Compile the imagehlp dll with STRICT defined.

dlls/imagehlp/Makefile.in

-EXTRADEFS = -D_IMAGEHLP_SOURCE_ -DWINE_NO_STRICT
+EXTRADEFS = -D_IMAGEHLP_SOURCE_
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
@@ -21,4 +21,3 @@ C_SRCS = \
 @MAKE_DLL_RULES@
 
 ### Dependencies:
-

dlls/imagehlp/access.c

@@ -58,7 +58,7 @@ BOOL WINAPI EnumerateLoadedModules(
   PENUMLOADED_MODULES_CALLBACK EnumLoadedModulesCallback,
   PVOID UserContext)
 {
-  FIXME("(0x%08x, %p, %p): stub\n",
+  FIXME("(%p, %p, %p): stub\n",
     hProcess, EnumLoadedModulesCallback, UserContext
   );
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -70,7 +70,7 @@ BOOL WINAPI EnumerateLoadedModules(
  */
 DWORD WINAPI GetTimestampForLoadedLibrary(HMODULE Module)
 {
-  FIXME("(0x%08x): stub\n", Module);
+  FIXME("(%p): stub\n", Module);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
   return 0;
 }

dlls/imagehlp/debug.c

@@ -61,7 +61,7 @@ PIMAGE_DEBUG_INFORMATION WINAPI MapDebugInformation(
   HANDLE FileHandle, LPSTR FileName,
   LPSTR SymbolPath, DWORD ImageBase)
 {
-  FIXME("(0x%08x, %s, %s, 0x%08lx): stub\n",
+  FIXME("(%p, %s, %s, 0x%08lx): stub\n",
     FileHandle, FileName, SymbolPath, ImageBase
   );
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -80,7 +80,7 @@ BOOL WINAPI StackWalk(
   PTRANSLATE_ADDRESS_ROUTINE TranslateAddress)
 {
   FIXME(
-    "(%ld, 0x%08x, 0x%08x, %p, %p, %p, %p, %p, %p): stub\n",
+    "(%ld, %p, %p, %p, %p, %p, %p, %p, %p): stub\n",
       MachineType, hProcess, hThread, StackFrame, ContextRecord,
       ReadMemoryRoutine, FunctionTableAccessRoutine,
       GetModuleBaseRoutine, TranslateAddress

dlls/imagehlp/imagehlp_main.c

@@ -117,12 +117,9 @@ BOOL WINAPI SearchTreeForFile(
 BOOL WINAPI TouchFileTimes(
   HANDLE FileHandle, LPSYSTEMTIME lpSystemTime)
 {
-  FIXME("(0x%08x, %p): stub\n",
+  FIXME("(%p, %p): stub\n",
     FileHandle, lpSystemTime
   );
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
   return FALSE;
 }
-
-
-

dlls/imagehlp/integrity.c

@@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(imagehlp);
 BOOL WINAPI ImageAddCertificate(
   HANDLE FileHandle, PWIN_CERTIFICATE Certificate, PDWORD Index)
 {
-  FIXME("(0x%08x, %p, %p): stub\n",
+  FIXME("(%p, %p, %p): stub\n",
     FileHandle, Certificate, Index
   );
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -47,7 +47,7 @@ BOOL WINAPI ImageEnumerateCertificates(
   HANDLE FileHandle, WORD TypeFilter, PDWORD CertificateCount,
   PDWORD Indices, DWORD IndexCount)
 {
-  FIXME("(0x%08x, %hd, %p, %p, %ld): stub\n",
+  FIXME("(%p, %hd, %p, %p, %ld): stub\n",
     FileHandle, TypeFilter, CertificateCount, Indices, IndexCount
   );
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -61,7 +61,7 @@ BOOL WINAPI ImageGetCertificateData(
   HANDLE FileHandle, DWORD CertificateIndex,
   PWIN_CERTIFICATE Certificate, PDWORD RequiredLength)
 {
-  FIXME("(0x%08x, %ld, %p, %p): stub\n",
+  FIXME("(%p, %ld, %p, %p): stub\n",
     FileHandle, CertificateIndex, Certificate, RequiredLength
   );
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -75,7 +75,7 @@ BOOL WINAPI ImageGetCertificateHeader(
   HANDLE FileHandle, DWORD CertificateIndex,
   PWIN_CERTIFICATE Certificateheader)
 {
-  FIXME("(0x%08x, %ld, %p): stub\n",
+  FIXME("(%p, %ld, %p): stub\n",
     FileHandle, CertificateIndex, Certificateheader
   );
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -89,7 +89,7 @@ BOOL WINAPI ImageGetDigestStream(
   HANDLE FileHandle, DWORD DigestLevel,
   DIGEST_FUNCTION DigestFunction, DIGEST_HANDLE DigestHandle)
 {
-  FIXME("(0x%08x, %ld, %p, %p): stub\n",
+  FIXME("(%p, %ld, %p, %p): stub\n",
     FileHandle, DigestLevel, DigestFunction, DigestHandle
   );
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -101,7 +101,7 @@ BOOL WINAPI ImageGetDigestStream(
  */
 BOOL WINAPI ImageRemoveCertificate(HANDLE FileHandle, DWORD Index)
 {
-  FIXME("(0x%08x, %ld): stub\n", FileHandle, Index);
+  FIXME("(%p, %ld): stub\n", FileHandle, Index);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
   return FALSE;
 }

dlls/imagehlp/symbol.c

@@ -31,7 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(imagehlp);
  */
 BOOL WINAPI SymCleanup(HANDLE hProcess)
 {
-  FIXME("(0x%08x): stub\n", hProcess);
+  FIXME("(%p): stub\n", hProcess);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
   return FALSE;
 }
@@ -44,7 +44,7 @@ BOOL WINAPI SymEnumerateModules(
   HANDLE hProcess, PSYM_ENUMMODULES_CALLBACK EnumModulesCallback,
   PVOID UserContext)
 {
-  FIXME("(0x%08x, %p, %p): stub\n",
+  FIXME("(%p, %p, %p): stub\n",
     hProcess, EnumModulesCallback, UserContext
   );
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -58,7 +58,7 @@ BOOL WINAPI SymEnumerateSymbols(
   HANDLE hProcess, DWORD BaseOfDll,
   PSYM_ENUMSYMBOLS_CALLBACK EnumSymbolsCallback, PVOID UserContext)
 {
-  FIXME("(0x%08x, 0x%08lx, %p, %p): stub\n",
+  FIXME("(%p, 0x%08lx, %p, %p): stub\n",
     hProcess, BaseOfDll, EnumSymbolsCallback, UserContext
   );
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -70,7 +70,7 @@ BOOL WINAPI SymEnumerateSymbols(
  */
 PVOID WINAPI SymFunctionTableAccess(HANDLE hProcess, DWORD AddrBase)
 {
-  FIXME("(0x%08x, 0x%08lx): stub\n", hProcess, AddrBase);
+  FIXME("(%p, 0x%08lx): stub\n", hProcess, AddrBase);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
   return FALSE;
 }
@@ -80,7 +80,7 @@ PVOID WINAPI SymFunctionTableAccess(HANDLE hProcess, DWORD AddrBase)
  */
 DWORD WINAPI SymGetModuleBase(HANDLE hProcess, DWORD dwAddr)
 {
-  FIXME("(0x%08x, 0x%08lx): stub\n", hProcess, dwAddr);
+  FIXME("(%p, 0x%08lx): stub\n", hProcess, dwAddr);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
   return 0;
 }
@@ -92,7 +92,7 @@ BOOL WINAPI SymGetModuleInfo(
   HANDLE hProcess, DWORD dwAddr,
   PIMAGEHLP_MODULE ModuleInfo)
 {
-  FIXME("(0x%08x, 0x%08lx, %p): stub\n",
+  FIXME("(%p, 0x%08lx, %p): stub\n",
     hProcess, dwAddr, ModuleInfo
   );
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -115,7 +115,7 @@ DWORD WINAPI SymGetOptions()
 BOOL WINAPI SymGetSearchPath(
   HANDLE hProcess, LPSTR szSearchPath, DWORD SearchPathLength)
 {
-  FIXME("(0x%08x, %s, %ld): stub\n",
+  FIXME("(%p, %s, %ld): stub\n",
     hProcess, debugstr_an(szSearchPath,SearchPathLength), SearchPathLength
   );
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -129,7 +129,7 @@ BOOL WINAPI SymGetSymFromAddr(
   HANDLE hProcess, DWORD dwAddr,
   PDWORD pdwDisplacement, PIMAGEHLP_SYMBOL Symbol)
 {
-  FIXME("(0x%08x, 0x%08lx, %p, %p): stub\n",
+  FIXME("(%p, 0x%08lx, %p, %p): stub\n",
     hProcess, dwAddr, pdwDisplacement, Symbol
   );
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -142,7 +142,7 @@ BOOL WINAPI SymGetSymFromAddr(
 BOOL WINAPI SymGetSymFromName(
   HANDLE hProcess, LPSTR Name, PIMAGEHLP_SYMBOL Symbol)
 {
-  FIXME("(0x%08x, %s, %p): stub\n", hProcess, Name, Symbol);
+  FIXME("(%p, %s, %p): stub\n", hProcess, Name, Symbol);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
   return FALSE;
 }
@@ -153,7 +153,7 @@ BOOL WINAPI SymGetSymFromName(
 BOOL WINAPI SymGetSymNext(
   HANDLE hProcess, PIMAGEHLP_SYMBOL Symbol)
 {
-  FIXME("(0x%08x, %p): stub\n", hProcess, Symbol);
+  FIXME("(%p, %p): stub\n", hProcess, Symbol);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
   return FALSE;
 }
@@ -165,7 +165,7 @@ BOOL WINAPI SymGetSymNext(
 BOOL WINAPI SymGetSymPrev(
   HANDLE hProcess, PIMAGEHLP_SYMBOL Symbol)
 {
-  FIXME("(0x%08x, %p): stub\n", hProcess, Symbol);
+  FIXME("(%p, %p): stub\n", hProcess, Symbol);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
   return FALSE;
 }
@@ -176,7 +176,7 @@ BOOL WINAPI SymGetSymPrev(
 BOOL WINAPI SymInitialize(
   HANDLE hProcess, LPSTR UserSearchPath, BOOL fInvadeProcess)
 {
-  FIXME("(0x%08x, %s, %d): stub\n",
+  FIXME("(%p, %s, %d): stub\n",
     hProcess, debugstr_a(UserSearchPath), fInvadeProcess
   );
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -191,7 +191,7 @@ BOOL WINAPI SymLoadModule(
   HANDLE hProcess, HANDLE hFile, LPSTR ImageName, LPSTR ModuleName,
   DWORD BaseOfDll, DWORD SizeOfDll)
 {
-  FIXME("(0x%08x, 0x%08x, %s, %s, %ld, %ld): stub\n",
+  FIXME("(%p, %p, %s, %s, %ld, %ld): stub\n",
     hProcess, hFile, debugstr_a(ImageName), debugstr_a(ModuleName),
     BaseOfDll, SizeOfDll
   );
@@ -206,7 +206,7 @@ BOOL WINAPI SymRegisterCallback(
   HANDLE hProcess, PSYMBOL_REGISTERED_CALLBACK CallbackFunction,
   PVOID UserContext)
 {
-  FIXME("(0x%08x, %p, %p): stub\n",
+  FIXME("(%p, %p, %p): stub\n",
     hProcess, CallbackFunction, UserContext
   );
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -228,7 +228,7 @@ DWORD WINAPI SymSetOptions(DWORD SymOptions)
  */
 BOOL WINAPI SymSetSearchPath(HANDLE hProcess, LPSTR szSearchPath)
 {
-  FIXME("(0x%08x, %s): stub\n",
+  FIXME("(%p, %s): stub\n",
     hProcess, debugstr_a(szSearchPath)
   );
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -254,7 +254,7 @@ BOOL WINAPI SymUnDName(
 BOOL WINAPI SymUnloadModule(
   HANDLE hProcess, DWORD BaseOfDll)
 {
-  FIXME("(0x%08x, 0x%08lx): stub\n", hProcess, BaseOfDll);
+  FIXME("(%p, 0x%08lx): stub\n", hProcess, BaseOfDll);
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
   return FALSE;
 }