Converted to the new debug interface, using script written by Patrik
Stridvall.
diff --git a/files/async.c b/files/async.c
index 0a7c06c..0285333 100644
--- a/files/async.c
+++ b/files/async.c
@@ -40,7 +40,7 @@
#include "selectors.h"
#include "sig_context.h"
#include "async.h"
-#include "debug.h"
+#include "debugtools.h"
typedef struct _async_fd {
int unixfd;
diff --git a/files/change.c b/files/change.c
index c5f6310..3aba77f 100644
--- a/files/change.c
+++ b/files/change.c
@@ -15,7 +15,7 @@
#include "thread.h"
#include "heap.h"
#include "server.h"
-#include "debug.h"
+#include "debugtools.h"
/****************************************************************************
diff --git a/files/file.c b/files/file.c
index 81fb8ef..14ad084 100644
--- a/files/file.c
+++ b/files/file.c
@@ -41,7 +41,7 @@
#include "task.h"
#include "async.h"
#include "wincon.h"
-#include "debug.h"
+#include "debugtools.h"
#include "server.h"
@@ -210,10 +210,10 @@
goto fail_error05;
}
default:
- ERR(file,"unknown mode\n");
+ ERR("unknown mode\n");
}
- ERR(file,"shouldn't happen\n");
- ERR(file,"Please report to bon@elektron.ikp.physik.tu-darmstadt.de\n");
+ ERR("shouldn't happen\n");
+ ERR("Please report to bon@elektron.ikp.physik.tu-darmstadt.de\n");
return TRUE;
test_ro_int24:
@@ -221,7 +221,7 @@
return FALSE;
/* Fall through */
fail_int24:
- FIXME(file,"generate INT24 missing\n");
+ FIXME("generate INT24 missing\n");
/* Is this the right error? */
SetLastError( ERROR_ACCESS_DENIED );
return TRUE;
@@ -231,7 +231,7 @@
return FALSE;
/* fall through */
fail_error05:
- TRACE(file,"Access Denied, oldmode 0x%02x mode 0x%02x\n",oldmode,mode);
+ TRACE("Access Denied, oldmode 0x%02x mode 0x%02x\n",oldmode,mode);
SetLastError( ERROR_ACCESS_DENIED );
return TRUE;
}
@@ -247,7 +247,7 @@
{
int save_errno = errno; /* errno gets overwritten by printf */
- TRACE(file, "errno = %d %s\n", errno, strerror(errno));
+ TRACE("errno = %d %s\n", errno, strerror(errno));
switch (save_errno)
{
case EAGAIN:
@@ -408,7 +408,7 @@
SetLastError( ERROR_INVALID_PARAMETER );
return HFILE_ERROR;
}
- TRACE(file,"%s %s%s%s%s%s%s%s\n",filename,
+ TRACE("%s %s%s%s%s%s%s%s\n",filename,
((access & GENERIC_READ)==GENERIC_READ)?"GENERIC_READ ":"",
((access & GENERIC_WRITE)==GENERIC_WRITE)?"GENERIC_WRITE ":"",
(!access)?"QUERY_ACCESS ":"",
@@ -427,7 +427,7 @@
filename += 4;
if (!strncmp(filename, "UNC\\", 4))
{
- FIXME( file, "UNC name (%s) not supported.\n", filename );
+ FIXME("UNC name (%s) not supported.\n", filename );
SetLastError( ERROR_PATH_NOT_FOUND );
return HFILE_ERROR;
}
@@ -439,7 +439,7 @@
/* If the name still starts with '\\', it's a UNC name. */
if (!strncmp(filename, "\\\\", 2))
{
- FIXME( file, "UNC name (%s) not supported.\n", filename );
+ FIXME("UNC name (%s) not supported.\n", filename );
SetLastError( ERROR_PATH_NOT_FOUND );
return HFILE_ERROR;
}
@@ -452,13 +452,13 @@
{
HFILE ret;
- TRACE(file, "opening device '%s'\n", filename );
+ TRACE("opening device '%s'\n", filename );
if (HFILE_ERROR!=(ret=DOSFS_OpenDevice( filename, access )))
return ret;
/* Do not silence this please. It is a critical error. -MM */
- ERR(file, "Couldn't open device '%s'!\n",filename);
+ ERR("Couldn't open device '%s'!\n",filename);
SetLastError( ERROR_FILE_NOT_FOUND );
return HFILE_ERROR;
}
@@ -659,7 +659,7 @@
!DRIVE_IsValid( toupper(drive & ~TF_FORCEDRIVE) - 'A' ))
{
drive &= ~TF_FORCEDRIVE;
- WARN(file, "invalid drive %d specified\n", drive );
+ WARN("invalid drive %d specified\n", drive );
}
if (drive & TF_FORCEDRIVE)
@@ -708,7 +708,7 @@
CREATE_NEW, FILE_ATTRIBUTE_NORMAL, -1 );
if (handle != INVALID_HANDLE_VALUE)
{ /* We created it */
- TRACE(file, "created %s\n",
+ TRACE("created %s\n",
buffer);
CloseHandle( handle );
break;
@@ -727,10 +727,10 @@
/* Check if we have write access in the directory */
if ((p = strrchr( full_name.long_name, '/' ))) *p = '\0';
if (access( full_name.long_name, W_OK ) == -1)
- WARN(file, "returns '%s', which doesn't seem to be writeable.\n",
+ WARN("returns '%s', which doesn't seem to be writeable.\n",
buffer);
}
- TRACE(file, "returning %s\n", buffer );
+ TRACE("returning %s\n", buffer );
return unique ? unique : num;
}
@@ -773,7 +773,7 @@
if (!ofs) return HFILE_ERROR;
- TRACE(file,"%s %s %s %s%s%s%s%s%s%s%s%s\n",name,
+ TRACE("%s %s %s %s%s%s%s%s%s%s%s%s\n",name,
((mode & 0x3 )==OF_READ)?"OF_READ":
((mode & 0x3 )==OF_WRITE)?"OF_WRITE":
((mode & 0x3 )==OF_READWRITE)?"OF_READWRITE":"unknown",
@@ -799,11 +799,11 @@
if (mode & OF_REOPEN) name = ofs->szPathName;
if (!name) {
- ERR(file, "called with `name' set to NULL ! Please debug.\n");
+ ERR("called with `name' set to NULL ! Please debug.\n");
return HFILE_ERROR;
}
- TRACE(file, "%s %04x\n", name, mode );
+ TRACE("%s %04x\n", name, mode );
/* the watcom 10.6 IDE relies on a valid path returned in ofs->szPathName
Are there any cases where getting the path here is wrong?
@@ -818,7 +818,7 @@
{
ofs->fFixedDisk = (GetDriveType16( ofs->szPathName[0]-'A' )
!= DRIVE_REMOVABLE);
- TRACE(file, "(%s): OF_PARSE, res = '%s'\n",
+ TRACE("(%s): OF_PARSE, res = '%s'\n",
name, ofs->szPathName );
return 0;
}
@@ -853,7 +853,7 @@
if (!DIR_SearchPath( NULL, name, NULL, &full_name, win32 )) goto not_found;
found:
- TRACE(file, "found %s = %s\n",
+ TRACE("found %s = %s\n",
full_name.long_name, full_name.short_name );
lstrcpynA( ofs->szPathName, full_name.short_name,
sizeof(ofs->szPathName) );
@@ -875,7 +875,7 @@
last = full_name.long_name - 1;
if (GetModuleHandle16(last+1))
{
- TRACE(file,"Denying shared open for %s\n",full_name.long_name);
+ TRACE("Denying shared open for %s\n",full_name.long_name);
return HFILE_ERROR;
}
}
@@ -883,7 +883,7 @@
if (mode & OF_DELETE)
{
if (unlink( full_name.long_name ) == -1) goto not_found;
- TRACE(file, "(%s): OF_DELETE return = OK\n", name);
+ TRACE("(%s): OF_DELETE return = OK\n", name);
return 1;
}
@@ -898,7 +898,7 @@
if (memcmp( ofs->reserved, filedatetime, sizeof(ofs->reserved) ))
{
CloseHandle( hFileRet );
- WARN(file, "(%s): OF_VERIFY failed\n", name );
+ WARN("(%s): OF_VERIFY failed\n", name );
/* FIXME: what error here? */
SetLastError( ERROR_FILE_NOT_FOUND );
goto error;
@@ -907,7 +907,7 @@
memcpy( ofs->reserved, filedatetime, sizeof(ofs->reserved) );
success: /* We get here if the open was successful */
- TRACE(file, "(%s): OK, return = %d\n", name, hFileRet );
+ TRACE("(%s): OK, return = %d\n", name, hFileRet );
if (win32)
{
if (mode & OF_EXIST) /* Return the handle, but close it first */
@@ -923,13 +923,13 @@
return hFileRet;
not_found: /* We get here if the file does not exist */
- WARN(file, "'%s' not found\n", name );
+ WARN("'%s' not found\n", name );
SetLastError( ERROR_FILE_NOT_FOUND );
/* fall through */
error: /* We get here if there was an error opening the file */
ofs->nErrCode = GetLastError();
- WARN(file, "(%s): return = HFILE_ERROR error= %d\n",
+ WARN("(%s): return = HFILE_ERROR error= %d\n",
name,ofs->nErrCode );
return HFILE_ERROR;
}
@@ -998,7 +998,7 @@
if (!*ptr)
{
*ptr = handle;
- TRACE( file, "Got %d for h32 %d\n", i, handle );
+ TRACE("Got %d for h32 %d\n", i, handle );
return i;
}
error:
@@ -1043,7 +1043,7 @@
}
if (hFile2 < 5)
{
- FIXME( file, "stdio handle closed, need proper conversion\n" );
+ FIXME("stdio handle closed, need proper conversion\n" );
SetLastError( ERROR_INVALID_HANDLE );
return HFILE_ERROR16;
}
@@ -1066,7 +1066,7 @@
if (hFile < 5)
{
- FIXME( file, "stdio handle closed, need proper conversion\n" );
+ FIXME("stdio handle closed, need proper conversion\n" );
SetLastError( ERROR_INVALID_HANDLE );
return HFILE_ERROR16;
}
@@ -1075,7 +1075,7 @@
SetLastError( ERROR_INVALID_HANDLE );
return HFILE_ERROR16;
}
- TRACE( file, "%d (handle32=%d)\n", hFile, table[hFile] );
+ TRACE("%d (handle32=%d)\n", hFile, table[hFile] );
CloseHandle( table[hFile] );
table[hFile] = 0;
return 0;
@@ -1087,7 +1087,7 @@
*/
HFILE WINAPI _lclose( HFILE hFile )
{
- TRACE(file, "handle %d\n", hFile );
+ TRACE("handle %d\n", hFile );
return CloseHandle( hFile ) ? 0 : HFILE_ERROR;
}
@@ -1101,7 +1101,7 @@
struct get_read_fd_request *req = get_req_buffer();
int unix_handle, result;
- TRACE(file, "%d %p %ld\n", hFile, buffer, bytesToRead );
+ TRACE("%d %p %ld\n", hFile, buffer, bytesToRead );
if (bytesRead) *bytesRead = 0; /* Do this before anything else */
if (!bytesToRead) return TRUE;
@@ -1132,7 +1132,7 @@
struct get_write_fd_request *req = get_req_buffer();
int unix_handle, result;
- TRACE(file, "%d %p %ld\n", hFile, buffer, bytesToWrite );
+ TRACE("%d %p %ld\n", hFile, buffer, bytesToWrite );
if (bytesWritten) *bytesWritten = 0; /* Do this before anything else */
if (!bytesToWrite) return TRUE;
@@ -1164,7 +1164,7 @@
{
LONG maxlen;
- TRACE(file, "%d %08lx %ld\n",
+ TRACE("%d %08lx %ld\n",
hFile, (DWORD)buffer, count );
/* Some programs pass a count larger than the allocated buffer */
@@ -1219,7 +1219,7 @@
{
/* Mask off all flags not explicitly allowed by the doc */
attr &= FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM;
- TRACE(file, "%s %02x\n", path, attr );
+ TRACE("%s %02x\n", path, attr );
return CreateFileA( path, GENERIC_READ | GENERIC_WRITE,
FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
CREATE_ALWAYS, attr, -1 );
@@ -1236,11 +1236,11 @@
if (highword && *highword)
{
- FIXME(file, "64-bit offsets not supported yet\n");
+ FIXME("64-bit offsets not supported yet\n");
SetLastError( ERROR_INVALID_PARAMETER );
return 0xffffffff;
}
- TRACE(file, "handle %d offset %ld origin %ld\n",
+ TRACE("handle %d offset %ld origin %ld\n",
hFile, distance, method );
req->handle = hFile;
@@ -1294,7 +1294,7 @@
{
DWORD access, sharing;
- TRACE(file, "('%s',%04x)\n", path, mode );
+ TRACE("('%s',%04x)\n", path, mode );
FILE_ConvertOFMode( mode, &access, &sharing );
return CreateFileA( path, access, sharing, NULL, OPEN_EXISTING, 0, -1 );
}
@@ -1358,7 +1358,7 @@
{
DWORD result;
- TRACE(file, "%d %p %ld\n", handle, buffer, count );
+ TRACE("%d %p %ld\n", handle, buffer, count );
if (!count)
{
@@ -1381,7 +1381,7 @@
PDB16 *pdb = (PDB16 *)GlobalLock16( hPDB );
BYTE *files = PTR_SEG_TO_LIN( pdb->fileHandlesPtr );
- TRACE(file, "(%d)\n", count );
+ TRACE("(%d)\n", count );
if (count < 20) count = 20; /* No point in going below 20 */
else if (count > 254) count = 254;
@@ -1471,16 +1471,16 @@
{
DOS_FULL_NAME full_name;
- TRACE(file, "'%s'\n", path );
+ TRACE("'%s'\n", path );
if (!*path)
{
- ERR(file, "Empty path passed\n");
+ ERR("Empty path passed\n");
return FALSE;
}
if (DOSFS_GetDevice( path ))
{
- WARN(file, "cannot remove DOS device '%s'!\n", path);
+ WARN("cannot remove DOS device '%s'!\n", path);
SetLastError( ERROR_FILE_NOT_FOUND );
return FALSE;
}
@@ -1520,7 +1520,7 @@
LPVOID ret;
if (size_high || offset_high)
- FIXME(file, "offsets larger than 4Gb not supported\n");
+ FIXME("offsets larger than 4Gb not supported\n");
if (unix_handle == -1)
{
@@ -1593,7 +1593,7 @@
int FILE_munmap( LPVOID start, DWORD size_high, DWORD size_low )
{
if (size_high)
- FIXME(file, "offsets larger than 4Gb not supported\n");
+ FIXME("offsets larger than 4Gb not supported\n");
return munmap( start, size_low );
}
@@ -1618,7 +1618,7 @@
DOS_FULL_NAME full_name1, full_name2;
int mode=0; /* mode == 1: use copy */
- TRACE(file, "(%s,%s,%04lx)\n", fn1, fn2, flag);
+ TRACE("(%s,%s,%04lx)\n", fn1, fn2, flag);
if (!DOSFS_GetFullName( fn1, TRUE, &full_name1 )) return FALSE;
if (fn2) { /* !fn2 means delete fn1 */
@@ -1645,7 +1645,7 @@
else /* fn2 == NULL means delete source */
if (flag & MOVEFILE_DELAY_UNTIL_REBOOT) {
if (flag & MOVEFILE_COPY_ALLOWED) {
- WARN(file, "Illegal flag\n");
+ WARN("Illegal flag\n");
SetLastError( ERROR_GEN_FAILURE );
return FALSE;
}
@@ -1653,7 +1653,7 @@
Perhaps we should queue these command and execute it
when exiting... What about using on_exit(2)
*/
- FIXME(file, "Please delete file '%s' when Wine has finished\n",
+ FIXME("Please delete file '%s' when Wine has finished\n",
full_name1.long_name);
return TRUE;
}
@@ -1669,7 +1669,7 @@
Perhaps we should queue these command and execute it
when exiting... What about using on_exit(2)
*/
- FIXME(file,"Please move existing file '%s' to file '%s'"
+ FIXME("Please move existing file '%s' to file '%s'"
"when Wine has finished\n",
full_name1.long_name, full_name2.long_name);
return TRUE;
@@ -1711,7 +1711,7 @@
DOS_FULL_NAME full_name1, full_name2;
struct stat fstat;
- TRACE(file, "(%s,%s)\n", fn1, fn2 );
+ TRACE("(%s,%s)\n", fn1, fn2 );
if (!DOSFS_GetFullName( fn1, TRUE, &full_name1 )) return FALSE;
if (DOSFS_GetFullName( fn2, TRUE, &full_name2 ))
@@ -1729,7 +1729,7 @@
else /*copy */ {
if (stat( full_name1.long_name, &fstat ))
{
- WARN(file, "Invalid source file %s\n",
+ WARN("Invalid source file %s\n",
full_name1.long_name);
FILE_SetDosError();
return FALSE;
@@ -1928,14 +1928,14 @@
DWORD nNumberOfBytesToLockLow, DWORD nNumberOfBytesToLockHigh,
LPOVERLAPPED pOverlapped )
{
- FIXME(file, "hFile=%d,flags=%ld,reserved=%ld,lowbytes=%ld,highbytes=%ld,overlapped=%p: stub.\n",
+ FIXME("hFile=%d,flags=%ld,reserved=%ld,lowbytes=%ld,highbytes=%ld,overlapped=%p: stub.\n",
hFile, flags, reserved, nNumberOfBytesToLockLow, nNumberOfBytesToLockHigh,
pOverlapped);
if (reserved == 0)
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
else
{
- ERR(file, "reserved == %ld: Supposed to be 0??\n", reserved);
+ ERR("reserved == %ld: Supposed to be 0??\n", reserved);
SetLastError(ERROR_INVALID_PARAMETER);
}
@@ -1971,14 +1971,14 @@
LPOVERLAPPED lpOverlapped
)
{
- FIXME(file, "hFile=%d,reserved=%ld,lowbytes=%ld,highbytes=%ld,overlapped=%p: stub.\n",
+ FIXME("hFile=%d,reserved=%ld,lowbytes=%ld,highbytes=%ld,overlapped=%p: stub.\n",
hFile, dwReserved, nNumberOfBytesToUnlockLow, nNumberOfBytesToUnlockHigh,
lpOverlapped);
if (dwReserved == 0)
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
else
{
- ERR(file, "reserved == %ld: Supposed to be 0??\n", dwReserved);
+ ERR("reserved == %ld: Supposed to be 0??\n", dwReserved);
SetLastError(ERROR_INVALID_PARAMETER);
}
@@ -2098,12 +2098,12 @@
struct flock f;
FILE_OBJECT *file;
- TRACE(file, "handle %d offsetlow=%ld offsethigh=%ld nbyteslow=%ld nbyteshigh=%ld\n",
+ TRACE("handle %d offsetlow=%ld offsethigh=%ld nbyteslow=%ld nbyteshigh=%ld\n",
hFile, dwFileOffsetLow, dwFileOffsetHigh,
nNumberOfBytesToLockLow, nNumberOfBytesToLockHigh);
if (dwFileOffsetHigh || nNumberOfBytesToLockHigh) {
- FIXME(file, "Unimplemented bytes > 32bits\n");
+ FIXME("Unimplemented bytes > 32bits\n");
return FALSE;
}
@@ -2149,12 +2149,12 @@
FILE_OBJECT *file;
struct flock f;
- TRACE(file, "handle %d offsetlow=%ld offsethigh=%ld nbyteslow=%ld nbyteshigh=%ld\n",
+ TRACE("handle %d offsetlow=%ld offsethigh=%ld nbyteslow=%ld nbyteshigh=%ld\n",
hFile, dwFileOffsetLow, dwFileOffsetHigh,
nNumberOfBytesToUnlockLow, nNumberOfBytesToUnlockHigh);
if (dwFileOffsetHigh || nNumberOfBytesToUnlockHigh) {
- WARN(file, "Unimplemented bytes > 32bits\n");
+ WARN("Unimplemented bytes > 32bits\n");
return FALSE;
}
@@ -2206,7 +2206,7 @@
lpFad->nFileSizeLow = info.nFileSizeLow;
}
else {
- FIXME (file, "invalid info level %d!\n", fInfoLevelId);
+ FIXME("invalid info level %d!\n", fInfoLevelId);
return FALSE;
}
diff --git a/files/profile.c b/files/profile.c
index 0d5a1330..7b0572e 100644
--- a/files/profile.c
+++ b/files/profile.c
@@ -17,7 +17,7 @@
#include "winnls.h"
#include "file.h"
#include "heap.h"
-#include "debug.h"
+#include "debugtools.h"
#include "options.h"
DEFAULT_DEBUG_CHANNEL(profile)
@@ -208,7 +208,7 @@
{
if (!(p2 = strrchr( p, ']' )))
{
- WARN(profile, "Invalid section header at line %d: '%s'\n",
+ WARN("Invalid section header at line %d: '%s'\n",
line, p );
}
else
@@ -224,7 +224,7 @@
next_key = §ion->key;
prev_key = NULL;
- TRACE(profile, "New section: '%s'\n",section->name);
+ TRACE("New section: '%s'\n",section->name);
continue;
}
@@ -251,7 +251,7 @@
next_key = &key->next;
prev_key = key;
- TRACE(profile, "New key: name='%s', value='%s'\n",key->name,key->value?key->value:"(none)");
+ TRACE("New key: name='%s', value='%s'\n",key->name,key->value?key->value:"(none)");
}
}
return first_section;
@@ -368,7 +368,7 @@
if(!CurProfile)
{
- WARN(profile, "No current profile!\n");
+ WARN("No current profile!\n");
return FALSE;
}
@@ -391,11 +391,11 @@
if (!file)
{
- WARN(profile, "could not save profile file %s\n", CurProfile->dos_name);
+ WARN("could not save profile file %s\n", CurProfile->dos_name);
return FALSE;
}
- TRACE(profile, "Saving '%s' into '%s'\n", CurProfile->dos_name, unix_name );
+ TRACE("Saving '%s' into '%s'\n", CurProfile->dos_name, unix_name );
PROFILE_Save( file, CurProfile->section );
fclose( file );
CurProfile->changed = FALSE;
@@ -463,10 +463,10 @@
CurProfile=tempProfile;
}
if(!stat(CurProfile->unix_name,&buf) && CurProfile->mtime==buf.st_mtime)
- TRACE(profile, "(%s): already opened (mru=%d)\n",
+ TRACE("(%s): already opened (mru=%d)\n",
filename, i );
else
- TRACE(profile, "(%s): already opened, needs refreshing (mru=%d)\n",
+ TRACE("(%s): already opened, needs refreshing (mru=%d)\n",
filename, i );
return TRUE;
}
@@ -515,7 +515,7 @@
CharLowerA( p );
if ((file = fopen( buffer, "r" )))
{
- TRACE(profile, "(%s): found it in %s\n",
+ TRACE("(%s): found it in %s\n",
filename, buffer );
CurProfile->unix_name = HEAP_strdupA( SystemHeap, 0, buffer );
}
@@ -526,7 +526,7 @@
CurProfile->unix_name = HEAP_strdupA( SystemHeap, 0,
full_name.long_name );
if ((file = fopen( full_name.long_name, "r" )))
- TRACE(profile, "(%s): found it in %s\n",
+ TRACE("(%s): found it in %s\n",
filename, full_name.long_name );
}
@@ -540,7 +540,7 @@
else
{
/* Does not exist yet, we will create it in PROFILE_FlushFile */
- WARN(profile, "profile file %s not found\n", newdos_name );
+ WARN("profile file %s not found\n", newdos_name );
}
return TRUE;
}
@@ -637,7 +637,7 @@
key = PROFILE_Find( &CurProfile->section, section, key_name, FALSE );
PROFILE_CopyEntry( buffer, (key && key->value) ? key->value : def_val,
len, FALSE );
- TRACE(profile, "('%s','%s','%s'): returning '%s'\n",
+ TRACE("('%s','%s','%s'): returning '%s'\n",
section, key_name, def_val, buffer );
return strlen( buffer );
}
@@ -659,7 +659,7 @@
{
if (!key_name) /* Delete a whole section */
{
- TRACE(profile, "('%s')\n", section_name);
+ TRACE("('%s')\n", section_name);
CurProfile->changed |= PROFILE_DeleteSection( &CurProfile->section,
section_name );
return TRUE; /* Even if PROFILE_DeleteSection() has failed,
@@ -667,7 +667,7 @@
}
else if (!value) /* Delete a key */
{
- TRACE(profile, "('%s','%s')\n",
+ TRACE("('%s','%s')\n",
section_name, key_name );
CurProfile->changed |= PROFILE_DeleteKey( &CurProfile->section,
section_name, key_name );
@@ -677,20 +677,20 @@
{
PROFILEKEY *key = PROFILE_Find( &CurProfile->section, section_name,
key_name, TRUE );
- TRACE(profile, "('%s','%s','%s'): \n",
+ TRACE("('%s','%s','%s'): \n",
section_name, key_name, value );
if (!key) return FALSE;
if (key->value)
{
if (!strcmp( key->value, value ))
{
- TRACE(profile, " no change needed\n" );
+ TRACE(" no change needed\n" );
return TRUE; /* No change needed */
}
- TRACE(profile, " replacing '%s'\n", key->value );
+ TRACE(" replacing '%s'\n", key->value );
HeapFree( SystemHeap, 0, key->value );
}
- else TRACE(profile, " creating key\n" );
+ else TRACE(" creating key\n" );
key->value = HEAP_strdupA( SystemHeap, 0, value );
CurProfile->changed = TRUE;
}
@@ -715,7 +715,7 @@
PROFILEKEY *key = PROFILE_Find(&PROFILE_WineProfile, section, key_name, FALSE);
PROFILE_CopyEntry( buffer, (key && key->value) ? key->value : def,
len, TRUE );
- TRACE(profile, "('%s','%s','%s'): returning '%s'\n",
+ TRACE("('%s','%s','%s'): returning '%s'\n",
section, key_name, def, buffer );
ret = strlen( buffer );
}
@@ -865,7 +865,7 @@
retval = def;
}
- TRACE(profile, "(\"%s\", \"%s\", %s), "
+ TRACE("(\"%s\", \"%s\", %s), "
"[%c], ret %s.\n", section, key_name,
def ? "TRUE" : "FALSE", key_value[0],
retval ? "TRUE" : "FALSE");
@@ -916,7 +916,7 @@
return 1;
}
}
- else WARN(profile, "could not get $HOME value for config file.\n" );
+ else WARN("could not get $HOME value for config file.\n" );
/* Try global file */
@@ -927,7 +927,7 @@
strncpy(PROFILE_WineIniUsed,WINE_INI_GLOBAL,MAX_PATHNAME_LEN-1);
return 1;
}
- MSG( "Can't open configuration file %s or $HOME%s\n",
+ MESSAGE( "Can't open configuration file %s or $HOME%s\n",
WINE_INI_GLOBAL, PROFILE_WineIniName );
return 0;
}
@@ -942,13 +942,13 @@
*/
void PROFILE_UsageWineIni(void)
{
- MSG("Perhaps you have not properly edited or created "
+ MESSAGE("Perhaps you have not properly edited or created "
"your Wine configuration file.\n");
- MSG("This is either %s or $HOME%s\n",WINE_INI_GLOBAL,PROFILE_WineIniName);
- MSG(" or it is determined by the -config option or from\n"
+ MESSAGE("This is either %s or $HOME%s\n",WINE_INI_GLOBAL,PROFILE_WineIniName);
+ MESSAGE(" or it is determined by the -config option or from\n"
" the WINE_INI environment variable.\n");
if (*PROFILE_WineIniUsed)
- MSG("Wine has used %s as configuration file.\n", PROFILE_WineIniUsed);
+ MESSAGE("Wine has used %s as configuration file.\n", PROFILE_WineIniUsed);
/* RTFM, so to say */
}
@@ -1314,11 +1314,11 @@
{
char *p =(char*)string;
- FIXME(profile, "WritePrivateProfileSection32A empty stub\n");
+ FIXME("WritePrivateProfileSection32A empty stub\n");
if (TRACE_ON(profile)) {
- TRACE(profile, "(%s) => [%s]\n", filename, section);
+ TRACE("(%s) => [%s]\n", filename, section);
while (*(p+1)) {
- TRACE(profile, "%s\n", p);
+ TRACE("%s\n", p);
p += strlen(p);
p += 1;
}
diff --git a/include/debug.h b/include/debug.h
deleted file mode 100644
index db1e55f..0000000
--- a/include/debug.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define OLD_DEBUG_MACROS
-#include "debugtools.h"
diff --git a/multimedia/dplay.c b/multimedia/dplay.c
index b12501c..d86ec08 100644
--- a/multimedia/dplay.c
+++ b/multimedia/dplay.c
@@ -12,7 +12,7 @@
#include "dplay.h"
#include "dplobby.h"
#include "heap.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(dplay)
@@ -106,8 +106,8 @@
DPSESSIONDESC2* lpSession = (DPSESSIONDESC2*) startData;
DWORD sessionDwFlags = lpSession->dwFlags;
- TRACE( dplay, "spawing thread for lpConn=%p dwFlags=%08lx\n", lpSession, sessionDwFlags );
- FIXME( dplay, "thread needs something to do\n" );
+ TRACE("spawing thread for lpConn=%p dwFlags=%08lx\n", lpSession, sessionDwFlags );
+ FIXME("thread needs something to do\n" );
/*for(;;)*/
{
@@ -290,7 +290,7 @@
LPVOID* ppvObj )
{
ICOM_THIS(IDirectPlayLobby2Impl,iface);
- TRACE( dplay, "(%p)->(%p,%p)\n", This, riid, ppvObj );
+ TRACE("(%p)->(%p,%p)\n", This, riid, ppvObj );
if( IsEqualGUID( &IID_IUnknown, riid ) ||
IsEqualGUID( &IID_IDirectPlayLobbyA, riid )
@@ -311,7 +311,7 @@
LPVOID* ppvObj )
{
ICOM_THIS(IDirectPlayLobbyImpl,iface);
- TRACE( dplay, "(%p)->(%p,%p)\n", This, riid, ppvObj );
+ TRACE("(%p)->(%p,%p)\n", This, riid, ppvObj );
if( IsEqualGUID( &IID_IUnknown, riid ) ||
IsEqualGUID( &IID_IDirectPlayLobby, riid )
@@ -332,7 +332,7 @@
LPVOID* ppvObj )
{
ICOM_THIS(IDirectPlayLobby2Impl,iface);
- TRACE( dplay, "(%p)->(%p,%p)\n", This, riid, ppvObj );
+ TRACE("(%p)->(%p,%p)\n", This, riid, ppvObj );
/* Compare riids. We know this object is a direct play lobby 2A object.
If we are asking about the same type of interface we're fine.
@@ -380,7 +380,7 @@
{
ICOM_THIS(IDirectPlayLobby2Impl,iface);
++(This->ref);
- TRACE( dplay,"ref count now %lu\n", This->ref );
+ TRACE("ref count now %lu\n", This->ref );
return (This->ref);
}
@@ -401,14 +401,14 @@
( LPDIRECTPLAYLOBBY2A iface )
{
ICOM_THIS(IDirectPlayLobby2Impl,iface);
- TRACE( dplay, "ref count decremeneted from %lu\n", This->ref );
+ TRACE("ref count decremeneted from %lu\n", This->ref );
This->ref--;
/* Deallocate if this is the last reference to the object */
if( !(This->ref) )
{
- FIXME( dplay, "memory leak\n" );
+ FIXME("memory leak\n" );
/* Implement memory deallocation */
HeapFree( GetProcessHeap(), 0, This );
@@ -441,7 +441,7 @@
LPDIRECTPLAY2* lplpDP,
IUnknown* pUnk)
{
- FIXME( dplay, ": dwFlags=%08lx %p %p stub\n", dwFlags, lplpDP, pUnk );
+ FIXME(": dwFlags=%08lx %p %p stub\n", dwFlags, lplpDP, pUnk );
return DPERR_OUTOFMEMORY;
}
@@ -455,7 +455,7 @@
LPDIRECTPLAY2* directPlay2W;
HRESULT createRC;
- FIXME( dplay, "(%p)->(%08lx,%p,%p): stub\n", This, dwFlags, lplpDP, pUnk );
+ FIXME("(%p)->(%08lx,%p,%p): stub\n", This, dwFlags, lplpDP, pUnk );
if( dwFlags )
{
@@ -464,7 +464,7 @@
if( ( createRC = DirectPlayCreate( (LPGUID)&IID_IDirectPlayLobby2, lplpDP, pUnk ) ) != DP_OK )
{
- ERR( dplay, "error creating Direct Play 2W interface. Return Code = %ld.\n", createRC );
+ ERR("error creating Direct Play 2W interface. Return Code = %ld.\n", createRC );
return createRC;
}
@@ -488,12 +488,12 @@
else if ( This->lpSession->dwFlags == DPLCONNECTION_JOINSESSION )
{
/* Let's search for a matching session */
- FIXME( dplay, "joining session not yet supported.\n");
+ FIXME("joining session not yet supported.\n");
return DPERR_OUTOFMEMORY;
}
else /* Unknown type of connection request */
{
- ERR( dplay, ": Unknown connection request lpConn->dwFlags=%08lx\n",
+ ERR(": Unknown connection request lpConn->dwFlags=%08lx\n",
lpConn->dwFlags );
return DPERR_OUTOFMEMORY;
@@ -530,7 +530,7 @@
LPVOID lpAddress,
LPDWORD lpdwAddressSize )
{
- FIXME( dplay, ":stub\n");
+ FIXME(":stub\n");
return DPERR_OUTOFMEMORY;
}
@@ -543,7 +543,7 @@
LPVOID lpAddress,
LPDWORD lpdwAddressSize )
{
- FIXME( dplay, ":stub\n");
+ FIXME(":stub\n");
return DPERR_OUTOFMEMORY;
}
@@ -561,7 +561,7 @@
DWORD dwAddressSize,
LPVOID lpContext )
{
- FIXME( dplay, ":stub\n");
+ FIXME(":stub\n");
return DPERR_OUTOFMEMORY;
}
@@ -572,7 +572,7 @@
DWORD dwAddressSize,
LPVOID lpContext )
{
- FIXME( dplay, ":stub\n");
+ FIXME(":stub\n");
return DPERR_OUTOFMEMORY;
}
@@ -589,7 +589,7 @@
LPVOID lpContext,
DWORD dwFlags )
{
- FIXME( dplay, ":stub\n");
+ FIXME(":stub\n");
return DPERR_OUTOFMEMORY;
}
@@ -612,7 +612,7 @@
LPVOID lpContext,
DWORD dwFlags )
{
- FIXME( dplay, ":stub\n");
+ FIXME(":stub\n");
return DPERR_OUTOFMEMORY;
}
@@ -628,7 +628,7 @@
LPVOID lpContext,
DWORD dwFlags )
{
- FIXME( dplay, ":stub\n");
+ FIXME(":stub\n");
return DPERR_OUTOFMEMORY;
}
@@ -649,7 +649,7 @@
LPVOID lpContext,
DWORD dwFlags )
{
- FIXME( dplay, ":stub\n");
+ FIXME(":stub\n");
return DPERR_OUTOFMEMORY;
}
@@ -684,7 +684,7 @@
ICOM_THIS(IDirectPlayLobbyImpl,iface);
LPDPLCONNECTION lpDplConnection;
- FIXME( dplay, ": semi stub (%p)->(0x%08lx,%p,%p)\n", This, dwAppID, lpData, lpdwDataSize );
+ FIXME(": semi stub (%p)->(0x%08lx,%p,%p)\n", This, dwAppID, lpData, lpdwDataSize );
/* Application is requesting us to give the required size */
if ( !lpData )
@@ -707,7 +707,7 @@
/* Make sure we were given the right size */
if( lpDplConnection->dwSize < sizeof( DPLCONNECTION ) )
{
- ERR( dplay, "bad passed size 0x%08lx.\n", lpDplConnection->dwSize );
+ ERR("bad passed size 0x%08lx.\n", lpDplConnection->dwSize );
return DPERR_INVALIDPARAMS;
}
@@ -780,7 +780,7 @@
LPDWORD lpdwDataSize )
{
ICOM_THIS(IDirectPlayLobbyImpl,iface);
- FIXME( dplay, ":semi stub %p %08lx %p %p \n", This, dwAppID, lpData, lpdwDataSize );
+ FIXME(":semi stub %p %08lx %p %p \n", This, dwAppID, lpData, lpdwDataSize );
/* Application is requesting us to give the required size */
if ( !lpData )
@@ -798,7 +798,7 @@
}
/* Fill in the fields - let them just use the ptrs */
- FIXME( dplay, "stub\n" );
+ FIXME("stub\n" );
return DP_OK;
}
@@ -829,7 +829,7 @@
LPDWORD lpdwDataSize )
{
ICOM_THIS(IDirectPlayLobbyImpl,iface);
- FIXME( dplay, ":stub %p %08lx %08lx %p %p %p\n", This, dwFlags, dwAppID, lpdwMessageFlags, lpData,
+ FIXME(":stub %p %08lx %08lx %p %p %p\n", This, dwFlags, dwAppID, lpdwMessageFlags, lpData,
lpdwDataSize );
return DPERR_OUTOFMEMORY;
}
@@ -857,7 +857,7 @@
LPDWORD lpdwDataSize )
{
ICOM_THIS(IDirectPlayLobbyImpl,iface);
- FIXME( dplay, ":stub %p %08lx %08lx %p %p %p\n", This, dwFlags, dwAppID, lpdwMessageFlags, lpData,
+ FIXME(":stub %p %08lx %08lx %p %p %p\n", This, dwFlags, dwAppID, lpdwMessageFlags, lpData,
lpdwDataSize );
return DPERR_OUTOFMEMORY;
}
@@ -888,7 +888,7 @@
LPDPLCONNECTION lpConn,
HANDLE hReceiveEvent )
{
- FIXME( dplay, ":stub\n");
+ FIXME(":stub\n");
return DPERR_OUTOFMEMORY;
}
@@ -911,7 +911,7 @@
LPDPLCONNECTION lpConn,
HANDLE hReceiveEvent )
{
- FIXME( dplay, ":stub\n");
+ FIXME(":stub\n");
return DPERR_OUTOFMEMORY;
}
@@ -941,7 +941,7 @@
LPVOID lpData,
DWORD dwDataSize )
{
- FIXME( dplay, ":stub\n");
+ FIXME(":stub\n");
return DPERR_OUTOFMEMORY;
}
@@ -965,7 +965,7 @@
LPVOID lpData,
DWORD dwDataSize )
{
- FIXME( dplay, ":stub\n");
+ FIXME(":stub\n");
return DPERR_OUTOFMEMORY;
}
@@ -994,13 +994,13 @@
LPDPLCONNECTION lpConn )
{
ICOM_THIS(IDirectPlayLobbyImpl,iface);
- TRACE( dplay, ": This=%p, dwFlags=%08lx, dwAppId=%08lx, lpConn=%p\n",
+ TRACE(": This=%p, dwFlags=%08lx, dwAppId=%08lx, lpConn=%p\n",
This, dwFlags, dwAppID, lpConn );
/* Paramater check */
if( dwFlags || !This || !lpConn )
{
- ERR( dplay, "invalid parameters.\n");
+ ERR("invalid parameters.\n");
return DPERR_INVALIDPARAMS;
}
@@ -1009,7 +1009,7 @@
*/
if( dwAppID )
{
- FIXME( dplay, ": Connection dwAppID=%08lx given. Not implemented yet.\n",
+ FIXME(": Connection dwAppID=%08lx given. Not implemented yet.\n",
dwAppID );
/* Need to add a check for this application Id...*/
@@ -1018,7 +1018,7 @@
if( lpConn->dwSize != sizeof(DPLCONNECTION) )
{
- ERR( dplay, ": old/new DPLCONNECTION type? Size=%08lx vs. expected=%ul bytes\n",
+ ERR(": old/new DPLCONNECTION type? Size=%08lx vs. expected=%ul bytes\n",
lpConn->dwSize, sizeof( DPLCONNECTION ) );
return DPERR_INVALIDPARAMS;
}
@@ -1030,7 +1030,7 @@
( lpConn->lpSessionDesc->dwSize != sizeof( DPSESSIONDESC2 ) )
)
{
- ERR( dplay, "DPSESSIONDESC passed in? Size=%08lx vs. expected=%ul bytes\n",
+ ERR("DPSESSIONDESC passed in? Size=%08lx vs. expected=%ul bytes\n",
lpConn->lpSessionDesc->dwSize, sizeof( DPSESSIONDESC2 ) );
return DPERR_INVALIDPARAMS;
}
@@ -1095,7 +1095,7 @@
LPDPLCONNECTION lpConn )
{
ICOM_THIS(IDirectPlayLobbyImpl,iface);
- FIXME( dplay, ": This=%p, dwFlags=%08lx, dwAppId=%08lx, lpConn=%p: stub\n",
+ FIXME(": This=%p, dwFlags=%08lx, dwAppId=%08lx, lpConn=%p: stub\n",
This, dwFlags, dwAppID, lpConn );
return DPERR_OUTOFMEMORY;
}
@@ -1122,7 +1122,7 @@
DWORD dwAppID,
HANDLE hReceiveEvent )
{
- FIXME( dplay, ":stub\n");
+ FIXME(":stub\n");
return DPERR_OUTOFMEMORY;
}
@@ -1143,7 +1143,7 @@
DWORD dwAppID,
HANDLE hReceiveEvent )
{
- FIXME( dplay, ":stub\n");
+ FIXME(":stub\n");
return DPERR_OUTOFMEMORY;
}
@@ -1171,7 +1171,7 @@
LPVOID lpAddress,
LPDWORD lpdwAddressSize )
{
- FIXME( dplay, ":stub\n");
+ FIXME(":stub\n");
return DPERR_OUTOFMEMORY;
}
@@ -1182,7 +1182,7 @@
LPVOID lpAddress,
LPDWORD lpdwAddressSize )
{
- FIXME( dplay, ":stub\n");
+ FIXME(":stub\n");
return DPERR_OUTOFMEMORY;
}
@@ -1299,7 +1299,7 @@
DWORD dwDataSize )
{
IDirectPlayLobbyAImpl** ilplpDPL=(IDirectPlayLobbyAImpl**)lplpDPL;
- TRACE(dplay,"lpGUIDDSP=%p lplpDPL=%p lpUnk=%p lpData=%p dwDataSize=%08lx\n",
+ TRACE("lpGUIDDSP=%p lplpDPL=%p lpUnk=%p lpData=%p dwDataSize=%08lx\n",
lpGUIDDSP,ilplpDPL,lpUnk,lpData,dwDataSize);
/* Parameter Check: lpGUIDSP, lpUnk & lpData must be NULL. dwDataSize must
@@ -1339,7 +1339,7 @@
DWORD dwDataSize )
{
IDirectPlayLobbyImpl** ilplpDPL=(IDirectPlayLobbyImpl**)lplpDPL;
- TRACE(dplay,"lpGUIDDSP=%p lplpDPL=%p lpUnk=%p lpData=%p dwDataSize=%08lx\n",
+ TRACE("lpGUIDDSP=%p lplpDPL=%p lpUnk=%p lpData=%p dwDataSize=%08lx\n",
lpGUIDDSP,ilplpDPL,lpUnk,lpData,dwDataSize);
/* Parameter Check: lpGUIDSP, lpUnk & lpData must be NULL. dwDataSize must
@@ -1348,7 +1348,7 @@
if ( lpGUIDDSP || lpUnk || lpData || dwDataSize )
{
*ilplpDPL = NULL;
- ERR( dplay, "Bad parameters!\n" );
+ ERR("Bad parameters!\n" );
return DPERR_INVALIDPARAMS;
}
@@ -1406,7 +1406,7 @@
DWORD dwIndex, sizeOfSubKeyName=50;
char subKeyName[51];
- TRACE( dplay, ": lpEnumCallback=%p lpContext=%p\n", lpEnumCallback, lpContext );
+ TRACE(": lpEnumCallback=%p lpContext=%p\n", lpEnumCallback, lpContext );
if( !lpEnumCallback || !*lpEnumCallback )
{
@@ -1418,7 +1418,7 @@
0, KEY_ENUMERATE_SUB_KEYS, &hkResult ) != ERROR_SUCCESS )
{
/* Hmmm. Does this mean that there are no service providers? */
- ERR(dplay, ": no service providers?\n");
+ ERR(": no service providers?\n");
return DP_OK;
}
@@ -1435,13 +1435,13 @@
DWORD majVersionNum /*, minVersionNum */;
LPWSTR lpWGUIDString;
- TRACE( dplay, " this time through: %s\n", subKeyName );
+ TRACE(" this time through: %s\n", subKeyName );
/* Get a handle for this particular service provider */
if( RegOpenKeyExA( hkResult, subKeyName, 0, KEY_QUERY_VALUE,
&hkServiceProvider ) != ERROR_SUCCESS )
{
- ERR( dplay, ": what the heck is going on?\n" );
+ ERR(": what the heck is going on?\n" );
continue;
}
@@ -1452,7 +1452,7 @@
NULL, &returnTypeGUID, returnBuffer,
&sizeOfReturnBuffer ) != ERROR_SUCCESS )
{
- ERR( dplay, ": missing GUID registry data members\n" );
+ ERR(": missing GUID registry data members\n" );
continue;
}
@@ -1467,7 +1467,7 @@
NULL, &returnTypeReserved1, returnBuffer,
&sizeOfReturnBuffer ) != ERROR_SUCCESS )
{
- ERR( dplay, ": missing dwReserved1 registry data members\n") ;
+ ERR(": missing dwReserved1 registry data members\n") ;
continue;
}
/* FIXME: This couldn't possibly be right...*/
@@ -1477,7 +1477,7 @@
if( !lpEnumCallback( &serviceProviderGUID , subKeyName,
majVersionNum, (DWORD)0, lpContext ) )
{
- WARN( dplay, "lpEnumCallback returning FALSE\n" );
+ WARN("lpEnumCallback returning FALSE\n" );
break;
}
}
@@ -1493,7 +1493,7 @@
HRESULT WINAPI DirectPlayEnumerateW( LPDPENUMDPCALLBACKW lpEnumCallback, LPVOID lpContext )
{
- FIXME( dplay, ":stub\n");
+ FIXME(":stub\n");
return DPERR_OUTOFMEMORY;
@@ -1507,12 +1507,12 @@
( LPGUID lpGUID, LPDIRECTPLAY2 *lplpDP, IUnknown *pUnk)
{
- TRACE(dplay,"lpGUID=%p lplpDP=%p pUnk=%p\n", lpGUID,lplpDP,pUnk);
+ TRACE("lpGUID=%p lplpDP=%p pUnk=%p\n", lpGUID,lplpDP,pUnk);
if( pUnk != NULL )
{
/* Hmmm...wonder what this means! */
- ERR(dplay, "What does a NULL here mean?\n" );
+ ERR("What does a NULL here mean?\n" );
return DPERR_OUTOFMEMORY;
}
@@ -1641,7 +1641,7 @@
( LPDIRECTPLAY2 iface, REFIID riid, LPVOID* ppvObj )
{
ICOM_THIS(IDirectPlay2Impl,iface);
- TRACE( dplay, "(%p)->(%p,%p)\n", This, riid, ppvObj );
+ TRACE("(%p)->(%p,%p)\n", This, riid, ppvObj );
if( IsEqualGUID( &IID_IUnknown, riid ) ||
IsEqualGUID( &IID_IDirectPlay2, riid )
@@ -1658,7 +1658,7 @@
( LPDIRECTPLAY2A iface, REFIID riid, LPVOID* ppvObj )
{
ICOM_THIS(IDirectPlay2Impl,iface);
- TRACE( dplay, "(%p)->(%p,%p)\n", This, riid, ppvObj );
+ TRACE("(%p)->(%p,%p)\n", This, riid, ppvObj );
if( IsEqualGUID( &IID_IUnknown, riid ) ||
IsEqualGUID( &IID_IDirectPlay2A, riid )
@@ -1676,7 +1676,7 @@
( LPDIRECTPLAY3 iface, REFIID riid, LPVOID* ppvObj )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- TRACE( dplay, "(%p)->(%p,%p)\n", This, riid, ppvObj );
+ TRACE("(%p)->(%p,%p)\n", This, riid, ppvObj );
if( IsEqualGUID( &IID_IUnknown, riid ) ||
IsEqualGUID( &IID_IDirectPlay3, riid )
@@ -1694,7 +1694,7 @@
( LPDIRECTPLAY3A iface, REFIID riid, LPVOID* ppvObj )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- TRACE( dplay, "(%p)->(%p,%p)\n", This, riid, ppvObj );
+ TRACE("(%p)->(%p,%p)\n", This, riid, ppvObj );
if( IsEqualGUID( &IID_IUnknown, riid ) ||
IsEqualGUID( &IID_IDirectPlay3A, riid )
@@ -1715,7 +1715,7 @@
{
ICOM_THIS(IDirectPlay3Impl,iface);
++(This->ref);
- TRACE( dplay,"ref count now %lu\n", This->ref );
+ TRACE("ref count now %lu\n", This->ref );
return (This->ref);
}
@@ -1723,14 +1723,14 @@
( LPDIRECTPLAY3 iface )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- TRACE( dplay, "ref count decremeneted from %lu\n", This->ref );
+ TRACE("ref count decremeneted from %lu\n", This->ref );
This->ref--;
/* Deallocate if this is the last reference to the object */
if( !(This->ref) )
{
- FIXME( dplay, "memory leak\n" );
+ FIXME("memory leak\n" );
/* Implement memory deallocation */
HeapFree( GetProcessHeap(), 0, This );
@@ -1745,14 +1745,14 @@
( LPDIRECTPLAY3A iface )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- TRACE( dplay, "ref count decremeneted from %lu\n", This->ref );
+ TRACE("ref count decremeneted from %lu\n", This->ref );
This->ref--;
/* Deallocate if this is the last reference to the object */
if( !(This->ref) )
{
- FIXME( dplay, "memory leak\n" );
+ FIXME("memory leak\n" );
/* Implement memory deallocation */
HeapFree( GetProcessHeap(), 0, This );
@@ -1767,7 +1767,7 @@
( LPDIRECTPLAY3A iface, DPID a, DPID b )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,0x%08lx): stub", This, a, b );
+ FIXME("(%p)->(0x%08lx,0x%08lx): stub", This, a, b );
return DP_OK;
}
@@ -1775,7 +1775,7 @@
( LPDIRECTPLAY3 iface, DPID a, DPID b )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,0x%08lx): stub", This, a, b );
+ FIXME("(%p)->(0x%08lx,0x%08lx): stub", This, a, b );
return DP_OK;
}
@@ -1784,7 +1784,7 @@
( LPDIRECTPLAY3A iface )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(): stub", This );
+ FIXME("(%p)->(): stub", This );
return DP_OK;
}
@@ -1792,7 +1792,7 @@
( LPDIRECTPLAY3 iface )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(): stub", This );
+ FIXME("(%p)->(): stub", This );
return DP_OK;
}
@@ -1800,7 +1800,7 @@
( LPDIRECTPLAY3A iface, LPDPID a, LPDPNAME b, LPVOID c, DWORD d, DWORD e )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(%p,%p,%p,0x%08lx,0x%08lx): stub", This, a, b, c, d, e );
+ FIXME("(%p)->(%p,%p,%p,0x%08lx,0x%08lx): stub", This, a, b, c, d, e );
return DP_OK;
}
@@ -1808,7 +1808,7 @@
( LPDIRECTPLAY3 iface, LPDPID a, LPDPNAME b, LPVOID c, DWORD d, DWORD e )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(%p,%p,%p,0x%08lx,0x%08lx): stub", This, a, b, c, d, e );
+ FIXME("(%p)->(%p,%p,%p,0x%08lx,0x%08lx): stub", This, a, b, c, d, e );
return DP_OK;
}
@@ -1816,7 +1816,7 @@
( LPDIRECTPLAY3A iface, LPDPID a, LPDPNAME b, HANDLE c, LPVOID d, DWORD e, DWORD f )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(%p,%p,%d,%p,0x%08lx,0x%08lx): stub", This, a, b, c, d, e, f );
+ FIXME("(%p)->(%p,%p,%d,%p,0x%08lx,0x%08lx): stub", This, a, b, c, d, e, f );
return DP_OK;
}
@@ -1824,7 +1824,7 @@
( LPDIRECTPLAY3 iface, LPDPID a, LPDPNAME b, HANDLE c, LPVOID d, DWORD e, DWORD f )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(%p,%p,%d,%p,0x%08lx,0x%08lx): stub", This, a, b, c, d, e, f );
+ FIXME("(%p)->(%p,%p,%d,%p,0x%08lx,0x%08lx): stub", This, a, b, c, d, e, f );
return DP_OK;
}
@@ -1832,7 +1832,7 @@
( LPDIRECTPLAY3A iface, DPID a, DPID b )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,0x%08lx): stub", This, a, b );
+ FIXME("(%p)->(0x%08lx,0x%08lx): stub", This, a, b );
return DP_OK;
}
@@ -1840,7 +1840,7 @@
( LPDIRECTPLAY3 iface, DPID a, DPID b )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,0x%08lx): stub", This, a, b );
+ FIXME("(%p)->(0x%08lx,0x%08lx): stub", This, a, b );
return DP_OK;
}
@@ -1848,7 +1848,7 @@
( LPDIRECTPLAY3A iface, DPID a )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx): stub", This, a );
+ FIXME("(%p)->(0x%08lx): stub", This, a );
return DP_OK;
}
@@ -1856,7 +1856,7 @@
( LPDIRECTPLAY3 iface, DPID a )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx): stub", This, a );
+ FIXME("(%p)->(0x%08lx): stub", This, a );
return DP_OK;
}
@@ -1864,7 +1864,7 @@
( LPDIRECTPLAY3A iface, DPID a )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx): stub", This, a );
+ FIXME("(%p)->(0x%08lx): stub", This, a );
return DP_OK;
}
@@ -1872,7 +1872,7 @@
( LPDIRECTPLAY3 iface, DPID a )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx): stub", This, a );
+ FIXME("(%p)->(0x%08lx): stub", This, a );
return DP_OK;
}
@@ -1881,7 +1881,7 @@
LPVOID d, DWORD e )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,%p,%p,%p,0x%08lx): stub", This, a, b, c, d, e );
+ FIXME("(%p)->(0x%08lx,%p,%p,%p,0x%08lx): stub", This, a, b, c, d, e );
return DP_OK;
}
@@ -1890,7 +1890,7 @@
LPVOID d, DWORD e )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,%p,%p,%p,0x%08lx): stub", This, a, b, c, d, e );
+ FIXME("(%p)->(0x%08lx,%p,%p,%p,0x%08lx): stub", This, a, b, c, d, e );
return DP_OK;
}
@@ -1898,7 +1898,7 @@
( LPDIRECTPLAY3A iface, LPGUID a, LPDPENUMPLAYERSCALLBACK2 b, LPVOID c, DWORD d )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(%p,%p,%p,0x%08lx): stub", This, a, b, c, d );
+ FIXME("(%p)->(%p,%p,%p,0x%08lx): stub", This, a, b, c, d );
return DP_OK;
}
@@ -1906,7 +1906,7 @@
( LPDIRECTPLAY3 iface, LPGUID a, LPDPENUMPLAYERSCALLBACK2 b, LPVOID c, DWORD d )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(%p,%p,%p,0x%08lx): stub", This, a, b, c, d );
+ FIXME("(%p)->(%p,%p,%p,0x%08lx): stub", This, a, b, c, d );
return DP_OK;
}
@@ -1914,7 +1914,7 @@
( LPDIRECTPLAY3A iface, LPGUID a, LPDPENUMPLAYERSCALLBACK2 b, LPVOID c, DWORD d )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(%p,%p,%p,0x%08lx): stub", This, a, b, c, d );
+ FIXME("(%p)->(%p,%p,%p,0x%08lx): stub", This, a, b, c, d );
return DP_OK;
}
@@ -1922,7 +1922,7 @@
( LPDIRECTPLAY3 iface, LPGUID a, LPDPENUMPLAYERSCALLBACK2 b, LPVOID c, DWORD d )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(%p,%p,%p,0x%08lx): stub", This, a, b, c, d );
+ FIXME("(%p)->(%p,%p,%p,0x%08lx): stub", This, a, b, c, d );
return DP_OK;
}
@@ -1931,7 +1931,7 @@
LPVOID d, DWORD e )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(%p,0x%08lx,%p,%p,0x%08lx): stub", This, a, b, c, d, e );
+ FIXME("(%p)->(%p,0x%08lx,%p,%p,0x%08lx): stub", This, a, b, c, d, e );
return DP_OK;
}
@@ -1940,7 +1940,7 @@
LPVOID d, DWORD e )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(%p,0x%08lx,%p,%p,0x%08lx): stub", This, a, b, c, d, e );
+ FIXME("(%p)->(%p,0x%08lx,%p,%p,0x%08lx): stub", This, a, b, c, d, e );
return DP_OK;
}
@@ -1948,7 +1948,7 @@
( LPDIRECTPLAY3A iface, LPDPCAPS a, DWORD b )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(%p,0x%08lx): stub", This, a, b );
+ FIXME("(%p)->(%p,0x%08lx): stub", This, a, b );
return DP_OK;
}
@@ -1956,7 +1956,7 @@
( LPDIRECTPLAY3 iface, LPDPCAPS a, DWORD b )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(%p,0x%08lx): stub", This, a, b );
+ FIXME("(%p)->(%p,0x%08lx): stub", This, a, b );
return DP_OK;
}
@@ -1964,7 +1964,7 @@
( LPDIRECTPLAY3 iface, DPID a, LPVOID b, LPDWORD c, DWORD d )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,%p,%p,0x%08lx): stub", This, a, b, c, d );
+ FIXME("(%p)->(0x%08lx,%p,%p,0x%08lx): stub", This, a, b, c, d );
return DP_OK;
}
@@ -1972,7 +1972,7 @@
( LPDIRECTPLAY3 iface, DPID a, LPVOID b, LPDWORD c, DWORD d )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,%p,%p,0x%08lx): stub", This, a, b, c, d );
+ FIXME("(%p)->(0x%08lx,%p,%p,0x%08lx): stub", This, a, b, c, d );
return DP_OK;
}
@@ -1980,7 +1980,7 @@
( LPDIRECTPLAY3A iface, DPID a, LPVOID b, LPDWORD c )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,%p,%p): stub", This, a, b, c );
+ FIXME("(%p)->(0x%08lx,%p,%p): stub", This, a, b, c );
return DP_OK;
}
@@ -1988,7 +1988,7 @@
( LPDIRECTPLAY3 iface, DPID a, LPVOID b, LPDWORD c )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,%p,%p): stub", This, a, b, c );
+ FIXME("(%p)->(0x%08lx,%p,%p): stub", This, a, b, c );
return DP_OK;
}
@@ -1996,7 +1996,7 @@
( LPDIRECTPLAY3A iface, DPID a, LPDWORD b )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,%p): stub", This, a, b );
+ FIXME("(%p)->(0x%08lx,%p): stub", This, a, b );
return DP_OK;
}
@@ -2004,7 +2004,7 @@
( LPDIRECTPLAY3 iface, DPID a, LPDWORD b )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,%p): stub", This, a, b );
+ FIXME("(%p)->(0x%08lx,%p): stub", This, a, b );
return DP_OK;
}
@@ -2012,7 +2012,7 @@
( LPDIRECTPLAY3A iface, DPID a, LPVOID b, LPDWORD c )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,%p,%p): stub", This, a, b, c );
+ FIXME("(%p)->(0x%08lx,%p,%p): stub", This, a, b, c );
return DP_OK;
}
@@ -2020,7 +2020,7 @@
( LPDIRECTPLAY3 iface, DPID a, LPVOID b, LPDWORD c )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,%p,%p): stub", This, a, b, c );
+ FIXME("(%p)->(0x%08lx,%p,%p): stub", This, a, b, c );
return DP_OK;
}
@@ -2028,7 +2028,7 @@
( LPDIRECTPLAY3A iface, DPID a, LPDPCAPS b, DWORD c )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,%p,0x%08lx): stub", This, a, b, c );
+ FIXME("(%p)->(0x%08lx,%p,0x%08lx): stub", This, a, b, c );
return DP_OK;
}
@@ -2036,7 +2036,7 @@
( LPDIRECTPLAY3 iface, DPID a, LPDPCAPS b, DWORD c )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,%p,0x%08lx): stub", This, a, b, c );
+ FIXME("(%p)->(0x%08lx,%p,0x%08lx): stub", This, a, b, c );
return DP_OK;
}
@@ -2044,7 +2044,7 @@
( LPDIRECTPLAY3A iface, DPID a, LPVOID b, LPDWORD c, DWORD d )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,%p,%p,0x%08lx): stub", This, a, b, c, d );
+ FIXME("(%p)->(0x%08lx,%p,%p,0x%08lx): stub", This, a, b, c, d );
return DP_OK;
}
@@ -2052,7 +2052,7 @@
( LPDIRECTPLAY3 iface, DPID a, LPVOID b, LPDWORD c, DWORD d )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,%p,%p,0x%08lx): stub", This, a, b, c, d );
+ FIXME("(%p)->(0x%08lx,%p,%p,0x%08lx): stub", This, a, b, c, d );
return DP_OK;
}
@@ -2060,7 +2060,7 @@
( LPDIRECTPLAY3 iface, DPID a, LPVOID b, LPDWORD c )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,%p,%p): stub", This, a, b, c );
+ FIXME("(%p)->(0x%08lx,%p,%p): stub", This, a, b, c );
return DP_OK;
}
@@ -2068,7 +2068,7 @@
( LPDIRECTPLAY3 iface, DPID a, LPVOID b, LPDWORD c )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,%p,%p): stub", This, a, b, c );
+ FIXME("(%p)->(0x%08lx,%p,%p): stub", This, a, b, c );
return DP_OK;
}
@@ -2076,7 +2076,7 @@
( LPDIRECTPLAY3A iface, LPVOID a, LPDWORD b )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(%p,%p): stub", This, a, b );
+ FIXME("(%p)->(%p,%p): stub", This, a, b );
return DP_OK;
}
@@ -2084,7 +2084,7 @@
( LPDIRECTPLAY3 iface, LPVOID a, LPDWORD b )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(%p,%p): stub", This, a, b );
+ FIXME("(%p)->(%p,%p): stub", This, a, b );
return DP_OK;
}
@@ -2092,7 +2092,7 @@
( LPDIRECTPLAY3A iface, LPGUID a )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(%p): stub", This, a );
+ FIXME("(%p)->(%p): stub", This, a );
return DP_OK;
}
@@ -2100,7 +2100,7 @@
( LPDIRECTPLAY3 iface, LPGUID a )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(%p): stub", This, a );
+ FIXME("(%p)->(%p): stub", This, a );
return DP_OK;
}
@@ -2109,7 +2109,7 @@
( LPDIRECTPLAY3A iface, LPDPSESSIONDESC2 a, DWORD b )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(%p,0x%08lx): stub", This, a, b );
+ FIXME("(%p)->(%p,0x%08lx): stub", This, a, b );
return DP_OK;
}
@@ -2117,7 +2117,7 @@
( LPDIRECTPLAY3 iface, LPDPSESSIONDESC2 a, DWORD b )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(%p,0x%08lx): stub", This, a, b );
+ FIXME("(%p)->(%p,0x%08lx): stub", This, a, b );
return DP_OK;
}
@@ -2125,7 +2125,7 @@
( LPDIRECTPLAY3A iface, LPDPID a, LPDPID b, DWORD c, LPVOID d, LPDWORD e )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(%p,%p,0x%08lx,%p,%p): stub", This, a, b, c, d, e );
+ FIXME("(%p)->(%p,%p,0x%08lx,%p,%p): stub", This, a, b, c, d, e );
return DP_OK;
}
@@ -2133,7 +2133,7 @@
( LPDIRECTPLAY3 iface, LPDPID a, LPDPID b, DWORD c, LPVOID d, LPDWORD e )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(%p,%p,0x%08lx,%p,%p): stub", This, a, b, c, d, e );
+ FIXME("(%p)->(%p,%p,0x%08lx,%p,%p): stub", This, a, b, c, d, e );
return DP_OK;
}
@@ -2141,7 +2141,7 @@
( LPDIRECTPLAY3A iface, DPID a, DPID b, DWORD c, LPVOID d, DWORD e )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,0x%08lx,0x%08lx,%p,0x%08lx): stub", This, a, b, c, d, e );
+ FIXME("(%p)->(0x%08lx,0x%08lx,0x%08lx,%p,0x%08lx): stub", This, a, b, c, d, e );
return DP_OK;
}
@@ -2149,7 +2149,7 @@
( LPDIRECTPLAY3 iface, DPID a, DPID b, DWORD c, LPVOID d, DWORD e )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,0x%08lx,0x%08lx,%p,0x%08lx): stub", This, a, b, c, d, e );
+ FIXME("(%p)->(0x%08lx,0x%08lx,0x%08lx,%p,0x%08lx): stub", This, a, b, c, d, e );
return DP_OK;
}
@@ -2157,7 +2157,7 @@
( LPDIRECTPLAY3A iface, DPID a, LPVOID b, DWORD c, DWORD d )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,%p,0x%08lx,0x%08lx): stub", This, a, b, c, d );
+ FIXME("(%p)->(0x%08lx,%p,0x%08lx,0x%08lx): stub", This, a, b, c, d );
return DP_OK;
}
@@ -2165,7 +2165,7 @@
( LPDIRECTPLAY3 iface, DPID a, LPVOID b, DWORD c, DWORD d )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,%p,0x%08lx,0x%08lx): stub", This, a, b, c, d );
+ FIXME("(%p)->(0x%08lx,%p,0x%08lx,0x%08lx): stub", This, a, b, c, d );
return DP_OK;
}
@@ -2173,7 +2173,7 @@
( LPDIRECTPLAY3A iface, DPID a, LPDPNAME b, DWORD c )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,%p,0x%08lx): stub", This, a, b, c );
+ FIXME("(%p)->(0x%08lx,%p,0x%08lx): stub", This, a, b, c );
return DP_OK;
}
@@ -2181,7 +2181,7 @@
( LPDIRECTPLAY3 iface, DPID a, LPDPNAME b, DWORD c )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,%p,0x%08lx): stub", This, a, b, c );
+ FIXME("(%p)->(0x%08lx,%p,0x%08lx): stub", This, a, b, c );
return DP_OK;
}
@@ -2189,7 +2189,7 @@
( LPDIRECTPLAY3A iface, DPID a, LPVOID b, DWORD c, DWORD d )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,%p,0x%08lx,0x%08lx): stub", This, a, b, c, d );
+ FIXME("(%p)->(0x%08lx,%p,0x%08lx,0x%08lx): stub", This, a, b, c, d );
return DP_OK;
}
@@ -2197,7 +2197,7 @@
( LPDIRECTPLAY3 iface, DPID a, LPVOID b, DWORD c, DWORD d )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,%p,0x%08lx,0x%08lx): stub", This, a, b, c, d );
+ FIXME("(%p)->(0x%08lx,%p,0x%08lx,0x%08lx): stub", This, a, b, c, d );
return DP_OK;
}
@@ -2205,7 +2205,7 @@
( LPDIRECTPLAY3A iface, DPID a, LPDPNAME b, DWORD c )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,%p,0x%08lx): stub", This, a, b, c );
+ FIXME("(%p)->(0x%08lx,%p,0x%08lx): stub", This, a, b, c );
return DP_OK;
}
@@ -2213,7 +2213,7 @@
( LPDIRECTPLAY3 iface, DPID a, LPDPNAME b, DWORD c )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,%p,0x%08lx): stub", This, a, b, c );
+ FIXME("(%p)->(0x%08lx,%p,0x%08lx): stub", This, a, b, c );
return DP_OK;
}
@@ -2221,7 +2221,7 @@
( LPDIRECTPLAY3A iface, LPDPSESSIONDESC2 a, DWORD b )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(%p,0x%08lx): stub", This, a, b );
+ FIXME("(%p)->(%p,0x%08lx): stub", This, a, b );
return DP_OK;
}
@@ -2229,7 +2229,7 @@
( LPDIRECTPLAY3 iface, LPDPSESSIONDESC2 a, DWORD b )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(%p,0x%08lx): stub", This, a, b );
+ FIXME("(%p)->(%p,0x%08lx): stub", This, a, b );
return DP_OK;
}
@@ -2237,7 +2237,7 @@
( LPDIRECTPLAY3A iface, DPID a, DPID b )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,0x%08lx): stub", This, a, b );
+ FIXME("(%p)->(0x%08lx,0x%08lx): stub", This, a, b );
return DP_OK;
}
@@ -2245,7 +2245,7 @@
( LPDIRECTPLAY3 iface, DPID a, DPID b )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,0x%08lx): stub", This, a, b );
+ FIXME("(%p)->(0x%08lx,0x%08lx): stub", This, a, b );
return DP_OK;
}
@@ -2253,7 +2253,7 @@
( LPDIRECTPLAY3A iface, DPID a, LPDPID b, LPDPNAME c, LPVOID d, DWORD e, DWORD f )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,%p,%p,%p,0x%08lx,0x%08lx): stub", This, a, b, c, d, e, f );
+ FIXME("(%p)->(0x%08lx,%p,%p,%p,0x%08lx,0x%08lx): stub", This, a, b, c, d, e, f );
return DP_OK;
}
@@ -2261,7 +2261,7 @@
( LPDIRECTPLAY3 iface, DPID a, LPDPID b, LPDPNAME c, LPVOID d, DWORD e, DWORD f )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,%p,%p,%p,0x%08lx,0x%08lx): stub", This, a, b, c, d, e, f );
+ FIXME("(%p)->(0x%08lx,%p,%p,%p,0x%08lx,0x%08lx): stub", This, a, b, c, d, e, f );
return DP_OK;
}
@@ -2269,7 +2269,7 @@
( LPDIRECTPLAY3A iface, DPID a, DPID b )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,0x%08lx): stub", This, a, b );
+ FIXME("(%p)->(0x%08lx,0x%08lx): stub", This, a, b );
return DP_OK;
}
@@ -2277,7 +2277,7 @@
( LPDIRECTPLAY3 iface, DPID a, DPID b )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,0x%08lx): stub", This, a, b );
+ FIXME("(%p)->(0x%08lx,0x%08lx): stub", This, a, b );
return DP_OK;
}
@@ -2285,7 +2285,7 @@
( LPDIRECTPLAY3A iface, LPCGUID a, LPDPENUMCONNECTIONSCALLBACK b, LPVOID c, DWORD d )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(%p,%p,%p,0x%08lx): stub", This, a, b, c, d );
+ FIXME("(%p)->(%p,%p,%p,0x%08lx): stub", This, a, b, c, d );
return DP_OK;
}
@@ -2293,7 +2293,7 @@
( LPDIRECTPLAY3 iface, LPCGUID a, LPDPENUMCONNECTIONSCALLBACK b, LPVOID c, DWORD d )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(%p,%p,%p,0x%08lx): stub", This, a, b, c, d );
+ FIXME("(%p)->(%p,%p,%p,0x%08lx): stub", This, a, b, c, d );
return DP_OK;
}
@@ -2301,7 +2301,7 @@
( LPDIRECTPLAY3A iface, DPID a, LPGUID b, LPDPENUMPLAYERSCALLBACK2 c, LPVOID d, DWORD e )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,%p,%p,%p,0x%08lx): stub", This, a, b, c, d, e );
+ FIXME("(%p)->(0x%08lx,%p,%p,%p,0x%08lx): stub", This, a, b, c, d, e );
return DP_OK;
}
@@ -2309,7 +2309,7 @@
( LPDIRECTPLAY3 iface, DPID a, LPGUID b, LPDPENUMPLAYERSCALLBACK2 c, LPVOID d, DWORD e )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,%p,%p,%p,0x%08lx): stub", This, a, b, c, d, e );
+ FIXME("(%p)->(0x%08lx,%p,%p,%p,0x%08lx): stub", This, a, b, c, d, e );
return DP_OK;
}
@@ -2317,7 +2317,7 @@
( LPDIRECTPLAY3A iface, DWORD a, DPID b, LPVOID c, LPDWORD d )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,0x%08lx,%p,%p): stub", This, a, b, c, d );
+ FIXME("(%p)->(0x%08lx,0x%08lx,%p,%p): stub", This, a, b, c, d );
return DP_OK;
}
@@ -2325,7 +2325,7 @@
( LPDIRECTPLAY3 iface, DWORD a, DPID b, LPVOID c, LPDWORD d )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,0x%08lx,%p,%p): stub", This, a, b, c, d );
+ FIXME("(%p)->(0x%08lx,0x%08lx,%p,%p): stub", This, a, b, c, d );
return DP_OK;
}
@@ -2333,7 +2333,7 @@
( LPDIRECTPLAY3A iface, LPVOID a, DWORD b )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(%p,0x%08lx): stub", This, a, b );
+ FIXME("(%p)->(%p,0x%08lx): stub", This, a, b );
return DP_OK;
}
@@ -2341,7 +2341,7 @@
( LPDIRECTPLAY3 iface, LPVOID a, DWORD b )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(%p,0x%08lx): stub", This, a, b );
+ FIXME("(%p)->(%p,0x%08lx): stub", This, a, b );
return DP_OK;
}
@@ -2349,7 +2349,7 @@
( LPDIRECTPLAY3A iface, LPCDPSESSIONDESC2 a, DWORD b, LPCDPSECURITYDESC c, LPCDPCREDENTIALS d )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(%p,0x%08lx,%p,%p): stub", This, a, b, c, d );
+ FIXME("(%p)->(%p,0x%08lx,%p,%p): stub", This, a, b, c, d );
return DP_OK;
}
@@ -2357,7 +2357,7 @@
( LPDIRECTPLAY3 iface, LPCDPSESSIONDESC2 a, DWORD b, LPCDPSECURITYDESC c, LPCDPCREDENTIALS d )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(%p,0x%08lx,%p,%p): stub", This, a, b, c, d );
+ FIXME("(%p)->(%p,0x%08lx,%p,%p): stub", This, a, b, c, d );
return DP_OK;
}
@@ -2365,7 +2365,7 @@
( LPDIRECTPLAY3A iface, DPID a, DPID b, DWORD c, LPDPCHAT d )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,0x%08lx,0x%08lx,%p): stub", This, a, b, c, d );
+ FIXME("(%p)->(0x%08lx,0x%08lx,0x%08lx,%p): stub", This, a, b, c, d );
return DP_OK;
}
@@ -2373,7 +2373,7 @@
( LPDIRECTPLAY3 iface, DPID a, DPID b, DWORD c, LPDPCHAT d )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,0x%08lx,0x%08lx,%p): stub", This, a, b, c, d );
+ FIXME("(%p)->(0x%08lx,0x%08lx,0x%08lx,%p): stub", This, a, b, c, d );
return DP_OK;
}
@@ -2381,7 +2381,7 @@
( LPDIRECTPLAY3A iface, DWORD a, DPID b, LPDPLCONNECTION c )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,0x%08lx,%p): stub", This, a, b, c );
+ FIXME("(%p)->(0x%08lx,0x%08lx,%p): stub", This, a, b, c );
return DP_OK;
}
@@ -2389,7 +2389,7 @@
( LPDIRECTPLAY3 iface, DWORD a, DPID b, LPDPLCONNECTION c )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,0x%08lx,%p): stub", This, a, b, c );
+ FIXME("(%p)->(0x%08lx,0x%08lx,%p): stub", This, a, b, c );
return DP_OK;
}
@@ -2397,7 +2397,7 @@
( LPDIRECTPLAY3A iface, DWORD a, DPID b )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,0x%08lx): stub", This, a, b );
+ FIXME("(%p)->(0x%08lx,0x%08lx): stub", This, a, b );
return DP_OK;
}
@@ -2405,7 +2405,7 @@
( LPDIRECTPLAY3 iface, DWORD a, DPID b )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,0x%08lx): stub", This, a, b );
+ FIXME("(%p)->(0x%08lx,0x%08lx): stub", This, a, b );
return DP_OK;
}
@@ -2413,7 +2413,7 @@
( LPDIRECTPLAY3A iface, DPID a, LPDWORD b )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,%p): stub", This, a, b );
+ FIXME("(%p)->(0x%08lx,%p): stub", This, a, b );
return DP_OK;
}
@@ -2421,7 +2421,7 @@
( LPDIRECTPLAY3 iface, DPID a, LPDWORD b )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,%p): stub", This, a, b );
+ FIXME("(%p)->(0x%08lx,%p): stub", This, a, b );
return DP_OK;
}
@@ -2429,7 +2429,7 @@
( LPDIRECTPLAY3A iface, DPID a, LPDPID b )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,%p): stub", This, a, b );
+ FIXME("(%p)->(0x%08lx,%p): stub", This, a, b );
return DP_OK;
}
@@ -2437,7 +2437,7 @@
( LPDIRECTPLAY3 iface, DPID a, LPDPID b )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,%p): stub", This, a, b );
+ FIXME("(%p)->(0x%08lx,%p): stub", This, a, b );
return DP_OK;
}
@@ -2445,7 +2445,7 @@
( LPDIRECTPLAY3A iface, DPID a, DWORD b, LPVOID c, LPDWORD d )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,0x%08lx,%p,%p): stub", This, a, b, c, d );
+ FIXME("(%p)->(0x%08lx,0x%08lx,%p,%p): stub", This, a, b, c, d );
return DP_OK;
}
@@ -2453,7 +2453,7 @@
( LPDIRECTPLAY3 iface, DPID a, DWORD b, LPVOID c, LPDWORD d )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,0x%08lx,%p,%p): stub", This, a, b, c, d );
+ FIXME("(%p)->(0x%08lx,0x%08lx,%p,%p): stub", This, a, b, c, d );
return DP_OK;
}
@@ -2461,7 +2461,7 @@
( LPDIRECTPLAY3A iface, DPID a, LPDWORD b )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,%p): stub", This, a, b );
+ FIXME("(%p)->(0x%08lx,%p): stub", This, a, b );
return DP_OK;
}
@@ -2469,7 +2469,7 @@
( LPDIRECTPLAY3 iface, DPID a, LPDWORD b )
{
ICOM_THIS(IDirectPlay3Impl,iface);
- FIXME( dplay,"(%p)->(0x%08lx,%p): stub", This, a, b );
+ FIXME("(%p)->(0x%08lx,%p): stub", This, a, b );
return DP_OK;
}
diff --git a/multimedia/dsound.c b/multimedia/dsound.c
index 2cd37c5..46d0df0 100644
--- a/multimedia/dsound.c
+++ b/multimedia/dsound.c
@@ -67,7 +67,7 @@
#include "multimedia.h"
#include "wine/obj_base.h"
#include "thread.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(dsound)
@@ -200,7 +200,7 @@
LPDSENUMCALLBACKA enumcb,
LPVOID context)
{
- TRACE(dsound, "enumcb = %p, context = %p\n", enumcb, context);
+ TRACE("enumcb = %p, context = %p\n", enumcb, context);
#ifdef HAVE_OSS
if (enumcb != NULL)
@@ -249,7 +249,7 @@
char xbuf[50];
WINE_StringFromCLSID(riid,xbuf);
- TRACE(dsound,"(%p,%s,%p)\n",This,xbuf,ppobj);
+ TRACE("(%p,%s,%p)\n",This,xbuf,ppobj);
return E_FAIL;
}
@@ -277,7 +277,7 @@
LPDIRECTSOUND3DBUFFER iface,
LPDS3DBUFFER lpDs3dBuffer)
{
- FIXME(dsound,"stub\n");
+ FIXME("stub\n");
return DS_OK;
}
@@ -286,7 +286,7 @@
LPDWORD lpdwInsideConeAngle,
LPDWORD lpdwOutsideConeAngle)
{
- FIXME(dsound,"stub\n");
+ FIXME("stub\n");
return DS_OK;
}
@@ -294,7 +294,7 @@
LPDIRECTSOUND3DBUFFER iface,
LPD3DVECTOR lpvConeOrientation)
{
- FIXME(dsound,"stub\n");
+ FIXME("stub\n");
return DS_OK;
}
@@ -302,7 +302,7 @@
LPDIRECTSOUND3DBUFFER iface,
LPLONG lplConeOutsideVolume)
{
- FIXME(dsound,"stub\n");
+ FIXME("stub\n");
return DS_OK;
}
@@ -310,7 +310,7 @@
LPDIRECTSOUND3DBUFFER iface,
LPD3DVALUE lpfMaxDistance)
{
- FIXME(dsound,"stub\n");
+ FIXME("stub\n");
return DS_OK;
}
@@ -318,7 +318,7 @@
LPDIRECTSOUND3DBUFFER iface,
LPD3DVALUE lpfMinDistance)
{
- FIXME(dsound,"stub\n");
+ FIXME("stub\n");
return DS_OK;
}
@@ -326,7 +326,7 @@
LPDIRECTSOUND3DBUFFER iface,
LPDWORD lpdwMode)
{
- FIXME(dsound,"stub\n");
+ FIXME("stub\n");
return DS_OK;
}
@@ -334,7 +334,7 @@
LPDIRECTSOUND3DBUFFER iface,
LPD3DVECTOR lpvPosition)
{
- FIXME(dsound,"stub\n");
+ FIXME("stub\n");
return DS_OK;
}
@@ -342,7 +342,7 @@
LPDIRECTSOUND3DBUFFER iface,
LPD3DVECTOR lpvVelocity)
{
- FIXME(dsound,"stub\n");
+ FIXME("stub\n");
return DS_OK;
}
@@ -351,7 +351,7 @@
LPCDS3DBUFFER lpcDs3dBuffer,
DWORD dwApply)
{
- FIXME(dsound,"stub\n");
+ FIXME("stub\n");
return DS_OK;
}
@@ -361,7 +361,7 @@
DWORD dwOutsideConeAngle,
DWORD dwApply)
{
- FIXME(dsound,"stub\n");
+ FIXME("stub\n");
return DS_OK;
}
@@ -370,7 +370,7 @@
D3DVALUE x, D3DVALUE y, D3DVALUE z,
DWORD dwApply)
{
- FIXME(dsound,"stub\n");
+ FIXME("stub\n");
return DS_OK;
}
@@ -379,7 +379,7 @@
LONG lConeOutsideVolume,
DWORD dwApply)
{
- FIXME(dsound,"stub\n");
+ FIXME("stub\n");
return DS_OK;
}
@@ -388,7 +388,7 @@
D3DVALUE fMaxDistance,
DWORD dwApply)
{
- FIXME(dsound,"stub\n");
+ FIXME("stub\n");
return DS_OK;
}
@@ -397,7 +397,7 @@
D3DVALUE fMinDistance,
DWORD dwApply)
{
- FIXME(dsound,"stub\n");
+ FIXME("stub\n");
return DS_OK;
}
@@ -407,7 +407,7 @@
DWORD dwApply)
{
ICOM_THIS(IDirectSound3DBufferImpl,iface);
- TRACE(dsound, "mode = %lx\n", dwMode);
+ TRACE("mode = %lx\n", dwMode);
This->ds3db.dwMode = dwMode;
return DS_OK;
}
@@ -417,7 +417,7 @@
D3DVALUE x, D3DVALUE y, D3DVALUE z,
DWORD dwApply)
{
- FIXME(dsound,"stub\n");
+ FIXME("stub\n");
return DS_OK;
}
@@ -426,7 +426,7 @@
D3DVALUE x, D3DVALUE y, D3DVALUE z,
DWORD dwApply)
{
- FIXME(dsound,"stub\n");
+ FIXME("stub\n");
return DS_OK;
}
@@ -545,7 +545,7 @@
char xbuf[50];
WINE_StringFromCLSID(riid,xbuf);
- TRACE(dsound,"(%p,%s,%p)\n",This,xbuf,ppobj);
+ TRACE("(%p,%s,%p)\n",This,xbuf,ppobj);
return E_FAIL;
}
@@ -568,7 +568,7 @@
LPDIRECTSOUND3DLISTENER iface,
LPDS3DLISTENER lpDS3DL)
{
- FIXME(dsound,"stub\n");
+ FIXME("stub\n");
return DS_OK;
}
@@ -576,7 +576,7 @@
LPDIRECTSOUND3DLISTENER iface,
LPD3DVALUE lpfDistanceFactor)
{
- FIXME(dsound,"stub\n");
+ FIXME("stub\n");
return DS_OK;
}
@@ -584,7 +584,7 @@
LPDIRECTSOUND3DLISTENER iface,
LPD3DVALUE lpfDopplerFactor)
{
- FIXME(dsound,"stub\n");
+ FIXME("stub\n");
return DS_OK;
}
@@ -593,7 +593,7 @@
LPD3DVECTOR lpvOrientFront,
LPD3DVECTOR lpvOrientTop)
{
- FIXME(dsound,"stub\n");
+ FIXME("stub\n");
return DS_OK;
}
@@ -601,7 +601,7 @@
LPDIRECTSOUND3DLISTENER iface,
LPD3DVECTOR lpvPosition)
{
- FIXME(dsound,"stub\n");
+ FIXME("stub\n");
return DS_OK;
}
@@ -609,7 +609,7 @@
LPDIRECTSOUND3DLISTENER iface,
LPD3DVALUE lpfRolloffFactor)
{
- FIXME(dsound,"stub\n");
+ FIXME("stub\n");
return DS_OK;
}
@@ -617,7 +617,7 @@
LPDIRECTSOUND3DLISTENER iface,
LPD3DVECTOR lpvVelocity)
{
- FIXME(dsound,"stub\n");
+ FIXME("stub\n");
return DS_OK;
}
@@ -626,7 +626,7 @@
LPCDS3DLISTENER lpcDS3DL,
DWORD dwApply)
{
- FIXME(dsound,"stub\n");
+ FIXME("stub\n");
return DS_OK;
}
@@ -635,7 +635,7 @@
D3DVALUE fDistanceFactor,
DWORD dwApply)
{
- FIXME(dsound,"stub\n");
+ FIXME("stub\n");
return DS_OK;
}
@@ -644,7 +644,7 @@
D3DVALUE fDopplerFactor,
DWORD dwApply)
{
- FIXME(dsound,"stub\n");
+ FIXME("stub\n");
return DS_OK;
}
@@ -654,7 +654,7 @@
D3DVALUE xTop, D3DVALUE yTop, D3DVALUE zTop,
DWORD dwApply)
{
- FIXME(dsound,"stub\n");
+ FIXME("stub\n");
return DS_OK;
}
@@ -663,7 +663,7 @@
D3DVALUE x, D3DVALUE y, D3DVALUE z,
DWORD dwApply)
{
- FIXME(dsound,"stub\n");
+ FIXME("stub\n");
return DS_OK;
}
@@ -672,7 +672,7 @@
D3DVALUE fRolloffFactor,
DWORD dwApply)
{
- FIXME(dsound,"stub\n");
+ FIXME("stub\n");
return DS_OK;
}
@@ -681,7 +681,7 @@
D3DVALUE x, D3DVALUE y, D3DVALUE z,
DWORD dwApply)
{
- FIXME(dsound,"stub\n");
+ FIXME("stub\n");
return DS_OK;
}
@@ -689,7 +689,7 @@
LPDIRECTSOUND3DLISTENER iface)
{
- FIXME(dsound,"stub\n");
+ FIXME("stub\n");
return DS_OK;
}
@@ -728,7 +728,7 @@
char xbuf[50];
WINE_StringFromCLSID(riid,xbuf);
- TRACE(dsound,"(%p,%s,%p)\n",This,xbuf,ppobj);
+ TRACE("(%p,%s,%p)\n",This,xbuf,ppobj);
return E_FAIL;
}
@@ -755,9 +755,9 @@
int i;
if (TRACE_ON(dsound)) {
- TRACE(dsound,"(%p,0x%08lx,%p)\n",This,howmuch,notify);
+ TRACE("(%p,0x%08lx,%p)\n",This,howmuch,notify);
for (i=0;i<howmuch;i++)
- TRACE(dsound,"notify at %ld to 0x%08lx\n",
+ TRACE("notify at %ld to 0x%08lx\n",
notify[i].dwOffset,(DWORD)notify[i].hEventNotify);
}
This->dsb->notifies = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,This->dsb->notifies,(This->dsb->nrofnotifies+howmuch)*sizeof(DSBPOSITIONNOTIFY));
@@ -799,7 +799,7 @@
(wfex->nSamplesPerSec < 1) ||
(wfex->nBlockAlign < 1) || (wfex->nChannels > 4) ||
((wfex->wBitsPerSample != 8) && (wfex->wBitsPerSample != 16))) {
- TRACE(dsound, "failed pedantic check!\n");
+ TRACE("failed pedantic check!\n");
return DSERR_INVALIDPARAM;
}
@@ -822,7 +822,7 @@
memcpy(&(primarybuf->wfx), wfex, sizeof(primarybuf->wfx));
- TRACE(dsound,"(formattag=0x%04x,chans=%d,samplerate=%ld"
+ TRACE("(formattag=0x%04x,chans=%d,samplerate=%ld"
"bytespersec=%ld,blockalign=%d,bitspersamp=%d,cbSize=%d)\n",
wfex->wFormatTag, wfex->nChannels, wfex->nSamplesPerSec,
wfex->nAvgBytesPerSec, wfex->nBlockAlign,
@@ -845,7 +845,7 @@
ICOM_THIS(IDirectSoundBufferImpl,iface);
double temp;
- TRACE(dsound,"(%p,%ld)\n",This,vol);
+ TRACE("(%p,%ld)\n",This,vol);
/* I'm not sure if we need this for primary buffer */
if (!(This->dsbd.dwFlags & DSBCAPS_CTRLVOLUME))
@@ -857,7 +857,7 @@
/* This needs to adjust the soundcard volume when */
/* called for the primary buffer */
if (This->dsbd.dwFlags & DSBCAPS_PRIMARYBUFFER) {
- FIXME(dsound, "Volume control of primary unimplemented.\n");
+ FIXME("Volume control of primary unimplemented.\n");
This->volume = vol;
return DS_OK;
}
@@ -875,7 +875,7 @@
LeaveCriticalSection(&(This->lock));
/* **** */
- TRACE(dsound, "left = %lx, right = %lx\n", This->lVolAdjust, This->rVolAdjust);
+ TRACE("left = %lx, right = %lx\n", This->lVolAdjust, This->rVolAdjust);
return DS_OK;
}
@@ -884,7 +884,7 @@
LPDIRECTSOUNDBUFFER iface,LPLONG vol
) {
ICOM_THIS(IDirectSoundBufferImpl,iface);
- TRACE(dsound,"(%p,%p)\n",This,vol);
+ TRACE("(%p,%p)\n",This,vol);
if (vol == NULL)
return DSERR_INVALIDPARAM;
@@ -897,7 +897,7 @@
LPDIRECTSOUNDBUFFER iface,DWORD freq
) {
ICOM_THIS(IDirectSoundBufferImpl,iface);
- TRACE(dsound,"(%p,%ld)\n",This,freq);
+ TRACE("(%p,%ld)\n",This,freq);
/* You cannot set the frequency of the primary buffer */
if (!(This->dsbd.dwFlags & DSBCAPS_CTRLFREQUENCY) ||
@@ -924,7 +924,7 @@
LPDIRECTSOUNDBUFFER iface,DWORD reserved1,DWORD reserved2,DWORD flags
) {
ICOM_THIS(IDirectSoundBufferImpl,iface);
- TRACE(dsound,"(%p,%08lx,%08lx,%08lx)\n",
+ TRACE("(%p,%08lx,%08lx,%08lx)\n",
This,reserved1,reserved2,flags
);
This->playflags = flags;
@@ -935,7 +935,7 @@
static HRESULT WINAPI IDirectSoundBufferImpl_Stop(LPDIRECTSOUNDBUFFER iface)
{
ICOM_THIS(IDirectSoundBufferImpl,iface);
- TRACE(dsound,"(%p)\n",This);
+ TRACE("(%p)\n",This);
/* **** */
EnterCriticalSection(&(This->lock));
@@ -999,10 +999,10 @@
LPDIRECTSOUNDBUFFER iface,LPDWORD playpos,LPDWORD writepos
) {
ICOM_THIS(IDirectSoundBufferImpl,iface);
- TRACE(dsound,"(%p,%p,%p)\n",This,playpos,writepos);
+ TRACE("(%p,%p,%p)\n",This,playpos,writepos);
if (playpos) *playpos = This->playpos;
if (writepos) *writepos = This->writepos;
- TRACE(dsound, "playpos = %ld, writepos = %ld\n", *playpos, *writepos);
+ TRACE("playpos = %ld, writepos = %ld\n", *playpos, *writepos);
return DS_OK;
}
@@ -1010,7 +1010,7 @@
LPDIRECTSOUNDBUFFER iface,LPDWORD status
) {
ICOM_THIS(IDirectSoundBufferImpl,iface);
- TRACE(dsound,"(%p,%p)\n",This,status);
+ TRACE("(%p,%p)\n",This,status);
if (status == NULL)
return DSERR_INVALIDPARAM;
@@ -1029,7 +1029,7 @@
LPDIRECTSOUNDBUFFER iface,LPWAVEFORMATEX lpwf,DWORD wfsize,LPDWORD wfwritten
) {
ICOM_THIS(IDirectSoundBufferImpl,iface);
- TRACE(dsound,"(%p,%p,%ld,%p)\n",This,lpwf,wfsize,wfwritten);
+ TRACE("(%p,%p,%ld,%p)\n",This,lpwf,wfsize,wfwritten);
if (wfsize>sizeof(This->wfx))
wfsize = sizeof(This->wfx);
@@ -1051,7 +1051,7 @@
) {
ICOM_THIS(IDirectSoundBufferImpl,iface);
- TRACE(dsound,"(%p,%ld,%ld,%p,%p,%p,%p,0x%08lx)\n",
+ TRACE("(%p,%ld,%ld,%p,%p,%p,%p,0x%08lx)\n",
This,
writecursor,
writebytes,
@@ -1077,7 +1077,7 @@
*(LPBYTE*)lplpaudioptr2 = NULL;
if (audiobytes2)
*audiobytes2 = 0;
- TRACE(dsound,"->%ld.0\n",writebytes);
+ TRACE("->%ld.0\n",writebytes);
} else {
*(LPBYTE*)lplpaudioptr1 = This->buffer+writecursor;
*audiobytes1 = This->buflen-writecursor;
@@ -1085,7 +1085,7 @@
*(LPBYTE*)lplpaudioptr2 = This->buffer;
if (audiobytes2)
*audiobytes2 = writebytes-(This->buflen-writecursor);
- TRACE(dsound,"->%ld.%ld\n",*audiobytes1,audiobytes2?*audiobytes2:0);
+ TRACE("->%ld.%ld\n",*audiobytes1,audiobytes2?*audiobytes2:0);
}
/* No. See file:///cdrom/sdk52/docs/worddoc/dsound.doc page 21 */
/* This->writepos=(writecursor+writebytes)%This->buflen; */
@@ -1096,7 +1096,7 @@
LPDIRECTSOUNDBUFFER iface,DWORD newpos
) {
ICOM_THIS(IDirectSoundBufferImpl,iface);
- TRACE(dsound,"(%p,%ld)\n",This,newpos);
+ TRACE("(%p,%ld)\n",This,newpos);
/* **** */
EnterCriticalSection(&(This->lock));
@@ -1115,7 +1115,7 @@
ICOM_THIS(IDirectSoundBufferImpl,iface);
double temp;
- TRACE(dsound,"(%p,%ld)\n",This,pan);
+ TRACE("(%p,%ld)\n",This,pan);
if ((pan > DSBPAN_RIGHT) || (pan < DSBPAN_LEFT))
return DSERR_INVALIDPARAM;
@@ -1147,7 +1147,7 @@
LPDIRECTSOUNDBUFFER iface,LPLONG pan
) {
ICOM_THIS(IDirectSoundBufferImpl,iface);
- TRACE(dsound,"(%p,%p)\n",This,pan);
+ TRACE("(%p,%p)\n",This,pan);
if (pan == NULL)
return DSERR_INVALIDPARAM;
@@ -1161,7 +1161,7 @@
LPDIRECTSOUNDBUFFER iface,LPVOID p1,DWORD x1,LPVOID p2,DWORD x2
) {
ICOM_THIS(IDirectSoundBufferImpl,iface);
- TRACE(dsound,"(%p,%p,%ld,%p,%ld):stub\n", This,p1,x1,p2,x2);
+ TRACE("(%p,%p,%ld,%p,%ld):stub\n", This,p1,x1,p2,x2);
/* There is really nothing to do here. Should someone */
/* choose to implement static buffers in hardware (by */
@@ -1184,7 +1184,7 @@
LPDIRECTSOUNDBUFFER iface,LPDWORD freq
) {
ICOM_THIS(IDirectSoundBufferImpl,iface);
- TRACE(dsound,"(%p,%p)\n",This,freq);
+ TRACE("(%p,%p)\n",This,freq);
if (freq == NULL)
return DSERR_INVALIDPARAM;
@@ -1198,7 +1198,7 @@
LPDIRECTSOUNDBUFFER iface,LPDIRECTSOUND dsound,LPDSBUFFERDESC dbsd
) {
ICOM_THIS(IDirectSoundBufferImpl,iface);
- FIXME(dsound,"(%p,%p,%p):stub\n",This,dsound,dbsd);
+ FIXME("(%p,%p,%p):stub\n",This,dsound,dbsd);
printf("Re-Init!!!\n");
return DSERR_ALREADYINITIALIZED;
}
@@ -1207,7 +1207,7 @@
LPDIRECTSOUNDBUFFER iface,LPDSBCAPS caps
) {
ICOM_THIS(IDirectSoundBufferImpl,iface);
- TRACE(dsound,"(%p)->(%p)\n",This,caps);
+ TRACE("(%p)->(%p)\n",This,caps);
if (caps == NULL)
return DSERR_INVALIDPARAM;
@@ -1234,7 +1234,7 @@
char xbuf[50];
WINE_StringFromCLSID(riid,xbuf);
- TRACE(dsound,"(%p,%s,%p)\n",This,xbuf,ppobj);
+ TRACE("(%p,%s,%p)\n",This,xbuf,ppobj);
if (!memcmp(&IID_IDirectSoundNotify,riid,sizeof(*riid))) {
IDirectSoundNotifyImpl *dsn;
@@ -1290,7 +1290,7 @@
LPDIRECTSOUND iface,HWND hwnd,DWORD level
) {
ICOM_THIS(IDirectSoundImpl,iface);
- FIXME(dsound,"(%p,%08lx,%ld):stub\n",This,(DWORD)hwnd,level);
+ FIXME("(%p,%08lx,%ld):stub\n",This,(DWORD)hwnd,level);
return 0;
}
@@ -1301,23 +1301,23 @@
IDirectSoundBufferImpl** ippdsb=(IDirectSoundBufferImpl**)ppdsb;
LPWAVEFORMATEX wfex;
- TRACE(dsound,"(%p,%p,%p,%p)\n",This,dsbd,ippdsb,lpunk);
+ TRACE("(%p,%p,%p,%p)\n",This,dsbd,ippdsb,lpunk);
if ((This == NULL) || (dsbd == NULL) || (ippdsb == NULL))
return DSERR_INVALIDPARAM;
if (TRACE_ON(dsound)) {
- TRACE(dsound,"(size=%ld)\n",dsbd->dwSize);
- TRACE(dsound,"(flags=0x%08lx\n",dsbd->dwFlags);
+ TRACE("(size=%ld)\n",dsbd->dwSize);
+ TRACE("(flags=0x%08lx\n",dsbd->dwFlags);
_dump_DSBCAPS(dsbd->dwFlags);
- TRACE(dsound,"(bufferbytes=%ld)\n",dsbd->dwBufferBytes);
- TRACE(dsound,"(lpwfxFormat=%p)\n",dsbd->lpwfxFormat);
+ TRACE("(bufferbytes=%ld)\n",dsbd->dwBufferBytes);
+ TRACE("(lpwfxFormat=%p)\n",dsbd->lpwfxFormat);
}
wfex = dsbd->lpwfxFormat;
if (wfex)
- TRACE(dsound,"(formattag=0x%04x,chans=%d,samplerate=%ld"
+ TRACE("(formattag=0x%04x,chans=%d,samplerate=%ld"
"bytespersec=%ld,blockalign=%d,bitspersamp=%d,cbSize=%d)\n",
wfex->wFormatTag, wfex->nChannels, wfex->nSamplesPerSec,
wfex->nAvgBytesPerSec, wfex->nBlockAlign,
@@ -1337,7 +1337,7 @@
return DSERR_OUTOFMEMORY;
(*ippdsb)->ref = 1;
- TRACE(dsound, "Created buffer at %p\n", *ippdsb);
+ TRACE("Created buffer at %p\n", *ippdsb);
if (dsbd->dwFlags & DSBCAPS_PRIMARYBUFFER) {
(*ippdsb)->buflen = dsound->wfx.nAvgBytesPerSec;
@@ -1429,7 +1429,7 @@
ICOM_THIS(IDirectSoundImpl,iface);
IDirectSoundBufferImpl* ipdsb=(IDirectSoundBufferImpl*)pdsb;
IDirectSoundBufferImpl** ippdsb=(IDirectSoundBufferImpl**)ppdsb;
- TRACE(dsound,"(%p,%p,%p)\n",This,ipdsb,ippdsb);
+ TRACE("(%p,%p,%p)\n",This,ipdsb,ippdsb);
*ippdsb = (IDirectSoundBufferImpl*)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IDirectSoundBufferImpl));
@@ -1452,8 +1452,8 @@
static HRESULT WINAPI IDirectSoundImpl_GetCaps(LPDIRECTSOUND iface,LPDSCAPS caps) {
ICOM_THIS(IDirectSoundImpl,iface);
- TRACE(dsound,"(%p,%p)\n",This,caps);
- TRACE(dsound,"(flags=0x%08lx)\n",caps->dwFlags);
+ TRACE("(%p,%p)\n",This,caps);
+ TRACE("(flags=0x%08lx)\n",caps->dwFlags);
if (caps == NULL)
return DSERR_INVALIDPARAM;
@@ -1509,11 +1509,11 @@
static ULONG WINAPI IDirectSoundImpl_Release(LPDIRECTSOUND iface) {
ICOM_THIS(IDirectSoundImpl,iface);
- TRACE(dsound,"(%p), ref was %ld\n",This,This->ref);
+ TRACE("(%p), ref was %ld\n",This,This->ref);
if (!--(This->ref)) {
DSOUND_CloseAudio();
while(IDirectSoundBuffer_Release((LPDIRECTSOUNDBUFFER)primarybuf)); /* Deallocate */
- FIXME(dsound, "need to release all buffers!\n");
+ FIXME("need to release all buffers!\n");
HeapFree(GetProcessHeap(),0,This);
dsound = NULL;
return 0;
@@ -1525,7 +1525,7 @@
LPDIRECTSOUND iface,DWORD config
) {
ICOM_THIS(IDirectSoundImpl,iface);
- FIXME(dsound,"(%p,0x%08lx):stub\n",This,config);
+ FIXME("(%p,0x%08lx):stub\n",This,config);
return 0;
}
@@ -1567,7 +1567,7 @@
}
WINE_StringFromCLSID(riid,xbuf);
- TRACE(dsound,"(%p,%s,%p)\n",This,xbuf,ppobj);
+ TRACE("(%p,%s,%p)\n",This,xbuf,ppobj);
return E_FAIL;
}
@@ -1575,7 +1575,7 @@
LPDIRECTSOUND iface)
{
ICOM_THIS(IDirectSoundImpl,iface);
- TRACE(dsound, "(%p)\n", This);
+ TRACE("(%p)\n", This);
return DS_OK;
}
@@ -1584,7 +1584,7 @@
LPDWORD lpdwSpeakerConfig)
{
ICOM_THIS(IDirectSoundImpl,iface);
- TRACE(dsound, "(%p, %p)\n", This, lpdwSpeakerConfig);
+ TRACE("(%p, %p)\n", This, lpdwSpeakerConfig);
*lpdwSpeakerConfig = DSSPEAKER_STEREO | (DSSPEAKER_GEOMETRY_NARROW << 16);
return DS_OK;
}
@@ -1594,7 +1594,7 @@
LPGUID lpGuid)
{
ICOM_THIS(IDirectSoundImpl,iface);
- TRACE(dsound, "(%p, %p)\n", This, lpGuid);
+ TRACE("(%p, %p)\n", This, lpGuid);
return DS_OK;
}
@@ -1622,12 +1622,12 @@
int xx,channels,speed,format,nformat;
if (!audioOK) {
- TRACE(dsound, "(%p) deferred\n", wfex);
+ TRACE("(%p) deferred\n", wfex);
return 0;
}
switch (wfex->wFormatTag) {
default:
- WARN(dsound,"unknown WAVE_FORMAT tag %d\n",wfex->wFormatTag);
+ WARN("unknown WAVE_FORMAT tag %d\n",wfex->wFormatTag);
return DSERR_BADFORMAT;
case WAVE_FORMAT_PCM:
break;
@@ -1642,7 +1642,7 @@
return -1;
}
if ((xx&format)!=format) {/* format unsupported */
- FIXME(dsound,"SNDCTL_DSP_GETFMTS: format not supported\n");
+ FIXME("SNDCTL_DSP_GETFMTS: format not supported\n");
return -1;
}
nformat = format;
@@ -1651,7 +1651,7 @@
return -1;
}
if (nformat!=format) {/* didn't work */
- FIXME(dsound,"SNDCTL_DSP_GETFMTS: format not set\n");
+ FIXME("SNDCTL_DSP_GETFMTS: format not set\n");
return -1;
}
@@ -1665,7 +1665,7 @@
perror("ioctl SNDCTL_DSP_SPEED");
return -1;
}
- TRACE(dsound,"(freq=%ld,channels=%d,bits=%d)\n",
+ TRACE("(freq=%ld,channels=%d,bits=%d)\n",
wfex->nSamplesPerSec,wfex->nChannels,wfex->wBitsPerSample
);
return 0;
@@ -1680,12 +1680,12 @@
if (dsb->nrofnotifies == 0)
return;
- TRACE(dsound,"(%p) buflen = %ld, playpos = %ld, len = %d\n",
+ TRACE("(%p) buflen = %ld, playpos = %ld, len = %d\n",
dsb, dsb->buflen, dsb->playpos, len);
for (i = 0; i < dsb->nrofnotifies ; i++) {
event = dsb->notifies + i;
offset = event->dwOffset;
- TRACE(dsound, "checking %d, position %ld, event = %d\n",
+ TRACE("checking %d, position %ld, event = %d\n",
i, offset, event->hEventNotify);
/* DSBPN_OFFSETSTOP has to be the last element. So this is */
/* OK. [Inside DirectX, p274] */
@@ -1695,7 +1695,7 @@
if (offset == DSBPN_OFFSETSTOP) {
if (dsb->playing == 0) {
SetEvent(event->hEventNotify);
- TRACE(dsound,"signalled event %d (%d)\n", event->hEventNotify, i);
+ TRACE("signalled event %d (%d)\n", event->hEventNotify, i);
return;
} else
return;
@@ -1703,12 +1703,12 @@
if ((dsb->playpos + len) >= dsb->buflen) {
if ((offset < ((dsb->playpos + len) % dsb->buflen)) ||
(offset >= dsb->playpos)) {
- TRACE(dsound,"signalled event %d (%d)\n", event->hEventNotify, i);
+ TRACE("signalled event %d (%d)\n", event->hEventNotify, i);
SetEvent(event->hEventNotify);
}
} else {
if ((offset >= dsb->playpos) && (offset < (dsb->playpos + len))) {
- TRACE(dsound,"signalled event %d (%d)\n", event->hEventNotify, i);
+ TRACE("signalled event %d (%d)\n", event->hEventNotify, i);
SetEvent(event->hEventNotify);
}
}
@@ -1772,7 +1772,7 @@
return;
}
- FIXME(dsound, "get_fields found an unsupported configuration\n");
+ FIXME("get_fields found an unsupported configuration\n");
return;
}
@@ -1801,7 +1801,7 @@
*bufs = (fl + fr) >> 1;
return;
}
- FIXME(dsound, "set_fields found an unsupported configuration\n");
+ FIXME("set_fields found an unsupported configuration\n");
return;
}
@@ -1816,12 +1816,12 @@
ibp = dsb->buffer + dsb->playpos;
obp = buf;
- TRACE(dsound, "(%p, %p, %p), playpos=%8.8lx\n", dsb, ibp, obp, dsb->playpos);
+ TRACE("(%p, %p, %p), playpos=%8.8lx\n", dsb, ibp, obp, dsb->playpos);
/* Check for the best case */
if ((dsb->freq == primarybuf->wfx.nSamplesPerSec) &&
(dsb->wfx.wBitsPerSample == primarybuf->wfx.wBitsPerSample) &&
(dsb->wfx.nChannels == primarybuf->wfx.nChannels)) {
- TRACE(dsound, "(%p) Best case\n", dsb);
+ TRACE("(%p) Best case\n", dsb);
if ((ibp + len) < (BYTE *)(dsb->buffer + dsb->buflen))
memcpy(obp, ibp, len);
else { /* wrap */
@@ -1835,7 +1835,7 @@
/* Check for same sample rate */
if (dsb->freq == primarybuf->wfx.nSamplesPerSec) {
- TRACE(dsound, "(%p) Same sample rate %ld = primary %ld\n", dsb,
+ TRACE("(%p) Same sample rate %ld = primary %ld\n", dsb,
dsb->freq, primarybuf->wfx.nSamplesPerSec);
ilen = 0;
for (i = 0; i < len; i += oAdvance) {
@@ -1855,7 +1855,7 @@
/* New PerfectPitch(tm) Technology (c) 1998 Rob Riggs */
/* Patent Pending :-] */
- TRACE(dsound, "(%p) Adjusting frequency: %ld -> %ld\n",
+ TRACE("(%p) Adjusting frequency: %ld -> %ld\n",
dsb, dsb->freq, primarybuf->wfx.nSamplesPerSec);
size = len / oAdvance;
@@ -1880,7 +1880,7 @@
BYTE *bpc = buf;
INT16 *bps = (INT16 *) buf;
- TRACE(dsound, "(%p) left = %lx, right = %lx\n", dsb,
+ TRACE("(%p) left = %lx, right = %lx\n", dsb,
dsb->lVolAdjust, dsb->rVolAdjust);
if ((!(dsb->dsbd.dwFlags & DSBCAPS_CTRLPAN) || (dsb->pan == 0)) &&
(!(dsb->dsbd.dwFlags & DSBCAPS_CTRLVOLUME) || (dsb->volume == 0)) &&
@@ -1913,7 +1913,7 @@
break;
default:
/* Very ugly! */
- FIXME(dsound, "MixerVol had a nasty error\n");
+ FIXME("MixerVol had a nasty error\n");
}
}
}
@@ -1930,7 +1930,7 @@
obp = buf;
if (playpos > buflen) {
- FIXME(dsound, "Major breakage");
+ FIXME("Major breakage");
return;
}
@@ -1994,11 +1994,11 @@
}
/* Been seeing segfaults in malloc() for some reason... */
- TRACE(dsound, "allocating buffer (size = %d)\n", len);
+ TRACE("allocating buffer (size = %d)\n", len);
if ((buf = ibuf = (BYTE *) DSOUND_tmpbuffer(len)) == NULL)
return 0;
- TRACE(dsound, "MixInBuffer (%p) len = %d\n", dsb, len);
+ TRACE("MixInBuffer (%p) len = %d\n", dsb, len);
ilen = DSOUND_MixerNorm(dsb, ibuf, len);
if ((dsb->dsbd.dwFlags & DSBCAPS_CTRLPAN) ||
@@ -2120,7 +2120,7 @@
primarybuf->writepos = DSOUND_FRAGLEN;
memset(primarybuf->buffer, neutral, primarybuf->buflen);
audiofd = -1;
- TRACE(dsound, "Audio stopped\n");
+ TRACE("Audio stopped\n");
}
static int DSOUND_WriteAudio(char *buf, int len)
@@ -2203,21 +2203,21 @@
{
int len;
- TRACE(dsound,"dsound is at pid %d\n",getpid());
+ TRACE("dsound is at pid %d\n",getpid());
while (1) {
if (!dsound) {
- WARN(dsound,"DSOUND thread giving up.\n");
+ WARN("DSOUND thread giving up.\n");
ExitThread(0);
}
if (getppid()==1) {
- WARN(dsound,"DSOUND father died? Giving up.\n");
+ WARN("DSOUND father died? Giving up.\n");
ExitThread(0);
}
/* RACE: dsound could be deleted */
IDirectSound_AddRef((LPDIRECTSOUND)dsound);
if (primarybuf == NULL) {
/* Should never happen */
- WARN(dsound, "Lost the primary buffer!\n");
+ WARN("Lost the primary buffer!\n");
IDirectSound_Release((LPDIRECTSOUND)dsound);
ExitThread(0);
}
@@ -2250,9 +2250,9 @@
{
IDirectSoundImpl** ippDS=(IDirectSoundImpl**)ppDS;
if (lpGUID)
- TRACE(dsound,"(%p,%p,%p)\n",lpGUID,ippDS,pUnkOuter);
+ TRACE("(%p,%p,%p)\n",lpGUID,ippDS,pUnkOuter);
else
- TRACE(dsound,"DirectSoundCreate (%p)\n", ippDS);
+ TRACE("DirectSoundCreate (%p)\n", ippDS);
#ifdef HAVE_OSS
@@ -2272,12 +2272,12 @@
audiofd = open("/dev/audio",O_WRONLY);
if (audiofd == -1) {
if (errno == ENODEV) {
- MSG("No sound hardware found.\n");
+ MESSAGE("No sound hardware found.\n");
return DSERR_NODRIVER;
} else if (errno == EBUSY) {
- MSG("Sound device busy, will keep trying.\n");
+ MESSAGE("Sound device busy, will keep trying.\n");
} else {
- MSG("Unexpected error (%d) while checking for sound support.\n",errno);
+ MESSAGE("Unexpected error (%d) while checking for sound support.\n",errno);
return DSERR_GENERIC;
}
} else {
@@ -2348,7 +2348,7 @@
WINE_StringFromCLSID(riid,buf);
else
sprintf(buf,"<guid-0x%04x>",LOWORD(riid));
- FIXME(dsound,"(%p)->(%s,%p),stub!\n",This,buf,ppobj);
+ FIXME("(%p)->(%s,%p),stub!\n",This,buf,ppobj);
return E_NOINTERFACE;
}
@@ -2371,7 +2371,7 @@
char buf[80];
WINE_StringFromCLSID(riid,buf);
- TRACE(dsound,"(%p)->(%p,%s,%p)\n",This,pOuter,buf,ppobj);
+ TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,buf,ppobj);
if (!memcmp(riid,&IID_IDirectSound,sizeof(IID_IDirectSound))) {
/* FIXME: reuse already created dsound if present? */
return DirectSoundCreate(riid,(LPDIRECTSOUND*)ppobj,pOuter);
@@ -2381,7 +2381,7 @@
static HRESULT WINAPI DSCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
ICOM_THIS(IClassFactoryImpl,iface);
- FIXME(dsound,"(%p)->(%d),stub!\n",This,dolock);
+ FIXME("(%p)->(%d),stub!\n",This,dolock);
return S_OK;
}
@@ -2424,13 +2424,13 @@
else
sprintf(buf,"<guid-0x%04x>",LOWORD(riid));
WINE_StringFromCLSID(riid,xbuf);
- TRACE(dsound, "(%p,%p,%p)\n", xbuf, buf, ppv);
+ TRACE("(%p,%p,%p)\n", xbuf, buf, ppv);
if (!memcmp(riid,&IID_IClassFactory,sizeof(IID_IClassFactory))) {
*ppv = (LPVOID)&DSOUND_CF;
IClassFactory_AddRef((IClassFactory*)*ppv);
return S_OK;
}
- FIXME(dsound, "(%p,%p,%p): no interface found.\n", xbuf, buf, ppv);
+ FIXME("(%p,%p,%p): no interface found.\n", xbuf, buf, ppv);
return E_NOINTERFACE;
}
@@ -2444,6 +2444,6 @@
*/
DWORD WINAPI DSOUND_DllCanUnloadNow(void)
{
- FIXME(dsound, "(void): stub\n");
+ FIXME("(void): stub\n");
return S_FALSE;
}
diff --git a/multimedia/joystick.c b/multimedia/joystick.c
index ae24104..a17a7d2 100644
--- a/multimedia/joystick.c
+++ b/multimedia/joystick.c
@@ -22,7 +22,7 @@
#include "winuser.h"
#include "winbase.h"
#include "mmsystem.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(mmsys)
@@ -97,7 +97,7 @@
}
if (joyCaptured == FALSE) return;
- TRACE(mmsys, " --\n");
+ TRACE(" --\n");
for (joy=0; joy < MAXJOYDRIVERS; joy++) {
if (joyOpenDriver(joy) == FALSE) continue;
@@ -146,8 +146,8 @@
joyCloseDriver(joy);
joy_cnt++;
}
- TRACE(mmsys, "returning %d\n", joy_cnt);
- if (!joy_cnt) ERR(mmsys, "No joystick found - "
+ TRACE("returning %d\n", joy_cnt);
+ if (!joy_cnt) ERR("No joystick found - "
"perhaps get joystick-0.8.0.tar.gz and load"
"it as module or use Linux >= 2.1.45 to be "
"able to use joysticks.\n");
@@ -230,7 +230,7 @@
*/
MMRESULT16 WINAPI joyGetDevCaps16(UINT16 wID, LPJOYCAPS16 lpCaps, UINT16 wSize)
{
- TRACE(mmsys, "(%04X, %p, %d);\n",
+ TRACE("(%04X, %p, %d);\n",
wID, lpCaps, wSize);
if (joyOpenDriver(wID) == TRUE) {
lpCaps->wMid = MM_MICROSOFT;
@@ -298,7 +298,7 @@
{
struct js_status js;
- TRACE(mmsys, "(%04X, %p)\n", wID, lpInfo);
+ TRACE("(%04X, %p)\n", wID, lpInfo);
if (joyOpenDriver(wID) == FALSE) return MMSYSERR_NODRIVER;
dev_stat = read(joy_dev[wID], &js, sizeof(js));
if (dev_stat != sizeof(js)) {
@@ -312,7 +312,7 @@
lpInfo->wYpos = js.y;
lpInfo->wZpos = 0; /* FIXME: Don't know what to do with this value as joystick driver doesn't provide a Z value */
lpInfo->wButtons = js.buttons;
- TRACE(mmsys, "x: %d, y: %d, buttons: %d\n", js.x, js.y, js.buttons);
+ TRACE("x: %d, y: %d, buttons: %d\n", js.x, js.y, js.buttons);
return JOYERR_NOERROR;
}
@@ -333,7 +333,7 @@
*/
MMRESULT16 WINAPI joyGetThreshold16(UINT16 wID, LPUINT16 lpThreshold)
{
- TRACE(mmsys, "(%04X, %p);\n", wID, lpThreshold);
+ TRACE("(%04X, %p);\n", wID, lpThreshold);
if (wID >= MAXJOYDRIVERS) return JOYERR_PARMS;
*lpThreshold = joy_threshold[wID];
return JOYERR_NOERROR;
@@ -352,7 +352,7 @@
*/
MMRESULT16 WINAPI joyReleaseCapture16(UINT16 wID)
{
- TRACE(mmsys, "(%04X);\n", wID);
+ TRACE("(%04X);\n", wID);
joyCaptured = FALSE;
joyCloseDriver(wID);
joy_dev[wID] = -1;
@@ -374,7 +374,7 @@
MMRESULT16 WINAPI joySetCapture16(HWND16 hWnd,UINT16 wID,UINT16 wPeriod,BOOL16 bChanged)
{
- TRACE(mmsys, "(%04X, %04X, %d, %d);\n",
+ TRACE("(%04X, %04X, %d, %d);\n",
hWnd, wID, wPeriod, bChanged);
if (!CaptureWnd[wID]) {
@@ -399,7 +399,7 @@
*/
MMRESULT16 WINAPI joySetThreshold16(UINT16 wID, UINT16 wThreshold)
{
- TRACE(mmsys, "(%04X, %d);\n", wID, wThreshold);
+ TRACE("(%04X, %d);\n", wID, wThreshold);
if (wID > 3) return JOYERR_PARMS;
joy_threshold[wID] = wThreshold;
@@ -411,6 +411,6 @@
*/
MMRESULT16 WINAPI joySetCalibration16(UINT16 wID)
{
- FIXME(mmsys, "(%04X): stub.\n", wID);
+ FIXME("(%04X): stub.\n", wID);
return JOYERR_NOCANDO;
}
diff --git a/multimedia/mcianim.c b/multimedia/mcianim.c
index 993a281..a941a12 100644
--- a/multimedia/mcianim.c
+++ b/multimedia/mcianim.c
@@ -15,7 +15,7 @@
#include "driver.h"
#include "mmsystem.h"
#include "multimedia.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(mcianim)
@@ -101,7 +101,7 @@
WINE_MCIANIM* wma = ANIM_drvGetDrv(wDevID);
if (wma == NULL || wma->nUseCount == 0) {
- WARN(mcianim, "Invalid wDevID=%u\n", wDevID);
+ WARN("Invalid wDevID=%u\n", wDevID);
return 0;
}
return wma;
@@ -115,7 +115,7 @@
DWORD dwDeviceID;
WINE_MCIANIM* wma = ANIM_drvGetDrv(wDevID);
- TRACE(mcianim,"(%04X, %08lX, %p);\n", wDevID, dwFlags, lpOpenParms);
+ TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpOpenParms);
if (lpOpenParms == NULL) return MCIERR_INTERNAL;
if (wma == NULL) return MCIERR_INVALID_DEVICE_ID;
@@ -135,16 +135,16 @@
dwDeviceID = lpOpenParms->wDeviceID;
- TRACE(mcianim,"wDevID=%04X\n", wDevID);
+ TRACE("wDevID=%04X\n", wDevID);
/* FIXME this is not consistent with other implementations */
lpOpenParms->wDeviceID = wDevID;
/*TRACE(mcianim,"lpParms->wDevID=%04X\n", lpParms->wDeviceID);*/
if (dwFlags & MCI_OPEN_ELEMENT) {
- TRACE(mcianim,"MCI_OPEN_ELEMENT '%s' !\n", lpOpenParms->lpstrElementName);
+ TRACE("MCI_OPEN_ELEMENT '%s' !\n", lpOpenParms->lpstrElementName);
if (lpOpenParms->lpstrElementName && strlen(lpOpenParms->lpstrElementName) > 0) {
}
- FIXME(mcianim, "element is not opened\n");
+ FIXME("element is not opened\n");
}
memcpy(&wma->openParms, lpOpenParms, sizeof(MCI_OPEN_PARMSA));
wma->wNotifyDeviceID = dwDeviceID;
@@ -175,7 +175,7 @@
{
WINE_MCIANIM* wma = ANIM_mciGetOpenDrv(wDevID);
- TRACE(mcianim,"(%u, %08lX, %p);\n", wDevID, dwParam, lpParms);
+ TRACE("(%u, %08lX, %p);\n", wDevID, dwParam, lpParms);
if (wma == NULL) return MCIERR_INVALID_DEVICE_ID;
@@ -194,13 +194,13 @@
{
WINE_MCIANIM* wma = ANIM_mciGetOpenDrv(wDevID);
- TRACE(mcianim,"(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms);
+ TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms);
if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK;
if (wma == NULL) return MCIERR_INVALID_DEVICE_ID;
if (dwFlags & MCI_GETDEVCAPS_ITEM) {
- TRACE(mcianim, "MCI_GETDEVCAPS_ITEM dwItem=%08lX;\n", lpParms->dwItem);
+ TRACE("MCI_GETDEVCAPS_ITEM dwItem=%08lX;\n", lpParms->dwItem);
switch(lpParms->dwItem) {
case MCI_GETDEVCAPS_CAN_RECORD:
lpParms->dwReturn = FALSE;
@@ -233,7 +233,7 @@
return MCIERR_UNRECOGNIZED_COMMAND;
}
}
- TRACE(mcianim, "lpParms->dwReturn=%08lX;\n", lpParms->dwReturn);
+ TRACE("lpParms->dwReturn=%08lX;\n", lpParms->dwReturn);
return 0;
}
@@ -249,12 +249,12 @@
UINT16 wSeconds;
UINT16 wFrames;
- TRACE(mcianim,"(%p, %08lX, %lu);\n", wma, dwFormatType, dwFrame);
+ TRACE("(%p, %08lX, %lu);\n", wma, dwFormatType, dwFrame);
switch (dwFormatType) {
case MCI_FORMAT_MILLISECONDS:
dwTime = dwFrame / ANIMFRAMES_PERSEC * 1000;
- TRACE(mcianim, "MILLISECONDS %lu\n", dwTime);
+ TRACE("MILLISECONDS %lu\n", dwTime);
break;
case MCI_FORMAT_MSF:
wMinutes = dwFrame / ANIMFRAMES_PERMIN;
@@ -262,7 +262,7 @@
wFrames = dwFrame - ANIMFRAMES_PERMIN * wMinutes -
ANIMFRAMES_PERSEC * wSeconds;
dwTime = MCI_MAKE_MSF(wMinutes, wSeconds, wFrames);
- TRACE(mcianim,"MSF %02u:%02u:%02u -> dwTime=%lu\n",
+ TRACE("MSF %02u:%02u:%02u -> dwTime=%lu\n",
wMinutes, wSeconds, wFrames, dwTime);
break;
default:
@@ -280,7 +280,7 @@
wFrames = dwFrame - ANIMFRAMES_PERMIN * wMinutes -
ANIMFRAMES_PERSEC * wSeconds;
dwTime = MCI_MAKE_TMSF(wTrack, wMinutes, wSeconds, wFrames);
- TRACE(mcianim, "%02u-%02u:%02u:%02u\n",
+ TRACE("%02u-%02u:%02u:%02u\n",
wTrack, wMinutes, wSeconds, wFrames);
break;
}
@@ -296,15 +296,15 @@
DWORD dwFrame = 0;
UINT16 wTrack;
- TRACE(mcianim,"(%p, %08lX, %lu);\n", wma, dwFormatType, dwTime);
+ TRACE("(%p, %08lX, %lu);\n", wma, dwFormatType, dwTime);
switch (dwFormatType) {
case MCI_FORMAT_MILLISECONDS:
dwFrame = dwTime * ANIMFRAMES_PERSEC / 1000;
- TRACE(mcianim, "MILLISECONDS %lu\n", dwFrame);
+ TRACE("MILLISECONDS %lu\n", dwFrame);
break;
case MCI_FORMAT_MSF:
- TRACE(mcianim, "MSF %02u:%02u:%02u\n",
+ TRACE("MSF %02u:%02u:%02u\n",
MCI_MSF_MINUTE(dwTime), MCI_MSF_SECOND(dwTime),
MCI_MSF_FRAME(dwTime));
dwFrame += ANIMFRAMES_PERMIN * MCI_MSF_MINUTE(dwTime);
@@ -316,10 +316,10 @@
dwFormatType = MCI_FORMAT_TMSF;
case MCI_FORMAT_TMSF:
wTrack = MCI_TMSF_TRACK(dwTime);
- TRACE(mcianim, "TMSF %02u-%02u:%02u:%02u\n",
+ TRACE("TMSF %02u-%02u:%02u:%02u\n",
MCI_TMSF_TRACK(dwTime), MCI_TMSF_MINUTE(dwTime),
MCI_TMSF_SECOND(dwTime), MCI_TMSF_FRAME(dwTime));
- TRACE(mcianim, "TMSF trackpos[%u]=%lu\n",
+ TRACE("TMSF trackpos[%u]=%lu\n",
wTrack, wma->lpdwTrackPos[wTrack - 1]);
dwFrame = wma->lpdwTrackPos[wTrack - 1];
dwFrame += ANIMFRAMES_PERMIN * MCI_TMSF_MINUTE(dwTime);
@@ -340,14 +340,14 @@
DWORD ret = 0;
LPSTR str = 0;
- TRACE(mcianim,"(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms);
+ TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms);
if (lpParms == NULL || lpParms->lpstrReturn == NULL) {
ret = MCIERR_NULL_PARAMETER_BLOCK;
} else if (wma == NULL) {
ret = MCIERR_INVALID_DEVICE_ID;
} else {
- TRACE(mcianim, "buf=%p, len=%lu\n", lpParms->lpstrReturn, lpParms->dwRetSize);
+ TRACE("buf=%p, len=%lu\n", lpParms->lpstrReturn, lpParms->dwRetSize);
switch(dwFlags) {
case MCI_INFO_PRODUCT:
@@ -360,7 +360,7 @@
str = "Animation Window";
break;
default:
- WARN(mcianim, "Don't know this info command (%lu)\n", dwFlags);
+ WARN("Don't know this info command (%lu)\n", dwFlags);
ret = MCIERR_UNRECOGNIZED_COMMAND;
}
}
@@ -380,13 +380,13 @@
{
WINE_MCIANIM* wma = ANIM_mciGetOpenDrv(wDevID);
- TRACE(mcianim,"(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms);
+ TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms);
if (lpParms == NULL) return MCIERR_INTERNAL;
if (wma == NULL) return MCIERR_INVALID_DEVICE_ID;
if (dwFlags & MCI_NOTIFY) {
- TRACE(mcianim, "MCI_NOTIFY_SUCCESSFUL %08lX !\n",
+ TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n",
lpParms->dwCallback);
mciDriverNotify16((HWND16)LOWORD(lpParms->dwCallback),
wma->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
@@ -395,11 +395,11 @@
switch(lpParms->dwItem) {
case MCI_STATUS_CURRENT_TRACK:
lpParms->dwReturn = wma->nCurTrack;
- TRACE(mcianim,"CURRENT_TRACK=%lu!\n", lpParms->dwReturn);
+ TRACE("CURRENT_TRACK=%lu!\n", lpParms->dwReturn);
return 0;
case MCI_STATUS_LENGTH:
if (dwFlags & MCI_TRACK) {
- TRACE(mcianim,"MCI_TRACK #%lu LENGTH=??? !\n",
+ TRACE("MCI_TRACK #%lu LENGTH=??? !\n",
lpParms->dwTrack);
if (lpParms->dwTrack > wma->nTracks)
return MCIERR_OUTOFRANGE;
@@ -408,20 +408,20 @@
else
lpParms->dwReturn = wma->dwTotalLen;
lpParms->dwReturn = ANIM_CalcTime(wma, wma->dwTimeFormat, lpParms->dwReturn);
- TRACE(mcianim,"LENGTH=%lu !\n", lpParms->dwReturn);
+ TRACE("LENGTH=%lu !\n", lpParms->dwReturn);
return 0;
case MCI_STATUS_MODE:
lpParms->dwReturn = wma->mode;
- TRACE(mcianim,"MCI_STATUS_MODE=%08lX !\n",
+ TRACE("MCI_STATUS_MODE=%08lX !\n",
lpParms->dwReturn);
return 0;
case MCI_STATUS_MEDIA_PRESENT:
lpParms->dwReturn = TRUE;
- TRACE(mcianim,"MCI_STATUS_MEDIA_PRESENT !\n");
+ TRACE("MCI_STATUS_MEDIA_PRESENT !\n");
return 0;
case MCI_STATUS_NUMBER_OF_TRACKS:
lpParms->dwReturn = 1;
- TRACE(mcianim,"MCI_STATUS_NUMBER_OF_TRACKS = %lu !\n",
+ TRACE("MCI_STATUS_NUMBER_OF_TRACKS = %lu !\n",
lpParms->dwReturn);
if (lpParms->dwReturn == (WORD)-1) return MCIERR_INTERNAL;
return 0;
@@ -429,32 +429,32 @@
lpParms->dwReturn = wma->dwCurFrame;
if (dwFlags & MCI_STATUS_START) {
lpParms->dwReturn = 0;
- TRACE(mcianim,"get MCI_STATUS_START !\n");
+ TRACE("get MCI_STATUS_START !\n");
}
if (dwFlags & MCI_TRACK) {
if (lpParms->dwTrack > wma->nTracks)
return MCIERR_OUTOFRANGE;
lpParms->dwReturn = wma->lpdwTrackPos[lpParms->dwTrack - 1];
- TRACE(mcianim,"get MCI_TRACK #%lu !\n", lpParms->dwTrack);
+ TRACE("get MCI_TRACK #%lu !\n", lpParms->dwTrack);
}
lpParms->dwReturn = ANIM_CalcTime(wma, wma->dwTimeFormat, lpParms->dwReturn);
- TRACE(mcianim,"MCI_STATUS_POSITION=%08lX !\n",
+ TRACE("MCI_STATUS_POSITION=%08lX !\n",
lpParms->dwReturn);
return 0;
case MCI_STATUS_READY:
- TRACE(mcianim,"MCI_STATUS_READY !\n");
+ TRACE("MCI_STATUS_READY !\n");
lpParms->dwReturn = TRUE;
return 0;
case MCI_STATUS_TIME_FORMAT:
- TRACE(mcianim,"MCI_STATUS_TIME_FORMAT !\n");
+ TRACE("MCI_STATUS_TIME_FORMAT !\n");
lpParms->dwReturn = MCI_FORMAT_MILLISECONDS;
return 0;
default:
- WARN(mcianim,"Unknown command %08lX !\n", lpParms->dwItem);
+ WARN("Unknown command %08lX !\n", lpParms->dwItem);
return MCIERR_UNRECOGNIZED_COMMAND;
}
}
- WARN(mcianim,"Not MCI_STATUS_ITEM !\n");
+ WARN("Not MCI_STATUS_ITEM !\n");
return 0;
}
@@ -467,7 +467,7 @@
WINE_MCIANIM* wma = ANIM_mciGetOpenDrv(wDevID);
int start, end;
- TRACE(mcianim,"(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms);
+ TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms);
if (lpParms == NULL) return MCIERR_INTERNAL;
if (wma == NULL) return MCIERR_INVALID_DEVICE_ID;
@@ -476,15 +476,15 @@
wma->nCurTrack = 1;
if (dwFlags & MCI_FROM) {
start = ANIM_CalcFrame(wma, wma->dwTimeFormat, lpParms->dwFrom);
- TRACE(mcianim,"MCI_FROM=%08lX -> %u \n", lpParms->dwFrom, start);
+ TRACE("MCI_FROM=%08lX -> %u \n", lpParms->dwFrom, start);
}
if (dwFlags & MCI_TO) {
end = ANIM_CalcFrame(wma, wma->dwTimeFormat, lpParms->dwTo);
- TRACE(mcianim, "MCI_TO=%08lX -> %u \n", lpParms->dwTo, end);
+ TRACE("MCI_TO=%08lX -> %u \n", lpParms->dwTo, end);
}
wma->mode = MCI_MODE_PLAY;
if (dwFlags & MCI_NOTIFY) {
- TRACE(mcianim, "MCI_NOTIFY_SUCCESSFUL %08lX !\n",
+ TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n",
lpParms->dwCallback);
mciDriverNotify16((HWND16)LOWORD(lpParms->dwCallback),
wma->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
@@ -499,14 +499,14 @@
{
WINE_MCIANIM* wma = ANIM_mciGetOpenDrv(wDevID);
- TRACE(mcianim,"(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms);
+ TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms);
if (lpParms == NULL) return MCIERR_INTERNAL;
if (wma == NULL) return MCIERR_INVALID_DEVICE_ID;
wma->mode = MCI_MODE_STOP;
if (dwFlags & MCI_NOTIFY) {
- TRACE(mcianim, "MCI_NOTIFY_SUCCESSFUL %08lX !\n",
+ TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n",
lpParms->dwCallback);
mciDriverNotify16((HWND16)LOWORD(lpParms->dwCallback),
wma->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
@@ -521,11 +521,11 @@
{
WINE_MCIANIM* wma = ANIM_mciGetOpenDrv(wDevID);
- TRACE(mcianim,"(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms);
+ TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms);
if (lpParms == NULL) return MCIERR_INTERNAL;
wma->mode = MCI_MODE_PAUSE;
if (dwFlags & MCI_NOTIFY) {
- TRACE(mcianim, "MCI_NOTIFY_SUCCESSFUL %08lX !\n",
+ TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n",
lpParms->dwCallback);
mciDriverNotify16((HWND16)LOWORD(lpParms->dwCallback),
wma->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
@@ -540,11 +540,11 @@
{
WINE_MCIANIM* wma = ANIM_mciGetOpenDrv(wDevID);
- TRACE(mcianim,"(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms);
+ TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms);
if (lpParms == NULL) return MCIERR_INTERNAL;
wma->mode = MCI_MODE_STOP;
if (dwFlags & MCI_NOTIFY) {
- TRACE(mcianim, "MCI_NOTIFY_SUCCESSFUL %08lX !\n",
+ TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n",
lpParms->dwCallback);
mciDriverNotify16((HWND16)LOWORD(lpParms->dwCallback),
wma->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
@@ -561,7 +561,7 @@
DWORD dwRet;
MCI_PLAY_PARMS PlayParms;
- TRACE(mcianim,"(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms);
+ TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms);
if (lpParms == NULL) return MCIERR_INTERNAL;
wma->mode = MCI_MODE_SEEK;
@@ -580,7 +580,7 @@
if (dwRet != 0) return dwRet;
dwRet = ANIM_mciStop(wDevID, MCI_WAIT, (LPMCI_GENERIC_PARMS)&PlayParms);
if (dwFlags & MCI_NOTIFY) {
- TRACE(mcianim, "MCI_NOTIFY_SUCCESSFUL %08lX !\n",
+ TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n",
lpParms->dwCallback);
mciDriverNotify16((HWND16)LOWORD(lpParms->dwCallback),
wma->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
@@ -596,7 +596,7 @@
{
WINE_MCIANIM* wma = ANIM_mciGetOpenDrv(wDevID);
- TRACE(mcianim,"(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms);
+ TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms);
if (lpParms == NULL) return MCIERR_INTERNAL;
if (wma == NULL) return MCIERR_INVALID_DEVICE_ID;
/*
@@ -606,16 +606,16 @@
if (dwFlags & MCI_SET_TIME_FORMAT) {
switch (lpParms->dwTimeFormat) {
case MCI_FORMAT_MILLISECONDS:
- TRACE(mcianim, "MCI_FORMAT_MILLISECONDS !\n");
+ TRACE("MCI_FORMAT_MILLISECONDS !\n");
break;
case MCI_FORMAT_MSF:
- TRACE(mcianim,"MCI_FORMAT_MSF !\n");
+ TRACE("MCI_FORMAT_MSF !\n");
break;
case MCI_FORMAT_TMSF:
- TRACE(mcianim,"MCI_FORMAT_TMSF !\n");
+ TRACE("MCI_FORMAT_TMSF !\n");
break;
default:
- WARN(mcianim,"Bad time format !\n");
+ WARN("Bad time format !\n");
return MCIERR_BAD_TIME_FORMAT;
}
wma->dwTimeFormat = lpParms->dwTimeFormat;
@@ -624,7 +624,7 @@
if (dwFlags & MCI_SET_ON) return MCIERR_UNSUPPORTED_FUNCTION;
if (dwFlags & MCI_SET_OFF) return MCIERR_UNSUPPORTED_FUNCTION;
if (dwFlags & MCI_NOTIFY) {
- TRACE(mcianim, "MCI_NOTIFY_SUCCESSFUL %08lX !\n",
+ TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n",
lpParms->dwCallback);
mciDriverNotify16((HWND16)LOWORD(lpParms->dwCallback),
wma->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
@@ -677,14 +677,14 @@
case MCI_CUT:
case MCI_DELETE:
case MCI_PASTE:
- WARN(mcianim, "Unsupported command=%s\n", MCI_CommandToString(wMsg));
+ WARN("Unsupported command=%s\n", MCI_CommandToString(wMsg));
break;
case MCI_OPEN:
case MCI_CLOSE:
- FIXME(mcianim, "Shouldn't receive a MCI_OPEN or CLOSE message\n");
+ FIXME("Shouldn't receive a MCI_OPEN or CLOSE message\n");
break;
default:
- TRACE(mcianim, "Sending msg=%s to default driver proc\n", MCI_CommandToString(wMsg));
+ TRACE("Sending msg=%s to default driver proc\n", MCI_CommandToString(wMsg));
return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
}
return MCIERR_UNRECOGNIZED_COMMAND;
diff --git a/multimedia/mcicda.c b/multimedia/mcicda.c
index a58cbb5..d0d363c 100644
--- a/multimedia/mcicda.c
+++ b/multimedia/mcicda.c
@@ -11,7 +11,7 @@
#include "driver.h"
#include "multimedia.h"
#include "cdrom.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(cdaudio)
@@ -87,7 +87,7 @@
WINE_MCICDAUDIO* wmcda = CDAUDIO_drvGetDrv(wDevID);
if (wmcda == NULL || wmcda->nUseCount == 0 || wmcda->wcda.unixdev <= 0) {
- WARN(cdaudio, "Invalid wDevID=%u\n", wDevID);
+ WARN("Invalid wDevID=%u\n", wDevID);
return 0;
}
return wmcda;
@@ -106,7 +106,7 @@
case WINE_CDA_STOP: return MCI_MODE_STOP;
case WINE_CDA_PAUSE: return MCI_MODE_PAUSE;
default:
- FIXME(cdaudio, "Unknown mode %04x\n", wcdaMode);
+ FIXME("Unknown mode %04x\n", wcdaMode);
}
return MCI_MODE_STOP;
}
@@ -124,7 +124,7 @@
case WINE_CDA_STOP:
case WINE_CDA_PAUSE: break;
default:
- FIXME(cdaudio, "Unknown mode %04x\n", wmcda->wcda.cdaMode);
+ FIXME("Unknown mode %04x\n", wmcda->wcda.cdaMode);
}
return MCIERR_DRIVER_INTERNAL;
}
@@ -137,15 +137,15 @@
DWORD dwFrame = 0;
UINT16 wTrack;
- TRACE(cdaudio,"(%p, %08lX, %lu);\n", wmcda, wmcda->dwTimeFormat, dwTime);
+ TRACE("(%p, %08lX, %lu);\n", wmcda, wmcda->dwTimeFormat, dwTime);
switch (wmcda->dwTimeFormat) {
case MCI_FORMAT_MILLISECONDS:
dwFrame = (dwTime * CDFRAMES_PERSEC) / 1000;
- TRACE(cdaudio, "MILLISECONDS %lu\n", dwFrame);
+ TRACE("MILLISECONDS %lu\n", dwFrame);
break;
case MCI_FORMAT_MSF:
- TRACE(cdaudio, "MSF %02u:%02u:%02u\n",
+ TRACE("MSF %02u:%02u:%02u\n",
MCI_MSF_MINUTE(dwTime), MCI_MSF_SECOND(dwTime), MCI_MSF_FRAME(dwTime));
dwFrame += CDFRAMES_PERMIN * MCI_MSF_MINUTE(dwTime);
dwFrame += CDFRAMES_PERSEC * MCI_MSF_SECOND(dwTime);
@@ -155,10 +155,10 @@
default:
/* unknown format ! force TMSF ! ... */
wTrack = MCI_TMSF_TRACK(dwTime);
- TRACE(cdaudio, "MSF %02u-%02u:%02u:%02u\n",
+ TRACE("MSF %02u-%02u:%02u:%02u\n",
MCI_TMSF_TRACK(dwTime), MCI_TMSF_MINUTE(dwTime),
MCI_TMSF_SECOND(dwTime), MCI_TMSF_FRAME(dwTime));
- TRACE(cdaudio, "TMSF trackpos[%u]=%lu\n",
+ TRACE("TMSF trackpos[%u]=%lu\n",
wTrack, wmcda->wcda.lpdwTrackPos[wTrack - 1]);
dwFrame = wmcda->wcda.lpdwTrackPos[wTrack - 1];
dwFrame += CDFRAMES_PERMIN * MCI_TMSF_MINUTE(dwTime);
@@ -180,19 +180,19 @@
UINT16 wSeconds;
UINT16 wFrames;
- TRACE(cdaudio,"(%p, %08lX, %lu);\n", wmcda, wmcda->dwTimeFormat, dwFrame);
+ TRACE("(%p, %08lX, %lu);\n", wmcda, wmcda->dwTimeFormat, dwFrame);
switch (wmcda->dwTimeFormat) {
case MCI_FORMAT_MILLISECONDS:
dwTime = (dwFrame * 1000) / CDFRAMES_PERSEC;
- TRACE(cdaudio, "MILLISECONDS %lu\n", dwTime);
+ TRACE("MILLISECONDS %lu\n", dwTime);
break;
case MCI_FORMAT_MSF:
wMinutes = dwFrame / CDFRAMES_PERMIN;
wSeconds = (dwFrame - CDFRAMES_PERMIN * wMinutes) / CDFRAMES_PERSEC;
wFrames = dwFrame - CDFRAMES_PERMIN * wMinutes - CDFRAMES_PERSEC * wSeconds;
dwTime = MCI_MAKE_MSF(wMinutes, wSeconds, wFrames);
- TRACE(cdaudio,"MSF %02u:%02u:%02u -> dwTime=%lu\n",wMinutes, wSeconds, wFrames, dwTime);
+ TRACE("MSF %02u:%02u:%02u -> dwTime=%lu\n",wMinutes, wSeconds, wFrames, dwTime);
break;
case MCI_FORMAT_TMSF:
default:
@@ -207,7 +207,7 @@
wSeconds = (dwFrame - CDFRAMES_PERMIN * wMinutes) / CDFRAMES_PERSEC;
wFrames = dwFrame - CDFRAMES_PERMIN * wMinutes - CDFRAMES_PERSEC * wSeconds;
dwTime = MCI_MAKE_TMSF(wTrack, wMinutes, wSeconds, wFrames);
- TRACE(cdaudio, "%02u-%02u:%02u:%02u\n", wTrack, wMinutes, wSeconds, wFrames);
+ TRACE("%02u-%02u:%02u:%02u\n", wTrack, wMinutes, wSeconds, wFrames);
break;
}
return dwTime;
@@ -225,7 +225,7 @@
WINE_MCICDAUDIO* wmcda = CDAUDIO_drvGetDrv(wDevID);
MCI_SEEK_PARMS seekParms;
- TRACE(cdaudio,"(%04X, %08lX, %p);\n", wDevID, dwFlags, lpOpenParms);
+ TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpOpenParms);
if (lpOpenParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK;
if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID;
@@ -245,7 +245,7 @@
wmcda->fShareable = dwFlags & MCI_OPEN_SHAREABLE;
}
if (dwFlags & MCI_OPEN_ELEMENT) {
- TRACE(cdaudio,"MCI_OPEN_ELEMENT !\n");
+ TRACE("MCI_OPEN_ELEMENT !\n");
/* return MCIERR_NO_ELEMENT_ALLOWED; */
}
@@ -264,7 +264,7 @@
wmcda->mciMode = MCI_MODE_STOP;
wmcda->dwTimeFormat = MCI_FORMAT_TMSF;
if (!CDAUDIO_GetTracksInfo(&wmcda->wcda)) {
- WARN(cdaudio,"error reading TracksInfo !\n");
+ WARN("error reading TracksInfo !\n");
/* return MCIERR_INTERNAL; */
}
@@ -280,7 +280,7 @@
{
WINE_MCICDAUDIO* wmcda = CDAUDIO_mciGetOpenDrv(wDevID);
- TRACE(cdaudio,"(%04X, %08lX, %p);\n", wDevID, dwParam, lpParms);
+ TRACE("(%04X, %08lX, %p);\n", wDevID, dwParam, lpParms);
if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID;
@@ -300,12 +300,12 @@
static DWORD CDAUDIO_mciGetDevCaps(UINT16 wDevID, DWORD dwFlags,
LPMCI_GETDEVCAPS_PARMS lpParms)
{
- TRACE(cdaudio,"(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms);
+ TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms);
if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK;
if (dwFlags & MCI_GETDEVCAPS_ITEM) {
- TRACE(cdaudio, "MCI_GETDEVCAPS_ITEM dwItem=%08lX;\n", lpParms->dwItem);
+ TRACE("MCI_GETDEVCAPS_ITEM dwItem=%08lX;\n", lpParms->dwItem);
switch(lpParms->dwItem) {
case MCI_GETDEVCAPS_CAN_RECORD:
@@ -339,7 +339,7 @@
return MCIERR_UNRECOGNIZED_COMMAND;
}
}
- TRACE(cdaudio, "lpParms->dwReturn=%08lX;\n", lpParms->dwReturn);
+ TRACE("lpParms->dwReturn=%08lX;\n", lpParms->dwReturn);
return 0;
}
@@ -352,21 +352,21 @@
LPSTR str = 0;
WINE_MCICDAUDIO* wmcda = CDAUDIO_mciGetOpenDrv(wDevID);
- TRACE(cdaudio,"(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms);
+ TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms);
if (lpParms == NULL || lpParms->lpstrReturn == NULL) {
ret = MCIERR_NULL_PARAMETER_BLOCK;
} else if (wmcda == NULL) {
ret = MCIERR_INVALID_DEVICE_ID;
} else {
- TRACE(cdaudio, "buf=%p, len=%lu\n", lpParms->lpstrReturn, lpParms->dwRetSize);
+ TRACE("buf=%p, len=%lu\n", lpParms->lpstrReturn, lpParms->dwRetSize);
switch(dwFlags) {
case MCI_INFO_PRODUCT:
str = "Wine's audio CD";
break;
default:
- WARN(cdaudio, "Don't know this info command (%lu)\n", dwFlags);
+ WARN("Don't know this info command (%lu)\n", dwFlags);
ret = MCIERR_UNRECOGNIZED_COMMAND;
}
}
@@ -387,7 +387,7 @@
WINE_MCICDAUDIO* wmcda = CDAUDIO_mciGetOpenDrv(wDevID);
DWORD ret = 0;
- TRACE(cdaudio,"(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms);
+ TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms);
if (lpParms == NULL) {
ret = MCIERR_NULL_PARAMETER_BLOCK;
@@ -395,7 +395,7 @@
ret = MCIERR_INVALID_DEVICE_ID;
} else {
if (dwFlags & MCI_NOTIFY) {
- TRACE(cdaudio, "MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
+ TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
mciDriverNotify16((HWND16)LOWORD(lpParms->dwCallback),
wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
@@ -406,17 +406,17 @@
return CDAUDIO_mciGetError(wmcda);
}
lpParms->dwReturn = wmcda->wcda.nCurTrack;
- TRACE(cdaudio,"CURRENT_TRACK=%lu!\n", lpParms->dwReturn);
+ TRACE("CURRENT_TRACK=%lu!\n", lpParms->dwReturn);
return 0;
case MCI_STATUS_LENGTH:
if (wmcda->wcda.nTracks == 0) {
if (!CDAUDIO_GetTracksInfo(&wmcda->wcda)) {
- WARN(cdaudio, "error reading TracksInfo !\n");
+ WARN("error reading TracksInfo !\n");
return CDAUDIO_mciGetError(wmcda);
}
}
if (dwFlags & MCI_TRACK) {
- TRACE(cdaudio,"MCI_TRACK #%lu LENGTH=??? !\n", lpParms->dwTrack);
+ TRACE("MCI_TRACK #%lu LENGTH=??? !\n", lpParms->dwTrack);
if (lpParms->dwTrack > wmcda->wcda.nTracks || lpParms->dwTrack == 0)
return MCIERR_OUTOFRANGE;
lpParms->dwReturn = wmcda->wcda.lpdwTrackLen[lpParms->dwTrack - 1];
@@ -424,24 +424,24 @@
lpParms->dwReturn = wmcda->wcda.dwTotalLen;
}
lpParms->dwReturn = CDAUDIO_CalcTime(wmcda, lpParms->dwReturn);
- TRACE(cdaudio,"LENGTH=%lu !\n", lpParms->dwReturn);
+ TRACE("LENGTH=%lu !\n", lpParms->dwReturn);
return 0;
case MCI_STATUS_MODE:
if (!CDAUDIO_GetCDStatus(&wmcda->wcda))
return CDAUDIO_mciGetError(wmcda);
lpParms->dwReturn = CDAUDIO_mciMode(wmcda->wcda.cdaMode);
if (!lpParms->dwReturn) lpParms->dwReturn = wmcda->mciMode;
- TRACE(cdaudio,"MCI_STATUS_MODE=%08lX !\n", lpParms->dwReturn);
+ TRACE("MCI_STATUS_MODE=%08lX !\n", lpParms->dwReturn);
return 0;
case MCI_STATUS_MEDIA_PRESENT:
if (!CDAUDIO_GetCDStatus(&wmcda->wcda))
return CDAUDIO_mciGetError(wmcda);
lpParms->dwReturn = (wmcda->wcda.nTracks > 0) ? TRUE : FALSE;
- TRACE(cdaudio,"MCI_STATUS_MEDIA_PRESENT =%s!\n", lpParms->dwReturn ? "Y" : "N");
+ TRACE("MCI_STATUS_MEDIA_PRESENT =%s!\n", lpParms->dwReturn ? "Y" : "N");
return 0;
case MCI_STATUS_NUMBER_OF_TRACKS:
lpParms->dwReturn = CDAUDIO_GetNumberOfTracks(&wmcda->wcda);
- TRACE(cdaudio,"MCI_STATUS_NUMBER_OF_TRACKS = %lu !\n", lpParms->dwReturn);
+ TRACE("MCI_STATUS_NUMBER_OF_TRACKS = %lu !\n", lpParms->dwReturn);
if (lpParms->dwReturn == (WORD)-1)
return CDAUDIO_mciGetError(wmcda);
return 0;
@@ -451,25 +451,25 @@
lpParms->dwReturn = wmcda->wcda.dwCurFrame;
if (dwFlags & MCI_STATUS_START) {
lpParms->dwReturn = wmcda->wcda.dwFirstOffset;
- TRACE(cdaudio,"get MCI_STATUS_START !\n");
+ TRACE("get MCI_STATUS_START !\n");
}
if (dwFlags & MCI_TRACK) {
if (lpParms->dwTrack > wmcda->wcda.nTracks || lpParms->dwTrack == 0)
return MCIERR_OUTOFRANGE;
lpParms->dwReturn = wmcda->wcda.lpdwTrackPos[lpParms->dwTrack - 1];
- TRACE(cdaudio,"get MCI_TRACK #%lu !\n", lpParms->dwTrack);
+ TRACE("get MCI_TRACK #%lu !\n", lpParms->dwTrack);
}
lpParms->dwReturn = CDAUDIO_CalcTime(wmcda, lpParms->dwReturn);
- TRACE(cdaudio,"MCI_STATUS_POSITION=%08lX !\n", lpParms->dwReturn);
+ TRACE("MCI_STATUS_POSITION=%08lX !\n", lpParms->dwReturn);
return 0;
case MCI_STATUS_READY:
- TRACE(cdaudio,"MCI_STATUS_READY !\n");
+ TRACE("MCI_STATUS_READY !\n");
lpParms->dwReturn = (wmcda->wcda.cdaMode != WINE_CDA_DONTKNOW && wmcda->wcda.cdaMode != WINE_CDA_NOTREADY);
- TRACE(cdaudio,"MCI_STATUS_READY=%ld!\n", lpParms->dwReturn);
+ TRACE("MCI_STATUS_READY=%ld!\n", lpParms->dwReturn);
return 0;
case MCI_STATUS_TIME_FORMAT:
lpParms->dwReturn = wmcda->dwTimeFormat;
- TRACE(cdaudio,"MCI_STATUS_TIME_FORMAT =%08lx!\n", lpParms->dwReturn);
+ TRACE("MCI_STATUS_TIME_FORMAT =%08lx!\n", lpParms->dwReturn);
return 0;
case MCI_CDA_STATUS_TYPE_TRACK:
if (!(dwFlags & MCI_TRACK))
@@ -478,15 +478,15 @@
return MCIERR_OUTOFRANGE;
lpParms->dwReturn = (wmcda->wcda.lpbTrackFlags[lpParms->dwTrack - 1] &
CDROM_DATA_TRACK) ? MCI_CDA_TRACK_OTHER : MCI_CDA_TRACK_AUDIO;
- TRACE(cdaudio, "MCI_CDA_STATUS_TYPE_TRACK[%ld]=%08lx\n", lpParms->dwTrack, lpParms->dwReturn);
+ TRACE("MCI_CDA_STATUS_TYPE_TRACK[%ld]=%08lx\n", lpParms->dwTrack, lpParms->dwReturn);
return 0;
default:
- WARN(cdaudio, "unknown command %08lX !\n", lpParms->dwItem);
+ WARN("unknown command %08lX !\n", lpParms->dwItem);
return MCIERR_UNRECOGNIZED_COMMAND;
}
}
}
- WARN(cdaudio, "not MCI_STATUS_ITEM !\n");
+ WARN("not MCI_STATUS_ITEM !\n");
return 0;
}
@@ -499,7 +499,7 @@
WINE_MCICDAUDIO* wmcda = CDAUDIO_mciGetOpenDrv(wDevID);
DWORD ret = 0;
- TRACE(cdaudio,"(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms);
+ TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms);
if (lpParms == NULL) {
ret = MCIERR_NULL_PARAMETER_BLOCK;
@@ -508,7 +508,7 @@
} else {
if (wmcda->wcda.nTracks == 0) {
if (!CDAUDIO_GetTracksInfo(&wmcda->wcda)) {
- WARN(cdaudio, "error reading TracksInfo !\n");
+ WARN("error reading TracksInfo !\n");
return MCIERR_DRIVER_INTERNAL;
}
}
@@ -516,21 +516,21 @@
wmcda->wcda.nCurTrack = 1;
if (dwFlags & MCI_FROM) {
start = CDAUDIO_CalcFrame(wmcda, lpParms->dwFrom);
- TRACE(cdaudio,"MCI_FROM=%08lX -> %u \n", lpParms->dwFrom, start);
+ TRACE("MCI_FROM=%08lX -> %u \n", lpParms->dwFrom, start);
} else {
if (!CDAUDIO_GetCDStatus(&wmcda->wcda)) return MCIERR_DRIVER_INTERNAL;
start = wmcda->wcda.dwCurFrame;
}
if (dwFlags & MCI_TO) {
end = CDAUDIO_CalcFrame(wmcda, lpParms->dwTo);
- TRACE(cdaudio, "MCI_TO=%08lX -> %u \n", lpParms->dwTo, end);
+ TRACE("MCI_TO=%08lX -> %u \n", lpParms->dwTo, end);
}
if (CDAUDIO_Play(&wmcda->wcda, start, end) == -1)
return MCIERR_HARDWARE;
wmcda->mciMode = MCI_MODE_PLAY;
if (dwFlags & MCI_NOTIFY) {
- TRACE(cdaudio, "MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
+ TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
/*
mciDriverNotify((HWND16)LOWORD(lpParms->dwCallback),
wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
@@ -547,7 +547,7 @@
{
WINE_MCICDAUDIO* wmcda = CDAUDIO_mciGetOpenDrv(wDevID);
- TRACE(cdaudio,"(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms);
+ TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms);
if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID;
@@ -555,7 +555,7 @@
return MCIERR_HARDWARE;
wmcda->mciMode = MCI_MODE_STOP;
if (lpParms && (dwFlags & MCI_NOTIFY)) {
- TRACE(cdaudio, "MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
+ TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
mciDriverNotify16((HWND16)LOWORD(lpParms->dwCallback),
wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
@@ -569,7 +569,7 @@
{
WINE_MCICDAUDIO* wmcda = CDAUDIO_mciGetOpenDrv(wDevID);
- TRACE(cdaudio,"(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms);
+ TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms);
if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID;
@@ -577,7 +577,7 @@
return MCIERR_HARDWARE;
wmcda->mciMode = MCI_MODE_PAUSE;
if (lpParms && (dwFlags & MCI_NOTIFY)) {
- TRACE(cdaudio, "MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
+ TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
mciDriverNotify16((HWND16)LOWORD(lpParms->dwCallback),
wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
@@ -591,7 +591,7 @@
{
WINE_MCICDAUDIO* wmcda = CDAUDIO_mciGetOpenDrv(wDevID);
- TRACE(cdaudio,"(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms);
+ TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms);
if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID;
@@ -599,7 +599,7 @@
return MCIERR_HARDWARE;
wmcda->mciMode = MCI_MODE_STOP;
if (lpParms && (dwFlags & MCI_NOTIFY)) {
- TRACE(cdaudio, "MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
+ TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
mciDriverNotify16((HWND16)LOWORD(lpParms->dwCallback),
wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
@@ -614,7 +614,7 @@
DWORD at;
WINE_MCICDAUDIO* wmcda = CDAUDIO_mciGetOpenDrv(wDevID);
- TRACE(cdaudio,"(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms);
+ TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms);
if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID;
if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK;
@@ -622,26 +622,26 @@
wmcda->mciMode = MCI_MODE_SEEK;
switch (dwFlags & ~(MCI_NOTIFY|MCI_WAIT)) {
case MCI_SEEK_TO_START:
- TRACE(cdaudio, "Seeking to start\n");
+ TRACE("Seeking to start\n");
at = 0;
break;
case MCI_SEEK_TO_END:
- TRACE(cdaudio, "Seeking to end\n");
+ TRACE("Seeking to end\n");
at = wmcda->wcda.dwTotalLen;
break;
case MCI_TO:
- TRACE(cdaudio, "Seeking to %lu\n", lpParms->dwTo);
+ TRACE("Seeking to %lu\n", lpParms->dwTo);
at = lpParms->dwTo;
break;
default:
- TRACE(cdaudio, "Seeking to ??=%lu\n", dwFlags);
+ TRACE("Seeking to ??=%lu\n", dwFlags);
return MCIERR_UNSUPPORTED_FUNCTION;
}
if (CDAUDIO_Seek(&wmcda->wcda, at) == -1) {
return MCIERR_HARDWARE;
}
if (dwFlags & MCI_NOTIFY) {
- TRACE(cdaudio, "MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
+ TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback);
mciDriverNotify16((HWND16)LOWORD(lpParms->dwCallback),
wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
}
@@ -655,7 +655,7 @@
{
WINE_MCICDAUDIO* wmcda = CDAUDIO_mciGetOpenDrv(wDevID);
- TRACE(cdaudio, "(%04x, %s) !\n", wDevID, (open) ? "OPEN" : "CLOSE");
+ TRACE("(%04x, %s) !\n", wDevID, (open) ? "OPEN" : "CLOSE");
if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID;
@@ -672,7 +672,7 @@
{
WINE_MCICDAUDIO* wmcda = CDAUDIO_mciGetOpenDrv(wDevID);
- TRACE(cdaudio,"(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms);
+ TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms);
if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID;
if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK;;
@@ -683,16 +683,16 @@
if (dwFlags & MCI_SET_TIME_FORMAT) {
switch (lpParms->dwTimeFormat) {
case MCI_FORMAT_MILLISECONDS:
- TRACE(cdaudio, "MCI_FORMAT_MILLISECONDS !\n");
+ TRACE("MCI_FORMAT_MILLISECONDS !\n");
break;
case MCI_FORMAT_MSF:
- TRACE(cdaudio,"MCI_FORMAT_MSF !\n");
+ TRACE("MCI_FORMAT_MSF !\n");
break;
case MCI_FORMAT_TMSF:
- TRACE(cdaudio,"MCI_FORMAT_TMSF !\n");
+ TRACE("MCI_FORMAT_TMSF !\n");
break;
default:
- WARN(cdaudio, "bad time format !\n");
+ WARN("bad time format !\n");
return MCIERR_BAD_TIME_FORMAT;
}
wmcda->dwTimeFormat = lpParms->dwTimeFormat;
@@ -707,7 +707,7 @@
if (dwFlags & MCI_SET_ON) return MCIERR_UNSUPPORTED_FUNCTION;
if (dwFlags & MCI_SET_OFF) return MCIERR_UNSUPPORTED_FUNCTION;
if (dwFlags & MCI_NOTIFY) {
- TRACE(cdaudio, "MCI_NOTIFY_SUCCESSFUL %08lX !\n",
+ TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n",
lpParms->dwCallback);
mciDriverNotify16((HWND16)LOWORD(lpParms->dwCallback),
wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL);
@@ -763,14 +763,14 @@
case MCI_CUT:
case MCI_DELETE:
case MCI_PASTE:
- WARN(cdaudio, "Unsupported command=%s\n", MCI_CommandToString(wMsg));
+ WARN("Unsupported command=%s\n", MCI_CommandToString(wMsg));
break;
case MCI_OPEN:
case MCI_CLOSE:
- FIXME(cdaudio, "Shouldn't receive a MCI_OPEN or CLOSE message\n");
+ FIXME("Shouldn't receive a MCI_OPEN or CLOSE message\n");
break;
default:
- TRACE(cdaudio, "Sending msg=%s to default driver proc\n", MCI_CommandToString(wMsg));
+ TRACE("Sending msg=%s to default driver proc\n", MCI_CommandToString(wMsg));
return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
}
return MCIERR_UNRECOGNIZED_COMMAND;
diff --git a/multimedia/mcistring.c b/multimedia/mcistring.c
index b5af30e..07b3b06 100644
--- a/multimedia/mcistring.c
+++ b/multimedia/mcistring.c
@@ -27,7 +27,7 @@
#include "user.h"
#include "driver.h"
#include "callback.h"
-#include "debug.h"
+#include "debugtools.h"
#include "xmalloc.h"
DEFAULT_DEBUG_CHANNEL(mci)
@@ -50,10 +50,10 @@
*/
#define _MCI_STR(s) \
do { \
- TRACE(mci, "-> returns '%s'\n", s); \
+ TRACE("-> returns '%s'\n", s); \
if (lpstrReturnString) { \
lstrcpynA(lpstrReturnString, s, uReturnLength); \
- TRACE(mci, "--> '%s'\n", lpstrReturnString); \
+ TRACE("--> '%s'\n", lpstrReturnString); \
} \
} while(0)
@@ -103,7 +103,7 @@
MCI_TMSF_FRAME(val));
break;
default:
- FIXME(mci, "missing timeformat for %ld, report.\n", timef);
+ FIXME("missing timeformat for %ld, report.\n", timef);
strcpy(buf, "0"); /* hmm */
break;
}
@@ -139,7 +139,7 @@
case MCI_SEQ_SMPTE: _MCI_STR("smpte"); break;
case MCI_SEQ_FILE: _MCI_STR("file"); break;
case MCI_SEQ_MIDI: _MCI_STR("midi"); break;
- default:FIXME(mci, "missing sequencer mode %ld\n", dwReturn);
+ default:FIXME("missing sequencer mode %ld\n", dwReturn);
}
break;
case _MCISTR_mode:
@@ -182,7 +182,7 @@
case MCI_FORMAT_MSF: _MCI_STR("msf"); break;
case MCI_FORMAT_TMSF: _MCI_STR("tmsf"); break;
default:
- FIXME(mci, "missing timefmt for %d, report.\n", timef);
+ FIXME("missing timefmt for %d, report.\n", timef);
break;
}
break;
@@ -207,12 +207,12 @@
case MCI_DEVTYPE_OTHER: _MCI_STR("other"); break;
case MCI_DEVTYPE_WAVEFORM_AUDIO:_MCI_STR("waveform audio"); break;
case MCI_DEVTYPE_SEQUENCER: _MCI_STR("sequencer"); break;
- default:FIXME(mci, "unknown device type %ld, report.\n",
+ default:FIXME("unknown device type %ld, report.\n",
dwReturn);break;
}
break;
default:
- FIXME(mci, "unknown resulttype %d, report.\n", type);
+ FIXME("unknown resulttype %d, report.\n", type);
break;
}
}
@@ -361,7 +361,7 @@
} else if (sscanf(keywords[i+1], "%ld", &st)) {
pU->animopenParams.dwStyle |= st;
} else
- FIXME(mci, "unknown 'style' keyword %s, please report.\n", keywords[i+1]);
+ FIXME("unknown 'style' keyword %s, please report.\n", keywords[i+1]);
i += 2;
continue;
}
@@ -387,7 +387,7 @@
} else if (sscanf(keywords[i+1], "%ld", &st)) {
pU->dgvopenParams.dwStyle |= st;
} else
- FIXME(mci, "unknown 'style' keyword %s, please report.\n", keywords[i+1]);
+ FIXME("unknown 'style' keyword %s, please report.\n", keywords[i+1]);
i += 2;
continue;
}
@@ -419,13 +419,13 @@
} else if (sscanf(keywords[i+1], "%ld", &st)) {
pU->ovlyopenParams.dwStyle |= st;
} else
- FIXME(mci, "unknown 'style' keyword %s, please report.\n", keywords[i+1]);
+ FIXME("unknown 'style' keyword %s, please report.\n", keywords[i+1]);
i += 2;
continue;
}
break;
}
- FIXME(mci, "unknown parameter passed %s, please report.\n",
+ FIXME("unknown parameter passed %s, please report.\n",
keywords[i]);
i++;
}
@@ -775,7 +775,7 @@
ITEM2("window", "maximized",MCI_DGV_STATUS_WINDOW_MAXIMIZED , _MCISTR_bool);
break;
}
- FIXME(mci, "unknown keyword '%s'\n", keywords[i]);
+ FIXME("unknown keyword '%s'\n", keywords[i]);
i++;
}
if (!pU->statusParams.dwItem)
@@ -1251,7 +1251,7 @@
parsestr="%d:%d:%d:%d";
nrargs=4;
break;
- default:FIXME(mci, "unknown timeformat %d, please report.\n", timef);
+ default:FIXME("unknown timeformat %d, please report.\n", timef);
parsestr="%d";
nrargs=1;
break;
@@ -1345,7 +1345,7 @@
parsestr="%d:%d:%d:%d";
nrargs=4;
break;
- default:FIXME(mci, "unknown timeformat %d, please report.\n", timef);
+ default:FIXME("unknown timeformat %d, please report.\n", timef);
parsestr="%d";
nrargs=1;
break;
@@ -1448,7 +1448,7 @@
nrargs=4;
break;
default:
- FIXME(mci, "unknown timeformat %d, please report.\n", timef);
+ FIXME("unknown timeformat %d, please report.\n", timef);
parsestr="%d";
nrargs=1;
break;
@@ -1775,7 +1775,7 @@
parsestr="%d:%d:%d:%d";
nrargs=4;
break;
- default:FIXME(mci, "unknown timeformat %d, please report.\n", timef);
+ default:FIXME("unknown timeformat %d, please report.\n", timef);
parsestr="%d";
nrargs=1;
break;
@@ -2542,7 +2542,7 @@
DWORD dwFlags;
int res = 0, i, nrofkeywords;
- TRACE(mci, "('%s', %p, %d, %X)\n",
+ TRACE("('%s', %p, %d, %X)\n",
lpstrCommand, lpstrReturnString, uReturnLength, hwndCallback);
/* format is <command> <device> <optargs> */
@@ -2591,7 +2591,7 @@
*s = '\0';
while (*++s == ' ');
}
- TRACE(mci, "[%d] => '%s'\n", i-1, keywords[i-1]);
+ TRACE("[%d] => '%s'\n", i-1, keywords[i-1]);
}
keywords[i] = NULL;
} else {
@@ -2620,7 +2620,7 @@
if (STRCMP(cmd, "open") != 0) {
wDevID = mciGetDeviceIDA(dev);
if (wDevID == 0) {
- TRACE(mci, "Device '%s' not found!\n", dev);
+ TRACE("Device '%s' not found!\n", dev);
res = MCIERR_INVALID_DEVICE_NAME;
goto the_end;
}
@@ -2639,7 +2639,7 @@
}
}
if (MCISTR_cmdtable[i].cmd == NULL) {
- FIXME(mci, "('%s', %p, %u, %X): unimplemented, please report.\n",
+ FIXME("('%s', %p, %u, %X): unimplemented, please report.\n",
lpstrCommand, lpstrReturnString, uReturnLength, hwndCallback);
res = MCIERR_MISSING_COMMAND_STRING;
}
@@ -2681,7 +2681,7 @@
char strRet[256];
DWORD ret;
- TRACE(mci, "(%s)!\n", lpstrCommand);
+ TRACE("(%s)!\n", lpstrCommand);
ret = mciSendString16(lpstrCommand, strRet, sizeof(strRet), 0);
if (ret != 0) {
diff --git a/multimedia/mmio.c b/multimedia/mmio.c
index 8380eb2..4394a73 100644
--- a/multimedia/mmio.c
+++ b/multimedia/mmio.c
@@ -15,7 +15,7 @@
#include "heap.h"
#include "file.h"
#include "mmsystem.h"
-#include "debug.h"
+#include "debugtools.h"
#include "xmalloc.h"
DEFAULT_DEBUG_CHANNEL(mmio)
@@ -24,7 +24,7 @@
* mmioDosIOProc [internal]
*/
static LRESULT mmioDosIOProc(LPMMIOINFO16 lpmmioinfo, UINT16 uMessage, LPARAM lParam1, LPARAM lParam2) {
- TRACE(mmio, "(%p, %X, %ld, %ld);\n", lpmmioinfo, uMessage, lParam1, lParam2);
+ TRACE("(%p, %X, %ld, %ld);\n", lpmmioinfo, uMessage, lParam1, lParam2);
switch (uMessage) {
@@ -40,7 +40,7 @@
LPSTR szFileName = (LPSTR) lParam1;
if (lpmmioinfo->dwFlags & MMIO_GETTEMP) {
- FIXME(mmio, "MMIO_GETTEMP not implemented\n");
+ FIXME("MMIO_GETTEMP not implemented\n");
return MMIOERR_CANNOTOPEN;
}
@@ -145,12 +145,12 @@
* Returns: zero on success, non-zero on failure
*/
- FIXME(mmio, "MMIOM_RENAME unimplemented\n");
+ FIXME("MMIOM_RENAME unimplemented\n");
return MMIOERR_FILENOTFOUND;
}
default:
- FIXME(mmio, "unexpected message %u\n", uMessage);
+ FIXME("unexpected message %u\n", uMessage);
return 0;
}
@@ -161,7 +161,7 @@
* mmioMemIOProc [internal]
*/
static LRESULT mmioMemIOProc(LPMMIOINFO16 lpmmioinfo, UINT16 uMessage, LPARAM lParam1, LPARAM lParam2) {
- TRACE(mmio,"(%p,0x%04x,0x%08lx,0x%08lx)\n",lpmmioinfo,uMessage,lParam1,lParam2);
+ TRACE("(%p,0x%04x,0x%08lx,0x%08lx)\n",lpmmioinfo,uMessage,lParam1,lParam2);
switch (uMessage) {
case MMIOM_OPEN: {
@@ -201,7 +201,7 @@
/* HPSTR pch = (HPSTR) lParam1; */
/* LONG cch = (LONG) lParam2; */
- FIXME(mmio,"MMIOM_READ on memory files should not occur, buffer may be lost!\n");
+ FIXME("MMIOM_READ on memory files should not occur, buffer may be lost!\n");
return 0;
}
@@ -220,7 +220,7 @@
/* HPSTR pch = (HPSTR) lParam1; */
/* LONG cch = (LONG) lParam2; */
- FIXME(mmio,"MMIOM_WRITE on memory files should not occur, buffer may be lost!\n");
+ FIXME("MMIOM_WRITE on memory files should not occur, buffer may be lost!\n");
return 0;
}
@@ -235,12 +235,12 @@
/* LONG Offset = (LONG) lParam1; */
/* LONG Whence = (LONG) lParam2; */
- FIXME(mmio,"MMIOM_SEEK on memory files should not occur, buffer may be lost!\n");
+ FIXME("MMIOM_SEEK on memory files should not occur, buffer may be lost!\n");
return -1;
}
default:
- FIXME(mmio, "unexpected message %u\n", uMessage);
+ FIXME("unexpected message %u\n", uMessage);
return 0;
}
@@ -257,7 +257,7 @@
HMMIO16 hmmio;
UINT16 result;
- TRACE(mmio, "('%s', %p, %08lX);\n", szFileName, lpmmioinfo, dwOpenFlags);
+ TRACE("('%s', %p, %08lX);\n", szFileName, lpmmioinfo, dwOpenFlags);
if (dwOpenFlags & MMIO_PARSE) {
char buffer[MAX_PATH];
@@ -366,7 +366,7 @@
LPMMIOINFO16 lpmminfo;
MMRESULT result;
- TRACE(mmio, "(%04X, %04X);\n", hmmio, uFlags);
+ TRACE("(%04X, %04X);\n", hmmio, uFlags);
lpmminfo = (LPMMIOINFO16) GlobalLock16(hmmio);
if (lpmminfo == NULL)
@@ -405,7 +405,7 @@
LONG count;
LPMMIOINFO16 lpmminfo;
- TRACE(mmio, "(%04X, %p, %ld);\n", hmmio, pch, cch);
+ TRACE("(%04X, %p, %ld);\n", hmmio, pch, cch);
lpmminfo = (LPMMIOINFO16)GlobalLock16(hmmio);
if (lpmminfo == NULL)
@@ -449,7 +449,7 @@
}
GlobalUnlock16(hmmio);
- TRACE(mmio, "count=%ld\n", count);
+ TRACE("count=%ld\n", count);
return count;
}
@@ -469,7 +469,7 @@
LONG count;
LPMMIOINFO16 lpmminfo;
- TRACE(mmio, "(%04X, %p, %ld);\n", hmmio, pch, cch);
+ TRACE("(%04X, %p, %ld);\n", hmmio, pch, cch);
lpmminfo = (LPMMIOINFO16)GlobalLock16(hmmio);
if (lpmminfo == NULL)
@@ -490,7 +490,7 @@
if (lpmminfo->fccIOProc==FOURCC_MEM) {
if (lpmminfo->adwInfo[0]) {
/* from where would we get the memory handle? */
- FIXME(mmio, "memory file expansion not implemented!\n");
+ FIXME("memory file expansion not implemented!\n");
} else break;
}
@@ -503,7 +503,7 @@
}
GlobalUnlock16(hmmio);
- TRACE(mmio, "count=%ld\n", count);
+ TRACE("count=%ld\n", count);
return count;
}
@@ -523,7 +523,7 @@
int offset;
LPMMIOINFO16 lpmminfo;
- TRACE(mmio, "(%04X, %08lX, %d);\n", hmmio, lOffset, iOrigin);
+ TRACE("(%04X, %08lX, %d);\n", hmmio, lOffset, iOrigin);
lpmminfo = (LPMMIOINFO16)GlobalLock16(hmmio);
if (lpmminfo == NULL)
@@ -566,7 +566,7 @@
UINT16 WINAPI mmioGetInfo16(HMMIO16 hmmio, MMIOINFO16 * lpmmioinfo, UINT16 uFlags)
{
LPMMIOINFO16 lpmminfo;
- TRACE(mmio, "mmioGetInfo\n");
+ TRACE("mmioGetInfo\n");
lpmminfo = (LPMMIOINFO16)GlobalLock16(hmmio);
if (lpmminfo == NULL) return 0;
memcpy(lpmmioinfo, lpmminfo, sizeof(MMIOINFO16));
@@ -583,7 +583,7 @@
LPMMIOINFO16 lpmminfo=&mmioinfo;
UINT16 ret;
- TRACE(mmio, "(0x%04x,%p,0x%08x)\n",hmmio,lpmmioinfo,uFlags);
+ TRACE("(0x%04x,%p,0x%08x)\n",hmmio,lpmmioinfo,uFlags);
ret = mmioGetInfo16(hmmio,&mmioinfo,uFlags);
if (!ret)
return 0;
@@ -612,7 +612,7 @@
UINT16 WINAPI mmioSetInfo16(HMMIO16 hmmio, const MMIOINFO16 * lpmmioinfo, UINT16 uFlags)
{
LPMMIOINFO16 lpmminfo;
- TRACE(mmio, "mmioSetInfo\n");
+ TRACE("mmioSetInfo\n");
lpmminfo = (LPMMIOINFO16)GlobalLock16(hmmio);
if (lpmminfo == NULL) return 0;
lpmminfo->pchNext = lpmmioinfo->pchNext;
@@ -627,7 +627,7 @@
UINT WINAPI mmioSetInfo(HMMIO hmmio, const MMIOINFO * lpmmioinfo, UINT uFlags)
{
LPMMIOINFO16 lpmminfo;
- TRACE(mmio, "mmioSetInfo\n");
+ TRACE("mmioSetInfo\n");
lpmminfo = (LPMMIOINFO16)GlobalLock16(hmmio);
if (lpmminfo == NULL) return 0;
lpmminfo->pchNext = lpmmioinfo->pchNext;
@@ -647,7 +647,7 @@
if (mmioFlush(hmmio, MMIO_EMPTYBUF) != 0)
return MMIOERR_CANNOTWRITE;
- TRACE(mmio, "(hmmio=%04x, pchBuf=%p, cchBuf=%ld, uFlags=%#08x)\n",
+ TRACE("(hmmio=%04x, pchBuf=%p, cchBuf=%ld, uFlags=%#08x)\n",
hmmio, pchBuffer, cchBuffer, uFlags);
lpmminfo = (LPMMIOINFO16)GlobalLock16(hmmio);
@@ -707,7 +707,7 @@
UINT WINAPI mmioFlush(HMMIO hmmio, UINT uFlags)
{
LPMMIOINFO16 lpmminfo;
- TRACE(mmio, "(%04X, %04X)\n", hmmio, uFlags);
+ TRACE("(%04X, %04X)\n", hmmio, uFlags);
lpmminfo = (LPMMIOINFO16)GlobalLock16(hmmio);
if (lpmminfo == NULL) return 0;
@@ -755,7 +755,7 @@
UINT WINAPI mmioAdvance(HMMIO hmmio,MMIOINFO*lpmmioinfo,UINT uFlags)
{
LPMMIOINFO16 lpmminfo;
- TRACE(mmio, "mmioAdvance\n");
+ TRACE("mmioAdvance\n");
lpmminfo = (LPMMIOINFO16)GlobalLock16(hmmio);
if (lpmminfo == NULL) return 0;
if (!lpmminfo->cchBuffer) {
@@ -789,7 +789,7 @@
UINT16 WINAPI mmioAdvance16(HMMIO16 hmmio,MMIOINFO16*lpmmioinfo,UINT16 uFlags)
{
LPMMIOINFO16 lpmminfo;
- TRACE(mmio, "mmioAdvance\n");
+ TRACE("mmioAdvance\n");
lpmminfo = (LPMMIOINFO16)GlobalLock16(hmmio);
if (lpmminfo == NULL) return 0;
if (!lpmminfo->cchBuffer) {
@@ -851,11 +851,11 @@
LPMMIOPROC16 WINAPI mmioInstallIOProc16(FOURCC fccIOProc,
LPMMIOPROC16 pIOProc, DWORD dwFlags)
{
- TRACE(mmio, "(%ld, %p, %08lX)\n",
+ TRACE("(%ld, %p, %08lX)\n",
fccIOProc, pIOProc, dwFlags);
if (dwFlags & MMIO_GLOBALPROC) {
- FIXME(mmio, " global procedures not implemented\n");
+ FIXME(" global procedures not implemented\n");
}
/* just handle the known procedures for now */
@@ -882,7 +882,7 @@
LPMMIOPROC WINAPI mmioInstallIOProcA(FOURCC fccIOProc,
LPMMIOPROC pIOProc, DWORD dwFlags)
{
- FIXME(mmio, "(%c%c%c%c,%p,0x%08lx) -- empty stub \n",
+ FIXME("(%c%c%c%c,%p,0x%08lx) -- empty stub \n",
(char)((fccIOProc&0xff000000)>>24),
(char)((fccIOProc&0x00ff0000)>>16),
(char)((fccIOProc&0x0000ff00)>> 8),
@@ -916,10 +916,10 @@
#endif
if (msg)
- TRACE(mmio, "(%04X, %s, %ld, %ld)\n",
+ TRACE("(%04X, %s, %ld, %ld)\n",
hmmio, msg, lParam1, lParam2);
else
- TRACE(mmio, "(%04X, %u, %ld, %ld)\n",
+ TRACE("(%04X, %u, %ld, %ld)\n",
hmmio, uMessage, lParam1, lParam2);
lpmminfo = (LPMMIOINFO16)GlobalLock16(hmmio);
@@ -944,19 +944,19 @@
MMCKINFO searchcki;
char ckid[5],fcc[5];
- TRACE(mmio,"(%04X, %p, %p, %04X);\n",hmmio,lpck,lpckParent,uFlags);
+ TRACE("(%04X, %p, %p, %04X);\n",hmmio,lpck,lpckParent,uFlags);
if (lpck == NULL)
return MMSYSERR_INVALPARAM;
dwOldPos = mmioSeek(hmmio, 0, SEEK_CUR);
- TRACE(mmio, "dwOldPos=%ld\n", dwOldPos);
+ TRACE("dwOldPos=%ld\n", dwOldPos);
if (lpckParent != NULL) {
- TRACE(mmio, "seek inside parent at %ld !\n", lpckParent->dwDataOffset);
+ TRACE("seek inside parent at %ld !\n", lpckParent->dwDataOffset);
/* EPP: was dwOldPos = mmioSeek(hmmio,lpckParent->dwDataOffset,SEEK_SET); */
if (dwOldPos < lpckParent->dwDataOffset || dwOldPos >= lpckParent->dwDataOffset + lpckParent->cksize) {
- ERR(mmio, "outside parent chunk\n");
+ ERR("outside parent chunk\n");
return MMIOERR_CHUNKNOTFOUND;
}
}
@@ -980,7 +980,7 @@
}
memcpy(&fcc,&(searchcki.fccType),4);fcc[4]=0;
memcpy(&ckid,&(searchcki.ckid),4);ckid[4]=0;
- TRACE(mmio,"searching for %s.%s\n",ckid,searchcki.fccType?fcc:"<any>");
+ TRACE("searching for %s.%s\n",ckid,searchcki.fccType?fcc:"<any>");
if (uFlags & (MMIO_FINDCHUNK|MMIO_FINDLIST|MMIO_FINDRIFF)) {
while (TRUE) {
@@ -989,18 +989,18 @@
ix = mmioRead(hmmio, (LPSTR)lpck, 3 * sizeof(DWORD));
if (ix < 2*sizeof(DWORD)) {
mmioSeek(hmmio, dwOldPos, SEEK_SET);
- WARN(mmio, "return ChunkNotFound\n");
+ WARN("return ChunkNotFound\n");
return MMIOERR_CHUNKNOTFOUND;
}
lpck->dwDataOffset = dwOldPos + 2 * sizeof(DWORD);
if (ix < lpck->dwDataOffset - dwOldPos) {
mmioSeek(hmmio, dwOldPos, SEEK_SET);
- WARN(mmio, "return ChunkNotFound\n");
+ WARN("return ChunkNotFound\n");
return MMIOERR_CHUNKNOTFOUND;
}
memcpy(ckid,&lpck->ckid,4);
memcpy(fcc,&lpck->fccType,4);
- TRACE(mmio, "ckid=%s fcc=%s cksize=%08lX !\n",
+ TRACE("ckid=%s fcc=%s cksize=%08lX !\n",
ckid, searchcki.fccType?fcc:"<unused>",
lpck->cksize);
if ((searchcki.ckid == lpck->ckid) &&
@@ -1023,7 +1023,7 @@
/* FIXME: unverified, does it do this? */
if (mmioRead(hmmio, (LPSTR)lpck, 3 * sizeof(DWORD)) < 3 * sizeof(DWORD)) {
mmioSeek(hmmio, dwOldPos, SEEK_SET);
- WARN(mmio, "return ChunkNotFound 2nd\n");
+ WARN("return ChunkNotFound 2nd\n");
return MMIOERR_CHUNKNOTFOUND;
}
lpck->dwDataOffset = dwOldPos + 2 * sizeof(DWORD);
@@ -1033,9 +1033,9 @@
}
mmioSeek(hmmio, lpck->dwDataOffset, SEEK_SET);
memcpy(ckid,&(lpck->ckid),4);
- TRACE(mmio, "lpck->ckid=%s lpck->cksize=%ld !\n", ckid, lpck->cksize);
+ TRACE("lpck->ckid=%s lpck->cksize=%ld !\n", ckid, lpck->cksize);
memcpy(fcc,&(lpck->fccType),4);
- TRACE(mmio, "lpck->fccType=%08lX (%s)!\n", lpck->fccType,searchcki.fccType?fcc:"");
+ TRACE("lpck->fccType=%08lX (%s)!\n", lpck->fccType,searchcki.fccType?fcc:"");
return 0;
}
@@ -1044,23 +1044,23 @@
*/
UINT WINAPI mmioAscend(HMMIO hmmio, MMCKINFO * lpck, UINT uFlags)
{
- TRACE(mmio, "(%04X, %p, %04X);\n",
+ TRACE("(%04X, %p, %04X);\n",
hmmio, lpck, uFlags);
if (lpck->dwFlags&MMIO_DIRTY) {
DWORD dwOldPos, dwNewSize, dwSizePos;
- TRACE(mmio, "chunk is marked MMIO_DIRTY, correcting chunk size\n");
+ TRACE("chunk is marked MMIO_DIRTY, correcting chunk size\n");
dwOldPos = mmioSeek(hmmio, 0, SEEK_CUR);
- TRACE(mmio, "dwOldPos=%ld\n", dwOldPos);
+ TRACE("dwOldPos=%ld\n", dwOldPos);
dwNewSize = dwOldPos - lpck->dwDataOffset;
if (dwNewSize != lpck->cksize) {
- TRACE(mmio, "dwNewSize=%ld\n", dwNewSize);
+ TRACE("dwNewSize=%ld\n", dwNewSize);
lpck->cksize = dwNewSize;
dwSizePos = lpck->dwDataOffset - sizeof(DWORD);
if (lpck->ckid == FOURCC_RIFF || lpck->ckid == FOURCC_LIST)
dwSizePos -= sizeof(DWORD);
- TRACE(mmio, "dwSizePos=%ld\n", dwSizePos);
+ TRACE("dwSizePos=%ld\n", dwSizePos);
mmioSeek(hmmio, dwSizePos, SEEK_SET);
mmioWrite(hmmio, (LPSTR)&dwNewSize, sizeof(DWORD));
@@ -1087,18 +1087,18 @@
DWORD dwOldPos;
LONG ix;
- TRACE(mmio, "(%04X, %p, %04X);\n",
+ TRACE("(%04X, %p, %04X);\n",
hmmio, lpck, uFlags);
dwOldPos = mmioSeek(hmmio, 0, SEEK_CUR);
- TRACE(mmio, "dwOldPos=%ld\n", dwOldPos);
+ TRACE("dwOldPos=%ld\n", dwOldPos);
if (uFlags == MMIO_CREATELIST)
lpck->ckid = FOURCC_LIST;
else if (uFlags == MMIO_CREATERIFF)
lpck->ckid = FOURCC_RIFF;
- TRACE(mmio, "ckid=%08lX\n", lpck->ckid);
+ TRACE("ckid=%08lX\n", lpck->ckid);
lpck->dwDataOffset = dwOldPos + 2 * sizeof(DWORD);
if (lpck->ckid == FOURCC_RIFF || lpck->ckid == FOURCC_LIST)
@@ -1106,11 +1106,11 @@
lpck->dwFlags = MMIO_DIRTY;
ix = mmioWrite(hmmio, (LPSTR)lpck, lpck->dwDataOffset - dwOldPos);
- TRACE(mmio, "after mmioWrite ix = %ld req = %ld, errno = %d\n",ix,lpck->dwDataOffset - dwOldPos,errno);
+ TRACE("after mmioWrite ix = %ld req = %ld, errno = %d\n",ix,lpck->dwDataOffset - dwOldPos,errno);
if (ix < lpck->dwDataOffset - dwOldPos) {
mmioSeek(hmmio, dwOldPos, SEEK_SET);
- WARN(mmio, "return CannotWrite\n");
+ WARN("return CannotWrite\n");
return MMIOERR_CANNOTWRITE;
}
@@ -1135,7 +1135,7 @@
LPMMIOINFO16 lpmminfo;
HMMIO16 hmmio;
- TRACE(mmio, "('%s', '%s', %p, %08lX);\n",
+ TRACE("('%s', '%s', %p, %08lX);\n",
szFileName, szNewFileName, lpmmioinfo, dwRenameFlags);
hmmio = GlobalAlloc16(GHND, sizeof(MMIOINFO16));
@@ -1173,7 +1173,7 @@
UINT WINAPI mmioRenameA(LPCSTR szFileName, LPCSTR szNewFileName,
MMIOINFO* lpmmioinfo, DWORD dwRenameFlags)
{
- FIXME(mmio, "This may fail\n");
+ FIXME("This may fail\n");
return mmioRename16(szFileName, szNewFileName, (MMIOINFO16*)lpmmioinfo, dwRenameFlags);
}
diff --git a/multimedia/msvideo.c b/multimedia/msvideo.c
index d3c372b..7eb9263 100644
--- a/multimedia/msvideo.c
+++ b/multimedia/msvideo.c
@@ -10,7 +10,7 @@
#include "vfw.h"
#include "wine/winestring.h"
#include "driver.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(msvideo)
@@ -40,7 +40,7 @@
char type[5],buf[2000];
memcpy(type,&fccType,4);type[4]=0;
- TRACE(msvideo,"(%s,%ld,%p).\n",type,fccHandler,lpicinfo);
+ TRACE("(%s,%ld,%p).\n",type,fccHandler,lpicinfo);
/* does OpenDriver/CloseDriver */
lpicinfo->dwSize = sizeof(ICINFO);
lpicinfo->fccType = fccType;
@@ -73,7 +73,7 @@
memcpy(type,&fccType,4);type[4]=0;
memcpy(handler,&fccHandler,4);handler[4]=0;
- TRACE(msvideo,"(%s,%s,0x%08lx)\n",type,handler,(DWORD)wMode);
+ TRACE("(%s,%s,0x%08lx)\n",type,handler,(DWORD)wMode);
sprintf(codecname,"%s.%s",type,handler);
/* Well, lParam2 is in fact a LPVIDEO_OPEN_PARMS, but it has the
@@ -108,7 +108,7 @@
memcpy(type,&fccType,4);type[4]=0;
memcpy(handler,&fccHandler,4);handler[4]=0;
- FIXME(msvideo,"(%s,%s,%d,%p), stub!\n",type,handler,wMode,lpfnHandler);
+ FIXME("(%s,%s,%d,%p), stub!\n",type,handler,wMode,lpfnHandler);
hic = ICOpen(fccType,fccHandler,wMode);
if (!hic)
return hic;
@@ -122,9 +122,9 @@
ICGetInfo(HIC hic,ICINFO *picinfo,DWORD cb) {
LRESULT ret;
- TRACE(msvideo,"(0x%08lx,%p,%ld)\n",(DWORD)hic,picinfo,cb);
+ TRACE("(0x%08lx,%p,%ld)\n",(DWORD)hic,picinfo,cb);
ret = ICSendMessage(hic,ICM_GETINFO,(DWORD)picinfo,cb);
- TRACE(msvideo," -> 0x%08lx\n",ret);
+ TRACE(" -> 0x%08lx\n",ret);
return ret;
}
@@ -150,7 +150,7 @@
querymsg = ICM_DRAW_QUERY;
break;
default:
- FIXME(msvideo,"Unknown mode (%d)\n",wMode);
+ FIXME("Unknown mode (%d)\n",wMode);
return 0;
}
@@ -168,7 +168,7 @@
if (hic)
return hic;
}
- FIXME(msvideo,"(%s,%s,%p,%p,0x%04x),unhandled!\n",type,handler,lpbiIn,lpbiOut,wMode);
+ FIXME("(%s,%s,%p,%p,0x%04x),unhandled!\n",type,handler,lpbiIn,lpbiOut,wMode);
return 0;
}
@@ -179,7 +179,7 @@
HIC tmphic = hic;
LRESULT lres;
- FIXME(msvideo,"(0x%08lx,%p,%p,%d,%d,%d),stub!\n",(DWORD)hic,lpbiIn,lpbiOut,depth,dx,dy);
+ FIXME("(0x%08lx,%p,%p,%d,%d,%d),stub!\n",(DWORD)hic,lpbiIn,lpbiOut,depth,dx,dy);
if (!tmphic) {
tmphic=ICLocate(ICTYPE_VIDEO,0,lpbiIn,NULL,ICMODE_DECOMPRESS);
if (!tmphic)
@@ -260,7 +260,7 @@
LRESULT ret;
WINE_HIC *whic = (WINE_HIC*)hic;
-#define XX(x) case x: TRACE(msvideo,"(0x%08lx,"#x",0x%08lx,0x%08lx)\n",(DWORD)hic,lParam1,lParam2);break;
+#define XX(x) case x: TRACE("(0x%08lx,"#x",0x%08lx,0x%08lx)\n",(DWORD)hic,lParam1,lParam2);break;
switch (msg) {
XX(ICM_ABOUT)
@@ -304,16 +304,16 @@
XX(ICM_DECOMPRESSEX_END)
XX(ICM_SET_STATUS_PROC)
default:
- FIXME(msvideo,"(0x%08lx,0x%08lx,0x%08lx,0x%08lx)\n",(DWORD)hic,(DWORD)msg,lParam1,lParam2);
+ FIXME("(0x%08lx,0x%08lx,0x%08lx,0x%08lx)\n",(DWORD)hic,(DWORD)msg,lParam1,lParam2);
}
#if 0
if (whic->driverproc) {
- FIXME(msvideo,"(0x%08lx,0x%08lx,0x%08lx,0x%08lx), calling %p\n",(DWORD)hic,(DWORD)msg,lParam1,lParam2,whic->driverproc);
+ FIXME("(0x%08lx,0x%08lx,0x%08lx,0x%08lx), calling %p\n",(DWORD)hic,(DWORD)msg,lParam1,lParam2,whic->driverproc);
ret = whic->driverproc(whic->hdrv,1,msg,lParam1,lParam2);
} else
#endif
ret = SendDriverMessage(whic->hdrv,msg,lParam1,lParam2);
- TRACE(msvideo," -> 0x%08lx\n",ret);
+ TRACE(" -> 0x%08lx\n",ret);
return ret;
}
@@ -370,7 +370,7 @@
LRESULT WINAPI ICClose(HIC hic) {
WINE_HIC *whic = (WINE_HIC*)hic;
- TRACE(msvideo,"(%d).\n",hic);
+ TRACE("(%d).\n",hic);
/* FIXME: correct? */
CloseDriver(whic->hdrv,0,0);
HeapFree(GetProcessHeap(),0,whic);
@@ -379,7 +379,7 @@
HANDLE /* HDRAWDIB */ WINAPI
DrawDibOpen( void ) {
- FIXME(msvideo,"stub!\n");
+ FIXME("stub!\n");
return 0xdead;
}
@@ -391,7 +391,7 @@
INT dxSrc,
INT dySrc,
UINT wFlags) {
- FIXME(msvideo,"(%d,0x%lx,%d,%d,%p,%d,%d,0x%08lx), stub!\n",
+ FIXME("(%d,0x%lx,%d,%d,%p,%d,%d,0x%08lx), stub!\n",
hdd,(DWORD)hdc,dxDst,dyDst,lpbi,dxSrc,dySrc,(DWORD)wFlags
);
return TRUE;
@@ -400,28 +400,28 @@
BOOL VFWAPI
DrawDibSetPalette(HANDLE /*HDRAWDIB*/ hdd, HPALETTE hpal) {
- FIXME(msvideo,"(%d,%d),stub!\n",hdd,hpal);
+ FIXME("(%d,%d),stub!\n",hdd,hpal);
return TRUE;
}
UINT VFWAPI DrawDibRealize(HANDLE /*HDRAWDIB*/ hdd, HDC hdc, BOOL fBackground) {
- FIXME(msvideo,"(0x%08lx,0x%08lx,%d),stub!\n",(DWORD)hdd,(DWORD)hdc,fBackground);
+ FIXME("(0x%08lx,0x%08lx,%d),stub!\n",(DWORD)hdd,(DWORD)hdc,fBackground);
return 0;
}
HWND VFWAPIV MCIWndCreate (HWND hwndParent, HINSTANCE hInstance,
DWORD dwStyle,LPVOID szFile)
-{ FIXME(msvideo,"%x %x %lx %p\n",hwndParent, hInstance, dwStyle, szFile);
+{ FIXME("%x %x %lx %p\n",hwndParent, hInstance, dwStyle, szFile);
return 0;
}
HWND VFWAPIV MCIWndCreateA(HWND hwndParent, HINSTANCE hInstance,
DWORD dwStyle,LPCSTR szFile)
-{ FIXME(msvideo,"%x %x %lx %s\n",hwndParent, hInstance, dwStyle, szFile);
+{ FIXME("%x %x %lx %s\n",hwndParent, hInstance, dwStyle, szFile);
return 0;
}
HWND VFWAPIV MCIWndCreateW(HWND hwndParent, HINSTANCE hInstance,
DWORD dwStyle,LPCWSTR szFile)
-{ FIXME(msvideo,"%x %x %lx %s\n",hwndParent, hInstance, dwStyle, debugstr_w(szFile));
+{ FIXME("%x %x %lx %s\n",hwndParent, hInstance, dwStyle, debugstr_w(szFile));
return 0;
}
diff --git a/ole/antimoniker.c b/ole/antimoniker.c
index f2c1484..f0ae4e3 100644
--- a/ole/antimoniker.c
+++ b/ole/antimoniker.c
@@ -6,7 +6,7 @@
#include <assert.h>
#include "winerror.h"
-#include "debug.h"
+#include "debugtools.h"
#include "heap.h"
#include "winuser.h"
#include "file.h"
@@ -128,7 +128,7 @@
{
ICOM_THIS(AntiMonikerImpl,iface);
- TRACE(ole,"(%p,%p,%p)\n",This,riid,ppvObject);
+ TRACE("(%p,%p,%p)\n",This,riid,ppvObject);
/* Perform a sanity check on the parameters.*/
if ( (This==0) || (ppvObject==0) )
@@ -164,7 +164,7 @@
{
ICOM_THIS(AntiMonikerImpl,iface);
- TRACE(ole,"(%p)\n",This);
+ TRACE("(%p)\n",This);
return ++(This->ref);
}
@@ -176,7 +176,7 @@
{
ICOM_THIS(AntiMonikerImpl,iface);
- TRACE(ole,"(%p)\n",This);
+ TRACE("(%p)\n",This);
This->ref--;
@@ -195,7 +195,7 @@
******************************************************************************/
HRESULT WINAPI AntiMonikerImpl_GetClassID(const IMoniker* iface,CLSID *pClassID)
{
- TRACE(ole,"(%p,%p),stub!\n",iface,pClassID);
+ TRACE("(%p,%p),stub!\n",iface,pClassID);
if (pClassID==NULL)
return E_POINTER;
@@ -214,7 +214,7 @@
method in the OLE-provided moniker interfaces always return S_FALSE because
their internal state never changes. */
- TRACE(ole,"(%p)\n",iface);
+ TRACE("(%p)\n",iface);
return S_FALSE;
}
@@ -256,7 +256,7 @@
HRESULT WINAPI AntiMonikerImpl_GetSizeMax(IMoniker* iface,
ULARGE_INTEGER* pcbSize)/* Pointer to size of stream needed to save object */
{
- TRACE(ole,"(%p,%p)\n",iface,pcbSize);
+ TRACE("(%p,%p)\n",iface,pcbSize);
if (pcbSize!=NULL)
return E_POINTER;
@@ -278,7 +278,7 @@
HRESULT WINAPI AntiMonikerImpl_Construct(AntiMonikerImpl* This)
{
- TRACE(ole,"(%p)\n",This);
+ TRACE("(%p)\n",This);
/* Initialize the virtual fgunction table. */
This->lpvtbl1 = &VT_AntiMonikerImpl;
@@ -293,7 +293,7 @@
*******************************************************************************/
HRESULT WINAPI AntiMonikerImpl_Destroy(AntiMonikerImpl* This)
{
- TRACE(ole,"(%p)\n",This);
+ TRACE("(%p)\n",This);
return HeapFree(GetProcessHeap(),0,This);
}
@@ -307,7 +307,7 @@
REFIID riid,
VOID** ppvResult)
{
- TRACE(ole,"(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult);
+ TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult);
return E_NOTIMPL;
}
@@ -320,7 +320,7 @@
REFIID riid,
VOID** ppvResult)
{
- TRACE(ole,"(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult);
+ TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult);
return E_NOTIMPL;
}
@@ -333,7 +333,7 @@
IMoniker** ppmkToLeft,
IMoniker** ppmkReduced)
{
- TRACE(ole,"(%p,%p,%ld,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced);
+ TRACE("(%p,%p,%ld,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced);
if (ppmkReduced==NULL)
return E_POINTER;
@@ -353,7 +353,7 @@
IMoniker** ppmkComposite)
{
- TRACE(ole,"(%p,%p,%d,%p)\n",iface,pmkRight,fOnlyIfNotGeneric,ppmkComposite);
+ TRACE("(%p,%p,%d,%p)\n",iface,pmkRight,fOnlyIfNotGeneric,ppmkComposite);
if ((ppmkComposite==NULL)||(pmkRight==NULL))
return E_POINTER;
@@ -371,7 +371,7 @@
******************************************************************************/
HRESULT WINAPI AntiMonikerImpl_Enum(IMoniker* iface,BOOL fForward, IEnumMoniker** ppenumMoniker)
{
- TRACE(ole,"(%p,%d,%p)\n",iface,fForward,ppenumMoniker);
+ TRACE("(%p,%d,%p)\n",iface,fForward,ppenumMoniker);
if (ppenumMoniker == NULL)
return E_POINTER;
@@ -388,7 +388,7 @@
{
DWORD mkSys;
- TRACE(ole,"(%p,%p)\n",iface,pmkOtherMoniker);
+ TRACE("(%p,%p)\n",iface,pmkOtherMoniker);
if (pmkOtherMoniker==NULL)
return S_FALSE;
@@ -425,7 +425,7 @@
IRunningObjectTable* rot;
HRESULT res;
- TRACE(ole,"(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pmkNewlyRunning);
+ TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pmkNewlyRunning);
if (pbc==NULL)
return E_INVALIDARG;
@@ -450,7 +450,7 @@
IMoniker* pmkToLeft,
FILETIME* pAntiTime)
{
- TRACE(ole,"(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pAntiTime);
+ TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pAntiTime);
return E_NOTIMPL;
}
@@ -459,7 +459,7 @@
******************************************************************************/
HRESULT WINAPI AntiMonikerImpl_Inverse(IMoniker* iface,IMoniker** ppmk)
{
- TRACE(ole,"(%p,%p)\n",iface,ppmk);
+ TRACE("(%p,%p)\n",iface,ppmk);
if (ppmk==NULL)
return E_POINTER;
@@ -497,7 +497,7 @@
******************************************************************************/
HRESULT WINAPI AntiMonikerImpl_RelativePathTo(IMoniker* iface,IMoniker* pmOther, IMoniker** ppmkRelPath)
{
- TRACE(ole,"(%p,%p,%p)\n",iface,pmOther,ppmkRelPath);
+ TRACE("(%p,%p,%p)\n",iface,pmOther,ppmkRelPath);
if (ppmkRelPath==NULL)
return E_POINTER;
@@ -519,13 +519,13 @@
{
WCHAR back[]={'\\','.','.',0};
- TRACE(ole,"(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,ppszDisplayName);
+ TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,ppszDisplayName);
if (ppszDisplayName==NULL)
return E_POINTER;
if (pmkToLeft!=NULL){
- FIXME(ole,"() pmkToLeft!=NULL not implemented \n");
+ FIXME("() pmkToLeft!=NULL not implemented \n");
return E_NOTIMPL;
}
@@ -549,7 +549,7 @@
ULONG* pchEaten,
IMoniker** ppmkOut)
{
- TRACE(ole,"(%p,%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pszDisplayName,pchEaten,ppmkOut);
+ TRACE("(%p,%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pszDisplayName,pchEaten,ppmkOut);
return E_NOTIMPL;
}
@@ -558,7 +558,7 @@
******************************************************************************/
HRESULT WINAPI AntiMonikerImpl_IsSystemMoniker(IMoniker* iface,DWORD* pwdMksys)
{
- TRACE(ole,"(%p,%p)\n",iface,pwdMksys);
+ TRACE("(%p,%p)\n",iface,pwdMksys);
if (!pwdMksys)
return E_POINTER;
@@ -576,7 +576,7 @@
ICOM_THIS_From_IROTData(IMoniker, iface);
- TRACE(ole,"(%p,%p,%p)\n",iface,riid,ppvObject);
+ TRACE("(%p,%p,%p)\n",iface,riid,ppvObject);
return AntiMonikerImpl_QueryInterface(This, riid, ppvObject);
}
@@ -588,7 +588,7 @@
{
ICOM_THIS_From_IROTData(IMoniker, iface);
- TRACE(ole,"(%p)\n",iface);
+ TRACE("(%p)\n",iface);
return AntiMonikerImpl_AddRef(This);
}
@@ -600,7 +600,7 @@
{
ICOM_THIS_From_IROTData(IMoniker, iface);
- TRACE(ole,"(%p)\n",iface);
+ TRACE("(%p)\n",iface);
return AntiMonikerImpl_Release(This);
}
@@ -613,7 +613,7 @@
ULONG cbMax,
ULONG* pcbData)
{
- FIXME(ole,"(),stub!\n");
+ FIXME("(),stub!\n");
return E_NOTIMPL;
}
@@ -626,7 +626,7 @@
HRESULT hr = S_OK;
IID riid=IID_IMoniker;
- TRACE(ole,"(%p)\n",ppmk);
+ TRACE("(%p)\n",ppmk);
newAntiMoniker = HeapAlloc(GetProcessHeap(), 0, sizeof(AntiMonikerImpl));
diff --git a/ole/bindctx.c b/ole/bindctx.c
index bb16312..97e9b1c 100644
--- a/ole/bindctx.c
+++ b/ole/bindctx.c
@@ -8,7 +8,7 @@
#include <assert.h>
#include "winerror.h"
#include "wine/obj_moniker.h"
-#include "debug.h"
+#include "debugtools.h"
#include "heap.h"
DEFAULT_DEBUG_CHANNEL(ole)
@@ -91,7 +91,7 @@
{
ICOM_THIS(BindCtxImpl,iface);
- TRACE(ole,"(%p,%p,%p)\n",This,riid,ppvObject);
+ TRACE("(%p,%p,%p)\n",This,riid,ppvObject);
/* Perform a sanity check on the parameters.*/
if ( (This==0) || (ppvObject==0) )
@@ -124,7 +124,7 @@
{
ICOM_THIS(BindCtxImpl,iface);
- TRACE(ole,"(%p)\n",This);
+ TRACE("(%p)\n",This);
return ++(This->ref);
}
@@ -136,7 +136,7 @@
{
ICOM_THIS(BindCtxImpl,iface);
- TRACE(ole,"(%p)\n",This);
+ TRACE("(%p)\n",This);
This->ref--;
@@ -158,7 +158,7 @@
*******************************************************************************/
HRESULT WINAPI BindCtxImpl_Construct(BindCtxImpl* This)
{
- TRACE(ole,"(%p)\n",This);
+ TRACE("(%p)\n",This);
/* Initialize the virtual function table.*/
This->lpvtbl = &VT_BindCtxImpl;
@@ -191,7 +191,7 @@
*******************************************************************************/
HRESULT WINAPI BindCtxImpl_Destroy(BindCtxImpl* This)
{
- TRACE(ole,"(%p)\n",This);
+ TRACE("(%p)\n",This);
/* free the table space memory */
HeapFree(GetProcessHeap(),0,This->bindCtxTable);
@@ -213,7 +213,7 @@
DWORD lastIndex=This->bindCtxTableLastIndex;
BindCtxObject cell;
- TRACE(ole,"(%p,%p)\n",This,punk);
+ TRACE("(%p,%p)\n",This,punk);
if (punk==NULL)
return E_POINTER;
@@ -230,7 +230,7 @@
if (lastIndex == This->bindCtxTableSize){ /* the table is full so it must be resized */
if (This->bindCtxTableSize > (MAX_TAB_SIZE-BLOCK_TAB_SIZE)){
- FIXME(ole,"This->bindCtxTableSize: %ld is out of data limite \n",This->bindCtxTableSize);
+ FIXME("This->bindCtxTableSize: %ld is out of data limite \n",This->bindCtxTableSize);
return E_FAIL;
}
@@ -253,7 +253,7 @@
ICOM_THIS(BindCtxImpl,iface);
- TRACE(ole,"(%p,%p)\n",This,punk);
+ TRACE("(%p,%p)\n",This,punk);
/* check if the object was registred or not */
if (BindCtxImpl_GetObjectIndex(This,punk,NULL,&index)==S_FALSE)
@@ -280,7 +280,7 @@
ICOM_THIS(BindCtxImpl,iface);
- TRACE(ole,"(%p)\n",This);
+ TRACE("(%p)\n",This);
for(i=0;i<This->bindCtxTableLastIndex;i++)
IUnknown_Release(This->bindCtxTable[i].pObj);
@@ -297,7 +297,7 @@
{
ICOM_THIS(BindCtxImpl,iface);
- TRACE(ole,"(%p,%p)\n",This,pbindopts);
+ TRACE("(%p,%p)\n",This,pbindopts);
if (pbindopts==NULL)
return E_POINTER;
@@ -314,7 +314,7 @@
{
ICOM_THIS(BindCtxImpl,iface);
- TRACE(ole,"(%p,%p)\n",This,pbindopts);
+ TRACE("(%p,%p)\n",This,pbindopts);
if (pbindopts==NULL)
return E_POINTER;
@@ -333,7 +333,7 @@
ICOM_THIS(BindCtxImpl,iface);
- TRACE(ole,"(%p,%p)\n",This,pprot);
+ TRACE("(%p,%p)\n",This,pprot);
if (pprot==NULL)
return E_POINTER;
@@ -350,7 +350,7 @@
{
ICOM_THIS(BindCtxImpl,iface);
- TRACE(ole,"(%p,%p,%p)\n",This,pszkey,punk);
+ TRACE("(%p,%p,%p)\n",This,pszkey,punk);
if (punk==NULL)
return E_INVALIDARG;
@@ -381,7 +381,7 @@
This->bindCtxTableSize+=BLOCK_TAB_SIZE; /* new table size */
if (This->bindCtxTableSize > (MAX_TAB_SIZE-BLOCK_TAB_SIZE)){
- FIXME(ole,"This->bindCtxTableSize: %ld is out of data limite \n",This->bindCtxTableSize);
+ FIXME("This->bindCtxTableSize: %ld is out of data limite \n",This->bindCtxTableSize);
return E_FAIL;
}
This->bindCtxTable = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,This->bindCtxTable,
@@ -399,7 +399,7 @@
DWORD index;
ICOM_THIS(BindCtxImpl,iface);
- TRACE(ole,"(%p,%p,%p)\n",This,pszkey,punk);
+ TRACE("(%p,%p,%p)\n",This,pszkey,punk);
if (punk==NULL)
return E_POINTER;
@@ -425,7 +425,7 @@
ICOM_THIS(BindCtxImpl,iface);
- TRACE(ole,"(%p,%p)\n",This,ppenum);
+ TRACE("(%p,%p)\n",This,ppenum);
if (BindCtxImpl_GetObjectIndex(This,NULL,ppenum,&index)==S_FALSE)
return E_FAIL;
@@ -447,7 +447,7 @@
******************************************************************************/
HRESULT WINAPI BindCtxImpl_EnumObjectParam(IBindCtx* iface,IEnumString** pszkey)
{
- FIXME(ole,"(%p,%p),stub!\n",iface,pszkey);
+ FIXME("(%p,%p),stub!\n",iface,pszkey);
return E_NOTIMPL;
}
@@ -463,7 +463,7 @@
DWORD i;
BYTE found=0;
- TRACE(ole,"(%p,%p,%p,%p)\n",This,punk,pszkey,index);
+ TRACE("(%p,%p,%p,%p)\n",This,punk,pszkey,index);
if (punk==NULL)
/* search object identified by a register key */
@@ -501,7 +501,7 @@
******************************************************************************/
HRESULT WINAPI CreateBindCtx16(DWORD reserved, LPBC * ppbc)
{
- FIXME(ole,"(%ld,%p),stub!\n",reserved,ppbc);
+ FIXME("(%ld,%p),stub!\n",reserved,ppbc);
return E_NOTIMPL;
}
@@ -514,7 +514,7 @@
HRESULT hr;
IID riid=IID_IBindCtx;
- TRACE(ole,"(%ld,%p)\n",reserved,ppbc);
+ TRACE("(%ld,%p)\n",reserved,ppbc);
newBindCtx = HeapAlloc(GetProcessHeap(), 0, sizeof(BindCtxImpl));
diff --git a/ole/compobj.c b/ole/compobj.c
index 450f8a8..c40d4c6 100644
--- a/ole/compobj.c
+++ b/ole/compobj.c
@@ -39,7 +39,7 @@
#include "winerror.h"
#include "ole.h"
#include "ole2ver.h"
-#include "debug.h"
+#include "debugtools.h"
#include "file.h"
#include "heap.h"
#include "ldt.h"
@@ -190,7 +190,7 @@
*/
DWORD WINAPI CoBuildVersion(void)
{
- TRACE(ole,"(void)\n");
+ TRACE("(void)\n");
return (rmm<<16)+rup;
}
@@ -249,11 +249,11 @@
{
HRESULT hr;
- TRACE(ole, "(%p, %x)\n", lpReserved, (int)dwCoInit);
+ TRACE("(%p, %x)\n", lpReserved, (int)dwCoInit);
if (lpReserved!=NULL)
{
- ERR(ole,"(%p, %x) - Bad parameter passed-in %p, must be an old Windows Application\n", lpReserved, (int)dwCoInit, lpReserved);
+ ERR("(%p, %x) - Bad parameter passed-in %p, must be an old Windows Application\n", lpReserved, (int)dwCoInit, lpReserved);
}
/*
@@ -261,7 +261,7 @@
*/
if (dwCoInit!=COINIT_APARTMENTTHREADED)
{
- FIXME(ole, ":(%p,%x): unsupported flag %x\n", lpReserved, (int)dwCoInit, (int)dwCoInit);
+ FIXME(":(%p,%x): unsupported flag %x\n", lpReserved, (int)dwCoInit, (int)dwCoInit);
/* Hope for the best and continue anyway */
}
@@ -274,7 +274,7 @@
/*
* Initialize the various COM libraries and data structures.
*/
- TRACE(ole, "() - Initializing the COM libraries\n");
+ TRACE("() - Initializing the COM libraries\n");
RunningObjectTableImpl_Initialize();
@@ -299,7 +299,7 @@
*/
void WINAPI CoUninitialize16(void)
{
- TRACE(ole,"()\n");
+ TRACE("()\n");
CoFreeAllLibraries();
}
@@ -312,7 +312,7 @@
*/
void WINAPI CoUninitialize(void)
{
- TRACE(ole,"()\n");
+ TRACE("()\n");
/*
* Decrease the reference count.
@@ -328,7 +328,7 @@
/*
* Release the various COM libraries and data structures.
*/
- TRACE(ole, "() - Releasing the COM libraries\n");
+ TRACE("() - Releasing the COM libraries\n");
RunningObjectTableImpl_UnInitialize();
/*
@@ -396,7 +396,7 @@
*/
HRESULT WINAPI CoDisconnectObject( LPUNKNOWN lpUnk, DWORD reserved )
{
- TRACE(ole,"%p %lx\n",lpUnk,reserved);
+ TRACE("%p %lx\n",lpUnk,reserved);
return S_OK;
}
@@ -450,7 +450,7 @@
int i;
BYTE table[256];
- TRACE(ole,"%s -> %p\n", idstr, id);
+ TRACE("%s -> %p\n", idstr, id);
/* quick lookup table */
memset(table, 0, 256);
@@ -701,7 +701,7 @@
((unsigned char*)pguid->Data4)[6] = a[4];
((unsigned char*)pguid->Data4)[7] = a[5];
- TRACE(ole, "%p", pguid);
+ TRACE("%p", pguid);
return S_OK;
}
@@ -742,7 +742,7 @@
int i;
if (!id)
- { ERR(ole,"called with id=Null\n");
+ { ERR("called with id=Null\n");
*idstr = 0x00;
return E_FAIL;
}
@@ -761,7 +761,7 @@
*s++ = '}';
*s++ = '\0';
- TRACE(ole,"%p->%s\n", id, idstr);
+ TRACE("%p->%s\n", id, idstr);
return OLE_OK;
}
@@ -800,7 +800,7 @@
(LPVOID)args,
(LPDWORD)idstr
)) {
- WARN(ole,"CallTo16 IMalloc16 failed\n");
+ WARN("CallTo16 IMalloc16 failed\n");
return E_FAIL;
}
return WINE_StringFromCLSID(id,PTR_SEG_TO_LIN(*idstr));
@@ -910,7 +910,7 @@
*/
HRESULT WINAPI WriteClassStm(IStream *pStm,REFCLSID rclsid)
{
- TRACE(ole,"(%p,%p)\n",pStm,rclsid);
+ TRACE("(%p,%p)\n",pStm,rclsid);
if (rclsid==NULL)
return E_INVALIDARG;
@@ -928,7 +928,7 @@
ULONG nbByte;
HRESULT res;
- TRACE(ole,"(%p,%p)\n",pStm,rclsid);
+ TRACE("(%p,%p)\n",pStm,rclsid);
if (rclsid==NULL)
return E_INVALIDARG;
@@ -949,7 +949,7 @@
* LookupETask (COMPOBJ.94)
*/
OLESTATUS WINAPI LookupETask16(HTASK16 *hTask,LPVOID p) {
- FIXME(ole,"(%p,%p),stub!\n",hTask,p);
+ FIXME("(%p,%p),stub!\n",hTask,p);
if ((*hTask = GetCurrentTask()) == hETask) {
memcpy(p, Table_ETask, sizeof(Table_ETask));
}
@@ -961,7 +961,7 @@
* SetETask (COMPOBJ.95)
*/
OLESTATUS WINAPI SetETask16(HTASK16 hTask, LPVOID p) {
- FIXME(ole,"(%04x,%p),stub!\n",hTask,p);
+ FIXME("(%04x,%p),stub!\n",hTask,p);
hETask = hTask;
return 0;
}
@@ -971,7 +971,7 @@
* CallObjectInWOW (COMPOBJ.201)
*/
OLESTATUS WINAPI CallObjectInWOW(LPVOID p1,LPVOID p2) {
- FIXME(ole,"(%p,%p),stub!\n",p1,p2);
+ FIXME("(%p,%p),stub!\n",p1,p2);
return 0;
}
@@ -991,7 +991,7 @@
WINE_StringFromCLSID(rclsid,buf);
- FIXME(ole,"(%s,%p,0x%08lx,0x%08lx,%p),stub\n",
+ FIXME("(%s,%p,0x%08lx,0x%08lx,%p),stub\n",
buf,pUnk,dwClsContext,flags,lpdwRegister
);
return 0;
@@ -1083,7 +1083,7 @@
WINE_StringFromCLSID(rclsid,buf);
- TRACE(ole,"(%s,%p,0x%08lx,0x%08lx,%p)\n",
+ TRACE("(%s,%p,0x%08lx,0x%08lx,%p)\n",
buf,pUnk,dwClsContext,flags,lpdwRegister);
/*
@@ -1166,7 +1166,7 @@
RegisteredClass** prevClassLink;
RegisteredClass* curClass;
- TRACE(ole,"(%08lx)\n",dwRegister);
+ TRACE("(%08lx)\n",dwRegister);
/*
* Iterate through the whole list and try to match the cookie.
@@ -1231,7 +1231,7 @@
WINE_StringFromCLSID((LPCLSID)rclsid,xclsid);
WINE_StringFromCLSID((LPCLSID)iid,xiid);
- TRACE(ole,"\n\tCLSID:\t%s,\n\tIID:\t%s\n",xclsid,xiid);
+ TRACE("\n\tCLSID:\t%s,\n\tIID:\t%s\n",xclsid,xiid);
/*
* First, try and see if we can't match the class ID with one of the
@@ -1256,7 +1256,7 @@
/* out of process and remote servers not supported yet */
if ((CLSCTX_LOCAL_SERVER|CLSCTX_REMOTE_SERVER) & dwClsContext) {
- FIXME(ole, "CLSCTX_LOCAL_SERVER and CLSCTX_REMOTE_SERVER not supported!\n");
+ FIXME("CLSCTX_LOCAL_SERVER and CLSCTX_REMOTE_SERVER not supported!\n");
return E_ACCESSDENIED;
}
@@ -1279,18 +1279,18 @@
RegCloseKey(CLSIDkey);
if (hres != ERROR_SUCCESS)
return REGDB_E_READREGDB;
- TRACE(ole,"found InprocServer32 dll %s\n", dllName);
+ TRACE("found InprocServer32 dll %s\n", dllName);
/* open dll, call DllGetClassFactory */
hLibrary = CoLoadLibrary(dllName, TRUE);
if (hLibrary == 0) {
- TRACE(ole,"couldn't load InprocServer32 dll %s\n", dllName);
+ TRACE("couldn't load InprocServer32 dll %s\n", dllName);
return E_ACCESSDENIED; /* or should this be CO_E_DLLNOTFOUND? */
}
DllGetClassObject = (DllGetClassObjectFunc)GetProcAddress(hLibrary, "DllGetClassObject");
if (!DllGetClassObject) {
/* not sure if this should be called here CoFreeLibrary(hLibrary);*/
- TRACE(ole,"couldn't find function DllGetClassObject in %s\n", dllName);
+ TRACE("couldn't find function DllGetClassObject in %s\n", dllName);
return E_ACCESSDENIED;
}
@@ -1317,7 +1317,7 @@
LPOLESTR *pathDec=0,absFile=0,progId=0;
WCHAR extention[100]={0};
- TRACE(ole,"()\n");
+ TRACE("()\n");
/* if the file contain a storage object the return the CLSID writen by IStorage_SetClass method*/
if((StgIsStorageFile(filePathName))==S_OK){
@@ -1401,7 +1401,7 @@
LPMESSAGEFILTER lpMessageFilter,
LPMESSAGEFILTER *lplpMessageFilter
) {
- FIXME(ole,"(%p,%p),stub!\n",lpMessageFilter,lplpMessageFilter);
+ FIXME("(%p,%p),stub!\n",lpMessageFilter,lplpMessageFilter);
return 0;
}
@@ -1473,7 +1473,7 @@
return E_INVALIDARG;
if (pServerInfo!=NULL)
- FIXME(ole, "() non-NULL pServerInfo not supported!\n");
+ FIXME("() non-NULL pServerInfo not supported!\n");
/*
* Initialize all the "out" parameters.
@@ -1673,7 +1673,7 @@
OpenDll *ptr;
OpenDll *tmp;
- TRACE(ole,"CoLoadLibrary(%p, %d\n", lpszLibName, bAutoFree);
+ TRACE("CoLoadLibrary(%p, %d\n", lpszLibName, bAutoFree);
hLibrary = LoadLibraryA(lpszLibName);
@@ -1712,7 +1712,7 @@
* CoInitializeWOW (OLE32.27)
*/
HRESULT WINAPI CoInitializeWOW(DWORD x,DWORD y) {
- FIXME(ole,"(0x%08lx,0x%08lx),stub!\n",x,y);
+ FIXME("(0x%08lx,0x%08lx),stub!\n",x,y);
return 0;
}
@@ -1724,7 +1724,7 @@
BOOL16 fLock, /* [in] do lock */
BOOL16 fLastUnlockReleases /* [in] ? */
) {
- FIXME(ole,"(%p,%d,%d),stub!\n",pUnk,fLock,fLastUnlockReleases);
+ FIXME("(%p,%d,%d),stub!\n",pUnk,fLock,fLastUnlockReleases);
return S_OK;
}
@@ -1762,7 +1762,7 @@
*/
HRESULT WINAPI CoGetState16(LPDWORD state)
{
- FIXME(ole, "(%p),stub!\n", state);
+ FIXME("(%p),stub!\n", state);
*state = 0;
return S_OK;
}
@@ -1771,7 +1771,7 @@
*/
HRESULT WINAPI CoSetState(LPDWORD state)
{
- FIXME(ole, "(%p),stub!\n", state);
+ FIXME("(%p),stub!\n", state);
if (state) *state = 0;
return S_OK;
}
@@ -1996,7 +1996,7 @@
*/
BOOL WINAPI COMPOBJ_DllEntryPoint(DWORD Reason, HINSTANCE16 hInst, WORD ds, WORD HeapSize, DWORD res1, WORD res2)
{
- TRACE(ole, "(%08lx, %04x, %04x, %04x, %08lx, %04x)\n", Reason, hInst, ds, HeapSize,
+ TRACE("(%08lx, %04x, %04x, %04x, %08lx, %04x)\n", Reason, hInst, ds, HeapSize,
res1, res2);
switch(Reason)
{
@@ -2004,7 +2004,7 @@
COMPOBJ_Attach++;
if(COMPOBJ_hInstance)
{
- ERR(ole, "compobj.dll instantiated twice!\n");
+ ERR("compobj.dll instantiated twice!\n");
/*
* We should return FALSE here, but that will break
* most apps that use CreateProcess because we do
diff --git a/ole/compositemoniker.c b/ole/compositemoniker.c
index 2f145f5..3096ebd 100644
--- a/ole/compositemoniker.c
+++ b/ole/compositemoniker.c
@@ -6,7 +6,7 @@
#include <assert.h>
#include "winerror.h"
-#include "debug.h"
+#include "debugtools.h"
#include "heap.h"
#include "winuser.h"
#include "file.h"
@@ -185,7 +185,7 @@
{
ICOM_THIS(CompositeMonikerImpl,iface);
- TRACE(ole,"(%p,%p,%p)\n",This,riid,ppvObject);
+ TRACE("(%p,%p,%p)\n",This,riid,ppvObject);
/* Perform a sanity check on the parameters.*/
if ( (This==0) || (ppvObject==0) )
@@ -221,7 +221,7 @@
{
ICOM_THIS(CompositeMonikerImpl,iface);
- TRACE(ole,"(%p)\n",This);
+ TRACE("(%p)\n",This);
return ++(This->ref);
}
@@ -234,7 +234,7 @@
ICOM_THIS(CompositeMonikerImpl,iface);
ULONG i;
- TRACE(ole,"(%p)\n",This);
+ TRACE("(%p)\n",This);
This->ref--;
@@ -257,7 +257,7 @@
******************************************************************************/
HRESULT WINAPI CompositeMonikerImpl_GetClassID(const IMoniker* iface,CLSID *pClassID)
{
- TRACE(ole,"(%p,%p),stub!\n",iface,pClassID);
+ TRACE("(%p,%p),stub!\n",iface,pClassID);
if (pClassID==NULL)
return E_POINTER;
@@ -276,7 +276,7 @@
method in the OLE-provided moniker interfaces always return S_FALSE because
their internal state never changes. */
- TRACE(ole,"(%p)\n",iface);
+ TRACE("(%p)\n",iface);
return S_FALSE;
}
@@ -293,7 +293,7 @@
ICOM_THIS(CompositeMonikerImpl,iface);
- TRACE(ole,"(%p,%p)\n",iface,pStm);
+ TRACE("(%p,%p)\n",iface,pStm);
/* this function call OleLoadFromStream function for each moniker within this object */
@@ -340,7 +340,7 @@
return E_FAIL;
else{
- FIXME(ole,"()");
+ FIXME("()");
break;
return E_NOTIMPL;
}
@@ -369,7 +369,7 @@
IMoniker *pmk;
DWORD constant=3;
- TRACE(ole,"(%p,%p,%d)\n",iface,pStm,fClearDirty);
+ TRACE("(%p,%p,%d)\n",iface,pStm,fClearDirty);
/* this function call OleSaveToStream function for each moniker within this object */
@@ -409,7 +409,7 @@
/* the sizeMax of this object is calculated by calling GetSizeMax on each moniker within this object then */
/* suming all returned sizemax */
- TRACE(ole,"(%p,%p)\n",iface,pcbSize);
+ TRACE("(%p,%p)\n",iface,pcbSize);
if (pcbSize!=NULL)
return E_POINTER;
@@ -444,7 +444,7 @@
IMoniker *tempMk;
HRESULT res;
- TRACE(ole,"(%p,%p,%p)\n",This,pmkFirst,pmkRest);
+ TRACE("(%p,%p,%p)\n",This,pmkFirst,pmkRest);
/* Initialize the virtual fgunction table. */
This->lpvtbl1 = &VT_CompositeMonikerImpl;
@@ -581,7 +581,7 @@
*******************************************************************************/
HRESULT WINAPI CompositeMonikerImpl_Destroy(CompositeMonikerImpl* This)
{
- TRACE(ole,"(%p)\n",This);
+ TRACE("(%p)\n",This);
HeapFree(GetProcessHeap(),0,This->tabMoniker);
@@ -604,7 +604,7 @@
IMoniker *tempMk,*antiMk,*mostRigthMk;
IEnumMoniker *enumMoniker;
- TRACE(ole,"(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult);
+ TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult);
if (ppvResult==NULL)
return E_POINTER;
@@ -659,7 +659,7 @@
IMoniker *tempMk,*antiMk,*mostRigthMk;
IEnumMoniker *enumMoniker;
- TRACE(ole,"(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult);
+ TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult);
*ppvResult=0;
@@ -701,7 +701,7 @@
IMoniker *tempMk,*antiMk,*mostRigthMk,*leftReducedComposedMk,*mostRigthReducedMk;
IEnumMoniker *enumMoniker;
- TRACE(ole,"(%p,%p,%ld,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced);
+ TRACE("(%p,%p,%ld,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced);
if (ppmkReduced==NULL)
return E_POINTER;
@@ -763,7 +763,7 @@
BOOL fOnlyIfNotGeneric,
IMoniker** ppmkComposite)
{
- TRACE(ole,"(%p,%p,%d,%p)\n",iface,pmkRight,fOnlyIfNotGeneric,ppmkComposite);
+ TRACE("(%p,%p,%d,%p)\n",iface,pmkRight,fOnlyIfNotGeneric,ppmkComposite);
if ((ppmkComposite==NULL)||(pmkRight==NULL))
return E_POINTER;
@@ -787,7 +787,7 @@
{
ICOM_THIS(CompositeMonikerImpl,iface);
- TRACE(ole,"(%p,%d,%p)\n",iface,fForward,ppenumMoniker);
+ TRACE("(%p,%d,%p)\n",iface,fForward,ppenumMoniker);
if (ppenumMoniker == NULL)
return E_POINTER;
@@ -804,7 +804,7 @@
IMoniker *tempMk1,*tempMk2;
HRESULT res1,res2,res;
- TRACE(ole,"(%p,%p)\n",iface,pmkOtherMoniker);
+ TRACE("(%p,%p)\n",iface,pmkOtherMoniker);
if (pmkOtherMoniker==NULL)
return S_FALSE;
@@ -858,7 +858,7 @@
******************************************************************************/
HRESULT WINAPI CompositeMonikerImpl_Hash(IMoniker* iface,DWORD* pdwHash)
{
- FIXME(ole,"(),stub!\n");
+ FIXME("(),stub!\n");
return E_NOTIMPL;
}
@@ -876,7 +876,7 @@
IMoniker *tempMk,*antiMk,*mostRigthMk;
IEnumMoniker *enumMoniker;
- TRACE(ole,"(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pmkNewlyRunning);
+ TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pmkNewlyRunning);
/* If pmkToLeft is non-NULL, this method composes pmkToLeft with this moniker and calls IsRunning on the result.*/
if (pmkToLeft!=NULL){
@@ -955,7 +955,7 @@
IMoniker *tempMk,*antiMk,*mostRigthMk;
IEnumMoniker *enumMoniker;
- TRACE(ole,"(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pCompositeTime);
+ TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pCompositeTime);
if (pCompositeTime==NULL)
return E_INVALIDARG;
@@ -1005,7 +1005,7 @@
IMoniker *tempMk,*antiMk,*mostRigthMk,*tempInvMk,*mostRigthInvMk;
IEnumMoniker *enumMoniker;
- TRACE(ole,"(%p,%p)\n",iface,ppmk);
+ TRACE("(%p,%p)\n",iface,ppmk);
if (ppmk==NULL)
return E_POINTER;
@@ -1265,7 +1265,7 @@
HRESULT res;
IMoniker *restOtherMk=0,*restThisMk=0,*invRestThisMk=0,*commonMk=0;
- TRACE(ole,"(%p,%p,%p)\n",iface,pmkOther,ppmkRelPath);
+ TRACE("(%p,%p,%p)\n",iface,pmkOther,ppmkRelPath);
if (ppmkRelPath==NULL)
return E_POINTER;
@@ -1330,7 +1330,7 @@
IMoniker* tempMk;
LPOLESTR tempStr;
- TRACE(ole,"(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,ppszDisplayName);
+ TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,ppszDisplayName);
if (ppszDisplayName==NULL)
return E_POINTER;
@@ -1402,7 +1402,7 @@
******************************************************************************/
HRESULT WINAPI CompositeMonikerImpl_IsSystemMoniker(IMoniker* iface,DWORD* pwdMksys)
{
- TRACE(ole,"(%p,%p)\n",iface,pwdMksys);
+ TRACE("(%p,%p)\n",iface,pwdMksys);
if (!pwdMksys)
return E_POINTER;
@@ -1420,7 +1420,7 @@
ICOM_THIS_From_IROTData(IMoniker, iface);
- TRACE(ole,"(%p,%p,%p)\n",iface,riid,ppvObject);
+ TRACE("(%p,%p,%p)\n",iface,riid,ppvObject);
return CompositeMonikerImpl_QueryInterface(This, riid, ppvObject);
}
@@ -1432,7 +1432,7 @@
{
ICOM_THIS_From_IROTData(IMoniker, iface);
- TRACE(ole,"(%p)\n",iface);
+ TRACE("(%p)\n",iface);
return CompositeMonikerImpl_AddRef(This);
}
@@ -1444,7 +1444,7 @@
{
ICOM_THIS_From_IROTData(IMoniker, iface);
- TRACE(ole,"(%p)\n",iface);
+ TRACE("(%p)\n",iface);
return CompositeMonikerImpl_Release(This);
}
@@ -1457,7 +1457,7 @@
ULONG cbMax,
ULONG* pcbData)
{
- FIXME(ole,"(),stub!\n");
+ FIXME("(),stub!\n");
return E_NOTIMPL;
}
@@ -1468,7 +1468,7 @@
{
ICOM_THIS(EnumMonikerImpl,iface);
- TRACE(ole,"(%p,%p,%p)\n",This,riid,ppvObject);
+ TRACE("(%p,%p,%p)\n",This,riid,ppvObject);
/* Perform a sanity check on the parameters.*/
if ( (This==0) || (ppvObject==0) )
@@ -1498,7 +1498,7 @@
{
ICOM_THIS(EnumMonikerImpl,iface);
- TRACE(ole,"(%p)\n",This);
+ TRACE("(%p)\n",This);
return ++(This->ref);
@@ -1512,7 +1512,7 @@
ICOM_THIS(EnumMonikerImpl,iface);
ULONG i
;
- TRACE(ole,"(%p)\n",This);
+ TRACE("(%p)\n",This);
This->ref--;
@@ -1648,7 +1648,7 @@
CompositeMonikerImpl* newCompositeMoniker = 0;
HRESULT hr = S_OK;
- TRACE(ole,"(%p,%p,%p)\n",pmkFirst,pmkRest,ppmkComposite);
+ TRACE("(%p,%p,%p)\n",pmkFirst,pmkRest,ppmkComposite);
if (ppmkComposite==NULL)
return E_POINTER;
@@ -1694,7 +1694,7 @@
******************************************************************************/
HRESULT WINAPI MonikerCommonPrefixWith(IMoniker* pmkThis,IMoniker* pmkOther,IMoniker** ppmkCommon)
{
- FIXME(ole,"(),stub!\n");
+ FIXME("(),stub!\n");
return E_NOTIMPL;
}
diff --git a/ole/datacache.c b/ole/datacache.c
index ed461d6..a2198b1 100644
--- a/ole/datacache.c
+++ b/ole/datacache.c
@@ -35,7 +35,7 @@
#include "winuser.h"
#include "winerror.h"
#include "ole2.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole)
@@ -449,7 +449,7 @@
WINE_StringFromCLSID((LPCLSID)rclsid,xclsid);
WINE_StringFromCLSID((LPCLSID)riid,xriid);
- TRACE(ole, "(%s, %p, %s, %p)\n", xclsid, pUnkOuter, xriid, ppvObj);
+ TRACE("(%s, %p, %s, %p)\n", xclsid, pUnkOuter, xriid, ppvObj);
/*
* Sanity check
@@ -550,7 +550,7 @@
static void DataCache_Destroy(
DataCache* ptrToDestroy)
{
- TRACE(ole, "()\n");
+ TRACE("()\n");
if (ptrToDestroy->sinkInterface != NULL)
{
@@ -650,7 +650,7 @@
DWORD aspect,
LONG lindex)
{
- TRACE(ole, "(%p, %lx, %ld)\n", this, aspect, lindex);
+ TRACE("(%p, %lx, %ld)\n", this, aspect, lindex);
/*
* The sink supplies a filter when it registers
@@ -888,7 +888,7 @@
WINE_StringFromCLSID((LPCLSID)riid,clsid);
- WARN(ole,
+ WARN(
"() : asking for un supported interface %s\n",
clsid);
@@ -1004,7 +1004,7 @@
LPFORMATETC pformatetcIn,
STGMEDIUM* pmedium)
{
- FIXME(ole,"stub\n");
+ FIXME("stub\n");
return E_NOTIMPL;
}
@@ -1013,7 +1013,7 @@
LPFORMATETC pformatetc,
STGMEDIUM* pmedium)
{
- FIXME(ole,"stub\n");
+ FIXME("stub\n");
return E_NOTIMPL;
}
@@ -1021,7 +1021,7 @@
IDataObject* iface,
LPFORMATETC pformatetc)
{
- FIXME(ole,"stub\n");
+ FIXME("stub\n");
return E_NOTIMPL;
}
@@ -1037,7 +1037,7 @@
LPFORMATETC pformatectIn,
LPFORMATETC pformatetcOut)
{
- TRACE(ole,"()\n");
+ TRACE("()\n");
return E_NOTIMPL;
}
@@ -1057,7 +1057,7 @@
IOleCache2* oleCache = NULL;
HRESULT hres;
- TRACE(ole,"(%p, %p, %p, %d)\n", iface, pformatetc, pmedium, fRelease);
+ TRACE("(%p, %p, %p, %d)\n", iface, pformatetc, pmedium, fRelease);
hres = IDataObject_QueryInterface(iface, &IID_IOleCache2, (void**)&oleCache);
@@ -1083,7 +1083,7 @@
DWORD dwDirection,
IEnumFORMATETC** ppenumFormatEtc)
{
- TRACE(ole,"()\n");
+ TRACE("()\n");
return E_NOTIMPL;
}
@@ -1101,7 +1101,7 @@
IAdviseSink* pAdvSink,
DWORD* pdwConnection)
{
- TRACE(ole,"()\n");
+ TRACE("()\n");
return OLE_E_ADVISENOTSUPPORTED;
}
@@ -1116,7 +1116,7 @@
IDataObject* iface,
DWORD dwConnection)
{
- TRACE(ole,"()\n");
+ TRACE("()\n");
return OLE_E_NOCONNECTION;
}
@@ -1131,7 +1131,7 @@
IDataObject* iface,
IEnumSTATDATA** ppenumAdvise)
{
- TRACE(ole,"()\n");
+ TRACE("()\n");
return OLE_E_ADVISENOTSUPPORTED;
}
@@ -1192,7 +1192,7 @@
const IPersistStorage* iface,
CLSID* pClassID)
{
- TRACE(ole,"(%p, %p)\n", iface, pClassID);
+ TRACE("(%p, %p)\n", iface, pClassID);
return E_NOTIMPL;
}
@@ -1207,7 +1207,7 @@
static HRESULT WINAPI DataCache_IsDirty(
IPersistStorage* iface)
{
- TRACE(ole,"(%p)\n", iface);
+ TRACE("(%p)\n", iface);
return S_FALSE;
}
@@ -1224,7 +1224,7 @@
IPersistStorage* iface,
IStorage* pStg)
{
- TRACE(ole, "(%p, %p)\n", iface, pStg);
+ TRACE("(%p, %p)\n", iface, pStg);
return DataCache_Load(iface, pStg);
}
@@ -1245,7 +1245,7 @@
{
_ICOM_THIS_From_IPersistStorage(DataCache, iface);
- TRACE(ole, "(%p, %p)\n", iface, pStg);
+ TRACE("(%p, %p)\n", iface, pStg);
if (this->presentationStorage != NULL)
{
@@ -1279,7 +1279,7 @@
{
_ICOM_THIS_From_IPersistStorage(DataCache, iface);
- TRACE(ole, "(%p, %p, %d)\n", iface, pStg, fSameAsLoad);
+ TRACE("(%p, %p, %d)\n", iface, pStg, fSameAsLoad);
if ( (!fSameAsLoad) &&
(this->presentationStorage!=NULL) )
@@ -1306,7 +1306,7 @@
IPersistStorage* iface,
IStorage* pStgNew)
{
- TRACE(ole, "(%p, %p)\n", iface, pStgNew);
+ TRACE("(%p, %p)\n", iface, pStgNew);
/*
* First, make sure we get our hands off any storage we have.
@@ -1334,7 +1334,7 @@
{
_ICOM_THIS_From_IPersistStorage(DataCache, iface);
- TRACE(ole,"(%p)\n", iface);
+ TRACE("(%p)\n", iface);
if (this->presentationStorage != NULL)
{
@@ -1418,7 +1418,7 @@
_ICOM_THIS_From_IViewObject2(DataCache, iface);
- TRACE(ole,"(%p, %lx, %ld, %p, %x, %x, %p, %p, %p, %lx)\n",
+ TRACE("(%p, %lx, %ld, %p, %x, %x, %p, %p, %p, %lx)\n",
iface,
dwDrawAspect,
lindex,
@@ -1515,7 +1515,7 @@
HDC hicTargetDevice,
LOGPALETTE** ppColorSet)
{
- FIXME(ole,"stub\n");
+ FIXME("stub\n");
return E_NOTIMPL;
}
@@ -1526,7 +1526,7 @@
void* pvAspect,
DWORD* pdwFreeze)
{
- FIXME(ole,"stub\n");
+ FIXME("stub\n");
return E_NOTIMPL;
}
@@ -1534,7 +1534,7 @@
IViewObject2* iface,
DWORD dwFreeze)
{
- FIXME(ole,"stub\n");
+ FIXME("stub\n");
return E_NOTIMPL;
}
@@ -1554,7 +1554,7 @@
{
_ICOM_THIS_From_IViewObject2(DataCache, iface);
- TRACE(ole,"(%p, %lx, %lx, %p)\n", iface, aspects, advf, pAdvSink);
+ TRACE("(%p, %lx, %lx, %p)\n", iface, aspects, advf, pAdvSink);
/*
* A call to this function removes the previous sink
@@ -1609,7 +1609,7 @@
{
_ICOM_THIS_From_IViewObject2(DataCache, iface);
- TRACE(ole,"(%p, %p, %p, %p)\n", iface, pAspects, pAdvf, ppAdvSink);
+ TRACE("(%p, %p, %p, %p)\n", iface, pAspects, pAdvf, ppAdvSink);
/*
* Just copy all the requested values.
@@ -1649,7 +1649,7 @@
_ICOM_THIS_From_IViewObject2(DataCache, iface);
- TRACE(ole, "(%p, %lx, %ld, %p, %p)\n",
+ TRACE("(%p, %lx, %ld, %p, %p)\n",
iface, dwDrawAspect, lindex, ptd, lpsizel);
/*
@@ -1668,14 +1668,14 @@
* This flag should be set to -1.
*/
if (lindex!=-1)
- FIXME(ole, "Unimplemented flag lindex = %ld\n", lindex);
+ FIXME("Unimplemented flag lindex = %ld\n", lindex);
/*
* Right now, we suport only the callback from
* the default handler.
*/
if (ptd!=NULL)
- FIXME(ole, "Unimplemented ptd = %p\n", ptd);
+ FIXME("Unimplemented ptd = %p\n", ptd);
/*
* Get the presentation information from the
@@ -1753,7 +1753,7 @@
DWORD advf,
DWORD* pdwConnection)
{
- FIXME(ole,"stub\n");
+ FIXME("stub\n");
return E_NOTIMPL;
}
@@ -1761,7 +1761,7 @@
IOleCache2* iface,
DWORD dwConnection)
{
- FIXME(ole,"stub\n");
+ FIXME("stub\n");
return E_NOTIMPL;
}
@@ -1769,7 +1769,7 @@
IOleCache2* iface,
IEnumSTATDATA** ppenumSTATDATA)
{
- FIXME(ole,"stub\n");
+ FIXME("stub\n");
return E_NOTIMPL;
}
@@ -1777,7 +1777,7 @@
IOleCache2* iface,
IDataObject* pDataObject)
{
- FIXME(ole,"stub\n");
+ FIXME("stub\n");
return E_NOTIMPL;
}
@@ -1787,7 +1787,7 @@
STGMEDIUM* pmedium,
BOOL fRelease)
{
- FIXME(ole,"stub\n");
+ FIXME("stub\n");
return E_NOTIMPL;
}
@@ -1797,7 +1797,7 @@
DWORD grfUpdf,
LPVOID pReserved)
{
- FIXME(ole,"stub\n");
+ FIXME("stub\n");
return E_NOTIMPL;
}
@@ -1805,7 +1805,7 @@
IOleCache2* iface,
DWORD dwDiscardOptions)
{
- FIXME(ole,"stub\n");
+ FIXME("stub\n");
return E_NOTIMPL;
}
@@ -1860,14 +1860,14 @@
IOleCacheControl* iface,
LPDATAOBJECT pDataObject)
{
- FIXME(ole,"stub\n");
+ FIXME("stub\n");
return E_NOTIMPL;
}
static HRESULT WINAPI DataCache_OnStop(
IOleCacheControl* iface)
{
- FIXME(ole,"stub\n");
+ FIXME("stub\n");
return E_NOTIMPL;
}
diff --git a/ole/defaulthandler.c b/ole/defaulthandler.c
index 9f83959..a88d06a 100644
--- a/ole/defaulthandler.c
+++ b/ole/defaulthandler.c
@@ -35,7 +35,7 @@
#include "winuser.h"
#include "winerror.h"
#include "ole2.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole)
@@ -387,7 +387,7 @@
WINE_StringFromCLSID((LPCLSID)clsid,xclsid);
WINE_StringFromCLSID((LPCLSID)riid,xriid);
- TRACE(ole, "(%s, %p, %s, %p)\n", xclsid, pUnkOuter, xriid, ppvObj);
+ TRACE("(%s, %p, %s, %p)\n", xclsid, pUnkOuter, xriid, ppvObj);
/*
* Sanity check
@@ -623,7 +623,7 @@
WINE_StringFromCLSID((LPCLSID)riid,clsid);
- WARN(ole,
+ WARN(
"() : asking for un supported interface %s\n",
clsid);
@@ -748,7 +748,7 @@
{
_ICOM_THIS_From_IOleObject(DefaultHandler, iface);
- TRACE(ole, "(%p, %p)\n", iface, pClientSite);
+ TRACE("(%p, %p)\n", iface, pClientSite);
/*
* Make sure we release the previous client site if there
@@ -814,7 +814,7 @@
{
_ICOM_THIS_From_IOleObject(DefaultHandler, iface);
- TRACE(ole, "(%p, %s, %s)\n",
+ TRACE("(%p, %s, %s)\n",
iface,
debugstr_w(szContainerApp),
debugstr_w(szContainerObj));
@@ -858,7 +858,7 @@
IOleObject* iface,
DWORD dwSaveOption)
{
- TRACE(ole, "()\n");
+ TRACE("()\n");
return S_OK;
}
@@ -874,7 +874,7 @@
DWORD dwWhichMoniker,
IMoniker* pmk)
{
- TRACE(ole, "(%p, %ld, %p)\n",
+ TRACE("(%p, %ld, %p)\n",
iface,
dwWhichMoniker,
pmk);
@@ -897,7 +897,7 @@
{
_ICOM_THIS_From_IOleObject(DefaultHandler, iface);
- TRACE(ole, "(%p, %ld, %ld, %p)\n",
+ TRACE("(%p, %ld, %ld, %p)\n",
iface, dwAssign, dwWhichMoniker, ppmk);
if (this->clientSite)
@@ -925,7 +925,7 @@
BOOL fCreation,
DWORD dwReserved)
{
- TRACE(ole, "(%p, %p, %d, %ld)\n",
+ TRACE("(%p, %p, %d, %ld)\n",
iface, pDataObject, fCreation, dwReserved);
return OLE_E_NOTRUNNING;
@@ -943,7 +943,7 @@
DWORD dwReserved,
IDataObject** ppDataObject)
{
- TRACE(ole, "(%p, %ld, %p)\n",
+ TRACE("(%p, %ld, %p)\n",
iface, dwReserved, ppDataObject);
return OLE_E_NOTRUNNING;
@@ -958,7 +958,7 @@
HWND hwndParent,
LPCRECT lprcPosRect)
{
- FIXME(ole, ": Stub\n");
+ FIXME(": Stub\n");
return E_NOTIMPL;
}
@@ -976,7 +976,7 @@
{
_ICOM_THIS_From_IOleObject(DefaultHandler, iface);
- TRACE(ole, "(%p, %p)\n", iface, ppEnumOleVerb);
+ TRACE("(%p, %p)\n", iface, ppEnumOleVerb);
return OleRegEnumVerbs(&this->clsid, ppEnumOleVerb);
}
@@ -984,7 +984,7 @@
static HRESULT WINAPI DefaultHandler_Update(
IOleObject* iface)
{
- FIXME(ole, ": Stub\n");
+ FIXME(": Stub\n");
return E_NOTIMPL;
}
@@ -998,7 +998,7 @@
static HRESULT WINAPI DefaultHandler_IsUpToDate(
IOleObject* iface)
{
- TRACE(ole, "(%p)\n", iface);
+ TRACE("(%p)\n", iface);
return OLE_E_NOTRUNNING;
}
@@ -1016,7 +1016,7 @@
{
_ICOM_THIS_From_IOleObject(DefaultHandler, iface);
- TRACE(ole, "(%p, %p)\n", iface, pClsid);
+ TRACE("(%p, %p)\n", iface, pClsid);
/*
* Sanity check.
@@ -1044,7 +1044,7 @@
{
_ICOM_THIS_From_IOleObject(DefaultHandler, iface);
- TRACE(ole, "(%p, %ld, %p)\n", iface, dwFormOfType, pszUserType);
+ TRACE("(%p, %ld, %p)\n", iface, dwFormOfType, pszUserType);
return OleRegGetUserType(&this->clsid, dwFormOfType, pszUserType);
}
@@ -1061,7 +1061,7 @@
DWORD dwDrawAspect,
SIZEL* psizel)
{
- TRACE(ole, "(%p, %lx, (%d,%d))\n", iface, dwDrawAspect, psizel->cx, psizel->cy);
+ TRACE("(%p, %lx, (%d,%d))\n", iface, dwDrawAspect, psizel->cx, psizel->cy);
return OLE_E_NOTRUNNING;
}
@@ -1084,7 +1084,7 @@
_ICOM_THIS_From_IOleObject(DefaultHandler, iface);
- TRACE(ole, "(%p, %lx, %p)\n", iface, dwDrawAspect, psizel);
+ TRACE("(%p, %lx, %p)\n", iface, dwDrawAspect, psizel);
hres = IUnknown_QueryInterface(this->dataCache, &IID_IViewObject2, (void**)&cacheView);
@@ -1131,7 +1131,7 @@
HRESULT hres = S_OK;
_ICOM_THIS_From_IOleObject(DefaultHandler, iface);
- TRACE(ole, "(%p, %p, %p)\n", iface, pAdvSink, pdwConnection);
+ TRACE("(%p, %p, %p)\n", iface, pAdvSink, pdwConnection);
/*
* Make sure we have an advise holder before we start.
@@ -1165,7 +1165,7 @@
{
_ICOM_THIS_From_IOleObject(DefaultHandler, iface);
- TRACE(ole, "(%p, %ld)\n", iface, dwConnection);
+ TRACE("(%p, %ld)\n", iface, dwConnection);
/*
* If we don't have an advise holder yet, it means we don't have
@@ -1192,7 +1192,7 @@
{
_ICOM_THIS_From_IOleObject(DefaultHandler, iface);
- TRACE(ole, "(%p, %p)\n", iface, ppenumAdvise);
+ TRACE("(%p, %p)\n", iface, ppenumAdvise);
/*
* Sanity check
@@ -1228,7 +1228,7 @@
HRESULT hres;
_ICOM_THIS_From_IOleObject(DefaultHandler, iface);
- TRACE(ole, "(%p, %lx, %p)\n", iface, dwAspect, pdwStatus);
+ TRACE("(%p, %lx, %p)\n", iface, dwAspect, pdwStatus);
hres = OleRegGetMiscStatus(&(this->clsid), dwAspect, pdwStatus);
@@ -1249,7 +1249,7 @@
IOleObject* iface,
LOGPALETTE* pLogpal)
{
- TRACE(ole, "(%p, %p))\n", iface, pLogpal);
+ TRACE("(%p, %p))\n", iface, pLogpal);
return OLE_E_NOTRUNNING;
}
@@ -1304,7 +1304,7 @@
LPFORMATETC pformatetcIn,
STGMEDIUM* pmedium)
{
- FIXME(ole, ": Stub\n");
+ FIXME(": Stub\n");
return E_NOTIMPL;
}
@@ -1313,7 +1313,7 @@
LPFORMATETC pformatetc,
STGMEDIUM* pmedium)
{
- FIXME(ole, ": Stub\n");
+ FIXME(": Stub\n");
return E_NOTIMPL;
}
@@ -1334,7 +1334,7 @@
_ICOM_THIS_From_IDataObject(DefaultHandler, iface);
- TRACE(ole, "(%p, %p)\n", iface, pformatetc);
+ TRACE("(%p, %p)\n", iface, pformatetc);
hres = IUnknown_QueryInterface(this->dataCache,
&IID_IDataObject,
@@ -1363,7 +1363,7 @@
LPFORMATETC pformatectIn,
LPFORMATETC pformatetcOut)
{
- FIXME(ole, "(%p, %p, %p)\n", iface, pformatectIn, pformatetcOut);
+ FIXME("(%p, %p, %p)\n", iface, pformatectIn, pformatetcOut);
return OLE_E_NOTRUNNING;
}
@@ -1387,7 +1387,7 @@
_ICOM_THIS_From_IDataObject(DefaultHandler, iface);
- TRACE(ole, "(%p, %p, %p, %d)\n", iface, pformatetc, pmedium, fRelease);
+ TRACE("(%p, %p, %p, %d)\n", iface, pformatetc, pmedium, fRelease);
hres = IUnknown_QueryInterface(this->dataCache,
&IID_IDataObject,
@@ -1422,7 +1422,7 @@
HRESULT hres;
_ICOM_THIS_From_IDataObject(DefaultHandler, iface);
- TRACE(ole, "(%p, %lx, %p)\n", iface, dwDirection, ppenumFormatEtc);
+ TRACE("(%p, %lx, %p)\n", iface, dwDirection, ppenumFormatEtc);
hres = OleRegEnumFormatEtc(&(this->clsid), dwDirection, ppenumFormatEtc);
@@ -1447,7 +1447,7 @@
HRESULT hres = S_OK;
_ICOM_THIS_From_IDataObject(DefaultHandler, iface);
- TRACE(ole, "(%p, %p, %ld, %p, %p)\n",
+ TRACE("(%p, %p, %ld, %p, %p)\n",
iface, pformatetc, advf, pAdvSink, pdwConnection);
/*
@@ -1485,7 +1485,7 @@
{
_ICOM_THIS_From_IDataObject(DefaultHandler, iface);
- TRACE(ole, "(%p, %ld)\n", iface, dwConnection);
+ TRACE("(%p, %ld)\n", iface, dwConnection);
/*
* If we don't have a data advise holder yet, it means that
@@ -1514,7 +1514,7 @@
{
_ICOM_THIS_From_IDataObject(DefaultHandler, iface);
- TRACE(ole, "(%p, %p)\n", iface, ppenumAdvise);
+ TRACE("(%p, %p)\n", iface, ppenumAdvise);
/*
* Sanity check
@@ -1598,7 +1598,7 @@
IRunnableObject* iface,
LPCLSID lpClsid)
{
- TRACE(ole, "()\n");
+ TRACE("()\n");
return S_OK;
}
@@ -1606,7 +1606,7 @@
IRunnableObject* iface,
IBindCtx* pbc)
{
- FIXME(ole, ": Stub\n");
+ FIXME(": Stub\n");
return E_NOTIMPL;
}
@@ -1622,7 +1622,7 @@
static BOOL WINAPI DefaultHandler_IsRunning(
IRunnableObject* iface)
{
- TRACE(ole, "()\n");
+ TRACE("()\n");
return S_FALSE;
}
@@ -1640,7 +1640,7 @@
BOOL fLock,
BOOL fLastUnlockCloses)
{
- TRACE(ole, "()\n");
+ TRACE("()\n");
return S_OK;
}
@@ -1657,7 +1657,7 @@
IRunnableObject* iface,
BOOL fContained)
{
- TRACE(ole, "()\n");
+ TRACE("()\n");
return S_OK;
}
diff --git a/ole/filemoniker.c b/ole/filemoniker.c
index fd7cb02..aa1cc6e 100644
--- a/ole/filemoniker.c
+++ b/ole/filemoniker.c
@@ -6,7 +6,7 @@
#include <assert.h>
#include "winerror.h"
-#include "debug.h"
+#include "debugtools.h"
#include "heap.h"
#include "winuser.h"
#include "file.h"
@@ -133,7 +133,7 @@
{
ICOM_THIS(FileMonikerImpl,iface);
- TRACE(ole,"(%p,%p,%p)\n",This,riid,ppvObject);
+ TRACE("(%p,%p,%p)\n",This,riid,ppvObject);
/* Perform a sanity check on the parameters.*/
if ( (This==0) || (ppvObject==0) )
@@ -170,7 +170,7 @@
{
ICOM_THIS(FileMonikerImpl,iface);
- TRACE(ole,"(%p)\n",iface);
+ TRACE("(%p)\n",iface);
return ++(This->ref);
}
@@ -182,7 +182,7 @@
{
ICOM_THIS(FileMonikerImpl,iface);
- TRACE(ole,"(%p)\n",iface);
+ TRACE("(%p)\n",iface);
This->ref--;
@@ -202,7 +202,7 @@
HRESULT WINAPI FileMonikerImpl_GetClassID(const IMoniker* iface,
CLSID *pClassID)/* Pointer to CLSID of object */
{
- TRACE(ole,"(%p,%p),stub!\n",iface,pClassID);
+ TRACE("(%p,%p),stub!\n",iface,pClassID);
if (pClassID==NULL)
return E_POINTER;
@@ -221,7 +221,7 @@
method in the OLE-provided moniker interfaces always return S_FALSE because
their internal state never changes. */
- TRACE(ole,"(%p)\n",iface);
+ TRACE("(%p)\n",iface);
return S_FALSE;
}
@@ -240,7 +240,7 @@
ICOM_THIS(FileMonikerImpl,iface);
- TRACE(ole,"(%p,%p)\n",iface,pStm);
+ TRACE("(%p,%p)\n",iface,pStm);
/* this function locate and read from the stream the filePath string writen by FileMonikerImpl_Save */
@@ -344,7 +344,7 @@
DWORD doubleLenDec;
int i=0;
- TRACE(ole,"(%p,%p,%d)\n",iface,pStm,fClearDirty);
+ TRACE("(%p,%p,%d)\n",iface,pStm,fClearDirty);
if (pStm==NULL)
return E_POINTER;
@@ -404,7 +404,7 @@
DWORD len=lstrlenW(This->filePathName);
DWORD sizeMAx;
- TRACE(ole,"(%p,%p)\n",iface,pcbSize);
+ TRACE("(%p,%p)\n",iface,pcbSize);
if (pcbSize!=NULL)
return E_POINTER;
@@ -443,7 +443,7 @@
WCHAR bkSlash[]={'\\',0};
BYTE addBkSlash;
- TRACE(ole,"(%p,%p)\n",This,lpszPathName);
+ TRACE("(%p,%p)\n",This,lpszPathName);
/* Initialize the virtual fgunction table. */
This->lpvtbl1 = &VT_FileMonikerImpl;
@@ -507,7 +507,7 @@
*******************************************************************************/
HRESULT WINAPI FileMonikerImpl_Destroy(FileMonikerImpl* This)
{
- TRACE(ole,"(%p)\n",This);
+ TRACE("(%p)\n",This);
if (This->filePathName!=NULL)
HeapFree(GetProcessHeap(),0,This->filePathName);
@@ -538,7 +538,7 @@
*ppvResult=0;
- TRACE(ole,"(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult);
+ TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult);
if(pmkToLeft==NULL){
@@ -591,7 +591,7 @@
}
if (pca!=NULL){
- FIXME(ole,"()");
+ FIXME("()");
/*res=GetClassFile(This->filePathName,&clsID);
@@ -645,7 +645,7 @@
IStorage *pstg=0;
HRESULT res;
- TRACE(ole,"(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvObject);
+ TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvObject);
if (pmkToLeft==NULL){
@@ -682,7 +682,7 @@
}
else {
- FIXME(ole,"(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvObject);
+ FIXME("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvObject);
return E_NOTIMPL;
}
@@ -698,7 +698,7 @@
IMoniker** ppmkToLeft,
IMoniker** ppmkReduced)
{
- TRACE(ole,"(%p,%p,%ld,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced);
+ TRACE("(%p,%p,%ld,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced);
if (ppmkReduced==NULL)
return E_POINTER;
@@ -725,7 +725,7 @@
int i=0,j=0,lastIdx1=0,lastIdx2=0;
DWORD mkSys;
- TRACE(ole,"(%p,%p,%d,%p)\n",iface,pmkRight,fOnlyIfNotGeneric,ppmkComposite);
+ TRACE("(%p,%p,%d,%p)\n",iface,pmkRight,fOnlyIfNotGeneric,ppmkComposite);
if (ppmkComposite==NULL)
return E_POINTER;
@@ -815,7 +815,7 @@
******************************************************************************/
HRESULT WINAPI FileMonikerImpl_Enum(IMoniker* iface,BOOL fForward, IEnumMoniker** ppenumMoniker)
{
- TRACE(ole,"(%p,%d,%p)\n",iface,fForward,ppenumMoniker);
+ TRACE("(%p,%d,%p)\n",iface,fForward,ppenumMoniker);
if (ppenumMoniker == NULL)
return E_POINTER;
@@ -836,7 +836,7 @@
IBindCtx* bind;
HRESULT res;
- TRACE(ole,"(%p,%p)\n",iface,pmkOtherMoniker);
+ TRACE("(%p,%p)\n",iface,pmkOtherMoniker);
if (pmkOtherMoniker==NULL)
return S_FALSE;
@@ -906,7 +906,7 @@
IRunningObjectTable* rot;
HRESULT res;
- TRACE(ole,"(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pmkNewlyRunning);
+ TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pmkNewlyRunning);
if ( (pmkNewlyRunning!=NULL) && (IMoniker_IsEqual(pmkNewlyRunning,iface)==S_OK) )
return S_OK;
@@ -939,7 +939,7 @@
HRESULT res;
WIN32_FILE_ATTRIBUTE_DATA info;
- TRACE(ole,"(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pFileTime);
+ TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pFileTime);
if (pFileTime==NULL)
return E_POINTER;
@@ -971,7 +971,7 @@
HRESULT WINAPI FileMonikerImpl_Inverse(IMoniker* iface,IMoniker** ppmk)
{
- TRACE(ole,"(%p,%p)\n",iface,ppmk);
+ TRACE("(%p,%p)\n",iface,ppmk);
return CreateAntiMoniker(ppmk);
}
@@ -1125,7 +1125,7 @@
DWORD len1=0,len2=0,sameIdx=0,j=0;
WCHAR back[] ={'.','.','\\',0};
- TRACE(ole,"(%p,%p,%p)\n",iface,pmOther,ppmkRelPath);
+ TRACE("(%p,%p,%p)\n",iface,pmOther,ppmkRelPath);
if (ppmkRelPath==NULL)
return E_POINTER;
@@ -1201,7 +1201,7 @@
int len=lstrlenW(This->filePathName);
- TRACE(ole,"(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,ppszDisplayName);
+ TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,ppszDisplayName);
if (ppszDisplayName==NULL)
return E_POINTER;
@@ -1228,7 +1228,7 @@
ULONG* pchEaten,
IMoniker** ppmkOut)
{
- FIXME(ole,"(%p,%p,%p,%p,%p,%p),stub!\n",iface,pbc,pmkToLeft,pszDisplayName,pchEaten,ppmkOut);
+ FIXME("(%p,%p,%p,%p,%p,%p),stub!\n",iface,pbc,pmkToLeft,pszDisplayName,pchEaten,ppmkOut);
return E_NOTIMPL;
}
@@ -1237,7 +1237,7 @@
******************************************************************************/
HRESULT WINAPI FileMonikerImpl_IsSystemMoniker(IMoniker* iface,DWORD* pwdMksys)
{
- TRACE(ole,"(%p,%p)\n",iface,pwdMksys);
+ TRACE("(%p,%p)\n",iface,pwdMksys);
if (!pwdMksys)
return E_POINTER;
@@ -1255,7 +1255,7 @@
ICOM_THIS_From_IROTData(IMoniker, iface);
- TRACE(ole,"(%p,%p,%p)\n",This,riid,ppvObject);
+ TRACE("(%p,%p,%p)\n",This,riid,ppvObject);
return FileMonikerImpl_QueryInterface(This, riid, ppvObject);
}
@@ -1267,7 +1267,7 @@
{
ICOM_THIS_From_IROTData(IMoniker, iface);
- TRACE(ole,"(%p)\n",This);
+ TRACE("(%p)\n",This);
return FileMonikerImpl_AddRef(This);
}
@@ -1279,7 +1279,7 @@
{
ICOM_THIS_From_IROTData(IMoniker, iface);
- TRACE(ole,"(%p)\n",This);
+ TRACE("(%p)\n",This);
return FileMonikerImpl_Release(This);
}
@@ -1292,7 +1292,7 @@
ULONG cbMax,
ULONG* pcbData)
{
- FIXME(ole,"(),stub!\n");
+ FIXME("(),stub!\n");
return E_NOTIMPL;
}
@@ -1302,7 +1302,7 @@
HRESULT WINAPI CreateFileMoniker16(LPCOLESTR16 lpszPathName,LPMONIKER* ppmk)
{
- FIXME(ole,"(%s,%p),stub!\n",lpszPathName,ppmk);
+ FIXME("(%s,%p),stub!\n",lpszPathName,ppmk);
return E_NOTIMPL;
}
@@ -1315,7 +1315,7 @@
HRESULT hr = E_FAIL;
IID riid=IID_IMoniker;
- TRACE(ole,"(%p,%p)\n",lpszPathName,ppmk);
+ TRACE("(%p,%p)\n",lpszPathName,ppmk);
if (ppmk==NULL)
return E_POINTER;
diff --git a/ole/hglobalstream.c b/ole/hglobalstream.c
index cce4b2a..bcd6386 100644
--- a/ole/hglobalstream.c
+++ b/ole/hglobalstream.c
@@ -13,7 +13,7 @@
#include "winbase.h"
#include "winerror.h"
-#include "debug.h"
+#include "debugtools.h"
#include "objbase.h"
@@ -279,7 +279,7 @@
*/
void HGLOBALStreamImpl_Destroy(HGLOBALStreamImpl* This)
{
- TRACE(storage, "(%p)\n", This);
+ TRACE("(%p)\n", This);
/*
* Release the HGlobal if the constructor asked for that.
@@ -406,7 +406,7 @@
ULONG bytesReadBuffer;
ULONG bytesToReadFromBuffer;
- TRACE(storage, "(%p, %p, %ld, %p)\n", iface,
+ TRACE("(%p, %p, %ld, %p)\n", iface,
pv, cb, pcbRead);
/*
@@ -477,7 +477,7 @@
ULARGE_INTEGER newSize;
ULONG bytesWritten = 0;
- TRACE(storage, "(%p, %p, %ld, %p)\n", iface,
+ TRACE("(%p, %p, %ld, %p)\n", iface,
pv, cb, pcbWritten);
/*
@@ -549,7 +549,7 @@
ULARGE_INTEGER newPosition;
- TRACE(storage, "(%p, %ld, %ld, %p)\n", iface,
+ TRACE("(%p, %ld, %ld, %p)\n", iface,
dlibMove.LowPart, dwOrigin, plibNewPosition);
/*
@@ -625,7 +625,7 @@
{
HGLOBALStreamImpl* const This=(HGLOBALStreamImpl*)iface;
- TRACE(storage, "(%p, %ld)\n", iface, libNewSize.LowPart);
+ TRACE("(%p, %ld)\n", iface, libNewSize.LowPart);
/*
* As documented.
@@ -668,7 +668,7 @@
ULARGE_INTEGER totalBytesRead;
ULARGE_INTEGER totalBytesWritten;
- TRACE(storage, "(%p, %p, %ld, %p, %p)\n", iface, pstm,
+ TRACE("(%p, %p, %ld, %p, %p)\n", iface, pstm,
cb.LowPart, pcbRead, pcbWritten);
/*
@@ -823,6 +823,6 @@
IStream* iface,
IStream** ppstm) /* [out] */
{
- FIXME(storage, "not implemented!\n");
+ FIXME("not implemented!\n");
return E_NOTIMPL;
}
diff --git a/ole/ifs.c b/ole/ifs.c
index 7443682..1ca3b64 100644
--- a/ole/ifs.c
+++ b/ole/ifs.c
@@ -15,7 +15,7 @@
#include "wine/obj_base.h"
#include "local.h"
#include "module.h"
-#include "debug.h"
+#include "debugtools.h"
#include "ifs.h"
@@ -35,7 +35,7 @@
*/
static ULONG WINAPI IUnknown_fnAddRef(LPUNKNOWN iface) {
ICOM_THIS(IUnknownImpl,iface);
- TRACE(relay,"(%p)->AddRef()\n",This);
+ TRACE("(%p)->AddRef()\n",This);
return ++(This->ref);
}
@@ -44,7 +44,7 @@
*/
static ULONG WINAPI IUnknown_fnRelease(LPUNKNOWN iface) {
ICOM_THIS(IUnknownImpl,iface);
- TRACE(relay,"(%p)->Release()\n",This);
+ TRACE("(%p)->Release()\n",This);
if (!--(This->ref)) {
HeapFree(GetProcessHeap(),0,This);
return 0;
@@ -60,7 +60,7 @@
char xrefiid[50];
WINE_StringFromCLSID((LPCLSID)refiid,xrefiid);
- TRACE(relay,"(%p)->QueryInterface(%s,%p)\n",This,xrefiid,obj);
+ TRACE("(%p)->QueryInterface(%s,%p)\n",This,xrefiid,obj);
if (!memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown))) {
*obj = This;
@@ -114,7 +114,7 @@
char xrefiid[50];
WINE_StringFromCLSID((LPCLSID)refiid,xrefiid);
- TRACE(relay,"(%p)->QueryInterface(%s,%p)\n",This,xrefiid,obj);
+ TRACE("(%p)->QueryInterface(%s,%p)\n",This,xrefiid,obj);
if ( !memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown)) ||
!memcmp(&IID_IMalloc,refiid,sizeof(IID_IMalloc))
) {
@@ -129,7 +129,7 @@
*/
ULONG WINAPI IMalloc16_fnAddRef(IMalloc16* iface) {
ICOM_THIS(IMalloc16Impl,iface);
- TRACE(relay,"(%p)->AddRef()\n",This);
+ TRACE("(%p)->AddRef()\n",This);
return 1; /* cannot be freed */
}
@@ -138,7 +138,7 @@
*/
ULONG WINAPI IMalloc16_fnRelease(IMalloc16* iface) {
ICOM_THIS(IMalloc16Impl,iface);
- TRACE(relay,"(%p)->Release()\n",This);
+ TRACE("(%p)->Release()\n",This);
return 1; /* cannot be freed */
}
@@ -147,7 +147,7 @@
*/
LPVOID WINAPI IMalloc16_fnAlloc(IMalloc16* iface,DWORD cb) {
ICOM_THIS(IMalloc16Impl,iface);
- TRACE(relay,"(%p)->Alloc(%ld)\n",This,cb);
+ TRACE("(%p)->Alloc(%ld)\n",This,cb);
return (LPVOID)PTR_SEG_OFF_TO_SEGPTR(This->heap,LOCAL_Alloc(This->heap,0,cb));
}
@@ -156,7 +156,7 @@
*/
LPVOID WINAPI IMalloc16_fnRealloc(IMalloc16* iface,LPVOID pv,DWORD cb) {
ICOM_THIS(IMalloc16Impl,iface);
- TRACE(relay,"(%p)->Realloc(%p,%ld)\n",This,pv,cb);
+ TRACE("(%p)->Realloc(%p,%ld)\n",This,pv,cb);
return (LPVOID)PTR_SEG_OFF_TO_SEGPTR(This->heap,LOCAL_ReAlloc(This->heap,0,LOWORD(pv),cb));
}
@@ -165,7 +165,7 @@
*/
VOID WINAPI IMalloc16_fnFree(IMalloc16* iface,LPVOID pv) {
ICOM_THIS(IMalloc16Impl,iface);
- TRACE(relay,"(%p)->Free(%p)\n",This,pv);
+ TRACE("(%p)->Free(%p)\n",This,pv);
LOCAL_Free(This->heap,LOWORD(pv));
}
@@ -174,7 +174,7 @@
*/
DWORD WINAPI IMalloc16_fnGetSize(const IMalloc16* iface,LPVOID pv) {
ICOM_CTHIS(IMalloc16Impl,iface);
- TRACE(relay,"(%p)->GetSize(%p)\n",This,pv);
+ TRACE("(%p)->GetSize(%p)\n",This,pv);
return LOCAL_Size(This->heap,LOWORD(pv));
}
@@ -183,7 +183,7 @@
*/
INT16 WINAPI IMalloc16_fnDidAlloc(const IMalloc16* iface,LPVOID pv) {
ICOM_CTHIS(IMalloc16,iface);
- TRACE(relay,"(%p)->DidAlloc(%p)\n",This,pv);
+ TRACE("(%p)->DidAlloc(%p)\n",This,pv);
return (INT16)-1;
}
@@ -192,7 +192,7 @@
*/
LPVOID WINAPI IMalloc16_fnHeapMinimize(IMalloc16* iface) {
ICOM_THIS(IMalloc16Impl,iface);
- TRACE(relay,"(%p)->HeapMinimize()\n",This);
+ TRACE("(%p)->HeapMinimize()\n",This);
return NULL;
}
@@ -248,7 +248,7 @@
char xrefiid[50];
WINE_StringFromCLSID((LPCLSID)refiid,xrefiid);
- TRACE(relay,"(%p)->QueryInterface(%s,%p)\n",This,xrefiid,obj);
+ TRACE("(%p)->QueryInterface(%s,%p)\n",This,xrefiid,obj);
if ( !memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown)) ||
!memcmp(&IID_IMalloc,refiid,sizeof(IID_IMalloc))
) {
@@ -263,7 +263,7 @@
*/
static ULONG WINAPI IMalloc_fnAddRef(LPMALLOC iface) {
ICOM_THIS(IMalloc32Impl,iface);
- TRACE(relay,"(%p)->AddRef()\n",This);
+ TRACE("(%p)->AddRef()\n",This);
return 1; /* cannot be freed */
}
@@ -272,7 +272,7 @@
*/
static ULONG WINAPI IMalloc_fnRelease(LPMALLOC iface) {
ICOM_THIS(IMalloc32Impl,iface);
- TRACE(relay,"(%p)->Release()\n",This);
+ TRACE("(%p)->Release()\n",This);
return 1; /* cannot be freed */
}
@@ -281,7 +281,7 @@
*/
static LPVOID WINAPI IMalloc_fnAlloc(LPMALLOC iface,DWORD cb) {
ICOM_THIS(IMalloc32Impl,iface);
- TRACE(relay,"(%p)->Alloc(%ld)\n",This,cb);
+ TRACE("(%p)->Alloc(%ld)\n",This,cb);
return HeapAlloc(GetProcessHeap(),0,cb);
}
@@ -290,7 +290,7 @@
*/
static LPVOID WINAPI IMalloc_fnRealloc(LPMALLOC iface,LPVOID pv,DWORD cb) {
ICOM_THIS(IMalloc32Impl,iface);
- TRACE(relay,"(%p)->Realloc(%p,%ld)\n",This,pv,cb);
+ TRACE("(%p)->Realloc(%p,%ld)\n",This,pv,cb);
return HeapReAlloc(GetProcessHeap(),0,pv,cb);
}
@@ -299,7 +299,7 @@
*/
static VOID WINAPI IMalloc_fnFree(LPMALLOC iface,LPVOID pv) {
ICOM_THIS(IMalloc32Impl,iface);
- TRACE(relay,"(%p)->Free(%p)\n",This,pv);
+ TRACE("(%p)->Free(%p)\n",This,pv);
HeapFree(GetProcessHeap(),0,pv);
}
@@ -308,7 +308,7 @@
*/
static DWORD WINAPI IMalloc_fnGetSize(const IMalloc* iface,LPVOID pv) {
ICOM_CTHIS(IMalloc,iface);
- TRACE(relay,"(%p)->GetSize(%p)\n",This,pv);
+ TRACE("(%p)->GetSize(%p)\n",This,pv);
return HeapSize(GetProcessHeap(),0,pv);
}
@@ -317,7 +317,7 @@
*/
static INT WINAPI IMalloc_fnDidAlloc(const IMalloc* iface,LPVOID pv) {
ICOM_CTHIS(IMalloc32Impl,iface);
- TRACE(relay,"(%p)->DidAlloc(%p)\n",This,pv);
+ TRACE("(%p)->DidAlloc(%p)\n",This,pv);
return -1;
}
@@ -326,7 +326,7 @@
*/
static LPVOID WINAPI IMalloc_fnHeapMinimize(LPMALLOC iface) {
ICOM_THIS(IMalloc32Impl,iface);
- TRACE(relay,"(%p)->HeapMinimize()\n",This);
+ TRACE("(%p)->HeapMinimize()\n",This);
return NULL;
}
diff --git a/ole/itemmoniker.c b/ole/itemmoniker.c
index 98fb5ab..dd203b8 100644
--- a/ole/itemmoniker.c
+++ b/ole/itemmoniker.c
@@ -6,7 +6,7 @@
#include <assert.h>
#include "winerror.h"
-#include "debug.h"
+#include "debugtools.h"
#include "heap.h"
#include "winuser.h"
#include "file.h"
@@ -132,7 +132,7 @@
{
ICOM_THIS(ItemMonikerImpl,iface);
- TRACE(ole,"(%p,%p,%p)\n",This,riid,ppvObject);
+ TRACE("(%p,%p,%p)\n",This,riid,ppvObject);
/* Perform a sanity check on the parameters.*/
if ( (This==0) || (ppvObject==0) )
@@ -169,7 +169,7 @@
{
ICOM_THIS(ItemMonikerImpl,iface);
- TRACE(ole,"(%p)\n",This);
+ TRACE("(%p)\n",This);
return ++(This->ref);
}
@@ -181,7 +181,7 @@
{
ICOM_THIS(ItemMonikerImpl,iface);
- TRACE(ole,"(%p)\n",This);
+ TRACE("(%p)\n",This);
This->ref--;
@@ -200,7 +200,7 @@
******************************************************************************/
HRESULT WINAPI ItemMonikerImpl_GetClassID(const IMoniker* iface,CLSID *pClassID)
{
- TRACE(ole,"(%p,%p),stub!\n",iface,pClassID);
+ TRACE("(%p,%p),stub!\n",iface,pClassID);
if (pClassID==NULL)
return E_POINTER;
@@ -219,7 +219,7 @@
method in the OLE-provided moniker interfaces always return S_FALSE because
their internal state never changes. */
- TRACE(ole,"(%p)\n",iface);
+ TRACE("(%p)\n",iface);
return S_FALSE;
}
@@ -316,7 +316,7 @@
DWORD delimiterLength=lstrlenW(This->itemDelimiter)+1;
DWORD nameLength=lstrlenW(This->itemName)+1;
- TRACE(ole,"(%p,%p)\n",iface,pcbSize);
+ TRACE("(%p,%p)\n",iface,pcbSize);
if (pcbSize!=NULL)
return E_POINTER;
@@ -343,7 +343,7 @@
int sizeStr1=lstrlenW(lpszItem);
int sizeStr2=lstrlenW(lpszDelim);
- TRACE(ole,"(%p,%p)\n",This,lpszItem);
+ TRACE("(%p,%p)\n",This,lpszItem);
/* Initialize the virtual fgunction table. */
This->lpvtbl1 = &VT_ItemMonikerImpl;
@@ -367,7 +367,7 @@
*******************************************************************************/
HRESULT WINAPI ItemMonikerImpl_Destroy(ItemMonikerImpl* This)
{
- TRACE(ole,"(%p)\n",This);
+ TRACE("(%p)\n",This);
if (This->itemName)
HeapFree(GetProcessHeap(),0,This->itemName);
@@ -395,7 +395,7 @@
IID refid=IID_IOleItemContainer;
IOleItemContainer *poic=0;
- TRACE(ole,"(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult);
+ TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult);
if(ppvResult ==NULL)
return E_POINTER;
@@ -431,7 +431,7 @@
HRESULT res;
IOleItemContainer *poic=0;
- TRACE(ole,"(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult);
+ TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult);
*ppvResult=0;
@@ -459,7 +459,7 @@
IMoniker** ppmkToLeft,
IMoniker** ppmkReduced)
{
- TRACE(ole,"(%p,%p,%ld,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced);
+ TRACE("(%p,%p,%ld,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced);
if (ppmkReduced==NULL)
return E_POINTER;
@@ -484,7 +484,7 @@
IMoniker *pmostLeftMk=0;
IMoniker* tempMkComposite=0;
- TRACE(ole,"(%p,%p,%d,%p)\n",iface,pmkRight,fOnlyIfNotGeneric,ppmkComposite);
+ TRACE("(%p,%p,%d,%p)\n",iface,pmkRight,fOnlyIfNotGeneric,ppmkComposite);
if ((ppmkComposite==NULL)||(pmkRight==NULL))
return E_POINTER;
@@ -550,7 +550,7 @@
******************************************************************************/
HRESULT WINAPI ItemMonikerImpl_Enum(IMoniker* iface,BOOL fForward, IEnumMoniker** ppenumMoniker)
{
- TRACE(ole,"(%p,%d,%p)\n",iface,fForward,ppenumMoniker);
+ TRACE("(%p,%d,%p)\n",iface,fForward,ppenumMoniker);
if (ppenumMoniker == NULL)
return E_POINTER;
@@ -571,7 +571,7 @@
IBindCtx* bind;
HRESULT res;
- TRACE(ole,"(%p,%p)\n",iface,pmkOtherMoniker);
+ TRACE("(%p,%p)\n",iface,pmkOtherMoniker);
if (pmkOtherMoniker==NULL)
return S_FALSE;
@@ -644,7 +644,7 @@
IOleItemContainer *poic=0;
ICOM_THIS(ItemMonikerImpl,iface);
- TRACE(ole,"(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pmkNewlyRunning);
+ TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pmkNewlyRunning);
/* If pmkToLeft is NULL, this method returns TRUE if pmkNewlyRunning is non-NULL and is equal to this */
/* moniker. Otherwise, the method checks the ROT to see whether this moniker is running. */
@@ -695,7 +695,7 @@
HRESULT res;
IMoniker *compositeMk;
- TRACE(ole,"(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pItemTime);
+ TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pItemTime);
if (pItemTime==NULL)
return E_INVALIDARG;
@@ -729,7 +729,7 @@
******************************************************************************/
HRESULT WINAPI ItemMonikerImpl_Inverse(IMoniker* iface,IMoniker** ppmk)
{
- TRACE(ole,"(%p,%p)\n",iface,ppmk);
+ TRACE("(%p,%p)\n",iface,ppmk);
if (ppmk==NULL)
return E_POINTER;
@@ -766,7 +766,7 @@
******************************************************************************/
HRESULT WINAPI ItemMonikerImpl_RelativePathTo(IMoniker* iface,IMoniker* pmOther, IMoniker** ppmkRelPath)
{
- TRACE(ole,"(%p,%p,%p)\n",iface,pmOther,ppmkRelPath);
+ TRACE("(%p,%p,%p)\n",iface,pmOther,ppmkRelPath);
if (ppmkRelPath==NULL)
return E_POINTER;
@@ -786,7 +786,7 @@
{
ICOM_THIS(ItemMonikerImpl,iface);
- TRACE(ole,"(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,ppszDisplayName);
+ TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,ppszDisplayName);
if (ppszDisplayName==NULL)
return E_POINTER;
@@ -852,7 +852,7 @@
******************************************************************************/
HRESULT WINAPI ItemMonikerImpl_IsSystemMoniker(IMoniker* iface,DWORD* pwdMksys)
{
- TRACE(ole,"(%p,%p)\n",iface,pwdMksys);
+ TRACE("(%p,%p)\n",iface,pwdMksys);
if (!pwdMksys)
return E_POINTER;
@@ -870,7 +870,7 @@
ICOM_THIS_From_IROTData(IMoniker, iface);
- TRACE(ole,"(%p,%p,%p)\n",iface,riid,ppvObject);
+ TRACE("(%p,%p,%p)\n",iface,riid,ppvObject);
return ItemMonikerImpl_QueryInterface(This, riid, ppvObject);
}
@@ -882,7 +882,7 @@
{
ICOM_THIS_From_IROTData(IMoniker, iface);
- TRACE(ole,"(%p)\n",iface);
+ TRACE("(%p)\n",iface);
return ItemMonikerImpl_AddRef(This);
}
@@ -894,7 +894,7 @@
{
ICOM_THIS_From_IROTData(IMoniker, iface);
- TRACE(ole,"(%p)\n",iface);
+ TRACE("(%p)\n",iface);
return ItemMonikerImpl_Release(This);
}
@@ -907,7 +907,7 @@
ULONG cbMax,
ULONG* pcbData)
{
- FIXME(ole,"(),stub!\n");
+ FIXME("(),stub!\n");
return E_NOTIMPL;
}
@@ -917,7 +917,7 @@
HRESULT WINAPI CreateItemMoniker16(LPCOLESTR16 lpszDelim,LPCOLESTR lpszItem,LPMONIKER* ppmk)
{
- FIXME(ole,"(%s,%p),stub!\n",lpszDelim,ppmk);
+ FIXME("(%s,%p),stub!\n",lpszDelim,ppmk);
*ppmk = NULL;
return E_NOTIMPL;
}
@@ -931,7 +931,7 @@
HRESULT hr = S_OK;
IID riid=IID_IMoniker;
- TRACE(ole,"(%p,%p,%p)\n",lpszDelim,lpszItem,ppmk);
+ TRACE("(%p,%p,%p)\n",lpszDelim,lpszItem,ppmk);
newItemMoniker = HeapAlloc(GetProcessHeap(), 0, sizeof(ItemMonikerImpl));
diff --git a/ole/memlockbytes.c b/ole/memlockbytes.c
index 6be250c..5c1db00 100644
--- a/ole/memlockbytes.c
+++ b/ole/memlockbytes.c
@@ -11,7 +11,7 @@
#include "winerror.h"
#include "objbase.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole)
diff --git a/ole/moniker.c b/ole/moniker.c
index 206b465..32a9e6d 100644
--- a/ole/moniker.c
+++ b/ole/moniker.c
@@ -8,7 +8,7 @@
#include <assert.h>
#include "winerror.h"
#include "wine/obj_moniker.h"
-#include "debug.h"
+#include "debugtools.h"
#include "heap.h"
DEFAULT_DEBUG_CHANNEL(ole)
@@ -82,7 +82,7 @@
{
ICOM_THIS(RunningObjectTableImpl,iface);
- TRACE(ole,"(%p,%p,%p)\n",This,riid,ppvObject);
+ TRACE("(%p,%p,%p)\n",This,riid,ppvObject);
/* validate arguments*/
if (This==0)
@@ -114,7 +114,7 @@
{
ICOM_THIS(RunningObjectTableImpl,iface);
- TRACE(ole,"(%p)\n",This);
+ TRACE("(%p)\n",This);
return ++(This->ref);
}
@@ -124,7 +124,7 @@
*/
HRESULT WINAPI RunningObjectTableImpl_Destroy()
{
- TRACE(ole,"()\n");
+ TRACE("()\n");
if (runningObjectTableInstance==NULL)
return E_INVALIDARG;
@@ -146,7 +146,7 @@
DWORD i;
ICOM_THIS(RunningObjectTableImpl,iface);
- TRACE(ole,"(%p)\n",This);
+ TRACE("(%p)\n",This);
This->ref--;
@@ -180,7 +180,7 @@
*/
HRESULT WINAPI RunningObjectTableImpl_Initialize()
{
- TRACE(ole,"()\n");
+ TRACE("()\n");
/* create the unique instance of the RunningObjectTableImpl structure */
runningObjectTableInstance = HeapAlloc(GetProcessHeap(), 0, sizeof(RunningObjectTableImpl));
@@ -214,7 +214,7 @@
*/
HRESULT WINAPI RunningObjectTableImpl_UnInitialize()
{
- TRACE(ole,"()\n");
+ TRACE("()\n");
if (runningObjectTableInstance==NULL)
return E_POINTER;
@@ -238,7 +238,7 @@
HRESULT res=S_OK;
ICOM_THIS(RunningObjectTableImpl,iface);
- TRACE(ole,"(%p,%ld,%p,%p,%p)\n",This,grfFlags,punkObject,pmkObjectName,pdwRegister);
+ TRACE("(%p,%ld,%p,%p,%p)\n",This,grfFlags,punkObject,pmkObjectName,pdwRegister);
/* there's only tow types of register : strong and or weak registration (only one must be passed on parameter) */
if ( ( (grfFlags & ROTFLAGS_REGISTRATIONKEEPSALIVE) || !(grfFlags & ROTFLAGS_ALLOWANYCLIENT)) &&
@@ -265,7 +265,7 @@
if (This->runObjTabRegister == 0xFFFFFFFF){
- FIXME(ole,"runObjTabRegister: %ld is out of data limite \n",This->runObjTabRegister);
+ FIXME("runObjTabRegister: %ld is out of data limite \n",This->runObjTabRegister);
return E_FAIL;
}
This->runObjTabRegister++;
@@ -298,7 +298,7 @@
DWORD index,j;
ICOM_THIS(RunningObjectTableImpl,iface);
- TRACE(ole,"(%p,%ld)\n",This,dwRegister);
+ TRACE("(%p,%ld)\n",This,dwRegister);
/* verify if the object to be revoked was registred befor or not */
if (RunningObjectTableImpl_GetObjectIndex(This,dwRegister,NULL,&index)==S_FALSE)
@@ -328,7 +328,7 @@
{
ICOM_THIS(RunningObjectTableImpl,iface);
- TRACE(ole,"(%p,%p)\n",This,pmkObjectName);
+ TRACE("(%p,%p)\n",This,pmkObjectName);
return RunningObjectTableImpl_GetObjectIndex(This,-1,pmkObjectName,NULL);
}
@@ -343,7 +343,7 @@
DWORD index;
ICOM_THIS(RunningObjectTableImpl,iface);
- TRACE(ole,"(%p,%p,%p)\n",This,pmkObjectName,ppunkObject);
+ TRACE("(%p,%p,%p)\n",This,pmkObjectName,ppunkObject);
if (ppunkObject==NULL)
return E_POINTER;
@@ -371,7 +371,7 @@
DWORD index=-1;
ICOM_THIS(RunningObjectTableImpl,iface);
- TRACE(ole,"(%p,%ld,%p)\n",This,dwRegister,pfiletime);
+ TRACE("(%p,%ld,%p)\n",This,dwRegister,pfiletime);
/* verify if the object to be changed was registred befor or not */
if (RunningObjectTableImpl_GetObjectIndex(This,dwRegister,NULL,&index)==S_FALSE)
@@ -393,7 +393,7 @@
DWORD index=-1;
ICOM_THIS(RunningObjectTableImpl,iface);
- TRACE(ole,"(%p,%p,%p)\n",This,pmkObjectName,pfiletime);
+ TRACE("(%p,%p,%p)\n",This,pmkObjectName,pfiletime);
if (pmkObjectName==NULL || pfiletime==NULL)
return E_INVALIDARG;
@@ -413,7 +413,7 @@
HRESULT WINAPI RunningObjectTableImpl_EnumRunning(IRunningObjectTable* iface,
IEnumMoniker **ppenumMoniker) /* Address of output variable that receives the IEnumMoniker interface pointer */
{
- FIXME(ole,"(%p,%p) needs the IEnumMoniker implementation \n",iface,ppenumMoniker);
+ FIXME("(%p,%p) needs the IEnumMoniker implementation \n",iface,ppenumMoniker);
return E_NOTIMPL;
}
@@ -428,7 +428,7 @@
DWORD i;
- TRACE(ole,"(%p,%ld,%p,%p)\n",This,identReg,pmk,indx);
+ TRACE("(%p,%ld,%p,%p)\n",This,identReg,pmk,indx);
if (pmk!=NULL)
/* search object identified by a moniker*/
@@ -449,7 +449,7 @@
*/
HRESULT WINAPI GetRunningObjectTable16(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot)
{
- FIXME(ole,"(%ld,%p),stub!\n",reserved,pprot);
+ FIXME("(%ld,%p),stub!\n",reserved,pprot);
return E_NOTIMPL;
}
@@ -461,7 +461,7 @@
IID riid=IID_IRunningObjectTable;
HRESULT res;
- TRACE(ole,"()\n");
+ TRACE("()\n");
if (reserved!=0)
return E_UNEXPECTED;
diff --git a/ole/ole2.c b/ole/ole2.c
index 91fd336..3d0aee0 100644
--- a/ole/ole2.c
+++ b/ole/ole2.c
@@ -18,7 +18,7 @@
#include "commctrl.h"
#include "wine/obj_clientserver.h"
#include "wine/wingdi16.h"
-#include "debug.h"
+#include "debugtools.h"
#include "ole2ver.h"
#include "winreg.h"
@@ -138,7 +138,7 @@
*/
DWORD WINAPI OleBuildVersion(void)
{
- TRACE(ole,"(void)\n");
+ TRACE("(void)\n");
return (rmm<<16)+rup;
}
@@ -149,7 +149,7 @@
{
HRESULT hr;
- TRACE(ole, "(%p)\n", reserved);
+ TRACE("(%p)\n", reserved);
/*
* The first duty of the OleInitialize is to initialize the COM libraries.
@@ -176,7 +176,7 @@
/*
* Initialize the libraries.
*/
- TRACE(ole, "() - Initializing the OLE libraries\n");
+ TRACE("() - Initializing the OLE libraries\n");
/*
* Drag and Drop
@@ -212,7 +212,7 @@
*/
void WINAPI OleUninitialize(void)
{
- TRACE(ole, "()\n");
+ TRACE("()\n");
/*
* Decrease the lock count on the OLE module.
@@ -227,7 +227,7 @@
/*
* Actually free the libraries.
*/
- TRACE(ole, "() - Freeing the last reference count\n");
+ TRACE("() - Freeing the last reference count\n");
/*
* Drag and Drop
@@ -259,7 +259,7 @@
*/
HRESULT WINAPI OleSetClipboard(LPVOID pDataObj)
{
- FIXME(ole,"(%p), stub!\n", pDataObj);
+ FIXME("(%p), stub!\n", pDataObj);
return S_OK;
}
@@ -270,7 +270,7 @@
LPMESSAGEFILTER lpMessageFilter, /* Pointer to interface */
LPMESSAGEFILTER *lplpMessageFilter /* Indirect pointer to prior instance if non-NULL */
) {
- FIXME(ole,"stub\n");
+ FIXME("stub\n");
if (lplpMessageFilter) {
*lplpMessageFilter = NULL;
}
@@ -281,7 +281,7 @@
* OleInitializeWOW [OLE32.109]
*/
HRESULT WINAPI OleInitializeWOW(DWORD x) {
- FIXME(ole,"(0x%08lx),stub!\n",x);
+ FIXME("(0x%08lx),stub!\n",x);
return 0;
}
@@ -292,7 +292,7 @@
HWND16 hwnd,
LPDROPTARGET pDropTarget
) {
- FIXME(ole,"(0x%04x,%p),stub!\n",hwnd,pDropTarget);
+ FIXME("(0x%04x,%p),stub!\n",hwnd,pDropTarget);
return S_OK;
}
@@ -305,7 +305,7 @@
{
DropTargetNode* dropTargetInfo;
- TRACE(ole,"(0x%x,%p)\n", hwnd, pDropTarget);
+ TRACE("(0x%x,%p)\n", hwnd, pDropTarget);
/*
* First, check if the window is already registered.
@@ -345,7 +345,7 @@
HRESULT WINAPI RevokeDragDrop16(
HWND16 hwnd
) {
- FIXME(ole,"(0x%04x),stub!\n",hwnd);
+ FIXME("(0x%04x),stub!\n",hwnd);
return S_OK;
}
@@ -357,7 +357,7 @@
{
DropTargetNode* dropTargetInfo;
- TRACE(ole,"(0x%x)\n", hwnd);
+ TRACE("(0x%x)\n", hwnd);
/*
* First, check if the window is already registered.
@@ -414,7 +414,7 @@
strcat(keyName, xclsid);
strcat(keyName, "\\");
- TRACE(ole,"(%s, %ld, %p)\n", keyName, dwFormOfType, pszUserType);
+ TRACE("(%s, %ld, %p)\n", keyName, dwFormOfType, pszUserType);
/*
* Open the class id Key
@@ -488,7 +488,7 @@
HWND hwndTrackWindow;
MSG msg;
- TRACE(ole,"(DataObject %p, DropSource %p)\n", pDataObject, pDropSource);
+ TRACE("(DataObject %p, DropSource %p)\n", pDataObject, pDropSource);
/*
* Setup the drag n drop tracking window.
@@ -572,7 +572,7 @@
HRESULT WINAPI OleQueryLinkFromData(
IDataObject* pSrcDataObject)
{
- FIXME(ole,"(%p),stub!\n", pSrcDataObject);
+ FIXME("(%p),stub!\n", pSrcDataObject);
return S_OK;
}
@@ -605,7 +605,7 @@
strcat(keyName, xclsid);
strcat(keyName, "\\");
- TRACE(ole,"(%s, %ld, %p)\n", keyName, dwAspect, pdwStatus);
+ TRACE("(%s, %ld, %p)\n", keyName, dwAspect, pdwStatus);
/*
* Open the class id Key
@@ -670,7 +670,7 @@
IRunnableObject* runnable = NULL;
HRESULT hres;
- TRACE(ole,"(%p,%x), stub!\n", pUnknown, fContained);
+ TRACE("(%p,%x), stub!\n", pUnknown, fContained);
hres = IUnknown_QueryInterface(pUnknown,
&IID_IRunnableObject,
@@ -702,7 +702,7 @@
STATSTG storageInfo;
HRESULT hres;
- TRACE(ole,"(%p,%p,%p,%p)\n", pStg, riid, pClientSite, ppvObj);
+ TRACE("(%p,%p,%p,%p)\n", pStg, riid, pClientSite, ppvObj);
/*
* TODO, Conversion ... OleDoAutoConvert
@@ -784,7 +784,7 @@
HRESULT hres;
CLSID objectClass;
- TRACE(ole,"(%p,%p,%x)\n", pPS, pStg, fSameAsLoad);
+ TRACE("(%p,%p,%x)\n", pPS, pStg, fSameAsLoad);
/*
* First, we transfer the class ID (if available)
@@ -818,7 +818,7 @@
HRESULT WINAPI OleGetClipboard(
IDataObject** ppDataObj)
{
- FIXME(ole,"(%p),stub!\n", ppDataObj);
+ FIXME("(%p),stub!\n", ppDataObj);
if (ppDataObj)
*ppDataObj=0;
@@ -1091,7 +1091,7 @@
OleMenuHookItem *pHookItem = NULL;
WORD fuFlags;
- TRACE(ole,"%i, %04x, %08x\n", code, wParam, (unsigned)lParam );
+ TRACE("%i, %04x, %08x\n", code, wParam, (unsigned)lParam );
/* Check if we're being asked to process the message */
if ( HC_ACTION != code )
@@ -1175,7 +1175,7 @@
if ( !( pHookItem = OLEMenu_IsHookInstalled( GetCurrentThreadId(), NULL ) ) )
{
/* This should never fail!! */
- WARN(ole, "could not retrieve hHook for current thread!\n" );
+ WARN("could not retrieve hHook for current thread!\n" );
return 0;
}
@@ -1196,7 +1196,7 @@
OleMenuHookItem *pHookItem = NULL;
WORD wCode;
- TRACE(ole,"%i, %04x, %08x\n", code, wParam, (unsigned)lParam );
+ TRACE("%i, %04x, %08x\n", code, wParam, (unsigned)lParam );
/* Check if we're being asked to process a messages */
if ( HC_ACTION != code )
@@ -1249,7 +1249,7 @@
if ( !( pHookItem = OLEMenu_IsHookInstalled( GetCurrentThreadId(), NULL ) ) )
{
/* This should never fail!! */
- WARN(ole, "could not retrieve hHook for current thread!\n" );
+ WARN("could not retrieve hHook for current thread!\n" );
return FALSE;
}
@@ -1343,7 +1343,7 @@
if ( lpFrame || lpActiveObject )
{
- FIXME(ole,"(%x, %x, %x, %p, %p), Context sensitive help filtering not implemented!\n",
+ FIXME("(%x, %x, %x, %p, %p), Context sensitive help filtering not implemented!\n",
(unsigned int)hOleMenu,
hwndFrame,
hwndActiveObject,
@@ -2120,7 +2120,7 @@
HGLOBAL16 hmf;
HDC16 hdc;
- FIXME(ole, "(%04x, '%s', '%s', %d): incorrect metrics, please try to correct them !\n\n\n", hIcon, lpszLabel, lpszSourceFile, iIconIndex);
+ FIXME("(%04x, '%s', '%s', %d): incorrect metrics, please try to correct them !\n\n\n", hIcon, lpszLabel, lpszSourceFile, iIconIndex);
if (!hIcon) {
if (lpszSourceFile) {
diff --git a/ole/ole2disp.c b/ole/ole2disp.c
index dee4935..c0c0347 100644
--- a/ole/ole2disp.c
+++ b/ole/ole2disp.c
@@ -11,7 +11,7 @@
#include "wine/obj_base.h"
#include "heap.h"
#include "ldt.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole)
@@ -300,7 +300,7 @@
LCID lcid,
ITypeInfo **pptinfo
) {
- FIXME(ole,"(%p,%ld,%p),stub\n",pidata,lcid,pptinfo);
+ FIXME("(%p,%ld,%p),stub\n",pidata,lcid,pptinfo);
return 0;
}
@@ -312,7 +312,7 @@
) {
char buf[80];
WINE_StringFromCLSID(rclsid,buf);
- FIXME(ole,"(%p,%s,0x%08lx,%p):stub\n",punk,buf,dwFlags,pdwRegister);
+ FIXME("(%p,%s,0x%08lx,%p):stub\n",punk,buf,dwFlags,pdwRegister);
return 0;
}
@@ -332,7 +332,7 @@
COLORREF colorref;
BYTE b = HIBYTE(HIWORD(clr));
- TRACE(ole,"(%08lx, %d, %p):stub\n", clr, hpal, pColorRef);
+ TRACE("(%08lx, %d, %p):stub\n", clr, hpal, pColorRef);
/*
* In case pColorRef is NULL, provide our own to simplify the code.
diff --git a/ole/ole2stubs.c b/ole/ole2stubs.c
index 5784850..f855d49 100644
--- a/ole/ole2stubs.c
+++ b/ole/ole2stubs.c
@@ -5,7 +5,7 @@
*/
#include "ole2.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole)
@@ -17,7 +17,7 @@
LPOLECLIENTSITE pClientSite, LPSTORAGE pStg,
LPVOID* ppvObj)
{
- FIXME(ole,"(%p,%p,%li,%p,%p,%p,%p), stub!\n", pSrcDataObj,riid,renderopt,pFormatEtc,pClientSite,pStg,ppvObj);
+ FIXME("(%p,%p,%li,%p,%p,%p,%p), stub!\n", pSrcDataObj,riid,renderopt,pFormatEtc,pClientSite,pStg,ppvObj);
return S_OK;
}
@@ -29,7 +29,7 @@
DWORD renderopt, LPFORMATETC lpFormatEtc,
LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj)
{
- FIXME(ole,"(%p,%p,%li,%p,%p,%p,%p), stub!\n",lpszFileName, riid, renderopt, lpFormatEtc, pClientSite, pStg, ppvObj);
+ FIXME("(%p,%p,%li,%p,%p,%p,%p), stub!\n",lpszFileName, riid, renderopt, lpFormatEtc, pClientSite, pStg, ppvObj);
return S_OK;
}
@@ -40,7 +40,7 @@
HRESULT WINAPI OleDuplicateData(HANDLE hSrc, CLIPFORMAT cfFormat,
UINT uiFlags)
{
- FIXME(ole,"(%x,%x,%x), stub!\n", hSrc, cfFormat, uiFlags);
+ FIXME("(%x,%x,%x), stub!\n", hSrc, cfFormat, uiFlags);
return S_OK;
}
@@ -51,7 +51,7 @@
HRESULT WINAPI WriteFmtUserTypeStg(
LPSTORAGE pstg, CLIPFORMAT cf, LPOLESTR lpszUserType)
{
- FIXME(ole,"(%p,%x,%p) stub!\n",pstg,cf,lpszUserType);
+ FIXME("(%p,%x,%p) stub!\n",pstg,cf,lpszUserType);
return S_OK;
}
@@ -61,7 +61,7 @@
HRESULT WINAPI OleTranslateAccelerator (LPOLEINPLACEFRAME lpFrame,
LPOLEINPLACEFRAMEINFO lpFrameInfo, LPMSG lpmsg)
{
- FIXME(ole,"(%p,%p,%p),stub!\n", lpFrame, lpFrameInfo, lpmsg);
+ FIXME("(%p,%p,%p),stub!\n", lpFrame, lpFrameInfo, lpmsg);
return S_OK;
}
@@ -70,7 +70,7 @@
*/
HRESULT WINAPI CoTreatAsClass(REFCLSID clsidOld, REFCLSID clsidNew)
{
- FIXME(ole,"(%p,%p), stub!\n", clsidOld, clsidNew);
+ FIXME("(%p,%p), stub!\n", clsidOld, clsidNew);
return S_OK;
}
@@ -80,7 +80,7 @@
*/
BOOL WINAPI IsAccelerator(HACCEL hAccel, int cAccelEntries, LPMSG lpMsg, WORD* lpwCmd)
{
- FIXME(ole,"(%x,%i,%p,%p), stub!\n", hAccel, cAccelEntries, lpMsg, lpwCmd);
+ FIXME("(%x,%i,%p,%p), stub!\n", hAccel, cAccelEntries, lpMsg, lpwCmd);
return TRUE;
}
@@ -89,7 +89,7 @@
*/
HRESULT WINAPI SetConvertStg(LPSTORAGE pStg, BOOL fConvert)
{
- FIXME(ole,"(%p,%x), stub!\n", pStg, fConvert);
+ FIXME("(%p,%x), stub!\n", pStg, fConvert);
return S_OK;
}
@@ -98,7 +98,7 @@
*/
HRESULT WINAPI OleFlushClipboard()
{
- FIXME(ole,"(), stub!\n");
+ FIXME("(), stub!\n");
return S_OK;
}
@@ -108,7 +108,7 @@
HRESULT WINAPI OleCreate(REFCLSID rclsid, REFIID riid, DWORD renderopt, LPFORMATETC pFormatEtc, LPOLECLIENTSITE pClientSite,
LPSTORAGE pStg, LPVOID* ppvObj)
{
- FIXME(ole,"(not shown), stub!\n");
+ FIXME("(not shown), stub!\n");
return S_OK;
}
@@ -118,7 +118,7 @@
HRESULT WINAPI OleCreateLink(LPMONIKER pmkLinkSrc, REFIID riid, DWORD renderopt, LPFORMATETC lpFormatEtc,
LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj)
{
- FIXME(ole,"(not shown), stub!\n");
+ FIXME("(not shown), stub!\n");
return S_OK;
}
@@ -128,7 +128,7 @@
HRESULT WINAPI OleCreateFromFile(REFCLSID rclsid, LPCOLESTR lpszFileName, REFIID riid,
DWORD renderopt, LPFORMATETC lpFormatEtc, LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj)
{
- FIXME(ole,"(not shown), stub!\n");
+ FIXME("(not shown), stub!\n");
return S_OK;
}
@@ -137,7 +137,7 @@
*/
HRESULT WINAPI OleLockRunning(LPUNKNOWN pUnknown, BOOL fLock, BOOL fLastUnlockCloses)
{
- FIXME(ole,"(%p,%x,%x), stub!\n", pUnknown, fLock, fLastUnlockCloses);
+ FIXME("(%p,%x,%x), stub!\n", pUnknown, fLock, fLastUnlockCloses);
return S_OK;
}
@@ -146,7 +146,7 @@
*/
HGLOBAL WINAPI OleGetIconOfClass(REFCLSID rclsid, LPOLESTR lpszLabel, BOOL fUseTypeAsLabel)
{
- FIXME(ole,"(%p,%p,%x), stub!\n", rclsid, lpszLabel, fUseTypeAsLabel);
+ FIXME("(%p,%p,%x), stub!\n", rclsid, lpszLabel, fUseTypeAsLabel);
return S_OK;
}
@@ -155,7 +155,7 @@
*/
HRESULT WINAPI OleQueryCreateFromData(LPDATAOBJECT pSrcDataObject)
{
- FIXME(ole,"(%p), stub!\n", pSrcDataObject);
+ FIXME("(%p), stub!\n", pSrcDataObject);
return S_OK;
}
@@ -164,7 +164,7 @@
*/
HRESULT WINAPI ReadFmtUserTypeStg (LPSTORAGE pstg, CLIPFORMAT* pcf, LPOLESTR* lplpszUserType)
{
- FIXME(ole,"(%p,%p,%p), stub!\n", pstg, pcf, lplpszUserType);
+ FIXME("(%p,%p,%p), stub!\n", pstg, pcf, lplpszUserType);
return S_OK;
}
@@ -175,7 +175,7 @@
DWORD renderopt, LPFORMATETC pFormatEtc, LPOLECLIENTSITE pClientSite,
LPSTORAGE pStg, LPVOID* ppvObj)
{
- FIXME(ole,"(not shown), stub!\n");
+ FIXME("(not shown), stub!\n");
return S_OK;
}
@@ -184,7 +184,7 @@
*/
HRESULT WINAPI OleRun(LPUNKNOWN pUnknown)
{
- FIXME(ole,"(%p), stub!\n", pUnknown);
+ FIXME("(%p), stub!\n", pUnknown);
return S_OK;
}
@@ -197,7 +197,7 @@
LPOLECLIENTSITE pClientSite, LPSTORAGE pStg,
LPVOID* ppvObj)
{
- FIXME(ole,"(not shown), stub!\n");
+ FIXME("(not shown), stub!\n");
return S_OK;
}
@@ -206,7 +206,7 @@
*/
BOOL WINAPI OleIsRunning(LPOLEOBJECT pObject)
{
- FIXME(ole,"(%p), stub!\n", pObject);
+ FIXME("(%p), stub!\n", pObject);
return TRUE;
}
@@ -215,7 +215,7 @@
*/
HRESULT WINAPI OleRegEnumVerbs (REFCLSID clsid, LPENUMOLEVERB* ppenum)
{
- FIXME(ole,"(%p,%p), stub!\n", clsid, ppenum);
+ FIXME("(%p,%p), stub!\n", clsid, ppenum);
return S_OK;
}
@@ -227,7 +227,7 @@
DWORD dwDirection,
LPENUMFORMATETC* ppenumFormatetc)
{
- FIXME(ole,"(%p, %ld, %p), stub!\n", clsid, dwDirection, ppenumFormatetc);
+ FIXME("(%p, %ld, %p), stub!\n", clsid, dwDirection, ppenumFormatetc);
return S_OK;
}
diff --git a/ole/olecli.c b/ole/olecli.c
index 9279f5d..b4992c9 100644
--- a/ole/olecli.c
+++ b/ole/olecli.c
@@ -11,7 +11,7 @@
#include "ole.h"
#include "gdi.h"
#include "objidl.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole)
@@ -24,7 +24,7 @@
OLESTATUS WINAPI OleRegisterClientDoc16(LPCSTR classname, LPCSTR docname,
LONG reserved, LHCLIENTDOC *hRet )
{
- FIXME(ole,"(%s,%s,...): stub\n",classname,docname);
+ FIXME("(%s,%s,...): stub\n",classname,docname);
*hRet=++OLE_current_handle;
return OLE_OK;
}
@@ -35,7 +35,7 @@
OLESTATUS WINAPI OleRegisterClientDoc(LPCSTR classname, LPCSTR docname,
LONG reserved, LHCLIENTDOC *hRet )
{
- FIXME(ole,"(%s,%s,...): stub\n",classname,docname);
+ FIXME("(%s,%s,...): stub\n",classname,docname);
*hRet=++OLE_current_handle;
return OLE_OK;
}
@@ -45,7 +45,7 @@
*/
OLESTATUS WINAPI OleRenameClientDoc16(LHCLIENTDOC hDoc, LPCSTR newName)
{
- FIXME(ole,"(%ld,%s,...): stub\n",hDoc, newName);
+ FIXME("(%ld,%s,...): stub\n",hDoc, newName);
return OLE_OK;
}
@@ -54,7 +54,7 @@
*/
OLESTATUS WINAPI OleRenameClientDoc(LHCLIENTDOC hDoc, LPCSTR newName)
{
- FIXME(ole,"(%ld,%s,...): stub\n",hDoc, newName);
+ FIXME("(%ld,%s,...): stub\n",hDoc, newName);
return OLE_OK;
}
@@ -63,7 +63,7 @@
*/
OLESTATUS WINAPI OleRevokeClientDoc16(LHCLIENTDOC hServerDoc)
{
- FIXME(ole,"(%ld): stub\n",hServerDoc);
+ FIXME("(%ld): stub\n",hServerDoc);
return OLE_OK;
}
@@ -72,7 +72,7 @@
*/
OLESTATUS WINAPI OleRevokeClientDoc(LHCLIENTDOC hServerDoc)
{
- FIXME(ole,"(%ld): stub\n",hServerDoc);
+ FIXME("(%ld): stub\n",hServerDoc);
return OLE_OK;
}
@@ -81,7 +81,7 @@
*/
OLESTATUS WINAPI OleRevertClientDoc16(LHCLIENTDOC hServerDoc)
{
- FIXME(ole, "(%ld): stub\n", hServerDoc);
+ FIXME("(%ld): stub\n", hServerDoc);
return OLE_OK;
}
@@ -90,7 +90,7 @@
*/
OLESTATUS WINAPI OleEnumObjects16(LHCLIENTDOC hServerDoc, SEGPTR data)
{
- FIXME(ole, "(%ld, %04x:%04x): stub\n", hServerDoc, HIWORD(data),
+ FIXME("(%ld, %04x:%04x): stub\n", hServerDoc, HIWORD(data),
LOWORD(data));
return OLE_OK;
}
@@ -102,7 +102,7 @@
LPCSTR name, LPOLECLIENT olecli, LHCLIENTDOC hclientdoc, LPCSTR xname,
LPOLEOBJECT *lpoleob, UINT16 render, UINT16 clipformat
) {
- FIXME(ole, "(%s, %04x:%04x, %ld, %s, %04x:%04x, %d, %d): stub!\n",
+ FIXME("(%s, %04x:%04x, %ld, %s, %04x:%04x, %d, %d): stub!\n",
(char *)PTR_SEG_TO_LIN(name), HIWORD(olecli), LOWORD(olecli),
hclientdoc, (char *)PTR_SEG_TO_LIN(xname), HIWORD(lpoleob),
LOWORD(lpoleob), render, clipformat);
@@ -116,7 +116,7 @@
LPCSTR name,LPOLECLIENT olecli,LHCLIENTDOC hclientdoc,LPCSTR xname,
LPOLEOBJECT *lpoleob,OLEOPT_RENDER render,OLECLIPFORMAT clipformat
) {
- FIXME(ole,"(%s,%p,%08lx,%s,%p,%d,%ld): stub!\n",
+ FIXME("(%s,%p,%08lx,%s,%p,%d,%ld): stub!\n",
name,olecli,hclientdoc,xname,lpoleob,render,clipformat);
return OLE_OK;
}
@@ -125,7 +125,7 @@
* OleQueryLinkFromClip16 [OLECLI.9]
*/
OLESTATUS WINAPI OleQueryLinkFromClip16(LPCSTR name, UINT16 render, UINT16 clipformat) {
- FIXME(ole, "(%s, %d, %d): stub!\n", (char*)(PTR_SEG_TO_LIN(name)),
+ FIXME("(%s, %d, %d): stub!\n", (char*)(PTR_SEG_TO_LIN(name)),
render, clipformat);
return OLE_OK;
}
@@ -134,7 +134,7 @@
* OleQueryLinkFromClip32 [OLECLI32.9]
*/
OLESTATUS WINAPI OleQueryLinkFromClip(LPCSTR name,OLEOPT_RENDER render,OLECLIPFORMAT clipformat) {
- FIXME(ole,"(%s,%d,%ld): stub!\n",name,render,clipformat);
+ FIXME("(%s,%d,%ld): stub!\n",name,render,clipformat);
return OLE_OK;
}
@@ -142,7 +142,7 @@
* OleQueryCreateFromClip16 [OLECLI.10]
*/
OLESTATUS WINAPI OleQueryCreateFromClip16(LPCSTR name, UINT16 render, UINT16 clipformat) {
- FIXME(ole, "(%s, %d, %d): stub!\n", (char*)(PTR_SEG_TO_LIN(name)),
+ FIXME("(%s, %d, %d): stub!\n", (char*)(PTR_SEG_TO_LIN(name)),
render, clipformat);
return OLE_OK;
}
@@ -151,7 +151,7 @@
* OleQueryCreateFromClip32 [OLECLI32.10]
*/
OLESTATUS WINAPI OleQueryCreateFromClip(LPCSTR name,OLEOPT_RENDER render,OLECLIPFORMAT clipformat) {
- FIXME(ole,"(%s,%d,%ld): stub!\n",name,render,clipformat);
+ FIXME("(%s,%d,%ld): stub!\n",name,render,clipformat);
return OLE_OK;
}
@@ -160,7 +160,7 @@
*/
BOOL16 WINAPI OleIsDcMeta16(HDC16 hdc)
{
- TRACE(ole,"(%04x)\n",hdc);
+ TRACE("(%04x)\n",hdc);
if (GDI_GetObjPtr( hdc, METAFILE_DC_MAGIC ) != 0) {
GDI_HEAP_UNLOCK( hdc );
return TRUE;
@@ -174,7 +174,7 @@
*/
BOOL WINAPI OleIsDcMeta(HDC hdc)
{
- TRACE(ole,"(%04x)\n",hdc);
+ TRACE("(%04x)\n",hdc);
if (GDI_GetObjPtr( hdc, METAFILE_DC_MAGIC ) != 0) {
GDI_HEAP_UNLOCK( hdc );
return TRUE;
@@ -187,7 +187,7 @@
* OleSetHostNames32 [OLECLI32.15]
*/
OLESTATUS WINAPI OleSetHostNames(LPOLEOBJECT oleob,LPCSTR name1,LPCSTR name2) {
- FIXME(ole,"(%p,%s,%s): stub\n",oleob,name1,name2);
+ FIXME("(%p,%s,%s): stub\n",oleob,name1,name2);
return OLE_OK;
}
@@ -195,7 +195,7 @@
* OleQueryType16 [OLECLI.14]
*/
OLESTATUS WINAPI OleQueryType16(LPOLEOBJECT oleob, SEGPTR xlong) {
- FIXME(ole, "(%p, %p): stub!\n",
+ FIXME("(%p, %p): stub!\n",
PTR_SEG_TO_LIN(oleob), PTR_SEG_TO_LIN(xlong));
return OLE_OK;
}
@@ -204,10 +204,10 @@
* OleQueryType32 [OLECLI32.14]
*/
OLESTATUS WINAPI OleQueryType(LPOLEOBJECT oleob,LONG*xlong) {
- FIXME(ole,"(%p,%p): stub!\n",oleob,xlong);
+ FIXME("(%p,%p): stub!\n",oleob,xlong);
if (!oleob)
return 0x10;
- TRACE(ole,"Calling OLEOBJECT.QueryType (%p) (%p,%p)\n",
+ TRACE("Calling OLEOBJECT.QueryType (%p) (%p,%p)\n",
oleob->lpvtbl->QueryType,oleob,xlong);
return oleob->lpvtbl->QueryType(oleob,xlong);
}
@@ -219,7 +219,7 @@
LPCSTR name, LPOLECLIENT olecli, LHCLIENTDOC hclientdoc, LPCSTR xname,
LPOLEOBJECT *lpoleob, UINT16 render, UINT16 clipformat
) {
- FIXME(ole, "(%s, %04x:%04x, %ld, %s, %04x:%04x, %d, %d): stub!\n",
+ FIXME("(%s, %04x:%04x, %ld, %s, %04x:%04x, %d, %d): stub!\n",
(char *)PTR_SEG_TO_LIN(name), HIWORD(olecli), LOWORD(olecli),
hclientdoc, (char *)PTR_SEG_TO_LIN(xname), HIWORD(lpoleob),
LOWORD(lpoleob), render, clipformat);
@@ -233,7 +233,7 @@
LPCSTR name,LPOLECLIENT olecli,LHCLIENTDOC hclientdoc,LPCSTR xname,
LPOLEOBJECT *lpoleob,OLEOPT_RENDER render, OLECLIPFORMAT clipformat
) {
- FIXME(ole,"(%s,%p,%08lx,%s,%p,%d,%ld): stub!\n",
+ FIXME("(%s,%p,%08lx,%s,%p,%d,%ld): stub!\n",
name,olecli,hclientdoc,xname,lpoleob,render,clipformat);
/* clipb type, object kreieren entsprechend etc. */
return OLE_OK;
@@ -245,7 +245,7 @@
HRESULT WINAPI OleIsCurrentClipboard (
IDataObject *pDataObject) /* ptr to the data obj previously copied or cut */
{
- FIXME(ole,"(DataObject %p): stub!\n", pDataObject);
+ FIXME("(DataObject %p): stub!\n", pDataObject);
return S_FALSE;
}
diff --git a/ole/oledlg.c b/ole/oledlg.c
index f7835d4..fee1b0a 100644
--- a/ole/oledlg.c
+++ b/ole/oledlg.c
@@ -8,7 +8,7 @@
#include "winbase.h"
#include "winerror.h"
#include "oledlg.h"
-#include "debug.h"
+#include "debugtools.h"
#include "ole2.h"
DEFAULT_DEBUG_CHANNEL(ole)
@@ -20,7 +20,7 @@
HMENU hMenu, UINT uPos, UINT uIDVerbMin, UINT uIDVerbMax,
BOOL bAddConvert, UINT idConvert, HMENU *lphMenu)
{
- FIXME(ole, "(%p, %s, 0x%08x, %d, %d, %d, %d, %d, %p): stub\n",
+ FIXME("(%p, %s, 0x%08x, %d, %d, %d, %d, %d, %p): stub\n",
lpOleObj, debugstr_a(lpszShortType),
hMenu, uPos, uIDVerbMin, uIDVerbMax,
bAddConvert, idConvert, lphMenu
@@ -37,7 +37,7 @@
HMENU hMenu, UINT uPos, UINT uIDVerbMin, UINT uIDVerbMax,
BOOL bAddConvert, UINT idConvert, HMENU *lphMenu)
{
- FIXME(ole, "(%p, %s, 0x%08x, %d, %d, %d, %d, %d, %p): stub\n",
+ FIXME("(%p, %s, 0x%08x, %d, %d, %d, %d, %d, %p): stub\n",
lpOleObj, debugstr_w(lpszShortType),
hMenu, uPos, uIDVerbMin, uIDVerbMax,
bAddConvert, idConvert, lphMenu
@@ -52,7 +52,7 @@
BOOL WINAPI OleUICanConvertOrActivateAs(
REFCLSID rClsid, BOOL fIsLinkedObject, WORD wFormat)
{
- FIXME(ole, "(%p, %d, %hd): stub\n",
+ FIXME("(%p, %d, %hd): stub\n",
rClsid, fIsLinkedObject, wFormat
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -64,7 +64,7 @@
*/
UINT WINAPI OleUIInsertObjectA(LPOLEUIINSERTOBJECTA lpOleUIInsertObject)
{
- FIXME(ole, "(%p): stub\n", lpOleUIInsertObject);
+ FIXME("(%p): stub\n", lpOleUIInsertObject);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
@@ -74,7 +74,7 @@
*/
UINT WINAPI OleUIInsertObjectW(LPOLEUIINSERTOBJECTW lpOleUIInsertObject)
{
- FIXME(ole, "(%p): stub\n", lpOleUIInsertObject);
+ FIXME("(%p): stub\n", lpOleUIInsertObject);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
@@ -84,7 +84,7 @@
*/
UINT WINAPI OleUIPasteSpecialA(LPOLEUIPASTESPECIALA lpOleUIPasteSpecial)
{
- FIXME(ole, "(%p): stub\n", lpOleUIPasteSpecial);
+ FIXME("(%p): stub\n", lpOleUIPasteSpecial);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
@@ -94,7 +94,7 @@
*/
UINT WINAPI OleUIPasteSpecialW(LPOLEUIPASTESPECIALW lpOleUIPasteSpecial)
{
- FIXME(ole, "(%p): stub\n", lpOleUIPasteSpecial);
+ FIXME("(%p): stub\n", lpOleUIPasteSpecial);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
@@ -104,7 +104,7 @@
*/
UINT WINAPI OleUIEditLinksA(LPOLEUIEDITLINKSA lpOleUIEditLinks)
{
- FIXME(ole, "(%p): stub\n", lpOleUIEditLinks);
+ FIXME("(%p): stub\n", lpOleUIEditLinks);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
@@ -114,7 +114,7 @@
*/
UINT WINAPI OleUIEditLinksW(LPOLEUIEDITLINKSW lpOleUIEditLinks)
{
- FIXME(ole, "(%p): stub\n", lpOleUIEditLinks);
+ FIXME("(%p): stub\n", lpOleUIEditLinks);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
@@ -125,7 +125,7 @@
UINT WINAPI OleUIChangeIconA(
LPOLEUICHANGEICONA lpOleUIChangeIcon)
{
- FIXME(ole, "(%p): stub\n", lpOleUIChangeIcon);
+ FIXME("(%p): stub\n", lpOleUIChangeIcon);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
@@ -136,7 +136,7 @@
UINT WINAPI OleUIChangeIconW(
LPOLEUICHANGEICONW lpOleUIChangeIcon)
{
- FIXME(ole, "(%p): stub\n", lpOleUIChangeIcon);
+ FIXME("(%p): stub\n", lpOleUIChangeIcon);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
@@ -146,7 +146,7 @@
*/
UINT WINAPI OleUIConvertA(LPOLEUICONVERTA lpOleUIConvert)
{
- FIXME(ole, "(%p): stub\n", lpOleUIConvert);
+ FIXME("(%p): stub\n", lpOleUIConvert);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
@@ -156,7 +156,7 @@
*/
UINT WINAPI OleUIConvertW(LPOLEUICONVERTW lpOleUIConvert)
{
- FIXME(ole, "(%p): stub\n", lpOleUIConvert);
+ FIXME("(%p): stub\n", lpOleUIConvert);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
@@ -166,7 +166,7 @@
*/
UINT WINAPI OleUIBusyA(LPOLEUIBUSYA lpOleUIBusy)
{
- FIXME(ole, "(%p): stub\n", lpOleUIBusy);
+ FIXME("(%p): stub\n", lpOleUIBusy);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
@@ -176,7 +176,7 @@
*/
UINT WINAPI OleUIBusyW(LPOLEUIBUSYW lpOleUIBusy)
{
- FIXME(ole, "(%p): stub\n", lpOleUIBusy);
+ FIXME("(%p): stub\n", lpOleUIBusy);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
@@ -188,7 +188,7 @@
LPOLEUILINKCONTAINERA lpOleUILinkCntr,
HWND hwndParent, LPSTR lpszTitle, INT cLinks)
{
- FIXME(ole,"(%p, 0x%08x, %s, %d): stub\n",
+ FIXME("(%p, 0x%08x, %s, %d): stub\n",
lpOleUILinkCntr, hwndParent, debugstr_a(lpszTitle), cLinks
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -205,7 +205,7 @@
LPOLEUILINKCONTAINERW lpOleUILinkCntr,
HWND hwndParent, LPWSTR lpszTitle, INT cLinks)
{
- FIXME(ole, "(%p, 0x%08x, %s, %d): stub\n",
+ FIXME("(%p, 0x%08x, %s, %d): stub\n",
lpOleUILinkCntr, hwndParent, debugstr_w(lpszTitle), cLinks
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -218,7 +218,7 @@
INT __cdecl OleUIPromptUserA(
INT nTemplate, HWND hwndParent, ...)
{
- FIXME(ole, "(%d, 0x%08x, ...): stub\n", nTemplate, hwndParent);
+ FIXME("(%d, 0x%08x, ...): stub\n", nTemplate, hwndParent);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
@@ -229,7 +229,7 @@
INT __cdecl OleUIPromptUserW(
INT nTemplate, HWND hwndParent, ...)
{
- FIXME(ole, "(%d, 0x%08x, ...): stub\n", nTemplate, hwndParent);
+ FIXME("(%d, 0x%08x, ...): stub\n", nTemplate, hwndParent);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
@@ -240,7 +240,7 @@
UINT WINAPI OleUIObjectPropertiesA(
LPOLEUIOBJECTPROPSA lpOleUIObjectProps)
{
- FIXME(ole, "(%p): stub\n", lpOleUIObjectProps);
+ FIXME("(%p): stub\n", lpOleUIObjectProps);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
@@ -251,7 +251,7 @@
UINT WINAPI OleUIObjectPropertiesW(
LPOLEUIOBJECTPROPSW lpOleUIObjectProps)
{
- FIXME(ole, "(%p): stub\n", lpOleUIObjectProps);
+ FIXME("(%p): stub\n", lpOleUIObjectProps);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
@@ -262,7 +262,7 @@
UINT WINAPI OleUIChangeSourceA(
LPOLEUICHANGESOURCEA lpOleUIChangeSource)
{
- FIXME(ole, "(%p): stub\n", lpOleUIChangeSource);
+ FIXME("(%p): stub\n", lpOleUIChangeSource);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
@@ -273,7 +273,7 @@
UINT WINAPI OleUIChangeSourceW(
LPOLEUICHANGESOURCEW lpOleUIChangeSource)
{
- FIXME(ole, "(%p): stub\n", lpOleUIChangeSource);
+ FIXME("(%p): stub\n", lpOleUIChangeSource);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return OLEUI_FALSE;
}
diff --git a/ole/olefont.c b/ole/olefont.c
index d5e16d3..ca78755 100644
--- a/ole/olefont.c
+++ b/ole/olefont.c
@@ -12,7 +12,7 @@
#include "oleauto.h"
#include "ocidl.h"
#include "olectl.h"
-#include "debug.h"
+#include "debugtools.h"
#include "heap.h"
DEFAULT_DEBUG_CHANNEL(ole)
@@ -405,7 +405,7 @@
WINE_StringFromCLSID((LPCLSID)riid,clsid);
- WARN(ole,
+ WARN(
"() : asking for un supported interface %s\n",
clsid);
@@ -571,7 +571,7 @@
IFont* iface,
BOOL* pbold)
{
- FIXME(ole,"():Stub\n");
+ FIXME("():Stub\n");
return E_NOTIMPL;
}
@@ -584,7 +584,7 @@
IFont* iface,
BOOL bold)
{
- FIXME(ole,"():Stub\n");
+ FIXME("():Stub\n");
return E_NOTIMPL;
}
@@ -882,7 +882,7 @@
IFont* iface,
IFont* pFontOther)
{
- FIXME(ole,"():Stub\n");
+ FIXME("():Stub\n");
return E_NOTIMPL;
}
@@ -913,7 +913,7 @@
IFont* iface,
TEXTMETRICOLE* ptm)
{
- FIXME(ole,"():Stub\n");
+ FIXME("():Stub\n");
return E_NOTIMPL;
}
@@ -975,7 +975,7 @@
IFont* iface,
HDC hdc)
{
- FIXME(ole,"():Stub\n");
+ FIXME("():Stub\n");
return E_NOTIMPL;
}
@@ -1029,7 +1029,7 @@
IDispatch* iface,
unsigned int* pctinfo)
{
- FIXME(ole,"():Stub\n");
+ FIXME("():Stub\n");
return E_NOTIMPL;
}
@@ -1045,7 +1045,7 @@
LCID lcid,
ITypeInfo** ppTInfo)
{
- FIXME(ole,"():Stub\n");
+ FIXME("():Stub\n");
return E_NOTIMPL;
}
@@ -1063,7 +1063,7 @@
LCID lcid,
DISPID* rgDispId)
{
- FIXME(ole,"():Stub\n");
+ FIXME("():Stub\n");
return E_NOTIMPL;
}
@@ -1084,7 +1084,7 @@
EXCEPINFO* pExepInfo,
UINT* puArgErr)
{
- FIXME(ole,"():Stub\n");
+ FIXME("():Stub\n");
return E_NOTIMPL;
}
diff --git a/ole/oleobj.c b/ole/oleobj.c
index 9090250..67c21f2 100644
--- a/ole/oleobj.c
+++ b/ole/oleobj.c
@@ -10,7 +10,7 @@
#include "winbase.h"
#include "winerror.h"
#include "oleidl.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole)
@@ -194,7 +194,7 @@
ICOM_THIS(OleAdviseHolderImpl, iface);
- TRACE(ole, "(%p, %p, %p)\n", This, pAdvise, pdwConnection);
+ TRACE("(%p, %p, %p)\n", This, pAdvise, pdwConnection);
/*
* Sanity check
@@ -258,7 +258,7 @@
{
ICOM_THIS(OleAdviseHolderImpl, iface);
- TRACE(ole, "(%p, %lu)\n", This, dwConnection);
+ TRACE("(%p, %lu)\n", This, dwConnection);
/*
* So we don't return 0 as a cookie, the index was
@@ -293,7 +293,7 @@
OleAdviseHolderImpl_EnumAdvise (LPOLEADVISEHOLDER iface, IEnumSTATDATA **ppenumAdvise)
{
ICOM_THIS(OleAdviseHolderImpl, iface);
- FIXME (ole, "(%p)->(%p)\n", This, ppenumAdvise);
+ FIXME("(%p)->(%p)\n", This, ppenumAdvise);
*ppenumAdvise = NULL;
@@ -307,7 +307,7 @@
OleAdviseHolderImpl_SendOnRename (LPOLEADVISEHOLDER iface, IMoniker *pmk)
{
ICOM_THIS(OleAdviseHolderImpl, iface);
- FIXME (ole, "(%p)->(%p)\n", This, pmk);
+ FIXME("(%p)->(%p)\n", This, pmk);
return S_OK;
@@ -320,7 +320,7 @@
OleAdviseHolderImpl_SendOnSave (LPOLEADVISEHOLDER iface)
{
ICOM_THIS(OleAdviseHolderImpl, iface);
- FIXME (ole, "(%p)\n", This);
+ FIXME("(%p)\n", This);
return S_OK;
@@ -333,7 +333,7 @@
OleAdviseHolderImpl_SendOnClose (LPOLEADVISEHOLDER iface)
{
ICOM_THIS(OleAdviseHolderImpl, iface);
- FIXME (ole, "(%p)\n", This);
+ FIXME("(%p)\n", This);
return S_OK;
@@ -524,7 +524,7 @@
IAdviseSink* pAdvise,
DWORD* pdwConnection)
{
- FIXME(ole, "(): stub\n");
+ FIXME("(): stub\n");
return E_NOTIMPL;
}
@@ -532,7 +532,7 @@
IDataAdviseHolder* iface,
DWORD dwConnection)
{
- FIXME(ole, "(): stub\n");
+ FIXME("(): stub\n");
return E_NOTIMPL;
}
@@ -540,7 +540,7 @@
IDataAdviseHolder* iface,
IEnumSTATDATA** ppenumAdvise)
{
- FIXME(ole, "(): stub\n");
+ FIXME("(): stub\n");
return E_NOTIMPL;
}
@@ -550,7 +550,7 @@
DWORD dwReserved,
DWORD advf)
{
- FIXME(ole, "(): stub\n");
+ FIXME("(): stub\n");
return E_NOTIMPL;
}
@@ -564,7 +564,7 @@
HRESULT WINAPI CreateOleAdviseHolder(
LPOLEADVISEHOLDER *ppOAHolder)
{
- TRACE(ole, "(%p)\n", ppOAHolder);
+ TRACE("(%p)\n", ppOAHolder);
/*
* Sanity check,
@@ -586,7 +586,7 @@
HRESULT WINAPI CreateDataAdviseHolder(
LPDATAADVISEHOLDER* ppDAHolder)
{
- TRACE(ole,"(%p)\n", ppDAHolder);
+ TRACE("(%p)\n", ppDAHolder);
/*
* Sanity check,
diff --git a/ole/olesvr.c b/ole/olesvr.c
index f1f4238..dcce95b 100644
--- a/ole/olesvr.c
+++ b/ole/olesvr.c
@@ -8,7 +8,7 @@
*/
#include "ole.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole)
@@ -21,7 +21,7 @@
LHSERVER *hRet, HINSTANCE16 hServer,
OLE_SERVER_USE use )
{
- FIXME(ole,"(%s,...): stub\n",name);
+ FIXME("(%s,...): stub\n",name);
*hRet=++OLE_current_handle;
/* return OLE_ERROR_MEMORY, OLE_ERROR_PROTECT_ONLY if you want it fail*/
return OLE_OK;
@@ -32,7 +32,7 @@
*/
OLESTATUS WINAPI OleBlockServer16(LHSERVER hServer)
{
- FIXME(ole,"(%ld): stub\n",hServer);
+ FIXME("(%ld): stub\n",hServer);
return OLE_OK;
}
@@ -41,7 +41,7 @@
*/
OLESTATUS WINAPI OleBlockServer(LHSERVER hServer)
{
- FIXME(ole,"(%ld): stub\n",hServer);
+ FIXME("(%ld): stub\n",hServer);
return OLE_OK;
}
@@ -50,7 +50,7 @@
*/
OLESTATUS WINAPI OleUnblockServer16(LHSERVER hServer, BOOL16 *block)
{
- FIXME(ole,"(%ld): stub\n",hServer);
+ FIXME("(%ld): stub\n",hServer);
/* no more blocked messages :) */
*block=FALSE;
return OLE_OK;
@@ -61,7 +61,7 @@
*/
OLESTATUS WINAPI OleUnblockServer(LHSERVER hServer, BOOL *block)
{
- FIXME(ole,"(%ld): stub\n",hServer);
+ FIXME("(%ld): stub\n",hServer);
/* no more blocked messages :) */
*block=FALSE;
return OLE_OK;
@@ -74,7 +74,7 @@
LPOLESERVERDOC document,
LHSERVERDOC *hRet)
{
- FIXME(ole,"(%ld,%s): stub\n",hServer, docname);
+ FIXME("(%ld,%s): stub\n",hServer, docname);
*hRet=++OLE_current_handle;
return OLE_OK;
}
@@ -84,7 +84,7 @@
*/
OLESTATUS WINAPI OleRevokeServerDoc16(LHSERVERDOC hServerDoc)
{
- FIXME(ole,"%ld - stub\n",hServerDoc);
+ FIXME("%ld - stub\n",hServerDoc);
return OLE_OK;
}
@@ -93,7 +93,7 @@
*/
OLESTATUS WINAPI OleRevokeServerDoc(LHSERVERDOC hServerDoc)
{
- FIXME(ole,"(%ld): stub\n",hServerDoc);
+ FIXME("(%ld): stub\n",hServerDoc);
return OLE_OK;
}
@@ -102,7 +102,7 @@
*/
OLESTATUS WINAPI OleRevokeServer16(LHSERVER hServer)
{
- FIXME(ole,"%ld - stub\n",hServer);
+ FIXME("%ld - stub\n",hServer);
return OLE_OK;
}
@@ -110,7 +110,7 @@
* OleRegisterServer32 [OLESVR32.2]
*/
OLESTATUS WINAPI OleRegisterServer(LPCSTR svrname,LPOLESERVER olesvr,LHSERVER* hRet,HINSTANCE hinst,OLE_SERVER_USE osu) {
- FIXME(ole,"(%s,%p,%p,%08x,%d): stub!\n",svrname,olesvr,hRet,hinst,osu);
+ FIXME("(%s,%p,%p,%08x,%d): stub!\n",svrname,olesvr,hRet,hinst,osu);
*hRet=++OLE_current_handle;
return OLE_OK;
}
@@ -122,7 +122,7 @@
LPOLESERVERDOC document,
LHSERVERDOC *hRet)
{
- FIXME(ole,"(%ld,%s): stub\n", hServer, docname);
+ FIXME("(%ld,%s): stub\n", hServer, docname);
*hRet=++OLE_current_handle;
return OLE_OK;
}
@@ -133,6 +133,6 @@
*/
OLESTATUS WINAPI OleRenameServerDoc(LHSERVERDOC hDoc, LPCSTR newName)
{
- FIXME(ole,"(%ld,%s): stub.\n",hDoc, newName);
+ FIXME("(%ld,%s): stub.\n",hDoc, newName);
return OLE_OK;
}
diff --git a/ole/safearray.c b/ole/safearray.c
index a5c8288..1453576 100644
--- a/ole/safearray.c
+++ b/ole/safearray.c
@@ -14,7 +14,7 @@
#include "winbase.h"
#include "oleauto.h"
#include "wine/obj_base.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(ole)
@@ -121,7 +121,7 @@
GetProcessHeap(), HEAP_ZERO_MEMORY, allocSize)) == NULL){
return(E_UNEXPECTED);
}
- TRACE(ole,"SafeArray: %lu bytes allocated for descriptor.\n", allocSize);
+ TRACE("SafeArray: %lu bytes allocated for descriptor.\n", allocSize);
return(S_OK);
}
@@ -144,7 +144,7 @@
psa->cbElements*ulWholeArraySize)) == NULL)
return(E_UNEXPECTED);
- TRACE(ole, "SafeArray: %lu bytes allocated for data at %p (%lu objects).\n",
+ TRACE("SafeArray: %lu bytes allocated for data at %p (%lu objects).\n",
psa->cbElements*ulWholeArraySize, psa->pvData, ulWholeArraySize);
return(S_OK);
@@ -187,7 +187,7 @@
/* allocate memory for the data... */
if( FAILED( hRes = SafeArrayAllocData(psa))) {
SafeArrayDestroyDescriptor(psa);
- ERR(ole,"() : Failed to allocate the Safe Array data\n");
+ ERR("() : Failed to allocate the Safe Array data\n");
return NULL;
}
@@ -293,11 +293,11 @@
}
} else {
- ERR(ole, "SafeArray: Cannot lock array....\n");
+ ERR("SafeArray: Cannot lock array....\n");
return E_UNEXPECTED; /* UNDOC error condition */
}
- TRACE(ole,"SafeArray: item put at adress %p.\n",elementStorageAddress);
+ TRACE("SafeArray: item put at adress %p.\n",elementStorageAddress);
return SafeArrayUnlock(psa);
}
@@ -343,7 +343,7 @@
memcpy(pv, elementStorageAddress, SafeArrayGetElemsize(psa) );
} else {
- ERR(ole, "SafeArray: Cannot lock array....\n");
+ ERR("SafeArray: Cannot lock array....\n");
return E_UNEXPECTED; /* UNDOC error condition */
}
@@ -873,7 +873,7 @@
res += ((coor[iterDim]-mat[iterDim].lLbound) *
endOfDim(coor, mat, iterDim+1, dim));
- TRACE(ole, "SafeArray: calculated displacement is %lu.\n", res);
+ TRACE("SafeArray: calculated displacement is %lu.\n", res);
return(res);
}
diff --git a/ole/stg_bigblockfile.c b/ole/stg_bigblockfile.c
index 564bc64..04e7279 100644
--- a/ole/stg_bigblockfile.c
+++ b/ole/stg_bigblockfile.c
@@ -30,7 +30,7 @@
#include "storage32.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(storage)
@@ -209,7 +209,7 @@
*/
if (GetHGlobalFromILockBytes(plkbyt, &(This->hbytearray)) != S_OK)
{
- FIXME(storage, "May not be an ILockBytes on HGLOBAL\n");
+ FIXME("May not be an ILockBytes on HGLOBAL\n");
return FALSE;
}
diff --git a/ole/stg_stream.c b/ole/stg_stream.c
index 2504d80..a31d6d3 100644
--- a/ole/stg_stream.c
+++ b/ole/stg_stream.c
@@ -15,7 +15,7 @@
#include "winbase.h"
#include "winerror.h"
-#include "debug.h"
+#include "debugtools.h"
#include "wine/obj_storage.h"
#include "storage32.h"
@@ -114,7 +114,7 @@
*/
void StgStreamImpl_Destroy(StgStreamImpl* This)
{
- TRACE(storage, "(%p)\n", This);
+ TRACE("(%p)\n", This);
/*
* Release the reference we are holding on the parent storage.
@@ -318,7 +318,7 @@
ULONG bytesReadBuffer;
ULONG bytesToReadFromBuffer;
- TRACE(storage, "(%p, %p, %ld, %p)\n",
+ TRACE("(%p, %p, %ld, %p)\n",
iface, pv, cb, pcbRead);
/*
@@ -401,7 +401,7 @@
ULARGE_INTEGER newSize;
ULONG bytesWritten = 0;
- TRACE(storage, "(%p, %p, %ld, %p)\n",
+ TRACE("(%p, %p, %ld, %p)\n",
iface, pv, cb, pcbWritten);
/*
@@ -485,7 +485,7 @@
ULARGE_INTEGER newPosition;
- TRACE(storage, "(%p, %ld, %ld, %p)\n",
+ TRACE("(%p, %ld, %ld, %p)\n",
iface, dlibMove.LowPart, dwOrigin, plibNewPosition);
/*
@@ -564,7 +564,7 @@
StgProperty curProperty;
BOOL Success;
- TRACE(storage, "(%p, %ld)\n", iface, libNewSize.LowPart);
+ TRACE("(%p, %ld)\n", iface, libNewSize.LowPart);
/*
* As documented.
@@ -669,7 +669,7 @@
ULARGE_INTEGER totalBytesRead;
ULARGE_INTEGER totalBytesWritten;
- TRACE(storage, "(%p, %p, %ld, %p, %p)\n",
+ TRACE("(%p, %p, %ld, %p, %p)\n",
iface, pstm, cb.LowPart, pcbRead, pcbWritten);
/*
@@ -768,7 +768,7 @@
ULARGE_INTEGER cb, /* [in] */
DWORD dwLockType) /* [in] */
{
- FIXME(storage, "not implemented!\n");
+ FIXME("not implemented!\n");
return E_NOTIMPL;
}
@@ -778,7 +778,7 @@
ULARGE_INTEGER cb, /* [in] */
DWORD dwLockType) /* [in] */
{
- FIXME(storage, "not implemented!\n");
+ FIXME("not implemented!\n");
return E_NOTIMPL;
}
@@ -823,6 +823,6 @@
IStream* iface,
IStream** ppstm) /* [out] */
{
- FIXME(storage, "not implemented!\n");
+ FIXME("not implemented!\n");
return E_NOTIMPL;
}
diff --git a/ole/storage32.c b/ole/storage32.c
index c0356a7..71c84e0 100644
--- a/ole/storage32.c
+++ b/ole/storage32.c
@@ -21,7 +21,7 @@
#include "wine/winestring.h"
#include "crtdll.h"
#include "tchar.h"
-#include "debug.h"
+#include "debugtools.h"
#include "windef.h"
#include "storage32.h"
@@ -284,7 +284,7 @@
StgProperty currentProperty;
ULONG foundPropertyIndex;
- TRACE(storage, "(%p, %s, %p, %lx, %ld, %p)\n",
+ TRACE("(%p, %s, %p, %lx, %ld, %p)\n",
iface, debugstr_w(pwcsName), reserved1, grfMode, reserved2, ppstm);
/*
@@ -381,7 +381,7 @@
StgProperty currentProperty;
ULONG foundPropertyIndex;
- TRACE(storage, "(%p, %s, %p, %lx, %p, %ld, %p)\n",
+ TRACE("(%p, %s, %p, %lx, %p, %ld, %p)\n",
iface, debugstr_w(pwcsName), pstgPriority,
grfMode, snbExclude, reserved, ppstg);
@@ -480,7 +480,7 @@
ICOM_THIS(StorageBaseImpl,iface);
IEnumSTATSTGImpl* newEnum;
- TRACE(storage, "(%p, %ld, %p, %ld, %p)\n",
+ TRACE("(%p, %ld, %p, %ld, %p)\n",
iface, reserved1, reserved2, reserved3, ppenum);
/*
@@ -528,7 +528,7 @@
StgProperty curProperty;
BOOL readSucessful;
- TRACE(storage, "(%p, %p, %lx)\n",
+ TRACE("(%p, %p, %lx)\n",
iface, pstatstg, grfStatFlag);
/*
@@ -579,7 +579,7 @@
StgProperty currentProperty;
ULONG foundPropertyIndex;
- TRACE(storage, "(%p, %s, %s)\n",
+ TRACE("(%p, %s, %s)\n",
iface, debugstr_w(pwcsOldName), debugstr_w(pwcsNewName));
/*
@@ -734,7 +734,7 @@
StgProperty currentProperty, newStreamProperty;
ULONG foundPropertyIndex, newPropertyIndex;
- TRACE(storage, "(%p, %s, %lx, %ld, %ld, %p)\n",
+ TRACE("(%p, %s, %lx, %ld, %ld, %p)\n",
iface, debugstr_w(pwcsName), grfMode,
reserved1, reserved2, ppstm);
@@ -883,7 +883,7 @@
StgProperty curProperty;
BOOL success;
- TRACE(storage, "(%p, %p)\n", iface, clsid);
+ TRACE("(%p, %p)\n", iface, clsid);
success = StorageImpl_ReadProperty(This->ancestorStorage,
This->rootPropertySetIndex,
@@ -930,7 +930,7 @@
ULONG newPropertyIndex;
HRESULT hr;
- TRACE(storage, "(%p, %s, %lx, %ld, %ld, %p)\n",
+ TRACE("(%p, %s, %lx, %ld, %ld, %p)\n",
iface, debugstr_w(pwcsName), grfMode,
reserved1, reserved2, ppstg);
@@ -1303,9 +1303,9 @@
IStream *pstrTmp, *pstrChild;
if ((ciidExclude != 0) || (rgiidExclude != NULL) || (snbExclude != NULL))
- FIXME( storage, "Exclude option not implemented\n");
+ FIXME("Exclude option not implemented\n");
- TRACE(storage, "(%p, %ld, %p, %p, %p)\n",
+ TRACE("(%p, %ld, %p, %p, %p)\n",
iface, ciidExclude, rgiidExclude,
snbExclude, pstgDest);
@@ -1439,7 +1439,7 @@
}
else
{
- WARN(storage, "unknown element type: %ld\n", curElement.type);
+ WARN("unknown element type: %ld\n", curElement.type);
}
} while (hr == S_OK);
@@ -1462,7 +1462,7 @@
const OLECHAR *pwcsNewName,/* [string][in] */
DWORD grfFlags) /* [in] */
{
- FIXME(storage, "not implemented!\n");
+ FIXME("not implemented!\n");
return E_NOTIMPL;
}
@@ -1473,7 +1473,7 @@
IStorage* iface,
DWORD grfCommitFlags)/* [in] */
{
- FIXME(storage, "(%ld): stub!\n", grfCommitFlags);
+ FIXME("(%ld): stub!\n", grfCommitFlags);
return S_OK;
}
@@ -1483,7 +1483,7 @@
HRESULT WINAPI StorageImpl_Revert(
IStorage* iface)
{
- FIXME(storage, "not implemented!\n");
+ FIXME("not implemented!\n");
return E_NOTIMPL;
}
@@ -1513,7 +1513,7 @@
ULONG typeOfRelation;
ULONG parentPropertyId;
- TRACE(storage, "(%p, %s)\n",
+ TRACE("(%p, %s)\n",
iface, debugstr_w(pwcsName));
/*
@@ -2007,7 +2007,7 @@
const FILETIME *patime, /* [in] */
const FILETIME *pmtime) /* [in] */
{
- FIXME(storage, "not implemented!\n");
+ FIXME("not implemented!\n");
return E_NOTIMPL;
}
@@ -2019,7 +2019,7 @@
DWORD grfStateBits,/* [in] */
DWORD grfMask) /* [in] */
{
- FIXME(storage, "not implemented!\n");
+ FIXME("not implemented!\n");
return E_NOTIMPL;
}
@@ -2218,7 +2218,7 @@
void StorageImpl_Destroy(
StorageImpl* This)
{
- TRACE(storage, "(%p)\n", This);
+ TRACE("(%p)\n", This);
BlockChainStream_Destroy(This->smallBlockRootChain);
BlockChainStream_Destroy(This->rootBlockChain);
@@ -5204,7 +5204,7 @@
DWORD fileAttributes;
WCHAR tempFileName[MAX_PATH];
- TRACE(storage, "(%s, %lx, %ld, %p)\n",
+ TRACE("(%s, %lx, %ld, %p)\n",
debugstr_w(pwcsName), grfMode,
reserved, ppstgOpen);
@@ -5253,7 +5253,7 @@
fileAttributes = FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS;
if (grfMode & STGM_TRANSACTED)
- FIXME(storage, "Transacted mode not implemented.\n");
+ FIXME("Transacted mode not implemented.\n");
/*
* Initialize the "out" parameter.
@@ -5322,7 +5322,7 @@
DWORD shareMode;
DWORD accessMode;
- TRACE(storage, "(%s, %p, %lx, %p, %ld, %p)\n",
+ TRACE("(%s, %p, %lx, %p, %ld, %p)\n",
debugstr_w(pwcsName), pstgPriority, grfMode,
snbExclude, reserved, ppstgOpen);
@@ -5555,7 +5555,7 @@
STATSTG pstatstg;
HRESULT hRes;
- TRACE(storage,"()\n");
+ TRACE("()\n");
if(pclsid==NULL)
return E_POINTER;
@@ -5580,7 +5580,7 @@
CLSID clsid;
HRESULT res;
- FIXME(storage,"(),stub!\n");
+ FIXME("(),stub!\n");
res=ReadClassStm(pStm,&clsid);
@@ -5607,7 +5607,7 @@
CLSID clsid;
HRESULT res;
- TRACE(storage,"(%p,%p)\n",pPStm,pStm);
+ TRACE("(%p,%p)\n",pPStm,pStm);
res=IPersistStream_GetClassID(pPStm,&clsid);
@@ -5797,11 +5797,11 @@
if ( stgm & STGM_CREATE)
return CREATE_ALWAYS;
if (stgm & STGM_CONVERT) {
- FIXME(storage, "STGM_CONVERT not implemented!\n");
+ FIXME("STGM_CONVERT not implemented!\n");
return CREATE_NEW;
}
/* All other cases */
if (stgm & ~ (STGM_CREATE|STGM_CONVERT))
- FIXME(storage,"unhandled storage mode : 0x%08lx\n",stgm & ~ (STGM_CREATE|STGM_CONVERT));
+ FIXME("unhandled storage mode : 0x%08lx\n",stgm & ~ (STGM_CREATE|STGM_CONVERT));
return CREATE_NEW;
}
diff --git a/ole/typelib.c b/ole/typelib.c
index 19d1b7c..ed80a48 100644
--- a/ole/typelib.c
+++ b/ole/typelib.c
@@ -35,7 +35,7 @@
#include "wine/winbase16.h"
#include "heap.h"
#include "wine/obj_base.h"
-#include "debug.h"
+#include "debugtools.h"
#include "winversion.h"
/* FIXME: get rid of these */
typedef struct ITypeInfoVtbl ITypeLib_VTable, *LPTYPEINFO_VTABLE ;
@@ -71,7 +71,7 @@
);
} else {
sprintf(xguid,"<guid 0x%08lx>",(DWORD)guid);
- FIXME(ole,"(%s,%d,%d,0x%04lx,%p),can't handle non-string guids.\n",xguid,wMaj,wMin,(DWORD)lcid,path);
+ FIXME_(ole)("(%s,%d,%d,0x%04lx,%p),can't handle non-string guids.\n",xguid,wMaj,wMin,(DWORD)lcid,path);
return E_FAIL;
}
plen = sizeof(pathname);
@@ -79,7 +79,7 @@
/* try again without lang specific id */
if (SUBLANGID(lcid))
return QueryPathOfRegTypeLib16(guid,wMaj,wMin,PRIMARYLANGID(lcid),path);
- FIXME(ole,"key %s not found\n",typelibkey);
+ FIXME_(ole)("key %s not found\n",typelibkey);
return E_FAIL;
}
*path = SysAllocString16(pathname);
@@ -111,7 +111,7 @@
);
} else {
sprintf(xguid,"<guid 0x%08lx>",(DWORD)guid);
- FIXME(ole,"(%s,%d,%d,0x%04lx,%p),stub!\n",xguid,wMaj,wMin,(DWORD)lcid,path);
+ FIXME_(ole)("(%s,%d,%d,0x%04lx,%p),stub!\n",xguid,wMaj,wMin,(DWORD)lcid,path);
return E_FAIL;
}
plen = sizeof(pathname);
@@ -119,7 +119,7 @@
/* try again without lang specific id */
if (SUBLANGID(lcid))
return QueryPathOfRegTypeLib(guid,wMaj,wMin,PRIMARYLANGID(lcid),path);
- FIXME(ole,"key %s not found\n",typelibkey);
+ FIXME_(ole)("key %s not found\n",typelibkey);
return E_FAIL;
}
*path = HEAP_strdupAtoW(GetProcessHeap(),0,pathname);
@@ -140,7 +140,7 @@
OLECHAR *szFile, /* [in] Name of file to load from */
void * *pptLib) /* [out] Pointer to pointer to loaded type library */
{
- FIXME(ole, "('%s',%p): stub\n",debugstr_w((LPWSTR)szFile),pptLib);
+ FIXME_(ole)("('%s',%p): stub\n",debugstr_w((LPWSTR)szFile),pptLib);
if (pptLib!=0)
*pptLib=0;
@@ -166,13 +166,13 @@
{
LPSTR p;
HRESULT res;
- TRACE(typelib, "('%s',%p)\n",debugstr_w(szFile),pptLib);
+ TRACE_(typelib)("('%s',%p)\n",debugstr_w(szFile),pptLib);
p=HEAP_strdupWtoA(GetProcessHeap(),0,szFile);
res= TLB_ReadTypeLib(p, pptLib);
/* XXX need to free p ?? */
- TRACE( typelib, " returns %ld\n",res);
+ TRACE_(typelib)(" returns %ld\n",res);
return res;
}
@@ -197,7 +197,7 @@
if(TRACE_ON(typelib)){
char xriid[50];
WINE_StringFromCLSID((LPCLSID)rguid,xriid);
- TRACE(typelib,"(IID: %s) load %s (%p)\n",xriid,
+ TRACE_(typelib)("(IID: %s) load %s (%p)\n",xriid,
SUCCEEDED(res)? "SUCCESS":"FAILED", *ppTLib);
}
return res;
@@ -221,7 +221,7 @@
OLECHAR * szFullPath, /*[in] full Path of the library*/
OLECHAR * szHelpDir) /*[in] dir to the helpfile for the library,
may be NULL*/
-{ FIXME(ole, "(%p,%s,%s): stub\n",ptlib, debugstr_w(szFullPath),debugstr_w(szHelpDir));
+{ FIXME_(ole)("(%p,%s,%s): stub\n",ptlib, debugstr_w(szFullPath),debugstr_w(szHelpDir));
return S_OK; /* FIXME: pretend everything is OK */
}
@@ -244,7 +244,7 @@
{
char xriid[50];
WINE_StringFromCLSID((LPCLSID)libid,xriid);
- TRACE(typelib,"(IID: %s): stub\n",xriid);
+ TRACE_(typelib)("(IID: %s): stub\n",xriid);
return S_OK; /* FIXME: pretend everything is OK */
}
@@ -263,7 +263,7 @@
case WIN31:
return MAKELONG(0xbd3, 0x3); /* WfW 3.11 */
default:
- FIXME(ole, "Version value not known yet. Please investigate it !");
+ FIXME_(ole)("Version value not known yet. Please investigate it !");
return MAKELONG(0xbd0, 0xa); /* return Win95A for now */
}
}
@@ -498,7 +498,7 @@
void * ret;
if((ret=HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,size))==NULL){
/* FIXME */
- ERR(ole,"cannot allocate memory\n");
+ ERR_(ole)("cannot allocate memory\n");
}
return ret;
}
@@ -516,7 +516,7 @@
pdw[0]=(len)*sizeof(OLECHAR);
bstr=(BSTR)&( pdw[1]);
lstrcpyAtoW( bstr, Astr);
- TRACE(typelib,"copying %s to (%p)\n", Astr, bstr);
+ TRACE_(typelib)("copying %s to (%p)\n", Astr, bstr);
return bstr;
}
@@ -535,7 +535,7 @@
!ReadFile(pcx->hFile, buffer, count, &bytesread, NULL)
) {
/* FIXME */
- ERR(typelib,"read error is 0x%lx reading %ld bytes at 0x%lx\n",
+ ERR_(typelib)("read error is 0x%lx reading %ld bytes at 0x%lx\n",
GetLastError(), count, where);
TLB_abort();
exit(1);
@@ -647,7 +647,7 @@
case VT_CLSID :
default:
size=0;
- FIXME(ole,"VARTYPE %d is not supported, setting pointer to NULL\n",
+ FIXME_(ole)("VARTYPE %d is not supported, setting pointer to NULL\n",
pVar->vt);
}
@@ -886,7 +886,7 @@
(*pprtd)->pImpTLInfo=pImpLib;
TLB_ReadGuid(&(*pprtd)->guid, impinfo.oGuid, pcx);
}else{
- ERR( typelib ,"Cannot find a reference\n");
+ ERR_(typelib)("Cannot find a reference\n");
(*pprtd)->reference=-1;
(*pprtd)->pImpTLInfo=(void *)-1;
}
@@ -954,7 +954,7 @@
/* name, eventually add to a hash table */
ptiRet->Name=TLB_ReadName(pcx, tiBase.NameOffset);
- TRACE( typelib,"reading %s\n", ptiRet->Name);
+ TRACE_(typelib)("reading %s\n", ptiRet->Name);
/* help info */
ptiRet->DocString=TLB_ReadString(pcx, tiBase.docstringoffs);
ptiRet->dwHelpStringContext=tiBase.helpstringcontext;
@@ -1023,9 +1023,9 @@
LOOK_FOR_MAGIC(TLBMAGIC1);
if(count)
- ERR(ole,"type library format not (yet) implemented\n");
+ ERR_(ole)("type library format not (yet) implemented\n");
else
- ERR(ole,"not type library found in this file\n");
+ ERR_(ole)("not type library found in this file\n");
return -1;
}
#undef LOOK_FOR_MAGIC
@@ -1039,15 +1039,15 @@
TLB2Header tlbHeader;
TLBSegDir tlbSegDir;
if((cx.hFile=OpenFile(file, &ofStruct, OF_READWRITE))==HFILE_ERROR) {
- ERR( typelib,"cannot open %s error 0x%lx\n",file, GetLastError());
+ ERR_(typelib)("cannot open %s error 0x%lx\n",file, GetLastError());
return E_FAIL;
}
/* get pointer to beginning of typelib data */
if((oStart=TLB_FindTlb(&cx))<0){
if(oStart==-1)
- ERR( typelib,"cannot locate typelib in %s\n",file);
+ ERR_(typelib)("cannot locate typelib in %s\n",file);
else
- ERR( typelib,"unsupported typelib format in %s\n",file);
+ ERR_(typelib)("unsupported typelib format in %s\n",file);
return E_FAIL;
}
cx.oStart=oStart;
@@ -1074,7 +1074,7 @@
if ( tlbSegDir.pTypeInfoTab.res0c != 0x0F ||
tlbSegDir.pImpInfo.res0c != 0x0F
) {
- ERR( typelib,"cannot find the table directory, ptr=0x%lx\n",lPSegDir);
+ ERR_(typelib)("cannot find the table directory, ptr=0x%lx\n",lPSegDir);
CloseHandle(cx.hFile);
return E_FAIL;
}
@@ -1150,7 +1150,7 @@
}
}else{
V_UNION(&(pLibInfo->pTypeDesc[i]),lpadesc)=NULL;
- ERR(ole, "didn't find array description data\n");
+ ERR_(ole)("didn't find array description data\n");
}
}
}
@@ -1202,7 +1202,7 @@
if(TRACE_ON(typelib)){
char xriid[50];
WINE_StringFromCLSID((LPCLSID)riid,xriid);
- TRACE(typelib,"(%p)->(IID: %s)\n",This,xriid);
+ TRACE_(typelib)("(%p)->(IID: %s)\n",This,xriid);
}
*ppvObject=NULL;
if(IsEqualIID(riid, &IID_IUnknown) ||
@@ -1211,10 +1211,10 @@
*ppvObject = This;
if(*ppvObject){
(*(LPTYPELIB*)ppvObject)->lpvtbl->fnAddRef(This);
- TRACE(typelib,"-- Interface: (%p)->(%p)\n",ppvObject,*ppvObject);
+ TRACE_(typelib)("-- Interface: (%p)->(%p)\n",ppvObject,*ppvObject);
return S_OK;
}
- TRACE(typelib,"-- Interface: E_NOINTERFACE\n");
+ TRACE_(typelib)("-- Interface: E_NOINTERFACE\n");
return E_NOINTERFACE;
}
@@ -1223,7 +1223,7 @@
static ULONG WINAPI ITypeLib_fnAddRef( LPTYPELIB iface)
{
ICOM_THIS( TLBLibInfo, iface);
- TRACE(typelib,"(%p)->ref is %u\n",This, This->ref);
+ TRACE_(typelib)("(%p)->ref is %u\n",This, This->ref);
return ++(This->ref);
}
@@ -1232,7 +1232,7 @@
static ULONG WINAPI ITypeLib_fnRelease( LPTYPELIB iface)
{
ICOM_THIS( TLBLibInfo, iface);
- FIXME(typelib,"(%p)->ref is %u: stub\n",This, This->ref);
+ FIXME_(typelib)("(%p)->ref is %u: stub\n",This, This->ref);
(This->ref)--;
return S_OK;
}
@@ -1244,7 +1244,7 @@
static UINT WINAPI ITypeLib_fnGetTypeInfoCount( LPTYPELIB iface)
{
ICOM_THIS( TLBLibInfo, iface);
- TRACE(typelib,"(%p)->count is %d\n",This, This->TypeInfoCount);
+ TRACE_(typelib)("(%p)->count is %d\n",This, This->TypeInfoCount);
return This->TypeInfoCount;
}
@@ -1258,15 +1258,15 @@
int i;
ICOM_THIS( TLBLibInfo, iface);
TLBTypeInfo **ppTLBTInfo=(TLBTypeInfo **)ppTInfo;
- TRACE(typelib,"(%p) index %d \n",This, index);
+ TRACE_(typelib)("(%p) index %d \n",This, index);
for(i=0,*ppTLBTInfo=This->pTypeInfo;*ppTLBTInfo && i != index;i++)
*ppTLBTInfo=(*ppTLBTInfo)->next;
if(*ppTLBTInfo){
(*ppTLBTInfo)->lpvtbl->fnAddRef(*ppTInfo);
- TRACE(typelib,"-- found (%p)->(%p)\n",ppTLBTInfo,*ppTLBTInfo);
+ TRACE_(typelib)("-- found (%p)->(%p)\n",ppTLBTInfo,*ppTLBTInfo);
return S_OK;
}
- TRACE(typelib,"-- element not found\n");
+ TRACE_(typelib)("-- element not found\n");
return TYPE_E_ELEMENTNOTFOUND;
}
@@ -1280,15 +1280,15 @@
int i;
TLBTypeInfo *pTInfo;
ICOM_THIS( TLBLibInfo, iface);
- TRACE(typelib,"(%p) index %d \n",This, index);
+ TRACE_(typelib)("(%p) index %d \n",This, index);
for(i=0,pTInfo=This->pTypeInfo;pTInfo && i != index;i++)
pTInfo=(pTInfo)->next;
if(pTInfo){
*pTKind=pTInfo->TypeAttr.typekind;
- TRACE(typelib,"-- found Type (%p)->%d\n",pTKind,*pTKind);
+ TRACE_(typelib)("-- found Type (%p)->%d\n",pTKind,*pTKind);
return S_OK;
}
- TRACE(typelib,"-- element not found\n");
+ TRACE_(typelib)("-- element not found\n");
return TYPE_E_ELEMENTNOTFOUND;
}
@@ -1306,17 +1306,17 @@
if(TRACE_ON(typelib)){
char xriid[50];
WINE_StringFromCLSID((LPCLSID)guid,xriid);
- TRACE(typelib,"(%p) guid %sx)\n",This,xriid);
+ TRACE_(typelib)("(%p) guid %sx)\n",This,xriid);
}
for(i=0,*ppTLBTInfo=This->pTypeInfo;*ppTLBTInfo &&
!IsEqualIID(guid,&(*ppTLBTInfo)->TypeAttr.guid);i++)
*ppTLBTInfo=(*ppTLBTInfo)->next;
if(*ppTLBTInfo){
(*ppTLBTInfo)->lpvtbl->fnAddRef(*ppTInfo);
- TRACE(typelib,"-- found (%p)->(%p)\n",ppTLBTInfo,*ppTLBTInfo);
+ TRACE_(typelib)("-- found (%p)->(%p)\n",ppTLBTInfo,*ppTLBTInfo);
return S_OK;
}
- TRACE(typelib,"-- element not found\n");
+ TRACE_(typelib)("-- element not found\n");
return TYPE_E_ELEMENTNOTFOUND;
}
@@ -1329,7 +1329,7 @@
LPTLIBATTR *ppTLibAttr)
{
ICOM_THIS( TLBLibInfo, iface);
- TRACE( typelib,"(%p)\n",This);
+ TRACE_(typelib)("(%p)\n",This);
/* FIXME: must do a copy here */
*ppTLibAttr=&This->LibAttr;
return S_OK;
@@ -1345,7 +1345,7 @@
ITypeComp **ppTComp)
{
ICOM_THIS( TLBLibInfo, iface);
- FIXME(typelib,"(%p): stub!\n",This);
+ FIXME_(typelib)("(%p): stub!\n",This);
return E_NOTIMPL;
}
@@ -1363,7 +1363,7 @@
ICOM_THIS( TLBLibInfo, iface);
HRESULT result;
ITypeInfo *pTInfo;
- TRACE( typelib, "(%p) index %d Name(%p) DocString(%p)"
+ TRACE_(typelib)("(%p) index %d Name(%p) DocString(%p)"
" HelpContext(%p) HelpFile(%p)\n",
This, index, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile);
if(index<0){ /* documentation for the typelib */
@@ -1420,7 +1420,7 @@
*pfName=FALSE;
ITypeLib_fnIsName_exit:
- TRACE( typelib,"(%p)slow! search for %s: %s found!\n", This,
+ TRACE_(typelib)("(%p)slow! search for %s: %s found!\n", This,
debugstr_a(astr), *pfName?"NOT":"");
HeapFree( GetProcessHeap(), 0, astr );
@@ -1458,7 +1458,7 @@
ppTInfo[j]=(LPTYPEINFO)pTInfo;
j++;
}
- TRACE( typelib,"(%p)slow! search for %d with %s: found %d TypeInfo's!\n",
+ TRACE_(typelib)("(%p)slow! search for %d with %s: found %d TypeInfo's!\n",
This, *pcFound, debugstr_a(astr), j);
*pcFound=j;
@@ -1475,7 +1475,7 @@
static VOID WINAPI ITypeLib_fnReleaseTLibAttr( LPTYPELIB iface, TLIBATTR *pTLibAttr)
{
ICOM_THIS( TLBLibInfo, iface);
- TRACE( typelib,"freeing (%p)\n",This);
+ TRACE_(typelib)("freeing (%p)\n",This);
/* nothing to do */
}
@@ -1493,7 +1493,7 @@
if(TRACE_ON(typelib)){
char xriid[50];
WINE_StringFromCLSID((LPCLSID)guid,xriid);
- TRACE(typelib,"(%p) guid %s %s found!x)\n",This,xriid,
+ TRACE_(typelib)("(%p) guid %s %s found!x)\n",This,xriid,
pCData? "" : "NOT");
}
if(pCData){
@@ -1514,7 +1514,7 @@
UINT *pcUniqueNames, UINT *pcchUniqueNames)
{
ICOM_THIS( TLBLibInfo, iface);
- FIXME( typelib,"(%p): stub!\n", This);
+ FIXME_(typelib)("(%p): stub!\n", This);
if(pcUniqueNames) *pcUniqueNames=1;
if(pcchUniqueNames) *pcchUniqueNames=1;
return S_OK;
@@ -1534,7 +1534,7 @@
ICOM_THIS( TLBLibInfo, iface);
HRESULT result;
ITypeInfo *pTInfo;
- FIXME( typelib,"(%p) index %d lcid %ld half implemented stub!\n", This,
+ FIXME_(typelib)("(%p) index %d lcid %ld half implemented stub!\n", This,
index, lcid);
/* the help string should be obtained from the helpstringdll,
* using the _DLLGetDocumentation function, based on the supplied
@@ -1571,7 +1571,7 @@
ICOM_THIS( TLBLibInfo, iface);
TLBCustData *pCData;
int i;
- TRACE( typelib,"(%p) returning %d items\n", This, This->ctCustData);
+ TRACE_(typelib)("(%p) returning %d items\n", This, This->ctCustData);
pCustData->prgCustData = TLB_Alloc(This->ctCustData * sizeof(CUSTDATAITEM));
if(pCustData->prgCustData ){
pCustData->cCustData=This->ctCustData;
@@ -1580,7 +1580,7 @@
VariantCopy(& pCustData->prgCustData[i].varValue, & pCData->data);
}
}else{
- ERR( typelib," OUT OF MEMORY! \n");
+ ERR_(typelib)(" OUT OF MEMORY! \n");
return E_OUTOFMEMORY;
}
return S_OK;
@@ -1598,7 +1598,7 @@
if(TRACE_ON(typelib)){
char xriid[50];
WINE_StringFromCLSID((LPCLSID)riid,xriid);
- TRACE(typelib,"(%p)->(IID: %s)\n",This,xriid);
+ TRACE_(typelib)("(%p)->(IID: %s)\n",This,xriid);
}
*ppvObject=NULL;
if(IsEqualIID(riid, &IID_IUnknown) ||
@@ -1607,10 +1607,10 @@
*ppvObject = This;
if(*ppvObject){
(*(LPTYPEINFO*)ppvObject)->lpvtbl->fnAddRef(iface);
- TRACE(typelib,"-- Interface: (%p)->(%p)\n",ppvObject,*ppvObject);
+ TRACE_(typelib)("-- Interface: (%p)->(%p)\n",ppvObject,*ppvObject);
return S_OK;
}
- TRACE(typelib,"-- Interface: E_NOINTERFACE\n");
+ TRACE_(typelib)("-- Interface: E_NOINTERFACE\n");
return E_NOINTERFACE;
}
@@ -1619,7 +1619,7 @@
static ULONG WINAPI ITypeInfo_fnAddRef( LPTYPEINFO iface)
{
ICOM_THIS( TLBTypeInfo, iface);
- TRACE(typelib,"(%p)->ref is %u\n",This, This->ref);
+ TRACE_(typelib)("(%p)->ref is %u\n",This, This->ref);
(This->pTypeLib->ref)++;
return ++(This->ref);
}
@@ -1629,7 +1629,7 @@
static ULONG WINAPI ITypeInfo_fnRelease( LPTYPEINFO iface)
{
ICOM_THIS( TLBTypeInfo, iface);
- FIXME(typelib,"(%p)->ref is %u: stub\n",This, This->ref);
+ FIXME_(typelib)("(%p)->ref is %u: stub\n",This, This->ref);
(This->ref)--;
(This->pTypeLib->ref)--;
return S_OK;
@@ -1645,7 +1645,7 @@
LPTYPEATTR *ppTypeAttr)
{
ICOM_THIS( TLBTypeInfo, iface);
- TRACE( typelib,"(%p)\n",This);
+ TRACE_(typelib)("(%p)\n",This);
/* FIXME: must do a copy here */
*ppTypeAttr=&This->TypeAttr;
return S_OK;
@@ -1661,7 +1661,7 @@
ITypeComp * *ppTComp)
{
ICOM_THIS( TLBTypeInfo, iface);
- FIXME( typelib,"(%p) stub!\n", This);
+ FIXME_(typelib)("(%p) stub!\n", This);
return S_OK;
}
@@ -1677,7 +1677,7 @@
ICOM_THIS( TLBTypeInfo, iface);
int i;
TLBFuncDesc * pFDesc;
- TRACE( typelib,"(%p) index %d\n", This, index);
+ TRACE_(typelib)("(%p) index %d\n", This, index);
for(i=0, pFDesc=This->funclist; i!=index && pFDesc; i++, pFDesc=pFDesc->next)
;
if(pFDesc){
@@ -1699,7 +1699,7 @@
ICOM_THIS( TLBTypeInfo, iface);
int i;
TLBVarDesc * pVDesc;
- TRACE( typelib,"(%p) index %d\n", This, index);
+ TRACE_(typelib)("(%p) index %d\n", This, index);
for(i=0, pVDesc=This->varlist; i!=index && pVDesc; i++, pVDesc=pVDesc->next)
;
if(pVDesc){
@@ -1723,7 +1723,7 @@
TLBFuncDesc * pFDesc;
TLBVarDesc * pVDesc;
int i;
- TRACE( typelib,"(%p) memid=0x%08lx Maxname=%d\n", This, memid,
+ TRACE_(typelib)("(%p) memid=0x%08lx Maxname=%d\n", This, memid,
cMaxNames);
for(pFDesc=This->funclist; pFDesc->funcdesc.memid != memid && pFDesc;
pFDesc=pFDesc->next)
@@ -1758,9 +1758,9 @@
pTInfo->lpvtbl->fnRelease(pTInfo);
return result;
}
- WARN( typelib,"Could not search inherited interface!\n");
+ WARN_(typelib)("Could not search inherited interface!\n");
} else
- WARN( typelib,"no names found\n");
+ WARN_(typelib)("no names found\n");
*pcNames=0;
return TYPE_E_ELEMENTNOTFOUND;
}
@@ -1783,7 +1783,7 @@
ICOM_THIS( TLBTypeInfo, iface);
int(i);
TLBRefType *pIref;
- TRACE( typelib,"(%p) index %d\n", This, index);
+ TRACE_(typelib)("(%p) index %d\n", This, index);
for(i=0, pIref=This->impltypelist; i<index && pIref;
i++, pIref=pIref->next)
;
@@ -1805,7 +1805,7 @@
ICOM_THIS( TLBTypeInfo, iface);
int(i);
TLBRefType *pIref;
- TRACE( typelib,"(%p) index %d\n", This, index);
+ TRACE_(typelib)("(%p) index %d\n", This, index);
for(i=0, pIref=This->impltypelist; i<index && pIref; i++, pIref=pIref->next)
;
if(i==index && pIref){
@@ -1828,7 +1828,7 @@
TLBVarDesc * pVDesc;
HRESULT ret=S_OK;
PCHAR aszName= HEAP_strdupWtoA( GetProcessHeap(), 0, *rgszNames);
- TRACE( typelib,"(%p) Name %s cNames %d\n", This, debugstr_a(aszName),
+ TRACE_(typelib)("(%p) Name %s cNames %d\n", This, debugstr_a(aszName),
cNames);
for(pFDesc=This->funclist; pFDesc; pFDesc=pFDesc->next) {
int i, j;
@@ -1869,9 +1869,9 @@
pTInfo->lpvtbl->fnRelease(pTInfo);
return ret;
}
- WARN( typelib,"Could not search inherited interface!\n");
+ WARN_(typelib)("Could not search inherited interface!\n");
} else
- WARN( typelib,"no names found\n");
+ WARN_(typelib)("no names found\n");
return DISP_E_UNKNOWNNAME;
}
@@ -1885,7 +1885,7 @@
VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *pArgErr)
{
ICOM_THIS( TLBTypeInfo, iface);
- FIXME( typelib,"(%p) stub!", This);
+ FIXME_(typelib)("(%p) stub!", This);
return S_OK;
}
@@ -1901,7 +1901,7 @@
ICOM_THIS( TLBTypeInfo, iface);
TLBFuncDesc * pFDesc;
TLBVarDesc * pVDesc;
- TRACE( typelib, "(%p) memid %ld Name(%p) DocString(%p)"
+ TRACE_(typelib)("(%p) memid %ld Name(%p) DocString(%p)"
" HelpContext(%p) HelpFile(%p)\n",
This, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile);
if(memid==MEMBERID_NIL){ /* documentation for the typeinfo */
@@ -1937,7 +1937,7 @@
WORD *pwOrdinal)
{
ICOM_THIS( TLBTypeInfo, iface);
- FIXME( typelib,"(%p) stub!\n", This);
+ FIXME_(typelib)("(%p) stub!\n", This);
return E_FAIL;
}
@@ -1991,7 +1991,7 @@
}
}
}
- TRACE( typelib,"(%p) hreftype 0x%04lx loaded %s (%p)\n", This, hRefType,
+ TRACE_(typelib)("(%p) hreftype 0x%04lx loaded %s (%p)\n", This, hRefType,
SUCCEEDED(result)? "SUCCESS":"FAILURE", *ppTInfo);
return result;
}
@@ -2005,7 +2005,7 @@
MEMBERID memid, INVOKEKIND invKind, PVOID *ppv)
{
ICOM_THIS( TLBTypeInfo, iface);
- FIXME( typelib,"(%p) stub!\n", This);
+ FIXME_(typelib)("(%p) stub!\n", This);
return S_OK;
}
@@ -2018,7 +2018,7 @@
IUnknown *pUnk, REFIID riid, VOID **ppvObj)
{
ICOM_THIS( TLBTypeInfo, iface);
- FIXME( typelib,"(%p) stub!\n", This);
+ FIXME_(typelib)("(%p) stub!\n", This);
return S_OK;
}
@@ -2030,7 +2030,7 @@
BSTR *pBstrMops)
{
ICOM_THIS( TLBTypeInfo, iface);
- FIXME( typelib,"(%p) stub!\n", This);
+ FIXME_(typelib)("(%p) stub!\n", This);
return S_OK;
}
@@ -2046,7 +2046,7 @@
*ppTLib=(LPTYPELIB )(This->pTypeLib);
*pIndex=This->index;
(*ppTLib)->lpvtbl->fnAddRef(*ppTLib);
- TRACE( typelib,"(%p) returns (%p) index %d!\n", This, *ppTLib, *pIndex);
+ TRACE_(typelib)("(%p) returns (%p) index %d!\n", This, *ppTLib, *pIndex);
return S_OK;
}
@@ -2059,7 +2059,7 @@
TYPEATTR* pTypeAttr)
{
ICOM_THIS( TLBTypeInfo, iface);
- TRACE( typelib,"(%p)->(%p)\n", This, pTypeAttr);
+ TRACE_(typelib)("(%p)->(%p)\n", This, pTypeAttr);
return S_OK;
}
@@ -2071,7 +2071,7 @@
FUNCDESC *pFuncDesc)
{
ICOM_THIS( TLBTypeInfo, iface);
- TRACE( typelib,"(%p)->(%p)\n", This, pFuncDesc);
+ TRACE_(typelib)("(%p)->(%p)\n", This, pFuncDesc);
return S_OK;
}
@@ -2083,7 +2083,7 @@
VARDESC *pVarDesc)
{
ICOM_THIS( TLBTypeInfo, iface);
- TRACE( typelib,"(%p)->(%p)\n", This, pVarDesc);
+ TRACE_(typelib)("(%p)->(%p)\n", This, pVarDesc);
return S_OK;
}
@@ -2097,7 +2097,7 @@
{
ICOM_THIS( TLBTypeInfo, iface);
*pTypeKind=This->TypeAttr.typekind;
- TRACE( typelib,"(%p) type 0x%0x\n", This,*pTypeKind);
+ TRACE_(typelib)("(%p) type 0x%0x\n", This,*pTypeKind);
return S_OK;
}
@@ -2113,7 +2113,7 @@
{
ICOM_THIS( TLBTypeInfo, iface);
*pTypeFlags=This->TypeAttr.wTypeFlags;
- TRACE( typelib,"(%p) flags 0x%04x\n", This,*pTypeFlags);
+ TRACE_(typelib)("(%p) flags 0x%04x\n", This,*pTypeFlags);
return S_OK;
}
@@ -2139,7 +2139,7 @@
*pFuncIndex=0;
result=E_INVALIDARG;
}
- TRACE( typelib,"(%p) memid 0x%08lx invKind 0x%04x -> %s\n", This,
+ TRACE_(typelib)("(%p) memid 0x%08lx invKind 0x%04x -> %s\n", This,
memid, invKind, SUCCEEDED(result)? "SUCCES":"FAILED");
return result;
}
@@ -2167,7 +2167,7 @@
*pVarIndex=0;
result=E_INVALIDARG;
}
- TRACE( typelib,"(%p) memid 0x%08lx -> %s\n", This,
+ TRACE_(typelib)("(%p) memid 0x%08lx -> %s\n", This,
memid, SUCCEEDED(result)? "SUCCES":"FAILED");
return result;
}
@@ -2186,7 +2186,7 @@
if(TRACE_ON(typelib)){
char xriid[50];
WINE_StringFromCLSID((LPCLSID)guid,xriid);
- TRACE(typelib,"(%p) guid %s %s found!x)\n", This, xriid,
+ TRACE_(typelib)("(%p) guid %s %s found!x)\n", This, xriid,
pCData? "" : "NOT");
}
if(pCData){
@@ -2217,7 +2217,7 @@
if(TRACE_ON(typelib)){
char xriid[50];
WINE_StringFromCLSID((LPCLSID)guid,xriid);
- TRACE(typelib,"(%p) guid %s %s found!x)\n",This,xriid,
+ TRACE_(typelib)("(%p) guid %s %s found!x)\n",This,xriid,
pCData? "" : "NOT");
}
if(pCData){
@@ -2249,7 +2249,7 @@
if(TRACE_ON(typelib)){
char xriid[50];
WINE_StringFromCLSID((LPCLSID)guid,xriid);
- TRACE(typelib,"(%p) guid %s %s found!x)\n",This,xriid,
+ TRACE_(typelib)("(%p) guid %s %s found!x)\n",This,xriid,
pCData? "" : "NOT");
}
if(pCData){
@@ -2280,7 +2280,7 @@
if(TRACE_ON(typelib)){
char xriid[50];
WINE_StringFromCLSID((LPCLSID)guid,xriid);
- TRACE(typelib,"(%p) guid %s %s found!x)\n",This,xriid,
+ TRACE_(typelib)("(%p) guid %s %s found!x)\n",This,xriid,
pCData? "" : "NOT");
}
if(pCData){
@@ -2311,7 +2311,7 @@
if(TRACE_ON(typelib)){
char xriid[50];
WINE_StringFromCLSID((LPCLSID)guid,xriid);
- TRACE(typelib,"(%p) guid %s %s found!x)\n",This,xriid,
+ TRACE_(typelib)("(%p) guid %s %s found!x)\n",This,xriid,
pCData? "" : "NOT");
}
if(pCData){
@@ -2336,7 +2336,7 @@
ICOM_THIS( TLBTypeInfo, iface);
TLBFuncDesc * pFDesc;
TLBVarDesc * pVDesc;
- TRACE( typelib, "(%p) memid %ld lcid(0x%lx) HelpString(%p) "
+ TRACE_(typelib)("(%p) memid %ld lcid(0x%lx) HelpString(%p) "
"HelpStringContext(%p) HelpStringDll(%p)\n",
This, memid, lcid, pbstrHelpString, pdwHelpStringContext,
pbstrHelpStringDll );
@@ -2391,7 +2391,7 @@
ICOM_THIS( TLBTypeInfo, iface);
TLBCustData *pCData;
int i;
- TRACE( typelib,"(%p) returning %d items\n", This, This->ctCustData);
+ TRACE_(typelib)("(%p) returning %d items\n", This, This->ctCustData);
pCustData->prgCustData = TLB_Alloc(This->ctCustData * sizeof(CUSTDATAITEM));
if(pCustData->prgCustData ){
pCustData->cCustData=This->ctCustData;
@@ -2400,7 +2400,7 @@
VariantCopy(& pCustData->prgCustData[i].varValue, & pCData->data);
}
}else{
- ERR( typelib," OUT OF MEMORY! \n");
+ ERR_(typelib)(" OUT OF MEMORY! \n");
return E_OUTOFMEMORY;
}
return S_OK;
@@ -2418,7 +2418,7 @@
TLBCustData *pCData;
TLBFuncDesc * pFDesc;
int i;
- TRACE( typelib,"(%p) index %d\n", This, index);
+ TRACE_(typelib)("(%p) index %d\n", This, index);
for(i=0, pFDesc=This->funclist; i!=index && pFDesc; i++,
pFDesc=pFDesc->next)
;
@@ -2434,7 +2434,7 @@
& pCData->data);
}
}else{
- ERR( typelib," OUT OF MEMORY! \n");
+ ERR_(typelib)(" OUT OF MEMORY! \n");
return E_OUTOFMEMORY;
}
return S_OK;
@@ -2454,7 +2454,7 @@
TLBCustData *pCData=NULL;
TLBFuncDesc * pFDesc;
int i;
- TRACE( typelib,"(%p) index %d\n", This, indexFunc);
+ TRACE_(typelib)("(%p) index %d\n", This, indexFunc);
for(i=0, pFDesc=This->funclist; i!=indexFunc && pFDesc; i++,
pFDesc=pFDesc->next)
;
@@ -2471,7 +2471,7 @@
& pCData->data);
}
}else{
- ERR( typelib," OUT OF MEMORY! \n");
+ ERR_(typelib)(" OUT OF MEMORY! \n");
return E_OUTOFMEMORY;
}
return S_OK;
@@ -2491,7 +2491,7 @@
TLBCustData *pCData;
TLBVarDesc * pVDesc;
int i;
- TRACE( typelib,"(%p) index %d\n", This, index);
+ TRACE_(typelib)("(%p) index %d\n", This, index);
for(i=0, pVDesc=This->varlist; i!=index && pVDesc; i++,
pVDesc=pVDesc->next)
;
@@ -2507,7 +2507,7 @@
& pCData->data);
}
}else{
- ERR( typelib," OUT OF MEMORY! \n");
+ ERR_(typelib)(" OUT OF MEMORY! \n");
return E_OUTOFMEMORY;
}
return S_OK;
@@ -2527,7 +2527,7 @@
TLBCustData *pCData;
TLBRefType * pRDesc;
int i;
- TRACE( typelib,"(%p) index %d\n", This, index);
+ TRACE_(typelib)("(%p) index %d\n", This, index);
for(i=0, pRDesc=This->impltypelist; i!=index && pRDesc; i++,
pRDesc=pRDesc->next)
;
@@ -2543,7 +2543,7 @@
& pCData->data);
}
}else{
- ERR( typelib," OUT OF MEMORY! \n");
+ ERR_(typelib)(" OUT OF MEMORY! \n");
return E_OUTOFMEMORY;
}
return S_OK;
diff --git a/ole/variant.c b/ole/variant.c
index 681a078..8a2a17b 100644
--- a/ole/variant.c
+++ b/ole/variant.c
@@ -23,7 +23,7 @@
#include "windef.h"
#include "oleauto.h"
#include "heap.h"
-#include "debug.h"
+#include "debugtools.h"
#include "winerror.h"
#include "parsedt.h"
@@ -504,7 +504,7 @@
case( VT_UNKNOWN ):
case( VT_DECIMAL ):
default:
- FIXME(ole,"Add size information for type vt=%d\n", parg->vt & VT_TYPEMASK );
+ FIXME("Add size information for type vt=%d\n", parg->vt & VT_TYPEMASK );
break;
}
@@ -934,7 +934,7 @@
/*res = VarI1FromDec32( ps->u.decVal, &(pd->u.cVal) );*/
default:
res = DISP_E_TYPEMISMATCH;
- FIXME(ole,"Coercion from %d to %d\n", vtFrom, vt );
+ FIXME("Coercion from %d to %d\n", vtFrom, vt );
break;
}
break;
@@ -987,7 +987,7 @@
/*res = VarI2FromDec32( ps->u.deiVal, &(pd->u.iVal) );*/
default:
res = DISP_E_TYPEMISMATCH;
- FIXME(ole,"Coercion from %d to %d\n", vtFrom, vt );
+ FIXME("Coercion from %d to %d\n", vtFrom, vt );
break;
}
break;
@@ -1041,7 +1041,7 @@
/*res = VarI4FromDec32( ps->u.deiVal, &(pd->u.lVal) );*/
default:
res = DISP_E_TYPEMISMATCH;
- FIXME(ole,"Coercion from %d to %d\n", vtFrom, vt );
+ FIXME("Coercion from %d to %d\n", vtFrom, vt );
break;
}
break;
@@ -1094,7 +1094,7 @@
/*res = VarUI1FromDec32( ps->u.deiVal, &(pd->u.bVal) );*/
default:
res = DISP_E_TYPEMISMATCH;
- FIXME(ole,"Coercion from %d to %d\n", vtFrom, vt );
+ FIXME("Coercion from %d to %d\n", vtFrom, vt );
break;
}
break;
@@ -1147,7 +1147,7 @@
/*res = VarUI2FromDec32( ps->u.deiVal, &(pd->u.uiVal) );*/
default:
res = DISP_E_TYPEMISMATCH;
- FIXME(ole,"Coercion from %d to %d\n", vtFrom, vt );
+ FIXME("Coercion from %d to %d\n", vtFrom, vt );
break;
}
break;
@@ -1200,7 +1200,7 @@
/*res = VarUI4FromDec32( ps->u.deiVal, &(pd->u.ulVal) );*/
default:
res = DISP_E_TYPEMISMATCH;
- FIXME(ole,"Coercion from %d to %d\n", vtFrom, vt );
+ FIXME("Coercion from %d to %d\n", vtFrom, vt );
break;
}
break;
@@ -1253,7 +1253,7 @@
/*res = VarR4FromDec32( ps->u.deiVal, &(pd->u.fltVal) );*/
default:
res = DISP_E_TYPEMISMATCH;
- FIXME(ole,"Coercion from %d to %d\n", vtFrom, vt );
+ FIXME("Coercion from %d to %d\n", vtFrom, vt );
break;
}
break;
@@ -1306,7 +1306,7 @@
/*res = VarR8FromDec32( ps->u.deiVal, &(pd->u.dblVal) );*/
default:
res = DISP_E_TYPEMISMATCH;
- FIXME(ole,"Coercion from %d to %d\n", vtFrom, vt );
+ FIXME("Coercion from %d to %d\n", vtFrom, vt );
break;
}
break;
@@ -1363,7 +1363,7 @@
/*res = VarDateFromDec32( ps->u.deiVal, &(pd->u.date) );*/
default:
res = DISP_E_TYPEMISMATCH;
- FIXME(ole,"Coercion from %d to %d\n", vtFrom, vt );
+ FIXME("Coercion from %d to %d\n", vtFrom, vt );
break;
}
break;
@@ -1420,7 +1420,7 @@
/*res = VarBoolFromDec32( ps->u.deiVal, &(pd->u.boolVal) );*/
default:
res = DISP_E_TYPEMISMATCH;
- FIXME(ole,"Coercion from %d to %d\n", vtFrom, vt );
+ FIXME("Coercion from %d to %d\n", vtFrom, vt );
break;
}
break;
@@ -1477,7 +1477,7 @@
/*res = VarBstrFromDec32( ps->u.deiVal, lcid, dwFlags, &(pd->u.bstrVal) );*/
default:
res = DISP_E_TYPEMISMATCH;
- FIXME(ole,"Coercion from %d to %d\n", vtFrom, vt );
+ FIXME("Coercion from %d to %d\n", vtFrom, vt );
break;
}
break;
@@ -1534,14 +1534,14 @@
/*res = VarCyFromDec32( ps->u.deiVal, &(pd->u.boolVal) );*/
default:
res = DISP_E_TYPEMISMATCH;
- FIXME(ole,"Coercion from %d to %d\n", vtFrom, vt );
+ FIXME("Coercion from %d to %d\n", vtFrom, vt );
break;
}
break;
default:
res = DISP_E_TYPEMISMATCH;
- FIXME(ole,"Coercion from %d to %d\n", vtFrom, vt );
+ FIXME("Coercion from %d to %d\n", vtFrom, vt );
break;
}
@@ -1645,7 +1645,7 @@
*/
void WINAPI VariantInit(VARIANTARG* pvarg)
{
- TRACE(ole,"(%p),stub\n",pvarg);
+ TRACE("(%p),stub\n",pvarg);
memset(pvarg, 0, sizeof (VARIANTARG));
pvarg->vt = VT_EMPTY;
@@ -1664,7 +1664,7 @@
HRESULT WINAPI VariantClear(VARIANTARG* pvarg)
{
HRESULT res = S_OK;
- TRACE(ole,"(%p)\n",pvarg);
+ TRACE("(%p)\n",pvarg);
res = ValidateVariantType( pvarg->vt );
if( res == S_OK )
@@ -1719,7 +1719,7 @@
{
HRESULT res = S_OK;
- TRACE(ole,"(%p, %p)\n", pvargDest, pvargSrc);
+ TRACE("(%p, %p)\n", pvargDest, pvargSrc);
res = ValidateVariantType( pvargSrc->vt );
@@ -1796,7 +1796,7 @@
{
HRESULT res = S_OK;
- TRACE(ole,"(%p, %p)\n", pvargDest, pvargSrc);
+ TRACE("(%p, %p)\n", pvargDest, pvargSrc);
res = ValidateVariantType( pvargSrc->vt );
@@ -1931,7 +1931,7 @@
VARIANTARG varg;
VariantInit( &varg );
- TRACE(ole,"(%p, %p, %ld, %u, %u),stub\n", pvargDest, pvargSrc, lcid, wFlags, vt);
+ TRACE("(%p, %p, %ld, %u, %u),stub\n", pvargDest, pvargSrc, lcid, wFlags, vt);
/* validate our source argument.
*/
@@ -2004,7 +2004,7 @@
*/
HRESULT WINAPI VarUI1FromI2(short sIn, BYTE* pbOut)
{
- TRACE( ole, "( %d, %p ), stub\n", sIn, pbOut );
+ TRACE("( %d, %p ), stub\n", sIn, pbOut );
/* Check range of value.
*/
@@ -2023,7 +2023,7 @@
*/
HRESULT WINAPI VarUI1FromI4(LONG lIn, BYTE* pbOut)
{
- TRACE( ole, "( %ld, %p ), stub\n", lIn, pbOut );
+ TRACE("( %ld, %p ), stub\n", lIn, pbOut );
/* Check range of value.
*/
@@ -2043,7 +2043,7 @@
*/
HRESULT WINAPI VarUI1FromR4(FLOAT fltIn, BYTE* pbOut)
{
- TRACE( ole, "( %f, %p ), stub\n", fltIn, pbOut );
+ TRACE("( %f, %p ), stub\n", fltIn, pbOut );
/* Check range of value.
*/
@@ -2063,7 +2063,7 @@
*/
HRESULT WINAPI VarUI1FromR8(double dblIn, BYTE* pbOut)
{
- TRACE( ole, "( %f, %p ), stub\n", dblIn, pbOut );
+ TRACE("( %f, %p ), stub\n", dblIn, pbOut );
/* Check range of value.
*/
@@ -2083,7 +2083,7 @@
*/
HRESULT WINAPI VarUI1FromDate(DATE dateIn, BYTE* pbOut)
{
- TRACE( ole, "( %f, %p ), stub\n", dateIn, pbOut );
+ TRACE("( %f, %p ), stub\n", dateIn, pbOut );
/* Check range of value.
*/
@@ -2103,7 +2103,7 @@
*/
HRESULT WINAPI VarUI1FromBool(VARIANT_BOOL boolIn, BYTE* pbOut)
{
- TRACE( ole, "( %d, %p ), stub\n", boolIn, pbOut );
+ TRACE("( %d, %p ), stub\n", boolIn, pbOut );
*pbOut = (BYTE) boolIn;
@@ -2115,7 +2115,7 @@
*/
HRESULT WINAPI VarUI1FromI1(CHAR cIn, BYTE* pbOut)
{
- TRACE( ole, "( %c, %p ), stub\n", cIn, pbOut );
+ TRACE("( %c, %p ), stub\n", cIn, pbOut );
*pbOut = cIn;
@@ -2127,7 +2127,7 @@
*/
HRESULT WINAPI VarUI1FromUI2(USHORT uiIn, BYTE* pbOut)
{
- TRACE( ole, "( %d, %p ), stub\n", uiIn, pbOut );
+ TRACE("( %d, %p ), stub\n", uiIn, pbOut );
/* Check range of value.
*/
@@ -2146,7 +2146,7 @@
*/
HRESULT WINAPI VarUI1FromUI4(ULONG ulIn, BYTE* pbOut)
{
- TRACE( ole, "( %ld, %p ), stub\n", ulIn, pbOut );
+ TRACE("( %ld, %p ), stub\n", ulIn, pbOut );
/* Check range of value.
*/
@@ -2169,7 +2169,7 @@
double dValue = 0.0;
LPSTR pNewString = NULL;
- TRACE( ole, "( %p, 0x%08lx, 0x%08lx, %p ), stub\n", strIn, lcid, dwFlags, pbOut );
+ TRACE("( %p, 0x%08lx, 0x%08lx, %p ), stub\n", strIn, lcid, dwFlags, pbOut );
/* Check if we have a valid argument
*/
@@ -2219,7 +2219,7 @@
*/
HRESULT WINAPI VarI2FromUI1(BYTE bIn, short* psOut)
{
- TRACE( ole, "( 0x%08x, %p ), stub\n", bIn, psOut );
+ TRACE("( 0x%08x, %p ), stub\n", bIn, psOut );
*psOut = (short) bIn;
@@ -2231,7 +2231,7 @@
*/
HRESULT WINAPI VarI2FromI4(LONG lIn, short* psOut)
{
- TRACE( ole, "( %lx, %p ), stub\n", lIn, psOut );
+ TRACE("( %lx, %p ), stub\n", lIn, psOut );
/* Check range of value.
*/
@@ -2250,7 +2250,7 @@
*/
HRESULT WINAPI VarI2FromR4(FLOAT fltIn, short* psOut)
{
- TRACE( ole, "( %f, %p ), stub\n", fltIn, psOut );
+ TRACE("( %f, %p ), stub\n", fltIn, psOut );
/* Check range of value.
*/
@@ -2270,7 +2270,7 @@
*/
HRESULT WINAPI VarI2FromR8(double dblIn, short* psOut)
{
- TRACE( ole, "( %f, %p ), stub\n", dblIn, psOut );
+ TRACE("( %f, %p ), stub\n", dblIn, psOut );
/* Check range of value.
*/
@@ -2290,7 +2290,7 @@
*/
HRESULT WINAPI VarI2FromDate(DATE dateIn, short* psOut)
{
- TRACE( ole, "( %f, %p ), stub\n", dateIn, psOut );
+ TRACE("( %f, %p ), stub\n", dateIn, psOut );
/* Check range of value.
*/
@@ -2310,7 +2310,7 @@
*/
HRESULT WINAPI VarI2FromBool(VARIANT_BOOL boolIn, short* psOut)
{
- TRACE( ole, "( %d, %p ), stub\n", boolIn, psOut );
+ TRACE("( %d, %p ), stub\n", boolIn, psOut );
*psOut = (short) boolIn;
@@ -2322,7 +2322,7 @@
*/
HRESULT WINAPI VarI2FromI1(CHAR cIn, short* psOut)
{
- TRACE( ole, "( %c, %p ), stub\n", cIn, psOut );
+ TRACE("( %c, %p ), stub\n", cIn, psOut );
*psOut = (short) cIn;
@@ -2334,7 +2334,7 @@
*/
HRESULT WINAPI VarI2FromUI2(USHORT uiIn, short* psOut)
{
- TRACE( ole, "( %d, %p ), stub\n", uiIn, psOut );
+ TRACE("( %d, %p ), stub\n", uiIn, psOut );
/* Check range of value.
*/
@@ -2353,7 +2353,7 @@
*/
HRESULT WINAPI VarI2FromUI4(ULONG ulIn, short* psOut)
{
- TRACE( ole, "( %lx, %p ), stub\n", ulIn, psOut );
+ TRACE("( %lx, %p ), stub\n", ulIn, psOut );
/* Check range of value.
*/
@@ -2375,7 +2375,7 @@
double dValue = 0.0;
LPSTR pNewString = NULL;
- TRACE( ole, "( %p, 0x%08lx, 0x%08lx, %p ), stub\n", strIn, lcid, dwFlags, psOut );
+ TRACE("( %p, 0x%08lx, 0x%08lx, %p ), stub\n", strIn, lcid, dwFlags, psOut );
/* Check if we have a valid argument
*/
@@ -2425,7 +2425,7 @@
*/
HRESULT WINAPI VarI4FromUI1(BYTE bIn, LONG* plOut)
{
- TRACE( ole, "( %X, %p ), stub\n", bIn, plOut );
+ TRACE("( %X, %p ), stub\n", bIn, plOut );
*plOut = (LONG) bIn;
@@ -2438,7 +2438,7 @@
*/
HRESULT WINAPI VarI4FromR4(FLOAT fltIn, LONG* plOut)
{
- TRACE( ole, "( %f, %p ), stub\n", fltIn, plOut );
+ TRACE("( %f, %p ), stub\n", fltIn, plOut );
/* Check range of value.
*/
@@ -2458,7 +2458,7 @@
*/
HRESULT WINAPI VarI4FromR8(double dblIn, LONG* plOut)
{
- TRACE( ole, "( %f, %p ), stub\n", dblIn, plOut );
+ TRACE("( %f, %p ), stub\n", dblIn, plOut );
/* Check range of value.
*/
@@ -2478,7 +2478,7 @@
*/
HRESULT WINAPI VarI4FromDate(DATE dateIn, LONG* plOut)
{
- TRACE( ole, "( %f, %p ), stub\n", dateIn, plOut );
+ TRACE("( %f, %p ), stub\n", dateIn, plOut );
/* Check range of value.
*/
@@ -2498,7 +2498,7 @@
*/
HRESULT WINAPI VarI4FromBool(VARIANT_BOOL boolIn, LONG* plOut)
{
- TRACE( ole, "( %d, %p ), stub\n", boolIn, plOut );
+ TRACE("( %d, %p ), stub\n", boolIn, plOut );
*plOut = (LONG) boolIn;
@@ -2510,7 +2510,7 @@
*/
HRESULT WINAPI VarI4FromI1(CHAR cIn, LONG* plOut)
{
- TRACE( ole, "( %c, %p ), stub\n", cIn, plOut );
+ TRACE("( %c, %p ), stub\n", cIn, plOut );
*plOut = (LONG) cIn;
@@ -2522,7 +2522,7 @@
*/
HRESULT WINAPI VarI4FromUI2(USHORT uiIn, LONG* plOut)
{
- TRACE( ole, "( %d, %p ), stub\n", uiIn, plOut );
+ TRACE("( %d, %p ), stub\n", uiIn, plOut );
*plOut = (LONG) uiIn;
@@ -2534,7 +2534,7 @@
*/
HRESULT WINAPI VarI4FromUI4(ULONG ulIn, LONG* plOut)
{
- TRACE( ole, "( %lx, %p ), stub\n", ulIn, plOut );
+ TRACE("( %lx, %p ), stub\n", ulIn, plOut );
/* Check range of value.
*/
@@ -2553,7 +2553,7 @@
*/
HRESULT WINAPI VarI4FromI2(short sIn, LONG* plOut)
{
- TRACE( ole, "( %d, %p ), stub\n", sIn, plOut );
+ TRACE("( %d, %p ), stub\n", sIn, plOut );
*plOut = (LONG) sIn;
@@ -2568,7 +2568,7 @@
double dValue = 0.0;
LPSTR pNewString = NULL;
- TRACE( ole, "( %p, 0x%08lx, 0x%08lx, %p ), stub\n", strIn, lcid, dwFlags, plOut );
+ TRACE("( %p, 0x%08lx, 0x%08lx, %p ), stub\n", strIn, lcid, dwFlags, plOut );
/* Check if we have a valid argument
*/
@@ -2618,7 +2618,7 @@
*/
HRESULT WINAPI VarR4FromUI1(BYTE bIn, FLOAT* pfltOut)
{
- TRACE( ole, "( %X, %p ), stub\n", bIn, pfltOut );
+ TRACE("( %X, %p ), stub\n", bIn, pfltOut );
*pfltOut = (FLOAT) bIn;
@@ -2630,7 +2630,7 @@
*/
HRESULT WINAPI VarR4FromI2(short sIn, FLOAT* pfltOut)
{
- TRACE( ole, "( %d, %p ), stub\n", sIn, pfltOut );
+ TRACE("( %d, %p ), stub\n", sIn, pfltOut );
*pfltOut = (FLOAT) sIn;
@@ -2642,7 +2642,7 @@
*/
HRESULT WINAPI VarR4FromI4(LONG lIn, FLOAT* pfltOut)
{
- TRACE( ole, "( %lx, %p ), stub\n", lIn, pfltOut );
+ TRACE("( %lx, %p ), stub\n", lIn, pfltOut );
*pfltOut = (FLOAT) lIn;
@@ -2654,7 +2654,7 @@
*/
HRESULT WINAPI VarR4FromR8(double dblIn, FLOAT* pfltOut)
{
- TRACE( ole, "( %f, %p ), stub\n", dblIn, pfltOut );
+ TRACE("( %f, %p ), stub\n", dblIn, pfltOut );
/* Check range of value.
*/
@@ -2673,7 +2673,7 @@
*/
HRESULT WINAPI VarR4FromDate(DATE dateIn, FLOAT* pfltOut)
{
- TRACE( ole, "( %f, %p ), stub\n", dateIn, pfltOut );
+ TRACE("( %f, %p ), stub\n", dateIn, pfltOut );
/* Check range of value.
*/
@@ -2692,7 +2692,7 @@
*/
HRESULT WINAPI VarR4FromBool(VARIANT_BOOL boolIn, FLOAT* pfltOut)
{
- TRACE( ole, "( %d, %p ), stub\n", boolIn, pfltOut );
+ TRACE("( %d, %p ), stub\n", boolIn, pfltOut );
*pfltOut = (FLOAT) boolIn;
@@ -2704,7 +2704,7 @@
*/
HRESULT WINAPI VarR4FromI1(CHAR cIn, FLOAT* pfltOut)
{
- TRACE( ole, "( %c, %p ), stub\n", cIn, pfltOut );
+ TRACE("( %c, %p ), stub\n", cIn, pfltOut );
*pfltOut = (FLOAT) cIn;
@@ -2716,7 +2716,7 @@
*/
HRESULT WINAPI VarR4FromUI2(USHORT uiIn, FLOAT* pfltOut)
{
- TRACE( ole, "( %d, %p ), stub\n", uiIn, pfltOut );
+ TRACE("( %d, %p ), stub\n", uiIn, pfltOut );
*pfltOut = (FLOAT) uiIn;
@@ -2728,7 +2728,7 @@
*/
HRESULT WINAPI VarR4FromUI4(ULONG ulIn, FLOAT* pfltOut)
{
- TRACE( ole, "( %ld, %p ), stub\n", ulIn, pfltOut );
+ TRACE("( %ld, %p ), stub\n", ulIn, pfltOut );
*pfltOut = (FLOAT) ulIn;
@@ -2743,7 +2743,7 @@
double dValue = 0.0;
LPSTR pNewString = NULL;
- TRACE( ole, "( %p, %ld, %ld, %p ), stub\n", strIn, lcid, dwFlags, pfltOut );
+ TRACE("( %p, %ld, %ld, %p ), stub\n", strIn, lcid, dwFlags, pfltOut );
/* Check if we have a valid argument
*/
@@ -2789,7 +2789,7 @@
*/
HRESULT WINAPI VarR8FromUI1(BYTE bIn, double* pdblOut)
{
- TRACE( ole, "( %d, %p ), stub\n", bIn, pdblOut );
+ TRACE("( %d, %p ), stub\n", bIn, pdblOut );
*pdblOut = (double) bIn;
@@ -2801,7 +2801,7 @@
*/
HRESULT WINAPI VarR8FromI2(short sIn, double* pdblOut)
{
- TRACE( ole, "( %d, %p ), stub\n", sIn, pdblOut );
+ TRACE("( %d, %p ), stub\n", sIn, pdblOut );
*pdblOut = (double) sIn;
@@ -2813,7 +2813,7 @@
*/
HRESULT WINAPI VarR8FromI4(LONG lIn, double* pdblOut)
{
- TRACE( ole, "( %ld, %p ), stub\n", lIn, pdblOut );
+ TRACE("( %ld, %p ), stub\n", lIn, pdblOut );
*pdblOut = (double) lIn;
@@ -2825,7 +2825,7 @@
*/
HRESULT WINAPI VarR8FromR4(FLOAT fltIn, double* pdblOut)
{
- TRACE( ole, "( %f, %p ), stub\n", fltIn, pdblOut );
+ TRACE("( %f, %p ), stub\n", fltIn, pdblOut );
*pdblOut = (double) fltIn;
@@ -2837,7 +2837,7 @@
*/
HRESULT WINAPI VarR8FromDate(DATE dateIn, double* pdblOut)
{
- TRACE( ole, "( %f, %p ), stub\n", dateIn, pdblOut );
+ TRACE("( %f, %p ), stub\n", dateIn, pdblOut );
*pdblOut = (double) dateIn;
@@ -2849,7 +2849,7 @@
*/
HRESULT WINAPI VarR8FromBool(VARIANT_BOOL boolIn, double* pdblOut)
{
- TRACE( ole, "( %d, %p ), stub\n", boolIn, pdblOut );
+ TRACE("( %d, %p ), stub\n", boolIn, pdblOut );
*pdblOut = (double) boolIn;
@@ -2861,7 +2861,7 @@
*/
HRESULT WINAPI VarR8FromI1(CHAR cIn, double* pdblOut)
{
- TRACE( ole, "( %c, %p ), stub\n", cIn, pdblOut );
+ TRACE("( %c, %p ), stub\n", cIn, pdblOut );
*pdblOut = (double) cIn;
@@ -2873,7 +2873,7 @@
*/
HRESULT WINAPI VarR8FromUI2(USHORT uiIn, double* pdblOut)
{
- TRACE( ole, "( %d, %p ), stub\n", uiIn, pdblOut );
+ TRACE("( %d, %p ), stub\n", uiIn, pdblOut );
*pdblOut = (double) uiIn;
@@ -2885,7 +2885,7 @@
*/
HRESULT WINAPI VarR8FromUI4(ULONG ulIn, double* pdblOut)
{
- TRACE( ole, "( %ld, %p ), stub\n", ulIn, pdblOut );
+ TRACE("( %ld, %p ), stub\n", ulIn, pdblOut );
*pdblOut = (double) ulIn;
@@ -2900,7 +2900,7 @@
double dValue = 0.0;
LPSTR pNewString = NULL;
- TRACE( ole, "( %p, %ld, %ld, %p ), stub\n", strIn, lcid, dwFlags, pdblOut );
+ TRACE("( %p, %ld, %ld, %p ), stub\n", strIn, lcid, dwFlags, pdblOut );
/* Check if we have a valid argument
*/
@@ -2939,7 +2939,7 @@
*/
HRESULT WINAPI VarDateFromUI1(BYTE bIn, DATE* pdateOut)
{
- TRACE( ole, "( %d, %p ), stub\n", bIn, pdateOut );
+ TRACE("( %d, %p ), stub\n", bIn, pdateOut );
*pdateOut = (DATE) bIn;
@@ -2951,7 +2951,7 @@
*/
HRESULT WINAPI VarDateFromI2(short sIn, DATE* pdateOut)
{
- TRACE( ole, "( %d, %p ), stub\n", sIn, pdateOut );
+ TRACE("( %d, %p ), stub\n", sIn, pdateOut );
*pdateOut = (DATE) sIn;
@@ -2963,7 +2963,7 @@
*/
HRESULT WINAPI VarDateFromI4(LONG lIn, DATE* pdateOut)
{
- TRACE( ole, "( %ld, %p ), stub\n", lIn, pdateOut );
+ TRACE("( %ld, %p ), stub\n", lIn, pdateOut );
if( lIn < DATE_MIN || lIn > DATE_MAX )
{
@@ -2980,7 +2980,7 @@
*/
HRESULT WINAPI VarDateFromR4(FLOAT fltIn, DATE* pdateOut)
{
- TRACE( ole, "( %f, %p ), stub\n", fltIn, pdateOut );
+ TRACE("( %f, %p ), stub\n", fltIn, pdateOut );
if( ceil(fltIn) < DATE_MIN || floor(fltIn) > DATE_MAX )
{
@@ -2997,7 +2997,7 @@
*/
HRESULT WINAPI VarDateFromR8(double dblIn, DATE* pdateOut)
{
- TRACE( ole, "( %f, %p ), stub\n", dblIn, pdateOut );
+ TRACE("( %f, %p ), stub\n", dblIn, pdateOut );
if( ceil(dblIn) < DATE_MIN || floor(dblIn) > DATE_MAX )
{
@@ -3039,7 +3039,7 @@
HRESULT ret = S_OK;
struct tm TM = { 0,0,0,0,0,0,0,0,0 };
- TRACE( ole, "( %p, %lx, %lx, %p ), stub\n", strIn, lcid, dwFlags, pdateOut );
+ TRACE("( %p, %lx, %lx, %p ), stub\n", strIn, lcid, dwFlags, pdateOut );
if( DateTimeStringToTm( strIn, lcid, &TM ) )
{
@@ -3062,7 +3062,7 @@
*/
HRESULT WINAPI VarDateFromI1(CHAR cIn, DATE* pdateOut)
{
- TRACE( ole, "( %c, %p ), stub\n", cIn, pdateOut );
+ TRACE("( %c, %p ), stub\n", cIn, pdateOut );
*pdateOut = (DATE) cIn;
@@ -3074,7 +3074,7 @@
*/
HRESULT WINAPI VarDateFromUI2(USHORT uiIn, DATE* pdateOut)
{
- TRACE( ole, "( %d, %p ), stub\n", uiIn, pdateOut );
+ TRACE("( %d, %p ), stub\n", uiIn, pdateOut );
if( uiIn > DATE_MAX )
{
@@ -3091,7 +3091,7 @@
*/
HRESULT WINAPI VarDateFromUI4(ULONG ulIn, DATE* pdateOut)
{
- TRACE( ole, "( %ld, %p ), stub\n", ulIn, pdateOut );
+ TRACE("( %ld, %p ), stub\n", ulIn, pdateOut );
if( ulIn < DATE_MIN || ulIn > DATE_MAX )
{
@@ -3108,7 +3108,7 @@
*/
HRESULT WINAPI VarDateFromBool(VARIANT_BOOL boolIn, DATE* pdateOut)
{
- TRACE( ole, "( %d, %p ), stub\n", boolIn, pdateOut );
+ TRACE("( %d, %p ), stub\n", boolIn, pdateOut );
*pdateOut = (DATE) boolIn;
@@ -3131,7 +3131,7 @@
*/
HRESULT WINAPI VarBstrFromUI1(BYTE bVal, LCID lcid, ULONG dwFlags, BSTR* pbstrOut)
{
- TRACE( ole, "( %d, %ld, %ld, %p ), stub\n", bVal, lcid, dwFlags, pbstrOut );
+ TRACE("( %d, %ld, %ld, %p ), stub\n", bVal, lcid, dwFlags, pbstrOut );
sprintf( pBuffer, "%d", bVal );
*pbstrOut = StringDupAtoBstr( pBuffer );
@@ -3144,7 +3144,7 @@
*/
HRESULT WINAPI VarBstrFromI2(short iVal, LCID lcid, ULONG dwFlags, BSTR* pbstrOut)
{
- TRACE( ole, "( %d, %ld, %ld, %p ), stub\n", iVal, lcid, dwFlags, pbstrOut );
+ TRACE("( %d, %ld, %ld, %p ), stub\n", iVal, lcid, dwFlags, pbstrOut );
sprintf( pBuffer, "%d", iVal );
*pbstrOut = StringDupAtoBstr( pBuffer );
@@ -3156,7 +3156,7 @@
*/
HRESULT WINAPI VarBstrFromI4(LONG lIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut)
{
- TRACE( ole, "( %ld, %ld, %ld, %p ), stub\n", lIn, lcid, dwFlags, pbstrOut );
+ TRACE("( %ld, %ld, %ld, %p ), stub\n", lIn, lcid, dwFlags, pbstrOut );
sprintf( pBuffer, "%ld", lIn );
*pbstrOut = StringDupAtoBstr( pBuffer );
@@ -3169,7 +3169,7 @@
*/
HRESULT WINAPI VarBstrFromR4(FLOAT fltIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut)
{
- TRACE( ole, "( %f, %ld, %ld, %p ), stub\n", fltIn, lcid, dwFlags, pbstrOut );
+ TRACE("( %f, %ld, %ld, %p ), stub\n", fltIn, lcid, dwFlags, pbstrOut );
sprintf( pBuffer, "%.7g", fltIn );
*pbstrOut = StringDupAtoBstr( pBuffer );
@@ -3182,7 +3182,7 @@
*/
HRESULT WINAPI VarBstrFromR8(double dblIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut)
{
- TRACE( ole, "( %f, %ld, %ld, %p ), stub\n", dblIn, lcid, dwFlags, pbstrOut );
+ TRACE("( %f, %ld, %ld, %p ), stub\n", dblIn, lcid, dwFlags, pbstrOut );
sprintf( pBuffer, "%.15g", dblIn );
*pbstrOut = StringDupAtoBstr( pBuffer );
@@ -3232,7 +3232,7 @@
{
struct tm TM = {0,0,0,0,0,0,0,0,0};
- TRACE( ole, "( %f, %ld, %ld, %p ), stub\n", dateIn, lcid, dwFlags, pbstrOut );
+ TRACE("( %f, %ld, %ld, %p ), stub\n", dateIn, lcid, dwFlags, pbstrOut );
if( DateToTm( dateIn, lcid, &TM ) == FALSE )
{
@@ -3256,7 +3256,7 @@
*/
HRESULT WINAPI VarBstrFromBool(VARIANT_BOOL boolIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut)
{
- TRACE( ole, "( %d, %ld, %ld, %p ), stub\n", boolIn, lcid, dwFlags, pbstrOut );
+ TRACE("( %d, %ld, %ld, %p ), stub\n", boolIn, lcid, dwFlags, pbstrOut );
if( boolIn == VARIANT_FALSE )
{
@@ -3277,7 +3277,7 @@
*/
HRESULT WINAPI VarBstrFromI1(CHAR cIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut)
{
- TRACE( ole, "( %c, %ld, %ld, %p ), stub\n", cIn, lcid, dwFlags, pbstrOut );
+ TRACE("( %c, %ld, %ld, %p ), stub\n", cIn, lcid, dwFlags, pbstrOut );
sprintf( pBuffer, "%d", cIn );
*pbstrOut = StringDupAtoBstr( pBuffer );
@@ -3289,7 +3289,7 @@
*/
HRESULT WINAPI VarBstrFromUI2(USHORT uiIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut)
{
- TRACE( ole, "( %d, %ld, %ld, %p ), stub\n", uiIn, lcid, dwFlags, pbstrOut );
+ TRACE("( %d, %ld, %ld, %p ), stub\n", uiIn, lcid, dwFlags, pbstrOut );
sprintf( pBuffer, "%d", uiIn );
*pbstrOut = StringDupAtoBstr( pBuffer );
@@ -3301,7 +3301,7 @@
*/
HRESULT WINAPI VarBstrFromUI4(ULONG ulIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut)
{
- TRACE( ole, "( %ld, %ld, %ld, %p ), stub\n", ulIn, lcid, dwFlags, pbstrOut );
+ TRACE("( %ld, %ld, %ld, %p ), stub\n", ulIn, lcid, dwFlags, pbstrOut );
sprintf( pBuffer, "%ld", ulIn );
*pbstrOut = StringDupAtoBstr( pBuffer );
@@ -3313,7 +3313,7 @@
*/
HRESULT WINAPI VarBoolFromUI1(BYTE bIn, VARIANT_BOOL* pboolOut)
{
- TRACE( ole, "( %d, %p ), stub\n", bIn, pboolOut );
+ TRACE("( %d, %p ), stub\n", bIn, pboolOut );
if( bIn == 0 )
{
@@ -3332,7 +3332,7 @@
*/
HRESULT WINAPI VarBoolFromI2(short sIn, VARIANT_BOOL* pboolOut)
{
- TRACE( ole, "( %d, %p ), stub\n", sIn, pboolOut );
+ TRACE("( %d, %p ), stub\n", sIn, pboolOut );
if( sIn == 0 )
{
@@ -3351,7 +3351,7 @@
*/
HRESULT WINAPI VarBoolFromI4(LONG lIn, VARIANT_BOOL* pboolOut)
{
- TRACE( ole, "( %ld, %p ), stub\n", lIn, pboolOut );
+ TRACE("( %ld, %p ), stub\n", lIn, pboolOut );
if( lIn == 0 )
{
@@ -3370,7 +3370,7 @@
*/
HRESULT WINAPI VarBoolFromR4(FLOAT fltIn, VARIANT_BOOL* pboolOut)
{
- TRACE( ole, "( %f, %p ), stub\n", fltIn, pboolOut );
+ TRACE("( %f, %p ), stub\n", fltIn, pboolOut );
if( fltIn == 0.0 )
{
@@ -3389,7 +3389,7 @@
*/
HRESULT WINAPI VarBoolFromR8(double dblIn, VARIANT_BOOL* pboolOut)
{
- TRACE( ole, "( %f, %p ), stub\n", dblIn, pboolOut );
+ TRACE("( %f, %p ), stub\n", dblIn, pboolOut );
if( dblIn == 0.0 )
{
@@ -3408,7 +3408,7 @@
*/
HRESULT WINAPI VarBoolFromDate(DATE dateIn, VARIANT_BOOL* pboolOut)
{
- TRACE( ole, "( %f, %p ), stub\n", dateIn, pboolOut );
+ TRACE("( %f, %p ), stub\n", dateIn, pboolOut );
if( dateIn == 0.0 )
{
@@ -3430,7 +3430,7 @@
HRESULT ret = S_OK;
char* pNewString = NULL;
- TRACE( ole, "( %p, %ld, %ld, %p ), stub\n", strIn, lcid, dwFlags, pboolOut );
+ TRACE("( %p, %ld, %ld, %p ), stub\n", strIn, lcid, dwFlags, pboolOut );
pNewString = HEAP_strdupWtoA( GetProcessHeap(), 0, strIn );
@@ -3480,7 +3480,7 @@
*/
HRESULT WINAPI VarBoolFromI1(CHAR cIn, VARIANT_BOOL* pboolOut)
{
- TRACE( ole, "( %c, %p ), stub\n", cIn, pboolOut );
+ TRACE("( %c, %p ), stub\n", cIn, pboolOut );
if( cIn == 0 )
{
@@ -3499,7 +3499,7 @@
*/
HRESULT WINAPI VarBoolFromUI2(USHORT uiIn, VARIANT_BOOL* pboolOut)
{
- TRACE( ole, "( %d, %p ), stub\n", uiIn, pboolOut );
+ TRACE("( %d, %p ), stub\n", uiIn, pboolOut );
if( uiIn == 0 )
{
@@ -3518,7 +3518,7 @@
*/
HRESULT WINAPI VarBoolFromUI4(ULONG ulIn, VARIANT_BOOL* pboolOut)
{
- TRACE( ole, "( %ld, %p ), stub\n", ulIn, pboolOut );
+ TRACE("( %ld, %p ), stub\n", ulIn, pboolOut );
if( ulIn == 0 )
{
@@ -3548,7 +3548,7 @@
*/
HRESULT WINAPI VarI1FromUI1(BYTE bIn, CHAR* pcOut)
{
- TRACE( ole, "( %d, %p ), stub\n", bIn, pcOut );
+ TRACE("( %d, %p ), stub\n", bIn, pcOut );
/* Check range of value.
*/
@@ -3567,7 +3567,7 @@
*/
HRESULT WINAPI VarI1FromI2(short uiIn, CHAR* pcOut)
{
- TRACE( ole, "( %d, %p ), stub\n", uiIn, pcOut );
+ TRACE("( %d, %p ), stub\n", uiIn, pcOut );
if( uiIn > CHAR_MAX )
{
@@ -3584,7 +3584,7 @@
*/
HRESULT WINAPI VarI1FromI4(LONG lIn, CHAR* pcOut)
{
- TRACE( ole, "( %ld, %p ), stub\n", lIn, pcOut );
+ TRACE("( %ld, %p ), stub\n", lIn, pcOut );
if( lIn < CHAR_MIN || lIn > CHAR_MAX )
{
@@ -3601,7 +3601,7 @@
*/
HRESULT WINAPI VarI1FromR4(FLOAT fltIn, CHAR* pcOut)
{
- TRACE( ole, "( %f, %p ), stub\n", fltIn, pcOut );
+ TRACE("( %f, %p ), stub\n", fltIn, pcOut );
fltIn = round( fltIn );
if( fltIn < CHAR_MIN || fltIn > CHAR_MAX )
@@ -3619,7 +3619,7 @@
*/
HRESULT WINAPI VarI1FromR8(double dblIn, CHAR* pcOut)
{
- TRACE( ole, "( %f, %p ), stub\n", dblIn, pcOut );
+ TRACE("( %f, %p ), stub\n", dblIn, pcOut );
dblIn = round( dblIn );
if( dblIn < CHAR_MIN || dblIn > CHAR_MAX )
@@ -3637,7 +3637,7 @@
*/
HRESULT WINAPI VarI1FromDate(DATE dateIn, CHAR* pcOut)
{
- TRACE( ole, "( %f, %p ), stub\n", dateIn, pcOut );
+ TRACE("( %f, %p ), stub\n", dateIn, pcOut );
dateIn = round( dateIn );
if( dateIn < CHAR_MIN || dateIn > CHAR_MAX )
@@ -3658,7 +3658,7 @@
double dValue = 0.0;
LPSTR pNewString = NULL;
- TRACE( ole, "( %p, %ld, %ld, %p ), stub\n", strIn, lcid, dwFlags, pcOut );
+ TRACE("( %p, %ld, %ld, %p ), stub\n", strIn, lcid, dwFlags, pcOut );
/* Check if we have a valid argument
*/
@@ -3695,7 +3695,7 @@
*/
HRESULT WINAPI VarI1FromBool(VARIANT_BOOL boolIn, CHAR* pcOut)
{
- TRACE( ole, "( %d, %p ), stub\n", boolIn, pcOut );
+ TRACE("( %d, %p ), stub\n", boolIn, pcOut );
*pcOut = (CHAR) boolIn;
@@ -3707,7 +3707,7 @@
*/
HRESULT WINAPI VarI1FromUI2(USHORT uiIn, CHAR* pcOut)
{
- TRACE( ole, "( %d, %p ), stub\n", uiIn, pcOut );
+ TRACE("( %d, %p ), stub\n", uiIn, pcOut );
if( uiIn > CHAR_MAX )
{
@@ -3724,7 +3724,7 @@
*/
HRESULT WINAPI VarI1FromUI4(ULONG ulIn, CHAR* pcOut)
{
- TRACE( ole, "( %ld, %p ), stub\n", ulIn, pcOut );
+ TRACE("( %ld, %p ), stub\n", ulIn, pcOut );
if( ulIn > CHAR_MAX )
{
@@ -3754,7 +3754,7 @@
*/
HRESULT WINAPI VarUI2FromUI1(BYTE bIn, USHORT* puiOut)
{
- TRACE( ole, "( %d, %p ), stub\n", bIn, puiOut );
+ TRACE("( %d, %p ), stub\n", bIn, puiOut );
*puiOut = (USHORT) bIn;
@@ -3766,7 +3766,7 @@
*/
HRESULT WINAPI VarUI2FromI2(short uiIn, USHORT* puiOut)
{
- TRACE( ole, "( %d, %p ), stub\n", uiIn, puiOut );
+ TRACE("( %d, %p ), stub\n", uiIn, puiOut );
if( uiIn < UI2_MIN )
{
@@ -3783,7 +3783,7 @@
*/
HRESULT WINAPI VarUI2FromI4(LONG lIn, USHORT* puiOut)
{
- TRACE( ole, "( %ld, %p ), stub\n", lIn, puiOut );
+ TRACE("( %ld, %p ), stub\n", lIn, puiOut );
if( lIn < UI2_MIN || lIn > UI2_MAX )
{
@@ -3800,7 +3800,7 @@
*/
HRESULT WINAPI VarUI2FromR4(FLOAT fltIn, USHORT* puiOut)
{
- TRACE( ole, "( %f, %p ), stub\n", fltIn, puiOut );
+ TRACE("( %f, %p ), stub\n", fltIn, puiOut );
fltIn = round( fltIn );
if( fltIn < UI2_MIN || fltIn > UI2_MAX )
@@ -3818,7 +3818,7 @@
*/
HRESULT WINAPI VarUI2FromR8(double dblIn, USHORT* puiOut)
{
- TRACE( ole, "( %f, %p ), stub\n", dblIn, puiOut );
+ TRACE("( %f, %p ), stub\n", dblIn, puiOut );
dblIn = round( dblIn );
if( dblIn < UI2_MIN || dblIn > UI2_MAX )
@@ -3836,7 +3836,7 @@
*/
HRESULT WINAPI VarUI2FromDate(DATE dateIn, USHORT* puiOut)
{
- TRACE( ole, "( %f, %p ), stub\n", dateIn, puiOut );
+ TRACE("( %f, %p ), stub\n", dateIn, puiOut );
dateIn = round( dateIn );
if( dateIn < UI2_MIN || dateIn > UI2_MAX )
@@ -3857,7 +3857,7 @@
double dValue = 0.0;
LPSTR pNewString = NULL;
- TRACE( ole, "( %p, %ld, %ld, %p ), stub\n", strIn, lcid, dwFlags, puiOut );
+ TRACE("( %p, %ld, %ld, %p ), stub\n", strIn, lcid, dwFlags, puiOut );
/* Check if we have a valid argument
*/
@@ -3894,7 +3894,7 @@
*/
HRESULT WINAPI VarUI2FromBool(VARIANT_BOOL boolIn, USHORT* puiOut)
{
- TRACE( ole, "( %d, %p ), stub\n", boolIn, puiOut );
+ TRACE("( %d, %p ), stub\n", boolIn, puiOut );
*puiOut = (USHORT) boolIn;
@@ -3906,7 +3906,7 @@
*/
HRESULT WINAPI VarUI2FromI1(CHAR cIn, USHORT* puiOut)
{
- TRACE( ole, "( %c, %p ), stub\n", cIn, puiOut );
+ TRACE("( %c, %p ), stub\n", cIn, puiOut );
*puiOut = (USHORT) cIn;
@@ -3918,7 +3918,7 @@
*/
HRESULT WINAPI VarUI2FromUI4(ULONG ulIn, USHORT* puiOut)
{
- TRACE( ole, "( %ld, %p ), stub\n", ulIn, puiOut );
+ TRACE("( %ld, %p ), stub\n", ulIn, puiOut );
if( ulIn < UI2_MIN || ulIn > UI2_MAX )
{
@@ -3938,7 +3938,7 @@
double dValue = 0.0;
LPSTR pNewString = NULL;
- TRACE( ole, "( %p, %ld, %ld, %p ), stub\n", strIn, lcid, dwFlags, pulOut );
+ TRACE("( %p, %ld, %ld, %p ), stub\n", strIn, lcid, dwFlags, pulOut );
/* Check if we have a valid argument
*/
@@ -3989,7 +3989,7 @@
*/
HRESULT WINAPI VarUI4FromUI1(BYTE bIn, ULONG* pulOut)
{
- TRACE( ole, "( %d, %p ), stub\n", bIn, pulOut );
+ TRACE("( %d, %p ), stub\n", bIn, pulOut );
*pulOut = (USHORT) bIn;
@@ -4001,7 +4001,7 @@
*/
HRESULT WINAPI VarUI4FromI2(short uiIn, ULONG* pulOut)
{
- TRACE( ole, "( %d, %p ), stub\n", uiIn, pulOut );
+ TRACE("( %d, %p ), stub\n", uiIn, pulOut );
if( uiIn < UI4_MIN )
{
@@ -4018,7 +4018,7 @@
*/
HRESULT WINAPI VarUI4FromI4(LONG lIn, ULONG* pulOut)
{
- TRACE( ole, "( %ld, %p ), stub\n", lIn, pulOut );
+ TRACE("( %ld, %p ), stub\n", lIn, pulOut );
if( lIn < UI4_MIN )
{
@@ -4051,7 +4051,7 @@
*/
HRESULT WINAPI VarUI4FromR8(double dblIn, ULONG* pulOut)
{
- TRACE( ole, "( %f, %p ), stub\n", dblIn, pulOut );
+ TRACE("( %f, %p ), stub\n", dblIn, pulOut );
dblIn = round( dblIn );
if( dblIn < UI4_MIN || dblIn > UI4_MAX )
@@ -4069,7 +4069,7 @@
*/
HRESULT WINAPI VarUI4FromDate(DATE dateIn, ULONG* pulOut)
{
- TRACE( ole, "( %f, %p ), stub\n", dateIn, pulOut );
+ TRACE("( %f, %p ), stub\n", dateIn, pulOut );
dateIn = round( dateIn );
if( dateIn < UI4_MIN || dateIn > UI4_MAX )
@@ -4087,7 +4087,7 @@
*/
HRESULT WINAPI VarUI4FromBool(VARIANT_BOOL boolIn, ULONG* pulOut)
{
- TRACE( ole, "( %d, %p ), stub\n", boolIn, pulOut );
+ TRACE("( %d, %p ), stub\n", boolIn, pulOut );
*pulOut = (ULONG) boolIn;
@@ -4099,7 +4099,7 @@
*/
HRESULT WINAPI VarUI4FromI1(CHAR cIn, ULONG* pulOut)
{
- TRACE( ole, "( %c, %p ), stub\n", cIn, pulOut );
+ TRACE("( %c, %p ), stub\n", cIn, pulOut );
*pulOut = (ULONG) cIn;
@@ -4111,7 +4111,7 @@
*/
HRESULT WINAPI VarUI4FromUI2(USHORT uiIn, ULONG* pulOut)
{
- TRACE( ole, "( %d, %p ), stub\n", uiIn, pulOut );
+ TRACE("( %d, %p ), stub\n", uiIn, pulOut );
*pulOut = (ULONG) uiIn;
@@ -4274,7 +4274,7 @@
{
struct tm t;
- TRACE( ole, "( 0x%x, 0x%x, 0x%p ), stub\n", wDosDate, wDosTime, pvtime );
+ TRACE("( 0x%x, 0x%x, 0x%p ), stub\n", wDosDate, wDosTime, pvtime );
t.tm_sec = (wDosTime & 0x001f) * 2;
t.tm_min = (wDosTime & 0x07e0) >> 5;
diff --git a/windows/caret.c b/windows/caret.c
index 90fa950..33bb330 100644
--- a/windows/caret.c
+++ b/windows/caret.c
@@ -10,7 +10,7 @@
#include "module.h"
#include "win.h"
#include "winuser.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(caret)
@@ -82,7 +82,7 @@
*/
static VOID CALLBACK CARET_Callback( HWND hwnd, UINT msg, UINT id, DWORD ctime)
{
- TRACE(caret,"hwnd=%04x, timerid=%d, caret=%d\n",
+ TRACE("hwnd=%04x, timerid=%d, caret=%d\n",
hwnd, id, Caret.on);
CARET_DisplayCaret(CARET_TOGGLE);
}
@@ -141,7 +141,7 @@
BOOL WINAPI CreateCaret( HWND hwnd, HBITMAP bitmap,
INT width, INT height )
{
- TRACE(caret,"hwnd=%04x\n", hwnd);
+ TRACE("hwnd=%04x\n", hwnd);
if (!hwnd) return FALSE;
@@ -193,7 +193,7 @@
{
if (!Caret.hwnd) return FALSE;
- TRACE(caret,"hwnd=%04x, timerid=%d\n",
+ TRACE("hwnd=%04x, timerid=%d\n",
Caret.hwnd, Caret.timerid);
CARET_KillTimer();
@@ -221,7 +221,7 @@
if (!Caret.hwnd) return FALSE;
if ((x == Caret.x) && (y == Caret.y)) return TRUE;
- TRACE(caret,"x=%d, y=%d\n", x, y);
+ TRACE("x=%d, y=%d\n", x, y);
CARET_KillTimer();
CARET_DisplayCaret(CARET_OFF);
@@ -253,7 +253,7 @@
if (!Caret.hwnd) return FALSE;
if (hwnd && (Caret.hwnd != hwnd)) return FALSE;
- TRACE(caret,"hwnd=%04x, hidden=%d\n",
+ TRACE("hwnd=%04x, hidden=%d\n",
hwnd, Caret.hidden);
CARET_KillTimer();
@@ -280,7 +280,7 @@
if (!Caret.hwnd) return FALSE;
if (hwnd && (Caret.hwnd != hwnd)) return FALSE;
- TRACE(caret,"hwnd=%04x, hidden=%d\n",
+ TRACE("hwnd=%04x, hidden=%d\n",
hwnd, Caret.hidden);
if (Caret.hidden)
@@ -311,7 +311,7 @@
{
if (!Caret.hwnd) return FALSE;
- TRACE(caret,"hwnd=%04x, msecs=%d\n",
+ TRACE("hwnd=%04x, msecs=%d\n",
Caret.hwnd, msecs);
Caret.timeout = msecs;
@@ -345,7 +345,7 @@
{
if (!Caret.hwnd || !pt) return;
- TRACE(caret,"hwnd=%04x, pt=%p, x=%d, y=%d\n",
+ TRACE("hwnd=%04x, pt=%p, x=%d, y=%d\n",
Caret.hwnd, pt, Caret.x, Caret.y);
pt->x = (INT16)Caret.x;
pt->y = (INT16)Caret.y;
diff --git a/windows/class.c b/windows/class.c
index ef5dc44..a5f555f 100644
--- a/windows/class.c
+++ b/windows/class.c
@@ -22,7 +22,7 @@
#include "ldt.h"
#include "toolhelp.h"
#include "winproc.h"
-#include "debug.h"
+#include "debugtools.h"
#include "winerror.h"
#include "wine/winuser16.h"
@@ -44,14 +44,14 @@
if (ptr->magic != CLASS_MAGIC)
{
- DUMP("%p is not a class\n", ptr );
+ DPRINTF("%p is not a class\n", ptr );
return;
}
GlobalGetAtomNameA( ptr->atomName, className, sizeof(className) );
- DUMP( "Class %p:\n", ptr );
- DUMP( "next=%p name=%04x '%s' style=%08x wndProc=%08x\n"
+ DPRINTF( "Class %p:\n", ptr );
+ DPRINTF( "next=%p name=%04x '%s' style=%08x wndProc=%08x\n"
"inst=%04x dce=%08x icon=%04x cursor=%04x bkgnd=%04x\n"
"clsExtra=%d winExtra=%d #windows=%d\n",
ptr->next, ptr->atomName, className, ptr->style,
@@ -60,12 +60,12 @@
ptr->cbClsExtra, ptr->cbWndExtra, ptr->cWindows );
if (ptr->cbClsExtra)
{
- DUMP( "extra bytes:" );
+ DPRINTF( "extra bytes:" );
for (i = 0; i < ptr->cbClsExtra; i++)
- DUMP( " %02x", *((BYTE *)ptr->wExtra+i) );
- DUMP( "\n" );
+ DPRINTF( " %02x", *((BYTE *)ptr->wExtra+i) );
+ DPRINTF( "\n" );
}
- DUMP( "\n" );
+ DPRINTF( "\n" );
}
@@ -79,14 +79,14 @@
CLASS *ptr;
char className[MAX_CLASSNAME+1];
- DUMP( " Class Name Style WndProc\n" );
+ DPRINTF( " Class Name Style WndProc\n" );
for (ptr = firstClass; ptr; ptr = ptr->next)
{
GlobalGetAtomNameA( ptr->atomName, className, sizeof(className) );
- DUMP( "%08x %-20.20s %08x %08x\n", (UINT)ptr, className,
+ DPRINTF( "%08x %-20.20s %08x %08x\n", (UINT)ptr, className,
ptr->style, (UINT)ptr->winproc );
}
- DUMP( "\n" );
+ DPRINTF( "\n" );
}
@@ -237,7 +237,7 @@
static BOOL CLASS_FreeClass( CLASS *classPtr )
{
CLASS **ppClass;
- TRACE(class,"%p \n", classPtr);
+ TRACE("%p \n", classPtr);
/* Check if we can remove this class */
@@ -249,7 +249,7 @@
if (*ppClass == classPtr) break;
if (!*ppClass)
{
- ERR( class, "Class list corrupted\n" );
+ ERR("Class list corrupted\n" );
return FALSE;
}
*ppClass = classPtr->next;
@@ -274,7 +274,7 @@
{
CLASS *ptr, *next;
- TRACE(class,"0x%08x \n", hModule);
+ TRACE("0x%08x \n", hModule);
for (ptr = firstClass; ptr; ptr = next)
{
@@ -297,7 +297,7 @@
CLASS *CLASS_FindClassByAtom( ATOM atom, HINSTANCE hinstance )
{ CLASS * class, *tclass=0;
- TRACE(class,"0x%08x 0x%08x\n", atom, hinstance);
+ TRACE("0x%08x 0x%08x\n", atom, hinstance);
/* First search task-specific classes */
@@ -308,7 +308,7 @@
{
if (hinstance==class->hInstance || hinstance==0xffff )
{
- TRACE(class,"-- found local %p\n", class);
+ TRACE("-- found local %p\n", class);
return class;
}
if (class->hInstance==0) tclass = class;
@@ -322,7 +322,7 @@
if (!(class->style & CS_GLOBALCLASS)) continue;
if (class->atomName == atom)
{
- TRACE(class,"-- found global %p\n", class);
+ TRACE("-- found global %p\n", class);
return class;
}
}
@@ -330,11 +330,11 @@
/* Then check if there was a local class with hInst=0*/
if ( tclass )
{
- WARN(class,"-- found local Class registred with hInst=0\n");
+ WARN("-- found local Class registred with hInst=0\n");
return tclass;
}
- TRACE(class,"-- not found\n");
+ TRACE("-- not found\n");
return 0;
}
@@ -351,7 +351,7 @@
{
CLASS *classPtr;
- TRACE(class,"atom=0x%x hinst=0x%x style=0x%lx clExtr=0x%x winExtr=0x%x wndProc=0x%p ProcType=0x%x\n",
+ TRACE("atom=0x%x hinst=0x%x style=0x%lx clExtr=0x%x winExtr=0x%x wndProc=0x%p ProcType=0x%x\n",
atom, hInstance, style, classExtra, winExtra, wndProc, wndProcType);
/* Check if a class with this name already exists */
@@ -369,10 +369,10 @@
if (classExtra < 0) classExtra = 0;
else if (classExtra > 40) /* Extra bytes are limited to 40 in Win32 */
- WARN(class, "Class extra bytes %d is > 40\n", classExtra);
+ WARN("Class extra bytes %d is > 40\n", classExtra);
if (winExtra < 0) winExtra = 0;
else if (winExtra > 40) /* Extra bytes are limited to 40 in Win32 */
- WARN(class, "Win extra bytes %d is > 40\n", winExtra );
+ WARN("Win extra bytes %d is > 40\n", winExtra );
/* Create the class */
@@ -423,7 +423,7 @@
return 0;
}
- TRACE(class, "atom=%04x wndproc=%08lx hinst=%04x "
+ TRACE("atom=%04x wndproc=%08lx hinst=%04x "
"bg=%04x style=%08x clsExt=%d winExt=%d class=%p name='%s'\n",
atom, (DWORD)wc->lpfnWndProc, hInstance,
wc->hbrBackground, wc->style, wc->cbClsExtra,
@@ -471,7 +471,7 @@
return FALSE;
}
- TRACE(class, "atom=%04x wndproc=%08lx hinst=%04x bg=%04x style=%08x clsExt=%d winExt=%d class=%p name='%s'\n",
+ TRACE("atom=%04x wndproc=%08lx hinst=%04x bg=%04x style=%08x clsExt=%d winExt=%d class=%p name='%s'\n",
atom, (DWORD)wc->lpfnWndProc, wc->hInstance,
wc->hbrBackground, wc->style, wc->cbClsExtra,
wc->cbWndExtra, classPtr,
@@ -511,7 +511,7 @@
return 0;
}
- TRACE(class, "atom=%04x wndproc=%08lx hinst=%04x bg=%04x style=%08x clsExt=%d winExt=%d class=%p\n",
+ TRACE("atom=%04x wndproc=%08lx hinst=%04x bg=%04x style=%08x clsExt=%d winExt=%d class=%p\n",
atom, (DWORD)wc->lpfnWndProc, wc->hInstance,
wc->hbrBackground, wc->style, wc->cbClsExtra,
wc->cbWndExtra, classPtr );
@@ -545,7 +545,7 @@
return 0;
}
- TRACE(class, "atom=%04x wndproc=%08lx hinst=%04x bg=%04x style=%08x clsExt=%d winExt=%d class=%p\n",
+ TRACE("atom=%04x wndproc=%08lx hinst=%04x bg=%04x style=%08x clsExt=%d winExt=%d class=%p\n",
atom, (DWORD)wc->lpfnWndProc, hInstance,
wc->hbrBackground, wc->style, wc->cbClsExtra,
wc->cbWndExtra, classPtr );
@@ -586,7 +586,7 @@
return FALSE;
}
- TRACE(class, "atom=%04x wndproc=%08lx hinst=%04x bg=%04x style=%08x clsExt=%d winExt=%d class=%p\n",
+ TRACE("atom=%04x wndproc=%08lx hinst=%04x bg=%04x style=%08x clsExt=%d winExt=%d class=%p\n",
atom, (DWORD)wc->lpfnWndProc, wc->hInstance,
wc->hbrBackground, wc->style, wc->cbClsExtra,
wc->cbWndExtra, classPtr );
@@ -624,7 +624,7 @@
return 0;
}
- TRACE(class, "atom=%04x wndproc=%08lx hinst=%04x bg=%04x style=%08x clsExt=%d winExt=%d class=%p\n",
+ TRACE("atom=%04x wndproc=%08lx hinst=%04x bg=%04x style=%08x clsExt=%d winExt=%d class=%p\n",
atom, (DWORD)wc->lpfnWndProc, wc->hInstance,
wc->hbrBackground, wc->style, wc->cbClsExtra,
wc->cbWndExtra, classPtr );
@@ -664,7 +664,7 @@
ATOM atom;
BOOL ret;
- TRACE(class,"%s %x\n",debugres_a(className), hInstance);
+ TRACE("%s %x\n",debugres_a(className), hInstance);
if (!(atom = GlobalFindAtomA( className )))
{
@@ -690,7 +690,7 @@
ATOM atom;
BOOL ret;
- TRACE(class,"%s %x\n",debugres_w(className), hInstance);
+ TRACE("%s %x\n",debugres_w(className), hInstance);
if (!(atom = GlobalFindAtomW( className )))
{
@@ -725,7 +725,7 @@
WND * wndPtr;
WORD retvalue = 0;
- TRACE(class,"%x %x\n",hwnd, offset);
+ TRACE("%x %x\n",hwnd, offset);
if (!(wndPtr = WIN_FindWndPtr( hwnd ))) return 0;
if (offset >= 0)
@@ -755,7 +755,7 @@
retvalue = (WORD)GetClassLongA( hwnd, offset );
}
- WARN(class, "Invalid offset %d\n", offset);
+ WARN("Invalid offset %d\n", offset);
END:
WIN_ReleaseWndPtr(wndPtr);
return retvalue;
@@ -770,7 +770,7 @@
WND *wndPtr;
LONG ret;
- TRACE(class,"%x %x\n",hwnd, offset);
+ TRACE("%x %x\n",hwnd, offset);
switch( offset )
{
@@ -796,7 +796,7 @@
WND * wndPtr;
LONG retvalue;
- TRACE(class,"%x %x\n",hwnd, offset);
+ TRACE("%x %x\n",hwnd, offset);
if (!(wndPtr = WIN_FindWndPtr( hwnd ))) return 0;
if (offset >= 0)
@@ -832,7 +832,7 @@
retvalue = GetClassWord( hwnd, offset );
goto END;
}
- WARN(class, "Invalid offset %d\n", offset);
+ WARN("Invalid offset %d\n", offset);
retvalue = 0;
END:
WIN_ReleaseWndPtr(wndPtr);
@@ -848,7 +848,7 @@
WND * wndPtr;
LONG retvalue;
- TRACE(class,"%x %x\n",hwnd, offset);
+ TRACE("%x %x\n",hwnd, offset);
switch(offset)
{
@@ -886,7 +886,7 @@
WORD retval = 0;
void *ptr;
- TRACE(class,"%x %x %x\n",hwnd, offset, newval);
+ TRACE("%x %x %x\n",hwnd, offset, newval);
if (!(wndPtr = WIN_FindWndPtr( hwnd ))) return 0;
if (offset >= 0)
@@ -895,7 +895,7 @@
ptr = ((char *)wndPtr->class->wExtra) + offset;
else
{
- WARN( class, "Invalid offset %d\n", offset );
+ WARN("Invalid offset %d\n", offset );
WIN_ReleaseWndPtr(wndPtr);
return 0;
}
@@ -914,7 +914,7 @@
case GCW_HICONSM: ptr = &wndPtr->class->hIconSm; break;
case GCW_ATOM: ptr = &wndPtr->class->atomName; break;
default:
- WARN( class, "Invalid offset %d\n", offset);
+ WARN("Invalid offset %d\n", offset);
WIN_ReleaseWndPtr(wndPtr);
return 0;
}
@@ -928,7 +928,7 @@
if (offset == GCW_ATOM)
{
CLASS_SetClassNameA( wndPtr->class, NULL );
- FIXME(class,"GCW_ATOM changed for a class. Not updating className, so GetClassInfoEx may not return correct className!\n");
+ FIXME("GCW_ATOM changed for a class. Not updating className, so GetClassInfoEx may not return correct className!\n");
}
WIN_ReleaseWndPtr(wndPtr);
return retval;
@@ -943,7 +943,7 @@
WND *wndPtr;
LONG retval;
- TRACE(class,"%x %x %lx\n",hwnd, offset, newval);
+ TRACE("%x %x %lx\n",hwnd, offset, newval);
switch(offset)
{
@@ -971,7 +971,7 @@
LONG retval = 0;
void *ptr;
- TRACE(class,"%x %x %lx\n",hwnd, offset, newval);
+ TRACE("%x %x %lx\n",hwnd, offset, newval);
if (!(wndPtr = WIN_FindWndPtr( hwnd ))) return 0;
if (offset >= 0)
@@ -980,7 +980,7 @@
ptr = ((char *)wndPtr->class->wExtra) + offset;
else
{
- WARN( class, "Invalid offset %d\n", offset );
+ WARN("Invalid offset %d\n", offset );
retval = 0;
goto END;
}
@@ -1008,7 +1008,7 @@
case GCL_CBCLSEXTRA: ptr = &wndPtr->class->cbClsExtra; break;
case GCL_HMODULE: ptr = &wndPtr->class->hInstance; break;
default:
- WARN( class, "Invalid offset %d\n", offset );
+ WARN("Invalid offset %d\n", offset );
retval = 0;
goto END;
}
@@ -1028,7 +1028,7 @@
WND *wndPtr;
LONG retval;
- TRACE(class,"%x %x %lx\n",hwnd, offset, newval);
+ TRACE("%x %x %lx\n",hwnd, offset, newval);
switch(offset)
{
@@ -1075,7 +1075,7 @@
ret = GlobalGetAtomNameA( wndPtr->class->atomName, buffer, count );
WIN_ReleaseWndPtr(wndPtr);
- TRACE(class,"%x %s %x\n",hwnd, buffer, count);
+ TRACE("%x %s %x\n",hwnd, buffer, count);
return ret;
}
@@ -1090,7 +1090,7 @@
if (!(wndPtr = WIN_FindWndPtr(hwnd))) return 0;
ret = GlobalGetAtomNameW( wndPtr->class->atomName, buffer, count );
WIN_ReleaseWndPtr(wndPtr);
- TRACE(class,"%x %s %x\n",hwnd, debugstr_w(buffer), count);
+ TRACE("%x %s %x\n",hwnd, debugstr_w(buffer), count);
return ret;
}
@@ -1105,7 +1105,7 @@
ATOM atom;
CLASS *classPtr;
- TRACE(class,"%x %p %p\n",hInstance, PTR_SEG_TO_LIN (name), wc);
+ TRACE("%x %p %p\n",hInstance, PTR_SEG_TO_LIN (name), wc);
hInstance = GetExePtr( hInstance );
if (!(atom = GlobalFindAtom16( name )) ||
@@ -1141,7 +1141,7 @@
ATOM atom;
CLASS *classPtr;
- TRACE(class,"%x %p %p\n",hInstance, name, wc);
+ TRACE("%x %p %p\n",hInstance, name, wc);
/* workaround: if hInstance=NULL you expect to get the system classes
but this classes (as example from comctl32.dll SysListView) won't be
@@ -1155,7 +1155,7 @@
{
if (hInstance) return FALSE;
else
- WARN(class,"systemclass %s (hInst=0) demanded but only class with hInst!=0 found\n",name);
+ WARN("systemclass %s (hInst=0) demanded but only class with hInst!=0 found\n",name);
}
wc->style = classPtr->style;
@@ -1182,7 +1182,7 @@
ATOM atom;
CLASS *classPtr;
- TRACE(class,"%x %p %p\n",hInstance, name, wc);
+ TRACE("%x %p %p\n",hInstance, name, wc);
if (!(atom = GlobalFindAtomW( name )) ||
!(classPtr = CLASS_FindClassByAtom( atom, hInstance )) ||
@@ -1216,7 +1216,7 @@
ATOM atom;
CLASS *classPtr;
- TRACE(class,"%x %p %p\n",hInstance,PTR_SEG_TO_LIN( name ), wc);
+ TRACE("%x %p %p\n",hInstance,PTR_SEG_TO_LIN( name ), wc);
hInstance = GetExePtr( hInstance );
if (!(atom = GlobalFindAtom16( name )) ||
@@ -1251,7 +1251,7 @@
ATOM atom;
CLASS *classPtr;
- TRACE(class,"%x %p %p\n",hInstance, name, wc);
+ TRACE("%x %p %p\n",hInstance, name, wc);
if (!(atom = GlobalFindAtomA( name )) ||
!(classPtr = CLASS_FindClassByAtom( atom, hInstance ))
@@ -1281,7 +1281,7 @@
ATOM atom;
CLASS *classPtr;
- TRACE(class,"%x %p %p\n",hInstance, name, wc);
+ TRACE("%x %p %p\n",hInstance, name, wc);
if (!(atom = GlobalFindAtomW( name )) ||
!(classPtr = CLASS_FindClassByAtom( atom, hInstance )) ||
@@ -1307,7 +1307,7 @@
*/
BOOL16 WINAPI ClassFirst16( CLASSENTRY *pClassEntry )
{
- TRACE(class,"%p\n",pClassEntry);
+ TRACE("%p\n",pClassEntry);
pClassEntry->wNext = 1;
return ClassNext16( pClassEntry );
}
@@ -1321,7 +1321,7 @@
int i;
CLASS *class = firstClass;
- TRACE(class,"%p\n",pClassEntry);
+ TRACE("%p\n",pClassEntry);
if (!pClassEntry->wNext) return FALSE;
for (i = 1; (i < pClassEntry->wNext) && class; i++) class = class->next;
diff --git a/windows/clipboard.c b/windows/clipboard.c
index b64e169..dde5d69 100644
--- a/windows/clipboard.c
+++ b/windows/clipboard.c
@@ -19,7 +19,7 @@
#include "message.h"
#include "clipboard.h"
#include "xmalloc.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(clipboard)
@@ -173,7 +173,7 @@
{
BOOL bRet;
- TRACE(clipboard,"(%04x)...\n", hWnd);
+ TRACE("(%04x)...\n", hWnd);
if (!hqClipLock)
{
@@ -184,7 +184,7 @@
}
else bRet = FALSE;
- TRACE(clipboard," returning %i\n", bRet);
+ TRACE(" returning %i\n", bRet);
return bRet;
}
@@ -203,7 +203,7 @@
*/
BOOL WINAPI CloseClipboard(void)
{
- TRACE(clipboard,"!\n");
+ TRACE("!\n");
if (hqClipLock == GetFastQueue16())
{
@@ -233,7 +233,7 @@
{
LPWINE_CLIPFORMAT lpFormat = ClipFormats;
- TRACE(clipboard,"(void)\n");
+ TRACE("(void)\n");
if (hqClipLock != GetFastQueue16()) return FALSE;
@@ -283,7 +283,7 @@
{
LPWINE_CLIPFORMAT lpFormat = __lookup_format( ClipFormats, wFormat );
- TRACE(clipboard, "(%04X, %04x) !\n", wFormat, hData);
+ TRACE("(%04X, %04x) !\n", wFormat, hData);
/* NOTE: If the hData is zero and current owner doesn't match
* the window that opened the clipboard then this application
@@ -331,7 +331,7 @@
{
LPWINE_CLIPFORMAT lpFormat = __lookup_format( ClipFormats, wFormat );
- TRACE(clipboard, "(%08X, %08x) !\n", wFormat, hData);
+ TRACE("(%08X, %08x) !\n", wFormat, hData);
/* NOTE: If the hData is zero and current owner doesn't match
* the window that opened the clipboard then this application
@@ -384,7 +384,7 @@
(WPARAM16)lpFormat->wFormatID,0L);
else
{
- WARN(clipboard, "\thWndClipOwner (%04x) is lost!\n",
+ WARN("\thWndClipOwner (%04x) is lost!\n",
hWndClipOwner);
hWndClipOwner = 0; lpFormat->wDataPresent = 0;
return FALSE;
@@ -419,7 +419,7 @@
}
if( !lpstrS ) return FALSE;
- TRACE(clipboard,"\tconverting from '%s' to '%s', %i chars\n",
+ TRACE("\tconverting from '%s' to '%s', %i chars\n",
lpSource->Name, lpTarget->Name, size);
lpTarget->hData32 = GlobalAlloc(GMEM_ZEROINIT, size);
@@ -431,7 +431,7 @@
CharToOemBuffA(lpstrS, lpstrT, size);
else
OemToCharBuffA(lpstrS, lpstrT, size);
- TRACE(clipboard,"\tgot %s\n", lpstrT);
+ TRACE("\tgot %s\n", lpstrT);
GlobalUnlock(lpTarget->hData32);
if (lpSource->hData32)
GlobalUnlock(lpSource->hData32);
@@ -458,7 +458,7 @@
if (hqClipLock != GetFastQueue16()) return 0;
- TRACE(clipboard,"(%04X)\n", wFormat);
+ TRACE("(%04X)\n", wFormat);
if( wFormat == CF_TEXT && !lpRender[CF_TEXT-1].wDataPresent
&& lpRender[CF_OEMTEXT-1].wDataPresent )
@@ -466,7 +466,7 @@
lpRender = &ClipFormats[CF_OEMTEXT-1];
lpUpdate = &ClipFormats[CF_TEXT-1];
- TRACE(clipboard,"\tOEMTEXT -> TEXT\n");
+ TRACE("\tOEMTEXT -> TEXT\n");
}
else if( wFormat == CF_OEMTEXT && !lpRender[CF_OEMTEXT-1].wDataPresent
&& lpRender[CF_TEXT-1].wDataPresent )
@@ -474,7 +474,7 @@
lpRender = &ClipFormats[CF_TEXT-1];
lpUpdate = &ClipFormats[CF_OEMTEXT-1];
- TRACE(clipboard,"\tTEXT -> OEMTEXT\n");
+ TRACE("\tTEXT -> OEMTEXT\n");
}
else
{
@@ -495,13 +495,13 @@
size = GlobalSize(lpUpdate->hData32);
lpUpdate->hData16 = GlobalAlloc16(GMEM_ZEROINIT, size);
if( !lpUpdate->hData16 )
- ERR(clipboard, "(%04X) -- not enough memory in 16b heap\n", wFormat);
+ ERR("(%04X) -- not enough memory in 16b heap\n", wFormat);
else
{
if( lpUpdate->wFormatID == CF_METAFILEPICT )
{
- FIXME(clipboard,"\timplement function CopyMetaFilePict32to16\n");
- FIXME(clipboard,"\tin the appropriate file.\n");
+ FIXME("\timplement function CopyMetaFilePict32to16\n");
+ FIXME("\tin the appropriate file.\n");
#ifdef SOMEONE_IMPLEMENTED_ME
CopyMetaFilePict32to16( GlobalLock16(lpUpdate->hData16),
GlobalLock(lpUpdate->hData32) );
@@ -518,7 +518,7 @@
}
}
- TRACE(clipboard,"\treturning %04x (type %i)\n",
+ TRACE("\treturning %04x (type %i)\n",
lpUpdate->hData16, lpUpdate->wFormatID);
return lpUpdate->hData16;
}
@@ -534,7 +534,7 @@
if (hqClipLock != GetFastQueue16()) return 0;
- TRACE(clipboard,"(%08X)\n", wFormat);
+ TRACE("(%08X)\n", wFormat);
if( wFormat == CF_TEXT && !lpRender[CF_TEXT-1].wDataPresent
&& lpRender[CF_OEMTEXT-1].wDataPresent )
@@ -542,7 +542,7 @@
lpRender = &ClipFormats[CF_OEMTEXT-1];
lpUpdate = &ClipFormats[CF_TEXT-1];
- TRACE(clipboard,"\tOEMTEXT -> TEXT\n");
+ TRACE("\tOEMTEXT -> TEXT\n");
}
else if( wFormat == CF_OEMTEXT && !lpRender[CF_OEMTEXT-1].wDataPresent
&& lpRender[CF_TEXT-1].wDataPresent )
@@ -550,7 +550,7 @@
lpRender = &ClipFormats[CF_TEXT-1];
lpUpdate = &ClipFormats[CF_OEMTEXT-1];
- TRACE(clipboard,"\tTEXT -> OEMTEXT\n");
+ TRACE("\tTEXT -> OEMTEXT\n");
}
else
{
@@ -572,8 +572,8 @@
lpUpdate->hData32 = GlobalAlloc(GMEM_ZEROINIT, size);
if( lpUpdate->wFormatID == CF_METAFILEPICT )
{
- FIXME(clipboard,"\timplement function CopyMetaFilePict16to32\n");
- FIXME(clipboard,"\tin the appropriate file.\n");
+ FIXME("\timplement function CopyMetaFilePict16to32\n");
+ FIXME("\tin the appropriate file.\n");
#ifdef SOMEONE_IMPLEMENTED_ME
CopyMetaFilePict16to32( GlobalLock16(lpUpdate->hData32),
GlobalLock(lpUpdate->hData16) );
@@ -589,7 +589,7 @@
GlobalUnlock16(lpUpdate->hData16);
}
- TRACE(clipboard,"\treturning %04x (type %i)\n",
+ TRACE("\treturning %04x (type %i)\n",
lpUpdate->hData32, lpUpdate->wFormatID);
return lpUpdate->hData32;
}
@@ -611,7 +611,7 @@
INT FormatCount = 0;
LPWINE_CLIPFORMAT lpFormat = ClipFormats;
- TRACE(clipboard,"(void)\n");
+ TRACE("(void)\n");
while(TRUE)
{
@@ -622,7 +622,7 @@
if (lpFormat->wDataPresent)
{
- TRACE(clipboard, "\tdata found for format %i\n", lpFormat->wFormatID);
+ TRACE("\tdata found for format %i\n", lpFormat->wFormatID);
FormatCount++;
}
lpFormat = lpFormat->NextFormat;
@@ -633,7 +633,7 @@
FormatCount += abs(ClipFormats[CF_TEXT-1].wDataPresent -
ClipFormats[CF_OEMTEXT-1].wDataPresent);
- TRACE(clipboard,"\ttotal %d\n", FormatCount);
+ TRACE("\ttotal %d\n", FormatCount);
return FormatCount;
}
@@ -654,7 +654,7 @@
{
LPWINE_CLIPFORMAT lpFormat = ClipFormats;
- TRACE(clipboard,"(%04X)\n", wFormat);
+ TRACE("(%04X)\n", wFormat);
if( hqClipLock != GetFastQueue16() ) return 0;
@@ -700,7 +700,7 @@
if (FormatName == NULL) return 0;
- TRACE(clipboard,"('%s') !\n", FormatName);
+ TRACE("('%s') !\n", FormatName);
/* walk format chain to see if it's already registered */
@@ -774,12 +774,12 @@
{
LPWINE_CLIPFORMAT lpFormat = __lookup_format( ClipFormats, wFormat );
- TRACE(clipboard, "(%04X, %p, %d) !\n", wFormat, retStr, maxlen);
+ TRACE("(%04X, %p, %d) !\n", wFormat, retStr, maxlen);
if (lpFormat == NULL || lpFormat->Name == NULL ||
lpFormat->wFormatID < CF_REGFORMATBASE) return 0;
- TRACE(clipboard, "Name='%s' !\n", lpFormat->Name);
+ TRACE("Name='%s' !\n", lpFormat->Name);
lstrcpynA( retStr, lpFormat->Name, maxlen );
return strlen(retStr);
@@ -815,7 +815,7 @@
{
HWND hwndPrev = hWndViewer;
- TRACE(clipboard,"(%04x): returning %04x\n", hWnd, hwndPrev);
+ TRACE("(%04x): returning %04x\n", hWnd, hwndPrev);
hWndViewer = hWnd;
return hwndPrev;
@@ -855,13 +855,13 @@
{
BOOL bRet = 0;
- FIXME(clipboard, "(0x%04x, 0x%04x): stub?\n", hWnd, hWndNext);
+ FIXME("(0x%04x, 0x%04x): stub?\n", hWnd, hWndNext);
if( hWndViewer )
bRet = !SendMessage16( hWndViewer, WM_CHANGECBCHAIN,
(WPARAM16)hWnd, (LPARAM)hWndNext);
else
- WARN(clipboard, "hWndViewer is lost\n");
+ WARN("hWndViewer is lost\n");
if( hWnd == hWndViewer ) hWndViewer = hWndNext;
@@ -884,7 +884,7 @@
*/
BOOL WINAPI IsClipboardFormatAvailable( UINT wFormat )
{
- TRACE(clipboard,"(%04X) !\n", wFormat);
+ TRACE("(%04X) !\n", wFormat);
CLIPBOARD_Driver->pGetData( (wFormat == CF_TEXT) ? CF_OEMTEXT : wFormat );
@@ -915,7 +915,7 @@
*/
INT16 WINAPI GetPriorityClipboardFormat16( UINT16 *lpPriorityList, INT16 nCount)
{
- FIXME(clipboard, "(%p,%d): stub\n", lpPriorityList, nCount );
+ FIXME("(%p,%d): stub\n", lpPriorityList, nCount );
return 0;
}
diff --git a/windows/dce.c b/windows/dce.c
index becdd9c..101bda4 100644
--- a/windows/dce.c
+++ b/windows/dce.c
@@ -27,7 +27,7 @@
#include "region.h"
#include "heap.h"
#include "local.h"
-#include "debug.h"
+#include "debugtools.h"
#include "wine/winuser16.h"
DEFAULT_DEBUG_CHANNEL(dc)
@@ -51,10 +51,10 @@
WIN_LockWnds();
dce = firstDCE;
- DUMP("DCE:\n");
+ DPRINTF("DCE:\n");
while( dce )
{
- DUMP("\t[0x%08x] hWnd 0x%04x, dcx %08x, %s %s\n",
+ DPRINTF("\t[0x%08x] hWnd 0x%04x, dcx %08x, %s %s\n",
(unsigned)dce, dce->hwndCurrent, (unsigned)dce->DCXflags,
(dce->DCXflags & DCX_CACHE) ? "Cache" : "Owned",
(dce->DCXflags & DCX_DCEBUSY) ? "InUse" : "" );
@@ -169,7 +169,7 @@
}
else if( pDCE->DCXflags & DCX_DCEBUSY ) /* shared cache DCE */
{
- ERR(dc,"[%04x] GetDC() without ReleaseDC()!\n",
+ ERR("[%04x] GetDC() without ReleaseDC()!\n",
pWnd->hwndSelf);
DCE_ReleaseDC( pDCE );
}
@@ -201,7 +201,7 @@
dce->hClipRgn = 0;
- TRACE(dc,"\trestoring VisRgn\n");
+ TRACE("\trestoring VisRgn\n");
RestoreVisRgn16(dce->hDC);
}
@@ -257,7 +257,7 @@
{
DCE *dce;
- TRACE(dc,"scope hwnd = %04x, (%i,%i - %i,%i)\n",
+ TRACE("scope hwnd = %04x, (%i,%i - %i,%i)\n",
wndScope->hwndSelf, pRectUpdate->left,pRectUpdate->top,
pRectUpdate->right,pRectUpdate->bottom);
if(TRACE_ON(dc))
@@ -310,7 +310,7 @@
{
/* Don't bother with visible regions of unused DCEs */
- TRACE(dc,"\tpurged %08x dce [%04x]\n",
+ TRACE("\tpurged %08x dce [%04x]\n",
(unsigned)dce, wndCurrent->hwndSelf);
dce->hwndCurrent = 0;
@@ -321,7 +321,7 @@
{
/* Set dirty bits in the hDC and DCE structs */
- TRACE(dc,"\tfixed up %08x dce [%04x]\n",
+ TRACE("\tfixed up %08x dce [%04x]\n",
(unsigned)dce, wndCurrent->hwndSelf);
dce->DCXflags |= DCX_DCEDIRTY;
@@ -655,7 +655,7 @@
BOOL bUpdateVisRgn = TRUE;
BOOL bUpdateClipOrigin = FALSE;
- TRACE(dc,"hwnd %04x, hrgnClip %04x, flags %08x\n",
+ TRACE("hwnd %04x, hrgnClip %04x, flags %08x\n",
hwnd, hrgnClip, (unsigned)flags);
if (!(wndPtr = WIN_FindWndPtr( hwnd ))) return 0;
@@ -734,7 +734,7 @@
((dce->DCXflags & (DCX_CLIPSIBLINGS | DCX_CLIPCHILDREN |
DCX_CACHE | DCX_WINDOW | DCX_PARENTCLIP)) == dcxFlags))
{
- TRACE(dc,"\tfound valid %08x dce [%04x], flags %08x\n",
+ TRACE("\tfound valid %08x dce [%04x], flags %08x\n",
(unsigned)dce, hwnd, (unsigned)dcxFlags );
bUpdateVisRgn = FALSE;
bUpdateClipOrigin = TRUE;
@@ -756,7 +756,7 @@
dce = (wndPtr->class->style & CS_OWNDC) ? wndPtr->dce : wndPtr->class->dce;
if( dce->hwndCurrent == hwnd )
{
- TRACE(dc,"\tskipping hVisRgn update\n");
+ TRACE("\tskipping hVisRgn update\n");
bUpdateVisRgn = FALSE; /* updated automatically, via DCHook() */
if( (dce->DCXflags & (DCX_EXCLUDERGN | DCX_INTERSECTRGN)) &&
@@ -766,7 +766,7 @@
if( dce->hClipRgn != hrgnClip )
{
- FIXME(dc,"new hrgnClip[%04x] smashes the previous[%04x]\n",
+ FIXME("new hrgnClip[%04x] smashes the previous[%04x]\n",
hrgnClip, dce->hClipRgn );
DCE_DeleteClipRgn( dce );
}
@@ -798,7 +798,7 @@
wndPtr->pDriver->pSetDrawable( wndPtr, dc, flags, bUpdateClipOrigin );
if( bUpdateVisRgn )
{
- TRACE(dc,"updating visrgn for %08x dce, hwnd [%04x]\n", (unsigned)dce, hwnd);
+ TRACE("updating visrgn for %08x dce, hwnd [%04x]\n", (unsigned)dce, hwnd);
if (flags & DCX_PARENTCLIP)
{
@@ -839,7 +839,7 @@
SelectVisRgn16( hdc, hrgnVisible );
}
else
- TRACE(dc,"no visrgn update %08x dce, hwnd [%04x]\n", (unsigned)dce, hwnd);
+ TRACE("no visrgn update %08x dce, hwnd [%04x]\n", (unsigned)dce, hwnd);
/* apply additional region operation (if any) */
@@ -850,7 +850,7 @@
dce->DCXflags |= flags & (DCX_KEEPCLIPRGN | DCX_INTERSECTRGN | DCX_EXCLUDERGN);
dce->hClipRgn = hrgnClip;
- TRACE(dc, "\tsaved VisRgn, clipRgn = %04x\n", hrgnClip);
+ TRACE("\tsaved VisRgn, clipRgn = %04x\n", hrgnClip);
SaveVisRgn16( hdc );
CombineRgn( hrgnVisible, hrgnClip, 0, RGN_COPY );
@@ -862,7 +862,7 @@
if( hrgnVisible ) DeleteObject( hrgnVisible );
- TRACE(dc, "(%04x,%04x,0x%lx): returning %04x\n",
+ TRACE("(%04x,%04x,0x%lx): returning %04x\n",
hwnd, hrgnClip, flags, hdc);
END:
WIN_ReleaseWndPtr(wndPtr);
@@ -940,7 +940,7 @@
WIN_LockWnds();
dce = firstDCE;
- TRACE(dc, "%04x %04x\n", hwnd, hdc );
+ TRACE("%04x %04x\n", hwnd, hdc );
while (dce && (dce->hDC != hdc)) dce = dce->next;
@@ -966,7 +966,7 @@
DC *dc;
WND *wndPtr;
- TRACE(dc,"hDC = %04x, %i\n", hDC, code);
+ TRACE("hDC = %04x, %i\n", hDC, code);
if (!dce) return 0;
assert(dce->hDC == hDC);
@@ -995,7 +995,7 @@
SetHookFlags16(hDC, DCHF_VALIDATEVISRGN);
hVisRgn = DCE_GetVisRgn(dce->hwndCurrent, dce->DCXflags, 0, 0);
- TRACE(dc,"\tapplying saved clipRgn\n");
+ TRACE("\tapplying saved clipRgn\n");
/* clip this region with saved clipping region */
@@ -1017,7 +1017,7 @@
WIN_ReleaseWndPtr( wndPtr ); /* Release WIN_FindWndPtr lock */
}
else /* non-fatal but shouldn't happen */
- WARN(dc, "DC is not in use!\n");
+ WARN("DC is not in use!\n");
break;
case DCHC_DELETEDC:
@@ -1028,13 +1028,13 @@
if ( dce->DCXflags & DCX_DCEBUSY )
{
- WARN(dc, "Application trying to delete a busy DC\n");
+ WARN("Application trying to delete a busy DC\n");
retv = FALSE;
}
break;
default:
- FIXME(dc,"unknown code\n");
+ FIXME("unknown code\n");
}
WIN_UnlockWnds(); /* Release the wnd lock */
diff --git a/windows/defwnd.c b/windows/defwnd.c
index 738809d..1f1c9c7 100644
--- a/windows/defwnd.c
+++ b/windows/defwnd.c
@@ -13,7 +13,7 @@
#include "nonclient.h"
#include "winpos.h"
#include "dce.h"
-#include "debug.h"
+#include "debugtools.h"
#include "spy.h"
#include "tweak.h"
#include "cache.h"
@@ -121,7 +121,7 @@
{
BOOL bVisible = wndPtr->dwStyle & WS_VISIBLE;
- TRACE(win,"%04x %i\n", wndPtr->hwndSelf, (wParam!=0) );
+ TRACE("%04x %i\n", wndPtr->hwndSelf, (wParam!=0) );
if( wParam )
{
@@ -166,7 +166,7 @@
(uFlags & PRF_OWNED) ||
(uFlags & PRF_NONCLIENT) )
{
- WARN(win,"WM_PRINT message with unsupported flags\n");
+ WARN("WM_PRINT message with unsupported flags\n");
}
/*
@@ -224,7 +224,7 @@
TrackPopupMenu32(wndPtr->hSysMenu,TPM_LEFTALIGN | TPM_RETURNCMD,LOWORD(lParam),HIWORD(lParam),0,wndPtr->hwndSelf,NULL);
DestroyMenu32(wndPtr->hSysMenu);
*/
- FIXME(win,"Display default popup menu\n");
+ FIXME("Display default popup menu\n");
/* Track system popup if click was in the caption area. */
}
break;
@@ -257,7 +257,7 @@
GetSystemMetrics(SM_CXICON))/2;
int y = (wndPtr->rectWindow.bottom - wndPtr->rectWindow.top -
GetSystemMetrics(SM_CYICON))/2;
- TRACE(win,"Painting class icon: vis rect=(%i,%i - %i,%i)\n",
+ TRACE("Painting class icon: vis rect=(%i,%i - %i,%i)\n",
ps.rcPaint.left, ps.rcPaint.top, ps.rcPaint.right, ps.rcPaint.bottom );
DrawIcon( hdc, x, y, wndPtr->class->hIcon );
}
diff --git a/windows/dialog.c b/windows/dialog.c
index 595a7df..f2adb71 100644
--- a/windows/dialog.c
+++ b/windows/dialog.c
@@ -21,7 +21,7 @@
#include "user.h"
#include "winproc.h"
#include "message.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(dialog)
@@ -166,7 +166,7 @@
xBaseUnit = size.cx;
yBaseUnit = size.cy;
- TRACE(dialog, "base units = %d,%d\n", xBaseUnit, yBaseUnit );
+ TRACE("base units = %d,%d\n", xBaseUnit, yBaseUnit );
return TRUE;
}
@@ -228,12 +228,12 @@
p += *p + 1;
if(int_id)
- TRACE(dialog," %s %04x %d, %d, %d, %d, %d, %08lx, %08lx\n",
+ TRACE(" %s %04x %d, %d, %d, %d, %d, %08lx, %08lx\n",
info->className, LOWORD(info->windowName),
info->id, info->x, info->y, info->cx, info->cy,
info->style, (DWORD)info->data);
else
- TRACE(dialog," %s '%s' %d, %d, %d, %d, %d, %08lx, %08lx\n",
+ TRACE(" %s '%s' %d, %d, %d, %d, %d, %08lx, %08lx\n",
info->className, info->windowName,
info->id, info->x, info->y, info->cx, info->cy,
info->style, (DWORD)info->data);
@@ -297,7 +297,7 @@
else
{
info->className = NULL;
- ERR( dialog, "Unknown built-in class id %04x\n", id );
+ ERR("Unknown built-in class id %04x\n", id );
}
p += 2;
}
@@ -318,7 +318,7 @@
p += lstrlenW( (LPCWSTR)p ) + 1;
}
- TRACE(dialog," %s %s %d, %d, %d, %d, %d, %08lx, %08lx, %08lx\n",
+ TRACE(" %s %s %d, %d, %d, %d, %d, %08lx, %08lx, %08lx\n",
debugstr_w( (LPCWSTR)info->className ),
debugres_w( (LPCWSTR)info->windowName ),
info->id, info->x, info->y, info->cx, info->cy,
@@ -329,11 +329,11 @@
if (TRACE_ON(dialog))
{
WORD i, count = GET_WORD(p) / sizeof(WORD);
- TRACE(dialog, " BEGIN\n");
- TRACE(dialog, " ");
- for (i = 0; i < count; i++) DUMP( "%04x,", GET_WORD(p+i+1) );
- DUMP("\n");
- TRACE(dialog, " END\n" );
+ TRACE(" BEGIN\n");
+ TRACE(" ");
+ for (i = 0; i < count; i++) DPRINTF( "%04x,", GET_WORD(p+i+1) );
+ DPRINTF("\n");
+ TRACE(" END\n" );
}
info->data = (LPVOID)(p + 1);
p += GET_WORD(p) / sizeof(WORD);
@@ -360,7 +360,7 @@
HWND hwndCtrl, hwndDefButton = 0;
INT items = dlgTemplate->nbItems;
- TRACE(dialog, " BEGIN\n" );
+ TRACE(" BEGIN\n" );
while (items--)
{
if (!win32)
@@ -375,7 +375,7 @@
dlgInfo->hDialogHeap = GlobalAlloc16(GMEM_FIXED, 0x10000);
if (!dlgInfo->hDialogHeap)
{
- ERR(dialog, "Insufficient memory to create heap for edit control\n" );
+ ERR("Insufficient memory to create heap for edit control\n" );
continue;
}
LocalInit16(dlgInfo->hDialogHeap, 0, 0xffff);
@@ -425,7 +425,7 @@
dlgInfo->idResult = GetWindowWord( hwndCtrl, GWW_ID );
}
}
- TRACE(dialog, " END\n" );
+ TRACE(" END\n" );
return TRUE;
}
@@ -445,9 +445,9 @@
result->y = GET_WORD(p); p += sizeof(WORD);
result->cx = GET_WORD(p); p += sizeof(WORD);
result->cy = GET_WORD(p); p += sizeof(WORD);
- TRACE(dialog, "DIALOG %d, %d, %d, %d\n",
+ TRACE("DIALOG %d, %d, %d, %d\n",
result->x, result->y, result->cx, result->cy );
- TRACE(dialog, " STYLE %08lx\n", result->style );
+ TRACE(" STYLE %08lx\n", result->style );
/* Get the menu name */
@@ -460,11 +460,11 @@
case 0xff:
result->menuName = (LPCSTR)(UINT)GET_WORD( p + 1 );
p += 3;
- TRACE(dialog, " MENU %04x\n", LOWORD(result->menuName) );
+ TRACE(" MENU %04x\n", LOWORD(result->menuName) );
break;
default:
result->menuName = p;
- TRACE(dialog, " MENU '%s'\n", p );
+ TRACE(" MENU '%s'\n", p );
p += strlen(p) + 1;
break;
}
@@ -474,7 +474,7 @@
if (*p)
{
result->className = p;
- TRACE(dialog, " CLASS '%s'\n", result->className );
+ TRACE(" CLASS '%s'\n", result->className );
}
else result->className = DIALOG_CLASS_ATOM;
p += strlen(p) + 1;
@@ -483,7 +483,7 @@
result->caption = p;
p += strlen(p) + 1;
- TRACE(dialog, " CAPTION '%s'\n", result->caption );
+ TRACE(" CAPTION '%s'\n", result->caption );
/* Get the font name */
@@ -493,7 +493,7 @@
p += sizeof(WORD);
result->faceName = p;
p += strlen(p) + 1;
- TRACE(dialog, " FONT %d,'%s'\n",
+ TRACE(" FONT %d,'%s'\n",
result->pointSize, result->faceName );
}
return p;
@@ -529,11 +529,11 @@
result->y = GET_WORD(p); p++;
result->cx = GET_WORD(p); p++;
result->cy = GET_WORD(p); p++;
- TRACE( dialog, "DIALOG%s %d, %d, %d, %d, %ld\n",
+ TRACE("DIALOG%s %d, %d, %d, %d, %ld\n",
result->dialogEx ? "EX" : "", result->x, result->y,
result->cx, result->cy, result->helpId );
- TRACE( dialog, " STYLE 0x%08lx\n", result->style );
- TRACE( dialog, " EXSTYLE 0x%08lx\n", result->exStyle );
+ TRACE(" STYLE 0x%08lx\n", result->style );
+ TRACE(" EXSTYLE 0x%08lx\n", result->exStyle );
/* Get the menu name */
@@ -546,11 +546,11 @@
case 0xffff:
result->menuName = (LPCSTR)(UINT)GET_WORD( p + 1 );
p += 2;
- TRACE(dialog, " MENU %04x\n", LOWORD(result->menuName) );
+ TRACE(" MENU %04x\n", LOWORD(result->menuName) );
break;
default:
result->menuName = (LPCSTR)p;
- TRACE(dialog, " MENU %s\n", debugstr_w( (LPCWSTR)p ));
+ TRACE(" MENU %s\n", debugstr_w( (LPCWSTR)p ));
p += lstrlenW( (LPCWSTR)p ) + 1;
break;
}
@@ -566,11 +566,11 @@
case 0xffff:
result->className = (LPCSTR)(UINT)GET_WORD( p + 1 );
p += 2;
- TRACE(dialog, " CLASS %04x\n", LOWORD(result->className) );
+ TRACE(" CLASS %04x\n", LOWORD(result->className) );
break;
default:
result->className = (LPCSTR)p;
- TRACE(dialog, " CLASS %s\n", debugstr_w( (LPCWSTR)p ));
+ TRACE(" CLASS %s\n", debugstr_w( (LPCWSTR)p ));
p += lstrlenW( (LPCWSTR)p ) + 1;
break;
}
@@ -579,7 +579,7 @@
result->caption = (LPCSTR)p;
p += lstrlenW( (LPCWSTR)p ) + 1;
- TRACE(dialog, " CAPTION %s\n", debugstr_w( (LPCWSTR)result->caption ) );
+ TRACE(" CAPTION %s\n", debugstr_w( (LPCWSTR)result->caption ) );
/* Get the font name */
@@ -599,7 +599,7 @@
}
result->faceName = (LPCSTR)p;
p += lstrlenW( (LPCWSTR)p ) + 1;
- TRACE(dialog, " FONT %d, %s, %d, %s\n",
+ TRACE(" FONT %d, %s, %d, %s\n",
result->pointSize, debugstr_w( (LPCWSTR)result->faceName ),
result->weight, result->italic ? "TRUE" : "FALSE" );
}
@@ -807,7 +807,7 @@
HGLOBAL16 hmem;
LPCVOID data;
- TRACE(dialog, "%04x,%08lx,%04x,%08lx,%ld\n",
+ TRACE("%04x,%08lx,%04x,%08lx,%ld\n",
hInst, (DWORD)dlgTemplate, owner, (DWORD)dlgProc, param );
if (!(hRsrc = FindResource16( hInst, dlgTemplate, RT_DIALOG16 ))) return 0;
@@ -894,7 +894,7 @@
LPCVOID dlgTemplate,
HWND owner, DLGPROC dlgProc,
LPARAM param )
-{ FIXME(dialog,"assume WIN_PROC_32W\n");
+{ FIXME("assume WIN_PROC_32W\n");
return DIALOG_CreateIndirect( hInst, dlgTemplate, TRUE, owner,
(DLGPROC16)dlgProc, param, WIN_PROC_32W );
}
@@ -1069,7 +1069,7 @@
WND * wndPtr = WIN_FindWndPtr( hwnd );
DIALOGINFO * dlgInfo = (DIALOGINFO *)wndPtr->wExtra;
- TRACE(dialog, "%04x %d\n", hwnd, retval );
+ TRACE("%04x %d\n", hwnd, retval );
if( dlgInfo )
{
@@ -1934,7 +1934,7 @@
BOOL ret;
HWND listbox = GetDlgItem( hwnd, id );
- TRACE(dialog, "%04x '%s' %d\n", hwnd, str, id );
+ TRACE("%04x '%s' %d\n", hwnd, str, id );
if (!listbox) return FALSE;
if (win32)
{
@@ -1983,7 +1983,7 @@
if (unicode) lstrcpynAtoW( (LPWSTR)str, ptr, len );
else lstrcpynA( str, ptr, len );
SEGPTR_FREE( buffer );
- TRACE(dialog, "Returning %d '%s'\n", ret, str );
+ TRACE("Returning %d '%s'\n", ret, str );
return ret;
}
@@ -2004,7 +2004,7 @@
((attrib & DDL_POSTMSGS) ? PostMessageA( hwnd, msg, wparam, lparam ) \
: SendMessageA( hwnd, msg, wparam, lparam ))
- TRACE(dialog, "%04x '%s' %d %d %04x\n",
+ TRACE("%04x '%s' %d %d %04x\n",
hDlg, spec ? spec : "NULL", idLBox, idStatic, attrib );
if (spec && spec[0] && (spec[1] == ':'))
@@ -2036,7 +2036,7 @@
}
}
- TRACE(dialog, "path=%c:\\%s mask=%s\n",
+ TRACE("path=%c:\\%s mask=%s\n",
'A' + drive, DRIVE_GetDosCwd(drive), spec );
if (idLBox && ((hwnd = GetDlgItem( hDlg, idLBox )) != 0))
diff --git a/windows/dinput.c b/windows/dinput.c
index 86c1100..0c6c7a8 100644
--- a/windows/dinput.c
+++ b/windows/dinput.c
@@ -25,7 +25,7 @@
#include <sys/signal.h>
#include "wine/obj_base.h"
-#include "debug.h"
+#include "debugtools.h"
#include "dinput.h"
#include "display.h"
#include "keyboard.h"
@@ -124,8 +124,8 @@
};
for (i=0;i<sizeof(flags)/sizeof(flags[0]);i++)
if (flags[i].mask & dwFlags)
- DUMP("%s ",flags[i].name);
- DUMP("\n");
+ DPRINTF("%s ",flags[i].name);
+ DPRINTF("\n");
}
struct IDirectInputAImpl
@@ -140,7 +140,7 @@
HRESULT WINAPI DirectInputCreateA(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTA *ppDI, LPUNKNOWN punkOuter)
{
IDirectInputAImpl* This;
- TRACE(dinput, "(0x%08lx,%04lx,%p,%p)\n",
+ TRACE("(0x%08lx,%04lx,%p,%p)\n",
(DWORD)hinst,dwVersion,ppDI,punkOuter
);
This = (IDirectInputAImpl*)HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputAImpl));
@@ -161,7 +161,7 @@
DIDEVICEINSTANCEA devInstance;
int ret;
- TRACE(dinput, "(this=%p,0x%04lx,%p,%p,%04lx)\n", This, dwDevType, lpCallback, pvRef, dwFlags);
+ TRACE("(this=%p,0x%04lx,%p,%p,%04lx)\n", This, dwDevType, lpCallback, pvRef, dwFlags);
devInstance.dwSize = sizeof(DIDEVICEINSTANCEA);
@@ -174,7 +174,7 @@
strcpy(devInstance.tszProductName, "Wine Keyboard");
ret = lpCallback(&devInstance, pvRef);
- TRACE(dinput, "Keyboard registered\n");
+ TRACE("Keyboard registered\n");
if (ret == DIENUM_STOP)
return 0;
@@ -189,7 +189,7 @@
strcpy(devInstance.tszProductName, "Wine Mouse");
ret = lpCallback(&devInstance, pvRef);
- TRACE(dinput, "Mouse registered\n");
+ TRACE("Mouse registered\n");
}
/* Should also do joystick enumerations.... */
@@ -221,7 +221,7 @@
char xbuf[50];
WINE_StringFromCLSID(rguid,xbuf);
- FIXME(dinput,"(this=%p,%s,%p,%p): stub\n",This,xbuf,pdev,punk);
+ FIXME("(this=%p,%s,%p,%p): stub\n",This,xbuf,pdev,punk);
if ((!memcmp(&GUID_SysKeyboard,rguid,sizeof(GUID_SysKeyboard))) || /* Generic Keyboard */
(!memcmp(&DInput_Wine_Keyboard_GUID,rguid,sizeof(GUID_SysKeyboard)))) { /* Wine Keyboard */
SysKeyboardAImpl* newDevice;
@@ -253,7 +253,7 @@
char xbuf[50];
WINE_StringFromCLSID(riid,xbuf);
- TRACE(dinput,"(this=%p,%s,%p)\n",This,xbuf,ppobj);
+ TRACE("(this=%p,%s,%p)\n",This,xbuf,ppobj);
if (!memcmp(&IID_IUnknown,riid,sizeof(*riid))) {
IDirectInputA_AddRef(iface);
*ppobj = This;
@@ -279,7 +279,7 @@
char xbuf[50];
WINE_StringFromCLSID(rguid,xbuf);
- FIXME(dinput,"(%p)->(%s): stub\n",This,xbuf);
+ FIXME("(%p)->(%s): stub\n",This,xbuf);
return DI_OK;
}
@@ -288,7 +288,7 @@
HWND hwndOwner,
DWORD dwFlags) {
ICOM_THIS(IDirectInputAImpl,iface);
- FIXME(dinput,"(%p)->(%08lx,%08lx): stub\n",This, (DWORD) hwndOwner, dwFlags);
+ FIXME("(%p)->(%08lx,%08lx): stub\n",This, (DWORD) hwndOwner, dwFlags);
return DI_OK;
}
@@ -343,7 +343,7 @@
LPDIRECTINPUTDEVICE2A iface,HWND hwnd,DWORD dwflags
) {
ICOM_THIS(IDirectInputDevice2AImpl,iface);
- FIXME(dinput,"(this=%p,0x%08lx,0x%08lx): stub\n",This,(DWORD)hwnd,dwflags);
+ FIXME("(this=%p,0x%08lx,0x%08lx): stub\n",This,(DWORD)hwnd,dwflags);
if (TRACE_ON(dinput))
_dump_cooperativelevel(dwflags);
return 0;
@@ -353,7 +353,7 @@
LPDIRECTINPUTDEVICE2A iface,HANDLE hnd
) {
ICOM_THIS(IDirectInputDevice2AImpl,iface);
- FIXME(dinput,"(this=%p,0x%08lx): stub\n",This,(DWORD)hnd);
+ FIXME("(this=%p,0x%08lx): stub\n",This,(DWORD)hnd);
return 0;
}
@@ -378,19 +378,19 @@
WINE_StringFromCLSID(rguid,xbuf);
else
sprintf(xbuf,"<special guid %ld>",(DWORD)rguid);
- TRACE(dinput,"(this=%p,%s,%p)\n",This,xbuf,ph);
- TRACE(dinput,"(size=%ld,headersize=%ld,obj=%ld,how=%ld\n",
+ TRACE("(this=%p,%s,%p)\n",This,xbuf,ph);
+ TRACE("(size=%ld,headersize=%ld,obj=%ld,how=%ld\n",
ph->dwSize,ph->dwHeaderSize,ph->dwObj,ph->dwHow);
if (!HIWORD(rguid)) {
switch ((DWORD)rguid) {
case (DWORD) DIPROP_BUFFERSIZE: {
LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph;
- TRACE(dinput,"(buffersize=%ld)\n",pd->dwData);
+ TRACE("(buffersize=%ld)\n",pd->dwData);
break;
}
default:
- WARN(dinput,"Unknown type %ld\n",(DWORD)rguid);
+ WARN("Unknown type %ld\n",(DWORD)rguid);
break;
}
}
@@ -411,7 +411,7 @@
{
ICOM_THIS(SysKeyboardAImpl,iface);
- TRACE(dinput, "(this=%p,%ld,%p,%p(%ld)),0x%08lx)\n",
+ TRACE("(this=%p,%ld,%p,%p(%ld)),0x%08lx)\n",
This,dodsize,dod,entries,entries?*entries:0,flags);
return KEYBOARD_Driver->pGetDIData(
@@ -421,14 +421,14 @@
static HRESULT WINAPI SysKeyboardAImpl_Acquire(LPDIRECTINPUTDEVICE2A iface)
{
ICOM_THIS(SysKeyboardAImpl,iface);
- TRACE(dinput,"(this=%p): stub\n",This);
+ TRACE("(this=%p): stub\n",This);
return 0;
}
static HRESULT WINAPI SysKeyboardAImpl_Unacquire(LPDIRECTINPUTDEVICE2A iface)
{
ICOM_THIS(SysKeyboardAImpl,iface);
- TRACE(dinput,"(this=%p): stub\n",This);
+ TRACE("(this=%p): stub\n",This);
return 0;
}
@@ -440,7 +440,7 @@
char xbuf[50];
WINE_StringFromCLSID(riid,xbuf);
- TRACE(dinput,"(this=%p,%s,%p)\n",This,xbuf,ppobj);
+ TRACE("(this=%p,%s,%p)\n",This,xbuf,ppobj);
if (!memcmp(&IID_IUnknown,riid,sizeof(*riid))) {
IDirectInputDevice2_AddRef(iface);
*ppobj = This;
@@ -471,7 +471,7 @@
LPDIDEVCAPS lpDIDevCaps)
{
lpDIDevCaps->dwFlags = DIDC_ATTACHED;
- FIXME(dinput, "stub!\n");
+ FIXME("stub!\n");
return DI_OK;
}
@@ -481,7 +481,7 @@
LPVOID lpvRef,
DWORD dwFlags)
{
- FIXME(dinput, "stub!\n");
+ FIXME("stub!\n");
#if 0
if (lpCallback)
lpCallback(NULL, lpvRef);
@@ -494,7 +494,7 @@
REFGUID rguid,
LPDIPROPHEADER pdiph)
{
- FIXME(dinput, "stub!\n");
+ FIXME("stub!\n");
return DI_OK;
}
@@ -504,7 +504,7 @@
DWORD dwObj,
DWORD dwHow)
{
- FIXME(dinput, "stub!\n");
+ FIXME("stub!\n");
return DI_OK;
}
@@ -512,7 +512,7 @@
LPDIRECTINPUTDEVICE2A iface,
LPDIDEVICEINSTANCEA pdidi)
{
- FIXME(dinput, "stub!\n");
+ FIXME("stub!\n");
return DI_OK;
}
@@ -521,7 +521,7 @@
HWND hwndOwner,
DWORD dwFlags)
{
- FIXME(dinput, "stub!\n");
+ FIXME("stub!\n");
return DI_OK;
}
@@ -531,7 +531,7 @@
DWORD dwVersion,
REFGUID rguid)
{
- FIXME(dinput, "stub!\n");
+ FIXME("stub!\n");
return DI_OK;
}
@@ -546,7 +546,7 @@
LPDIRECTINPUTEFFECT *ppdef,
LPUNKNOWN pUnkOuter)
{
- FIXME(dinput, "stub!\n");
+ FIXME("stub!\n");
return DI_OK;
}
@@ -556,7 +556,7 @@
LPVOID lpvRef,
DWORD dwFlags)
{
- FIXME(dinput, "stub!\n");
+ FIXME("stub!\n");
if (lpCallback)
lpCallback(NULL, lpvRef);
return DI_OK;
@@ -567,7 +567,7 @@
LPDIEFFECTINFOA lpdei,
REFGUID rguid)
{
- FIXME(dinput, "stub!\n");
+ FIXME("stub!\n");
return DI_OK;
}
@@ -575,7 +575,7 @@
LPDIRECTINPUTDEVICE2A iface,
LPDWORD pdwOut)
{
- FIXME(dinput, "stub!\n");
+ FIXME("stub!\n");
return DI_OK;
}
@@ -583,7 +583,7 @@
LPDIRECTINPUTDEVICE2A iface,
DWORD dwFlags)
{
- FIXME(dinput, "stub!\n");
+ FIXME("stub!\n");
return DI_OK;
}
@@ -593,7 +593,7 @@
LPVOID lpvRef,
DWORD dwFlags)
{
- FIXME(dinput, "stub!\n");
+ FIXME("stub!\n");
if (lpCallback)
lpCallback(NULL, lpvRef);
return DI_OK;
@@ -603,14 +603,14 @@
LPDIRECTINPUTDEVICE2A iface,
LPDIEFFESCAPE lpDIEEsc)
{
- FIXME(dinput, "stub!\n");
+ FIXME("stub!\n");
return DI_OK;
}
static HRESULT WINAPI IDirectInputDevice2AImpl_Poll(
LPDIRECTINPUTDEVICE2A iface)
{
- FIXME(dinput, "stub!\n");
+ FIXME("stub!\n");
return DI_OK;
}
@@ -621,7 +621,7 @@
LPDWORD pdwInOut,
DWORD dwFlags)
{
- FIXME(dinput, "stub!\n");
+ FIXME("stub!\n");
return DI_OK;
}
@@ -664,7 +664,7 @@
{
ICOM_THIS(SysMouseAImpl,iface);
- TRACE(dinput,"(this=%p,0x%08lx,0x%08lx): stub\n",This,(DWORD)hwnd,dwflags);
+ TRACE("(this=%p,0x%08lx,0x%08lx): stub\n",This,(DWORD)hwnd,dwflags);
if (TRACE_ON(dinput))
_dump_cooperativelevel(dwflags);
@@ -690,13 +690,13 @@
ICOM_THIS(SysMouseAImpl,iface);
int i;
- TRACE(dinput,"(this=%p,%p)\n",This,df);
+ TRACE("(this=%p,%p)\n",This,df);
- TRACE(dinput,"(df.dwSize=%ld)\n",df->dwSize);
- TRACE(dinput,"(df.dwObjsize=%ld)\n",df->dwObjSize);
- TRACE(dinput,"(df.dwFlags=0x%08lx)\n",df->dwFlags);
- TRACE(dinput,"(df.dwDataSize=%ld)\n",df->dwDataSize);
- TRACE(dinput,"(df.dwNumObjs=%ld)\n",df->dwNumObjs);
+ TRACE("(df.dwSize=%ld)\n",df->dwSize);
+ TRACE("(df.dwObjsize=%ld)\n",df->dwObjSize);
+ TRACE("(df.dwFlags=0x%08lx)\n",df->dwFlags);
+ TRACE("(df.dwDataSize=%ld)\n",df->dwDataSize);
+ TRACE("(df.dwNumObjs=%ld)\n",df->dwNumObjs);
for (i=0;i<df->dwNumObjs;i++) {
char xbuf[50];
@@ -705,16 +705,16 @@
WINE_StringFromCLSID(df->rgodf[i].pguid,xbuf);
else
strcpy(xbuf,"<no guid>");
- TRACE(dinput,"df.rgodf[%d].guid %s (%p)\n",i,xbuf, df->rgodf[i].pguid);
- TRACE(dinput,"df.rgodf[%d].dwOfs %ld\n",i,df->rgodf[i].dwOfs);
- TRACE(dinput,"dwType 0x%02x,dwInstance %d\n",DIDFT_GETTYPE(df->rgodf[i].dwType),DIDFT_GETINSTANCE(df->rgodf[i].dwType));
- TRACE(dinput,"df.rgodf[%d].dwFlags 0x%08lx\n",i,df->rgodf[i].dwFlags);
+ TRACE("df.rgodf[%d].guid %s (%p)\n",i,xbuf, df->rgodf[i].pguid);
+ TRACE("df.rgodf[%d].dwOfs %ld\n",i,df->rgodf[i].dwOfs);
+ TRACE("dwType 0x%02x,dwInstance %d\n",DIDFT_GETTYPE(df->rgodf[i].dwType),DIDFT_GETINSTANCE(df->rgodf[i].dwType));
+ TRACE("df.rgodf[%d].dwFlags 0x%08lx\n",i,df->rgodf[i].dwFlags);
}
/* Check size of data format to prevent crashes if the applications
sends a smaller buffer */
if (df->dwDataSize != sizeof(struct DIMOUSESTATE)) {
- FIXME(dinput, "non-standard mouse configuration not supported yet.");
+ FIXME("non-standard mouse configuration not supported yet.");
return DIERR_INVALIDPARAM;
}
@@ -759,11 +759,11 @@
posX = (dx * GetSystemMetrics(SM_CXSCREEN)) >> 16;
posY = (dy * GetSystemMetrics(SM_CYSCREEN)) >> 16;
} else {
- ERR(dinput, "Mouse event not supported...\n");
+ ERR("Mouse event not supported...\n");
return ;
}
- TRACE(dinput, " %ld %ld ", posX, posY);
+ TRACE(" %ld %ld ", posX, posY);
if ( dwFlags & MOUSEEVENTF_MOVE ) {
if (This->absolute) {
@@ -795,42 +795,42 @@
}
if ( dwFlags & MOUSEEVENTF_LEFTDOWN ) {
if (TRACE_ON(dinput))
- DUMP(" LD ");
+ DPRINTF(" LD ");
GEN_EVENT(DIMOFS_BUTTON0, 0xFF, time, 0);
}
if ( dwFlags & MOUSEEVENTF_LEFTUP ) {
if (TRACE_ON(dinput))
- DUMP(" LU ");
+ DPRINTF(" LU ");
GEN_EVENT(DIMOFS_BUTTON0, 0x00, time, 0);
}
if ( dwFlags & MOUSEEVENTF_RIGHTDOWN ) {
if (TRACE_ON(dinput))
- DUMP(" RD ");
+ DPRINTF(" RD ");
GEN_EVENT(DIMOFS_BUTTON1, 0xFF, time, 0);
}
if ( dwFlags & MOUSEEVENTF_RIGHTUP ) {
if (TRACE_ON(dinput))
- DUMP(" RU ");
+ DPRINTF(" RU ");
GEN_EVENT(DIMOFS_BUTTON1, 0x00, time, 0);
}
if ( dwFlags & MOUSEEVENTF_MIDDLEDOWN ) {
if (TRACE_ON(dinput))
- DUMP(" MD ");
+ DPRINTF(" MD ");
GEN_EVENT(DIMOFS_BUTTON2, 0xFF, time, 0);
}
if ( dwFlags & MOUSEEVENTF_MIDDLEUP ) {
if (TRACE_ON(dinput))
- DUMP(" MU ");
+ DPRINTF(" MU ");
GEN_EVENT(DIMOFS_BUTTON2, 0x00, time, 0);
}
if (TRACE_ON(dinput))
- DUMP("\n");
+ DPRINTF("\n");
This->prevX = posX;
This->prevY = posY;
@@ -845,7 +845,7 @@
ICOM_THIS(SysMouseAImpl,iface);
RECT rect;
- TRACE(dinput,"(this=%p)\n",This);
+ TRACE("(this=%p)\n",This);
if (This->acquired == 0) {
POINT point;
@@ -865,7 +865,7 @@
This->win_centerY = (rect.bottom - rect.top ) / 2;
/* Warp the mouse to the center of the window */
- TRACE(dinput, "Warping mouse to %ld - %ld\n", This->win_centerX, This->win_centerY);
+ TRACE("Warping mouse to %ld - %ld\n", This->win_centerX, This->win_centerY);
point.x = This->win_centerX;
point.y = This->win_centerY;
MapWindowPoints(This->win, HWND_DESKTOP, &point, 1);
@@ -883,7 +883,7 @@
{
ICOM_THIS(SysMouseAImpl,iface);
- TRACE(dinput,"(this=%p)\n",This);
+ TRACE("(this=%p)\n",This);
/* Reinstall previous mouse event handler */
MOUSE_Enable(This->prev_handler);
@@ -911,17 +911,17 @@
DWORD rx, ry, state;
struct DIMOUSESTATE *mstate = (struct DIMOUSESTATE *) ptr;
- TRACE(dinput,"(this=%p,0x%08lx,%p): \n",This,len,ptr);
+ TRACE("(this=%p,0x%08lx,%p): \n",This,len,ptr);
/* Check if the buffer is big enough */
if (len < sizeof(struct DIMOUSESTATE)) {
- FIXME(dinput, "unsupported state structure.");
+ FIXME("unsupported state structure.");
return DIERR_INVALIDPARAM;
}
/* Get the mouse position */
EVENT_QueryPointer(&rx, &ry, &state);
- TRACE(dinput,"(X:%ld - Y:%ld)\n", rx, ry);
+ TRACE("(X:%ld - Y:%ld)\n", rx, ry);
/* Fill the mouse state structure */
if (This->absolute) {
@@ -944,7 +944,7 @@
if (This->need_warp) {
POINT point;
- TRACE(dinput, "Warping mouse to %ld - %ld\n", This->win_centerX, This->win_centerY);
+ TRACE("Warping mouse to %ld - %ld\n", This->win_centerX, This->win_centerY);
point.x = This->win_centerX;
point.y = This->win_centerY;
MapWindowPoints(This->win, HWND_DESKTOP, &point, 1);
@@ -953,7 +953,7 @@
This->need_warp = 0;
}
- TRACE(dinput, "(X: %ld - Y: %ld L: %02x M: %02x R: %02x)\n",
+ TRACE("(X: %ld - Y: %ld L: %02x M: %02x R: %02x)\n",
mstate->lX, mstate->lY,
mstate->rgbButtons[0], mstate->rgbButtons[2], mstate->rgbButtons[1]);
@@ -971,11 +971,11 @@
) {
ICOM_THIS(SysMouseAImpl,iface);
- TRACE(dinput,"(%p)->(%ld,%p,%p(0x%08lx),0x%08lx)\n",
+ TRACE("(%p)->(%ld,%p,%p(0x%08lx),0x%08lx)\n",
This,dodsize,dod,entries,*entries,flags);
if (flags & DIGDD_PEEK)
- TRACE(dinput, "DIGDD_PEEK\n");
+ TRACE("DIGDD_PEEK\n");
if (dod == NULL) {
*entries = This->queue_pos;
@@ -983,15 +983,15 @@
} else {
/* Check for buffer overflow */
if (This->queue_pos > *entries) {
- WARN(dinput, "Buffer overflow not handled properly yet...\n");
+ WARN("Buffer overflow not handled properly yet...\n");
This->queue_pos = *entries;
}
if (dodsize != sizeof(DIDEVICEOBJECTDATA)) {
- ERR(dinput, "Wrong structure size !\n");
+ ERR("Wrong structure size !\n");
return DIERR_INVALIDPARAM;
}
- TRACE(dinput, "Application retrieving %d event(s).\n", This->queue_pos);
+ TRACE("Application retrieving %d event(s).\n", This->queue_pos);
/* Copy the buffered data into the application queue */
memcpy(dod, This->data_queue, This->queue_pos * dodsize);
@@ -1004,7 +1004,7 @@
if (This->need_warp) {
POINT point;
- TRACE(dinput, "Warping mouse to %ld - %ld\n", This->win_centerX, This->win_centerY);
+ TRACE("Warping mouse to %ld - %ld\n", This->win_centerX, This->win_centerY);
point.x = This->win_centerX;
point.y = This->win_centerY;
MapWindowPoints(This->win, HWND_DESKTOP, &point, 1);
@@ -1031,14 +1031,14 @@
else
sprintf(xbuf,"<special guid %ld>",(DWORD)rguid);
- TRACE(dinput,"(this=%p,%s,%p)\n",This,xbuf,ph);
+ TRACE("(this=%p,%s,%p)\n",This,xbuf,ph);
if (!HIWORD(rguid)) {
switch ((DWORD)rguid) {
case (DWORD) DIPROP_BUFFERSIZE: {
LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph;
- TRACE(dinput,"buffersize = %ld\n",pd->dwData);
+ TRACE("buffersize = %ld\n",pd->dwData);
This->data_queue = (LPDIDEVICEOBJECTDATA)HeapAlloc(GetProcessHeap(),0,
pd->dwData * sizeof(DIDEVICEOBJECTDATA));
@@ -1047,7 +1047,7 @@
break;
}
default:
- WARN(dinput,"Unknown type %ld\n",(DWORD)rguid);
+ WARN("Unknown type %ld\n",(DWORD)rguid);
break;
}
}
diff --git a/windows/display.c b/windows/display.c
index a864032..7677299 100644
--- a/windows/display.c
+++ b/windows/display.c
@@ -5,7 +5,7 @@
*
*/
-#include "debug.h"
+#include "debugtools.h"
#include "display.h"
#include "mouse.h"
#include "windef.h"
@@ -46,7 +46,7 @@
*/
VOID WINAPI DISPLAY_CheckCursor( void )
{
- TRACE( cursor, "stub\n" );
+ TRACE("stub\n" );
}
/***********************************************************************
diff --git a/windows/focus.c b/windows/focus.c
index 3020c40..d2d6c63 100644
--- a/windows/focus.c
+++ b/windows/focus.c
@@ -13,7 +13,7 @@
#include "hook.h"
#include "message.h"
#include "task.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(win)
@@ -78,7 +78,7 @@
/* Get the messageQ for the current thread */
if (!(pCurMsgQ = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue16() )))
{
- WARN( win, "\tCurrent message queue not found. Exiting!\n" );
+ WARN("\tCurrent message queue not found. Exiting!\n" );
goto CLEANUP;
}
@@ -99,7 +99,7 @@
pMsgQ = (MESSAGEQUEUE *)QUEUE_Lock( wndPtr->hmemTaskQ );
if ( !pMsgQ )
{
- WARN( win, "\tMessage queue not found. Exiting!\n" );
+ WARN("\tMessage queue not found. Exiting!\n" );
goto CLEANUP;
}
@@ -187,7 +187,7 @@
/* Get the messageQ for the current thread */
if (!(pCurMsgQ = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue16() )))
{
- WARN( win, "\tCurrent message queue not found. Exiting!\n" );
+ WARN("\tCurrent message queue not found. Exiting!\n" );
return 0;
}
diff --git a/windows/hook.c b/windows/hook.c
index 6b40ea2..e9812de 100644
--- a/windows/hook.c
+++ b/windows/hook.c
@@ -25,7 +25,7 @@
#include "heap.h"
#include "struct32.h"
#include "winproc.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(hook)
@@ -227,7 +227,7 @@
case WH_HARDWARE:
case WH_FOREGROUNDIDLE:
case WH_CALLWNDPROCRET:
- FIXME(hook, "\t[%i] 16to32 translation unimplemented\n", id);
+ FIXME("\t[%i] 16to32 translation unimplemented\n", id);
}
}
@@ -331,7 +331,7 @@
case WH_HARDWARE:
case WH_FOREGROUNDIDLE:
case WH_CALLWNDPROCRET:
- FIXME(hook, "\t[%i] skipping unmap\n", id);
+ FIXME("\t[%i] skipping unmap\n", id);
break;
}
}
@@ -495,7 +495,7 @@
case WH_HARDWARE:
case WH_FOREGROUNDIDLE:
case WH_CALLWNDPROCRET:
- FIXME(hook,"\t[%i] 32to16 translation unimplemented\n", id);
+ FIXME("\t[%i] 32to16 translation unimplemented\n", id);
}
}
@@ -645,7 +645,7 @@
case WH_HARDWARE:
case WH_FOREGROUNDIDLE:
case WH_CALLWNDPROCRET:
- FIXME(hook, "\t[%i] skipping unmap\n", id);
+ FIXME("\t[%i] skipping unmap\n", id);
}
}
@@ -859,7 +859,7 @@
if ((id < WH_MINHOOK) || (id > WH_MAXHOOK)) return 0;
- TRACE(hook, "Setting hook %d: %08x %04x %08lx\n",
+ TRACE("Setting hook %d: %08x %04x %08lx\n",
id, (UINT)proc, hModule, dwThreadId );
/* Create task queue if none present */
@@ -899,7 +899,7 @@
data->next = HOOK_systemHooks[id - WH_MINHOOK];
HOOK_systemHooks[id - WH_MINHOOK] = handle;
}
- TRACE(hook, "Setting hook %d: ret=%04x [next=%04x]\n",
+ TRACE("Setting hook %d: ret=%04x [next=%04x]\n",
id, handle, data->next );
return (HHOOK)( handle? MAKELONG( handle, HOOK_MAGIC ) : 0 );
@@ -916,13 +916,13 @@
HOOKDATA *data;
HANDLE16 *prevHook;
- TRACE(hook, "Removing hook %04x\n", hook );
+ TRACE("Removing hook %04x\n", hook );
if (!(data = (HOOKDATA *)USER_HEAP_LIN_ADDR(hook))) return FALSE;
if (data->flags & HOOK_INUSE)
{
/* Mark it for deletion later on */
- WARN(hook, "Hook still running, deletion delayed\n" );
+ WARN("Hook still running, deletion delayed\n" );
data->proc = (HOOKPROC)0;
return TRUE;
}
@@ -998,7 +998,7 @@
queue->hCurHook = hook;
data->flags |= HOOK_INUSE;
- TRACE(hook, "Calling hook %04x: %d %08x %08lx\n",
+ TRACE("Calling hook %04x: %d %08x %08lx\n",
hook, code, wParam, lParam );
/* Suspend window structure locks before calling user code */
@@ -1017,7 +1017,7 @@
WIN_RestoreWndsLock(iWndsLocks);
- TRACE(hook, "Ret hook %04x = %08lx\n", hook, ret );
+ TRACE("Ret hook %04x = %08lx\n", hook, ret );
data->flags &= ~HOOK_INUSE;
queue->hCurHook = prevHook;
@@ -1238,7 +1238,7 @@
{
if (id == WH_DEBUG)
{
- FIXME(hook, "WH_DEBUG is broken in 16-bit Windows.\n");
+ FIXME("WH_DEBUG is broken in 16-bit Windows.\n");
return 0;
}
return HOOK_SetHook( id, proc, HOOK_WIN16, GetExePtr(hInst), (DWORD)hTask );
@@ -1278,7 +1278,7 @@
{
HANDLE16 hook = HOOK_GetHook( id, GetFastQueue16() );
- TRACE(hook, "%d %08lx\n", id, (DWORD)proc );
+ TRACE("%d %08lx\n", id, (DWORD)proc );
while (hook)
{
@@ -1346,7 +1346,7 @@
fromtype = oldhook->flags & HOOK_MAPTYPE;
if (fromtype == HOOK_WIN16)
- ERR(hook, "called from 16bit hook!\n");
+ ERR("called from 16bit hook!\n");
return HOOK_CallHook( next, fromtype, code, wParam, lParam );
}
diff --git a/windows/mdi.c b/windows/mdi.c
index d3fae2d..5c76f0e 100644
--- a/windows/mdi.c
+++ b/windows/mdi.c
@@ -26,7 +26,7 @@
#include "scroll.h"
#include "struct32.h"
#include "tweak.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(mdi)
@@ -123,7 +123,7 @@
WND *tmpWnd = WIN_FindWndPtr(MDI_GetChildByID(clientWnd,index));
if( !tmpWnd )
{
- TRACE(mdi,"no window for id=%i\n",index);
+ TRACE("no window for id=%i\n",index);
WIN_ReleaseWndPtr(tmpWnd);
continue;
}
@@ -212,7 +212,7 @@
HWND hwndFrame = GetParent(hwnd);
HMENU oldFrameMenu = GetMenu(hwndFrame);
- TRACE(mdi, "%04x %04x %04x\n",
+ TRACE("%04x %04x %04x\n",
hwnd, hmenuFrame, hmenuWindow);
ci = (MDICLIENTINFO *) w->wExtra;
@@ -277,10 +277,10 @@
HWND hwndFrame = GetParent(hwnd);
HMENU oldFrameMenu = GetMenu(hwndFrame);
- TRACE(mdi, "%04x %04x %04x\n",
+ TRACE("%04x %04x %04x\n",
hwnd, hmenuFrame, hmenuWindow);
- FIXME(mdi,"partially function stub\n");
+ FIXME("partially function stub\n");
return oldFrameMenu;
}
@@ -301,7 +301,7 @@
WORD wIDmenu = ci->idFirstChild + ci->nActiveChildren;
char lpstrDef[]="junk!";
- TRACE(mdi, "origin %i,%i - dim %i,%i, style %08x\n",
+ TRACE("origin %i,%i - dim %i,%i, style %08x\n",
cs->x, cs->y, cs->cx, cs->cy, (unsigned)cs->style);
/* calculate placement */
MDI_CalcDefaultChildPos(w, ci->nTotalCreated++, pos, 0);
@@ -406,7 +406,7 @@
}
WIN_ReleaseWndPtr(wnd);
- TRACE(mdi, "created child - %04x\n",hwnd);
+ TRACE("created child - %04x\n",hwnd);
}
else
{
@@ -443,7 +443,7 @@
WIN_ReleaseWndPtr(childWnd);
- TRACE(mdi,"max rect (%i,%i - %i, %i)\n",
+ TRACE("max rect (%i,%i - %i, %i)\n",
rect.left,rect.top,rect.right,rect.bottom);
}
@@ -466,7 +466,7 @@
ci = (MDICLIENTINFO *) w->wExtra;
- TRACE(mdi, "from %04x, to %04x\n",childHwnd,hwndTo);
+ TRACE("from %04x, to %04x\n",childHwnd,hwndTo);
if ( !hwndTo ) goto END; /* no window to switch to */
@@ -529,7 +529,7 @@
ci->nActiveChildren--;
- TRACE(mdi,"child destroyed - %04x\n",child);
+ TRACE("child destroyed - %04x\n",child);
if (flagDestroy)
{
@@ -571,7 +571,7 @@
}
}
- TRACE(mdi,"%04x\n", hWndChild);
+ TRACE("%04x\n", hWndChild);
if( GetActiveWindow() == clientPtr->parent->hwndSelf )
isActiveFrameWnd = TRUE;
@@ -705,7 +705,7 @@
while (ppWnd != heapPtr)
{
ppWnd--;
- TRACE(mdi, "move %04x to (%ld,%ld) size [%ld,%ld]\n",
+ TRACE("move %04x to (%ld,%ld) size [%ld,%ld]\n",
(*ppWnd)->hwndSelf, pos[0].x, pos[0].y, pos[1].x, pos[1].y);
MDI_CalcDefaultChildPos(clientWnd, n++, pos, delta);
@@ -739,7 +739,7 @@
ppWnd = WIN_BuildWinArray(wndClient, BWA_SKIPHIDDEN | BWA_SKIPOWNED | BWA_SKIPICONIC |
((wParam & MDITILE_SKIPDISABLED)? BWA_SKIPDISABLED : 0), &total );
- TRACE(mdi,"%u windows to tile\n", total);
+ TRACE("%u windows to tile\n", total);
if( ppWnd )
{
@@ -809,7 +809,7 @@
HMENU hSysPopup = 0;
HBITMAP hSysMenuBitmap = 0;
- TRACE(mdi,"frame %p,child %04x\n",frame,hChild);
+ TRACE("frame %p,child %04x\n",frame,hChild);
if( !frame->wIDmenu || !child->hSysMenu )
{
@@ -823,7 +823,7 @@
if (!(hSysPopup = LoadMenuA(GetModuleHandleA("USER32"), "SYSMENU")))
return 0;
- TRACE(mdi,"\tgot popup %04x in sysmenu %04x\n",
+ TRACE("\tgot popup %04x in sysmenu %04x\n",
hSysPopup, child->hSysMenu);
AppendMenuA(frame->wIDmenu,MF_HELP | MF_BITMAP,
@@ -870,7 +870,7 @@
if( !InsertMenuA(frame->wIDmenu,0,MF_BYPOSITION | MF_BITMAP | MF_POPUP,
hSysPopup, (LPSTR)(DWORD)hSysMenuBitmap))
{
- TRACE(mdi,"not inserted\n");
+ TRACE("not inserted\n");
DestroyMenu(hSysPopup);
return 0;
}
@@ -901,7 +901,7 @@
INT nItems = GetMenuItemCount(frameWnd->wIDmenu) - 1;
UINT iId = GetMenuItemID(frameWnd->wIDmenu,nItems) ;
- TRACE(mdi,"frameWnd %p,child %04x\n",frameWnd,hChild);
+ TRACE("frameWnd %p,child %04x\n",frameWnd,hChild);
if(!(iId == SC_RESTORE || iId == SC_CLOSE) )
return 0;
@@ -939,7 +939,7 @@
WND* clientWnd = WIN_FindWndPtr(hClient);
MDICLIENTINFO *ci = (MDICLIENTINFO *) clientWnd->wExtra;
- TRACE(mdi, "repaint %i, frameText %s\n", repaint, (lpTitle)?lpTitle:"NULL");
+ TRACE("repaint %i, frameText %s\n", repaint, (lpTitle)?lpTitle:"NULL");
if (!clientWnd)
return;
@@ -1075,7 +1075,7 @@
NC_HandleNCCalcSize( w, &rect );
w->rectClient = rect;
- TRACE(mdi,"Client created - hwnd = %04x, idFirst = %u\n",
+ TRACE("Client created - hwnd = %04x, idFirst = %u\n",
hwnd, ci->idFirstChild );
retvalue = 0;
@@ -1185,7 +1185,7 @@
POINT16 pt = MAKEPOINT16(lParam);
HWND16 child = ChildWindowFromPoint16(hwnd, pt);
- TRACE(mdi,"notification from %04x (%i,%i)\n",child,pt.x,pt.y);
+ TRACE("notification from %04x (%i,%i)\n",child,pt.x,pt.y);
if( child && child != hwnd && child != ci->hwndActiveChild )
SetWindowPos(child, 0,0,0,0,0, SWP_NOSIZE | SWP_NOMOVE );
@@ -1251,7 +1251,7 @@
wndPtr = WIN_FindWndPtr(hwndMDIClient);
if (!wndPtr) {
- ERR(mdi,"null wndPtr for mdi window hwndMDIClient=%04x\n",
+ ERR("null wndPtr for mdi window hwndMDIClient=%04x\n",
hwndMDIClient);
return 0;
}
@@ -1468,7 +1468,7 @@
goto END;
case WM_NCPAINT:
- TRACE(mdi,"WM_NCPAINT for %04x, active %04x\n",
+ TRACE("WM_NCPAINT for %04x, active %04x\n",
hwnd, ci->hwndActiveChild );
break;
@@ -1549,7 +1549,7 @@
SendMessage16( hMaxChild, WM_SETREDRAW, TRUE, 0L );
}
- TRACE(mdi,"maximizing child %04x\n", hwnd );
+ TRACE("maximizing child %04x\n", hwnd );
ci->hwndChildMaximized = hwnd; /* !!! */
ci->hwndActiveChild = hwnd;
@@ -1757,7 +1757,7 @@
HINSTANCE hInstance, /* [in] Handle to application instance */
LPARAM lParam) /* [in] Application-defined value */
{
- WARN(mdi,"is only single threaded!\n");
+ WARN("is only single threaded!\n");
return MDI_CreateMDIWindowA(lpClassName, lpWindowName, dwStyle, X, Y,
nWidth, nHeight, hWndParent, hInstance, lParam);
}
@@ -1784,12 +1784,12 @@
WND *pWnd=WIN_FindWndPtr(hWndParent);
HWND retvalue;
- TRACE(mdi, "(%s,%s,%ld,%d,%d,%d,%d,%x,%d,%ld)\n",
+ TRACE("(%s,%s,%ld,%d,%d,%d,%d,%x,%d,%ld)\n",
debugstr_a(lpClassName),debugstr_a(lpWindowName),dwStyle,X,Y,
nWidth,nHeight,hWndParent,hInstance,lParam);
if(!pWnd){
- ERR(mdi," bad hwnd for MDI-client: %d\n",hWndParent);
+ ERR(" bad hwnd for MDI-client: %d\n",hWndParent);
return 0;
}
cs.szClass=lpClassName;
@@ -1828,7 +1828,7 @@
HINSTANCE hInstance, /* [in] Handle to application instance */
LPARAM lParam) /* [in] Application-defined value */
{
- FIXME(mdi, "(%s,%s,%ld,%d,%d,%d,%d,%x,%d,%ld): stub\n",
+ FIXME("(%s,%s,%ld,%d,%d,%d,%d,%x,%d,%ld): stub\n",
debugstr_w(lpClassName),debugstr_w(lpWindowName),dwStyle,X,Y,
nWidth,nHeight,hWndParent,hInstance,lParam);
return (HWND)NULL;
@@ -1852,7 +1852,7 @@
HINSTANCE hInstance, /* [in] Handle to application instance */
LPARAM lParam) /* [in] Application-defined value */
{
- FIXME(mdi, "(%s,%s,%ld,%d,%d,%d,%d,%x,%d,%ld): stub\n",
+ FIXME("(%s,%s,%ld,%d,%d,%d,%d,%x,%d,%ld): stub\n",
debugstr_w(lpClassName),debugstr_w(lpWindowName),dwStyle,X,Y,
nWidth,nHeight,hWndParent,hInstance,lParam);
return (HWND)NULL;
@@ -1912,7 +1912,7 @@
default:
return 0;
}
- TRACE(mdi,"wParam = %04x\n", wParam);
+ TRACE("wParam = %04x\n", wParam);
SendMessage16( ci->hwndActiveChild, WM_SYSCOMMAND,
wParam, (LPARAM)msg->wParam);
return 1;
@@ -2078,7 +2078,7 @@
CascadeWindows (HWND hwndParent, UINT wFlags, const LPRECT lpRect,
UINT cKids, const HWND *lpKids)
{
- FIXME (mdi, "(0x%08x,0x%08x,...,%u,...): stub\n",
+ FIXME("(0x%08x,0x%08x,...,%u,...): stub\n",
hwndParent, wFlags, cKids);
return 0;
@@ -2096,7 +2096,7 @@
TileWindows (HWND hwndParent, UINT wFlags, const LPRECT lpRect,
UINT cKids, const HWND *lpKids)
{
- FIXME (mdi, "(0x%08x,0x%08x,...,%u,...): stub\n",
+ FIXME("(0x%08x,0x%08x,...,%u,...): stub\n",
hwndParent, wFlags, cKids);
return 0;
diff --git a/windows/mouse.c b/windows/mouse.c
index 04b7d28..9355e56 100644
--- a/windows/mouse.c
+++ b/windows/mouse.c
@@ -5,7 +5,7 @@
*
*/
-#include "debug.h"
+#include "debugtools.h"
#include "mouse.h"
#include "monitor.h"
#include "winuser.h"
@@ -67,7 +67,7 @@
if ( !DefMouseEventProc ) return;
- TRACE( event, "(%04lX,%ld,%ld)\n", mouseStatus, posX, posY );
+ TRACE("(%04lX,%ld,%ld)\n", mouseStatus, posX, posY );
mouseStatus |= MOUSEEVENTF_ABSOLUTE;
posX = (((long)posX << 16) + width-1) / width;
diff --git a/windows/msgbox.c b/windows/msgbox.c
index ec5ff2b..23eb678 100644
--- a/windows/msgbox.c
+++ b/windows/msgbox.c
@@ -11,7 +11,7 @@
#include "dlgs.h"
#include "heap.h"
#include "ldt.h"
-#include "debug.h"
+#include "debugtools.h"
#include "debugstr.h"
#include "tweak.h"
@@ -190,7 +190,7 @@
default:
/* Ok. Ignore all the other messages */
- TRACE (dialog, "Message number %i is being ignored.\n", message);
+ TRACE("Message number %i is being ignored.\n", message);
break;
}
return 0;
@@ -202,7 +202,7 @@
*/
INT16 WINAPI MessageBox16( HWND16 hwnd, LPCSTR text, LPCSTR title, UINT16 type)
{
- WARN(dialog,"Messagebox\n");
+ WARN("Messagebox\n");
return MessageBoxA( hwnd, text, title, type );
}
@@ -220,7 +220,7 @@
HRSRC hRes;
MSGBOXPARAMSA mbox;
- WARN(dialog,"Messagebox\n");
+ WARN("Messagebox\n");
if(!(hRes = FindResourceA(GetModuleHandleA("USER32"), "MSGBOX", RT_DIALOGA)))
return 0;
@@ -248,7 +248,7 @@
LPSTR textA = HEAP_strdupWtoA( GetProcessHeap(), 0, text );
INT ret;
- WARN(dialog,"Messagebox\n");
+ WARN("Messagebox\n");
ret = MessageBoxA( hwnd, textA, titleA, type );
HeapFree( GetProcessHeap(), 0, titleA );
@@ -263,7 +263,7 @@
INT WINAPI MessageBoxExA( HWND hWnd, LPCSTR text, LPCSTR title,
UINT type, WORD langid )
{
- WARN(dialog,"Messagebox\n");
+ WARN("Messagebox\n");
/* ignore language id for now */
return MessageBoxA(hWnd,text,title,type);
}
@@ -274,7 +274,7 @@
INT WINAPI MessageBoxExW( HWND hWnd, LPCWSTR text, LPCWSTR title,
UINT type, WORD langid )
{
- WARN(dialog,"Messagebox\n");
+ WARN("Messagebox\n");
/* ignore language id for now */
return MessageBoxW(hWnd,text,title,type);
}
@@ -288,7 +288,7 @@
HRSRC hRes;
MSGBOXPARAMSA msgbox32;
- WARN(dialog,"Messagebox\n");
+ WARN("Messagebox\n");
if(!(hRes = FindResourceA(GetModuleHandleA("USER32"), "MSGBOX", RT_DIALOGA)))
return 0;
@@ -319,7 +319,7 @@
LPVOID template;
HRSRC hRes;
- WARN(dialog,"Messagebox\n");
+ WARN("Messagebox\n");
if(!(hRes = FindResourceA(GetModuleHandleA("USER32"), "MSGBOX", RT_DIALOGA)))
return 0;
@@ -337,7 +337,7 @@
INT WINAPI MessageBoxIndirectW( LPMSGBOXPARAMSW msgbox )
{
MSGBOXPARAMSA msgboxa;
- WARN(dialog,"Messagebox\n");
+ WARN("Messagebox\n");
memcpy(&msgboxa,msgbox,sizeof(msgboxa));
if (msgbox->lpszCaption)
@@ -354,7 +354,7 @@
*/
void WINAPI FatalAppExit16( UINT16 action, LPCSTR str )
{
- WARN(dialog,"AppExit\n");
+ WARN("AppExit\n");
FatalAppExitA( action, str );
}
@@ -364,7 +364,7 @@
*/
void WINAPI FatalAppExitA( UINT action, LPCSTR str )
{
- WARN(dialog,"AppExit\n");
+ WARN("AppExit\n");
MessageBoxA( 0, str, NULL, MB_SYSTEMMODAL | MB_OK );
ExitProcess(0);
}
@@ -375,7 +375,7 @@
*/
void WINAPI FatalAppExitW( UINT action, LPCWSTR str )
{
- WARN(dialog,"AppExit\n");
+ WARN("AppExit\n");
MessageBoxW( 0, str, NULL, MB_SYSTEMMODAL | MB_OK );
ExitProcess(0);
}
diff --git a/windows/property.c b/windows/property.c
index bcb6591..6303793 100644
--- a/windows/property.c
+++ b/windows/property.c
@@ -9,7 +9,7 @@
#include "wine/winuser16.h"
#include "win.h"
#include "heap.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(prop)
@@ -80,10 +80,10 @@
PROPERTY *prop = PROP_FindProp( hwnd, str );
if (HIWORD(str))
- TRACE(prop, "(%08x,'%s'): returning %08x\n",
+ TRACE("(%08x,'%s'): returning %08x\n",
hwnd, str, prop ? prop->handle : 0 );
else
- TRACE(prop, "(%08x,#%04x): returning %08x\n",
+ TRACE("(%08x,#%04x): returning %08x\n",
hwnd, LOWORD(str), prop ? prop->handle : 0 );
return prop ? prop->handle : 0;
@@ -123,9 +123,9 @@
PROPERTY *prop;
if (HIWORD(str))
- TRACE(prop, "%04x '%s' %08x\n", hwnd, str, handle );
+ TRACE("%04x '%s' %08x\n", hwnd, str, handle );
else
- TRACE(prop, "%04x #%04x %08x\n",
+ TRACE("%04x #%04x %08x\n",
hwnd, LOWORD(str), handle );
if (!(prop = PROP_FindProp( hwnd, str )))
@@ -191,9 +191,9 @@
WND *pWnd = WIN_FindWndPtr( hwnd );
if (HIWORD(str))
- TRACE(prop, "%04x '%s'\n", hwnd, str );
+ TRACE("%04x '%s'\n", hwnd, str );
else
- TRACE(prop, "%04x #%04x\n", hwnd, LOWORD(str));
+ TRACE("%04x #%04x\n", hwnd, LOWORD(str));
if (!pWnd) return (HANDLE)0;
@@ -277,7 +277,7 @@
WND *pWnd;
INT16 ret = -1;
- TRACE(prop, "%04x %08x\n", hwnd, (UINT)func );
+ TRACE("%04x %08x\n", hwnd, (UINT)func );
if (!(pWnd = WIN_FindWndPtr( hwnd ))) return -1;
for (prop = pWnd->pProp; (prop); prop = next)
{
@@ -285,7 +285,7 @@
/* function removes the current property. */
next = prop->next;
- TRACE(prop, " Callback: handle=%08x str='%s'\n",
+ TRACE(" Callback: handle=%08x str='%s'\n",
prop->handle, prop->string );
ret = func( hwnd, SEGPTR_GET(prop->string), prop->handle );
if (!ret) break;
@@ -322,7 +322,7 @@
WND *pWnd;
INT ret = -1;
- TRACE(prop, "%04x %08x %08lx\n",
+ TRACE("%04x %08x %08lx\n",
hwnd, (UINT)func, lParam );
if (!(pWnd = WIN_FindWndPtr( hwnd ))) return -1;
for (prop = pWnd->pProp; (prop); prop = next)
@@ -331,7 +331,7 @@
/* function removes the current property. */
next = prop->next;
- TRACE(prop, " Callback: handle=%08x str='%s'\n",
+ TRACE(" Callback: handle=%08x str='%s'\n",
prop->handle, prop->string );
ret = func( hwnd, prop->string, prop->handle, lParam );
if (!ret) break;
@@ -350,7 +350,7 @@
WND *pWnd;
INT ret = -1;
- TRACE(prop, "%04x %08x %08lx\n",
+ TRACE("%04x %08x %08lx\n",
hwnd, (UINT)func, lParam );
if (!(pWnd = WIN_FindWndPtr( hwnd ))) return -1;
for (prop = pWnd->pProp; (prop); prop = next)
@@ -359,7 +359,7 @@
/* function removes the current property. */
next = prop->next;
- TRACE(prop, " Callback: handle=%08x str='%s'\n",
+ TRACE(" Callback: handle=%08x str='%s'\n",
prop->handle, prop->string );
if (HIWORD(prop->string))
{
diff --git a/windows/scroll.c b/windows/scroll.c
index 0bf8adf..86868bb 100644
--- a/windows/scroll.c
+++ b/windows/scroll.c
@@ -16,7 +16,7 @@
#include "gdi.h"
#include "dce.h"
#include "region.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(scroll)
@@ -81,7 +81,7 @@
POINT src, dest;
DC *dc = (DC *)GDI_GetObjPtr(hdc, DC_MAGIC);
- TRACE(scroll,"%04x %d,%d hrgnUpdate=%04x rcUpdate = %p cliprc = (%d,%d-%d,%d), rc=(%d,%d-%d,%d)\n",
+ TRACE("%04x %d,%d hrgnUpdate=%04x rcUpdate = %p cliprc = (%d,%d-%d,%d), rc=(%d,%d-%d,%d)\n",
(HDC16)hdc, dx, dy, hrgnUpdate, rcUpdate,
prLClip ? prLClip->left : 0, prLClip ? prLClip->top : 0, prLClip ? prLClip->right : 0, prLClip ? prLClip->bottom : 0,
rc ? rc->left : 0, rc ? rc->top : 0, rc ? rc->right : 0, rc ? rc->bottom : 0 );
@@ -259,7 +259,7 @@
HRGN hrgnTemp = CreateRectRgnIndirect(&rc);
RECT caretrc;
-TRACE(scroll,"%04x, %d,%d hrgnUpdate=%04x rcUpdate = %p \
+TRACE("%04x, %d,%d hrgnUpdate=%04x rcUpdate = %p \
cliprc = (%d,%d-%d,%d), rc=(%d,%d-%d,%d) %04x\n",
(HWND16)hwnd, dx, dy, hrgnUpdate, rcUpdate,
clipRect?clipRect->left:0, clipRect?clipRect->top:0, clipRect?clipRect->right:0, clipRect?clipRect->bottom:0,
diff --git a/windows/syscolor.c b/windows/syscolor.c
index 210d8bd..329719f 100644
--- a/windows/syscolor.c
+++ b/windows/syscolor.c
@@ -15,7 +15,7 @@
#include "sysmetrics.h"
#include "winbase.h"
#include "winuser.h"
-#include "debug.h"
+#include "debugtools.h"
#include "tweak.h"
#include "winreg.h"
#include "winversion.h"
@@ -251,7 +251,7 @@
{
if (0 <= index && index < NUM_SYS_COLORS)
return SysColorBrushes[index];
- WARN(syscolor, "Unknown index(%d)\n", index );
+ WARN("Unknown index(%d)\n", index );
return GetStockObject(LTGRAY_BRUSH);
}
diff --git a/windows/timer.c b/windows/timer.c
index 4250b0b..cc71922 100644
--- a/windows/timer.c
+++ b/windows/timer.c
@@ -11,7 +11,7 @@
#include "winproc.h"
#include "services.h"
#include "message.h"
-#include "debug.h"
+#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(timer)
@@ -136,7 +136,7 @@
if ( !pTimer->expired )
{
- TRACE(timer, "Timer expired: %04x, %04x, %04x, %08lx\n",
+ TRACE("Timer expired: %04x, %04x, %04x, %08lx\n",
pTimer->hwnd, pTimer->msg, pTimer->id, (DWORD)pTimer->proc);
pTimer->expired = TRUE;
@@ -177,7 +177,7 @@
return FALSE; /* No timer */
}
- TRACE(timer, "Timer got message: %04x, %04x, %04x, %08lx\n",
+ TRACE("Timer got message: %04x, %04x, %04x, %08lx\n",
pTimer->hwnd, pTimer->msg, pTimer->id, (DWORD)pTimer->proc);
if (remove)
@@ -251,7 +251,7 @@
pTimer->hService = SERVICE_AddTimer( timeout * 1000L,
TIMER_CheckTimer, (ULONG_PTR)pTimer );
- TRACE(timer, "Timer added: %p, %04x, %04x, %04x, %08lx\n",
+ TRACE("Timer added: %p, %04x, %04x, %04x, %08lx\n",
pTimer, pTimer->hwnd, pTimer->msg, pTimer->id,
(DWORD)pTimer->proc );
@@ -303,7 +303,7 @@
UINT16 WINAPI SetTimer16( HWND16 hwnd, UINT16 id, UINT16 timeout,
TIMERPROC16 proc )
{
- TRACE(timer, "%04x %d %d %08lx\n",
+ TRACE("%04x %d %d %08lx\n",
hwnd, id, timeout, (LONG)proc );
return TIMER_SetTimer( hwnd, id, timeout, (WNDPROC16)proc,
WIN_PROC_16, FALSE );
@@ -316,7 +316,7 @@
UINT WINAPI SetTimer( HWND hwnd, UINT id, UINT timeout,
TIMERPROC proc )
{
- TRACE(timer, "%04x %d %d %08lx\n",
+ TRACE("%04x %d %d %08lx\n",
hwnd, id, timeout, (LONG)proc );
return TIMER_SetTimer( hwnd, id, timeout, (WNDPROC16)proc,
WIN_PROC_32A, FALSE );
@@ -329,7 +329,7 @@
UINT16 WINAPI SetSystemTimer16( HWND16 hwnd, UINT16 id, UINT16 timeout,
TIMERPROC16 proc )
{
- TRACE(timer, "%04x %d %d %08lx\n",
+ TRACE("%04x %d %d %08lx\n",
hwnd, id, timeout, (LONG)proc );
return TIMER_SetTimer( hwnd, id, timeout, (WNDPROC16)proc,
WIN_PROC_16, TRUE );
@@ -342,7 +342,7 @@
UINT WINAPI SetSystemTimer( HWND hwnd, UINT id, UINT timeout,
TIMERPROC proc )
{
- TRACE(timer, "%04x %d %d %08lx\n",
+ TRACE("%04x %d %d %08lx\n",
hwnd, id, timeout, (LONG)proc );
return TIMER_SetTimer( hwnd, id, timeout, (WNDPROC16)proc,
WIN_PROC_32A, TRUE );
@@ -354,7 +354,7 @@
*/
BOOL16 WINAPI KillTimer16( HWND16 hwnd, UINT16 id )
{
- TRACE(timer, "%04x %d\n", hwnd, id );
+ TRACE("%04x %d\n", hwnd, id );
return TIMER_KillTimer( hwnd, id, FALSE );
}
@@ -364,7 +364,7 @@
*/
BOOL WINAPI KillTimer( HWND hwnd, UINT id )
{
- TRACE(timer, "%04x %d\n", hwnd, id );
+ TRACE("%04x %d\n", hwnd, id );
return TIMER_KillTimer( hwnd, id, FALSE );
}
@@ -374,7 +374,7 @@
*/
BOOL16 WINAPI KillSystemTimer16( HWND16 hwnd, UINT16 id )
{
- TRACE(timer, "%04x %d\n", hwnd, id );
+ TRACE("%04x %d\n", hwnd, id );
return TIMER_KillTimer( hwnd, id, TRUE );
}
@@ -384,6 +384,6 @@
*/
BOOL WINAPI KillSystemTimer( HWND hwnd, UINT id )
{
- TRACE(timer, "%04x %d\n", hwnd, id );
+ TRACE("%04x %d\n", hwnd, id );
return TIMER_KillTimer( hwnd, id, TRUE );
}
diff --git a/windows/winhelp.c b/windows/winhelp.c
index 62d6ea6..517169a 100644
--- a/windows/winhelp.c
+++ b/windows/winhelp.c
@@ -6,7 +6,7 @@
#include <stdio.h>
#include <string.h>
#include <unistd.h>
-#include "debug.h"
+#include "debugtools.h"
#include "wine/winuser16.h"
#include "wine/winbase16.h"
#include "heap.h"
@@ -86,7 +86,7 @@
dsize = ((LPHELPWININFO)dwData)->wStructSize;
break;
default:
- WARN( win,"Unknown help command %d\n",wCommand);
+ WARN("Unknown help command %d\n",wCommand);
return FALSE;
}
if(lpHelpFile)
diff --git a/windows/winpos.c b/windows/winpos.c
index 9794e8e..fc22cae 100644
--- a/windows/winpos.c
+++ b/windows/winpos.c
@@ -20,7 +20,7 @@
#include "winpos.h"
#include "dce.h"
#include "nonclient.h"
-#include "debug.h"
+#include "debugtools.h"
#include "local.h"
#include "ldt.h"
@@ -91,7 +91,7 @@
pMsgQ = (MESSAGEQUEUE *)QUEUE_Lock( wndPtr->hmemTaskQ );
if ( !pMsgQ )
{
- WARN( win, "\tMessage queue not found. Exiting!\n" );
+ WARN("\tMessage queue not found. Exiting!\n" );
return;
}
@@ -100,7 +100,7 @@
if( hwnd == PERQDATA_GetActiveWnd( pMsgQ->pQData ) )
{
PERQDATA_SetActiveWnd( pMsgQ->pQData, 0 );
- WARN(win, "\tattempt to activate destroyed window!\n");
+ WARN("\tattempt to activate destroyed window!\n");
}
if( lpPos )
@@ -274,13 +274,13 @@
WND * wndPtr = WIN_FindWndPtr( hwnd );
if (!wndPtr) return (ERROR);
- FIXME (win, "GetWindowRgn: doesn't really do regions\n");
+ FIXME("GetWindowRgn: doesn't really do regions\n");
memset (&rect, 0, sizeof(rect));
GetWindowRect ( hwnd, &rect );
- FIXME (win, "Check whether a valid region here\n");
+ FIXME("Check whether a valid region here\n");
SetRectRgn ( hrgn, rect.left, rect.top, rect.right, rect.bottom );
@@ -295,7 +295,7 @@
{
- FIXME (win, "SetWindowRgn: stub\n");
+ FIXME("SetWindowRgn: stub\n");
return TRUE;
}
@@ -306,7 +306,7 @@
{
- FIXME (win, "SetWindowRgn16: stub\n");
+ FIXME("SetWindowRgn16: stub\n");
return TRUE;
}
@@ -656,7 +656,7 @@
{
if (!(wndPtr = WIN_FindWndPtr( hwndFrom )))
{
- ERR(win,"bad hwndFrom = %04x\n",hwndFrom);
+ ERR("bad hwndFrom = %04x\n",hwndFrom);
return;
}
while (wndPtr->parent)
@@ -673,7 +673,7 @@
{
if (!(wndPtr = WIN_FindWndPtr( hwndTo )))
{
- ERR(win,"bad hwndTo = %04x\n", hwndTo );
+ ERR("bad hwndTo = %04x\n", hwndTo );
return;
}
while (wndPtr->parent)
@@ -789,7 +789,7 @@
/* Get the messageQ for the current thread */
if (!(pCurMsgQ = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue16() )))
{
- WARN( win, "\tCurrent message queue not found. Exiting!\n" );
+ WARN("\tCurrent message queue not found. Exiting!\n" );
return 0;
}
@@ -839,7 +839,7 @@
/* Get the messageQ for the current thread */
if (!(pCurMsgQ = (MESSAGEQUEUE *)QUEUE_Lock( GetFastQueue16() )))
{
- WARN( win, "\tCurrent message queue not found. Exiting!\n" );
+ WARN("\tCurrent message queue not found. Exiting!\n" );
goto CLEANUP;
}
@@ -847,7 +847,7 @@
pMsgQ = (MESSAGEQUEUE *)QUEUE_Lock( wndPtr->hmemTaskQ );
if ( !pMsgQ )
{
- WARN( win, "\tWindow message queue not found. Exiting!\n" );
+ WARN("\tWindow message queue not found. Exiting!\n" );
goto CLEANUP;
}
@@ -935,7 +935,7 @@
* SetShellWindow (USER32.504)
*/
HWND WINAPI SetShellWindow(HWND hwndshell)
-{ WARN(win, "(hWnd=%08x) semi stub\n",hwndshell );
+{ WARN("(hWnd=%08x) semi stub\n",hwndshell );
hGlobalShellWindow = hwndshell;
return hGlobalShellWindow;
@@ -946,7 +946,7 @@
* GetShellWindow (USER32.287)
*/
HWND WINAPI GetShellWindow(void)
-{ WARN(win, "(hWnd=%x) semi stub\n",hGlobalShellWindow );
+{ WARN("(hWnd=%x) semi stub\n",hGlobalShellWindow );
return hGlobalShellWindow;
}
@@ -988,7 +988,7 @@
{
int flags = SWP_NOZORDER | SWP_NOACTIVATE;
if (!repaint) flags |= SWP_NOREDRAW;
- TRACE(win, "%04x %d,%d %dx%d %d\n",
+ TRACE("%04x %d,%d %dx%d %d\n",
hwnd, x, y, cx, cy, repaint );
return SetWindowPos( hwnd, 0, x, y, cx, cy, flags );
}
@@ -1054,7 +1054,7 @@
{
HWND16 hWnd = lpPos->hwndIconTitle;
- TRACE(win,"0x%04x %i\n", pWnd->hwndSelf, (bShow != 0) );
+ TRACE("0x%04x %i\n", pWnd->hwndSelf, (bShow != 0) );
if( !hWnd )
lpPos->hwndIconTitle = hWnd = ICONTITLE_Create( pWnd );
@@ -1133,7 +1133,7 @@
/* Some sanity checks */
- TRACE(win,"%ld %ld / %ld %ld / %ld %ld / %ld %ld\n",
+ TRACE("%ld %ld / %ld %ld / %ld %ld / %ld %ld\n",
MinMax.ptMaxSize.x, MinMax.ptMaxSize.y,
MinMax.ptMaxPosition.x, MinMax.ptMaxPosition.y,
MinMax.ptMaxTrackSize.x, MinMax.ptMaxTrackSize.y,
@@ -1162,7 +1162,7 @@
POINT pt, size;
LPINTERNALPOS lpPos;
- TRACE(win,"0x%04x %u\n", wndPtr->hwndSelf, cmd );
+ TRACE("0x%04x %u\n", wndPtr->hwndSelf, cmd );
size.x = wndPtr->rectWindow.left; size.y = wndPtr->rectWindow.top;
lpPos = WINPOS_InitInternalPos( wndPtr, size, &wndPtr->rectWindow );
@@ -1289,7 +1289,7 @@
if (!wndPtr) return FALSE;
- TRACE(win,"hwnd=%04x, cmd=%d\n", hwnd, cmd);
+ TRACE("hwnd=%04x, cmd=%d\n", hwnd, cmd);
wasVisible = (wndPtr->dwStyle & WS_VISIBLE) != 0;
@@ -1653,7 +1653,7 @@
HWND hwndActive = 0;
BOOL bRet = 0;
- TRACE( win, "(%04x, %d, %d)\n", hWnd, fMouse, fChangeFocus );
+ TRACE("(%04x, %d, %d)\n", hWnd, fMouse, fChangeFocus );
/* Get current active window from the active queue */
if ( hActiveQueue )
@@ -1679,7 +1679,7 @@
WIN_ReleaseWndPtr(wndTemp);
}
else
- TRACE(win,"no current active window.\n");
+ TRACE("no current active window.\n");
/* call CBT hook chain */
if ((cbtStruct = SEGPTR_NEW(CBTACTIVATESTRUCT16)))
@@ -2011,7 +2011,7 @@
}
result = SendMessageA( hwnd, WM_NCCALCSIZE, calcValidRect,
(LPARAM)¶ms );
- TRACE(win, "%d,%d-%d,%d\n",
+ TRACE("%d,%d-%d,%d\n",
params.rgrc[0].left, params.rgrc[0].top,
params.rgrc[0].right, params.rgrc[0].bottom );
*newClientRect = params.rgrc[0];
@@ -2075,7 +2075,7 @@
{
WND* w = WIN_LockWndPtr(pDesktop->child);
- WARN(win, "(%04x) hInsertAfter = %04x\n", wndPtr->hwndSelf, hwndInsertAfter );
+ WARN("(%04x) hInsertAfter = %04x\n", wndPtr->hwndSelf, hwndInsertAfter );
if( (wndPtr->dwStyle & WS_POPUP) && wndPtr->owner )
{
@@ -2138,12 +2138,12 @@
HRGN newVisRgn, dirtyRgn;
INT my = COMPLEXREGION;
- TRACE(win,"\tnew wnd=(%i %i-%i %i) old wnd=(%i %i-%i %i), %04x\n",
+ TRACE("\tnew wnd=(%i %i-%i %i) old wnd=(%i %i-%i %i), %04x\n",
Wnd->rectWindow.left, Wnd->rectWindow.top,
Wnd->rectWindow.right, Wnd->rectWindow.bottom,
lpOldWndRect->left, lpOldWndRect->top,
lpOldWndRect->right, lpOldWndRect->bottom, *pVisRgn);
- TRACE(win,"\tnew client=(%i %i-%i %i) old client=(%i %i-%i %i)\n",
+ TRACE("\tnew client=(%i %i-%i %i) old client=(%i %i-%i %i)\n",
Wnd->rectClient.left, Wnd->rectClient.top,
Wnd->rectClient.right, Wnd->rectClient.bottom,
lpOldClientRect->left, lpOldClientRect->top,
@@ -2162,7 +2162,7 @@
{
nocopy:
- TRACE(win,"\twon't copy anything!\n");
+ TRACE("\twon't copy anything!\n");
/* set dirtyRgn to the sum of old and new visible regions
* in parent client coordinates */
@@ -2237,7 +2237,7 @@
else
OffsetRect( &r, -lpOldWndRect->left, -lpOldWndRect->top );
- TRACE(win,"\tcomputing dirty region!\n");
+ TRACE("\tcomputing dirty region!\n");
/* Compute combined dirty region (old + new - valid) */
CombineRgn( *pVisRgn, *pVisRgn, newVisRgn, RGN_OR);
@@ -2471,7 +2471,7 @@
}
}
- TRACE(win,"hwnd %04x, swp (%i,%i)-(%i,%i) flags %08x\n",
+ TRACE("hwnd %04x, swp (%i,%i)-(%i,%i) flags %08x\n",
hwnd, x, y, x+cx, y+cy, flags);
bChangePos = !(flags & SWP_WINE_NOHOSTMOVE);
@@ -2485,7 +2485,7 @@
if (hwnd == GetDesktopWindow()) return FALSE;
if (!(wndPtr = WIN_FindWndPtr( hwnd ))) return FALSE;
- TRACE(win,"\tcurrent (%i,%i)-(%i,%i), style %08x\n", wndPtr->rectWindow.left, wndPtr->rectWindow.top,
+ TRACE("\tcurrent (%i,%i)-(%i,%i), style %08x\n", wndPtr->rectWindow.left, wndPtr->rectWindow.top,
wndPtr->rectWindow.right, wndPtr->rectWindow.bottom, (unsigned)wndPtr->dwStyle );
/* Fix redundant flags */
@@ -2870,7 +2870,7 @@
/* And last, send the WM_WINDOWPOSCHANGED message */
- TRACE(win,"\tstatus flags = %04x\n", winpos.flags & SWP_AGG_STATUSFLAGS);
+ TRACE("\tstatus flags = %04x\n", winpos.flags & SWP_AGG_STATUSFLAGS);
if ( resync ||
(((winpos.flags & SWP_AGG_STATUSFLAGS) != SWP_AGG_NOPOSCHANGE) &&
@@ -3060,7 +3060,7 @@
*/
void WINAPI TileChildWindows16( HWND16 parent, WORD action )
{
- FIXME(win, "(%04x, %d): stub\n", parent, action);
+ FIXME("(%04x, %d): stub\n", parent, action);
}
/***********************************************************************
@@ -3068,7 +3068,7 @@
*/
void WINAPI CascadeChildWindows16( HWND16 parent, WORD action )
{
- FIXME(win, "(%04x, %d): stub\n", parent, action);
+ FIXME("(%04x, %d): stub\n", parent, action);
}
/***********************************************************************
@@ -3101,7 +3101,7 @@
*/
HRESULT WINAPI SetShellWindowEx ( HWND hwndProgman, HWND hwndListView )
{
- FIXME(win,"0x%08x 0x%08x stub\n",hwndProgman ,hwndListView );
+ FIXME("0x%08x 0x%08x stub\n",hwndProgman ,hwndListView );
hGlobalShellWindow = hwndProgman;
return hGlobalShellWindow;
diff --git a/windows/x11drv/clipboard.c b/windows/x11drv/clipboard.c
index cb07e66..5ed4d24 100644
--- a/windows/x11drv/clipboard.c
+++ b/windows/x11drv/clipboard.c
@@ -14,7 +14,7 @@
#include "wine/winuser16.h"
#include "clipboard.h"
-#include "debug.h"
+#include "debugtools.h"
#include "message.h"
#include "win.h"
#include "windef.h"
@@ -38,7 +38,7 @@
*/
static void X11DRV_CLIPBOARD_CheckSelection(WND* pWnd)
{
- TRACE(clipboard,"\tchecking %08x\n",
+ TRACE("\tchecking %08x\n",
(unsigned) X11DRV_WND_GetXWindow(pWnd)
);
@@ -54,7 +54,7 @@
if( pWnd->parent->child != pWnd )
selectionWindow = X11DRV_WND_GetXWindow(pWnd->parent->child);
- TRACE(clipboard,"\tswitching selection from %08x to %08x\n",
+ TRACE("\tswitching selection from %08x to %08x\n",
(unsigned)selectionPrevWindow, (unsigned)selectionWindow);
if( selectionWindow != None )
@@ -74,7 +74,7 @@
HANDLE hText = 0;
LPWINE_CLIPFORMAT lpFormat = ClipFormats;
- TRACE(clipboard,"Reading X selection...\n");
+ TRACE("Reading X selection...\n");
if(prop != None)
{
@@ -83,16 +83,16 @@
unsigned long nitems,remain;
unsigned char* val=NULL;
- TRACE(clipboard,"\tgot property %s\n",TSXGetAtomName(display,prop));
+ TRACE("\tgot property %s\n",TSXGetAtomName(display,prop));
/* TODO: Properties longer than 64K */
if(TSXGetWindowProperty(display,w,prop,0,0x3FFF,True,XA_STRING,
&atype, &aformat, &nitems, &remain, &val) != Success)
- WARN(clipboard, "\tcouldn't read property\n");
+ WARN("\tcouldn't read property\n");
else
{
- TRACE(clipboard,"\tType %s,Format %d,nitems %ld,value %s\n",
+ TRACE("\tType %s,Format %d,nitems %ld,value %s\n",
TSXGetAtomName(display,atype),aformat,nitems,val);
if(atype == XA_STRING && aformat == 8)
@@ -100,7 +100,7 @@
int i,inlcount = 0;
char* lpstr;
- TRACE(clipboard,"\tselection is '%s'\n",val);
+ TRACE("\tselection is '%s'\n",val);
for(i=0; i <= nitems; i++)
if( val[i] == '\n' ) inlcount++;
@@ -150,7 +150,7 @@
* selectionPrevWindow is nonzero if CheckSelection() was called.
*/
- TRACE(clipboard,"\tevent->window = %08x (sw = %08x, spw=%08x)\n",
+ TRACE("\tevent->window = %08x (sw = %08x, spw=%08x)\n",
(unsigned)w, (unsigned)selectionWindow, (unsigned)selectionPrevWindow );
if( selectionAcquired )
@@ -188,7 +188,7 @@
selectionPrevWindow = selectionWindow;
selectionWindow = None;
- TRACE(clipboard, "\tgiving up selection (spw = %08x)\n",
+ TRACE("\tgiving up selection (spw = %08x)\n",
(unsigned)selectionPrevWindow);
EnterCriticalSection(&X11DRV_CritSection);
@@ -222,7 +222,7 @@
selectionAcquired = True;
selectionWindow = owner;
- TRACE(clipboard,"Grabbed X selection, owner=(%08x)\n",
+ TRACE("Grabbed X selection, owner=(%08x)\n",
(unsigned) owner);
}
WIN_ReleaseWndPtr(tmpWnd);
@@ -248,7 +248,7 @@
XEvent xe;
Window w = X11DRV_WND_FindXWindow(wnd);
- TRACE(clipboard, "Requesting XA_STRING selection...\n");
+ TRACE("Requesting XA_STRING selection...\n");
EnterCriticalSection( &X11DRV_CritSection );
XConvertSelection(display, XA_PRIMARY, XA_STRING,
@@ -275,7 +275,7 @@
bRet = (BOOL)ClipFormats[CF_OEMTEXT-1].wDataPresent;
- TRACE(clipboard,"\tpresent CF_OEMTEXT = %i\n", bRet );
+ TRACE("\tpresent CF_OEMTEXT = %i\n", bRet );
WIN_ReleaseWndPtr(wnd);
}
return bRet;
@@ -296,7 +296,7 @@
if(!bFooBar && !X11DRV_WND_GetXWindow(pWnd))
return;
- TRACE(clipboard,"clipboard owner = %04x, selection = %08x\n",
+ TRACE("clipboard owner = %04x, selection = %08x\n",
hWndClipOwner, (unsigned)selectionWindow);
if( pWnd->hwndSelf == hWndClipOwner)
@@ -309,7 +309,7 @@
{
if( lpFormat->wDataPresent && !lpFormat->hData16 && !lpFormat->hData32 )
{
- TRACE(clipboard,"\tdata missing for clipboard format %i\n",
+ TRACE("\tdata missing for clipboard format %i\n",
lpFormat->wFormatID);
lpFormat->wDataPresent = 0;
}
diff --git a/windows/x11drv/desktop.c b/windows/x11drv/desktop.c
index 6e8e2dd..49bd6c2 100644
--- a/windows/x11drv/desktop.c
+++ b/windows/x11drv/desktop.c
@@ -9,7 +9,7 @@
#ifndef X_DISPLAY_MISSING
-#include "debug.h"
+#include "debugtools.h"
#include "desktop.h"
#include "monitor.h"
#include "options.h"
diff --git a/windows/x11drv/main.c b/windows/x11drv/main.c
index 4ccff2c..6e58928 100644
--- a/windows/x11drv/main.c
+++ b/windows/x11drv/main.c
@@ -21,7 +21,7 @@
#include "clipboard.h"
#include "console.h"
-#include "debug.h"
+#include "debugtools.h"
#include "desktop.h"
#include "keyboard.h"
#include "main.h"
@@ -203,7 +203,7 @@
if (!(display = TSXOpenDisplay( display_name )))
{
- MSG( "%s: Can't open display: %s\n",
+ MESSAGE( "%s: Can't open display: %s\n",
argv[0], display_name ? display_name : "(none specified)" );
exit(1);
}
@@ -259,7 +259,7 @@
if (X11DRV_USER_GetResource( db, ".debugmsg", &value))
{
#ifndef DEBUG_RUNTIME
- MSG("%s: Option \"-debugmsg\" not implemented.\n" \
+ MESSAGE("%s: Option \"-debugmsg\" not implemented.\n" \
" Recompile with DEBUG_RUNTIME in include/debugtools.h defined.\n",
argv[0]);
exit(1);
@@ -275,7 +275,7 @@
/* don't overwrite previous value. Should we
* automatically add the ',' between multiple DLLs ?
*/
- MSG("Only one -dll flag is allowed. Use ',' between multiple DLLs\n");
+ MESSAGE("Only one -dll flag is allowed. Use ',' between multiple DLLs\n");
}
else Options.dllFlags = xstrdup((char *)value.addr);
}
@@ -313,7 +313,7 @@
if (Options.desktopGeometry && Options.managed)
{
#if 0
- MSG( "%s: -managed and -desktop options cannot be used together\n",
+ MESSAGE( "%s: -managed and -desktop options cannot be used together\n",
Options.programName );
exit(1);
#else
diff --git a/windows/x11drv/monitor.c b/windows/x11drv/monitor.c
index debec81..a143d57 100644
--- a/windows/x11drv/monitor.c
+++ b/windows/x11drv/monitor.c
@@ -14,7 +14,7 @@
#include "ts_xlib.h"
#include "ts_xutil.h"
-#include "debug.h"
+#include "debugtools.h"
#include "heap.h"
#include "monitor.h"
#include "options.h"
@@ -101,7 +101,7 @@
class_hints = TSXAllocClassHint();
if (!size_hints || !wm_hints || !class_hints)
{
- MSG("Not enough memory for window manager hints.\n" );
+ MESSAGE("Not enough memory for window manager hints.\n" );
exit(1);
}
size_hints->min_width = size_hints->max_width = width;
@@ -158,7 +158,7 @@
TSXFree( depth_list );
if (i >= depth_count)
{
- MSG( "%s: Depth %d not supported on this screen.\n",
+ MESSAGE( "%s: Depth %d not supported on this screen.\n",
Options.programName, pX11Monitor->depth );
exit(1);
}
diff --git a/windows/x11drv/mouse.c b/windows/x11drv/mouse.c
index 51953eb..4464b3b 100644
--- a/windows/x11drv/mouse.c
+++ b/windows/x11drv/mouse.c
@@ -11,7 +11,7 @@
#include "ts_xlib.h"
#include "callback.h"
-#include "debug.h"
+#include "debugtools.h"
#include "mouse.h"
#include "win.h"
#include "windef.h"
@@ -53,7 +53,7 @@
if (ptr->bPlanes * ptr->bBitsPerPixel != 1)
{
- WARN(cursor, "Cursor has more than 1 bpp!\n" );
+ WARN("Cursor has more than 1 bpp!\n" );
return FALSE;
}
@@ -220,7 +220,7 @@
if ( winX == wAbsX && winY == wAbsY )
return;
- TRACE( cursor, "(%d,%d): moving from (%d,%d)\n", wAbsX, wAbsY, winX, winY );
+ TRACE("(%d,%d): moving from (%d,%d)\n", wAbsX, wAbsY, winX, winY );
TSXWarpPointer( display, X11DRV_GetXRootWindow(), X11DRV_GetXRootWindow(),
0, 0, 0, 0, wAbsX, wAbsY );
diff --git a/windows/x11drv/wnd.c b/windows/x11drv/wnd.c
index 382d73a..5076b7e 100644
--- a/windows/x11drv/wnd.c
+++ b/windows/x11drv/wnd.c
@@ -18,7 +18,7 @@
#include <string.h>
#include "bitmap.h"
#include "color.h"
-#include "debug.h"
+#include "debugtools.h"
#include "display.h"
#include "dce.h"
#include "options.h"
@@ -132,12 +132,12 @@
(X11DRV_WND_DATA *) wndPtr->pDriverData;
if (!wndPtr->pDriverData) {
- ERR(win,"Trying to destroy window again. Not good.\n");
+ ERR("Trying to destroy window again. Not good.\n");
return;
}
if(pWndDriverData->window)
{
- ERR(win,
+ ERR(
"WND destroyed without destroying "
"the associated X Window (%ld)\n",
pWndDriverData->window
