Converted to the new debug interface, using script written by Patrik Stridvall.
diff --git a/msdos/devices.c b/msdos/devices.c index 4ae228f..b6cd115 100644 --- a/msdos/devices.c +++ b/msdos/devices.c
@@ -10,7 +10,7 @@ #include "msdos.h" #include "miscemu.h" #include "dosexe.h" -#include "debug.h" +#include "debugtools.h" #include "pshpack1.h"
diff --git a/msdos/dosconf.c b/msdos/dosconf.c index 0170720..eea0170 100644 --- a/msdos/dosconf.c +++ b/msdos/dosconf.c
@@ -12,7 +12,7 @@ #include <ctype.h> #include "winbase.h" #include "msdos.h" -#include "debug.h" +#include "debugtools.h" #include "options.h" #include "file.h" @@ -133,7 +133,7 @@ /* FIXME: get DEVICEHIGH parameters if avail ? */ } if (!(DOSCONF_JumpToEntry(confline, '='))) return 0; - TRACE(profile, "Loading device '%s'\n", *confline); + TRACE("Loading device '%s'\n", *confline); #if 0 DOSMOD_LoadDevice(*confline, loadhigh); #endif @@ -160,7 +160,7 @@ else (*confline)++; DOSCONF_JumpToEntry(confline, ','); } - TRACE(profile, "DOSCONF_Dos: HIGH is %d, UMB is %d\n", + TRACE("DOSCONF_Dos: HIGH is %d, UMB is %d\n", (DOSCONF_config.flags & DOSCONF_MEM_HIGH) != 0, (DOSCONF_config.flags & DOSCONF_MEM_UMB) != 0); return 1; } @@ -172,10 +172,10 @@ DOSCONF_config.fcbs = atoi(*confline); if (DOSCONF_config.fcbs > 255) { - MSG("The FCBS value in the config.sys file is too high ! Setting to 255.\n"); + MESSAGE("The FCBS value in the config.sys file is too high ! Setting to 255.\n"); DOSCONF_config.fcbs = 255; } - TRACE(profile, "DOSCONF_Fcbs returning %d\n", DOSCONF_config.fcbs); + TRACE("DOSCONF_Fcbs returning %d\n", DOSCONF_config.fcbs); return 1; } @@ -185,7 +185,7 @@ if (!(DOSCONF_JumpToEntry(confline, '='))) return 0; if (!(strcasecmp(*confline, "ON"))) DOSCONF_config.brk_flag = 1; - TRACE(profile, "BREAK is %d\n", DOSCONF_config.brk_flag); + TRACE("BREAK is %d\n", DOSCONF_config.brk_flag); return 1; } @@ -196,15 +196,15 @@ DOSCONF_config.files = atoi(*confline); if (DOSCONF_config.files > 255) { - MSG("The FILES value in the config.sys file is too high ! Setting to 255.\n"); + MESSAGE("The FILES value in the config.sys file is too high ! Setting to 255.\n"); DOSCONF_config.files = 255; } if (DOSCONF_config.files < 8) { - MSG("The FILES value in the config.sys file is too low ! Setting to 8.\n"); + MESSAGE("The FILES value in the config.sys file is too low ! Setting to 8.\n"); DOSCONF_config.files = 8; } - TRACE(profile, "DOSCONF_Files returning %d\n", DOSCONF_config.files); + TRACE("DOSCONF_Files returning %d\n", DOSCONF_config.files); return 1; } @@ -216,7 +216,7 @@ *confline += 7; /* strlen("INSTALL") */ if (!(DOSCONF_JumpToEntry(confline, '='))) return 0; - TRACE(profile, "Installing '%s'\n", *confline); + TRACE("Installing '%s'\n", *confline); #if 0 DOSMOD_Install(*confline, loadhigh); #endif @@ -228,7 +228,7 @@ *confline += 9; /* strlen("LASTDRIVE") */ if (!(DOSCONF_JumpToEntry(confline, '='))) return 0; DOSCONF_config.lastdrive = toupper(**confline); - TRACE(profile, "Lastdrive %c\n", DOSCONF_config.lastdrive); + TRACE("Lastdrive %c\n", DOSCONF_config.lastdrive); return 1; } @@ -236,7 +236,7 @@ { *confline += 7; /* strlen("COUNTRY") */ if (!(DOSCONF_JumpToEntry(confline, '='))) return 0; - TRACE(profile, "Country '%s'\n", *confline); + TRACE("Country '%s'\n", *confline); if (DOSCONF_config.country == NULL) DOSCONF_config.country = malloc(strlen(*confline) + 1); strcpy(DOSCONF_config.country, *confline); @@ -249,7 +249,7 @@ if (!(DOSCONF_JumpToEntry(confline, '='))) return 0; if (!(strcasecmp(*confline, "ON"))) DOSCONF_config.flags |= DOSCONF_NUMLOCK; - TRACE(profile, "NUMLOCK is %d\n", (DOSCONF_config.flags & DOSCONF_NUMLOCK) != 0); + TRACE("NUMLOCK is %d\n", (DOSCONF_config.flags & DOSCONF_NUMLOCK) != 0); return 1; } @@ -266,7 +266,7 @@ DOSCONF_config.flags |= DOSCONF_KEYB_CONV; } while ((p = strtok(NULL, "/"))); - TRACE(profile, "'Force conventional keyboard' is %d\n", + TRACE("'Force conventional keyboard' is %d\n", (DOSCONF_config.flags & DOSCONF_KEYB_CONV) != 0); return 1; } @@ -275,7 +275,7 @@ { *confline += 5; /* strlen("SHELL") */ if (!(DOSCONF_JumpToEntry(confline, '='))) return 0; - TRACE(profile, "Shell '%s'\n", *confline); + TRACE("Shell '%s'\n", *confline); if (DOSCONF_config.shell == NULL) DOSCONF_config.shell = malloc(strlen(*confline) + 1); strcpy(DOSCONF_config.shell, *confline); @@ -289,7 +289,7 @@ if (!(DOSCONF_JumpToEntry(confline, '='))) return 0; DOSCONF_config.stacks_nr = atoi(strtok(*confline, ",")); DOSCONF_config.stacks_sz = atoi((strtok(NULL, ","))); - TRACE(profile, "%d stacks of size %d\n", + TRACE("%d stacks of size %d\n", DOSCONF_config.stacks_nr, DOSCONF_config.stacks_sz); return 1; } @@ -304,7 +304,7 @@ DOSCONF_config.buf = atoi(p); if ((p = strtok(NULL, ","))) DOSCONF_config.buf2 = atoi(p); - TRACE(profile, "%d primary buffers, %d secondary buffers\n", + TRACE("%d primary buffers, %d secondary buffers\n", DOSCONF_config.buf, DOSCONF_config.buf2); return 1; } @@ -352,7 +352,7 @@ if (!(DOSCONF_JumpToEntry(confline, '='))) return 0; fgetpos(cfg_fd, &oldpos); fseek(cfg_fd, 0, SEEK_SET); - TRACE(profile, "Including menu '%s'\n", *confline); + TRACE("Including menu '%s'\n", *confline); temp = malloc(strlen(*confline) + 1); strcpy(temp, *confline); DOSCONF_Parse(temp); @@ -403,7 +403,7 @@ if (!(strncasecmp(p, tag_entries[i].tag_name, strlen(tag_entries[i].tag_name)))) { - TRACE(profile, "tag '%s'\n", tag_entries[i].tag_name); + TRACE("tag '%s'\n", tag_entries[i].tag_name); if (tag_entries[i].tag_handler != NULL) tag_entries[i].tag_handler(&p); break; @@ -435,7 +435,7 @@ } else { - MSG("Couldn't open config.sys file given as \"%s\" in" \ + MESSAGE("Couldn't open config.sys file given as \"%s\" in" \ " wine.conf or .winerc, section [wine] !\n", filename); ret = 0; }
diff --git a/msdos/dpmi.c b/msdos/dpmi.c index 2636c60..0d36bc5 100644 --- a/msdos/dpmi.c +++ b/msdos/dpmi.c
@@ -20,7 +20,7 @@ #include "selectors.h" #include "process.h" #include "callback.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(int31) @@ -86,7 +86,7 @@ * try non-linear */ if (!xflag && (lastvalloced<oldlastv)) { /* wrapped */ - FIXME(int31,"failed to allocate lineary growing memory (%d bytes), using non-linear growing...\n",len); + FIXME("failed to allocate lineary growing memory (%d bytes), using non-linear growing...\n",len); xflag++; } /* if we even fail to allocate something in the next @@ -95,7 +95,7 @@ if ((xflag==1) && (lastvalloced >= oldlastv)) xflag++; if ((xflag==2) && (lastvalloced < oldlastv)) { - FIXME(int31,"failed to allocate any memory of %d bytes!\n",len); + FIXME("failed to allocate any memory of %d bytes!\n",len); return NULL; } } @@ -119,11 +119,11 @@ newptr = DPMI_xalloc(newsize); if (ptr) { if (!VirtualQuery(ptr,&mbi,sizeof(mbi))) { - FIXME(int31,"realloc of DPMI_xallocd region %p?\n",ptr); + FIXME("realloc of DPMI_xallocd region %p?\n",ptr); return NULL; } if (mbi.State == MEM_FREE) { - FIXME(int31,"realloc of DPMI_xallocd region %p?\n",ptr); + FIXME("realloc of DPMI_xallocd region %p?\n",ptr); return NULL; } /* We do not shrink allocated memory. most reallocs @@ -203,7 +203,7 @@ INT_SetRealModeContext((REALMODECALL *)PTR_SEG_OFF_TO_LIN( rmcb->regs_sel, rmcb->regs_ofs ), context); ss = SELECTOR_AllocBlock( DOSMEM_MemoryBase(0) + (DWORD)(SS_reg(context)<<4), 0x10000, SEGMENT_DATA, FALSE, FALSE ); - FIXME(int31,"untested!\n"); + FIXME("untested!\n"); /* The called proc ends with an IRET, and takes these parameters: * DS:ESI = pointer to real-mode SS:SP @@ -246,7 +246,7 @@ SELECTOR_FreeBlock(ss, 1); INT_GetRealModeContext((REALMODECALL*)PTR_SEG_OFF_TO_LIN( es, edi ), context); #else - ERR(int31,"RMCBs only implemented for i386\n"); + ERR("RMCBs only implemented for i386\n"); #endif } } @@ -273,9 +273,9 @@ GlobalUnlock16( GetCurrentTask() ); - TRACE(int31, "EAX=%08lx EBX=%08lx ECX=%08lx EDX=%08lx\n", + TRACE("EAX=%08lx EBX=%08lx ECX=%08lx EDX=%08lx\n", EAX_reg(context), EBX_reg(context), ECX_reg(context), EDX_reg(context) ); - TRACE(int31, "ESI=%08lx EDI=%08lx ES=%04lx DS=%04lx CS:IP=%04lx:%04x, %d WORD arguments, %s\n", + TRACE("ESI=%08lx EDI=%08lx ES=%04lx DS=%04lx CS:IP=%04lx:%04x, %d WORD arguments, %s\n", ESI_reg(context), EDI_reg(context), ES_reg(context), DS_reg(context), CS_reg(context), IP_reg(context), args, iret?"IRET":"FAR" ); @@ -313,10 +313,10 @@ #ifdef MZ_SUPPORTED if (!(CurrRMCB || pModule->lpDosTask)) { - FIXME(int31,"DPMI real-mode call using DOS VM task system, not fully tested!\n"); - TRACE(int31,"creating VM86 task\n"); + FIXME("DPMI real-mode call using DOS VM task system, not fully tested!\n"); + TRACE("creating VM86 task\n"); if (!MZ_InitTask( MZ_AllocDPMITask( pModule->self ) )) { - ERR(int31,"could not setup VM86 task\n"); + ERR("could not setup VM86 task\n"); return 1; } } @@ -327,7 +327,7 @@ SP_reg(context) = 64-2; stack16 += 32-1; if (!addr) { - ERR(int31,"could not allocate default stack\n"); + ERR("could not allocate default stack\n"); return 1; } } else { @@ -377,9 +377,9 @@ CS_reg(context) = DPMI_wrap_seg; IP_reg(context) = 2; #endif - TRACE(int31,"entering real mode...\n"); + TRACE("entering real mode...\n"); DOSVM_Enter( context ); - TRACE(int31,"returned from real-mode call\n"); + TRACE("returned from real-mode call\n"); #else addr = CTX_SEG_OFF_TO_LIN(context, CS_reg(context), EIP_reg(context)); sel = SELECTOR_AllocBlock( addr, 0x10000, SEGMENT_CODE, FALSE, FALSE ); @@ -423,10 +423,10 @@ if (INT_RealModeInterrupt( LOWORD(rm_int)/4, &realmode_ctx )) SET_CFLAG(context); if (EFL_reg(context)&1) { - FIXME(int31,"%02x: EAX=%08lx EBX=%08lx ECX=%08lx EDX=%08lx\n", + FIXME("%02x: EAX=%08lx EBX=%08lx ECX=%08lx EDX=%08lx\n", BL_reg(context), EAX_reg(&realmode_ctx), EBX_reg(&realmode_ctx), ECX_reg(&realmode_ctx), EDX_reg(&realmode_ctx)); - FIXME(int31," ESI=%08lx EDI=%08lx DS=%04lx ES=%04lx\n", + FIXME(" ESI=%08lx EDI=%08lx DS=%04lx ES=%04lx\n", ESI_reg(&realmode_ctx), EDI_reg(&realmode_ctx), DS_reg(&realmode_ctx), ES_reg(&realmode_ctx) ); } @@ -440,9 +440,9 @@ REALMODECALL *p = (REALMODECALL *)PTR_SEG_OFF_TO_LIN( ES_reg(context), DI_reg(context) ); CONTEXT86 context16; - TRACE(int31, "RealModeCall: EAX=%08lx EBX=%08lx ECX=%08lx EDX=%08lx\n", + TRACE("RealModeCall: EAX=%08lx EBX=%08lx ECX=%08lx EDX=%08lx\n", p->eax, p->ebx, p->ecx, p->edx); - TRACE(int31, " ESI=%08lx EDI=%08lx ES=%04x DS=%04x CS:IP=%04x:%04x, %d WORD arguments, %s\n", + TRACE(" ESI=%08lx EDI=%08lx ES=%04x DS=%04x CS:IP=%04x:%04x, %d WORD arguments, %s\n", p->esi, p->edi, p->es, p->ds, p->cs, p->ip, CX_reg(context), iret?"IRET":"FAR" ); if (!(p->cs) && !(p->ip)) { /* remove this check @@ -464,7 +464,7 @@ register structure available - this is easily fixed by going through a Win16 register relay instead of calling RMCallbackProc "directly", but I won't bother at this time. */ - FIXME(int31,"not properly supported on your architecture!\n"); + FIXME("not properly supported on your architecture!\n"); } static RMCB *DPMI_AllocRMCB( void ) @@ -510,7 +510,7 @@ { RMCB *NewRMCB = DPMI_AllocRMCB(); - TRACE(int31, "Function to call: %04x:%04x\n", (WORD)DS_reg(context), SI_reg(context) ); + TRACE("Function to call: %04x:%04x\n", (WORD)DS_reg(context), SI_reg(context) ); if (NewRMCB) { @@ -571,7 +571,7 @@ static void FreeRMCB( CONTEXT86 *context ) { - FIXME(int31, "callback address: %04x:%04x\n", + FIXME("callback address: %04x:%04x\n", CX_reg(context), DX_reg(context)); if (DPMI_FreeRMCB(MAKELONG(DX_reg(context), CX_reg(context)))) { @@ -628,7 +628,7 @@ FS_reg(&pm_ctx) = 0; GS_reg(&pm_ctx) = 0; - TRACE(int31,"DOS program is now entering protected mode\n"); + TRACE("DOS program is now entering protected mode\n"); Callbacks->CallRegisterShortProc(&pm_ctx, 0); /* in the current state of affairs, we won't ever actually return here... */ @@ -653,7 +653,7 @@ if (!lpDosTask) { /* we could probably start a DPMI-only dosmod task here, but I doubt anything other than real DOS apps want to call raw mode switch */ - ERR(int31,"attempting raw mode switch without DOS task!\n"); + ERR("attempting raw mode switch without DOS task!\n"); ExitProcess(1); } /* initialize real-mode context as per spec */ @@ -670,7 +670,7 @@ EFL_reg(&rm_ctx) = EFL_sig(context); /* at least we need the IF flag */ /* enter real mode again */ - TRACE(int31,"re-entering real mode at %04lx:%04lx\n", + TRACE("re-entering real mode at %04lx:%04lx\n", CS_reg(&rm_ctx),EIP_reg(&rm_ctx)); ret = DOSVM_Enter( &rm_ctx ); /* when the real-mode stuff call its mode switch address, @@ -693,14 +693,14 @@ GS_sig(context) = 0; /* Return to new address and hope that we didn't mess up */ - TRACE(int31,"re-entering protected mode at %04x:%08lx\n", + TRACE("re-entering protected mode at %04x:%08lx\n", CS_sig(context), EIP_sig(context)); } #else void WINAPI DPMI_RawModeSwitch( SIGCONTEXT *context ) { - ERR(int31,"don't even think about DPMI raw mode switch without DOS support!\n"); + ERR("don't even think about DPMI raw mode switch without DOS support!\n"); ExitProcess(1); } #endif @@ -739,7 +739,7 @@ #ifdef MZ_SUPPORTED if (ISV86(context) && lpDosTask) { /* Called from real mode, check if it's our wrapper */ - TRACE(int31,"called from real mode\n"); + TRACE("called from real mode\n"); if (CS_reg(context)==lpDosTask->dpmi_seg) { /* This is the protected mode switch */ StartPM(context,lpDosTask); @@ -770,18 +770,18 @@ switch(AX_reg(context)) { case 0x0000: /* Allocate LDT descriptors */ - TRACE(int31,"allocate LDT descriptors (%d)\n",CX_reg(context)); + TRACE("allocate LDT descriptors (%d)\n",CX_reg(context)); if (!(AX_reg(context) = AllocSelectorArray16( CX_reg(context) ))) { - TRACE(int31,"failed\n"); + TRACE("failed\n"); AX_reg(context) = 0x8011; /* descriptor unavailable */ SET_CFLAG(context); } - TRACE(int31,"success, array starts at 0x%04x\n",AX_reg(context)); + TRACE("success, array starts at 0x%04x\n",AX_reg(context)); break; case 0x0001: /* Free LDT descriptor */ - TRACE(int31,"free LDT descriptor (0x%04x)\n",BX_reg(context)); + TRACE("free LDT descriptor (0x%04x)\n",BX_reg(context)); if (FreeSelector16( BX_reg(context) )) { AX_reg(context) = 0x8022; /* invalid selector */ @@ -799,7 +799,7 @@ break; case 0x0002: /* Real mode segment to descriptor */ - TRACE(int31,"real mode segment to descriptor (0x%04x)\n",BX_reg(context)); + TRACE("real mode segment to descriptor (0x%04x)\n",BX_reg(context)); { WORD entryPoint = 0; /* KERNEL entry point for descriptor */ switch(BX_reg(context)) @@ -825,22 +825,22 @@ break; case 0x0003: /* Get next selector increment */ - TRACE(int31,"get selector increment (__AHINCR)\n"); + TRACE("get selector increment (__AHINCR)\n"); AX_reg(context) = __AHINCR; break; case 0x0004: /* Lock selector (not supported) */ - FIXME(int31,"lock selector not supported\n"); + FIXME("lock selector not supported\n"); AX_reg(context) = 0; /* FIXME: is this a correct return value? */ break; case 0x0005: /* Unlock selector (not supported) */ - FIXME(int31,"unlock selector not supported\n"); + FIXME("unlock selector not supported\n"); AX_reg(context) = 0; /* FIXME: is this a correct return value? */ break; case 0x0006: /* Get selector base address */ - TRACE(int31,"get selector base address (0x%04x)\n",BX_reg(context)); + TRACE("get selector base address (0x%04x)\n",BX_reg(context)); if (!(dw = GetSelectorBase( BX_reg(context) ))) { AX_reg(context) = 0x8022; /* invalid selector */ @@ -860,7 +860,7 @@ break; case 0x0007: /* Set selector base address */ - TRACE(int31, "set selector base address (0x%04x,0x%08lx)\n", + TRACE("set selector base address (0x%04x,0x%08lx)\n", BX_reg(context), W32S_APP2WINE(MAKELONG(DX_reg(context),CX_reg(context)), offset)); dw = W32S_APP2WINE(MAKELONG(DX_reg(context), CX_reg(context)), offset); @@ -874,7 +874,7 @@ break; case 0x0008: /* Set selector limit */ - TRACE(int31,"set selector limit (0x%04x,0x%08lx)\n",BX_reg(context),MAKELONG(DX_reg(context),CX_reg(context))); + TRACE("set selector limit (0x%04x,0x%08lx)\n",BX_reg(context),MAKELONG(DX_reg(context),CX_reg(context))); dw = MAKELONG( DX_reg(context), CX_reg(context) ); #ifdef MZ_SUPPORTED if (lpDosTask) { @@ -902,12 +902,12 @@ break; case 0x0009: /* Set selector access rights */ - TRACE(int31,"set selector access rights(0x%04x,0x%04x)\n",BX_reg(context),CX_reg(context)); + TRACE("set selector access rights(0x%04x,0x%04x)\n",BX_reg(context),CX_reg(context)); SelectorAccessRights16( BX_reg(context), 1, CX_reg(context) ); break; case 0x000a: /* Allocate selector alias */ - TRACE(int31,"allocate selector alias (0x%04x)\n",BX_reg(context)); + TRACE("allocate selector alias (0x%04x)\n",BX_reg(context)); if (!(AX_reg(context) = AllocCStoDSAlias16( BX_reg(context) ))) { AX_reg(context) = 0x8011; /* descriptor unavailable */ @@ -916,7 +916,7 @@ break; case 0x000b: /* Get descriptor */ - TRACE(int31,"get descriptor (0x%04x)\n",BX_reg(context)); + TRACE("get descriptor (0x%04x)\n",BX_reg(context)); { ldt_entry entry; LDT_GetEntry( SELECTOR_TO_ENTRY( BX_reg(context) ), &entry ); @@ -935,7 +935,7 @@ break; case 0x000c: /* Set descriptor */ - TRACE(int31,"set descriptor (0x%04x)\n",BX_reg(context)); + TRACE("set descriptor (0x%04x)\n",BX_reg(context)); { ldt_entry entry; LDT_BytesToEntry( PTR_SEG_OFF_TO_LIN( ES_reg(context), @@ -958,12 +958,12 @@ break; case 0x000d: /* Allocate specific LDT descriptor */ - FIXME(int31,"allocate descriptor (0x%04x), stub!\n",BX_reg(context)); + FIXME("allocate descriptor (0x%04x), stub!\n",BX_reg(context)); AX_reg(context) = 0x8011; /* descriptor unavailable */ SET_CFLAG(context); break; case 0x0100: /* Allocate DOS memory block */ - TRACE(int31,"allocate DOS memory block (0x%x paragraphs)\n",BX_reg(context)); + TRACE("allocate DOS memory block (0x%x paragraphs)\n",BX_reg(context)); dw = GlobalDOSAlloc16((DWORD)BX_reg(context)<<4); if (dw) { AX_reg(context) = HIWORD(dw); @@ -975,7 +975,7 @@ } break; case 0x0101: /* Free DOS memory block */ - TRACE(int31,"free DOS memory block (0x%04x)\n",DX_reg(context)); + TRACE("free DOS memory block (0x%04x)\n",DX_reg(context)); dw = GlobalDOSFree16(DX_reg(context)); if (!dw) { AX_reg(context) = 0x0009; /* memory block address invalid */ @@ -983,23 +983,23 @@ } break; case 0x0200: /* get real mode interrupt vector */ - FIXME(int31,"get realmode interupt vector(0x%02x) unimplemented.\n", + FIXME("get realmode interupt vector(0x%02x) unimplemented.\n", BL_reg(context)); SET_CFLAG(context); break; case 0x0201: /* set real mode interrupt vector */ - FIXME(int31, "set realmode interupt vector(0x%02x,0x%04x:0x%04x) unimplemented\n", BL_reg(context),CX_reg(context),DX_reg(context)); + FIXME("set realmode interupt vector(0x%02x,0x%04x:0x%04x) unimplemented\n", BL_reg(context),CX_reg(context),DX_reg(context)); SET_CFLAG(context); break; case 0x0204: /* Get protected mode interrupt vector */ - TRACE(int31,"get protected mode interrupt handler (0x%02x), stub!\n",BL_reg(context)); + TRACE("get protected mode interrupt handler (0x%02x), stub!\n",BL_reg(context)); dw = (DWORD)INT_GetPMHandler( BL_reg(context) ); CX_reg(context) = HIWORD(dw); DX_reg(context) = LOWORD(dw); break; case 0x0205: /* Set protected mode interrupt vector */ - TRACE(int31,"set protected mode interrupt handler (0x%02x,%p), stub!\n", + TRACE("set protected mode interrupt handler (0x%02x,%p), stub!\n", BL_reg(context),PTR_SEG_OFF_TO_LIN(CX_reg(context),DX_reg(context))); INT_SetPMHandler( BL_reg(context), (FARPROC16)PTR_SEG_OFF_TO_SEGPTR( CX_reg(context), @@ -1027,20 +1027,20 @@ break; case 0x0305: /* Get State Save/Restore Addresses */ - TRACE(int31,"get state save/restore addresses\n"); + TRACE("get state save/restore addresses\n"); /* we probably won't need this kind of state saving */ AX_reg(context) = 0; /* real mode: just point to the lret */ BX_reg(context) = DPMI_wrap_seg; ECX_reg(context) = 2; /* protected mode: don't have any handler yet... */ - FIXME(int31,"no protected-mode dummy state save/restore handler yet\n"); + FIXME("no protected-mode dummy state save/restore handler yet\n"); SI_reg(context) = 0; EDI_reg(context) = 0; break; case 0x0306: /* Get Raw Mode Switch Addresses */ - TRACE(int31,"get raw mode switch addresses\n"); + TRACE("get raw mode switch addresses\n"); if (lpDosTask) { /* real mode, point to standard DPMI return wrapper */ BX_reg(context) = DPMI_wrap_seg; @@ -1049,13 +1049,13 @@ SI_reg(context) = lpDosTask->dpmi_sel; EDI_reg(context) = 8; /* offset of the INT 0x31 call */ } else { - ERR(int31,"win app attempting to get raw mode switch!\n"); + ERR("win app attempting to get raw mode switch!\n"); AX_reg(context) = 0x8001; /* unsupported function */ SET_CFLAG(context); } break; case 0x0400: /* Get DPMI version */ - TRACE(int31,"get DPMI version\n"); + TRACE("get DPMI version\n"); { SYSTEM_INFO si; @@ -1067,7 +1067,7 @@ break; } case 0x0500: /* Get free memory information */ - TRACE(int31,"get free memory information\n"); + TRACE("get free memory information\n"); { MEMMANINFO mmi; @@ -1081,7 +1081,7 @@ break; } case 0x0501: /* Allocate memory block */ - TRACE(int31,"allocate memory block (%ld)\n",MAKELONG(CX_reg(context),BX_reg(context))); + TRACE("allocate memory block (%ld)\n",MAKELONG(CX_reg(context),BX_reg(context))); if (!(ptr = (BYTE *)DPMI_xalloc(MAKELONG(CX_reg(context), BX_reg(context))))) { AX_reg(context) = 0x8012; /* linear memory not available */ @@ -1093,14 +1093,14 @@ break; case 0x0502: /* Free memory block */ - TRACE(int31, "free memory block (0x%08lx)\n", + TRACE("free memory block (0x%08lx)\n", W32S_APP2WINE(MAKELONG(DI_reg(context),SI_reg(context)), offset)); DPMI_xfree( (void *)W32S_APP2WINE(MAKELONG(DI_reg(context), SI_reg(context)), offset) ); break; case 0x0503: /* Resize memory block */ - TRACE(int31, "resize memory block (0x%08lx,%ld)\n", + TRACE("resize memory block (0x%08lx,%ld)\n", W32S_APP2WINE(MAKELONG(DI_reg(context),SI_reg(context)), offset), MAKELONG(CX_reg(context),BX_reg(context))); if (!(ptr = (BYTE *)DPMI_xrealloc( @@ -1116,41 +1116,41 @@ break; case 0x0507: /* Modify page attributes */ - FIXME(int31,"modify page attributes unimplemented\n"); + FIXME("modify page attributes unimplemented\n"); break; /* Just ignore it */ case 0x0600: /* Lock linear region */ - FIXME(int31,"lock linear region unimplemented\n"); + FIXME("lock linear region unimplemented\n"); break; /* Just ignore it */ case 0x0601: /* Unlock linear region */ - FIXME(int31,"unlock linear region unimplemented\n"); + FIXME("unlock linear region unimplemented\n"); break; /* Just ignore it */ case 0x0602: /* Unlock real-mode region */ - FIXME(int31,"unlock realmode region unimplemented\n"); + FIXME("unlock realmode region unimplemented\n"); break; /* Just ignore it */ case 0x0603: /* Lock real-mode region */ - FIXME(int31,"lock realmode region unimplemented\n"); + FIXME("lock realmode region unimplemented\n"); break; /* Just ignore it */ case 0x0604: /* Get page size */ - TRACE(int31,"get pagesize\n"); + TRACE("get pagesize\n"); BX_reg(context) = 0; CX_reg(context) = VIRTUAL_GetPageSize(); break; case 0x0702: /* Mark page as demand-paging candidate */ - FIXME(int31,"mark page as demand-paging candidate\n"); + FIXME("mark page as demand-paging candidate\n"); break; /* Just ignore it */ case 0x0703: /* Discard page contents */ - FIXME(int31,"discard page contents\n"); + FIXME("discard page contents\n"); break; /* Just ignore it */ case 0x0800: /* Physical address mapping */ - FIXME(int31,"map real to linear (0x%08lx)\n",MAKELONG(CX_reg(context),BX_reg(context))); + FIXME("map real to linear (0x%08lx)\n",MAKELONG(CX_reg(context),BX_reg(context))); if(!(ptr=DOSMEM_MapRealToLinear(MAKELONG(CX_reg(context),BX_reg(context))))) { AX_reg(context) = 0x8021;
diff --git a/msdos/int09.c b/msdos/int09.c index 2e02554..3852ae6 100644 --- a/msdos/int09.c +++ b/msdos/int09.c
@@ -7,7 +7,7 @@ #include "winuser.h" #include "miscemu.h" #include "input.h" -#include "debug.h" +#include "debugtools.h" #include "dosexe.h" DEFAULT_DEBUG_CHANNEL(int) @@ -32,7 +32,7 @@ /* as in TranslateMessage, windows/input.c */ cnt = ToAscii(vkey, scan&0x7f, QueueKeyStateTable, (LPWORD)ch, 0); if (cnt==1) { - FIXME(int,"enter character %c into console input, not implemented\n",ch[0]); + FIXME("enter character %c into console input, not implemented\n",ch[0]); } } DOSVM_PIC_ioport_out(0x20, 0x20); /* send EOI */
diff --git a/msdos/int10.c b/msdos/int10.c index 69138a7..ef2ec83 100644 --- a/msdos/int10.c +++ b/msdos/int10.c
@@ -5,7 +5,7 @@ #include <stdlib.h> #include "miscemu.h" #include "vga.h" -#include "debug.h" +#include "debugtools.h" #include "console.h" DEFAULT_DEBUG_CHANNEL(int10) @@ -101,12 +101,12 @@ switch(AH_reg(context)) { case 0x00: /* GET SuperVGA INFORMATION */ - FIXME(int10, "Vesa Get SuperVGA Info STUB!\n"); + FIXME("Vesa Get SuperVGA Info STUB!\n"); AL_reg(context) = 0x4f; AH_reg(context) = 0x01; /* 0x01=failed 0x00=succesful */ break; case 0x01: /* GET SuperVGA MODE INFORMATION */ - FIXME(int10, "VESA GET SuperVGA Mode Information - Not supported\n"); + FIXME("VESA GET SuperVGA Mode Information - Not supported\n"); AL_reg(context) = 0x4f; AH_reg(context) = 0x01; /* 0x00 = successful 0x01 = failed */ break; @@ -116,7 +116,7 @@ case 0x00: /* 40x25 */ case 0x01: VGA_Exit(); - TRACE(int10, "Set VESA Text Mode - 0x0%x\n", + TRACE("Set VESA Text Mode - 0x0%x\n", BX_reg(context)); CONSOLE_ResizeScreen(40, 25); CONSOLE_ClearScreen(); @@ -126,129 +126,129 @@ case 0x03: case 0x07: VGA_Exit(); - TRACE(int10, "Set VESA Text Mode - 0x0%x\n", + TRACE("Set VESA Text Mode - 0x0%x\n", BX_reg(context)); CONSOLE_ResizeScreen(80, 25); CONSOLE_ClearScreen(); DOSMEM_BiosData()->VideoColumns = 80; break; case 0x0D: - TRACE(int10, "Setting VESA 320x200 16-color mode\n"); + TRACE("Setting VESA 320x200 16-color mode\n"); VGA_SetMode(320,200,4); break; case 0x0E: - TRACE(int10, "Setting VESA 640x200 16-color mode\n"); + TRACE("Setting VESA 640x200 16-color mode\n"); VGA_SetMode(640,200,4); break; case 0x10: - TRACE(int10, "Setting VESA 640x350 16-color mode\n"); + TRACE("Setting VESA 640x350 16-color mode\n"); VGA_SetMode(640,350,4); break; case 0x12: - TRACE(int10, "Setting VESA 640x480 16-color mode\n"); + TRACE("Setting VESA 640x480 16-color mode\n"); VGA_SetMode(640,480,4); break; case 0x13: - TRACE(int10, "Setting VESA 320x200 256-color mode\n"); + TRACE("Setting VESA 320x200 256-color mode\n"); VGA_SetMode(320,200,8); break; /* VBE Modes */ case 0x100: - TRACE(int10, "Setting VESA 640x400 256-color mode\n"); + TRACE("Setting VESA 640x400 256-color mode\n"); VGA_SetMode(640,400,8); break; case 0x101: - TRACE(int10, "Setting VESA 640x480 256-color mode\n"); + TRACE("Setting VESA 640x480 256-color mode\n"); VGA_SetMode(640,480,8); break; case 0x102: - TRACE(int10, "Setting VESA 800x600 16-color mode\n"); + TRACE("Setting VESA 800x600 16-color mode\n"); VGA_SetMode(800,600,4); break; case 0x103: - TRACE(int10, "Setting VESA 800x600 256-color mode\n"); + TRACE("Setting VESA 800x600 256-color mode\n"); VGA_SetMode(800,600,8); break; case 0x104: - TRACE(int10, "Setting VESA 1024x768 16-color mode\n"); + TRACE("Setting VESA 1024x768 16-color mode\n"); VGA_SetMode(1024,768,4); break; case 0x105: - TRACE(int10, "Setting VESA 1024x768 256-color mode\n"); + TRACE("Setting VESA 1024x768 256-color mode\n"); VGA_SetMode(1024,768,8); break; case 0x106: - TRACE(int10, "Setting VESA 1280x1024 16-color mode\n"); + TRACE("Setting VESA 1280x1024 16-color mode\n"); VGA_SetMode(1280,1024,4); break; case 0x107: - TRACE(int10, "Setting VESA 1280x1024 256-color mode\n"); + TRACE("Setting VESA 1280x1024 256-color mode\n"); VGA_SetMode(1280,1024,8); break; /* 108h - 10Ch are text modes and im lazy so :p */ /* VBE v1.2+ */ case 0x10D: - TRACE(int10, "Setting VESA 320x200 15bpp\n"); + TRACE("Setting VESA 320x200 15bpp\n"); VGA_SetMode(320,200,15); break; case 0x10E: - TRACE(int10, "Setting VESA 320x200 16bpp\n"); + TRACE("Setting VESA 320x200 16bpp\n"); VGA_SetMode(320,200,16); break; case 0x10F: - TRACE(int10, "Setting VESA 320x200 24bpp\n"); + TRACE("Setting VESA 320x200 24bpp\n"); VGA_SetMode(320,200,24); break; case 0x110: - TRACE(int10, "Setting VESA 640x480 15bpp\n"); + TRACE("Setting VESA 640x480 15bpp\n"); VGA_SetMode(640,480,15); break; case 0x111: - TRACE(int10, "Setting VESA 640x480 16bpp\n"); + TRACE("Setting VESA 640x480 16bpp\n"); VGA_SetMode(640,480,16); break; case 0x112: - TRACE(int10, "Setting VESA 640x480 24bpp\n"); + TRACE("Setting VESA 640x480 24bpp\n"); VGA_SetMode(640,480,24); break; case 0x113: - TRACE(int10, "Setting VESA 800x600 15bpp\n"); + TRACE("Setting VESA 800x600 15bpp\n"); VGA_SetMode(800,600,15); break; case 0x114: - TRACE(int10, "Setting VESA 800x600 16bpp\n"); + TRACE("Setting VESA 800x600 16bpp\n"); VGA_SetMode(800,600,16); break; case 0x115: - TRACE(int10, "Setting VESA 800x600 24bpp\n"); + TRACE("Setting VESA 800x600 24bpp\n"); VGA_SetMode(800,600,24); break; case 0x116: - TRACE(int10, "Setting VESA 1024x768 15bpp\n"); + TRACE("Setting VESA 1024x768 15bpp\n"); VGA_SetMode(1024,768,15); break; case 0x117: - TRACE(int10, "Setting VESA 1024x768 16bpp\n"); + TRACE("Setting VESA 1024x768 16bpp\n"); VGA_SetMode(1024,768,16); break; case 0x118: - TRACE(int10, "Setting VESA 1024x768 24bpp\n"); + TRACE("Setting VESA 1024x768 24bpp\n"); VGA_SetMode(1024,768,24); break; case 0x119: - TRACE(int10, "Setting VESA 1280x1024 15bpp\n"); + TRACE("Setting VESA 1280x1024 15bpp\n"); VGA_SetMode(1280,1024,15); break; case 0x11A: - TRACE(int10, "Setting VESA 1280x1024 16bpp\n"); + TRACE("Setting VESA 1280x1024 16bpp\n"); VGA_SetMode(1280,1024,16); break; case 0x11B: - TRACE(int10, "Setting VESA 1280x1024 24bpp\n"); + TRACE("Setting VESA 1280x1024 24bpp\n"); VGA_SetMode(1280,1024,24); break; default: - FIXME(int10,"VESA Set Video Mode (0x%x) - Not Supported\n", BX_reg(context)); + FIXME("VESA Set Video Mode (0x%x) - Not Supported\n", BX_reg(context)); } DOSMEM_BiosData()->VideoMode = BX_reg(context); AL_reg(context) = 0x4f; @@ -260,43 +260,43 @@ BX_reg(context) = DOSMEM_BiosData()->VideoMode; break; case 0x04: /* VESA SuperVGA BIOS - SAVE/RESTORE SuperVGA VIDEO STATE */ - ERR(int10,"VESA SAVE/RESTORE Video State - Not Implemented\n"); + ERR("VESA SAVE/RESTORE Video State - Not Implemented\n"); /* AL_reg(context) = 0x4f; = supported so dont set since not implemented */ /* maby we should do this instead ? */ /* AH_reg(context = 0x01; not implemented so just fail */ break; case 0x05: /* VESA SuperVGA BIOS - CPU VIDEO MEMORY CONTROL */ - ERR(int10,"VESA CPU VIDEO MEMORY CONTROL\n"); + ERR("VESA CPU VIDEO MEMORY CONTROL\n"); /* AL_reg(context) = 0x4f; = supported so dont set since not implemented */ /* maby we should do this instead ? */ /* AH_reg(context = 0x001; not implemented so just fail */ break; case 0x06: /* VESA GET/SET LOGICAL SCAN LINE LENGTH */ - ERR(int10,"VESA GET/SET LOGICAL SCAN LINE LENGTH - Not Implemented\n"); + ERR("VESA GET/SET LOGICAL SCAN LINE LENGTH - Not Implemented\n"); /* AL_reg(context) = 0x4f; = supported so dont set since not implemented */ /* maby we should do this instead ? */ /* AH_reg(context = 0x001; not implemented so just fail */ break; case 0x07: /* GET/SET DISPLAY START */ - ERR(int10,"VESA GET/SET DISPLAY START - Not Implemented\n"); + ERR("VESA GET/SET DISPLAY START - Not Implemented\n"); /* AL_reg(context) = 0x4f; = supported so dont set since not implemented */ /* maby we should do this instead ? */ /* AH_reg(context = 0x001; not implemented so just fail */ break; case 0x08: /* GET/SET DAC PALETTE CONTROL */ - ERR(int10,"VESA GET/SET DAC PALETTE CONTROL- Not Implemented\n"); + ERR("VESA GET/SET DAC PALETTE CONTROL- Not Implemented\n"); /* AL_reg(context) = 0x4f; = supported so dont set since not implemented */ /* maby we should do this instead ? */ /* AH_reg(context = 0x001; not implemented so just fail */ break; case 0x09: /* SET PALETTE ENTRIES */ - FIXME(int10, "VESA Set palette entries - not implemented\n"); + FIXME("VESA Set palette entries - not implemented\n"); break; case 0xff: /* Turn VESA ON/OFF */ /* i dont know what to do */ break; default: - FIXME(int10,"VESA Function (0x%x) - Not Supported\n", AH_reg(context)); + FIXME("VESA Function (0x%x) - Not Supported\n", AH_reg(context)); break; } } @@ -318,7 +318,7 @@ case 0x00: /* 40x25 */ case 0x01: VGA_Exit(); - TRACE(int10, "Set Video Mode - Set to Text - 0x0%x\n", + TRACE("Set Video Mode - Set to Text - 0x0%x\n", AL_reg(context)); CONSOLE_ResizeScreen(40, 25); CONSOLE_ClearScreen(); @@ -328,41 +328,41 @@ case 0x03: case 0x07: VGA_Exit(); - TRACE(int10, "Set Video Mode - Set to Text - 0x0%x\n", + TRACE("Set Video Mode - Set to Text - 0x0%x\n", AL_reg(context)); CONSOLE_ResizeScreen(80, 25); CONSOLE_ClearScreen(); DOSMEM_BiosData()->VideoColumns = 80; break; case 0x0D: - TRACE(int10, "Setting VGA 320x200 16-color mode\n"); + TRACE("Setting VGA 320x200 16-color mode\n"); VGA_SetMode(320,200,4); break; case 0x0E: - TRACE(int10, "Setting VGA 640x200 16-color mode\n"); + TRACE("Setting VGA 640x200 16-color mode\n"); VGA_SetMode(640,200,4); break; case 0x10: - TRACE(int10, "Setting VGA 640x350 16-color mode\n"); + TRACE("Setting VGA 640x350 16-color mode\n"); VGA_SetMode(640,350,4); break; case 0x12: - TRACE(int10, "Setting VGA 640x480 16-color mode\n"); + TRACE("Setting VGA 640x480 16-color mode\n"); VGA_SetMode(640,480,4); break; case 0x13: - TRACE(int10, "Setting VGA 320x200 256-color mode\n"); + TRACE("Setting VGA 320x200 256-color mode\n"); VGA_SetMode(320,200,8); break; default: - FIXME(int10, "Set Video Mode (0x%x) - Not Supported\n", + FIXME("Set Video Mode (0x%x) - Not Supported\n", AL_reg(context)); } DOSMEM_BiosData()->VideoMode = AL_reg(context); break; case 0x01: /* SET CURSOR SHAPE */ - FIXME(int10, "Set Cursor Shape - Not Supported\n"); + FIXME("Set Cursor Shape - Not Supported\n"); break; case 0x02: /* SET CURSOR POSITION */ @@ -371,13 +371,13 @@ /* DL = Column */ /* 0 is top */ if (BH_reg(context)) { - FIXME(int10, "Set Cursor Position: Cannot set to page %d\n", + FIXME("Set Cursor Position: Cannot set to page %d\n", BH_reg(context)); } else { CONSOLE_MoveCursor(DH_reg(context), DL_reg(context)); - TRACE(int10, "Set Cursor Position: %d %d\n", DH_reg(context), + TRACE("Set Cursor Position: %d %d\n", DH_reg(context), DL_reg(context)); } break; @@ -386,7 +386,7 @@ { CHAR row, col; - FIXME(int10, "Get cursor position and size - partially supported\n"); + FIXME("Get cursor position and size - partially supported\n"); CX_reg(context) = 0x0a0b; /* Bogus cursor data */ CONSOLE_GetCursorPosition(&row, &col); DH_reg(context) = row; @@ -395,12 +395,12 @@ break; case 0x04: /* READ LIGHT PEN POSITION */ - FIXME(int10, "Read Light Pen Position - Not Supported\n"); + FIXME("Read Light Pen Position - Not Supported\n"); AH_reg(context) = 0x00; /* Not down */ break; case 0x05: /* SELECT ACTIVE DISPLAY PAGE */ - FIXME(int10, "Select Active Display Page - Not Supported\n"); + FIXME("Select Active Display Page - Not Supported\n"); break; case 0x06: /* SCROLL UP WINDOW */ @@ -411,7 +411,7 @@ scroll_window(SCROLL_UP, AL_reg(context), CH_reg(context), CL_reg(context), DH_reg(context), DL_reg(context), BH_reg(context)); - TRACE(int10, "Scroll Up Window %d\n", AL_reg(context)); + TRACE("Scroll Up Window %d\n", AL_reg(context)); break; case 0x07: /* SCROLL DOWN WINDOW */ @@ -422,7 +422,7 @@ scroll_window(SCROLL_DOWN, AL_reg(context), CH_reg(context), CL_reg(context), DH_reg(context), DL_reg(context), BH_reg(context)); - TRACE(int10, "Scroll Down Window %d\n", AL_reg(context)); + TRACE("Scroll Down Window %d\n", AL_reg(context)); break; case 0x08: /* READ CHARACTER AND ATTRIBUTE AT CURSOR POSITION */ @@ -432,14 +432,14 @@ int bg, fg, attr; if (BH_reg(context)) /* Write to different page */ { - FIXME(int10, "Read character and attribute at cursor position -" + FIXME("Read character and attribute at cursor position -" " Can't read from non-0 page\n"); AL_reg(context) = ' '; /* That page is blank */ AH_reg(context) = 7; } else { - TRACE(int10, + TRACE( "Read Character and Attribute at Cursor Position\n"); CONSOLE_GetCharacterAtCursor(&ch, &fg, &bg, &attr); AL_reg(context) = ch; @@ -457,10 +457,10 @@ write_char_attribute_at_cursor(AL_reg(context), BH_reg(context), BL_reg(context), CX_reg(context)); if (CX_reg(context) > 1) - TRACE(int10, "Write Character and Attribute at Cursor Position " + TRACE("Write Character and Attribute at Cursor Position " "(Rep. %d) %c\n", CX_reg(context), AL_reg(context)); else - TRACE(int10, "Write Character and Attribute at Cursor" + TRACE("Write Character and Attribute at Cursor" "Position: %c\n", AL_reg(context)); break; @@ -468,7 +468,7 @@ /* AL = Character to display. */ /* BH = Page Number */ /* We can't write to non-0 pages, yet. */ /* CX = Times to Write Char */ - TRACE(int10, "Write Character at Cursor\n"); + TRACE("Write Character at Cursor\n"); write_char_attribute_at_cursor(AL_reg(context), BH_reg(context), 0, CX_reg(context)); break; @@ -485,16 +485,16 @@ apparantly, the foreground or attribute of the background with this call, so we should check first to see what the foreground already is... FIXME */ - TRACE(int10, "Set Background/Border Color: %d\n", + TRACE("Set Background/Border Color: %d\n", BL_reg(context)); CONSOLE_SetBackgroundColor(color_palette[0], color_palette[BL_reg(context)]); break; case 0x01: /* SET PALETTE */ - FIXME(int10, "Set Palette - Not Supported\n"); + FIXME("Set Palette - Not Supported\n"); break; default: - FIXME(int10, "INT 10 AH = 0x0b BH = 0x%x - Unknown\n", + FIXME("INT 10 AH = 0x0b BH = 0x%x - Unknown\n", BH_reg(context)); break; } @@ -502,21 +502,21 @@ case 0x0c: /* WRITE GRAPHICS PIXEL */ /* Not in graphics mode, can ignore w/o error */ - FIXME(int10, "Write Graphics Pixel - Not Supported\n"); + FIXME("Write Graphics Pixel - Not Supported\n"); break; case 0x0d: /* READ GRAPHICS PIXEL */ /* Not in graphics mode, can ignore w/o error */ - FIXME(int10, "Read Graphics Pixel - Not Supported\n"); + FIXME("Read Graphics Pixel - Not Supported\n"); break; case 0x0e: /* TELETYPE OUTPUT */ - TRACE(int10, "Teletype Output\n"); + TRACE("Teletype Output\n"); CONSOLE_Write(AL_reg(context), 0, 0, 0); break; case 0x0f: /* GET CURRENT VIDEO MODE */ - TRACE(int10, "Get current video mode\n"); + TRACE("Get current video mode\n"); /* Note: This should not be a constant value. */ AL_reg(context) = DOSMEM_BiosData()->VideoMode; AH_reg(context) = DOSMEM_BiosData()->VideoColumns; @@ -526,59 +526,59 @@ case 0x10: switch AL_reg(context) { case 0x00: /* SET SINGLE PALETTE REGISTER */ - FIXME(int10, "Set Single Palette Register - Not Supported\n"); + FIXME("Set Single Palette Register - Not Supported\n"); break; case 0x01: /* SET BORDER (OVERSCAN) */ /* Text terminals have no overscan */ - TRACE(int10, "Set Border (Overscan) - Ignored\n"); + TRACE("Set Border (Overscan) - Ignored\n"); break; case 0x02: /* SET ALL PALETTE REGISTERS */ - FIXME(int10, "Set all palette registers - Not Supported\n"); + FIXME("Set all palette registers - Not Supported\n"); break; case 0x03: /* TOGGLE INTENSITY/BLINKING BIT */ - FIXME(int10, "Toggle Intensity/Blinking Bit - Not Supported\n"); + FIXME("Toggle Intensity/Blinking Bit - Not Supported\n"); break; case 0x07: /* GET INDIVIDUAL PALETTE REGISTER */ - FIXME(int10, "Get Individual Palette Register - Not Supported\n"); + FIXME("Get Individual Palette Register - Not Supported\n"); break; case 0x08: /* READ OVERSCAN (BORDER COLOR) REGISTER */ - FIXME(int10, + FIXME( "Read Overscan (Border Color) Register - Not Supported\n"); break; case 0x09: /* READ ALL PALETTE REGISTERS AND OVERSCAN REGISTER */ - FIXME(int10, + FIXME( "Read All Palette Registers and Overscan Register " " - Not Supported\n"); break; case 0x10: /* SET INDIVIDUAL DAC REGISTER */ - FIXME(int10, "Set Individual DAC register - Not Supported\n"); + FIXME("Set Individual DAC register - Not Supported\n"); break; case 0x12: /* SET BLOCK OF DAC REGISTERS */ - FIXME(int10, "Set Block of DAC registers - Not Supported\n"); + FIXME("Set Block of DAC registers - Not Supported\n"); break; case 0x13: /* SELECT VIDEO DAC COLOR PAGE */ - FIXME(int10, "Select video DAC color page - Not Supported\n"); + FIXME("Select video DAC color page - Not Supported\n"); break; case 0x15: /* READ INDIVIDUAL DAC REGISTER */ - FIXME(int10, "Read individual DAC register - Not Supported\n"); + FIXME("Read individual DAC register - Not Supported\n"); break; case 0x17: /* READ BLOCK OF DAC REGISTERS */ - FIXME(int10, "Read block of DAC registers - Not Supported\n"); + FIXME("Read block of DAC registers - Not Supported\n"); break; case 0x18: /* SET PEL MASK */ - FIXME(int10, "Set PEL mask - Not Supported\n"); + FIXME("Set PEL mask - Not Supported\n"); break; case 0x19: /* READ PEL MASK */ - FIXME(int10, "Read PEL mask - Not Supported\n"); + FIXME("Read PEL mask - Not Supported\n"); break; case 0x1a: /* GET VIDEO DAC COLOR PAGE STATE */ - FIXME(int10, "Get video DAC color page state - Not Supported\n"); + FIXME("Get video DAC color page state - Not Supported\n"); break; case 0x1b: /* PERFORM GRAY-SCALE SUMMING */ - FIXME(int10, "Perform Gray-scale summing - Not Supported\n"); + FIXME("Perform Gray-scale summing - Not Supported\n"); break; default: - FIXME(int10, "INT 10 AH = 0x10 AL = 0x%x - Unknown\n", + FIXME("INT 10 AH = 0x10 AL = 0x%x - Unknown\n", AL_reg(context)); break; } @@ -590,45 +590,45 @@ switch AL_reg(context) { case 0x00: /* LOAD USER SPECIFIED PATTERNS */ case 0x10: - FIXME(int10, "Load User Specified Patterns - Not Supported\n"); + FIXME("Load User Specified Patterns - Not Supported\n"); break; case 0x01: /* LOAD ROM MONOCHROME PATTERNS */ case 0x11: - FIXME(int10, "Load ROM Monochrome Patterns - Not Supported\n"); + FIXME("Load ROM Monochrome Patterns - Not Supported\n"); break; case 0x02: /* LOAD ROM 8x8 DOUBLE-DOT PATTERNS */ case 0x12: - FIXME(int10, + FIXME( "Load ROM 8x8 Double Dot Patterns - Not Supported\n"); break; case 0x03: /* SET BLOCK SPECIFIER */ - FIXME(int10, "Set Block Specifier - Not Supported\n"); + FIXME("Set Block Specifier - Not Supported\n"); break; case 0x04: /* LOAD ROM 8x16 CHARACTER SET */ case 0x14: - FIXME(int10, "Load ROM 8x16 Character Set - Not Supported\n"); + FIXME("Load ROM 8x16 Character Set - Not Supported\n"); break; case 0x20: /* SET USER 8x16 GRAPHICS CHARS */ - FIXME(int10, "Set User 8x16 Graphics Chars - Not Supported\n"); + FIXME("Set User 8x16 Graphics Chars - Not Supported\n"); break; case 0x21: /* SET USER GRAPICS CHARACTERS */ - FIXME(int10, "Set User Graphics Characters - Not Supported\n"); + FIXME("Set User Graphics Characters - Not Supported\n"); break; case 0x22: /* SET ROM 8x14 GRAPHICS CHARS */ - FIXME(int10, "Set ROM 8x14 Graphics Chars - Not Supported\n"); + FIXME("Set ROM 8x14 Graphics Chars - Not Supported\n"); break; case 0x23: /* SET ROM 8x8 DBL DOT CHARS */ - FIXME(int10, + FIXME( "Set ROM 8x8 Dbl Dot Chars (Graphics) - Not Supported\n"); break; case 0x24: /* LOAD 8x16 GRAPHIC CHARS */ - FIXME(int10, "Load 8x16 Graphic Chars - Not Supported\n"); + FIXME("Load 8x16 Graphic Chars - Not Supported\n"); break; case 0x30: /* GET FONT INFORMATION */ - FIXME(int10, "Get Font Information - Not Supported\n"); + FIXME("Get Font Information - Not Supported\n"); break; default: - FIXME(int10, "INT 10 AH = 0x11 AL = 0x%x - Unknown\n", + FIXME("INT 10 AH = 0x11 AL = 0x%x - Unknown\n", AL_reg(context)); break; } @@ -637,7 +637,7 @@ case 0x12: /* ALTERNATE FUNCTION SELECT */ switch BL_reg(context) { case 0x10: /* GET EGA INFO */ - TRACE(int10, "EGA info requested\n"); + TRACE("EGA info requested\n"); BH_reg(context) = 0x00; /* Color screen */ BL_reg(context) = DOSMEM_BiosData()->ModeOptions >> 5; /* EGA memory size */ @@ -645,33 +645,33 @@ DOSMEM_BiosData()->FeatureBitsSwitches; break; case 0x20: /* ALTERNATE PRTSC */ - FIXME(int10, "Install Alternate Print Screen - Not Supported\n"); + FIXME("Install Alternate Print Screen - Not Supported\n"); break; case 0x30: /* SELECT VERTICAL RESOULTION */ - FIXME(int10, "Select vertical resolution - not supported\n"); + FIXME("Select vertical resolution - not supported\n"); break; case 0x31: /* ENABLE/DISABLE DEFAULT PALETTE LOADING */ - FIXME(int10, "Default palette loading - not supported\n"); + FIXME("Default palette loading - not supported\n"); DOSMEM_BiosData()->VGASettings = (DOSMEM_BiosData()->VGASettings & 0xf7) | ((AL_reg(context) == 1) << 3); break; case 0x32: /* ENABLE/DISABLE VIDEO ADDRERSSING */ - FIXME(int10, "Video Addressing - Not Supported\n"); + FIXME("Video Addressing - Not Supported\n"); break; case 0x33: /* ENABLE/DISABLE GRAY SCALE SUMMING */ - FIXME(int10, "Gray Scale Summing - Not Supported\n"); + FIXME("Gray Scale Summing - Not Supported\n"); break; case 0x34: /* ENABLE/DISABLE CURSOR EMULATION */ - TRACE(int10, "Set cursor emulation to %d\n", AL_reg(context)); + TRACE("Set cursor emulation to %d\n", AL_reg(context)); DOSMEM_BiosData()->ModeOptions = (DOSMEM_BiosData()->ModeOptions & 0xfe)|(AL_reg(context) == 1); break; case 0x36: /* VIDEO ADDRESS CONTROL */ - FIXME(int10, "Video Address Control - Not Supported\n"); + FIXME("Video Address Control - Not Supported\n"); break; default: - FIXME(int10, "INT 10 AH = 0x11 AL = 0x%x - Unknown\n", + FIXME("INT 10 AH = 0x11 AL = 0x%x - Unknown\n", AL_reg(context)); break; } @@ -679,29 +679,29 @@ case 0x13: /* WRITE STRING */ /* This one does not imply that string be at cursor. */ - FIXME(int10, "Write String - Not Supported\n"); + FIXME("Write String - Not Supported\n"); break; case 0x1a: switch AL_reg(context) { case 0x00: /* GET DISPLAY COMBINATION CODE */ - TRACE(int10, "Get Display Combination Code\n"); + TRACE("Get Display Combination Code\n"); AX_reg(context) = 0x001a; BL_reg(context) = 0x08; /* VGA w/ color analog display */ BH_reg(context) = 0x00; /* No secondary hardware */ break; case 0x01: /* SET DISPLAY COMBINATION CODE */ - FIXME(int10, "Set Display Combination Code - Not Supported\n"); + FIXME("Set Display Combination Code - Not Supported\n"); break; default: - FIXME(int10, "INT 10 AH = 0x1a AL = 0x%x - Unknown\n", + FIXME("INT 10 AH = 0x1a AL = 0x%x - Unknown\n", AL_reg(context)); break; } break; case 0x1b: /* FUNCTIONALITY/STATE INFORMATION */ - FIXME(int10, "Get functionality/state information - partially implemented\n"); + FIXME("Get functionality/state information - partially implemented\n"); if (BX_reg(context) == 0x0) { AL_reg(context) = 0x1b; @@ -714,7 +714,7 @@ break; case 0x1c: /* SAVE/RESTORE VIDEO STATE */ - FIXME(int10, "Save/Restore Video State - Not Supported\n"); + FIXME("Save/Restore Video State - Not Supported\n"); break; case 0x4f: /* Get SuperVGA INFORMATION */ @@ -723,7 +723,7 @@ CTX_SEG_OFF_TO_LIN(context, ES_reg(context), EDI_reg(context)); /* BOOL16 vesa20 = (*(DWORD *)p == *(DWORD *)"VBE2"); */ - TRACE(int10, "Get SuperVGA information\n"); + TRACE("Get SuperVGA information\n"); AH_reg(context) = 0; *(DWORD *)p = *(DWORD *)"VESA"; *(WORD *)(p+0x04) = 0x0200; /* VESA 2.0 */ @@ -732,7 +732,7 @@ } break; default: - FIXME(int10, "Unknown - 0x%x\n", AH_reg(context)); + FIXME("Unknown - 0x%x\n", AH_reg(context)); INT_BARF( context, 0x10 ); } } @@ -751,14 +751,14 @@ if (page_num) /* Only support one text page right now */ { - FIXME(int10, "Cannot write to alternate page %d", page_num); + FIXME("Cannot write to alternate page %d", page_num); return; } conv_text_mode_attributes(attribute, &fg_color, &bg_color, &wattribute); - TRACE(int10, "Fore: %d Back: %d\n", fg_color, bg_color); + TRACE("Fore: %d Back: %d\n", fg_color, bg_color); CONSOLE_GetCursorPosition(&x, &y);
diff --git a/msdos/int11.c b/msdos/int11.c index ebc5e1b..f6e9d72 100644 --- a/msdos/int11.c +++ b/msdos/int11.c
@@ -6,7 +6,7 @@ #include "miscemu.h" #include "msdos.h" #include "drive.h" -#include "debug.h" +#include "debugtools.h" /********************************************************************** * INT_Int11Handler
diff --git a/msdos/int13.c b/msdos/int13.c index 7fff05e..5574d47 100644 --- a/msdos/int13.c +++ b/msdos/int13.c
@@ -13,7 +13,7 @@ #endif #include "miscemu.h" /* #define DEBUG_INT */ -#include "debug.h" +#include "debugtools.h" #include "drive.h" DEFAULT_DEBUG_CHANNEL(int) @@ -79,7 +79,7 @@ if ( (floppy_fd = DRIVE_OpenDevice( drive_nr, O_NONBLOCK)) == -1) { - WARN(int, "(GET DRIVE PARAMETERS): Can't determine floppy geometry !\n"); + WARN("(GET DRIVE PARAMETERS): Can't determine floppy geometry !\n"); BX_reg(context) = 0; CX_reg(context) = 0; DH_reg(context) = 0;
diff --git a/msdos/int15.c b/msdos/int15.c index 17be10d..32ee114 100644 --- a/msdos/int15.c +++ b/msdos/int15.c
@@ -4,7 +4,7 @@ #include <stdlib.h> #include "miscemu.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(int) @@ -40,10 +40,10 @@ switch(BH_reg(context)) { case 0x00: - FIXME(int, "Disable Pointing Device - not implemented\n"); + FIXME("Disable Pointing Device - not implemented\n"); break; case 0x01: - FIXME(int, "Enable Pointing Device - not implemented\n"); + FIXME("Enable Pointing Device - not implemented\n"); break; default: INT_BARF( context, 0x15 ); @@ -53,11 +53,11 @@ break; case 0x02: /* Set Sampling Rate */ /* BH = sampling rate */ - FIXME(int, "Set Sampling Rate - not implemented\n"); + FIXME("Set Sampling Rate - not implemented\n"); AH_reg(context) = 0x00; /* successful */ break; case 0x04: /* Get Pointing Device Type */ - FIXME(int, "Get Pointing Device Type - not implemented\n"); + FIXME("Get Pointing Device Type - not implemented\n"); BH_reg(context) = 0x01;/*Device id FIXME what is it suposed to be?*/ break; default:
diff --git a/msdos/int16.c b/msdos/int16.c index 9a78a96..1ef4c2b 100644 --- a/msdos/int16.c +++ b/msdos/int16.c
@@ -10,7 +10,7 @@ #include "module.h" #include "console.h" #include "wincon.h" -#include "debug.h" +#include "debugtools.h" #include "winuser.h" #include "miscemu.h" @@ -34,7 +34,7 @@ case 0x00: /* Get Keystroke */ /* Returns: AH = Scan code AL = ASCII character */ - TRACE(int16, "Get Keystroke\n"); + TRACE("Get Keystroke\n"); CONSOLE_GetKeystroke(&AH_reg(context), &AL_reg(context)); break; @@ -42,7 +42,7 @@ /* Returns: ZF set if no keystroke */ /* AH = Scan code */ /* AL = ASCII character */ - TRACE(int16, "Check for Keystroke\n"); + TRACE("Check for Keystroke\n"); if (!CONSOLE_CheckForKeystroke(&AH_reg(context), &AL_reg(context))) { SET_ZFLAG(context); @@ -72,25 +72,25 @@ AL_reg(context) |= 0x40; if (GetAsyncKeyState(VK_INSERT)) AL_reg(context) |= 0x80; - TRACE(int16, "Get Shift Flags: returning 0x%02x\n", AL_reg(context)); + TRACE("Get Shift Flags: returning 0x%02x\n", AL_reg(context)); break; case 0x03: /* Set Typematic Rate and Delay */ - FIXME(int16, "Set Typematic Rate and Delay - Not Supported\n"); + FIXME("Set Typematic Rate and Delay - Not Supported\n"); break; case 0x09: /* Get Keyboard Functionality */ - FIXME(int16, "Get Keyboard Functionality - Not Supported\n"); + FIXME("Get Keyboard Functionality - Not Supported\n"); /* As a temporary measure, say that "nothing" is supported... */ AL_reg(context) = 0; break; case 0x0a: /* Get Keyboard ID */ - FIXME(int16, "Get Keyboard ID - Not Supported\n"); + FIXME("Get Keyboard ID - Not Supported\n"); break; case 0x10: /* Get Enhanced Keystroke */ - TRACE(int16, "Get Enhanced Keystroke - Partially supported\n"); + TRACE("Get Enhanced Keystroke - Partially supported\n"); /* Returns: AH = Scan code AL = ASCII character */ CONSOLE_GetKeystroke(&AH_reg(context), &AL_reg(context)); @@ -101,7 +101,7 @@ /* Returns: ZF set if no keystroke */ /* AH = Scan code */ /* AL = ASCII character */ - TRACE(int16, "Check for Enhanced Keystroke - Partially supported\n"); + TRACE("Check for Enhanced Keystroke - Partially supported\n"); if (!CONSOLE_CheckForKeystroke(&AH_reg(context), &AL_reg(context))) { SET_ZFLAG(context); @@ -113,11 +113,11 @@ break; case 0x12: /* Get Extended Shift States */ - FIXME(int16, "Get Extended Shift States - Not Supported\n"); + FIXME("Get Extended Shift States - Not Supported\n"); break; default: - FIXME(int16, "Unknown INT 16 function - 0x%x\n", AH_reg(context)); + FIXME("Unknown INT 16 function - 0x%x\n", AH_reg(context)); break; }
diff --git a/msdos/int17.c b/msdos/int17.c index 5fb337a..319e773 100644 --- a/msdos/int17.c +++ b/msdos/int17.c
@@ -5,7 +5,7 @@ #include <stdlib.h> #include "miscemu.h" -#include "debug.h" +#include "debugtools.h" #include "msdos.h" #include "drive.h" #include "winnt.h" @@ -22,11 +22,11 @@ switch( AH_reg(context) ) { case 0x01: /* PRINTER - INITIALIZE */ - FIXME(int17, "Initialize Printer - Not Supported\n"); + FIXME("Initialize Printer - Not Supported\n"); AH_reg(context) = 0; /* time out */ break; case 0x02: /* PRINTER - GET STATUS */ - FIXME(int17, "Get Printer Status - Not Supported\n"); + FIXME("Get Printer Status - Not Supported\n"); break; default: AH_reg(context) = 0; /* time out */
diff --git a/msdos/int19.c b/msdos/int19.c index f745e35..a469d0a 100644 --- a/msdos/int19.c +++ b/msdos/int19.c
@@ -4,7 +4,7 @@ #include <stdlib.h> #include "miscemu.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(int19) @@ -16,5 +16,5 @@ */ void WINAPI INT_Int19Handler( CONTEXT86 *context ) { - WARN(int19, "Attempted Reboot\n"); + WARN("Attempted Reboot\n"); }
diff --git a/msdos/int1a.c b/msdos/int1a.c index 170d2b9..2ab783d 100644 --- a/msdos/int1a.c +++ b/msdos/int1a.c
@@ -7,7 +7,7 @@ #include <stdlib.h> #include "options.h" #include "miscemu.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(int) @@ -58,7 +58,7 @@ CX_reg(context) = HIWORD(ticks); DX_reg(context) = LOWORD(ticks); AX_reg(context) = 0; /* No midnight rollover */ - TRACE(int,"int1a: AH=00 -- ticks=%ld\n", ticks); + TRACE("int1a: AH=00 -- ticks=%ld\n", ticks); break; case 0x02:
diff --git a/msdos/int20.c b/msdos/int20.c index 1ad5b42..a818acf 100644 --- a/msdos/int20.c +++ b/msdos/int20.c
@@ -6,7 +6,7 @@ #include "winbase.h" #include "miscemu.h" /* #define DEBUG_INT */ -#include "debug.h" +#include "debugtools.h" #include "task.h" /**********************************************************************
diff --git a/msdos/int21.c b/msdos/int21.c index c2ec5a3..a155922 100644 --- a/msdos/int21.c +++ b/msdos/int21.c
@@ -31,7 +31,7 @@ #include "miscemu.h" #include "dosexe.h" /* for the MZ_SUPPORTED define */ #include "module.h" -#include "debug.h" +#include "debugtools.h" #include "console.h" DEFAULT_DEBUG_CHANNEL(int21) @@ -91,7 +91,7 @@ { if (!(DosHeapHandle = GlobalAlloc16(GMEM_FIXED,sizeof(struct DosHeap)))) { - WARN(int21, "Out of memory\n"); + WARN("Out of memory\n"); return FALSE; } heap = (struct DosHeap *) GlobalLock16(DosHeapHandle); @@ -186,7 +186,7 @@ } else if (heap || INT21_CreateHeap()) { - FIXME(int21, "GetDrivePB not fully implemented.\n"); + FIXME("GetDrivePB not fully implemented.\n"); /* FIXME: I have no idea what a lot of this information should * say or whether it even really matters since we're not allowing @@ -225,7 +225,7 @@ int curr_drive; const DOS_DEVICE *dev; - TRACE(int21, "(%d)\n", BX_reg(context)); + TRACE("(%d)\n", BX_reg(context)); RESET_CFLAG(context); @@ -269,7 +269,7 @@ switch (CL_reg(context)) { case 0x4a: /* lock logical volume */ - TRACE(int21,"lock logical volume (%d) level %d mode %d\n",drive,BH_reg(context),DX_reg(context)); + TRACE("lock logical volume (%d) level %d mode %d\n",drive,BH_reg(context),DX_reg(context)); break; case 0x60: /* get device parameters */ @@ -334,7 +334,7 @@ break; case 0x6a: - TRACE(int21,"logical volume %d unlocked.\n",drive); + TRACE("logical volume %d unlocked.\n",drive); break; case 0x6f: @@ -366,7 +366,7 @@ AL_reg(context) = 0xff; /* failed */ - TRACE(int21, "filename: '%s'\n", filename); + TRACE("filename: '%s'\n", filename); buffer = HeapAlloc( GetProcessHeap(), 0, strlen(filename) + 1); @@ -383,7 +383,7 @@ *d = '\0'; DOSFS_ToDosFCBFormat(buffer, fcb + 1); *fcb = 0; - TRACE(int21, "FCB: '%s'\n", ((CHAR *)fcb + 1)); + TRACE("FCB: '%s'\n", ((CHAR *)fcb + 1)); HeapFree( GetProcessHeap(), 0, buffer); @@ -476,7 +476,7 @@ _lclose16( AX_reg(context) ); AX_reg(context) = 0x0050; /*File exists*/ SET_CFLAG(context); - WARN(int21, "extended open/create: failed because file exists \n"); + WARN("extended open/create: failed because file exists \n"); } else if ((action & 0x07) == 2) { @@ -484,23 +484,23 @@ if ((BL_reg(context) & 0x0007)== 0) { _lclose16( AX_reg(context) ); - WARN(int21, "extended open/create: failed, trunc on ro file\n"); + WARN("extended open/create: failed, trunc on ro file\n"); AX_reg(context) = 0x000C; /*Access code invalid*/ SET_CFLAG(context); } else { - TRACE(int21, "extended open/create: Closing before truncate\n"); + TRACE("extended open/create: Closing before truncate\n"); if (_lclose16( AX_reg(context) )) { - WARN(int21, "extended open/create: close before trunc failed\n"); + WARN("extended open/create: close before trunc failed\n"); AX_reg(context) = 0x0019; /*Seek Error*/ CX_reg(context) = 0; SET_CFLAG(context); } /* Shuffle arguments to call CreateFile */ - TRACE(int21, "extended open/create: Truncating\n"); + TRACE("extended open/create: Truncating\n"); AL_reg(context) = BL_reg(context); /* CX is still the same */ DX_reg(context) = SI_reg(context); @@ -508,7 +508,7 @@ if (EFL_reg(context) & 0x0001) /*no file open, flags set */ { - WARN(int21, "extended open/create: trunc failed\n"); + WARN("extended open/create: trunc failed\n"); return bExtendedError; } uReturnCX = 0x3; @@ -525,19 +525,19 @@ { CX_reg(context) = 0; SET_CFLAG(context); - WARN(int21, "extended open/create: failed, file dosen't exist\n"); + WARN("extended open/create: failed, file dosen't exist\n"); } else { /* Shuffle arguments to call CreateFile */ - TRACE(int21, "extended open/create: Creating\n"); + TRACE("extended open/create: Creating\n"); AL_reg(context) = BL_reg(context); /* CX should still be the same */ DX_reg(context) = SI_reg(context); bExtendedError = INT21_CreateFile(context); if (EFL_reg(context) & 0x0001) /*no file open, flags set */ { - WARN(int21, "extended open/create: create failed\n"); + WARN("extended open/create: create failed\n"); return bExtendedError; } CX_reg(context) = 2; @@ -553,7 +553,7 @@ int drive; char *dirname = CTX_SEG_OFF_TO_LIN(context, DS_reg(context),EDX_reg(context)); - TRACE(int21,"changedir %s\n", dirname); + TRACE("changedir %s\n", dirname); if (dirname[0] && (dirname[1] == ':')) { drive = toupper(dirname[0]) - 'A'; @@ -619,7 +619,7 @@ } if ((int)dta->count + count > 0xffff) { - WARN(int21, "Too many directory entries in %s\n", dta->unixPath ); + WARN("Too many directory entries in %s\n", dta->unixPath ); HeapFree( GetProcessHeap(), 0, dta->unixPath ); dta->unixPath = NULL; return 0; @@ -658,7 +658,7 @@ if ((AX_reg(context) = _lcreat16_uniq( name, 0 )) != (WORD)HFILE_ERROR16) { - TRACE(int21, "created %s\n", name ); + TRACE("created %s\n", name ); return TRUE; } if (GetLastError() != ERROR_FILE_EXISTS) return FALSE; @@ -830,12 +830,12 @@ static void DeleteFileFCB( CONTEXT86 *context ) { - FIXME(int21, "(%p): stub\n", context); + FIXME("(%p): stub\n", context); } static void RenameFileFCB( CONTEXT86 *context ) { - FIXME(int21, "(%p): stub\n", context); + FIXME("(%p): stub\n", context); } @@ -846,7 +846,7 @@ switch ( AX_reg(context) & 0xff ) { case 0x00: /* LOCK */ - TRACE(int21,"lock handle %d offset %ld length %ld\n", + TRACE("lock handle %d offset %ld length %ld\n", BX_reg(context), MAKELONG(DX_reg(context),CX_reg(context)), MAKELONG(DI_reg(context),SI_reg(context))) ; @@ -859,7 +859,7 @@ break; case 0x01: /* UNLOCK */ - TRACE(int21,"unlock handle %d offset %ld length %ld\n", + TRACE("unlock handle %d offset %ld length %ld\n", BX_reg(context), MAKELONG(DX_reg(context),CX_reg(context)), MAKELONG(DI_reg(context),SI_reg(context))) ; @@ -884,10 +884,10 @@ case 0x00: /* Get machine name. */ { char *dst = CTX_SEG_OFF_TO_LIN (context,DS_reg(context),EDX_reg(context)); - TRACE(int21, "getting machine name to %p\n", dst); + TRACE("getting machine name to %p\n", dst); if (gethostname (dst, 15)) { - WARN(int21,"failed!\n"); + WARN("failed!\n"); SetLastError( ER_NoNetwork ); return TRUE; } else { @@ -897,7 +897,7 @@ dst[15] = 0; CH_reg(context) = 1; /* Valid */ CL_reg(context) = 1; /* NETbios number??? */ - TRACE(int21, "returning %s\n", debugstr_an (dst, 16)); + TRACE("returning %s\n", debugstr_an (dst, 16)); return FALSE; } } @@ -919,7 +919,7 @@ pModule->lpDosTask->psp_seg = psp; else #endif - ERR(int21, "Cannot change PSP for non-DOS task!\n"); + ERR("Cannot change PSP for non-DOS task!\n"); } static WORD INT21_GetCurrentPSP() @@ -1038,13 +1038,13 @@ locus = EL_Disk; break; default: - FIXME( int21, "Unknown error %d\n", error ); + FIXME("Unknown error %d\n", error ); class = EC_SystemFailure; action = SA_Abort; locus = EL_Unknown; break; } - TRACE( int21, "GET EXTENDED ERROR code 0x%02x class 0x%02x action 0x%02x locus %02x\n", + TRACE("GET EXTENDED ERROR code 0x%02x class 0x%02x action 0x%02x locus %02x\n", error, class, action, locus ); AX_reg(context) = error; BH_reg(context) = class; @@ -1060,7 +1060,7 @@ BOOL bSetDOSExtendedError = FALSE; - TRACE(int21, "AX=%04x BX=%04x CX=%04x DX=%04x " + TRACE("AX=%04x BX=%04x CX=%04x DX=%04x " "SI=%04x DI=%04x DS=%04x ES=%04x EFL=%08lx\n", AX_reg(context), BX_reg(context), CX_reg(context), DX_reg(context), SI_reg(context), DI_reg(context), @@ -1076,7 +1076,7 @@ if (AH_reg(context) == 0x0C) /* Flush buffer and read standard input */ { - TRACE(int21, "FLUSH BUFFER AND READ STANDARD INPUT\n"); + TRACE("FLUSH BUFFER AND READ STANDARD INPUT\n"); /* no flush here yet */ AH_reg(context) = AL_reg(context); } @@ -1108,25 +1108,25 @@ break; case 0x00: /* TERMINATE PROGRAM */ - TRACE(int21,"TERMINATE PROGRAM\n"); + TRACE("TERMINATE PROGRAM\n"); ExitProcess( 0 ); break; case 0x01: /* READ CHARACTER FROM STANDARD INPUT, WITH ECHO */ - TRACE(int21,"DIRECT CHARACTER INPUT WITH ECHO\n"); + TRACE("DIRECT CHARACTER INPUT WITH ECHO\n"); AL_reg(context) = CONSOLE_GetCharacter(); /* FIXME: no echo */ break; case 0x02: /* WRITE CHARACTER TO STANDARD OUTPUT */ - TRACE(int21, "Write Character to Standard Output\n"); + TRACE("Write Character to Standard Output\n"); CONSOLE_Write(DL_reg(context), 0, 0, 0); break; case 0x06: /* DIRECT CONSOLE IN/OUTPUT */ if (DL_reg(context) == 0xff) { static char scan = 0; - TRACE(int21, "Direct Console Input\n"); + TRACE("Direct Console Input\n"); if (scan) { /* return pending scancode */ AL_reg(context) = scan; @@ -1149,23 +1149,23 @@ } } } else { - TRACE(int21, "Direct Console Output\n"); + TRACE("Direct Console Output\n"); CONSOLE_Write(DL_reg(context), 0, 0, 0); } break; case 0x07: /* DIRECT CHARACTER INPUT WITHOUT ECHO */ - TRACE(int21,"DIRECT CHARACTER INPUT WITHOUT ECHO\n"); + TRACE("DIRECT CHARACTER INPUT WITHOUT ECHO\n"); AL_reg(context) = CONSOLE_GetCharacter(); break; case 0x08: /* CHARACTER INPUT WITHOUT ECHO */ - TRACE(int21,"CHARACTER INPUT WITHOUT ECHO\n"); + TRACE("CHARACTER INPUT WITHOUT ECHO\n"); AL_reg(context) = CONSOLE_GetCharacter(); break; case 0x09: /* WRITE STRING TO STANDARD OUTPUT */ - TRACE(int21,"WRITE '$'-terminated string from %04lX:%04X to stdout\n", + TRACE("WRITE '$'-terminated string from %04lX:%04X to stdout\n", DS_reg(context),DX_reg(context) ); { LPSTR data = CTX_SEG_OFF_TO_LIN(context,DS_reg(context),EDX_reg(context)); @@ -1185,9 +1185,9 @@ EDX_reg(context) )); int res; - TRACE(int21,"BUFFERED INPUT (size=%d)\n",buffer[0]); + TRACE("BUFFERED INPUT (size=%d)\n",buffer[0]); if (buffer[1]) - TRACE(int21,"Handle old chars in buffer!\n"); + TRACE("Handle old chars in buffer!\n"); res=_lread16( 0, buffer+2,buffer[0]); buffer[1]=res; if(buffer[res+1] == '\n') @@ -1205,7 +1205,7 @@ break; } case 0x2e: /* SET VERIFY FLAG */ - TRACE(int21,"SET VERIFY FLAG ignored\n"); + TRACE("SET VERIFY FLAG ignored\n"); /* we cannot change the behaviour anyway, so just ignore it */ break; @@ -1222,18 +1222,18 @@ break; case 0x0d: /* DISK BUFFER FLUSH */ - TRACE(int21,"DISK BUFFER FLUSH ignored\n"); + TRACE("DISK BUFFER FLUSH ignored\n"); RESET_CFLAG(context); /* dos 6+ only */ break; case 0x0e: /* SELECT DEFAULT DRIVE */ - TRACE(int21,"SELECT DEFAULT DRIVE %d\n", DL_reg(context)); + TRACE("SELECT DEFAULT DRIVE %d\n", DL_reg(context)); DRIVE_SetCurrentDrive( DL_reg(context) ); AL_reg(context) = MAX_DOS_DRIVES; break; case 0x11: /* FIND FIRST MATCHING FILE USING FCB */ - TRACE(int21,"FIND FIRST MATCHING FILE USING FCB %p\n", + TRACE("FIND FIRST MATCHING FILE USING FCB %p\n", CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context))); if (!INT21_FindFirstFCB(context)) { @@ -1262,7 +1262,7 @@ { TDB *pTask = (TDB *)GlobalLock16( GetCurrentTask() ); pTask->dta = PTR_SEG_OFF_TO_SEGPTR(DS_reg(context),DX_reg(context)); - TRACE(int21, "Set DTA: %08lx\n", pTask->dta); + TRACE("Set DTA: %08lx\n", pTask->dta); } break; @@ -1294,7 +1294,7 @@ break; case 0x2b: /* SET SYSTEM DATE */ - FIXME(int21, "SetSystemDate(%02d/%02d/%04d): not allowed\n", + FIXME("SetSystemDate(%02d/%02d/%04d): not allowed\n", DL_reg(context), DH_reg(context), CX_reg(context) ); AL_reg(context) = 0; /* Let's pretend we succeeded */ break; @@ -1304,14 +1304,14 @@ break; case 0x2d: /* SET SYSTEM TIME */ - FIXME(int21, "SetSystemTime(%02d:%02d:%02d.%02d): not allowed\n", + FIXME("SetSystemTime(%02d:%02d:%02d.%02d): not allowed\n", CH_reg(context), CL_reg(context), DH_reg(context), DL_reg(context) ); AL_reg(context) = 0; /* Let's pretend we succeeded */ break; case 0x2f: /* GET DISK TRANSFER AREA ADDRESS */ - TRACE(int21,"GET DISK TRANSFER AREA ADDRESS\n"); + TRACE("GET DISK TRANSFER AREA ADDRESS\n"); { TDB *pTask = (TDB *)GlobalLock16( GetCurrentTask() ); ES_reg(context) = SELECTOROF( pTask->dta ); @@ -1320,7 +1320,7 @@ break; case 0x30: /* GET DOS VERSION */ - TRACE(int21,"GET DOS VERSION %s requested\n", + TRACE("GET DOS VERSION %s requested\n", (AL_reg(context) == 0x00)?"OEM number":"version flag"); AX_reg(context) = (HIWORD(GetVersion16()) >> 8) | (HIWORD(GetVersion16()) << 8); @@ -1334,11 +1334,11 @@ break; case 0x31: /* TERMINATE AND STAY RESIDENT */ - FIXME(int21,"TERMINATE AND STAY RESIDENT stub\n"); + FIXME("TERMINATE AND STAY RESIDENT stub\n"); break; case 0x32: /* GET DOS DRIVE PARAMETER BLOCK FOR SPECIFIC DRIVE */ - TRACE(int21,"GET DOS DRIVE PARAMETER BLOCK FOR DRIVE %s\n", + TRACE("GET DOS DRIVE PARAMETER BLOCK FOR DRIVE %s\n", INT21_DriveName( DL_reg(context))); GetDrivePB(context, DOS_GET_DRIVE( DL_reg(context) ) ); break; @@ -1347,17 +1347,17 @@ switch (AL_reg(context)) { case 0x00: /* GET CURRENT EXTENDED BREAK STATE */ - TRACE(int21,"GET CURRENT EXTENDED BREAK STATE\n"); + TRACE("GET CURRENT EXTENDED BREAK STATE\n"); DL_reg(context) = DOSCONF_config.brk_flag; break; case 0x01: /* SET EXTENDED BREAK STATE */ - TRACE(int21,"SET CURRENT EXTENDED BREAK STATE\n"); + TRACE("SET CURRENT EXTENDED BREAK STATE\n"); DOSCONF_config.brk_flag = (DL_reg(context) > 0); break; case 0x02: /* GET AND SET EXTENDED CONTROL-BREAK CHECKING STATE*/ - TRACE(int21,"GET AND SET EXTENDED CONTROL-BREAK CHECKING STATE\n"); + TRACE("GET AND SET EXTENDED CONTROL-BREAK CHECKING STATE\n"); /* ugly coding in order to stay reentrant */ if (DL_reg(context)) { @@ -1372,13 +1372,13 @@ break; case 0x05: /* GET BOOT DRIVE */ - TRACE(int21,"GET BOOT DRIVE\n"); + TRACE("GET BOOT DRIVE\n"); DL_reg(context) = 3; /* c: is Wine's bootdrive (a: is 1)*/ break; case 0x06: /* GET TRUE VERSION NUMBER */ - TRACE(int21,"GET TRUE VERSION NUMBER\n"); + TRACE("GET TRUE VERSION NUMBER\n"); BX_reg(context) = (HIWORD(GetVersion16() >> 8)) | (HIWORD(GetVersion16() << 8)); DX_reg(context) = 0x00; @@ -1391,14 +1391,14 @@ break; case 0x34: /* GET ADDRESS OF INDOS FLAG */ - TRACE(int21,"GET ADDRESS OF INDOS FLAG\n"); + TRACE("GET ADDRESS OF INDOS FLAG\n"); if (!heap) INT21_CreateHeap(); ES_reg(context) = DosHeapHandle; BX_reg(context) = (int)&heap->InDosFlag - (int)heap; break; case 0x35: /* GET INTERRUPT VECTOR */ - TRACE(int21,"GET INTERRUPT VECTOR 0x%02x\n",AL_reg(context)); + TRACE("GET INTERRUPT VECTOR 0x%02x\n",AL_reg(context)); { FARPROC16 addr = INT_CtxGetHandler( context, AL_reg(context) ); ES_reg(context) = SELECTOROF(addr); @@ -1407,7 +1407,7 @@ break; case 0x36: /* GET FREE DISK SPACE */ - TRACE(int21,"GET FREE DISK SPACE FOR DRIVE %s\n", + TRACE("GET FREE DISK SPACE FOR DRIVE %s\n", INT21_DriveName( DL_reg(context))); if (!INT21_GetFreeDiskSpace(context)) AX_reg(context) = 0xffff; break; @@ -1418,12 +1418,12 @@ switch (AL_reg(context)) { case 0x00: /* "SWITCHAR" - GET SWITCH CHARACTER */ - TRACE(int21,"SWITCHAR - GET SWITCH CHARACTER\n"); + TRACE("SWITCHAR - GET SWITCH CHARACTER\n"); AL_reg(context) = 0x00; /* success*/ DL_reg(context) = switchchar; break; case 0x01: /*"SWITCHAR" - SET SWITCH CHARACTER*/ - TRACE(int21,"SWITCHAR - SET SWITCH CHARACTER\n"); + TRACE("SWITCHAR - SET SWITCH CHARACTER\n"); switchchar = DL_reg(context); AL_reg(context) = 0x00; /* success*/ break; @@ -1435,14 +1435,14 @@ } case 0x38: /* GET COUNTRY-SPECIFIC INFORMATION */ - TRACE(int21,"GET COUNTRY-SPECIFIC INFORMATION for country 0x%02x\n", + TRACE("GET COUNTRY-SPECIFIC INFORMATION for country 0x%02x\n", AL_reg(context)); AX_reg(context) = 0x02; /* no country support available */ SET_CFLAG(context); break; case 0x39: /* "MKDIR" - CREATE SUBDIRECTORY */ - TRACE(int21,"MKDIR %s\n", + TRACE("MKDIR %s\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context))); bSetDOSExtendedError = (!CreateDirectory16( CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context) ), NULL)); @@ -1464,37 +1464,37 @@ break; case 0x3a: /* "RMDIR" - REMOVE SUBDIRECTORY */ - TRACE(int21,"RMDIR %s\n", + TRACE("RMDIR %s\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context))); bSetDOSExtendedError = (!RemoveDirectory16( CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context) ))); break; case 0x3b: /* "CHDIR" - SET CURRENT DIRECTORY */ - TRACE(int21,"CHDIR %s\n", + TRACE("CHDIR %s\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context))); bSetDOSExtendedError = !INT21_ChangeDir(context); break; case 0x3c: /* "CREAT" - CREATE OR TRUNCATE FILE */ - TRACE(int21,"CREAT flag 0x%02x %s\n",CX_reg(context), + TRACE("CREAT flag 0x%02x %s\n",CX_reg(context), (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context))); bSetDOSExtendedError = INT21_CreateFile( context ); break; case 0x3d: /* "OPEN" - OPEN EXISTING FILE */ - TRACE(int21,"OPEN mode 0x%02x %s\n",AL_reg(context), + TRACE("OPEN mode 0x%02x %s\n",AL_reg(context), (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context))); OpenExistingFile(context); break; case 0x3e: /* "CLOSE" - CLOSE FILE */ - TRACE(int21,"CLOSE handle %d\n",BX_reg(context)); + TRACE("CLOSE handle %d\n",BX_reg(context)); bSetDOSExtendedError = ((AX_reg(context) = _lclose16( BX_reg(context) )) != 0); break; case 0x3f: /* "READ" - READ FROM FILE OR DEVICE */ - TRACE(int21,"READ from %d to %04lX:%04X for %d byte\n",BX_reg(context), + TRACE("READ from %d to %04lX:%04X for %d byte\n",BX_reg(context), DS_reg(context),DX_reg(context),CX_reg(context) ); { LONG result; @@ -1514,7 +1514,7 @@ break; case 0x40: /* "WRITE" - WRITE TO FILE OR DEVICE */ - TRACE(int21,"WRITE from %04lX:%04X to handle %d for %d byte\n", + TRACE("WRITE from %04lX:%04X to handle %d for %d byte\n", DS_reg(context),DX_reg(context),BX_reg(context),CX_reg(context) ); { LONG result = _hwrite16( BX_reg(context), @@ -1527,14 +1527,14 @@ break; case 0x41: /* "UNLINK" - DELETE FILE */ - TRACE(int21,"UNLINK%s\n", + TRACE("UNLINK%s\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context))); bSetDOSExtendedError = (!DeleteFileA( CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context) ))); break; case 0x42: /* "LSEEK" - SET CURRENT FILE POSITION */ - TRACE(int21,"LSEEK handle %d offset %ld from %s\n", + TRACE("LSEEK handle %d offset %ld from %s\n", BX_reg(context), MAKELONG(DX_reg(context),CX_reg(context)), (AL_reg(context)==0)?"start of file":(AL_reg(context)==1)? "current file position":"end of file"); @@ -1555,7 +1555,7 @@ switch (AL_reg(context)) { case 0x00: - TRACE(int21,"GET FILE ATTRIBUTES for %s\n", + TRACE("GET FILE ATTRIBUTES for %s\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context))); AX_reg(context) = (WORD)GetFileAttributesA( CTX_SEG_OFF_TO_LIN(context, DS_reg(context), @@ -1565,7 +1565,7 @@ break; case 0x01: - TRACE(int21,"SET FILE ATTRIBUTES 0x%02x for %s\n", CX_reg(context), + TRACE("SET FILE ATTRIBUTES 0x%02x for %s\n", CX_reg(context), (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context))); bSetDOSExtendedError = (!SetFileAttributesA( CTX_SEG_OFF_TO_LIN(context, DS_reg(context), @@ -1573,7 +1573,7 @@ CX_reg(context) )); break; case 0x02: - TRACE(int21,"GET COMPRESSED FILE SIZE for %s stub\n", + TRACE("GET COMPRESSED FILE SIZE for %s stub\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context))); } break; @@ -1600,7 +1600,7 @@ /*BYTE *dataptr = CTX_SEG_OFF_TO_LIN(context, DS_reg(context),EDX_reg(context));*/ int drive = DOS_GET_DRIVE(BL_reg(context)); - FIXME(int21,"program tried to write to block device control channel of drive %d:\n",drive); + FIXME("program tried to write to block device control channel of drive %d:\n",drive); /* for (i=0;i<CX_reg(context);i++) fprintf(stdnimp,"%02x ",dataptr[i]); fprintf(stdnimp,"\n");*/ @@ -1608,7 +1608,7 @@ break; } case 0x08: /* Check if drive is removable. */ - TRACE(int21,"IOCTL - CHECK IF BLOCK DEVICE REMOVABLE for drive %s\n", + TRACE("IOCTL - CHECK IF BLOCK DEVICE REMOVABLE for drive %s\n", INT21_DriveName( BL_reg(context))); switch(GetDriveType16( DOS_GET_DRIVE( BL_reg(context) ))) { @@ -1627,7 +1627,7 @@ break; case 0x09: /* CHECK IF BLOCK DEVICE REMOTE */ - TRACE(int21,"IOCTL - CHECK IF BLOCK DEVICE REMOTE for drive %s\n", + TRACE("IOCTL - CHECK IF BLOCK DEVICE REMOTE for drive %s\n", INT21_DriveName( BL_reg(context))); switch(GetDriveType16( DOS_GET_DRIVE( BL_reg(context) ))) { @@ -1646,7 +1646,7 @@ break; case 0x0a: /* check if handle (BX) is remote */ - TRACE(int21,"IOCTL - CHECK IF HANDLE %d IS REMOTE\n",BX_reg(context)); + TRACE("IOCTL - CHECK IF HANDLE %d IS REMOTE\n",BX_reg(context)); /* returns DX, bit 15 set if remote, bit 14 set if date/time * not set on close */ @@ -1654,7 +1654,7 @@ break; case 0x0b: /* SET SHARING RETRY COUNT */ - TRACE(int21,"IOCTL - SET SHARING RETRY COUNT pause %d retries %d\n", + TRACE("IOCTL - SET SHARING RETRY COUNT pause %d retries %d\n", CX_reg(context), DX_reg(context)); if (!CX_reg(context)) { @@ -1669,13 +1669,13 @@ break; case 0x0d: - TRACE(int21,"IOCTL - GENERIC BLOCK DEVICE REQUEST %s\n", + TRACE("IOCTL - GENERIC BLOCK DEVICE REQUEST %s\n", INT21_DriveName( BL_reg(context))); bSetDOSExtendedError = ioctlGenericBlkDevReq(context); break; case 0x0e: /* get logical drive mapping */ - TRACE(int21,"IOCTL - GET LOGICAL DRIVE MAP for drive %s\n", + TRACE("IOCTL - GET LOGICAL DRIVE MAP for drive %s\n", INT21_DriveName( BL_reg(context))); AL_reg(context) = 0; /* drive has no mapping - FIXME: may be wrong*/ break; @@ -1683,7 +1683,7 @@ case 0x0F: /* Set logical drive mapping */ { int drive; - TRACE(int21,"IOCTL - SET LOGICAL DRIVE MAP for drive %s\n", + TRACE("IOCTL - SET LOGICAL DRIVE MAP for drive %s\n", INT21_DriveName( BL_reg(context))); drive = DOS_GET_DRIVE ( BL_reg(context) ); if ( ! DRIVE_SetLogicalMapping ( drive, drive+1 ) ) @@ -1707,7 +1707,7 @@ case 0x45: /* "DUP" - DUPLICATE FILE HANDLE */ { HANDLE handle; - TRACE(int21,"DUP - DUPLICATE FILE HANDLE %d\n",BX_reg(context)); + TRACE("DUP - DUPLICATE FILE HANDLE %d\n",BX_reg(context)); if ((bSetDOSExtendedError = !DuplicateHandle( GetCurrentProcess(), FILE_GetHandle(BX_reg(context)), GetCurrentProcess(), &handle, @@ -1719,19 +1719,19 @@ } case 0x46: /* "DUP2", "FORCEDUP" - FORCE DUPLICATE FILE HANDLE */ - TRACE(int21,"FORCEDUP - FORCE DUPLICATE FILE HANDLE %d to %d\n", + TRACE("FORCEDUP - FORCE DUPLICATE FILE HANDLE %d to %d\n", BX_reg(context),CX_reg(context)); bSetDOSExtendedError = (FILE_Dup2( BX_reg(context), CX_reg(context) ) == HFILE_ERROR16); break; case 0x47: /* "CWD" - GET CURRENT DIRECTORY */ - TRACE(int21,"CWD - GET CURRENT DIRECTORY for drive %s\n", + TRACE("CWD - GET CURRENT DIRECTORY for drive %s\n", INT21_DriveName( DL_reg(context))); bSetDOSExtendedError = !INT21_GetCurrentDirectory(context); break; case 0x48: /* ALLOCATE MEMORY */ - TRACE(int21,"ALLOCATE MEMORY for %d paragraphs\n", BX_reg(context)); + TRACE("ALLOCATE MEMORY for %d paragraphs\n", BX_reg(context)); { LPVOID *mem; if (ISV86(context)) @@ -1756,7 +1756,7 @@ break; case 0x49: /* FREE MEMORY */ - TRACE(int21,"FREE MEMORY segment %04lX\n", ES_reg(context)); + TRACE("FREE MEMORY segment %04lX\n", ES_reg(context)); { BOOL ret; if (ISV86(context)) @@ -1769,7 +1769,7 @@ } if (!ret) { - TRACE(int21,"FREE MEMORY failed\n"); + TRACE("FREE MEMORY failed\n"); SET_CFLAG(context); AX_reg(context) = 0x0009; /* memory block address invalid */ } @@ -1777,9 +1777,9 @@ break; case 0x4a: /* RESIZE MEMORY BLOCK */ - TRACE(int21,"RESIZE MEMORY segment %04lX to %d paragraphs\n", ES_reg(context), BX_reg(context)); + TRACE("RESIZE MEMORY segment %04lX to %d paragraphs\n", ES_reg(context), BX_reg(context)); if (!ISV86(context)) - FIXME(int21,"RESIZE MEMORY probably insufficient implementation. Expect crash soon\n"); + FIXME("RESIZE MEMORY probably insufficient implementation. Expect crash soon\n"); { LPVOID *mem = DOSMEM_ResizeBlock(0,DOSMEM_MapDosToLinear(ES_reg(context)<<4), BX_reg(context)<<4,NULL); @@ -1794,7 +1794,7 @@ break; case 0x4b: /* "EXEC" - LOAD AND/OR EXECUTE PROGRAM */ - TRACE(int21,"EXEC %s\n", + TRACE("EXEC %s\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context),EDX_reg(context) )); AX_reg(context) = WinExec16( CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context) ), @@ -1803,23 +1803,23 @@ break; case 0x4c: /* "EXIT" - TERMINATE WITH RETURN CODE */ - TRACE(int21,"EXIT with return code %d\n",AL_reg(context)); + TRACE("EXIT with return code %d\n",AL_reg(context)); ExitProcess( AL_reg(context) ); break; case 0x4d: /* GET RETURN CODE */ - TRACE(int21,"GET RETURN CODE (ERRORLEVEL)\n"); + TRACE("GET RETURN CODE (ERRORLEVEL)\n"); AX_reg(context) = 0; /* normal exit */ break; case 0x4e: /* "FINDFIRST" - FIND FIRST MATCHING FILE */ - TRACE(int21,"FINDFIRST mask 0x%04x spec %s\n",CX_reg(context), + TRACE("FINDFIRST mask 0x%04x spec %s\n",CX_reg(context), (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context))); if (!INT21_FindFirst(context)) break; /* fall through */ case 0x4f: /* "FINDNEXT" - FIND NEXT MATCHING FILE */ - TRACE(int21,"FINDNEXT\n"); + TRACE("FINDNEXT\n"); if (!INT21_FindNext(context)) { SetLastError( ERROR_NO_MORE_FILES ); @@ -1829,24 +1829,24 @@ else AX_reg(context) = 0; /* OK */ break; case 0x50: /* SET CURRENT PROCESS ID (SET PSP ADDRESS) */ - TRACE(int21, "SET CURRENT PROCESS ID (SET PSP ADDRESS)\n"); + TRACE("SET CURRENT PROCESS ID (SET PSP ADDRESS)\n"); INT21_SetCurrentPSP(BX_reg(context)); break; case 0x51: /* GET PSP ADDRESS */ - TRACE(int21,"GET CURRENT PROCESS ID (GET PSP ADDRESS)\n"); + TRACE("GET CURRENT PROCESS ID (GET PSP ADDRESS)\n"); /* FIXME: should we return the original DOS PSP upon */ /* Windows startup ? */ BX_reg(context) = INT21_GetCurrentPSP(); break; case 0x62: /* GET PSP ADDRESS */ - TRACE(int21,"GET CURRENT PSP ADDRESS\n"); + TRACE("GET CURRENT PSP ADDRESS\n"); /* FIXME: should we return the original DOS PSP upon */ /* Windows startup ? */ BX_reg(context) = INT21_GetCurrentPSP(); break; case 0x52: /* "SYSVARS" - GET LIST OF LISTS */ - TRACE(int21,"SYSVARS - GET LIST OF LISTS\n"); + TRACE("SYSVARS - GET LIST OF LISTS\n"); { ES_reg(context) = ISV86(context) ? HIWORD(DOS_LOLSeg) : LOWORD(DOS_LOLSeg); BX_reg(context) = FIELD_OFFSET(DOS_LISTOFLISTS, ptr_first_DPB); @@ -1854,12 +1854,12 @@ break; case 0x54: /* Get Verify Flag */ - TRACE(int21,"Get Verify Flag - Not Supported\n"); + TRACE("Get Verify Flag - Not Supported\n"); AL_reg(context) = 0x00; /* pretend we can tell. 00h = off 01h = on */ break; case 0x56: /* "RENAME" - RENAME FILE */ - TRACE(int21,"RENAME %s to %s\n", + TRACE("RENAME %s to %s\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context),EDX_reg(context)), (LPCSTR)CTX_SEG_OFF_TO_LIN(context, ES_reg(context),EDI_reg(context))); bSetDOSExtendedError = @@ -1873,7 +1873,7 @@ case 0x00: /* Get */ { FILETIME filetime; - TRACE(int21,"GET FILE DATE AND TIME for handle %d\n", + TRACE("GET FILE DATE AND TIME for handle %d\n", BX_reg(context)); if (!GetFileTime( FILE_GetHandle(BX_reg(context)), NULL, NULL, &filetime )) bSetDOSExtendedError = TRUE; @@ -1885,7 +1885,7 @@ case 0x01: /* Set */ { FILETIME filetime; - TRACE(int21,"SET FILE DATE AND TIME for handle %d\n", + TRACE("SET FILE DATE AND TIME for handle %d\n", BX_reg(context)); DosDateTimeToFileTime( DX_reg(context), CX_reg(context), &filetime ); @@ -1898,7 +1898,7 @@ break; case 0x58: /* GET OR SET MEMORY/UMB ALLOCATION STRATEGY */ - TRACE(int21,"GET OR SET MEMORY/UMB ALLOCATION STRATEGY subfunction %d\n", + TRACE("GET OR SET MEMORY/UMB ALLOCATION STRATEGY subfunction %d\n", AL_reg(context)); switch (AL_reg(context)) { @@ -1916,12 +1916,12 @@ break; case 0x5a: /* CREATE TEMPORARY FILE */ - TRACE(int21,"CREATE TEMPORARY FILE\n"); + TRACE("CREATE TEMPORARY FILE\n"); bSetDOSExtendedError = !INT21_CreateTempFile(context); break; case 0x5b: /* CREATE NEW FILE */ - TRACE(int21,"CREATE NEW FILE 0x%02x for %s\n", CX_reg(context), + TRACE("CREATE NEW FILE 0x%02x for %s\n", CX_reg(context), (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context))); bSetDOSExtendedError = ((AX_reg(context) = _lcreat16_uniq( CTX_SEG_OFF_TO_LIN(context, DS_reg(context),EDX_reg(context)), @@ -1929,7 +1929,7 @@ break; case 0x5d: /* NETWORK */ - FIXME(int21,"Function 0x%04x not implemented.\n", AX_reg (context)); + FIXME("Function 0x%04x not implemented.\n", AX_reg (context)); /* Fix the following while you're at it. */ SetLastError( ER_NoNetwork ); bSetDOSExtendedError = TRUE; @@ -1943,7 +1943,7 @@ switch (AL_reg(context)) { case 0x07: /* ENABLE DRIVE */ - TRACE(int21,"ENABLE DRIVE %c:\n",(DL_reg(context)+'A')); + TRACE("ENABLE DRIVE %c:\n",(DL_reg(context)+'A')); if (!DRIVE_Enable( DL_reg(context) )) { SetLastError( ERROR_INVALID_DRIVE ); @@ -1952,7 +1952,7 @@ break; case 0x08: /* DISABLE DRIVE */ - TRACE(int21,"DISABLE DRIVE %c:\n",(DL_reg(context)+'A')); + TRACE("DISABLE DRIVE %c:\n",(DL_reg(context)+'A')); if (!DRIVE_Disable( DL_reg(context) )) { SetLastError( ERROR_INVALID_DRIVE ); @@ -1962,7 +1962,7 @@ default: /* network software not installed */ - TRACE(int21,"NETWORK function AX=%04x not implemented\n",AX_reg(context)); + TRACE("NETWORK function AX=%04x not implemented\n",AX_reg(context)); SetLastError( ER_NoNetwork ); bSetDOSExtendedError = TRUE; break; @@ -1970,7 +1970,7 @@ break; case 0x60: /* "TRUENAME" - CANONICALIZE FILENAME OR PATH */ - TRACE(int21,"TRUENAME %s\n", + TRACE("TRUENAME %s\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context),ESI_reg(context))); { if (!GetFullPathNameA( CTX_SEG_OFF_TO_LIN(context, DS_reg(context), @@ -1998,11 +1998,11 @@ case 0x65:{/* GET EXTENDED COUNTRY INFORMATION */ extern WORD WINE_LanguageId; BYTE *dataptr=CTX_SEG_OFF_TO_LIN(context, ES_reg(context),EDI_reg(context)); - TRACE(int21,"GET EXTENDED COUNTRY INFORMATION code page %d country %d\n", + TRACE("GET EXTENDED COUNTRY INFORMATION code page %d country %d\n", BX_reg(context), DX_reg(context)); switch (AL_reg(context)) { case 0x01: - TRACE(int21,"\tget general internationalization info\n"); + TRACE("\tget general internationalization info\n"); dataptr[0] = 0x1; *(WORD*)(dataptr+1) = 41; *(WORD*)(dataptr+3) = WINE_LanguageId; @@ -2010,13 +2010,13 @@ *(DWORD*)(dataptr+0x19) = 0; /* FIXME: ptr to case map routine */ break; case 0x06: - TRACE(int21,"\tget pointer to collating sequence table\n"); + TRACE("\tget pointer to collating sequence table\n"); dataptr[0] = 0x06; *(DWORD*)(dataptr+1) = MAKELONG(DOSMEM_CollateTable & 0xFFFF,DOSMEM_AllocSelector(DOSMEM_CollateTable>>16)); CX_reg(context) = 258;/*FIXME: size of table?*/ break; default: - TRACE(int21,"\tunimplemented function %d\n",AL_reg(context)); + TRACE("\tunimplemented function %d\n",AL_reg(context)); INT_BARF( context, 0x21 ); SET_CFLAG(context); break; @@ -2027,12 +2027,12 @@ switch (AL_reg(context)) { case 0x01: - TRACE(int21,"GET GLOBAL CODE PAGE TABLE\n"); + TRACE("GET GLOBAL CODE PAGE TABLE\n"); DX_reg(context) = BX_reg(context) = CodePage; RESET_CFLAG(context); break; case 0x02: - TRACE(int21,"SET GLOBAL CODE PAGE TABLE active page %d system page %d\n", + TRACE("SET GLOBAL CODE PAGE TABLE active page %d system page %d\n", BX_reg(context),DX_reg(context)); CodePage = BX_reg(context); RESET_CFLAG(context); @@ -2041,14 +2041,14 @@ break; case 0x67: /* SET HANDLE COUNT */ - TRACE(int21,"SET HANDLE COUNT to %d\n",BX_reg(context) ); + TRACE("SET HANDLE COUNT to %d\n",BX_reg(context) ); SetHandleCount16( BX_reg(context) ); if (GetLastError()) bSetDOSExtendedError = TRUE; break; case 0x68: /* "FFLUSH" - COMMIT FILE */ case 0x6a: /* COMMIT FILE */ - TRACE(int21,"FFLUSH/COMMIT handle %d\n",BX_reg(context)); + TRACE("FFLUSH/COMMIT handle %d\n",BX_reg(context)); bSetDOSExtendedError = (!FlushFileBuffers( FILE_GetHandle(BX_reg(context)) )); break; @@ -2056,14 +2056,14 @@ switch (AL_reg(context)) { case 0x00: - TRACE(int21,"GET DISK SERIAL NUMBER for drive %s\n", + TRACE("GET DISK SERIAL NUMBER for drive %s\n", INT21_DriveName(BL_reg(context))); if (!INT21_GetDiskSerialNumber(context)) bSetDOSExtendedError = TRUE; else AX_reg(context) = 0; break; case 0x01: - TRACE(int21,"SET DISK SERIAL NUMBER for drive %s\n", + TRACE("SET DISK SERIAL NUMBER for drive %s\n", INT21_DriveName(BL_reg(context))); if (!INT21_SetDiskSerialNumber(context)) bSetDOSExtendedError = TRUE; else AX_reg(context) = 1; @@ -2072,7 +2072,7 @@ break; case 0x6C: /* Extended Open/Create*/ - TRACE(int21,"EXTENDED OPEN/CREATE %s\n", + TRACE("EXTENDED OPEN/CREATE %s\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDI_reg(context))); bSetDOSExtendedError = INT21_ExtendedOpenCreateFile(context); break; @@ -2080,47 +2080,47 @@ case 0x71: /* MS-DOS 7 (Windows95) - LONG FILENAME FUNCTIONS */ if ((GetVersion()&0xC0000004)!=0xC0000004) { /* not supported on anything but Win95 */ - TRACE(int21,"LONG FILENAME functions supported only by win95\n"); + TRACE("LONG FILENAME functions supported only by win95\n"); SET_CFLAG(context); AL_reg(context) = 0; } else switch(AL_reg(context)) { case 0x39: /* Create directory */ - TRACE(int21,"LONG FILENAME - MAKE DIRECTORY %s\n", + TRACE("LONG FILENAME - MAKE DIRECTORY %s\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context),EDX_reg(context))); bSetDOSExtendedError = (!CreateDirectoryA( CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context) ), NULL)); break; case 0x3a: /* Remove directory */ - TRACE(int21,"LONG FILENAME - REMOVE DIRECTORY %s\n", + TRACE("LONG FILENAME - REMOVE DIRECTORY %s\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context),EDX_reg(context))); bSetDOSExtendedError = (!RemoveDirectoryA( CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context) ))); break; case 0x43: /* Get/Set file attributes */ - TRACE(int21,"LONG FILENAME -EXTENDED GET/SET FILE ATTRIBUTES %s\n", + TRACE("LONG FILENAME -EXTENDED GET/SET FILE ATTRIBUTES %s\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context),EDX_reg(context))); switch (BL_reg(context)) { case 0x00: /* Get file attributes */ - TRACE(int21,"\tretrieve attributes\n"); + TRACE("\tretrieve attributes\n"); CX_reg(context) = (WORD)GetFileAttributesA( CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context))); if (CX_reg(context) == 0xffff) bSetDOSExtendedError = TRUE; break; case 0x01: - TRACE(int21,"\tset attributes 0x%04x\n",CX_reg(context)); + TRACE("\tset attributes 0x%04x\n",CX_reg(context)); bSetDOSExtendedError = (!SetFileAttributesA( CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context)), CX_reg(context) ) ); break; default: - FIXME(int21, "Unimplemented long file name function:\n"); + FIXME("Unimplemented long file name function:\n"); INT_BARF( context, 0x21 ); SET_CFLAG(context); AL_reg(context) = 0; @@ -2128,13 +2128,13 @@ } break; case 0x47: /* Get current directory */ - TRACE(int21," LONG FILENAME - GET CURRENT DIRECTORY for drive %s\n", + TRACE(" LONG FILENAME - GET CURRENT DIRECTORY for drive %s\n", INT21_DriveName(DL_reg(context))); bSetDOSExtendedError = !INT21_GetCurrentDirectory(context); break; case 0x4e: /* Find first file */ - TRACE(int21," LONG FILENAME - FIND FIRST MATCHING FILE for %s\n", + TRACE(" LONG FILENAME - FIND FIRST MATCHING FILE for %s\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context),EDX_reg(context))); /* FIXME: use attributes in CX */ if ((AX_reg(context) = FindFirstFile16( @@ -2145,7 +2145,7 @@ bSetDOSExtendedError = TRUE; break; case 0x4f: /* Find next file */ - TRACE(int21,"LONG FILENAME - FIND NEXT MATCHING FILE for handle %d\n", + TRACE("LONG FILENAME - FIND NEXT MATCHING FILE for handle %d\n", BX_reg(context)); if (!FindNextFile16( BX_reg(context), (WIN32_FIND_DATAA *)CTX_SEG_OFF_TO_LIN(context, ES_reg(context), @@ -2153,12 +2153,12 @@ bSetDOSExtendedError = TRUE; break; case 0xa1: /* Find close */ - TRACE(int21,"LONG FILENAME - FINDCLOSE for handle %d\n", + TRACE("LONG FILENAME - FINDCLOSE for handle %d\n", BX_reg(context)); bSetDOSExtendedError = (!FindClose16( BX_reg(context) )); break; case 0xa0: - TRACE(int21,"LONG FILENAME - GET VOLUME INFORMATION for drive %s stub\n", + TRACE("LONG FILENAME - GET VOLUME INFORMATION for drive %s stub\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context),EDX_reg(context))); break; case 0x60: @@ -2183,7 +2183,7 @@ else AX_reg(context) = 0; break; default: - FIXME(int21, "Unimplemented long file name function:\n"); + FIXME("Unimplemented long file name function:\n"); INT_BARF( context, 0x21 ); SET_CFLAG(context); AL_reg(context) = 0; @@ -2191,14 +2191,14 @@ } break; case 0x6c: /* Create or open file */ - TRACE(int21,"LONG FILENAME - CREATE OR OPEN FILE %s\n", + TRACE("LONG FILENAME - CREATE OR OPEN FILE %s\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context), ESI_reg(context))); /* translate Dos 7 action to Dos 6 action */ bSetDOSExtendedError = INT21_ExtendedOpenCreateFile(context); break; case 0x3b: /* Change directory */ - TRACE(int21,"LONG FILENAME - CHANGE DIRECTORY %s\n", + TRACE("LONG FILENAME - CHANGE DIRECTORY %s\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context))); if (!SetCurrentDirectoryA(CTX_SEG_OFF_TO_LIN(context, DS_reg(context), @@ -2210,7 +2210,7 @@ } break; case 0x41: /* Delete file */ - TRACE(int21,"LONG FILENAME - DELETE FILE %s\n", + TRACE("LONG FILENAME - DELETE FILE %s\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context))); if (!DeleteFileA(CTX_SEG_OFF_TO_LIN(context, DS_reg(context), @@ -2221,11 +2221,11 @@ } break; case 0x56: /* Move (rename) file */ - TRACE(int21,"LONG FILENAME - RENAME FILE %s to %s stub\n", + TRACE("LONG FILENAME - RENAME FILE %s to %s stub\n", (LPCSTR)CTX_SEG_OFF_TO_LIN(context, DS_reg(context), EDX_reg(context)), (LPCSTR)CTX_SEG_OFF_TO_LIN(context, ES_reg(context), EDI_reg(context))); default: - FIXME(int21, "Unimplemented long file name function:\n"); + FIXME("Unimplemented long file name function:\n"); INT_BARF( context, 0x21 ); SET_CFLAG(context); AL_reg(context) = 0; @@ -2236,9 +2236,9 @@ case 0x70: /* MS-DOS 7 (Windows95) - ??? (country-specific?)*/ case 0x72: /* MS-DOS 7 (Windows95) - ??? */ case 0x73: /* MS-DOS 7 (Windows95) - DRIVE LOCKING ??? */ - TRACE(int21,"windows95 function AX %04x\n", + TRACE("windows95 function AX %04x\n", AX_reg(context)); - WARN(int21, " returning unimplemented\n"); + WARN(" returning unimplemented\n"); SET_CFLAG(context); AL_reg(context) = 0; break; @@ -2260,9 +2260,9 @@ } if ((EFL_reg(context) & 0x0001)) - TRACE(int21, "failed, error 0x%04lx\n", GetLastError() ); + TRACE("failed, error 0x%04lx\n", GetLastError() ); - TRACE(int21, "returning: AX=%04x BX=%04x CX=%04x DX=%04x " + TRACE("returning: AX=%04x BX=%04x CX=%04x DX=%04x " "SI=%04x DI=%04x DS=%04x ES=%04x EFL=%08lx\n", AX_reg(context), BX_reg(context), CX_reg(context), DX_reg(context), SI_reg(context), DI_reg(context), @@ -2272,7 +2272,7 @@ FARPROC16 WINAPI GetSetKernelDOSProc16(FARPROC16 DosProc) { - FIXME(int21, "(DosProc=0x%08x): stub\n", (UINT)DosProc); + FIXME("(DosProc=0x%08x): stub\n", (UINT)DosProc); return NULL; }
diff --git a/msdos/int25.c b/msdos/int25.c index 84b221c..1a628ba 100644 --- a/msdos/int25.c +++ b/msdos/int25.c
@@ -10,7 +10,7 @@ #include "ldt.h" #include "miscemu.h" #include "drive.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(int) @@ -44,7 +44,7 @@ begin = DX_reg(context); length = CX_reg(context); } - TRACE(int, "int25: abs diskread, drive %d, sector %ld, " + TRACE("int25: abs diskread, drive %d, sector %ld, " "count %ld, buffer %p\n", AL_reg(context), begin, length, dataptr);
diff --git a/msdos/int26.c b/msdos/int26.c index bf76c64..df84e6a 100644 --- a/msdos/int26.c +++ b/msdos/int26.c
@@ -9,7 +9,7 @@ #include "ldt.h" #include "miscemu.h" #include "drive.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(int) @@ -43,7 +43,7 @@ length = CX_reg(context); } - TRACE(int,"int26: abs diskwrite, drive %d, sector %ld, " + TRACE("int26: abs diskwrite, drive %d, sector %ld, " "count %ld, buffer %p\n", AL_reg(context), begin, length, dataptr );
diff --git a/msdos/int2a.c b/msdos/int2a.c index efcf0c2..ecef77a 100644 --- a/msdos/int2a.c +++ b/msdos/int2a.c
@@ -5,7 +5,7 @@ #include <stdlib.h> #include "msdos.h" #include "miscemu.h" -#include "debug.h" +#include "debugtools.h" /********************************************************************** * INT_Int2aHandler
diff --git a/msdos/int2f.c b/msdos/int2f.c index 52ec327..2b77bf9 100644 --- a/msdos/int2f.c +++ b/msdos/int2f.c
@@ -21,7 +21,7 @@ #include "dosexe.h" #include "heap.h" /* #define DEBUG_INT */ -#include "debug.h" +#include "debugtools.h" #include "cdrom.h" DEFAULT_DEBUG_CHANNEL(int) @@ -39,7 +39,7 @@ */ void WINAPI INT_Int2fHandler( CONTEXT86 *context ) { - TRACE(int,"Subfunction 0x%X\n", AX_reg(context)); + TRACE("Subfunction 0x%X\n", AX_reg(context)); switch(AH_reg(context)) { @@ -87,7 +87,7 @@ DI_reg(context) = 0x0000; break; case 0x08: - FIXME(int, "No real-mode handler for errors yet! (bye!)"); + FIXME("No real-mode handler for errors yet! (bye!)"); break; default: INT_BARF(context, 0x2f); @@ -115,7 +115,7 @@ switch (AL_reg(context)) { case 0x00: /* XMS v2+ installation check */ - WARN(int,"XMS is not fully implemented\n"); + WARN("XMS is not fully implemented\n"); AL_reg(context) = 0x80; break; case 0x10: /* XMS v2+ get driver address */ @@ -137,7 +137,7 @@ INT_BARF( context, 0x2f ); } #else - FIXME(int,"check for XMS (not supported)\n"); + FIXME("check for XMS (not supported)\n"); AL_reg(context) = 0x42; /* != 0x80 */ #endif break; @@ -184,7 +184,7 @@ case 0x03: case 0x04: case 0x05: - FIXME(int,"Task Switcher - not implemented\n"); + FIXME("Task Switcher - not implemented\n"); break; default: INT_BARF( context, 0x2f ); @@ -248,7 +248,7 @@ case 0x01: /* Quarterdeck RPCI - QEMM/QRAM - PCL-838.EXE functions */ if(BX_reg(context) == 0x5145 && CX_reg(context) == 0x4D4D && DX_reg(context) == 0x3432) - TRACE(int, "Check for QEMM v5.0+ (not installed)\n"); + TRACE("Check for QEMM v5.0+ (not installed)\n"); break; default: INT_BARF( context, 0x2f ); @@ -272,7 +272,7 @@ case 0x01: /* Quarterdeck QDPMI.SYS - DESQview */ if(BX_reg(context) == 0x4450 && CX_reg(context) == 0x4d49 && DX_reg(context) == 0x8f4f) - TRACE(int, "Check for QDPMI.SYS (not installed)\n"); + TRACE("Check for QDPMI.SYS (not installed)\n"); break; default: INT_BARF( context, 0x2f ); @@ -315,7 +315,7 @@ case 0x11: /* Get Shell Parameters - (SHELL= in CONFIG.SYS) */ /* We can mock this up. But not today... */ - FIXME(int, "Get Shell Parameters\n"); + FIXME("Get Shell Parameters\n"); break; case 0x80: /* Release time-slice */ @@ -344,7 +344,7 @@ VXD_BASE + BX_reg(context) ); if (!addr) /* not supported */ { - ERR(int, "Accessing unknown VxD %04x - Expect a failure now.\n", + ERR("Accessing unknown VxD %04x - Expect a failure now.\n", BX_reg(context) ); } ES_reg(context) = SELECTOROF(addr); @@ -437,7 +437,7 @@ } break; } - TRACE(int, "%s\n", buf); + TRACE("%s\n", buf); } #else #define MSCDEX_Dump(pfx, req, drm) @@ -466,7 +466,7 @@ break; } } - TRACE(int, "Installation check: %d cdroms, starting at %d\n", count, drive); + TRACE("Installation check: %d cdroms, starting at %d\n", count, drive); BX_reg(context) = count; CX_reg(context) = (drive < MAX_DOS_DRIVES) ? drive : 0; break; @@ -478,7 +478,7 @@ case 0x0C: /* get version */ BX_reg(context) = 0x020a; - TRACE(int, "Version number => %04x\n", BX_reg(context)); + TRACE("Version number => %04x\n", BX_reg(context)); break; case 0x0D: /* get drive letters */ @@ -487,7 +487,7 @@ for (drive = 0; drive < MAX_DOS_DRIVES; drive++) { if (DRIVE_GetType(drive) == TYPE_CDROM) *p++ = drive; } - TRACE(int, "Get drive letters\n"); + TRACE("Get drive letters\n"); break; case 0x10: /* direct driver acces */ @@ -504,8 +504,8 @@ if (!driver_request) { /* FIXME - to be deleted ?? */ - ERR(int, "ES:BX==0 ! SEGFAULT ?\n"); - ERR(int, "-->BX=0x%04x, ES=0x%04lx, DS=0x%04lx, CX=0x%04x\n", + ERR("ES:BX==0 ! SEGFAULT ?\n"); + ERR("-->BX=0x%04x, ES=0x%04lx, DS=0x%04lx, CX=0x%04x\n", BX_reg(context), ES_reg(context), DS_reg(context), CX_reg(context)); driver_request[4] |= 0x80; driver_request[3] = 5; /* bad request length */ @@ -517,14 +517,14 @@ */ if (wcda.unixdev <= 0) CDAUDIO_Open(&wcda); - TRACE(int, "CDROM device driver -> command <%d>\n", (unsigned char)driver_request[2]); + TRACE("CDROM device driver -> command <%d>\n", (unsigned char)driver_request[2]); for (drive = 0; drive < MAX_DOS_DRIVES && DRIVE_GetType(drive) != TYPE_CDROM; drive++); /* drive contains the first CD ROM */ if (CX_reg(context) != drive) { - WARN(int, "Request made doesn't match a CD ROM drive (%d/%d)\n", CX_reg(context), drive); + WARN("Request made doesn't match a CD ROM drive (%d/%d)\n", CX_reg(context), drive); driver_request[4] |= 0x80; driver_request[3] = 1; /* unknown unit */ return; @@ -542,7 +542,7 @@ DOSMEM_MapRealToLinear(MAKELONG(PTR_AT(driver_request, 14, WORD), PTR_AT(driver_request, 16, WORD))) : PTR_SEG_OFF_TO_LIN(PTR_AT(driver_request, 16, WORD), PTR_AT(driver_request, 14, WORD)); - TRACE(int, " --> IOCTL INPUT <%d>\n", io_stru[0]); + TRACE(" --> IOCTL INPUT <%d>\n", io_stru[0]); switch (io_stru[0]) { #if 0 case 0: /* Get device Header */ @@ -580,10 +580,10 @@ MSCDEX_StoreMSF(wcda.dwCurFrame, io_stru + 2); break; default: - ERR(int, "CDRom-Driver: Unsupported addressing mode !!\n"); + ERR("CDRom-Driver: Unsupported addressing mode !!\n"); Error = 0x0c; } - TRACE(int, " ----> HEAD LOCATION <%ld>\n", PTR_AT(io_stru, 2, DWORD)); + TRACE(" ----> HEAD LOCATION <%ld>\n", PTR_AT(io_stru, 2, DWORD)); break; case 4: /* Audio channel info */ @@ -595,7 +595,7 @@ io_stru[6] = 0; io_stru[7] = 3; io_stru[8] = 0; - TRACE(int, " ----> AUDIO CHANNEL INFO\n"); + TRACE(" ----> AUDIO CHANNEL INFO\n"); break; case 6: /* device status */ @@ -616,18 +616,18 @@ */ if (wcda.cdaMode == WINE_CDA_OPEN) io_stru[1] |= 1; - TRACE(int, " ----> DEVICE STATUS <0x%08lx>\n", PTR_AT(io_stru, 1, DWORD)); + TRACE(" ----> DEVICE STATUS <0x%08lx>\n", PTR_AT(io_stru, 1, DWORD)); break; case 8: /* Volume size */ PTR_AT(io_stru, 1, DWORD) = wcda.dwTotalLen; - TRACE(int, " ----> VOLUME SIZE <%ld>\n", PTR_AT(io_stru, 1, DWORD)); + TRACE(" ----> VOLUME SIZE <%ld>\n", PTR_AT(io_stru, 1, DWORD)); break; case 9: /* media changed ? */ /* answers don't know... -1/1 for yes/no would be better */ io_stru[1] = 0; /* FIXME? 1? */ - TRACE(int, " ----> MEDIA CHANGED <%d>\n", io_stru[1]); + TRACE(" ----> MEDIA CHANGED <%d>\n", io_stru[1]); break; case 10: /* audio disk info */ @@ -635,7 +635,7 @@ io_stru[2] = wcda.nLastTrack; /* ending track */ MSCDEX_StoreMSF(wcda.dwTotalLen, io_stru + 3); - TRACE(int, " ----> AUDIO DISK INFO <%d-%d/%08lx>\n", + TRACE(" ----> AUDIO DISK INFO <%d-%d/%08lx>\n", io_stru[1], io_stru[2], PTR_AT(io_stru, 3, DWORD)); break; @@ -649,7 +649,7 @@ PTR_AT(io_stru, 2, DWORD) = 0; io_stru[6] = 0; } - TRACE(int, " ----> AUDIO TRACK INFO[%d] = [%08lx:%d]\n", + TRACE(" ----> AUDIO TRACK INFO[%d] = [%08lx:%d]\n", io_stru[1], PTR_AT(io_stru, 2, DWORD), io_stru[6]); break; @@ -674,7 +674,7 @@ io_stru[10] = bTmp[0]; io_stru[11] = 0; } - TRACE(int, "Q-Channel info: Ctrl/adr=%02x TNO=%02x X=%02x rtt=%02x:%02x:%02x rtd=%02x:%02x:%02x (cf=%08lx, tp=%08lx)\n", + TRACE("Q-Channel info: Ctrl/adr=%02x TNO=%02x X=%02x rtt=%02x:%02x:%02x rtd=%02x:%02x:%02x (cf=%08lx, tp=%08lx)\n", io_stru[ 1], io_stru[ 2], io_stru[ 3], io_stru[ 4], io_stru[ 5], io_stru[ 6], io_stru[ 8], io_stru[ 9], io_stru[10], @@ -691,12 +691,12 @@ PTR_AT(io_stru, 3, DWORD) = wcda.lpdwTrackPos[0]; PTR_AT(io_stru, 7, DWORD) = wcda.lpdwTrackPos[wcda.nTracks - 1]; } - TRACE(int, "Audio status info: status=%04x startLoc=%ld endLoc=%ld\n", + TRACE("Audio status info: status=%04x startLoc=%ld endLoc=%ld\n", PTR_AT(io_stru, 1, WORD), PTR_AT(io_stru, 3, DWORD), PTR_AT(io_stru, 7, DWORD)); break; default: - FIXME(int, "IOCTL INPUT: Unimplemented <%d>!!\n", io_stru[0]); + FIXME("IOCTL INPUT: Unimplemented <%d>!!\n", io_stru[0]); Error = 0x0c; break; } @@ -707,25 +707,25 @@ DOSMEM_MapRealToLinear(MAKELONG(PTR_AT(driver_request, 14, WORD), PTR_AT(driver_request, 16, WORD))) : PTR_SEG_OFF_TO_LIN(PTR_AT(driver_request, 16, WORD), PTR_AT(driver_request, 14, WORD)); - TRACE(int, " --> IOCTL OUTPUT <%d>\n", io_stru[0]); + TRACE(" --> IOCTL OUTPUT <%d>\n", io_stru[0]); switch (io_stru[0]) { case 0: /* eject */ CDAUDIO_SetDoor(&wcda, 1); - TRACE(int, " ----> EJECT\n"); + TRACE(" ----> EJECT\n"); break; case 2: /* reset drive */ CDAUDIO_Reset(&wcda); - TRACE(int, " ----> RESET\n"); + TRACE(" ----> RESET\n"); break; case 3: /* Audio Channel Control */ - FIXME(int, " ----> AUDIO CHANNEL CONTROL (NIY)\n"); + FIXME(" ----> AUDIO CHANNEL CONTROL (NIY)\n"); break; case 5: /* close tray */ CDAUDIO_SetDoor(&wcda, 0); - TRACE(int, " ----> CLOSE TRAY\n"); + TRACE(" ----> CLOSE TRAY\n"); break; default: - FIXME(int, " IOCTL OUPUT: Unimplemented <%d>!!\n", io_stru[0]); + FIXME(" IOCTL OUPUT: Unimplemented <%d>!!\n", io_stru[0]); Error = 0x0c; break; } @@ -737,7 +737,7 @@ at = PTR_AT(driver_request, 20, DWORD); - TRACE(int, " --> SEEK AUDIO mode :<0x%02X>, [%ld]\n", + TRACE(" --> SEEK AUDIO mode :<0x%02X>, [%ld]\n", (BYTE)driver_request[13], at); switch (driver_request[13]) { @@ -753,7 +753,7 @@ CDAUDIO_Seek(&wcda, at); break; default: - ERR(int, "Unsupported address mode !!\n"); + ERR("Unsupported address mode !!\n"); Error = 0x0c; break; } @@ -767,7 +767,7 @@ beg = end = PTR_AT(driver_request, 14, DWORD); end += PTR_AT(driver_request, 18, DWORD); - TRACE(int, " --> PLAY AUDIO mode :<0x%02X>, [%ld-%ld]\n", + TRACE(" --> PLAY AUDIO mode :<0x%02X>, [%ld-%ld]\n", (BYTE)driver_request[13], beg, end); switch (driver_request[13]) { @@ -786,7 +786,7 @@ CDAUDIO_Play(&wcda, beg, end); break; default: - ERR(int, "Unsupported address mode !!\n"); + ERR("Unsupported address mode !!\n"); Error = 0x0c; break; } @@ -796,20 +796,20 @@ case 133: if (wcda.cdaMode == WINE_CDA_PLAY) { CDAUDIO_Pause(&wcda, 1); - TRACE(int, " --> STOP AUDIO (Paused)\n"); + TRACE(" --> STOP AUDIO (Paused)\n"); } else { CDAUDIO_Stop(&wcda); - TRACE(int, " --> STOP AUDIO (Stopped)\n"); + TRACE(" --> STOP AUDIO (Stopped)\n"); } break; case 136: - TRACE(int, " --> RESUME AUDIO\n"); + TRACE(" --> RESUME AUDIO\n"); CDAUDIO_Pause(&wcda, 0); break; default: - FIXME(int, " ioctl uninplemented <%d>\n", driver_request[2]); + FIXME(" ioctl uninplemented <%d>\n", driver_request[2]); Error = 0x0c; } @@ -829,7 +829,7 @@ } break; default: - FIXME(int, "Unimplemented MSCDEX function 0x%02X.\n", AL_reg(context)); + FIXME("Unimplemented MSCDEX function 0x%02X.\n", AL_reg(context)); break; } }
diff --git a/msdos/int33.c b/msdos/int33.c index 23069fc..1f5f229 100644 --- a/msdos/int33.c +++ b/msdos/int33.c
@@ -6,7 +6,7 @@ #include "winuser.h" #include "miscemu.h" #include "dosexe.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(int) @@ -27,20 +27,20 @@ switch (AX_reg(context)) { case 0x00: - TRACE(int,"Reset mouse driver and request status\n"); + TRACE("Reset mouse driver and request status\n"); AX_reg(context) = 0xFFFF; /* installed */ BX_reg(context) = 3; /* # of buttons */ sys = calloc(1,sizeof(MOUSESYSTEM)); DOSVM_SetSystemData(0x33, sys); break; case 0x03: - TRACE(int,"Return mouse position and button status\n"); + TRACE("Return mouse position and button status\n"); BX_reg(context) = sys->but; CX_reg(context) = sys->x; DX_reg(context) = sys->y; break; case 0x0C: /* Define interrupt subroutine */ - TRACE(int,"Define mouse interrupt subroutine\n"); + TRACE("Define mouse interrupt subroutine\n"); sys->callmask = CX_reg(context); sys->callback = (FARPROC16)PTR_SEG_OFF_TO_SEGPTR(ES_reg(context), DX_reg(context)); break;
diff --git a/msdos/int3d.c b/msdos/int3d.c index 30fabe5..768e260 100644 --- a/msdos/int3d.c +++ b/msdos/int3d.c
@@ -7,7 +7,7 @@ #include "msdos.h" #include "miscemu.h" /* #define DEBUG_INT */ -#include "debug.h" +#include "debugtools.h" /********************************************************************** * INT_Int3dHandler
diff --git a/msdos/int5c.c b/msdos/int5c.c index 79440b7..feb1c7c 100644 --- a/msdos/int5c.c +++ b/msdos/int5c.c
@@ -6,7 +6,7 @@ #include "ldt.h" #include "miscemu.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(int) @@ -20,7 +20,7 @@ { BYTE* ptr; ptr = (BYTE*) PTR_SEG_OFF_TO_LIN(ES_reg(context),BX_reg(context)); - FIXME(int,"(%p): command code %02x (ignored)\n",context, *ptr); + FIXME("(%p): command code %02x (ignored)\n",context, *ptr); AL_reg(context) = *(ptr+0x01) = 0xFB; /* NetBIOS emulator not found */ }
diff --git a/msdos/interrupts.c b/msdos/interrupts.c index 36282a0..abfe861 100644 --- a/msdos/interrupts.c +++ b/msdos/interrupts.c
@@ -8,7 +8,7 @@ #include "windef.h" #include "miscemu.h" #include "msdos.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(int) @@ -33,7 +33,7 @@ */ void INT_SetPMHandler( BYTE intnum, FARPROC16 handler ) { - TRACE(int, "Set protected mode interrupt vector %02x <- %04x:%04x\n", + TRACE("Set protected mode interrupt vector %02x <- %04x:%04x\n", intnum, HIWORD(handler), LOWORD(handler) ); INT_Vectors[intnum] = handler; } @@ -57,7 +57,7 @@ */ void INT_SetRMHandler( BYTE intnum, FARPROC16 handler ) { - TRACE(int, "Set real mode interrupt vector %02x <- %04x:%04x\n", + TRACE("Set real mode interrupt vector %02x <- %04x:%04x\n", intnum, HIWORD(handler), LOWORD(handler) ); ((FARPROC16*)DOSMEM_MemoryBase(0))[intnum] = handler; } @@ -85,7 +85,7 @@ void INT_CtxSetHandler( CONTEXT86 *context, BYTE intnum, FARPROC16 handler ) { if (ISV86(context)) { - TRACE(int, "Set real mode interrupt vector %02x <- %04x:%04x\n", + TRACE("Set real mode interrupt vector %02x <- %04x:%04x\n", intnum, HIWORD(handler), LOWORD(handler) ); ((FARPROC16*)V86BASE(context))[intnum] = handler; } else @@ -152,7 +152,7 @@ INT_Int33Handler(context); break; default: - FIXME(int, "Unknown Interrupt in DOS mode: 0x%x\n", intnum); + FIXME("Unknown Interrupt in DOS mode: 0x%x\n", intnum); return 1; } return 0;
diff --git a/msdos/ioports.c b/msdos/ioports.c index 41f0931..931970e 100644 --- a/msdos/ioports.c +++ b/msdos/ioports.c
@@ -21,7 +21,7 @@ #include "dosexe.h" #include "options.h" #include "miscemu.h" -#include "debug.h" +#include "debugtools.h" #include "miscemu.h" DEFAULT_DEBUG_CHANNEL(int) @@ -80,7 +80,7 @@ sum += cmosimage[i]; cmosimage[0x2e] = sum >> 8; /* yes, this IS hi byte !! */ cmosimage[0x2f] = sum & 0xff; - TRACE(int, "calculated hi %02x, lo %02x\n", cmosimage[0x2e], cmosimage[0x2f]); + TRACE("calculated hi %02x, lo %02x\n", cmosimage[0x2e], cmosimage[0x2f]); } static void set_timer_maxval(unsigned timer, unsigned maxval) @@ -90,13 +90,13 @@ DOSVM_SetTimer(maxval); break; case 1: /* RAM refresh */ - FIXME(int, "RAM refresh counter handling not implemented !"); + FIXME("RAM refresh counter handling not implemented !"); break; case 2: /* cassette & speaker */ /* speaker on ? */ if (((BYTE)parport_8255[1] & 3) == 3) { - TRACE(int, "Beep (freq: %d) !\n", 1193180 / maxval ); + TRACE("Beep (freq: %d) !\n", 1193180 / maxval ); Beep(1193180 / maxval, 20); } break; @@ -138,7 +138,7 @@ { int val, val1, i, len; if (!strcasecmp(temp, "all")) { - MSG("Warning!!! Granting FULL IO port access to" + MESSAGE("Warning!!! Granting FULL IO port access to" " windoze programs!\nWarning!!! " "*** THIS IS NOT AT ALL " "RECOMMENDED!!! ***\n"); @@ -253,7 +253,7 @@ { DWORD res = 0; - TRACE(int, "%d-byte value from port 0x%02x\n", size, port ); + TRACE("%d-byte value from port 0x%02x\n", size, port ); #ifdef DIRECT_IO_ACCESS if ((do_direct_port_access) @@ -267,7 +267,7 @@ case 2: res = inw( port ); break; case 4: res = inl( port ); break; default: - ERR(int, "invalid data size %d\n", size); + ERR("invalid data size %d\n", size); } iopl(0); return res; @@ -347,11 +347,11 @@ res = 0xffffffff; /* no joystick */ break; default: - WARN( int, "Direct I/O read attempted from port %x\n", port); + WARN("Direct I/O read attempted from port %x\n", port); res = 0xffffffff; break; } - TRACE(int, " returning ( 0x%lx )\n", res ); + TRACE(" returning ( 0x%lx )\n", res ); return res; } @@ -361,7 +361,7 @@ */ void IO_outport( int port, int size, DWORD value ) { - TRACE(int, "IO: 0x%lx (%d-byte value) to port 0x%02x\n", + TRACE("IO: 0x%lx (%d-byte value) to port 0x%02x\n", value, size, port ); #ifdef DIRECT_IO_ACCESS @@ -376,7 +376,7 @@ case 2: outw( LOWORD(value), port ); break; case 4: outl( value, port ); break; default: - WARN(int, "Invalid data size %d\n", size); + WARN("Invalid data size %d\n", size); } iopl(0); return; @@ -442,7 +442,7 @@ /* ctrl byte for specific timer channel */ tmr_8253_ctrlbyte_ch[chan] = (BYTE)value; if (chan == 3) { - FIXME(int,"8254 timer readback not implemented yet\n"); + FIXME("8254 timer readback not implemented yet\n"); } else if (((BYTE)value&0x30)==0) { /* latch timer */ @@ -463,7 +463,7 @@ parport_8255[1] = (BYTE)value; if ((((BYTE)parport_8255[1] & 3) == 3) && (tmr_8253_countmax[2] != 1)) { - TRACE(int, "Beep (freq: %d) !\n", 1193180 / tmr_8253_countmax[2]); + TRACE("Beep (freq: %d) !\n", 1193180 / tmr_8253_countmax[2]); Beep(1193180 / tmr_8253_countmax[2], 20); } break; @@ -474,7 +474,7 @@ cmosimage[cmosaddress & 0x3f] = (BYTE)value; break; default: - WARN(int, "Direct I/O write attempted to port %x\n", port ); + WARN("Direct I/O write attempted to port %x\n", port ); break; } }
diff --git a/msdos/vxd.c b/msdos/vxd.c index 3281c7a..87194f4 100644 --- a/msdos/vxd.c +++ b/msdos/vxd.c
@@ -17,13 +17,13 @@ #include "task.h" #include "process.h" #include "file.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(vxd) #define VXD_BARF(context,name) \ - DUMP( "vxd %s: unknown/not implemented parameters:\n" \ + DPRINTF( "vxd %s: unknown/not implemented parameters:\n" \ "vxd %s: AX %04x, BX %04x, CX %04x, DX %04x, " \ "SI %04x, DI %04x, DS %04x, ES %04x\n", \ (name), (name), AX_reg(context), BX_reg(context), \ @@ -44,7 +44,7 @@ { unsigned service = AX_reg(context); - TRACE(vxd,"[%04x] VMM \n", (UINT16)service); + TRACE("[%04x] VMM \n", (UINT16)service); switch(service) { @@ -73,18 +73,18 @@ /* taken from Ralf Brown's Interrupt List */ - TRACE(vxd,"[%04x] PageFile\n", (UINT16)service ); + TRACE("[%04x] PageFile\n", (UINT16)service ); switch(service) { case 0x00: /* get version, is this windows version? */ - TRACE(vxd,"returning version\n"); + TRACE("returning version\n"); AX_reg(context) = VXD_WinVersion(); RESET_CFLAG(context); break; case 0x01: /* get swap file info */ - TRACE(vxd,"VxD PageFile: returning swap file info\n"); + TRACE("VxD PageFile: returning swap file info\n"); AX_reg(context) = 0x00; /* paging disabled */ ECX_reg(context) = 0; /* maximum size of paging file */ /* FIXME: do I touch DS:SI or DS:DI? */ @@ -92,12 +92,12 @@ break; case 0x02: /* delete permanent swap on exit */ - TRACE(vxd,"VxD PageFile: supposed to delete swap\n"); + TRACE("VxD PageFile: supposed to delete swap\n"); RESET_CFLAG(context); break; case 0x03: /* current temporary swap file size */ - TRACE(vxd,"VxD PageFile: what is current temp. swap size\n"); + TRACE("VxD PageFile: what is current temp. swap size\n"); RESET_CFLAG(context); break; @@ -117,7 +117,7 @@ { unsigned service = AX_reg(context); - TRACE(vxd,"[%04x] VMM \n", (UINT16)service); + TRACE("[%04x] VMM \n", (UINT16)service); switch(service) { @@ -138,7 +138,7 @@ { unsigned service = AX_reg(context); - TRACE(vxd,"[%04x] VDD \n", (UINT16)service); + TRACE("[%04x] VDD \n", (UINT16)service); switch(service) { @@ -159,7 +159,7 @@ { unsigned service = AX_reg(context); - TRACE(vxd,"[%04x] VMD \n", (UINT16)service); + TRACE("[%04x] VMD \n", (UINT16)service); switch(service) { @@ -180,12 +180,12 @@ { unsigned service = DX_reg(context); - TRACE(vxd,"[%04x] Shell\n", (UINT16)service); + TRACE("[%04x] Shell\n", (UINT16)service); switch (service) /* Ralf Brown says EDX, but I use DX instead */ { case 0x0000: - TRACE(vxd,"returning version\n"); + TRACE("returning version\n"); AX_reg(context) = VXD_WinVersion(); EBX_reg(context) = 1; /* system VM Handle */ break; @@ -215,7 +215,7 @@ break; case 0x0006: /* SHELL_Get_VM_State */ - TRACE(vxd,"VxD Shell: returning VM state\n"); + TRACE("VxD Shell: returning VM state\n"); /* Actually we don't, not yet. We have to return a structure * and I am not to sure how to set it up and return it yet, * so for now let's do nothing. I can (hopefully) get this @@ -254,7 +254,7 @@ break; case 0x0106: /* install timeout callback */ - TRACE( vxd, "VxD Shell: ignoring shell callback (%ld sec.)\n", + TRACE("VxD Shell: ignoring shell callback (%ld sec.)\n", EBX_reg( context ) ); SET_CFLAG(context); break; @@ -274,12 +274,12 @@ { unsigned service = AX_reg(context); - TRACE(vxd,"[%04x] Comm\n", (UINT16)service); + TRACE("[%04x] Comm\n", (UINT16)service); switch (service) { case 0x0000: /* get version */ - TRACE(vxd,"returning version\n"); + TRACE("returning version\n"); AX_reg(context) = VXD_WinVersion(); RESET_CFLAG(context); break; @@ -299,7 +299,7 @@ { unsigned service = AX_reg(context); - TRACE(vxd,"[%04x] Virtual Timer\n", (UINT16)service); + TRACE("[%04x] Virtual Timer\n", (UINT16)service); switch(service) { @@ -335,7 +335,7 @@ { unsigned service = AX_reg(context); - TRACE(vxd,"[%04x] TimerAPI \n", (UINT16)service); + TRACE("[%04x] TimerAPI \n", (UINT16)service); switch(service) { @@ -368,7 +368,7 @@ { unsigned service = AX_reg(context); - TRACE(vxd,"[%04x] ConfigMG \n", (UINT16)service); + TRACE("[%04x] ConfigMG \n", (UINT16)service); switch(service) { @@ -389,7 +389,7 @@ { unsigned service = AX_reg(context); - TRACE(vxd,"[%04x] Enable \n", (UINT16)service); + TRACE("[%04x] Enable \n", (UINT16)service); switch(service) { @@ -410,7 +410,7 @@ { unsigned service = AX_reg(context); - TRACE(vxd,"[%04x] APM \n", (UINT16)service); + TRACE("[%04x] APM \n", (UINT16)service); switch(service) { @@ -501,7 +501,7 @@ * 1 if VMCPD VxD not found */ - TRACE(vxd, "GetVersion()\n"); + TRACE("GetVersion()\n"); EAX_reg(context) = VXD_WinVersion() | (200 << 16); EBX_reg(context) = 0; @@ -577,7 +577,7 @@ if (found == 3 && retv) { - TRACE(vxd, "PERF130 hack: " + TRACE("PERF130 hack: " "Replacing byte %02X at offset %04X:%04X\n", *(retv+1), SELECTOROF(func1), OFFSETOF(func1) + retv+1-start); @@ -613,7 +613,7 @@ * Output: EAX: 0 if OK */ - TRACE(vxd, "[0001] EBX=%lx ECX=%lx EDX=%lx ESI=%lx EDI=%lx\n", + TRACE("[0001] EBX=%lx ECX=%lx EDX=%lx ESI=%lx EDI=%lx\n", EBX_reg(context), ECX_reg(context), EDX_reg(context), ESI_reg(context), EDI_reg(context)); @@ -636,7 +636,7 @@ * Output: EAX: Size of area changed */ - TRACE(vxd, "[0002] EBX=%lx ECX=%lx EDX=%lx\n", + TRACE("[0002] EBX=%lx ECX=%lx EDX=%lx\n", EBX_reg(context), ECX_reg(context), EDX_reg(context)); /* FIXME */ @@ -654,7 +654,7 @@ * Bit 1: Read-Write if set, Read-Only if clear */ - TRACE(vxd, "[0003] EDX=%lx\n", EDX_reg(context)); + TRACE("[0003] EDX=%lx\n", EDX_reg(context)); /* FIXME */ @@ -673,7 +673,7 @@ if (!EDX_reg(context) || CX_reg(context) == 0xFFFF) { - TRACE(vxd, "MapModule: Initialization call\n"); + TRACE("MapModule: Initialization call\n"); EAX_reg(context) = 0; } else @@ -711,7 +711,7 @@ BOOL error = (image == INVALID_HANDLE_VALUE); UINT i; - TRACE(vxd, "MapModule: Loading %s\n", module->pathName); + TRACE("MapModule: Loading %s\n", module->pathName); for (i = 0; !error && i < nt_header->FileHeader.NumberOfSections; @@ -722,7 +722,7 @@ DWORD len = pe_seg->SizeOfRawData; LPBYTE addr = module->baseAddr + pe_seg->VirtualAddress; - TRACE(vxd, "MapModule: " + TRACE("MapModule: " "Section %d at %08lx from %08lx len %08lx\n", i, (DWORD)addr, off, len); @@ -734,7 +734,7 @@ _lclose(image); if (error) - ERR(vxd, "MapModule: Unable to load %s\n", module->pathName); + ERR("MapModule: Unable to load %s\n", module->pathName); else if (module->relocDelta != 0) { @@ -743,14 +743,14 @@ IMAGE_BASE_RELOCATION *r = (IMAGE_BASE_RELOCATION *) (dir->Size? module->baseAddr + dir->VirtualAddress : 0); - TRACE(vxd, "MapModule: Reloc delta %08lx\n", module->relocDelta); + TRACE("MapModule: Reloc delta %08lx\n", module->relocDelta); while (r && r->VirtualAddress) { LPBYTE page = module->baseAddr + r->VirtualAddress; int count = (r->SizeOfBlock - 8) / 2; - TRACE(vxd, "MapModule: %d relocations for page %08lx\n", + TRACE("MapModule: %d relocations for page %08lx\n", count, (DWORD)page); for(i = 0; i < count; i++) @@ -771,7 +771,7 @@ *(DWORD*)(page+offset) += module->relocDelta; break; default: - WARN(vxd, "MapModule: Unsupported fixup type\n"); + WARN("MapModule: Unsupported fixup type\n"); break; } } @@ -793,7 +793,7 @@ * Output: EAX: 1 if OK */ - TRACE(vxd, "UnMapModule: %lx\n", (DWORD)W32S_APP2WINE(EDX_reg(context), W32S_OFFSET)); + TRACE("UnMapModule: %lx\n", (DWORD)W32S_APP2WINE(EDX_reg(context), W32S_OFFSET)); /* As we didn't map anything, there's nothing to unmap ... */ @@ -824,18 +824,18 @@ DWORD prot = stack[4]; DWORD result; - TRACE(vxd, "VirtualAlloc(%lx, %lx, %lx, %lx, %lx)\n", + TRACE("VirtualAlloc(%lx, %lx, %lx, %lx, %lx)\n", (DWORD)retv, (DWORD)base, size, type, prot); if (type & 0x80000000) { - WARN(vxd, "VirtualAlloc: strange type %lx\n", type); + WARN("VirtualAlloc: strange type %lx\n", type); type &= 0x7fffffff; } if (!base && (type & MEM_COMMIT) && prot == PAGE_READONLY) { - WARN(vxd, "VirtualAlloc: NLS hack, allowing write access!\n"); + WARN("VirtualAlloc: NLS hack, allowing write access!\n"); prot = PAGE_READWRITE; } @@ -872,7 +872,7 @@ DWORD type = stack[3]; DWORD result; - TRACE(vxd, "VirtualFree(%lx, %lx, %lx, %lx)\n", + TRACE("VirtualFree(%lx, %lx, %lx, %lx)\n", (DWORD)retv, (DWORD)base, size, type); result = VirtualFree(base, size, type); @@ -910,7 +910,7 @@ DWORD *old_prot = (DWORD *)W32S_APP2WINE(stack[4], W32S_OFFSET); DWORD result; - TRACE(vxd, "VirtualProtect(%lx, %lx, %lx, %lx, %lx)\n", + TRACE("VirtualProtect(%lx, %lx, %lx, %lx, %lx)\n", (DWORD)retv, (DWORD)base, size, new_prot, (DWORD)old_prot); result = VirtualProtect(base, size, new_prot, old_prot); @@ -947,7 +947,7 @@ DWORD len = stack[3]; DWORD result; - TRACE(vxd, "VirtualQuery(%lx, %lx, %lx, %lx)\n", + TRACE("VirtualQuery(%lx, %lx, %lx, %lx)\n", (DWORD)retv, (DWORD)base, (DWORD)info, len); result = VirtualQuery(base, info, len); @@ -967,7 +967,7 @@ * Output: EAX: NtStatus */ - TRACE(vxd, "[000a] ECX=%lx EDX=%lx\n", + TRACE("[000a] ECX=%lx EDX=%lx\n", ECX_reg(context), EDX_reg(context)); /* FIXME */ @@ -983,7 +983,7 @@ * Output: EAX: NtStatus */ - TRACE(vxd, "[000b] ECX=%lx\n", ECX_reg(context)); + TRACE("[000b] ECX=%lx\n", ECX_reg(context)); /* FIXME */ @@ -998,7 +998,7 @@ * Output: EDX: Previous Debug Flags */ - FIXME(vxd, "[000c] EDX=%lx\n", EDX_reg(context)); + FIXME("[000c] EDX=%lx\n", EDX_reg(context)); /* FIXME */ @@ -1035,13 +1035,13 @@ HANDLE result = INVALID_HANDLE_VALUE; char name[128]; - TRACE(vxd, "NtCreateSection(%lx, %lx, %lx, %lx, %lx, %lx, %lx, %lx)\n", + TRACE("NtCreateSection(%lx, %lx, %lx, %lx, %lx, %lx, %lx, %lx)\n", (DWORD)retv, flags1, atom, (DWORD)size, protect, flags2, (DWORD)hFile, psp); if (!atom || GlobalGetAtomNameA(atom, name, sizeof(name))) { - TRACE(vxd, "NtCreateSection: name=%s\n", atom? name : NULL); + TRACE("NtCreateSection: name=%s\n", atom? name : NULL); result = CreateFileMappingA(hFile, NULL, protect, size? size->HighPart : 0, @@ -1050,9 +1050,9 @@ } if (result == INVALID_HANDLE_VALUE) - WARN(vxd, "NtCreateSection: failed!\n"); + WARN("NtCreateSection: failed!\n"); else - TRACE(vxd, "NtCreateSection: returned %lx\n", (DWORD)result); + TRACE("NtCreateSection: returned %lx\n", (DWORD)result); if (result != INVALID_HANDLE_VALUE) *retv = result, @@ -1083,20 +1083,20 @@ HANDLE result = INVALID_HANDLE_VALUE; char name[128]; - TRACE(vxd, "NtOpenSection(%lx, %lx, %lx)\n", + TRACE("NtOpenSection(%lx, %lx, %lx)\n", (DWORD)retv, protect, atom); if (atom && GlobalGetAtomNameA(atom, name, sizeof(name))) { - TRACE(vxd, "NtOpenSection: name=%s\n", name); + TRACE("NtOpenSection: name=%s\n", name); result = OpenFileMappingA(protect, FALSE, name); } if (result == INVALID_HANDLE_VALUE) - WARN(vxd, "NtOpenSection: failed!\n"); + WARN("NtOpenSection: failed!\n"); else - TRACE(vxd, "NtOpenSection: returned %lx\n", (DWORD)result); + TRACE("NtOpenSection: returned %lx\n", (DWORD)result); if (result != INVALID_HANDLE_VALUE) *retv = result, @@ -1122,7 +1122,7 @@ HANDLE handle = stack[0]; DWORD *id = (DWORD *)W32S_APP2WINE(stack[1], W32S_OFFSET); - TRACE(vxd, "NtCloseSection(%lx, %lx)\n", (DWORD)handle, (DWORD)id); + TRACE("NtCloseSection(%lx, %lx)\n", (DWORD)handle, (DWORD)id); CloseHandle(handle); if (id) *id = 0; /* FIXME */ @@ -1145,7 +1145,7 @@ HANDLE handle = stack[0]; HANDLE new_handle; - TRACE(vxd, "NtDupSection(%lx)\n", (DWORD)handle); + TRACE("NtDupSection(%lx)\n", (DWORD)handle); DuplicateHandle( GetCurrentProcess(), handle, GetCurrentProcess(), &new_handle, @@ -1200,12 +1200,12 @@ case PAGE_EXECUTE_WRITECOPY: access = FILE_MAP_COPY; break; } - TRACE(vxd, "NtMapViewOfSection" + TRACE("NtMapViewOfSection" "(%lx, %lx, %lx, %lx, %lx, %lx, %lx, %lx, %lx, %lx)\n", (DWORD)SectionHandle, ProcessHandle, (DWORD)BaseAddress, ZeroBits, CommitSize, (DWORD)SectionOffset, (DWORD)ViewSize, InheritDisposition, AllocationType, Protect); - TRACE(vxd, "NtMapViewOfSection: " + TRACE("NtMapViewOfSection: " "base=%lx, offset=%lx, size=%lx, access=%lx\n", (DWORD)address, SectionOffset? SectionOffset->LowPart : 0, ViewSize? *ViewSize : 0, access); @@ -1215,7 +1215,7 @@ SectionOffset? SectionOffset->LowPart : 0, ViewSize? *ViewSize : 0, address); - TRACE(vxd, "NtMapViewOfSection: result=%lx\n", result); + TRACE("NtMapViewOfSection: result=%lx\n", result); if (W32S_WINE2APP(result, W32S_OFFSET)) { @@ -1242,7 +1242,7 @@ DWORD ProcessHandle = stack[0]; /* ignored */ LPBYTE BaseAddress = (LPBYTE)W32S_APP2WINE(stack[1], W32S_OFFSET); - TRACE(vxd, "NtUnmapViewOfSection(%lx, %lx)\n", + TRACE("NtUnmapViewOfSection(%lx, %lx)\n", ProcessHandle, (DWORD)BaseAddress); UnmapViewOfFile(BaseAddress); @@ -1273,10 +1273,10 @@ LPBYTE address = (LPBYTE)(BaseAddress? W32S_APP2WINE(*BaseAddress, W32S_OFFSET) : 0); DWORD size = ViewSize? *ViewSize : 0; - TRACE(vxd, "NtFlushVirtualMemory(%lx, %lx, %lx, %lx)\n", + TRACE("NtFlushVirtualMemory(%lx, %lx, %lx, %lx)\n", ProcessHandle, (DWORD)BaseAddress, (DWORD)ViewSize, (DWORD)unknown); - TRACE(vxd, "NtFlushVirtualMemory: base=%lx, size=%lx\n", + TRACE("NtFlushVirtualMemory: base=%lx, size=%lx\n", (DWORD)address, size); FlushViewOfFile(address, size); @@ -1297,7 +1297,7 @@ * Output: None */ - FIXME(vxd, "[0014] ECX=%lx EDX=%lx\n", + FIXME("[0014] ECX=%lx EDX=%lx\n", ECX_reg(context), EDX_reg(context)); /* FIXME */ @@ -1311,7 +1311,7 @@ * Output: None */ - TRACE(vxd, "[0015] EDX=%lx\n", EDX_reg(context)); + TRACE("[0015] EDX=%lx\n", EDX_reg(context)); /* We don't care, as we always have a coprocessor anyway */ break; @@ -1351,7 +1351,7 @@ * Output: None */ - FIXME(vxd, "[0017] EBX=%lx CX=%x\n", + FIXME("[0017] EBX=%lx CX=%x\n", EBX_reg(context), CX_reg(context)); /* FIXME */ @@ -1377,7 +1377,7 @@ DWORD size = stack[2]; DWORD result; - TRACE(vxd, "VirtualLock(%lx, %lx, %lx)\n", + TRACE("VirtualLock(%lx, %lx, %lx)\n", (DWORD)retv, (DWORD)base, size); result = VirtualLock(base, size); @@ -1411,7 +1411,7 @@ DWORD size = stack[2]; DWORD result; - TRACE(vxd, "VirtualUnlock(%lx, %lx, %lx)\n", + TRACE("VirtualUnlock(%lx, %lx, %lx)\n", (DWORD)retv, (DWORD)base, size); result = VirtualUnlock(base, size); @@ -1434,7 +1434,7 @@ * EDX: End of sparse memory arena */ - TRACE(vxd, "KGetSystemInfo()\n"); + TRACE("KGetSystemInfo()\n"); /* * Note: Win32s reserves 0GB - 2GB for Win 3.1 and uses 2GB - 4GB as @@ -1471,7 +1471,7 @@ struct Win32sMemoryInfo *info = (struct Win32sMemoryInfo *)W32S_APP2WINE(ESI_reg(context), W32S_OFFSET); - FIXME(vxd, "KGlobalMemStat(%lx)\n", (DWORD)info); + FIXME("KGlobalMemStat(%lx)\n", (DWORD)info); /* FIXME */ } @@ -1485,7 +1485,7 @@ * Output: None */ - TRACE(vxd, "[001c] ECX=%lx\n", ECX_reg(context)); + TRACE("[001c] ECX=%lx\n", ECX_reg(context)); /* FIXME */ break; @@ -1512,12 +1512,12 @@ DWORD prot = stack[3]; DWORD result; - TRACE(vxd, "VirtualAlloc16(%lx, %lx, %lx, %lx)\n", + TRACE("VirtualAlloc16(%lx, %lx, %lx, %lx)\n", (DWORD)base, size, type, prot); if (type & 0x80000000) { - WARN(vxd, "VirtualAlloc16: strange type %lx\n", type); + WARN("VirtualAlloc16: strange type %lx\n", type); type &= 0x7fffffff; } @@ -1529,7 +1529,7 @@ else EDX_reg(context) = 0, EAX_reg(context) = STATUS_NO_MEMORY; /* FIXME */ - TRACE(vxd, "VirtualAlloc16: returning base %lx\n", EDX_reg(context)); + TRACE("VirtualAlloc16: returning base %lx\n", EDX_reg(context)); } break; @@ -1553,7 +1553,7 @@ DWORD type = stack[2]; DWORD result; - TRACE(vxd, "VirtualFree16(%lx, %lx, %lx)\n", + TRACE("VirtualFree16(%lx, %lx, %lx)\n", (DWORD)base, size, type); result = VirtualFree(base, size, type); @@ -1581,7 +1581,7 @@ DWORD *ptr = (DWORD *)W32S_APP2WINE(ECX_reg(context), W32S_OFFSET); BOOL set = EDX_reg(context); - TRACE(vxd, "FWorkingSetSize(%lx, %lx)\n", (DWORD)ptr, (DWORD)set); + TRACE("FWorkingSetSize(%lx, %lx)\n", (DWORD)ptr, (DWORD)set); if (set) /* We do it differently ... */;
diff --git a/msdos/xms.c b/msdos/xms.c index 0653d52..c1dbfb7 100644 --- a/msdos/xms.c +++ b/msdos/xms.c
@@ -13,7 +13,7 @@ #include "module.h" #include "miscemu.h" #include "toolhelp.h" -#include "debug.h" +#include "debugtools.h" #include "selectors.h" DEFAULT_DEBUG_CHANNEL(int31) @@ -44,7 +44,7 @@ switch(AH_reg(context)) { case 0x00: /* Get XMS version number */ - TRACE(int31, "get XMS version number\n"); + TRACE("get XMS version number\n"); AX_reg(context) = 0x0200; /* 2.0 */ BX_reg(context) = 0x0000; /* internal revision */ DX_reg(context) = 0x0001; /* HMA exists */ @@ -53,16 +53,16 @@ { MEMMANINFO mmi; - TRACE(int31, "query free extended memory\n"); + TRACE("query free extended memory\n"); mmi.dwSize = sizeof(mmi); MemManInfo16(&mmi); AX_reg(context) = mmi.dwLargestFreeBlock >> 10; DX_reg(context) = (mmi.dwFreePages * VIRTUAL_GetPageSize()) >> 10; - TRACE(int31, "returning largest %dK, total %dK\n", AX_reg(context), DX_reg(context)); + TRACE("returning largest %dK, total %dK\n", AX_reg(context), DX_reg(context)); } break; case 0x09: /* Allocate Extended Memory Block */ - TRACE(int31, "allocate extended memory block (%dK)\n", + TRACE("allocate extended memory block (%dK)\n", DX_reg(context)); DX_reg(context) = GlobalAlloc16(GMEM_MOVEABLE, (DWORD)DX_reg(context)<<10); @@ -70,7 +70,7 @@ if (!DX_reg(context)) BL_reg(context) = 0xA0; /* out of memory */ break; case 0x0a: /* Free Extended Memory Block */ - TRACE(int31, "free extended memory block %04x\n",DX_reg(context)); + TRACE("free extended memory block %04x\n",DX_reg(context)); GlobalFree16(DX_reg(context)); break; case 0x0b: /* Move Extended Memory Block */ @@ -78,7 +78,7 @@ MOVESTRUCT*move=CTX_SEG_OFF_TO_LIN(context, DS_reg(context),ESI_reg(context)); BYTE*src,*dst; - TRACE(int31, "move extended memory block\n"); + TRACE("move extended memory block\n"); src=XMS_Offset(&move->Source); dst=XMS_Offset(&move->Dest); memcpy(dst,src,move->Length);