Make use of the DEFAULT_DEBUG_CHANNEL where appropriate.
Use the default version of FIXME, ERR, WARN, TRACE for the default
channel.
diff --git a/loader/elfdll.c b/loader/elfdll.c
index e3aab96..962d5ff 100644
--- a/loader/elfdll.c
+++ b/loader/elfdll.c
@@ -20,7 +20,7 @@
#include "debugtools.h"
#include "winerror.h"
-DECLARE_DEBUG_CHANNEL(elfdll)
+DEFAULT_DEBUG_CHANNEL(elfdll)
#if defined(HAVE_DL_API)
#include <dlfcn.h>
@@ -84,7 +84,7 @@
if(len + namelen + 1 >= sizeof(buffer))
{
- ERR_(elfdll)("Buffer overflow! Check EXTRA_LD_LIBRARY_PATH or increase buffer size.\n");
+ ERR("Buffer overflow! Check EXTRA_LD_LIBRARY_PATH or increase buffer size.\n");
return NULL;
}
@@ -97,7 +97,7 @@
else
strcpy(buffer + len, libname);
- TRACE_(elfdll)("Trying dlopen('%s', %d)\n", buffer, flags);
+ TRACE("Trying dlopen('%s', %d)\n", buffer, flags);
handle = dlopen(buffer, flags);
if(handle)
@@ -216,7 +216,7 @@
{
if ( PROCESS_Current()->exe_modref )
- FIXME_(elfdll)( "Trying to load second .EXE file: %s\n", path );
+ FIXME( "Trying to load second .EXE file: %s\n", path );
else
PROCESS_Current()->exe_modref = wm;
}
@@ -301,7 +301,7 @@
dlhandle = ELFDLL_dlopen(soname, RTLD_LAZY);
if(!dlhandle)
{
- WARN_(elfdll)("Could not load %s (%s)\n", soname, dlerror());
+ WARN("Could not load %s (%s)\n", soname, dlerror());
*err = ERROR_FILE_NOT_FOUND;
return NULL;
}
@@ -312,7 +312,7 @@
image = (struct elfdll_image *)dlsym(dlhandle, soname);
if(!image)
{
- ERR_(elfdll)("Could not get elfdll image descriptor %s (%s)\n", soname, dlerror());
+ ERR("Could not get elfdll image descriptor %s (%s)\n", soname, dlerror());
dlclose(dlhandle);
*err = ERROR_BAD_FORMAT;
return NULL;
@@ -322,7 +322,7 @@
hmod16 = ELFDLL_CreateNEModule(image->ne_module_start, image->ne_module_size);
if(!hmod16)
{
- ERR_(elfdll)("Could not create win16 dummy module for %s\n", path);
+ ERR("Could not create win16 dummy module for %s\n", path);
dlclose(dlhandle);
*err = ERROR_OUTOFMEMORY;
return NULL;
@@ -333,7 +333,7 @@
wm = ELFDLL_CreateModref(image->pe_module_start, path);
if(!wm)
{
- ERR_(elfdll)("Could not create WINE_MODREF for %s\n", path);
+ ERR("Could not create WINE_MODREF for %s\n", path);
GLOBAL_FreeBlock((HGLOBAL16)hmod16);
dlclose(dlhandle);
*err = ERROR_OUTOFMEMORY;
diff --git a/loader/module.c b/loader/module.c
index 7db93e1..a530b27 100644
--- a/loader/module.c
+++ b/loader/module.c
@@ -32,7 +32,7 @@
#include "loadorder.h"
#include "elfdll.h"
-DECLARE_DEBUG_CHANNEL(module)
+DEFAULT_DEBUG_CHANNEL(module)
DECLARE_DEBUG_CHANNEL(win32)
/*************************************************************************
@@ -77,7 +77,7 @@
return PROCESS_Current()->exe_modref;
if (!HIWORD(hmod)) {
- ERR_(module)("tried to lookup 0x%04x in win32 module handler!\n",hmod);
+ ERR("tried to lookup 0x%04x in win32 module handler!\n",hmod);
return NULL;
}
for ( wm = PROCESS_Current()->modref_list; wm; wm=wm->next )
@@ -105,8 +105,8 @@
return TRUE;
- TRACE_(module)("(%s,%s,%p) - CALL\n",
- wm->modname, typeName[type], lpReserved );
+ TRACE("(%s,%s,%p) - CALL\n",
+ wm->modname, typeName[type], lpReserved );
/* Call the initialization routine */
switch ( wm->type )
@@ -120,13 +120,13 @@
break;
default:
- ERR_(module)("wine_modref type %d not handled.\n", wm->type );
+ ERR("wine_modref type %d not handled.\n", wm->type );
retv = FALSE;
break;
}
- TRACE_(module)("(%s,%s,%p) - RETURN %d\n",
- wm->modname, typeName[type], lpReserved, retv );
+ TRACE("(%s,%s,%p) - RETURN %d\n",
+ wm->modname, typeName[type], lpReserved, retv );
return retv;
}
@@ -174,8 +174,7 @@
|| ( wm->flags & WINE_MODREF_PROCESS_ATTACHED ) )
return retv;
- TRACE_(module)("(%s,%p) - START\n",
- wm->modname, lpReserved );
+ TRACE("(%s,%p) - START\n", wm->modname, lpReserved );
/* Tag current MODREF to prevent recursive loop */
wm->flags |= WINE_MODREF_MARKER;
@@ -207,8 +206,7 @@
/* Remove recursion flag */
wm->flags &= ~WINE_MODREF_MARKER;
- TRACE_(module)("(%s,%p) - END\n",
- wm->modname, lpReserved );
+ TRACE("(%s,%p) - END\n", wm->modname, lpReserved );
return retv;
}
@@ -832,7 +830,7 @@
hInstance = GetLastError();
if ( hInstance < 32 ) return hInstance;
- FIXME_(module)("Strange error set by CreateProcess: %d\n", hInstance );
+ FIXME("Strange error set by CreateProcess: %d\n", hInstance );
return 11;
}
@@ -911,8 +909,7 @@
**to = 0; /* terminate output string */
- TRACE_(module)("returning token len=%d, string=%s\n",
- len, to_old);
+ TRACE("returning token len=%d, string=%s\n", len, to_old);
return len;
}
@@ -951,7 +948,7 @@
found = FALSE;
break;
}
- TRACE_(module)("checking if file exists '%s'\n", name);
+ TRACE("checking if file exists '%s'\n", name);
retlen = SearchPathA( NULL, name, ".exe", sizeof(buffer), buffer, &lastpart);
if ( retlen && (retlen < sizeof(buffer)) ) break;
} while (1);
@@ -962,15 +959,15 @@
strcpy( name, buffer );
} else {
/* not enough space to return full path string */
- FIXME_(module)("internal string not long enough, need %d\n",
+ FIXME("internal string not long enough, need %d\n",
strlen(buffer) );
}
}
/* all done, indicate end of module name and then trace and exit */
if (after) *after = from;
- TRACE_(module)("%i, selected file name '%s'\n and cmdline as %s\n",
- found, name, debugstr_a(from));
+ TRACE("%i, selected file name '%s'\n and cmdline as %s\n",
+ found, name, debugstr_a(from));
return found;
}
@@ -1027,11 +1024,11 @@
} while (1);
if (!SearchPathA( NULL, buffer, ".exe", namelen, name, NULL )) {
- TRACE_(module)("file not found '%s'\n", buffer );
+ TRACE("file not found '%s'\n", buffer );
return FALSE;
}
- TRACE_(module)("selected as file name '%s'\n", name );
+ TRACE("selected as file name '%s'\n", name );
return TRUE;
}
@@ -1095,58 +1092,58 @@
/* Warn if unsupported features are used */
if (dwCreationFlags & DETACHED_PROCESS)
- FIXME_(module)("(%s,...): DETACHED_PROCESS ignored\n", name);
+ FIXME("(%s,...): DETACHED_PROCESS ignored\n", name);
if (dwCreationFlags & CREATE_NEW_CONSOLE)
- FIXME_(module)("(%s,...): CREATE_NEW_CONSOLE ignored\n", name);
+ FIXME("(%s,...): CREATE_NEW_CONSOLE ignored\n", name);
if (dwCreationFlags & NORMAL_PRIORITY_CLASS)
- FIXME_(module)("(%s,...): NORMAL_PRIORITY_CLASS ignored\n", name);
+ FIXME("(%s,...): NORMAL_PRIORITY_CLASS ignored\n", name);
if (dwCreationFlags & IDLE_PRIORITY_CLASS)
- FIXME_(module)("(%s,...): IDLE_PRIORITY_CLASS ignored\n", name);
+ FIXME("(%s,...): IDLE_PRIORITY_CLASS ignored\n", name);
if (dwCreationFlags & HIGH_PRIORITY_CLASS)
- FIXME_(module)("(%s,...): HIGH_PRIORITY_CLASS ignored\n", name);
+ FIXME("(%s,...): HIGH_PRIORITY_CLASS ignored\n", name);
if (dwCreationFlags & REALTIME_PRIORITY_CLASS)
- FIXME_(module)("(%s,...): REALTIME_PRIORITY_CLASS ignored\n", name);
+ FIXME("(%s,...): REALTIME_PRIORITY_CLASS ignored\n", name);
if (dwCreationFlags & CREATE_NEW_PROCESS_GROUP)
- FIXME_(module)("(%s,...): CREATE_NEW_PROCESS_GROUP ignored\n", name);
+ FIXME("(%s,...): CREATE_NEW_PROCESS_GROUP ignored\n", name);
if (dwCreationFlags & CREATE_UNICODE_ENVIRONMENT)
- FIXME_(module)("(%s,...): CREATE_UNICODE_ENVIRONMENT ignored\n", name);
+ FIXME("(%s,...): CREATE_UNICODE_ENVIRONMENT ignored\n", name);
if (dwCreationFlags & CREATE_SEPARATE_WOW_VDM)
- FIXME_(module)("(%s,...): CREATE_SEPARATE_WOW_VDM ignored\n", name);
+ FIXME("(%s,...): CREATE_SEPARATE_WOW_VDM ignored\n", name);
if (dwCreationFlags & CREATE_SHARED_WOW_VDM)
- FIXME_(module)("(%s,...): CREATE_SHARED_WOW_VDM ignored\n", name);
+ FIXME("(%s,...): CREATE_SHARED_WOW_VDM ignored\n", name);
if (dwCreationFlags & CREATE_DEFAULT_ERROR_MODE)
- FIXME_(module)("(%s,...): CREATE_DEFAULT_ERROR_MODE ignored\n", name);
+ FIXME("(%s,...): CREATE_DEFAULT_ERROR_MODE ignored\n", name);
if (dwCreationFlags & CREATE_NO_WINDOW)
- FIXME_(module)("(%s,...): CREATE_NO_WINDOW ignored\n", name);
+ FIXME("(%s,...): CREATE_NO_WINDOW ignored\n", name);
if (dwCreationFlags & PROFILE_USER)
- FIXME_(module)("(%s,...): PROFILE_USER ignored\n", name);
+ FIXME("(%s,...): PROFILE_USER ignored\n", name);
if (dwCreationFlags & PROFILE_KERNEL)
- FIXME_(module)("(%s,...): PROFILE_KERNEL ignored\n", name);
+ FIXME("(%s,...): PROFILE_KERNEL ignored\n", name);
if (dwCreationFlags & PROFILE_SERVER)
- FIXME_(module)("(%s,...): PROFILE_SERVER ignored\n", name);
+ FIXME("(%s,...): PROFILE_SERVER ignored\n", name);
if (lpCurrentDirectory)
- FIXME_(module)("(%s,...): lpCurrentDirectory %s ignored\n",
+ FIXME("(%s,...): lpCurrentDirectory %s ignored\n",
name, lpCurrentDirectory);
if (lpStartupInfo->lpDesktop)
- FIXME_(module)("(%s,...): lpStartupInfo->lpDesktop %s ignored\n",
+ FIXME("(%s,...): lpStartupInfo->lpDesktop %s ignored\n",
name, lpStartupInfo->lpDesktop);
if (lpStartupInfo->lpTitle)
- FIXME_(module)("(%s,...): lpStartupInfo->lpTitle %s ignored\n",
+ FIXME("(%s,...): lpStartupInfo->lpTitle %s ignored\n",
name, lpStartupInfo->lpTitle);
if (lpStartupInfo->dwFlags & STARTF_USECOUNTCHARS)
- FIXME_(module)("(%s,...): STARTF_USECOUNTCHARS (%ld,%ld) ignored\n",
+ FIXME("(%s,...): STARTF_USECOUNTCHARS (%ld,%ld) ignored\n",
name, lpStartupInfo->dwXCountChars, lpStartupInfo->dwYCountChars);
if (lpStartupInfo->dwFlags & STARTF_USEFILLATTRIBUTE)
- FIXME_(module)("(%s,...): STARTF_USEFILLATTRIBUTE %lx ignored\n",
+ FIXME("(%s,...): STARTF_USEFILLATTRIBUTE %lx ignored\n",
name, lpStartupInfo->dwFillAttribute);
if (lpStartupInfo->dwFlags & STARTF_RUNFULLSCREEN)
- FIXME_(module)("(%s,...): STARTF_RUNFULLSCREEN ignored\n", name);
+ FIXME("(%s,...): STARTF_RUNFULLSCREEN ignored\n", name);
if (lpStartupInfo->dwFlags & STARTF_FORCEONFEEDBACK)
- FIXME_(module)("(%s,...): STARTF_FORCEONFEEDBACK ignored\n", name);
+ FIXME("(%s,...): STARTF_FORCEONFEEDBACK ignored\n", name);
if (lpStartupInfo->dwFlags & STARTF_FORCEOFFFEEDBACK)
- FIXME_(module)("(%s,...): STARTF_FORCEOFFFEEDBACK ignored\n", name);
+ FIXME("(%s,...): STARTF_FORCEOFFFEEDBACK ignored\n", name);
if (lpStartupInfo->dwFlags & STARTF_USEHOTKEY)
- FIXME_(module)("(%s,...): STARTF_USEHOTKEY ignored\n", name);
+ FIXME("(%s,...): STARTF_USEHOTKEY ignored\n", name);
/* Load file and create process */
@@ -1209,7 +1206,7 @@
case SCS_PIF_BINARY:
case SCS_POSIX_BINARY:
case SCS_OS216_BINARY:
- FIXME_(module)("Unsupported executable type: %ld\n", type );
+ FIXME("Unsupported executable type: %ld\n", type );
/* fall through */
default:
@@ -1309,7 +1306,7 @@
else
lstrcpynA( lpFileName, wm->short_filename, size );
- TRACE_(module)("%s\n", lpFileName );
+ TRACE("%s\n", lpFileName );
return strlen(lpFileName);
}
@@ -1388,7 +1385,7 @@
{
if(!(pwm->flags & WINE_MODREF_MARKER))
pwm->refCount++;
- TRACE_(module)("Already loaded module '%s' at 0x%08x, count=%d, \n", libname, pwm->module, pwm->refCount);
+ TRACE("Already loaded module '%s' at 0x%08x, count=%d, \n", libname, pwm->module, pwm->refCount);
LeaveCriticalSection(&PROCESS_Current()->crit_section);
return pwm;
}
@@ -1400,27 +1397,27 @@
switch(plo->loadorder[i])
{
case MODULE_LOADORDER_DLL:
- TRACE_(module)("Trying native dll '%s'\n", libname);
+ TRACE("Trying native dll '%s'\n", libname);
pwm = PE_LoadLibraryExA(libname, flags, &err);
break;
case MODULE_LOADORDER_ELFDLL:
- TRACE_(module)("Trying elfdll '%s'\n", libname);
+ TRACE("Trying elfdll '%s'\n", libname);
pwm = ELFDLL_LoadLibraryExA(libname, flags, &err);
break;
case MODULE_LOADORDER_SO:
- TRACE_(module)("Trying so-library '%s'\n", libname);
+ TRACE("Trying so-library '%s'\n", libname);
pwm = ELF_LoadLibraryExA(libname, flags, &err);
break;
case MODULE_LOADORDER_BI:
- TRACE_(module)("Trying built-in '%s'\n", libname);
+ TRACE("Trying built-in '%s'\n", libname);
pwm = BUILTIN32_LoadLibraryExA(libname, flags, &err);
break;
default:
- ERR_(module)("Got invalid loadorder type %d (%s index %d)\n", plo->loadorder[i], plo->modulename, i);
+ ERR("Got invalid loadorder type %d (%s index %d)\n", plo->loadorder[i], plo->modulename, i);
/* Fall through */
case MODULE_LOADORDER_INVALID: /* We ignore this as it is an empty entry */
@@ -1431,7 +1428,7 @@
if(pwm)
{
/* Initialize DLL just loaded */
- TRACE_(module)("Loaded module '%s' at 0x%08x, \n", libname, pwm->module);
+ TRACE("Loaded module '%s' at 0x%08x, \n", libname, pwm->module);
/* Set the refCount here so that an attach failure will */
/* decrement the dependencies through the MODULE_FreeLibrary call. */
@@ -1446,7 +1443,7 @@
break;
}
- WARN_(module)("Failed to load module '%s'; error=0x%08lx, \n", libname, err);
+ WARN("Failed to load module '%s'; error=0x%08lx, \n", libname, err);
SetLastError(err);
LeaveCriticalSection(&PROCESS_Current()->crit_section);
return NULL;
@@ -1532,7 +1529,7 @@
case MODULE32_BI: BUILTIN32_UnloadLibrary(wm); break;
default:
- ERR_(module)("Invalid or unhandled MODREF type %d encountered (wm=%p)\n", wm->type, wm);
+ ERR("Invalid or unhandled MODREF type %d encountered (wm=%p)\n", wm->type, wm);
}
}
}
@@ -1576,7 +1573,7 @@
return;
--wm->refCount;
- TRACE_(module)("(%s) refCount: %d\n", wm->modname, wm->refCount );
+ TRACE("(%s) refCount: %d\n", wm->modname, wm->refCount );
if ( wm->refCount == 0 )
{
@@ -1597,7 +1594,7 @@
*/
BOOL MODULE_FreeLibrary( WINE_MODREF *wm )
{
- TRACE_(module)("(%s) - START\n", wm->modname );
+ TRACE("(%s) - START\n", wm->modname );
/* Recursively decrement reference counts */
MODULE_DecRefCount( wm );
@@ -1612,7 +1609,7 @@
MODULE_FlushModrefs();
- TRACE_(module)("(%s) - END\n", wm->modname );
+ TRACE("(%s) - END\n", wm->modname );
return TRUE;
}
@@ -1660,27 +1657,25 @@
FARPROC16 ret;
if (!hModule) {
- WARN_(module)("hModule may not be 0!\n");
+ WARN("hModule may not be 0!\n");
return (FARPROC16)0;
}
if (HIWORD(hModule))
{
- WARN_(module)("hModule is Win32 handle (%08x)\n", hModule );
+ WARN("hModule is Win32 handle (%08x)\n", hModule );
return (FARPROC16)0;
}
hModule = GetExePtr( hModule );
if (HIWORD(name)) {
ordinal = NE_GetOrdinal( hModule, name );
- TRACE_(module)("%04x '%s'\n",
- hModule, name );
+ TRACE("%04x '%s'\n", hModule, name );
} else {
ordinal = LOWORD(name);
- TRACE_(module)("%04x %04x\n",
- hModule, ordinal );
+ TRACE("%04x %04x\n", hModule, ordinal );
}
if (!ordinal) return (FARPROC16)0;
ret = NE_GetEntryPoint( hModule, ordinal );
- TRACE_(module)("returning %08x\n",(UINT)ret);
+ TRACE("returning %08x\n",(UINT)ret);
return ret;
}
@@ -1698,20 +1693,18 @@
if (HIWORD(name) != 0)
{
ordinal = NE_GetOrdinal( hModule, (LPSTR)PTR_SEG_TO_LIN(name) );
- TRACE_(module)("%04x '%s'\n",
- hModule, (LPSTR)PTR_SEG_TO_LIN(name) );
+ TRACE("%04x '%s'\n", hModule, (LPSTR)PTR_SEG_TO_LIN(name) );
}
else
{
ordinal = LOWORD(name);
- TRACE_(module)("%04x %04x\n",
- hModule, ordinal );
+ TRACE("%04x %04x\n", hModule, ordinal );
}
if (!ordinal) return (FARPROC16)0;
ret = NE_GetEntryPoint( hModule, ordinal );
- TRACE_(module)("returning %08x\n", (UINT)ret );
+ TRACE("returning %08x\n", (UINT)ret );
return ret;
}
@@ -1762,7 +1755,7 @@
if (!retproc) SetLastError(ERROR_PROC_NOT_FOUND);
return retproc;
default:
- ERR_(module)("wine_modref type %d not handled.\n",wm->type);
+ ERR("wine_modref type %d not handled.\n",wm->type);
SetLastError(ERROR_INVALID_HANDLE);
return (FARPROC)0;
}
diff --git a/loader/pe_image.c b/loader/pe_image.c
index 77cea45..b6274ca 100644
--- a/loader/pe_image.c
+++ b/loader/pe_image.c
@@ -62,12 +62,12 @@
#include "snoop.h"
#include "debugtools.h"
+DEFAULT_DEBUG_CHANNEL(win32)
DECLARE_DEBUG_CHANNEL(delayhlp)
DECLARE_DEBUG_CHANNEL(fixup)
DECLARE_DEBUG_CHANNEL(module)
DECLARE_DEBUG_CHANNEL(relay)
DECLARE_DEBUG_CHANNEL(segment)
-DECLARE_DEBUG_CHANNEL(win32)
/* convert PE image VirtualAddress to Real Address */
@@ -91,15 +91,15 @@
IMAGE_EXPORT_DIRECTORY *pe_exports = (IMAGE_EXPORT_DIRECTORY*)RVA(rva_start);
Module = (char*)RVA(pe_exports->Name);
- TRACE_(win32)("*******EXPORT DATA*******\n");
- TRACE_(win32)("Module name is %s, %ld functions, %ld names\n",
- Module, pe_exports->NumberOfFunctions, pe_exports->NumberOfNames);
+ TRACE("*******EXPORT DATA*******\n");
+ TRACE("Module name is %s, %ld functions, %ld names\n",
+ Module, pe_exports->NumberOfFunctions, pe_exports->NumberOfNames);
ordinal=(u_short*) RVA(pe_exports->AddressOfNameOrdinals);
functions=function=(u_long*) RVA(pe_exports->AddressOfFunctions);
name=(u_char**) RVA(pe_exports->AddressOfNames);
- TRACE_(win32)(" Ord RVA Addr Name\n" );
+ TRACE(" Ord RVA Addr Name\n" );
for (i=0;i<pe_exports->NumberOfFunctions;i++, function++)
{
if (!*function) continue; /* No such function */
@@ -144,15 +144,15 @@
char * forward;
if (HIWORD(funcName))
- TRACE_(win32)("(%s)\n",funcName);
+ TRACE("(%s)\n",funcName);
else
- TRACE_(win32)("(%d)\n",(int)funcName);
+ TRACE("(%d)\n",(int)funcName);
if (!exports) {
/* Not a fatal problem, some apps do
* GetProcAddress(0,"RegisterPenApp") which triggers this
* case.
*/
- WARN_(win32)("Module %08x(%s)/MODREF %p doesn't have a exports table.\n",wm->module,wm->modname,pem);
+ WARN("Module %08x(%s)/MODREF %p doesn't have a exports table.\n",wm->module,wm->modname,pem);
return NULL;
}
ordinal = (u_short*) RVA(exports->AddressOfNameOrdinals);
@@ -183,8 +183,7 @@
} else {
int i;
if (LOWORD(funcName)-exports->Base > exports->NumberOfFunctions) {
- TRACE_(win32)(" ordinal %d out of range!\n",
- LOWORD(funcName));
+ TRACE(" ordinal %d out of range!\n", LOWORD(funcName));
return NULL;
}
addr = function[(int)funcName-exports->Base];
@@ -218,7 +217,7 @@
module[end-forward] = 0;
if (!(wm = MODULE_FindModule( module )))
{
- ERR_(win32)("module not found for forward '%s'\n", forward );
+ ERR("module not found for forward '%s'\n", forward );
return NULL;
}
return MODULE_GetProcAddress( wm->module, end + 1, snoop );
@@ -242,7 +241,7 @@
modname = "<unknown>";
/* OK, now dump the import list */
- TRACE_(win32)("Dumping imports list\n");
+ TRACE("Dumping imports list\n");
/* first, count the number of imported non-internal modules */
pe_imp = pem->pe_import;
@@ -288,7 +287,7 @@
/* FIXME: forwarder entries ... */
if (pe_imp->u.OriginalFirstThunk != 0) { /* original MS style */
- TRACE_(win32)("Microsoft style imports used\n");
+ TRACE("Microsoft style imports used\n");
import_list =(PIMAGE_THUNK_DATA) RVA(pe_imp->u.OriginalFirstThunk);
thunk_list = (PIMAGE_THUNK_DATA) RVA(pe_imp->FirstThunk);
@@ -296,23 +295,23 @@
if (IMAGE_SNAP_BY_ORDINAL(import_list->u1.Ordinal)) {
int ordinal = IMAGE_ORDINAL(import_list->u1.Ordinal);
- TRACE_(win32)("--- Ordinal %s,%d\n", name, ordinal);
+ TRACE("--- Ordinal %s,%d\n", name, ordinal);
thunk_list->u1.Function=MODULE_GetProcAddress(
wmImp->module, (LPCSTR)ordinal, TRUE
);
if (!thunk_list->u1.Function) {
- ERR_(win32)("No implementation for %s.%d, setting to 0xdeadbeef\n",
+ ERR("No implementation for %s.%d, setting to 0xdeadbeef\n",
name, ordinal);
thunk_list->u1.Function = (FARPROC)0xdeadbeef;
}
} else { /* import by name */
pe_name = (PIMAGE_IMPORT_BY_NAME)RVA(import_list->u1.AddressOfData);
- TRACE_(win32)("--- %s %s.%d\n", pe_name->Name, name, pe_name->Hint);
+ TRACE("--- %s %s.%d\n", pe_name->Name, name, pe_name->Hint);
thunk_list->u1.Function=MODULE_GetProcAddress(
wmImp->module, pe_name->Name, TRUE
);
if (!thunk_list->u1.Function) {
- ERR_(win32)("No implementation for %s.%d(%s), setting to 0xdeadbeef\n",
+ ERR("No implementation for %s.%d(%s), setting to 0xdeadbeef\n",
name,pe_name->Hint,pe_name->Name);
thunk_list->u1.Function = (FARPROC)0xdeadbeef;
}
@@ -321,31 +320,31 @@
thunk_list++;
}
} else { /* Borland style */
- TRACE_(win32)("Borland style imports used\n");
+ TRACE("Borland style imports used\n");
thunk_list = (PIMAGE_THUNK_DATA) RVA(pe_imp->FirstThunk);
while (thunk_list->u1.Ordinal) {
if (IMAGE_SNAP_BY_ORDINAL(thunk_list->u1.Ordinal)) {
/* not sure about this branch, but it seems to work */
int ordinal = IMAGE_ORDINAL(thunk_list->u1.Ordinal);
- TRACE_(win32)("--- Ordinal %s.%d\n",name,ordinal);
+ TRACE("--- Ordinal %s.%d\n",name,ordinal);
thunk_list->u1.Function=MODULE_GetProcAddress(
wmImp->module, (LPCSTR) ordinal, TRUE
);
if (!thunk_list->u1.Function) {
- ERR_(win32)("No implementation for %s.%d, setting to 0xdeadbeef\n",
+ ERR("No implementation for %s.%d, setting to 0xdeadbeef\n",
name,ordinal);
thunk_list->u1.Function = (FARPROC)0xdeadbeef;
}
} else {
pe_name=(PIMAGE_IMPORT_BY_NAME) RVA(thunk_list->u1.AddressOfData);
- TRACE_(win32)("--- %s %s.%d\n",
+ TRACE("--- %s %s.%d\n",
pe_name->Name,name,pe_name->Hint);
thunk_list->u1.Function=MODULE_GetProcAddress(
wmImp->module, pe_name->Name, TRUE
);
if (!thunk_list->u1.Function) {
- ERR_(win32)("No implementation for %s.%d, setting to 0xdeadbeef\n",
+ ERR("No implementation for %s.%d, setting to 0xdeadbeef\n",
name, pe_name->Hint);
thunk_list->u1.Function = (FARPROC)0xdeadbeef;
}
@@ -362,11 +361,11 @@
int i,vma_size = 0;
IMAGE_SECTION_HEADER *pe_seg = PE_SECTIONS(hModule);
- TRACE_(win32)("Dump of segment table\n");
- TRACE_(win32)(" Name VSz Vaddr SzRaw Fileadr *Reloc *Lineum #Reloc #Linum Char\n");
+ TRACE("Dump of segment table\n");
+ TRACE(" Name VSz Vaddr SzRaw Fileadr *Reloc *Lineum #Reloc #Linum Char\n");
for (i = 0; i< PE_HEADER(hModule)->FileHeader.NumberOfSections; i++)
{
- TRACE_(win32)("%8s: %4.4lx %8.8lx %8.8lx %8.8lx %8.8lx %8.8lx %4.4x %4.4x %8.8lx\n",
+ TRACE("%8s: %4.4lx %8.8lx %8.8lx %8.8lx %8.8lx %8.8lx %4.4x %4.4x %8.8lx\n",
pe_seg->Name,
pe_seg->Misc.VirtualSize,
pe_seg->VirtualAddress,
@@ -420,13 +419,13 @@
/* FIXME: if this is an exported address, fire up enhanced logic */
break;
case IMAGE_REL_BASED_HIGHADJ:
- FIXME_(win32)("Don't know what to do with IMAGE_REL_BASED_HIGHADJ\n");
+ FIXME("Don't know what to do with IMAGE_REL_BASED_HIGHADJ\n");
break;
case IMAGE_REL_BASED_MIPS_JMPADDR:
- FIXME_(win32)("Is this a MIPS machine ???\n");
+ FIXME("Is this a MIPS machine ???\n");
break;
default:
- FIXME_(win32)("Unknown fixup type\n");
+ FIXME("Unknown fixup type\n");
break;
}
}
@@ -469,14 +468,14 @@
0, 0, NULL );
if (!mapping)
{
- WARN_(win32)("CreateFileMapping error %ld\n", GetLastError() );
+ WARN("CreateFileMapping error %ld\n", GetLastError() );
return 0;
}
hModule = (HMODULE)MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 );
CloseHandle( mapping );
if (!hModule)
{
- WARN_(win32)("MapViewOfFile error %ld\n", GetLastError() );
+ WARN("MapViewOfFile error %ld\n", GetLastError() );
return 0;
}
nt = PE_HEADER( hModule );
@@ -484,7 +483,7 @@
/* Check signature */
if ( nt->Signature != IMAGE_NT_SIGNATURE )
{
- WARN_(win32)("image doesn't have PE signature, but 0x%08lx\n",
+ WARN("image doesn't have PE signature, but 0x%08lx\n",
nt->Signature );
goto error;
}
@@ -526,7 +525,7 @@
/* Check file size */
if ( file_size && file_size < rawsize )
{
- ERR_(win32)("PE module is too small (header: %d, filesize: %d), "
+ ERR("PE module is too small (header: %d, filesize: %d), "
"probably truncated download?\n",
rawsize, file_size );
goto error;
@@ -535,7 +534,7 @@
/* Check entrypoint address */
aoep = nt->OptionalHeader.AddressOfEntryPoint;
if (aoep && (aoep < lowest_va))
- FIXME_(win32)("WARNING: '%s' has an invalid entrypoint (0x%08lx) "
+ FIXME("WARNING: '%s' has an invalid entrypoint (0x%08lx) "
"below the first virtual address (0x%08x) "
"(possible Virus Infection or broken binary)!\n",
filename, aoep, lowest_va );
@@ -585,7 +584,7 @@
reloc = dir->VirtualAddress;
else
{
- FIXME_(win32)(
+ FIXME(
"FATAL: Need to relocate %s, but no relocation records present (%s). Try to run that file directly !\n",
filename,
(nt->FileHeader.Characteristics&IMAGE_FILE_RELOCS_STRIPPED)?
@@ -598,7 +597,7 @@
* Some DLLs really check the MSB of the module handle :-/
*/
if ( nt->OptionalHeader.ImageBase & 0x80000000 )
- ERR_(win32)( "Forced to relocate system DLL (base > 2GB). This is not good.\n" );
+ ERR( "Forced to relocate system DLL (base > 2GB). This is not good.\n" );
load_addr = (DWORD)VirtualAlloc( NULL, vma_size,
MEM_RESERVE | MEM_COMMIT,
@@ -610,8 +609,8 @@
}
}
- TRACE_(win32)("Load addr is %lx (base %lx), range %x\n",
- load_addr, nt->OptionalHeader.ImageBase, vma_size );
+ TRACE("Load addr is %lx (base %lx), range %x\n",
+ load_addr, nt->OptionalHeader.ImageBase, vma_size );
TRACE_(segment)("Loading %s at %lx, range %x\n",
filename, load_addr, vma_size );
@@ -706,38 +705,38 @@
pe_resource = (PIMAGE_RESOURCE_DIRECTORY)RVA(dir->VirtualAddress);
dir = nt->OptionalHeader.DataDirectory+IMAGE_DIRECTORY_ENTRY_EXCEPTION;
- if (dir->Size) FIXME_(win32)("Exception directory ignored\n" );
+ if (dir->Size) FIXME("Exception directory ignored\n" );
dir = nt->OptionalHeader.DataDirectory+IMAGE_DIRECTORY_ENTRY_SECURITY;
- if (dir->Size) FIXME_(win32)("Security directory ignored\n" );
+ if (dir->Size) FIXME("Security directory ignored\n" );
/* IMAGE_DIRECTORY_ENTRY_BASERELOC handled in PE_LoadImage */
/* IMAGE_DIRECTORY_ENTRY_DEBUG handled by debugger */
dir = nt->OptionalHeader.DataDirectory+IMAGE_DIRECTORY_ENTRY_DEBUG;
- if (dir->Size) TRACE_(win32)("Debug directory ignored\n" );
+ if (dir->Size) TRACE("Debug directory ignored\n" );
dir = nt->OptionalHeader.DataDirectory+IMAGE_DIRECTORY_ENTRY_COPYRIGHT;
- if (dir->Size) FIXME_(win32)("Copyright string ignored\n" );
+ if (dir->Size) FIXME("Copyright string ignored\n" );
dir = nt->OptionalHeader.DataDirectory+IMAGE_DIRECTORY_ENTRY_GLOBALPTR;
- if (dir->Size) FIXME_(win32)("Global Pointer (MIPS) ignored\n" );
+ if (dir->Size) FIXME("Global Pointer (MIPS) ignored\n" );
/* IMAGE_DIRECTORY_ENTRY_TLS handled in PE_TlsInit */
dir = nt->OptionalHeader.DataDirectory+IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG;
- if (dir->Size) FIXME_(win32)("Load Configuration directory ignored\n" );
+ if (dir->Size) FIXME("Load Configuration directory ignored\n" );
dir = nt->OptionalHeader.DataDirectory+IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT;
- if (dir->Size) TRACE_(win32)("Bound Import directory ignored\n" );
+ if (dir->Size) TRACE("Bound Import directory ignored\n" );
dir = nt->OptionalHeader.DataDirectory+IMAGE_DIRECTORY_ENTRY_IAT;
- if (dir->Size) TRACE_(win32)("Import Address Table directory ignored\n" );
+ if (dir->Size) TRACE("Import Address Table directory ignored\n" );
dir = nt->OptionalHeader.DataDirectory+IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT;
if (dir->Size)
{
- TRACE_(win32)("Delayed import, stub calls LoadLibrary\n" );
+ TRACE("Delayed import, stub calls LoadLibrary\n" );
/*
* Nothing to do here.
*/
@@ -762,10 +761,10 @@
}
dir = nt->OptionalHeader.DataDirectory+IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR;
- if (dir->Size) FIXME_(win32)("Unknown directory 14 ignored\n" );
+ if (dir->Size) FIXME("Unknown directory 14 ignored\n" );
dir = nt->OptionalHeader.DataDirectory+15;
- if (dir->Size) FIXME_(win32)("Unknown directory 15 ignored\n" );
+ if (dir->Size) FIXME("Unknown directory 15 ignored\n" );
/* Allocate and fill WINE_MODREF */
@@ -812,7 +811,7 @@
{
if ( PROCESS_Current()->exe_modref )
- FIXME_(win32)( "Trying to load second .EXE file: %s\n", filename );
+ FIXME( "Trying to load second .EXE file: %s\n", filename );
else
PROCESS_Current()->exe_modref = wm;
}
@@ -910,7 +909,7 @@
/* Create 32-bit MODREF */
if ( !(wm = PE_CreateModule( hModule32, filename, flags, FALSE )) )
{
- ERR_(win32)( "can't load %s\n", filename );
+ ERR( "can't load %s\n", filename );
FreeLibrary16( hModule16 );
*err = ERROR_OUTOFMEMORY;
return NULL;
@@ -989,7 +988,7 @@
*/
int PE_UnloadImage( HMODULE hModule )
{
- FIXME_(win32)("stub.\n");
+ FIXME("stub.\n");
/* free resources, image, unmap */
return 1;
}
@@ -1075,7 +1074,7 @@
cbs = _fixup_address(&(peh->OptionalHeader),delta,pdir->AddressOfCallBacks);
if (*cbs)
- FIXME_(win32)("TLS Callbacks aren't going to be called\n");
+ FIXME("TLS Callbacks aren't going to be called\n");
}
TlsSetValue( pem->tlsindex, mem );
diff --git a/loader/resource.c b/loader/resource.c
index 6ed1196..4967f29 100644
--- a/loader/resource.c
+++ b/loader/resource.c
@@ -33,8 +33,8 @@
#include "debugstr.h"
#include "winnls.h"
+DEFAULT_DEBUG_CHANNEL(resource)
DECLARE_DEBUG_CHANNEL(accel)
-DECLARE_DEBUG_CHANNEL(resource)
extern WORD WINE_LanguageId;
@@ -68,7 +68,7 @@
if ( !(map = (HRSRC_MAP *)HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY,
sizeof(HRSRC_MAP) ) ) )
{
- ERR_(resource)("Cannot allocate HRSRC map\n" );
+ ERR("Cannot allocate HRSRC map\n" );
return 0;
}
pModule->hRsrcMap = (LPVOID)map;
@@ -87,7 +87,7 @@
(map->nAlloc + HRSRC_MAP_BLOCKSIZE)
* sizeof(HRSRC_ELEM) ) ))
{
- ERR_(resource)("Cannot grow HRSRC map\n" );
+ ERR("Cannot grow HRSRC map\n" );
return 0;
}
map->elem = newElem;
@@ -139,13 +139,14 @@
WINE_MODREF *wm = pModule && pModule->module32?
MODULE32_LookupHMODULE( pModule->module32 ) : NULL;
- TRACE_(resource)("(%08x %s, %08x%s, %08x%s, %04x, %s, %s)\n",
- hModule, pModule ? (char *)NE_MODULE_NAME(pModule) : "NULL dereference",
- (UINT)type, HIWORD(type)? (bUnicode? debugstr_w((LPWSTR)type) : debugstr_a(type)) : "",
- (UINT)name, HIWORD(name)? (bUnicode? debugstr_w((LPWSTR)name) : debugstr_a(name)) : "",
- lang,
- bUnicode? "W" : "A",
- bRet16? "NE" : "PE" );
+ TRACE("(%08x %s, %08x%s, %08x%s, %04x, %s, %s)\n",
+ hModule,
+ pModule ? (char *)NE_MODULE_NAME(pModule) : "NULL dereference",
+ (UINT)type, HIWORD(type)? (bUnicode? debugstr_w((LPWSTR)type) : debugstr_a(type)) : "",
+ (UINT)name, HIWORD(name)? (bUnicode? debugstr_w((LPWSTR)name) : debugstr_a(name)) : "",
+ lang,
+ bUnicode? "W" : "A",
+ bRet16? "NE" : "PE" );
if ( !pModule ) return 0;
@@ -174,7 +175,7 @@
break;
default:
- ERR_(resource)("unknown module type %d\n", wm->type );
+ ERR("unknown module type %d\n", wm->type );
break;
}
@@ -230,8 +231,8 @@
WINE_MODREF *wm = pModule && pModule->module32?
MODULE32_LookupHMODULE( pModule->module32 ) : NULL;
- TRACE_(resource)("(%08x %s, %08x, %s)\n",
- hModule, NE_MODULE_NAME(pModule), hRsrc, bRet16? "NE" : "PE" );
+ TRACE("(%08x %s, %08x, %s)\n",
+ hModule, NE_MODULE_NAME(pModule), hRsrc, bRet16? "NE" : "PE" );
if ( !pModule || !hRsrc ) return 0;
@@ -253,7 +254,7 @@
break;
default:
- ERR_(resource)("unknown module type %d\n", wm->type );
+ ERR("unknown module type %d\n", wm->type );
break;
}
}
@@ -281,8 +282,8 @@
WINE_MODREF *wm = pModule && pModule->module32?
MODULE32_LookupHMODULE( pModule->module32 ) : NULL;
- TRACE_(resource)("(%08x %s, %08x, %s)\n",
- hModule, NE_MODULE_NAME(pModule), hRsrc, bRet16? "NE" : "PE" );
+ TRACE("(%08x %s, %08x, %s)\n",
+ hModule, NE_MODULE_NAME(pModule), hRsrc, bRet16? "NE" : "PE" );
if ( !pModule || !hRsrc ) return HFILE_ERROR;
@@ -294,7 +295,7 @@
HRSRC hRsrc32 = HIWORD(hRsrc)? hRsrc : MapHRsrc16To32( pModule, hRsrc );
#endif
- FIXME_(resource)("32-bit modules not yet supported.\n" );
+ FIXME("32-bit modules not yet supported.\n" );
hFile = HFILE_ERROR;
/* If we need to return a 16-bit file handle, convert it */
@@ -329,8 +330,8 @@
WINE_MODREF *wm = pModule && pModule->module32?
MODULE32_LookupHMODULE( pModule->module32 ) : NULL;
- TRACE_(resource)("(%08x %s, %08x, %s)\n",
- hModule, NE_MODULE_NAME(pModule), hRsrc, bRet16? "NE" : "PE" );
+ TRACE("(%08x %s, %08x, %s)\n",
+ hModule, NE_MODULE_NAME(pModule), hRsrc, bRet16? "NE" : "PE" );
if ( !pModule || !hRsrc ) return 0;
@@ -352,7 +353,7 @@
break;
default:
- ERR_(resource)("unknown module type %d\n", wm->type );
+ ERR("unknown module type %d\n", wm->type );
break;
}
@@ -388,14 +389,14 @@
{
LPVOID bits = NULL;
- TRACE_(resource)("(%08x, %s)\n", handle, bRet16? "NE" : "PE" );
+ TRACE("(%08x, %s)\n", handle, bRet16? "NE" : "PE" );
if ( HIWORD( handle ) )
{
/* 32-bit memory handle */
if ( bRet16 )
- FIXME_(resource)("can't return SEGPTR to 32-bit resource %08x.\n", handle );
+ FIXME("can't return SEGPTR to 32-bit resource %08x.\n", handle );
else
bits = (LPVOID)handle;
}
@@ -422,7 +423,7 @@
{
HGLOBAL retv = handle;
- TRACE_(resource)("(%08x)\n", handle );
+ TRACE("(%08x)\n", handle );
if ( HIWORD( handle ) )
{
@@ -862,8 +863,8 @@
int string_num;
int i;
- TRACE_(resource)("inst=%04x id=%04x buff=%08x len=%d\n",
- instance, resource_id, (int) buffer, buflen);
+ TRACE("inst=%04x id=%04x buff=%08x len=%d\n",
+ instance, resource_id, (int) buffer, buflen);
hrsrc = FindResource16( instance, (SEGPTR)((resource_id>>4)+1), RT_STRING16 );
if (!hrsrc) return 0;
@@ -875,7 +876,7 @@
for (i = 0; i < string_num; i++)
p += *p + 1;
- TRACE_(resource)("strlen = %d\n", (int)*p );
+ TRACE("strlen = %d\n", (int)*p );
if (buffer == NULL) return *p;
i = MIN(buflen - 1, *p);
@@ -887,11 +888,11 @@
buffer[0] = '\0';
return 0;
}
- WARN_(resource)("Dont know why caller give buflen=%d *p=%d trying to obtain string '%s'\n", buflen, *p, p + 1);
+ WARN("Dont know why caller give buflen=%d *p=%d trying to obtain string '%s'\n", buflen, *p, p + 1);
}
FreeResource16( hmem );
- TRACE_(resource)("'%s' loaded !\n", buffer);
+ TRACE("'%s' loaded !\n", buffer);
return i;
}
@@ -909,8 +910,8 @@
if (HIWORD(resource_id)==0xFFFF) /* netscape 3 passes this */
resource_id = (UINT)(-((INT)resource_id));
- TRACE_(resource)("instance = %04x, id = %04x, buffer = %08x, "
- "length = %d\n", instance, (int)resource_id, (int) buffer, buflen);
+ TRACE("instance = %04x, id = %04x, buffer = %08x, "
+ "length = %d\n", instance, (int)resource_id, (int) buffer, buflen);
/* Use bits 4 - 19 (incremented by 1) as resourceid, mask out
* 20 - 31. */
@@ -925,7 +926,7 @@
for (i = 0; i < string_num; i++)
p += *p + 1;
- TRACE_(resource)("strlen = %d\n", (int)*p );
+ TRACE("strlen = %d\n", (int)*p );
if (buffer == NULL) return *p;
i = MIN(buflen - 1, *p);
@@ -938,11 +939,11 @@
return 0;
}
#if 0
- WARN_(resource)("Dont know why caller give buflen=%d *p=%d trying to obtain string '%s'\n", buflen, *p, p + 1);
+ WARN("Dont know why caller give buflen=%d *p=%d trying to obtain string '%s'\n", buflen, *p, p + 1);
#endif
}
- TRACE_(resource)("%s loaded !\n", debugstr_w(buffer));
+ TRACE("%s loaded !\n", debugstr_w(buffer));
return i;
}
@@ -1006,7 +1007,7 @@
PMESSAGE_RESOURCE_ENTRY mre;
int i,slen;
- TRACE_(resource)("instance = %08lx, id = %08lx, buffer = %p, length = %ld\n", (DWORD)instance, (DWORD)id, buffer, (DWORD)buflen);
+ TRACE("instance = %08lx, id = %08lx, buffer = %p, length = %ld\n", (DWORD)instance, (DWORD)id, buffer, (DWORD)buflen);
/*FIXME: I am not sure about the '1' ... But I've only seen those entries*/
hrsrc = FindResourceExW(instance,RT_MESSAGELISTW,(LPWSTR)1,lang);
@@ -1033,7 +1034,7 @@
mre = (PMESSAGE_RESOURCE_ENTRY)(((char*)mre)+(mre->Length));
}
slen=mre->Length;
- TRACE_(resource)(" - strlen=%d\n",slen);
+ TRACE(" - strlen=%d\n",slen);
i = MIN(buflen - 1, slen);
if (buffer == NULL)
return slen;
@@ -1047,7 +1048,7 @@
}
}
if (buffer)
- TRACE_(resource)("'%s' copied !\n", buffer);
+ TRACE("'%s' copied !\n", buffer);
return i;
}
diff --git a/loader/task.c b/loader/task.c
index 35d8a8e..342e17b 100644
--- a/loader/task.c
+++ b/loader/task.c
@@ -37,8 +37,8 @@
#include "services.h"
#include "server.h"
+DEFAULT_DEBUG_CHANNEL(task)
DECLARE_DEBUG_CHANNEL(relay)
-DECLARE_DEBUG_CHANNEL(task)
DECLARE_DEBUG_CHANNEL(toolhelp)
/* Min. number of thunks allocated when creating a new segment */
@@ -254,10 +254,10 @@
EDI_reg(&context) = pTask->hInstance;
ESI_reg(&context) = pTask->hPrevInstance;
- TRACE_(task)("Starting main program: cs:ip=%04lx:%04lx ds=%04lx ss:sp=%04x:%04x\n",
- CS_reg(&context), EIP_reg(&context), DS_reg(&context),
- SELECTOROF(pTask->teb->cur_stack),
- OFFSETOF(pTask->teb->cur_stack) );
+ TRACE("Starting main program: cs:ip=%04lx:%04lx ds=%04lx ss:sp=%04x:%04x\n",
+ CS_reg(&context), EIP_reg(&context), DS_reg(&context),
+ SELECTOROF(pTask->teb->cur_stack),
+ OFFSETOF(pTask->teb->cur_stack) );
Callbacks->CallRegisterShortProc( &context, 0 );
}
@@ -382,7 +382,7 @@
/* Enter task handle into thread and process */
pTask->teb->htask16 = pTask->teb->process->task = hTask;
- TRACE_(task)("module='%s' cmdline='%s' task=%04x\n", name, cmd_line, hTask );
+ TRACE("module='%s' cmdline='%s' task=%04x\n", name, cmd_line, hTask );
/* Add the task to the linked list */
@@ -448,7 +448,7 @@
return;
}
- TRACE_(task)("Killing task %04x\n", hTask );
+ TRACE("Killing task %04x\n", hTask );
#ifdef MZ_SUPPORTED
{
@@ -468,7 +468,7 @@
if (nTaskCount <= 1)
{
- TRACE_(task)("this is the last task, exiting\n" );
+ TRACE("this is the last task, exiting\n" );
ExitKernel16();
}
@@ -572,8 +572,8 @@
/* Check what we need to do */
hOldTask = GetCurrentTask();
pOldTask = (TDB *)GlobalLock16( hOldTask );
- TRACE_(task)( "entered with hCurrentTask %04x by hTask %04x (pid %ld)\n",
- hCurrentTask, hOldTask, (long) getpid() );
+ TRACE( "entered with hCurrentTask %04x by hTask %04x (pid %ld)\n",
+ hCurrentTask, hOldTask, (long) getpid() );
if ( pOldTask && THREAD_IsWin16( NtCurrentTeb() ) )
{
@@ -624,8 +624,7 @@
{
pNewTask = (TDB *)GlobalLock16( hNewTask );
- TRACE_(task)( "\ttask = %04x, events = %i\n",
- hNewTask, pNewTask->nEvents );
+ TRACE( "\ttask = %04x, events = %i\n", hNewTask, pNewTask->nEvents );
if (pNewTask->nEvents) break;
hNewTask = pNewTask->hNext;
@@ -636,7 +635,7 @@
/* If we are still the task with highest priority, just return ... */
if ( mode == MODE_YIELD && hNewTask == hCurrentTask )
{
- TRACE_(task)("returning to the current task (%04x)\n", hCurrentTask );
+ TRACE("returning to the current task (%04x)\n", hCurrentTask );
SYSLEVEL_LeaveWin16Lock();
/* Allow Win32 threads to thunk down even while a Win16 task is
@@ -649,14 +648,14 @@
/* If no task to yield to found, suspend 16-bit scheduler ... */
if ( mode == MODE_YIELD && !hNewTask )
{
- TRACE_(task)("No currently active task\n");
+ TRACE("No currently active task\n");
hCurrentTask = 0;
}
/* If we found a task to wake up, do it ... */
if ( (mode == MODE_YIELD || mode == MODE_WAKEUP) && hNewTask )
{
- TRACE_(task)("Switching to task %04x (%.8s)\n",
+ TRACE("Switching to task %04x (%.8s)\n",
hNewTask, pNewTask->module_name );
pNewTask->priority++;
@@ -761,7 +760,7 @@
if ( !THREAD_IsWin16( NtCurrentTeb() ) )
{
- FIXME_(task)("called for Win32 thread (%04x)!\n", NtCurrentTeb()->teb_sel);
+ FIXME("called for Win32 thread (%04x)!\n", NtCurrentTeb()->teb_sel);
return TRUE;
}
@@ -791,7 +790,7 @@
if ( !THREAD_IsWin16( pTask->teb ) )
{
- FIXME_(task)("called for Win32 thread (%04x)!\n", pTask->teb->teb_sel );
+ FIXME("called for Win32 thread (%04x)!\n", pTask->teb->teb_sel );
return;
}
@@ -853,7 +852,7 @@
if ( !THREAD_IsWin16( NtCurrentTeb() ) )
{
- FIXME_(task)("called for Win32 thread (%04x)!\n", NtCurrentTeb()->teb_sel);
+ FIXME("called for Win32 thread (%04x)!\n", NtCurrentTeb()->teb_sel);
return;
}
@@ -882,16 +881,16 @@
if ( !THREAD_IsWin16( NtCurrentTeb() ) )
{
- FIXME_(task)("called for Win32 thread (%04x)!\n", NtCurrentTeb()->teb_sel);
+ FIXME("called for Win32 thread (%04x)!\n", NtCurrentTeb()->teb_sel);
return;
}
- TRACE_(task)("%04x: DirectedYield(%04x)\n", pCurTask->hSelf, hTask );
+ TRACE("%04x: DirectedYield(%04x)\n", pCurTask->hSelf, hTask );
pCurTask->hYieldTo = hTask;
OldYield16();
- TRACE_(task)("%04x: back from DirectedYield(%04x)\n", pCurTask->hSelf, hTask );
+ TRACE("%04x: back from DirectedYield(%04x)\n", pCurTask->hSelf, hTask );
}
/***********************************************************************
@@ -913,7 +912,7 @@
{
if ( !someTask ) return 0;
- FIXME_(task)("(%04x): stub\n", someTask );
+ FIXME("(%04x): stub\n", someTask );
return 0;
}
@@ -926,12 +925,12 @@
SEGPTR thunkaddr;
if (!func) {
- ERR_(task)("Ouch ! MakeProcInstance called with func == NULL !\n");
+ ERR("Ouch ! MakeProcInstance called with func == NULL !\n");
return (FARPROC16)0; /* Windows seems to do the same */
}
if ( GetTaskDS16() !=hInstance )
{
- ERR_(task)("Problem with hInstance? Got %04x, using %04x instead\n",
+ ERR("Problem with hInstance? Got %04x, using %04x instead\n",
hInstance,GetTaskDS16());
hInstance = GetTaskDS16();
}
@@ -941,12 +940,12 @@
thunk = PTR_SEG_TO_LIN( thunkaddr );
lfunc = PTR_SEG_TO_LIN( func );
- TRACE_(task)("(%08lx,%04x): got thunk %08lx\n",
- (DWORD)func, hInstance, (DWORD)thunkaddr );
+ TRACE("(%08lx,%04x): got thunk %08lx\n",
+ (DWORD)func, hInstance, (DWORD)thunkaddr );
if (((lfunc[0]==0x8c) && (lfunc[1]==0xd8)) ||
((lfunc[0]==0x1e) && (lfunc[1]==0x58))
) {
- FIXME_(task)("thunk would be useless for %p, overwriting with nop;nop;\n", func );
+ FIXME("thunk would be useless for %p, overwriting with nop;nop;\n", func );
lfunc[0]=0x90; /* nop */
lfunc[1]=0x90; /* nop */
}
@@ -965,7 +964,7 @@
*/
void WINAPI FreeProcInstance16( FARPROC16 func )
{
- TRACE_(task)("(%08lx)\n", (DWORD)func );
+ TRACE("(%08lx)\n", (DWORD)func );
TASK_FreeThunk( GetCurrentTask(), (SEGPTR)func );
}
@@ -1185,7 +1184,7 @@
Callout.InitThreadInput16( 0, THREAD_IsWin16(teb)? 4 : 5 );
if (!teb->queue)
- FIXME_(task)("(): should initialize thread-local queue, expect failure!\n" );
+ FIXME("(): should initialize thread-local queue, expect failure!\n" );
return (HANDLE)teb->queue;
}
@@ -1202,9 +1201,9 @@
if (!(pTask = (TDB *)GlobalLock16( GetCurrentTask() ))) return;
if (!(pData = (INSTANCEDATA *)GlobalLock16( seg ))) return;
- TRACE_(task)("old=%04x:%04x new=%04x:%04x\n",
- SELECTOROF( pTask->teb->cur_stack ),
- OFFSETOF( pTask->teb->cur_stack ), seg, ptr );
+ TRACE("old=%04x:%04x new=%04x:%04x\n",
+ SELECTOROF( pTask->teb->cur_stack ),
+ OFFSETOF( pTask->teb->cur_stack ), seg, ptr );
/* Save the old stack */
@@ -1247,11 +1246,11 @@
return;
if (!pData->old_ss_sp)
{
- WARN_(task)("No previous SwitchStackTo\n" );
+ WARN("No previous SwitchStackTo\n" );
return;
}
- TRACE_(task)("restoring stack %04x:%04x\n",
- SELECTOROF(pData->old_ss_sp), OFFSETOF(pData->old_ss_sp) );
+ TRACE("restoring stack %04x:%04x\n",
+ SELECTOROF(pData->old_ss_sp), OFFSETOF(pData->old_ss_sp) );
oldFrame = CURRENT_STACK16;
@@ -1480,7 +1479,7 @@
WORD WINAPI SetSigHandler16( FARPROC16 newhandler, FARPROC16* oldhandler,
UINT16 *oldmode, UINT16 newmode, UINT16 flag )
{
- FIXME_(task)("(%p,%p,%p,%d,%d), unimplemented.\n",
+ FIXME("(%p,%p,%p,%d,%d), unimplemented.\n",
newhandler,oldhandler,oldmode,newmode,flag );
if (flag != 1) return 0;
