Compile the advapi32 dll with -DSTRICT.

dlls/advapi32/Makefile.in

-EXTRADEFS = -D_ADVAPI32_ -DWINE_NO_STRICT
+EXTRADEFS = -D_ADVAPI32_
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/advapi32/eventlog.c

@@ -88,7 +88,7 @@ BOOL WINAPI CloseEventLog ( HANDLE hEventLog )
  */
 BOOL WINAPI DeregisterEventSource( HANDLE hEventLog )
 {
-    FIXME("(%d): stub\n",hEventLog);
+    FIXME("(%p): stub\n",hEventLog);
     return TRUE;
 }
 

dlls/advapi32/security.c

@@ -44,7 +44,7 @@ static void dumpLsaAttributes( PLSA_OBJECT_ATTRIBUTES oa )
 {
 	if (oa)
 	{
-	  TRACE("\n\tlength=%lu, rootdir=0x%08x, objectname=%s\n\tattr=0x%08lx, sid=%p qos=%p\n",
+	  TRACE("\n\tlength=%lu, rootdir=%p, objectname=%s\n\tattr=0x%08lx, sid=%p qos=%p\n",
 		oa->Length, oa->RootDirectory,
 		oa->ObjectName?debugstr_w(oa->ObjectName->Buffer):"null",
      		oa->Attributes, oa->SecurityDescriptor, oa->SecurityQualityOfService);
@@ -157,7 +157,7 @@ BOOL WINAPI
 CheckTokenMembership( HANDLE TokenHandle, PSID SidToCheck,
                       PBOOL IsMember )
 {
-  FIXME("(0x%08x %p %p) stub!\n", TokenHandle, SidToCheck, IsMember);
+  FIXME("(%p %p %p) stub!\n", TokenHandle, SidToCheck, IsMember);
 
   *IsMember = TRUE;
   return(TRUE);
@@ -178,7 +178,7 @@ BOOL WINAPI
 GetTokenInformation( HANDLE token, TOKEN_INFORMATION_CLASS tokeninfoclass,
 		     LPVOID tokeninfo, DWORD tokeninfolength, LPDWORD retlen )
 {
-    TRACE("(%x, %s, %p, %ld, %p): \n",
+    TRACE("(%p, %s, %p, %ld, %p): \n",
           token,
           (tokeninfoclass == TokenUser) ? "TokenUser" :
           (tokeninfoclass == TokenGroups) ? "TokenGroups" :
@@ -214,7 +214,7 @@ BOOL WINAPI
 SetTokenInformation( HANDLE token, TOKEN_INFORMATION_CLASS tokeninfoclass,
 		     LPVOID tokeninfo, DWORD tokeninfolength )
 {
-    FIXME("(%x, %s, %p, %ld): stub\n",
+    FIXME("(%p, %s, %p, %ld): stub\n",
           token,
           (tokeninfoclass == TokenUser) ? "TokenUser" :
           (tokeninfoclass == TokenGroups) ? "TokenGroups" :
@@ -251,7 +251,7 @@ SetTokenInformation( HANDLE token, TOKEN_INFORMATION_CLASS tokeninfoclass,
 
 BOOL WINAPI SetThreadToken(PHANDLE thread, HANDLE token)
 {
-    FIXME("(%p, %x): stub (NT impl. only)\n", thread, token);
+    FIXME("(%p, %p): stub (NT impl. only)\n", thread, token);
 
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 
@@ -1011,7 +1011,7 @@ ImpersonateSelf(SECURITY_IMPERSONATION_LEVEL ImpersonationLevel)
  */
 BOOL WINAPI ImpersonateLoggedOnUser(HANDLE hToken)
 {
-    FIXME("(%08x):stub returning FALSE\n", hToken);
+    FIXME("(%p):stub returning FALSE\n", hToken);
     return FALSE;
 }
 
@@ -1088,7 +1088,7 @@ BOOL WINAPI GetAce(PACL pAcl,DWORD dwAceIndex,LPVOID *pAce )
  */
 BOOL WINAPI PrivilegeCheck( HANDLE ClientToken, PPRIVILEGE_SET RequiredPrivileges, LPBOOL pfResult)
 {
-	FIXME("stub %d %p %p\n", ClientToken, RequiredPrivileges, pfResult);
+	FIXME("stub %p %p %p\n", ClientToken, RequiredPrivileges, pfResult);
 	if (pfResult)
 		*pfResult=TRUE;
         return TRUE;

dlls/advapi32/service.c

@@ -42,7 +42,7 @@ EnumServicesStatusA( SC_HANDLE hSCManager, DWORD dwServiceType,
                      DWORD dwServiceState, LPENUM_SERVICE_STATUSA lpServices,
                      DWORD cbBufSize, LPDWORD pcbBytesNeeded,
                      LPDWORD lpServicesReturned, LPDWORD lpResumeHandle )
-{	FIXME("%x type=%lx state=%lx %p %lx %p %p %p\n", hSCManager,
+{	FIXME("%p type=%lx state=%lx %p %lx %p %p %p\n", hSCManager,
 		dwServiceType, dwServiceState, lpServices, cbBufSize,
 		pcbBytesNeeded, lpServicesReturned,  lpResumeHandle);
 	SetLastError (ERROR_ACCESS_DENIED);
@@ -57,7 +57,7 @@ EnumServicesStatusW( SC_HANDLE hSCManager, DWORD dwServiceType,
                      DWORD dwServiceState, LPENUM_SERVICE_STATUSW lpServices,
                      DWORD cbBufSize, LPDWORD pcbBytesNeeded,
                      LPDWORD lpServicesReturned, LPDWORD lpResumeHandle )
-{	FIXME("%x type=%lx state=%lx %p %lx %p %p %p\n", hSCManager,
+{	FIXME("%p type=%lx state=%lx %p %lx %p %p %p\n", hSCManager,
 		dwServiceType, dwServiceState, lpServices, cbBufSize,
 		pcbBytesNeeded, lpServicesReturned,  lpResumeHandle);
 	SetLastError (ERROR_ACCESS_DENIED);
@@ -261,7 +261,7 @@ OpenSCManagerW( LPCWSTR lpMachineName, LPCWSTR lpDatabaseName,
     if (r!=ERROR_SUCCESS)
         return 0;
 
-    TRACE("returning %x\n",hKey);
+    TRACE("returning %p\n",hKey);
 
     return hKey;
 }
@@ -297,7 +297,7 @@ BOOL WINAPI
 ControlService( SC_HANDLE hService, DWORD dwControl,
                 LPSERVICE_STATUS lpServiceStatus )
 {
-    FIXME("(%d,%ld,%p): stub\n",hService,dwControl,lpServiceStatus);
+    FIXME("(%p,%ld,%p): stub\n",hService,dwControl,lpServiceStatus);
     return TRUE;
 }
 
@@ -314,7 +314,7 @@ ControlService( SC_HANDLE hService, DWORD dwControl,
 BOOL WINAPI
 CloseServiceHandle( SC_HANDLE hSCObject )
 {
-    TRACE("(%x)\n", hSCObject);
+    TRACE("(%p)\n", hSCObject);
 
     RegCloseKey(hSCObject);
 
@@ -364,7 +364,7 @@ OpenServiceW(SC_HANDLE hSCManager, LPCWSTR lpServiceName,
     HKEY hKey;
     long r;
 
-    TRACE("(%d,%p,%ld)\n",hSCManager, lpServiceName,
+    TRACE("(%p,%p,%ld)\n",hSCManager, lpServiceName,
           dwDesiredAccess);
 
     MultiByteToWideChar( CP_ACP, 0, str, -1, lpServiceKey, sizeof(lpServiceKey)/sizeof(WCHAR) );
@@ -377,7 +377,7 @@ OpenServiceW(SC_HANDLE hSCManager, LPCWSTR lpServiceName,
     if (r!=ERROR_SUCCESS)
         return 0;
 
-    TRACE("returning %x\n",hKey);
+    TRACE("returning %p\n",hKey);
 
     return hKey;
 }
@@ -394,7 +394,7 @@ CreateServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName,
                   LPCWSTR lpDependencies, LPCWSTR lpServiceStartName,
                   LPCWSTR lpPassword )
 {
-    FIXME("(%u,%s,%s,...)\n", hSCManager, debugstr_w(lpServiceName), debugstr_w(lpDisplayName));
+    FIXME("(%p,%s,%s,...)\n", hSCManager, debugstr_w(lpServiceName), debugstr_w(lpDisplayName));
     return 0;
 }
 
@@ -415,7 +415,7 @@ CreateServiceA( SC_HANDLE hSCManager, LPCSTR lpServiceName,
     LONG r;
     DWORD dp;
 
-    TRACE("(%u,%s,%s,...)\n", hSCManager, debugstr_a(lpServiceName), debugstr_a(lpDisplayName));
+    TRACE("(%p,%s,%s,...)\n", hSCManager, debugstr_a(lpServiceName), debugstr_a(lpDisplayName));
 
     r = RegCreateKeyExA(hSCManager, lpServiceName, 0, NULL,
                        REG_OPTION_NON_VOLATILE, dwDesiredAccess, NULL, &hKey, &dp);
@@ -507,7 +507,7 @@ CreateServiceA( SC_HANDLE hSCManager, LPCSTR lpServiceName,
 BOOL WINAPI
 DeleteService( SC_HANDLE hService )
 {
-    FIXME("(%d): stub\n",hService);
+    FIXME("(%p): stub\n",hService);
     return TRUE;
 }
 
@@ -523,7 +523,7 @@ StartServiceA( SC_HANDLE hService, DWORD dwNumServiceArgs,
     LPWSTR *lpwstr=NULL;
     int i;
 
-    TRACE("(%d,%ld,%p)\n",hService,dwNumServiceArgs,lpServiceArgVectors);
+    TRACE("(%p,%ld,%p)\n",hService,dwNumServiceArgs,lpServiceArgVectors);
 
     if(dwNumServiceArgs)
         lpwstr = (LPWSTR*) HeapAlloc( GetProcessHeap(), 0,
@@ -584,7 +584,7 @@ StartServiceW( SC_HANDLE hService, DWORD dwNumServiceArgs,
     PROCESS_INFORMATION procinfo;
     STARTUPINFOA startupinfo;
 
-    TRACE("(%d,%ld,%p)\n",hService,dwNumServiceArgs,
+    TRACE("(%p,%ld,%p)\n",hService,dwNumServiceArgs,
           lpServiceArgVectors);
 
     size = sizeof str;
@@ -678,7 +678,7 @@ QueryServiceStatus( SC_HANDLE hService, LPSERVICE_STATUS lpservicestatus )
     LONG r;
     DWORD type, val, size;
 
-    FIXME("(%x,%p) partial\n",hService,lpservicestatus);
+    FIXME("(%p,%p) partial\n",hService,lpservicestatus);
 
     /* read the service type from the registry */
     size = sizeof val;