Converted to the new debug interface, using script written by Patrik Stridvall.
diff --git a/misc/callback.c b/misc/callback.c index e7d48fb..dd46fb0 100644 --- a/misc/callback.c +++ b/misc/callback.c
@@ -12,7 +12,7 @@ #include "cursoricon.h" #include "user.h" #include "queue.h" -#include "debug.h" +#include "debugtools.h" #include "win.h" DEFAULT_DEBUG_CHANNEL(relay) @@ -42,7 +42,7 @@ */ static LONG WINAPI CALLBACK_CallRegisterProc( CONTEXT86 *context, INT offset) { - ERR(relay, "Cannot call a register proc in Winelib\n" ); + ERR("Cannot call a register proc in Winelib\n" ); assert( FALSE ); return 0; } @@ -142,7 +142,7 @@ HMODULE16 hModule, HRSRC16 hRsrc ) { - ERR( relay, "Cannot call a 16-bit resource handler in Winelib\n" ); + ERR("Cannot call a 16-bit resource handler in Winelib\n" ); assert( FALSE ); return 0; } @@ -239,7 +239,7 @@ ); break; default: - WARN(relay,"(%ld) arguments not supported.\n",cbArgs); + WARN("(%ld) arguments not supported.\n",cbArgs); if (dwFlags == WCB16_CDECL) HeapFree(GetProcessHeap(),0,args); return FALSE; @@ -256,7 +256,7 @@ */ static DWORD WINAPI CALLBACK_CallUTProc( FARPROC16 proc, DWORD w1, DWORD w2 ) { - ERR( relay, "Cannot call a UT thunk proc in Winelib\n" ); + ERR("Cannot call a UT thunk proc in Winelib\n" ); assert( FALSE ); return 0; }
diff --git a/misc/cdrom.c b/misc/cdrom.c index fe4e0b4..633bc7a 100644 --- a/misc/cdrom.c +++ b/misc/cdrom.c
@@ -11,7 +11,7 @@ #include <fcntl.h> #include <sys/ioctl.h> #include "cdrom.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(cdaudio) @@ -33,7 +33,7 @@ #if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) wcda->unixdev = open(CDAUDIO_DEV, O_RDONLY | O_NONBLOCK, 0); if (wcda->unixdev == -1) { - WARN(cdaudio,"can't open '%s'!. errno=%d\n", CDAUDIO_DEV, errno); + WARN("can't open '%s'!. errno=%d\n", CDAUDIO_DEV, errno); return -1; } wcda->cdaMode = WINE_CDA_OPEN; /* to force reading tracks info */ @@ -86,7 +86,7 @@ if (ioctl(wcda->unixdev, CDIOREADTOCHEADER, &hdr)) #endif { - WARN(cdaudio, "(%p) -- Error occured (%d)!\n", wcda, errno); + WARN("(%p) -- Error occured (%d)!\n", wcda, errno); return (WORD)-1; } #ifdef linux @@ -123,7 +123,7 @@ if (wcda->nTracks == 0) { if (CDAUDIO_GetNumberOfTracks(wcda) == (WORD)-1) return FALSE; } - TRACE(cdaudio,"nTracks=%u\n", wcda->nTracks); + TRACE("nTracks=%u\n", wcda->nTracks); if (wcda->lpdwTrackLen != NULL) free(wcda->lpdwTrackLen); @@ -136,7 +136,7 @@ wcda->lpbTrackFlags = (LPBYTE)malloc((wcda->nTracks + 1) * sizeof(BYTE)); if (wcda->lpdwTrackLen == NULL || wcda->lpdwTrackPos == NULL || wcda->lpbTrackFlags == NULL) { - WARN(cdaudio, "error allocating track table !\n"); + WARN("error allocating track table !\n"); return FALSE; } memset(wcda->lpdwTrackLen, 0, (wcda->nTracks + 1) * sizeof(DWORD)); @@ -170,7 +170,7 @@ if (ioctl(wcda->unixdev, CDIOREADTOCENTRYS, &entry)) #endif { - WARN(cdaudio, "error read entry (%d)\n", errno); + WARN("error read entry (%d)\n", errno); /* update status according to new status */ CDAUDIO_GetCDStatus(wcda); @@ -188,7 +188,7 @@ if (i == 0) { last_start = start; wcda->dwFirstOffset = start; - TRACE(cdaudio, "dwFirstOffset=%u\n", start); + TRACE("dwFirstOffset=%u\n", start); } else { length = start - last_start; last_start = start; @@ -196,7 +196,7 @@ total_length += length; wcda->lpdwTrackLen[i - 1] = length; wcda->lpdwTrackPos[i - 1] = start; - TRACE(cdaudio, "track #%u start=%u len=%u\n", i, start, length); + TRACE("track #%u start=%u len=%u\n", i, start, length); } #ifdef linux wcda->lpbTrackFlags[i] = @@ -205,10 +205,10 @@ wcda->lpbTrackFlags[i] = (toc_buffer.addr_type << 4) | (toc_buffer.control & 0x0f); #endif - TRACE(cdaudio, "track #%u flags=%02x\n", i + 1, wcda->lpbTrackFlags[i]); + TRACE("track #%u flags=%02x\n", i + 1, wcda->lpbTrackFlags[i]); } wcda->dwTotalLen = total_length; - TRACE(cdaudio,"total_len=%u\n", total_length); + TRACE("total_len=%u\n", total_length); return TRUE; #else return FALSE; @@ -239,7 +239,7 @@ if (ioctl(wcda->unixdev, CDIOCREADSUBCHANNEL, &read_sc)) #endif { - TRACE(cdaudio,"opened or no_media (%d)!\n", errno); + TRACE("opened or no_media (%d)!\n", errno); wcda->cdaMode = WINE_CDA_OPEN; /* was NOT_READY */ return TRUE; } @@ -255,7 +255,7 @@ #else case CD_AS_AUDIO_INVALID: #endif - WARN(cdaudio, "device doesn't support status.\n"); + WARN("device doesn't support status.\n"); wcda->cdaMode = WINE_CDA_DONTKNOW; break; #ifdef linux @@ -264,7 +264,7 @@ case CD_AS_NO_STATUS: #endif wcda->cdaMode = WINE_CDA_STOP; - TRACE(cdaudio,"WINE_CDA_STOP !\n"); + TRACE("WINE_CDA_STOP !\n"); break; #ifdef linux case CDROM_AUDIO_PLAY: @@ -279,14 +279,14 @@ case CD_AS_PLAY_PAUSED: #endif wcda->cdaMode = WINE_CDA_PAUSE; - TRACE(cdaudio,"WINE_CDA_PAUSE !\n"); + TRACE("WINE_CDA_PAUSE !\n"); break; default: #ifdef linux - TRACE(cdaudio,"status=%02X !\n", + TRACE("status=%02X !\n", wcda->sc.cdsc_audiostatus); #else - TRACE(cdaudio,"status=%02X !\n", + TRACE("status=%02X !\n", wcda->sc.header.audio_status); #endif } @@ -304,13 +304,13 @@ wcda->sc.what.position.absaddr.msf.frame; #endif #ifdef linux - TRACE(cdaudio,"%02u-%02u:%02u:%02u \n", + TRACE("%02u-%02u:%02u:%02u \n", wcda->sc.cdsc_trk, wcda->sc.cdsc_absaddr.msf.minute, wcda->sc.cdsc_absaddr.msf.second, wcda->sc.cdsc_absaddr.msf.frame); #else - TRACE(cdaudio,"%02u-%02u:%02u:%02u \n", + TRACE("%02u-%02u:%02u:%02u \n", wcda->sc.what.position.track_number, wcda->sc.what.position.absaddr.msf.minute, wcda->sc.what.position.absaddr.msf.second, @@ -319,7 +319,7 @@ if (oldmode != wcda->cdaMode && oldmode == WINE_CDA_OPEN) { if (!CDAUDIO_GetTracksInfo(wcda)) { - WARN(cdaudio, "error updating TracksInfo !\n"); + WARN("error updating TracksInfo !\n"); return FALSE; } } @@ -362,7 +362,7 @@ if (ioctl(wcda->unixdev, CDIOCSTART, NULL)) #endif { - WARN(cdaudio, "motor doesn't start !\n"); + WARN("motor doesn't start !\n"); return -1; } #ifdef linux @@ -371,15 +371,15 @@ if (ioctl(wcda->unixdev, CDIOCPLAYMSF, &msf)) #endif { - WARN(cdaudio, "device doesn't play !\n"); + WARN("device doesn't play !\n"); return -1; } #ifdef linux - TRACE(cdaudio,"msf = %d:%d:%d %d:%d:%d\n", + TRACE("msf = %d:%d:%d %d:%d:%d\n", msf.cdmsf_min0, msf.cdmsf_sec0, msf.cdmsf_frame0, msf.cdmsf_min1, msf.cdmsf_sec1, msf.cdmsf_frame1); #else - TRACE(cdaudio,"msf = %d:%d:%d %d:%d:%d\n", + TRACE("msf = %d:%d:%d %d:%d:%d\n", msf.start_m, msf.start_s, msf.start_f, msf.end_m, msf.end_s, msf.end_f); #endif @@ -440,7 +440,7 @@ /* FIXME: the current end for play is lost * use end of CD ROM instead */ - FIXME(cdaudio, "Could a BSD expert implement the seek function ?\n"); + FIXME("Could a BSD expert implement the seek function ?\n"); CDAUDIO_Play(wcda, at, wcda->lpdwTrackPos[wcda->nTracks] + wcda->lpdwTrackLen[wcda->nTracks]); #endif
diff --git a/misc/comm.c b/misc/comm.c index 73b67db..c00aa26 100644 --- a/misc/comm.c +++ b/misc/comm.c
@@ -66,7 +66,7 @@ #include "winerror.h" #include "async.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(comm) @@ -108,15 +108,15 @@ } stat(temp, &st); if (!S_ISCHR(st.st_mode)) - WARN(comm,"Can't use `%s' as %s !\n", temp, option); + WARN("Can't use `%s' as %s !\n", temp, option); else if ((COM[x].devicename = malloc(strlen(temp)+1)) == NULL) - WARN(comm,"Can't malloc for device info!\n"); + WARN("Can't malloc for device info!\n"); else { COM[x].fd = 0; strcpy(COM[x].devicename, temp); } - TRACE(comm, "%s = %s\n", option, COM[x].devicename); + TRACE("%s = %s\n", option, COM[x].devicename); } strcpy(option, "LPTx"); @@ -130,15 +130,15 @@ else { stat(temp, &st); if (!S_ISCHR(st.st_mode)) - WARN(comm,"Can't use `%s' as %s !\n", temp, option); + WARN("Can't use `%s' as %s !\n", temp, option); else if ((LPT[x].devicename = malloc(strlen(temp)+1)) == NULL) - WARN(comm,"Can't malloc for device info!\n"); + WARN("Can't malloc for device info!\n"); else { LPT[x].fd = 0; strcpy(LPT[x].devicename, temp); } - TRACE(comm, "%s = %s\n", option, LPT[x].devicename); + TRACE("%s = %s\n", option, LPT[x].devicename); } } @@ -184,7 +184,7 @@ static int WinError(void) { - TRACE(comm, "errno = %d\n", errno); + TRACE("errno = %d\n", errno); switch (errno) { default: return CE_IOE; @@ -220,7 +220,7 @@ WORD mask = 0; int cid = GetCommPort_fd(fd); - TRACE(comm, "async notification\n"); + TRACE("async notification\n"); /* read data from comm port */ prev = comm_inbuf(ptr); do { @@ -286,7 +286,7 @@ /* send notifications, if any */ if (ptr->wnd && mask) { - TRACE(comm, "notifying %04x: cid=%d, mask=%02x\n", ptr->wnd, cid, mask); + TRACE("notifying %04x: cid=%d, mask=%02x\n", ptr->wnd, cid, mask); PostMessage16(ptr->wnd, WM_COMMNOTIFY, cid, mask); } } @@ -301,14 +301,14 @@ int port; char *ptr, temp[256]; - TRACE(comm, "(%s), ptr %p\n", device, lpdcb); + TRACE("(%s), ptr %p\n", device, lpdcb); if (!lstrncmpiA(device,"COM",3)) { port = device[3] - '0'; if (port-- == 0) { - ERR(comm, "BUG ! COM0 can't exist!.\n"); + ERR("BUG ! COM0 can't exist!.\n"); return -1; } @@ -333,13 +333,13 @@ lpdcb->BaudRate = COM[port].baudrate; else lpdcb->BaudRate = atoi(ptr); - TRACE(comm,"baudrate (%d)\n", lpdcb->BaudRate); + TRACE("baudrate (%d)\n", lpdcb->BaudRate); ptr = strtok(NULL, ", "); if (islower(*ptr)) *ptr = toupper(*ptr); - TRACE(comm,"parity (%c)\n", *ptr); + TRACE("parity (%c)\n", *ptr); lpdcb->fParity = TRUE; switch (*ptr) { case 'N': @@ -356,16 +356,16 @@ lpdcb->Parity = ODDPARITY; break; default: - WARN(comm,"Unknown parity `%c'!\n", *ptr); + WARN("Unknown parity `%c'!\n", *ptr); return -1; } ptr = strtok(NULL, ", "); - TRACE(comm, "charsize (%c)\n", *ptr); + TRACE("charsize (%c)\n", *ptr); lpdcb->ByteSize = *ptr - '0'; ptr = strtok(NULL, ", "); - TRACE(comm, "stopbits (%c)\n", *ptr); + TRACE("stopbits (%c)\n", *ptr); switch (*ptr) { case '1': lpdcb->StopBits = ONESTOPBIT; @@ -374,7 +374,7 @@ lpdcb->StopBits = TWOSTOPBITS; break; default: - WARN(comm,"Unknown # of stopbits `%c'!\n", *ptr); + WARN("Unknown # of stopbits `%c'!\n", *ptr); return -1; } } @@ -389,16 +389,16 @@ { int port,fd; - TRACE(comm, "%s, %d, %d\n", device, cbInQueue, cbOutQueue); + TRACE("%s, %d, %d\n", device, cbInQueue, cbOutQueue); port = device[3] - '0'; if (port-- == 0) - ERR(comm, "BUG ! COM0 or LPT0 don't exist !\n"); + ERR("BUG ! COM0 or LPT0 don't exist !\n"); if (!lstrncmpiA(device,"COM",3)) { - TRACE(comm, "%s = %s\n", device, COM[port].devicename); + TRACE("%s = %s\n", device, COM[port].devicename); if (!ValidCOMPort(port)) return IE_BADID; @@ -408,7 +408,7 @@ fd = open(COM[port].devicename, O_RDWR | O_NONBLOCK); if (fd == -1) { - ERR(comm, "error=%d\n", errno); + ERR("error=%d\n", errno); return IE_HARDWARE; } else { unknown[port] = SEGPTR_ALLOC(40); @@ -448,7 +448,7 @@ /* not enough memory */ tcsetattr(COM[port].fd,TCSANOW,&m_stat[port]); close(COM[port].fd); - ERR(comm, "out of memory"); + ERR("out of memory"); return IE_MEMORY; } @@ -488,7 +488,7 @@ { struct DosDeviceStruct *ptr; - TRACE(comm,"cid=%d\n", cid); + TRACE("cid=%d\n", cid); if ((ptr = GetDeviceStruct(cid)) == NULL) { return -1; } @@ -524,7 +524,7 @@ { struct DosDeviceStruct *ptr; - TRACE(comm,"cid=%d\n", cid); + TRACE("cid=%d\n", cid); if ((ptr = GetDeviceStruct(cid)) == NULL) { return -1; } @@ -541,7 +541,7 @@ { struct DosDeviceStruct *ptr; - TRACE(comm,"cid=%d\n", cid); + TRACE("cid=%d\n", cid); if ((ptr = GetDeviceStruct(cid)) == NULL) { return -1; } @@ -560,7 +560,7 @@ struct DosDeviceStruct *ptr; struct termios port; - TRACE(comm,"cid=%d, function=%d\n", cid, nFunction); + TRACE("cid=%d, function=%d\n", cid, nFunction); if ((ptr = GetDeviceStruct(cid)) == NULL) { return -1; } @@ -613,7 +613,7 @@ break; default: - WARN(comm,"(cid=%d,nFunction=%d): Unknown function\n", + WARN("(cid=%d,nFunction=%d): Unknown function\n", cid, nFunction); break; } @@ -635,7 +635,7 @@ int queue; struct DosDeviceStruct *ptr; - TRACE(comm,"cid=%d, queue=%d\n", cid, fnQueue); + TRACE("cid=%d, queue=%d\n", cid, fnQueue); if ((ptr = GetDeviceStruct(cid)) == NULL) { return -1; } @@ -649,7 +649,7 @@ ptr->ibuf_head = ptr->ibuf_tail; break; default: - WARN(comm,"(cid=%d,fnQueue=%d):Unknown queue\n", + WARN("(cid=%d,fnQueue=%d):Unknown queue\n", cid, fnQueue); return -1; } @@ -676,7 +676,7 @@ return -1; } if (cid&FLAG_LPT) { - WARN(comm," cid %d not comm port\n",cid); + WARN(" cid %d not comm port\n",cid); return CE_MODE; } stol = (unsigned char *)unknown[cid] + COMM_MSR_OFFSET; @@ -692,12 +692,12 @@ lpStat->cbOutQue = comm_outbuf(ptr); lpStat->cbInQue = comm_inbuf(ptr); - TRACE(comm, "cid %d, error %d, lpStat %d %d %d stol %x\n", + TRACE("cid %d, error %d, lpStat %d %d %d stol %x\n", cid, ptr->commerror, lpStat->status, lpStat->cbInQue, lpStat->cbOutQue, *stol); } else - TRACE(comm, "cid %d, error %d, lpStat NULL stol %x\n", + TRACE("cid %d, error %d, lpStat NULL stol %x\n", cid, ptr->commerror, *stol); /* Return any errors and clear it */ @@ -716,26 +716,26 @@ int repid; unsigned int mstat; - TRACE(comm,"cid %d,mask %d\n",cid,fuEvtMask); + TRACE("cid %d,mask %d\n",cid,fuEvtMask); if ((ptr = GetDeviceStruct(cid)) == NULL) return (SEGPTR)NULL; ptr->eventmask = fuEvtMask; if ((cid&FLAG_LPT) || !ValidCOMPort(cid)) { - WARN(comm," cid %d not comm port\n",cid); + WARN(" cid %d not comm port\n",cid); return (SEGPTR)NULL; } /* it's a COM port ? -> modify flags */ stol = (unsigned char *)unknown[cid] + COMM_MSR_OFFSET; repid = ioctl(ptr->fd,TIOCMGET,&mstat); - TRACE(comm, " ioctl %d, msr %x at %p %p\n",repid,mstat,stol,unknown[cid]); + TRACE(" ioctl %d, msr %x at %p %p\n",repid,mstat,stol,unknown[cid]); if ((mstat&TIOCM_CAR)) *stol |= 0x80; else *stol &=0x7f; - TRACE(comm," modem dcd construct %x\n",*stol); + TRACE(" modem dcd construct %x\n",*stol); return SEGPTR_GET(unknown[cid]); } @@ -747,12 +747,12 @@ struct DosDeviceStruct *ptr; WORD events; - TRACE(comm, "cid %d, mask %d\n", cid, fnEvtClear); + TRACE("cid %d, mask %d\n", cid, fnEvtClear); if ((ptr = GetDeviceStruct(cid)) == NULL) return 0; if ((cid&FLAG_LPT) || !ValidCOMPort(cid)) { - WARN(comm," cid %d not comm port\n",cid); + WARN(" cid %d not comm port\n",cid); return 0; } @@ -769,7 +769,7 @@ struct termios port; struct DosDeviceStruct *ptr; - TRACE(comm, "cid %d, ptr %p\n", lpdcb->Id, lpdcb); + TRACE("cid %d, ptr %p\n", lpdcb->Id, lpdcb); if ((ptr = GetDeviceStruct(lpdcb->Id)) == NULL) { return -1; } @@ -796,7 +796,7 @@ port.c_lflag &= ~(ICANON|ECHO|ISIG); port.c_lflag |= NOFLSH; - TRACE(comm,"baudrate %d\n",lpdcb->BaudRate); + TRACE("baudrate %d\n",lpdcb->BaudRate); #ifdef CBAUD port.c_cflag &= ~CBAUD; switch (lpdcb->BaudRate) { @@ -894,7 +894,7 @@ } port.c_ispeed = port.c_ospeed; #endif - TRACE(comm,"bytesize %d\n",lpdcb->ByteSize); + TRACE("bytesize %d\n",lpdcb->ByteSize); port.c_cflag &= ~CSIZE; switch (lpdcb->ByteSize) { case 5: @@ -914,7 +914,7 @@ return -1; } - TRACE(comm,"fParity %d Parity %d\n",lpdcb->fParity, lpdcb->Parity); + TRACE("fParity %d Parity %d\n",lpdcb->fParity, lpdcb->Parity); port.c_cflag &= ~(PARENB | PARODD); if (lpdcb->fParity) port.c_iflag |= INPCK; @@ -935,7 +935,7 @@ } - TRACE(comm,"stopbits %d\n",lpdcb->StopBits); + TRACE("stopbits %d\n",lpdcb->StopBits); switch (lpdcb->StopBits) { case ONESTOPBIT: @@ -984,7 +984,7 @@ struct DosDeviceStruct *ptr; struct termios port; - TRACE(comm,"cid %d, ptr %p\n", cid, lpdcb); + TRACE("cid %d, ptr %p\n", cid, lpdcb); if ((ptr = GetDeviceStruct(cid)) == NULL) { return -1; } @@ -1122,7 +1122,7 @@ { struct DosDeviceStruct *ptr; - TRACE(comm, "cid %d, data %d \n", cid, chTransmit); + TRACE("cid %d, data %d \n", cid, chTransmit); if ((ptr = GetDeviceStruct(cid)) == NULL) { return -1; } @@ -1161,7 +1161,7 @@ { struct DosDeviceStruct *ptr; - TRACE(comm,"cid %d (char %d)\n", cid, chUnget); + TRACE("cid %d (char %d)\n", cid, chUnget); if ((ptr = GetDeviceStruct(cid)) == NULL) { return -1; } @@ -1193,7 +1193,7 @@ struct DosDeviceStruct *ptr; LPSTR orgBuf = lpvBuf; - TRACE(comm, "cid %d, ptr %p, length %d\n", cid, lpvBuf, cbRead); + TRACE("cid %d, ptr %p, length %d\n", cid, lpvBuf, cbRead); if ((ptr = GetDeviceStruct(cid)) == NULL) { return -1; } @@ -1228,7 +1228,7 @@ length += status; } - TRACE(comm,"%.*s\n", length, orgBuf); + TRACE("%.*s\n", length, orgBuf); ptr->commerror = 0; return length; } @@ -1241,7 +1241,7 @@ int status, length; struct DosDeviceStruct *ptr; - TRACE(comm,"cid %d, ptr %p, length %d\n", + TRACE("cid %d, ptr %p, length %d\n", cid, lpvBuf, cbWrite); if ((ptr = GetDeviceStruct(cid)) == NULL) { return -1; @@ -1252,7 +1252,7 @@ return -1; } - TRACE(comm,"%.*s\n", cbWrite, lpvBuf ); + TRACE("%.*s\n", cbWrite, lpvBuf ); length = 0; while (length < cbWrite) { @@ -1291,7 +1291,7 @@ { struct DosDeviceStruct *ptr; - TRACE(comm, "(%d, %x, %d, %d)\n", cid, hwnd, cbWriteNotify, cbOutQueue); + TRACE("(%d, %x, %d, %d)\n", cid, hwnd, cbWriteNotify, cbOutQueue); if ((ptr = GetDeviceStruct(cid)) == NULL) { ptr->commerror = IE_BADID; return -1; @@ -1320,12 +1320,12 @@ int port; char *ptr,*temp; - TRACE(comm,"(%s,%p,%p)\n",device,lpdcb,lptimeouts); + TRACE("(%s,%p,%p)\n",device,lpdcb,lptimeouts); if (!lstrncmpiA(device,"COM",3)) { port=device[3]-'0'; if (port--==0) { - ERR(comm,"BUG! COM0 can't exists!.\n"); + ERR("BUG! COM0 can't exists!.\n"); return FALSE; } if (!ValidCOMPort(port)) @@ -1393,19 +1393,19 @@ flag=0; if (!strncmp("baud=",ptr,5)) { if (!sscanf(ptr+5,"%ld",&x)) - WARN(comm,"Couldn't parse %s\n",ptr); + WARN("Couldn't parse %s\n",ptr); lpdcb->BaudRate = x; flag=1; } if (!strncmp("stop=",ptr,5)) { if (!sscanf(ptr+5,"%ld",&x)) - WARN(comm,"Couldn't parse %s\n",ptr); + WARN("Couldn't parse %s\n",ptr); lpdcb->StopBits = x; flag=1; } if (!strncmp("data=",ptr,5)) { if (!sscanf(ptr+5,"%ld",&x)) - WARN(comm,"Couldn't parse %s\n",ptr); + WARN("Couldn't parse %s\n",ptr); lpdcb->ByteSize = x; flag=1; } @@ -1429,7 +1429,7 @@ flag=1; } if (!flag) - ERR(comm,"Unhandled specifier '%s', please report.\n",ptr); + ERR("Unhandled specifier '%s', please report.\n",ptr); ptr=strtok(NULL," "); } if (lpdcb->BaudRate==110) @@ -1446,7 +1446,7 @@ LPSTR devidA; BOOL ret; - TRACE(comm,"(%p,%p,%p)\n",devid,lpdcb,lptimeouts); + TRACE("(%p,%p,%p)\n",devid,lpdcb,lptimeouts); devidA = HEAP_strdupWtoA( GetProcessHeap(), 0, devid ); ret=BuildCommDCBAndTimeoutsA(devidA,lpdcb,lptimeouts); HeapFree( GetProcessHeap(), 0, devidA ); @@ -1497,7 +1497,7 @@ */ BOOL WINAPI SetCommBreak(HANDLE handle) { - FIXME(comm,"handle %d, stub!\n", handle); + FIXME("handle %d, stub!\n", handle); return TRUE; } @@ -1506,7 +1506,7 @@ */ BOOL WINAPI ClearCommBreak(HANDLE handle) { - FIXME(comm,"handle %d, stub!\n", handle); + FIXME("handle %d, stub!\n", handle); return TRUE; } @@ -1518,7 +1518,7 @@ int fd; struct termios port; - TRACE(comm,"handle %d, function=%d\n", handle, nFunction); + TRACE("handle %d, function=%d\n", handle, nFunction); fd = COMM_GetWriteFd(handle); if(fd<0) return FALSE; @@ -1563,15 +1563,15 @@ port.c_iflag |= IXON; break; case SETBREAK: - FIXME(comm,"setbreak, stub\n"); + FIXME("setbreak, stub\n"); /* ptr->suspended = 1; */ break; case CLRBREAK: - FIXME(comm,"clrbreak, stub\n"); + FIXME("clrbreak, stub\n"); /* ptr->suspended = 0; */ break; default: - WARN(comm,"(handle=%d,nFunction=%d): Unknown function\n", + WARN("(handle=%d,nFunction=%d): Unknown function\n", handle, nFunction); break; } @@ -1594,7 +1594,7 @@ { int fd; - TRACE(comm,"handle %d, flags %lx\n", handle, flags); + TRACE("handle %d, flags %lx\n", handle, flags); fd = COMM_GetWriteFd(handle); if(fd<0) @@ -1644,15 +1644,15 @@ lpStat->status = 0; if(ioctl(fd, TIOCOUTQ, &lpStat->cbOutQue)) - WARN(comm, "ioctl returned error\n"); + WARN("ioctl returned error\n"); if(ioctl(fd, TIOCINQ, &lpStat->cbInQue)) - WARN(comm, "ioctl returned error\n"); + WARN("ioctl returned error\n"); } close(fd); - TRACE(comm,"handle %d cbInQue = %ld cbOutQue = %ld\n", + TRACE("handle %d cbInQue = %ld cbOutQue = %ld\n", handle, lpStat->cbInQue, lpStat->cbOutQue); @@ -1677,7 +1677,7 @@ { int fd; - FIXME(comm, "insize %ld outsize %ld unimplemented stub\n", insize, outsize); + FIXME("insize %ld outsize %ld unimplemented stub\n", insize, outsize); fd=COMM_GetWriteFd(handle); if(0>fd) { @@ -1694,7 +1694,7 @@ { int fd; - TRACE(comm, "handle %d, mask %p\n", handle, evtmask); + TRACE("handle %d, mask %p\n", handle, evtmask); if(0>(fd=COMM_GetReadFd(handle))) { return FALSE; @@ -1711,7 +1711,7 @@ { int fd; - TRACE(comm, "handle %d, mask %lx\n", handle, evtmask); + TRACE("handle %d, mask %lx\n", handle, evtmask); if(0>(fd=COMM_GetWriteFd(handle))) { return FALSE; } @@ -1728,7 +1728,7 @@ struct termios port; int fd; - TRACE(comm,"handle %d, ptr %p\n", handle, lpdcb); + TRACE("handle %d, ptr %p\n", handle, lpdcb); if ((fd = COMM_GetWriteFd(handle)) < 0) return FALSE; @@ -1849,7 +1849,7 @@ } port.c_ispeed = port.c_ospeed; #endif - TRACE(comm,"bytesize %d\n",lpdcb->ByteSize); + TRACE("bytesize %d\n",lpdcb->ByteSize); port.c_cflag &= ~CSIZE; switch (lpdcb->ByteSize) { case 5: @@ -1870,7 +1870,7 @@ return FALSE; } - TRACE(comm,"fParity %d Parity %d\n",lpdcb->fParity, lpdcb->Parity); + TRACE("fParity %d Parity %d\n",lpdcb->fParity, lpdcb->Parity); port.c_cflag &= ~(PARENB | PARODD); if (lpdcb->fParity) port.c_iflag |= INPCK; @@ -1892,7 +1892,7 @@ } - TRACE(comm,"stopbits %d\n",lpdcb->StopBits); + TRACE("stopbits %d\n",lpdcb->StopBits); switch (lpdcb->StopBits) { case ONESTOPBIT: port.c_cflag &= ~CSTOPB; @@ -1944,12 +1944,12 @@ struct termios port; int fd; - TRACE(comm,"handle %d, ptr %p\n", handle, lpdcb); + TRACE("handle %d, ptr %p\n", handle, lpdcb); if ((fd = COMM_GetReadFd(handle)) < 0) return FALSE; if (tcgetattr(fd, &port) == -1) { - TRACE(comm,"tcgetattr(%d, ...) returned -1",fd); + TRACE("tcgetattr(%d, ...) returned -1",fd); commerror = WinError(); close( fd ); return FALSE; @@ -2060,7 +2060,7 @@ commerror = 0; - TRACE(comm,"OK\n"); + TRACE("OK\n"); return TRUE; } @@ -2072,7 +2072,7 @@ { struct DosDeviceStruct *ptr; - FIXME(comm,"(%d,'%c'), use win32 handle!\n",cid,chTransmit); + FIXME("(%d,'%c'), use win32 handle!\n",cid,chTransmit); if ((ptr = GetDeviceStruct(cid)) == NULL) { return FALSE; } @@ -2095,7 +2095,7 @@ */ BOOL WINAPI GetCommTimeouts(INT cid,LPCOMMTIMEOUTS lptimeouts) { - FIXME(comm,"(%x,%p):stub.\n",cid,lptimeouts); + FIXME("(%x,%p):stub.\n",cid,lptimeouts); return TRUE; } @@ -2103,7 +2103,7 @@ * SetCommTimeouts (KERNEL32.453) */ BOOL WINAPI SetCommTimeouts(INT cid,LPCOMMTIMEOUTS lptimeouts) { - FIXME(comm,"(%x,%p):stub.\n",cid,lptimeouts); + FIXME("(%x,%p):stub.\n",cid,lptimeouts); return TRUE; } @@ -2112,7 +2112,7 @@ */ BOOL WINAPI GetCommModemStatus(HANDLE hFile,LPDWORD lpModemStat ) { - FIXME(comm, "(%d %p)\n",hFile,lpModemStat ); + FIXME("(%d %p)\n",hFile,lpModemStat ); return TRUE; } /*********************************************************************** @@ -2120,7 +2120,7 @@ */ BOOL WINAPI WaitCommEvent(HANDLE hFile,LPDWORD eventmask ,LPOVERLAPPED overlapped) { - FIXME(comm, "(%d %p %p )\n",hFile, eventmask,overlapped); + FIXME("(%d %p %p )\n",hFile, eventmask,overlapped); return TRUE; } @@ -2129,7 +2129,7 @@ */ BOOL WINAPI GetCommProperties(HANDLE hFile, LPDCB *dcb) { - FIXME(comm, "(%d %p )\n",hFile,dcb); + FIXME("(%d %p )\n",hFile,dcb); return TRUE; } @@ -2138,7 +2138,7 @@ */ BOOL WINAPI SetCommProperties(HANDLE hFile, LPDCB dcb) { - FIXME(comm, "(%d %p )\n",hFile,dcb); + FIXME("(%d %p )\n",hFile,dcb); return TRUE; }
diff --git a/misc/cpu.c b/misc/cpu.c index 8ad04bb..629d136 100644 --- a/misc/cpu.c +++ b/misc/cpu.c
@@ -15,7 +15,7 @@ #include "winnt.h" #include "winerror.h" #include "winreg.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(reg) @@ -76,7 +76,7 @@ /* Create this registry key for all systems */ if (RegCreateKey16(HKEY_LOCAL_MACHINE,"HARDWARE\\DESCRIPTION\\System\\CentralProcessor",&hkey)!=ERROR_SUCCESS) { - WARN(reg,"Unable to register CPU information\n"); + WARN("Unable to register CPU information\n"); } #ifdef linux
diff --git a/misc/crtdll.c b/misc/crtdll.c index 5b92d69..98d93f4 100644 --- a/misc/crtdll.c +++ b/misc/crtdll.c
@@ -42,7 +42,7 @@ #include "winuser.h" #include "winerror.h" #include "ntddk.h" -#include "debug.h" +#include "debugtools.h" #include "module.h" #include "heap.h" #include "crtdll.h" @@ -106,7 +106,7 @@ */ BOOL WINAPI CRTDLL_Init(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE(crtdll,"(0x%08x,%ld,%p)\n",hinstDLL,fdwReason,lpvReserved); + TRACE("(0x%08x,%ld,%p)\n",hinstDLL,fdwReason,lpvReserved); if (fdwReason == DLL_PROCESS_ATTACH) { CRTDLL__fdopen(0,"r"); @@ -127,12 +127,12 @@ int xargc,i,afterlastspace; DWORD version; - TRACE(crtdll,"(%p,%p,%p,%ld).\n", + TRACE("(%p,%p,%p,%ld).\n", argc,argv,environ,flag ); CRTDLL_acmdln_dll = cmdline = HEAP_strdupA( GetProcessHeap(), 0, GetCommandLineA() ); - TRACE(crtdll,"got '%s'\n", cmdline); + TRACE("got '%s'\n", cmdline); version = GetVersion(); CRTDLL_osver_dll = version >> 16; @@ -174,7 +174,7 @@ CRTDLL_argv_dll = xargv; *argv = xargv; - TRACE(crtdll,"found %d arguments\n", + TRACE("found %d arguments\n", CRTDLL_argc_dll); CRTDLL_environ_dll = *environ = GetEnvironmentStringsA(); return 0; @@ -200,7 +200,7 @@ */ DWORD __cdecl CRTDLL__findfirst(LPCSTR fname, struct find_t * x2) { - FIXME(crtdll, ":(%s,%p): stub\n",fname,x2); + FIXME(":(%s,%p): stub\n",fname,x2); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -213,7 +213,7 @@ */ INT __cdecl CRTDLL__findnext(DWORD hand, struct find_t * x2) { - FIXME(crtdll, ":(%ld,%p): stub\n",hand,x2); + FIXME(":(%ld,%p): stub\n",hand,x2); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -226,7 +226,7 @@ */ int __cdecl CRTDLL__fstat(int file, struct stat* buf) { - FIXME(crtdll, ":(%d,%p): stub\n",file,buf); + FIXME(":(%d,%p): stub\n",file,buf); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -238,7 +238,7 @@ { _INITTERMFUN *current; - TRACE(crtdll,"(%p,%p)\n",start,end); + TRACE("(%p,%p)\n",start,end); current=start; while (current<end) { if (*current) (*current)(); @@ -273,7 +273,7 @@ file->handle = handle; break; } - TRACE(crtdll, "open handle %d mode %s got file %p\n", + TRACE("open handle %d mode %s got file %p\n", handle, mode, file); return file; } @@ -292,7 +292,7 @@ */ void __cdecl CRTDLL__local_unwind2( PEXCEPTION_FRAME endframe, DWORD nr ) { - TRACE(crtdll,"(%p,%ld)\n",endframe,nr); + TRACE("(%p,%ld)\n",endframe,nr); } /********************************************************************* * _read (CRTDLL.256) @@ -302,7 +302,7 @@ */ INT __cdecl CRTDLL__read(INT fd, LPVOID buf, UINT count) { - FIXME(crtdll,":(%d,%p,%d): stub\n",fd,buf,count); + FIXME(":(%d,%p,%d): stub\n",fd,buf,count); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -318,7 +318,7 @@ DOS_FULL_NAME full_name; if (!DOSFS_GetFullName( path, FALSE, &full_name )) { - WARN(crtdll, "file %s bad name\n",path); + WARN("file %s bad name\n",path); return 0; } @@ -359,7 +359,7 @@ file = HeapAlloc( GetProcessHeap(), 0, sizeof(*file) ); file->handle = handle; } - TRACE(crtdll, "file %s mode %s got handle %d file %p\n", + TRACE("file %s mode %s got handle %d file %p\n", path,mode,handle,file); return file; } @@ -378,7 +378,7 @@ known binary extensions must be unchanged */ while ( (i < (nmemb*size)) && (ret==1)) { ret=fread(temp,1,1,file); - TRACE(crtdll, "got %c 0x%02x ret %d\n", + TRACE("got %c 0x%02x ret %d\n", (isalpha(*(unsigned char*)temp))? *(unsigned char*)temp: ' ',*(unsigned char*)temp, ret); if (*(unsigned char*)temp != 0xd) { /* skip CR */ @@ -386,21 +386,21 @@ i++; } else - TRACE(crtdll, "skipping ^M\n"); + TRACE("skipping ^M\n"); } - TRACE(crtdll, "0x%08x items of size %d from file %p to %p\n", + TRACE("0x%08x items of size %d from file %p to %p\n", nmemb,size,file,ptr,); if(i!=nmemb) - WARN(crtdll, " failed!\n"); + WARN(" failed!\n"); return i; #else DWORD ret; - TRACE(crtdll, "0x%08x items of size %d from file %p to %p\n", + TRACE("0x%08x items of size %d from file %p to %p\n", nmemb,size,file,ptr); if (!ReadFile( file->handle, ptr, size * nmemb, &ret, NULL )) - WARN(crtdll, " failed!\n"); + WARN(" failed!\n"); return ret / size; #endif @@ -413,7 +413,7 @@ */ DWORD __cdecl CRTDLL_freopen(LPCSTR path, LPCSTR mode, LPVOID stream) { - FIXME(crtdll, ":(%s,%s,%p): stub\n", path, mode, stream); + FIXME(":(%s,%s,%p): stub\n", path, mode, stream); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -434,7 +434,7 @@ va_end( valist ); return res; #endif - FIXME(crtdll,"broken\n"); + FIXME("broken\n"); return 0; } @@ -443,13 +443,13 @@ */ LONG __cdecl CRTDLL_fseek( CRTDLL_FILE *file, LONG offset, INT whence) { - TRACE(crtdll, "file %p to 0x%08lx pos %s\n", + TRACE("file %p to 0x%08lx pos %s\n", file,offset,(whence==SEEK_SET)?"SEEK_SET": (whence==SEEK_CUR)?"SEEK_CUR": (whence==SEEK_END)?"SEEK_END":"UNKNOWN"); if (SetFilePointer( file->handle, offset, NULL, whence ) != 0xffffffff) return 0; - WARN(crtdll, " failed!\n"); + WARN(" failed!\n"); return -1; } @@ -458,7 +458,7 @@ */ INT __cdecl CRTDLL_fsetpos( CRTDLL_FILE *file, INT *pos ) { - TRACE(crtdll, "file %p pos %d\n", file, *pos ); + TRACE("file %p pos %d\n", file, *pos ); return CRTDLL_fseek(file, *pos, SEEK_SET); } @@ -477,12 +477,12 @@ { DWORD ret; - TRACE(crtdll, "0x%08x items of size %d to file %p(%d) from %p\n", + TRACE("0x%08x items of size %d to file %p(%d) from %p\n", nmemb,size,file,file-(CRTDLL_FILE*)CRTDLL_iob,ptr); if (!WriteFile( file->handle, ptr, size * nmemb, &ret, NULL )) - WARN(crtdll, " failed!\n"); + WARN(" failed!\n"); return ret / size; } @@ -491,7 +491,7 @@ */ INT __cdecl CRTDLL_setbuf(CRTDLL_FILE *file, LPSTR buf) { - TRACE(crtdll, "(file %p buf %p)\n", file, buf); + TRACE("(file %p buf %p)\n", file, buf); /* this doesn't work:"void value not ignored as it ought to be" return setbuf(file,buf); */ @@ -522,7 +522,7 @@ default: return (-1); } - TRACE(crtdll, "(handle %08lx,flags %d) return %d\n", + TRACE("(handle %08lx,flags %d) return %d\n", osfhandle,flags,handle); return handle; @@ -598,7 +598,7 @@ */ BOOL __cdecl CRTDLL__isatty(DWORD x) { - TRACE(crtdll,"(%ld)\n",x); + TRACE("(%ld)\n",x); return TRUE; } @@ -615,7 +615,7 @@ len = (UINT)write(fd,buf,(LONG)count); else len = _lwrite(fd,buf,count); - TRACE(crtdll,"%d/%d byte to dfh %d from %p,\n", + TRACE("%d/%d byte to dfh %d from %p,\n", len,count,fd,buf); return len; } @@ -635,7 +635,7 @@ */ void __cdecl CRTDLL__cexit(INT ret) { - TRACE(crtdll,"(%d)\n",ret); + TRACE("(%d)\n",ret); ExitProcess(ret); } @@ -645,7 +645,7 @@ */ void __cdecl CRTDLL_exit(DWORD ret) { - TRACE(crtdll,"(%ld)\n",ret); + TRACE("(%ld)\n",ret); ExitProcess(ret); } @@ -655,7 +655,7 @@ */ INT __cdecl CRTDLL__abnormal_termination(void) { - TRACE(crtdll,"(void)\n"); + TRACE("(void)\n"); return 0; } @@ -720,7 +720,7 @@ { char ch = (char)c; DWORD res; - TRACE(crtdll, "%c to file %p\n",c,file); + TRACE("%c to file %p\n",c,file); if (!WriteFile( file->handle, &ch, 1, &res, NULL )) return -1; return c; } @@ -732,7 +732,7 @@ INT __cdecl CRTDLL_fputs( LPCSTR s, CRTDLL_FILE *file ) { DWORD res; - TRACE(crtdll, "%s to file %p\n",s,file); + TRACE("%s to file %p\n",s,file); if (!WriteFile( file->handle, s, strlen(s), &res, NULL )) return -1; return res; } @@ -743,7 +743,7 @@ */ INT __cdecl CRTDLL_puts(LPCSTR s) { - TRACE(crtdll, "%s \n",s); + TRACE("%s \n",s); return puts(s); } @@ -799,7 +799,7 @@ *s = '\0'; - TRACE(crtdll,"got '%s'\n", buf_start); + TRACE("got '%s'\n", buf_start); return buf_start; } @@ -821,7 +821,7 @@ *buf = '\0'; - TRACE(crtdll,"got '%s'\n", buf_start); + TRACE("got '%s'\n", buf_start); return buf_start; } @@ -833,7 +833,7 @@ { unsigned int ret = (x >> shift)|( x >>((sizeof(x))-shift)); - TRACE(crtdll, "got 0x%08x rot %d ret 0x%08x\n", + TRACE("got 0x%08x rot %d ret 0x%08x\n", x,shift,ret); return ret; @@ -845,7 +845,7 @@ { unsigned long ret = (x >> shift)|( x >>((sizeof(x))-shift)); - TRACE(crtdll, "got 0x%08lx rot %d ret 0x%08lx\n", + TRACE("got 0x%08lx rot %d ret 0x%08lx\n", x,shift,ret); return ret; @@ -902,7 +902,7 @@ */ unsigned char* __cdecl CRTDLL__mbscpy(unsigned char *x,unsigned char *y) { - TRACE(crtdll,"CRTDLL_mbscpy %s and %s\n",x,y); + TRACE("CRTDLL_mbscpy %s and %s\n",x,y); return strcpy(x,y); } @@ -943,13 +943,13 @@ { unsigned char *y =x; - TRACE(crtdll, "CRTDLL_strlwr got %s\n", x); + TRACE("CRTDLL_strlwr got %s\n", x); while (*y) { if ((*y > 0x40) && (*y< 0x5b)) *y = *y + 0x20; y++; } - TRACE(crtdll, " returned %s\n", x); + TRACE(" returned %s\n", x); return x; } @@ -976,7 +976,7 @@ } /* If buffer too short, exit. */ if (i > SYSBUF_LENGTH) { - TRACE(crtdll,"_system buffer to small\n"); + TRACE("_system buffer to small\n"); return 127; } @@ -993,7 +993,7 @@ } *bp++ = '"'; *bp = 0; - TRACE(crtdll, "_system got '%s', executing '%s'\n",x,buffer); + TRACE("_system got '%s', executing '%s'\n",x,buffer); return system(buffer); } @@ -1046,7 +1046,7 @@ */ VOID __cdecl CRTDLL_longjmp(jmp_buf env, int val) { - FIXME(crtdll,"CRTDLL_longjmp semistup, expect crash\n"); + FIXME("CRTDLL_longjmp semistup, expect crash\n"); longjmp(env, val); } @@ -1132,7 +1132,7 @@ */ INT __cdecl CRTDLL_fclose( CRTDLL_FILE *file ) { - TRACE(crtdll,"%p\n", file ); + TRACE("%p\n", file ); if (!CloseHandle( file->handle )) return -1; HeapFree( GetProcessHeap(), 0, file ); return 0; @@ -1147,15 +1147,15 @@ DOS_FULL_NAME full_name; if (!DOSFS_GetFullName( pathname, FALSE, &full_name )) { - WARN(crtdll, "CRTDLL_unlink file %s bad name\n",pathname); + WARN("CRTDLL_unlink file %s bad name\n",pathname); return EOF; } ret=unlink(full_name.long_name); - TRACE(crtdll,"(%s unix %s)\n", + TRACE("(%s unix %s)\n", pathname,full_name.long_name); if(ret) - WARN(crtdll, " Failed!\n"); + WARN(" Failed!\n"); return ret; } @@ -1197,13 +1197,13 @@ if (!DOSFS_GetFullName( filename, TRUE, &full_name )) { - WARN(crtdll, "CRTDLL__stat filename %s bad name\n",filename); + WARN("CRTDLL__stat filename %s bad name\n",filename); return -1; } ret=stat(full_name.long_name,&mystat); - TRACE(crtdll,"CRTDLL__stat %s\n", filename); + TRACE("CRTDLL__stat %s\n", filename); if(ret) - WARN(crtdll, " Failed!\n"); + WARN(" Failed!\n"); /* FIXME: should check what Windows returns */ @@ -1260,14 +1260,14 @@ creation = OPEN_EXISTING; } if (flags & 0x0008) /* O_APPEND */ - FIXME(crtdll, "O_APPEND not supported\n" ); + FIXME("O_APPEND not supported\n" ); if (flags & 0xf0f4) - TRACE(crtdll,"CRTDLL_open file unsupported flags 0x%04x\n",flags); + TRACE("CRTDLL_open file unsupported flags 0x%04x\n",flags); /* End Fixme */ ret = CreateFileA( path, access, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, creation, FILE_ATTRIBUTE_NORMAL, -1 ); - TRACE(crtdll,"CRTDLL_open file %s mode 0x%04x got handle %d\n", path,flags,ret); + TRACE("CRTDLL_open file %s mode 0x%04x got handle %d\n", path,flags,ret); return ret; } @@ -1278,9 +1278,9 @@ { int ret=_lclose(fd); - TRACE(crtdll,"(%d)\n",fd); + TRACE("(%d)\n",fd); if(ret) - WARN(crtdll, " Failed!\n"); + WARN(" Failed!\n"); return ret; } @@ -1290,7 +1290,7 @@ */ INT __cdecl CRTDLL_feof( CRTDLL_FILE *file ) { - FIXME(crtdll,"stub\n" ); + FIXME("stub\n" ); return 0; } @@ -1310,7 +1310,7 @@ case CRTDLL_LC_TIME: categorystr="LC_TIME";break; default: categorystr = "UNKNOWN?";break; } - FIXME(crtdll,"(%s,%s),stub!\n",categorystr,locale); + FIXME("(%s,%s),stub!\n",categorystr,locale); return "C"; } @@ -1528,7 +1528,7 @@ #define O_TEXT 0x4000 #define O_BINARY 0x8000 - FIXME(crtdll, "on fhandle %d mode %s, STUB.\n", + FIXME("on fhandle %d mode %s, STUB.\n", fh,(mode=O_TEXT)?"O_TEXT": (mode=O_BINARY)?"O_BINARY":"UNKNOWN"); return -1; @@ -1539,7 +1539,7 @@ */ VOID __cdecl CRTDLL__fpreset(void) { - FIXME(crtdll," STUB.\n"); + FIXME(" STUB.\n"); } /********************************************************************* @@ -1547,7 +1547,7 @@ */ INT __cdecl CRTDLL_atexit(LPVOID x) { - FIXME(crtdll,"(%p), STUB.\n",x); + FIXME("(%p), STUB.\n",x); return 0; /* successful */ } @@ -1567,7 +1567,7 @@ else if (!(*mb)) ret =0; - TRACE(crtdll,"CRTDLL_mlen %s for max %d bytes ret %d\n",mb,size,ret); + TRACE("CRTDLL_mlen %s for max %d bytes ret %d\n",mb,size,ret); return ret; } @@ -1594,7 +1594,7 @@ p++; ret = (p -wcs); - TRACE(crtdll,"CRTDLL_mbstowcs %s for %d chars put %d wchars\n", + TRACE("CRTDLL_mbstowcs %s for %d chars put %d wchars\n", mbs,size,ret); return ret; } @@ -1622,7 +1622,7 @@ else ret = -1; - TRACE(crtdll,"CRTDLL_mbtowc %s for %d chars\n",mb,size); + TRACE("CRTDLL_mbtowc %s for %d chars\n",mb,size); return ret; } @@ -1686,7 +1686,7 @@ } if (!DOSFS_GetFullName( name, FALSE, &full_name )) return NULL; lstrcpynA(buf,full_name.short_name,size); - TRACE(crtdll,"CRTDLL_fullpath got %s\n",buf); + TRACE("CRTDLL_fullpath got %s\n",buf); return buf; } @@ -1702,7 +1702,7 @@ */ char * drivechar,*dirchar,*namechar; - TRACE(crtdll,"CRTDLL__splitpath got %s\n",path); + TRACE("CRTDLL__splitpath got %s\n",path); drivechar = strchr(path,':'); dirchar = strrchr(path,'/'); @@ -1746,7 +1746,7 @@ } } - TRACE(crtdll,"CRTDLL__splitpath found %s %s %s %s\n",drive,directory,filename,extension); + TRACE("CRTDLL__splitpath found %s %s %s %s\n",drive,directory,filename,extension); } @@ -1760,7 +1760,7 @@ LPCSTR extension ) { char ch; - TRACE(crtdll,"CRTDLL__makepath got %s %s %s %s\n", drive, directory, + TRACE("CRTDLL__makepath got %s %s %s %s\n", drive, directory, filename, extension); if ( !path ) @@ -1791,7 +1791,7 @@ } } - TRACE(crtdll,"CRTDLL__makepath returns %s\n",path); + TRACE("CRTDLL__makepath returns %s\n",path); } /********************************************************************* @@ -1820,7 +1820,7 @@ if (len > size) { /* set error to ERANGE */ - TRACE(crtdll,"CRTDLL_getcwd buffer to small\n"); + TRACE("CRTDLL_getcwd buffer to small\n"); return NULL; } return buf; @@ -1835,7 +1835,7 @@ char test[1]; int len; - FIXME(crtdll,"(\"%c:\",%s,%d)\n",drive+'A',buf,size); + FIXME("(\"%c:\",%s,%d)\n",drive+'A',buf,size); len = size; if (!buf) { if (size < 0) /* allocate as big as nescessary */ @@ -1854,7 +1854,7 @@ if (len > size) { /* set error to ERANGE */ - TRACE(crtdll,"buffer to small\n"); + TRACE("buffer to small\n"); return NULL; } return buf; @@ -1915,25 +1915,25 @@ DOS_FULL_NAME tempname; if ((ret = tempnam(dir,prefix))==NULL) { - WARN(crtdll, "Unable to get unique filename\n"); + WARN("Unable to get unique filename\n"); return NULL; } if (!DOSFS_GetFullName(ret,FALSE,&tempname)) { - TRACE(crtdll, "Wrong path?\n"); + TRACE("Wrong path?\n"); return NULL; } free(ret); if ((ret = CRTDLL_malloc(strlen(tempname.short_name)+1)) == NULL) { - WARN(crtdll, "CRTDL_malloc for shortname failed\n"); + WARN("CRTDL_malloc for shortname failed\n"); return NULL; } if ((ret = strcpy(ret,tempname.short_name)) == NULL) { - WARN(crtdll, "Malloc for shortname failed\n"); + WARN("Malloc for shortname failed\n"); return NULL; } - TRACE(crtdll,"dir %s prefix %s got %s\n", + TRACE("dir %s prefix %s got %s\n", dir,prefix,ret); return ret; @@ -1949,18 +1949,18 @@ char *ret; if ((ret =tmpnam(s))== NULL) { - WARN(crtdll, "Unable to get unique filename\n"); + WARN("Unable to get unique filename\n"); return NULL; } if (!DOSFS_GetFullName(ret,FALSE,&CRTDLL_tmpname)) { - TRACE(crtdll, "Wrong path?\n"); + TRACE("Wrong path?\n"); return NULL; } strcat(CRTDLL_tmpname.short_name,"."); - TRACE(crtdll,"for buf %p got %s\n", + TRACE("for buf %p got %s\n", s,CRTDLL_tmpname.short_name); - TRACE(crtdll,"long got %s\n", + TRACE("long got %s\n", CRTDLL_tmpname.long_name); if ( s != NULL) return strcpy(s,CRTDLL_tmpname.short_name); @@ -1984,7 +1984,7 @@ LPSTR __cdecl CRTDLL__ltoa(long x,LPSTR buf,INT radix) { switch(radix) { - case 2: FIXME(crtdll, "binary format not implemented !\n"); + case 2: FIXME("binary format not implemented !\n"); break; case 8: wsnprintfA(buf,0x80,"%o",x); break; @@ -1992,7 +1992,7 @@ break; case 16: wsnprintfA(buf,0x80,"%x",x); break; - default: FIXME(crtdll, "radix %d not implemented !\n", radix); + default: FIXME("radix %d not implemented !\n", radix); } return buf; } @@ -2003,7 +2003,7 @@ LPSTR __cdecl CRTDLL__ultoa(long x,LPSTR buf,INT radix) { switch(radix) { - case 2: FIXME(crtdll, "binary format not implemented !\n"); + case 2: FIXME("binary format not implemented !\n"); break; case 8: wsnprintfA(buf,0x80,"%lo",x); break; @@ -2011,7 +2011,7 @@ break; case 16: wsnprintfA(buf,0x80,"%lx",x); break; - default: FIXME(crtdll, "radix %d not implemented !\n", radix); + default: FIXME("radix %d not implemented !\n", radix); } return buf; } @@ -2023,7 +2023,7 @@ */ VOID __cdecl CRTDLL_signal(int sig, sig_handler_type ptr) { - FIXME(crtdll, "(%d %p):stub.\n", sig, ptr); + FIXME("(%d %p):stub.\n", sig, ptr); } /********************************************************************* @@ -2039,7 +2039,7 @@ } #else LONG __cdecl CRTDLL__ftol(double fl) { - FIXME(crtdll,"should be register function\n"); + FIXME("should be register function\n"); return (LONG)fl; } #endif @@ -2056,7 +2056,7 @@ } #else LONG __cdecl CRTDLL__CIpow(double x,double y) { - FIXME(crtdll,"should be register function\n"); + FIXME("should be register function\n"); return pow(x,y); } #endif @@ -2066,7 +2066,7 @@ */ VOID __cdecl CRTDLL__sleep(unsigned long timeout) { - TRACE(crtdll,"CRTDLL__sleep for %ld milliseconds\n",timeout); + TRACE("CRTDLL__sleep for %ld milliseconds\n",timeout); Sleep((timeout)?timeout:1); } @@ -2091,7 +2091,7 @@ if ((pp)&& (pos)) { pp = pos+1; - TRACE(crtdll,"got %s\n",pp); + TRACE("got %s\n",pp); } FreeEnvironmentStringsA( environ ); return pp; @@ -2133,7 +2133,7 @@ */ VOID __cdecl CRTDLL__dllonexit () { - FIXME(crtdll,"stub\n"); + FIXME("stub\n"); } /********************************************************************* @@ -2176,7 +2176,7 @@ * strdate (CRTDLL.283) */ LPSTR __cdecl CRTDLL__strdate (LPSTR date) -{ FIXME (crtdll,"%p stub\n", date); +{ FIXME("%p stub\n", date); return 0; } @@ -2184,6 +2184,6 @@ * strtime (CRTDLL.299) */ LPSTR __cdecl CRTDLL__strtime (LPSTR date) -{ FIXME (crtdll,"%p stub\n", date); +{ FIXME("%p stub\n", date); return 0; }
diff --git a/misc/ddeml.c b/misc/ddeml.c index 066e62c..a72ce48 100644 --- a/misc/ddeml.c +++ b/misc/ddeml.c
@@ -16,7 +16,7 @@ #include "winerror.h" #include "heap.h" #include "shm_semaph.h" -#include "debug.h" +#include "debugtools.h" #include "tchar.h" #include "winnt.h" @@ -217,7 +217,7 @@ * so set the global list pointer to it. */ reference_inst->Node_list = pNew; - TRACE(ddeml,"HSZ node list entry added\n"); + TRACE("HSZ node list entry added\n"); } } } @@ -245,12 +245,12 @@ { if ( reference_inst->Instance_id == InstId ) { - TRACE(ddeml,"Instance entry found\n"); + TRACE("Instance entry found\n"); return reference_inst; } reference_inst = reference_inst->Next_Entry; } - TRACE(ddeml,"Instance entry missing\n"); + TRACE("Instance entry missing\n"); return NULL; } @@ -277,12 +277,12 @@ { if ( reference_name->hsz == Service_Name ) { - TRACE(ddeml,"Service Name found\n"); + TRACE("Service Name found\n"); return reference_name; } reference_name = reference_name->next; } - TRACE(ddeml,"Service name missing\n"); + TRACE("Service name missing\n"); return NULL; } @@ -308,7 +308,7 @@ ReleaseMutex(mutex); if ( (err_no=GetLastError()) != 0 ) { - ERR(ddeml,"ReleaseMutex failed - %s mutex %li\n",mutex_name,err_no); + ERR("ReleaseMutex failed - %s mutex %li\n",mutex_name,err_no); HeapFree(SystemHeap, 0, this_instance); if ( release_handle_m ) { @@ -354,13 +354,13 @@ } if ( (err_no=GetLastError()) != 0 ) { - ERR(ddeml,"CreateMutex failed - inst_count %li\n",err_no); + ERR("CreateMutex failed - inst_count %li\n",err_no); err_no=Release_reserved_mutex (handle_mutex,"handle_mutex",0,1); return DMLERR_SYS_ERROR; } DDE_Max_Assigned_Instance++; this_instance->Instance_id = DDE_Max_Assigned_Instance; - TRACE(ddeml,"New instance id %ld allocated\n",DDE_Max_Assigned_Instance); + TRACE("New instance id %ld allocated\n",DDE_Max_Assigned_Instance); if (Release_reserved_mutex(inst_count_mutex,"instance_count",1,0)) return DMLERR_SYS_ERROR; return DMLERR_NO_ERROR; } @@ -462,7 +462,7 @@ UINT16 WINAPI DdeInitialize16( LPDWORD pidInst, PFNCALLBACK16 pfnCallback, DWORD afCmd, DWORD ulRes) { - TRACE(ddeml,"DdeInitialize16 called - calling DdeInitializeA\n"); + TRACE("DdeInitialize16 called - calling DdeInitializeA\n"); return (UINT16)DdeInitializeA(pidInst,(PFNCALLBACK)pfnCallback, afCmd, ulRes); } @@ -474,7 +474,7 @@ UINT WINAPI DdeInitializeA( LPDWORD pidInst, PFNCALLBACK pfnCallback, DWORD afCmd, DWORD ulRes ) { - TRACE(ddeml,"DdeInitializeA called - calling DdeInitializeW\n"); + TRACE("DdeInitializeA called - calling DdeInitializeW\n"); return DdeInitializeW(pidInst,pfnCallback,afCmd,ulRes); } @@ -516,8 +516,8 @@ if( ulRes ) { - ERR(ddeml, "Reserved value not zero? What does this mean?\n"); - FIXME(ddeml, "(%p,%p,0x%lx,%ld): stub\n", pidInst, pfnCallback, + ERR("Reserved value not zero? What does this mean?\n"); + FIXME("(%p,%p,0x%lx,%ld): stub\n", pidInst, pfnCallback, afCmd,ulRes); /* trap this and no more until we know more */ return DMLERR_NO_ERROR; @@ -529,7 +529,7 @@ /* can't set up the instance with nothing to act as a callback */ - TRACE(ddeml,"No callback provided\n"); + TRACE("No callback provided\n"); return DMLERR_INVALIDPARAMETER; /* might be DMLERR_DLL_USAGE */ } @@ -539,7 +539,7 @@ if ( this_instance == NULL ) { /* catastrophe !! warn user & abort */ - ERR (ddeml, "Instance create failed - out of memory\n"); + ERR("Instance create failed - out of memory\n"); return DMLERR_SYS_ERROR; } this_instance->Next_Entry = NULL; @@ -570,11 +570,11 @@ ==CBF_FAIL_ALLSVRXACTIONS; } - TRACE(ddeml,"instance created - checking validity \n"); + TRACE("instance created - checking validity \n"); if( *pidInst == 0 ) { /* Initialisation of new Instance Identifier */ - TRACE(ddeml,"new instance, callback %p flags %lX\n",pfnCallback,afCmd); + TRACE("new instance, callback %p flags %lX\n",pfnCallback,afCmd); if ( DDE_Max_Assigned_Instance == 0 ) { /* Nothing has been initialised - exit now ! can return TRUE since effect is the same */ @@ -585,7 +585,7 @@ handle_mutex = CreateMutexW(s_att,1,DDEHandleAccess); if ( (err_no=GetLastError()) != 0 ) { - ERR(ddeml,"CreateMutex failed - handle list %li\n",err_no); + ERR("CreateMutex failed - handle list %li\n",err_no); HeapFree(SystemHeap, 0, this_instance); return DMLERR_SYS_ERROR; } @@ -596,12 +596,12 @@ { /* FIXME - needs refinement with popup for timeout, also is timeout interval OK */ - ERR(ddeml,"WaitForSingleObject failed - handle list %li\n",err_no); + ERR("WaitForSingleObject failed - handle list %li\n",err_no); return DMLERR_SYS_ERROR; } } - TRACE(ddeml,"Handle Mutex created/reserved\n"); + TRACE("Handle Mutex created/reserved\n"); if (DDE_Handle_Table_Base == NULL ) { /* can't be another instance in this case, assign to the base pointer */ @@ -617,14 +617,14 @@ */ this_instance->CBF_Flags=this_instance->CBF_Flags|APPCMD_FILTERINITS; - TRACE(ddeml,"First application instance detected OK\n"); + TRACE("First application instance detected OK\n"); /* allocate new instance ID */ if ((err_no = IncrementInstanceId()) ) return err_no; } else { /* really need to chain the new one in to the latest here, but after checking conditions * such as trying to start a conversation from an application trying to monitor */ reference_inst = DDE_Handle_Table_Base; - TRACE(ddeml,"Subsequent application instance - starting checks\n"); + TRACE("Subsequent application instance - starting checks\n"); while ( reference_inst->Next_Entry != NULL ) { /* @@ -667,23 +667,23 @@ } /* All cleared, add to chain */ - TRACE(ddeml,"Application Instance checks finished\n"); + TRACE("Application Instance checks finished\n"); if ((err_no = IncrementInstanceId())) return err_no; if ( Release_reserved_mutex(handle_mutex,"handle_mutex",0,0)) return DMLERR_SYS_ERROR; reference_inst->Next_Entry = this_instance; } *pidInst = this_instance->Instance_id; - TRACE(ddeml,"New application instance processing finished OK\n"); + TRACE("New application instance processing finished OK\n"); } else { /* Reinitialisation situation --- FIX */ - TRACE(ddeml,"reinitialisation of (%p,%p,0x%lx,%ld): stub\n",pidInst,pfnCallback,afCmd,ulRes); + TRACE("reinitialisation of (%p,%p,0x%lx,%ld): stub\n",pidInst,pfnCallback,afCmd,ulRes); WaitForSingleObject(handle_mutex,1000); if ( (err_no=GetLastError()) != 0 ) { /* FIXME - needs refinement with popup for timeout, also is timeout interval OK */ - ERR(ddeml,"WaitForSingleObject failed - handle list %li\n",err_no); + ERR("WaitForSingleObject failed - handle list %li\n",err_no); HeapFree(SystemHeap, 0, this_instance); return DMLERR_SYS_ERROR; } @@ -769,7 +769,7 @@ */ BOOL16 WINAPI DdeUninitialize16( DWORD idInst ) { - FIXME(ddeml," stub calling DdeUninitialize\n"); + FIXME(" stub calling DdeUninitialize\n"); return (BOOL16)DdeUninitialize( idInst ); } @@ -802,10 +802,10 @@ { /* FIXME - needs refinement with popup for timeout, also is timeout interval OK */ - ERR(ddeml,"WaitForSingleObject failed - handle list %li\n",err_no); + ERR("WaitForSingleObject failed - handle list %li\n",err_no); return DMLERR_SYS_ERROR; } - TRACE(ddeml,"Handle Mutex created/reserved\n"); + TRACE("Handle Mutex created/reserved\n"); /* First check instance */ this_instance = Find_Instance_Entry(idInst); @@ -817,7 +817,7 @@ */ return FALSE; } - FIXME(ddeml, "(%ld): partial stub\n", idInst); + FIXME("(%ld): partial stub\n", idInst); /* FIXME ++++++++++++++++++++++++++++++++++++++++++ * Needs to de-register all service names @@ -887,7 +887,7 @@ HCONVLIST WINAPI DdeConnectList( DWORD idInst, HSZ hszService, HSZ hszTopic, HCONVLIST hConvList, LPCONVCONTEXT pCC ) { - FIXME(ddeml, "(%ld,%ld,%ld,%ld,%p): stub\n", idInst, hszService, hszTopic, + FIXME("(%ld,%ld,%ld,%ld,%p): stub\n", idInst, hszService, hszTopic, hConvList,pCC); return 1; } @@ -907,7 +907,7 @@ */ HCONV WINAPI DdeQueryNextServer( HCONVLIST hConvList, HCONV hConvPrev ) { - FIXME(ddeml, "(%ld,%ld): stub\n",hConvList,hConvPrev); + FIXME("(%ld,%ld): stub\n",hConvList,hConvPrev); return 0; } @@ -929,7 +929,7 @@ DWORD ret = 0; CHAR pString[MAX_BUFFER_LEN]; - FIXME(ddeml, + FIXME( "(%ld, 0x%lx, %p, %ld, %d): partial stub\n", idInst, hsz, @@ -947,11 +947,11 @@ { /* FIXME - needs refinement with popup for timeout, also is timeout interval OK */ - ERR(ddeml,"WaitForSingleObject failed - handle list %li\n",err_no); + ERR("WaitForSingleObject failed - handle list %li\n",err_no); /* needs something for DdeGetLAstError even if the manual doesn't say so */ return FALSE; } - TRACE(ddeml,"Handle Mutex created/reserved\n"); + TRACE("Handle Mutex created/reserved\n"); /* First check instance */ @@ -980,7 +980,7 @@ } else { Release_reserved_mutex(handle_mutex,"handle_mutex",FALSE,FALSE); } - TRACE(ddeml,"returning pointer\n"); + TRACE("returning pointer\n"); return ret; } @@ -1003,7 +1003,7 @@ WCHAR pString[MAX_BUFFER_LEN]; int factor = 1; - FIXME(ddeml, + FIXME( "(%ld, 0x%lx, %p, %ld, %d): stub\n", idInst, hsz, @@ -1045,7 +1045,7 @@ DWORD WINAPI DdeQueryString16(DWORD idInst, HSZ hsz, LPSTR lpsz, DWORD cchMax, int codepage) { - FIXME(ddeml,"(%ld, 0x%lx, %p, %ld, %d): stub \n", + FIXME("(%ld, 0x%lx, %p, %ld, %d): stub \n", idInst, hsz, lpsz, @@ -1074,7 +1074,7 @@ BOOL WINAPI DdeDisconnectList( HCONVLIST hConvList) /* [in] Handle to conversation list */ { - FIXME(ddeml, "(%ld): stub\n", hConvList); + FIXME("(%ld): stub\n", hConvList); return TRUE; } @@ -1085,7 +1085,7 @@ HCONV WINAPI DdeConnect16( DWORD idInst, HSZ hszService, HSZ hszTopic, LPCONVCONTEXT16 pCC ) { - FIXME( ddeml, "empty stub\n" ); + FIXME("empty stub\n" ); return 0; } @@ -1096,7 +1096,7 @@ HCONV WINAPI DdeConnect( DWORD idInst, HSZ hszService, HSZ hszTopic, LPCONVCONTEXT pCC ) { - FIXME(ddeml, "(0x%lx,%ld,%ld,%p): stub\n",idInst,hszService,hszTopic, + FIXME("(0x%lx,%ld,%ld,%p): stub\n",idInst,hszService,hszTopic, pCC); return 0; } @@ -1115,7 +1115,7 @@ */ BOOL16 WINAPI DdeSetUserHandle16( HCONV hConv, DWORD id, DWORD hUser ) { - FIXME( ddeml, "(%ld,%ld,%ld): stub\n",hConv,id, hUser ); + FIXME("(%ld,%ld,%ld): stub\n",hConv,id, hUser ); return 0; } @@ -1142,7 +1142,7 @@ DWORD cbOff, HSZ hszItem, UINT wFmt, UINT afCmd ) { - FIXME( ddeml, + FIXME( "(%ld,%p,%ld,%ld,0x%lx,%d,%d): stub\n", idInst, pSrc, @@ -1160,7 +1160,7 @@ */ BOOL WINAPI DdeDisconnect( HCONV hConv ) { - FIXME( ddeml, "empty stub\n" ); + FIXME("empty stub\n" ); return 0; } @@ -1170,7 +1170,7 @@ */ HCONV WINAPI DdeReconnect( HCONV hConv ) { - FIXME( ddeml, "empty stub\n" ); + FIXME("empty stub\n" ); return 0; } @@ -1194,7 +1194,7 @@ { return DdeCreateStringHandleA( idInst, str, codepage ); } else { - TRACE(ddeml,"Default codepage supplied\n"); + TRACE("Default codepage supplied\n"); return DdeCreateStringHandleA( idInst, str, CP_WINANSI); } } @@ -1220,7 +1220,7 @@ HSZ WINAPI DdeCreateStringHandleA( DWORD idInst, LPCSTR psz, INT codepage ) { HSZ hsz = 0; - TRACE(ddeml, "(%ld,%s,%d): partial stub\n",idInst,debugstr_a(psz),codepage); + TRACE("(%ld,%s,%d): partial stub\n",idInst,debugstr_a(psz),codepage); if ( DDE_Max_Assigned_Instance == 0 ) @@ -1233,10 +1233,10 @@ { /* FIXME - needs refinement with popup for timeout, also is timeout interval OK */ - ERR(ddeml,"WaitForSingleObject failed - handle list %li\n",err_no); + ERR("WaitForSingleObject failed - handle list %li\n",err_no); return DMLERR_SYS_ERROR; } - TRACE(ddeml,"Handle Mutex created/reserved\n"); + TRACE("Handle Mutex created/reserved\n"); /* First check instance */ @@ -1256,19 +1256,19 @@ /* Save the handle so we know to clean it when * uninitialize is called. */ - TRACE(ddeml,"added atom %s with HSZ 0x%lx, \n",debugstr_a(psz),hsz); + TRACE("added atom %s with HSZ 0x%lx, \n",debugstr_a(psz),hsz); InsertHSZNode( hsz ); if ( Release_reserved_mutex(handle_mutex,"handle_mutex",FALSE,FALSE)) { reference_inst->Last_Error = DMLERR_SYS_ERROR; return 0; } - TRACE(ddeml,"Returning pointer\n"); + TRACE("Returning pointer\n"); return hsz; } else { Release_reserved_mutex(handle_mutex,"handle_mutex",FALSE,FALSE); } - TRACE(ddeml,"Returning error\n"); + TRACE("Returning error\n"); return 0; } @@ -1297,7 +1297,7 @@ { HSZ hsz = 0; - TRACE(ddeml, "(%ld,%s,%d): partial stub\n",idInst,debugstr_w(psz),codepage); + TRACE("(%ld,%s,%d): partial stub\n",idInst,debugstr_w(psz),codepage); if ( DDE_Max_Assigned_Instance == 0 ) @@ -1310,10 +1310,10 @@ { /* FIXME - needs refinement with popup for timeout, also is timeout interval OK */ - ERR(ddeml,"WaitForSingleObject failed - handle list %li\n",err_no); + ERR("WaitForSingleObject failed - handle list %li\n",err_no); return DMLERR_SYS_ERROR; } - TRACE(ddeml,"CreateString - Handle Mutex created/reserved\n"); + TRACE("CreateString - Handle Mutex created/reserved\n"); /* First check instance */ @@ -1327,7 +1327,7 @@ return 0; } - FIXME(ddeml, "(%ld,%s,%d): partial stub\n",idInst,debugstr_w(psz),codepage); + FIXME("(%ld,%s,%d): partial stub\n",idInst,debugstr_w(psz),codepage); if (codepage==CP_WINUNICODE) /* @@ -1344,12 +1344,12 @@ reference_inst->Last_Error = DMLERR_SYS_ERROR; return 0; } - TRACE(ddeml,"Returning pointer\n"); + TRACE("Returning pointer\n"); return hsz; } else { Release_reserved_mutex(handle_mutex,"handle_mutex",FALSE,FALSE); } - TRACE(ddeml,"Returning error\n"); + TRACE("Returning error\n"); return 0; } @@ -1359,7 +1359,7 @@ */ BOOL16 WINAPI DdeFreeStringHandle16( DWORD idInst, HSZ hsz ) { - FIXME(ddeml,"idInst %ld hsz 0x%lx\n",idInst,hsz); + FIXME("idInst %ld hsz 0x%lx\n",idInst,hsz); return (BOOL)DdeFreeStringHandle( idInst, hsz ); } @@ -1381,7 +1381,7 @@ */ BOOL WINAPI DdeFreeStringHandle( DWORD idInst, HSZ hsz ) { - TRACE(ddeml, "(%ld,%ld): \n",idInst,hsz); + TRACE("(%ld,%ld): \n",idInst,hsz); if ( DDE_Max_Assigned_Instance == 0 ) { /* Nothing has been initialised - exit now ! can return TRUE since effect is the same */ @@ -1390,17 +1390,17 @@ if ( ( prev_err = GetLastError()) != 0 ) { /* something earlier failed !! */ - ERR(ddeml,"Error %li before WaitForSingleObject - trying to continue\n",prev_err); + ERR("Error %li before WaitForSingleObject - trying to continue\n",prev_err); } WaitForSingleObject(handle_mutex,1000); if ( ((err_no=GetLastError()) != 0 ) && (err_no != prev_err )) { /* FIXME - needs refinement with popup for timeout, also is timeout interval OK */ - ERR(ddeml,"WaitForSingleObject failed - handle list %li\n",err_no); + ERR("WaitForSingleObject failed - handle list %li\n",err_no); return DMLERR_SYS_ERROR; } - TRACE(ddeml,"Handle Mutex created/reserved\n"); + TRACE("Handle Mutex created/reserved\n"); /* First check instance */ @@ -1437,7 +1437,7 @@ */ BOOL WINAPI DdeFreeDataHandle( HDDEDATA hData ) { - FIXME( ddeml, "empty stub\n" ); + FIXME("empty stub\n" ); return TRUE; } @@ -1472,7 +1472,7 @@ BOOL WINAPI DdeKeepStringHandle( DWORD idInst, HSZ hsz ) { - TRACE(ddeml, "(%ld,%ld): \n",idInst,hsz); + TRACE("(%ld,%ld): \n",idInst,hsz); if ( DDE_Max_Assigned_Instance == 0 ) { /* Nothing has been initialised - exit now ! can return FALSE since effect is the same */ @@ -1481,17 +1481,17 @@ if ( ( prev_err = GetLastError()) != 0 ) { /* something earlier failed !! */ - ERR(ddeml,"Error %li before WaitForSingleObject - trying to continue\n",prev_err); + ERR("Error %li before WaitForSingleObject - trying to continue\n",prev_err); } WaitForSingleObject(handle_mutex,1000); if ( ((err_no=GetLastError()) != 0 ) && (err_no != prev_err )) { /* FIXME - needs refinement with popup for timeout, also is timeout interval OK */ - ERR(ddeml,"WaitForSingleObject failed - handle list %li\n",err_no); + ERR("WaitForSingleObject failed - handle list %li\n",err_no); return FALSE; } - TRACE(ddeml,"Handle Mutex created/reserved\n"); + TRACE("Handle Mutex created/reserved\n"); /* First check instance */ @@ -1530,7 +1530,7 @@ UINT wType, DWORD dwTimeout, LPDWORD pdwResult ) { - FIXME( ddeml, "empty stub\n" ); + FIXME("empty stub\n" ); return 0; } @@ -1542,7 +1542,7 @@ BOOL16 WINAPI DdeAbandonTransaction16( DWORD idInst, HCONV hConv, DWORD idTransaction ) { - FIXME( ddeml, "empty stub\n" ); + FIXME("empty stub\n" ); return TRUE; } @@ -1562,7 +1562,7 @@ BOOL WINAPI DdeAbandonTransaction( DWORD idInst, HCONV hConv, DWORD idTransaction ) { - FIXME( ddeml, "empty stub\n" ); + FIXME("empty stub\n" ); return TRUE; } @@ -1587,7 +1587,7 @@ HSZ hszTopic, /* [in] Handle to topic name string */ HSZ hszItem) /* [in] Handle to item name string */ { - FIXME(ddeml, "(%ld,%ld,%ld): stub\n",idInst,hszTopic,hszItem); + FIXME("(%ld,%ld,%ld): stub\n",idInst,hszTopic,hszItem); return TRUE; } @@ -1598,7 +1598,7 @@ HDDEDATA WINAPI DdeAddData16( HDDEDATA hData, LPBYTE pSrc, DWORD cb, DWORD cbOff ) { - FIXME( ddeml, "empty stub\n" ); + FIXME("empty stub\n" ); return 0; } @@ -1617,7 +1617,7 @@ HDDEDATA WINAPI DdeAddData( HDDEDATA hData, LPBYTE pSrc, DWORD cb, DWORD cbOff ) { - FIXME( ddeml, "empty stub\n" ); + FIXME("empty stub\n" ); return 0; } @@ -1637,7 +1637,7 @@ BOOL WINAPI DdeImpersonateClient( HCONV hConv) { - FIXME( ddeml, "empty stub\n" ); + FIXME("empty stub\n" ); return TRUE; } @@ -1658,7 +1658,7 @@ BOOL WINAPI DdeSetQualityOfService( HWND hwndClient, CONST SECURITY_QUALITY_OF_SERVICE *pqosNew, PSECURITY_QUALITY_OF_SERVICE pqosPrev) { - FIXME( ddeml, "empty stub\n" ); + FIXME("empty stub\n" ); return TRUE; } @@ -1677,7 +1677,7 @@ BOOL WINAPI DdeSetUserHandle( HCONV hConv, DWORD id, DWORD hUser) { - FIXME( ddeml, "empty stub\n" ); + FIXME("empty stub\n" ); return TRUE; } @@ -1693,7 +1693,7 @@ DWORD cbMax, /* [in] Amount of data to copy */ DWORD cbOff) /* [in] Offset to beginning of data */ { - FIXME(ddeml, "(%ld,%p,%ld,%ld): stub\n",hData,pDst,cbMax,cbOff); + FIXME("(%ld,%p,%ld,%ld): stub\n",hData,pDst,cbMax,cbOff); return cbMax; } @@ -1724,7 +1724,7 @@ */ LPBYTE WINAPI DdeAccessData( HDDEDATA hData, LPDWORD pcbDataSize ) { - FIXME( ddeml, "(%ld,%p): stub\n", hData, pcbDataSize); + FIXME("(%ld,%p): stub\n", hData, pcbDataSize); return 0; } @@ -1741,7 +1741,7 @@ */ BOOL WINAPI DdeUnaccessData( HDDEDATA hData ) { - FIXME( ddeml, "(0x%lx): stub\n", hData); + FIXME("(0x%lx): stub\n", hData); return 0; } @@ -1759,7 +1759,7 @@ */ BOOL WINAPI DdeEnableCallback( DWORD idInst, HCONV hConv, UINT wCmd ) { - FIXME( ddeml, "(%ld, 0x%lx, %d) stub\n", idInst, hConv, wCmd); + FIXME("(%ld, 0x%lx, %d) stub\n", idInst, hConv, wCmd); return 0; } @@ -1808,7 +1808,7 @@ CHAR SNameBuffer[MAX_BUFFER_LEN]; UINT rcode; this_service = NULL; - FIXME(ddeml, "(%ld,%ld,%ld,%d): stub\n",idInst,hsz1,hsz2,afCmd); + FIXME("(%ld,%ld,%ld,%d): stub\n",idInst,hsz1,hsz2,afCmd); if ( DDE_Max_Assigned_Instance == 0 ) { /* Nothing has been initialised - exit now ! @@ -1820,10 +1820,10 @@ { /* FIXME - needs refinement with popup for timeout, also is timeout interval OK */ - ERR(ddeml,"WaitForSingleObject failed - handle list %li\n",err_no); + ERR("WaitForSingleObject failed - handle list %li\n",err_no); return DMLERR_SYS_ERROR; } - TRACE(ddeml,"Handle Mutex created/reserved\n"); + TRACE("Handle Mutex created/reserved\n"); /* First check instance */ @@ -1831,7 +1831,7 @@ this_instance = reference_inst; if (reference_inst == NULL) { - TRACE(ddeml,"Instance not found as initialised\n"); + TRACE("Instance not found as initialised\n"); if ( Release_reserved_mutex(handle_mutex,"handle_mutex",FALSE,FALSE)) return TRUE; /* Nothing has been initialised - exit now ! can return TRUE since effect is the same */ return FALSE; @@ -1844,7 +1844,7 @@ */ reference_inst->Last_Error = DMLERR_INVALIDPARAMETER; Release_reserved_mutex(handle_mutex,"handle_mutex",FALSE,FALSE); - FIXME(ddeml,"Reserved parameter no-zero !!\n"); + FIXME("Reserved parameter no-zero !!\n"); return FALSE; } if ( hsz1 == 0L ) @@ -1857,7 +1857,7 @@ /* don't know if we should check this but it makes sense * why supply REGISTER or filter flags if de-registering all */ - TRACE(ddeml,"General unregister unexpected flags\n"); + TRACE("General unregister unexpected flags\n"); reference_inst->Last_Error = DMLERR_DLL_USAGE; Release_reserved_mutex(handle_mutex,"handle_mutex",FALSE,FALSE); return FALSE; @@ -1868,7 +1868,7 @@ { /* None to unregister !! */ - TRACE(ddeml,"General de-register - nothing registered\n"); + TRACE("General de-register - nothing registered\n"); reference_inst->Last_Error = DMLERR_DLL_USAGE; Release_reserved_mutex(handle_mutex,"handle_mutex",FALSE,FALSE); return FALSE; @@ -1883,12 +1883,12 @@ HeapFree(SystemHeap, 0, this_service); /* finished - release heap space used as work store */ } HeapFree(SystemHeap, 0, this_service); /* finished - release heap space used as work store */ - TRACE(ddeml,"General de-register - finished\n"); + TRACE("General de-register - finished\n"); } Release_reserved_mutex(handle_mutex,"handle_mutex",FALSE,FALSE); return TRUE; } - TRACE(ddeml,"Specific name action detected\n"); + TRACE("Specific name action detected\n"); reference_service = Find_Service_Name(hsz1,reference_inst); if (( Cmd_flags && DNS_REGISTER ) == DNS_REGISTER ) { @@ -1905,7 +1905,7 @@ { /* easy one - nothing else there */ - TRACE(ddeml,"Adding 1st service name\n"); + TRACE("Adding 1st service name\n"); reference_inst->ServiceNames = this_service; GlobalAddAtomA(SNameBuffer); } else @@ -1918,12 +1918,12 @@ * what do we do ? */ HeapFree(SystemHeap, 0, this_service); /* finished - release heap space used as work store */ - FIXME(ddeml,"Trying to register already registered service !!\n"); + FIXME("Trying to register already registered service !!\n"); } else { /* Add this one into the chain */ - TRACE(ddeml,"Adding subsequent service name\n"); + TRACE("Adding subsequent service name\n"); this_service->next = reference_inst->ServiceNames; reference_inst->ServiceNames = this_service; GlobalAddAtomA(SNameBuffer); @@ -1949,7 +1949,7 @@ /* Service name not registered !! * what do we do ? */ - FIXME(ddeml,"Trying to de-register unregistered service !!\n"); + FIXME("Trying to de-register unregistered service !!\n"); } else { /* Delete this one from the chain @@ -2049,7 +2049,7 @@ UINT WINAPI DdeGetLastError( DWORD idInst ) { DWORD error_code; - FIXME(ddeml, "(%ld): stub\n",idInst); + FIXME("(%ld): stub\n",idInst); if ( DDE_Max_Assigned_Instance == 0 ) { /* Nothing has been initialised - exit now ! */ @@ -2058,17 +2058,17 @@ if ( ( prev_err = GetLastError()) != 0 ) { /* something earlier failed !! */ - ERR(ddeml,"Error %li before WaitForSingleObject - trying to continue\n",prev_err); + ERR("Error %li before WaitForSingleObject - trying to continue\n",prev_err); } WaitForSingleObject(handle_mutex,1000); if ( ((err_no=GetLastError()) != 0 ) && (err_no != prev_err )) { /* FIXME - needs refinement with popup for timeout, also is timeout interval OK */ - ERR(ddeml,"WaitForSingleObject failed - handle list %li\n",err_no); + ERR("WaitForSingleObject failed - handle list %li\n",err_no); return DMLERR_SYS_ERROR; } - TRACE(ddeml,"Handle Mutex created/reserved\n"); + TRACE("Handle Mutex created/reserved\n"); /* First check instance */ @@ -2113,7 +2113,7 @@ int ret = 0; int ret1, ret2; - TRACE( ddeml, "handle 1, handle 2\n" ); + TRACE("handle 1, handle 2\n" ); ret1 = GlobalGetAtomNameA( hsz1, psz1, MAX_BUFFER_LEN ); ret2 = GlobalGetAtomNameA( hsz2, psz2, MAX_BUFFER_LEN ); @@ -2169,7 +2169,7 @@ */ UINT WINAPI PackDDElParam(UINT msg, UINT uiLo, UINT uiHi) { - FIXME(ddeml, "stub.\n"); + FIXME("stub.\n"); return 0; } @@ -2184,7 +2184,7 @@ UINT WINAPI UnpackDDElParam(UINT msg, UINT lParam, UINT *uiLo, UINT *uiHi) { - FIXME(ddeml, "stub.\n"); + FIXME("stub.\n"); return 0; } @@ -2198,7 +2198,7 @@ */ UINT WINAPI FreeDDElParam(UINT msg, UINT lParam) { - FIXME(ddeml, "stub.\n"); + FIXME("stub.\n"); return 0; } @@ -2209,7 +2209,7 @@ UINT WINAPI ReuseDDElParam(UINT lParam, UINT msgIn, UINT msgOut, UINT uiLi, UINT uiHi) { - FIXME(ddeml, "stub.\n"); + FIXME("stub.\n"); return 0; } @@ -2219,7 +2219,7 @@ */ UINT16 WINAPI DdeQueryConvInfo16( HCONV hconv, DWORD idTransaction , LPCONVINFO16 lpConvInfo) { - FIXME(ddeml,"stub.\n"); + FIXME("stub.\n"); return 0; } @@ -2230,6 +2230,6 @@ */ UINT WINAPI DdeQueryConvInfo( HCONV hconv, DWORD idTransaction , LPCONVINFO lpConvInfo) { - FIXME(ddeml,"stub.\n"); + FIXME("stub.\n"); return 0; }
diff --git a/misc/error.c b/misc/error.c index 52be9f7..2255e05 100644 --- a/misc/error.c +++ b/misc/error.c
@@ -9,7 +9,7 @@ #include "windef.h" #include "stackframe.h" -#include "debug.h" +#include "debugtools.h" #define ErrorString(manifest) { manifest, # manifest } @@ -140,7 +140,7 @@ */ VOID WINAPI LogError16(UINT16 uErr, LPVOID lpvInfo) { - MSG("(%s, %p)\n", GetErrorString(uErr), lpvInfo); + MESSAGE("(%s, %p)\n", GetErrorString(uErr), lpvInfo); } @@ -152,7 +152,7 @@ /* FIXME: is it possible to get the module name/function * from the lpfn param? */ - MSG("(%s, %p, %p)\n", GetParamErrorString(uErr), lpfn, lpvParam); + MESSAGE("(%s, %p, %p)\n", GetParamErrorString(uErr), lpfn, lpvParam); } /***********************************************************************
diff --git a/misc/imm.c b/misc/imm.c index 47e9927..d84f68b 100644 --- a/misc/imm.c +++ b/misc/imm.c
@@ -8,7 +8,7 @@ #include "winuser.h" #include "winerror.h" #include "windef.h" -#include "debug.h" +#include "debugtools.h" #include "winversion.h" #include "imm.h" @@ -19,7 +19,7 @@ */ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) { - FIXME(imm, "(0x%08x, 0x%08x): stub\n",hWnd,hIMC); + FIXME("(0x%08x, 0x%08x): stub\n",hWnd,hIMC); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return (HIMC)NULL; } @@ -30,7 +30,7 @@ BOOL WINAPI ImmConfigureIMEA( HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData) { - FIXME(imm, "(0x%08x, 0x%08x, %ld, %p): stub\n", + FIXME("(0x%08x, 0x%08x, %ld, %p): stub\n", hKL, hWnd, dwMode, lpData ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -43,7 +43,7 @@ BOOL WINAPI ImmConfigureIMEW( HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData) { - FIXME(imm, "(0x%08x, 0x%08x, %ld, %p): stub\n", + FIXME("(0x%08x, 0x%08x, %ld, %p): stub\n", hKL, hWnd, dwMode, lpData ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -55,7 +55,7 @@ */ HIMC WINAPI ImmCreateContext() { - FIXME(imm, "(): stub\n"); + FIXME("(): stub\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return (HIMC)NULL; } @@ -65,7 +65,7 @@ */ BOOL WINAPI ImmDestroyContext(HIMC hIMC) { - FIXME(imm, "(0x%08x): stub\n",hIMC); + FIXME("(0x%08x): stub\n",hIMC); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -78,7 +78,7 @@ LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszRegister, LPVOID lpData) { - FIXME(imm, "(0x%08x, %p, %s, %ld, %s, %p): stub\n", + FIXME("(0x%08x, %p, %s, %ld, %s, %p): stub\n", hKL, lpfnEnumProc, debugstr_a(lpszReading), dwStyle, debugstr_a(lpszRegister), lpData @@ -95,7 +95,7 @@ LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszRegister, LPVOID lpData) { - FIXME(imm, "(0x%08x, %p, %s, %ld, %s, %p): stub\n", + FIXME("(0x%08x, %p, %s, %ld, %s, %p): stub\n", hKL, lpfnEnumProc, debugstr_w(lpszReading), dwStyle, debugstr_w(lpszRegister), lpData @@ -111,7 +111,7 @@ HKL hKL, HIMC hIMC, UINT uEscape, LPVOID lpData) { - FIXME(imm, "(0x%08x, 0x%08x, %d, %p): stub\n", + FIXME("(0x%08x, 0x%08x, %d, %p): stub\n", hKL, hIMC, uEscape, lpData ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -125,7 +125,7 @@ HKL hKL, HIMC hIMC, UINT uEscape, LPVOID lpData) { - FIXME(imm, "(0x%08x, 0x%08x, %d, %p): stub\n", + FIXME("(0x%08x, 0x%08x, %d, %p): stub\n", hKL, hIMC, uEscape, lpData ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -139,7 +139,7 @@ HIMC hIMC, DWORD deIndex, LPCANDIDATELIST lpCandList, DWORD dwBufLen) { - FIXME(imm, "(0x%08x, %ld, %p, %ld): stub\n", + FIXME("(0x%08x, %ld, %p, %ld): stub\n", hIMC, deIndex, lpCandList, dwBufLen ); @@ -153,7 +153,7 @@ DWORD WINAPI ImmGetCandidateListCountA( HIMC hIMC, LPDWORD lpdwListCount) { - FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lpdwListCount); + FIXME("(0x%08x, %p): stub\n", hIMC, lpdwListCount); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } @@ -164,7 +164,7 @@ DWORD WINAPI ImmGetCandidateListCountW( HIMC hIMC, LPDWORD lpdwListCount) { - FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lpdwListCount); + FIXME("(0x%08x, %p): stub\n", hIMC, lpdwListCount); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } @@ -176,7 +176,7 @@ HIMC hIMC, DWORD deIndex, LPCANDIDATELIST lpCandList, DWORD dwBufLen) { - FIXME(imm, "(0x%08x, %ld, %p, %ld): stub\n", + FIXME("(0x%08x, %ld, %p, %ld): stub\n", hIMC, deIndex, lpCandList, dwBufLen ); @@ -190,7 +190,7 @@ BOOL WINAPI ImmGetCandidateWindow( HIMC hIMC, DWORD dwBufLen, LPCANDIDATEFORM lpCandidate) { - FIXME(imm, "(0x%08x, %ld, %p): stub\n", hIMC, dwBufLen, lpCandidate); + FIXME("(0x%08x, %ld, %p): stub\n", hIMC, dwBufLen, lpCandidate); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -200,7 +200,7 @@ */ BOOL WINAPI ImmGetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf) { - FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lplf); + FIXME("(0x%08x, %p): stub\n", hIMC, lplf); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -210,7 +210,7 @@ */ BOOL WINAPI ImmGetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf) { - FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lplf); + FIXME("(0x%08x, %p): stub\n", hIMC, lplf); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -221,14 +221,14 @@ LONG WINAPI ImmGetCompositionStringA( HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen) { - FIXME(imm, "(0x%08x, %ld, %p, %ld): stub\n", + FIXME("(0x%08x, %ld, %p, %ld): stub\n", hIMC, dwIndex, lpBuf, dwBufLen ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); switch(VERSION_GetVersion()) { default: - FIXME(imm, "%s not supported",VERSION_GetVersionName()); + FIXME("%s not supported",VERSION_GetVersionName()); case WIN95: return 0xffffffff; case NT40: @@ -243,14 +243,14 @@ HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen) { - FIXME(imm, "(0x%08x, %ld, %p, %ld): stub\n", + FIXME("(0x%08x, %ld, %p, %ld): stub\n", hIMC, dwIndex, lpBuf, dwBufLen ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); switch(VERSION_GetVersion()) { default: - FIXME(imm, "%s not supported",VERSION_GetVersionName()); + FIXME("%s not supported",VERSION_GetVersionName()); case WIN95: return 0xffffffff; case NT40: @@ -263,7 +263,7 @@ */ BOOL WINAPI ImmGetCompositionWindow(HIMC hIMC, LPCOMPOSITIONFORM lpCompForm) { - FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lpCompForm); + FIXME("(0x%08x, %p): stub\n", hIMC, lpCompForm); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } @@ -273,7 +273,7 @@ */ HIMC WINAPI ImmGetContext(HWND hWnd) { - FIXME(imm, "(0x%08x): stub\n", hWnd); + FIXME("(0x%08x): stub\n", hWnd); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return (HIMC)NULL; } @@ -286,7 +286,7 @@ LPCSTR pSrc, LPCANDIDATELIST lpDst, DWORD dwBufLen, UINT uFlag) { - FIXME(imm, "(0x%08x, 0x%08x, %s, %p, %ld, %d): stub\n", + FIXME("(0x%08x, 0x%08x, %s, %p, %ld, %d): stub\n", hKL, hIMC, debugstr_a(pSrc), lpDst, dwBufLen, uFlag ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -301,7 +301,7 @@ LPCWSTR pSrc, LPCANDIDATELIST lpDst, DWORD dwBufLen, UINT uFlag) { - FIXME(imm, "(0x%08x, 0x%08x, %s, %p, %ld, %d): stub\n", + FIXME("(0x%08x, 0x%08x, %s, %p, %ld, %d): stub\n", hKL, hIMC, debugstr_w(pSrc), lpDst, dwBufLen, uFlag ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -314,7 +314,7 @@ BOOL WINAPI ImmGetConversionStatus( HIMC hIMC, LPDWORD lpfdwConversion, LPDWORD lpfdwSentence) { - FIXME(imm, "(0x%08x, %p, %p): stub\n", + FIXME("(0x%08x, %p, %p): stub\n", hIMC, lpfdwConversion, lpfdwSentence ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -326,7 +326,7 @@ */ HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) { - FIXME(imm, "(0x%08x): stub\n", hWnd); + FIXME("(0x%08x): stub\n", hWnd); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return (HWND)NULL; } @@ -337,7 +337,7 @@ UINT WINAPI ImmGetDescriptionA( HKL hKL, LPSTR lpszDescription, UINT uBufLen) { - FIXME(imm, "(0x%08x, %s, %d): stub\n", + FIXME("(0x%08x, %s, %d): stub\n", hKL, debugstr_a(lpszDescription), uBufLen ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -349,7 +349,7 @@ */ UINT WINAPI ImmGetDescriptionW(HKL hKL, LPWSTR lpszDescription, UINT uBufLen) { - FIXME(imm, "(0x%08x, %s, %d): stub\n", + FIXME("(0x%08x, %s, %d): stub\n", hKL, debugstr_w(lpszDescription), uBufLen ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -362,7 +362,7 @@ DWORD WINAPI ImmGetGuideLineA( HIMC hIMC, DWORD dwIndex, LPSTR lpBuf, DWORD dwBufLen) { - FIXME(imm, "(0x%08x, %ld, %s, %ld): stub\n", + FIXME("(0x%08x, %ld, %s, %ld): stub\n", hIMC, dwIndex, debugstr_a(lpBuf), dwBufLen ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -374,7 +374,7 @@ */ DWORD WINAPI ImmGetGuideLineW(HIMC hIMC, DWORD dwIndex, LPWSTR lpBuf, DWORD dwBufLen) { - FIXME(imm, "(0x%08x, %ld, %s, %ld): stub\n", + FIXME("(0x%08x, %ld, %s, %ld): stub\n", hIMC, dwIndex, debugstr_w(lpBuf), dwBufLen ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -387,7 +387,7 @@ UINT WINAPI ImmGetIMEFileNameA( HKL hKL, LPSTR lpszFileName, UINT uBufLen) { - FIXME(imm, "(0x%08x, %s, %d): stub\n", + FIXME("(0x%08x, %s, %d): stub\n", hKL, debugstr_a(lpszFileName), uBufLen ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -400,7 +400,7 @@ UINT WINAPI ImmGetIMEFileNameW( HKL hKL, LPWSTR lpszFileName, UINT uBufLen) { - FIXME(imm, "(0x%08x, %s, %d): stub\n", + FIXME("(0x%08x, %s, %d): stub\n", hKL, debugstr_w(lpszFileName), uBufLen ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -412,7 +412,7 @@ */ BOOL WINAPI ImmGetOpenStatus(HIMC hIMC) { - FIXME(imm, "(0x%08x): stub\n", hIMC); + FIXME("(0x%08x): stub\n", hIMC); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -422,7 +422,7 @@ */ DWORD WINAPI ImmGetProperty(HKL hKL, DWORD fdwIndex) { - FIXME(imm, "(0x%08x, %ld): stub\n", hKL, fdwIndex); + FIXME("(0x%08x, %ld): stub\n", hKL, fdwIndex); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } @@ -433,7 +433,7 @@ UINT WINAPI ImmGetRegisterWordStyleA( HKL hKL, UINT nItem, LPSTYLEBUFA lpStyleBuf) { - FIXME(imm, "(0x%08x, %d, %p): stub\n", hKL, nItem, lpStyleBuf); + FIXME("(0x%08x, %d, %p): stub\n", hKL, nItem, lpStyleBuf); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } @@ -444,7 +444,7 @@ UINT WINAPI ImmGetRegisterWordStyleW( HKL hKL, UINT nItem, LPSTYLEBUFW lpStyleBuf) { - FIXME(imm, "(0x%08x, %d, %p): stub\n", hKL, nItem, lpStyleBuf); + FIXME("(0x%08x, %d, %p): stub\n", hKL, nItem, lpStyleBuf); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } @@ -454,7 +454,7 @@ */ BOOL WINAPI ImmGetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos) { - FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lpptPos); + FIXME("(0x%08x, %p): stub\n", hIMC, lpptPos); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -464,12 +464,12 @@ */ UINT WINAPI ImmGetVirtualKey(HWND hWnd) { - FIXME(imm, "(0x%08x): stub\n", hWnd); + FIXME("(0x%08x): stub\n", hWnd); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); switch(VERSION_GetVersion()) { default: - FIXME(imm, "%s not supported", VERSION_GetVersionName()); + FIXME("%s not supported", VERSION_GetVersionName()); case WIN95: return VK_PROCESSKEY; case NT40: @@ -483,7 +483,7 @@ HKL WINAPI ImmInstallIMEA( LPCSTR lpszIMEFileName, LPCSTR lpszLayoutText) { - FIXME(imm, "(%s, %s): stub\n", + FIXME("(%s, %s): stub\n", debugstr_a(lpszIMEFileName), debugstr_a(lpszLayoutText) ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -496,7 +496,7 @@ HKL WINAPI ImmInstallIMEW( LPCWSTR lpszIMEFileName, LPCWSTR lpszLayoutText) { - FIXME(imm, "(%s, %s): stub\n", + FIXME("(%s, %s): stub\n", debugstr_w(lpszIMEFileName), debugstr_w(lpszLayoutText) ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -508,7 +508,7 @@ */ BOOL WINAPI ImmIsIME(HKL hKL) { - FIXME(imm, "(0x%08x): stub\n", hKL); + FIXME("(0x%08x): stub\n", hKL); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -519,7 +519,7 @@ BOOL WINAPI ImmIsUIMessageA( HWND hWndIME, UINT msg, WPARAM wParam, LPARAM lParam) { - FIXME(imm, "(0x%08x, %d, %d, %ld): stub\n", + FIXME("(0x%08x, %d, %d, %ld): stub\n", hWndIME, msg, wParam, lParam ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -532,7 +532,7 @@ BOOL WINAPI ImmIsUIMessageW( HWND hWndIME, UINT msg, WPARAM wParam, LPARAM lParam) { - FIXME(imm, "(0x%08x, %d, %d, %ld): stub\n", + FIXME("(0x%08x, %d, %d, %ld): stub\n", hWndIME, msg, wParam, lParam ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -545,7 +545,7 @@ BOOL WINAPI ImmNotifyIME( HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) { - FIXME(imm, "(0x%08x, %ld, %ld, %ld): stub\n", + FIXME("(0x%08x, %ld, %ld, %ld): stub\n", hIMC, dwAction, dwIndex, dwValue ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -558,7 +558,7 @@ BOOL WINAPI ImmRegisterWordA( HKL hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszRegister) { - FIXME(imm, "(0x%08x, %s, %ld, %s): stub\n", + FIXME("(0x%08x, %s, %ld, %s): stub\n", hKL, debugstr_a(lpszReading), dwStyle, debugstr_a(lpszRegister) ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -571,7 +571,7 @@ BOOL WINAPI ImmRegisterWordW( HKL hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszRegister) { - FIXME(imm, "(0x%08x, %s, %ld, %s): stub\n", + FIXME("(0x%08x, %s, %ld, %s): stub\n", hKL, debugstr_w(lpszReading), dwStyle, debugstr_w(lpszRegister) ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -583,7 +583,7 @@ */ BOOL WINAPI ImmReleaseContext(HWND hWnd, HIMC hIMC) { - FIXME(imm, "(0x%08x, 0x%08x): stub\n", hWnd, hIMC); + FIXME("(0x%08x, 0x%08x): stub\n", hWnd, hIMC); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -594,7 +594,7 @@ BOOL WINAPI ImmSetCandidateWindow( HIMC hIMC, LPCANDIDATEFORM lpCandidate) { - FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lpCandidate); + FIXME("(0x%08x, %p): stub\n", hIMC, lpCandidate); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -604,7 +604,7 @@ */ BOOL WINAPI ImmSetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf) { - FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lplf); + FIXME("(0x%08x, %p): stub\n", hIMC, lplf); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -614,7 +614,7 @@ */ BOOL WINAPI ImmSetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf) { - FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lplf); + FIXME("(0x%08x, %p): stub\n", hIMC, lplf); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -627,7 +627,7 @@ LPCVOID lpComp, DWORD dwCompLen, LPCVOID lpRead, DWORD dwReadLen) { - FIXME(imm, "(0x%08x, %ld, %p, %ld, %p, %ld): stub\n", + FIXME("(0x%08x, %ld, %p, %ld, %p, %ld): stub\n", hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -642,7 +642,7 @@ LPCVOID lpComp, DWORD dwCompLen, LPCVOID lpRead, DWORD dwReadLen) { - FIXME(imm, "(0x%08x, %ld, %p, %ld, %p, %ld): stub\n", + FIXME("(0x%08x, %ld, %p, %ld, %p, %ld): stub\n", hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -655,7 +655,7 @@ BOOL WINAPI ImmSetCompositionWindow( HIMC hIMC, LPCOMPOSITIONFORM lpCompForm) { - FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lpCompForm); + FIXME("(0x%08x, %p): stub\n", hIMC, lpCompForm); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -666,7 +666,7 @@ BOOL WINAPI ImmSetConversionStatus( HIMC hIMC, DWORD fdwConversion, DWORD fdwSentence) { - FIXME(imm, "(0x%08x, %ld, %ld): stub\n", + FIXME("(0x%08x, %ld, %ld): stub\n", hIMC, fdwConversion, fdwSentence ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -678,7 +678,7 @@ */ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) { - FIXME(imm, "(0x%08x, %d): stub\n", hIMC, fOpen); + FIXME("(0x%08x, %d): stub\n", hIMC, fOpen); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -688,7 +688,7 @@ */ BOOL WINAPI ImmSetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos) { - FIXME(imm, "(0x%08x, %p): stub\n", hIMC, lpptPos); + FIXME("(0x%08x, %p): stub\n", hIMC, lpptPos); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -698,7 +698,7 @@ */ BOOL WINAPI ImmSimulateHotKey(HWND hWnd, DWORD dwHotKeyID) { - FIXME(imm, "(0x%08x, %ld): stub\n", hWnd, dwHotKeyID); + FIXME("(0x%08x, %ld): stub\n", hWnd, dwHotKeyID); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -709,7 +709,7 @@ BOOL WINAPI ImmUnregisterWordA( HKL hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszUnregister) { - FIXME(imm, "(0x%08x, %s, %ld, %s): stub\n", + FIXME("(0x%08x, %s, %ld, %s): stub\n", hKL, debugstr_a(lpszReading), dwStyle, debugstr_a(lpszUnregister) ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -725,7 +725,7 @@ BOOL WINAPI ImmUnregisterWordW( HKL hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszUnregister) { - FIXME(imm, "(0x%08x, %s, %ld, %s): stub\n", + FIXME("(0x%08x, %s, %ld, %s): stub\n", hKL, debugstr_w(lpszReading), dwStyle, debugstr_w(lpszUnregister) ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
diff --git a/misc/lstr.c b/misc/lstr.c index 8054cca..7fb9f56 100644 --- a/misc/lstr.c +++ b/misc/lstr.c
@@ -31,7 +31,7 @@ #include "ldt.h" #include "stackframe.h" #include "module.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(resource) @@ -520,10 +520,10 @@ DWORD width = dwFlags & FORMAT_MESSAGE_MAX_WIDTH_MASK; DWORD nolinefeed = 0; - TRACE(resource, "(0x%lx,%p,%ld,0x%lx,%p,%ld,%p)\n", + TRACE("(0x%lx,%p,%ld,0x%lx,%p,%ld,%p)\n", dwFlags,lpSource,dwMessageId,dwLanguageId,lpBuffer,nSize,args); if (width) - FIXME(resource,"line wrapping not supported.\n"); + FIXME("line wrapping not supported.\n"); from = NULL; if (dwFlags & FORMAT_MESSAGE_FROM_STRING) from = HEAP_strdupA( GetProcessHeap(), 0, (LPSTR)lpSource); @@ -657,7 +657,7 @@ if (nSize && talloced<nSize) { target = (char*)HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,nSize); } - TRACE(resource,"-- %s\n",debugstr_a(target)); + TRACE("-- %s\n",debugstr_a(target)); if (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) { /* nSize is the MINIMUM size */ *((LPVOID*)lpBuffer) = (LPVOID)LocalAlloc(GMEM_ZEROINIT,talloced); @@ -696,10 +696,10 @@ DWORD width = dwFlags & FORMAT_MESSAGE_MAX_WIDTH_MASK; DWORD nolinefeed = 0; - TRACE(resource, "(0x%lx,%p,%ld,0x%lx,%p,%ld,%p)\n", + TRACE("(0x%lx,%p,%ld,0x%lx,%p,%ld,%p)\n", dwFlags,lpSource,dwMessageId,dwLanguageId,lpBuffer,nSize,args); if (width) - FIXME(resource,"line wrapping not supported.\n"); + FIXME("line wrapping not supported.\n"); from = NULL; if (dwFlags & FORMAT_MESSAGE_FROM_STRING) from = HEAP_strdupWtoA(GetProcessHeap(),0,(LPWSTR)lpSource);
diff --git a/misc/lzexpand.c b/misc/lzexpand.c index 5fab3fe..72f1363 100644 --- a/misc/lzexpand.c +++ b/misc/lzexpand.c
@@ -16,7 +16,7 @@ #include "file.h" #include "heap.h" #include "lzexpand.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(file) @@ -121,7 +121,7 @@ */ INT16 WINAPI LZStart16(void) { - TRACE(file,"(void)\n"); + TRACE("(void)\n"); return 1; } @@ -131,7 +131,7 @@ */ INT WINAPI LZStart(void) { - TRACE(file,"(void)\n"); + TRACE("(void)\n"); return 1; } @@ -167,7 +167,7 @@ DWORD ret; int i; - TRACE(file,"(%d)\n",hfSrc); + TRACE("(%d)\n",hfSrc); ret=read_header(hfSrc,&head); if (ret<=0) { _llseek(hfSrc,0,SEEK_SET); @@ -199,7 +199,7 @@ */ void WINAPI LZDone(void) { - TRACE(file,"(void)\n"); + TRACE("(void)\n"); } @@ -231,7 +231,7 @@ INT fnislowercased,ret,len; LPSTR s,t; - TRACE(file,"(%s)\n",in); + TRACE("(%s)\n",in); fd=OpenFile(in,&ofs,OF_READ); if (fd==HFILE_ERROR) return (INT)(INT16)LZERROR_BADINHANDLE; @@ -253,7 +253,7 @@ /* now mangle the basename */ if (!*s) { /* FIXME: hmm. shouldn't happen? */ - WARN(file,"Specified a directory or what? (%s)\n",in); + WARN("Specified a directory or what? (%s)\n",in); _lclose(fd); return 1; } @@ -328,7 +328,7 @@ struct lzstate *lzs; buf=(LPBYTE)vbuf; - TRACE(file,"(%d,%p,%d)\n",fd,buf,toread); + TRACE("(%d,%p,%d)\n",fd,buf,toread); howmuch=toread; if (!(lzs = GET_LZ_STATE(fd))) return _lread(fd,buf,toread); @@ -427,7 +427,7 @@ struct lzstate *lzs; LONG newwanted; - TRACE(file,"(%d,%ld,%d)\n",fd,off,type); + TRACE("(%d,%ld,%d)\n",fd,off,type); /* not compressed? just use normal _llseek() */ if (!(lzs = GET_LZ_STATE(fd))) return _llseek(fd,off,type); newwanted = lzs->realwanted; @@ -495,7 +495,7 @@ _readfun xread; - TRACE(file,"(%d,%d)\n",src,dest); + TRACE("(%d,%d)\n",src,dest); if (!IS_LZ_HANDLE(src)) { src = LZInit(src); if ((INT)src <= 0) return 0; @@ -570,7 +570,7 @@ { HFILE fd,cfd; - TRACE(file,"(%s,%p,%d)\n",fn,ofs,mode); + TRACE("(%s,%p,%d)\n",fn,ofs,mode); /* 0x70 represents all OF_SHARE_* flags, ignore them for the check */ fd=OpenFile(fn,ofs,mode); if (fd==HFILE_ERROR) @@ -628,7 +628,7 @@ { struct lzstate *lzs; - TRACE(file,"(%d)\n",fd); + TRACE("(%d)\n",fd); if (!(lzs = GET_LZ_STATE(fd))) _lclose(fd); else { @@ -644,7 +644,7 @@ */ LONG WINAPI CopyLZFile16( HFILE16 src, HFILE16 dest ) { - TRACE(file,"(%d,%d)\n",src,dest); + TRACE("(%d,%d)\n",src,dest); return LZCopy16(src,dest); } @@ -657,6 +657,6 @@ */ LONG WINAPI CopyLZFile( HFILE src, HFILE dest ) { - TRACE(file,"(%d,%d)\n",src,dest); + TRACE("(%d,%d)\n",src,dest); return LZCopy(src,dest); }
diff --git a/misc/main.c b/misc/main.c index 9e83491..3129ef7 100644 --- a/misc/main.c +++ b/misc/main.c
@@ -30,7 +30,7 @@ #include "options.h" #include "desktop.h" #include "builtin32.h" -#include "debug.h" +#include "debugtools.h" #include "debugdefs.h" #include "xmalloc.h" #include "module.h" @@ -143,7 +143,7 @@ */ void MAIN_Usage( char *name ) { - MSG( szUsage, WINE_RELEASE_INFO, name ); + MESSAGE( szUsage, WINE_RELEASE_INFO, name ); exit(1); } @@ -290,28 +290,28 @@ return TRUE; error: - MSG("%s: Syntax: -debugmsg [class]+xxx,... or " + MESSAGE("%s: Syntax: -debugmsg [class]+xxx,... or " "-debugmsg [class]-xxx,...\n",Options.argv[0]); - MSG("Example: -debugmsg +all,warn-heap\n" + MESSAGE("Example: -debugmsg +all,warn-heap\n" " turn on all messages except warning heap messages\n"); - MSG("Special case: -debugmsg +relay=DLL:DLL.###:FuncName\n" + MESSAGE("Special case: -debugmsg +relay=DLL:DLL.###:FuncName\n" " turn on -debugmsg +relay only as specified\n" "Special case: -debugmsg -relay=DLL:DLL.###:FuncName\n" " turn on -debugmsg +relay except as specified\n" "Also permitted, +snoop=..., -snoop=... as with relay.\n\n"); - MSG("Available message classes:\n"); + MESSAGE("Available message classes:\n"); for(i=0;i<DEBUG_CLASS_COUNT;i++) - MSG( "%-9s", debug_cl_name[i]); - MSG("\n\n"); + MESSAGE( "%-9s", debug_cl_name[i]); + MESSAGE("\n\n"); - MSG("Available message types:\n"); - MSG("%-9s ","all"); + MESSAGE("Available message types:\n"); + MESSAGE("%-9s ","all"); for(i=0;i<DEBUG_CHANNEL_COUNT;i++) if(debug_ch_name[i]) - MSG("%-9s%c",debug_ch_name[i], + MESSAGE("%-9s%c",debug_ch_name[i], (((i+2)%8==0)?'\n':' ')); - MSG("\n\n"); + MESSAGE("\n\n"); exit(1); } @@ -680,9 +680,9 @@ const WINE_LANGUAGE_DEF *p = Languages; /* for compatibility whith non-iso names previously used */ - if (!strcmp("Sw",arg)) { strcpy(arg,"Sv"); FIXME(system,"use 'Sv' instead of 'Sw'\n");} - if (!strcmp("Cz",arg)) { strcpy(arg,"Cs"); FIXME(system,"use 'Cs' instead of 'Cz'\n");} - if (!strcmp("Po",arg)) { strcpy(arg,"Pt"); FIXME(system,"use 'Pt' instead of 'Po'\n");} + if (!strcmp("Sw",arg)) { strcpy(arg,"Sv"); FIXME_(system)("use 'Sv' instead of 'Sw'\n");} + if (!strcmp("Cz",arg)) { strcpy(arg,"Cs"); FIXME_(system)("use 'Cs' instead of 'Cz'\n");} + if (!strcmp("Po",arg)) { strcpy(arg,"Pt"); FIXME_(system)("use 'Pt' instead of 'Po'\n");} Options.language = LANG_Xx; /* First (dummy) language */ for (;p->name;p++) @@ -694,9 +694,9 @@ } Options.language++; } - MSG( "Invalid language specified '%s'. Supported languages are: ", arg ); - for (p = Languages; p->name; p++) MSG( "%s ", p->name ); - MSG( "\n" ); + MESSAGE( "Invalid language specified '%s'. Supported languages are: ", arg ); + for (p = Languages; p->name; p++) MESSAGE( "%s ", p->name ); + MESSAGE( "\n" ); exit(1); } @@ -712,8 +712,8 @@ else if (!lstrcmpiA("standard", arg)) Options.mode = MODE_STANDARD; else { - MSG( "Invalid mode '%s' specified.\n", arg); - MSG( "Valid modes are: 'standard', 'enhanced' (default).\n"); + MESSAGE( "Invalid mode '%s' specified.\n", arg); + MESSAGE( "Valid modes are: 'standard', 'enhanced' (default).\n"); exit(1); } } @@ -744,7 +744,7 @@ { if (!strcmp( argv[i], "-v" ) || !strcmp( argv[i], "-version" )) { - MSG( "%s\n", WINE_RELEASE_INFO ); + MESSAGE( "%s\n", WINE_RELEASE_INFO ); exit(0); } if (!strcmp( argv[i], "-h" ) || !strcmp( argv[i], "-help" )) @@ -784,11 +784,11 @@ mcheck(NULL); if (!(trace = getenv("MALLOC_TRACE"))) { - MSG( "MALLOC_TRACE not set. No trace generated\n" ); + MESSAGE( "MALLOC_TRACE not set. No trace generated\n" ); } else { - MSG( "malloc trace goes to %s\n", trace ); + MESSAGE( "malloc trace goes to %s\n", trace ); mtrace(); } #endif @@ -1031,7 +1031,7 @@ LPANIMATIONINFO lpAnimInfo = (LPANIMATIONINFO)lpvParam; /* Do nothing */ - WARN(system, "SPI_SETANIMATION ignored.\n"); + WARN_(system)("SPI_SETANIMATION ignored.\n"); lpAnimInfo->cbSize = sizeof(ANIMATIONINFO); uParam = sizeof(ANIMATIONINFO); break; @@ -1041,7 +1041,7 @@ { LPHIGHCONTRASTA lpHighContrastA = (LPHIGHCONTRASTA)lpvParam; - FIXME(system,"SPI_GETHIGHCONTRAST not fully implemented\n"); + FIXME_(system)("SPI_GETHIGHCONTRAST not fully implemented\n"); if ( lpHighContrastA->cbSize == sizeof( HIGHCONTRASTA ) ) { @@ -1224,7 +1224,7 @@ case SPI_SETFASTTASKSWITCH: case SPI_SETKEYBOARDDELAY: case SPI_SETKEYBOARDSPEED: - WARN(system, "Option %d ignored.\n", uAction); + WARN_(system)("Option %d ignored.\n", uAction); break; case SPI_GETWORKAREA: @@ -1234,7 +1234,7 @@ break; default: - WARN(system, "Unknown option %d.\n", uAction); + WARN_(system)("Unknown option %d.\n", uAction); break; } return 1; @@ -1307,7 +1307,7 @@ { LPHIGHCONTRASTW lpHighContrastW = (LPHIGHCONTRASTW)lpvParam; - FIXME(system,"SPI_GETHIGHCONTRAST not fully implemented\n"); + FIXME_(system)("SPI_GETHIGHCONTRAST not fully implemented\n"); if ( lpHighContrastW->cbSize == sizeof( HIGHCONTRASTW ) ) { @@ -1336,6 +1336,6 @@ */ FARPROC16 WINAPI FileCDR16(FARPROC16 x) { - FIXME(file,"(0x%8x): stub\n", (int) x); + FIXME_(file)("(0x%8x): stub\n", (int) x); return (FARPROC16)TRUE; }
diff --git a/misc/sound.c b/misc/sound.c index 97d5622..8ceeca6 100644 --- a/misc/sound.c +++ b/misc/sound.c
@@ -5,56 +5,56 @@ #include <stdlib.h> #include "windef.h" #include "wine/winesound.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(sound) INT16 WINAPI OpenSound16(void) { - FIXME(sound, "(void): stub\n"); + FIXME("(void): stub\n"); return -1; } void WINAPI OpenSound(void) { - FIXME(sound, "(void): stub\n"); + FIXME("(void): stub\n"); } void WINAPI CloseSound16(void) { - FIXME(sound, "(void): stub\n"); + FIXME("(void): stub\n"); } INT16 WINAPI SetVoiceQueueSize16(INT16 nVoice, INT16 nBytes) { - FIXME(sound, "(%d,%d): stub\n",nVoice,nBytes); + FIXME("(%d,%d): stub\n",nVoice,nBytes); return 0; } DWORD WINAPI SetVoiceQueueSize(DWORD nVoice, DWORD nBytes) { - FIXME(sound, "(%ld,%ld): stub\n",nVoice,nBytes); + FIXME("(%ld,%ld): stub\n",nVoice,nBytes); return 0; } INT16 WINAPI SetVoiceNote16(INT16 nVoice, INT16 nValue, INT16 nLength, INT16 nCdots) { - FIXME(sound, "(%d,%d,%d,%d): stub\n",nVoice,nValue,nLength,nCdots); + FIXME("(%d,%d,%d,%d): stub\n",nVoice,nValue,nLength,nCdots); return 0; } DWORD WINAPI SetVoiceNote(DWORD nVoice, DWORD nValue, DWORD nLength, DWORD nCdots) { - FIXME(sound, "(%ld,%ld,%ld,%ld): stub\n",nVoice,nValue,nLength,nCdots); + FIXME("(%ld,%ld,%ld,%ld): stub\n",nVoice,nValue,nLength,nCdots); return 0; } INT16 WINAPI SetVoiceAccent16(INT16 nVoice, INT16 nTempo, INT16 nVolume, INT16 nMode, INT16 nPitch) { - FIXME(sound, "(%d,%d,%d,%d,%d): stub\n", nVoice, nTempo, + FIXME("(%d,%d,%d,%d,%d): stub\n", nVoice, nTempo, nVolume, nMode, nPitch); return 0; } @@ -62,44 +62,44 @@ DWORD WINAPI SetVoiceAccent(DWORD nVoice, DWORD nTempo, DWORD nVolume, DWORD nMode, DWORD nPitch) { - FIXME(sound, "(%ld,%ld,%ld,%ld,%ld): stub\n", nVoice, nTempo, + FIXME("(%ld,%ld,%ld,%ld,%ld): stub\n", nVoice, nTempo, nVolume, nMode, nPitch); return 0; } INT16 WINAPI SetVoiceEnvelope16(INT16 nVoice, INT16 nShape, INT16 nRepeat) { - FIXME(sound, "(%d,%d,%d): stub\n",nVoice,nShape,nRepeat); + FIXME("(%d,%d,%d): stub\n",nVoice,nShape,nRepeat); return 0; } DWORD WINAPI SetVoiceEnvelope(DWORD nVoice, DWORD nShape, DWORD nRepeat) { - FIXME(sound, "(%ld,%ld,%ld): stub\n",nVoice,nShape,nRepeat); + FIXME("(%ld,%ld,%ld): stub\n",nVoice,nShape,nRepeat); return 0; } INT16 WINAPI SetSoundNoise16(INT16 nSource, INT16 nDuration) { - FIXME(sound, "(%d,%d): stub\n",nSource,nDuration); + FIXME("(%d,%d): stub\n",nSource,nDuration); return 0; } DWORD WINAPI SetSoundNoise(DWORD nSource, DWORD nDuration) { - FIXME(sound, "(%ld,%ld): stub\n",nSource,nDuration); + FIXME("(%ld,%ld): stub\n",nSource,nDuration); return 0; } INT16 WINAPI SetVoiceSound16(INT16 nVoice, DWORD lFrequency, INT16 nDuration) { - FIXME(sound, "(%d, %ld, %d): stub\n",nVoice,lFrequency, nDuration); + FIXME("(%d, %ld, %d): stub\n",nVoice,lFrequency, nDuration); return 0; } DWORD WINAPI SetVoiceSound(DWORD nVoice, DWORD lFrequency, DWORD nDuration) { - FIXME(sound, "(%ld, %ld, %ld): stub\n",nVoice,lFrequency, nDuration); + FIXME("(%ld, %ld, %ld): stub\n",nVoice,lFrequency, nDuration); return 0; } @@ -115,79 +115,79 @@ INT16 WINAPI WaitSoundState16(INT16 x) { - FIXME(sound, "(%d): stub\n", x); + FIXME("(%d): stub\n", x); return 0; } DWORD WINAPI WaitSoundState(DWORD x) { - FIXME(sound, "(%ld): stub\n", x); + FIXME("(%ld): stub\n", x); return 0; } INT16 WINAPI SyncAllVoices16(void) { - FIXME(sound, "(void): stub\n"); + FIXME("(void): stub\n"); return 0; } DWORD WINAPI SyncAllVoices(void) { - FIXME(sound, "(void): stub\n"); + FIXME("(void): stub\n"); return 0; } INT16 WINAPI CountVoiceNotes16(INT16 x) { - FIXME(sound, "(%d): stub\n", x); + FIXME("(%d): stub\n", x); return 0; } DWORD WINAPI CountVoiceNotes(DWORD x) { - FIXME(sound, "(%ld): stub\n", x); + FIXME("(%ld): stub\n", x); return 0; } LPINT16 WINAPI GetThresholdEvent16(void) { - FIXME(sound, "(void): stub\n"); + FIXME("(void): stub\n"); return NULL; } LPDWORD WINAPI GetThresholdEvent(void) { - FIXME(sound, "(void): stub\n"); + FIXME("(void): stub\n"); return NULL; } INT16 WINAPI GetThresholdStatus16(void) { - FIXME(sound, "(void): stub\n"); + FIXME("(void): stub\n"); return 0; } DWORD WINAPI GetThresholdStatus(void) { - FIXME(sound, "(void): stub\n"); + FIXME("(void): stub\n"); return 0; } INT16 WINAPI SetVoiceThreshold16(INT16 a, INT16 b) { - FIXME(sound, "(%d,%d): stub\n", a, b); + FIXME("(%d,%d): stub\n", a, b); return 0; } DWORD WINAPI SetVoiceThreshold(DWORD a, DWORD b) { - FIXME(sound, "(%ld,%ld): stub\n", a, b); + FIXME("(%ld,%ld): stub\n", a, b); return 0; } void WINAPI DoBeep16(void) { - FIXME(sound, "(void): stub!\n"); + FIXME("(void): stub!\n"); }
diff --git a/misc/spy.c b/misc/spy.c index f8afbe2..230ba22 100644 --- a/misc/spy.c +++ b/misc/spy.c
@@ -12,7 +12,7 @@ #include "win.h" #include "module.h" #include "options.h" -#include "debug.h" +#include "debugtools.h" #include "spy.h" DEFAULT_DEBUG_CHANNEL(message) @@ -670,22 +670,22 @@ { case WM_DRAWITEM: { DRAWITEMSTRUCT *lpdis = (DRAWITEMSTRUCT*) structure; - TRACE(message, "DRAWITEMSTRUCT: CtlType=0x%08x CtlID=0x%08x\n", lpdis->CtlType, lpdis->CtlID); - TRACE(message, "itemID=0x%08x itemAction=0x%08x itemState=0x%08x\n", lpdis->itemID, lpdis->itemAction, lpdis->itemState); - TRACE(message, "hWnd=0x%04x hDC=0x%04x (%d,%d)-(%d,%d) itemData=0x%08lx\n", + TRACE("DRAWITEMSTRUCT: CtlType=0x%08x CtlID=0x%08x\n", lpdis->CtlType, lpdis->CtlID); + TRACE("itemID=0x%08x itemAction=0x%08x itemState=0x%08x\n", lpdis->itemID, lpdis->itemAction, lpdis->itemState); + TRACE("hWnd=0x%04x hDC=0x%04x (%d,%d)-(%d,%d) itemData=0x%08lx\n", lpdis->hwndItem, lpdis->hDC, lpdis->rcItem.left, lpdis->rcItem.top, lpdis->rcItem.right, lpdis->rcItem.bottom, lpdis->itemData); } break; case WM_MEASUREITEM: { MEASUREITEMSTRUCT *lpmis = (MEASUREITEMSTRUCT*) structure; - TRACE(message, "MEASUREITEMSTRUCT: CtlType=0x%08x CtlID=0x%08x\n", lpmis->CtlType, lpmis->CtlID); - TRACE(message, "itemID=0x%08x itemWidth=0x%08x itemHeight=0x%08x\n", lpmis->itemID, lpmis->itemWidth, lpmis->itemHeight); - TRACE(message, "itemData=0x%08lx\n", lpmis->itemData); + TRACE("MEASUREITEMSTRUCT: CtlType=0x%08x CtlID=0x%08x\n", lpmis->CtlType, lpmis->CtlID); + TRACE("itemID=0x%08x itemWidth=0x%08x itemHeight=0x%08x\n", lpmis->itemID, lpmis->itemWidth, lpmis->itemHeight); + TRACE("itemData=0x%08lx\n", lpmis->itemData); } break; case WM_NOTIFY: { NMHDR * pnmh = (NMHDR*) structure; - TRACE(message, "NMHDR hwndFrom=0x%08x idFrom=0x%08x code=0x%08x\n", pnmh->hwndFrom, pnmh->idFrom, pnmh->code); + TRACE("NMHDR hwndFrom=0x%08x idFrom=0x%08x code=0x%08x\n", pnmh->hwndFrom, pnmh->idFrom, pnmh->code); } default: break; @@ -707,14 +707,14 @@ { case SPY_DISPATCHMESSAGE16: pname = SPY_GetWndName(hWnd); - TRACE(message,"%*s(%04x) %-16s message [%04x] %s dispatched wp=%04x lp=%08lx\n", + TRACE("%*s(%04x) %-16s message [%04x] %s dispatched wp=%04x lp=%08lx\n", SPY_IndentLevel, "", hWnd, pname, msg, SPY_GetMsgName( msg ), wParam, lParam); break; case SPY_DISPATCHMESSAGE: pname = SPY_GetWndName(hWnd); - TRACE(message,"%*s(%08x) %-16s message [%04x] %s dispatched wp=%08x lp=%08lx\n", + TRACE("%*s(%08x) %-16s message [%04x] %s dispatched wp=%08x lp=%08lx\n", SPY_IndentLevel, "", hWnd, pname, msg, SPY_GetMsgName( msg ), wParam, lParam); break; @@ -735,11 +735,11 @@ pname = SPY_GetWndName(hWnd); if (iFlag == SPY_SENDMESSAGE16) - TRACE(message, "%*s(%04x) %-16s message [%04x] %s sent from %s wp=%04x lp=%08lx\n", + TRACE("%*s(%04x) %-16s message [%04x] %s sent from %s wp=%04x lp=%08lx\n", SPY_IndentLevel, "", hWnd, pname, msg, SPY_GetMsgName( msg ), taskName, wParam, lParam ); else - { TRACE(message, "%*s(%08x) %-16s message [%04x] %s sent from %s wp=%08x lp=%08lx\n", + { TRACE("%*s(%08x) %-16s message [%04x] %s sent from %s wp=%08x lp=%08lx\n", SPY_IndentLevel, "", hWnd, pname, msg, SPY_GetMsgName( msg ), taskName, wParam, lParam ); SPY_DumpStructure(msg, lParam); @@ -749,14 +749,14 @@ case SPY_DEFWNDPROC16: if( SPY_ExcludeDWP ) return; - TRACE(message, "%*s(%04x) DefWindowProc16: %s [%04x] wp=%04x lp=%08lx\n", + TRACE("%*s(%04x) DefWindowProc16: %s [%04x] wp=%04x lp=%08lx\n", SPY_IndentLevel, "", hWnd, SPY_GetMsgName( msg ), msg, wParam, lParam ); break; case SPY_DEFWNDPROC: if( SPY_ExcludeDWP ) return; - TRACE(message, "%*s(%08x) DefWindowProc32: %s [%04x] wp=%08x lp=%08lx\n", + TRACE("%*s(%08x) DefWindowProc32: %s [%04x] wp=%08x lp=%08lx\n", SPY_IndentLevel, "", hWnd, SPY_GetMsgName( msg ), msg, wParam, lParam ); break; @@ -781,39 +781,39 @@ switch(iFlag) { case SPY_RESULT_DEFWND16: - TRACE(message," %*s(%04x) DefWindowProc16: %s [%04x] returned %08lx\n", + TRACE(" %*s(%04x) DefWindowProc16: %s [%04x] returned %08lx\n", SPY_IndentLevel, "", hWnd, SPY_GetMsgName( msg ), msg, lReturn ); break; case SPY_RESULT_DEFWND: - TRACE(message," %*s(%08x) DefWindowProc32: %s [%04x] returned %08lx\n", + TRACE(" %*s(%08x) DefWindowProc32: %s [%04x] returned %08lx\n", SPY_IndentLevel, "", hWnd, SPY_GetMsgName( msg ), msg, lReturn ); break; case SPY_RESULT_OK16: pname = SPY_GetWndName(hWnd); - TRACE(message," %*s(%04x) %-16s message [%04x] %s returned %08lx\n", + TRACE(" %*s(%04x) %-16s message [%04x] %s returned %08lx\n", SPY_IndentLevel, "", hWnd, pname, msg, SPY_GetMsgName( msg ), lReturn ); break; case SPY_RESULT_OK: pname = SPY_GetWndName(hWnd); - TRACE(message," %*s(%08x) %-16s message [%04x] %s returned %08lx\n", + TRACE(" %*s(%08x) %-16s message [%04x] %s returned %08lx\n", SPY_IndentLevel, "", hWnd, pname, msg, SPY_GetMsgName( msg ), lReturn ); break; case SPY_RESULT_INVALIDHWND16: pname = SPY_GetWndName(hWnd); - WARN(message, " %*s(%04x) %-16s message [%04x] %s HAS INVALID HWND\n", + WARN(" %*s(%04x) %-16s message [%04x] %s HAS INVALID HWND\n", SPY_IndentLevel, "", hWnd, pname, msg, SPY_GetMsgName( msg ) ); break; case SPY_RESULT_INVALIDHWND: pname = SPY_GetWndName(hWnd); - WARN(message, " %*s(%08x) %-16s message [%04x] %s HAS INVALID HWND\n", + WARN(" %*s(%08x) %-16s message [%04x] %s HAS INVALID HWND\n", SPY_IndentLevel, "", hWnd, pname, msg, SPY_GetMsgName( msg ) ); break; @@ -834,7 +834,7 @@ PROFILE_GetWineIniString( "Spy", "Include", "", buffer, sizeof(buffer) ); if (buffer[0] && strcmp( buffer, "INCLUDEALL" )) { - TRACE(message, "Include=%s\n", buffer ); + TRACE("Include=%s\n", buffer ); for (i = 0; i <= SPY_MAX_MSGNUM; i++) SPY_Exclude[i] = (MessageTypeNames[i] && !strstr(buffer,MessageTypeNames[i])); } @@ -842,7 +842,7 @@ PROFILE_GetWineIniString( "Spy", "Exclude", "", buffer, sizeof(buffer) ); if (buffer[0]) { - TRACE(message, "Exclude=%s\n", buffer ); + TRACE("Exclude=%s\n", buffer ); if (!strcmp( buffer, "EXCLUDEALL" )) for (i = 0; i <= SPY_MAX_MSGNUM; i++) SPY_Exclude[i] = TRUE; else
diff --git a/misc/stress.c b/misc/stress.c index 373c6eb..860c35d 100644 --- a/misc/stress.c +++ b/misc/stress.c
@@ -1,13 +1,13 @@ #include <limits.h> #include "stress.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(stress) int WINAPI AllocDiskSpace(long lLeft, UINT16 uDrive) { - FIXME(stress, "(%d, %ld) - stub\n", + FIXME("(%d, %ld) - stub\n", uDrive, lLeft); return 1; @@ -15,7 +15,7 @@ int WINAPI AllocFileHandles(int Left) { - TRACE(stress, "(%d) - stub\n", Left); + TRACE("(%d) - stub\n", Left); if (Left < 0) return -1; @@ -25,48 +25,48 @@ BOOL16 WINAPI AllocGDIMem(UINT16 uLeft) { - TRACE(stress, "(%d) - stub\n", uLeft); + TRACE("(%d) - stub\n", uLeft); return 1; } BOOL16 WINAPI AllocMem(DWORD dwLeft) { - FIXME(stress, "(%ld) - stub\n", dwLeft); + FIXME("(%ld) - stub\n", dwLeft); return 1; } BOOL16 WINAPI AllocUserMem(UINT16 uContig) { - TRACE(stress, "AllocUserMem %d\n", uContig); + TRACE("AllocUserMem %d\n", uContig); return 1; } void WINAPI FreeAllMem(void) { - TRACE(stress, "FreeAllMem\n"); + TRACE("FreeAllMem\n"); } void WINAPI FreeAllGDIMem(void) { - TRACE(stress, "FreeAllGDIMem\n"); + TRACE("FreeAllGDIMem\n"); } void WINAPI FreeAllUserMem(void) { - TRACE(stress, "FreeAllUserMem\n"); + TRACE("FreeAllUserMem\n"); } void WINAPI GetFreeAllUserMem(void) { - TRACE(stress, "GetFreeAllUserMem\n"); + TRACE("GetFreeAllUserMem\n"); } int WINAPI GetFreeFileHandles(void) { - TRACE(stress, "GetFreeFileHandles\n"); + TRACE("GetFreeFileHandles\n"); #ifndef OPEN_MAX return _POSIX_OPEN_MAX; @@ -77,10 +77,10 @@ void WINAPI UnAllocDiskSpace(UINT16 drive) { - TRACE(stress, "UnAllocDiskSpace %d\n", drive); + TRACE("UnAllocDiskSpace %d\n", drive); } void WINAPI UnAllocFileHandles(void) { - TRACE(stress, "GetFreeAllUserMem\n"); + TRACE("GetFreeAllUserMem\n"); }
diff --git a/misc/system.c b/misc/system.c index 14f73b9..2cab5cd 100644 --- a/misc/system.c +++ b/misc/system.c
@@ -7,7 +7,7 @@ #include "wine/winbase16.h" #include "wine/winuser16.h" #include "services.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(system) @@ -91,10 +91,10 @@ return MAKELONG( drivetype, drivetype ); case 2: /* Enable one-drive logic */ - FIXME(system, "Case %d: set single-drive %d not supported\n", code, arg ); + FIXME("Case %d: set single-drive %d not supported\n", code, arg ); return 0; } - WARN(system, "Unknown code %d\n", code ); + WARN("Unknown code %d\n", code ); return 0; }
diff --git a/misc/toolhelp.c b/misc/toolhelp.c index 7abf041..d9a88b8 100644 --- a/misc/toolhelp.c +++ b/misc/toolhelp.c
@@ -17,7 +17,7 @@ #include "toolhelp.h" #include "heap.h" #include "server.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(toolhelp) @@ -42,7 +42,7 @@ { int i; - TRACE(toolhelp, "(%x,%lx,%x) called.\n", + TRACE("(%x,%lx,%x) called.\n", htask, (DWORD)lpfnCallback, wFlags ); if (!htask) htask = GetCurrentTask(); for (i=0;i<nrofnotifys;i++) @@ -68,7 +68,7 @@ { int i; - TRACE(toolhelp, "(%x) called.\n", htask ); + TRACE("(%x) called.\n", htask ); if (!htask) htask = GetCurrentTask(); for (i=nrofnotifys;i--;) if (notifys[i].htask==htask) @@ -118,9 +118,9 @@ { struct create_snapshot_request *req = get_req_buffer(); - TRACE( toolhelp, "%lx,%lx\n", flags, process ); + TRACE("%lx,%lx\n", flags, process ); if (flags & (TH32CS_SNAPHEAPLIST|TH32CS_SNAPMODULE|TH32CS_SNAPTHREAD)) - FIXME( toolhelp, "flags %lx not implemented\n", flags ); + FIXME("flags %lx not implemented\n", flags ); if (!(flags & TH32CS_SNAPPROCESS)) { SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); @@ -147,7 +147,7 @@ if (lppe->dwSize < sizeof (PROCESSENTRY)) { SetLastError( ERROR_INSUFFICIENT_BUFFER ); - ERR (toolhelp, "Result buffer too small\n"); + ERR("Result buffer too small\n"); return FALSE; } req->handle = handle; @@ -193,7 +193,7 @@ */ BOOL WINAPI Module32First(HANDLE hSnapshot, LPMODULEENTRY lpme) { - FIXME(toolhelp,"(%d,%p),stub!\n",hSnapshot,lpme); + FIXME("(%d,%p),stub!\n",hSnapshot,lpme); return FALSE; } @@ -204,7 +204,7 @@ */ BOOL WINAPI Module32Next(HANDLE hSnapshot, LPMODULEENTRY lpme) { - FIXME(toolhelp,"(%d,%p),stub!\n",hSnapshot,lpme); + FIXME("(%d,%p),stub!\n",hSnapshot,lpme); return FALSE; } @@ -220,6 +220,6 @@ */ DWORD WINAPI GlobalMasterHandle16(void) { - FIXME(toolhelp,": stub\n"); + FIXME(": stub\n"); return 0; }
diff --git a/misc/tweak.c b/misc/tweak.c index c538ca6..4c30596 100644 --- a/misc/tweak.c +++ b/misc/tweak.c
@@ -32,7 +32,7 @@ #include "winuser.h" #include "tweak.h" #include "options.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(tweak) @@ -65,13 +65,13 @@ if (strncmp (szIniString, "TestString", 10)) { if (PROFILE_GetWineIniBool ("Tweak.Layout", "Win95Look", 0)) { TWEAK_WineLook = WIN95_LOOK; - TRACE (tweak, "Using Win95 look and feel.\n"); + TRACE("Using Win95 look and feel.\n"); } else { TWEAK_WineLook = WIN31_LOOK; - TRACE (tweak, "Using Win3.1 look and feel.\n"); + TRACE("Using Win3.1 look and feel.\n"); } - ERR (tweak, + ERR( "Replace \"Win95Look\" by \"WineLook\" in your \"wine.ini\"!\n"); } @@ -80,19 +80,19 @@ if (!strncasecmp (szIniString, "Win31", 5)) { TWEAK_WineLook = WIN31_LOOK; - TRACE (tweak, "Using Win3.1 look and feel.\n"); + TRACE("Using Win3.1 look and feel.\n"); } else if (!strncasecmp (szIniString, "Win95", 5)) { TWEAK_WineLook = WIN95_LOOK; - TRACE (tweak, "Using Win95 look and feel.\n"); + TRACE("Using Win95 look and feel.\n"); } else if (!strncasecmp (szIniString, "Win98", 5)) { TWEAK_WineLook = WIN98_LOOK; - TRACE (tweak, "Using Win98 look and feel.\n"); + TRACE("Using Win98 look and feel.\n"); } else { TWEAK_WineLook = WIN31_LOOK; - TRACE (tweak, "Using Win3.1 look and feel.\n"); + TRACE("Using Win3.1 look and feel.\n"); } return 1;
diff --git a/misc/version.c b/misc/version.c index fa6d448..67411d9 100644 --- a/misc/version.c +++ b/misc/version.c
@@ -14,7 +14,7 @@ #include "wine/winbase16.h" #include "process.h" #include "options.h" -#include "debug.h" +#include "debugtools.h" #include "neexe.h" #include "winversion.h" @@ -97,10 +97,10 @@ return; } } - MSG("Invalid winver value '%s' specified.\n", arg ); - MSG("Valid versions are:" ); + MESSAGE("Invalid winver value '%s' specified.\n", arg ); + MESSAGE("Valid versions are:" ); for (i = 0; i < NB_WINDOWS_VERSIONS; i++) - MSG(" '%s'%c", WinVersionNames[i], + MESSAGE(" '%s'%c", WinVersionNames[i], (i == NB_WINDOWS_VERSIONS - 1) ? '\n' : ',' ); } @@ -143,7 +143,7 @@ peheader = PE_HEADER(pdb->exe_modref->module); #define OPTHD peheader->OptionalHeader - TRACE(ver, "%02x.%02x/%02x.%02x/%02x.%02x/%02x.%02x\n", + TRACE("%02x.%02x/%02x.%02x/%02x.%02x/%02x.%02x\n", OPTHD.MajorLinkerVersion, OPTHD.MinorLinkerVersion, OPTHD.MajorOperatingSystemVersion, @@ -191,7 +191,7 @@ } default: if (OPTHD.MajorSubsystemVersion) - ERR(ver,"unknown subsystem version: %04x.%04x, please report.\n", + ERR("unknown subsystem version: %04x.%04x, please report.\n", OPTHD.MajorSubsystemVersion, OPTHD.MinorSubsystemVersion ); return defaultWinVersion; @@ -285,7 +285,7 @@ case NT40: return "Windows NT 4.0"; default: - FIXME(ver,"Windows version %d not named",ver); + FIXME("Windows version %d not named",ver); return "Windows <Unknown>"; } } @@ -318,7 +318,7 @@ WINDOWS_VERSION ver = VERSION_GetVersion(); if (v->dwOSVersionInfoSize != sizeof(OSVERSIONINFO16)) { - WARN(ver,"wrong OSVERSIONINFO size from app"); + WARN("wrong OSVERSIONINFO size from app"); return FALSE; } v->dwMajorVersion = VersionData[ver].getVersionEx.dwMajorVersion; @@ -338,7 +338,7 @@ WINDOWS_VERSION ver = VERSION_GetVersion(); if (v->dwOSVersionInfoSize != sizeof(OSVERSIONINFOA)) { - WARN(ver,"wrong OSVERSIONINFO size from app"); + WARN("wrong OSVERSIONINFO size from app"); return FALSE; } v->dwMajorVersion = VersionData[ver].getVersionEx.dwMajorVersion; @@ -359,7 +359,7 @@ if (v->dwOSVersionInfoSize!=sizeof(OSVERSIONINFOW)) { - WARN(ver,"wrong OSVERSIONINFO size from app"); + WARN("wrong OSVERSIONINFO size from app"); return FALSE; } v->dwMajorVersion = VersionData[ver].getVersionEx.dwMajorVersion; @@ -398,7 +398,7 @@ break; default: - ERR(ver, "Unknown mode set? This shouldn't happen. Check GetWinFlags()!\n"); + ERR("Unknown mode set? This shouldn't happen. Check GetWinFlags()!\n"); break; } if (si.wProcessorLevel >= 4) result |= WF_HASCPUID; @@ -415,7 +415,7 @@ */ BOOL16 WINAPI GetWinDebugInfo16(WINDEBUGINFO *lpwdi, UINT16 flags) { - FIXME(ver, "(%8lx,%d): stub returning 0\n", + FIXME("(%8lx,%d): stub returning 0\n", (unsigned long)lpwdi, flags); /* 0 means not in debugging mode/version */ /* Can this type of debugging be used in wine ? */ @@ -429,7 +429,7 @@ */ BOOL16 WINAPI SetWinDebugInfo16(WINDEBUGINFO *lpwdi) { - FIXME(ver, "(%8lx): stub returning 0\n", (unsigned long)lpwdi); + FIXME("(%8lx): stub returning 0\n", (unsigned long)lpwdi); /* 0 means not in debugging mode/version */ /* Can this type of debugging be used in wine ? */ /* Constants: WDI_OPTIONS WDI_FILTER WDI_ALLOCBREAK */ @@ -477,7 +477,7 @@ { WINDOWS_VERSION ver = VERSION_GetVersion(); - FIXME(ver, "Please report to a.mohr@mailto.de if you get version error messages !\n"); + FIXME("Please report to a.mohr@mailto.de if you get version error messages !\n"); switch(VersionData[ver].getVersion32) { case 0x80000a03: /* Win 3.1 */ @@ -485,7 +485,7 @@ case 0xc0000004: /* Win 95 */ return 0x1e10a9; /* some older version: 0x0a0bd3 */ case 0x04213303: /* NT 3.51 */ - FIXME(ver, "NT 3.51 version value unknown !\n"); + FIXME("NT 3.51 version value unknown !\n"); return 0x1e10a9; /* value borrowed from Win95 */ case 0x05650004: /* NT 4.0 */ return 0x141016;
diff --git a/misc/win32s16.c b/misc/win32s16.c index afe644d..506bdaa 100644 --- a/misc/win32s16.c +++ b/misc/win32s16.c
@@ -8,13 +8,13 @@ #include <string.h> #include <stdlib.h> #include "windef.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(dll) void WINAPI BootTask16() { - MSG("BootTask(): should only be used by WIN32S.EXE.\n"); + MESSAGE("BootTask(): should only be used by WIN32S.EXE.\n"); } /*********************************************************************** @@ -24,6 +24,6 @@ */ SEGPTR WINAPI StackLinearToSegmented16(WORD w1, WORD w2) { - FIXME(dll,"(%d,%d):stub.\n",w1,w2); + FIXME("(%d,%d):stub.\n",w1,w2); return (SEGPTR)NULL; }
diff --git a/misc/windebug.c b/misc/windebug.c index e1509fa..cec9897 100644 --- a/misc/windebug.c +++ b/misc/windebug.c
@@ -8,7 +8,7 @@ #include <stdlib.h> #include "windef.h" #include "module.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(dll) @@ -18,7 +18,7 @@ */ void WINAPI WinNotify16(CONTEXT86 *context) { - FIXME(dll, "(AX=%04x):stub.\n", AX_reg(context)); + FIXME("(AX=%04x):stub.\n", AX_reg(context)); switch (AX_reg(context)) { case 0x000D:
diff --git a/misc/winsock.c b/misc/winsock.c index 6aff24a..ebffea2 100644 --- a/misc/winsock.c +++ b/misc/winsock.c
@@ -58,13 +58,13 @@ #include "task.h" #include "message.h" #include "miscemu.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(winsock) #define DEBUG_SOCKADDR 0 #define dump_sockaddr(a) \ - DUMP("sockaddr_in: family %d, address %s, port %d\n", \ + DPRINTF("sockaddr_in: family %d, address %s, port %d\n", \ ((struct sockaddr_in *)a)->sin_family, \ inet_ntoa(((struct sockaddr_in *)a)->sin_addr), \ ntohs(((struct sockaddr_in *)a)->sin_port)) @@ -149,14 +149,14 @@ for(i=0; _ws_sock_ops[i]; i++) if( _ws_sock_ops[i] == *optname ) break; if( _ws_sock_ops[i] ) *optname = _px_sock_ops[i]; - else FIXME(winsock, "Unknown SOL_SOCKET optname %d\n", *optname); + else FIXME("Unknown SOL_SOCKET optname %d\n", *optname); break; case WS_IPPROTO_TCP: *level = IPPROTO_TCP; for(i=0; _ws_tcp_ops[i]; i++) if ( _ws_tcp_ops[i] == *optname ) break; if( _ws_tcp_ops[i] ) *optname = _px_tcp_ops[i]; - else FIXME(winsock, "Unknown IPPROTO_TCP optname %d\n", *optname); + else FIXME("Unknown IPPROTO_TCP optname %d\n", *optname); break; } } @@ -174,7 +174,7 @@ LPWSINFO pwsi = _wsi_list; while( pwsi && pwsi->tid != hTask ) pwsi = pwsi->next; if( pwsi ) - WARN(winsock,"(pwsi=0x%08x,task=0x%04x):Loose wsi struct! \n", + WARN("(pwsi=0x%08x,task=0x%04x):Loose wsi struct! \n", (unsigned)pwsi, hTask ); return pwsi; } @@ -252,7 +252,7 @@ optlen = sizeof(optval); getsockopt(s, SOL_SOCKET, SO_ERROR, (void *) &optval, &optlen); - if (optval) WARN(winsock, "\t[%i] error: %d\n", s, optval); + if (optval) WARN("\t[%i] error: %d\n", s, optval); return optval != 0; } @@ -295,7 +295,7 @@ if( b32 ) wsfds32->fd_count = j; else wsfds16->fd_count = j; - TRACE(winsock, "\n"); + TRACE("\n"); #undef wsfds32 #undef wsfds16 } @@ -440,7 +440,7 @@ } if (write (__wakeup_pipe[1], "A", 1) != 1) - ERR(winsock, "unable to write in wakeup_pipe\n"); + ERR("unable to write in wakeup_pipe\n"); } /*********************************************************************** @@ -502,7 +502,7 @@ HTASK16 tid = GetCurrentTask(); LPWSINFO pwsi; - TRACE(winsock, "verReq=%x\n", wVersionRequested); + TRACE("verReq=%x\n", wVersionRequested); if (LOBYTE(wVersionRequested) < 1 || (LOBYTE(wVersionRequested) == 1 && HIBYTE(wVersionRequested) < 1)) return WSAVERNOTSUPPORTED; @@ -516,7 +516,7 @@ _WSHeap = HeapCreate(HEAP_ZERO_MEMORY, 8120, 32768); if( !(_ws_stub = WS_ALLOC(0x10)) ) { - ERR(winsock,"Fatal: failed to create WinSock heap\n"); + ERR("Fatal: failed to create WinSock heap\n"); return 0; } } @@ -557,7 +557,7 @@ memcpy(lpWSAData, &WINSOCK_data, sizeof(WINSOCK_data)); - TRACE(winsock, "succeeded\n"); + TRACE("succeeded\n"); return 0; } @@ -599,7 +599,7 @@ WINSOCK_Shutdown(); /* just in case */ if( pwsi->flags & WSI_BLOCKINGCALL ) - TRACE(winsock,"\tinside blocking call!\n"); + TRACE("\tinside blocking call!\n"); /* FIXME: aop_control() doesn't decrement pwsi->num_async_rq * @@ -618,7 +618,7 @@ close(pwsi->sock[i].fd); j++; } if( j ) - TRACE(winsock,"\tclosed %i sockets, killed %i async selects!\n", j, n); + TRACE("\tclosed %i sockets, killed %i async selects!\n", j, n); /* delete scratch buffers */ @@ -636,7 +636,7 @@ { HTASK16 hTask = GetCurrentTask(); - TRACE(winsock, "(%04x)\n", hTask ); + TRACE("(%04x)\n", hTask ); if( hTask ) { LPWSINFO pwsi = wsi_find(hTask); @@ -734,7 +734,7 @@ struct ws_sockaddr_ipx* addr2 = (struct ws_sockaddr_ipx *)addr; #endif - TRACE(winsock, "(%08x): socket %04x\n", + TRACE("(%08x): socket %04x\n", (unsigned)pwsi, (UINT16)s ); if( _check_ws(pwsi, pws) ) { @@ -814,7 +814,7 @@ struct ws_sockaddr_ipx* name2 = (struct ws_sockaddr_ipx *)name; #endif - TRACE(winsock, "(%08x): socket %04x, ptr %8x, length %d\n", + TRACE("(%08x): socket %04x, ptr %8x, length %d\n", (unsigned)pwsi, s, (int) name, namelen); #if DEBUG_SOCKADDR dump_sockaddr(name); @@ -850,7 +850,7 @@ if ( bind(pws->fd, name, namelen) < 0 ) { int loc_errno = errno; - WARN(winsock, "\tfailure - errno = %i\n", errno); + WARN("\tfailure - errno = %i\n", errno); errno = loc_errno; switch(errno) { @@ -892,7 +892,7 @@ ws_socket* pws = (ws_socket*)WS_HANDLE2PTR(s); LPWSINFO pwsi = wsi_find(GetCurrentTask()); - TRACE(winsock, "(%08x): socket %08x\n", (unsigned)pwsi, s); + TRACE("(%08x): socket %08x\n", (unsigned)pwsi, s); if( _check_ws(pwsi, pws) ) { @@ -930,7 +930,7 @@ struct ws_sockaddr_ipx* name2 = (struct ws_sockaddr_ipx *)name; #endif - TRACE(winsock, "(%08x): socket %04x, ptr %8x, length %d\n", + TRACE("(%08x): socket %04x, ptr %8x, length %d\n", (unsigned)pwsi, s, (int) name, namelen); #if DEBUG_SOCKADDR dump_sockaddr(name); @@ -1014,7 +1014,7 @@ struct ws_sockaddr_ipx* name2 = (struct ws_sockaddr_ipx *)name; #endif - TRACE(winsock, "(%08x): socket: %04x, ptr %8x, ptr %8x\n", + TRACE("(%08x): socket: %04x, ptr %8x, ptr %8x\n", (unsigned)pwsi, s, (int) name, *namelen); if( _check_ws(pwsi, pws) ) { @@ -1080,7 +1080,7 @@ struct ws_sockaddr_ipx* name2 = (struct ws_sockaddr_ipx *)name; #endif - TRACE(winsock, "(%08x): socket: %04x, ptr %8x, ptr %8x\n", + TRACE("(%08x): socket: %04x, ptr %8x, ptr %8x\n", (unsigned)pwsi, s, (int) name, (int) *namelen); if( _check_ws(pwsi, pws) ) { @@ -1150,7 +1150,7 @@ ws_socket* pws = (ws_socket*)WS_HANDLE2PTR(s); LPWSINFO pwsi = wsi_find(GetCurrentTask()); - TRACE(winsock, "(%08x): socket: %04x, opt %d, ptr %8x, ptr %8x\n", + TRACE("(%08x): socket: %04x, opt %d, ptr %8x, ptr %8x\n", (unsigned)pwsi, s, level, (int) optval, (int) *optlen); if( _check_ws(pwsi, pws) ) { @@ -1243,7 +1243,7 @@ ws_socket* pws = (ws_socket*)WS_HANDLE2PTR(s); LPWSINFO pwsi = wsi_find(GetCurrentTask()); - TRACE(winsock, "(%08x): socket %04x, cmd %08x, ptr %8x\n", + TRACE("(%08x): socket %04x, cmd %08x, ptr %8x\n", (unsigned)pwsi, s, cmd, (unsigned) argp); if( _check_ws(pwsi, pws) ) { @@ -1270,13 +1270,13 @@ break; case WS_IOW('f',125,u_long): - WARN(winsock,"Warning: WS1.1 shouldn't be using async I/O\n"); + WARN("Warning: WS1.1 shouldn't be using async I/O\n"); SetLastError(WSAEINVAL); return SOCKET_ERROR; default: /* Netscape tries hard to use bogus ioctl 0x667e */ - WARN(winsock, "\tunknown WS_IOCTL cmd (%08x)\n", cmd); + WARN("\tunknown WS_IOCTL cmd (%08x)\n", cmd); } if( ioctl(pws->fd, newcmd, (char*)argp ) == 0 ) return 0; SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); @@ -1301,7 +1301,7 @@ ws_socket* pws = (ws_socket*)WS_HANDLE2PTR(s); LPWSINFO pwsi = wsi_find(GetCurrentTask()); - TRACE(winsock, "(%08x): socket %04x, backlog %d\n", + TRACE("(%08x): socket %04x, backlog %d\n", (unsigned)pwsi, s, backlog); if( _check_ws(pwsi, pws) ) { @@ -1339,7 +1339,7 @@ ws_socket* pws = (ws_socket*)WS_HANDLE2PTR(s); LPWSINFO pwsi = wsi_find(GetCurrentTask()); - TRACE(winsock, "(%08x): socket %04x, buf %8x, len %d, " + TRACE("(%08x): socket %04x, buf %8x, len %d, " "flags %d\n", (unsigned)pwsi, s, (unsigned)buf, len, flags); if( _check_ws(pwsi, pws) ) @@ -1347,7 +1347,7 @@ INT length; if ((length = recv(pws->fd, buf, len, flags)) >= 0) { - TRACE(winsock, " -> %i bytes\n", length); + TRACE(" -> %i bytes\n", length); if( pws->psop && (pws->flags & (WS_FD_READ | WS_FD_CLOSE)) ) EVENT_AddIO( pws->fd, EVENT_IO_READ ); /* reenabler */ @@ -1357,7 +1357,7 @@ SetLastError(wsaErrno()); } else SetLastError(WSAENOTSOCK); - WARN(winsock, " -> ERROR\n"); + WARN(" -> ERROR\n"); return SOCKET_ERROR; } @@ -1382,12 +1382,12 @@ struct ws_sockaddr_ipx* from2 = (struct ws_sockaddr_ipx *)from; #endif - TRACE(winsock, "(%08x): socket %04x, ptr %08x, " + TRACE("(%08x): socket %04x, ptr %08x, " "len %d, flags %d\n", (unsigned)pwsi, s, (unsigned)buf, len, flags); #if DEBUG_SOCKADDR if( from ) dump_sockaddr(from); - else DUMP("from = NULL\n"); + else DPRINTF("from = NULL\n"); #endif if( _check_ws(pwsi, pws) ) @@ -1396,7 +1396,7 @@ if ((length = recvfrom(pws->fd, buf, len, flags, from, fromlen32)) >= 0) { - TRACE(winsock, " -> %i bytes\n", length); + TRACE(" -> %i bytes\n", length); if( pws->psop && (pws->flags & (WS_FD_READ | WS_FD_CLOSE)) ) EVENT_AddIO( pws->fd, EVENT_IO_READ ); /* reenabler */ @@ -1419,7 +1419,7 @@ SetLastError(wsaErrno()); } else SetLastError(WSAENOTSOCK); - WARN(winsock, " -> ERROR\n"); + WARN(" -> ERROR\n"); #ifdef HAVE_IPX if (from && ((struct sockaddr_ipx *)from)->sipx_family == AF_IPX) { from = (struct sockaddr *) @@ -1460,7 +1460,7 @@ { LPWSINFO pwsi = wsi_find(GetCurrentTask()); - TRACE(winsock, "(%08x): read %8x, write %8x, excp %8x\n", + TRACE("(%08x): read %8x, write %8x, excp %8x\n", (unsigned) pwsi, (unsigned) ws_readfds, (unsigned) ws_writefds, (unsigned) ws_exceptfds); if( pwsi ) @@ -1539,7 +1539,7 @@ ws_socket* pws = (ws_socket*)WS_HANDLE2PTR(s); LPWSINFO pwsi = wsi_find(GetCurrentTask()); - TRACE(winsock, "(%08x): socket %04x, ptr %08x, length %d, flags %d\n", + TRACE("(%08x): socket %04x, ptr %08x, length %d, flags %d\n", (unsigned)pwsi, s, (unsigned) buf, len, flags); if( _check_ws(pwsi, pws) ) { @@ -1578,7 +1578,7 @@ struct ws_sockaddr_ipx* to2 = (struct ws_sockaddr_ipx *)to; #endif - TRACE(winsock, "(%08x): socket %04x, ptr %08x, length %d, flags %d\n", + TRACE("(%08x): socket %04x, ptr %08x, length %d, flags %d\n", (unsigned)pwsi, s, (unsigned) buf, len, flags); if( _check_ws(pwsi, pws) ) { @@ -1643,7 +1643,7 @@ ws_socket* pws = (ws_socket*)WS_HANDLE2PTR(s); LPWSINFO pwsi = wsi_find(GetCurrentTask()); - TRACE(winsock, "(%08x): socket %04x, lev %d, opt %d, ptr %08x, len %d\n", + TRACE("(%08x): socket %04x, lev %d, opt %d, ptr %08x, len %d\n", (unsigned)pwsi, s, level, optname, (int) optval, optlen); if( _check_ws(pwsi, pws) ) { @@ -1685,7 +1685,7 @@ ws_socket* pws = (ws_socket*)WS_HANDLE2PTR(s); LPWSINFO pwsi = wsi_find(GetCurrentTask()); - TRACE(winsock, "(%08x): socket %04x, how %i\n", + TRACE("(%08x): socket %04x, how %i\n", (unsigned)pwsi, s, how ); if( _check_ws(pwsi, pws) ) { @@ -1750,7 +1750,7 @@ { LPWSINFO pwsi = wsi_find(GetCurrentTask()); - TRACE(winsock, "(%08x): af=%d type=%d protocol=%d\n", + TRACE("(%08x): af=%d type=%d protocol=%d\n", (unsigned)pwsi, af, type, protocol); if( pwsi ) @@ -1797,7 +1797,7 @@ { ws_socket* pnew = wsi_alloc_socket(pwsi, sock); - TRACE(winsock,"\tcreated %i (handle %04x)\n", sock, (UINT16)WS_PTR2HANDLE(pnew)); + TRACE("\tcreated %i (handle %04x)\n", sock, (UINT16)WS_PTR2HANDLE(pnew)); if( pnew ) { @@ -1813,14 +1813,14 @@ if (errno == EPERM) /* raw socket denied */ { if (type == SOCK_RAW) - MSG("WARNING: Trying to create a socket of type SOCK_RAW, will fail unless running as root\n"); + MESSAGE("WARNING: Trying to create a socket of type SOCK_RAW, will fail unless running as root\n"); else - MSG("WS_SOCKET: not enough privileges to create socket, try running as root\n"); + MESSAGE("WS_SOCKET: not enough privileges to create socket, try running as root\n"); SetLastError(WSAESOCKTNOSUPPORT); } else SetLastError(wsaErrno()); } - WARN(winsock, "\t\tfailed!\n"); + WARN("\t\tfailed!\n"); return INVALID_SOCKET; } @@ -1867,7 +1867,7 @@ SEGPTR WINAPI WINSOCK_gethostbyaddr16(const char *addr, INT16 len, INT16 type) { struct WIN_hostent* retval; - TRACE(winsock, "ptr %08x, len %d, type %d\n", + TRACE("ptr %08x, len %d, type %d\n", (unsigned) addr, len, type); retval = __ws_gethostbyaddr( addr, len, type, WS_DUP_SEGPTR ); return retval ? SEGPTR_GET(retval) : ((SEGPTR)NULL); @@ -1876,7 +1876,7 @@ struct WIN_hostent* WINAPI WINSOCK_gethostbyaddr(const char *addr, INT len, INT type) { - TRACE(winsock, "ptr %08x, len %d, type %d\n", + TRACE("ptr %08x, len %d, type %d\n", (unsigned) addr, len, type); return __ws_gethostbyaddr(addr, len, type, WS_DUP_LINEAR); } @@ -1903,14 +1903,14 @@ SEGPTR WINAPI WINSOCK_gethostbyname16(const char *name) { struct WIN_hostent* retval; - TRACE(winsock, "%s\n", (name)?name:NULL_STRING); + TRACE("%s\n", (name)?name:NULL_STRING); retval = __ws_gethostbyname( name, WS_DUP_SEGPTR ); return (retval)? SEGPTR_GET(retval) : ((SEGPTR)NULL) ; } struct WIN_hostent* WINAPI WINSOCK_gethostbyname(const char* name) { - TRACE(winsock, "%s\n", (name)?name:NULL_STRING); + TRACE("%s\n", (name)?name:NULL_STRING); return __ws_gethostbyname( name, WS_DUP_LINEAR ); } @@ -1937,14 +1937,14 @@ SEGPTR WINAPI WINSOCK_getprotobyname16(const char *name) { struct WIN_protoent* retval; - TRACE(winsock, "%s\n", (name)?name:NULL_STRING); + TRACE("%s\n", (name)?name:NULL_STRING); retval = __ws_getprotobyname(name, WS_DUP_SEGPTR); return retval ? SEGPTR_GET(retval) : ((SEGPTR)NULL); } struct WIN_protoent* WINAPI WINSOCK_getprotobyname(const char* name) { - TRACE(winsock, "%s\n", (name)?name:NULL_STRING); + TRACE("%s\n", (name)?name:NULL_STRING); return __ws_getprotobyname(name, WS_DUP_LINEAR); } @@ -1971,14 +1971,14 @@ SEGPTR WINAPI WINSOCK_getprotobynumber16(INT16 number) { struct WIN_protoent* retval; - TRACE(winsock, "%i\n", number); + TRACE("%i\n", number); retval = __ws_getprotobynumber(number, WS_DUP_SEGPTR); return retval ? SEGPTR_GET(retval) : ((SEGPTR)NULL); } struct WIN_protoent* WINAPI WINSOCK_getprotobynumber(INT number) { - TRACE(winsock, "%i\n", number); + TRACE("%i\n", number); return __ws_getprotobynumber(number, WS_DUP_LINEAR); } @@ -2009,7 +2009,7 @@ SEGPTR WINAPI WINSOCK_getservbyname16(const char *name, const char *proto) { struct WIN_servent* retval; - TRACE(winsock, "'%s', '%s'\n", + TRACE("'%s', '%s'\n", (name)?name:NULL_STRING, (proto)?proto:NULL_STRING); retval = __ws_getservbyname(name, proto, WS_DUP_SEGPTR); return retval ? SEGPTR_GET(retval) : ((SEGPTR)NULL); @@ -2017,7 +2017,7 @@ struct WIN_servent* WINAPI WINSOCK_getservbyname(const char *name, const char *proto) { - TRACE(winsock, "'%s', '%s'\n", + TRACE("'%s', '%s'\n", (name)?name:NULL_STRING, (proto)?proto:NULL_STRING); return __ws_getservbyname(name, proto, WS_DUP_LINEAR); } @@ -2049,7 +2049,7 @@ SEGPTR WINAPI WINSOCK_getservbyport16(INT16 port, const char *proto) { struct WIN_servent* retval; - TRACE(winsock, "%i, '%s'\n", + TRACE("%i, '%s'\n", (int)port, (proto)?proto:NULL_STRING); retval = __ws_getservbyport(port, proto, WS_DUP_SEGPTR); return retval ? SEGPTR_GET(retval) : ((SEGPTR)NULL); @@ -2057,7 +2057,7 @@ struct WIN_servent* WINAPI WINSOCK_getservbyport(INT port, const char *proto) { - TRACE(winsock, "%i, '%s'\n", + TRACE("%i, '%s'\n", (int)port, (proto)?proto:NULL_STRING); return __ws_getservbyport(port, proto, WS_DUP_LINEAR); } @@ -2070,7 +2070,7 @@ { LPWSINFO pwsi = wsi_find(GetCurrentTask()); - TRACE(winsock, "(%08x): name %s, len %d\n", + TRACE("(%08x): name %s, len %d\n", (unsigned)pwsi, (name)?name:NULL_STRING, namelen); if( pwsi ) { @@ -2110,7 +2110,7 @@ DWORD dwEvent, dwErrBytes; int num_posted; - TRACE(winsock,"%i pending descriptors\n", num_pending ); + TRACE("%i pending descriptors\n", num_pending ); for( num_posted = dwEvent = 0 ; psop; psop = psop->next ) { @@ -2128,7 +2128,7 @@ * Reenabling calls turn them back on. */ - TRACE(winsock,"\tchecking psop = 0x%08x\n", (unsigned) psop ); + TRACE("\tchecking psop = 0x%08x\n", (unsigned) psop ); num_pending--; @@ -2204,7 +2204,7 @@ if( PostMessageA( psop->hWnd, psop->uMsg, (WPARAM)WS_PTR2HANDLE(psop->pws), (LPARAM)WSAMAKESELECTREPLY( WS_FD_WRITE, 0 ) ) ) { - TRACE(winsock, "\t hwnd %04x - %04x, %08x\n", + TRACE("\t hwnd %04x - %04x, %08x\n", psop->hWnd, psop->uMsg, (unsigned)MAKELONG(WS_FD_WRITE, 0) ); FD_CLR( fd, &event_set[EVENT_IO_WRITE] ); num_posted++; @@ -2266,7 +2266,7 @@ if( bPost ) { - TRACE(winsock, "\t hwnd %04x - %04x, %08x\n", + TRACE("\t hwnd %04x - %04x, %08x\n", psop->hWnd, psop->uMsg, (unsigned)dwEvent ); PostMessageA( psop->hWnd, psop->uMsg, (WPARAM)WS_PTR2HANDLE(psop->pws), (LPARAM)dwEvent ); @@ -2277,7 +2277,7 @@ if( num_pending <= 0 ) break; } - TRACE(winsock, "\tdone, %i posted events\n", num_posted ); + TRACE("\tdone, %i posted events\n", num_posted ); return ( num_posted ) ? TRUE : FALSE; } @@ -2286,7 +2286,7 @@ ws_socket* pws = (ws_socket*)WS_HANDLE2PTR(s); LPWSINFO pwsi = wsi_find(GetCurrentTask()); - TRACE(winsock, "(%08x): %04x, hWnd %04x, uMsg %08x, event %08x\n", + TRACE("(%08x): %04x, hWnd %04x, uMsg %08x, event %08x\n", (unsigned)pwsi, (SOCKET16)s, (HWND16)hWnd, uMsg, (unsigned)lEvent ); if( _check_ws(pwsi, pws) ) { @@ -2307,7 +2307,7 @@ if( pws->flags & (WS_FD_CONNECT | WS_FD_WRITE) ) EVENT_DeleteIO( pws->fd, EVENT_IO_WRITE ); - TRACE(winsock,"\tremoving psop = 0x%08x\n", (unsigned) psop ); + TRACE("\tremoving psop = 0x%08x\n", (unsigned) psop ); WS_FREE( pws->psop ); pws->flags &= ~(WS_FD_RAW | WS_FD_ACCEPT | WS_FD_CONNECT | @@ -2346,7 +2346,7 @@ /* TODO: handle WS_FD_ACCEPT right away if the socket is readable */ - TRACE(winsock,"\tcreating psop = 0x%08x\n", (unsigned)psop ); + TRACE("\tcreating psop = 0x%08x\n", (unsigned)psop ); return 0; /* success */ } @@ -2371,7 +2371,7 @@ { int i = set->fd_count; - TRACE(winsock, "(%d,%8lx(%i))\n", s,(unsigned long)set, i); + TRACE("(%d,%8lx(%i))\n", s,(unsigned long)set, i); while (i--) if (set->fd_array[i] == s) return 1; @@ -2385,7 +2385,7 @@ { int i = set->fd_count; - TRACE(winsock, "(%d,%8lx(%i))\n", s,(unsigned long)set, i); + TRACE("(%d,%8lx(%i))\n", s,(unsigned long)set, i); while (i--) if (set->fd_array[i] == s) return 1; @@ -2405,7 +2405,7 @@ * Note: It is allowed to call this function without prior WSAStartup(). */ - TRACE(winsock, "\n"); + TRACE("\n"); return FALSE; } @@ -2416,7 +2416,7 @@ { LPWSINFO pwsi = wsi_find(GetCurrentTask()); - TRACE(winsock, "(%08x)\n", (unsigned)pwsi); + TRACE("(%08x)\n", (unsigned)pwsi); if( pwsi ) return 0; return SOCKET_ERROR; @@ -2431,7 +2431,7 @@ FARPROC16 prev; LPWSINFO pwsi = wsi_find(GetCurrentTask()); - TRACE(winsock, "(%08x): hook %08x\n", + TRACE("(%08x): hook %08x\n", (unsigned)pwsi, (unsigned) lpBlockFunc); if( pwsi ) { @@ -2452,7 +2452,7 @@ FARPROC prev; LPWSINFO pwsi = wsi_find(GetCurrentTask()); - TRACE(winsock, "(%08x): hook %08x\n", + TRACE("(%08x): hook %08x\n", (unsigned)pwsi, (unsigned) lpBlockFunc); if( pwsi ) { prev = (FARPROC)pwsi->blocking_hook; @@ -2471,7 +2471,7 @@ { LPWSINFO pwsi = wsi_find(GetCurrentTask()); - TRACE(winsock, "(%08x)\n", (unsigned)pwsi); + TRACE("(%08x)\n", (unsigned)pwsi); if( pwsi ) return (INT16)(pwsi->blocking_hook = 0); return SOCKET_ERROR; } @@ -2484,7 +2484,7 @@ { LPWSINFO pwsi = wsi_find(GetCurrentTask()); - TRACE(winsock, "(%08x)\n", (unsigned)pwsi); + TRACE("(%08x)\n", (unsigned)pwsi); if( pwsi ) { pwsi->blocking_hook = 0; @@ -2534,11 +2534,11 @@ char type= *(unsigned char*)(inbuf+15); /* 0x2: don't fragment*/ #endif - FIXME(winsock,"(ICMP_ECHO) to 0x%08x stub \n", addr); + FIXME("(ICMP_ECHO) to 0x%08x stub \n", addr); break; } default: - FIXME(winsock,"(%lx,%lx,%p,%p,%p,%p) stub\n", + FIXME("(%lx,%lx,%p,%p,%p,%p) stub\n", protocoll,action,inbuf,inbuflen,outbuf,outbuflen); } return FALSE; @@ -2548,7 +2548,7 @@ */ void WINAPI WS_s_perror(LPCSTR message) { - FIXME(winsock,"(%s): stub\n",message); + FIXME("(%s): stub\n",message); return; } @@ -2731,9 +2731,9 @@ { int loc_errno = errno; #ifdef HAVE_STRERROR - WARN(winsock, "errno %d, (%s).\n", loc_errno, strerror(loc_errno)); + WARN("errno %d, (%s).\n", loc_errno, strerror(loc_errno)); #else - WARN(winsock, "errno %d\n", loc_errno); + WARN("errno %d\n", loc_errno); #endif switch(loc_errno) @@ -2796,7 +2796,7 @@ /* just in case we ever get here and there are no problems */ case 0: return 0; default: - WARN(winsock, "Unknown errno %d!\n", loc_errno); + WARN("Unknown errno %d!\n", loc_errno); return WSAEOPNOTSUPP; } } @@ -2805,7 +2805,7 @@ { int loc_errno = h_errno; - WARN(winsock, "h_errno %d.\n", loc_errno); + WARN("h_errno %d.\n", loc_errno); switch(loc_errno) { @@ -2816,7 +2816,7 @@ case 0: return 0; default: - WARN(winsock,"Unknown h_errno %d!\n", loc_errno); + WARN("Unknown h_errno %d!\n", loc_errno); return WSAEOPNOTSUPP; } }
diff --git a/misc/winsock_async.c b/misc/winsock_async.c index 833c6c6..f18e21b 100644 --- a/misc/winsock_async.c +++ b/misc/winsock_async.c
@@ -67,7 +67,7 @@ #include "task.h" #include "message.h" #include "miscemu.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(winsock) @@ -372,7 +372,7 @@ HANDLE16 WINAPI WSAAsyncGetHostByAddr16(HWND16 hWnd, UINT16 uMsg, LPCSTR addr, INT16 len, INT16 type, SEGPTR sbuf, INT16 buflen) { - TRACE(winsock, "hwnd %04x, msg %04x, addr %08x[%i]\n", + TRACE("hwnd %04x, msg %04x, addr %08x[%i]\n", hWnd, uMsg, (unsigned)addr , len ); return __WSAsyncDBQuery(hWnd,uMsg,len,addr,type,NULL,(void*)sbuf,buflen,AQ_NUMBER|AQ_WIN16|AQ_GETHOST); } @@ -383,7 +383,7 @@ HANDLE WINAPI WSAAsyncGetHostByAddr(HWND hWnd, UINT uMsg, LPCSTR addr, INT len, INT type, LPSTR sbuf, INT buflen) { - TRACE(winsock, "hwnd %04x, msg %04x, addr %08x[%i]\n", + TRACE("hwnd %04x, msg %04x, addr %08x[%i]\n", hWnd, uMsg, (unsigned)addr , len ); return __WSAsyncDBQuery(hWnd,uMsg,len,addr,type,NULL,sbuf,buflen,AQ_NUMBER|AQ_WIN32|AQ_GETHOST); } @@ -394,7 +394,7 @@ HANDLE16 WINAPI WSAAsyncGetHostByName16(HWND16 hWnd, UINT16 uMsg, LPCSTR name, SEGPTR sbuf, INT16 buflen) { - TRACE(winsock, "hwnd %04x, msg %04x, host %s, buffer %i\n", hWnd, uMsg, (name)?name:"<null>", (int)buflen ); + TRACE("hwnd %04x, msg %04x, host %s, buffer %i\n", hWnd, uMsg, (name)?name:"<null>", (int)buflen ); return __WSAsyncDBQuery(hWnd,uMsg,0,name,0,NULL,(void*)sbuf,buflen,AQ_NAME|AQ_WIN16|AQ_GETHOST); } @@ -405,7 +405,7 @@ HANDLE WINAPI WSAAsyncGetHostByName(HWND hWnd, UINT uMsg, LPCSTR name, LPSTR sbuf, INT buflen) { - TRACE(winsock, "hwnd %04x, msg %08x, host %s, buffer %i\n", + TRACE("hwnd %04x, msg %08x, host %s, buffer %i\n", (HWND16)hWnd, uMsg, (name)?name:"<null>", (int)buflen ); return __WSAsyncDBQuery(hWnd,uMsg,0,name,0,NULL,sbuf,buflen,AQ_NAME|AQ_WIN32|AQ_GETHOST); } @@ -416,7 +416,7 @@ HANDLE16 WINAPI WSAAsyncGetProtoByName16(HWND16 hWnd, UINT16 uMsg, LPCSTR name, SEGPTR sbuf, INT16 buflen) { - TRACE(winsock, "hwnd %04x, msg %08x, protocol %s\n", + TRACE("hwnd %04x, msg %08x, protocol %s\n", (HWND16)hWnd, uMsg, (name)?name:"<null>" ); return __WSAsyncDBQuery(hWnd,uMsg,0,name,0,NULL,(void*)sbuf,buflen,AQ_GETPROTO|AQ_NAME|AQ_WIN16); } @@ -427,7 +427,7 @@ HANDLE WINAPI WSAAsyncGetProtoByName(HWND hWnd, UINT uMsg, LPCSTR name, LPSTR sbuf, INT buflen) { - TRACE(winsock, "hwnd %04x, msg %08x, protocol %s\n", + TRACE("hwnd %04x, msg %08x, protocol %s\n", (HWND16)hWnd, uMsg, (name)?name:"<null>" ); return __WSAsyncDBQuery(hWnd,uMsg,0,name,0,NULL,sbuf,buflen,AQ_GETPROTO|AQ_NAME|AQ_WIN32); } @@ -439,7 +439,7 @@ HANDLE16 WINAPI WSAAsyncGetProtoByNumber16(HWND16 hWnd,UINT16 uMsg,INT16 number, SEGPTR sbuf, INT16 buflen) { - TRACE(winsock, "hwnd %04x, msg %04x, num %i\n", hWnd, uMsg, number ); + TRACE("hwnd %04x, msg %04x, num %i\n", hWnd, uMsg, number ); return __WSAsyncDBQuery(hWnd,uMsg,number,NULL,0,NULL,(void*)sbuf,buflen,AQ_GETPROTO|AQ_NUMBER|AQ_WIN16); } @@ -449,7 +449,7 @@ HANDLE WINAPI WSAAsyncGetProtoByNumber(HWND hWnd, UINT uMsg, INT number, LPSTR sbuf, INT buflen) { - TRACE(winsock, "hwnd %04x, msg %04x, num %i\n", hWnd, uMsg, number ); + TRACE("hwnd %04x, msg %04x, num %i\n", hWnd, uMsg, number ); return __WSAsyncDBQuery(hWnd,uMsg,number,NULL,0,NULL,sbuf,buflen,AQ_GETPROTO|AQ_NUMBER|AQ_WIN32); } @@ -460,7 +460,7 @@ HANDLE16 WINAPI WSAAsyncGetServByName16(HWND16 hWnd, UINT16 uMsg, LPCSTR name, LPCSTR proto, SEGPTR sbuf, INT16 buflen) { - TRACE(winsock, "hwnd %04x, msg %04x, name %s, proto %s\n", + TRACE("hwnd %04x, msg %04x, name %s, proto %s\n", hWnd, uMsg, (name)?name:"<null>", (proto)?proto:"<null>" ); return __WSAsyncDBQuery(hWnd,uMsg,0,name,0,proto,(void*)sbuf,buflen,AQ_GETSERV|AQ_NAME|AQ_WIN16); @@ -472,7 +472,7 @@ HANDLE WINAPI WSAAsyncGetServByName(HWND hWnd, UINT uMsg, LPCSTR name, LPCSTR proto, LPSTR sbuf, INT buflen) { - TRACE(winsock, "hwnd %04x, msg %04x, name %s, proto %s\n", + TRACE("hwnd %04x, msg %04x, name %s, proto %s\n", hWnd, uMsg, (name)?name:"<null>", (proto)?proto:"<null>" ); return __WSAsyncDBQuery(hWnd,uMsg,0,name,0,proto,sbuf,buflen,AQ_GETSERV|AQ_NAME|AQ_WIN32); } @@ -483,7 +483,7 @@ HANDLE16 WINAPI WSAAsyncGetServByPort16(HWND16 hWnd, UINT16 uMsg, INT16 port, LPCSTR proto, SEGPTR sbuf, INT16 buflen) { - TRACE(winsock, "hwnd %04x, msg %04x, port %i, proto %s\n", + TRACE("hwnd %04x, msg %04x, port %i, proto %s\n", hWnd, uMsg, port, (proto)?proto:"<null>" ); return __WSAsyncDBQuery(hWnd,uMsg,port,NULL,0,proto,(void*)sbuf,buflen,AQ_GETSERV|AQ_NUMBER|AQ_WIN16); } @@ -494,7 +494,7 @@ HANDLE WINAPI WSAAsyncGetServByPort(HWND hWnd, UINT uMsg, INT port, LPCSTR proto, LPSTR sbuf, INT buflen) { - TRACE(winsock, "hwnd %04x, msg %04x, port %i, proto %s\n", + TRACE("hwnd %04x, msg %04x, port %i, proto %s\n", hWnd, uMsg, port, (proto)?proto:"<null>" ); return __WSAsyncDBQuery(hWnd,uMsg,port,NULL,0,proto,sbuf,buflen,AQ_GETSERV|AQ_NUMBER|AQ_WIN32); } @@ -504,7 +504,7 @@ */ INT WINAPI WSACancelAsyncRequest(HANDLE hAsyncTaskHandle) { - FIXME(winsock, "(%08x),stub\n", hAsyncTaskHandle); + FIXME("(%08x),stub\n", hAsyncTaskHandle); return 0; }
diff --git a/misc/wsprintf.c b/misc/wsprintf.c index bf68528..9e5506b 100644 --- a/misc/wsprintf.c +++ b/misc/wsprintf.c
@@ -12,7 +12,7 @@ #include "stackframe.h" #include "module.h" #include "global.h" -#include "debug.h" +#include "debugtools.h" DEFAULT_DEBUG_CHANNEL(string) @@ -448,7 +448,7 @@ maxlen -= len; } *p = 0; - TRACE(string,"%s\n",buffer); + TRACE("%s\n",buffer); return (maxlen > 1) ? (INT)(p - buffer) : -1; } @@ -533,7 +533,7 @@ */ INT16 WINAPI wvsprintf16( LPSTR buffer, LPCSTR spec, LPCVOID args ) { - TRACE(string,"for %p got:\n",buffer); + TRACE("for %p got:\n",buffer); return wvsnprintf16( buffer, 0xffff, spec, args ); } @@ -543,7 +543,7 @@ */ INT WINAPI wvsprintfA( LPSTR buffer, LPCSTR spec, va_list args ) { - TRACE(string,"for %p got:\n",buffer); + TRACE("for %p got:\n",buffer); return wvsnprintfA( buffer, 0xffffffff, spec, args ); } @@ -553,7 +553,7 @@ */ INT WINAPI wvsprintfW( LPWSTR buffer, LPCWSTR spec, va_list args ) { - TRACE(string,"for %p got:\n",buffer); + TRACE("for %p got:\n",buffer); return wvsnprintfW( buffer, 0xffffffff, spec, args ); } @@ -567,7 +567,7 @@ va_list valist; INT16 res; - TRACE(string,"for %p got:\n",buffer); + TRACE("for %p got:\n",buffer); va_start( valist, spec ); /* Note: we call the 32-bit version, because the args are 32-bit */ res = (INT16)wvsnprintfA( buffer, 0xffffffff, spec, valist ); @@ -585,7 +585,7 @@ VA_START16( valist ); buffer = VA_ARG16( valist, SEGPTR ); spec = VA_ARG16( valist, SEGPTR ); - TRACE(string,"got:\n"); + TRACE("got:\n"); res = wvsnprintf16( (LPSTR)PTR_SEG_TO_LIN(buffer), 0xffff, (LPCSTR)PTR_SEG_TO_LIN(spec), valist ); VA_END16( valist ); @@ -601,7 +601,7 @@ va_list valist; INT res; - TRACE(string,"for %p got:\n",buffer); + TRACE("for %p got:\n",buffer); va_start( valist, spec ); res = wvsnprintfA( buffer, 0xffffffff, spec, valist ); va_end( valist ); @@ -617,7 +617,7 @@ va_list valist; INT res; - TRACE(string,"wsprintfW for %p\n",buffer); + TRACE("wsprintfW for %p\n",buffer); va_start( valist, spec ); res = wvsnprintfW( buffer, 0xffffffff, spec, valist ); va_end( valist );
diff --git a/misc/xmalloc.c b/misc/xmalloc.c index 0e757e8..e76ce51 100644 --- a/misc/xmalloc.c +++ b/misc/xmalloc.c
@@ -16,7 +16,7 @@ #include <stdlib.h> #include <string.h> #include "xmalloc.h" -#include "debug.h" +#include "debugtools.h" void *xmalloc( int size ) { @@ -25,7 +25,7 @@ res = malloc (size ? size : 1); if (res == NULL) { - MSG("Virtual memory exhausted.\n"); + MESSAGE("Virtual memory exhausted.\n"); exit (1); } memset(res,0,size); @@ -47,7 +47,7 @@ void *res = realloc (ptr, size); if ((res == NULL) && size) { - MSG("Virtual memory exhausted.\n"); + MESSAGE("Virtual memory exhausted.\n"); exit (1); } return res; @@ -59,7 +59,7 @@ char *res = strdup( str ); if (!res) { - MSG("Virtual memory exhausted.\n"); + MESSAGE("Virtual memory exhausted.\n"); exit (1); } return res;