Ros-diffs March 2022

ros-diffs@reactos.org

20 participants
436 discussions

[reactos] 01/01: [SERVICES] Tweak the binary size a bit CORE-18071

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d31a55723797ce85f60a7… commit d31a55723797ce85f60a7fa1491d916a583b1167 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Mar 20 20:12:56 2022 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Mar 20 20:12:56 2022 +0100 [SERVICES] Tweak the binary size a bit CORE-18071 Fixes some typos like "alread"->"already" and kill g_dwServiceBits in rpcserver.cpp and omit points and exclamation marks at end of prints. On GCC8.4.0dbg RosBE2.2.1 this shrinks the file for me from 210.432 to 209.920 The file is loaded many times into memory, therefore optimization pays off here at runtime memory consumption. Also shorten to H. Poussineau in the header sections, to stop git from displaying diff in that line on each review due to that special char. --- base/system/services/controlset.c | 10 +-- base/system/services/database.c | 18 ++-- base/system/services/driver.c | 2 +- base/system/services/rpcserver.c | 173 ++++++++++++++++++-------------------- base/system/services/services.c | 20 ++--- 5 files changed, 108 insertions(+), 115 deletions(-) diff --git a/base/system/services/controlset.c b/base/system/services/controlset.c index e34eb2f3528..b387ffd335c 100644 --- a/base/system/services/controlset.c +++ b/base/system/services/controlset.c @@ -630,7 +630,7 @@ ScmCreateLastKnownGoodControlSet(VOID) if ((ScmGetSetupInProgress() == 0) && (dwCurrentControlSet == dwLastKnownGoodControlSet)) { - DPRINT("First boot after setup!\n"); + DPRINT("First boot after setup\n"); /* Search for a new control set number */ for (dwNewControlSet = 1; dwNewControlSet < 1000; dwNewControlSet++) @@ -645,7 +645,7 @@ ScmCreateLastKnownGoodControlSet(VOID) /* Fail if we did not find an unused control set!*/ if (dwNewControlSet >= 1000) { - DPRINT1("Too many control sets!\n"); + DPRINT1("Too many control sets\n"); return ERROR_NO_MORE_ITEMS; } @@ -683,7 +683,7 @@ ScmAcceptBoot(VOID) if (bBootAccepted) { - DPRINT1("Boot has alread been accepted!\n"); + DPRINT1("Boot has already been accepted\n"); return ERROR_BOOT_ALREADY_ACCEPTED; } @@ -708,7 +708,7 @@ ScmAcceptBoot(VOID) /* Fail if we did not find an unused control set!*/ if (dwNewControlSet >= 1000) { - DPRINT1("Too many control sets!\n"); + DPRINT1("Too many control sets\n"); return ERROR_NO_MORE_ITEMS; } @@ -744,7 +744,7 @@ ScmRunLastKnownGood(VOID) if (bBootAccepted) { - DPRINT1("Boot has alread been accepted!\n"); + DPRINT1("Boot has already been accepted\n"); return ERROR_BOOT_ALREADY_ACCEPTED; } diff --git a/base/system/services/database.c b/base/system/services/database.c index 6b710926205..ad790736177 100644 --- a/base/system/services/database.c +++ b/base/system/services/database.c @@ -4,7 +4,7 @@ * FILE: base/system/services/database.c * PURPOSE: Database control interface * COPYRIGHT: Copyright 2002-2006 Eric Kohl - * Copyright 2006 Herv� Poussineau <hpoussin(a)reactos.org> + * Copyright 2006 H. Poussineau <hpoussin(a)reactos.org> * Copyright 2007 Ged Murphy <gedmurphy(a)reactos.org> * Gregor Brunmar <gregor.brunmar(a)home.se> * @@ -141,7 +141,7 @@ ScmCreateNewControlPipe( DPRINT("CreateNamedPipeW(%S) done\n", szControlPipeName); if (pServiceImage->hControlPipe == INVALID_HANDLE_VALUE) { - DPRINT1("Failed to create control pipe!\n"); + DPRINT1("Failed to create control pipe\n"); return GetLastError(); } @@ -323,7 +323,7 @@ ScmEnableBackupRestorePrivileges( pTokenPrivileges = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwSize); if (pTokenPrivileges == NULL) { - DPRINT1("Failed to allocate the privilege buffer!\n"); + DPRINT1("Failed to allocate privilege buffer\n"); goto done; } @@ -989,7 +989,7 @@ CreateServiceListEntry(LPCWSTR lpServiceName, /* Assing the default security descriptor if the security descriptor cannot be read */ if (lpService->pSecurityDescriptor == NULL) { - DPRINT("No security descriptor found! Assign default security descriptor!\n"); + DPRINT("No security descriptor found! Assign default security descriptor\n"); dwError = ScmCreateDefaultServiceSD(&lpService->pSecurityDescriptor); if (dwError != ERROR_SUCCESS) goto done; @@ -1769,7 +1769,7 @@ ScmWaitForServiceConnect(PSERVICE Service) } } - DPRINT("Control pipe connected!\n"); + DPRINT("Control pipe connected\n"); Overlapped.hEvent = (HANDLE) NULL; @@ -1901,7 +1901,7 @@ ScmStartUserModeService(PSERVICE Service, if (!CreateEnvironmentBlock(&lpEnvironment, Service->lpImage->hToken, FALSE)) { /* We failed, run the service with the current environment */ - DPRINT1("CreateEnvironmentBlock() failed with error %d; service '%S' will run with the current environment.\n", + DPRINT1("CreateEnvironmentBlock() failed with error %d; service '%S' will run with current environment\n", GetLastError(), Service->lpServiceName); lpEnvironment = NULL; } @@ -1941,7 +1941,7 @@ ScmStartUserModeService(PSERVICE Service, if (!CreateEnvironmentBlock(&lpEnvironment, NULL, TRUE)) { /* We failed, run the service with the current environment */ - DPRINT1("CreateEnvironmentBlock() failed with error %d; service '%S' will run with the current environment.\n", + DPRINT1("CreateEnvironmentBlock() failed with error %d; service '%S' will run with current environment\n", GetLastError(), Service->lpServiceName); lpEnvironment = NULL; } @@ -2030,7 +2030,7 @@ ScmLoadService(PSERVICE Service, if (Service->Status.dwCurrentState != SERVICE_STOPPED) { - DPRINT("Service %S is already running!\n", Service->lpServiceName); + DPRINT("Service %S is already running\n", Service->lpServiceName); return ERROR_SERVICE_ALREADY_RUNNING; } @@ -2273,7 +2273,7 @@ ScmAutoStartServices(VOID) } else { - DPRINT1("WARNING: Could not open the associated Safe Boot key!"); + DPRINT1("WARNING: Could not open the associated Safe Boot key"); CurrentService->ServiceVisited = FALSE; } } diff --git a/base/system/services/driver.c b/base/system/services/driver.c index 2293acd053d..cc4fe24b781 100644 --- a/base/system/services/driver.c +++ b/base/system/services/driver.c @@ -179,7 +179,7 @@ ScmGetDriverStatus(PSERVICE lpService, &ObjectAttributes); if (!NT_SUCCESS(Status)) { - DPRINT1("NtOpenDirectoryObject() failed!\n"); + DPRINT1("NtOpenDirectoryObject() failed\n"); return RtlNtStatusToDosError(Status); } diff --git a/base/system/services/rpcserver.c b/base/system/services/rpcserver.c index 741dc1c84e1..2c8e96d3b57 100644 --- a/base/system/services/rpcserver.c +++ b/base/system/services/rpcserver.c @@ -4,7 +4,7 @@ * FILE: base/system/services/rpcserver.c * PURPOSE: RPC server interface for the advapi32 calls * COPYRIGHT: Copyright 2005-2006 Eric Kohl - * Copyright 2006-2007 Hervé Poussineau <hpoussin(a)reactos.org> + * Copyright 2006-2007 H. Poussineau <hpoussin(a)reactos.org> * Copyright 2007 Ged Murphy <gedmurphy(a)reactos.org> */ @@ -99,7 +99,6 @@ ScmServiceMapping = {SERVICE_READ, SERVICE_EXECUTE, SERVICE_ALL_ACCESS}; -DWORD g_dwServiceBits = 0; /* FUNCTIONS ***************************************************************/ @@ -156,7 +155,7 @@ ScmCreateManagerHandle(LPWSTR lpDatabaseName, } else if (_wcsicmp(lpDatabaseName, SERVICES_ACTIVE_DATABASEW) != 0) { - DPRINT("Invalid Database name %S.\n", lpDatabaseName); + DPRINT("Invalid Database name %S\n", lpDatabaseName); return ERROR_INVALID_NAME; } @@ -210,7 +209,7 @@ ScmGetServiceManagerFromHandle(SC_RPC_HANDLE Handle) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - DPRINT1("Exception: Invalid Service Manager handle!\n"); + DPRINT1("Exception: Invalid Service Manager handle\n"); } _SEH2_END; @@ -230,7 +229,7 @@ ScmGetServiceFromHandle(SC_RPC_HANDLE Handle) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - DPRINT1("Exception: Invalid Service handle!\n"); + DPRINT1("Exception: Invalid Service handle\n"); } _SEH2_END; @@ -429,7 +428,7 @@ ScmConvertToBootPathName(wchar_t *CanonName, wchar_t **RelativeName) (ServiceNameLen + 1) * sizeof(WCHAR)); if (*RelativeName == NULL) { - DPRINT("Error allocating memory for boot driver name!\n"); + DPRINT("Error allocating memory for boot driver name\n"); return ERROR_NOT_ENOUGH_MEMORY; } @@ -451,7 +450,7 @@ ScmConvertToBootPathName(wchar_t *CanonName, wchar_t **RelativeName) if (*RelativeName == NULL) { - DPRINT("Error allocating memory for boot driver name!\n"); + DPRINT("Error allocating memory for boot driver name\n"); return ERROR_NOT_ENOUGH_MEMORY; } @@ -477,7 +476,7 @@ ScmConvertToBootPathName(wchar_t *CanonName, wchar_t **RelativeName) (BufferSize + 1) * sizeof(WCHAR)); if (!Expanded) { - DPRINT("Error allocating memory for boot driver name!\n"); + DPRINT("Error allocating memory for boot driver name\n"); return ERROR_NOT_ENOUGH_MEMORY; } @@ -508,7 +507,7 @@ ScmConvertToBootPathName(wchar_t *CanonName, wchar_t **RelativeName) NtPathName.Length + sizeof(UNICODE_NULL)); if (!Expanded) { - DPRINT("Error allocating memory for boot driver name!\n"); + DPRINT("Error allocating memory for boot driver name\n"); RtlFreeUnicodeString(&NtPathName); return ERROR_NOT_ENOUGH_MEMORY; } @@ -529,7 +528,7 @@ ScmConvertToBootPathName(wchar_t *CanonName, wchar_t **RelativeName) (ServiceNameLen - ExpandedLen) * sizeof(WCHAR) + 13*sizeof(WCHAR)); if (*RelativeName == NULL) { - DPRINT("Error allocating memory for boot driver name!\n"); + DPRINT("Error allocating memory for boot driver name\n"); return ERROR_NOT_ENOUGH_MEMORY; } @@ -663,7 +662,7 @@ ScmCanonDriverImagePath(DWORD dwStartType, if (*lpCanonName == NULL) { - DPRINT("Error allocating memory for canonized service name!\n"); + DPRINT("Error allocating memory for canonized service name\n"); return ERROR_NOT_ENOUGH_MEMORY; } @@ -689,7 +688,7 @@ ScmCanonDriverImagePath(DWORD dwStartType, if (*lpCanonName == NULL) { - DPRINT("Error allocating memory for canonized service name!\n"); + DPRINT("Error allocating memory for canonized service name\n"); return ERROR_NOT_ENOUGH_MEMORY; } @@ -712,7 +711,7 @@ ScmCanonDriverImagePath(DWORD dwStartType, if (*lpCanonName == NULL) { - DPRINT("Error allocating memory for canonized service name!\n"); + DPRINT("Error allocating memory for canonized service name\n"); return ERROR_NOT_ENOUGH_MEMORY; } @@ -725,7 +724,7 @@ ScmCanonDriverImagePath(DWORD dwStartType, /* It seems to be a DOS path, convert it */ if (!RtlDosPathNameToNtPathName_U(lpServiceName, &NtServiceName, NULL, NULL)) { - DPRINT("RtlDosPathNameToNtPathName_U() failed!\n"); + DPRINT("RtlDosPathNameToNtPathName_U() failed\n"); return ERROR_INVALID_PARAMETER; } @@ -735,7 +734,7 @@ ScmCanonDriverImagePath(DWORD dwStartType, if (*lpCanonName == NULL) { - DPRINT("Error allocating memory for canonized service name!\n"); + DPRINT("Error allocating memory for canonized service name\n"); RtlFreeUnicodeString(&NtServiceName); return ERROR_NOT_ENOUGH_MEMORY; } @@ -758,7 +757,7 @@ ScmCanonDriverImagePath(DWORD dwStartType, { /* There is a problem, free name and return */ HeapFree(GetProcessHeap(), 0, *lpCanonName); - DPRINT("Error converting named!\n"); + DPRINT("Error converting named\n"); return Result; } @@ -816,7 +815,7 @@ Int_EnumDependentServicesW(HKEY hServicesKey, NULL); if (dwError != ERROR_SUCCESS) { - DPRINT("ERROR! Unable to get number of services keys.\n"); + DPRINT("ERROR! Unable to get number of services keys\n"); return dwError; } @@ -1022,7 +1021,7 @@ RCloseServiceHandle( /* If pcbBytesNeeded returned a value then there are services running that are dependent on this service */ if (pcbBytesNeeded) { - DPRINT("Deletion failed due to running dependencies.\n"); + DPRINT("Deletion failed due to running dependencies\n"); RegCloseKey(hServicesKey); ScmUnlockDatabase(); return ERROR_SUCCESS; @@ -1093,7 +1092,7 @@ RControlService( hSvc = ScmGetServiceFromHandle(hService); if (hSvc == NULL) { - DPRINT1("Invalid service handle!\n"); + DPRINT1("Invalid service handle\n"); return ERROR_INVALID_HANDLE; } @@ -1101,7 +1100,7 @@ RControlService( lpService = hSvc->ServiceEntry; if (lpService == NULL) { - DPRINT1("lpService == NULL!\n"); + DPRINT1("lpService == NULL\n"); return ERROR_INVALID_HANDLE; } @@ -1174,7 +1173,7 @@ RControlService( are dependent on this service */ if (pcbBytesNeeded != 0) { - DPRINT("Service has running dependencies. Failed to stop service.\n"); + DPRINT("Service has running dependencies. Failed to stop service\n"); return ERROR_DEPENDENT_SERVICES_RUNNING; } } @@ -1316,7 +1315,7 @@ RDeleteService( hSvc = ScmGetServiceFromHandle(hService); if (hSvc == NULL) { - DPRINT1("Invalid service handle!\n"); + DPRINT1("Invalid service handle\n"); return ERROR_INVALID_HANDLE; } @@ -1327,7 +1326,7 @@ RDeleteService( lpService = hSvc->ServiceEntry; if (lpService == NULL) { - DPRINT("lpService == NULL!\n"); + DPRINT("lpService == NULL\n"); return ERROR_INVALID_HANDLE; } @@ -1336,7 +1335,7 @@ RDeleteService( if (lpService->bDeleted) { - DPRINT("The service has already been marked for delete!\n"); + DPRINT("Service has already been marked for delete\n"); dwError = ERROR_SERVICE_MARKED_FOR_DELETE; goto Done; } @@ -1372,7 +1371,7 @@ RLockServiceDatabase( hMgr = ScmGetServiceManagerFromHandle(hSCManager); if (hMgr == NULL) { - DPRINT1("Invalid service manager handle!\n"); + DPRINT1("Invalid service manager handle\n"); return ERROR_INVALID_HANDLE; } @@ -1406,7 +1405,7 @@ RQueryServiceObjectSecurity( hSvc = ScmGetServiceFromHandle(hService); if (hSvc == NULL) { - DPRINT1("Invalid service handle!\n"); + DPRINT1("Invalid service handle\n"); return ERROR_INVALID_HANDLE; } @@ -1428,7 +1427,7 @@ RQueryServiceObjectSecurity( lpService = hSvc->ServiceEntry; if (lpService == NULL) { - DPRINT("lpService == NULL!\n"); + DPRINT("lpService == NULL\n"); return ERROR_INVALID_HANDLE; } @@ -1491,7 +1490,7 @@ RSetServiceObjectSecurity( hSvc = ScmGetServiceFromHandle(hService); if (hSvc == NULL) { - DPRINT1("Invalid service handle!\n"); + DPRINT1("Invalid service handle\n"); return ERROR_INVALID_HANDLE; } @@ -1536,7 +1535,7 @@ RSetServiceObjectSecurity( lpService = hSvc->ServiceEntry; if (lpService == NULL) { - DPRINT1("lpService == NULL!\n"); + DPRINT1("lpService == NULL\n"); return ERROR_INVALID_HANDLE; } @@ -1620,7 +1619,7 @@ RQueryServiceStatus( hSvc = ScmGetServiceFromHandle(hService); if (hSvc == NULL) { - DPRINT1("Invalid service handle!\n"); + DPRINT1("Invalid service handle\n"); return ERROR_INVALID_HANDLE; } @@ -1634,7 +1633,7 @@ RQueryServiceStatus( lpService = hSvc->ServiceEntry; if (lpService == NULL) { - DPRINT("lpService == NULL!\n"); + DPRINT("lpService == NULL\n"); return ERROR_INVALID_HANDLE; } @@ -1699,7 +1698,7 @@ RSetServiceStatus( if (hServiceStatus == 0) { - DPRINT("hServiceStatus == NULL!\n"); + DPRINT("hServiceStatus == NULL\n"); return ERROR_INVALID_HANDLE; } @@ -1708,7 +1707,7 @@ RSetServiceStatus( /* Check current state */ if (!ScmIsValidServiceState(lpServiceStatus->dwCurrentState)) { - DPRINT("Invalid service state!\n"); + DPRINT("Invalid service state\n"); return ERROR_INVALID_DATA; } @@ -1716,14 +1715,14 @@ RSetServiceStatus( if (!(lpServiceStatus->dwServiceType & SERVICE_WIN32) && (lpServiceStatus->dwServiceType & SERVICE_DRIVER)) { - DPRINT("Invalid service type!\n"); + DPRINT("Invalid service type\n"); return ERROR_INVALID_DATA; } /* Check accepted controls */ if (lpServiceStatus->dwControlsAccepted & ~0xFF) { - DPRINT("Invalid controls accepted!\n"); + DPRINT("Invalid controls accepted\n"); return ERROR_INVALID_DATA; } @@ -1884,7 +1883,7 @@ RI_ScSetServiceBitsW( if (hServiceStatus == 0) { - DPRINT("hServiceStatus == NULL!\n"); + DPRINT("hServiceStatus == NULL\n"); return ERROR_INVALID_HANDLE; } @@ -1894,20 +1893,14 @@ RI_ScSetServiceBitsW( if (bSetBitsOn) { DPRINT("Old service bits: %08lx\n", pService->dwServiceBits); - DPRINT("Old global service bits: %08lx\n", g_dwServiceBits); pService->dwServiceBits |= dwServiceBits; - g_dwServiceBits |= dwServiceBits; DPRINT("New service bits: %08lx\n", pService->dwServiceBits); - DPRINT("New global service bits: %08lx\n", g_dwServiceBits); } else { DPRINT("Old service bits: %08lx\n", pService->dwServiceBits); - DPRINT("Old global service bits: %08lx\n", g_dwServiceBits); pService->dwServiceBits &= ~dwServiceBits; - g_dwServiceBits &= ~dwServiceBits; DPRINT("New service bits: %08lx\n", pService->dwServiceBits); - DPRINT("New global service bits: %08lx\n", g_dwServiceBits); } return ERROR_SUCCESS; @@ -1957,7 +1950,7 @@ RChangeServiceConfigW( hSvc = ScmGetServiceFromHandle(hService); if (hSvc == NULL) { - DPRINT1("Invalid service handle!\n"); + DPRINT1("Invalid service handle\n"); return ERROR_INVALID_HANDLE; } @@ -2016,7 +2009,7 @@ RChangeServiceConfigW( lpService = hSvc->ServiceEntry; if (lpService == NULL) { - DPRINT("lpService == NULL!\n"); + DPRINT("lpService == NULL\n"); return ERROR_INVALID_HANDLE; } @@ -2025,7 +2018,7 @@ RChangeServiceConfigW( if (lpService->bDeleted) { - DPRINT("The service has already been marked for delete!\n"); + DPRINT("Service has already been marked for delete\n"); dwError = ERROR_SERVICE_MARKED_FOR_DELETE; goto done; } @@ -2313,7 +2306,7 @@ RCreateServiceW( hManager = ScmGetServiceManagerFromHandle(hSCManager); if (hManager == NULL) { - DPRINT1("Invalid service manager handle!\n"); + DPRINT1("Invalid service manager handle\n"); return ERROR_INVALID_HANDLE; } @@ -2730,7 +2723,7 @@ REnumDependentServicesW( hSvc = ScmGetServiceFromHandle(hService); if (hSvc == NULL) { - DPRINT1("Invalid service handle!\n"); + DPRINT1("Invalid service handle\n"); return ERROR_INVALID_HANDLE; } @@ -2777,7 +2770,7 @@ REnumDependentServicesW( (dwServicesReturned + 1) * sizeof(PSERVICE)); if (!lpServicesArray) { - DPRINT1("Could not allocate a buffer!!\n"); + DPRINT1("Could not allocate buffer\n"); dwError = ERROR_NOT_ENOUGH_MEMORY; goto Done; } @@ -2940,7 +2933,7 @@ ROpenServiceW( hManager = ScmGetServiceManagerFromHandle(hSCManager); if (hManager == NULL) { - DPRINT1("Invalid service manager handle!\n"); + DPRINT1("Invalid service manager handle\n"); return ERROR_INVALID_HANDLE; } @@ -2957,7 +2950,7 @@ ROpenServiceW( lpService = ScmGetServiceEntryByName(lpServiceName); if (lpService == NULL) { - DPRINT("Could not find the service!\n"); + DPRINT("Could not find service\n"); dwError = ERROR_SERVICE_DOES_NOT_EXIST; goto Done; } @@ -3026,7 +3019,7 @@ RQueryServiceConfigW( hSvc = ScmGetServiceFromHandle(hService); if (hSvc == NULL) { - DPRINT1("Invalid service handle!\n"); + DPRINT1("Invalid service handle\n"); return ERROR_INVALID_HANDLE; } @@ -3040,7 +3033,7 @@ RQueryServiceConfigW( lpService = hSvc->ServiceEntry; if (lpService == NULL) { - DPRINT("lpService == NULL!\n"); + DPRINT("lpService == NULL\n"); return ERROR_INVALID_HANDLE; } @@ -3224,7 +3217,7 @@ RQueryServiceLockStatusW( hMgr = ScmGetServiceManagerFromHandle(hSCManager); if (hMgr == NULL) { - DPRINT1("Invalid service manager handle!\n"); + DPRINT1("Invalid service manager handle\n"); return ERROR_INVALID_HANDLE; } @@ -3280,7 +3273,7 @@ RStartServiceW( hSvc = ScmGetServiceFromHandle(hService); if (hSvc == NULL) { - DPRINT1("Invalid service handle!\n"); + DPRINT1("Invalid service handle\n"); return ERROR_INVALID_HANDLE; } @@ -3294,7 +3287,7 @@ RStartServiceW( lpService = hSvc->ServiceEntry; if (lpService == NULL) { - DPRINT("lpService == NULL!\n"); + DPRINT("lpService == NULL\n"); return ERROR_INVALID_HANDLE; } @@ -3336,7 +3329,7 @@ RGetServiceDisplayNameW( hManager = (PMANAGER_HANDLE)hSCManager; if (hManager->Handle.Tag != MANAGER_TAG) { - DPRINT("Invalid manager handle!\n"); + DPRINT("Invalid manager handle\n"); return ERROR_INVALID_HANDLE; } #endif @@ -3345,7 +3338,7 @@ RGetServiceDisplayNameW( lpService = ScmGetServiceEntryByName(lpServiceName); if (lpService == NULL) { - DPRINT("Could not find the service!\n"); + DPRINT("Could not find service\n"); return ERROR_SERVICE_DOES_NOT_EXIST; } @@ -3398,7 +3391,7 @@ RGetServiceKeyNameW( hManager = (PMANAGER_HANDLE)hSCManager; if (hManager->Handle.Tag != MANAGER_TAG) { - DPRINT("Invalid manager handle!\n"); + DPRINT("Invalid manager handle\n"); return ERROR_INVALID_HANDLE; } #endif @@ -3407,7 +3400,7 @@ RGetServiceKeyNameW( lpService = ScmGetServiceEntryByDisplayName(lpDisplayName); if (lpService == NULL) { - DPRINT("Could not find the service!\n"); + DPRINT("Could not find service\n"); return ERROR_SERVICE_DOES_NOT_EXIST; } @@ -3768,7 +3761,7 @@ REnumDependentServicesA( hSvc = ScmGetServiceFromHandle(hService); if (hSvc == NULL) { - DPRINT1("Invalid service handle!\n"); + DPRINT1("Invalid service handle\n"); return ERROR_INVALID_HANDLE; } @@ -3820,7 +3813,7 @@ REnumDependentServicesA( (dwServicesReturned + 1) * sizeof(PSERVICE)); if (!lpServicesArray) { - DPRINT("Could not allocate a buffer!!\n"); + DPRINT("Could not allocate buffer\n"); dwError = ERROR_NOT_ENOUGH_MEMORY; goto Done; } @@ -3926,7 +3919,7 @@ REnumServicesStatusA( lpStatusPtrW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwBufSize); if (!lpStatusPtrW) { - DPRINT("Failed to allocate buffer!\n"); + DPRINT("Failed to allocate buffer\n"); return ERROR_NOT_ENOUGH_MEMORY; } } @@ -4097,7 +4090,7 @@ RQueryServiceConfigA( hSvc = ScmGetServiceFromHandle(hService); if (hSvc == NULL) { - DPRINT1("Invalid service handle!\n"); + DPRINT1("Invalid service handle\n"); return ERROR_INVALID_HANDLE; } @@ -4111,7 +4104,7 @@ RQueryServiceConfigA( lpService = hSvc->ServiceEntry; if (lpService == NULL) { - DPRINT("lpService == NULL!\n"); + DPRINT("lpService == NULL\n"); return ERROR_INVALID_HANDLE; } @@ -4328,7 +4321,7 @@ RQueryServiceLockStatusA( hMgr = ScmGetServiceManagerFromHandle(hSCManager); if (hMgr == NULL) { - DPRINT1("Invalid service manager handle!\n"); + DPRINT1("Invalid service manager handle\n"); return ERROR_INVALID_HANDLE; } @@ -4375,7 +4368,7 @@ RStartServiceA( hSvc = ScmGetServiceFromHandle(hService); if (hSvc == NULL) { - DPRINT1("Invalid service handle!\n"); + DPRINT1("Invalid service handle\n"); return ERROR_INVALID_HANDLE; } @@ -4389,7 +4382,7 @@ RStartServiceA( lpService = hSvc->ServiceEntry; if (lpService == NULL) { - DPRINT("lpService == NULL!\n"); + DPRINT("lpService == NULL\n"); return ERROR_INVALID_HANDLE; } @@ -4479,7 +4472,7 @@ RGetServiceDisplayNameA( hManager = (PMANAGER_HANDLE)hSCManager; if (hManager->Handle.Tag != MANAGER_TAG) { - DPRINT("Invalid manager handle!\n"); + DPRINT("Invalid manager handle\n"); return ERROR_INVALID_HANDLE; } #endif @@ -4508,7 +4501,7 @@ RGetServiceDisplayNameA( if (lpService == NULL) { - DPRINT("Could not find the service!\n"); + DPRINT("Could not find service\n"); return ERROR_SERVICE_DOES_NOT_EXIST; } @@ -4600,7 +4593,7 @@ RGetServiceKeyNameA( hManager = (PMANAGER_HANDLE)hSCManager; if (hManager->Handle.Tag != MANAGER_TAG) { - DPRINT("Invalid manager handle!\n"); + DPRINT("Invalid manager handle\n"); return ERROR_INVALID_HANDLE; } #endif @@ -4627,7 +4620,7 @@ RGetServiceKeyNameA( if (lpService == NULL) { - DPRINT("Could not find the service!\n"); + DPRINT("Could not find service\n"); return ERROR_SERVICE_DOES_NOT_EXIST; } @@ -4710,7 +4703,7 @@ RI_ScGetCurrentGroupStateW( hManager = ScmGetServiceManagerFromHandle(hSCManager); if (hManager == NULL) { - DPRINT1("Invalid service manager handle!\n"); + DPRINT1("Invalid service manager handle\n"); return ERROR_INVALID_HANDLE; } @@ -4782,7 +4775,7 @@ REnumServiceGroupW( hManager = ScmGetServiceManagerFromHandle(hSCManager); if (hManager == NULL) { - DPRINT1("Invalid service manager handle!\n"); + DPRINT1("Invalid service manager handle\n"); return ERROR_INVALID_HANDLE; } @@ -4797,14 +4790,14 @@ REnumServiceGroupW( if ((dwServiceType == 0) || ((dwServiceType & ~SERVICE_TYPE_ALL) != 0)) { - DPRINT("Not a valid Service Type!\n"); + DPRINT("Invalid Service Type\n"); return ERROR_INVALID_PARAMETER; } if ((dwServiceState == 0) || ((dwServiceState & ~SERVICE_STATE_ALL) != 0)) { - DPRINT("Not a valid Service State!\n"); + DPRINT("Invalid Service State\n"); return ERROR_INVALID_PARAMETER; } @@ -5442,7 +5435,7 @@ RChangeServiceConfig2W( hSvc = ScmGetServiceFromHandle(hService); if (hSvc == NULL) { - DPRINT("Invalid service handle!\n"); + DPRINT("Invalid service handle\n"); return ERROR_INVALID_HANDLE; } @@ -5466,7 +5459,7 @@ RChangeServiceConfig2W( lpService = hSvc->ServiceEntry; if (lpService == NULL) { - DPRINT("lpService == NULL!\n"); + DPRINT("lpService == NULL\n"); return ERROR_INVALID_HANDLE; } @@ -5482,7 +5475,7 @@ RChangeServiceConfig2W( if (lpService->bDeleted) { - DPRINT("The service has already been marked for delete!\n"); + DPRINT("Service has already been marked for delete\n"); dwError = ERROR_SERVICE_MARKED_FOR_DELETE; goto done; } @@ -5584,7 +5577,7 @@ RQueryServiceConfig2A( hSvc = ScmGetServiceFromHandle(hService); if (hSvc == NULL) { - DPRINT1("Invalid service handle!\n"); + DPRINT1("Invalid service handle\n"); return ERROR_INVALID_HANDLE; } @@ -5598,7 +5591,7 @@ RQueryServiceConfig2A( lpService = hSvc->ServiceEntry; if (lpService == NULL) { - DPRINT("lpService == NULL!\n"); + DPRINT("lpService == NULL\n"); return ERROR_INVALID_HANDLE; } @@ -5830,7 +5823,7 @@ RQueryServiceConfig2W( hSvc = ScmGetServiceFromHandle(hService); if (hSvc == NULL) { - DPRINT1("Invalid service handle!\n"); + DPRINT1("Invalid service handle\n"); return ERROR_INVALID_HANDLE; } @@ -5844,7 +5837,7 @@ RQueryServiceConfig2W( lpService = hSvc->ServiceEntry; if (lpService == NULL) { - DPRINT("lpService == NULL!\n"); + DPRINT("lpService == NULL\n"); return ERROR_INVALID_HANDLE; } @@ -6047,7 +6040,7 @@ RQueryServiceStatusEx( hSvc = ScmGetServiceFromHandle(hService); if (hSvc == NULL) { - DPRINT1("Invalid service handle!\n"); + DPRINT1("Invalid service handle\n"); return ERROR_INVALID_HANDLE; } @@ -6061,7 +6054,7 @@ RQueryServiceStatusEx( lpService = hSvc->ServiceEntry; if (lpService == NULL) { - DPRINT("lpService == NULL!\n"); + DPRINT("lpService == NULL\n"); return ERROR_INVALID_HANDLE; } @@ -6126,7 +6119,7 @@ REnumServicesStatusExA( pszGroupNameW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (strlen(pszGroupName) + 1) * sizeof(WCHAR)); if (!pszGroupNameW) { - DPRINT("Failed to allocate buffer!\n"); + DPRINT("Failed to allocate buffer\n"); dwError = ERROR_NOT_ENOUGH_MEMORY; goto Done; } @@ -6144,7 +6137,7 @@ REnumServicesStatusExA( lpStatusPtrW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cbBufSize); if (!lpStatusPtrW) { - DPRINT("Failed to allocate buffer!\n"); + DPRINT("Failed to allocate buffer\n"); dwError = ERROR_NOT_ENOUGH_MEMORY; goto Done; } @@ -6268,7 +6261,7 @@ REnumServicesStatusExW( hManager = ScmGetServiceManagerFromHandle(hSCManager); if (hManager == NULL) { - DPRINT1("Invalid service manager handle!\n"); + DPRINT1("Invalid service manager handle\n"); return ERROR_INVALID_HANDLE; } @@ -6283,14 +6276,14 @@ REnumServicesStatusExW( if ((dwServiceType == 0) || ((dwServiceType & ~SERVICE_TYPE_ALL) != 0)) { - DPRINT("Not a valid Service Type!\n"); + DPRINT("Invalid Service Type\n"); return ERROR_INVALID_PARAMETER; } if ((dwServiceState == 0) || ((dwServiceState & ~SERVICE_STATE_ALL) != 0)) { - DPRINT("Not a valid Service State!\n"); + DPRINT("Invalid Service State\n"); return ERROR_INVALID_PARAMETER; } @@ -6298,7 +6291,7 @@ REnumServicesStatusExW( if (!RtlAreAllAccessesGranted(hManager->Handle.DesiredAccess, SC_MANAGER_ENUMERATE_SERVICE)) { - DPRINT("Insufficient access rights! 0x%lx\n", + DPRINT("Insufficient access rights 0x%lx\n", hManager->Handle.DesiredAccess); return ERROR_ACCESS_DENIED; } diff --git a/base/system/services/services.c b/base/system/services/services.c index 7721eb95042..b45ac07b745 100644 --- a/base/system/services/services.c +++ b/base/system/services/services.c @@ -103,7 +103,7 @@ CheckForLiveCD(VOID) /* Check for the '-mini' option */ if (wcsstr(CommandLine, L" -mini") != NULL) { - DPRINT1("Running on LiveCD!\n"); + DPRINT1("Running on LiveCD\n"); ScmLiveSetup = TRUE; } @@ -189,9 +189,9 @@ ScmWaitForLsa(VOID) } else { - DPRINT("Wait for the LSA server!\n"); + DPRINT("Wait for the LSA server\n"); WaitForSingleObject(hEvent, INFINITE); - DPRINT("LSA server running!\n"); + DPRINT("LSA server running\n"); CloseHandle(hEvent); } @@ -206,7 +206,7 @@ ShutdownHandlerRoutine(DWORD dwCtrlType) if (dwCtrlType & (CTRL_SHUTDOWN_EVENT | CTRL_LOGOFF_EVENT)) { - DPRINT1("Shutdown event received!\n"); + DPRINT1("Shutdown event received\n"); ScmShutdown = TRUE; ScmAutoShutdownServices(); @@ -254,7 +254,7 @@ wWinMain(HINSTANCE hInstance, DPRINT1("SERVICES: Failed to create the start event\n"); goto done; } - DPRINT("SERVICES: Created start event with handle %p.\n", hScmStartEvent); + DPRINT("SERVICES: Created start event with handle %p\n", hScmStartEvent); /* Create the auto-start complete event */ hScmAutoStartCompleteEvent = CreateEventW(NULL, TRUE, FALSE, SCM_AUTOSTARTCOMPLETE_EVENT); @@ -263,7 +263,7 @@ wWinMain(HINSTANCE hInstance, DPRINT1("SERVICES: Failed to create the auto-start complete event\n"); goto done; } - DPRINT("SERVICES: created auto-start complete event with handle %p.\n", hScmAutoStartCompleteEvent); + DPRINT("SERVICES: created auto-start complete event with handle %p\n", hScmAutoStartCompleteEvent); /* Create the shutdown event */ hScmShutdownEvent = CreateEventW(NULL, TRUE, FALSE, NULL); @@ -316,7 +316,7 @@ wWinMain(HINSTANCE hInstance, dwError = ScmAcquireServiceStartLock(TRUE, &Lock); if (dwError != ERROR_SUCCESS) { - DPRINT1("SERVICES: Failed to acquire the service start lock (Error %lu)\n", dwError); + DPRINT1("SERVICES: Failed to acquire service start lock (Error %lu)\n", dwError); goto done; } @@ -326,7 +326,7 @@ wWinMain(HINSTANCE hInstance, /* Signal start event */ SetEvent(hScmStartEvent); - DPRINT("SERVICES: Initialized.\n"); + DPRINT("SERVICES: Initialized\n"); /* Register event handler (used for system shutdown) */ SetConsoleCtrlHandler(ShutdownHandlerRoutine, TRUE); @@ -351,7 +351,7 @@ wWinMain(HINSTANCE hInstance, /* Initialization finished */ ScmInitialize = FALSE; - DPRINT("SERVICES: Running.\n"); + DPRINT("SERVICES: Running\n"); /* Wait until the shutdown event gets signaled */ WaitForSingleObject(hScmShutdownEvent, INFINITE); @@ -378,7 +378,7 @@ done: if (hScmStartEvent != NULL) CloseHandle(hScmStartEvent); - DPRINT("SERVICES: Finished.\n"); + DPRINT("SERVICES: Finished\n"); ExitThread(0); return 0;

2 years, 9 months

[reactos] 360/360: [WINESYNC]: msi is now in sync with wine-staging wine-7.3

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=80c56a5f6cf5c6f87abbb… commit 80c56a5f6cf5c6f87abbbec17626f3793271b7f1 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Mar 14 21:57:24 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:46 2022 +0100 [WINESYNC]: msi is now in sync with wine-staging wine-7.3 --- dll/win32/msi/msi_ros.diff | 1025 -------------------------------------------- media/doc/WINESYNC.txt | 2 +- sdk/tools/winesync/msi.cfg | 10 + 3 files changed, 11 insertions(+), 1026 deletions(-) diff --git a/dll/win32/msi/msi_ros.diff b/dll/win32/msi/msi_ros.diff deleted file mode 100644 index 3d153bb231e..00000000000 --- a/dll/win32/msi/msi_ros.diff +++ /dev/null @@ -1,1025 +0,0 @@ -Index: D:/trunk/dll/win32/msi/msi_Es.rc -=================================================================== ---- D:/trunk/dll/win32/msi/msi_Es.rc (revision 51710) -+++ D:/trunk/dll/win32/msi/msi_Es.rc (revision 51711) -@@ -27,33 +27,7 @@ - 4 "No se ha podido abrir el paquete de instalaci�n especificado. Por favor, compruebe la ruta del archivo y vuelva a intentarlo." - 5 "ruta %s no encontrada" - 9 "inserte el disco %s" -- 10 "Windows Installer %s\n\n" \ -- "Usage:\n" \ -- "msiexec command {required parameter} [optional parammeter]\n\n" \ -- "Install a product:\n" \ -- "\t/i {package|productcode} [property]\n" \ -- "\t/package {package|productcode} [property]\n" \ -- "\t/a package [property]\n" \ -- "Repair an installation:\n" \ -- "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ -- "Uninstall a product:\n" \ -- "\t/uninstall {package|productcode} [property]\n" \ -- "\t/x {package|productcode} [property]\n" \ -- "Advertise a product:\n" \ -- "\t/j[u|m] package [/t transform] [/g languageid]\n" \ -- "Apply a patch:\n" \ -- "\t/p patchpackage [property]\n" \ -- "\t/p patchpackage /a package [property]\n" \ -- "Log and UI Modifiers for above commands:\n" \ -- "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ -- "\t/q{|n|b|r|f|n+|b+|b-}\n" \ -- "Register MSI Service:\n" \ -- "\t/y\n" \ -- "Unregister MSI Service:\n" \ -- "\t/z\n" \ -- "Display this help:\n" \ -- "\t/help\n" \ -- "\t/?\n" -+ 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a p [...] - 11 "introduzca qu� carpeta contiene %s" - 12 "instalar fuente para caracter�stica ausente" - 13 "unidad de red para caracter�stica ausente" -Index: D:/trunk/dll/win32/msi/msi_Ko.rc -=================================================================== ---- D:/trunk/dll/win32/msi/msi_Ko.rc (revision 51710) -+++ D:/trunk/dll/win32/msi/msi_Ko.rc (revision 51711) -@@ -29,33 +29,7 @@ - 4 " �� ġ ��Ű�� ϴ�. �� θ� Ȯ��ϰ� �ٽ� �õ��Ͻʽÿ�." - 5 "%s ��θ� ã�� ϴ�" - 9 "��ũ %s ��" -- 10 "Windows Installer %s\n\n" \ -- "��:\n" \ -- "msiexec �� {�ʼ� �Ű��} [�� Ű��]\n\n" \ -- "��ǰ ��ġ:\n" \ -- "\t/i {package|productcode} [property]\n" \ -- "\t/package {package|productcode} [property]\n" \ -- "\t/a package [property]\n" \ -- "��ġ ��:\n" \ -- "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ -- "��ǰ ��:\n" \ -- "\t/uninstall {package|productcode} [property]\n" \ -- "\t/x {package|productcode} [property]\n" \ -- "��ǰ �˸��:\n" \ -- "\t/j[u|m] package [/t transform] [/g languageid]\n" \ -- "��ġ �߰�:\n" \ -- "\t/p patchpackage [property]\n" \ -- "\t/p patchpackage /a package [property]\n" \ -- "�� ɾ �� Log �� UI �� :\n" \ -- "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ -- "\t/q{|n|b|r|f|n+|b+|b-}\n" \ -- "MSI �� :\n" \ -- "\t/y\n" \ -- "MSI �� :\n" \ -- "\t/z\n" \ -- "�� :\n" \ -- "\t/help\n" \ -- "\t/?\n" -+ 10 "Windows Installer %s\n\n��:\nmsiexec �� {�ʼ� �Ű��} [�� Ű��]\n\n��ǰ ��ġ:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\n��ġ ��:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n��ǰ ��:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\n��ǰ �˸��:\n\t/j[u|m] package [/t transform] [/g languageid]\n��ġ �߰�:\n\t/p patchpackage [property]\n\t/p patchpackage /a package [ [...] - 11 "%s�� ϴ� �� Է��ϼ��" - 12 "�� κ�(feature)�� ġ ��" - 13 "�� κ�(feature)�� Ʈ��ũ ��̺�" -Index: D:/trunk/dll/win32/msi/msi_No.rc -=================================================================== ---- D:/trunk/dll/win32/msi/msi_No.rc (revision 51710) -+++ D:/trunk/dll/win32/msi/msi_No.rc (revision 51711) -@@ -27,33 +27,7 @@ - 4 "Klarte ikke �pne den oppgitte installasjonspakken. Kontroller filbanen og pr�v igjen." - 5 "Fant ikke stien '%s'." - 9 "Sett i disk '%s'" -- 10 "Windows Installer %s\n\n" \ -- "Usage:\n" \ -- "msiexec command {required parameter} [optional parammeter]\n\n" \ -- "Install a product:\n" \ -- "\t/i {package|productcode} [property]\n" \ -- "\t/package {package|productcode} [property]\n" \ -- "\t/a package [property]\n" \ -- "Repair an installation:\n" \ -- "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ -- "Uninstall a product:\n" \ -- "\t/uninstall {package|productcode} [property]\n" \ -- "\t/x {package|productcode} [property]\n" \ -- "Advertise a product:\n" \ -- "\t/j[u|m] package [/t transform] [/g languageid]\n" \ -- "Apply a patch:\n" \ -- "\t/p patchpackage [property]\n" \ -- "\t/p patchpackage /a package [property]\n" \ -- "Log and UI Modifiers for above commands:\n" \ -- "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ -- "\t/q{|n|b|r|f|n+|b+|b-}\n" \ -- "Register MSI Service:\n" \ -- "\t/y\n" \ -- "Unregister MSI Service:\n" \ -- "\t/z\n" \ -- "Display this help:\n" \ -- "\t/help\n" \ -- "\t/?\n" -+ 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a p [...] - 11 "Oppgi katalogen som inneholder '%s'." - 12 "Egenskapens installasjonskilde mangler." - 13 "Egenskapens nettverksstasjon mangler." -Index: D:/trunk/dll/win32/msi/msi_Uk.rc -=================================================================== ---- D:/trunk/dll/win32/msi/msi_Uk.rc (revision 51710) -+++ D:/trunk/dll/win32/msi/msi_Uk.rc (revision 51711) -@@ -32,33 +32,7 @@ - 4 "Не вдалося відкрити вказаний пакет інсталяції. Перевірте шлях до файлу та спробуйте знов." - 5 "шлях %s не знайдено" - 9 "вставте диск %s" -- 10 "Windows Installer %s\n\n" \ -- "Usage:\n" \ -- "msiexec command {required parameter} [optional parammeter]\n\n" \ -- "Install a product:\n" \ -- "\t/i {package|productcode} [property]\n" \ -- "\t/package {package|productcode} [property]\n" \ -- "\t/a package [property]\n" \ -- "Repair an installation:\n" \ -- "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ -- "Uninstall a product:\n" \ -- "\t/uninstall {package|productcode} [property]\n" \ -- "\t/x {package|productcode} [property]\n" \ -- "Advertise a product:\n" \ -- "\t/j[u|m] package [/t transform] [/g languageid]\n" \ -- "Apply a patch:\n" \ -- "\t/p patchpackage [property]\n" \ -- "\t/p patchpackage /a package [property]\n" \ -- "Log and UI Modifiers for above commands:\n" \ -- "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ -- "\t/q{|n|b|r|f|n+|b+|b-}\n" \ -- "Register MSI Service:\n" \ -- "\t/y\n" \ -- "Unregister MSI Service:\n" \ -- "\t/z\n" \ -- "Display this help:\n" \ -- "\t/help\n" \ -- "\t/?\n" -+ 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a p [...] - 11 "вкажіть папку, що містить %s" - 12 "джерело встановлення даної можливості не вказане" - 13 "мережевий диск для даної можливості не вказаний" -Index: D:/trunk/dll/win32/msi/msi_Ro.rc -=================================================================== ---- D:/trunk/dll/win32/msi/msi_Ro.rc (revision 51710) -+++ D:/trunk/dll/win32/msi/msi_Ro.rc (revision 51711) -@@ -28,33 +28,7 @@ - 4 "Pachetul de instalare menționat nu a putut fi deschis. Verificați calea și încercați din nou." - 5 "calea %s nu a fost găsită" - 9 "inserați discul %s" -- 10 "Windows Installer %s\n\n" \ -- "Usage:\n" \ -- "msiexec command {required parameter} [optional parammeter]\n\n" \ -- "Install a product:\n" \ -- "\t/i {package|productcode} [property]\n" \ -- "\t/package {package|productcode} [property]\n" \ -- "\t/a package [property]\n" \ -- "Repair an installation:\n" \ -- "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ -- "Uninstall a product:\n" \ -- "\t/uninstall {package|productcode} [property]\n" \ -- "\t/x {package|productcode} [property]\n" \ -- "Advertise a product:\n" \ -- "\t/j[u|m] package [/t transform] [/g languageid]\n" \ -- "Apply a patch:\n" \ -- "\t/p patchpackage [property]\n" \ -- "\t/p patchpackage /a package [property]\n" \ -- "Log and UI Modifiers for above commands:\n" \ -- "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ -- "\t/q{|n|b|r|f|n+|b+|b-}\n" \ -- "Register MSI Service:\n" \ -- "\t/y\n" \ -- "Unregister MSI Service:\n" \ -- "\t/z\n" \ -- "Display this help:\n" \ -- "\t/help\n" \ -- "\t/?\n" -+ 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a p [...] - 11 "introduceți fișierul care conține %s" - 12 "lipsește sursa de instalare pentru această caracteristică" - 13 "lipsește unitatea de rețea pentru această caracteristică" -Index: D:/trunk/dll/win32/msi/msvchelper.h -=================================================================== ---- D:/trunk/dll/win32/msi/msvchelper.h (revision 0) -+++ D:/trunk/dll/win32/msi/msvchelper.h (revision 51711) -@@ -0,0 +1,12 @@ -+ -+#ifdef __i386__ -+ -+typedef unsigned int (__stdcall *__MSVC__MsiCustomActionEntryPoint)(unsigned int); -+ -+__inline unsigned int CUSTOMPROC_wrapper(__MSVC__MsiCustomActionEntryPoint proc, unsigned int handle) -+{ -+#pragma message("warning: CUSTOMPROC_wrapper might not be correct") -+ return proc(handle); -+} -+ -+#endif - -Property changes on: D:\trunk\dll\win32\msi\msvchelper.h -___________________________________________________________________ -Added: svn:eol-style - + native - -Index: D:/trunk/dll/win32/msi/msi_En.rc -=================================================================== ---- D:/trunk/dll/win32/msi/msi_En.rc (revision 51710) -+++ D:/trunk/dll/win32/msi/msi_En.rc (revision 51711) -@@ -28,33 +28,7 @@ - 4 "The specified installation package could not be opened. Please check the file path and try again." - 5 "path %s not found" - 9 "insert disk %s" -- 10 "Windows Installer %s\n\n" \ -- "Usage:\n" \ -- "msiexec command {required parameter} [optional parameter]\n\n" \ -- "Install a product:\n" \ -- "\t/i {package|productcode} [property]\n" \ -- "\t/package {package|productcode} [property]\n" \ -- "\t/a package [property]\n" \ -- "Repair an installation:\n" \ -- "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ -- "Uninstall a product:\n" \ -- "\t/uninstall {package|productcode} [property]\n" \ -- "\t/x {package|productcode} [property]\n" \ -- "Advertise a product:\n" \ -- "\t/j[u|m] package [/t transform] [/g languageid]\n" \ -- "Apply a patch:\n" \ -- "\t/p patchpackage [property]\n" \ -- "\t/p patchpackage /a package [property]\n" \ -- "Log and UI Modifiers for above commands:\n" \ -- "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ -- "\t/q{|n|b|r|f|n+|b+|b-}\n" \ -- "Register MSI Service:\n" \ -- "\t/y\n" \ -- "Unregister MSI Service:\n" \ -- "\t/z\n" \ -- "Display this help:\n" \ -- "\t/help\n" \ -- "\t/?\n" -+ 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parameter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a pa [...] - 11 "enter which folder contains %s" - 12 "install source for feature missing" - 13 "network drive for feature missing" -Index: D:/trunk/dll/win32/msi/msi_Fr.rc -=================================================================== ---- D:/trunk/dll/win32/msi/msi_Fr.rc (revision 51710) -+++ D:/trunk/dll/win32/msi/msi_Fr.rc (revision 51711) -@@ -31,33 +31,7 @@ - 4 "Le paquet d'installation spécifié n'a pu être ouvert. Veuillez vérifier le chemin du fichier et réessayer." - 5 "Le chemin %s est introuvable" - 9 "insérez le disque %s" -- 10 "Programme d'installation Windows %s\n\n" \ -- "Usage :\n" \ -- "msiexec commande {paramètre obligatoire} [paramètre optionnel]\n\n" \ -- "Installer un produit :\n" \ -- "\t/i {paquet|code_produit} [propriété]\n" \ -- "\t/package {paquet|code_produit} [propriété]\n" \ -- "\t/a paquet [propriété]\n" \ -- "Réparer une installation :\n" \ -- "\t/f[p|o|e|d|c|a|u|m|s|v] {paquet|code_produit}\n" \ -- "Désinstaller un produit :\n" \ -- "\t/uninstall {paquet|code_produit} [propriété]\n" \ -- "\t/x {paquet|code_produit} [propriété]\n" \ -- "Publier un produit :\n" \ -- "\t/j[u|m] paquet [/t transformation] [/g id_langue]\n" \ -- "Appliquer un patch :\n" \ -- "\t/p paquet_patch [propriété]\n" \ -- "\t/p paquet_patch /a paquet [propriété]\n" \ -- "Modificateurs de journalisation et d'interface utilisateur pour les commandes ci-dessus :\n" \ -- "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] fichier_journal\n" \ -- "\t/q{|n|b|r|f|n+|b+|b-}\n" \ -- "Enregistrer le service MSI :\n" \ -- "\t/y\n" \ -- "Annuler l'enregistrement du service MSI :\n" \ -- "\t/z\n" \ -- "Afficher cette aide :\n" \ -- "\t/help\n" \ -- "\t/?\n" -+ 10 "Programme d'installation Windows %s\n\nUsage :\nmsiexec commande {paramètre obligatoire} [paramètre optionnel]\n\nInstaller un produit :\n\t/i {paquet|code_produit} [propriété]\n\t/package {paquet|code_produit} [propriété]\n\t/a paquet [propriété]\nRéparer une installation :\n\t/f[p|o|e|d|c|a|u|m|s|v] {paquet|code_produit}\nDésinstaller un produit :\n\t/uninstall {paquet|code_produit} [propriété]\n\t/x {paquet|code_produit} [propriété]\nPublier un produit :\n\t/j[u|m] paquet [/t tr [...] - 11 "saisissez le nom du dossier contenant %s" - 12 "source d'installation pour la fonctionnalité manquante" - 13 "lecteur réseau pour la fonctionnalité manquante" -Index: D:/trunk/dll/win32/msi/msi_Da.rc -=================================================================== ---- D:/trunk/dll/win32/msi/msi_Da.rc (revision 51710) -+++ D:/trunk/dll/win32/msi/msi_Da.rc (revision 51711) -@@ -27,33 +27,7 @@ - 4 "Kunne ikke �bne den specificerede installationspakke. Kontroller stien og pr�v igen." - 5 "kunne ikke finden stien '%s'." - 9 "inds�t disk '%s'" -- 10 "Windows Installer %s\n\n" \ -- "Usage:\n" \ -- "msiexec command {required parameter} [optional parammeter]\n\n" \ -- "Install a product:\n" \ -- "\t/i {package|productcode} [property]\n" \ -- "\t/package {package|productcode} [property]\n" \ -- "\t/a package [property]\n" \ -- "Repair an installation:\n" \ -- "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ -- "Uninstall a product:\n" \ -- "\t/uninstall {package|productcode} [property]\n" \ -- "\t/x {package|productcode} [property]\n" \ -- "Advertise a product:\n" \ -- "\t/j[u|m] package [/t transform] [/g languageid]\n" \ -- "Apply a patch:\n" \ -- "\t/p patchpackage [property]\n" \ -- "\t/p patchpackage /a package [property]\n" \ -- "Log and UI Modifiers for above commands:\n" \ -- "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ -- "\t/q{|n|b|r|f|n+|b+|b-}\n" \ -- "Register MSI Service:\n" \ -- "\t/y\n" \ -- "Unregister MSI Service:\n" \ -- "\t/z\n" \ -- "Display this help:\n" \ -- "\t/help\n" \ -- "\t/?\n" -+ 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a p [...] - 11 "angiv kataloget som indeholder '%s'." - 12 "featurens installationskilde mangler." - 13 "featurens netv�rksdrev mangler." -Index: D:/trunk/dll/win32/msi/msi_Sr.rc -=================================================================== ---- D:/trunk/dll/win32/msi/msi_Sr.rc (revision 51710) -+++ D:/trunk/dll/win32/msi/msi_Sr.rc (revision 51711) -@@ -30,33 +30,7 @@ - 4 "Instalacija ne može biti otvorena. Molimo proverite destinaciju fajla i pokušajte ponovo." - 5 "putanja %s nije nađena" - 9 "Ubacite disk %s" -- 10 "Windows Instalacija programa %s\n\n" \ -- "Svrha:\n" \ -- "msiexec komanda {traženi parametar} [opcioni parametar]\n\n" \ -- "Instalacija proizvoda:\n" \ -- "\t/i {paket|kod} [svojina]\n" \ -- "\t/package {paket|kod} [svojina]\n" \ -- "\t/a paket [svojina]\n" \ -- "Popravak instalacije:\n" \ -- "\t/f[p|o|e|d|c|a|u|m|s|v] {paket|kod}\n" \ -- "Uninstal programa:\n" \ -- "\t/uninstall {paket|kod} [svojina]\n" \ -- "\t/x {paket|kod} [svojina]\n" \ -- "Reklama programa:\n" \ -- "\t/j[u|m] paket [/t pretvori] [/g id jezika]\n" \ -- "Primeni peč:\n" \ -- "\t/p pečpaket [svojina]\n" \ -- "\t/p pečpaket /a paket [svojina]\n" \ -- "Izveštalj i Izgled Modifikatori za komande iznad:\n" \ -- "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] izvestaj\n" \ -- "\t/q{|n|b|r|f|n+|b+|b-}\n" \ -- "Registracija MSI Servisa:\n" \ -- "\t/y\n " \ -- "Uklanjanje MSI Servisa:\n" \ -- "\t/z\n" \ -- "Prikaži ovu Pomoć:\n" \ -- "\t/help\n" \ -- "\t/?\n" -+ 10 "Windows Instalacija programa %s\n\nSvrha:\nmsiexec komanda {traženi parametar} [opcioni parametar]\n\nInstalacija proizvoda:\n\t/i {paket|kod} [svojina]\n\t/package {paket|kod} [svojina]\n\t/a paket [svojina]\nPopravak instalacije:\n\t/f[p|o|e|d|c|a|u|m|s|v] {paket|kod}\nUninstal programa:\n\t/uninstall {paket|kod} [svojina]\n\t/x {paket|kod} [svojina]\nReklama programa:\n\t/j[u|m] paket [/t pretvori] [/g id jezika]\nPrimeni peč:\n\t/p pečpaket [svojina]\n\t/p pečpaket /a paket [sv [...] - 11 "unesite koji folder sadrži %s" - 12 "instalacija nedostaje" - 13 "mrežni drajv nedostaje" -@@ -71,33 +45,7 @@ - 4 "Инсталација не може бити отворена. Молимо проверите дестинацију фајла и покушајте поново." - 5 "путања %s није нађена" - 9 "Убаците диск %s" -- 10 "Виндовс Инсталација програма %s\n\n" \ -- "Сврха:\n" \ -- "msiexec команда {тражени параметар} [опциони параметар]\n\n" \ -- "Инсталација производа:\n" \ -- "\t/i {пакет|код} [својина]\n" \ -- "\t/package {пакет|код} [својина]\n" \ -- "\t/a пакет [svojina]\n" \ -- "Поправак инсталације:\n" \ -- "\t/f[p|o|e|d|c|a|u|m|s|v] {пакет|код}\n" \ -- "Брисање програма:\n" \ -- "\t/uninstall {пакет|код} [svojina]\n" \ -- "\t/x {пакет|код} [својина]\n" \ -- "Реклама програма:\n" \ -- "\t/j[u|m] пакет [/t transform] [/g languageid]\n" \ -- "Примени печ:\n" \ -- "\t/p печпакет [својина]\n" \ -- "\t/p печпакет /a пакет [својина]\n" \ -- "Известај и Изглед Модификатора за команде изнад:\n" \ -- "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] извештај\n" \ -- "\t/q{|n|b|r|f|n+|b+|b-}\n" \ -- "Регистрација МСИ Сервиса:\n" \ -- "\t/y\n" \ -- "Уклањање МСИ Сервиса:\n" \ -- "\t/z\n" \ -- "Прикажи ову Помоћ:\n" \ -- "\t/help\n" \ -- "\t/?\n" -+ 10 "Виндовс Инсталација програма %s\n\nСврха:\nmsiexec команда {тражени параметар} [опциони параметар]\n\nИнсталација производа:\n\t/i {пакет|код} [својина]\n\t/package {пакет|код} [својина]\n\t/a пакет [svojina]\nПоправак инсталације:\n\t/f[p|o|e|d|c|a|u|m|s|v] {пакет|код}\nБрисање програма:\n\t/uninstall {пакет|код} [svojina]\n\t/x {пакет|код} [својина]\nРеклама програма:\n\t/j[u|m] пакет [/t transform] [/g languageid]\nПримени печ:\n\t/p печпакет [својина]\n\t/p печпакет /a пакет [с [...] - 11 "Унесите који фолдер садржи %s" - 12 "Инсталација недостаје" - 13 "Мрежни драјв недостаје" -Index: D:/trunk/dll/win32/msi/msi_Tr.rc -=================================================================== ---- D:/trunk/dll/win32/msi/msi_Tr.rc (revision 51710) -+++ D:/trunk/dll/win32/msi/msi_Tr.rc (revision 51711) -@@ -27,33 +27,7 @@ - 4 "The specified installation package could not be opened. Please check the file path and try again." - 5 "%s yolu bulunamad�" - 9 "%s nolu diski yerle�tirin" -- 10 "Windows Installer %s\n\n" \ -- "Usage:\n" \ -- "msiexec command {required parameter} [optional parammeter]\n\n" \ -- "Install a product:\n" \ -- "\t/i {package|productcode} [property]\n" \ -- "\t/package {package|productcode} [property]\n" \ -- "\t/a package [property]\n" \ -- "Repair an installation:\n" \ -- "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ -- "Uninstall a product:\n" \ -- "\t/uninstall {package|productcode} [property]\n" \ -- "\t/x {package|productcode} [property]\n" \ -- "Advertise a product:\n" \ -- "\t/j[u|m] package [/t transform] [/g languageid]\n" \ -- "Apply a patch:\n" \ -- "\t/p patchpackage [property]\n" \ -- "\t/p patchpackage /a package [property]\n" \ -- "Log and UI Modifiers for above commands:\n" \ -- "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ -- "\t/q{|n|b|r|f|n+|b+|b-}\n" \ -- "Register MSI Service:\n" \ -- "\t/y\n" \ -- "Unregister MSI Service:\n" \ -- "\t/z\n" \ -- "Display this help:\n" \ -- "\t/help\n" \ -- "\t/?\n" -+ 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a p [...] - 11 "%s ��esini i�eren dizini girin" - 12 "eksik �zellik i�in kurulum kayna��" - 13 "eksik �zellik i�in a� s�r�c�s�" -Index: D:/trunk/dll/win32/msi/msi_De.rc -=================================================================== ---- D:/trunk/dll/win32/msi/msi_De.rc (revision 51710) -+++ D:/trunk/dll/win32/msi/msi_De.rc (revision 51711) -@@ -30,33 +30,7 @@ - 4 "Das angegebene Installationspaket konnte nicht geöffnet werden. Bitte überprüfen Sie den Pfadnamen und versuchen Sie es noch einmal." - 5 "Der Pfad %s wurde nicht gefunden." - 9 "Bitte Disk %s einlegen." -- 10 "Windows Installer %s\n\n" \ -- "Benutzung:\n" \ -- "msiexec Befehl {Parameter} [Zusätzliche Parammeter]\n\n" \ -- "Produkt installieren:\n" \ -- "\t/i {Paket|Produktcode} [Eigenschaft]\n" \ -- "\t/package {Paket|Produktcode} [Eigenschaft]\n" \ -- "\t/a Paket [Eigenschaft]\n" \ -- "Installation reparieren:\n" \ -- "\t/f[p|o|e|d|c|a|u|m|s|v] {Paket|Produktcode}\n" \ -- "Produkt deinstallieren:\n" \ -- "\t/uninstall {Paket|Produktcode} [Eigenschaft]\n" \ -- "\t/x {Paket|Produktcode} [Eigenschaft]\n" \ -- "Produkt ankündigen:\n" \ -- "\t/j[u|m] Paket [/t Transformationspaket] [/g Sprachkennung]\n" \ -- "Patch integrieren:\n" \ -- "\t/p Patchpaket [Eigenschaft]\n" \ -- "\t/p Patchpaket /a Paket [Eigenschaft]\n" \ -- "Protokollierung und Benutzeroberfläche für die oberen Befehle anpassen:\n" \ -- "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] Protokolldatei\n" \ -- "\t/q{|n|b|r|f|n+|b+|b-}\n" \ -- "MSI Service registrieren:\n" \ -- "\t/y\n" \ -- "Registrierung des MSI Service aufheben:\n" \ -- "\t/z\n" \ -- "Hilfe anzeigen:\n" \ -- "\t/help\n" \ -- "\t/?\n" -+ 10 "Windows Installer %s\n\nBenutzung:\nmsiexec Befehl {Parameter} [Zusätzliche Parammeter]\n\nProdukt installieren:\n\t/i {Paket|Produktcode} [Eigenschaft]\n\t/package {Paket|Produktcode} [Eigenschaft]\n\t/a Paket [Eigenschaft]\nInstallation reparieren:\n\t/f[p|o|e|d|c|a|u|m|s|v] {Paket|Produktcode}\nProdukt deinstallieren:\n\t/uninstall {Paket|Produktcode} [Eigenschaft]\n\t/x {Paket|Produktcode} [Eigenschaft]\nProdukt ankündigen:\n\t/j[u|m] Paket [/t Transformationspaket] [/g Sprachk [...] - 11 "Geben Sie das Verzeichnis ein, dass %s enthält." - 12 "Die Installationsquelle für das Feature fehlt." - 13 "Das Netzwerklaufwerk für das Feature fehlt." -Index: D:/trunk/dll/win32/msi/msi_Sv.rc -=================================================================== ---- D:/trunk/dll/win32/msi/msi_Sv.rc (revision 51710) -+++ D:/trunk/dll/win32/msi/msi_Sv.rc (revision 51711) -@@ -27,33 +27,7 @@ - 4 "Det angivna installationspaketet kunde inte �ppnas. Kontrollera fils�kv�gen och f�rs�k igen." - 5 "s�kv�gen %s hittades inte" - 9 "mata in %s" -- 10 "Windows Installer %s\n\n" \ -- "Usage:\n" \ -- "msiexec command {required parameter} [optional parammeter]\n\n" \ -- "Install a product:\n" \ -- "\t/i {package|productcode} [property]\n" \ -- "\t/package {package|productcode} [property]\n" \ -- "\t/a package [property]\n" \ -- "Repair an installation:\n" \ -- "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ -- "Uninstall a product:\n" \ -- "\t/uninstall {package|productcode} [property]\n" \ -- "\t/x {package|productcode} [property]\n" \ -- "Advertise a product:\n" \ -- "\t/j[u|m] package [/t transform] [/g languageid]\n" \ -- "Apply a patch:\n" \ -- "\t/p patchpackage [property]\n" \ -- "\t/p patchpackage /a package [property]\n" \ -- "Log and UI Modifiers for above commands:\n" \ -- "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ -- "\t/q{|n|b|r|f|n+|b+|b-}\n" \ -- "Register MSI Service:\n" \ -- "\t/y\n" \ -- "Unregister MSI Service:\n" \ -- "\t/z\n" \ -- "Display this help:\n" \ -- "\t/help\n" \ -- "\t/?\n" -+ 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a p [...] - 11 "ange vilken mapp som inneh�ller %s" - 12 "installationsk�lla f�r funktion saknar" - 13 "n�tverksenhet f�r funktion saknar" -Index: D:/trunk/dll/win32/msi/msi_Fi.rc -=================================================================== ---- D:/trunk/dll/win32/msi/msi_Fi.rc (revision 51710) -+++ D:/trunk/dll/win32/msi/msi_Fi.rc (revision 51711) -@@ -27,33 +27,7 @@ - 4 "Annettua asennuspakettia ei voitu avata. Tarkista tiedoston polku ja yrit� uudelleen." - 5 "Polkua %s ei l�ydy." - 9 "Anna levy %s" -- 10 "Windows Installer %s\n\n" \ -- "K�ytt�:\n" \ -- "msiexec komento {pakollinen parametri} [valinnainen parametri]\n\n" \ -- "Asenna tuote:\n" \ -- "\t/i {paketti|tuotekoodi} [ominaisuus]\n" \ -- "\t/package {paketti|tuotekoodi} [ominaisuus]\n" \ -- "\t/a {paketti} [ominaisuus]\n" \ -- "Korjaa asennus:\n" \ -- "\t/f[p|o|e|d|c|a|u|m|s|v] {paketti|tuotekoodi}\n" \ -- "Poista tuote:\n" \ -- "\t/uninstall {paketti|tuotekoodi} [ominaisuus]\n" \ -- "\t/x {paketti|tuotekoodi} [ominaisuus]\n" \ -- "Mainosta (advertise) tuotetta:\n" \ -- "\t/j[u|m] paketti [/t muunnos] [/g kielitunnus]\n" \ -- "Asenna korjaus:\n" \ -- "\t/p korjauspaketti [ominaisuus]\n" \ -- "\t/p korjauspaketti /a paketti [ominaisuus]\n" \ -- "Loki- ja k�ytt�liittym�asetukset edellisille komennoille:\n" \ -- "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] lokitiedosto\n" \ -- "\t/q{|n|b|r|f|n+|b+|b-}\n" \ -- "Rekister�i MSI-palvelu:\n" \ -- "\t/y\n" \ -- "Peru MSI-palvelun rekister�inti:\n" \ -- "\t/z\n" \ -- "N�yt� t�m� ohje:\n" \ -- "\t/help\n" \ -- "\t/?\n" -+ 10 "Windows Installer %s\n\nK�ytt�:\nmsiexec komento {pakollinen parametri} [valinnainen parametri]\n\nAsenna tuote:\n\t/i {paketti|tuotekoodi} [ominaisuus]\n\t/package {paketti|tuotekoodi} [ominaisuus]\n\t/a {paketti} [ominaisuus]\nKorjaa asennus:\n\t/f[p|o|e|d|c|a|u|m|s|v] {paketti|tuotekoodi}\nPoista tuote:\n\t/uninstall {paketti|tuotekoodi} [ominaisuus]\n\t/x {paketti|tuotekoodi} [ominaisuus]\nMainosta (advertise) tuotetta:\n\t/j[u|m] paketti [/t muunnos] [/g kielitunnus]\nAsenna k [...] - 11 "Anna kansio, jossa on %s" - 12 "Ominaisuuden asennusl�hde puuttuu." - 13 "Ominaisuuden verkkolevy puuttuu." -Index: D:/trunk/dll/win32/msi/msi_Si.rc -=================================================================== ---- D:/trunk/dll/win32/msi/msi_Si.rc (revision 51710) -+++ D:/trunk/dll/win32/msi/msi_Si.rc (revision 51711) -@@ -29,33 +29,7 @@ - 4 "Navedenega namestitvenega paketa ni mogoče odpreti. Preverite ime datoteke in poskusite znova." - 5 "pot %s ne obstaja" - 9 "vnesite disk %s" -- 10 "Windows Installer %s\n\n" \ -- "Usage:\n" \ -- "msiexec command {required parameter} [optional parammeter]\n\n" \ -- "Install a product:\n" \ -- "\t/i {package|productcode} [property]\n" \ -- "\t/package {package|productcode} [property]\n" \ -- "\t/a package [property]\n" \ -- "Repair an installation:\n" \ -- "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ -- "Uninstall a product:\n" \ -- "\t/uninstall {package|productcode} [property]\n" \ -- "\t/x {package|productcode} [property]\n" \ -- "Advertise a product:\n" \ -- "\t/j[u|m] package [/t transform] [/g languageid]\n" \ -- "Apply a patch:\n" \ -- "\t/p patchpackage [property]\n" \ -- "\t/p patchpackage /a package [property]\n" \ -- "Log and UI Modifiers for above commands:\n" \ -- "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ -- "\t/q{|n|b|r|f|n+|b+|b-}\n" \ -- "Register MSI Service:\n" \ -- "\t/y\n" \ -- "Unregister MSI Service:\n" \ -- "\t/z\n" \ -- "Display this help:\n" \ -- "\t/help\n" \ -- "\t/?\n" -+ 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a p [...] - 11 "vnesite ime mape, ki vsebuje %s" - 12 "manjkajoč namestitveni vir za namestitev funkcije" - 13 "manjkajoč omrežni pogon za namestitev funkcijo" -Index: D:/trunk/dll/win32/msi/msi_Hu.rc -=================================================================== ---- D:/trunk/dll/win32/msi/msi_Hu.rc (revision 51710) -+++ D:/trunk/dll/win32/msi/msi_Hu.rc (revision 51711) -@@ -27,33 +27,7 @@ - 4 "The specified installation package could not be opened. Please check the file path and try again." - 5 "%s �tvonal nem tal�lhat�" - 9 "helyezze be a lemezt: %s" -- 10 "Windows Installer %s\n\n" \ -- "Usage:\n" \ -- "msiexec command {required parameter} [optional parammeter]\n\n" \ -- "Install a product:\n" \ -- "\t/i {package|productcode} [property]\n" \ -- "\t/package {package|productcode} [property]\n" \ -- "\t/a package [property]\n" \ -- "Repair an installation:\n" \ -- "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ -- "Uninstall a product:\n" \ -- "\t/uninstall {package|productcode} [property]\n" \ -- "\t/x {package|productcode} [property]\n" \ -- "Advertise a product:\n" \ -- "\t/j[u|m] package [/t transform] [/g languageid]\n" \ -- "Apply a patch:\n" \ -- "\t/p patchpackage [property]\n" \ -- "\t/p patchpackage /a package [property]\n" \ -- "Log and UI Modifiers for above commands:\n" \ -- "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ -- "\t/q{|n|b|r|f|n+|b+|b-}\n" \ -- "Register MSI Service:\n" \ -- "\t/y\n" \ -- "Unregister MSI Service:\n" \ -- "\t/z\n" \ -- "Display this help:\n" \ -- "\t/help\n" \ -- "\t/?\n" -+ 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a p [...] - 11 "adja meg melyik mappa tartalmazza ezt: %s" - 12 "hi�nyz� tulajdons�g a telep�t�si forr�shoz" - 13 "hi�nyz� tulajdons�g a h�l�zati meghajt�hoz" -Index: D:/trunk/dll/win32/msi/msi_Ru.rc -=================================================================== ---- D:/trunk/dll/win32/msi/msi_Ru.rc (revision 51710) -+++ D:/trunk/dll/win32/msi/msi_Ru.rc (revision 51711) -@@ -30,33 +30,7 @@ - 4 "Указанный пакет не может быть открыт. Проверьте файл и повторите попытку." - 5 "путь %s не найден" - 9 "вставьте диск %s" -- 10 "Windows Installer %s\n\n" \ -- "Usage:\n" \ -- "msiexec command {required parameter} [optional parammeter]\n\n" \ -- "Install a product:\n" \ -- "\t/i {package|productcode} [property]\n" \ -- "\t/package {package|productcode} [property]\n" \ -- "\t/a package [property]\n" \ -- "Repair an installation:\n" \ -- "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ -- "Uninstall a product:\n" \ -- "\t/uninstall {package|productcode} [property]\n" \ -- "\t/x {package|productcode} [property]\n" \ -- "Advertise a product:\n" \ -- "\t/j[u|m] package [/t transform] [/g languageid]\n" \ -- "Apply a patch:\n" \ -- "\t/p patchpackage [property]\n" \ -- "\t/p patchpackage /a package [property]\n" \ -- "Log and UI Modifiers for above commands:\n" \ -- "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ -- "\t/q{|n|b|r|f|n+|b+|b-}\n" \ -- "Register MSI Service:\n" \ -- "\t/y\n" \ -- "Unregister MSI Service:\n" \ -- "\t/z\n" \ -- "Display this help:\n" \ -- "\t/help\n" \ -- "\t/?\n" -+ 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a p [...] - 11 "укажите каталог, содержащий %s" - 12 "источник установки данной возможности не указан" - 13 "сетевой диск для данной возможности не указан" -Index: D:/trunk/dll/win32/msi/msi_Nl.rc -=================================================================== ---- D:/trunk/dll/win32/msi/msi_Nl.rc (revision 51710) -+++ D:/trunk/dll/win32/msi/msi_Nl.rc (revision 51711) -@@ -27,33 +27,7 @@ - 4 "Het opgegeven installatie pakket kon niet worden geopend. Verifieer het bestandspad en probeer opnieuw." - 5 "Pad %s niet gevonden" - 9 "Plaats disk %s" -- 10 "Windows Installer %s\n\n" \ -- "Gebruik:\n" \ -- "msiexec commando {vereiste parameter} [optionele parameter]\n\n" \ -- "Installeer een product:\n" \ -- "\t/i {pakket|productcode} [eigenschap]\n" \ -- "\t/package {pakket|productcode} [eigenschap]\n" \ -- "\t/a pakket [eigenschap]\n" \ -- "Herstel een installatie:\n" \ -- "\t/f[p|o|e|d|c|a|u|m|s|v] {pakket|productcode}\n" \ -- "Verwijder een product:\n" \ -- "\t/uninstall {pakket|productcode} [eigenschap]\n" \ -- "\t/x {pakket|productcode} [eigenschap]\n" \ -- "Adverteer een product:\n" \ -- "\t/j[u|m] pakket [/t transform] [/g languageid]\n" \ -- "Pas een patch toe:\n" \ -- "\t/p patchpakket [eigenschap]\n" \ -- "\t/p patchpakket /a pakket [eigenschap]\n" \ -- "Log en UI Modifiers voor bovenstaande commando's:\n" \ -- "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logbestand\n" \ -- "\t/q{|n|b|r|f|n+|b+|b-}\n" \ -- "Registreer MSI Service:\n" \ -- "\t/y\n" \ -- "Maak registratie MSI Service ongedaan:\n" \ -- "\t/z\n" \ -- "Laat dit helpvenster zien:\n" \ -- "\t/help\n" \ -- "\t/?\n" -+ 10 "Windows Installer %s\n\nGebruik:\nmsiexec commando {vereiste parameter} [optionele parameter]\n\nInstalleer een product:\n\t/i {pakket|productcode} [eigenschap]\n\t/package {pakket|productcode} [eigenschap]\n\t/a pakket [eigenschap]\nHerstel een installatie:\n\t/f[p|o|e|d|c|a|u|m|s|v] {pakket|productcode}\nVerwijder een product:\n\t/uninstall {pakket|productcode} [eigenschap]\n\t/x {pakket|productcode} [eigenschap]\nAdverteer een product:\n\t/j[u|m] pakket [/t transform] [/g langua [...] - 11 "Voer de map in die %s bevat" - 12 "De installatiebron van de feature ontbreekt" - 13 "De netwerkschijf met de feature ontbreekt" -Index: D:/trunk/dll/win32/msi/msi_Pl.rc -=================================================================== ---- D:/trunk/dll/win32/msi/msi_Pl.rc (revision 51710) -+++ D:/trunk/dll/win32/msi/msi_Pl.rc (revision 51711) -@@ -28,33 +28,7 @@ - 4 "Nie uda�o si� otworzy� wybranego pakietu instalacyjnego. Sprawd� czy �cie�ka jest poprawna i spr�buj ponownie." - 5 "�cie�ka '%s' nie zosta�a odnaleziona" - 9 "w�� dysk '%s'" -- 10 "Windows Installer %s\n\n" \ -- "Usage:\n" \ -- "msiexec command {required parameter} [optional parammeter]\n\n" \ -- "Install a product:\n" \ -- "\t/i {package|productcode} [property]\n" \ -- "\t/package {package|productcode} [property]\n" \ -- "\t/a package [property]\n" \ -- "Repair an installation:\n" \ -- "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ -- "Uninstall a product:\n" \ -- "\t/uninstall {package|productcode} [property]\n" \ -- "\t/x {package|productcode} [property]\n" \ -- "Advertise a product:\n" \ -- "\t/j[u|m] package [/t transform] [/g languageid]\n" \ -- "Apply a patch:\n" \ -- "\t/p patchpackage [property]\n" \ -- "\t/p patchpackage /a package [property]\n" \ -- "Log and UI Modifiers for above commands:\n" \ -- "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ -- "\t/q{|n|b|r|f|n+|b+|b-}\n" \ -- "Register MSI Service:\n" \ -- "\t/y\n" \ -- "Unregister MSI Service:\n" \ -- "\t/z\n" \ -- "Display this help:\n" \ -- "\t/help\n" \ -- "\t/?\n" -+ 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a p [...] - 11 "wprowad� sice�k� do folderu zawieraj�cego '%s'" - 12 "�r�d�o danych zawieraj�ce ��dan� funkcj� jest niedost�pne" - 13 "dysk siecowy zawieraj�cy ��dan� funckje jest niedost�pny" -Index: D:/trunk/dll/win32/msi/msi_It.rc -=================================================================== ---- D:/trunk/dll/win32/msi/msi_It.rc (revision 51710) -+++ D:/trunk/dll/win32/msi/msi_It.rc (revision 51711) -@@ -30,33 +30,7 @@ - 4 "Impossibile aprire il pacchetto di installazione specificato. Per favore controlla l'indirizzo del file e riprova." - 5 "percorso %s non trovato" - 9 "inserire disco %s" -- 10 "Windows Installer %s\n\n" \ -- "Usage:\n" \ -- "msiexec command {required parameter} [optional parammeter]\n\n" \ -- "Install a product:\n" \ -- "\t/i {package|productcode} [property]\n" \ -- "\t/package {package|productcode} [property]\n" \ -- "\t/a package [property]\n" \ -- "Repair an installation:\n" \ -- "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ -- "Uninstall a product:\n" \ -- "\t/uninstall {package|productcode} [property]\n" \ -- "\t/x {package|productcode} [property]\n" \ -- "Advertise a product:\n" \ -- "\t/j[u|m] package [/t transform] [/g languageid]\n" \ -- "Apply a patch:\n" \ -- "\t/p patchpackage [property]\n" \ -- "\t/p patchpackage /a package [property]\n" \ -- "Log and UI Modifiers for above commands:\n" \ -- "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ -- "\t/q{|n|b|r|f|n+|b+|b-}\n" \ -- "Register MSI Service:\n" \ -- "\t/y\n" \ -- "Unregister MSI Service:\n" \ -- "\t/z\n" \ -- "Display this help:\n" \ -- "\t/help\n" \ -- "\t/?\n" -+ 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a p [...] - 11 "immettere il nome della cartella che contiene %s" - 12 "sorgente di installazione per la funzionalità mancante" - 13 "periferica di rete per la funzionalità mancante" -Index: D:/trunk/dll/win32/msi/msi_Lt.rc -=================================================================== ---- D:/trunk/dll/win32/msi/msi_Lt.rc (revision 51710) -+++ D:/trunk/dll/win32/msi/msi_Lt.rc (revision 51711) -@@ -30,33 +30,7 @@ - 4 "Nepavyko atverti nurodyto diegimo paketo. Patikrinkite failo kelią ir mėginkite dar kartą." - 5 "kelias %s nerastas" - 9 "įdėkite diską %s" -- 10 "Windows diegimo programa %s\n\n" \ -- "Naudojimas:\n" \ -- "msiexec komanda {būtinas parametras} [nebūtinas parametras]\n\n" \ -- "Įdiegti produktą:\n" \ -- "\t/i {paketas|produkto_kodas} [savybė]\n" \ -- "\t/package {paketas|produkto_kodas} [savybė]\n" \ -- "\t/a paketas [savybė]\n" \ -- "Taisyti įdiegimą:\n" \ -- "\t/f[p|o|e|d|c|a|u|m|s|v] {paketas|produkto_kodas}\n" \ -- "Pašalinti produktą:\n" \ -- "\t/uninstall {paketas|produkto_kodas} [savybė]\n" \ -- "\t/x {paketas|produkto_kodas} [savybė]\n" \ -- "Skelbti produktą:\n" \ -- "\t/j[u|m] paketas [/t pakeitimas] [/g kalbos_identifikatorius]\n" \ -- "Pritaikyti pataisą:\n" \ -- "\t/p pataisos_paketas [savybė]\n" \ -- "\t/p pataisos_paketas /a paketas [savybė]\n" \ -- "Žurnalo ir sąsajos modifikatoriai aukščiau išvardintoms komandoms:\n" \ -- "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] žurnalo_failas\n" \ -- "\t/q{|n|b|r|f|n+|b+|b-}\n" \ -- "Registruoti MSI tarnybą:\n" \ -- "\t/y\n" \ -- "Išregistruoti MSI tarnybą:\n" \ -- "\t/z\n" \ -- "Parodyti šią pagalbą:\n" \ -- "\t/help\n" \ -- "\t/?\n" -+ 10 "Windows diegimo programa %s\n\nNaudojimas:\nmsiexec komanda {būtinas parametras} [nebūtinas parametras]\n\nĮdiegti produktą:\n\t/i {paketas|produkto_kodas} [savybė]\n\t/package {paketas|produkto_kodas} [savybė]\n\t/a paketas [savybė]\nTaisyti įdiegimą:\n\t/f[p|o|e|d|c|a|u|m|s|v] {paketas|produkto_kodas}\nPašalinti produktą:\n\t/uninstall {paketas|produkto_kodas} [savybė]\n\t/x {paketas|produkto_kodas} [savybė]\nSkelbti produktą:\n\t/j[u|m] paketas [/t pakeitimas] [/g kalbos_identif [...] - 11 "įveskite aplanką, kuris turi %s" - 12 "trūksta diegimo šaltinio komponentui" - 13 "trūksta tinklo disko komponentui" -Index: D:/trunk/dll/win32/msi/msi_Zh.rc -=================================================================== ---- D:/trunk/dll/win32/msi/msi_Zh.rc (revision 51710) -+++ D:/trunk/dll/win32/msi/msi_Zh.rc (revision 51711) -@@ -30,33 +30,7 @@ - 4 "不能打开所指定的安装软件包. 请检查文件路径后再试." - 5 "路径 %s 没找到" - 9 "插入软盘 %s" -- 10 "Windows Installer %s\n\n" \ -- "Usage:\n" \ -- "msiexec command {required parameter} [optional parammeter]\n\n" \ -- "Install a product:\n" \ -- "\t/i {package|productcode} [property]\n" \ -- "\t/package {package|productcode} [property]\n" \ -- "\t/a package [property]\n" \ -- "Repair an installation:\n" \ -- "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ -- "Uninstall a product:\n" \ -- "\t/uninstall {package|productcode} [property]\n" \ -- "\t/x {package|productcode} [property]\n" \ -- "Advertise a product:\n" \ -- "\t/j[u|m] package [/t transform] [/g languageid]\n" \ -- "Apply a patch:\n" \ -- "\t/p patchpackage [property]\n" \ -- "\t/p patchpackage /a package [property]\n" \ -- "Log and UI Modifiers for above commands:\n" \ -- "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ -- "\t/q{|n|b|r|f|n+|b+|b-}\n" \ -- "Register MSI Service:\n" \ -- "\t/y\n" \ -- "Unregister MSI Service:\n" \ -- "\t/z\n" \ -- "Display this help:\n" \ -- "\t/help\n" \ -- "\t/?\n" -+ 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a p [...] - 11 "输入包含 %s 的文件夹" - 12 "本功能的安装源不存在" - 13 "本功能的网络驱动器不存在" -@@ -71,33 +45,7 @@ - 4 "不能開啟所指定的安裝軟件包. 請檢查檔案路徑後再試." - 5 "路徑 %s 沒找到" - 9 "插入軟碟 %s" -- 10 "Windows Installer %s\n\n" \ -- "Usage:\n" \ -- "msiexec command {required parameter} [optional parammeter]\n\n" \ -- "Install a product:\n" \ -- "\t/i {package|productcode} [property]\n" \ -- "\t/package {package|productcode} [property]\n" \ -- "\t/a package [property]\n" \ -- "Repair an installation:\n" \ -- "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ -- "Uninstall a product:\n" \ -- "\t/uninstall {package|productcode} [property]\n" \ -- "\t/x {package|productcode} [property]\n" \ -- "Advertise a product:\n" \ -- "\t/j[u|m] package [/t transform] [/g languageid]\n" \ -- "Apply a patch:\n" \ -- "\t/p patchpackage [property]\n" \ -- "\t/p patchpackage /a package [property]\n" \ -- "Log and UI Modifiers for above commands:\n" \ -- "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ -- "\t/q{|n|b|r|f|n+|b+|b-}\n" \ -- "Register MSI Service:\n" \ -- "\t/y\n" \ -- "Unregister MSI Service:\n" \ -- "\t/z\n" \ -- "Display this help:\n" \ -- "\t/help\n" \ -- "\t/?\n" -+ 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a p [...] - 11 "輸入包含 %s 的檔案夾" - 12 "本功能的安裝源不存在" - 13 "本功能的網路儲存槽不存在" -Index: D:/trunk/dll/win32/msi/msi_Pt.rc -=================================================================== ---- D:/trunk/dll/win32/msi/msi_Pt.rc (revision 51710) -+++ D:/trunk/dll/win32/msi/msi_Pt.rc (revision 51711) -@@ -31,33 +31,7 @@ - 4 "O pacote de instalação especificado não pôde ser aberto. Por favor, verifique o arquivo e tente novamente." - 5 "caminho %s não encontrado" - 9 "insira disco %s" -- 10 "Windows Installer %s\n\n" \ -- "Modo de usar:\n" \ -- "msiexec command {required parameter} [optional parammeter]\n\n" \ -- "Instalar um produto:\n" \ -- "\t/i {package|productcode} [property]\n" \ -- "\t/package {package|productcode} [property]\n" \ -- "\t/a package [property]\n" \ -- "Reparar uma instalação:\n" \ -- "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ -- "Desinstalar um produto:\n" \ -- "\t/uninstall {package|productcode} [property]\n" \ -- "\t/x {package|productcode} [property]\n" \ -- "Anunciar um produto:\n" \ -- "\t/j[u|m] package [/t transform] [/g languageid]\n" \ -- "Aplicar um patch:\n" \ -- "\t/p patchpackage [property]\n" \ -- "\t/p patchpackage /a package [property]\n" \ -- "Modificadores Log e UI para os comandos acima:\n" \ -- "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ -- "\t/q{|n|b|r|f|n+|b+|b-}\n" \ -- "Registrar Serviço MSI:\n" \ -- "\t/y\n" \ -- "Desregistrar Serviço MSI:\n" \ -- "\t/z\n" \ -- "Mostrar esta ajuda:\n" \ -- "\t/help\n" \ -- "\t/?\n" -+ 10 "Windows Installer %s\n\nModo de usar:\nmsiexec command {required parameter} [optional parammeter]\n\nInstalar um produto:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nReparar uma instalação:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nDesinstalar um produto:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAnunciar um produto:\n\t/j[u|m] package [/t transform] [/g languageid [...] - 11 "entre a pasta que contém %s" - 12 "faltando fonte de instalação para característica" - 13 "faltando drive de rede para característica" -@@ -72,33 +46,7 @@ - 4 "The specified installation package could not be opened. Please check the file path and try again." - 5 "localização %s não encontrada" - 9 "insira o disco %s" -- 10 "Windows Installer %s\n\n" \ -- "Usage:\n" \ -- "msiexec command {required parameter} [optional parammeter]\n\n" \ -- "Install a product:\n" \ -- "\t/i {package|productcode} [property]\n" \ -- "\t/package {package|productcode} [property]\n" \ -- "\t/a package [property]\n" \ -- "Repair an installation:\n" \ -- "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ -- "Uninstall a product:\n" \ -- "\t/uninstall {package|productcode} [property]\n" \ -- "\t/x {package|productcode} [property]\n" \ -- "Advertise a product:\n" \ -- "\t/j[u|m] package [/t transform] [/g languageid]\n" \ -- "Apply a patch:\n" \ -- "\t/p patchpackage [property]\n" \ -- "\t/p patchpackage /a package [property]\n" \ -- "Log and UI Modifiers for above commands:\n" \ -- "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ -- "\t/q{|n|b|r|f|n+|b+|b-}\n" \ -- "Register MSI Service:\n" \ -- "\t/y\n" \ -- "Unregister MSI Service:\n" \ -- "\t/z\n" \ -- "Display this help:\n" \ -- "\t/help\n" \ -- "\t/?\n" -+ 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a p [...] - 11 "indique que pasta contém %s" - 12 "instalar fonte para a opção em falta" - 13 "controlador de rede para a opção em falta" -Index: D:/trunk/dll/win32/msi/msi_Bg.rc -=================================================================== ---- D:/trunk/dll/win32/msi/msi_Bg.rc (revision 51710) -+++ D:/trunk/dll/win32/msi/msi_Bg.rc (revision 51711) -@@ -27,33 +27,7 @@ - 4 "The specified installation package could not be opened. Please check the file path and try again." - 5 "�� %s �� " - 9 "�� %s" -- 10 "Windows Installer %s\n\n" \ -- "Usage:\n" \ -- "msiexec command {required parameter} [optional parammeter]\n\n" \ -- "Install a product:\n" \ -- "\t/i {package|productcode} [property]\n" \ -- "\t/package {package|productcode} [property]\n" \ -- "\t/a package [property]\n" \ -- "Repair an installation:\n" \ -- "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ -- "Uninstall a product:\n" \ -- "\t/uninstall {package|productcode} [property]\n" \ -- "\t/x {package|productcode} [property]\n" \ -- "Advertise a product:\n" \ -- "\t/j[u|m] package [/t transform] [/g languageid]\n" \ -- "Apply a patch:\n" \ -- "\t/p patchpackage [property]\n" \ -- "\t/p patchpackage /a package [property]\n" \ -- "Log and UI Modifiers for above commands:\n" \ -- "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ -- "\t/q{|n|b|r|f|n+|b+|b-}\n" \ -- "Register MSI Service:\n" \ -- "\t/y\n" \ -- "Unregister MSI Service:\n" \ -- "\t/z\n" \ -- "Display this help:\n" \ -- "\t/help\n" \ -- "\t/?\n" -+ 10 "Windows Installer %s\n\nUsage:\nmsiexec command {required parameter} [optional parammeter]\n\nInstall a product:\n\t/i {package|productcode} [property]\n\t/package {package|productcode} [property]\n\t/a package [property]\nRepair an installation:\n\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\nUninstall a product:\n\t/uninstall {package|productcode} [property]\n\t/x {package|productcode} [property]\nAdvertise a product:\n\t/j[u|m] package [/t transform] [/g languageid]\nApply a p [...] - 11 "�� , �� %s" - 12 "�� " - 13 "�� " diff --git a/media/doc/WINESYNC.txt b/media/doc/WINESYNC.txt index fc56759cc34..562ae24ae72 100644 --- a/media/doc/WINESYNC.txt +++ b/media/doc/WINESYNC.txt @@ -114,7 +114,7 @@ dll/win32/msg711.acm # Synced to WineStaging-4.18 dll/win32/msgsm32.acm # Synced to WineStaging-4.0 dll/win32/mshtml # Synced to WineStaging-1.7.55 dll/win32/mshtml.tlb # Synced to WineStaging-1.7.55 -dll/win32/msi # Synced to WineStaging-3.3 +dll/win32/msi # Synced to WineStaging-7.3 dll/win32/msimg32 # Synced to WineStaging-3.3 dll/win32/msimtf # Synced to WineStaging-4.18 dll/win32/msisip # Synced to WineStaging-4.18 diff --git a/sdk/tools/winesync/msi.cfg b/sdk/tools/winesync/msi.cfg new file mode 100644 index 00000000000..31196a18ac0 --- /dev/null +++ b/sdk/tools/winesync/msi.cfg @@ -0,0 +1,10 @@ +directories: + dlls/msi: dll/win32/msi + dlls/msi/tests: modules/rostests/winetests/msi + programs/msiexec: base/system/msiexec +files: + include/msi.h: sdk/include/psdk/msi.h + include/msidefs.h: sdk/include/psdk/msidefs.h + include/msiquery.h: sdk/include/psdk/msiquery.h +tags: + wine: wine-7.3

2 years, 9 months

[reactos] 359/360: [WINESYNC] msi: Create the custom action server as an elevated process.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b5586f6350a7a74db4d1… commit 3b5586f6350a7a74db4d15a1f0125cb2394b631f Author: winesync <ros-dev(a)reactos.org> AuthorDate: Mon Mar 14 21:57:22 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:45 2022 +0100 [WINESYNC] msi: Create the custom action server as an elevated process. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51143 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> wine-staging patch by Zebediah Figura <z.figura12(a)gmail.com> --- dll/win32/msi/custom.c | 31 ++++++++++- ...ustom_action_server_as_an_elevated_process.diff | 61 ++++++++++++++++++++++ 2 files changed, 90 insertions(+), 2 deletions(-) diff --git a/dll/win32/msi/custom.c b/dll/win32/msi/custom.c index 143de262971..f29699bd54b 100644 --- a/dll/win32/msi/custom.c +++ b/dll/win32/msi/custom.c @@ -593,12 +593,35 @@ UINT CDECL __wine_msi_call_dll_function(DWORD client_pid, const GUID *guid) return r; } +static HANDLE get_admin_token(void) +{ + TOKEN_ELEVATION_TYPE type; + TOKEN_LINKED_TOKEN linked; + DWORD size; + +#ifdef __REACTOS__ +#ifndef GetCurrentThreadEffectiveToken +#define GetCurrentProcessToken() ((HANDLE)~(ULONG_PTR)3) +#define GetCurrentThreadEffectiveToken() GetCurrentProcessToken() +#endif +#endif + + if (!GetTokenInformation(GetCurrentThreadEffectiveToken(), TokenElevationType, &type, sizeof(type), &size) + || type == TokenElevationTypeFull) + return NULL; + + if (!GetTokenInformation(GetCurrentThreadEffectiveToken(), TokenLinkedToken, &linked, sizeof(linked), &size)) + return NULL; + return linked.LinkedToken; +} + static DWORD custom_start_server(MSIPACKAGE *package, DWORD arch) { WCHAR path[MAX_PATH], cmdline[MAX_PATH + 23]; PROCESS_INFORMATION pi = {0}; STARTUPINFOW si = {0}; WCHAR buffer[24]; + HANDLE token; void *cookie; HANDLE pipe; @@ -620,14 +643,18 @@ static DWORD custom_start_server(MSIPACKAGE *package, DWORD arch) lstrcatW(path, L"\\msiexec.exe"); swprintf(cmdline, ARRAY_SIZE(cmdline), L"%s -Embedding %d", path, GetCurrentProcessId()); + token = get_admin_token(); + if (is_wow64 && arch == SCS_64BIT_BINARY) { Wow64DisableWow64FsRedirection(&cookie); - CreateProcessW(path, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + CreateProcessAsUserW(token, path, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); Wow64RevertWow64FsRedirection(cookie); } else - CreateProcessW(path, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + CreateProcessAsUserW(token, path, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + + if (token) CloseHandle(token); CloseHandle(pi.hThread); diff --git a/sdk/tools/winesync/msi_staging/0002-msi__Create_the_custom_action_server_as_an_elevated_process.diff b/sdk/tools/winesync/msi_staging/0002-msi__Create_the_custom_action_server_as_an_elevated_process.diff new file mode 100644 index 00000000000..b94f8d06526 --- /dev/null +++ b/sdk/tools/winesync/msi_staging/0002-msi__Create_the_custom_action_server_as_an_elevated_process.diff @@ -0,0 +1,61 @@ +diff --git a/dll/win32/msi/custom.c b/dll/win32/msi/custom.c +index 143de262971..f29699bd54b 100644 +--- a/dll/win32/msi/custom.c ++++ b/dll/win32/msi/custom.c +@@ -593,12 +593,35 @@ UINT CDECL __wine_msi_call_dll_function(DWORD client_pid, const GUID *guid) + return r; + } + ++static HANDLE get_admin_token(void) ++{ ++ TOKEN_ELEVATION_TYPE type; ++ TOKEN_LINKED_TOKEN linked; ++ DWORD size; ++ ++#ifdef __REACTOS__ ++#ifndef GetCurrentThreadEffectiveToken ++#define GetCurrentProcessToken() ((HANDLE)~(ULONG_PTR)3) ++#define GetCurrentThreadEffectiveToken() GetCurrentProcessToken() ++#endif ++#endif ++ ++ if (!GetTokenInformation(GetCurrentThreadEffectiveToken(), TokenElevationType, &type, sizeof(type), &size) ++ || type == TokenElevationTypeFull) ++ return NULL; ++ ++ if (!GetTokenInformation(GetCurrentThreadEffectiveToken(), TokenLinkedToken, &linked, sizeof(linked), &size)) ++ return NULL; ++ return linked.LinkedToken; ++} ++ + static DWORD custom_start_server(MSIPACKAGE *package, DWORD arch) + { + WCHAR path[MAX_PATH], cmdline[MAX_PATH + 23]; + PROCESS_INFORMATION pi = {0}; + STARTUPINFOW si = {0}; + WCHAR buffer[24]; ++ HANDLE token; + void *cookie; + HANDLE pipe; + +@@ -620,14 +643,18 @@ static DWORD custom_start_server(MSIPACKAGE *package, DWORD arch) + lstrcatW(path, L"\\msiexec.exe"); + swprintf(cmdline, ARRAY_SIZE(cmdline), L"%s -Embedding %d", path, GetCurrentProcessId()); + ++ token = get_admin_token(); ++ + if (is_wow64 && arch == SCS_64BIT_BINARY) + { + Wow64DisableWow64FsRedirection(&cookie); +- CreateProcessW(path, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ++ CreateProcessAsUserW(token, path, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + Wow64RevertWow64FsRedirection(cookie); + } + else +- CreateProcessW(path, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ++ CreateProcessAsUserW(token, path, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ++ ++ if (token) CloseHandle(token); + + CloseHandle(pi.hThread); +

2 years, 9 months

[reactos] 358/360: [WINESYNC] msi: Do not sign extend after multiplying.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=48d97683b30c0cbaf4c22… commit 48d97683b30c0cbaf4c229e36c48a69674332526 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Mon Mar 14 21:53:54 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:45 2022 +0100 [WINESYNC] msi: Do not sign extend after multiplying. Signed-off-by: Mark Jansen <learn0more+wine(a)gmail.com> wine-staging patch by Mark Jansen <learn0more+wine(a)gmail.com> --- ...-msi__Do_not_sign_extend_after_multiplying.diff | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/sdk/tools/winesync/msi_staging/0001-msi__Do_not_sign_extend_after_multiplying.diff b/sdk/tools/winesync/msi_staging/0001-msi__Do_not_sign_extend_after_multiplying.diff new file mode 100644 index 00000000000..6f8e3524a5b --- /dev/null +++ b/sdk/tools/winesync/msi_staging/0001-msi__Do_not_sign_extend_after_multiplying.diff @@ -0,0 +1,26 @@ +diff --git a/sdk/tools/winesync/msi_staging/0001-msi__Do_not_sign_extend_after_multiplying.diff b/sdk/tools/winesync/msi_staging/0001-msi__Do_not_sign_extend_after_multiplying.diff +new file mode 100644 +index 00000000000..307428366a3 +--- /dev/null ++++ b/sdk/tools/winesync/msi_staging/0001-msi__Do_not_sign_extend_after_multiplying.diff +@@ -0,0 +1,20 @@ ++diff --git a/dll/win32/msi/dialog.c b/dll/win32/msi/dialog.c ++index 9d82be8..8e4c151 100644 ++--- a/dll/win32/msi/dialog.c +++++ b/dll/win32/msi/dialog.c ++@@ -3186,13 +3186,13 @@ static LONGLONG msi_vcl_get_cost( msi_dialog *dialog ) ++ MSICOSTTREE_SELFONLY, INSTALLSTATE_LOCAL, &each_cost))) ++ { ++ /* each_cost is in 512-byte units */ ++- total_cost += each_cost * 512; +++ total_cost += ((LONGLONG)each_cost) * 512; ++ } ++ if (ERROR_SUCCESS == (MSI_GetFeatureCost(dialog->package, feature, ++ MSICOSTTREE_SELFONLY, INSTALLSTATE_ABSENT, &each_cost))) ++ { ++ /* each_cost is in 512-byte units */ ++- total_cost -= each_cost * 512; +++ total_cost -= ((LONGLONG)each_cost) * 512; ++ } ++ } ++ return total_cost;

2 years, 9 months

[reactos] 357/360: [WINESYNC] msi/tests: Fix the trailing linefeed in an ok() message.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f162f02b5da3324976ae6… commit f162f02b5da3324976ae634661f6ab8b7c6421f9 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Mon Mar 14 21:53:48 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:45 2022 +0100 [WINESYNC] msi/tests: Fix the trailing linefeed in an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 194d1b72587756512c693df7c2fce505d591c905 by Francois Gouget <fgouget(a)free.fr> --- modules/rostests/winetests/msi/msi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/winetests/msi/msi.c b/modules/rostests/winetests/msi/msi.c index d9b3a6d6756..70b8f0e3e1d 100644 --- a/modules/rostests/winetests/msi/msi.c +++ b/modules/rostests/winetests/msi/msi.c @@ -4553,7 +4553,7 @@ static void test_MsiGetProductInfo(void) ok(r == ERROR_UNKNOWN_PROPERTY, "Expected ERROR_UNKNOWN_PROPERTY, got %d\n", r); ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf); - ok(sz == MAX_PATH, "%lun", sz); + ok(sz == MAX_PATH, "%lu\n", sz); res = RegCreateKeyExA(localkey, "InstallProperties", 0, NULL, 0, access, NULL, &propkey, NULL); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res);

2 years, 9 months

[reactos] 356/360: [WINESYNC] msi/tests: Correctly free usersid.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0dd82beda914bbedb7516… commit 0dd82beda914bbedb7516c9fa0ed6abcc89a7384 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Mon Mar 14 21:53:46 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:45 2022 +0100 [WINESYNC] msi/tests: Correctly free usersid. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 1bab386adffce4cd5589cec43b407d53230ef1cd by Hans Leidekker <hans(a)codeweavers.com> --- modules/rostests/winetests/msi/action.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/rostests/winetests/msi/action.c b/modules/rostests/winetests/msi/action.c index 24881d87636..0844ec56d97 100644 --- a/modules/rostests/winetests/msi/action.c +++ b/modules/rostests/winetests/msi/action.c @@ -3025,7 +3025,7 @@ error: DeleteFileA(msifile); DeleteFileA("msitest\\maximus"); RemoveDirectoryA("msitest"); - free(usersid); + LocalFree(usersid); } static void test_publish_product(void) @@ -3262,7 +3262,7 @@ error: DeleteFileA(msifile); DeleteFileA("msitest\\maximus"); RemoveDirectoryA("msitest"); - free(usersid); + LocalFree(usersid); } static void test_publish_features(void) @@ -3387,7 +3387,7 @@ error: DeleteFileA(msifile); DeleteFileA("msitest\\maximus"); RemoveDirectoryA("msitest"); - free(usersid); + LocalFree(usersid); } static LPSTR reg_get_val_str(HKEY hkey, LPCSTR name)

2 years, 9 months

[reactos] 355/360: [WINESYNC] msi/tests: Build without -DWINE_NO_LONG_TYPES.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1b4acd3c6542a16ddcc67… commit 1b4acd3c6542a16ddcc6791c0d69e3e7fb2bb52c Author: winesync <ros-dev(a)reactos.org> AuthorDate: Mon Mar 14 21:24:16 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:45 2022 +0100 [WINESYNC] msi/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 54b8c8c7eaafd19780cb4d91b763fe2f20327f50 by Hans Leidekker <hans(a)codeweavers.com> --- modules/rostests/winetests/msi/CMakeLists.txt | 3 +- modules/rostests/winetests/msi/action.c | 472 ++--- modules/rostests/winetests/msi/automation.c | 397 ++-- modules/rostests/winetests/msi/custom.c | 2 +- modules/rostests/winetests/msi/db.c | 164 +- modules/rostests/winetests/msi/format.c | 207 +- modules/rostests/winetests/msi/install.c | 102 +- modules/rostests/winetests/msi/msi.c | 2651 ++++++++++++------------- modules/rostests/winetests/msi/package.c | 454 ++--- modules/rostests/winetests/msi/patch.c | 25 +- modules/rostests/winetests/msi/record.c | 22 +- modules/rostests/winetests/msi/source.c | 654 +++--- modules/rostests/winetests/msi/suminfo.c | 2 +- 13 files changed, 2579 insertions(+), 2576 deletions(-) diff --git a/modules/rostests/winetests/msi/CMakeLists.txt b/modules/rostests/winetests/msi/CMakeLists.txt index 03ad557e08b..631c09abc15 100644 --- a/modules/rostests/winetests/msi/CMakeLists.txt +++ b/modules/rostests/winetests/msi/CMakeLists.txt @@ -44,7 +44,8 @@ add_typelib(typelib.idl) target_compile_definitions(msi_winetest PRIVATE __WINESRC__ USE_WINE_TODOS) if(CMAKE_C_COMPILER_ID STREQUAL "GNU") - target_compile_options(msi_winetest PRIVATE -Wno-format-overflow) + target_compile_options(msi_winetest PRIVATE -Wno-format-overflow -Wno-format) + target_compile_options(custom PRIVATE -Wno-format) endif() # msi_winetest.rc: let rc.exe find custom.dll in its subdirectory, i.e. Debug. diff --git a/modules/rostests/winetests/msi/action.c b/modules/rostests/winetests/msi/action.c index b5b80efe63e..24881d87636 100644 --- a/modules/rostests/winetests/msi/action.c +++ b/modules/rostests/winetests/msi/action.c @@ -2475,7 +2475,7 @@ static void remove_restore_point(DWORD seq_number) res = pSRRemoveRestorePoint(seq_number); if (res != ERROR_SUCCESS) - trace("Failed to remove the restore point : %08x\n", res); + trace("Failed to remove the restore point : %#lx\n", res); } static LONG delete_key( HKEY key, LPCSTR subkey, REGSAM access ) @@ -2516,8 +2516,8 @@ static void check_reg_str(HKEY prodkey, LPCSTR name, LPCSTR expected, BOOL bcase size = MAX_PATH; val[0] = '\0'; res = RegQueryValueExA(prodkey, name, NULL, &type, (BYTE *)val, &size); - ok_(__FILE__, line)(!res, "Failed to query value, error %u\n", res); - ok_(__FILE__, line)(type == REG_SZ || type == REG_EXPAND_SZ, "Got wrong type %u\n", type); + ok_(__FILE__, line)(!res, "Failed to query value, error %ld\n", res); + ok_(__FILE__, line)(type == REG_SZ || type == REG_EXPAND_SZ, "Got wrong type %lu\n", type); todo_wine_if (todo) { if (bcase) @@ -2541,9 +2541,9 @@ static void check_reg_multi(HKEY prodkey, const char *name, const char *expect, size = MAX_PATH; val[0] = '\0'; res = RegQueryValueExA(prodkey, name, NULL, &type, (BYTE *)val, &size); - ok_(__FILE__, line)(!res, "Failed to query value, error %u\n", res); - ok_(__FILE__, line)(type == REG_MULTI_SZ, "Got wrong type %u\n", type); - ok_(__FILE__, line)(size == expect_size, "expected size %u, got %u\n", expect_size, size); + ok_(__FILE__, line)(!res, "Failed to query value, error %ld\n", res); + ok_(__FILE__, line)(type == REG_MULTI_SZ, "Got wrong type %lu\n", type); + ok_(__FILE__, line)(size == expect_size, "expected size %lu, got %lu\n", expect_size, size); ok_(__FILE__, line)(!memcmp(val, expect, size), "got %s\n", debugstr_an(val, size)); } @@ -2554,10 +2554,10 @@ static void check_reg_dword(HKEY prodkey, LPCSTR name, DWORD expected, BOOL todo size = sizeof(DWORD); res = RegQueryValueExA(prodkey, name, NULL, &type, (BYTE *)&val, &size); - ok_(__FILE__, line)(!res, "Failed to query value, error %u\n", res); - ok_(__FILE__, line)(type == REG_DWORD, "Got wrong type %u\n", type); + ok_(__FILE__, line)(!res, "Failed to query value, error %ld\n", res); + ok_(__FILE__, line)(type == REG_DWORD, "Got wrong type %lu\n", type); todo_wine_if (todo) - ok_(__FILE__, line)(val == expected, "Expected %d, got %d\n", expected, val); + ok_(__FILE__, line)(val == expected, "Expected %lu, got %lu\n", expected, val); } #define CHECK_REG_STR(prodkey, name, expected) \ @@ -2644,7 +2644,7 @@ static void extract_resource(const char *name, const char *type, const char *pat void *ptr; file = CreateFileA(path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); - ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", path, GetLastError()); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %lu\n", path, GetLastError()); res = FindResourceA(NULL, name, type); ok( res != 0, "couldn't find resource\n" ); @@ -2703,10 +2703,10 @@ static void test_register_product(void) ok(delete_pf("msitest", FALSE), "Directory not created\n"); res = RegOpenKeyA(HKEY_CURRENT_USER, userugkey, &hkey); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall, 0, KEY_READ | KEY_WOW64_32KEY, &hkey); - ok(!res, "got %d\n", res); + ok(!res, "got %ld\n", res); CHECK_DEL_REG_STR(hkey, "DisplayName", "MSITEST"); CHECK_DEL_REG_STR(hkey, "DisplayVersion", "1.1.1"); @@ -2734,15 +2734,15 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD_TODO(hkey, "EstimatedSize", get_estimated_size()); res = RegDeleteKeyA(hkey, ""); - ok(!res, "got %d\n", res); + ok(!res, "got %ld\n", res); RegCloseKey(hkey); sprintf(keypath, userdata, usersid); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, KEY_ALL_ACCESS | KEY_WOW64_64KEY, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); res = RegOpenKeyExA(hkey, "InstallProperties", 0, KEY_READ, &props); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); size = sizeof(path); RegQueryValueExA(props, "LocalPackage", NULL, &type, (LPBYTE)path, &size); @@ -2775,43 +2775,43 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD_TODO(props, "EstimatedSize", get_estimated_size()); res = RegDeleteKeyA(props, ""); - ok(!res, "got %d\n", res); + ok(!res, "got %ld\n", res); RegCloseKey(props); res = RegOpenKeyExA(hkey, "Usage", 0, KEY_READ, &usage); todo_wine { - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); } res = RegDeleteKeyA(usage, ""); todo_wine - ok(!res, "got %d\n", res); + ok(!res, "got %ld\n", res); RegCloseKey(usage); res = RegDeleteKeyA(hkey, ""); - ok(!res, "got %d\n", res); + ok(!res, "got %ld\n", res); RegCloseKey(hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ugkey, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); CHECK_DEL_REG_STR(hkey, "84A88FD7F6998CE40A22FB59F6B9C2BB", ""); res = RegDeleteKeyA(hkey, ""); - ok(!res, "got %d\n", res); + ok(!res, "got %ld\n", res); RegCloseKey(hkey); /* RegisterProduct, machine */ r = MsiInstallProductA(msifile, "REGISTER_PRODUCT=1 ALLUSERS=1"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, userugkey, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall, 0, KEY_READ | KEY_WOW64_32KEY, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); CHECK_DEL_REG_STR(hkey, "DisplayName", "MSITEST"); CHECK_DEL_REG_STR(hkey, "DisplayVersion", "1.1.1"); @@ -2839,15 +2839,15 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD_TODO(hkey, "EstimatedSize", get_estimated_size()); res = RegDeleteKeyA(hkey, ""); - ok(!res, "got %d\n", res); + ok(!res, "got %ld\n", res); RegCloseKey(hkey); sprintf(keypath, userdata, "S-1-5-18"); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); res = RegOpenKeyExA(hkey, "InstallProperties", 0, KEY_READ, &props); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); size = sizeof(path); RegQueryValueExA(props, "LocalPackage", NULL, &type, (LPBYTE)path, &size); @@ -2880,30 +2880,30 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD_TODO(props, "EstimatedSize", get_estimated_size()); res = RegDeleteKeyA(props, ""); - ok(!res, "got %d\n", res); + ok(!res, "got %ld\n", res); RegCloseKey(props); res = RegOpenKeyExA(hkey, "Usage", 0, KEY_READ, &usage); todo_wine { - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); } res = RegDeleteKeyA(usage, ""); todo_wine - ok(!res, "got %d\n", res); + ok(!res, "got %ld\n", res); RegCloseKey(usage); res = RegDeleteKeyA(hkey, ""); - ok(!res, "got %d\n", res); + ok(!res, "got %ld\n", res); RegCloseKey(hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ugkey, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); CHECK_DEL_REG_STR(hkey, "84A88FD7F6998CE40A22FB59F6B9C2BB", ""); res = RegDeleteKeyA(hkey, ""); - ok(!res, "got %d\n", res); + ok(!res, "got %ld\n", res); RegCloseKey(hkey); if (is_wow64 || is_64bit) @@ -2917,13 +2917,13 @@ static void test_register_product(void) ok(delete_pf("msitest", FALSE), "Directory not created\n"); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, userugkey, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall, 0, KEY_READ | KEY_WOW64_32KEY, &hkey); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_SUCCESS, got %ld\n", res); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); CHECK_DEL_REG_STR(hkey, "DisplayName", "MSITEST"); CHECK_DEL_REG_STR(hkey, "DisplayVersion", "1.1.1"); @@ -2951,15 +2951,15 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD_TODO(hkey, "EstimatedSize", get_estimated_size()); res = RegDeleteKeyA(hkey, ""); - ok(!res, "got %d\n", res); + ok(!res, "got %ld\n", res); RegCloseKey(hkey); sprintf(keypath, userdata, "S-1-5-18"); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); res = RegOpenKeyExA(hkey, "InstallProperties", 0, KEY_READ, &props); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); size = sizeof(path); RegQueryValueExA(props, "LocalPackage", NULL, &type, (LPBYTE)path, &size); @@ -2992,30 +2992,30 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD_TODO(props, "EstimatedSize", get_estimated_size()); res = RegDeleteKeyA(props, ""); - ok(!res, "got %d\n", res); + ok(!res, "got %ld\n", res); RegCloseKey(props); res = RegOpenKeyExA(hkey, "Usage", 0, KEY_READ, &usage); todo_wine { - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); } res = RegDeleteKeyA(usage, ""); todo_wine - ok(!res, "got %d\n", res); + ok(!res, "got %ld\n", res); RegCloseKey(usage); res = RegDeleteKeyA(hkey, ""); - ok(!res, "got %d\n", res); + ok(!res, "got %ld\n", res); RegCloseKey(hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ugkey, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); CHECK_DEL_REG_STR(hkey, "84A88FD7F6998CE40A22FB59F6B9C2BB", ""); res = RegDeleteKeyA(hkey, ""); - ok(!res, "got %d\n", res); + ok(!res, "got %ld\n", res); RegCloseKey(hkey); } else @@ -3088,7 +3088,7 @@ static void test_publish_product(void) ok(delete_pf("msitest", FALSE), "Directory not created\n"); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, badprod, 0, access, &hkey); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); sprintf(keypath, prodpath, usersid); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &hkey); @@ -3108,13 +3108,13 @@ static void test_publish_product(void) return; } } - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); res = RegOpenKeyExA(hkey, "InstallProperties", 0, access, &props); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); res = RegOpenKeyExA(hkey, "Patches", 0, access, &patches); - todo_wine ok(!res, "Expected ERROR_SUCCESS, got %d\n", res); + todo_wine ok(!res, "Expected ERROR_SUCCESS, got %ld\n", res); if (!res) CHECK_DEL_REG_STR(patches, "AllPatches", ""); @@ -3125,7 +3125,7 @@ static void test_publish_product(void) currentuser: res = RegOpenKeyA(HKEY_CURRENT_USER, cuprodpath, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); CHECK_DEL_REG_STR(hkey, "ProductName", "MSITEST"); CHECK_DEL_REG_STR(hkey, "PackageCode", "AC75740029052C94DA02821EECD05F2F"); @@ -3139,7 +3139,7 @@ currentuser: CHECK_DEL_REG_MULTI(hkey, "Clients", ":\0"); res = RegOpenKeyA(hkey, "SourceList", &sourcelist); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); lstrcpyA(path, "n;1;"); lstrcatA(path, temp); @@ -3147,7 +3147,7 @@ currentuser: CHECK_DEL_REG_STR(sourcelist, "PackageName", "msitest.msi"); res = RegOpenKeyA(sourcelist, "Net", &net); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); CHECK_DEL_REG_STR(net, "1", temp); @@ -3155,7 +3155,7 @@ currentuser: RegCloseKey(net); res = RegOpenKeyA(sourcelist, "Media", &media); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); CHECK_DEL_REG_STR(media, "1", "DISK1;"); @@ -3167,7 +3167,7 @@ currentuser: RegCloseKey(hkey); res = RegOpenKeyA(HKEY_CURRENT_USER, cuupgrades, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); CHECK_DEL_REG_STR(hkey, "84A88FD7F6998CE40A22FB59F6B9C2BB", ""); @@ -3183,17 +3183,17 @@ currentuser: ok(delete_pf("msitest", FALSE), "Directory not created\n"); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, badprod, 0, access, &hkey); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); sprintf(keypath, prodpath, "S-1-5-18"); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); res = RegOpenKeyExA(hkey, "InstallProperties", 0, access, &props); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); res = RegOpenKeyExA(hkey, "Patches", 0, access, &patches); - todo_wine ok(!res, "Expected ERROR_SUCCESS, got %d\n", res); + todo_wine ok(!res, "Expected ERROR_SUCCESS, got %ld\n", res); if (!res) CHECK_DEL_REG_STR(patches, "AllPatches", ""); @@ -3204,7 +3204,7 @@ currentuser: machprod: res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, machprod, 0, access, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); CHECK_DEL_REG_STR(hkey, "ProductName", "MSITEST"); CHECK_DEL_REG_STR(hkey, "PackageCode", "AC75740029052C94DA02821EECD05F2F"); @@ -3218,7 +3218,7 @@ machprod: CHECK_DEL_REG_MULTI(hkey, "Clients", ":\0"); res = RegOpenKeyExA(hkey, "SourceList", 0, access, &sourcelist); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); lstrcpyA(path, "n;1;"); lstrcatA(path, temp); @@ -3226,36 +3226,36 @@ machprod: CHECK_DEL_REG_STR(sourcelist, "PackageName", "msitest.msi"); res = RegOpenKeyExA(sourcelist, "Net", 0, access, &net); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); CHECK_DEL_REG_STR(net, "1", temp); res = delete_key(net, "", access); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); RegCloseKey(net); res = RegOpenKeyExA(sourcelist, "Media", 0, access, &media); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); CHECK_DEL_REG_STR(media, "1", "DISK1;"); res = delete_key(media, "", access); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); RegCloseKey(media); res = delete_key(sourcelist, "", access); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); RegCloseKey(sourcelist); res = delete_key(hkey, "", access); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); RegCloseKey(hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, machup, 0, access, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); CHECK_DEL_REG_STR(hkey, "84A88FD7F6998CE40A22FB59F6B9C2BB", ""); res = delete_key(hkey, "", access); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); RegCloseKey(hkey); error: @@ -3317,13 +3317,13 @@ static void test_publish_features(void) ok(delete_pf("msitest", FALSE), "Directory not created\n"); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, featkey, 0, access, &hkey); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, classfeat, 0, access, &hkey); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); res = RegOpenKeyA(HKEY_CURRENT_USER, cupath, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); CHECK_REG_STR(hkey, "feature", ""); CHECK_REG_STR(hkey, "montecristo", ""); @@ -3335,7 +3335,7 @@ static void test_publish_features(void) sprintf(keypath, udfeatpath, usersid); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); CHECK_REG_STR(hkey, "feature", "VGtfp^p+,?82@JU1j_KE"); CHECK_REG_STR(hkey, "montecristo", "VGtfp^p+,?82@JU1j_KE"); @@ -3354,12 +3354,12 @@ static void test_publish_features(void) ok(delete_pf("msitest", FALSE), "Directory not created\n"); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, featkey, 0, access, &hkey); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); res = RegOpenKeyA(HKEY_CURRENT_USER, cupath, &hkey); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, classfeat, 0, access, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); CHECK_REG_STR(hkey, "feature", ""); CHECK_REG_STR(hkey, "montecristo", ""); @@ -3371,7 +3371,7 @@ static void test_publish_features(void) sprintf(keypath, udfeatpath, "S-1-5-18"); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); CHECK_REG_STR(hkey, "feature", "VGtfp^p+,?82@JU1j_KE"); CHECK_REG_STR(hkey, "montecristo", "VGtfp^p+,?82@JU1j_KE"); @@ -3504,7 +3504,7 @@ static void test_register_user(void) sprintf(keypath, keypropsfmt, usersid); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &props); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); CHECK_REG_STR(props, "ProductID", "none"); CHECK_REG_STR(props, "RegCompany", company); @@ -3526,7 +3526,7 @@ static void test_register_user(void) sprintf(keypath, keypropsfmt, "S-1-5-18"); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &props); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); CHECK_REG_STR(props, "ProductID", "none"); CHECK_REG_STR(props, "RegCompany", company); @@ -3598,12 +3598,12 @@ static void test_process_components(void) sprintf(keypath, keyfmt, usersid, "CBABC2FDCCB35E749A8944D8C1C098B5"); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &comp); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); size = MAX_PATH; res = RegQueryValueExA(comp, "84A88FD7F6998CE40A22FB59F6B9C2BB", NULL, NULL, (LPBYTE)val, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); lstrcpyA(program_files_maximus,PROG_FILES_DIR); lstrcatA(program_files_maximus,"\\msitest\\maximus"); @@ -3612,7 +3612,7 @@ static void test_process_components(void) "Expected \"%s\", got \"%s\"\n", program_files_maximus, val); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, compkey, 0, access, &hkey); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); RegDeleteValueA(comp, "84A88FD7F6998CE40A22FB59F6B9C2BB"); delete_key(comp, "", access); @@ -3620,17 +3620,17 @@ static void test_process_components(void) sprintf(keypath, keyfmt, usersid, "241C3DA58FECD0945B9687D408766058"); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &comp); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); size = MAX_PATH; res = RegQueryValueExA(comp, "84A88FD7F6998CE40A22FB59F6B9C2BB", NULL, NULL, (LPBYTE)val, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); ok(!lstrcmpA(val, "01\\msitest\\augustus"), "Expected \"01\\msitest\\augustus\", got \"%s\"\n", val); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, compkey, 0, access, &hkey); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); RegDeleteValueA(comp, "84A88FD7F6998CE40A22FB59F6B9C2BB"); delete_key(comp, "", access); @@ -3644,17 +3644,17 @@ static void test_process_components(void) sprintf(keypath, keyfmt, "S-1-5-18", "CBABC2FDCCB35E749A8944D8C1C098B5"); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &comp); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); size = MAX_PATH; res = RegQueryValueExA(comp, "84A88FD7F6998CE40A22FB59F6B9C2BB", NULL, NULL, (LPBYTE)val, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); ok(!lstrcmpiA(val, program_files_maximus), "Expected \"%s\", got \"%s\"\n", program_files_maximus, val); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, compkey, 0, access, &hkey); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); RegDeleteValueA(comp, "84A88FD7F6998CE40A22FB59F6B9C2BB"); delete_key(comp, "", access); @@ -3662,17 +3662,17 @@ static void test_process_components(void) sprintf(keypath, keyfmt, "S-1-5-18", "241C3DA58FECD0945B9687D408766058"); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &comp); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); size = MAX_PATH; res = RegQueryValueExA(comp, "84A88FD7F6998CE40A22FB59F6B9C2BB", NULL, NULL, (LPBYTE)val, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); ok(!lstrcmpA(val, "01\\msitest\\augustus"), "Expected \"01\\msitest\\augustus\", got \"%s\"\n", val); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, compkey, 0, access, &hkey); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); RegDeleteValueA(comp, "84A88FD7F6998CE40A22FB59F6B9C2BB"); delete_key(comp, "", access); @@ -3715,12 +3715,12 @@ static void test_publish(void) access |= KEY_WOW64_64KEY; res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, subkey, 0, KEY_ALL_ACCESS, &uninstall); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); if (is_64bit) { res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, subkey_32node, 0, KEY_ALL_ACCESS, &uninstall_32node); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); } CreateDirectoryA("msitest", NULL); @@ -3742,7 +3742,7 @@ static void test_publish(void) error = GetLastError(); ok(r == ERROR_UNKNOWN_PRODUCT, "got %u\n", r); ok(state == 0xdead, "got %d\n", state); - ok(error == 0xdeadbeef, "got %u\n", error); + ok(error == 0xdeadbeef, "got %lu\n", error); state = 0xdead; SetLastError(0xdeadbeef); @@ -3750,7 +3750,7 @@ static void test_publish(void) error = GetLastError(); ok(r == ERROR_UNKNOWN_PRODUCT, "got %u\n", r); ok(state == 0xdead, "got %d\n", state); - ok(error == ERROR_SUCCESS, "got %u\n", error); + ok(error == ERROR_SUCCESS, "got %lu\n", error); state = 0xdead; SetLastError(0xdeadbeef); @@ -3758,7 +3758,7 @@ static void test_publish(void) error = GetLastError(); ok(r == ERROR_UNKNOWN_PRODUCT, "got %u\n", r); ok(state == 0xdead, "got %d\n", state); - ok(error == ERROR_SUCCESS, "got %u\n", error); + ok(error == ERROR_SUCCESS, "got %lu\n", error); state = MsiQueryFeatureStateA(prodcode, "feature"); ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); @@ -3772,7 +3772,7 @@ static void test_publish(void) ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); res = RegOpenKeyExA(uninstall, prodcode, 0, access, &prodkey); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); /* nothing published */ r = MsiInstallProductA(msifile, NULL); @@ -3800,7 +3800,7 @@ static void test_publish(void) ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); res = RegOpenKeyExA(uninstall, prodcode, 0, access, &prodkey); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); /* PublishProduct and RegisterProduct */ r = MsiInstallProductA(msifile, "REGISTER_PRODUCT=1 PUBLISH_PRODUCT=1"); @@ -3825,14 +3825,14 @@ static void test_publish(void) if (is_64bit) { res = RegOpenKeyExA(uninstall_32node, prodcode, 0, KEY_ALL_ACCESS, &prodkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); } else { res = RegOpenKeyExA(uninstall, prodcode, 0, access, &prodkey); if (is_wow64 && res == ERROR_FILE_NOT_FOUND) /* XP - Vista, Wow64 */ res = RegOpenKeyExA(uninstall, prodcode, 0, KEY_ALL_ACCESS, &prodkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); } CHECK_REG_STR(prodkey, "DisplayName", "MSITEST"); @@ -3882,7 +3882,7 @@ static void test_publish(void) ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); res = RegOpenKeyExA(uninstall, prodcode, 0, access, &prodkey); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); /* complete install */ r = MsiInstallProductA(msifile, "FULL=1"); @@ -3902,7 +3902,7 @@ static void test_publish(void) error = GetLastError(); ok(r == ERROR_UNKNOWN_PRODUCT, "got %u\n", r); ok(state == 0xdead, "got %d\n", state); - ok(error == 0xdeadbeef, "got %u\n", error); + ok(error == 0xdeadbeef, "got %lu\n", error); state = 0xdead; SetLastError(0xdeadbeef); @@ -3910,7 +3910,7 @@ static void test_publish(void) error = GetLastError(); ok(r == ERROR_UNKNOWN_PRODUCT, "got %u\n", r); ok(state == 0xdead, "got %d\n", state); - ok(error == ERROR_SUCCESS, "got %u\n", error); + ok(error == ERROR_SUCCESS, "got %lu\n", error); state = 0xdead; SetLastError(0xdeadbeef); @@ -3918,7 +3918,7 @@ static void test_publish(void) error = GetLastError(); ok(r == ERROR_SUCCESS, "got %u\n", r); ok(state == INSTALLSTATE_LOCAL, "got %d\n", state); - ok(error == ERROR_SUCCESS, "got %u\n", error); + ok(error == ERROR_SUCCESS, "got %lu\n", error); state = MsiQueryFeatureStateA(prodcode, "montecristo"); ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); @@ -3931,12 +3931,12 @@ static void test_publish(void) if (is_64bit) { res = RegOpenKeyExA(uninstall_32node, prodcode, 0, KEY_ALL_ACCESS, &prodkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); } else { res = RegOpenKeyExA(uninstall, prodcode, 0, KEY_ALL_ACCESS, &prodkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); } CHECK_REG_STR(prodkey, "DisplayName", "MSITEST"); @@ -3987,7 +3987,7 @@ static void test_publish(void) ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); res = RegOpenKeyExA(uninstall, prodcode, 0, access, &prodkey); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); /* complete install */ r = MsiInstallProductA(msifile, "FULL=1"); @@ -4012,12 +4012,12 @@ static void test_publish(void) if (is_64bit) { res = RegOpenKeyExA(uninstall_32node, prodcode, 0, KEY_ALL_ACCESS, &prodkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); } else { res = RegOpenKeyExA(uninstall, prodcode, 0, KEY_ALL_ACCESS, &prodkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); } CHECK_REG_STR(prodkey, "DisplayName", "MSITEST"); @@ -4070,12 +4070,12 @@ static void test_publish(void) if (is_64bit) { res = RegOpenKeyExA(uninstall_32node, prodcode, 0, KEY_ALL_ACCESS, &prodkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); } else { res = RegOpenKeyExA(uninstall, prodcode, 0, KEY_ALL_ACCESS, &prodkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); } CHECK_REG_STR(prodkey, "DisplayName", "MSITEST"); @@ -4128,12 +4128,12 @@ static void test_publish(void) if (is_64bit) { res = RegOpenKeyExA(uninstall_32node, prodcode, 0, KEY_ALL_ACCESS, &prodkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); } else { res = RegOpenKeyExA(uninstall, prodcode, 0, KEY_ALL_ACCESS, &prodkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); } CHECK_REG_STR(prodkey, "DisplayName", "MSITEST"); @@ -4184,7 +4184,7 @@ static void test_publish(void) ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); res = RegOpenKeyExA(uninstall, prodcode, 0, access, &prodkey); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); /* complete install */ r = MsiInstallProductA(msifile, "FULL=1"); @@ -4209,12 +4209,12 @@ static void test_publish(void) if (is_64bit) { res = RegOpenKeyExA(uninstall_32node, prodcode, 0, KEY_ALL_ACCESS, &prodkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); } else { res = RegOpenKeyExA(uninstall, prodcode, 0, KEY_ALL_ACCESS, &prodkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); } CHECK_REG_STR(prodkey, "DisplayName", "MSITEST"); @@ -4265,7 +4265,7 @@ static void test_publish(void) ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); res = RegOpenKeyExA(uninstall, prodcode, 0, access, &prodkey); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); /* make sure 'Program Files\msitest' is removed */ delete_pfmsitest_files(); @@ -4320,7 +4320,7 @@ static void test_publish_sourcelist(void) r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAMEA, value, &size); ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); - ok(size == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, size); + ok(size == MAX_PATH, "got %lu\n", size); ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got \"%s\"\n", value); size = MAX_PATH; @@ -4328,7 +4328,7 @@ static void test_publish_sourcelist(void) r = pMsiSourceListEnumSourcesA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT | MSISOURCETYPE_URL, 0, value, &size); ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); - ok(size == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, size); + ok(size == MAX_PATH, "got %lu\n", size); ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got \"%s\"\n", value); r = MsiInstallProductA(msifile, "REGISTER_PRODUCT=1"); @@ -4342,7 +4342,7 @@ static void test_publish_sourcelist(void) r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAMEA, value, &size); ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); - ok(size == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, size); + ok(size == MAX_PATH, "got %lu\n", size); ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got \"%s\"\n", value); size = MAX_PATH; @@ -4350,7 +4350,7 @@ static void test_publish_sourcelist(void) r = pMsiSourceListEnumSourcesA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT | MSISOURCETYPE_URL, 0, value, &size); ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); - ok(size == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, size); + ok(size == MAX_PATH, "got %lu\n", size); ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got \"%s\"\n", value); r = MsiInstallProductA(msifile, "PROCESS_COMPONENTS=1"); @@ -4364,7 +4364,7 @@ static void test_publish_sourcelist(void) r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAMEA, value, &size); ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); - ok(size == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, size); + ok(size == MAX_PATH, "got %lu\n", size); ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got \"%s\"\n", value); size = MAX_PATH; @@ -4372,7 +4372,7 @@ static void test_publish_sourcelist(void) r = pMsiSourceListEnumSourcesA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT | MSISOURCETYPE_URL, 0, value, &size); ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); - ok(size == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, size); + ok(size == MAX_PATH, "got %lu\n", size); ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got \"%s\"\n", value); r = MsiInstallProductA(msifile, "PUBLISH_FEATURES=1"); @@ -4386,7 +4386,7 @@ static void test_publish_sourcelist(void) r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAMEA, value, &size); ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); - ok(size == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, size); + ok(size == MAX_PATH, "got %lu\n", size); ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got \"%s\"\n", value); size = MAX_PATH; @@ -4394,7 +4394,7 @@ static void test_publish_sourcelist(void) r = pMsiSourceListEnumSourcesA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT | MSISOURCETYPE_URL, 0, value, &size); ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); - ok(size == MAX_PATH, "Expected %d, got %d\n", MAX_PATH, size); + ok(size == MAX_PATH, "got %lu\n", size); ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got \"%s\"\n", value); r = MsiInstallProductA(msifile, "PUBLISH_PRODUCT=1"); @@ -4409,7 +4409,7 @@ static void test_publish_sourcelist(void) MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAMEA, value, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(value, "msitest.msi"), "Expected 'msitest.msi', got %s\n", value); - ok(size == 11, "Expected 11, got %d\n", size); + ok(size == 11, "Expected 11, got %lu\n", size); size = MAX_PATH; lstrcpyA(value, "aaa"); @@ -4417,7 +4417,7 @@ static void test_publish_sourcelist(void) MSICODE_PRODUCT, INSTALLPROPERTY_MEDIAPACKAGEPATHA, value, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(value, ""), "Expected \"\", got \"%s\"\n", value); - ok(size == 0, "Expected 0, got %d\n", size); + ok(size == 0, "Expected 0, got %lu\n", size); size = MAX_PATH; lstrcpyA(value, "aaa"); @@ -4425,7 +4425,7 @@ static void test_publish_sourcelist(void) MSICODE_PRODUCT, INSTALLPROPERTY_DISKPROMPTA, value, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(value, ""), "Expected \"\", got \"%s\"\n", value); - ok(size == 0, "Expected 0, got %d\n", size); + ok(size == 0, "Expected 0, got %lu\n", size); lstrcpyA(path, CURR_DIR); lstrcatA(path, "\\"); @@ -4436,7 +4436,7 @@ static void test_publish_sourcelist(void) MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCEA, value, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(value, path), "Expected \"%s\", got \"%s\"\n", path, value); - ok(size == lstrlenA(path), "Expected %d, got %d\n", lstrlenA(path), size); + ok(size == lstrlenA(path), "Expected %d, got %lu\n", lstrlenA(path), size); size = MAX_PATH; lstrcpyA(value, "aaa"); @@ -4444,7 +4444,7 @@ static void test_publish_sourcelist(void) MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDTYPEA, value, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(value, "n"), "Expected \"n\", got \"%s\"\n", value); - ok(size == 1, "Expected 1, got %d\n", size); + ok(size == 1, "Expected 1, got %lu\n", size); size = MAX_PATH; lstrcpyA(value, "aaa"); @@ -4452,7 +4452,7 @@ static void test_publish_sourcelist(void) MSICODE_PRODUCT | MSISOURCETYPE_URL, 0, value, &size); ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value); - ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size); + ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size); size = MAX_PATH; lstrcpyA(value, "aaa"); @@ -4460,7 +4460,7 @@ static void test_publish_sourcelist(void) MSICODE_PRODUCT | MSISOURCETYPE_NETWORK, 0, value, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(value, path), "Expected \"%s\", got \"%s\"\n", path, value); - ok(size == lstrlenA(path), "Expected %d, got %d\n", lstrlenA(path), size); + ok(size == lstrlenA(path), "Expected %d, got %lu\n", lstrlenA(path), size); size = MAX_PATH; lstrcpyA(value, "aaa"); @@ -4468,7 +4468,7 @@ static void test_publish_sourcelist(void) MSICODE_PRODUCT | MSISOURCETYPE_NETWORK, 1, value, &size); ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value); - ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size); + ok(size == MAX_PATH, "Expected MAX_PATH, got %lu\n", size); /* complete uninstall */ r = MsiInstallProductA(msifile, "FULL=1 REMOVE=ALL"); @@ -4826,28 +4826,28 @@ static void test_write_registry_values(void) MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); res = RegCreateKeyA(HKEY_CURRENT_USER, "msitest", &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); res = RegSetValueExA(hkey, "Value1", 0, REG_MULTI_SZ, (const BYTE *)"two\0", 5); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); res = RegSetValueExA(hkey, "Value2", 0, REG_MULTI_SZ, (const BYTE *)"one\0", 5); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); res = RegSetValueExA(hkey, "Value3", 0, REG_MULTI_SZ, (const BYTE *)"two\0", 5); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); res = RegSetValueExA(hkey, "Value4", 0, REG_MULTI_SZ, (const BYTE *)"one\0", 5); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); res = RegSetValueExA(hkey, "Value5", 0, REG_MULTI_SZ, (const BYTE *)"one\0two\0", 9); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); res = RegSetValueExA(hkey, "Value6", 0, REG_MULTI_SZ, (const BYTE *)"one\0", 5); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); res = RegSetValueExA(hkey, "Value7", 0, REG_SZ, (const BYTE *)"one", 4); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); res = RegSetValueExA(hkey, "instremove", 0, REG_SZ, (const BYTE *)"val", 3); - ok(!res, "got %u\n", res); + ok(!res, "got %ld\n", res); res = RegCreateKeyA(hkey, "instremove", &subkey); - ok(!res, "got %u\n", res); + ok(!res, "got %ld\n", res); RegCloseKey(subkey); r = MsiInstallProductA(msifile, NULL); @@ -4864,21 +4864,21 @@ static void test_write_registry_values(void) size = sizeof(buf); res = RegQueryValueExA(hkey, "expandsz", NULL, &type, (BYTE *)buf, &size); - ok(!res, "got %u\n", res); - ok(type == REG_EXPAND_SZ, "got %d\n", type); + ok(!res, "got %ld\n", res); + ok(type == REG_EXPAND_SZ, "got %ld\n", type); ok(!strcmp(buf, "string"), "got %s\n", buf); size = sizeof(buf); res = RegQueryValueExA(hkey, "binary", NULL, &type, (BYTE *)buf, &size); - ok(!res, "got %u\n", res); - ok(type == REG_BINARY, "got %d\n", type); - ok(size == 4, "got size %u\n", size); + ok(!res, "got %ld\n", res); + ok(type == REG_BINARY, "got %ld\n", type); + ok(size == 4, "got size %lu\n", size); ok(!memcmp(buf, "\x01\x23\x45\x67", 4), "wrong data\n"); CHECK_REG_STR(hkey, "", "default"); res = RegOpenKeyA(hkey, "VisualStudio", &subkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); RegCloseKey(subkey); CHECK_REG_MULTI(hkey, "Value1", "one\0"); @@ -4893,55 +4893,55 @@ static void test_write_registry_values(void) CHECK_REG_DWORD(hkey, "source", 1); res = RegOpenKeyA(hkey, "subkey", &subkey); - ok(!res, "got %u\n", res); + ok(!res, "got %ld\n", res); res = RegQueryValueExA(subkey, "", NULL, NULL, NULL, NULL); - ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res); RegCloseKey(subkey); res = RegOpenKeyA(hkey, "create", &subkey); - ok(!res, "got %u\n", res); + ok(!res, "got %ld\n", res); RegCloseKey(subkey); res = RegOpenKeyA(hkey, "delete", &subkey); - ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res); res = RegCreateKeyA(hkey, "delete", &subkey); - ok(!res, "got %u\n", res); + ok(!res, "got %ld\n", res); RegCloseKey(subkey); res = RegQueryValueExA(hkey, "instremove", NULL, NULL, NULL, NULL); - ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res); res = RegOpenKeyA(hkey, "instremove", &subkey); - ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res); r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(!r, "got %u\n", r); res = RegQueryValueExA(hkey, "sz", NULL, NULL, NULL, NULL); - ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res); res = RegQueryValueExA(hkey, "multisz", NULL, NULL, NULL, NULL); - ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res); res = RegQueryValueExA(hkey, "dword", NULL, NULL, NULL, NULL); - ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res); res = RegQueryValueExA(hkey, "expandsz", NULL, NULL, NULL, NULL); - ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res); res = RegQueryValueExA(hkey, "binary", NULL, NULL, NULL, NULL); - ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res); res = RegQueryValueExA(hkey, "", NULL, NULL, NULL, NULL); - ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res); res = RegOpenKeyA(hkey, "VisualStudio", &subkey); - ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res); res = RegQueryValueExA(hkey, "Value1", NULL, NULL, NULL, NULL); - ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res); res = RegQueryValueExA(hkey, "Value4", NULL, NULL, NULL, NULL); - ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res); res = RegQueryValueExA(hkey, "Value5", NULL, NULL, NULL, NULL); - ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res); res = RegQueryValueExA(hkey, "Value6", NULL, NULL, NULL, NULL); - ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res); res = RegQueryValueExA(hkey, "Value7", NULL, NULL, NULL, NULL); - ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res); todo_wine { CHECK_REG_MULTI(hkey, "Value2", "one\0"); @@ -4949,25 +4949,25 @@ todo_wine { } res = RegQueryValueExA(hkey, "format", NULL, NULL, NULL, NULL); - ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res); res = RegQueryValueExA(hkey, "source", NULL, NULL, NULL, NULL); - ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res); res = RegOpenKeyA(hkey, "subkey", &subkey); - ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res); res = RegOpenKeyA(hkey, "create", &subkey); - ok(!res, "got %u\n", res); + ok(!res, "got %ld\n", res); RegCloseKey(subkey); res = RegDeleteKeyA(hkey, "create"); - ok(!res, "got %u\n", res); + ok(!res, "got %ld\n", res); res = RegOpenKeyA(hkey, "delete", &subkey); - ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res); RegCloseKey(hkey); res = RegDeleteKeyA(HKEY_CURRENT_USER, "msitest"); - ok(!res, "got %u\n", res); + ok(!res, "got %ld\n", res); error: DeleteFileA(msifile); @@ -4990,20 +4990,20 @@ static void test_envvar(void) create_database(msifile, env_tables, ARRAY_SIZE(env_tables)); res = RegCreateKeyExA(HKEY_CURRENT_USER, "Environment", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &env, NULL); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "System\\CurrentControlSet\\Control\\Session Manager\\Environment", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &env2, NULL); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); res = RegSetValueExA(env, "MSITESTVAR1", 0, REG_SZ, (const BYTE *)"0", 2); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); res = RegSetValueExA(env, "MSITESTVAR2", 0, REG_SZ, (const BYTE *)"0", 2); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); res = RegSetValueExA(env, "MSITESTVAR21", 0, REG_SZ, (const BYTE *)"1", 2); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); @@ -5021,22 +5021,22 @@ static void test_envvar(void) CHECK_REG_STR(env, "MSITESTVAR4", "1"); res = RegDeleteValueA(env, "MSITESTVAR5"); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); res = RegDeleteValueA(env, "MSITESTVAR6"); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); res = RegDeleteValueA(env, "MSITESTVAR7"); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); res = RegDeleteValueA(env, "MSITESTVAR8"); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); res = RegDeleteValueA(env, "MSITESTVAR9"); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); res = RegDeleteValueA(env, "MSITESTVAR10"); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); CHECK_REG_STR(env, "MSITESTVAR11", "1;2"); CHECK_REG_STR(env, "MSITESTVAR12", "1"); @@ -5053,13 +5053,13 @@ static void test_envvar(void) CHECK_REG_STR(env2, "MSITESTVAR100", "1"); res = RegSetValueExA(env, "MSITESTVAR22", 0, REG_SZ, (const BYTE *)"1", 2); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); res = RegSetValueExA(env, "MSITESTVAR23", 0, REG_SZ, (const BYTE *)"1", 2); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); res = RegDeleteValueA(env, "MSITESTVAR25"); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(!r, "got %u\n", r); @@ -5076,11 +5076,11 @@ static void test_envvar(void) { sprintf(buffer, "MSITESTVAR%i", i); res = RegDeleteValueA(env, buffer); - ok(res == ERROR_FILE_NOT_FOUND, "[%d] got %u\n", i, res); + ok(res == ERROR_FILE_NOT_FOUND, "[%d] got %ld\n", i, res); } res = RegDeleteValueA(env2, "MSITESTVAR100"); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); error: RegDeleteValueA(env, "MSITESTVAR1"); @@ -5168,7 +5168,7 @@ static void test_start_stop_services(void) CloseServiceHandle(scm); return; } - ok(service != NULL, "Failed to open Spooler, error %d\n", GetLastError()); + ok(service != NULL, "Failed to open Spooler, error %lu\n", GetLastError()); if (!service) { CloseServiceHandle(scm); return; @@ -5202,7 +5202,7 @@ static void test_start_stop_services(void) service = OpenServiceA(scm, "Spooler", SC_MANAGER_ALL_ACCESS); ret = ControlService(service, SERVICE_CONTROL_STOP, &status); - ok(ret, "ControlService failed %u\n", GetLastError()); + ok(ret, "ControlService failed %lu\n", GetLastError()); CloseServiceHandle(service); CloseServiceHandle(scm); @@ -5233,7 +5233,7 @@ static void test_start_stop_services(void) service = OpenServiceA(scm, "Spooler", SC_MANAGER_ALL_ACCESS); ret = ControlService(service, SERVICE_CONTROL_STOP, &status); - ok(ret, "ControlService failed %u\n", GetLastError()); + ok(ret, "ControlService failed %lu\n", GetLastError()); CloseServiceHandle(service); CloseServiceHandle(scm); @@ -5256,7 +5256,7 @@ static void delete_test_service(const char *name) if (service) { ret = DeleteService( service ); - ok( ret, "failed to delete service %u\n", GetLastError() ); + ok( ret, "failed to delete service %lu\n", GetLastError() ); CloseServiceHandle(service); } CloseServiceHandle(manager); @@ -5275,13 +5275,13 @@ static void test_delete_services(void) } manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); - ok(manager != NULL, "can't open service manager %u\n", GetLastError()); + ok(manager != NULL, "can't open service manager %lu\n", GetLastError()); if (!manager) return; service = CreateServiceA(manager, "TestService3", "TestService3", SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, "C:\\doesnt_exist.exe", NULL, NULL, NULL, NULL, NULL); - ok(service != NULL, "can't create service %u\n", GetLastError()); + ok(service != NULL, "can't create service %lu\n", GetLastError()); CloseServiceHandle(service); CloseServiceHandle(manager); if (!service) return; @@ -5306,7 +5306,7 @@ static void test_delete_services(void) service = OpenServiceA(manager, "TestService3", GENERIC_ALL); error = GetLastError(); ok(service == NULL, "TestService3 not deleted\n"); - ok(error == ERROR_SERVICE_DOES_NOT_EXIST, "wrong error %u\n", error); + ok(error == ERROR_SERVICE_DOES_NOT_EXIST, "wrong error %lu\n", error); CloseServiceHandle(manager); r = MsiInstallProductA(msifile, "REMOVE=ALL"); @@ -5373,7 +5373,7 @@ static void test_install_services(void) ok(service == NULL, "TestService4 installed\n"); res = RegOpenKeyA(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Services\\TestService", &hKey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); if (res == ERROR_SUCCESS) { @@ -5381,7 +5381,7 @@ static void test_install_services(void) err_controltype = REG_DWORD; err_controlsize = sizeof(err_control); res = RegQueryValueExA(hKey, "ErrorControl", NULL, &err_controltype, (LPBYTE)&err_control, &err_controlsize); - ok(err_control == 0, "TestService.ErrorControl wrong, expected 0, got %u\n", err_control); + ok(err_control == 0, "TestService.ErrorControl wrong, expected 0, got %lu\n", err_control); RegCloseKey(hKey); } @@ -5494,7 +5494,7 @@ static void test_register_font(void) RegOpenKeyExA(HKEY_LOCAL_MACHINE, regfont2, 0, access, &key); ret = RegQueryValueExA(key, "msi test font", NULL, NULL, NULL, NULL); - ok(ret != ERROR_FILE_NOT_FOUND, "unexpected result %d\n", ret); + ok(ret != ERROR_FILE_NOT_FOUND, "unexpected result %ld\n", ret); r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -5502,7 +5502,7 @@ static void test_register_font(void) ok(!delete_pf("msitest", FALSE), "directory not removed\n"); ret = RegQueryValueExA(key, "msi test font", NULL, NULL, NULL, NULL); - ok(ret == ERROR_FILE_NOT_FOUND, "unexpected result %d\n", ret); + ok(ret == ERROR_FILE_NOT_FOUND, "unexpected result %ld\n", ret); RegDeleteValueA(key, "msi test font"); RegCloseKey(key); @@ -5682,14 +5682,14 @@ static void test_register_typelib(void) ok(r == ERROR_SUCCESS, "got %u\n", r); hr = LoadRegTypeLib(&LIBID_register_test, 7, 1, 0, &tlb); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ITypeLib_Release(tlb); r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); hr = LoadRegTypeLib(&LIBID_register_test, 7, 1, 0, &tlb); - ok(hr == TYPE_E_LIBNOTREGISTERED, "got %#x\n", hr); + ok(hr == TYPE_E_LIBNOTREGISTERED, "got %#lx\n", hr); ok(!delete_pf("msitest\\typelib.dll", TRUE), "file not removed\n"); ok(!delete_pf("msitest", FALSE), "directory not removed\n"); @@ -5779,24 +5779,24 @@ static void test_publish_components(void) ok(r == ERROR_SUCCESS, "MsiProvideQualifiedComponent returned %d\n", r); res = RegOpenKeyA(HKEY_CURRENT_USER, keypath, &key); - ok(res == ERROR_SUCCESS, "components key not created %d\n", res); + ok(res == ERROR_SUCCESS, "components key not created %ld\n", res); res = RegQueryValueExA(key, "english.txt", NULL, NULL, NULL, &size); - ok(res == ERROR_SUCCESS, "value not found %d\n", res); + ok(res == ERROR_SUCCESS, "value not found %ld\n", res); data = malloc(size); res = RegQueryValueExA(key, "english.txt", NULL, NULL, data, &size); - ok(res == ERROR_SUCCESS, "value not found %d\n", res); + ok(res == ERROR_SUCCESS, "value not found %ld\n", res); RegCloseKey(key); res = RegDeleteKeyA(HKEY_CURRENT_USER, keypath); - ok(res == ERROR_SUCCESS, "RegDeleteKey failed %d\n", res); + ok(res == ERROR_SUCCESS, "RegDeleteKey failed %ld\n", res); res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath2, 0, NULL, REG_OPTION_NON_VOLATILE, MAXIMUM_ALLOWED | KEY_WOW64_64KEY, NULL, &key, NULL ); - ok(res == ERROR_SUCCESS, "RegCreateKeyEx failed %d\n", res); + ok(res == ERROR_SUCCESS, "RegCreateKeyEx failed %ld\n", res); res = RegSetValueExA(key, "english.txt", 0, REG_MULTI_SZ, data, size); - ok(res == ERROR_SUCCESS, "RegSetValueEx failed %d\n", res); + ok(res == ERROR_SUCCESS, "RegSetValueEx failed %ld\n", res); RegCloseKey(key); size = 0; @@ -5808,13 +5808,13 @@ static void test_publish_components(void) res = pRegDeleteKeyExA(HKEY_LOCAL_MACHINE, keypath2, KEY_WOW64_64KEY, 0); else res = RegDeleteKeyA(HKEY_LOCAL_MACHINE, keypath2); - ok(res == ERROR_SUCCESS, "RegDeleteKey failed %d\n", res); + ok(res == ERROR_SUCCESS, "RegDeleteKey failed %ld\n", res); res = RegCreateKeyA(HKEY_CURRENT_USER, keypath, &key); - ok(res == ERROR_SUCCESS, "RegCreateKey failed %d\n", res); + ok(res == ERROR_SUCCESS, "RegCreateKey failed %ld\n", res); res = RegSetValueExA(key, "english.txt", 0, REG_MULTI_SZ, data, size); - ok(res == ERROR_SUCCESS, "RegSetValueEx failed %d\n", res); + ok(res == ERROR_SUCCESS, "RegSetValueEx failed %ld\n", res); free(data); RegCloseKey(key); @@ -5822,7 +5822,7 @@ static void test_publish_components(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); res = RegOpenKeyA(HKEY_CURRENT_USER, keypath, &key); - ok(res == ERROR_FILE_NOT_FOUND, "unexpected result %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "unexpected result %ld\n", res); ok(!delete_pf("msitest\\english.txt", TRUE), "file not removed\n"); ok(!delete_pf("msitest", FALSE), "directory not removed\n"); @@ -5954,7 +5954,7 @@ static void test_ini_values(void) CloseHandle(file); ret = WritePrivateProfileStringA("sectionA", "keyA", "valueA", inifile); - ok(ret, "failed to write profile string %u\n", GetLastError()); + ok(ret, "failed to write profile string %lu\n", GetLastError()); MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); @@ -5962,19 +5962,19 @@ static void test_ini_values(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); len = GetPrivateProfileStringA("section1", "key1", NULL, buf, sizeof(buf), inifile); - ok(len == 6, "got %u expected 6\n", len); + ok(len == 6, "got %lu expected 6\n", len); len = GetPrivateProfileStringA("sectionA", "keyA", NULL, buf, sizeof(buf), inifile); - ok(!len, "got %u expected 0\n", len); + ok(!len, "got %lu expected 0\n", len); r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); len = GetPrivateProfileStringA("section1", "key1", NULL, buf, sizeof(buf), inifile); - ok(!len, "got %u expected 0\n", len); + ok(!len, "got %lu expected 0\n", len); len = GetPrivateProfileStringA("sectionA", "keyA", NULL, buf, sizeof(buf), inifile); - ok(!len, "got %u expected 0\n", len); + ok(!len, "got %lu expected 0\n", len); todo_wine ok(!delete_pf("msitest\\test.ini", TRUE), "file removed\n"); ok(!delete_pf("msitest\\inifile.txt", TRUE), "file not removed\n"); @@ -6363,31 +6363,31 @@ static void test_publish_assemblies(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); res = RegOpenKeyA(HKEY_CURRENT_USER, path_dotnet, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); CHECK_REG_MULTI(hkey, name_dotnet, "rcHQPHq?CA@Uv-XqMI1e>Z'q,T*76M@=YEg6My?~]\0"); RegCloseKey(hkey); path = (is_wow64 || is_64bit) ? path_dotnet_local_wow64 : path_dotnet_local; res = RegOpenKeyA(HKEY_CURRENT_USER, path, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); CHECK_REG_MULTI(hkey, name_dotnet_local, "rcHQPHq?CA@Uv-XqMI1e>LF,8A?0d.AW@vcZ$Cgox\0"); RegCloseKey(hkey); res = RegOpenKeyA(HKEY_CURRENT_USER, path_win32, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); CHECK_REG_MULTI(hkey, name_win32, "rcHQPHq?CA@Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%\0"); RegCloseKey(hkey); path = (is_wow64 || is_64bit) ? path_win32_local_wow64 : path_win32_local; res = RegOpenKeyA(HKEY_CURRENT_USER, path, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); CHECK_REG_MULTI(hkey, name_win32_local, "rcHQPHq?CA@Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!\0"); RegCloseKey(hkey); /* No registration is done for a local assembly with no matching file */ path = (is_wow64 || is_64bit) ? path_fake_local_wow64 : path_fake_local; res = RegOpenKeyA(HKEY_CURRENT_USER, path, &hkey); - ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res); r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -6396,25 +6396,25 @@ static void test_publish_assemblies(void) if (res == ERROR_SUCCESS) { res = RegDeleteValueA(hkey, name_dotnet); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); RegCloseKey(hkey); } path = (is_wow64 || is_64bit) ? path_dotnet_local_wow64 : path_dotnet_local; res = RegOpenKeyA(HKEY_CURRENT_USER, path, &hkey); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); res = RegOpenKeyA(HKEY_CURRENT_USER, path_win32, &hkey); if (res == ERROR_SUCCESS) { res = RegDeleteValueA(hkey, name_win32); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); RegCloseKey(hkey); } path = (is_wow64 || is_64bit) ? path_win32_local_wow64 : path_win32_local; res = RegOpenKeyA(HKEY_CURRENT_USER, path, &hkey); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); r = MsiInstallProductA(msifile, "ALLUSERS=1"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -6427,31 +6427,31 @@ static void test_publish_assemblies(void) access = KEY_QUERY_VALUE | KEY_WOW64_64KEY; res = RegOpenKeyExA(HKEY_CLASSES_ROOT, classes_path_dotnet, 0, access, &hkey); } - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); CHECK_REG_MULTI(hkey, name_dotnet, "rcHQPHq?CA@Uv-XqMI1e>Z'q,T*76M@=YEg6My?~]\0"); RegCloseKey(hkey); path = (is_wow64 || is_64bit) ? classes_path_dotnet_local_wow64 : classes_path_dotnet_local; res = RegOpenKeyExA(HKEY_CLASSES_ROOT, path, 0, access, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); CHECK_REG_MULTI(hkey, name_dotnet_local, "rcHQPHq?CA@Uv-XqMI1e>LF,8A?0d.AW@vcZ$Cgox\0"); RegCloseKey(hkey); res = RegOpenKeyExA(HKEY_CLASSES_ROOT, classes_path_win32, 0, access, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); CHECK_REG_MULTI(hkey, name_win32, "rcHQPHq?CA@Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%\0"); RegCloseKey(hkey); path = (is_wow64 || is_64bit) ? classes_path_win32_local_wow64 : classes_path_win32_local; res = RegOpenKeyExA(HKEY_CLASSES_ROOT, path, 0, access, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); CHECK_REG_MULTI(hkey, name_win32_local, "rcHQPHq?CA@Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!\0"); RegCloseKey(hkey); /* No registration is done for a local assembly with no matching file */ path = (is_wow64 || is_64bit) ? classes_path_fake_local_wow64 : classes_path_fake_local; res = RegOpenKeyExA(HKEY_CLASSES_ROOT, path, 0, access, &hkey); - ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "got %ld\n", res); r = MsiInstallProductA(msifile, "REMOVE=ALL ALLUSERS=1"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -6460,25 +6460,25 @@ static void test_publish_assemblies(void) if (res == ERROR_SUCCESS) { res = RegDeleteValueA(hkey, name_dotnet); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); RegCloseKey(hkey); } path = (is_wow64 || is_64bit) ? classes_path_dotnet_local_wow64 : classes_path_dotnet_local; res = RegOpenKeyA(HKEY_CLASSES_ROOT, path, &hkey); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); res = RegOpenKeyA(HKEY_CLASSES_ROOT, classes_path_win32, &hkey); if (res == ERROR_SUCCESS) { res = RegDeleteValueA(hkey, name_win32); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); RegCloseKey(hkey); } path = (is_wow64 || is_64bit) ? classes_path_win32_local_wow64 : classes_path_win32_local; res = RegOpenKeyA(HKEY_CLASSES_ROOT, path, &hkey); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); done: DeleteFileA("msitest\\win32.txt"); diff --git a/modules/rostests/winetests/msi/automation.c b/modules/rostests/winetests/msi/automation.c index bd040b153da..bc79701c707 100644 --- a/modules/rostests/winetests/msi/automation.c +++ b/modules/rostests/winetests/msi/automation.c @@ -347,7 +347,7 @@ static BOOL create_package(LPWSTR path) len = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, CURR_DIR, -1, path, MAX_PATH); - ok(len, "MultiByteToWideChar returned error %d\n", GetLastError()); + ok(len, "MultiByteToWideChar returned error %lu\n", GetLastError()); if (!len) return FALSE; @@ -585,32 +585,32 @@ static void test_dispid(void) { dispid = get_dispid(pInstaller, ptr->name); todo_wine_if (ptr->todo) - ok(dispid == ptr->did, "%s: expected %d, got %d\n", ptr->name, ptr->did, dispid); + ok(dispid == ptr->did, "%s: expected %ld, got %ld\n", ptr->name, ptr->did, dispid); ptr++; } dispid = get_dispid(pInstaller, "RemovePatches"); - ok(dispid == 49 || dispid == -1, "Expected 49 or -1, got %d\n", dispid); + ok(dispid == 49 || dispid == -1, "Expected 49 or -1, got %ld\n", dispid); dispid = get_dispid(pInstaller, "ApplyMultiplePatches"); - ok(dispid == 51 || dispid == -1, "Expected 51 or -1, got %d\n", dispid); + ok(dispid == 51 || dispid == -1, "Expected 51 or -1, got %ld\n", dispid); dispid = get_dispid(pInstaller, "ProductsEx"); - ok(dispid == 52 || dispid == -1, "Expected 52 or -1, got %d\n", dispid); + ok(dispid == 52 || dispid == -1, "Expected 52 or -1, got %ld\n", dispid); dispid = get_dispid(pInstaller, "PatchesEx"); - ok(dispid == 55 || dispid == -1, "Expected 55 or -1, got %d\n", dispid); + ok(dispid == 55 || dispid == -1, "Expected 55 or -1, got %ld\n", dispid); dispid = get_dispid(pInstaller, "ExtractPatchXMLData"); - ok(dispid == 57 || dispid == -1, "Expected 57 or -1, got %d\n", dispid); + ok(dispid == 57 || dispid == -1, "Expected 57 or -1, got %ld\n", dispid); dispid = get_dispid( pInstaller, "ProductElevated" ); - ok(dispid == 59 || dispid == -1, "Expected 59 or -1, got %d\n", dispid); + ok(dispid == 59 || dispid == -1, "Expected 59 or -1, got %ld\n", dispid); dispid = get_dispid( pInstaller, "ProvideAssembly" ); - ok(dispid == 60 || dispid == -1, "Expected 60 or -1, got %d\n", dispid); + ok(dispid == 60 || dispid == -1, "Expected 60 or -1, got %ld\n", dispid); dispid = get_dispid( pInstaller, "ProductInfoFromScript" ); - ok(dispid == 61 || dispid == -1, "Expected 61 or -1, got %d\n", dispid); + ok(dispid == 61 || dispid == -1, "Expected 61 or -1, got %ld\n", dispid); dispid = get_dispid( pInstaller, "AdvertiseProduct" ); - ok(dispid == 62 || dispid == -1, "Expected 62 or -1, got %d\n", dispid); + ok(dispid == 62 || dispid == -1, "Expected 62 or -1, got %ld\n", dispid); dispid = get_dispid( pInstaller, "CreateAdvertiseScript" ); - ok(dispid == 63 || dispid == -1, "Expected 63 or -1, got %d\n", dispid); + ok(dispid == 63 || dispid == -1, "Expected 63 or -1, got %ld\n", dispid); dispid = get_dispid( pInstaller, "PatchFiles" ); - ok(dispid == 65 || dispid == -1, "Expected 65 or -1, got %d\n", dispid); + ok(dispid == 65 || dispid == -1, "Expected 65 or -1, got %ld\n", dispid); } /* Test basic IDispatch functions */ @@ -627,16 +627,16 @@ static void test_dispatch(void) /* Test getting ID of a function name that does not exist */ name = (WCHAR *)L"winetest-automation.msi"; hr = IDispatch_GetIDsOfNames(pInstaller, &IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &dispid); - ok(hr == DISP_E_UNKNOWNNAME, "IDispatch::GetIDsOfNames returned 0x%08x\n", hr); + ok(hr == DISP_E_UNKNOWNNAME, "IDispatch::GetIDsOfNames returned %#lx\n", hr); /* Test invoking this function */ hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, NULL, NULL, NULL, NULL); - ok(hr == DISP_E_MEMBERNOTFOUND, "IDispatch::Invoke returned 0x%08x\n", hr); + ok(hr == DISP_E_MEMBERNOTFOUND, "IDispatch::Invoke returned %#lx\n", hr); /* Test getting ID of a function name that does exist */ name = (WCHAR *)L"OpenPackage"; hr = IDispatch_GetIDsOfNames(pInstaller, &IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &dispid); - ok(hr == S_OK, "IDispatch::GetIDsOfNames returned 0x%08x\n", hr); + ok(hr == S_OK, "IDispatch::GetIDsOfNames returned %#lx\n", hr); /* Test invoking this function (without parameters passed) */ if (0) /* All of these crash MSI on Windows XP */ @@ -649,21 +649,21 @@ static void test_dispatch(void) /* Try with NULL params */ hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); - ok(hr == DISP_E_TYPEMISMATCH, "IDispatch::Invoke returned 0x%08x\n", hr); + ok(hr == DISP_E_TYPEMISMATCH, "IDispatch::Invoke returned %#lx\n", hr); /* Try one empty parameter */ dispparams.rgvarg = vararg; dispparams.cArgs = 1; VariantInit(&vararg[0]); hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); - ok(hr == DISP_E_TYPEMISMATCH, "IDispatch::Invoke returned 0x%08x\n", hr); + ok(hr == DISP_E_TYPEMISMATCH, "IDispatch::Invoke returned %#lx\n", hr); /* Try two empty parameters */ dispparams.cArgs = 2; VariantInit(&vararg[0]); VariantInit(&vararg[1]); hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); - ok(hr == DISP_E_TYPEMISMATCH, "IDispatch::Invoke returned 0x%08x\n", hr); + ok(hr == DISP_E_TYPEMISMATCH, "IDispatch::Invoke returned %#lx\n", hr); /* Try one parameter, the required BSTR. Second parameter is optional. * NOTE: The specified package does not exist, which is why the call fails. @@ -673,7 +673,7 @@ static void test_dispatch(void) V_VT(&vararg[0]) = VT_BSTR; V_BSTR(&vararg[0]) = SysAllocString(L"winetest-automation.msi"); hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); - ok(hr == DISP_E_EXCEPTION, "IDispatch::Invoke returned 0x%08x\n", hr); + ok(hr == DISP_E_EXCEPTION, "IDispatch::Invoke returned %#lx\n", hr); ok_exception(hr, L"OpenPackage,PackagePath,Options"); VariantClear(&vararg[0]); @@ -686,7 +686,7 @@ static void test_dispatch(void) V_BSTR(&vararg[1]) = SysAllocString(L"winetest-automation.msi"); VariantInit(&vararg[0]); hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); - ok(hr == DISP_E_EXCEPTION, "IDispatch::Invoke returned 0x%08x\n", hr); + ok(hr == DISP_E_EXCEPTION, "IDispatch::Invoke returned %#lx\n", hr); ok_exception(hr, L"OpenPackage,PackagePath,Options"); VariantClear(&vararg[1]); @@ -700,7 +700,7 @@ static void test_dispatch(void) VariantInit(&vararg[1]); VariantInit(&vararg[0]); hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); - ok(hr == DISP_E_EXCEPTION, "IDispatch::Invoke returned 0x%08x\n", hr); + ok(hr == DISP_E_EXCEPTION, "IDispatch::Invoke returned %#lx\n", hr); ok_exception(hr, L"OpenPackage,PackagePath,Options"); VariantClear(&vararg[2]); @@ -713,7 +713,7 @@ static void test_dispatch(void) V_VT(&vararg[0]) = VT_BSTR; V_BSTR(&vararg[0]) = SysAllocString(L"winetest-automation.msi"); hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); - ok(hr == DISP_E_TYPEMISMATCH, "IDispatch::Invoke returned 0x%08x\n", hr); + ok(hr == DISP_E_TYPEMISMATCH, "IDispatch::Invoke returned %#lx\n", hr); VariantClear(&vararg[0]); VariantClear(&vararg[1]); @@ -728,7 +728,7 @@ static void test_dispatch(void) V_VT(&vararg[0]) = VT_BSTR; V_BSTR(&vararg[0]) = SysAllocString(L"winetest-automation.msi"); hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); - todo_wine ok(hr == DISP_E_EXCEPTION, "IDispatch::Invoke returned 0x%08x\n", hr); + todo_wine ok(hr == DISP_E_EXCEPTION, "IDispatch::Invoke returned %#lx\n", hr); ok_exception(hr, L"OpenPackage,PackagePath,Options"); VariantClear(&vararg[0]); if (hr != DISP_E_EXCEPTION) @@ -748,7 +748,7 @@ static void test_dispatch(void) DeleteFileW(path); return; } - ok(hr == S_OK, "IDispatch::Invoke returned 0x%08x\n", hr); + ok(hr == S_OK, "IDispatch::Invoke returned %#lx\n", hr); VariantClear(&vararg[0]); VariantClear(&varresult); @@ -761,7 +761,7 @@ static void test_dispatch(void) V_BSTR(&vararg[1]) = SysAllocString(path); VariantInit(&vararg[0]); hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); - ok(hr == S_OK, "IDispatch::Invoke returned 0x%08x\n", hr); + ok(hr == S_OK, "IDispatch::Invoke returned %#lx\n", hr); VariantClear(&vararg[1]); VariantClear(&varresult); @@ -775,7 +775,7 @@ static void test_dispatch(void) VariantInit(&vararg[1]); VariantInit(&vararg[0]); hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); - ok(hr == S_OK, "IDispatch::Invoke returned 0x%08x\n", hr); + ok(hr == S_OK, "IDispatch::Invoke returned %#lx\n", hr); VariantClear(&vararg[2]); VariantClear(&varresult); @@ -788,7 +788,7 @@ static void test_dispatch(void) V_VT(&vararg[0]) = VT_BSTR; V_BSTR(&vararg[0]) = SysAllocString(path); hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); - ok(hr == DISP_E_TYPEMISMATCH, "IDispatch::Invoke returned 0x%08x\n", hr); + ok(hr == DISP_E_TYPEMISMATCH, "IDispatch::Invoke returned %#lx\n", hr); VariantClear(&vararg[0]); VariantClear(&vararg[1]); @@ -803,7 +803,7 @@ static void test_dispatch(void) V_VT(&vararg[0]) = VT_I2; V_BSTR(&vararg[0]) = 0; hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); - ok(hr == S_OK, "IDispatch::Invoke returned 0x%08x\n", hr); + ok(hr == S_OK, "IDispatch::Invoke returned %#lx\n", hr); VariantClear(&vararg[1]); VariantClear(&varresult); @@ -812,26 +812,26 @@ static void test_dispatch(void) /* Test invoking a method as a DISPATCH_PROPERTYGET or DISPATCH_PROPERTYPUT */ VariantInit(&vararg[0]); hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL); - ok(hr == DISP_E_MEMBERNOTFOUND, "IDispatch::Invoke returned 0x%08x\n", hr); + ok(hr == DISP_E_MEMBERNOTFOUND, "IDispatch::Invoke returned %#lx\n", hr); VariantInit(&vararg[0]); hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYPUT, &dispparams, &varresult, &excepinfo, NULL); - ok(hr == DISP_E_MEMBERNOTFOUND, "IDispatch::Invoke returned 0x%08x\n", hr); + ok(hr == DISP_E_MEMBERNOTFOUND, "IDispatch::Invoke returned %#lx\n", hr); /* Test invoking a read-only property as DISPATCH_PROPERTYPUT or as a DISPATCH_METHOD */ name = (WCHAR *)L"ProductState"; hr = IDispatch_GetIDsOfNames(pInstaller, &IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &dispid); - ok(hr == S_OK, "IDispatch::GetIDsOfNames returned 0x%08x\n", hr); + ok(hr == S_OK, "IDispatch::GetIDsOfNames returned %#lx\n", hr); dispparams.rgvarg = NULL; dispparams.cArgs = 0; hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYPUT, &dispparams, &varresult, &excepinfo, NULL); - ok(hr == DISP_E_MEMBERNOTFOUND, "IDispatch::Invoke returned 0x%08x\n", hr); + ok(hr == DISP_E_MEMBERNOTFOUND, "IDispatch::Invoke returned %#lx\n", hr); dispparams.rgvarg = NULL; dispparams.cArgs = 0; hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); - ok(hr == DISP_E_MEMBERNOTFOUND, "IDispatch::Invoke returned 0x%08x\n", hr); + ok(hr == DISP_E_MEMBERNOTFOUND, "IDispatch::Invoke returned %#lx\n", hr); } /* invocation helper function */ @@ -854,7 +854,7 @@ static HRESULT invoke(IDispatch *pDispatch, LPCSTR szName, WORD wFlags, DISPPARA MultiByteToWideChar(CP_ACP, 0, szName, -1, name, len ); hr = IDispatch_GetIDsOfNames(pDispatch, &IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &dispid); free(name); - ok(hr == S_OK, "IDispatch::GetIDsOfNames returned 0x%08x\n", hr); + ok(hr == S_OK, "IDispatch::GetIDsOfNames returned %#lx\n", hr); if (hr != S_OK) return hr; memset(&excepinfo, 0, sizeof(excepinfo)); @@ -867,7 +867,7 @@ static HRESULT invoke(IDispatch *pDispatch, LPCSTR szName, WORD wFlags, DISPPARA if (vtResult != VT_EMPTY) { hr = VariantChangeTypeEx(pVarResult, pVarResult, LOCALE_NEUTRAL, 0, vtResult); - ok(hr == S_OK, "VariantChangeTypeEx returned 0x%08x\n", hr); + ok(hr == S_OK, "VariantChangeTypeEx returned %#lx\n", hr); } } @@ -1588,7 +1588,7 @@ static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *in /* SummaryInfo::PropertyCount */ hr = SummaryInfo_PropertyCountGet(pSummaryInfo, &j); - ok(hr == S_OK, "SummaryInfo_PropertyCount failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "SummaryInfo_PropertyCount failed, hresult %#lx\n", hr); ok(j == num_info, "SummaryInfo_PropertyCount returned %d, expected %d\n", j, num_info); /* SummaryInfo::Property, get for properties we have set */ @@ -1602,11 +1602,11 @@ static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *in else if (vt == VT_I2) vt = VT_I4; hr = SummaryInfo_PropertyGet(pSummaryInfo, entry->property, &varresult, vt); - ok(hr == S_OK, "SummaryInfo_Property (pid %d) failed, hresult 0x%08x\n", entry->property, hr); + ok(hr == S_OK, "SummaryInfo_Property (pid %d) failed, hresult %#lx\n", entry->property, hr); if (V_VT(&varresult) != vt) skip("Skipping property tests due to type mismatch\n"); else if (vt == VT_I4) - ok(V_I4(&varresult) == entry->iValue, "SummaryInfo_Property (pid %d) I4 result expected to be %d, but was %d\n", + ok(V_I4(&varresult) == entry->iValue, "SummaryInfo_Property (pid %d) I4 result expected to be %d, but was %ld\n", entry->property, entry->iValue, V_I4(&varresult)); else if (vt == VT_DATE) { @@ -1632,32 +1632,32 @@ static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *in /* Invalid pids */ hr = SummaryInfo_PropertyGet(pSummaryInfo, -1, &varresult, VT_EMPTY); - ok(hr == DISP_E_EXCEPTION, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr); + ok(hr == DISP_E_EXCEPTION, "SummaryInfo_PropertyGet failed, hresult %#lx\n", hr); ok_exception(hr, L"Property,Pid"); hr = SummaryInfo_PropertyGet(pSummaryInfo, 1000, &varresult, VT_EMPTY); - ok(hr == DISP_E_EXCEPTION, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr); + ok(hr == DISP_E_EXCEPTION, "SummaryInfo_PropertyGet failed, hresult %#lx\n", hr); ok_exception(hr, L"Property,Pid"); /* Unsupported pids */ hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_DICTIONARY, &varresult, VT_EMPTY); - ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult %#lx\n", hr); hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_THUMBNAIL, &varresult, VT_EMPTY); - ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult %#lx\n", hr); /* Pids we have not set, one for each type */ hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_CODEPAGE, &varresult, VT_EMPTY); - ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult %#lx\n", hr); hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_TITLE, &varresult, VT_EMPTY); - ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult %#lx\n", hr); hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_EDITTIME, &varresult, VT_EMPTY); - ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult %#lx\n", hr); hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_CHARCOUNT, &varresult, VT_EMPTY); - ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult %#lx\n", hr); if (!readonly) { @@ -1668,10 +1668,10 @@ static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *in V_VT(&var) = VT_I2; V_I2(&var) = 1; hr = SummaryInfo_PropertyPut(pSummaryInfo, PID_CODEPAGE, &var); - ok(hr == S_OK, "SummaryInfo_PropertyPut failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "SummaryInfo_PropertyPut failed, hresult %#lx\n", hr); hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_CODEPAGE, &varresult, VT_I4 /* NOT VT_I2 */); - ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult %#lx\n", hr); ok(V_I2(&var) == V_I2(&varresult), "SummaryInfo_PropertyGet expected %d, but returned %d\n", V_I2(&var), V_I2(&varresult)); VariantClear(&varresult); VariantClear(&var); @@ -1680,10 +1680,10 @@ static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *in V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(L"Title"); hr = SummaryInfo_PropertyPut(pSummaryInfo, PID_TITLE, &var); - ok(hr == S_OK, "SummaryInfo_PropertyPut failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "SummaryInfo_PropertyPut failed, hresult %#lx\n", hr); hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_TITLE, &varresult, V_VT(&var)); - ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult %#lx\n", hr); ok_w2("SummaryInfo_PropertyGet expected %s, but returned %s\n", V_BSTR(&var), V_BSTR(&varresult)); VariantClear(&varresult); VariantClear(&var); @@ -1693,10 +1693,10 @@ static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *in FileTimeToSystemTime(&systemtime, &st); SystemTimeToVariantTime(&st, &V_DATE(&var)); hr = SummaryInfo_PropertyPut(pSummaryInfo, PID_LASTSAVE_DTM, &var); - ok(hr == S_OK, "SummaryInfo_PropertyPut failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "SummaryInfo_PropertyPut failed, hresult %#lx\n", hr); hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_LASTSAVE_DTM, &varresult, V_VT(&var)); - ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult %#lx\n", hr); ok(V_DATE(&var) == V_DATE(&varresult), "SummaryInfo_PropertyGet expected %lf, but returned %lf\n", V_DATE(&var), V_DATE(&varresult)); VariantClear(&varresult); VariantClear(&var); @@ -1705,17 +1705,17 @@ static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *in V_VT(&var) = VT_I4; V_I4(&var) = 1000; hr = SummaryInfo_PropertyPut(pSummaryInfo, PID_CHARCOUNT, &var); - ok(hr == S_OK, "SummaryInfo_PropertyPut failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "SummaryInfo_PropertyPut failed, hresult %#lx\n", hr); hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_CHARCOUNT, &varresult, V_VT(&var)); - ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr); - ok(V_I4(&var) == V_I4(&varresult), "SummaryInfo_PropertyGet expected %d, but returned %d\n", V_I4(&var), V_I4(&varresult)); + ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult %#lx\n", hr); + ok(V_I4(&var) == V_I4(&varresult), "SummaryInfo_PropertyGet expected %ld, but returned %ld\n", V_I4(&var), V_I4(&varresult)); VariantClear(&varresult); VariantClear(&var); /* SummaryInfo::PropertyCount */ hr = SummaryInfo_PropertyCountGet(pSummaryInfo, &j); - ok(hr == S_OK, "SummaryInfo_PropertyCount failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "SummaryInfo_PropertyCount failed, hresult %#lx\n", hr); ok(j == num_info+4, "SummaryInfo_PropertyCount returned %d, expected %d\n", j, num_info); } } @@ -1726,7 +1726,7 @@ static void test_Database(IDispatch *pDatabase, BOOL readonly) HRESULT hr; hr = Database_OpenView(pDatabase, L"SELECT `Feature` FROM `Feature` WHERE `Feature_Parent`='One'", &pView); - ok(hr == S_OK, "Database_OpenView failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Database_OpenView failed, hresult %#lx\n", hr); if (hr == S_OK) { IDispatch *pRecord = NULL; @@ -1734,55 +1734,55 @@ static void test_Database(IDispatch *pDatabase, BOOL readonly) /* View::Execute */ hr = View_Execute(pView, NULL); - ok(hr == S_OK, "View_Execute failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "View_Execute failed, hresult %#lx\n", hr); /* View::Fetch */ hr = View_Fetch(pView, &pRecord); - ok(hr == S_OK, "View_Fetch failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "View_Fetch failed, hresult %#lx\n", hr); ok(pRecord != NULL, "View_Fetch should not have returned NULL record\n"); if (pRecord) { /* Record::StringDataGet */ memset(szString, 0, sizeof(szString)); hr = Record_StringDataGet(pRecord, 1, szString); - ok(hr == S_OK, "Record_StringDataGet failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Record_StringDataGet failed, hresult %#lx\n", hr); ok_w2("Record_StringDataGet result was %s but expected %s\n", szString, L"Three"); /* Record::StringDataPut with correct index */ hr = Record_StringDataPut(pRecord, 1, L"Two"); - ok(hr == S_OK, "Record_StringDataPut failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Record_StringDataPut failed, hresult %#lx\n", hr); /* Record::StringDataGet */ memset(szString, 0, sizeof(szString)); hr = Record_StringDataGet(pRecord, 1, szString); - ok(hr == S_OK, "Record_StringDataGet failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Record_StringDataGet failed, hresult %#lx\n", hr); ok_w2("Record_StringDataGet result was %s but expected %s\n", szString, L"Two"); /* Record::StringDataPut with incorrect index */ hr = Record_StringDataPut(pRecord, -1, szString); - ok(hr == DISP_E_EXCEPTION, "Record_StringDataPut failed, hresult 0x%08x\n", hr); + ok(hr == DISP_E_EXCEPTION, "Record_StringDataPut failed, hresult %#lx\n", hr); ok_exception(hr, L"StringData,Field"); /* View::Modify with incorrect parameters */ hr = View_Modify(pView, -5, NULL); - ok(hr == DISP_E_EXCEPTION, "View_Modify failed, hresult 0x%08x\n", hr); + ok(hr == DISP_E_EXCEPTION, "View_Modify failed, hresult %#lx\n", hr); ok_exception(hr, L"Modify,Mode,Record"); hr = View_Modify(pView, -5, pRecord); - ok(hr == DISP_E_EXCEPTION, "View_Modify failed, hresult 0x%08x\n", hr); + ok(hr == DISP_E_EXCEPTION, "View_Modify failed, hresult %#lx\n", hr); ok_exception(hr, L"Modify,Mode,Record"); hr = View_Modify(pView, MSIMODIFY_REFRESH, NULL); - ok(hr == DISP_E_EXCEPTION, "View_Modify failed, hresult 0x%08x\n", hr); + ok(hr == DISP_E_EXCEPTION, "View_Modify failed, hresult %#lx\n", hr); ok_exception(hr, L"Modify,Mode,Record"); hr = View_Modify(pView, MSIMODIFY_REFRESH, pRecord); - ok(hr == S_OK, "View_Modify failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "View_Modify failed, hresult %#lx\n", hr); /* Record::StringDataGet, confirm that the record is back to its unmodified value */ memset(szString, 0, sizeof(szString)); hr = Record_StringDataGet(pRecord, 1, szString); - ok(hr == S_OK, "Record_StringDataGet failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Record_StringDataGet failed, hresult %#lx\n", hr); todo_wine ok_w2("Record_StringDataGet result was %s but expected %s\n", szString, L"Three"); IDispatch_Release(pRecord); @@ -1790,14 +1790,14 @@ static void test_Database(IDispatch *pDatabase, BOOL readonly) /* View::Fetch */ hr = View_Fetch(pView, &pRecord); - ok(hr == S_OK, "View_Fetch failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "View_Fetch failed, hresult %#lx\n", hr); ok(pRecord != NULL, "View_Fetch should not have returned NULL record\n"); if (pRecord) { /* Record::StringDataGet */ memset(szString, 0, sizeof(szString)); hr = Record_StringDataGet(pRecord, 1, szString); - ok(hr == S_OK, "Record_StringDataGet failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Record_StringDataGet failed, hresult %#lx\n", hr); ok_w2("Record_StringDataGet result was %s but expected %s\n", szString, L"Two"); IDispatch_Release(pRecord); @@ -1805,21 +1805,21 @@ static void test_Database(IDispatch *pDatabase, BOOL readonly) /* View::Fetch */ hr = View_Fetch(pView, &pRecord); - ok(hr == S_OK, "View_Fetch failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "View_Fetch failed, hresult %#lx\n", hr); ok(pRecord == NULL, "View_Fetch should have returned NULL record\n"); if (pRecord) IDispatch_Release(pRecord); /* View::Close */ hr = View_Close(pView); - ok(hr == S_OK, "View_Close failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "View_Close failed, hresult %#lx\n", hr); IDispatch_Release(pView); } /* Database::SummaryInformation */ hr = Database_SummaryInformation(pDatabase, TEST_SUMMARYINFO_PROPERTIES_MODIFIED, &pSummaryInfo); - ok(hr == S_OK, "Database_SummaryInformation failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Database_SummaryInformation failed, hresult %#lx\n", hr); ok(pSummaryInfo != NULL, "Database_SummaryInformation should not have returned NULL record\n"); if (pSummaryInfo) { @@ -1841,93 +1841,93 @@ static void test_Session(IDispatch *pSession) /* Session::Installer */ hr = Session_Installer(pSession, &pInst); - ok(hr == S_OK, "Session_Installer failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_Installer failed, hresult %#lx\n", hr); ok(pInst != NULL, "Session_Installer returned NULL IDispatch pointer\n"); ok(pInst == pInstaller, "Session_Installer does not match Installer instance from CoCreateInstance\n"); refs_before = IDispatch_AddRef(pInst); hr = Session_Installer(pSession, &pInst); - ok(hr == S_OK, "Session_Installer failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_Installer failed, hresult %#lx\n", hr); ok(pInst != NULL, "Session_Installer returned NULL IDispatch pointer\n"); ok(pInst == pInstaller, "Session_Installer does not match Installer instance from CoCreateInstance\n"); refs_after = IDispatch_Release(pInst); - ok(refs_before == refs_after, "got %u and %u\n", refs_before, refs_after); + ok(refs_before == refs_after, "got %lu and %lu\n", refs_before, refs_after); /* Session::Property, get */ memset(stringw, 0, sizeof(stringw)); hr = Session_PropertyGet(pSession, L"ProductName", stringw); - ok(hr == S_OK, "Session_PropertyGet failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_PropertyGet failed, hresult %#lx\n", hr); if (lstrcmpW(stringw, L"MSITEST") != 0) { len = WideCharToMultiByte(CP_ACP, 0, stringw, -1, string, MAX_PATH, NULL, NULL); - ok(len, "WideCharToMultiByteChar returned error %d\n", GetLastError()); + ok(len, "WideCharToMultiByteChar returned error %lu\n", GetLastError()); ok(0, "Property \"ProductName\" expected to be \"MSITEST\" but was \"%s\"\n", string); } /* Session::Property, put */ hr = Session_PropertyPut(pSession, L"ProductName", L"ProductName"); - ok(hr == S_OK, "Session_PropertyPut failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_PropertyPut failed, hresult %#lx\n", hr); memset(stringw, 0, sizeof(stringw)); hr = Session_PropertyGet(pSession, L"ProductName", stringw); - ok(hr == S_OK, "Session_PropertyGet failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_PropertyGet failed, hresult %#lx\n", hr); if (lstrcmpW(stringw, L"ProductName") != 0) { len = WideCharToMultiByte(CP_ACP, 0, stringw, -1, string, MAX_PATH, NULL, NULL); - ok(len, "WideCharToMultiByteChar returned error %d\n", GetLastError()); + ok(len, "WideCharToMultiByteChar returned error %lu\n", GetLastError()); ok(0, "Property \"ProductName\" expected to be \"ProductName\" but was \"%s\"\n", string); } /* Try putting a property using empty property identifier */ hr = Session_PropertyPut(pSession, L"", L"ProductName"); - ok(hr == DISP_E_EXCEPTION, "Session_PropertyPut failed, hresult 0x%08x\n", hr); + ok(hr == DISP_E_EXCEPTION, "Session_PropertyPut failed, hresult %#lx\n", hr); ok_exception(hr, L"Property,Name"); /* Try putting a property using illegal property identifier */ hr = Session_PropertyPut(pSession, L"=", L"ProductName"); - ok(hr == S_OK, "Session_PropertyPut failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_PropertyPut failed, hresult %#lx\n", hr); /* Session::Language, get */ hr = Session_LanguageGet(pSession, &len); - ok(hr == S_OK, "Session_LanguageGet failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_LanguageGet failed, hresult %#lx\n", hr); /* Not sure how to check the language is correct */ /* Session::Mode, get */ hr = Session_ModeGet(pSession, MSIRUNMODE_REBOOTATEND, &bool); - ok(hr == S_OK, "Session_ModeGet failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_ModeGet failed, hresult %#lx\n", hr); ok(!bool, "Reboot at end session mode is %d\n", bool); hr = Session_ModeGet(pSession, MSIRUNMODE_MAINTENANCE, &bool); - ok(hr == S_OK, "Session_ModeGet failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_ModeGet failed, hresult %#lx\n", hr); ok(!bool, "Maintenance mode is %d\n", bool); /* Session::Mode, put */ hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, VARIANT_TRUE); - ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_ModePut failed, hresult %#lx\n", hr); hr = Session_ModeGet(pSession, MSIRUNMODE_REBOOTATEND, &bool); - ok(hr == S_OK, "Session_ModeGet failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_ModeGet failed, hresult %#lx\n", hr); ok(bool, "Reboot at end session mode is %d, expected 1\n", bool); hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, VARIANT_FALSE); /* set it again so we don't reboot */ - ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_ModePut failed, hresult %#lx\n", hr); hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, VARIANT_TRUE); - ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_ModePut failed, hresult %#lx\n", hr); ok_exception(hr, L"Mode,Flag"); hr = Session_ModeGet(pSession, MSIRUNMODE_REBOOTNOW, &bool); - ok(hr == S_OK, "Session_ModeGet failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_ModeGet failed, hresult %#lx\n", hr); ok(bool, "Reboot now mode is %d, expected 1\n", bool); hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTNOW, VARIANT_FALSE); /* set it again so we don't reboot */ - ok(hr == S_OK, "Session_ModePut failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_ModePut failed, hresult %#lx\n", hr); ok_exception(hr, L"Mode,Flag"); hr = Session_ModePut(pSession, MSIRUNMODE_MAINTENANCE, VARIANT_TRUE); - ok(hr == DISP_E_EXCEPTION, "Session_ModePut failed, hresult 0x%08x\n", hr); + ok(hr == DISP_E_EXCEPTION, "Session_ModePut failed, hresult %#lx\n", hr); ok_exception(hr, L"Mode,Flag"); /* Session::Database, get */ hr = Session_Database(pSession, &pDatabase); - ok(hr == S_OK, "Session_Database failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_Database failed, hresult %#lx\n", hr); if (hr == S_OK) { test_Database(pDatabase, TRUE); @@ -1936,61 +1936,61 @@ static void test_Session(IDispatch *pSession) /* Session::EvaluateCondition */ hr = Session_EvaluateCondition(pSession, NULL, &myint); - ok(hr == S_OK, "Session_EvaluateCondition failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_EvaluateCondition failed, hresult %#lx\n", hr); ok(myint == MSICONDITION_NONE, "Feature current state was %d but expected %d\n", myint, INSTALLSTATE_UNKNOWN); hr = Session_EvaluateCondition(pSession, L"", &myint); - ok(hr == S_OK, "Session_EvaluateCondition failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_EvaluateCondition failed, hresult %#lx\n", hr); ok(myint == MSICONDITION_NONE, "Feature current state was %d but expected %d\n", myint, INSTALLSTATE_UNKNOWN); hr = Session_EvaluateCondition(pSession, L"=", &myint); - ok(hr == S_OK, "Session_EvaluateCondition failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_EvaluateCondition failed, hresult %#lx\n", hr); ok(myint == MSICONDITION_ERROR, "Feature current state was %d but expected %d\n", myint, INSTALLSTATE_UNKNOWN); /* Session::DoAction(CostInitialize) must occur before the next statements */ hr = Session_DoAction(pSession, L"CostInitialize", &myint); - ok(hr == S_OK, "Session_DoAction failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_DoAction failed, hresult %#lx\n", hr); ok(myint == IDOK, "DoAction(CostInitialize) returned %d, %d expected\n", myint, IDOK); /* Session::SetInstallLevel */ hr = Session_SetInstallLevel(pSession, INSTALLLEVEL_MINIMUM); - ok(hr == S_OK, "Session_SetInstallLevel failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_SetInstallLevel failed, hresult %#lx\n", hr); /* Session::FeatureCurrentState, get */ hr = Session_FeatureCurrentState(pSession, L"One", &myint); - ok(hr == S_OK, "Session_FeatureCurrentState failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_FeatureCurrentState failed, hresult %#lx\n", hr); ok(myint == INSTALLSTATE_UNKNOWN, "Feature current state was %d but expected %d\n", myint, INSTALLSTATE_UNKNOWN); /* Session::Message */ hr = Installer_CreateRecord(0, &record); - ok(hr == S_OK, "Installer_CreateRecord failed: %08x\n", hr); + ok(hr == S_OK, "Installer_CreateRecord failed: %#lx\n", hr); hr = Session_Message(pSession, INSTALLMESSAGE_INFO, record, &myint); - ok(hr == S_OK, "Session_Message failed: %08x\n", hr); + ok(hr == S_OK, "Session_Message failed: %#lx\n", hr); ok(myint == 0, "Session_Message returned %x\n", myint); /* Session::EvaluateCondition */ hr = Session_EvaluateCondition(pSession, L"!One>0", &myint); - ok(hr == S_OK, "Session_EvaluateCondition failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_EvaluateCondition failed, hresult %#lx\n", hr); ok(myint == MSICONDITION_FALSE, "Feature current state was %d but expected %d\n", myint, INSTALLSTATE_UNKNOWN); hr = Session_EvaluateCondition(pSession, L"!One=-1", &myint); - ok(hr == S_OK, "Session_EvaluateCondition failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_EvaluateCondition failed, hresult %#lx\n", hr); ok(myint == MSICONDITION_TRUE, "Feature current state was %d but expected %d\n", myint, INSTALLSTATE_UNKNOWN); /* Session::FeatureRequestState, put */ hr = Session_FeatureRequestStatePut(pSession, L"One", INSTALLSTATE_ADVERTISED); - ok(hr == S_OK, "Session_FeatureRequestStatePut failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_FeatureRequestStatePut failed, hresult %#lx\n", hr); hr = Session_FeatureRequestStateGet(pSession, L"One", &myint); - ok(hr == S_OK, "Session_FeatureRequestStateGet failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_FeatureRequestStateGet failed, hresult %#lx\n", hr); ok(myint == INSTALLSTATE_ADVERTISED, "Feature request state was %d but expected %d\n", myint, INSTALLSTATE_ADVERTISED); /* Session::EvaluateCondition */ hr = Session_EvaluateCondition(pSession, L"$One=-1", &myint); - ok(hr == S_OK, "Session_EvaluateCondition failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_EvaluateCondition failed, hresult %#lx\n", hr); ok(myint == MSICONDITION_FALSE, "Feature current state was %d but expected %d\n", myint, INSTALLSTATE_UNKNOWN); hr = Session_EvaluateCondition(pSession, L"$One>0", &myint); - ok(hr == S_OK, "Session_EvaluateCondition failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Session_EvaluateCondition failed, hresult %#lx\n", hr); ok(myint == MSICONDITION_TRUE, "Feature current state was %d but expected %d\n", myint, INSTALLSTATE_UNKNOWN); } @@ -2040,16 +2040,16 @@ static void test_Installer_RegistryValue(void) /* Does our key exist? Shouldn't; check with all three possible value parameter types */ hr = Installer_RegistryValueE(curr_user, L"Software\\Wine\\Test", &bRet); - ok(hr == S_OK, "Installer_RegistryValueE failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Installer_RegistryValueE failed, hresult %#lx\n", hr); ok(!bRet, "Registry key expected to not exist, but Installer_RegistryValue claims it does\n"); memset(szString, 0, sizeof(szString)); hr = Installer_RegistryValueW(curr_user, L"Software\\Wine\\Test", NULL, szString); - ok(hr == DISP_E_BADINDEX, "Installer_RegistryValueW failed, hresult 0x%08x\n", hr); + ok(hr == DISP_E_BADINDEX, "Installer_RegistryValueW failed, hresult %#lx\n", hr); memset(szString, 0, sizeof(szString)); hr = Installer_RegistryValueI(curr_user, L"Software\\Wine\\Test", 0, szString, VT_BSTR); - ok(hr == DISP_E_BADINDEX, "Installer_RegistryValueI failed, hresult 0x%08x\n", hr); + ok(hr == DISP_E_BADINDEX, "Installer_RegistryValueI failed, hresult %#lx\n", hr); /* Create key */ ok(!RegCreateKeyW( HKEY_CURRENT_USER, L"Software\\Wine\\Test", &hkey ), "RegCreateKeyW failed\n"); @@ -2061,7 +2061,7 @@ static void test_Installer_RegistryValue(void) ok(!RegSetValueExW(hkey, L"Three", 0, REG_BINARY, (const BYTE *)qw, 4), "RegSetValueExW failed\n"); bRet = SetEnvironmentVariableA("MSITEST", "Four"); - ok(bRet, "SetEnvironmentVariableA failed %d\n", GetLastError()); + ok(bRet, "SetEnvironmentVariableA failed %lu\n", GetLastError()); ok(!RegSetValueExW(hkey, L"Four", 0, REG_EXPAND_SZ, (const BYTE *)L"%MSITEST%", sizeof(L"%MSITEST%")), "RegSetValueExW failed\n"); ok(!RegSetValueExW(hkey, L"Five\0Hi\0", 0, REG_MULTI_SZ, (const BYTE *)L"Five\0Hi\0", sizeof(L"Five\0Hi\0")), @@ -2079,53 +2079,53 @@ static void test_Installer_RegistryValue(void) /* Does our key exist? It should, and make sure we retrieve the correct default value */ bRet = FALSE; hr = Installer_RegistryValueE(curr_user, L"Software\\Wine\\Test", &bRet); - ok(hr == S_OK, "Installer_RegistryValueE failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Installer_RegistryValueE failed, hresult %#lx\n", hr); ok(bRet, "Registry key expected to exist, but Installer_RegistryValue claims it does not\n"); memset(szString, 0, sizeof(szString)); hr = Installer_RegistryValueW(curr_user, L"Software\\Wine\\Test", NULL, szString); - ok(hr == S_OK, "Installer_RegistryValueW failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Installer_RegistryValueW failed, hresult %#lx\n", hr); ok_w2("Default registry value \"%s\" does not match expected \"%s\"\n", szString, L"One"); /* Ask for the value of a nonexistent key */ memset(szString, 0, sizeof(szString)); hr = Installer_RegistryValueW(curr_user, L"Software\\Wine\\Test", L"%MSITEST%", szString); - ok(hr == DISP_E_BADINDEX, "Installer_RegistryValueW failed, hresult 0x%08x\n", hr); + ok(hr == DISP_E_BADINDEX, "Installer_RegistryValueW failed, hresult %#lx\n", hr); /* Get values of keys */ memset(szString, 0, sizeof(szString)); hr = Installer_RegistryValueW(curr_user, L"Software\\Wine\\Test", L"One", szString); - ok(hr == S_OK, "Installer_RegistryValueW failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Installer_RegistryValueW failed, hresult %#lx\n", hr); ok_w2("Registry value \"%s\" does not match expected \"%s\"\n", szString, L"One"); VariantInit(&vararg); V_VT(&vararg) = VT_BSTR; V_BSTR(&vararg) = SysAllocString(L"Two"); hr = Installer_RegistryValue(curr_user, L"Software\\Wine\\Test", vararg, &varresult, VT_I4); - ok(hr == S_OK, "Installer_RegistryValue failed, hresult 0x%08x\n", hr); - ok(V_I4(&varresult) == 305419896, "Registry value %d does not match expected value\n", V_I4(&varresult)); + ok(hr == S_OK, "Installer_RegistryValue failed, hresult %#lx\n", hr); + ok(V_I4(&varresult) == 305419896, "Registry value %ld does not match expected value\n", V_I4(&varresult)); VariantClear(&varresult); memset(szString, 0, sizeof(szString)); hr = Installer_RegistryValueW(curr_user, L"Software\\Wine\\Test", L"Three", szString); - ok(hr == S_OK, "Installer_RegistryValueW failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Installer_RegistryValueW failed, hresult %#lx\n", hr); ok_w2("Registry value \"%s\" does not match expected \"%s\"\n", szString, L"(REG_BINARY)"); memset(szString, 0, sizeof(szString)); hr = Installer_RegistryValueW(curr_user, L"Software\\Wine\\Test", L"Four", szString); - ok(hr == S_OK, "Installer_RegistryValueW failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Installer_RegistryValueW failed, hresult %#lx\n", hr); ok_w2("Registry value \"%s\" does not match expected \"%s\"\n", szString, L"Four"); /* Vista does not NULL-terminate this case */ memset(szString, 0, sizeof(szString)); hr = Installer_RegistryValueW(curr_user, L"Software\\Wine\\Test", L"Five\0Hi\0", szString); - ok(hr == S_OK, "Installer_RegistryValueW failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Installer_RegistryValueW failed, hresult %#lx\n", hr); ok_w2n("Registry value \"%s\" does not match expected \"%s\"\n", szString, L"Five\nHi", lstrlenW(L"Five\nHi")); memset(szString, 0, sizeof(szString)); hr = Installer_RegistryValueW(curr_user, L"Software\\Wine\\Test", L"Six", szString); - ok(hr == S_OK, "Installer_RegistryValueW failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Installer_RegistryValueW failed, hresult %#lx\n", hr); ok(!lstrcmpW(szString, L"(REG_\?\?)") || broken(!lstrcmpW(szString, L"(REG_]")), "Registry value does not match\n"); @@ -2133,36 +2133,36 @@ static void test_Installer_RegistryValue(void) V_VT(&vararg) = VT_BSTR; V_BSTR(&vararg) = SysAllocString(L"Seven"); hr = Installer_RegistryValue(curr_user, L"Software\\Wine\\Test", vararg, &varresult, VT_EMPTY); - ok(hr == S_OK, "Installer_RegistryValue failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Installer_RegistryValue failed, hresult %#lx\n", hr); /* Get string class name for the key */ memset(szString, 0, sizeof(szString)); hr = Installer_RegistryValueI(curr_user, L"Software\\Wine\\Test", 0, szString, VT_BSTR); - ok(hr == S_OK, "Installer_RegistryValueI failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Installer_RegistryValueI failed, hresult %#lx\n", hr); ok_w2("Registry name \"%s\" does not match expected \"%s\"\n", szString, L""); /* Get name of a value by positive number (RegEnumValue like), valid index */ memset(szString, 0, sizeof(szString)); hr = Installer_RegistryValueI(curr_user, L"Software\\Wine\\Test", 2, szString, VT_BSTR); - ok(hr == S_OK, "Installer_RegistryValueI failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Installer_RegistryValueI failed, hresult %#lx\n", hr); /* RegEnumValue order seems different on wine */ todo_wine ok_w2("Registry name \"%s\" does not match expected \"%s\"\n", szString, L"Two"); /* Get name of a value by positive number (RegEnumValue like), invalid index */ memset(szString, 0, sizeof(szString)); hr = Installer_RegistryValueI(curr_user, L"Software\\Wine\\Test", 10, szString, VT_EMPTY); - ok(hr == S_OK, "Installer_RegistryValueI failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Installer_RegistryValueI failed, hresult %#lx\n", hr); /* Get name of a subkey by negative number (RegEnumValue like), valid index */ memset(szString, 0, sizeof(szString)); hr = Installer_RegistryValueI(curr_user, L"Software\\Wine\\Test", -1, szString, VT_BSTR); - ok(hr == S_OK, "Installer_RegistryValueI failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Installer_RegistryValueI failed, hresult %#lx\n", hr); ok_w2("Registry name \"%s\" does not match expected \"%s\"\n", szString, L"Eight"); /* Get name of a subkey by negative number (RegEnumValue like), invalid index */ memset(szString, 0, sizeof(szString)); hr = Installer_RegistryValueI(curr_user, L"Software\\Wine\\Test", -10, szString, VT_EMPTY); - ok(hr == S_OK, "Installer_RegistryValueI failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Installer_RegistryValueI failed, hresult %#lx\n", hr); /* clean up */ delete_key(hkey); @@ -2183,38 +2183,39 @@ static void test_Installer_Products(BOOL bProductInstalled) /* Installer::Products */ hr = Installer_Products(&pStringList); - ok(hr == S_OK, "Installer_Products failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Installer_Products failed, hresult %#lx\n", hr); if (hr == S_OK) { /* StringList::_NewEnum */ hr = StringList__NewEnum(pStringList, &pUnk); - ok(hr == S_OK, "StringList_NewEnum failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "StringList_NewEnum failed, hresult %#lx\n", hr); if (hr == S_OK) { hr = IUnknown_QueryInterface(pUnk, &IID_IEnumVARIANT, (void **)&pEnum); - ok (hr == S_OK, "IUnknown::QueryInterface returned 0x%08x\n", hr); + ok (hr == S_OK, "IUnknown::QueryInterface returned %#lx\n", hr); } if (!pEnum) skip("IEnumVARIANT tests\n"); /* StringList::Count */ hr = StringList_Count(pStringList, &iCount); - ok(hr == S_OK, "StringList_Count failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "StringList_Count failed, hresult %#lx\n", hr); for (idx=0; idx<iCount; idx++) { /* StringList::Item */ memset(szString, 0, sizeof(szString)); hr = StringList_Item(pStringList, idx, szString); - ok(hr == S_OK, "StringList_Item failed (idx %d, count %d), hresult 0x%08x\n", idx, iCount, hr); + ok(hr == S_OK, "StringList_Item failed (idx %d, count %d), hresult %#lx\n", idx, iCount, hr); if (hr == S_OK) { /* Installer::ProductState */ hr = Installer_ProductState(szString, &iValue); - ok(hr == S_OK, "Installer_ProductState failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Installer_ProductState failed, hresult %#lx\n", hr); if (hr == S_OK) - ok(iValue == INSTALLSTATE_DEFAULT || iValue == INSTALLSTATE_ADVERTISED, "Installer_ProductState returned %d, expected %d or %d\n", iValue, INSTALLSTATE_DEFAULT, INSTALLSTATE_ADVERTISED); + ok(iValue == INSTALLSTATE_DEFAULT || iValue == INSTALLSTATE_ADVERTISED, + "Installer_ProductState returned %d, expected %d or %d\n", iValue, INSTALLSTATE_DEFAULT, INSTALLSTATE_ADVERTISED); /* Not found our product code yet? Check */ if (!bProductFound && !lstrcmpW(szString, L"{837450fa-a39b-4bc8-b321-08b393f784b3}")) @@ -2224,8 +2225,8 @@ static void test_Installer_Products(BOOL bProductInstalled) if (pEnum) { hr = IEnumVARIANT_Next(pEnum, 1, &var, &celt); - ok(hr == S_OK, "IEnumVARIANT_Next failed (idx %d, count %d), hresult 0x%08x\n", idx, iCount, hr); - ok(celt == 1, "%d items were retrieved, expected 1\n", celt); + ok(hr == S_OK, "IEnumVARIANT_Next failed (idx %d, count %d), hresult %#lx\n", idx, iCount, hr); + ok(celt == 1, "%lu items were retrieved, expected 1\n", celt); ok(V_VT(&var) == VT_BSTR, "IEnumVARIANT_Next returned variant of type %d, expected %d\n", V_VT(&var), VT_BSTR); ok_w2("%s returned by StringList_Item does not match %s returned by IEnumVARIANT_Next\n", szString, V_BSTR(&var)); VariantClear(&var); @@ -2252,7 +2253,7 @@ static void test_Installer_Products(BOOL bProductInstalled) /* IEnumVARIANT::Clone */ hr = IEnumVARIANT_Clone(pEnum, &pEnum2); - ok(hr == S_OK, "IEnumVARIANT_Clone failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "IEnumVARIANT_Clone failed, hresult %#lx\n", hr); if (hr == S_OK) { /* IEnumVARIANT::Clone is supposed to save the position, but it actually just goes back to the beginning */ @@ -2261,8 +2262,8 @@ static void test_Installer_Products(BOOL bProductInstalled) if (iCount) { hr = IEnumVARIANT_Next(pEnum2, 1, &var, &celt); - ok(hr == S_OK, "IEnumVARIANT_Next failed, hresult 0x%08x\n", hr); - ok(celt == 1, "%d items were retrieved, expected 0\n", celt); + ok(hr == S_OK, "IEnumVARIANT_Next failed, hresult %#lx\n", hr); + ok(celt == 1, "%lu items were retrieved, expected 0\n", celt); ok(V_VT(&var) == VT_BSTR, "IEnumVARIANT_Next returned variant of type %d, expected %d\n", V_VT(&var), VT_BSTR); VariantClear(&var); } @@ -2274,33 +2275,33 @@ static void test_Installer_Products(BOOL bProductInstalled) /* IEnumVARIANT::Skip should fail */ hr = IEnumVARIANT_Skip(pEnum, 1); - ok(hr == S_FALSE, "IEnumVARIANT_Skip failed, hresult 0x%08x\n", hr); + ok(hr == S_FALSE, "IEnumVARIANT_Skip failed, hresult %#lx\n", hr); /* IEnumVARIANT::Next, NULL variant pointer */ hr = IEnumVARIANT_Next(pEnum, 1, NULL, &celt); - ok(hr == S_FALSE, "IEnumVARIANT_Next failed, hresult 0x%08x\n", hr); - ok(celt == 0, "%d items were retrieved, expected 0\n", celt); + ok(hr == S_FALSE, "IEnumVARIANT_Next failed, hresult %#lx\n", hr); + ok(celt == 0, "%lu items were retrieved, expected 0\n", celt); /* IEnumVARIANT::Next, should not return any more items */ hr = IEnumVARIANT_Next(pEnum, 1, &var, &celt); - ok(hr == S_FALSE, "IEnumVARIANT_Next failed, hresult 0x%08x\n", hr); - ok(celt == 0, "%d items were retrieved, expected 0\n", celt); + ok(hr == S_FALSE, "IEnumVARIANT_Next failed, hresult %#lx\n", hr); + ok(celt == 0, "%lu items were retrieved, expected 0\n", celt); VariantClear(&var); /* IEnumVARIANT::Reset */ hr = IEnumVARIANT_Reset(pEnum); - ok(hr == S_OK, "IEnumVARIANT_Reset failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "IEnumVARIANT_Reset failed, hresult %#lx\n", hr); if (iCount) { /* IEnumVARIANT::Skip to the last product */ hr = IEnumVARIANT_Skip(pEnum, iCount-1); - ok(hr == S_OK, "IEnumVARIANT_Skip failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "IEnumVARIANT_Skip failed, hresult %#lx\n", hr); /* IEnumVARIANT::Next should match the very last retrieved value, also makes sure it works with * NULL celt pointer. */ hr = IEnumVARIANT_Next(pEnum, 1, &var, NULL); - ok(hr == S_OK, "IEnumVARIANT_Next failed (idx %d, count %d), hresult 0x%08x\n", idx, iCount, hr); + ok(hr == S_OK, "IEnumVARIANT_Next failed (idx %d, count %d), hresult %#lx\n", idx, iCount, hr); ok(V_VT(&var) == VT_BSTR, "IEnumVARIANT_Next returned variant of type %d, expected %d\n", V_VT(&var), VT_BSTR); ok_w2("%s returned by StringList_Item does not match %s returned by IEnumVARIANT_Next\n", szString, V_BSTR(&var)); VariantClear(&var); @@ -2312,7 +2313,7 @@ static void test_Installer_Products(BOOL bProductInstalled) /* StringList::Item using an invalid index */ memset(szString, 0, sizeof(szString)); hr = StringList_Item(pStringList, iCount, szString); - ok(hr == DISP_E_BADINDEX, "StringList_Item for an invalid index did not return DISP_E_BADINDEX, hresult 0x%08x\n", hr); + ok(hr == DISP_E_BADINDEX, "StringList_Item for an invalid index did not return DISP_E_BADINDEX, hresult %#lx\n", hr); if (pEnum) IEnumVARIANT_Release(pEnum); if (pUnk) IUnknown_Release(pUnk); @@ -2406,7 +2407,7 @@ static void test_Installer_InstallProduct(void) /* Avoid an interactive dialog in case of insufficient privileges. */ hr = Installer_UILevelPut(INSTALLUILEVEL_NONE); - ok(hr == S_OK, "Expected UILevel property put invoke to return S_OK, got 0x%08x\n", hr); + ok(hr == S_OK, "Expected UILevel property put invoke to return S_OK, got %#lx\n", hr); /* Installer::InstallProduct */ hr = Installer_InstallProduct(L"winetest-automation.msi", NULL); @@ -2416,11 +2417,11 @@ static void test_Installer_InstallProduct(void) delete_test_files(); return; } - ok(hr == S_OK, "Installer_InstallProduct failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Installer_InstallProduct failed, hresult %#lx\n", hr); /* Installer::ProductState for our product code, which has been installed */ hr = Installer_ProductState(L"{837450fa-a39b-4bc8-b321-08b393f784b3}", &iValue); - ok(hr == S_OK, "Installer_ProductState failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Installer_ProductState failed, hresult %#lx\n", hr); ok(iValue == INSTALLSTATE_DEFAULT, "Installer_ProductState returned %d, expected %d\n", iValue, INSTALLSTATE_DEFAULT); /* Installer::ProductInfo for our product code */ @@ -2428,25 +2429,25 @@ static void test_Installer_InstallProduct(void) /* NULL attribute */ memset(szString, 0, sizeof(szString)); hr = Installer_ProductInfo(L"{837450fa-a39b-4bc8-b321-08b393f784b3}", NULL, szString); - ok(hr == DISP_E_EXCEPTION, "Installer_ProductInfo failed, hresult 0x%08x\n", hr); + ok(hr == DISP_E_EXCEPTION, "Installer_ProductInfo failed, hresult %#lx\n", hr); ok_exception(hr, L"ProductInfo,Product,Attribute"); /* Nonexistent attribute */ memset(szString, 0, sizeof(szString)); hr = Installer_ProductInfo(L"{837450fa-a39b-4bc8-b321-08b393f784b3}", L"winetest-automation.msi", szString); - ok(hr == DISP_E_EXCEPTION, "Installer_ProductInfo failed, hresult 0x%08x\n", hr); + ok(hr == DISP_E_EXCEPTION, "Installer_ProductInfo failed, hresult %#lx\n", hr); ok_exception(hr, L"ProductInfo,Product,Attribute"); /* Package name */ memset(szString, 0, sizeof(szString)); hr = Installer_ProductInfo(L"{837450fa-a39b-4bc8-b321-08b393f784b3}", L"PackageName", szString); - ok(hr == S_OK, "Installer_ProductInfo failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Installer_ProductInfo failed, hresult %#lx\n", hr); todo_wine ok_w2("Installer_ProductInfo returned %s but expected %s\n", szString, L"winetest-automation.msi"); /* Product name */ memset(szString, 0, sizeof(szString)); hr = Installer_ProductInfo(L"{837450fa-a39b-4bc8-b321-08b393f784b3}", L"ProductName", szString); - ok(hr == S_OK, "Installer_ProductInfo failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Installer_ProductInfo failed, hresult %#lx\n", hr); todo_wine ok_w2("Installer_ProductInfo returned %s but expected %s\n", szString, L"MSITEST"); /* Installer::Products */ @@ -2454,25 +2455,25 @@ static void test_Installer_InstallProduct(void) /* Installer::RelatedProducts for our upgrade code */ hr = Installer_RelatedProducts(L"{CE067E8D-2E1A-4367-B734-4EB2BDAD6565}", &pStringList); - ok(hr == S_OK, "Installer_RelatedProducts failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Installer_RelatedProducts failed, hresult %#lx\n", hr); if (hr == S_OK) { /* StringList::Count */ hr = StringList_Count(pStringList, &iCount); - ok(hr == S_OK, "StringList_Count failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "StringList_Count failed, hresult %#lx\n", hr); ok(iCount == 1, "Expected one related product but found %d\n", iCount); /* StringList::Item */ memset(szString, 0, sizeof(szString)); hr = StringList_Item(pStringList, 0, szString); - ok(hr == S_OK, "StringList_Item failed (idx 0, count %d), hresult 0x%08x\n", iCount, hr); + ok(hr == S_OK, "StringList_Item failed (idx 0, count %d), hresult %#lx\n", iCount, hr); ok_w2("StringList_Item returned %s but expected %s\n", szString, L"{837450fa-a39b-4bc8-b321-08b393f784b3}"); IDispatch_Release(pStringList); } hr = Installer_ProductInfo(L"{837450fa-a39b-4bc8-b321-08b393f784b3}", L"LocalPackage", szString); - ok(hr == S_OK, "Installer_ProductInfo failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Installer_ProductInfo failed, hresult %#lx\n", hr); DeleteFileW( szString ); /* Check & clean up installed files & registry keys */ @@ -2489,67 +2490,67 @@ static void test_Installer_InstallProduct(void) ok(delete_pf("msitest", FALSE), "Directory not created\n"); res = RegOpenKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest", &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); size = MAX_PATH; type = REG_SZ; res = RegQueryValueExA(hkey, "Name", NULL, &type, (LPBYTE)path, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); ok(!lstrcmpA(path, "imaname"), "Expected imaname, got %s\n", path); size = MAX_PATH; type = REG_SZ; res = RegQueryValueExA(hkey, "blah", NULL, &type, (LPBYTE)path, &size); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); size = sizeof(num); type = REG_DWORD; res = RegQueryValueExA(hkey, "number", NULL, &type, (LPBYTE)&num, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(num == 314, "Expected 314, got %d\n", num); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); + ok(num == 314, "Expected 314, got %lu\n", num); size = MAX_PATH; type = REG_SZ; res = RegQueryValueExA(hkey, "OrderTestName", NULL, &type, (LPBYTE)path, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); ok(!lstrcmpA(path, "OrderTestValue"), "Expected imaname, got %s\n", path); RegCloseKey(hkey); res = RegDeleteKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest"); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); /* Remove registry keys written by RegisterProduct standard action */ res = delete_key_portable(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\{837450fa-a39b-4bc8-b321-08b393f784b3}", KEY_WOW64_32KEY); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); res = delete_key_portable(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Installer\\UpgradeCodes\\D8E760ECA1E276347B43E42BDBDA5656", access); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); res = find_registry_key(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData", "af054738b93a8cb43b12803b397f483b", access, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); res = delete_registry_key(hkey, "af054738b93a8cb43b12803b397f483b", access); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); RegCloseKey(hkey); res = delete_key_portable(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Installer\\Products\\af054738b93a8cb43b12803b397f483b", access); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); /* Remove registry keys written by PublishProduct standard action */ res = RegOpenKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\Installer", &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); res = delete_registry_key(hkey, "Products\\af054738b93a8cb43b12803b397f483b", KEY_ALL_ACCESS); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); res = RegDeleteKeyA(hkey, "UpgradeCodes\\D8E760ECA1E276347B43E42BDBDA5656"); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); RegCloseKey(hkey); @@ -2570,42 +2571,42 @@ static void test_Installer(void) /* Test for error */ hr = Installer_CreateRecord(-1, &pRecord); - ok(hr == DISP_E_EXCEPTION, "Installer_CreateRecord failed, hresult 0x%08x\n", hr); + ok(hr == DISP_E_EXCEPTION, "Installer_CreateRecord failed, hresult %#lx\n", hr); ok_exception(hr, L"CreateRecord,Count"); /* Test for success */ hr = Installer_CreateRecord(1, &pRecord); - ok(hr == S_OK, "Installer_CreateRecord failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Installer_CreateRecord failed, hresult %#lx\n", hr); ok(pRecord != NULL, "Installer_CreateRecord should not have returned NULL record\n"); if (pRecord) { /* Record::FieldCountGet */ hr = Record_FieldCountGet(pRecord, &iValue); - ok(hr == S_OK, "Record_FiledCountGet failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Record_FiledCountGet failed, hresult %#lx\n", hr); ok(iValue == 1, "Record_FieldCountGet result was %d but expected 1\n", iValue); /* Record::IntegerDataGet */ hr = Record_IntegerDataGet(pRecord, 1, &iValue); - ok(hr == S_OK, "Record_IntegerDataGet failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Record_IntegerDataGet failed, hresult %#lx\n", hr); ok(iValue == MSI_NULL_INTEGER, "Record_IntegerDataGet result was %d but expected %d\n", iValue, MSI_NULL_INTEGER); /* Record::IntegerDataGet, bad index */ hr = Record_IntegerDataGet(pRecord, 10, &iValue); - ok(hr == S_OK, "Record_IntegerDataGet failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Record_IntegerDataGet failed, hresult %#lx\n", hr); ok(iValue == MSI_NULL_INTEGER, "Record_IntegerDataGet result was %d but expected %d\n", iValue, MSI_NULL_INTEGER); /* Record::IntegerDataPut */ hr = Record_IntegerDataPut(pRecord, 1, 100); - ok(hr == S_OK, "Record_IntegerDataPut failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Record_IntegerDataPut failed, hresult %#lx\n", hr); /* Record::IntegerDataPut, bad index */ hr = Record_IntegerDataPut(pRecord, 10, 100); - ok(hr == DISP_E_EXCEPTION, "Record_IntegerDataPut failed, hresult 0x%08x\n", hr); + ok(hr == DISP_E_EXCEPTION, "Record_IntegerDataPut failed, hresult %#lx\n", hr); ok_exception(hr, L"IntegerData,Field"); /* Record::IntegerDataGet */ hr = Record_IntegerDataGet(pRecord, 1, &iValue); - ok(hr == S_OK, "Record_IntegerDataGet failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Record_IntegerDataGet failed, hresult %#lx\n", hr); ok(iValue == 100, "Record_IntegerDataGet result was %d but expected 100\n", iValue); IDispatch_Release(pRecord); @@ -2621,7 +2622,7 @@ static void test_Installer(void) DeleteFileW(szPath); return; } - ok(hr == S_OK, "Installer_OpenPackage failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Installer_OpenPackage failed, hresult %#lx\n", hr); if (hr == S_OK) { test_Session(pSession); @@ -2630,7 +2631,7 @@ static void test_Installer(void) /* Installer::OpenDatabase */ hr = Installer_OpenDatabase(szPath, (INT_PTR)MSIDBOPEN_TRANSACT, &pDatabase); - ok(hr == S_OK, "Installer_OpenDatabase failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Installer_OpenDatabase failed, hresult %#lx\n", hr); if (hr == S_OK) { test_Database(pDatabase, FALSE); @@ -2639,7 +2640,7 @@ static void test_Installer(void) /* Installer::SummaryInformation */ hr = Installer_SummaryInformation(szPath, 0, &pSumInfo); - ok(hr == S_OK, "Installer_SummaryInformation failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Installer_SummaryInformation failed, hresult %#lx\n", hr); if (hr == S_OK) { test_SummaryInfo(pSumInfo, summary_info, ARRAY_SIZE(summary_info), TRUE); @@ -2647,14 +2648,14 @@ static void test_Installer(void) } hr = Installer_SummaryInformation(NULL, 0, &pSumInfo); - ok(hr == DISP_E_EXCEPTION, "Installer_SummaryInformation failed, hresult 0x%08x\n", hr); + ok(hr == DISP_E_EXCEPTION, "Installer_SummaryInformation failed, hresult %#lx\n", hr); /* Installer::RegistryValue */ test_Installer_RegistryValue(); /* Installer::ProductState for our product code, which should not be installed */ hr = Installer_ProductState(L"{837450fa-a39b-4bc8-b321-08b393f784b3}", &iValue); - ok(hr == S_OK, "Installer_ProductState failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Installer_ProductState failed, hresult %#lx\n", hr); ok(iValue == INSTALLSTATE_UNKNOWN, "Installer_ProductState returned %d, expected %d\n", iValue, INSTALLSTATE_UNKNOWN); /* Installer::ProductInfo for our product code, which should not be installed */ @@ -2662,13 +2663,13 @@ static void test_Installer(void) /* Package name */ memset(szPath, 0, sizeof(szPath)); hr = Installer_ProductInfo(L"{837450fa-a39b-4bc8-b321-08b393f784b3}", L"PackageName", szPath); - ok(hr == DISP_E_EXCEPTION, "Installer_ProductInfo failed, hresult 0x%08x\n", hr); + ok(hr == DISP_E_EXCEPTION, "Installer_ProductInfo failed, hresult %#lx\n", hr); ok_exception(hr, L"ProductInfo,Product,Attribute"); /* NULL attribute and NULL product code */ memset(szPath, 0, sizeof(szPath)); hr = Installer_ProductInfo(NULL, NULL, szPath); - ok(hr == DISP_E_EXCEPTION, "Installer_ProductInfo failed, hresult 0x%08x\n", hr); + ok(hr == DISP_E_EXCEPTION, "Installer_ProductInfo failed, hresult %#lx\n", hr); ok_exception(hr, L"ProductInfo,Product,Attribute"); /* Installer::Products */ @@ -2676,12 +2677,12 @@ static void test_Installer(void) /* Installer::RelatedProducts for our upgrade code, should not find anything */ hr = Installer_RelatedProducts(L"{CE067E8D-2E1A-4367-B734-4EB2BDAD6565}", &pStringList); - ok(hr == S_OK, "Installer_RelatedProducts failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Installer_RelatedProducts failed, hresult %#lx\n", hr); if (hr == S_OK) { /* StringList::Count */ hr = StringList_Count(pStringList, &iCount); - ok(hr == S_OK, "StringList_Count failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "StringList_Count failed, hresult %#lx\n", hr); ok(!iCount, "Expected no related products but found %d\n", iCount); IDispatch_Release(pStringList); @@ -2690,7 +2691,7 @@ static void test_Installer(void) /* Installer::Version */ memset(szPath, 0, sizeof(szPath)); hr = Installer_VersionGet(szPath); - ok(hr == S_OK, "Installer_VersionGet failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "Installer_VersionGet failed, hresult %#lx\n", hr); /* Installer::InstallProduct and other tests that depend on our product being installed */ test_Installer_InstallProduct(); @@ -2724,16 +2725,16 @@ START_TEST(automation) get_program_files_dir(PROG_FILES_DIR); hr = OleInitialize(NULL); - ok (hr == S_OK, "OleInitialize returned 0x%08x\n", hr); + ok (hr == S_OK, "OleInitialize returned %#lx\n", hr); hr = CLSIDFromProgID(L"WindowsInstaller.Installer", &clsid); - ok (hr == S_OK, "CLSIDFromProgID returned 0x%08x\n", hr); + ok (hr == S_OK, "CLSIDFromProgID returned %#lx\n", hr); hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk); - ok(hr == S_OK, "CoCreateInstance returned 0x%08x\n", hr); + ok(hr == S_OK, "CoCreateInstance returned %#lx\n", hr); if (pUnk) { hr = IUnknown_QueryInterface(pUnk, &IID_IDispatch, (void **)&pInstaller); - ok (hr == S_OK, "IUnknown::QueryInterface returned 0x%08x\n", hr); + ok (hr == S_OK, "IUnknown::QueryInterface returned %#lx\n", hr); test_dispid(); test_dispatch(); diff --git a/modules/rostests/winetests/msi/custom.c b/modules/rostests/winetests/msi/custom.c index 75e234c6583..c1b011c8871 100644 --- a/modules/rostests/winetests/msi/custom.c +++ b/modules/rostests/winetests/msi/custom.c @@ -1141,7 +1141,7 @@ static void test_invalid_functions(MSIHANDLE hinst) r = MsiEnableUIPreview(db, &preview); ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); - sprintf(package_name, "#%u", db); + sprintf(package_name, "#%lu", db); r = MsiOpenPackageA(package_name, &package); ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); diff --git a/modules/rostests/winetests/msi/db.c b/modules/rostests/winetests/msi/db.c index b2a60f5b304..59dcf87a47c 100644 --- a/modules/rostests/winetests/msi/db.c +++ b/modules/rostests/winetests/msi/db.c @@ -548,7 +548,7 @@ static void test_msidecomposedesc(void) comp[0] = 0x55; r = pMsiDecomposeDescriptorA(desc, prod, feature, comp, &len); ok(r == ERROR_SUCCESS, "returned an error\n"); - ok(len == 41, "got %u\n", len); + ok(len == 41, "got %lu\n", len); ok(!strcmp(prod,"{90110409-6000-11D3-8CFE-0150048383C9}"), "got '%s'\n", prod); ok(!strcmp(feature,"FollowTheWhiteRabbit"), "got '%s'\n", feature); ok(!comp[0], "got '%s'\n", comp); @@ -558,7 +558,7 @@ static void test_msidecomposedesc(void) comp[0] = 0x55; r = pMsiDecomposeDescriptorA("yh1BVN)8A$!!!!!MKKSkAlwaysInstalledIntl_1033<", prod, feature, comp, &len); ok(r == ERROR_SUCCESS, "got %u\n", r); - ok(len == 45, "got %u\n", len); + ok(len == 45, "got %lu\n", len); ok(!strcmp(prod, "{90150000-006E-0409-0000-0000000FF1CE}"), "got '%s'\n", prod); ok(!strcmp(feature, "AlwaysInstalledIntl_1033"), "got '%s'\n", feature); ok(!comp[0], "got '%s'\n", comp); @@ -907,7 +907,7 @@ static void test_viewmodify(void) err = MsiViewGetErrorA( hview, buffer, &sz ); ok(err == MSIDBERROR_NOERROR, "got %d\n", err); ok(!buffer[0], "got \"%s\"\n", buffer); - ok(sz == 0, "got size %u\n", sz); + ok(sz == 0, "got size %lu\n", sz); r = MsiViewExecute(hview, 0); ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); @@ -928,7 +928,7 @@ static void test_viewmodify(void) err = MsiViewGetErrorA( hview, buffer, &sz ); ok(err == MSIDBERROR_NOERROR, "got %d\n", err); ok(!buffer[0], "got \"%s\"\n", buffer); - ok(sz == 0, "got size %u\n", sz); + ok(sz == 0, "got size %lu\n", sz); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n"); @@ -960,7 +960,7 @@ static void test_viewmodify(void) err = MsiViewGetErrorA( hview, buffer, &sz ); ok(err == MSIDBERROR_DUPLICATEKEY, "got %d\n", err); ok(!strcmp(buffer, "id"), "got \"%s\"\n", buffer); - ok(sz == 2, "got size %u\n", sz); + ok(sz == 2, "got size %lu\n", sz); /* insert the same thing again */ r = MsiViewExecute(hview, 0); @@ -1809,7 +1809,7 @@ static void test_streamtable(void) memset(buf, 0, MAX_PATH); r = MsiRecordReadStream( rec, 2, buf, &size ); ok( r == ERROR_SUCCESS, "Failed to get stream: %d\n", r); - ok( !lstrcmpA(buf, "test.txt\n"), "Expected 'test.txt\\n', got '%s' (%d)\n", buf, size); + ok( !lstrcmpA(buf, "test.txt\n"), "Expected 'test.txt\\n', got '%s' (%lu)\n", buf, size); MsiCloseHandle( rec ); /* open a handle to the "data" stream (and keep it open during removal) */ @@ -1841,7 +1841,7 @@ static void test_streamtable(void) memset(buf, 0, MAX_PATH); r = MsiRecordReadStream( rec, 2, buf, &size ); ok( r == ERROR_SUCCESS, "Failed to get stream: %d\n", r); - todo_wine ok( size == 0, "Expected empty buffer, got %d bytes\n", size); + todo_wine ok( size == 0, "Expected empty buffer, got %lu bytes\n", size); MsiCloseHandle( rec ); MsiCloseHandle( hdb ); @@ -2246,7 +2246,8 @@ static void test_suminfo_import(void) { MSIHANDLE hdb, hsi, view = 0; LPCSTR query; - UINT r, count, size, type; + UINT r, count, type; + DWORD size; char str_value[50]; INT int_value; FILETIME ft_value; @@ -2284,7 +2285,7 @@ static void test_suminfo_import(void) r = MsiSummaryInfoGetPropertyA(hsi, PID_TITLE, &type, NULL, NULL, str_value, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(type == VT_LPSTR, "Expected VT_LPSTR, got %u\n", type); - ok(size == 18, "Expected 18, got %u\n", size); + ok(size == 18, "Expected 18, got %lu\n", size); ok(!strcmp(str_value, "Installer Database"), "Expected \"Installer Database\", got %s\n", str_value); @@ -2980,7 +2981,7 @@ static void generate_transform_manual(void) STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stm ); if (FAILED(r)) { - ok(0, "failed to create stream %08x\n", r); + ok(0, "failed to create stream %#lx\n", r); continue; } @@ -3068,7 +3069,7 @@ static UINT package_from_db(MSIHANDLE hdb, MSIHANDLE *handle) CHAR szPackage[12]; MSIHANDLE hPackage; - sprintf(szPackage, "#%u", hdb); + sprintf(szPackage, "#%lu", hdb); res = MsiOpenPackageA(szPackage, &hPackage); if (res != ERROR_SUCCESS) return res; @@ -3512,7 +3513,7 @@ static void test_join(void) i++; MsiCloseHandle(hrec); } - ok( i == 5, "Expected 5 rows, got %d\n", i ); + ok( i == 5, "Expected 5 rows, got %lu\n", i ); ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r ); MsiViewClose(hview); @@ -3533,7 +3534,7 @@ static void test_join(void) i++; MsiCloseHandle(hrec); } - ok( i == 24, "Expected 24 rows, got %d\n", i ); + ok( i == 24, "Expected 24 rows, got %lu\n", i ); MsiViewClose(hview); MsiCloseHandle(hview); @@ -3555,7 +3556,7 @@ static void test_join(void) MsiCloseHandle(hrec); } - ok( i == 2, "Expected 2 rows, got %d\n", i ); + ok( i == 2, "Expected 2 rows, got %lu\n", i ); ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r ); MsiViewClose(hview); @@ -3578,7 +3579,7 @@ static void test_join(void) i++; MsiCloseHandle(hrec); } - ok( i == 2, "Expected 2 rows, got %d\n", i ); + ok( i == 2, "Expected 2 rows, got %lu\n", i ); ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r ); MsiViewClose(hview); @@ -3601,7 +3602,7 @@ static void test_join(void) i++; MsiCloseHandle(hrec); } - ok( i == 1, "Expected 1 rows, got %d\n", i ); + ok( i == 1, "Expected 1 rows, got %lu\n", i ); ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r ); MsiViewClose(hview); @@ -3625,7 +3626,7 @@ static void test_join(void) i++; MsiCloseHandle(hrec); } - ok( i == 1, "Expected 1 rows, got %d\n", i ); + ok( i == 1, "Expected 1 rows, got %lu\n", i ); ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r ); MsiViewClose(hview); @@ -3648,7 +3649,7 @@ static void test_join(void) i++; MsiCloseHandle(hrec); } - ok( i == 6, "Expected 6 rows, got %d\n", i ); + ok( i == 6, "Expected 6 rows, got %lu\n", i ); ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r ); MsiViewClose(hview); @@ -3672,7 +3673,7 @@ static void test_join(void) i++; MsiCloseHandle(hrec); } - ok( i == 3, "Expected 3 rows, got %d\n", i ); + ok( i == 3, "Expected 3 rows, got %lu\n", i ); ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r ); MsiViewClose(hview); @@ -3693,7 +3694,7 @@ static void test_join(void) i++; MsiCloseHandle(hrec); } - ok( i == 6, "Expected 6 rows, got %d\n", i ); + ok( i == 6, "Expected 6 rows, got %lu\n", i ); ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r ); MsiViewClose(hview); @@ -3714,7 +3715,7 @@ static void test_join(void) i++; MsiCloseHandle(hrec); } - ok( i == 6, "Expected 6 rows, got %d\n", i ); + ok( i == 6, "Expected 6 rows, got %lu\n", i ); ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r ); MsiViewClose(hview); @@ -3736,7 +3737,7 @@ static void test_join(void) i++; MsiCloseHandle(hrec); } - ok( i == 6, "Expected 6 rows, got %d\n", i ); + ok( i == 6, "Expected 6 rows, got %lu\n", i ); ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r ); MsiViewClose(hview); @@ -4240,21 +4241,21 @@ static void test_integers(void) ok(r == 8, "record count wrong: %d\n", r); i = MsiRecordGetInteger(rec, 1); - ok(i == MSI_NULL_INTEGER, "Expected MSI_NULL_INTEGER, got %d\n", i); + ok(i == MSI_NULL_INTEGER, "Expected MSI_NULL_INTEGER, got %lu\n", i); i = MsiRecordGetInteger(rec, 3); - ok(i == MSI_NULL_INTEGER, "Expected MSI_NULL_INTEGER, got %d\n", i); + ok(i == MSI_NULL_INTEGER, "Expected MSI_NULL_INTEGER, got %lu\n", i); i = MsiRecordGetInteger(rec, 2); - ok(i == 2, "Expected 2, got %d\n", i); + ok(i == 2, "Expected 2, got %lu\n", i); i = MsiRecordGetInteger(rec, 4); - ok(i == 4, "Expected 4, got %d\n", i); + ok(i == 4, "Expected 4, got %lu\n", i); i = MsiRecordGetInteger(rec, 5); - ok(i == 5, "Expected 5, got %d\n", i); + ok(i == 5, "Expected 5, got %lu\n", i); i = MsiRecordGetInteger(rec, 6); - ok(i == 6, "Expected 6, got %d\n", i); + ok(i == 6, "Expected 6, got %lu\n", i); i = MsiRecordGetInteger(rec, 7); - ok(i == 7, "Expected 7, got %d\n", i); + ok(i == 7, "Expected 7, got %lu\n", i); i = MsiRecordGetInteger(rec, 8); - ok(i == 8, "Expected 8, got %d\n", i); + ok(i == 8, "Expected 8, got %lu\n", i); MsiCloseHandle(rec); MsiViewClose(view); @@ -5714,65 +5715,65 @@ static void test_stringtable(void) MultiByteToWideChar(CP_ACP, 0, msifile, -1, name, 0x20); hr = StgOpenStorage(name, NULL, mode, NULL, 0, &stg); - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr); ok(stg != NULL, "Expected non-NULL storage\n"); hr = IStorage_OpenStream(stg, moo, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm); - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr); ok(stm != NULL, "Expected non-NULL stream\n"); hr = IStream_Read(stm, data, MAX_PATH, &read); - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); - ok(read == 4, "Expected 4, got %d\n", read); + ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr); + ok(read == 4, "Expected 4, got %lu\n", read); todo_wine ok(!memcmp(data, data10, read), "Unexpected data\n"); hr = IStream_Release(stm); - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr); hr = IStorage_OpenStream(stg, aar, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm); - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr); ok(stm != NULL, "Expected non-NULL stream\n"); hr = IStream_Read(stm, data, MAX_PATH, &read); - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); - ok(read == 8, "Expected 8, got %d\n", read); + ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr); + ok(read == 8, "Expected 8, got %lu\n", read); todo_wine { ok(!memcmp(data, data11, read), "Unexpected data\n"); } hr = IStream_Release(stm); - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr); hr = IStorage_OpenStream(stg, stringdata, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm); - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr); ok(stm != NULL, "Expected non-NULL stream\n"); hr = IStream_Read(stm, buffer, MAX_PATH, &read); - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); - ok(read == 24, "Expected 24, got %d\n", read); + ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr); + ok(read == 24, "Expected 24, got %lu\n", read); ok(!memcmp(buffer, data12, read), "Unexpected data\n"); hr = IStream_Release(stm); - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr); hr = IStorage_OpenStream(stg, stringpool, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm); - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr); ok(stm != NULL, "Expected non-NULL stream\n"); hr = IStream_Read(stm, data, MAX_PATH, &read); - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr); todo_wine { - ok(read == 64, "Expected 64, got %d\n", read); + ok(read == 64, "Expected 64, got %lu\n", read); ok(!memcmp(data, data13, read), "Unexpected data\n"); } hr = IStream_Release(stm); - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr); hr = IStorage_Release(stg); - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr); DeleteFileA(msifile); } @@ -5895,7 +5896,7 @@ static void enum_stream_names(IStorage *stg) memset(check, 'a', MAX_PATH); hr = IStorage_EnumElements(stg, 0, NULL, 0, &stgenum); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr); n = 0; while(TRUE) @@ -5906,12 +5907,12 @@ static void enum_stream_names(IStorage *stg) break; ok(!lstrcmpW(stat.pwcsName, database_table_data[n].name), - "Expected table %d name to match\n", n); + "Expected table %lu name to match\n", n); stm = NULL; hr = IStorage_OpenStream(stg, stat.pwcsName, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr); ok(stm != NULL, "Expected non-NULL stream\n"); CoTaskMemFree(stat.pwcsName); @@ -5919,22 +5920,22 @@ static void enum_stream_names(IStorage *stg) sz = MAX_PATH; memset(data, 'a', MAX_PATH); hr = IStream_Read(stm, data, sz, &count); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr); ok(count == database_table_data[n].size, - "Expected %d, got %d\n", database_table_data[n].size, count); + "Expected %lu, got %lu\n", database_table_data[n].size, count); if (!database_table_data[n].size) ok(!memcmp(data, check, MAX_PATH), "data should not be changed\n"); else ok(!memcmp(data, database_table_data[n].data, database_table_data[n].size), - "Expected table %d data to match\n", n); + "Expected table %lu data to match\n", n); IStream_Release(stm); n++; } - ok(n == 3, "Expected 3, got %d\n", n); + ok(n == 3, "Expected 3, got %lu\n", n); IEnumSTATSTG_Release(stgenum); } @@ -5957,7 +5958,7 @@ static void test_defaultdatabase(void) MsiCloseHandle(hdb); hr = StgOpenStorage(msifileW, NULL, STGM_READ | STGM_SHARE_DENY_WRITE, NULL, 0, &stg); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr); ok(stg != NULL, "Expected non-NULL stg\n"); enum_stream_names(stg); @@ -7188,7 +7189,7 @@ static void test_storages_table(void) r = MsiRecordReadStream(hrec, 2, buf, &size); ok(r == ERROR_INVALID_DATA, "Expected ERROR_INVALID_DATA, got %d\n", r); ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf); - ok(size == 0, "Expected 0, got %d\n", size); + ok(size == 0, "Expected 0, got %lu\n", size); MsiCloseHandle(hrec); @@ -7204,23 +7205,23 @@ static void test_storages_table(void) MultiByteToWideChar(CP_ACP, 0, msifile, -1, name, MAX_PATH); hr = StgOpenStorage(name, NULL, STGM_DIRECT | STGM_READ | STGM_SHARE_DENY_WRITE, NULL, 0, &stg); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr); ok(stg != NULL, "Expected non-NULL storage\n"); MultiByteToWideChar(CP_ACP, 0, "stgname", -1, name, MAX_PATH); hr = IStorage_OpenStorage(stg, name, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, NULL, 0, &inner); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr); ok(inner != NULL, "Expected non-NULL storage\n"); MultiByteToWideChar(CP_ACP, 0, "storage.bin", -1, name, MAX_PATH); hr = IStorage_OpenStream(inner, name, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr); ok(stm != NULL, "Expected non-NULL stream\n"); hr = IStream_Read(stm, buf, MAX_PATH, &size); - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); - ok(size == 8, "Expected 8, got %d\n", size); + ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr); + ok(size == 8, "Expected 8, got %lu\n", size); ok(!lstrcmpA(buf, "stgdata"), "Expected \"stgdata\", got \"%s\"\n", buf); IStream_Release(stm); @@ -7248,7 +7249,7 @@ static void test_dbtopackage(void) create_custom_action_table(hdb); add_custom_action_entry(hdb, "'SetProp', 51, 'MYPROP', 'grape'"); - sprintf(package, "#%u", hdb); + sprintf(package, "#%lu", hdb); r = MsiOpenPackageA(package, &hpkg); if (r == ERROR_INSTALL_PACKAGE_REJECTED) { @@ -7263,7 +7264,7 @@ static void test_dbtopackage(void) r = MsiGetPropertyA(hpkg, "MYPROP", buf, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); - ok(size == 0, "Expected 0, got %d\n", size); + ok(size == 0, "Expected 0, got %lu\n", size); /* run the custom action to set the property */ r = MsiDoActionA(hpkg, "SetProp"); @@ -7275,7 +7276,7 @@ static void test_dbtopackage(void) r = MsiGetPropertyA(hpkg, "MYPROP", buf, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(buf, "grape"), "Expected \"grape\", got \"%s\"\n", buf); - ok(size == 5, "Expected 5, got %d\n", size); + ok(size == 5, "Expected 5, got %lu\n", size); MsiCloseHandle(hpkg); @@ -7291,7 +7292,7 @@ static void test_dbtopackage(void) todo_wine { ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); - ok(size == 0, "Expected 0, got %d\n", size); + ok(size == 0, "Expected 0, got %lu\n", size); } MsiCloseHandle(hdb); @@ -7308,7 +7309,7 @@ static void test_dbtopackage(void) create_custom_action_table(hdb); add_custom_action_entry(hdb, "'SetProp', 51, 'MYPROP', 'grape'"); - sprintf(package, "#%u", hdb); + sprintf(package, "#%lu", hdb); r = MsiOpenPackageA(package, &hpkg); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -7318,7 +7319,7 @@ static void test_dbtopackage(void) r = MsiGetPropertyA(hpkg, "MYPROP", buf, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); - ok(size == 0, "Expected 0, got %d\n", size); + ok(size == 0, "Expected 0, got %lu\n", size); /* run the custom action to set the property */ r = MsiDoActionA(hpkg, "SetProp"); @@ -7330,7 +7331,7 @@ static void test_dbtopackage(void) r = MsiGetPropertyA(hpkg, "MYPROP", buf, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(buf, "grape"), "Expected \"grape\", got \"%s\"\n", buf); - ok(size == 5, "Expected 5, got %d\n", size); + ok(size == 5, "Expected 5, got %lu\n", size); MsiCloseHandle(hpkg); @@ -7346,7 +7347,7 @@ static void test_dbtopackage(void) todo_wine { ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); - ok(size == 0, "Expected 0, got %d\n", size); + ok(size == 0, "Expected 0, got %lu\n", size); } MsiCloseHandle(hpkg); @@ -8583,7 +8584,8 @@ static void test_embedded_nulls(void) "s72\tL0\n" "Control\tDialog\n" "LicenseAgreementDlg\ttext\x11\x19text\0text"; - UINT r, sz; + UINT r; + DWORD sz; MSIHANDLE hdb, hrec; char buffer[32]; @@ -9208,7 +9210,7 @@ static void test_view_get_error(void) sz = 0; err = MsiViewGetErrorA(0, NULL, &sz); ok(err == MSIDBERROR_INVALIDARG, "got %d\n", err); - ok(sz == 0, "got size %u\n", sz); + ok(sz == 0, "got size %lu\n", sz); err = MsiViewGetErrorA(view, NULL, NULL); ok(err == MSIDBERROR_INVALIDARG, "got %d\n", err); @@ -9216,21 +9218,21 @@ static void test_view_get_error(void) sz = 0; err = MsiViewGetErrorA(view, NULL, &sz); ok(err == MSIDBERROR_NOERROR, "got %d\n", err); - ok(sz == 0, "got size %u\n", sz); + ok(sz == 0, "got size %lu\n", sz); sz = 0; strcpy(buffer, "x"); err = MsiViewGetErrorA(view, buffer, &sz); ok(err == MSIDBERROR_MOREDATA, "got %d\n", err); ok(!strcmp(buffer, "x"), "got \"%s\"\n", buffer); - ok(sz == 0, "got size %u\n", sz); + ok(sz == 0, "got size %lu\n", sz); sz = 1; strcpy(buffer, "x"); err = MsiViewGetErrorA(view, buffer, &sz); ok(err == MSIDBERROR_NOERROR, "got %d\n", err); ok(!buffer[0], "got \"%s\"\n", buffer); - ok(sz == 0, "got size %u\n", sz); + ok(sz == 0, "got size %lu\n", sz); rec = MsiCreateRecord(2); MsiRecordSetInteger(rec, 1, 1); @@ -9243,14 +9245,14 @@ static void test_view_get_error(void) err = MsiViewGetErrorA(view, buffer, &sz); ok(err == MSIDBERROR_DUPLICATEKEY, "got %d\n", err); ok(!strcmp(buffer, "A"), "got \"%s\"\n", buffer); - ok(sz == 1, "got size %u\n", sz); + ok(sz == 1, "got size %lu\n", sz); sz = 2; strcpy(buffer, "x"); err = MsiViewGetErrorA(view, buffer, &sz); todo_wine ok(err == MSIDBERROR_NOERROR, "got %d\n", err); todo_wine ok(!buffer[0], "got \"%s\"\n", buffer); - todo_wine ok(sz == 0, "got size %u\n", sz); + todo_wine ok(sz == 0, "got size %lu\n", sz); r = MsiViewModify(view, MSIMODIFY_VALIDATE_NEW, rec); ok(r == ERROR_INVALID_DATA, "got %u\n", r); @@ -9260,14 +9262,14 @@ static void test_view_get_error(void) err = MsiViewGetErrorA(view, buffer, &sz); ok(err == MSIDBERROR_MOREDATA, "got %d\n", err); ok(!buffer[0], "got \"%s\"\n", buffer); - ok(sz == 1, "got size %u\n", sz); + ok(sz == 1, "got size %lu\n", sz); sz = 1; strcpy(buffer, "x"); err = MsiViewGetErrorA(view, buffer, &sz); todo_wine ok(err == MSIDBERROR_NOERROR, "got %d\n", err); ok(!buffer[0], "got \"%s\"\n", buffer); - todo_wine ok(sz == 0, "got size %u\n", sz); + todo_wine ok(sz == 0, "got size %lu\n", sz); r = MsiViewModify(view, MSIMODIFY_VALIDATE_NEW, rec); ok(r == ERROR_INVALID_DATA, "got %u\n", r); @@ -9277,14 +9279,14 @@ static void test_view_get_error(void) err = MsiViewGetErrorA(view, buffer, &sz); ok(err == MSIDBERROR_MOREDATA, "got %d\n", err); ok(!strcmp(buffer, "x"), "got \"%s\"\n", buffer); - ok(sz == 1, "got size %u\n", sz); + ok(sz == 1, "got size %lu\n", sz); sz = 0; strcpy(buffer, "x"); err = MsiViewGetErrorA(view, buffer, &sz); ok(err == MSIDBERROR_MOREDATA, "got %d\n", err); ok(!strcmp(buffer, "x"), "got \"%s\"\n", buffer); - todo_wine ok(sz == 0, "got size %u\n", sz); + todo_wine ok(sz == 0, "got size %lu\n", sz); MsiCloseHandle(rec); MsiCloseHandle(view); diff --git a/modules/rostests/winetests/msi/format.c b/modules/rostests/winetests/msi/format.c index 06f901fb84c..1cf2021214c 100644 --- a/modules/rostests/winetests/msi/format.c +++ b/modules/rostests/winetests/msi/format.c @@ -35,7 +35,7 @@ static UINT package_from_db(MSIHANDLE hdb, MSIHANDLE *handle) CHAR szPackage[12]; MSIHANDLE hPackage; - sprintf(szPackage, "#%u", hdb); + sprintf(szPackage, "#%lu", hdb); res = MsiOpenPackageA(szPackage, &hPackage); if (res != ERROR_SUCCESS) return res; @@ -205,7 +205,7 @@ static void test_formatrecord(void) sz = 123; r = MsiFormatRecordA(0, hrec, NULL, &sz); ok( r == ERROR_SUCCESS, "format failed with empty buffer\n"); - ok( sz == 2, "size wrong (%i)\n",sz); + ok( sz == 2, "size wrong (%lu)\n",sz); sz = sizeof buffer; buffer[0] = 'x'; buffer[1] = 0; @@ -296,7 +296,7 @@ static void test_formatrecord(void) sz = sizeof buffer; r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 30, "size wrong %i\n",sz); + ok( sz == 30, "size wrong %lu\n",sz); ok( 0 == strcmp(buffer,"1: boo 2: hoo 3: 4: 5: 6: "), "wrong output(%s)\n",buffer); @@ -308,7 +308,7 @@ static void test_formatrecord(void) sz = sizeof buffer; r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 31, "size wrong %i\n",sz); + ok( sz == 31, "size wrong %lu\n",sz); ok( 0 == strcmp(buffer,"1: 123 2: 4567 3: 4: 5: 6: "), "wrong output(%s)\n",buffer); @@ -322,7 +322,7 @@ static void test_formatrecord(void) sz = sizeof buffer; r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 7, "size wrong,(%i)\n",sz); + ok( sz == 7, "size wrong,(%lu)\n",sz); ok( 0 == strcmp(buffer,"hey hey"), "wrong output (%s)\n",buffer); r = MsiRecordSetStringA(hrec, 0, "[[1]] [2]"); @@ -334,7 +334,7 @@ static void test_formatrecord(void) sz = sizeof buffer; r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 9, "size wrong,(%i)\n",sz); + ok( sz == 9, "size wrong,(%lu)\n",sz); ok( 0 == strcmp(buffer,"[[2]] hey"), "wrong output (%s)\n",buffer); r = MsiRecordSetStringA(hrec, 0, "[[[3]]] [2]"); @@ -348,7 +348,7 @@ static void test_formatrecord(void) sz = sizeof buffer; r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 7, "size wrong,(%i)\n",sz); + ok( sz == 7, "size wrong,(%lu)\n",sz); ok( 0 == strcmp(buffer,"hey hey"), "wrong output (%s)\n",buffer); r = MsiCloseHandle(hrec); @@ -369,7 +369,7 @@ static void test_formatrecord(void) sz = sizeof buffer; r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 7, "size wrong,(%i)\n",sz); + ok( sz == 7, "size wrong,(%lu)\n",sz); ok( 0 == strcmp(buffer,"big hey"), "wrong output (%s)\n",buffer); r = MsiRecordSetStringA(hrec, 0, "[[3][4][1]] [2]"); @@ -387,7 +387,7 @@ static void test_formatrecord(void) sz = sizeof buffer; r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 7, "size wrong,(%i)\n",sz); + ok( sz == 7, "size wrong,(%lu)\n",sz); ok( 0 == strcmp(buffer,"big hey"), "wrong output (%s)\n",buffer); r = MsiRecordSetStringA(hrec, 0, "[[3][[4]][1]] [2]"); @@ -405,7 +405,7 @@ static void test_formatrecord(void) sz = sizeof buffer; r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 10, "size wrong,(%i)\n",sz); + ok( sz == 10, "size wrong,(%lu)\n",sz); ok( 0 == strcmp(buffer,"[1[]2] hey"), "wrong output (%s)\n",buffer); /* incorrect formats */ @@ -424,7 +424,7 @@ static void test_formatrecord(void) sz = sizeof buffer; r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 18, "size wrong,(%i)\n",sz); + ok( sz == 18, "size wrong,(%lu)\n",sz); ok( 0 == strcmp(buffer,"[[[3][[4]][1]] [2]"), "wrong output (%s)\n",buffer); r = MsiRecordSetStringA(hrec, 0, "[[3][[4]][1]] [2]]"); @@ -442,7 +442,7 @@ static void test_formatrecord(void) sz = sizeof buffer; r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 11, "size wrong,(%i)\n",sz); + ok( sz == 11, "size wrong,(%lu)\n",sz); ok( 0 == strcmp(buffer,"[1[]2] hey]"), "wrong output (%s)\n",buffer); @@ -463,7 +463,7 @@ static void test_formatrecord(void) sz = sizeof buffer; r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 6, "size wrong,(%i)\n",sz); + ok( sz == 6, "size wrong,(%lu)\n",sz); ok( 0 == strcmp(buffer,"12 hey"), "wrong output (%s)\n",buffer); r = MsiRecordSetStringA(hrec, 0, "[{[3][1]}] [2]"); @@ -481,10 +481,9 @@ static void test_formatrecord(void) sz = sizeof buffer; r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 8, "size wrong,(%i)\n",sz); + ok( sz == 8, "size wrong,(%lu)\n",sz); ok( 0 == strcmp(buffer,"[12] hey"), "wrong output (%s)\n",buffer); - r = MsiRecordSetStringA(hrec, 0, "{test} [2]"); ok( r == ERROR_SUCCESS, "set string failed\n"); r = MsiRecordSetStringA(hrec, 1, "2"); @@ -500,7 +499,7 @@ static void test_formatrecord(void) sz = sizeof buffer; r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 10, "size wrong,(%i)\n",sz); + ok( sz == 10, "size wrong,(%lu)\n",sz); ok( 0 == strcmp(buffer,"{test} hey"), "wrong output (%s)\n",buffer); r = MsiRecordSetStringA(hrec, 0, "{[test]} [2]"); @@ -518,7 +517,7 @@ static void test_formatrecord(void) sz = sizeof buffer; r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 12, "size wrong,(%i)\n",sz); + ok( sz == 12, "size wrong,(%lu)\n",sz); ok( 0 == strcmp(buffer,"{[test]} hey"), "wrong output (%s)\n",buffer); r = MsiRecordSetStringA(hrec, 0, "{[1][2][3][4]} [2]"); @@ -536,7 +535,7 @@ static void test_formatrecord(void) sz = sizeof buffer; r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 4, "size wrong,(%i)\n",sz); + ok( sz == 4, "size wrong,(%lu)\n",sz); ok( 0 == strcmp(buffer," hey"), "wrong output (%s)\n",buffer); r = MsiRecordSetStringA(hrec, 0, "{[1][2][3][dummy]} [2]"); @@ -554,7 +553,7 @@ static void test_formatrecord(void) sz = sizeof buffer; r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 18, "size wrong,(%i)\n",sz); + ok( sz == 18, "size wrong,(%lu)\n",sz); ok( 0 == strcmp(buffer,"{2hey1[dummy]} hey"), "wrong output (%s)\n",buffer); r = MsiRecordSetStringA(hrec, 0, "{[1][2][3][4][dummy]} [2]"); @@ -572,7 +571,7 @@ static void test_formatrecord(void) sz = sizeof buffer; r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 18, "size wrong,(%i)\n",sz); + ok( sz == 18, "size wrong,(%lu)\n",sz); ok( 0 == strcmp(buffer,"{2hey1[dummy]} hey"), "wrong output (%s)\n",buffer); r = MsiRecordSetStringA(hrec, 0, "{{[1][2]}[3][4][dummy]}"); @@ -590,7 +589,7 @@ static void test_formatrecord(void) sz = sizeof buffer; r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 16, "size wrong,(%i)\n",sz); + ok( sz == 16, "size wrong,(%lu)\n",sz); ok( 0 == strcmp(buffer,"{{2hey}1[dummy]}"), "wrong output (%s)\n",buffer); r = MsiRecordSetStringA(hrec, 0, "{{[1][2]}[3]{[4][dummy]}}"); @@ -608,7 +607,7 @@ static void test_formatrecord(void) sz = sizeof buffer; r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 0, "size wrong,(%i)\n",sz); + ok( sz == 0, "size wrong,(%lu)\n",sz); ok( 0 == strcmp(buffer,""), "wrong output (%s)\n",buffer); r = MsiRecordSetStringA(hrec, 0, "{{[1][2]}[3]} {[1][2]}"); @@ -626,7 +625,7 @@ static void test_formatrecord(void) sz = sizeof buffer; r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 12, "size wrong,(%i)\n",sz); + ok( sz == 12, "size wrong,(%lu)\n",sz); ok( 0 == strcmp(buffer,"{{12}3} {12}"), "wrong output (%s)\n",buffer); r = MsiRecordSetStringA(hrec, 0, "{[1][2]} {{[1][2]}[3]} {[1][2]}"); @@ -644,7 +643,7 @@ static void test_formatrecord(void) sz = sizeof buffer; r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 15, "size wrong,(%i)\n",sz); + ok( sz == 15, "size wrong,(%lu)\n",sz); ok( 0 == strcmp(buffer,"12 {{12}3} {12}"), "wrong output (%s)\n",buffer); r = MsiRecordSetStringA(hrec, 0, "{[4]}{[1][2]} {{[1][2]}[3]} {[1][2]}"); @@ -662,7 +661,7 @@ static void test_formatrecord(void) sz = sizeof buffer; r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 15, "size wrong,(%i)\n",sz); + ok( sz == 15, "size wrong,(%lu)\n",sz); ok( 0 == strcmp(buffer,"12 {{12}3} {12}"), "wrong output (%s)\n",buffer); r = MsiRecordSetStringA(hrec, 0, "{blah} {[4]}{[1][2]} {{[1][2]}[3]} {[1][2]}"); @@ -680,7 +679,7 @@ static void test_formatrecord(void) sz = sizeof buffer; r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 22, "size wrong,(%i)\n",sz); + ok( sz == 22, "size wrong,(%lu)\n",sz); ok( 0 == strcmp(buffer,"{blah} 12 {{12}3} {12}"), "wrong output (%s)\n",buffer); r = MsiRecordSetStringA(hrec, 0, "{{[1]}[2]} {[4]}{[1][2]}"); @@ -698,7 +697,7 @@ static void test_formatrecord(void) sz = sizeof buffer; r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 13, "size wrong,(%i)\n",sz); + ok( sz == 13, "size wrong,(%lu)\n",sz); ok( 0 == strcmp(buffer,"{{1}2} {}{12}"), "wrong output (%s)\n",buffer); r = MsiRecordSetStringA(hrec, 0, "{{[1]}} {[4]}{[1][2]}"); @@ -716,7 +715,7 @@ static void test_formatrecord(void) sz = sizeof buffer; r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 3, "size wrong,(%i)\n",sz); + ok( sz == 3, "size wrong,(%lu)\n",sz); ok( 0 == strcmp(buffer," 12"), "wrong output (%s)\n",buffer); r = MsiRecordSetStringA(hrec, 0, "{{{[1]}} {[4]}{[1][2]}"); @@ -735,10 +734,10 @@ static void test_formatrecord(void) r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); todo_wine{ - ok( sz == 3, "size wrong,(%i)\n",sz); + ok( sz == 3, "size wrong,(%lu)\n",sz); ok( 0 == strcmp(buffer," 12"), "wrong output (%s)\n",buffer); } - + /* now put play games with escaping */ r = MsiRecordSetStringA(hrec, 0, "[1] [2] [\\3asdf]"); ok( r == ERROR_SUCCESS, "set string failed\n"); @@ -770,7 +769,7 @@ static void test_formatrecord(void) sz = sizeof buffer; r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 4, "size wrong: %d\n", sz); + ok( sz == 4, "size wrong: %lu\n", sz); ok( 0 == strcmp(buffer,"[\\x]"), "wrong output: %s\n", buffer); r = MsiRecordSetStringA(hrec, 0, "{\\x}"); @@ -778,7 +777,7 @@ static void test_formatrecord(void) sz = sizeof buffer; r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 4, "size wrong: %d\n", sz); + ok( sz == 4, "size wrong: %lu\n", sz); ok( 0 == strcmp(buffer,"{\\x}"), "wrong output: %s\n", buffer); r = MsiRecordSetStringA(hrec, 0, "[abc\\x]"); @@ -786,7 +785,7 @@ static void test_formatrecord(void) sz = sizeof buffer; r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 7, "size wrong: %d\n", sz); + ok( sz == 7, "size wrong: %lu\n", sz); ok( 0 == strcmp(buffer,"[abc\\x]"), "wrong output: %s\n", buffer); r = MsiRecordSetStringA(hrec, 0, "[\\[]Bracket Text[\\]]"); @@ -794,7 +793,7 @@ static void test_formatrecord(void) sz = sizeof buffer; r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 20, "size wrong: %d\n", sz); + ok( sz == 20, "size wrong: %lu\n", sz); ok( 0 == strcmp(buffer,"[\\[]Bracket Text[\\]]"), "wrong output: %s\n", buffer); /* now try other formats without a package */ @@ -1091,7 +1090,7 @@ static void test_formatrecord(void) sz = sizeof(buffer); r = MsiFormatRecordA(0, hrec, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(sz == 4, "Expected 4, got %d\n", sz); + ok(sz == 4, "Expected 4, got %lu\n", sz); ok(!lstrcmpA(buffer, "[\\[]"), "Expected \"[\\[]\", got \"%s\"\n", buffer); r = MsiRecordSetStringA(hrec, 0, "[foo]"); @@ -1329,7 +1328,7 @@ static void test_formatrecord(void) r = MsiFormatRecordA(0, hrec, buffer, &sz); todo_wine { - ok( sz == 12, "size wrong: got %u, expected 12\n", sz); + ok( sz == 12, "size wrong: got %lu, expected 12\n", sz); ok( 0 == strcmp(buffer,"{[1{{boo}}]}"), "wrong output: got %s, expected [1]\n", buffer); } ok( r == ERROR_SUCCESS, "format failed\n"); @@ -1340,7 +1339,7 @@ static void test_formatrecord(void) ok( r == ERROR_SUCCESS, "set string failed\n"); sz = sizeof buffer; r = MsiFormatRecordA(0, hrec, buffer, &sz); - ok( sz == 6, "size wrong: got %u, expected 3\n", sz); + ok( sz == 6, "size wrong: got %lu, expected 3\n", sz); ok( 0 == strcmp(buffer,"{{hoo}"), "wrong output: got %s, expected [1]\n", buffer); ok( r == ERROR_SUCCESS, "format failed\n"); @@ -1525,7 +1524,7 @@ static void test_formatrecord(void) ok( r == ERROR_SUCCESS, "set string failed\n"); r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 6, "size wrong(%i)\n",sz); + ok( sz == 6, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,"{abcd}"), "wrong output (%s)\n",buffer); sz = sizeof buffer; @@ -1533,7 +1532,7 @@ static void test_formatrecord(void) ok( r == ERROR_SUCCESS, "set string failed\n"); r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 23, "size wrong(%i)\n",sz); + ok( sz == 23, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,"{a[one]bc[two]de[one]f}"), "wrong output (%s)\n",buffer); sz = sizeof buffer; @@ -1541,7 +1540,7 @@ static void test_formatrecord(void) ok( r == ERROR_SUCCESS, "set string failed\n"); r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 23, "size wrong(%i)\n",sz); + ok( sz == 23, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,"{a[one]bc[bad]de[two]f}"), "wrong output (%s)\n",buffer); sz = sizeof buffer; @@ -1549,7 +1548,7 @@ static void test_formatrecord(void) ok( r == ERROR_SUCCESS, "set string failed\n"); r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 7, "size wrong(%i)\n",sz); + ok( sz == 7, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,"{[bad]}"), "wrong output (%s)\n",buffer); sz = sizeof buffer; @@ -1557,7 +1556,7 @@ static void test_formatrecord(void) ok( r == ERROR_SUCCESS, "set string failed\n"); r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 14, "size wrong(%i)\n",sz); + ok( sz == 14, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,"{abc{d[one]ef}"), "wrong output (%s)\n",buffer); sz = sizeof buffer; @@ -1565,7 +1564,7 @@ static void test_formatrecord(void) ok( r == ERROR_SUCCESS, "set string failed\n"); r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 15, "size wrong(%i)\n",sz); + ok( sz == 15, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,"{abc{d[one]ef}}"), "wrong output (%s)\n",buffer); sz = sizeof buffer; @@ -1573,7 +1572,7 @@ static void test_formatrecord(void) ok( r == ERROR_SUCCESS, "set string failed\n"); r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 5, "size wrong(%i)\n",sz); + ok( sz == 5, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,"{abc}"), "wrong output (%s)\n",buffer); sz = sizeof buffer; @@ -1581,7 +1580,7 @@ static void test_formatrecord(void) ok( r == ERROR_SUCCESS, "set string failed\n"); r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 0, "size wrong(%i)\n",sz); + ok( sz == 0, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,""), "wrong output (%s)\n",buffer); sz = sizeof buffer; @@ -1589,7 +1588,7 @@ static void test_formatrecord(void) ok( r == ERROR_SUCCESS, "set string failed\n"); r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 0, "size wrong(%i)\n",sz); + ok( sz == 0, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,""), "wrong output (%s)\n",buffer); sz = sizeof buffer; @@ -1599,7 +1598,7 @@ static void test_formatrecord(void) ok( r == ERROR_SUCCESS, "format failed\n"); todo_wine { - ok( sz == 7, "size wrong(%i)\n",sz); + ok( sz == 7, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,"hi{jk}}"), "wrong output (%s)\n",buffer); } @@ -1610,7 +1609,7 @@ static void test_formatrecord(void) ok( r == ERROR_SUCCESS, "format failed\n"); todo_wine { - ok( sz == 1, "size wrong(%i)\n",sz); + ok( sz == 1, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,"}"), "wrong output (%s)\n",buffer); } @@ -1619,7 +1618,7 @@ static void test_formatrecord(void) ok( r == ERROR_SUCCESS, "set string failed\n"); r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 0, "size wrong(%i)\n",sz); + ok( sz == 0, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,""), "wrong output (%s)\n",buffer); sz = sizeof buffer; @@ -1627,7 +1626,7 @@ static void test_formatrecord(void) ok( r == ERROR_SUCCESS, "set string failed\n"); r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 0, "size wrong(%i)\n",sz); + ok( sz == 0, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,""), "wrong output (%s)\n",buffer); sz = sizeof buffer; @@ -1635,7 +1634,7 @@ static void test_formatrecord(void) ok( r == ERROR_SUCCESS, "set string failed\n"); r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 7, "size wrong(%i)\n",sz); + ok( sz == 7, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,"{a{b}c}"), "wrong output (%s)\n",buffer); sz = sizeof buffer; @@ -1643,7 +1642,7 @@ static void test_formatrecord(void) ok( r == ERROR_SUCCESS, "set string failed\n"); r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 6, "size wrong(%i)\n",sz); + ok( sz == 6, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,"{a{b}}"), "wrong output (%s)\n",buffer); sz = sizeof buffer; @@ -1651,7 +1650,7 @@ static void test_formatrecord(void) ok( r == ERROR_SUCCESS, "set string failed\n"); r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 6, "size wrong(%i)\n",sz); + ok( sz == 6, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,"{{b}c}"), "wrong output (%s)\n",buffer); sz = sizeof buffer; @@ -1661,7 +1660,7 @@ static void test_formatrecord(void) ok( r == ERROR_SUCCESS, "format failed\n"); todo_wine { - ok( sz == 2, "size wrong(%i)\n",sz); + ok( sz == 2, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,"}}"), "wrong output (%s)\n",buffer); } @@ -1672,7 +1671,7 @@ static void test_formatrecord(void) ok( r == ERROR_SUCCESS, "set string failed\n"); r = MsiFormatRecordA(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 8, "size wrong(%i)\n",sz); + ok( sz == 8, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,"100 -100"), "wrong output (%s)\n",buffer); sz = sizeof(buffer); @@ -1682,7 +1681,7 @@ static void test_formatrecord(void) ok( r == ERROR_SUCCESS, "set string failed\n"); r = MsiFormatRecordA(0, hrec, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(sz == 33, "Expected 33, got %d\n",sz); + ok(sz == 33, "Expected 33, got %lu\n",sz); ok(!lstrcmpA(buffer, "one {[noprop] [twoprop]} {abcdef}"), "Expected \"one {[noprop] [twoprop]} {abcdef}\", got \"%s\"\n", buffer); @@ -1693,7 +1692,7 @@ static void test_formatrecord(void) ok( r == ERROR_SUCCESS, "set string failed\n"); r = MsiFormatRecordA(0, hrec, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(sz == 29, "Expected 29, got %d\n",sz); + ok(sz == 29, "Expected 29, got %lu\n",sz); ok(!lstrcmpA(buffer, "one {[noprop] [one]} {abcdef}"), "Expected \"one {[noprop] [one]} {abcdef}\", got \"%s\"\n", buffer); @@ -1704,7 +1703,7 @@ static void test_formatrecord(void) ok( r == ERROR_SUCCESS, "set string failed\n"); r = MsiFormatRecordA(0, hrec, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(sz == 20, "Expected 20, got %d\n",sz); + ok(sz == 20, "Expected 20, got %lu\n",sz); ok(!lstrcmpA(buffer, "one {[one]} {abcdef}"), "Expected \"one {[one]} {abcdef}\", got \"%s\"\n", buffer); @@ -1766,7 +1765,7 @@ static void test_formatrecord_package(void) sz = sizeof buffer; r = MsiFormatRecordA(package, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed with empty buffer (%i)\n",r); - ok( sz == 51, "size wrong (%i)\n",sz); + ok( sz == 51, "size wrong (%lu)\n",sz); ok( 0 == strcmp(buffer,"1: 2: 3: 4: 5: 6: 7: 8: 9: 10: 11: 12: "), "wrong output(%s)\n",buffer); r = MsiSetPropertyA(package, "prop", "val"); @@ -1789,7 +1788,7 @@ static void test_formatrecord_package(void) ok( r == ERROR_SUCCESS, "format failed with empty buffer (%i)\n",r); todo_wine { - ok( sz == 66, "size wrong (%i)\n",sz); + ok( sz == 66, "size wrong (%lu)\n",sz); ok( !lstrcmpA(buffer, "1: [2] 2: stuff 3: prop 4: val 5: 6: 7: 8: 9: 10: 11: 12: "), "wrong output(%s)\n",buffer); @@ -1805,7 +1804,7 @@ static void test_formatrecord_package(void) sz = sizeof buffer; r = MsiFormatRecordA(package, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 9, "size wrong(%i)\n",sz); + ok( sz == 9, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,"boo hoo 3"), "wrong output (%s)\n",buffer); r = MsiRecordSetStringA(hrec, 0, "[1] [2] [\\x]"); @@ -1817,77 +1816,77 @@ static void test_formatrecord_package(void) sz = sizeof buffer; r = MsiFormatRecordA(package, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 9, "size wrong(%i)\n",sz); + ok( sz == 9, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,"boo hoo x"), "wrong output (%s)\n",buffer); MsiRecordSetStringA(hrec, 0, "[\\x]"); sz = sizeof buffer; r = MsiFormatRecordA(package, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 1, "size wrong: %d\n", sz); + ok( sz == 1, "size wrong: %lu\n", sz); ok( 0 == strcmp(buffer,"x"), "wrong output: %s\n", buffer); MsiRecordSetStringA(hrec, 0, "{\\x}"); sz = sizeof buffer; r = MsiFormatRecordA(package, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 4, "size wrong: %d\n", sz); + ok( sz == 4, "size wrong: %lu\n", sz); ok( 0 == strcmp(buffer,"{\\x}"), "wrong output: %s\n", buffer); MsiRecordSetStringA(hrec, 0, "[abc\\x]"); sz = sizeof buffer; r = MsiFormatRecordA(package, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 0, "size wrong: %d\n", sz); + ok( sz == 0, "size wrong: %lu\n", sz); ok( 0 == strcmp(buffer,""), "wrong output: %s\n", buffer); MsiRecordSetStringA(hrec, 0, "[abc\\xdef]"); sz = sizeof buffer; r = MsiFormatRecordA(package, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 0, "size wrong: %d\n", sz); + ok( sz == 0, "size wrong: %lu\n", sz); ok( 0 == strcmp(buffer,""), "wrong output: %s\n", buffer); MsiRecordSetStringA(hrec, 0, "\\x"); sz = sizeof(buffer); r = MsiFormatRecordA(package, hrec, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(sz == 2, "Expected 2, got %d\n", sz); + ok(sz == 2, "Expected 2, got %lu\n", sz); ok(!lstrcmpA(buffer, "\\x"), "Expected \"\\x\", got \"%s\"\n", buffer); MsiRecordSetStringA(hrec, 0, "[\\["); sz = sizeof(buffer); r = MsiFormatRecordA(package, hrec, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(sz == 3, "Expected 3, got %d\n", sz); + ok(sz == 3, "Expected 3, got %lu\n", sz); ok(!lstrcmpA(buffer, "[\\["), "Expected \"[\\[\", got \"%s\"\n", buffer); MsiRecordSetStringA(hrec, 0, "[\\[]"); sz = sizeof(buffer); r = MsiFormatRecordA(package, hrec, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(sz == 1, "Expected 1, got %d\n", sz); + ok(sz == 1, "Expected 1, got %lu\n", sz); ok(!lstrcmpA(buffer, "["), "Expected \"[\", got \"%s\"\n", buffer); MsiRecordSetStringA(hrec, 0, "[[]"); sz = sizeof(buffer); r = MsiFormatRecordA(package, hrec, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(sz == 3, "Expected 3, got %d\n", sz); + ok(sz == 3, "Expected 3, got %lu\n", sz); ok(!lstrcmpA(buffer, "[[]"), "Expected \"[]\", got \"%s\"\n", buffer); MsiRecordSetStringA(hrec, 0, "[\\[]]"); sz = sizeof(buffer); r = MsiFormatRecordA(package, hrec, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(sz == 2, "Expected 2, got %d\n", sz); + ok(sz == 2, "Expected 2, got %lu\n", sz); ok(!lstrcmpA(buffer, "[]"), "Expected \"[]\", got \"%s\"\n", buffer); MsiRecordSetStringA(hrec, 0, "[\\[a]"); sz = sizeof(buffer); r = MsiFormatRecordA(package, hrec, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(sz == 1, "Expected 1, got %d\n", sz); + ok(sz == 1, "Expected 1, got %lu\n", sz); ok(!lstrcmpA(buffer, "["), "Expected \"[\", got \"%s\"\n", buffer); MsiRecordSetStringA(hrec, 0, "[\\a[]"); @@ -1896,7 +1895,7 @@ static void test_formatrecord_package(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); todo_wine { - ok(sz == 1, "Expected 1, got %d\n", sz); + ok(sz == 1, "Expected 1, got %lu\n", sz); ok(!lstrcmpA(buffer, "a"), "Expected \"a\", got \"%s\"\n", buffer); } @@ -1904,14 +1903,14 @@ static void test_formatrecord_package(void) sz = sizeof(buffer); r = MsiFormatRecordA(package, hrec, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(sz == 3, "Expected 3, got %d\n", sz); + ok(sz == 3, "Expected 3, got %lu\n", sz); ok(!lstrcmpA(buffer, "val"), "Expected \"val\", got \"%s\"\n", buffer); MsiRecordSetStringA(hrec, 0, "[prop] [pro\\pblah] [prop]"); sz = sizeof(buffer); r = MsiFormatRecordA(package, hrec, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(sz == 8, "Expected 8, got %d\n", sz); + ok(sz == 8, "Expected 8, got %lu\n", sz); ok(!lstrcmpA(buffer, "val val"), "Expected \"val val\", got \"%s\"\n", buffer); MsiSetPropertyA(package, "b", "ball"); @@ -1919,35 +1918,35 @@ static void test_formatrecord_package(void) sz = sizeof(buffer); r = MsiFormatRecordA(package, hrec, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(sz == 1, "Expected 1, got %d\n", sz); + ok(sz == 1, "Expected 1, got %lu\n", sz); ok(!lstrcmpA(buffer, "b"), "Expected \"b\", got \"%s\"\n", buffer); MsiRecordSetStringA(hrec, 0, "[\\c]"); sz = sizeof(buffer); r = MsiFormatRecordA(package, hrec, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(sz == 1, "Expected 1, got %d\n", sz); + ok(sz == 1, "Expected 1, got %lu\n", sz); ok(!lstrcmpA(buffer, "c"), "Expected \"c\", got \"%s\"\n", buffer); MsiRecordSetStringA(hrec, 0, "[\\[]prop]"); sz = sizeof(buffer); r = MsiFormatRecordA(package, hrec, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(sz == 6, "Expected 6, got %d\n", sz); + ok(sz == 6, "Expected 6, got %lu\n", sz); ok(!lstrcmpA(buffer, "[prop]"), "Expected \"[prop]\", got \"%s\"\n", buffer); MsiRecordSetStringA(hrec, 0, "[\\a]prop]"); sz = sizeof(buffer); r = MsiFormatRecordA(package, hrec, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(sz == 6, "Expected 6, got %d\n", sz); + ok(sz == 6, "Expected 6, got %lu\n", sz); ok(!lstrcmpA(buffer, "aprop]"), "Expected \"aprop]\", got \"%s\"\n", buffer); MsiRecordSetStringA(hrec, 0, "[\\[]Bracket Text[\\]]"); sz = sizeof buffer; r = MsiFormatRecordA(package, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 14, "size wrong: %d\n", sz); + ok( sz == 14, "size wrong: %lu\n", sz); ok( 0 == strcmp(buffer,"[Bracket Text]"), "wrong output: %s\n", buffer); /* null characters */ @@ -1960,7 +1959,7 @@ static void test_formatrecord_package(void) sz = sizeof buffer; r = MsiFormatRecordA(package, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 9, "size wrong: %d\n", sz); + ok( sz == 9, "size wrong: %lu\n", sz); ok( 0 == strcmp(buffer,"boo "), "wrong output: %s\n", buffer); ok(!lstrcmpA(&buffer[5], " hoo"), "Expected \" hoo\", got \"%s\"\n", &buffer[5]); @@ -1974,7 +1973,7 @@ static void test_formatrecord_package(void) sz = sizeof(buffer); r = MsiFormatRecordA(package, hrec, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(sz == 8, "Expected 8, got %d\n", sz); + ok(sz == 8, "Expected 8, got %lu\n", sz); ok(!lstrcmpA(buffer, "boo hoo"), "Expected \"boo hoo\", got \"%s\"\n", buffer); /* properties */ @@ -2022,7 +2021,7 @@ static void test_formatrecord_package(void) sz = sizeof buffer; r = MsiFormatRecordA(package, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 12, "size wrong(%i)\n",sz); + ok( sz == 12, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,"foo baa whoa"), "wrong output (%s)\n",buffer); r = MsiSetPropertyA(package,"dummya","1"); @@ -2042,7 +2041,7 @@ static void test_formatrecord_package(void) ok( r == ERROR_SUCCESS, "format failed\n"); todo_wine { - ok( sz == 9, "size wrong(%i)\n",sz); + ok( sz == 9, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,"1 [1] [2]"), "wrong output (%s)\n",buffer); } @@ -2065,7 +2064,7 @@ static void test_formatrecord_package(void) sz = sizeof buffer; r = MsiFormatRecordA(package, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 10, "size wrong(%i)\n",sz); + ok( sz == 10, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,"\\blath b 1"), "wrong output (%s)\n",buffer); r = MsiRecordSetStringA(hrec, 0, "[1] [2] [[\\3asdf]]"); @@ -2081,7 +2080,7 @@ static void test_formatrecord_package(void) ok( r == ERROR_SUCCESS, "format failed\n"); todo_wine { - ok( sz == 11, "size wrong(%i)\n",sz); + ok( sz == 11, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,"boo hoo [3]"), "wrong output (%s)\n",buffer); } @@ -2096,7 +2095,7 @@ static void test_formatrecord_package(void) sz = sizeof buffer; r = MsiFormatRecordA(package, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 9, "size wrong(%i)\n",sz); + ok( sz == 9, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,"boo hoo h"), "wrong output (%s)\n",buffer); /* nested properties */ @@ -2107,7 +2106,7 @@ static void test_formatrecord_package(void) MsiRecordSetStringA(hrec, 0, "[PropC]"); r = MsiFormatRecordA(package, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 7, "size wrong(%i)\n",sz); + ok( sz == 7, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,"[PropB]"), "wrong output (%s)\n",buffer); MsiSetPropertyA(package, "PropA", "surprise"); @@ -2117,7 +2116,7 @@ static void test_formatrecord_package(void) MsiRecordSetStringA(hrec, 0, "[PropC]"); r = MsiFormatRecordA(package, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 5, "size wrong(%i)\n",sz); + ok( sz == 5, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,"PropB"), "wrong output (%s)\n",buffer); MsiSetPropertyA(package, "PropA", "surprise"); @@ -2127,7 +2126,7 @@ static void test_formatrecord_package(void) MsiRecordSetStringA(hrec, 0, "[[PropC]]"); r = MsiFormatRecordA(package, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 0, "size wrong(%i)\n",sz); + ok( sz == 0, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,""), "wrong output (%s)\n",buffer); MsiSetPropertyA(package, "PropA", "surprise"); @@ -2137,7 +2136,7 @@ static void test_formatrecord_package(void) MsiRecordSetStringA(hrec, 0, "[[PropC]]"); r = MsiFormatRecordA(package, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 7, "size wrong(%i)\n",sz); + ok( sz == 7, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,"[PropA]"), "wrong output (%s)\n",buffer); MsiSetPropertyA(package, "PropA", "surprise"); @@ -2147,7 +2146,7 @@ static void test_formatrecord_package(void) MsiRecordSetStringA(hrec, 0, "[[PropC]]"); r = MsiFormatRecordA(package, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 5, "size wrong(%i)\n",sz); + ok( sz == 5, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,"PropA"), "wrong output (%s)\n",buffer); MsiSetPropertyA(package, "PropA", "surprise"); @@ -2157,7 +2156,7 @@ static void test_formatrecord_package(void) MsiRecordSetStringA(hrec, 0, "[[[PropC]]]"); r = MsiFormatRecordA(package, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 8, "size wrong(%i)\n",sz); + ok( sz == 8, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,"surprise"), "wrong output (%s)\n",buffer); /* properties inside braces */ @@ -2165,7 +2164,7 @@ static void test_formatrecord_package(void) MsiRecordSetStringA(hrec, 0, "{abcd}"); r = MsiFormatRecordA(package, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 6, "size wrong(%i)\n",sz); + ok( sz == 6, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,"{abcd}"), "wrong output (%s)\n",buffer); MsiSetPropertyA(package, "one", "mercury"); @@ -2174,7 +2173,7 @@ static void test_formatrecord_package(void) MsiRecordSetStringA(hrec, 0, "{a[one]bc[two]de[one]f}"); r = MsiFormatRecordA(package, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed: %d\n", r); - ok( sz == 25, "size wrong(%i)\n",sz); + ok( sz == 25, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,"amercurybcvenusdemercuryf"), "wrong output (%s)\n",buffer); MsiSetPropertyA(package, "one", "mercury"); @@ -2184,7 +2183,7 @@ static void test_formatrecord_package(void) MsiRecordSetStringA(hrec, 0, "{a[one]bc[bad]de[two]f}"); r = MsiFormatRecordA(package, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 0, "size wrong(%i)\n",sz); + ok( sz == 0, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,""), "wrong output (%s)\n",buffer); MsiSetPropertyA(package, "bad", ""); @@ -2192,7 +2191,7 @@ static void test_formatrecord_package(void) MsiRecordSetStringA(hrec, 0, "{[bad]}"); r = MsiFormatRecordA(package, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 0, "size wrong(%i)\n",sz); + ok( sz == 0, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,""), "wrong output (%s)\n",buffer); MsiSetPropertyA(package, "one", "mercury"); @@ -2202,7 +2201,7 @@ static void test_formatrecord_package(void) ok( r == ERROR_SUCCESS, "format failed\n"); todo_wine { - ok( sz == 14, "size wrong(%i)\n",sz); + ok( sz == 14, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,"abc{dmercuryef"), "wrong output (%s)\n",buffer); } @@ -2213,7 +2212,7 @@ static void test_formatrecord_package(void) ok( r == ERROR_SUCCESS, "format failed\n"); todo_wine { - ok( sz == 15, "size wrong(%i)\n",sz); + ok( sz == 15, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,"abc{dmercuryef}"), "wrong output (%s)\n",buffer); } @@ -2222,7 +2221,7 @@ static void test_formatrecord_package(void) MsiRecordSetStringA(hrec, 0, "{abc}{{def}hi{j[one]k}}"); r = MsiFormatRecordA(package, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 5, "size wrong(%i)\n",sz); + ok( sz == 5, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,"{abc}"), "wrong output (%s)\n",buffer); MsiSetPropertyA(package, "one", "mercury"); @@ -2231,7 +2230,7 @@ static void test_formatrecord_package(void) MsiRecordSetStringA(hrec, 0, "{{def}hi{j[one]k}}"); r = MsiFormatRecordA(package, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed\n"); - ok( sz == 0, "size wrong(%i)\n",sz); + ok( sz == 0, "size wrong(%lu)\n",sz); ok( 0 == strcmp(buffer,""), "wrong output (%s)\n",buffer); sz = sizeof(buffer); @@ -2239,7 +2238,7 @@ static void test_formatrecord_package(void) MsiRecordSetStringA(hrec, 1, "one"); r = MsiFormatRecordA(package, hrec, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(sz == 13, "Expected 13, got %d\n",sz); + ok(sz == 13, "Expected 13, got %lu\n",sz); ok(!lstrcmpA(buffer, "one {abcdef}"), "Expected \"one {abcdef}\", got \"%s\"\n", buffer); @@ -2248,7 +2247,7 @@ static void test_formatrecord_package(void) MsiRecordSetStringA(hrec, 1, "one"); r = MsiFormatRecordA(package, hrec, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(sz == 13, "Expected 13, got %d\n",sz); + ok(sz == 13, "Expected 13, got %lu\n",sz); ok(!lstrcmpA(buffer, "one {abcdef}"), "Expected \"one {abcdef}\", got \"%s\"\n", buffer); @@ -2257,7 +2256,7 @@ static void test_formatrecord_package(void) MsiRecordSetStringA(hrec, 1, "one"); r = MsiFormatRecordA(package, hrec, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(sz == 20, "Expected 20, got %d\n",sz); + ok(sz == 20, "Expected 20, got %lu\n",sz); ok(!lstrcmpA(buffer, "one mercury {abcdef}"), "Expected \"one mercury {abcdef}\", got \"%s\"\n", buffer); diff --git a/modules/rostests/winetests/msi/install.c b/modules/rostests/winetests/msi/install.c index ae5b03e248c..a7388a917d8 100644 --- a/modules/rostests/winetests/msi/install.c +++ b/modules/rostests/winetests/msi/install.c @@ -2640,7 +2640,7 @@ static char *load_resource(const char *name) GetTempFileNameA(".", name, 0, path); file = CreateFileA(path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); - ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", path, GetLastError()); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %lu\n", path, GetLastError()); res = FindResourceA(NULL, name, "TESTDLL"); ok( res != 0, "couldn't find resource\n" ); @@ -2752,7 +2752,7 @@ static void remove_restore_point(DWORD seq_number) res = pSRRemoveRestorePoint(seq_number); if (res != ERROR_SUCCESS) - trace("Failed to remove the restore point : %08x\n", res); + trace("Failed to remove the restore point: %#lx\n", res); } static LONG delete_key( HKEY key, LPCSTR subkey, REGSAM access ) @@ -2811,29 +2811,29 @@ static void test_MsiInstallProduct(void) delete_pf_files(); res = RegOpenKeyExA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest", 0, access, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); size = MAX_PATH; type = REG_SZ; res = RegQueryValueExA(hkey, "Name", NULL, &type, (LPBYTE)path, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); ok(!lstrcmpA(path, "imaname"), "Expected imaname, got %s\n", path); size = MAX_PATH; type = REG_SZ; res = RegQueryValueExA(hkey, "blah", NULL, &type, (LPBYTE)path, &size); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); size = sizeof(num); type = REG_DWORD; res = RegQueryValueExA(hkey, "number", NULL, &type, (LPBYTE)&num, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - ok(num == 314, "Expected 314, got %d\n", num); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); + ok(num == 314, "Expected 314, got %lu\n", num); size = MAX_PATH; type = REG_SZ; res = RegQueryValueExA(hkey, "OrderTestName", NULL, &type, (LPBYTE)path, &size); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); ok(!lstrcmpA(path, "OrderTestValue"), "Expected OrderTestValue, got %s\n", path); delete_key(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest", access); @@ -2845,7 +2845,7 @@ static void test_MsiInstallProduct(void) delete_pf_files(); res = RegOpenKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest", &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); RegDeleteKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest"); create_database(msifile, up_tables, ARRAY_SIZE(up_tables)); @@ -2857,7 +2857,7 @@ static void test_MsiInstallProduct(void) delete_pf_files(); res = RegOpenKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest", &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); RegDeleteKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest"); create_database(msifile, up2_tables, ARRAY_SIZE(up2_tables)); @@ -2869,7 +2869,7 @@ static void test_MsiInstallProduct(void) delete_pf_files(); res = RegOpenKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest", &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); RegDeleteKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest"); create_database(msifile, up3_tables, ARRAY_SIZE(up3_tables)); @@ -2881,7 +2881,7 @@ static void test_MsiInstallProduct(void) delete_pf_files(); res = RegOpenKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest", &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); RegDeleteKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest"); create_database(msifile, up4_tables, ARRAY_SIZE(up4_tables)); @@ -2893,7 +2893,7 @@ static void test_MsiInstallProduct(void) delete_pf_files(); res = RegOpenKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest", &hkey); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); create_database(msifile, up4_tables, ARRAY_SIZE(up4_tables)); @@ -2904,7 +2904,7 @@ static void test_MsiInstallProduct(void) delete_pf_files(); res = RegOpenKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest", &hkey); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); create_database(msifile, up5_tables, ARRAY_SIZE(up5_tables)); @@ -2915,7 +2915,7 @@ static void test_MsiInstallProduct(void) delete_pf_files(); res = RegOpenKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest", &hkey); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); create_database(msifile, up6_tables, ARRAY_SIZE(up6_tables)); @@ -2926,7 +2926,7 @@ static void test_MsiInstallProduct(void) delete_pf_files(); res = RegOpenKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest", &hkey); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); create_database(msifile, up7_tables, ARRAY_SIZE(up7_tables)); @@ -2937,7 +2937,7 @@ static void test_MsiInstallProduct(void) delete_pf_files(); res = RegOpenKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest", &hkey); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); r = MsiInstallProductA(msifile, "REMOVE=ALL FULL=1"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -3789,7 +3789,7 @@ static void generate_transform_manual(void) STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stm); if (FAILED(r)) { - ok(0, "failed to create stream %08x\n", r); + ok(0, "failed to create stream %#lx\n", r); continue; } @@ -3996,16 +3996,16 @@ static void set_admin_property_stream(LPCSTR file) MultiByteToWideChar(CP_ACP, 0, file, -1, fileW, MAX_PATH); hr = StgOpenStorage(fileW, NULL, mode, NULL, 0, &stg); - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr); if (!stg) return; hr = IStorage_CreateStream(stg, L"\x41ca\x4330\x3e71\x44b5\x4233\x45f5\x422c\x4836", STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stm); - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr); hr = IStream_Write(stm, L"MYPROP=2718 MyProp=42", sizeof(L"MYPROP=2718 MyProp=42"), &count); - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr); IStream_Release(stm); IStorage_Release(stg); @@ -4725,7 +4725,7 @@ static void test_sourcepath(void) r = MsiInstallProductA(msifile, NULL); ok(r == spmap[i].err, "%d: Expected %d, got %d\n", i, spmap[i].err, r); ok(get_pf_file_size("msitest\\augustus") == spmap[i].size, - "%d: Expected %d, got %d\n", i, spmap[i].size, + "%u: Expected %lu, got %lu\n", i, spmap[i].size, get_pf_file_size("msitest\\augustus")); if (r == ERROR_SUCCESS) @@ -5062,7 +5062,7 @@ static void test_shortcut(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); - ok(SUCCEEDED(hr), "CoInitialize failed 0x%08x\n", hr); + ok(SUCCEEDED(hr), "CoInitialize failed %#lx\n", hr); r = MsiInstallProductA(msifile, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -5070,7 +5070,7 @@ static void test_shortcut(void) CoUninitialize(); hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - ok(SUCCEEDED(hr), "CoInitialize failed 0x%08x\n", hr); + ok(SUCCEEDED(hr), "CoInitialize failed %#lx\n", hr); r = MsiInstallProductA(msifile, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -5262,14 +5262,14 @@ static void process_pending_renames(HKEY hkey) BOOL found = FALSE; ret = RegQueryValueExA(hkey, rename_ops, NULL, NULL, NULL, &size); - ok(!ret, "RegQueryValueExA failed %d\n", ret); + ok(!ret, "RegQueryValueExA failed %ld\n", ret); buf = malloc(size + 1); buf2ptr = buf2 = calloc(1, size + 1); ret = RegQueryValueExA(hkey, rename_ops, NULL, NULL, (LPBYTE)buf, &size); buf[size] = 0; - ok(!ret, "RegQueryValueExA failed %d\n", ret); + ok(!ret, "RegQueryValueExA failed %ld\n", ret); if (ret) return; for (src = buf; *src; src = dst + strlen(dst) + 1) @@ -5300,12 +5300,12 @@ static void process_pending_renames(HKEY hkey) { if (dst[0] == '\\' && dst[1] == '?' && dst[2] == '?' && dst[3] == '\\') dst += 4; fileret = MoveFileExA(src, dst, flags); - ok(fileret, "Failed to move file %s -> %s (%u)\n", src, dst, GetLastError()); + ok(fileret, "Failed to move file %s -> %s (%lu)\n", src, dst, GetLastError()); } else { fileret = DeleteFileA(src); - ok(fileret || broken(!fileret) /* win2k3 */, "Failed to delete file %s (%u)\n", src, GetLastError()); + ok(fileret || broken(!fileret) /* win2k3 */, "Failed to delete file %s (%lu)\n", src, GetLastError()); } } @@ -5327,7 +5327,7 @@ static BOOL file_matches_data(LPCSTR file, LPCSTR data) char buf[128]; handle = CreateFileA(file, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); - ok(handle != INVALID_HANDLE_VALUE, "failed to open %s (%u)\n", file, GetLastError()); + ok(handle != INVALID_HANDLE_VALUE, "failed to open %s (%lu)\n", file, GetLastError()); if (ReadFile(handle, buf, sizeof(buf), &len, NULL) && len >= data_len) { @@ -5872,25 +5872,25 @@ static void test_mixed_package(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey); - ok(!res, "can't open 32-bit component key, got %d\n", res); + ok(!res, "can't open 32-bit component key, got %ld\n", res); res = RegQueryValueExA(hkey, "test1", NULL, NULL, NULL, NULL); - ok(!res, "expected RegQueryValueEx to succeed, got %d\n", res); + ok(!res, "expected RegQueryValueEx to succeed, got %ld\n", res); res = RegQueryValueExA(hkey, "test2", NULL, NULL, NULL, NULL); - ok(res, "expected RegQueryValueEx to fail, got %d\n", res); + ok(res, "expected RegQueryValueEx to fail, got %ld\n", res); RegCloseKey(hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); - ok(!res, "can't open 64-bit component key, got %d\n", res); + ok(!res, "can't open 64-bit component key, got %ld\n", res); res = RegQueryValueExA(hkey, "test1", NULL, NULL, NULL, NULL); - ok(res, "expected RegQueryValueEx to fail, got %d\n", res); + ok(res, "expected RegQueryValueEx to fail, got %ld\n", res); res = RegQueryValueExA(hkey, "test2", NULL, NULL, NULL, NULL); - ok(!res, "expected RegQueryValueEx to succeed, got %d\n", res); + ok(!res, "expected RegQueryValueEx to succeed, got %ld\n", res); RegCloseKey(hkey); res = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\\InProcServer32", 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey); - ok(res == ERROR_SUCCESS, "can't open 32-bit CLSID key, got %d\n", res); + ok(res == ERROR_SUCCESS, "can't open 32-bit CLSID key, got %ld\n", res); if (res == ERROR_SUCCESS) { size = sizeof(value); res = RegQueryValueExA(hkey, "", NULL, NULL, (LPBYTE)value, &size); @@ -5901,7 +5901,7 @@ static void test_mixed_package(void) res = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\\InProcServer32", 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); - ok(res == ERROR_SUCCESS, "can't open 64-bit CLSID key, got %d\n", res); + ok(res == ERROR_SUCCESS, "can't open 64-bit CLSID key, got %ld\n", res); if (res == ERROR_SUCCESS) { size = sizeof(value); res = RegQueryValueExA(hkey, "", NULL, NULL, (LPBYTE)value, &size); @@ -5935,25 +5935,25 @@ static void test_mixed_package(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey); - ok(!res, "can't open 32-bit component key, got %d\n", res); + ok(!res, "can't open 32-bit component key, got %ld\n", res); res = RegQueryValueExA(hkey, "test1", NULL, NULL, NULL, NULL); - ok(!res, "expected RegQueryValueEx to succeed, got %d\n", res); + ok(!res, "expected RegQueryValueEx to succeed, got %ld\n", res); res = RegQueryValueExA(hkey, "test2", NULL, NULL, NULL, NULL); - ok(res, "expected RegQueryValueEx to fail, got %d\n", res); + ok(res, "expected RegQueryValueEx to fail, got %ld\n", res); RegCloseKey(hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); - ok(!res, "can't open 64-bit component key, got %d\n", res); + ok(!res, "can't open 64-bit component key, got %ld\n", res); res = RegQueryValueExA(hkey, "test1", NULL, NULL, NULL, NULL); - ok(res, "expected RegQueryValueEx to fail, got %d\n", res); + ok(res, "expected RegQueryValueEx to fail, got %ld\n", res); res = RegQueryValueExA(hkey, "test2", NULL, NULL, NULL, NULL); - ok(!res, "expected RegQueryValueEx to succeed, got %d\n", res); + ok(!res, "expected RegQueryValueEx to succeed, got %ld\n", res); RegCloseKey(hkey); res = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\\InProcServer32", 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey); - ok(res == ERROR_SUCCESS, "can't open 32-bit CLSID key, got %d\n", res); + ok(res == ERROR_SUCCESS, "can't open 32-bit CLSID key, got %ld\n", res); if (res == ERROR_SUCCESS) { size = sizeof(value); res = RegQueryValueExA(hkey, "", NULL, NULL, (LPBYTE)value, &size); @@ -5964,7 +5964,7 @@ static void test_mixed_package(void) res = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\\InProcServer32", 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); - ok(res == ERROR_SUCCESS, "can't open 64-bit CLSID key, got %d\n", res); + ok(res == ERROR_SUCCESS, "can't open 64-bit CLSID key, got %ld\n", res); if (res == ERROR_SUCCESS) { size = sizeof(value); res = RegQueryValueExA(hkey, "", NULL, NULL, (LPBYTE)value, &size); @@ -6092,15 +6092,15 @@ static void test_remove_upgrade_code(void) res = RegOpenKeyExA( HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UpgradeCodes\\51AAE0C44620A5E4788506E91F249BD2", 0, access, &hkey ); - ok( res == ERROR_SUCCESS, "got %d\n", res ); + ok( res == ERROR_SUCCESS, "got %ld\n", res ); type = 0xdeadbeef; buf[0] = 0x55; size = sizeof(buf); res = RegQueryValueExA( hkey, "94A88FD7F6998CE40A22FB59F6B9C2BB", NULL, &type, (BYTE *)buf, &size ); - ok( res == ERROR_SUCCESS, "got %d\n", res ); - ok( type == REG_SZ, "got %u\n", type ); - ok( size == 1, "got %u\n", size ); + ok( res == ERROR_SUCCESS, "got %ld\n", res ); + ok( type == REG_SZ, "got %lu\n", type ); + ok( size == 1, "got %lu\n", size ); ok( !buf[0], "wrong data\n" ); RegCloseKey( hkey ); @@ -6110,7 +6110,7 @@ static void test_remove_upgrade_code(void) res = RegOpenKeyExA( HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UpgradeCodes\\51AAE0C44620A5E4788506E91F249BD2", 0, access, &hkey ); - ok( res == ERROR_FILE_NOT_FOUND, "got %d\n", res ); + ok( res == ERROR_FILE_NOT_FOUND, "got %ld\n", res ); RemoveDirectoryA( "msitest" ); DeleteFileA( msifile ); @@ -6153,7 +6153,7 @@ static void check_file_matches(const char *filename, const char *text) file = CreateFileA(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); ReadFile(file, buffer, sizeof(buffer), &size, NULL); - ok(size == strlen(text) && !memcmp(buffer, text, size), "got %.*s\n", size, buffer); + ok(size == strlen(text) && !memcmp(buffer, text, size), "got %.*s\n", (int)size, buffer); CloseHandle(file); } diff --git a/modules/rostests/winetests/msi/msi.c b/modules/rostests/winetests/msi/msi.c index 6e7ef68872d..d9b3a6d6756 100644 --- a/modules/rostests/winetests/msi/msi.c +++ b/modules/rostests/winetests/msi/msi.c @@ -1231,7 +1231,7 @@ static void create_test_guid(LPSTR prodcode, LPSTR squashed) int size; hr = CoCreateGuid(&guid); - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr); size = StringFromGUID2(&guid, guidW, ARRAY_SIZE(guidW)); ok(size == GUID_SIZE, "Expected %d, got %d.\n", GUID_SIZE, size); @@ -1287,42 +1287,42 @@ static void test_MsiQueryProductState(void) state = MsiQueryProductStateA(NULL); error = GetLastError(); ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state); - ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error); + ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error); /* empty prodcode */ SetLastError(0xdeadbeef); state = MsiQueryProductStateA(""); error = GetLastError(); ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state); - ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error); + ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error); /* garbage prodcode */ SetLastError(0xdeadbeef); state = MsiQueryProductStateA("garbage"); error = GetLastError(); ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state); - ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error); + ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error); /* guid without brackets */ SetLastError(0xdeadbeef); state = MsiQueryProductStateA("6700E8CF-95AB-4D9C-BC2C-15840DEA7A5D"); error = GetLastError(); ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state); - ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error); + ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error); /* guid with brackets */ SetLastError(0xdeadbeef); state = MsiQueryProductStateA("{6700E8CF-95AB-4D9C-BC2C-15840DEA7A5D}"); error = GetLastError(); ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error); /* same length as guid, but random */ SetLastError(0xdeadbeef); state = MsiQueryProductStateA("A938G02JF-2NF3N93-VN3-2NNF-3KGKALDNF93"); error = GetLastError(); ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error); + ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error); /* MSIINSTALLCONTEXT_USERUNMANAGED */ @@ -1330,20 +1330,20 @@ static void test_MsiQueryProductState(void) state = MsiQueryProductStateA(prodcode); error = GetLastError(); ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error); lstrcpyA(keypath, "Software\\Microsoft\\Installer\\Products\\"); lstrcatA(keypath, prod_squashed); res = RegCreateKeyA(HKEY_CURRENT_USER, keypath, &userkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); /* user product key exists */ SetLastError(0xdeadbeef); state = MsiQueryProductStateA(prodcode); error = GetLastError(); ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); - ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error); lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"); lstrcatA(keypath, prodcode); @@ -1357,25 +1357,25 @@ static void test_MsiQueryProductState(void) LocalFree(usersid); return; } - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); /* local uninstall key exists */ SetLastError(0xdeadbeef); state = MsiQueryProductStateA(prodcode); error = GetLastError(); ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); - ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error); data = 1; res = RegSetValueExA(localkey, "WindowsInstaller", 0, REG_DWORD, (const BYTE *)&data, sizeof(DWORD)); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); /* WindowsInstaller value exists */ SetLastError(0xdeadbeef); state = MsiQueryProductStateA(prodcode); error = GetLastError(); ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); - ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error); RegDeleteValueA(localkey, "WindowsInstaller"); delete_key(localkey, "", access & KEY_WOW64_64KEY); @@ -1394,28 +1394,28 @@ static void test_MsiQueryProductState(void) LocalFree(usersid); return; } - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); /* local product key exists */ SetLastError(0xdeadbeef); state = MsiQueryProductStateA(prodcode); error = GetLastError(); ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); - ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error); res = RegCreateKeyExA(localkey, "InstallProperties", 0, NULL, 0, access, NULL, &props, NULL); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); /* install properties key exists */ SetLastError(0xdeadbeef); state = MsiQueryProductStateA(prodcode); error = GetLastError(); ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); - ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error); data = 1; res = RegSetValueExA(props, "WindowsInstaller", 0, REG_DWORD, (const BYTE *)&data, sizeof(DWORD)); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); /* WindowsInstaller value exists */ SetLastError(0xdeadbeef); @@ -1435,18 +1435,18 @@ static void test_MsiQueryProductState(void) return; } ok(state == INSTALLSTATE_DEFAULT, "Expected INSTALLSTATE_DEFAULT, got %d\n", state); - ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error); data = 2; res = RegSetValueExA(props, "WindowsInstaller", 0, REG_DWORD, (const BYTE *)&data, sizeof(DWORD)); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); /* WindowsInstaller value is not 1 */ SetLastError(0xdeadbeef); state = MsiQueryProductStateA(prodcode); error = GetLastError(); ok(state == INSTALLSTATE_DEFAULT, "Expected INSTALLSTATE_DEFAULT, got %d\n", state); - ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error); RegDeleteKeyA(userkey, ""); @@ -1455,7 +1455,7 @@ static void test_MsiQueryProductState(void) state = MsiQueryProductStateA(prodcode); error = GetLastError(); ok(state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); - ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %lu\n", error); RegDeleteValueA(props, "WindowsInstaller"); delete_key(props, "", access & KEY_WOW64_64KEY); @@ -1473,7 +1473,7 @@ static void test_MsiQueryProductState(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &prodkey, NULL); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); state = MsiQueryProductStateA(prodcode); ok(state == INSTALLSTATE_ADVERTISED, @@ -1485,14 +1485,14 @@ static void test_MsiQueryProductState(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &localkey, NULL); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); state = MsiQueryProductStateA(prodcode); ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); res = RegCreateKeyExA(localkey, "InstallProperties", 0, NULL, 0, access, NULL, &props, NULL); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); state = MsiQueryProductStateA(prodcode); ok(state == INSTALLSTATE_ADVERTISED, @@ -1500,7 +1500,7 @@ static void test_MsiQueryProductState(void) data = 1; res = RegSetValueExA(props, "WindowsInstaller", 0, REG_DWORD, (const BYTE *)&data, sizeof(DWORD)); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); /* WindowsInstaller value exists */ state = MsiQueryProductStateA(prodcode); @@ -1526,7 +1526,7 @@ static void test_MsiQueryProductState(void) LocalFree( usersid ); return; } - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); state = MsiQueryProductStateA(prodcode); ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); @@ -1536,14 +1536,14 @@ static void test_MsiQueryProductState(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, access, NULL, &localkey, NULL); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); state = MsiQueryProductStateA(prodcode); ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); res = RegCreateKeyExA(localkey, "InstallProperties", 0, NULL, 0, access, NULL, &props, NULL); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); state = MsiQueryProductStateA(prodcode); ok(state == INSTALLSTATE_ADVERTISED, @@ -1551,7 +1551,7 @@ static void test_MsiQueryProductState(void) data = 1; res = RegSetValueExA(props, "WindowsInstaller", 0, REG_DWORD, (const BYTE *)&data, sizeof(DWORD)); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", res); /* WindowsInstaller value exists */ state = MsiQueryProductStateA(prodcode); @@ -1608,10 +1608,10 @@ static void compose_base85_guid(LPSTR component, LPSTR comp_base85, LPSTR squash int size; hr = CoCreateGuid(&guid); - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + ok(hr == S_OK, "Expected S_OK, got %#lx\n", hr); size = StringFromGUID2(&guid, guidW, MAX_PATH); - ok(size == 39, "Expected 39, got %d\n", hr); + ok(size == 39, "Expected 39, got %d\n", size); WideCharToMultiByte(CP_ACP, 0, guidW, size, component, MAX_PATH, NULL, NULL); encode_base85_guid(&guid, base85W); @@ -1648,63 +1648,63 @@ static void test_MsiQueryFeatureState(void) state = MsiQueryFeatureStateA(NULL, "feature"); error = GetLastError(); ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state); - ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error); + ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error); /* empty prodcode */ SetLastError(0xdeadbeef); state = MsiQueryFeatureStateA("", "feature"); error = GetLastError(); ok(state == INSTALLSTATE_INVALIDARG, "Expected INSTALLSTATE_INVALIDARG, got %d\n", state); - ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", error); + ok(error == 0xdeadbeef, "expected 0xdeadbeef, got %lu\n", error); /* garbage prodcode */ SetLastError(0xdeadbeef); state = MsiQueryFeatureStateA("garbage", "feature"); error = GetLastError(); ... 13356 lines suppressed ...

2 years, 9 months

[reactos] 354/360: [WINESYNC] msi: Build without -DWINE_NO_LONG_TYPES.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=02f995b22e831fd8bc1e4… commit 02f995b22e831fd8bc1e41bc1ce594ec4741f5e5 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Mon Mar 14 21:20:29 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:44 2022 +0100 [WINESYNC] msi: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id c3135c632f1df0091afd5d0d62855f3dc7abe247 by Hans Leidekker <hans(a)codeweavers.com> --- dll/win32/msi/action.c | 88 ++++++------ dll/win32/msi/appsearch.c | 4 +- dll/win32/msi/assembly.c | 22 +-- dll/win32/msi/automation.c | 45 ++++--- dll/win32/msi/classes.c | 16 +-- dll/win32/msi/custom.c | 42 +++--- dll/win32/msi/database.c | 51 +++---- dll/win32/msi/dialog.c | 41 +++--- dll/win32/msi/files.c | 22 +-- dll/win32/msi/format.c | 7 +- dll/win32/msi/handle.c | 8 +- dll/win32/msi/insert.c | 2 +- dll/win32/msi/install.c | 64 ++++----- dll/win32/msi/media.c | 13 +- dll/win32/msi/msi.c | 323 ++++++++++++++++++++------------------------- dll/win32/msi/msiquery.c | 89 ++++++------- dll/win32/msi/package.c | 29 ++-- dll/win32/msi/record.c | 54 ++++---- dll/win32/msi/registry.c | 219 ++++++++++++++---------------- dll/win32/msi/script.c | 6 +- dll/win32/msi/source.c | 140 +++++++++----------- dll/win32/msi/streams.c | 12 +- dll/win32/msi/string.c | 6 +- dll/win32/msi/suminfo.c | 72 +++++----- dll/win32/msi/table.c | 17 ++- dll/win32/msi/upgrade.c | 2 +- 26 files changed, 641 insertions(+), 753 deletions(-) diff --git a/dll/win32/msi/action.c b/dll/win32/msi/action.c index b3bfa26bea7..403643fa5c8 100644 --- a/dll/win32/msi/action.c +++ b/dll/win32/msi/action.c @@ -2083,7 +2083,7 @@ static UINT calculate_file_cost( MSIPACKAGE *package ) continue; } file_size = msi_get_disk_file_size( package, file->TargetPath ); - TRACE("%s (size %u)\n", debugstr_w(file->TargetPath), file_size); + TRACE("%s (size %lu)\n", debugstr_w(file->TargetPath), file_size); if (file->Version) { @@ -2389,7 +2389,7 @@ static BYTE *parse_value( MSIPACKAGE *package, const WCHAR *value, DWORD len, DW } msi_free(deformated); - TRACE("Data %i bytes(%i)\n",*size,count); + TRACE( "data %lu bytes(%u)\n", *size, count ); } else { @@ -2414,8 +2414,8 @@ static BYTE *parse_value( MSIPACKAGE *package, const WCHAR *value, DWORD len, DW } if (deformated[0] == '-') d = -d; - *(LPDWORD)data = d; - TRACE("DWORD %i\n",*(LPDWORD)data); + *(DWORD *)data = d; + TRACE( "DWORD %lu\n", *(DWORD *)data); msi_free(deformated); } @@ -2508,7 +2508,7 @@ static HKEY open_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path, BO res = RegOpenKeyExW( root, subkey, 0, access, &hkey ); if (res) { - TRACE("failed to open key %s (%d)\n", debugstr_w(subkey), res); + TRACE( "failed to open key %s (%ld)\n", debugstr_w(subkey), res ); msi_free( subkey ); return NULL; } @@ -2772,14 +2772,14 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) } if (!check_first) { - TRACE("setting value %s of %s type %u\n", debugstr_w(deformated), debugstr_w(uikey), type); + TRACE( "setting value %s of %s type %lu\n", debugstr_w(deformated), debugstr_w(uikey), type ); RegSetValueExW( hkey, deformated, 0, type, new_value, new_size ); } else if (!old_value) { if (deformated || new_size) { - TRACE("setting value %s of %s type %u\n", debugstr_w(deformated), debugstr_w(uikey), type); + TRACE( "setting value %s of %s type %lu\n", debugstr_w(deformated), debugstr_w(uikey), type ); RegSetValueExW( hkey, deformated, 0, type, new_value, new_size ); } } @@ -2863,7 +2863,7 @@ static void delete_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path ) res = RegDeleteKeyExW( root, subkey, access, 0 ); if (res) { - TRACE("failed to delete key %s (%d)\n", debugstr_w(subkey), res); + TRACE( "failed to delete key %s (%ld)\n", debugstr_w(subkey), res ); break; } } while (p); @@ -2878,7 +2878,7 @@ static void delete_value( const MSICOMPONENT *comp, HKEY root, const WCHAR *path if ((hkey = open_key( comp, root, path, FALSE, KEY_SET_VALUE | KEY_QUERY_VALUE ))) { if ((res = RegDeleteValueW( hkey, value ))) - TRACE("failed to delete value %s (%d)\n", debugstr_w(value), res); + TRACE( "failed to delete value %s (%ld)\n", debugstr_w(value), res ); RegCloseKey( hkey ); if (is_key_empty(comp, root, path)) @@ -2896,7 +2896,7 @@ static void delete_tree( const MSICOMPONENT *comp, HKEY root, const WCHAR *path if (!(hkey = open_key( comp, root, path, FALSE, KEY_ALL_ACCESS ))) return; res = RegDeleteTreeW( hkey, NULL ); - if (res) TRACE("failed to delete subtree of %s (%d)\n", debugstr_w(path), res); + if (res) TRACE( "failed to delete subtree of %s (%ld)\n", debugstr_w(path), res ); delete_key( comp, root, path ); RegCloseKey( hkey ); } @@ -3424,7 +3424,7 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) } res = RegDeleteValueW( hkey, squashed_pc ); RegCloseKey(hkey); - if (res) WARN( "failed to delete component value %d\n", res ); + if (res) WARN( "failed to delete component value %ld\n", res ); } } @@ -3589,7 +3589,7 @@ static UINT ITERATE_RegisterTypeLibraries(MSIRECORD *row, LPVOID param) hr = msi_load_typelib( package, file->TargetPath, REGKIND_REGISTER, &tlib ); if (FAILED(hr)) { - ERR("Failed to load type library: %08x\n", hr); + ERR( "failed to load type library: %#lx\n", hr ); return ERROR_INSTALL_FAILURE; } @@ -3654,7 +3654,7 @@ static UINT ITERATE_UnregisterTypeLibraries( MSIRECORD *row, LPVOID param ) hr = UnRegisterTypeLib( &libid, (version >> 8) & 0xffff, version & 0xff, language, syskind ); if (FAILED(hr)) { - WARN("Failed to unregister typelib: %08x\n", hr); + WARN( "failed to unregister typelib: %#lx\n", hr ); } return ERROR_SUCCESS; @@ -3888,7 +3888,7 @@ static UINT ITERATE_RemoveShortcuts( MSIRECORD *row, LPVOID param ) link_file = get_link_file( package, row ); TRACE("Removing shortcut file %s\n", debugstr_w( link_file )); - if (!msi_delete_file( package, link_file )) WARN("Failed to remove shortcut file %u\n", GetLastError()); + if (!msi_delete_file( package, link_file )) WARN( "failed to remove shortcut file %lu\n", GetLastError() ); msi_free( link_file ); return ERROR_SUCCESS; @@ -4193,7 +4193,7 @@ static UINT msi_publish_patches( MSIPACKAGE *package ) if (patch->filename && !CopyFileW( patch->filename, patch->localfile, FALSE )) { res = GetLastError(); - ERR("Unable to copy patch package %d\n", res); + ERR( "unable to copy patch package %lu\n", res ); goto done; } res = RegCreateKeyExW( product_patches_key, patch_squashed, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &patch_key, NULL ); @@ -4490,7 +4490,7 @@ static UINT ITERATE_RemoveIniValuesOnUninstall( MSIRECORD *row, LPVOID param ) if (!WritePrivateProfileStringW( deformated_section, deformated_key, NULL, filename )) { - WARN("Unable to remove key %u\n", GetLastError()); + WARN( "unable to remove key %lu\n", GetLastError() ); } msi_free( filename ); } @@ -4552,7 +4552,7 @@ static UINT ITERATE_RemoveIniValuesOnInstall( MSIRECORD *row, LPVOID param ) if (!WritePrivateProfileStringW( deformated_section, deformated_key, NULL, filename )) { - WARN("Unable to remove key %u\n", GetLastError()); + WARN( "unable to remove key %lu\n", GetLastError() ); } msi_free( filename ); } @@ -5648,7 +5648,7 @@ static UINT ITERATE_UnpublishComponent( MSIRECORD *rec, LPVOID param ) res = RegDeleteKeyW( HKEY_CURRENT_USER, keypath ); if (res != ERROR_SUCCESS) { - WARN("Unable to delete component key %d\n", res); + WARN( "unable to delete component key %ld\n", res ); } uirow = MSI_CreateRecord( 2 ); @@ -5776,7 +5776,7 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) { if (GetLastError() != ERROR_SERVICE_EXISTS) { - WARN("Failed to create service %s: %d\n", debugstr_w(name), GetLastError()); + WARN( "failed to create service %s (%lu)\n", debugstr_w(name), GetLastError() ); if (is_vital) ret = ERROR_INSTALL_FAILURE; @@ -5785,7 +5785,7 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) else if (sd.lpDescription) { if (!ChangeServiceConfig2W(service, SERVICE_CONFIG_DESCRIPTION, &sd)) - WARN("failed to set service description %u\n", GetLastError()); + WARN( "failed to set service description %lu\n", GetLastError() ); } if (image_path != file->TargetPath) msi_free(image_path); @@ -5914,7 +5914,7 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param) service = OpenServiceW(scm, name, SERVICE_START|SERVICE_QUERY_STATUS); if (!service) { - ERR("Failed to open service %s (%u)\n", debugstr_w(name), GetLastError()); + ERR( "failed to open service %s (%lu)\n", debugstr_w(name), GetLastError() ); goto done; } @@ -5923,7 +5923,7 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param) if (!StartServiceW(service, numargs, vector) && GetLastError() != ERROR_SERVICE_ALREADY_RUNNING) { - ERR("Failed to start service %s (%u)\n", debugstr_w(name), GetLastError()); + ERR( "failed to start service %s (%lu)\n", debugstr_w(name), GetLastError() ); goto done; } @@ -5934,7 +5934,7 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param) if (!QueryServiceStatusEx(service, SC_STATUS_PROCESS_INFO, (BYTE *)&status, sizeof(SERVICE_STATUS_PROCESS), &dummy)) { - TRACE("failed to query service status (%u)\n", GetLastError()); + TRACE( "failed to query service status (%lu)\n", GetLastError() ); goto done; } start_time = GetTickCount64(); @@ -5945,13 +5945,13 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param) if (!QueryServiceStatusEx(service, SC_STATUS_PROCESS_INFO, (BYTE *)&status, sizeof(SERVICE_STATUS_PROCESS), &dummy)) { - TRACE("failed to query service status (%u)\n", GetLastError()); + TRACE( "failed to query service status (%lu)\n", GetLastError() ); goto done; } } if (status.dwCurrentState != SERVICE_RUNNING) { - WARN("service failed to start %u\n", status.dwCurrentState); + WARN( "service failed to start %lu\n", status.dwCurrentState ); r = ERROR_FUNCTION_FAILED; } } @@ -6043,24 +6043,20 @@ static UINT stop_service( LPCWSTR name ) scm = OpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS); if (!scm) { - WARN("Failed to open the SCM: %d\n", GetLastError()); + WARN( "failed to open the SCM (%lu)\n", GetLastError() ); goto done; } - service = OpenServiceW(scm, name, - SERVICE_STOP | - SERVICE_QUERY_STATUS | - SERVICE_ENUMERATE_DEPENDENTS); + service = OpenServiceW(scm, name, SERVICE_STOP | SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS); if (!service) { - WARN("Failed to open service (%s): %d\n", debugstr_w(name), GetLastError()); + WARN( "failed to open service %s (%lu)\n", debugstr_w(name), GetLastError() ); goto done; } - if (!QueryServiceStatusEx(service, SC_STATUS_PROCESS_INFO, (LPBYTE)&ssp, - sizeof(SERVICE_STATUS_PROCESS), &needed)) + if (!QueryServiceStatusEx( service, SC_STATUS_PROCESS_INFO, (BYTE *)&ssp, sizeof(ssp), &needed) ) { - WARN("Failed to query service status (%s): %d\n", debugstr_w(name), GetLastError()); + WARN( "failed to query service status %s (%lu)\n", debugstr_w(name), GetLastError() ); goto done; } @@ -6070,7 +6066,7 @@ static UINT stop_service( LPCWSTR name ) stop_service_dependents(scm, service); if (!ControlService(service, SERVICE_CONTROL_STOP, &status)) - WARN("Failed to stop service (%s): %d\n", debugstr_w(name), GetLastError()); + WARN( "failed to stop service %s (%lu)\n", debugstr_w(name), GetLastError() ); done: if (service) CloseServiceHandle(service); @@ -6182,7 +6178,7 @@ static UINT ITERATE_DeleteService( MSIRECORD *rec, LPVOID param ) scm = OpenSCManagerW( NULL, NULL, SC_MANAGER_ALL_ACCESS ); if (!scm) { - WARN("Failed to open the SCM: %d\n", GetLastError()); + WARN( "failed to open the SCM (%lu)\n", GetLastError() ); goto done; } @@ -6197,12 +6193,12 @@ static UINT ITERATE_DeleteService( MSIRECORD *rec, LPVOID param ) service = OpenServiceW( scm, name, DELETE ); if (!service) { - WARN("Failed to open service (%s): %u\n", debugstr_w(name), GetLastError()); + WARN( "failed to open service %s (%lu)\n", debugstr_w(name), GetLastError() ); goto done; } if (!DeleteService( service )) - WARN("Failed to delete service (%s): %u\n", debugstr_w(name), GetLastError()); + WARN( "failed to delete service %s (%lu)\n", debugstr_w(name), GetLastError() ); done: uirow = MSI_CreateRecord( 2 ); @@ -6749,7 +6745,7 @@ static UINT env_parse_flags( LPCWSTR *name, LPCWSTR *value, DWORD *flags ) check_flag_combo(*flags, ENV_ACT_REMOVEMATCH | ENV_ACT_SETALWAYS) || check_flag_combo(*flags, ENV_ACT_SETABSENT | ENV_MOD_MASK)) { - ERR("Invalid flags: %08x\n", *flags); + ERR( "invalid flags: %#lx\n", *flags ); return ERROR_FUNCTION_FAILED; } @@ -6779,7 +6775,7 @@ static UINT open_env_key( DWORD flags, HKEY *key ) res = RegOpenKeyExW( root, env, 0, KEY_ALL_ACCESS, key ); if (res != ERROR_SUCCESS) { - WARN("Failed to open key %s (%d)\n", debugstr_w(env), res); + WARN( "failed to open key %s (%ld)\n", debugstr_w(env), res ); return ERROR_FUNCTION_FAILED; } @@ -7107,7 +7103,7 @@ static UINT ITERATE_RemoveEnvironmentString( MSIRECORD *rec, LPVOID param ) TRACE("removing %s\n", debugstr_w(name)); res = RegDeleteValueW( env, name ); if (res != ERROR_SUCCESS) - WARN("failed to delete value %s (%d)\n", debugstr_w(name), res); + WARN( "failed to delete value %s (%ld)\n", debugstr_w(name), res ); } else { @@ -7115,7 +7111,7 @@ static UINT ITERATE_RemoveEnvironmentString( MSIRECORD *rec, LPVOID param ) size = (lstrlenW( new_value ) + 1) * sizeof(WCHAR); res = RegSetValueExW( env, name, 0, type, (BYTE *)new_value, size ); if (res != ERROR_SUCCESS) - WARN("failed to set %s to %s (%d)\n", debugstr_w(name), debugstr_w(new_value), res); + WARN( "failed to set %s to %s (%ld)\n", debugstr_w(name), debugstr_w(new_value), res ); } done: @@ -7231,7 +7227,7 @@ static UINT ACTION_SetODBCFolders( MSIPACKAGE *package ) msiobj_release( &view->hdr ); if (r != ERROR_SUCCESS) return r; - if (count) FIXME("ignored %u rows in ODBCDriver table\n", count); + if (count) FIXME( "ignored %lu rows in ODBCDriver table\n", count ); } r = MSI_DatabaseOpenViewW( package->db, L"SELECT * FROM `ODBCTranslator`", &view ); if (r == ERROR_SUCCESS) @@ -7241,7 +7237,7 @@ static UINT ACTION_SetODBCFolders( MSIPACKAGE *package ) msiobj_release( &view->hdr ); if (r != ERROR_SUCCESS) return r; - if (count) FIXME("ignored %u rows in ODBCTranslator table\n", count); + if (count) FIXME( "ignored %lu rows in ODBCTranslator table\n", count ); } return ERROR_SUCCESS; } @@ -7379,7 +7375,7 @@ static void bind_image( MSIPACKAGE *package, const char *filename, const char *p { if (!msi_bind_image( package, filename, path )) { - WARN("failed to bind image %u\n", GetLastError()); + WARN( "failed to bind image %lu\n", GetLastError() ); } } @@ -7449,7 +7445,7 @@ static UINT msi_unimplemented_action_stub( MSIPACKAGE *package, LPCSTR action, L if (r != ERROR_SUCCESS) return r; } - if (count) FIXME("%s: ignored %u rows from %s\n", action, count, debugstr_w(table)); + if (count) FIXME( "%s: ignored %lu rows from %s\n", action, count, debugstr_w(table) ); return ERROR_SUCCESS; } diff --git a/dll/win32/msi/appsearch.c b/dll/win32/msi/appsearch.c index d3a8ccc03f3..77b12156ca8 100644 --- a/dll/win32/msi/appsearch.c +++ b/dll/win32/msi/appsearch.c @@ -139,7 +139,7 @@ static UINT get_signature( MSIPACKAGE *package, MSISIGNATURE *sig, const WCHAR * TRACE("MaxVersion is %d.%d.%d.%d\n", HIWORD(sig->MaxVersionMS), LOWORD(sig->MaxVersionMS), HIWORD(sig->MaxVersionLS), LOWORD(sig->MaxVersionLS)); - TRACE("MinSize is %d, MaxSize is %d;\n", sig->MinSize, sig->MaxSize); + TRACE("MinSize is %lu, MaxSize is %lu\n", sig->MinSize, sig->MaxSize); TRACE("Languages is %s\n", debugstr_w(sig->Languages)); msiobj_release( &row->hdr ); @@ -336,7 +336,7 @@ static void convert_reg_value( DWORD regType, const BYTE *value, DWORD sz, WCHAR swprintf(ptr, 3, L"%02X", value[i]); break; default: - WARN("unimplemented for values of type %d\n", regType); + WARN( "unimplemented for values of type %lu\n", regType ); *appValue = NULL; } } diff --git a/dll/win32/msi/assembly.c b/dll/win32/msi/assembly.c index 9cddfd2e68d..9f75a9c0281 100644 --- a/dll/win32/msi/assembly.c +++ b/dll/win32/msi/assembly.c @@ -233,7 +233,7 @@ static BOOL is_assembly_installed( IAssemblyCache *cache, const WCHAR *display_n { return (info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED); } - TRACE("QueryAssemblyInfo returned 0x%08x\n", hr); + TRACE( "QueryAssemblyInfo returned %#lx\n", hr ); return FALSE; } @@ -337,7 +337,7 @@ MSIASSEMBLY *msi_load_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) TRACE("application %s\n", debugstr_w(a->application)); a->attributes = MSI_RecordGetInteger( rec, 5 ); - TRACE("attributes %u\n", a->attributes); + TRACE( "attributes %lu\n", a->attributes ); if (!(a->display_name = get_assembly_display_name( package->db, comp->Component, a ))) { @@ -445,7 +445,7 @@ UINT msi_install_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) hr = IAssemblyCache_InstallAssembly( cache, 0, manifest, NULL ); if (hr != S_OK) { - ERR("Failed to install assembly %s (0x%08x)\n", debugstr_w(manifest), hr); + ERR( "failed to install assembly %s (%#lx)\n", debugstr_w(manifest), hr ); return ERROR_FUNCTION_FAILED; } if (feature) feature->Action = INSTALLSTATE_LOCAL; @@ -474,7 +474,7 @@ UINT msi_uninstall_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) { cache = package->cache_sxs; hr = IAssemblyCache_UninstallAssembly( cache, 0, assembly->display_name, NULL, NULL ); - if (FAILED( hr )) WARN("failed to uninstall assembly 0x%08x\n", hr); + if (FAILED( hr )) WARN( "failed to uninstall assembly %#lx\n", hr ); } else { @@ -486,7 +486,7 @@ UINT msi_uninstall_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) if (cache) { hr = IAssemblyCache_UninstallAssembly( cache, 0, assembly->display_name, NULL, NULL ); - if (FAILED( hr )) WARN("failed to uninstall assembly 0x%08x\n", hr); + if (FAILED( hr )) WARN( "failed to uninstall assembly %#lx\n", hr ); } } } @@ -638,7 +638,7 @@ UINT ACTION_MsiPublishAssemblies( MSIPACKAGE *package ) } if ((res = open_local_assembly_key( package->Context, win32, file->TargetPath, &hkey ))) { - WARN("failed to open local assembly key %d\n", res); + WARN( "failed to open local assembly key %ld\n", res ); return ERROR_FUNCTION_FAILED; } } @@ -646,14 +646,14 @@ UINT ACTION_MsiPublishAssemblies( MSIPACKAGE *package ) { if ((res = open_global_assembly_key( package->Context, win32, &hkey ))) { - WARN("failed to open global assembly key %d\n", res); + WARN( "failed to open global assembly key %ld\n", res ); return ERROR_FUNCTION_FAILED; } } size = sizeof(buffer); if ((res = RegSetValueExW( hkey, assembly->display_name, 0, REG_MULTI_SZ, (const BYTE *)buffer, size ))) { - WARN("failed to set assembly value %d\n", res); + WARN( "failed to set assembly value %ld\n", res ); } RegCloseKey( hkey ); @@ -699,17 +699,17 @@ UINT ACTION_MsiUnpublishAssemblies( MSIPACKAGE *package ) continue; } if ((res = delete_local_assembly_key( package->Context, win32, file->TargetPath ))) - WARN("failed to delete local assembly key %d\n", res); + WARN( "failed to delete local assembly key %ld\n", res ); } else { HKEY hkey; if ((res = open_global_assembly_key( package->Context, win32, &hkey ))) - WARN("failed to delete global assembly key %d\n", res); + WARN( "failed to delete global assembly key %ld\n", res ); else { if ((res = RegDeleteValueW( hkey, assembly->display_name ))) - WARN("failed to delete global assembly value %d\n", res); + WARN( "failed to delete global assembly value %ld\n", res ); RegCloseKey( hkey ); } } diff --git a/dll/win32/msi/automation.c b/dll/win32/msi/automation.c index 80d6b8a66ba..f8fd8cc1449 100644 --- a/dll/win32/msi/automation.c +++ b/dll/win32/msi/automation.c @@ -265,7 +265,7 @@ static HRESULT WINAPI AutomationObject_GetTypeInfo( AutomationObject *This = impl_from_IDispatch(iface); HRESULT hr; - TRACE("(%p/%p)->(%d,%d,%p)\n", iface, This, iTInfo, lcid, ppTInfo); + TRACE( "(%p/%p)->(%u, %ld, %p)\n", iface, This, iTInfo, lcid, ppTInfo ); hr = get_typeinfo(This->tid, ppTInfo); if (FAILED(hr)) @@ -287,7 +287,7 @@ static HRESULT WINAPI AutomationObject_GetIDsOfNames( ITypeInfo *ti; HRESULT hr; - TRACE("(%p/%p)->(%s, %p, %d, %d, %p)\n", iface, This, + TRACE("(%p/%p)->(%s, %p, %u, %ld, %p)\n", iface, This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); if (!IsEqualGUID(riid, &IID_NULL)) return E_INVALIDARG; @@ -331,7 +331,7 @@ static HRESULT WINAPI AutomationObject_Invoke( BSTR bstrName = NULL; ITypeInfo *ti; - TRACE("(%p/%p)->(%d, %s, %d, %d, %p, %p, %p, %p)\n", iface, This, + TRACE("(%p/%p)->(%ld, %s, %ld, %d, %p, %p, %p, %p)\n", iface, This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); @@ -362,14 +362,14 @@ static HRESULT WINAPI AutomationObject_Invoke( if (TRACE_ON(msi)) { ITypeInfo_GetDocumentation(ti, dispIdMember, &bstrName, NULL, NULL, NULL); - TRACE("Method %d, %s\n", dispIdMember, debugstr_w(bstrName)); + TRACE("method %ld, %s\n", dispIdMember, debugstr_w(bstrName)); } hr = tid_ids[This->tid].fn_invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr); if (hr == DISP_E_MEMBERNOTFOUND) { if (bstrName == NULL) ITypeInfo_GetDocumentation(ti, dispIdMember, &bstrName, NULL, NULL, NULL); - FIXME("Method %d, %s wflags %d not implemented, clsid %s\n", dispIdMember, debugstr_w(bstrName), wFlags, + FIXME("method %ld, %s wflags %d not implemented, clsid %s\n", dispIdMember, debugstr_w(bstrName), wFlags, debugstr_guid(get_riid_from_tid(This->tid))); } else if (pExcepInfo && @@ -383,7 +383,7 @@ static HRESULT WINAPI AutomationObject_Invoke( if (FAILED(ITypeInfo_GetNames(ti, dispIdMember, bstrParamNames, MAX_FUNC_PARAMS, &namesNo))) { - TRACE("Failed to retrieve names for dispIdMember %d\n", dispIdMember); + TRACE("failed to retrieve names for dispIdMember %ld\n", dispIdMember); } else { @@ -412,7 +412,7 @@ static HRESULT WINAPI AutomationObject_Invoke( /* Free function name if we retrieved it */ SysFreeString(bstrName); - TRACE("Returning 0x%08x, %s\n", hr, SUCCEEDED(hr) ? "ok" : "not ok"); + TRACE("returning %#lx, %s\n", hr, SUCCEEDED(hr) ? "ok" : "not ok"); return hr; } @@ -470,7 +470,7 @@ static HRESULT WINAPI ProvideMultipleClassInfo_GetClassInfo(IProvideMultipleClas static HRESULT WINAPI ProvideMultipleClassInfo_GetGUID(IProvideMultipleClassInfo* iface, DWORD dwGuidKind, GUID* pGUID) { AutomationObject *This = impl_from_IProvideMultipleClassInfo(iface); - TRACE("(%p/%p)->(%d,%s)\n", iface, This, dwGuidKind, debugstr_guid(pGUID)); + TRACE("(%p/%p)->(%lu, %s)\n", iface, This, dwGuidKind, debugstr_guid(pGUID)); if (dwGuidKind != GUIDKIND_DEFAULT_SOURCE_DISP_IID) return E_INVALIDARG; @@ -500,7 +500,8 @@ static HRESULT WINAPI ProvideMultipleClassInfo_GetInfoOfIndex(IProvideMultipleCl { AutomationObject *This = impl_from_IProvideMultipleClassInfo(iface); - TRACE("(%p/%p)->(%d,%d,%p,%p,%p,%p,%p)\n", iface, This, iti, dwFlags, ti, pdwTIFlags, pcdispidReserved, piidPrimary, piidSource); + TRACE("(%p/%p)->(%lu, %#lx, %p, %p, %p, %p, %p)\n", iface, This, iti, dwFlags, ti, pdwTIFlags, pcdispidReserved, + piidPrimary, piidSource); if (iti != 0) return E_INVALIDARG; @@ -542,7 +543,7 @@ static const IProvideMultipleClassInfoVtbl ProvideMultipleClassInfoVtbl = static void init_automation_object(AutomationObject *This, MSIHANDLE msiHandle, tid_t tid) { - TRACE("(%p, %d, %s)\n", This, msiHandle, debugstr_guid(get_riid_from_tid(tid))); + TRACE("%p, %lu, %s\n", This, msiHandle, debugstr_guid(get_riid_from_tid(tid))); This->IDispatch_iface.lpVtbl = &AutomationObjectVtbl; This->IProvideMultipleClassInfo_iface.lpVtbl = &ProvideMultipleClassInfoVtbl; @@ -618,7 +619,7 @@ static HRESULT WINAPI ListEnumerator_Next(IEnumVARIANT* iface, ULONG celt, VARIA ListEnumerator *This = impl_from_IEnumVARIANT(iface); ULONG i, local; - TRACE("(%p, %uld, %p, %p)\n", iface, celt, rgVar, fetched); + TRACE("%p, %lu, %p, %p\n", iface, celt, rgVar, fetched); if (fetched) *fetched = 0; @@ -641,7 +642,7 @@ static HRESULT WINAPI ListEnumerator_Skip(IEnumVARIANT* iface, ULONG celt) { ListEnumerator *This = impl_from_IEnumVARIANT(iface); - TRACE("(%p,%uld)\n", iface, celt); + TRACE("%p, %lu\n", iface, celt); This->pos += celt; if (This->pos >= This->list->count) @@ -1030,7 +1031,7 @@ static HRESULT list_invoke( if (SUCCEEDED(hr = create_list_enumerator(list, (LPVOID *)&pUnk))) V_UNKNOWN(pVarResult) = pUnk; else - ERR("Failed to create IEnumVARIANT object, hresult 0x%08x\n", hr); + ERR("failed to create IEnumVARIANT object, hresult %#lx\n", hr); } else return DISP_E_MEMBERNOTFOUND; break; @@ -1189,7 +1190,7 @@ static HRESULT view_invoke( if ((ret = MsiViewFetch(This->msiHandle, &msiHandle)) == ERROR_SUCCESS) { if (FAILED(hr = create_record(msiHandle, &V_DISPATCH(pVarResult)))) - ERR("Failed to create Record object, hresult 0x%08x\n", hr); + ERR("failed to create Record object, hresult %#lx\n", hr); } else if (ret == ERROR_NO_MORE_ITEMS) V_DISPATCH(pVarResult) = NULL; @@ -1289,7 +1290,7 @@ HRESULT database_invoke( if (SUCCEEDED(hr)) V_DISPATCH(pVarResult) = dispatch; else - ERR("Failed to create SummaryInfo object: 0x%08x\n", hr); + ERR("failed to create SummaryInfo object: %#lx\n", hr); } else { @@ -1311,7 +1312,7 @@ HRESULT database_invoke( if (SUCCEEDED(hr = create_view(msiHandle, &dispatch))) V_DISPATCH(pVarResult) = dispatch; else - ERR("Failed to create View object, hresult 0x%08x\n", hr); + ERR("failed to create View object, hresult %#lx\n", hr); } else { @@ -1447,7 +1448,7 @@ static HRESULT session_invoke( if (SUCCEEDED(hr = create_database(msiHandle, &dispatch))) V_DISPATCH(pVarResult) = dispatch; else - ERR("Failed to create Database object, hresult 0x%08x\n", hr); + ERR("failed to create Database object, hresult %#lx\n", hr); } else { @@ -1617,11 +1618,11 @@ static void variant_from_registry_value(VARIANT *pVarResult, DWORD dwType, LPBYT case REG_EXPAND_SZ: if (!(dwNewSize = ExpandEnvironmentStringsW(szString, szNewString, dwNewSize))) - ERR("ExpandEnvironmentStrings returned error %d\n", GetLastError()); + ERR("ExpandEnvironmentStrings returned error %lu\n", GetLastError()); else if (!(szNewString = msi_alloc(dwNewSize * sizeof(WCHAR)))) ERR("Out of memory\n"); else if (!(dwNewSize = ExpandEnvironmentStringsW(szString, szNewString, dwNewSize))) - ERR("ExpandEnvironmentStrings returned error %d\n", GetLastError()); + ERR("ExpandEnvironmentStrings returned error %lu\n", GetLastError()); else { V_VT(pVarResult) = VT_BSTR; @@ -1650,7 +1651,7 @@ static void variant_from_registry_value(VARIANT *pVarResult, DWORD dwType, LPBYT break; default: - FIXME("Unhandled registry value type %d\n", dwType); + FIXME("Unhandled registry value type %lu\n", dwType); } } @@ -2455,7 +2456,7 @@ static HRESULT create_database(MSIHANDLE msiHandle, IDispatch **dispatch) { AutomationObject *database; - TRACE("(%d %p)\n", msiHandle, dispatch); + TRACE("%lu %p\n", msiHandle, dispatch); database = msi_alloc(sizeof(AutomationObject)); if (!database) return E_OUTOFMEMORY; @@ -2471,7 +2472,7 @@ static HRESULT create_view(MSIHANDLE msiHandle, IDispatch **dispatch) { AutomationObject *view; - TRACE("(%d %p)\n", msiHandle, dispatch); + TRACE("%lu %p\n", msiHandle, dispatch); view = msi_alloc(sizeof(AutomationObject)); if (!view) return E_OUTOFMEMORY; diff --git a/dll/win32/msi/classes.c b/dll/win32/msi/classes.c index 52a91b306f1..b2c94fa0ff5 100644 --- a/dll/win32/msi/classes.c +++ b/dll/win32/msi/classes.c @@ -911,7 +911,7 @@ UINT ACTION_UnregisterClassInfo( MSIPACKAGE *package ) res = RegDeleteTreeW( hkey, cls->clsid ); if (res != ERROR_SUCCESS) - WARN("Failed to delete class key %d\n", res); + WARN("failed to delete class key %ld\n", res); if (cls->AppID) { @@ -920,7 +920,7 @@ UINT ACTION_UnregisterClassInfo( MSIPACKAGE *package ) { res = RegDeleteKeyW( hkey2, cls->AppID->AppID ); if (res != ERROR_SUCCESS) - WARN("Failed to delete appid key %d\n", res); + WARN("failed to delete appid key %ld\n", res); RegCloseKey( hkey2 ); } } @@ -935,7 +935,7 @@ UINT ACTION_UnregisterClassInfo( MSIPACKAGE *package ) msi_free( filetype ); if (res != ERROR_SUCCESS) - WARN("Failed to delete file type %d\n", res); + WARN("failed to delete file type %ld\n", res); } } @@ -1111,7 +1111,7 @@ UINT ACTION_UnregisterProgIdInfo( MSIPACKAGE *package ) res = RegDeleteTreeW( HKEY_CLASSES_ROOT, progid->ProgID ); if (res != ERROR_SUCCESS) - TRACE("Failed to delete progid key %d\n", res); + TRACE("failed to delete progid key %ld\n", res); uirow = MSI_CreateRecord( 1 ); MSI_RecordSetStringW( uirow, 1, progid->ProgID ); @@ -1256,7 +1256,7 @@ UINT ACTION_RegisterExtensionInfo(MSIPACKAGE *package) res = RegCreateKeyW( HKEY_CLASSES_ROOT, extension, &hkey ); msi_free( extension ); if (res != ERROR_SUCCESS) - WARN("Failed to create extension key %d\n", res); + WARN("failed to create extension key %ld\n", res); } if (ext->Mime) @@ -1355,7 +1355,7 @@ UINT ACTION_UnregisterExtensionInfo( MSIPACKAGE *package ) res = RegDeleteTreeW( HKEY_CLASSES_ROOT, extension ); msi_free( extension ); if (res != ERROR_SUCCESS) - WARN("Failed to delete extension key %d\n", res); + WARN("failed to delete extension key %ld\n", res); } if (ext->ProgID || ext->ProgIDText) @@ -1376,7 +1376,7 @@ UINT ACTION_UnregisterExtensionInfo( MSIPACKAGE *package ) res = RegDeleteTreeW( HKEY_CLASSES_ROOT, progid_shell ); msi_free( progid_shell ); if (res != ERROR_SUCCESS) - WARN("Failed to delete shell key %d\n", res); + WARN("failed to delete shell key %ld\n", res); RegDeleteKeyW( HKEY_CLASSES_ROOT, progid ); } } @@ -1482,7 +1482,7 @@ UINT ACTION_UnregisterMIMEInfo( MSIPACKAGE *package ) lstrcatW( mime_key, mime->ContentType ); res = RegDeleteKeyW( HKEY_CLASSES_ROOT, mime_key ); if (res != ERROR_SUCCESS) - WARN("Failed to delete MIME key %d\n", res); + WARN("failed to delete MIME key %ld\n", res); msi_free( mime_key ); } diff --git a/dll/win32/msi/custom.c b/dll/win32/msi/custom.c index e33acad3005..143de262971 100644 --- a/dll/win32/msi/custom.c +++ b/dll/win32/msi/custom.c @@ -321,7 +321,7 @@ static UINT custom_get_process_return( HANDLE process ) DWORD rc = 0; GetExitCodeProcess( process, &rc ); - TRACE("exit code is %u\n", rc); + TRACE( "exit code is %lu\n", rc ); if (rc != 0) return ERROR_FUNCTION_FAILED; return ERROR_SUCCESS; @@ -346,7 +346,7 @@ static UINT custom_get_thread_return( MSIPACKAGE *package, HANDLE thread ) ACTION_ForceReboot( package ); return ERROR_SUCCESS; default: - ERR("Invalid Return Code %d\n",rc); + ERR( "invalid Return Code %lu\n", rc ); return ERROR_INSTALL_FAILURE; } } @@ -527,13 +527,13 @@ UINT CDECL __wine_msi_call_dll_function(DWORD client_pid, const GUID *guid) status = RpcStringBindingComposeW(NULL, (WCHAR *)L"ncalrpc", NULL, endpoint, NULL, &binding_str); if (status != RPC_S_OK) { - ERR("RpcStringBindingCompose failed: %#x\n", status); + ERR("RpcStringBindingCompose failed: %#lx\n", status); return status; } status = RpcBindingFromStringBindingW(binding_str, &rpc_handle); if (status != RPC_S_OK) { - ERR("RpcBindingFromStringBinding failed: %#x\n", status); + ERR("RpcBindingFromStringBinding failed: %#lx\n", status); return status; } RpcStringFreeW(&binding_str); @@ -546,7 +546,7 @@ UINT CDECL __wine_msi_call_dll_function(DWORD client_pid, const GUID *guid) hPackage = alloc_msi_remote_handle( remote_package ); if (!hPackage) { - ERR( "failed to create handle for %x\n", remote_package ); + ERR( "failed to create handle for %#lx\n", remote_package ); midl_user_free( action ); midl_user_free( dll ); midl_user_free( proc ); @@ -556,7 +556,7 @@ UINT CDECL __wine_msi_call_dll_function(DWORD client_pid, const GUID *guid) hModule = LoadLibraryW( dll ); if (!hModule) { - ERR( "failed to load dll %s (%u)\n", debugstr_w( dll ), GetLastError() ); + ERR( "failed to load dll %s (%lu)\n", debugstr_w( dll ), GetLastError() ); midl_user_free( action ); midl_user_free( dll ); midl_user_free( proc ); @@ -576,7 +576,7 @@ UINT CDECL __wine_msi_call_dll_function(DWORD client_pid, const GUID *guid) } __EXCEPT_PAGE_FAULT { - ERR( "Custom action (%s:%s) caused a page fault: %08x\n", + ERR( "Custom action (%s:%s) caused a page fault: %#lx\n", debugstr_w(dll), debugstr_a(proc), GetExceptionCode() ); r = ERROR_SUCCESS; } @@ -611,7 +611,7 @@ static DWORD custom_start_server(MSIPACKAGE *package, DWORD arch) pipe = CreateNamedPipeW(buffer, PIPE_ACCESS_DUPLEX, 0, 1, sizeof(DWORD64), sizeof(GUID), 0, NULL); if (pipe == INVALID_HANDLE_VALUE) - ERR("Failed to create custom action client pipe: %u\n", GetLastError()); + ERR("failed to create custom action client pipe: %lu\n", GetLastError()); if ((sizeof(void *) == 8 || is_wow64) && arch == SCS_32BIT_BINARY) GetSystemWow64DirectoryW(path, MAX_PATH - ARRAY_SIZE(L"\\msiexec.exe")); @@ -644,7 +644,7 @@ static DWORD custom_start_server(MSIPACKAGE *package, DWORD arch) if (!ConnectNamedPipe(pipe, NULL)) { - ERR("Failed to connect to custom action server: %u\n", GetLastError()); + ERR("failed to connect to custom action server: %lu\n", GetLastError()); return GetLastError(); } @@ -689,13 +689,13 @@ static DWORD WINAPI custom_client_thread(void *arg) if (!WriteFile(pipe, &info->guid, sizeof(info->guid), &size, NULL) || size != sizeof(info->guid)) { - ERR("Failed to write to custom action client pipe: %u\n", GetLastError()); + ERR("failed to write to custom action client pipe: %lu\n", GetLastError()); LeaveCriticalSection(&msi_custom_action_cs); return GetLastError(); } if (!ReadFile(pipe, &thread64, sizeof(thread64), &size, NULL) || size != sizeof(thread64)) { - ERR("Failed to read from custom action client pipe: %u\n", GetLastError()); + ERR("failed to read from custom action client pipe: %lu\n", GetLastError()); LeaveCriticalSection(&msi_custom_action_cs); return GetLastError(); } @@ -793,7 +793,7 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll( endpoint, NULL); if (status != RPC_S_OK) { - ERR("RpcServerUseProtseqEp failed: %#x\n", status); + ERR("RpcServerUseProtseqEp failed: %#lx\n", status); return NULL; } @@ -801,7 +801,7 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll( RPC_IF_AUTOLISTEN, RPC_C_LISTEN_MAX_CALLS_DEFAULT, NULL); if (status != RPC_S_OK) { - ERR("RpcServerRegisterIfEx failed: %#x\n", status); + ERR("RpcServerRegisterIfEx failed: %#lx\n", status); return NULL; } @@ -869,7 +869,7 @@ static HANDLE execute_command( const WCHAR *app, WCHAR *arg, const WCHAR *dir ) } if (!len_exe) { - ERR("can't find executable %u\n", GetLastError()); + ERR("can't find executable %lu\n", GetLastError()); msi_free( exe ); return INVALID_HANDLE_VALUE; } @@ -907,7 +907,7 @@ static HANDLE execute_command( const WCHAR *app, WCHAR *arg, const WCHAR *dir ) msi_free( exe ); if (!ret) { - ERR("unable to execute command %u\n", GetLastError()); + ERR("unable to execute command %lu\n", GetLastError()); return INVALID_HANDLE_VALUE; } CloseHandle( info.hThread ); @@ -1062,27 +1062,27 @@ static UINT write_substorage_to_file( MSIPACKAGE *package, const WCHAR *source, hr = StgCreateDocfile( filename, STGM_CREATE|STGM_TRANSACTED|STGM_WRITE|STGM_SHARE_EXCLUSIVE, 0, &dst ); if (FAILED( hr )) { - WARN( "can't open destination storage %s (%08x)\n", debugstr_w(filename), hr ); + WARN( "can't open destination storage %s (%#lx)\n", debugstr_w(filename), hr ); goto done; } hr = IStorage_OpenStorage( package->db->storage, source, NULL, STGM_SHARE_EXCLUSIVE, NULL, 0, &src ); if (FAILED( hr )) { - WARN( "can't open source storage %s (%08x)\n", debugstr_w(source), hr ); + WARN( "can't open source storage %s (%#lx)\n", debugstr_w(source), hr ); goto done; } hr = IStorage_CopyTo( src, 0, NULL, NULL, dst ); if (FAILED( hr )) { - ERR( "failed to copy storage %s (%08x)\n", debugstr_w(source), hr ); + ERR( "failed to copy storage %s (%#lx)\n", debugstr_w(source), hr ); goto done; } hr = IStorage_Commit( dst, 0 ); if (FAILED( hr )) - ERR( "failed to commit storage (%08x)\n", hr ); + ERR( "failed to commit storage (%#lx)\n", hr ); else r = ERROR_SUCCESS; @@ -1200,11 +1200,11 @@ static DWORD WINAPI ScriptThread( LPVOID arg ) LPGUID guid = arg; DWORD rc; - TRACE("custom action (%x) started\n", GetCurrentThreadId() ); + TRACE("custom action (%#lx) started\n", GetCurrentThreadId() ); rc = ACTION_CallScript( guid ); - TRACE("custom action (%x) returned %i\n", GetCurrentThreadId(), rc ); + TRACE("custom action (%#lx) returned %lu\n", GetCurrentThreadId(), rc ); MsiCloseAllHandles(); return rc; diff --git a/dll/win32/msi/database.c b/dll/win32/msi/database.c index dd5a6977460..f7305e661ef 100644 --- a/dll/win32/msi/database.c +++ b/dll/win32/msi/database.c @@ -108,7 +108,7 @@ static HRESULT db_initialize( IStorage *stg, const GUID *clsid ) hr = IStorage_SetClass( stg, clsid ); if (FAILED( hr )) { - WARN("failed to set class id 0x%08x\n", hr); + WARN("failed to set class id %#lx\n", hr); return hr; } @@ -116,21 +116,21 @@ static HRESULT db_initialize( IStorage *stg, const GUID *clsid ) hr = write_stream_data( stg, L"_Tables", NULL, 0, TRUE ); if (FAILED( hr )) { - WARN("failed to create _Tables stream 0x%08x\n", hr); + WARN("failed to create _Tables stream %#lx\n", hr); return hr; } hr = msi_init_string_table( stg ); if (FAILED( hr )) { - WARN("failed to initialize string table 0x%08x\n", hr); + WARN("failed to initialize string table %#lx\n", hr); return hr; } hr = IStorage_Commit( stg, 0 ); if (FAILED( hr )) { - WARN("failed to commit changes 0x%08x\n", hr); + WARN("failed to commit changes %#lx\n", hr); return hr; } @@ -217,7 +217,7 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) if( FAILED( r ) || !stg ) { - WARN("open failed r = %08x for %s\n", r, debugstr_w(szDBPath)); + WARN("open failed r = %#lx for %s\n", r, debugstr_w(szDBPath)); return ERROR_FUNCTION_FAILED; } @@ -513,7 +513,7 @@ static LPWSTR msi_build_createsql_columns(LPWSTR *columns_data, LPWSTR *types, D type = L"LONG"; else { - WARN("invalid int width %u\n", len); + WARN("invalid int width %lu\n", len); msi_free(columns); return NULL; } @@ -835,12 +835,12 @@ done: return r; } -UINT WINAPI MsiDatabaseImportW(MSIHANDLE handle, LPCWSTR szFolder, LPCWSTR szFilename) +UINT WINAPI MsiDatabaseImportW( MSIHANDLE handle, const WCHAR *szFolder, const WCHAR *szFilename ) { MSIDATABASE *db; UINT r; - TRACE("%x %s %s\n",handle,debugstr_w(szFolder), debugstr_w(szFilename)); + TRACE( "%lu %s %s\n", handle, debugstr_w(szFolder), debugstr_w(szFilename) ); if (!(db = msihandle2msiinfo(handle, MSIHANDLETYPE_DATABASE))) return ERROR_INVALID_HANDLE; @@ -850,13 +850,12 @@ UINT WINAPI MsiDatabaseImportW(MSIHANDLE handle, LPCWSTR szFolder, LPCWSTR szFil return r; } -UINT WINAPI MsiDatabaseImportA( MSIHANDLE handle, - LPCSTR szFolder, LPCSTR szFilename ) +UINT WINAPI MsiDatabaseImportA( MSIHANDLE handle, const char *szFolder, const char *szFilename ) { - LPWSTR path = NULL, file = NULL; + WCHAR *path = NULL, *file = NULL; UINT r = ERROR_OUTOFMEMORY; - TRACE("%x %s %s\n", handle, debugstr_a(szFolder), debugstr_a(szFilename)); + TRACE( "%lu %s %s\n", handle, debugstr_a(szFolder), debugstr_a(szFilename) ); if( szFolder ) { @@ -1141,14 +1140,12 @@ done: * * row4 : data <tab> data <tab> data <tab> ... data <cr> <lf> */ -UINT WINAPI MsiDatabaseExportW( MSIHANDLE handle, LPCWSTR szTable, - LPCWSTR szFolder, LPCWSTR szFilename ) +UINT WINAPI MsiDatabaseExportW( MSIHANDLE handle, const WCHAR *szTable, const WCHAR *szFolder, const WCHAR *szFilename ) { MSIDATABASE *db; UINT r; - TRACE("%x %s %s %s\n", handle, debugstr_w(szTable), - debugstr_w(szFolder), debugstr_w(szFilename)); + TRACE( "%lu %s %s %s\n", handle, debugstr_w(szTable), debugstr_w(szFolder), debugstr_w(szFilename) ); if (!(db = msihandle2msiinfo(handle, MSIHANDLETYPE_DATABASE))) return ERROR_INVALID_HANDLE; @@ -1158,14 +1155,12 @@ UINT WINAPI MsiDatabaseExportW( MSIHANDLE handle, LPCWSTR szTable, return r; } -UINT WINAPI MsiDatabaseExportA( MSIHANDLE handle, LPCSTR szTable, - LPCSTR szFolder, LPCSTR szFilename ) +UINT WINAPI MsiDatabaseExportA( MSIHANDLE handle, const char *szTable, const char *szFolder, const char *szFilename ) { - LPWSTR path = NULL, file = NULL, table = NULL; + WCHAR *path = NULL, *file = NULL, *table = NULL; UINT r = ERROR_OUTOFMEMORY; - TRACE("%x %s %s %s\n", handle, debugstr_a(szTable), - debugstr_a(szFolder), debugstr_a(szFilename)); + TRACE( "%lu %s %s %s\n", handle, debugstr_a(szTable), debugstr_a(szFolder), debugstr_a(szFilename) ); if( szTable ) { @@ -1198,14 +1193,12 @@ end: return r; } -UINT WINAPI MsiDatabaseMergeA(MSIHANDLE hDatabase, MSIHANDLE hDatabaseMerge, - LPCSTR szTableName) +UINT WINAPI MsiDatabaseMergeA( MSIHANDLE hDatabase, MSIHANDLE hDatabaseMerge, const char *szTableName ) { UINT r; - LPWSTR table; + WCHAR *table; - TRACE("(%d, %d, %s)\n", hDatabase, hDatabaseMerge, - debugstr_a(szTableName)); + TRACE("%lu, %lu, %s\n", hDatabase, hDatabaseMerge, debugstr_a(szTableName) ); table = strdupAtoW(szTableName); r = MsiDatabaseMergeW(hDatabase, hDatabaseMerge, table); @@ -1839,7 +1832,7 @@ static UINT update_merge_errors(MSIDATABASE *db, LPCWSTR error, return r; } -UINT WINAPI MsiDatabaseMergeW(MSIHANDLE hDatabase, MSIHANDLE hDatabaseMerge, LPCWSTR szTableName) +UINT WINAPI MsiDatabaseMergeW( MSIHANDLE hDatabase, MSIHANDLE hDatabaseMerge, const WCHAR *szTableName ) { struct list tabledata = LIST_INIT(tabledata); struct list *item, *cursor; @@ -1848,7 +1841,7 @@ UINT WINAPI MsiDatabaseMergeW(MSIHANDLE hDatabase, MSIHANDLE hDatabaseMerge, LPC BOOL conflicts; UINT r; - TRACE("(%d, %d, %s)\n", hDatabase, hDatabaseMerge, debugstr_w(szTableName)); + TRACE( "%lu, %lu, %s\n", hDatabase, hDatabaseMerge, debugstr_w(szTableName) ); if (szTableName && !*szTableName) return ERROR_INVALID_TABLE; @@ -1906,7 +1899,7 @@ MSIDBSTATE WINAPI MsiGetDatabaseState( MSIHANDLE handle ) MSIDBSTATE ret = MSIDBSTATE_READ; MSIDATABASE *db; - TRACE("%d\n", handle); + TRACE( "%lu\n", handle ); if (!(db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE ))) return MSIDBSTATE_ERROR; diff --git a/dll/win32/msi/dialog.c b/dll/win32/msi/dialog.c index bc0c0fa3290..8e4c1511081 100644 --- a/dll/win32/msi/dialog.c +++ b/dll/win32/msi/dialog.c @@ -590,7 +590,7 @@ static void dialog_handle_event( msi_dialog *dialog, const WCHAR *control, val1 = MSI_RecordGetInteger( rec, 2 ); val2 = MSI_RecordGetInteger( rec, 3 ); - TRACE("progress: func %u val1 %u val2 %u\n", func, val1, val2); + TRACE( "progress: func %lu val1 %lu val2 %lu\n", func, val1, val2 ); units = val1 / 512; switch (func) @@ -633,7 +633,7 @@ static void dialog_handle_event( msi_dialog *dialog, const WCHAR *control, ctrl->progress_max += units; break; default: - FIXME("Unknown progress message %u\n", func); + FIXME( "unknown progress message %lu\n", func ); break; } } @@ -730,8 +730,7 @@ static msi_control *msi_dialog_add_control( msi_dialog *dialog, attributes = MSI_RecordGetInteger( rec, 8 ); if (wcscmp( control_type, L"ScrollableText" )) text = MSI_RecordGetString( rec, 10 ); - TRACE("%s, %s, %08x, %s, %08x\n", debugstr_w(szCls), debugstr_w(name), - attributes, debugstr_w(text), style); + TRACE( "%s, %s, %#lx, %s, %#lx\n", debugstr_w(szCls), debugstr_w(name), attributes, debugstr_w(text), style ); if( attributes & msidbControlAttributesVisible ) style |= WS_VISIBLE; @@ -773,7 +772,7 @@ MSIText_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) struct msi_text_info *info; LRESULT r = 0; - TRACE("%p %04x %08lx %08lx\n", hWnd, msg, wParam, lParam); + TRACE( "%p %04x %#Ix %#Ix\n", hWnd, msg, wParam, lParam ); info = GetPropW(hWnd, L"MSIDATA"); @@ -1247,7 +1246,7 @@ MSIScrollText_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) struct msi_scrolltext_info *info; HRESULT r; - TRACE("%p %04x %08lx %08lx\n", hWnd, msg, wParam, lParam); + TRACE( "%p %04x %#Ix %#Ix\n", hWnd, msg, wParam, lParam ); info = GetPropW( hWnd, L"MSIDATA" ); @@ -1287,7 +1286,7 @@ msi_richedit_stream_in( DWORD_PTR arg, LPBYTE buffer, LONG count, LONG *pcb ) *pcb = count; info->offset += count; - TRACE("%d/%d\n", info->offset, info->length); + TRACE( "%lu/%lu\n", info->offset, info->length ); return 0; } @@ -1428,7 +1427,7 @@ static LRESULT WINAPI MSIComboBox_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LP LRESULT r; DWORD j; - TRACE("%p %04x %08lx %08lx\n", hWnd, msg, wParam, lParam); + TRACE( "%p %04x %#Ix %#Ix\n", hWnd, msg, wParam, lParam ); info = GetPropW( hWnd, L"MSIDATA" ); if (!info) @@ -1828,7 +1827,7 @@ MSIMaskedEdit_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) struct msi_maskedit_info *info; HRESULT r; - TRACE("%p %04x %08lx %08lx\n", hWnd, msg, wParam, lParam); + TRACE("%p %04x %#Ix %#Ix\n", hWnd, msg, wParam, lParam); info = GetPropW(hWnd, L"MSIDATA"); @@ -2163,7 +2162,7 @@ static LRESULT WINAPI MSIPathEdit_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LP struct msi_pathedit_info *info = GetPropW(hWnd, L"MSIDATA"); LRESULT r = 0; - TRACE("%p %04x %08lx %08lx\n", hWnd, msg, wParam, lParam); + TRACE("%p %04x %#Ix %#Ix\n", hWnd, msg, wParam, lParam); if ( msg == WM_KILLFOCUS ) { @@ -2262,7 +2261,7 @@ static LRESULT WINAPI MSIRadioGroup_WndProc( HWND hWnd, UINT msg, WPARAM wParam, WNDPROC oldproc = (WNDPROC)GetPropW( hWnd, L"MSIDATA" ); LRESULT r; - TRACE("hWnd %p msg %04x wParam 0x%08lx lParam 0x%08lx\n", hWnd, msg, wParam, lParam); + TRACE( "hWnd %p msg %04x wParam %#Ix lParam %#Ix\n", hWnd, msg, wParam, lParam ); if (msg == WM_COMMAND) /* Forward notifications to dialog */ SendMessageW( GetParent( hWnd ), msg, wParam, lParam ); @@ -2463,7 +2462,7 @@ MSISelectionTree_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) TVHITTESTINFO tvhti; HRESULT r; - TRACE("%p %04x %08lx %08lx\n", hWnd, msg, wParam, lParam); + TRACE("%p %04x %#Ix %#Ix\n", hWnd, msg, wParam, lParam); info = GetPropW(hWnd, L"MSIDATA"); @@ -2714,7 +2713,7 @@ static LRESULT WINAPI MSIListBox_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPA LRESULT r; DWORD j; - TRACE("%p %04x %08lx %08lx\n", hWnd, msg, wParam, lParam); + TRACE("%p %04x %#Ix %#Ix\n", hWnd, msg, wParam, lParam); info = GetPropW( hWnd, L"MSIDATA" ); if (!info) @@ -3792,7 +3791,7 @@ static LRESULT msi_dialog_oncommand( msi_dialog *dialog, WPARAM param, HWND hwnd { msi_control *control = NULL; - TRACE("%p %p %08lx\n", dialog, hwnd, param); + TRACE( "%p, %#Ix, %p\n", dialog, param, hwnd ); switch (param) { @@ -4214,7 +4213,7 @@ UINT WINAPI MsiEnableUIPreview( MSIHANDLE hdb, MSIHANDLE *phPreview ) MSIPREVIEW *preview; UINT r = ERROR_FUNCTION_FAILED; - TRACE("%d %p\n", hdb, phPreview); + TRACE( "%lu %p\n", hdb, phPreview ); if (!(db = msihandle2msiinfo(hdb, MSIHANDLETYPE_DATABASE))) return ERROR_INVALID_HANDLE; @@ -4264,7 +4263,7 @@ UINT WINAPI MsiPreviewDialogW( MSIHANDLE hPreview, LPCWSTR szDialogName ) MSIPREVIEW *preview; UINT r; - TRACE("%d %s\n", hPreview, debugstr_w(szDialogName)); + TRACE( "%lu %s\n", hPreview, debugstr_w(szDialogName) ); preview = msihandle2msiinfo( hPreview, MSIHANDLETYPE_PREVIEW ); if (!preview) @@ -4280,7 +4279,7 @@ UINT WINAPI MsiPreviewDialogA( MSIHANDLE hPreview, LPCSTR szDialogName ) UINT r; LPWSTR strW = NULL; - TRACE("%d %s\n", hPreview, debugstr_a(szDialogName)); + TRACE( "%lu %s\n", hPreview, debugstr_a(szDialogName) ); if (szDialogName) { @@ -4293,15 +4292,15 @@ UINT WINAPI MsiPreviewDialogA( MSIHANDLE hPreview, LPCSTR szDialogName ) return r; } -UINT WINAPI MsiPreviewBillboardW( MSIHANDLE hPreview, LPCWSTR szControlName, LPCWSTR szBillboard ) +UINT WINAPI MsiPreviewBillboardW( MSIHANDLE hPreview, const WCHAR *szControlName, const WCHAR *szBillboard ) { - FIXME("%d %s %s\n", hPreview, debugstr_w(szControlName), debugstr_w(szBillboard)); + FIXME( "%lu %s %s\n", hPreview, debugstr_w(szControlName), debugstr_w(szBillboard) ); return ERROR_CALL_NOT_IMPLEMENTED; } -UINT WINAPI MsiPreviewBillboardA( MSIHANDLE hPreview, LPCSTR szControlName, LPCSTR szBillboard ) +UINT WINAPI MsiPreviewBillboardA( MSIHANDLE hPreview, const char *szControlName, const char *szBillboard ) { - FIXME("%d %s %s\n", hPreview, debugstr_a(szControlName), debugstr_a(szBillboard)); + FIXME( "%lu %s %s\n", hPreview, debugstr_a(szControlName), debugstr_a(szBillboard) ); return ERROR_CALL_NOT_IMPLEMENTED; } diff --git a/dll/win32/msi/files.c b/dll/win32/msi/files.c index 8cb876b2468..1b8e4fd7d90 100644 --- a/dll/win32/msi/files.c +++ b/dll/win32/msi/files.c @@ -355,7 +355,7 @@ static msi_file_state calculate_install_state( MSIPACKAGE *package, MSIFILE *fil } if ((size = msi_get_disk_file_size( package, file->TargetPath )) != file->FileSize) { - TRACE("overwriting %s (old size %u new size %u)\n", debugstr_w(file->File), size, file->FileSize); + TRACE("overwriting %s (old size %lu new size %d)\n", debugstr_w(file->File), size, file->FileSize); return msifs_overwrite; } if (file->hash.dwFileHashInfoSize) @@ -722,7 +722,7 @@ static UINT patch_file( MSIPACKAGE *package, MSIFILEPATCH *patch ) } else { - WARN("failed to patch %s: %08x\n", debugstr_w(patch->File->TargetPath), GetLastError()); + WARN( "failed to patch %s: %#lx\n", debugstr_w(patch->File->TargetPath), GetLastError() ); r = ERROR_INSTALL_FAILURE; } DeleteFileW( patch->path ); @@ -761,8 +761,8 @@ static UINT patch_assembly( MSIPACKAGE *package, MSIASSEMBLY *assembly, MSIFILEP { if (!msi_copy_file( package, path, patch->File->TargetPath, FALSE )) { - ERR("Failed to copy file %s -> %s (%u)\n", debugstr_w(path), - debugstr_w(patch->File->TargetPath), GetLastError() ); + ERR( "failed to copy file %s -> %s (%lu)\n", debugstr_w(path), + debugstr_w(patch->File->TargetPath), GetLastError() ); msi_free( path ); msi_free( displayname ); IAssemblyName_Release( name ); @@ -898,7 +898,7 @@ static BOOL move_file( MSIPACKAGE *package, const WCHAR *source, const WCHAR *de ret = msi_move_file( package, source, dest, MOVEFILE_REPLACE_EXISTING ); if (!ret) { - WARN("msi_move_file failed: %u\n", GetLastError()); + WARN( "msi_move_file failed: %lu\n", GetLastError() ); return FALSE; } } @@ -908,7 +908,7 @@ static BOOL move_file( MSIPACKAGE *package, const WCHAR *source, const WCHAR *de ret = msi_copy_file( package, source, dest, FALSE ); if (!ret) { - WARN("msi_copy_file failed: %u\n", GetLastError()); + WARN( "msi_copy_file failed: %lu\n", GetLastError() ); return FALSE; } } @@ -1176,7 +1176,7 @@ static UINT ITERATE_MoveFiles( MSIRECORD *rec, LPVOID param ) { if (!msi_create_full_path( package, destdir )) { - WARN("failed to create directory %u\n", GetLastError()); + WARN( "failed to create directory %lu\n", GetLastError() ); goto done; } } @@ -1317,8 +1317,8 @@ static UINT ITERATE_DuplicateFiles(MSIRECORD *row, LPVOID param) TRACE("Duplicating file %s to %s\n", debugstr_w(file->TargetPath), debugstr_w(dest)); if (!msi_copy_file( package, file->TargetPath, dest, TRUE )) { - WARN("Failed to copy file %s -> %s (%u)\n", - debugstr_w(file->TargetPath), debugstr_w(dest), GetLastError()); + WARN( "failed to copy file %s -> %s (%lu)\n", + debugstr_w(file->TargetPath), debugstr_w(dest), GetLastError() ); } FIXME("We should track these duplicate files as well\n"); @@ -1395,7 +1395,7 @@ static UINT ITERATE_RemoveDuplicateFiles( MSIRECORD *row, LPVOID param ) TRACE("Removing duplicate %s of %s\n", debugstr_w(dest), debugstr_w(file->TargetPath)); if (!msi_delete_file( package, dest )) { - WARN("Failed to delete duplicate file %s (%u)\n", debugstr_w(dest), GetLastError()); + WARN( "failed to delete duplicate file %s (%lu)\n", debugstr_w(dest), GetLastError() ); } uirow = MSI_CreateRecord( 9 ); @@ -1606,7 +1606,7 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) msi_set_file_attributes( package, file->TargetPath, FILE_ATTRIBUTE_NORMAL ); if (!msi_delete_file( package, file->TargetPath )) { - WARN("failed to delete %s (%u)\n", debugstr_w(file->TargetPath), GetLastError()); + WARN( "failed to delete %s (%lu)\n", debugstr_w(file->TargetPath), GetLastError() ); } file->state = msifs_missing; diff --git a/dll/win32/msi/format.c b/dll/win32/msi/format.c index cf81b3b0374..38bd187626b 100644 --- a/dll/win32/msi/format.c +++ b/dll/win32/msi/format.c @@ -897,14 +897,13 @@ end: return rc; } -UINT WINAPI MsiFormatRecordW( MSIHANDLE hInstall, MSIHANDLE hRecord, - LPWSTR szResult, LPDWORD sz ) +UINT WINAPI MsiFormatRecordW( MSIHANDLE hInstall, MSIHANDLE hRecord, WCHAR *szResult, DWORD *sz ) { UINT r = ERROR_INVALID_HANDLE; MSIPACKAGE *package; MSIRECORD *record; - TRACE("%d %d %p %p\n", hInstall, hRecord, szResult, sz); + TRACE( "%lu, %lu, %p, %p\n", hInstall, hRecord, szResult, sz ); record = msihandle2msiinfo(hRecord, MSIHANDLETYPE_RECORD); if (!record) @@ -961,7 +960,7 @@ UINT WINAPI MsiFormatRecordA(MSIHANDLE hinst, MSIHANDLE hrec, char *buf, DWORD * DWORD len; UINT r; - TRACE("%d %d %p %p\n", hinst, hrec, buf, sz); + TRACE( "%lu, %lu, %p, %p\n", hinst, hrec, buf, sz ); rec = msihandle2msiinfo(hrec, MSIHANDLETYPE_RECORD); if (!rec) diff --git a/dll/win32/msi/handle.c b/dll/win32/msi/handle.c index 29c5784c10e..c1f290652df 100644 --- a/dll/win32/msi/handle.c +++ b/dll/win32/msi/handle.c @@ -127,7 +127,7 @@ MSIHANDLE alloc_msihandle( MSIOBJECTHDR *obj ) LeaveCriticalSection( &MSI_handle_cs ); - TRACE("%p -> %d\n", obj, ret ); + TRACE( "%p -> %lu\n", obj, ret ); return ret; } @@ -150,7 +150,7 @@ MSIHANDLE alloc_msi_remote_handle(MSIHANDLE remote) LeaveCriticalSection( &MSI_handle_cs ); - TRACE("%d -> %d\n", remote, ret); + TRACE( "%lu -> %lu\n", remote, ret ); return ret; } @@ -271,7 +271,7 @@ UINT WINAPI MsiCloseHandle(MSIHANDLE handle) MSIOBJECTHDR *info = NULL; UINT ret = ERROR_INVALID_HANDLE; - TRACE("%x\n",handle); + TRACE( "%lu\n", handle ); if (!handle) return ERROR_SUCCESS; @@ -305,7 +305,7 @@ UINT WINAPI MsiCloseHandle(MSIHANDLE handle) ret = ERROR_SUCCESS; - TRACE("handle %x destroyed\n", handle+1); + TRACE( "handle %lu destroyed\n", handle + 1 ); out: LeaveCriticalSection( &MSI_handle_cs ); if( info ) diff --git a/dll/win32/msi/insert.c b/dll/win32/msi/insert.c index 098287d6039..3021fc88de8 100644 --- a/dll/win32/msi/insert.c +++ b/dll/win32/msi/insert.c @@ -79,7 +79,7 @@ MSIRECORD *msi_query_merge_record( UINT fields, const column_info *vl, MSIRECORD switch( vl->val->type ) { case EXPR_SVAL: - TRACE("field %d -> %s\n", i, debugstr_w(vl->val->u.sval)); + TRACE( "field %lu -> %s\n", i, debugstr_w(vl->val->u.sval) ); MSI_RecordSetStringW( merged, i, vl->val->u.sval ); break; case EXPR_IVAL: diff --git a/dll/win32/msi/install.c b/dll/win32/msi/install.c index 7aad6bffc07..997f3655556 100644 --- a/dll/win32/msi/install.c +++ b/dll/win32/msi/install.c @@ -672,7 +672,7 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode) MSIPACKAGE *package; BOOL r = FALSE; - TRACE("%d %d\n", hInstall, iRunMode); + TRACE( "%lu, %d\n", hInstall, iRunMode ); package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_PACKAGE); if (!package) @@ -765,7 +765,7 @@ UINT WINAPI MsiSetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode, BOOL fState) MSIPACKAGE *package; UINT r; - TRACE("%d %d %d\n", hInstall, iRunMode, fState); + TRACE( "%lu, %d, %d\n", hInstall, iRunMode, fState ); package = msihandle2msiinfo( hInstall, MSIHANDLETYPE_PACKAGE ); if (!package) @@ -990,7 +990,7 @@ UINT WINAPI MsiSetFeatureAttributesA( MSIHANDLE handle, LPCSTR feature, DWORD at UINT r; WCHAR *featureW = NULL; - TRACE("%u, %s, 0x%08x\n", handle, debugstr_a(feature), attrs); + TRACE( "%lu, %s, %#lx\n", handle, debugstr_a(feature), attrs ); if (feature && !(featureW = strdupAtoW( feature ))) return ERROR_OUTOFMEMORY; @@ -1021,7 +1021,7 @@ UINT WINAPI MsiSetFeatureAttributesW( MSIHANDLE handle, LPCWSTR name, DWORD attr MSIFEATURE *feature; WCHAR *costing; - TRACE("%u, %s, 0x%08x\n", handle, debugstr_w(name), attrs); + TRACE( "%lu, %s, %#lx\n", handle, debugstr_w(name), attrs ); if (!name || !name[0]) return ERROR_UNKNOWN_FEATURE; @@ -1085,13 +1085,13 @@ UINT MSI_GetFeatureStateW(MSIPACKAGE *package, LPCWSTR szFeature, /*********************************************************************** * MsiGetFeatureStateW (MSI.@) */ -UINT WINAPI MsiGetFeatureStateW(MSIHANDLE hInstall, LPCWSTR szFeature, - INSTALLSTATE *piInstalled, INSTALLSTATE *piAction) +UINT WINAPI MsiGetFeatureStateW( MSIHANDLE hInstall, const WCHAR *szFeature, INSTALLSTATE *piInstalled, + INSTALLSTATE *piAction ) { MSIPACKAGE* package; UINT ret; - TRACE("%d %s %p %p\n", hInstall, debugstr_w(szFeature), piInstalled, piAction); + TRACE( "%lu, %s, %p, %p\n", hInstall, debugstr_w(szFeature), piInstalled, piAction ); if (!szFeature) return ERROR_UNKNOWN_FEATURE; @@ -1204,15 +1204,14 @@ UINT MSI_GetFeatureCost( MSIPACKAGE *package, MSIFEATURE *feature, MSICOSTTREE t /*********************************************************************** * MsiGetFeatureCostW (MSI.@) */ -UINT WINAPI MsiGetFeatureCostW(MSIHANDLE hInstall, LPCWSTR szFeature, - MSICOSTTREE iCostTree, INSTALLSTATE iState, LPINT piCost) +UINT WINAPI MsiGetFeatureCostW( MSIHANDLE hInstall, const WCHAR *szFeature, MSICOSTTREE iCostTree, + INSTALLSTATE iState, INT *piCost ) { MSIPACKAGE *package; MSIFEATURE *feature; UINT ret; - TRACE("(%d %s %i %i %p)\n", hInstall, debugstr_w(szFeature), - iCostTree, iState, piCost); + TRACE( "%lu, %s, %d, %d, %p\n", hInstall, debugstr_w(szFeature), iCostTree, iState, piCost ); if (!szFeature) return ERROR_INVALID_PARAMETER; @@ -1258,14 +1257,14 @@ UINT WINAPI MsiGetFeatureCostW(MSIHANDLE hInstall, LPCWSTR szFeature, /*********************************************************************** * MsiGetFeatureInfoA (MSI.@) */ -UINT WINAPI MsiGetFeatureInfoA( MSIHANDLE handle, LPCSTR feature, LPDWORD attrs, - LPSTR title, LPDWORD title_len, LPSTR help, LPDWORD help_len ) +UINT WINAPI MsiGetFeatureInfoA( MSIHANDLE handle, const char *feature, DWORD *attrs, + char *title, DWORD *title_len, char *help, DWORD *help_len ) { UINT r; WCHAR *titleW = NULL, *helpW = NULL, *featureW = NULL; - TRACE("%u, %s, %p, %p, %p, %p, %p\n", handle, debugstr_a(feature), attrs, title, - title_len, help, help_len); + TRACE( "%lu, %s, %p, %p, %p, %p, %p\n", handle, debugstr_a(feature), attrs, title, + title_len, help, help_len ); if (feature && !(featureW = strdupAtoW( feature ))) return ERROR_OUTOFMEMORY; @@ -1352,14 +1351,14 @@ static UINT MSI_GetFeatureInfo( MSIPACKAGE *package, LPCWSTR name, LPDWORD attrs /*********************************************************************** * MsiGetFeatureInfoW (MSI.@) */ -UINT WINAPI MsiGetFeatureInfoW( MSIHANDLE handle, LPCWSTR feature, LPDWORD attrs, - LPWSTR title, LPDWORD title_len, LPWSTR help, LPDWORD help_len ) +UINT WINAPI MsiGetFeatureInfoW( MSIHANDLE handle, const WCHAR *feature, DWORD *attrs, + WCHAR *title, DWORD *title_len, WCHAR *help, DWORD *help_len ) { UINT r; MSIPACKAGE *package; - TRACE("%u, %s, %p, %p, %p, %p, %p\n", handle, debugstr_w(feature), attrs, title, - title_len, help, help_len); + TRACE( "%lu, %s, %p, %p, %p, %p, %p\n", handle, debugstr_w(feature), attrs, title, + title_len, help, help_len ); if (!feature) return ERROR_INVALID_PARAMETER; @@ -1499,14 +1498,13 @@ UINT WINAPI MsiSetComponentStateW(MSIHANDLE hInstall, LPCWSTR szComponent, /*********************************************************************** * MsiGetComponentStateW (MSI.@) */ -UINT WINAPI MsiGetComponentStateW(MSIHANDLE hInstall, LPCWSTR szComponent, - INSTALLSTATE *piInstalled, INSTALLSTATE *piAction) +UINT WINAPI MsiGetComponentStateW( MSIHANDLE hInstall, const WCHAR *szComponent, INSTALLSTATE *piInstalled, + INSTALLSTATE *piAction ) { MSIPACKAGE* package; UINT ret; - TRACE("%d %s %p %p\n", hInstall, debugstr_w(szComponent), - piInstalled, piAction); + TRACE( "%lu, %s, %p, %p\n", hInstall, debugstr_w(szComponent), piInstalled, piAction ); if (!szComponent) return ERROR_UNKNOWN_COMPONENT; @@ -1601,7 +1599,7 @@ UINT WINAPI MsiSetInstallLevel(MSIHANDLE hInstall, int iInstallLevel) MSIPACKAGE* package; UINT r; - TRACE("%d %i\n", hInstall, iInstallLevel); + TRACE( "%lu %d\n", hInstall, iInstallLevel ); package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_PACKAGE); if (!package) @@ -1634,28 +1632,22 @@ UINT WINAPI MsiSetInstallLevel(MSIHANDLE hInstall, int iInstallLevel) /*********************************************************************** * MsiGetFeatureValidStatesW (MSI.@) */ -UINT WINAPI MsiGetFeatureValidStatesW(MSIHANDLE hInstall, LPCWSTR szFeature, - LPDWORD pInstallState) +UINT WINAPI MsiGetFeatureValidStatesW( MSIHANDLE hInstall, const WCHAR *szFeature, DWORD *pInstallState ) { - if(pInstallState) *pInstallState = 1<<INSTALLSTATE_LOCAL; - FIXME("%d %s %p stub returning %d\n", - hInstall, debugstr_w(szFeature), pInstallState, pInstallState ? *pInstallState : 0); - + if (pInstallState) *pInstallState = 1 << INSTALLSTATE_LOCAL; + FIXME( "%lu, %s, %p stub returning %lu\n", hInstall, debugstr_w(szFeature), pInstallState, + pInstallState ? *pInstallState : 0 ); return ERROR_SUCCESS; } /*********************************************************************** * MsiGetFeatureValidStatesA (MSI.@) */ -UINT WINAPI MsiGetFeatureValidStatesA(MSIHANDLE hInstall, LPCSTR szFeature, - LPDWORD pInstallState) +UINT WINAPI MsiGetFeatureValidStatesA( MSIHANDLE hInstall, const char *szFeature, DWORD *pInstallState ) { UINT ret; - LPWSTR szwFeature = strdupAtoW(szFeature); - + WCHAR *szwFeature = strdupAtoW(szFeature); ret = MsiGetFeatureValidStatesW(hInstall, szwFeature, pInstallState); - msi_free(szwFeature); - return ret; } diff --git a/dll/win32/msi/media.c b/dll/win32/msi/media.c index af6e83b893e..6aeb948de51 100644 --- a/dll/win32/msi/media.c +++ b/dll/win32/msi/media.c @@ -64,7 +64,7 @@ static BOOL source_matches_volume(MSIMEDIAINFO *mi, LPCWSTR source_root) if (!GetVolumeInformationW(root, volume_name, MAX_PATH + 1, NULL, NULL, NULL, NULL, 0)) { - WARN("failed to get volume information for %s (%u)\n", debugstr_w(root), GetLastError()); + WARN( "failed to get volume information for %s (%lu)\n", debugstr_w(root), GetLastError() ); return FALSE; } @@ -227,7 +227,7 @@ static INT_PTR CDECL cabinet_open_stream( char *pszFile, int oflag, int pmode ) msi_free( encoded ); if (FAILED(hr)) { - WARN("failed to open stream 0x%08x\n", hr); + WARN( "failed to open stream %#lx\n", hr ); return -1; } } @@ -349,7 +349,7 @@ static INT_PTR cabinet_next_cabinet(FDINOTIFICATIONTYPE fdint, length = strlen(pfdin->psz3) + 1 + strlen(next_cab) + 1; if (length > 256) { - WARN("Cannot update next cabinet filename with a string size %u > 256\n", length); + WARN( "cannot update next cabinet filename with a string size %lu > 256\n", length ); msi_free(next_cab); goto done; } @@ -441,7 +441,7 @@ static INT_PTR cabinet_copy_file(FDINOTIFICATIONTYPE fdint, if (attrs2 == INVALID_FILE_ATTRIBUTES) { - ERR("failed to create %s (error %d)\n", debugstr_w(path), err); + ERR( "failed to create %s (error %lu)\n", debugstr_w(path), err ); goto done; } else if (err == ERROR_ACCESS_DENIED && (attrs2 & FILE_ATTRIBUTE_READONLY)) @@ -481,13 +481,12 @@ static INT_PTR cabinet_copy_file(FDINOTIFICATIONTYPE fdint, } else { - WARN("failed to schedule rename operation %s (error %d)\n", debugstr_w(path), GetLastError()); + WARN( "failed to schedule rename operation %s (error %lu)\n", debugstr_w(path), GetLastError() ); DeleteFileW( tmpfileW ); } msi_free(tmpfileW); } - else - WARN("failed to create %s (error %d)\n", debugstr_w(path), err); + else WARN( "failed to create %s (error %lu)\n", debugstr_w(path), err ); } done: diff --git a/dll/win32/msi/msi.c b/dll/win32/msi/msi.c index a9e0fbeeda6..7f198f3fd2e 100644 --- a/dll/win32/msi/msi.c +++ b/dll/win32/msi/msi.c @@ -181,21 +181,19 @@ UINT WINAPI MsiAdvertiseProductW(LPCWSTR szPackagePath, LPCWSTR szScriptfilePath return ERROR_CALL_NOT_IMPLEMENTED; } -UINT WINAPI MsiAdvertiseProductExA(LPCSTR szPackagePath, LPCSTR szScriptfilePath, - LPCSTR szTransforms, LANGID lgidLanguage, DWORD dwPlatform, DWORD dwOptions) +UINT WINAPI MsiAdvertiseProductExA( const char *szPackagePath, const char *szScriptfilePath, + const char *szTransforms, LANGID lgidLanguage, DWORD dwPlatform, DWORD dwOptions ) { - FIXME("%s %s %s %08x %08x %08x\n", debugstr_a(szPackagePath), - debugstr_a(szScriptfilePath), debugstr_a(szTransforms), - lgidLanguage, dwPlatform, dwOptions); + FIXME( "%s, %s, %s, %#x, %#lx, %#lx\n", debugstr_a(szPackagePath), debugstr_a(szScriptfilePath), + debugstr_a(szTransforms), lgidLanguage, dwPlatform, dwOptions ); return ERROR_CALL_NOT_IMPLEMENTED; } -UINT WINAPI MsiAdvertiseProductExW( LPCWSTR szPackagePath, LPCWSTR szScriptfilePath, - LPCWSTR szTransforms, LANGID lgidLanguage, DWORD dwPlatform, DWORD dwOptions) +UINT WINAPI MsiAdvertiseProductExW( const WCHAR *szPackagePath, const WCHAR *szScriptfilePath, + const WCHAR *szTransforms, LANGID lgidLanguage, DWORD dwPlatform, DWORD dwOptions ) { - FIXME("%s %s %s %08x %08x %08x\n", debugstr_w(szPackagePath), - debugstr_w(szScriptfilePath), debugstr_w(szTransforms), - lgidLanguage, dwPlatform, dwOptions); + FIXME( "%s, %s, %s, %#x %#lx %#lx\n", debugstr_w(szPackagePath), debugstr_w(szScriptfilePath), + debugstr_w(szTransforms), lgidLanguage, dwPlatform, dwOptions ); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -267,24 +265,22 @@ UINT WINAPI MsiInstallProductW(LPCWSTR szPackagePath, LPCWSTR szCommandLine) return r; } -UINT WINAPI MsiReinstallProductA(LPCSTR szProduct, DWORD dwReinstallMode) +UINT WINAPI MsiReinstallProductA( const char *szProduct, DWORD dwReinstallMode ) { - LPWSTR wszProduct; + WCHAR *wszProduct; UINT rc; - TRACE("%s %08x\n", debugstr_a(szProduct), dwReinstallMode); + TRACE( "%s, %#lx\n", debugstr_a(szProduct), dwReinstallMode ); wszProduct = strdupAtoW(szProduct); - rc = MsiReinstallProductW(wszProduct, dwReinstallMode); - msi_free(wszProduct); return rc; } -UINT WINAPI MsiReinstallProductW(LPCWSTR szProduct, DWORD dwReinstallMode) +UINT WINAPI MsiReinstallProductW( const WCHAR *szProduct, DWORD dwReinstallMode ) { - TRACE("%s %08x\n", debugstr_w(szProduct), dwReinstallMode); + TRACE( "%s, %#lx\n", debugstr_w(szProduct), dwReinstallMode ); return MsiReinstallFeatureW(szProduct, L"ALL", dwReinstallMode); } @@ -531,14 +527,14 @@ static MSIPATCHSEQUENCEINFOW *patchinfoAtoW( DWORD count, const MSIPATCHSEQUENCE return ret; } -UINT WINAPI MsiDetermineApplicablePatchesA(LPCSTR szProductPackagePath, - DWORD cPatchInfo, PMSIPATCHSEQUENCEINFOA pPatchInfo) +UINT WINAPI MsiDetermineApplicablePatchesA( const char *szProductPackagePath, DWORD cPatchInfo, + MSIPATCHSEQUENCEINFOA *pPatchInfo ) { UINT i, r; WCHAR *package_path = NULL; MSIPATCHSEQUENCEINFOW *psi; - TRACE("%s, %u, %p\n", debugstr_a(szProductPackagePath), cPatchInfo, pPatchInfo); + TRACE( "%s, %lu, %p\n", debugstr_a(szProductPackagePath), cPatchInfo, pPatchInfo ); if (szProductPackagePath && !(package_path = strdupAtoW( szProductPackagePath ))) return ERROR_OUTOFMEMORY; @@ -673,7 +669,7 @@ static UINT determine_patch_sequence( MSIPACKAGE *package, DWORD count, MSIPATCH &IID_IXMLDOMDocument, (void**)&desc ); if (hr != S_OK) { - ERR("failed to create DOMDocument30 instance, 0x%08x\n", hr); + ERR( "failed to create DOMDocument30 instance, %#lx\n", hr ); return ERROR_FUNCTION_FAILED; } } @@ -720,7 +716,7 @@ static UINT determine_patch_sequence( MSIPACKAGE *package, DWORD count, MSIPATCH TRACE("szPatchData: %s\n", debugstr_w(info[i].szPatchData)); TRACE("ePatchDataType: %u\n", info[i].ePatchDataType); - TRACE("dwOrder: %u\n", info[i].dwOrder); + TRACE("dwOrder: %lu\n", info[i].dwOrder); TRACE("uStatus: %u\n", info[i].uStatus); } @@ -729,13 +725,13 @@ static UINT determine_patch_sequence( MSIPACKAGE *package, DWORD count, MSIPATCH return ERROR_SUCCESS; } -UINT WINAPI MsiDetermineApplicablePatchesW(LPCWSTR szProductPackagePath, - DWORD cPatchInfo, PMSIPATCHSEQUENCEINFOW pPatchInfo) +UINT WINAPI MsiDetermineApplicablePatchesW( const WCHAR *szProductPackagePath, DWORD cPatchInfo, + MSIPATCHSEQUENCEINFOW *pPatchInfo ) { UINT r; MSIPACKAGE *package; - TRACE("%s, %u, %p\n", debugstr_w(szProductPackagePath), cPatchInfo, pPatchInfo); + TRACE( "%s, %lu, %p\n", debugstr_w(szProductPackagePath), cPatchInfo, pPatchInfo ); r = MSI_OpenPackageW( szProductPackagePath, 0, &package ); if (r != ERROR_SUCCESS) @@ -748,15 +744,14 @@ UINT WINAPI MsiDetermineApplicablePatchesW(LPCWSTR szProductPackagePath, return r; } -UINT WINAPI MsiDeterminePatchSequenceA( LPCSTR product, LPCSTR usersid, - MSIINSTALLCONTEXT context, DWORD count, PMSIPATCHSEQUENCEINFOA patchinfo ) +UINT WINAPI MsiDeterminePatchSequenceA( const char *product, const char *usersid, MSIINSTALLCONTEXT context, + DWORD count, MSIPATCHSEQUENCEINFOA *patchinfo ) { UINT i, r; WCHAR *productW, *usersidW = NULL; MSIPATCHSEQUENCEINFOW *patchinfoW; - TRACE("%s, %s, %d, %d, %p\n", debugstr_a(product), debugstr_a(usersid), - context, count, patchinfo); + TRACE( "%s, %s, %d, %lu, %p\n", debugstr_a(product), debugstr_a(usersid), context, count, patchinfo ); if (!product) return ERROR_INVALID_PARAMETER; if (!(productW = strdupAtoW( product ))) return ERROR_OUTOFMEMORY; @@ -818,14 +813,13 @@ static UINT open_package( const WCHAR *product, const WCHAR *usersid, return MSI_OpenPackageW( sourcepath, 0, package ); } -UINT WINAPI MsiDeterminePatchSequenceW( LPCWSTR product, LPCWSTR usersid, - MSIINSTALLCONTEXT context, DWORD count, PMSIPATCHSEQUENCEINFOW patchinfo ) +UINT WINAPI MsiDeterminePatchSequenceW( const WCHAR *product, const WCHAR *usersid, MSIINSTALLCONTEXT context, + DWORD count, MSIPATCHSEQUENCEINFOW *patchinfo ) { UINT r; MSIPACKAGE *package; - TRACE("%s, %s, %d, %d, %p\n", debugstr_w(product), debugstr_w(usersid), - context, count, patchinfo); + TRACE( "%s, %s, %d, %lu, %p\n", debugstr_w(product), debugstr_w(usersid), context, count, patchinfo ); if (!product) return ERROR_INVALID_PARAMETER; r = open_package( product, usersid, context, &package ); @@ -1089,7 +1083,7 @@ static WCHAR *reg_get_value( HKEY hkey, const WCHAR *name, DWORD *type ) return strdupW( temp ); } - ERR( "unhandled value type %u\n", *type ); + ERR( "unhandled value type %lu\n", *type ); return NULL; } @@ -1887,12 +1881,12 @@ UINT WINAPI MsiGetPatchInfoW( LPCWSTR patch, LPCWSTR attr, LPWSTR buffer, LPDWOR return ERROR_UNKNOWN_PRODUCT; } -UINT WINAPI MsiEnableLogA(DWORD dwLogMode, LPCSTR szLogFile, DWORD attributes) +UINT WINAPI MsiEnableLogA( DWORD dwLogMode, const char *szLogFile, DWORD attributes ) { LPWSTR szwLogFile = NULL; UINT r; - TRACE("%08x %s %08x\n", dwLogMode, debugstr_a(szLogFile), attributes); + TRACE( "%#lx, %s, %#lx\n", dwLogMode, debugstr_a(szLogFile), attributes ); if( szLogFile ) { @@ -1905,9 +1899,9 @@ UINT WINAPI MsiEnableLogA(DWORD dwLogMode, LPCSTR szLogFile, DWORD attributes) return r; } -UINT WINAPI MsiEnableLogW(DWORD dwLogMode, LPCWSTR szLogFile, DWORD attributes) +UINT WINAPI MsiEnableLogW( DWORD dwLogMode, const WCHAR *szLogFile, DWORD attributes ) { - TRACE("%08x %s %08x\n", dwLogMode, debugstr_w(szLogFile), attributes); + TRACE( "%#lx, %s, %#lx\n", dwLogMode, debugstr_w(szLogFile), attributes ); msi_free(gszLogFile); gszLogFile = NULL; @@ -1924,23 +1918,21 @@ UINT WINAPI MsiEnableLogW(DWORD dwLogMode, LPCWSTR szLogFile, DWORD attributes) gszLogFile = strdupW(szLogFile); CloseHandle(file); } - else - ERR("Unable to enable log %s (%u)\n", debugstr_w(szLogFile), GetLastError()); + else ERR( "unable to enable log %s (%lu)\n", debugstr_w(szLogFile), GetLastError() ); } return ERROR_SUCCESS; } -UINT WINAPI MsiEnumComponentCostsA( MSIHANDLE handle, LPCSTR component, DWORD index, - INSTALLSTATE state, LPSTR drive, DWORD *buflen, - int *cost, int *temp ) +UINT WINAPI MsiEnumComponentCostsA( MSIHANDLE handle, const char *component, DWORD index, INSTALLSTATE state, + char *drive, DWORD *buflen, int *cost, int *temp ) { UINT r; DWORD len; WCHAR *driveW, *componentW = NULL; - TRACE("%d, %s, %u, %d, %p, %p, %p %p\n", handle, debugstr_a(component), index, - state, drive, buflen, cost, temp); + TRACE( "%lu, %s, %lu, %d, %p, %p, %p, %p\n", handle, debugstr_a(component), index, state, drive, buflen, cost, + temp ); if (!drive || !buflen) return ERROR_INVALID_PARAMETER; if (component && !(componentW = strdupAtoW( component ))) return ERROR_OUTOFMEMORY; @@ -1969,9 +1961,8 @@ static UINT set_drive( WCHAR *buffer, WCHAR letter ) return 2; } -UINT WINAPI MsiEnumComponentCostsW( MSIHANDLE handle, LPCWSTR component, DWORD index, - INSTALLSTATE state, LPWSTR drive, DWORD *buflen, - int *cost, int *temp ) +UINT WINAPI MsiEnumComponentCostsW( MSIHANDLE handle, const WCHAR *component, DWORD index, INSTALLSTATE state, + WCHAR *drive, DWORD *buflen, int *cost, int *temp ) { UINT r = ERROR_NO_MORE_ITEMS; MSICOMPONENT *comp = NULL; @@ -1980,8 +1971,8 @@ UINT WINAPI MsiEnumComponentCostsW( MSIHANDLE handle, LPCWSTR component, DWORD i STATSTG stat = {0}; WCHAR path[MAX_PATH]; - TRACE("%d, %s, %u, %d, %p, %p, %p %p\n", handle, debugstr_w(component), index, - state, drive, buflen, cost, temp); + TRACE( "%lu, %s, %lu, %d, %p, %p, %p, %p\n", handle, debugstr_w(component), index, state, drive, buflen, cost, + temp ); if (!drive || !buflen || !cost || !temp) return ERROR_INVALID_PARAMETER; if (!(package = msihandle2msiinfo( handle, MSIHANDLETYPE_PACKAGE ))) @@ -2315,12 +2306,11 @@ INSTALLUILEVEL WINAPI MsiSetInternalUI(INSTALLUILEVEL dwUILevel, HWND *phWnd) return old; } -INSTALLUI_HANDLERA WINAPI MsiSetExternalUIA(INSTALLUI_HANDLERA puiHandler, - DWORD dwMessageFilter, LPVOID pvContext) +INSTALLUI_HANDLERA WINAPI MsiSetExternalUIA( INSTALLUI_HANDLERA puiHandler, DWORD dwMessageFilter, void *pvContext ) { INSTALLUI_HANDLERA prev = gUIHandlerA; - TRACE("%p %08x %p\n", puiHandler, dwMessageFilter, pvContext); + TRACE( "%p, %#lx, %p\n", puiHandler, dwMessageFilter, pvContext ); gUIHandlerA = puiHandler; gUIHandlerW = NULL; @@ -2330,12 +2320,11 @@ INSTALLUI_HANDLERA WINAPI MsiSetExternalUIA(INSTALLUI_HANDLERA puiHandler, return prev; } -INSTALLUI_HANDLERW WINAPI MsiSetExternalUIW(INSTALLUI_HANDLERW puiHandler, - DWORD dwMessageFilter, LPVOID pvContext) +INSTALLUI_HANDLERW WINAPI MsiSetExternalUIW( INSTALLUI_HANDLERW puiHandler, DWORD dwMessageFilter, void *pvContext ) { INSTALLUI_HANDLERW prev = gUIHandlerW; - TRACE("%p %08x %p\n", puiHandler, dwMessageFilter, pvContext); + TRACE( "%p, %#lx, %p\n", puiHandler, dwMessageFilter, pvContext ); gUIHandlerA = NULL; gUIHandlerW = puiHandler; @@ -2370,24 +2359,22 @@ INSTALLUI_HANDLERW WINAPI MsiSetExternalUIW(INSTALLUI_HANDLERW puiHandler, * for starters, as -1 is an invalid MSI handle, but not an invalid module * handle. Maybe strings can be stored in an MSI database somehow. */ -LANGID WINAPI MsiLoadStringW( MSIHANDLE handle, UINT id, LPWSTR lpBuffer, - int nBufferMax, LANGID lang ) +LANGID WINAPI MsiLoadStringW( MSIHANDLE handle, UINT id, WCHAR *lpBuffer, int nBufferMax, LANGID lang ) { HRSRC hres; HGLOBAL hResData; LPWSTR p; DWORD i, len; - TRACE("%d %u %p %d %d\n", handle, id, lpBuffer, nBufferMax, lang); + TRACE( "%lu, %u, %p, %d, %#x\n", handle, id, lpBuffer, nBufferMax, lang ); if( handle != -1 ) - FIXME("don't know how to deal with handle = %08x\n", handle); + FIXME( "don't know how to deal with handle = %lu\n", handle ); if( !lang ) lang = GetUserDefaultLangID(); - hres = FindResourceExW( msi_hInstance, (LPCWSTR) RT_STRING, - (LPWSTR)1, lang ); + hres = FindResourceExW( msi_hInstance, (const WCHAR *)RT_STRING, (WCHAR *)1, lang ); if( !hres ) return 0; hResData = LoadResource( msi_hInstance, hres ); @@ -2464,55 +2451,49 @@ INSTALLSTATE WINAPI MsiLocateComponentW(LPCWSTR szComponent, LPWSTR lpPathBuf, return MsiGetComponentPathW( szProduct, szComponent, lpPathBuf, pcchBuf ); } -UINT WINAPI MsiMessageBoxA(HWND hWnd, LPCSTR lpText, LPCSTR lpCaption, UINT uType, - WORD wLanguageId, DWORD f) +UINT WINAPI MsiMessageBoxA( HWND hWnd, const char *lpText, const char *lpCaption, UINT uType, WORD wLanguageId, + DWORD f ) { - FIXME("%p %s %s %u %08x %08x\n", hWnd, debugstr_a(lpText), debugstr_a(lpCaption), - uType, wLanguageId, f); - return MessageBoxExA(hWnd,lpText,lpCaption,uType,wLanguageId); + FIXME( "%p, %s, %s, %u, %#x, %#lx\n", hWnd, debugstr_a(lpText), debugstr_a(lpCaption), uType, wLanguageId, f ); + return MessageBoxExA( hWnd, lpText, lpCaption, uType, wLanguageId ); } -UINT WINAPI MsiMessageBoxW(HWND hWnd, LPCWSTR lpText, LPCWSTR lpCaption, UINT uType, - WORD wLanguageId, DWORD f) +UINT WINAPI MsiMessageBoxW( HWND hWnd, const WCHAR *lpText, const WCHAR *lpCaption, UINT uType, WORD wLanguageId, + DWORD f ) { - FIXME("%p %s %s %u %08x %08x\n", hWnd, debugstr_w(lpText), debugstr_w(lpCaption), - uType, wLanguageId, f); - return MessageBoxExW(hWnd,lpText,lpCaption,uType,wLanguageId); + FIXME( "%p, %s, %s, %u, %#x %#lx\n", hWnd, debugstr_w(lpText), debugstr_w(lpCaption), uType, wLanguageId, f ); + return MessageBoxExW( hWnd, lpText, lpCaption, uType, wLanguageId ); } -UINT WINAPI MsiMessageBoxExA(HWND hWnd, LPCSTR lpText, LPCSTR lpCaption, UINT uType, - DWORD unknown, WORD wLanguageId, DWORD f) +UINT WINAPI MsiMessageBoxExA( HWND hWnd, const char *lpText, const char *lpCaption, UINT uType, DWORD unknown, + WORD wLanguageId, DWORD f ) { - FIXME("(%p, %s, %s, %u, 0x%08x, 0x%08x, 0x%08x): semi-stub\n", hWnd, debugstr_a(lpText), - debugstr_a(lpCaption), uType, unknown, wLanguageId, f); - return MessageBoxExA(hWnd, lpText, lpCaption, uType, wLanguageId); + FIXME( "%p, %s, %s, %u, %#lx, %#x, %#lx): semi-stub\n", hWnd, debugstr_a(lpText), debugstr_a(lpCaption), uType, + unknown, wLanguageId, f ); + return MessageBoxExA( hWnd, lpText, lpCaption, uType, wLanguageId ); } -UINT WINAPI MsiMessageBoxExW(HWND hWnd, LPCWSTR lpText, LPCWSTR lpCaption, UINT uType, - DWORD unknown, WORD wLanguageId, DWORD f) +UINT WINAPI MsiMessageBoxExW( HWND hWnd, const WCHAR *lpText, const WCHAR *lpCaption, UINT uType, DWORD unknown, + WORD wLanguageId, DWORD f ) { - FIXME("(%p, %s, %s, %u, 0x%08x, 0x%08x, 0x%08x): semi-stub\n", hWnd, debugstr_w(lpText), - debugstr_w(lpCaption), uType, unknown, wLanguageId, f); - return MessageBoxExW(hWnd, lpText, lpCaption, uType, wLanguageId); + FIXME( "%p, %s, %s, %u, %#lx, %#x, %#lx): semi-stub\n", hWnd, debugstr_w(lpText), debugstr_w(lpCaption), uType, + unknown, wLanguageId, f ); + return MessageBoxExW( hWnd, lpText, lpCaption, uType, wLanguageId ); } -UINT WINAPI MsiProvideAssemblyA( LPCSTR szAssemblyName, LPCSTR szAppContext, - DWORD dwInstallMode, DWORD dwAssemblyInfo, LPSTR lpPathBuf, - LPDWORD pcchPathBuf ) +UINT WINAPI MsiProvideAssemblyA( const char *szAssemblyName, const char *szAppContext, DWORD dwInstallMode, + DWORD dwAssemblyInfo, char *lpPathBuf, DWORD *pcchPathBuf ) { - FIXME("%s %s %08x %08x %p %p\n", debugstr_a(szAssemblyName), - debugstr_a(szAppContext), dwInstallMode, dwAssemblyInfo, lpPathBuf, - pcchPathBuf); + FIXME( "%s, %s, %#lx, %#lx, %p, %p\n", debugstr_a(szAssemblyName), debugstr_a(szAppContext), dwInstallMode, + dwAssemblyInfo, lpPathBuf, pcchPathBuf ); return ERROR_CALL_NOT_IMPLEMENTED; } -UINT WINAPI MsiProvideAssemblyW( LPCWSTR szAssemblyName, LPCWSTR szAppContext, - DWORD dwInstallMode, DWORD dwAssemblyInfo, LPWSTR lpPathBuf, - LPDWORD pcchPathBuf ) +UINT WINAPI MsiProvideAssemblyW( const WCHAR *szAssemblyName, const WCHAR *szAppContext, DWORD dwInstallMode, + DWORD dwAssemblyInfo, WCHAR *lpPathBuf, DWORD *pcchPathBuf ) { - FIXME("%s %s %08x %08x %p %p\n", debugstr_w(szAssemblyName), - debugstr_w(szAppContext), dwInstallMode, dwAssemblyInfo, lpPathBuf, - pcchPathBuf); + FIXME( "%s, %s, %#lx, %#lx, %p, %p\n", debugstr_w(szAssemblyName), debugstr_w(szAppContext), dwInstallMode, + dwAssemblyInfo, lpPathBuf, pcchPathBuf ); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -2530,13 +2511,13 @@ UINT WINAPI MsiProvideComponentFromDescriptorW( LPCWSTR szDescriptor, return ERROR_CALL_NOT_IMPLEMENTED; } -HRESULT WINAPI MsiGetFileSignatureInformationA( LPCSTR path, DWORD flags, PCCERT_CONTEXT *cert, - LPBYTE hash, LPDWORD hashlen ) +HRESULT WINAPI MsiGetFileSignatureInformationA( const char *path, DWORD flags, PCCERT_CONTEXT *cert, BYTE *hash, + DWORD *hashlen ) { UINT r; WCHAR *pathW = NULL; - TRACE("%s %08x %p %p %p\n", debugstr_a(path), flags, cert, hash, hashlen); + TRACE( "%s, %#lx, %p, %p, %p\n", debugstr_a(path), flags, cert, hash, hashlen ); if (path && !(pathW = strdupAtoW( path ))) return E_OUTOFMEMORY; r = MsiGetFileSignatureInformationW( pathW, flags, cert, hash, hashlen ); @@ -2544,8 +2525,8 @@ HRESULT WINAPI MsiGetFileSignatureInformationA( LPCSTR path, DWORD flags, PCCERT return r; } -HRESULT WINAPI MsiGetFileSignatureInformationW( LPCWSTR path, DWORD flags, PCCERT_CONTEXT *cert, - LPBYTE hash, LPDWORD hashlen ) +HRESULT WINAPI MsiGetFileSignatureInformationW( const WCHAR *path, DWORD flags, PCCERT_CONTEXT *cert, BYTE *hash, + DWORD *hashlen ) { static GUID generic_verify_v2 = WINTRUST_ACTION_GENERIC_VERIFY_V2; HRESULT hr; @@ -2554,7 +2535,7 @@ HRESULT WINAPI MsiGetFileSignatureInformationW( LPCWSTR path, DWORD flags, PCCER CRYPT_PROVIDER_SGNR *signer; CRYPT_PROVIDER_CERT *provider; - TRACE("%s %08x %p %p %p\n", debugstr_w(path), flags, cert, hash, hashlen); + TRACE( "%s, %#lx, %p, %p, %p\n", debugstr_w(path), flags, cert, hash, hashlen ); if (!path || !cert) return E_INVALIDARG; @@ -2612,15 +2593,13 @@ done: /****************************************************************** * MsiGetProductPropertyA [MSI.@] */ -UINT WINAPI MsiGetProductPropertyA(MSIHANDLE hProduct, LPCSTR szProperty, - LPSTR szValue, LPDWORD pccbValue) +UINT WINAPI MsiGetProductPropertyA( MSIHANDLE hProduct, const char *szProperty, char *szValue, DWORD *pccbValue ) { LPWSTR prop = NULL, val = NULL; DWORD len; UINT r; - TRACE("(%d, %s, %p, %p)\n", hProduct, debugstr_a(szProperty), - szValue, pccbValue); + TRACE( "%lu, %s, %p, %p\n", hProduct, debugstr_a(szProperty), szValue, pccbValue ); if (szValue && !pccbValue) return ERROR_INVALID_PARAMETER; @@ -2674,8 +2653,7 @@ done: /****************************************************************** * MsiGetProductPropertyW [MSI.@] */ -UINT WINAPI MsiGetProductPropertyW(MSIHANDLE hProduct, LPCWSTR szProperty, - LPWSTR szValue, LPDWORD pccbValue) +UINT WINAPI MsiGetProductPropertyW( MSIHANDLE hProduct, const WCHAR *szProperty, WCHAR *szValue, DWORD *pccbValue ) { MSIPACKAGE *package; MSIQUERY *view = NULL; @@ -2683,8 +2661,7 @@ UINT WINAPI MsiGetProductPropertyW(MSIHANDLE hProduct, LPCWSTR szProperty, LPCWSTR val; UINT r; - TRACE("(%d, %s, %p, %p)\n", hProduct, debugstr_w(szProperty), - szValue, pccbValue); + TRACE( "%lu, %s, %p, %p)\n", hProduct, debugstr_w(szProperty), szValue, pccbValue ); if (!szProperty) return ERROR_INVALID_PARAMETER; @@ -3234,13 +3211,11 @@ static UINT get_file_version( const WCHAR *path, WCHAR *verbuf, DWORD *verlen, /****************************************************************** * MsiGetFileVersionW [MSI.@] */ -UINT WINAPI MsiGetFileVersionW( LPCWSTR path, LPWSTR verbuf, LPDWORD verlen, - LPWSTR langbuf, LPDWORD langlen ) +UINT WINAPI MsiGetFileVersionW( const WCHAR *path, WCHAR *verbuf, DWORD *verlen, WCHAR *langbuf, DWORD *langlen ) { UINT ret; - TRACE("%s %p %u %p %u\n", debugstr_w(path), verbuf, verlen ? *verlen : 0, - langbuf, langlen ? *langlen : 0); + TRACE( "%s, %p(%lu), %p(%lu)\n", debugstr_w(path), verbuf, verlen ? *verlen : 0, langbuf, langlen ? *langlen : 0 ); if ((verbuf && !verlen) || (langbuf && !langlen)) return ERROR_INVALID_PARAMETER; @@ -3307,13 +3282,12 @@ end: /*********************************************************************** * MsiUseFeatureExW [MSI.@] */ -INSTALLSTATE WINAPI MsiUseFeatureExW( LPCWSTR szProduct, LPCWSTR szFeature, - DWORD dwInstallMode, DWORD dwReserved ) +INSTALLSTATE WINAPI MsiUseFeatureExW( const WCHAR *szProduct, const WCHAR *szFeature, DWORD dwInstallMode, + DWORD dwReserved ) { INSTALLSTATE state; - TRACE("%s %s %i %i\n", debugstr_w(szProduct), debugstr_w(szFeature), - dwInstallMode, dwReserved); + TRACE( "%s, %s, %lu %#lx\n", debugstr_w(szProduct), debugstr_w(szFeature), dwInstallMode, dwReserved ); state = MsiQueryFeatureStateW( szProduct, szFeature ); @@ -3332,14 +3306,13 @@ INSTALLSTATE WINAPI MsiUseFeatureExW( LPCWSTR szProduct, LPCWSTR szFeature, /*********************************************************************** * MsiUseFeatureExA [MSI.@] */ -INSTALLSTATE WINAPI MsiUseFeatureExA( LPCSTR szProduct, LPCSTR szFeature, - DWORD dwInstallMode, DWORD dwReserved ) +INSTALLSTATE WINAPI MsiUseFeatureExA( const char *szProduct, const char *szFeature, DWORD dwInstallMode, + DWORD dwReserved ) { INSTALLSTATE ret = INSTALLSTATE_UNKNOWN; - LPWSTR prod = NULL, feat = NULL; + WCHAR *prod = NULL, *feat = NULL; - TRACE("%s %s %i %i\n", debugstr_a(szProduct), debugstr_a(szFeature), - dwInstallMode, dwReserved); + TRACE( "%s, %s, %lu, %#lx\n", debugstr_a(szProduct), debugstr_a(szFeature), dwInstallMode, dwReserved ); prod = strdupAtoW( szProduct ); if (szProduct && !prod) @@ -3456,39 +3429,35 @@ static UINT MSI_ProvideQualifiedComponentEx(LPCWSTR szComponent, /*********************************************************************** * MsiProvideQualifiedComponentExW [MSI.@] */ -UINT WINAPI MsiProvideQualifiedComponentExW(LPCWSTR szComponent, - LPCWSTR szQualifier, DWORD dwInstallMode, LPCWSTR szProduct, - DWORD Unused1, DWORD Unused2, LPWSTR lpPathBuf, - LPDWORD pcchPathBuf) +UINT WINAPI MsiProvideQualifiedComponentExW( const WCHAR *szComponent, const WCHAR *szQualifier, DWORD dwInstallMode, + const WCHAR *szProduct, DWORD Unused1, DWORD Unused2, WCHAR *lpPathBuf, + DWORD *pcchPathBuf ) { awstring path; - TRACE("%s %s %u %s %u %u %p %p\n", debugstr_w(szComponent), - debugstr_w(szQualifier), dwInstallMode, debugstr_w(szProduct), - Unused1, Unused2, lpPathBuf, pcchPathBuf); + TRACE( "%s, %s, %lu, %s, %#lx, %#lx, %p, %p\n", debugstr_w(szComponent), debugstr_w(szQualifier), dwInstallMode, + debugstr_w(szProduct), Unused1, Unused2, lpPathBuf, pcchPathBuf ); path.unicode = TRUE; path.str.w = lpPathBuf; - return MSI_ProvideQualifiedComponentEx(szComponent, szQualifier, - dwInstallMode, szProduct, Unused1, Unused2, &path, pcchPathBuf); + return MSI_ProvideQualifiedComponentEx( szComponent, szQualifier, dwInstallMode, szProduct, Unused1, Unused2, + &path, pcchPathBuf ); } /*********************************************************************** * MsiProvideQualifiedComponentExA [MSI.@] */ -UINT WINAPI MsiProvideQualifiedComponentExA(LPCSTR szComponent, - LPCSTR szQualifier, DWORD dwInstallMode, LPCSTR szProduct, - DWORD Unused1, DWORD Unused2, LPSTR lpPathBuf, - LPDWORD pcchPathBuf) +UINT WINAPI MsiProvideQualifiedComponentExA( const char *szComponent, const char *szQualifier, DWORD dwInstallMode, + const char *szProduct, DWORD Unused1, DWORD Unused2, char *lpPathBuf, + DWORD *pcchPathBuf ) { - LPWSTR szwComponent, szwQualifier = NULL, szwProduct = NULL; + WCHAR *szwComponent, *szwQualifier = NULL, *szwProduct = NULL; UINT r = ERROR_OUTOFMEMORY; awstring path; - TRACE("%s %s %u %s %u %u %p %p\n", debugstr_a(szComponent), - debugstr_a(szQualifier), dwInstallMode, debugstr_a(szProduct), - Unused1, Unused2, lpPathBuf, pcchPathBuf); + TRACE( "%s, %s, %lu, %s, %#lx, %#lx, %p, %p\n", debugstr_a(szComponent), debugstr_a(szQualifier), dwInstallMode, + debugstr_a(szProduct), Unused1, Unused2, lpPathBuf, pcchPathBuf ); szwComponent = strdupAtoW( szComponent ); if (szComponent && !szwComponent) @@ -3848,11 +3817,11 @@ UINT WINAPI MsiCreateAndVerifyInstallerDirectory(DWORD dwReserved) { WCHAR path[MAX_PATH]; - TRACE("%d\n", dwReserved); + TRACE( "%#lx\n", dwReserved ); if (dwReserved) { - FIXME("dwReserved=%d\n", dwReserved); + FIXME( "dwReserved = %#lx\n", dwReserved ); return ERROR_INVALID_PARAMETER; } @@ -3952,7 +3921,7 @@ UINT WINAPI MsiGetShortcutTargetW( LPCWSTR szShortcutTarget, return ERROR_FUNCTION_FAILED; } -UINT WINAPI MsiReinstallFeatureW( LPCWSTR szProduct, LPCWSTR szFeature, DWORD dwReinstallMode ) +UINT WINAPI MsiReinstallFeatureW( const WCHAR *szProduct, const WCHAR *szFeature, DWORD dwReinstallMode ) { MSIPACKAGE *package; MSIINSTALLCONTEXT context; @@ -3961,7 +3930,7 @@ UINT WINAPI MsiReinstallFeatureW( LPCWSTR szProduct, LPCWSTR szFeature, DWORD dw WCHAR *ptr, *cmdline; DWORD sz; - TRACE("%s, %s, 0x%08x\n", debugstr_w(szProduct), debugstr_w(szFeature), dwReinstallMode); + TRACE( "%s, %s, %#lx\n", debugstr_w(szProduct), debugstr_w(szFeature), dwReinstallMode ); r = msi_locate_product( szProduct, &context ); if (r != ERROR_SUCCESS) @@ -4023,15 +3992,12 @@ UINT WINAPI MsiReinstallFeatureW( LPCWSTR szProduct, LPCWSTR szFeature, DWORD dw return r; } -UINT WINAPI MsiReinstallFeatureA( LPCSTR szProduct, LPCSTR szFeature, - DWORD dwReinstallMode ) +UINT WINAPI MsiReinstallFeatureA( const char *szProduct, const char *szFeature, DWORD dwReinstallMode ) { - LPWSTR wszProduct; - LPWSTR wszFeature; + WCHAR *wszProduct, *wszFeature; UINT rc; - TRACE("%s %s %i\n", debugstr_a(szProduct), debugstr_a(szFeature), - dwReinstallMode); + TRACE( "%s, %s, %lu\n", debugstr_a(szProduct), debugstr_a(szFeature), dwReinstallMode ); wszProduct = strdupAtoW(szProduct); wszFeature = strdupAtoW(szFeature); @@ -4068,7 +4034,7 @@ UINT msi_get_filehash( MSIPACKAGE *package, const WCHAR *path, MSIFILEHASHINFO * handle = CreateFileW( path, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, NULL ); if (handle == INVALID_HANDLE_VALUE) { - WARN("can't open file %u\n", GetLastError()); + WARN( "can't open file %lu\n", GetLastError() ); return ERROR_FILE_NOT_FOUND; } if ((length = GetFileSize( handle, NULL ))) @@ -4104,10 +4070,9 @@ UINT msi_get_filehash( MSIPACKAGE *package, const WCHAR *path, MSIFILEHASHINFO * /*********************************************************************** * MsiGetFileHashW [MSI.@] */ -UINT WINAPI MsiGetFileHashW( LPCWSTR szFilePath, DWORD dwOptions, - PMSIFILEHASHINFO pHash ) +UINT WINAPI MsiGetFileHashW( const WCHAR *szFilePath, DWORD dwOptions, MSIFILEHASHINFO *pHash ) { - TRACE("%s %08x %p\n", debugstr_w(szFilePath), dwOptions, pHash ); + TRACE( "%s, %#lx, %p\n", debugstr_w(szFilePath), dwOptions, pHash ); if (!szFilePath) return ERROR_INVALID_PARAMETER; @@ -4128,13 +4093,12 @@ UINT WINAPI MsiGetFileHashW( LPCWSTR szFilePath, DWORD dwOptions, /*********************************************************************** * MsiGetFileHashA [MSI.@] */ -UINT WINAPI MsiGetFileHashA( LPCSTR szFilePath, DWORD dwOptions, - PMSIFILEHASHINFO pHash ) +UINT WINAPI MsiGetFileHashA( const char *szFilePath, DWORD dwOptions, MSIFILEHASHINFO *pHash ) { LPWSTR file; UINT r; - TRACE("%s %08x %p\n", debugstr_a(szFilePath), dwOptions, pHash ); + TRACE( "%s, %#lx, %p\n", debugstr_a(szFilePath), dwOptions, pHash ); file = strdupAtoW( szFilePath ); if (szFilePath && !file) @@ -4148,22 +4112,18 @@ UINT WINAPI MsiGetFileHashA( LPCSTR szFilePath, DWORD dwOptions, /*********************************************************************** * MsiAdvertiseScriptW [MSI.@] */ -UINT WINAPI MsiAdvertiseScriptW( LPCWSTR szScriptFile, DWORD dwFlags, - PHKEY phRegData, BOOL fRemoveItems ) +UINT WINAPI MsiAdvertiseScriptW( const WCHAR *szScriptFile, DWORD dwFlags, HKEY *phRegData, BOOL fRemoveItems ) { - FIXME("%s %08x %p %d\n", - debugstr_w( szScriptFile ), dwFlags, phRegData, fRemoveItems ); + FIXME( "%s, %#lx, %p, %d\n", debugstr_w(szScriptFile), dwFlags, phRegData, fRemoveItems ); return ERROR_CALL_NOT_IMPLEMENTED; } /*********************************************************************** * MsiAdvertiseScriptA [MSI.@] */ -UINT WINAPI MsiAdvertiseScriptA( LPCSTR szScriptFile, DWORD dwFlags, - PHKEY phRegData, BOOL fRemoveItems ) +UINT WINAPI MsiAdvertiseScriptA( const char *szScriptFile, DWORD dwFlags, HKEY *phRegData, BOOL fRemoveItems ) { - FIXME("%s %08x %p %d\n", - debugstr_a( szScriptFile ), dwFlags, phRegData, fRemoveItems ); + FIXME( "%s, %#lx, %p, %d\n", debugstr_a(szScriptFile), dwFlags, phRegData, fRemoveItems ); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -4192,11 +4152,10 @@ UINT WINAPI MsiIsProductElevatedA( LPCSTR szProduct, BOOL *pfElevated ) /*********************************************************************** * MsiSetExternalUIRecord [MSI.@] */ -UINT WINAPI MsiSetExternalUIRecord( INSTALLUI_HANDLER_RECORD handler, - DWORD filter, LPVOID context, - PINSTALLUI_HANDLER_RECORD prev ) +UINT WINAPI MsiSetExternalUIRecord( INSTALLUI_HANDLER_RECORD handler, DWORD filter, void *context, + INSTALLUI_HANDLER_RECORD *prev ) { - TRACE("%p %08x %p %p\n", handler, filter, context, prev); + TRACE( "%p, %#lx, %p, %p\n", handler, filter, context, prev ); if (prev) *prev = gUIHandlerRecord; @@ -4242,14 +4201,16 @@ UINT WINAPI MsiInstallMissingComponentW(LPCWSTR szProduct, LPCWSTR szComponent, return ERROR_SUCCESS; } -UINT WINAPI MsiProvideComponentA( LPCSTR product, LPCSTR feature, LPCSTR component, DWORD mode, LPSTR buf, LPDWORD buflen ) +UINT WINAPI MsiProvideComponentA( const char *product, const char *feature, const char *component, DWORD mode, + char *buf, DWORD *buflen ) { WCHAR *productW = NULL, *componentW = NULL, *featureW = NULL, *bufW = NULL; UINT r = ERROR_OUTOFMEMORY; DWORD lenW = 0; int len; - TRACE("%s, %s, %s, %x, %p, %p\n", debugstr_a(product), debugstr_a(component), debugstr_a(feature), mode, buf, buflen); + TRACE( "%s, %s, %s, %#lx, %p, %p\n", debugstr_a(product), debugstr_a(component), debugstr_a(feature), mode, + buf, buflen ); if (product && !(productW = strdupAtoW( product ))) goto done; if (feature && !(featureW = strdupAtoW( feature ))) goto done; @@ -4288,11 +4249,13 @@ done: return r; } -UINT WINAPI MsiProvideComponentW( LPCWSTR product, LPCWSTR feature, LPCWSTR component, DWORD mode, LPWSTR buf, LPDWORD buflen ) +UINT WINAPI MsiProvideComponentW( const WCHAR *product, const WCHAR *feature, const WCHAR *component, DWORD mode, + WCHAR *buf, DWORD *buflen ) { INSTALLSTATE state; - TRACE("%s, %s, %s, %x, %p, %p\n", debugstr_w(product), debugstr_w(component), debugstr_w(feature), mode, buf, buflen); + TRACE( "%s, %s, %s, %#lx, %p, %p\n", debugstr_w(product), debugstr_w(component), debugstr_w(feature), mode, + buf, buflen); state = MsiQueryFeatureStateW( product, feature ); TRACE("feature state: %d\n", state); @@ -4302,7 +4265,7 @@ UINT WINAPI MsiProvideComponentW( LPCWSTR product, LPCWSTR feature, LPCWSTR comp break; default: - FIXME("mode %x not implemented\n", mode); + FIXME( "mode %#lx not implemented\n", mode ); return ERROR_INSTALL_FAILURE; } @@ -4331,12 +4294,12 @@ UINT WINAPI MsiProvideComponentW( LPCWSTR product, LPCWSTR feature, LPCWSTR comp /*********************************************************************** * MsiBeginTransactionA [MSI.@] */ -UINT WINAPI MsiBeginTransactionA( LPCSTR name, DWORD attrs, MSIHANDLE *id, HANDLE *event ) +UINT WINAPI MsiBeginTransactionA( const char *name, DWORD attrs, MSIHANDLE *id, HANDLE *event ) { WCHAR *nameW; UINT r; - FIXME("%s %u %p %p\n", debugstr_a(name), attrs, id, event); + FIXME( "%s, %#lx, %p, %p\n", debugstr_a(name), attrs, id, event ); nameW = strdupAtoW( name ); if (name && !nameW) @@ -4350,9 +4313,9 @@ UINT WINAPI MsiBeginTransactionA( LPCSTR name, DWORD attrs, MSIHANDLE *id, HANDL /*********************************************************************** * MsiBeginTransactionW [MSI.@] */ -UINT WINAPI MsiBeginTransactionW( LPCWSTR name, DWORD attrs, MSIHANDLE *id, HANDLE *event ) +UINT WINAPI MsiBeginTransactionW( const WCHAR *name, DWORD attrs, MSIHANDLE *id, HANDLE *event ) { - FIXME("%s %u %p %p\n", debugstr_w(name), attrs, id, event); + FIXME( "%s, %#lx, %p, %p\n", debugstr_w(name), attrs, id, event ); *id = (MSIHANDLE)0xdeadbeef; *event = (HANDLE)0xdeadbeef; @@ -4365,7 +4328,7 @@ UINT WINAPI MsiBeginTransactionW( LPCWSTR name, DWORD attrs, MSIHANDLE *id, HAND */ UINT WINAPI MsiJoinTransaction( MSIHANDLE handle, DWORD attrs, HANDLE *event ) { - FIXME("%u %08x %p\n", handle, attrs, event); + FIXME( "%lu, %#lx, %p\n", handle, attrs, event ); *event = (HANDLE)0xdeadbeef; return ERROR_SUCCESS; @@ -4376,13 +4339,13 @@ UINT WINAPI MsiJoinTransaction( MSIHANDLE handle, DWORD attrs, HANDLE *event ) */ UINT WINAPI MsiEndTransaction( DWORD state ) { - FIXME("%u\n", state); + FIXME( "%#lx\n", state ); return ERROR_SUCCESS; } -UINT WINAPI Migrate10CachedPackagesW(void* a, void* b, void* c, DWORD d) +UINT WINAPI Migrate10CachedPackagesW( void *a, void *b, void *c, DWORD d ) { - FIXME("%p,%p,%p,%08x\n", a, b, c, d); + FIXME( "%p, %p, %p, %#lx\n", a, b, c, d ); return ERROR_SUCCESS; } diff --git a/dll/win32/msi/msiquery.c b/dll/win32/msi/msiquery.c index 39233c2bd0c..a8585f20af2 100644 --- a/dll/win32/msi/msiquery.c +++ b/dll/win32/msi/msiquery.c @@ -85,13 +85,12 @@ UINT VIEW_find_column( MSIVIEW *table, LPCWSTR name, LPCWSTR table_name, UINT *n return ERROR_INVALID_PARAMETER; } -UINT WINAPI MsiDatabaseOpenViewA(MSIHANDLE hdb, - LPCSTR szQuery, MSIHANDLE *phView) +UINT WINAPI MsiDatabaseOpenViewA( MSIHANDLE hdb, const char *szQuery, MSIHANDLE *phView ) { UINT r; - LPWSTR szwQuery; + WCHAR *szwQuery; - TRACE("%d %s %p\n", hdb, debugstr_a(szQuery), phView); + TRACE( "%lu, %s, %p\n", hdb, debugstr_a(szQuery), phView ); if( szQuery ) { @@ -108,13 +107,12 @@ UINT WINAPI MsiDatabaseOpenViewA(MSIHANDLE hdb, return r; } -UINT MSI_DatabaseOpenViewW(MSIDATABASE *db, - LPCWSTR szQuery, MSIQUERY **pView) +UINT MSI_DatabaseOpenViewW( MSIDATABASE *db, const WCHAR *szQuery, MSIQUERY **pView ) { MSIQUERY *query; UINT r; - TRACE("%s %p\n", debugstr_w(szQuery), pView); + TRACE( "%s, %p\n", debugstr_w(szQuery), pView ); /* pre allocate a handle to hold a pointer to the view */ query = alloc_msiobject( MSIHANDLETYPE_VIEW, sizeof (MSIQUERY), @@ -403,13 +401,13 @@ UINT MSI_ViewFetch(MSIQUERY *query, MSIRECORD **prec) return r; } -UINT WINAPI MsiViewFetch(MSIHANDLE hView, MSIHANDLE *record) +UINT WINAPI MsiViewFetch( MSIHANDLE hView, MSIHANDLE *record ) { MSIQUERY *query; MSIRECORD *rec = NULL; UINT ret; - TRACE("%d %p\n", hView, record); + TRACE( "%lu, %p\n", hView, record ); if( !record ) return ERROR_INVALID_PARAMETER; @@ -468,12 +466,12 @@ UINT MSI_ViewClose(MSIQUERY *query) return view->ops->close( view ); } -UINT WINAPI MsiViewClose(MSIHANDLE hView) +UINT WINAPI MsiViewClose( MSIHANDLE hView ) { MSIQUERY *query; UINT ret; - TRACE("%d\n", hView ); + TRACE( "%lu\n", hView ); query = msihandle2msiinfo( hView, MSIHANDLETYPE_VIEW ); if (!query) @@ -517,13 +515,13 @@ UINT MSI_ViewExecute(MSIQUERY *query, MSIRECORD *rec ) return view->ops->execute( view, rec ); } -UINT WINAPI MsiViewExecute(MSIHANDLE hView, MSIHANDLE hRec) +UINT WINAPI MsiViewExecute( MSIHANDLE hView, MSIHANDLE hRec ) { MSIQUERY *query; MSIRECORD *rec = NULL; UINT ret; - TRACE("%d %d\n", hView, hRec); + TRACE( "%lu, %lu\n", hView, hRec ); if( hRec ) { @@ -641,13 +639,13 @@ UINT MSI_ViewGetColumnInfo( MSIQUERY *query, MSICOLINFO info, MSIRECORD **prec ) return ERROR_SUCCESS; } -UINT WINAPI MsiViewGetColumnInfo(MSIHANDLE hView, MSICOLINFO info, MSIHANDLE *hRec) +UINT WINAPI MsiViewGetColumnInfo( MSIHANDLE hView, MSICOLINFO info, MSIHANDLE *hRec ) { MSIQUERY *query = NULL; MSIRECORD *rec = NULL; UINT r; - TRACE("%d %d %p\n", hView, info, hRec); + TRACE( "%lu, %d, %p\n", hView, info, hRec ); if( !hRec ) return ERROR_INVALID_PARAMETER; @@ -719,14 +717,13 @@ UINT MSI_ViewModify( MSIQUERY *query, MSIMODIFY mode, MSIRECORD *rec ) return r; } -UINT WINAPI MsiViewModify( MSIHANDLE hView, MSIMODIFY eModifyMode, - MSIHANDLE hRecord) +UINT WINAPI MsiViewModify( MSIHANDLE hView, MSIMODIFY eModifyMode, MSIHANDLE hRecord ) { MSIQUERY *query = NULL; MSIRECORD *rec = NULL; UINT r = ERROR_FUNCTION_FAILED; - TRACE("%d %x %d\n", hView, eModifyMode, hRecord); + TRACE( "%lu, %#x, %lu\n", hView, eModifyMode, hRecord ); rec = msihandle2msiinfo( hRecord, MSIHANDLETYPE_RECORD ); @@ -770,13 +767,13 @@ UINT WINAPI MsiViewModify( MSIHANDLE hView, MSIMODIFY eModifyMode, return r; } -MSIDBERROR WINAPI MsiViewGetErrorW( MSIHANDLE handle, LPWSTR buffer, LPDWORD buflen ) +MSIDBERROR WINAPI MsiViewGetErrorW( MSIHANDLE handle, WCHAR *buffer, DWORD *buflen ) { MSIQUERY *query; const WCHAR *column; MSIDBERROR r; - TRACE("%u %p %p\n", handle, buffer, buflen); + TRACE( "%lu, %p, %p\n", handle, buffer, buflen ); if (!buflen) return MSIDBERROR_INVALIDARG; @@ -821,13 +818,13 @@ MSIDBERROR WINAPI MsiViewGetErrorW( MSIHANDLE handle, LPWSTR buffer, LPDWORD buf return r; } -MSIDBERROR WINAPI MsiViewGetErrorA( MSIHANDLE handle, LPSTR buffer, LPDWORD buflen ) +MSIDBERROR WINAPI MsiViewGetErrorA( MSIHANDLE handle, char *buffer, DWORD *buflen ) { MSIQUERY *query; const WCHAR *column; MSIDBERROR r; - TRACE("%u %p %p\n", handle, buffer, buflen); + TRACE( "%lu, %p, %p\n", handle, buffer, buflen ); if (!buflen) return MSIDBERROR_INVALIDARG; @@ -892,7 +889,7 @@ UINT MSI_DatabaseApplyTransformW( MSIDATABASE *db, const WCHAR *transform, int e hr = IStorage_OpenStorage( db->storage, transform + 1, NULL, STGM_SHARE_EXCLUSIVE, NULL, 0, &stg ); if (FAILED( hr )) { - WARN( "failed to open substorage transform 0x%08x\n", hr ); + WARN( "failed to open substorage transform %#lx\n", hr ); return ERROR_FUNCTION_FAILED; } } @@ -901,7 +898,7 @@ UINT MSI_DatabaseApplyTransformW( MSIDATABASE *db, const WCHAR *transform, int e hr = StgOpenStorage( transform, NULL, STGM_DIRECT|STGM_READ|STGM_SHARE_DENY_WRITE, NULL, 0, &stg ); if (FAILED( hr )) { - WARN( "failed to open file transform 0x%08x\n", hr ); + WARN( "failed to open file transform %#lx\n", hr ); return ERROR_FUNCTION_FAILED; } } @@ -938,7 +935,7 @@ UINT WINAPI MsiDatabaseApplyTransformA( MSIHANDLE hdb, const char *transform, in WCHAR *wstr; UINT ret; - TRACE( "%d %s %08x\n", hdb, debugstr_a(transform), error_cond ); + TRACE( "%lu, %s, %#x\n", hdb, debugstr_a(transform), error_cond ); wstr = strdupAtoW( transform ); if (transform && !wstr) @@ -949,19 +946,17 @@ UINT WINAPI MsiDatabaseApplyTransformA( MSIHANDLE hdb, const char *transform, in return ret; } -UINT WINAPI MsiDatabaseGenerateTransformA( MSIHANDLE hdb, MSIHANDLE hdbref, - LPCSTR szTransformFile, int iReserved1, int iReserved2 ) +UINT WINAPI MsiDatabaseGenerateTransformA( MSIHANDLE hdb, MSIHANDLE hdbref, const char *szTransformFile, + int iReserved1, int iReserved2 ) { - FIXME("%d %d %s %d %d\n", hdb, hdbref, - debugstr_a(szTransformFile), iReserved1, iReserved2); + FIXME( "%lu, %lu, %s, %d, %d\n", hdb, hdbref, debugstr_a(szTransformFile), iReserved1, iReserved2 ); return ERROR_CALL_NOT_IMPLEMENTED; } -UINT WINAPI MsiDatabaseGenerateTransformW( MSIHANDLE hdb, MSIHANDLE hdbref, - LPCWSTR szTransformFile, int iReserved1, int iReserved2 ) +UINT WINAPI MsiDatabaseGenerateTransformW( MSIHANDLE hdb, MSIHANDLE hdbref, const WCHAR *szTransformFile, + int iReserved1, int iReserved2 ) { - FIXME("%d %d %s %d %d\n", hdb, hdbref, - debugstr_w(szTransformFile), iReserved1, iReserved2); + FIXME( "%lu, %lu, %s, %d, %d\n", hdb, hdbref, debugstr_w(szTransformFile), iReserved1, iReserved2 ); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -970,7 +965,7 @@ UINT WINAPI MsiDatabaseCommit( MSIHANDLE hdb ) MSIDATABASE *db; UINT r; - TRACE("%d\n", hdb); + TRACE( "%lu\n", hdb ); db = msihandle2msiinfo( hdb, MSIHANDLETYPE_DATABASE ); if( !db ) @@ -1066,7 +1061,7 @@ UINT MSI_DatabaseGetPrimaryKeys( MSIDATABASE *db, r = MSI_IterateRecords( query, 0, msi_primary_key_iterator, &info ); if( r == ERROR_SUCCESS ) { - TRACE("Found %d primary keys\n", info.n ); + TRACE( "found %lu primary keys\n", info.n ); /* allocate a record and fill in the names of the tables */ info.rec = MSI_CreateRecord( info.n ); @@ -1082,14 +1077,13 @@ UINT MSI_DatabaseGetPrimaryKeys( MSIDATABASE *db, return r; } -UINT WINAPI MsiDatabaseGetPrimaryKeysW( MSIHANDLE hdb, - LPCWSTR table, MSIHANDLE* phRec ) +UINT WINAPI MsiDatabaseGetPrimaryKeysW( MSIHANDLE hdb, const WCHAR *table, MSIHANDLE *phRec ) { MSIRECORD *rec = NULL; MSIDATABASE *db; UINT r; - TRACE("%d %s %p\n", hdb, debugstr_w(table), phRec); + TRACE( "%lu, %s, %p\n", hdb, debugstr_w(table), phRec ); db = msihandle2msiinfo( hdb, MSIHANDLETYPE_DATABASE ); if( !db ) @@ -1132,13 +1126,12 @@ UINT WINAPI MsiDatabaseGetPrimaryKeysW( MSIHANDLE hdb, return r; } -UINT WINAPI MsiDatabaseGetPrimaryKeysA(MSIHANDLE hdb, - LPCSTR table, MSIHANDLE* phRec) +UINT WINAPI MsiDatabaseGetPrimaryKeysA( MSIHANDLE hdb, const char *table, MSIHANDLE *phRec ) { - LPWSTR szwTable = NULL; + WCHAR *szwTable = NULL; UINT r; - TRACE("%d %s %p\n", hdb, debugstr_a(table), phRec); + TRACE( "%lu, %s, %p\n", hdb, debugstr_a(table), phRec ); if( table ) { @@ -1152,13 +1145,12 @@ UINT WINAPI MsiDatabaseGetPrimaryKeysA(MSIHANDLE hdb, return r; } -MSICONDITION WINAPI MsiDatabaseIsTablePersistentA( - MSIHANDLE hDatabase, LPCSTR szTableName) +MSICONDITION WINAPI MsiDatabaseIsTablePersistentA( MSIHANDLE hDatabase, const char *szTableName ) { - LPWSTR szwTableName = NULL; + WCHAR *szwTableName = NULL; MSICONDITION r; - TRACE("%x %s\n", hDatabase, debugstr_a(szTableName)); + TRACE( "%lu, %s\n", hDatabase, debugstr_a(szTableName) ); if( szTableName ) { @@ -1172,13 +1164,12 @@ MSICONDITION WINAPI MsiDatabaseIsTablePersistentA( return r; } -MSICONDITION WINAPI MsiDatabaseIsTablePersistentW( - MSIHANDLE hDatabase, LPCWSTR szTableName) +MSICONDITION WINAPI MsiDatabaseIsTablePersistentW( MSIHANDLE hDatabase, const WCHAR *szTableName ) { MSIDATABASE *db; MSICONDITION r; - TRACE("%x %s\n", hDatabase, debugstr_w(szTableName)); + TRACE( "%lu, %s\n", hDatabase, debugstr_w(szTableName) ); db = msihandle2msiinfo( hDatabase, MSIHANDLETYPE_DATABASE ); if( !db ) diff --git a/dll/win32/msi/package.c b/dll/win32/msi/package.c index b65b9e98959..3095026003e 100644 --- a/dll/win32/msi/package.c +++ b/dll/win32/msi/package.c @@ -298,7 +298,7 @@ static void free_package_structures( MSIPACKAGE *package ) list_remove( &binary->entry ); if (!DeleteFileW( binary->tmpfile )) - ERR("failed to delete %s (%u)\n", debugstr_w(binary->tmpfile), GetLastError()); + ERR( "failed to delete %s (%lu)\n", debugstr_w(binary->tmpfile), GetLastError() ); msi_free( binary->source ); msi_free( binary->tmpfile ); msi_free( binary ); @@ -321,7 +321,7 @@ static void free_package_structures( MSIPACKAGE *package ) list_remove( &patch->entry ); if (patch->delete_on_close && !DeleteFileW( patch->localfile )) { - ERR("failed to delete %s (%u)\n", debugstr_w(patch->localfile), GetLastError()); + ERR( "failed to delete %s (%lu)\n", debugstr_w(patch->localfile), GetLastError() ); } msi_free_patchinfo( patch ); } @@ -1553,12 +1553,12 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, DWORD dwOptions, MSIPACKAGE **pPackage) return ERROR_SUCCESS; } -UINT WINAPI MsiOpenPackageExW(LPCWSTR szPackage, DWORD dwOptions, MSIHANDLE *phPackage) +UINT WINAPI MsiOpenPackageExW( const WCHAR *szPackage, DWORD dwOptions, MSIHANDLE *phPackage ) { MSIPACKAGE *package = NULL; UINT ret; - TRACE("%s %08x %p\n", debugstr_w(szPackage), dwOptions, phPackage ); + TRACE( "%s, %#lx, %p\n", debugstr_w(szPackage), dwOptions, phPackage ); if( !szPackage || !phPackage ) return ERROR_INVALID_PARAMETER; @@ -1570,7 +1570,7 @@ UINT WINAPI MsiOpenPackageExW(LPCWSTR szPackage, DWORD dwOptions, MSIHANDLE *phP } if( dwOptions ) - FIXME("dwOptions %08x not supported\n", dwOptions); + FIXME( "dwOptions %#lx not supported\n", dwOptions ); ret = MSI_OpenPackageW( szPackage, 0, &package ); if( ret == ERROR_SUCCESS ) @@ -1615,13 +1615,13 @@ UINT WINAPI MsiOpenPackageA(LPCSTR szPackage, MSIHANDLE *phPackage) return MsiOpenPackageExA( szPackage, 0, phPackage ); } -MSIHANDLE WINAPI MsiGetActiveDatabase(MSIHANDLE hInstall) +MSIHANDLE WINAPI MsiGetActiveDatabase( MSIHANDLE hInstall ) { MSIPACKAGE *package; MSIHANDLE handle = 0; MSIHANDLE remote; - TRACE("(%d)\n",hInstall); + TRACE( "%lu\n", hInstall ); package = msihandle2msiinfo( hInstall, MSIHANDLETYPE_PACKAGE); if( package) @@ -1821,21 +1821,21 @@ INT MSI_ProcessMessageVerbatim(MSIPACKAGE *package, INSTALLMESSAGE eMessageType, if (gUIHandlerRecord && (gUIFilterRecord & log_type)) { MSIHANDLE rec = alloc_msihandle(&record->hdr); - TRACE("Calling UI handler %p(pvContext=%p, iMessageType=%08x, hRecord=%u)\n", - gUIHandlerRecord, gUIContextRecord, eMessageType, rec); + TRACE( "calling UI handler %p(pvContext = %p, iMessageType = %#x, hRecord = %lu)\n", + gUIHandlerRecord, gUIContextRecord, eMessageType, rec ); rc = gUIHandlerRecord( gUIContextRecord, eMessageType, rec ); MsiCloseHandle( rec ); } if (!rc && gUIHandlerW && (gUIFilter & log_type)) { - TRACE("Calling UI handler %p(pvContext=%p, iMessageType=%08x, szMessage=%s)\n", - gUIHandlerW, gUIContext, eMessageType, debugstr_w(message)); + TRACE( "calling UI handler %p(pvContext = %p, iMessageType = %#x, szMessage = %s)\n", + gUIHandlerW, gUIContext, eMessageType, debugstr_w(message) ); rc = gUIHandlerW( gUIContext, eMessageType, message ); } else if (!rc && gUIHandlerA && (gUIFilter & log_type)) { - TRACE("Calling UI handler %p(pvContext=%p, iMessageType=%08x, szMessage=%s)\n", - gUIHandlerA, gUIContext, eMessageType, debugstr_a(msg)); + TRACE( "calling UI handler %p(pvContext = %p, iMessageType = %#x, szMessage = %s)\n", + gUIHandlerA, gUIContext, eMessageType, debugstr_a(msg) ); rc = gUIHandlerA( gUIContext, eMessageType, msg ); } @@ -2214,8 +2214,7 @@ UINT msi_get_property( MSIDATABASE *db, LPCWSTR szName, TRACE("returning %s for property %s\n", debugstr_wn(szValueBuf, *pchValueBuf), debugstr_w(szName)); else if (rc == ERROR_MORE_DATA) - TRACE("need %d sized buffer for %s\n", *pchValueBuf, - debugstr_w(szName)); + TRACE( "need %lu sized buffer for %s\n", *pchValueBuf, debugstr_w(szName) ); else { *pchValueBuf = 0; diff --git a/dll/win32/msi/record.c b/dll/win32/msi/record.c index 46c2d71f6f1..9e11752cc97 100644 --- a/dll/win32/msi/record.c +++ b/dll/win32/msi/record.c @@ -115,7 +115,7 @@ UINT WINAPI MsiRecordGetFieldCount( MSIHANDLE handle ) MSIRECORD *rec; UINT ret; - TRACE("%d\n", handle ); + TRACE( "%lu\n", handle ); rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD ); if( !rec ) @@ -239,7 +239,7 @@ int WINAPI MsiRecordGetInteger( MSIHANDLE handle, UINT iField) MSIRECORD *rec; UINT ret; - TRACE("%d %d\n", handle, iField ); + TRACE( "%lu, %u\n", handle, iField ); rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD ); if( !rec ) @@ -258,7 +258,7 @@ UINT WINAPI MsiRecordClearData( MSIHANDLE handle ) MSIRECORD *rec; UINT i; - TRACE("%d\n", handle ); + TRACE( "%lu\n", handle ); rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD ); if( !rec ) @@ -305,7 +305,7 @@ UINT WINAPI MsiRecordSetInteger( MSIHANDLE handle, UINT iField, int iVal ) MSIRECORD *rec; UINT ret; - TRACE("%d %u %d\n", handle, iField, iVal); + TRACE( "%lu, %u, %d\n", handle, iField, iVal ); rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD ); if( !rec ) @@ -335,7 +335,7 @@ BOOL WINAPI MsiRecordIsNull( MSIHANDLE handle, UINT iField ) MSIRECORD *rec; UINT ret; - TRACE("%d %d\n", handle, iField ); + TRACE( "%lu, %u\n", handle, iField ); rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD ); if( !rec ) @@ -400,13 +400,12 @@ UINT MSI_RecordGetStringA(MSIRECORD *rec, UINT iField, return ret; } -UINT WINAPI MsiRecordGetStringA(MSIHANDLE handle, UINT iField, - LPSTR szValue, LPDWORD pcchValue) +UINT WINAPI MsiRecordGetStringA( MSIHANDLE handle, UINT iField, char *szValue, DWORD *pcchValue ) { MSIRECORD *rec; UINT ret; - TRACE("%d %d %p %p\n", handle, iField, szValue, pcchValue); + TRACE( "%lu, %d, %p, %p\n", handle, iField, szValue, pcchValue ); rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD ); if( !rec ) @@ -436,13 +435,12 @@ const WCHAR *MSI_RecordGetString( const MSIRECORD *rec, UINT iField ) return msi_record_get_string( rec, iField, NULL ); } -UINT MSI_RecordGetStringW(MSIRECORD *rec, UINT iField, - LPWSTR szValue, LPDWORD pcchValue) +UINT MSI_RecordGetStringW( MSIRECORD *rec, UINT iField, WCHAR *szValue, DWORD *pcchValue ) { UINT len = 0, ret = ERROR_SUCCESS; WCHAR buffer[16]; - TRACE("%p %d %p %p\n", rec, iField, szValue, pcchValue); + TRACE( "%p, %u, %p, %p\n", rec, iField, szValue, pcchValue ); if( iField > rec->count ) { @@ -481,13 +479,12 @@ UINT MSI_RecordGetStringW(MSIRECORD *rec, UINT iField, return ret; } -UINT WINAPI MsiRecordGetStringW(MSIHANDLE handle, UINT iField, - LPWSTR szValue, LPDWORD pcchValue) +UINT WINAPI MsiRecordGetStringW( MSIHANDLE handle, UINT iField, WCHAR *szValue, DWORD *pcchValue ) { MSIRECORD *rec; UINT ret; - TRACE("%d %d %p %p\n", handle, iField, szValue, pcchValue); + TRACE( "%lu, %u, %p, %p\n", handle, iField, szValue, pcchValue ); rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD ); if( !rec ) @@ -532,12 +529,12 @@ static UINT MSI_RecordDataSize(MSIRECORD *rec, UINT iField) return 0; } -UINT WINAPI MsiRecordDataSize(MSIHANDLE handle, UINT iField) +UINT WINAPI MsiRecordDataSize( MSIHANDLE handle, UINT iField ) { MSIRECORD *rec; UINT ret; - TRACE("%d %d\n", handle, iField); + TRACE( "%lu, %u\n", handle, iField ); rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD ); if( !rec ) @@ -549,13 +546,13 @@ UINT WINAPI MsiRecordDataSize(MSIHANDLE handle, UINT iField) return ret; } -UINT WINAPI MsiRecordSetStringA( MSIHANDLE handle, UINT iField, LPCSTR szValue ) +UINT WINAPI MsiRecordSetStringA( MSIHANDLE handle, UINT iField, const char *szValue ) { WCHAR *valueW = NULL; MSIRECORD *rec; UINT ret; - TRACE("%d %d %s\n", handle, iField, debugstr_a(szValue)); + TRACE( "%lu, %u %s\n", handle, iField, debugstr_a(szValue) ); if (szValue && !(valueW = strdupAtoW( szValue ))) return ERROR_OUTOFMEMORY; @@ -604,12 +601,12 @@ UINT MSI_RecordSetStringW( MSIRECORD *rec, UINT iField, LPCWSTR szValue ) return msi_record_set_string( rec, iField, szValue, -1 ); } -UINT WINAPI MsiRecordSetStringW( MSIHANDLE handle, UINT iField, LPCWSTR szValue ) +UINT WINAPI MsiRecordSetStringW( MSIHANDLE handle, UINT iField, const WCHAR *szValue ) { MSIRECORD *rec; UINT ret; - TRACE("%d %d %s\n", handle, iField, debugstr_w(szValue)); + TRACE( "%lu, %u, %s\n", handle, iField, debugstr_w(szValue) ); rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD ); if( !rec ) @@ -667,8 +664,7 @@ static UINT RECORD_StreamFromFile(LPCWSTR szFile, IStream **pstm) ulSize.QuadPart = sz; IStream_SetSize(*pstm, ulSize); - TRACE("read %s, %d bytes into IStream %p\n", debugstr_w(szFile), sz, *pstm); - + TRACE( "read %s, %lu bytes into IStream %p\n", debugstr_w(szFile), sz, *pstm ); return ERROR_SUCCESS; } @@ -725,12 +721,12 @@ UINT MSI_RecordSetStreamFromFileW(MSIRECORD *rec, UINT iField, LPCWSTR szFilenam return ERROR_SUCCESS; } -UINT WINAPI MsiRecordSetStreamA(MSIHANDLE hRecord, UINT iField, LPCSTR szFilename) +UINT WINAPI MsiRecordSetStreamA( MSIHANDLE hRecord, UINT iField, const char *szFilename ) { - LPWSTR wstr = NULL; + WCHAR *wstr = NULL; UINT ret; - TRACE("%d %d %s\n", hRecord, iField, debugstr_a(szFilename)); + TRACE( "%lu, %u, %s\n", hRecord, iField, debugstr_a(szFilename) ); if( szFilename ) { @@ -744,12 +740,12 @@ UINT WINAPI MsiRecordSetStreamA(MSIHANDLE hRecord, UINT iField, LPCSTR szFilenam return ret; } -UINT WINAPI MsiRecordSetStreamW(MSIHANDLE handle, UINT iField, LPCWSTR szFilename) +UINT WINAPI MsiRecordSetStreamW( MSIHANDLE handle, UINT iField, const WCHAR *szFilename ) { MSIRECORD *rec; UINT ret; - TRACE("%d %d %s\n", handle, iField, debugstr_w(szFilename)); + TRACE( "%lu, %u, %s\n", handle, iField, debugstr_w(szFilename) ); rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD ); if( !rec ) @@ -820,12 +816,12 @@ UINT MSI_RecordReadStream(MSIRECORD *rec, UINT iField, char *buf, LPDWORD sz) return ERROR_SUCCESS; } -UINT WINAPI MsiRecordReadStream(MSIHANDLE handle, UINT iField, char *buf, LPDWORD sz) +UINT WINAPI MsiRecordReadStream( MSIHANDLE handle, UINT iField, char *buf, DWORD *sz ) { MSIRECORD *rec; UINT ret; - TRACE("%d %d %p %p\n", handle, iField, buf, sz); + TRACE( "%lu, %u, %p, %p\n", handle, iField, buf, sz ); rec = msihandle2msiinfo( handle, MSIHANDLETYPE_RECORD ); if( !rec ) diff --git a/dll/win32/msi/registry.c b/dll/win32/msi/registry.c index 5dc3c0a81c3..877b889ef42 100644 --- a/dll/win32/msi/registry.c +++ b/dll/win32/msi/registry.c @@ -1021,12 +1021,12 @@ UINT WINAPI MsiDecomposeDescriptorA( LPCSTR szDescriptor, LPSTR szProduct, return r; } -UINT WINAPI MsiEnumProductsA(DWORD index, LPSTR lpguid) +UINT WINAPI MsiEnumProductsA( DWORD index, char *lpguid ) { DWORD r; WCHAR szwGuid[GUID_SIZE]; - TRACE("%d %p\n", index, lpguid); + TRACE( "%lu, %p\n", index, lpguid ); if (NULL == lpguid) return ERROR_INVALID_PARAMETER; @@ -1037,9 +1037,9 @@ UINT WINAPI MsiEnumProductsA(DWORD index, LPSTR lpguid) return r; } -UINT WINAPI MsiEnumProductsW(DWORD index, LPWSTR lpguid) +UINT WINAPI MsiEnumProductsW( DWORD index, WCHAR *lpguid ) { - TRACE("%d %p\n", index, lpguid); + TRACE("%lu, %p\n", index, lpguid ); if (NULL == lpguid) return ERROR_INVALID_PARAMETER; @@ -1048,13 +1048,13 @@ UINT WINAPI MsiEnumProductsW(DWORD index, LPWSTR lpguid) NULL, NULL, NULL ); } -UINT WINAPI MsiEnumFeaturesA(LPCSTR szProduct, DWORD index, LPSTR szFeature, LPSTR szParent) +UINT WINAPI MsiEnumFeaturesA( const char *szProduct, DWORD index, char *szFeature, char *szParent ) { DWORD r; WCHAR szwFeature[GUID_SIZE], szwParent[GUID_SIZE]; - LPWSTR szwProduct = NULL; + WCHAR *szwProduct = NULL; - TRACE("%s %d %p %p\n", debugstr_a(szProduct), index, szFeature, szParent); + TRACE( "%s, %lu, %p, %p\n", debugstr_a(szProduct), index, szFeature, szParent ); if( szProduct ) { @@ -1066,10 +1066,8 @@ UINT WINAPI MsiEnumFeaturesA(LPCSTR szProduct, DWORD index, LPSTR szFeature, LPS r = MsiEnumFeaturesW(szwProduct, index, szwFeature, szwParent); if( r == ERROR_SUCCESS ) { - WideCharToMultiByte(CP_ACP, 0, szwFeature, -1, - szFeature, GUID_SIZE, NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, szwParent, -1, - szParent, GUID_SIZE, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, szwFeature, -1, szFeature, GUID_SIZE, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, szwParent, -1, szParent, GUID_SIZE, NULL, NULL); } msi_free( szwProduct); @@ -1077,12 +1075,12 @@ UINT WINAPI MsiEnumFeaturesA(LPCSTR szProduct, DWORD index, LPSTR szFeature, LPS return r; } -UINT WINAPI MsiEnumFeaturesW(LPCWSTR szProduct, DWORD index, LPWSTR szFeature, LPWSTR szParent) +UINT WINAPI MsiEnumFeaturesW( const WCHAR *szProduct, DWORD index, WCHAR *szFeature, WCHAR *szParent ) { HKEY hkeyProduct = 0; DWORD r, sz; - TRACE("%s %d %p %p\n", debugstr_w(szProduct), index, szFeature, szParent); + TRACE( "%s, %lu, %p, %p\n", debugstr_w(szProduct), index, szFeature, szParent ); if( !szProduct ) return ERROR_INVALID_PARAMETER; @@ -1098,12 +1096,12 @@ UINT WINAPI MsiEnumFeaturesW(LPCWSTR szProduct, DWORD index, LPWSTR szFeature, L return r; } -UINT WINAPI MsiEnumComponentsA(DWORD index, LPSTR lpguid) +UINT WINAPI MsiEnumComponentsA( DWORD index, char *lpguid ) { DWORD r; WCHAR szwGuid[GUID_SIZE]; - TRACE("%u, %p\n", index, lpguid); + TRACE( "%lu, %p\n", index, lpguid ); if (!lpguid) return ERROR_INVALID_PARAMETER; @@ -1114,23 +1112,23 @@ UINT WINAPI MsiEnumComponentsA(DWORD index, LPSTR lpguid) return r; } -UINT WINAPI MsiEnumComponentsW(DWORD index, LPWSTR lpguid) +UINT WINAPI MsiEnumComponentsW( DWORD index, WCHAR *lpguid ) { - TRACE("%u, %p\n", index, lpguid); + TRACE( "%lu, %p\n", index, lpguid ); if (!lpguid) return ERROR_INVALID_PARAMETER; return MsiEnumComponentsExW( L"S-1-1-0", MSIINSTALLCONTEXT_ALL, index, lpguid, NULL, NULL, NULL ); } -UINT WINAPI MsiEnumComponentsExA( LPCSTR user_sid, DWORD ctx, DWORD index, CHAR guid[39], - MSIINSTALLCONTEXT *installed_ctx, LPSTR sid, LPDWORD sid_len ) +UINT WINAPI MsiEnumComponentsExA( const char *user_sid, DWORD ctx, DWORD index, CHAR guid[39], + MSIINSTALLCONTEXT *installed_ctx, char *sid, DWORD *sid_len ) { UINT r; WCHAR *user_sidW = NULL, *sidW = NULL, guidW[GUID_SIZE]; - TRACE("%s, %u, %u, %p, %p, %p, %p\n", debugstr_a(user_sid), ctx, index, guid, installed_ctx, - sid, sid_len); + TRACE( "%s, %#lx, %lu, %p, %p, %p, %p\n", debugstr_a(user_sid), ctx, index, guid, installed_ctx, + sid, sid_len ); if (sid && !sid_len) return ERROR_INVALID_PARAMETER; if (user_sid && !(user_sidW = strdupAtoW( user_sid ))) return ERROR_OUTOFMEMORY; @@ -1300,15 +1298,15 @@ done: return r; } -UINT WINAPI MsiEnumComponentsExW( LPCWSTR user_sid, DWORD ctx, DWORD index, WCHAR guid[39], - MSIINSTALLCONTEXT *installed_ctx, LPWSTR sid, LPDWORD sid_len ) +UINT WINAPI MsiEnumComponentsExW( const WCHAR *user_sid, DWORD ctx, DWORD index, WCHAR guid[39], + MSIINSTALLCONTEXT *installed_ctx, WCHAR *sid, DWORD *sid_len ) { UINT r; DWORD idx = 0; static DWORD last_index; - TRACE("%s, %u, %u, %p, %p, %p, %p\n", debugstr_w(user_sid), ctx, index, guid, installed_ctx, - sid, sid_len); + TRACE( "%s, %#lx, %lu, %p, %p, %p, %p\n", debugstr_w(user_sid), ctx, index, guid, installed_ctx, + sid, sid_len ); if ((sid && !sid_len) || !ctx || (user_sid && ctx == MSIINSTALLCONTEXT_MACHINE)) return ERROR_INVALID_PARAMETER; @@ -1327,13 +1325,13 @@ UINT WINAPI MsiEnumComponentsExW( LPCWSTR user_sid, DWORD ctx, DWORD index, WCHA return r; } -UINT WINAPI MsiEnumClientsA(LPCSTR szComponent, DWORD index, LPSTR szProduct) +UINT WINAPI MsiEnumClientsA( const char *szComponent, DWORD index, char *szProduct ) { DWORD r; WCHAR szwProduct[GUID_SIZE]; - LPWSTR szwComponent = NULL; + WCHAR *szwComponent = NULL; - TRACE("%s %d %p\n", debugstr_a(szComponent), index, szProduct); + TRACE( "%s, %lu, %p\n", debugstr_a(szComponent), index, szProduct ); if ( !szProduct ) return ERROR_INVALID_PARAMETER; @@ -1347,23 +1345,20 @@ UINT WINAPI MsiEnumClientsA(LPCSTR szComponent, DWORD index, LPSTR szProduct) r = MsiEnumClientsW(szComponent?szwComponent:NULL, index, szwProduct); if( r == ERROR_SUCCESS ) - { - WideCharToMultiByte(CP_ACP, 0, szwProduct, -1, - szProduct, GUID_SIZE, NULL, NULL); - } + WideCharToMultiByte(CP_ACP, 0, szwProduct, -1, szProduct, GUID_SIZE, NULL, NULL); msi_free( szwComponent); return r; } -UINT WINAPI MsiEnumClientsW(LPCWSTR szComponent, DWORD index, LPWSTR szProduct) +UINT WINAPI MsiEnumClientsW( const WCHAR *szComponent, DWORD index, WCHAR *szProduct ) { HKEY hkeyComp = 0; DWORD r, sz; WCHAR szValName[SQUASHED_GUID_SIZE]; - TRACE("%s %d %p\n", debugstr_w(szComponent), index, szProduct); + TRACE( "%s, %lu, %p\n", debugstr_w(szComponent), index, szProduct ); if (!szComponent || !*szComponent || !szProduct) return ERROR_INVALID_PARAMETER; @@ -1396,35 +1391,33 @@ UINT WINAPI MsiEnumClientsW(LPCWSTR szComponent, DWORD index, LPWSTR szProduct) return r; } -UINT WINAPI MsiEnumClientsExA(LPCSTR component, LPCSTR usersid, DWORD ctx, DWORD index, - CHAR installed_product[GUID_SIZE], - MSIINSTALLCONTEXT *installed_ctx, LPSTR sid, LPDWORD sid_len) +UINT WINAPI MsiEnumClientsExA( const char *component, const char *usersid, DWORD ctx, DWORD index, + char installed_product[GUID_SIZE], MSIINSTALLCONTEXT *installed_ctx, char *sid, + DWORD *sid_len ) { - FIXME("%s, %s, %u, %u, %p, %p, %p, %p\n", debugstr_a(component), debugstr_a(usersid), - ctx, index, installed_product, installed_ctx, sid, sid_len); + FIXME( "%s, %s, %#lx, %lu, %p, %p, %p, %p\n", debugstr_a(component), debugstr_a(usersid), ctx, index, + installed_product, installed_ctx, sid, sid_len ); return ERROR_ACCESS_DENIED; } -UINT WINAPI MsiEnumClientsExW(LPCWSTR component, LPCWSTR usersid, DWORD ctx, DWORD index, - WCHAR installed_product[GUID_SIZE], - MSIINSTALLCONTEXT *installed_ctx, LPWSTR sid, LPDWORD sid_len) +UINT WINAPI MsiEnumClientsExW( const WCHAR *component, const WCHAR *usersid, DWORD ctx, DWORD index, + WCHAR installed_product[GUID_SIZE], MSIINSTALLCONTEXT *installed_ctx, WCHAR *sid, + DWORD *sid_len ) { - FIXME("%s, %s, %u, %u, %p, %p, %p, %p\n", debugstr_w(component), debugstr_w(usersid), - ctx, index, installed_product, installed_ctx, sid, sid_len); + FIXME( "%s, %s, %#lx, %lu, %p, %p, %p, %p\n", debugstr_w(component), debugstr_w(usersid), ctx, index, + installed_product, installed_ctx, sid, sid_len ); return ERROR_ACCESS_DENIED; } -static UINT MSI_EnumComponentQualifiers( LPCWSTR szComponent, DWORD iIndex, - awstring *lpQualBuf, LPDWORD pcchQual, - awstring *lpAppBuf, LPDWORD pcchAppBuf ) +static UINT MSI_EnumComponentQualifiers( const WCHAR *szComponent, DWORD iIndex, awstring *lpQualBuf, + DWORD *pcchQual, awstring *lpAppBuf, DWORD *pcchAppBuf ) { DWORD name_sz, val_sz, name_max, val_max, type, ofs; - LPWSTR name = NULL, val = NULL; + WCHAR *name = NULL, *val = NULL; UINT r, r2; HKEY key; - TRACE("%s %08x %p %p %p %p\n", debugstr_w(szComponent), iIndex, - lpQualBuf, pcchQual, lpAppBuf, pcchAppBuf); + TRACE( "%s, %lu, %p, %p, %p, %p\n", debugstr_w(szComponent), iIndex, lpQualBuf, pcchQual, lpAppBuf, pcchAppBuf ); if (!szComponent) return ERROR_INVALID_PARAMETER; @@ -1451,8 +1444,7 @@ static UINT MSI_EnumComponentQualifiers( LPCWSTR szComponent, DWORD iIndex, { name_sz = name_max; val_sz = val_max; - r = RegEnumValueW( key, iIndex, name, &name_sz, - NULL, &type, (LPBYTE)val, &val_sz ); + r = RegEnumValueW( key, iIndex, name, &name_sz, NULL, &type, (BYTE *)val, &val_sz ); if (r == ERROR_SUCCESS) break; if (r != ERROR_MORE_DATA) @@ -1460,7 +1452,7 @@ static UINT MSI_EnumComponentQualifiers( LPCWSTR szComponent, DWORD iIndex, if (type != REG_MULTI_SZ) { - ERR("component data has wrong type (%d)\n", type); + ERR( "component data has wrong type (%lu)\n", type ); goto end; } @@ -1483,7 +1475,7 @@ static UINT MSI_EnumComponentQualifiers( LPCWSTR szComponent, DWORD iIndex, goto end; continue; } - ERR("should be enough data, but isn't %d %d\n", name_sz, val_sz ); + ERR( "should be enough data, but isn't %lu %lu\n", name_sz, val_sz ); goto end; } @@ -1510,17 +1502,16 @@ end: /************************************************************************* * MsiEnumComponentQualifiersA [MSI.@] */ -UINT WINAPI MsiEnumComponentQualifiersA( LPCSTR szComponent, DWORD iIndex, - LPSTR lpQualifierBuf, LPDWORD pcchQualifierBuf, - LPSTR lpApplicationDataBuf, LPDWORD pcchApplicationDataBuf ) +UINT WINAPI MsiEnumComponentQualifiersA( const char *szComponent, DWORD iIndex, char *lpQualifierBuf, + DWORD *pcchQualifierBuf, char *lpApplicationDataBuf, + DWORD *pcchApplicationDataBuf ) { awstring qual, appdata; - LPWSTR comp; + WCHAR *comp; UINT r; - TRACE("%s %08x %p %p %p %p\n", debugstr_a(szComponent), iIndex, - lpQualifierBuf, pcchQualifierBuf, lpApplicationDataBuf, - pcchApplicationDataBuf); + TRACE( "%s, %lu, %p, %p, %p, %p\n", debugstr_a(szComponent), iIndex, lpQualifierBuf, pcchQualifierBuf, + lpApplicationDataBuf, pcchApplicationDataBuf ); comp = strdupAtoW( szComponent ); if (szComponent && !comp) @@ -1541,15 +1532,14 @@ UINT WINAPI MsiEnumComponentQualifiersA( LPCSTR szComponent, DWORD iIndex, /************************************************************************* * MsiEnumComponentQualifiersW [MSI.@] */ -UINT WINAPI MsiEnumComponentQualifiersW( LPCWSTR szComponent, DWORD iIndex, - LPWSTR lpQualifierBuf, LPDWORD pcchQualifierBuf, - LPWSTR lpApplicationDataBuf, LPDWORD pcchApplicationDataBuf ) +UINT WINAPI MsiEnumComponentQualifiersW( const WCHAR *szComponent, DWORD iIndex, WCHAR *lpQualifierBuf, + DWORD *pcchQualifierBuf, WCHAR *lpApplicationDataBuf, + DWORD *pcchApplicationDataBuf ) { awstring qual, appdata; - TRACE("%s %08x %p %p %p %p\n", debugstr_w(szComponent), iIndex, - lpQualifierBuf, pcchQualifierBuf, lpApplicationDataBuf, - pcchApplicationDataBuf); + TRACE( "%s, %lu, %p, %p, %p, %p\n", debugstr_w(szComponent), iIndex, lpQualifierBuf, pcchQualifierBuf, + lpApplicationDataBuf, pcchApplicationDataBuf ); qual.unicode = TRUE; qual.str.w = lpQualifierBuf; @@ -1557,24 +1547,22 @@ UINT WINAPI MsiEnumComponentQualifiersW( LPCWSTR szComponent, DWORD iIndex, appdata.unicode = TRUE; appdata.str.w = lpApplicationDataBuf; - return MSI_EnumComponentQualifiers( szComponent, iIndex, - &qual, pcchQualifierBuf, &appdata, pcchApplicationDataBuf ); + return MSI_EnumComponentQualifiers( szComponent, iIndex, &qual, pcchQualifierBuf, &appdata, pcchApplicationDataBuf ); } /************************************************************************* * MsiEnumRelatedProductsW [MSI.@] * */ -UINT WINAPI MsiEnumRelatedProductsW(LPCWSTR szUpgradeCode, DWORD dwReserved, - DWORD iProductIndex, LPWSTR lpProductBuf) +UINT WINAPI MsiEnumRelatedProductsW( const WCHAR *szUpgradeCode, DWORD dwReserved, DWORD iProductIndex, + WCHAR *lpProductBuf ) { UINT r; HKEY hkey; WCHAR szKeyName[SQUASHED_GUID_SIZE]; DWORD dwSize = ARRAY_SIZE(szKeyName); - TRACE("%s %u %u %p\n", debugstr_w(szUpgradeCode), dwReserved, - iProductIndex, lpProductBuf); + TRACE( "%s, %#lx, %lu, %p\n", debugstr_w(szUpgradeCode), dwReserved, iProductIndex, lpProductBuf ); if (NULL == szUpgradeCode) return ERROR_INVALID_PARAMETER; @@ -1597,15 +1585,14 @@ UINT WINAPI MsiEnumRelatedProductsW(LPCWSTR szUpgradeCode, DWORD dwReserved, * MsiEnumRelatedProductsA [MSI.@] * */ -UINT WINAPI MsiEnumRelatedProductsA(LPCSTR szUpgradeCode, DWORD dwReserved, - DWORD iProductIndex, LPSTR lpProductBuf) +UINT WINAPI MsiEnumRelatedProductsA( const char *szUpgradeCode, DWORD dwReserved, DWORD iProductIndex, + char *lpProductBuf ) { - LPWSTR szwUpgradeCode = NULL; + WCHAR *szwUpgradeCode = NULL; WCHAR productW[GUID_SIZE]; UINT r; - TRACE("%s %u %u %p\n", debugstr_a(szUpgradeCode), dwReserved, - iProductIndex, lpProductBuf); + TRACE( "%s, %#lx, %lu, %p\n", debugstr_a(szUpgradeCode), dwReserved, iProductIndex, lpProductBuf ); if (szUpgradeCode) { @@ -1628,23 +1615,19 @@ UINT WINAPI MsiEnumRelatedProductsA(LPCSTR szUpgradeCode, DWORD dwReserved, /*********************************************************************** * MsiEnumPatchesExA [MSI.@] */ -UINT WINAPI MsiEnumPatchesExA(LPCSTR szProductCode, LPCSTR szUserSid, - DWORD dwContext, DWORD dwFilter, DWORD dwIndex, LPSTR szPatchCode, - LPSTR szTargetProductCode, MSIINSTALLCONTEXT *pdwTargetProductContext, - LPSTR szTargetUserSid, LPDWORD pcchTargetUserSid) +UINT WINAPI MsiEnumPatchesExA( const char *szProductCode, const char *szUserSid, DWORD dwContext, DWORD dwFilter, + DWORD dwIndex, char *szPatchCode, char *szTargetProductCode, + MSIINSTALLCONTEXT *pdwTargetProductContext, char *szTargetUserSid, + DWORD *pcchTargetUserSid ) { - LPWSTR prodcode = NULL; - LPWSTR usersid = NULL; - LPWSTR targsid = NULL; - WCHAR patch[GUID_SIZE]; - WCHAR targprod[GUID_SIZE]; + WCHAR *prodcode = NULL, *usersid = NULL, *targsid = NULL; + WCHAR patch[GUID_SIZE], targprod[GUID_SIZE]; DWORD len; UINT r; - TRACE("(%s, %s, %d, %d, %d, %p, %p, %p, %p, %p)\n", - debugstr_a(szProductCode), debugstr_a(szUserSid), dwContext, dwFilter, - dwIndex, szPatchCode, szTargetProductCode, pdwTargetProductContext, - szTargetUserSid, pcchTargetUserSid); + TRACE( "%s, %s, %#lx, %lu, %lu, %p, %p, %p, %p, %p\n", debugstr_a(szProductCode), debugstr_a(szUserSid), + dwContext, dwFilter, dwIndex, szPatchCode, szTargetProductCode, pdwTargetProductContext, szTargetUserSid, + pcchTargetUserSid ); if (szTargetUserSid && !pcchTargetUserSid) return ERROR_INVALID_PARAMETER; @@ -1977,10 +1960,10 @@ done: /*********************************************************************** * MsiEnumPatchesExW [MSI.@] */ -UINT WINAPI MsiEnumPatchesExW(LPCWSTR szProductCode, LPCWSTR szUserSid, - DWORD dwContext, DWORD dwFilter, DWORD dwIndex, LPWSTR szPatchCode, - LPWSTR szTargetProductCode, MSIINSTALLCONTEXT *pdwTargetProductContext, - LPWSTR szTargetUserSid, LPDWORD pcchTargetUserSid) +UINT WINAPI MsiEnumPatchesExW( const WCHAR *szProductCode, const WCHAR *szUserSid, DWORD dwContext, DWORD dwFilter, + DWORD dwIndex, WCHAR *szPatchCode, WCHAR *szTargetProductCode, + MSIINSTALLCONTEXT *pdwTargetProductContext, WCHAR *szTargetUserSid, + DWORD *pcchTargetUserSid ) { WCHAR squashed_pc[SQUASHED_GUID_SIZE]; DWORD idx = 0; @@ -1988,10 +1971,9 @@ UINT WINAPI MsiEnumPatchesExW(LPCWSTR szProductCode, LPCWSTR szUserSid, static DWORD last_index; - TRACE("(%s, %s, %d, %d, %d, %p, %p, %p, %p, %p)\n", - debugstr_w(szProductCode), debugstr_w(szUserSid), dwContext, dwFilter, - dwIndex, szPatchCode, szTargetProductCode, pdwTargetProductContext, - szTargetUserSid, pcchTargetUserSid); + TRACE( "%s, %s, %#lx, %lu, %lu, %p, %p, %p, %p, %p)\n", debugstr_w(szProductCode), debugstr_w(szUserSid), + dwContext, dwFilter, dwIndex, szPatchCode, szTargetProductCode, pdwTargetProductContext, szTargetUserSid, + pcchTargetUserSid ); if (!szProductCode || !squash_guid( szProductCode, squashed_pc )) return ERROR_INVALID_PARAMETER; @@ -2031,16 +2013,15 @@ UINT WINAPI MsiEnumPatchesExW(LPCWSTR szProductCode, LPCWSTR szUserSid, /*********************************************************************** * MsiEnumPatchesA [MSI.@] */ -UINT WINAPI MsiEnumPatchesA(LPCSTR szProduct, DWORD iPatchIndex, - LPSTR lpPatchBuf, LPSTR lpTransformsBuf, LPDWORD pcchTransformsBuf) +UINT WINAPI MsiEnumPatchesA( const char *szProduct, DWORD iPatchIndex, char *lpPatchBuf, char *lpTransformsBuf, + DWORD *pcchTransformsBuf ) { - LPWSTR product, transforms; - WCHAR patch[GUID_SIZE]; + WCHAR *product, *transforms, patch[GUID_SIZE]; DWORD len; UINT r; - TRACE("(%s %d %p %p %p)\n", debugstr_a(szProduct), iPatchIndex, - lpPatchBuf, lpTransformsBuf, pcchTransformsBuf); + TRACE( "%s, %lu, %p, %p, %p\n", debugstr_a(szProduct), iPatchIndex, lpPatchBuf, lpTransformsBuf, + pcchTransformsBuf ); if (!szProduct || !lpPatchBuf || !lpTransformsBuf || !pcchTransformsBuf) return ERROR_INVALID_PARAMETER; @@ -2086,16 +2067,16 @@ done: /*********************************************************************** * MsiEnumPatchesW [MSI.@] */ -UINT WINAPI MsiEnumPatchesW(LPCWSTR szProduct, DWORD iPatchIndex, - LPWSTR lpPatchBuf, LPWSTR lpTransformsBuf, LPDWORD pcchTransformsBuf) +UINT WINAPI MsiEnumPatchesW( const WCHAR *szProduct, DWORD iPatchIndex, WCHAR *lpPatchBuf, WCHAR *lpTransformsBuf, + DWORD *pcchTransformsBuf ) { WCHAR *transforms = NULL, squashed_pc[SQUASHED_GUID_SIZE]; HKEY prod; DWORD idx = 0; UINT r; - TRACE("(%s %d %p %p %p)\n", debugstr_w(szProduct), iPatchIndex, - lpPatchBuf, lpTransformsBuf, pcchTransformsBuf); + TRACE( "%s, %lu, %p, %p, %p)\n", debugstr_w(szProduct), iPatchIndex, lpPatchBuf, lpTransformsBuf, + pcchTransformsBuf ); if (!szProduct || !squash_guid( szProduct, squashed_pc )) return ERROR_INVALID_PARAMETER; @@ -2133,15 +2114,15 @@ done: return r; } -UINT WINAPI MsiEnumProductsExA( LPCSTR product, LPCSTR usersid, DWORD ctx, DWORD index, - CHAR installed_product[GUID_SIZE], - MSIINSTALLCONTEXT *installed_ctx, LPSTR sid, LPDWORD sid_len ) +UINT WINAPI MsiEnumProductsExA( const char *product, const char *usersid, DWORD ctx, DWORD index, + char installed_product[GUID_SIZE], MSIINSTALLCONTEXT *installed_ctx, char *sid, + DWORD *sid_len ) { UINT r; WCHAR installed_productW[GUID_SIZE], *productW = NULL, *usersidW = NULL, *sidW = NULL; - TRACE("%s, %s, %u, %u, %p, %p, %p, %p\n", debugstr_a(product), debugstr_a(usersid), - ctx, index, installed_product, installed_ctx, sid, sid_len); + TRACE( "%s, %s, %#lx, %lu, %p, %p, %p, %p\n", debugstr_a(product), debugstr_a(usersid), ctx, index, + installed_product, installed_ctx, sid, sid_len ); if (sid && !sid_len) return ERROR_INVALID_PARAMETER; if (product && !(productW = strdupAtoW( product ))) return ERROR_OUTOFMEMORY; @@ -2342,16 +2323,16 @@ done: return r; } -UINT WINAPI MsiEnumProductsExW( LPCWSTR product, LPCWSTR usersid, DWORD ctx, DWORD index, - WCHAR installed_product[GUID_SIZE], - MSIINSTALLCONTEXT *installed_ctx, LPWSTR sid, LPDWORD sid_len ) +UINT WINAPI MsiEnumProductsExW( const WCHAR *product, const WCHAR *usersid, DWORD ctx, DWORD index, + WCHAR installed_product[GUID_SIZE], MSIINSTALLCONTEXT *installed_ctx, WCHAR *sid, + DWORD *sid_len ) { UINT r; DWORD idx = 0; static DWORD last_index; - TRACE("%s, %s, %u, %u, %p, %p, %p, %p\n", debugstr_w(product), debugstr_w(usersid), - ctx, index, installed_product, installed_ctx, sid, sid_len); + TRACE( "%s, %s, %#lx, %lu, %p, %p, %p, %p\n", debugstr_w(product), debugstr_w(usersid), ctx, index, + installed_product, installed_ctx, sid, sid_len ); if ((sid && !sid_len) || !ctx || (usersid && ctx == MSIINSTALLCONTEXT_MACHINE)) return ERROR_INVALID_PARAMETER; diff --git a/dll/win32/msi/script.c b/dll/win32/msi/script.c index 4585c2b5922..26dcddc041e 100644 --- a/dll/win32/msi/script.c +++ b/dll/win32/msi/script.c @@ -90,7 +90,7 @@ static ULONG WINAPI MsiActiveScriptSite_AddRef(IActiveScriptSite* iface) { MsiActiveScriptSite *This = impl_from_IActiveScriptSite(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE( "(%p)->(%lu)\n", This, ref ); return ref; } @@ -99,7 +99,7 @@ static ULONG WINAPI MsiActiveScriptSite_Release(IActiveScriptSite* iface) MsiActiveScriptSite *This = impl_from_IActiveScriptSite(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE( "(%p)->(%lu)\n", This, ref ); if (!ref) msi_free(This); @@ -118,7 +118,7 @@ static HRESULT WINAPI MsiActiveScriptSite_GetItemInfo(IActiveScriptSite* iface, { MsiActiveScriptSite *This = impl_from_IActiveScriptSite(iface); - TRACE("(%p)->(%p, %d, %p, %p)\n", This, pstrName, dwReturnMask, ppiunkItem, ppti); + TRACE( "(%p)->(%p, %lu, %p, %p)\n", This, pstrName, dwReturnMask, ppiunkItem, ppti ); /* Determine the kind of pointer that is requested, and make sure placeholder is valid */ if (dwReturnMask & SCRIPTINFO_ITYPEINFO) { diff --git a/dll/win32/msi/source.c b/dll/win32/msi/source.c index 0eed436774a..7ed0aabf142 100644 --- a/dll/win32/msi/source.c +++ b/dll/win32/msi/source.c @@ -141,21 +141,17 @@ static UINT OpenURLSubkey(HKEY rootkey, HKEY *key, BOOL create) /****************************************************************** * MsiSourceListEnumMediaDisksA (MSI.@) */ -UINT WINAPI MsiSourceListEnumMediaDisksA(LPCSTR szProductCodeOrPatchCode, - LPCSTR szUserSid, MSIINSTALLCONTEXT dwContext, - DWORD dwOptions, DWORD dwIndex, LPDWORD pdwDiskId, - LPSTR szVolumeLabel, LPDWORD pcchVolumeLabel, - LPSTR szDiskPrompt, LPDWORD pcchDiskPrompt) +UINT WINAPI MsiSourceListEnumMediaDisksA( const char *szProductCodeOrPatchCode, const char *szUserSid, + MSIINSTALLCONTEXT dwContext, DWORD dwOptions, DWORD dwIndex, + DWORD *pdwDiskId, char *szVolumeLabel, DWORD *pcchVolumeLabel, + char *szDiskPrompt, DWORD *pcchDiskPrompt ) { - LPWSTR product = NULL; - LPWSTR usersid = NULL; - LPWSTR volume = NULL; - LPWSTR prompt = NULL; + WCHAR *product = NULL, *usersid = NULL, *volume = NULL, *prompt = NULL; UINT r = ERROR_INVALID_PARAMETER; - TRACE("(%s, %s, %d, %d, %d, %p, %p, %p, %p, %p)\n", debugstr_a(szProductCodeOrPatchCode), - debugstr_a(szUserSid), dwContext, dwOptions, dwIndex, pdwDiskId, - szVolumeLabel, pcchVolumeLabel, szDiskPrompt, pcchDiskPrompt); + TRACE( "%s, %s, %d, %#lx, %lu, %p, %p, %p, %p, %p\n", debugstr_a(szProductCodeOrPatchCode), + debugstr_a(szUserSid), dwContext, dwOptions, dwIndex, pdwDiskId, szVolumeLabel, pcchVolumeLabel, + szDiskPrompt, pcchDiskPrompt ); if (szDiskPrompt && !pcchDiskPrompt) return ERROR_INVALID_PARAMETER; @@ -199,11 +195,10 @@ done: /****************************************************************** * MsiSourceListEnumMediaDisksW (MSI.@) */ -UINT WINAPI MsiSourceListEnumMediaDisksW(LPCWSTR szProductCodeOrPatchCode, - LPCWSTR szUserSid, MSIINSTALLCONTEXT dwContext, - DWORD dwOptions, DWORD dwIndex, LPDWORD pdwDiskId, - LPWSTR szVolumeLabel, LPDWORD pcchVolumeLabel, - LPWSTR szDiskPrompt, LPDWORD pcchDiskPrompt) +UINT WINAPI MsiSourceListEnumMediaDisksW( const WCHAR *szProductCodeOrPatchCode, const WCHAR *szUserSid, + MSIINSTALLCONTEXT dwContext, DWORD dwOptions, DWORD dwIndex, + DWORD *pdwDiskId, WCHAR *szVolumeLabel, DWORD *pcchVolumeLabel, + WCHAR *szDiskPrompt, DWORD *pcchDiskPrompt ) { WCHAR squashed_pc[SQUASHED_GUID_SIZE], convert[11]; WCHAR *value = NULL, *data = NULL, *ptr, *ptr2; @@ -213,9 +208,9 @@ UINT WINAPI MsiSourceListEnumMediaDisksW(LPCWSTR szProductCodeOrPatchCode, UINT r; static DWORD index = 0; - TRACE("(%s, %s, %d, %d, %d, %p, %p, %p, %p)\n", debugstr_w(szProductCodeOrPatchCode), - debugstr_w(szUserSid), dwContext, dwOptions, dwIndex, szVolumeLabel, - pcchVolumeLabel, szDiskPrompt, pcchDiskPrompt); + TRACE( "%s, %s, %d, %#lx, %lu, %p, %p, %p, %p\n", debugstr_w(szProductCodeOrPatchCode), + debugstr_w(szUserSid), dwContext, dwOptions, dwIndex, szVolumeLabel, pcchVolumeLabel, + szDiskPrompt, pcchDiskPrompt ); if (!szProductCodeOrPatchCode || !squash_guid( szProductCodeOrPatchCode, squashed_pc )) return ERROR_INVALID_PARAMETER; @@ -331,20 +326,17 @@ done: /****************************************************************** * MsiSourceListEnumSourcesA (MSI.@) */ -UINT WINAPI MsiSourceListEnumSourcesA(LPCSTR szProductCodeOrPatch, LPCSTR szUserSid, - MSIINSTALLCONTEXT dwContext, - DWORD dwOptions, DWORD dwIndex, - LPSTR szSource, LPDWORD pcchSource) +UINT WINAPI MsiSourceListEnumSourcesA( const char *szProductCodeOrPatch, const char *szUserSid, + MSIINSTALLCONTEXT dwContext, DWORD dwOptions, DWORD dwIndex, char *szSource, + DWORD *pcchSource ) { - LPWSTR product = NULL; - LPWSTR usersid = NULL; - LPWSTR source = NULL; + WCHAR *product = NULL, *usersid = NULL, *source = NULL; DWORD len = 0; UINT r = ERROR_INVALID_PARAMETER; static DWORD index = 0; - TRACE("(%s, %s, %d, %d, %d, %p, %p)\n", debugstr_a(szProductCodeOrPatch), - debugstr_a(szUserSid), dwContext, dwOptions, dwIndex, szSource, pcchSource); + TRACE( "%s, %s, %d, %#lx, %lu, %p, %p)\n", debugstr_a(szProductCodeOrPatch), debugstr_a(szUserSid), dwContext, + dwOptions, dwIndex, szSource, pcchSource ); if (dwIndex == 0) index = 0; @@ -403,10 +395,9 @@ done: /****************************************************************** * MsiSourceListEnumSourcesW (MSI.@) */ -UINT WINAPI MsiSourceListEnumSourcesW(LPCWSTR szProductCodeOrPatch, LPCWSTR szUserSid, - MSIINSTALLCONTEXT dwContext, - DWORD dwOptions, DWORD dwIndex, - LPWSTR szSource, LPDWORD pcchSource) +UINT WINAPI MsiSourceListEnumSourcesW( const WCHAR *szProductCodeOrPatch, const WCHAR *szUserSid, + MSIINSTALLCONTEXT dwContext, DWORD dwOptions, DWORD dwIndex, WCHAR *szSource, + DWORD *pcchSource ) { WCHAR squashed_pc[SQUASHED_GUID_SIZE], name[32]; HKEY source = NULL, subkey = NULL; @@ -414,8 +405,8 @@ UINT WINAPI MsiSourceListEnumSourcesW(LPCWSTR szProductCodeOrPatch, LPCWSTR szUs UINT r = ERROR_INVALID_PARAMETER; static DWORD index = 0; - TRACE("(%s, %s, %d, %d, %d, %p, %p)\n", debugstr_w(szProductCodeOrPatch), - debugstr_w(szUserSid), dwContext, dwOptions, dwIndex, szSource, pcchSource); + TRACE( "%s, %s, %d, %#lx, %lu, %p, %p\n", debugstr_w(szProductCodeOrPatch), debugstr_w(szUserSid), dwContext, + dwOptions, dwIndex, szSource, pcchSource ); if (dwIndex == 0) index = 0; @@ -754,17 +745,16 @@ UINT msi_set_last_used_source(LPCWSTR product, LPCWSTR usersid, /****************************************************************** * MsiSourceListSetInfoW (MSI.@) */ -UINT WINAPI MsiSourceListSetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, - MSIINSTALLCONTEXT dwContext, DWORD dwOptions, - LPCWSTR szProperty, LPCWSTR szValue) +UINT WINAPI MsiSourceListSetInfoW( const WCHAR *szProduct, const WCHAR *szUserSid, MSIINSTALLCONTEXT dwContext, + DWORD dwOptions, const WCHAR *szProperty, const WCHAR *szValue ) { WCHAR squashed_pc[SQUASHED_GUID_SIZE]; HKEY sourcekey, media; LPCWSTR property; UINT rc; - TRACE("%s %s %x %x %s %s\n", debugstr_w(szProduct), debugstr_w(szUserSid), - dwContext, dwOptions, debugstr_w(szProperty), debugstr_w(szValue)); + TRACE( "%s, %s, %d, %#lx, %s, %s\n", debugstr_w(szProduct), debugstr_w(szUserSid), dwContext, dwOptions, + debugstr_w(szProperty), debugstr_w(szValue) ); if (!szProduct || !squash_guid( szProduct, squashed_pc )) return ERROR_INVALID_PARAMETER; @@ -1041,9 +1031,8 @@ error: /****************************************************************** * MsiSourceListAddSourceExW (MSI.@) */ -UINT WINAPI MsiSourceListAddSourceExW( LPCWSTR szProduct, LPCWSTR szUserSid, - MSIINSTALLCONTEXT dwContext, DWORD dwOptions, LPCWSTR szSource, - DWORD dwIndex) +UINT WINAPI MsiSourceListAddSourceExW( const WCHAR *szProduct, const WCHAR *szUserSid, MSIINSTALLCONTEXT dwContext, + DWORD dwOptions, const WCHAR *szSource, DWORD dwIndex ) { HKEY sourcekey, typekey; UINT rc; @@ -1053,8 +1042,8 @@ UINT WINAPI MsiSourceListAddSourceExW( LPCWSTR szProduct, LPCWSTR szUserSid, LPCWSTR postfix; DWORD size, count, index; - TRACE("%s %s %x %x %s %i\n", debugstr_w(szProduct), debugstr_w(szUserSid), - dwContext, dwOptions, debugstr_w(szSource), dwIndex); + TRACE( "%s, %s, %d, %#lx, %s, %lu\n", debugstr_w(szProduct), debugstr_w(szUserSid), dwContext, dwOptions, + debugstr_w(szSource), dwIndex ); if (!szProduct || !squash_guid( szProduct, squashed_pc )) return ERROR_INVALID_PARAMETER; @@ -1086,7 +1075,7 @@ UINT WINAPI MsiSourceListAddSourceExW( LPCWSTR szProduct, LPCWSTR szUserSid, rc = OpenMediaSubkey(sourcekey, &typekey, TRUE); else { - ERR("unknown media type: %08x\n", dwOptions); + ERR( "unknown media type: %#lx\n", dwOptions ); RegCloseKey(sourcekey); return ERROR_FUNCTION_FAILED; } @@ -1194,18 +1183,17 @@ UINT WINAPI MsiSourceListAddMediaDiskA(LPCSTR szProduct, LPCSTR szUserSid, /****************************************************************** * MsiSourceListAddMediaDiskW (MSI.@) */ -UINT WINAPI MsiSourceListAddMediaDiskW(LPCWSTR szProduct, LPCWSTR szUserSid, - MSIINSTALLCONTEXT dwContext, DWORD dwOptions, DWORD dwDiskId, - LPCWSTR szVolumeLabel, LPCWSTR szDiskPrompt) +UINT WINAPI MsiSourceListAddMediaDiskW( const WCHAR *szProduct, const WCHAR *szUserSid, MSIINSTALLCONTEXT dwContext, + DWORD dwOptions, DWORD dwDiskId, const WCHAR *szVolumeLabel, + const WCHAR *szDiskPrompt ) { HKEY sourcekey, mediakey; UINT rc; WCHAR *buffer, squashed_pc[SQUASHED_GUID_SIZE], szIndex[10]; DWORD size; - TRACE("%s %s %x %x %i %s %s\n", debugstr_w(szProduct), - debugstr_w(szUserSid), dwContext, dwOptions, dwDiskId, - debugstr_w(szVolumeLabel), debugstr_w(szDiskPrompt)); + TRACE( "%s, %s, %d, %#lx, %lu, %s, %s\n", debugstr_w(szProduct), debugstr_w(szUserSid), dwContext, dwOptions, + dwDiskId, debugstr_w(szVolumeLabel), debugstr_w(szDiskPrompt) ); if (!szProduct || !squash_guid( szProduct, squashed_pc )) return ERROR_INVALID_PARAMETER; @@ -1257,81 +1245,77 @@ UINT WINAPI MsiSourceListAddMediaDiskW(LPCWSTR szProduct, LPCWSTR szUserSid, /****************************************************************** * MsiSourceListClearAllA (MSI.@) */ -UINT WINAPI MsiSourceListClearAllA( LPCSTR szProduct, LPCSTR szUserName, DWORD dwReserved ) +UINT WINAPI MsiSourceListClearAllA( const char *szProduct, const char *szUserName, DWORD dwReserved ) { - FIXME("(%s %s %d)\n", debugstr_a(szProduct), debugstr_a(szUserName), dwReserved); + FIXME( "%s, %s, %#lx\n", debugstr_a(szProduct), debugstr_a(szUserName), dwReserved ); return ERROR_SUCCESS; } /****************************************************************** * MsiSourceListClearAllW (MSI.@) */ -UINT WINAPI MsiSourceListClearAllW( LPCWSTR szProduct, LPCWSTR szUserName, DWORD dwReserved ) +UINT WINAPI MsiSourceListClearAllW( const WCHAR *szProduct, const WCHAR *szUserName, DWORD dwReserved ) { - FIXME("(%s %s %d)\n", debugstr_w(szProduct), debugstr_w(szUserName), dwReserved); + FIXME( "%s, %s, %#lx\n", debugstr_w(szProduct), debugstr_w(szUserName), dwReserved ); return ERROR_SUCCESS; } /****************************************************************** * MsiSourceListClearAllExA (MSI.@) */ -UINT WINAPI MsiSourceListClearAllExA( LPCSTR szProduct, LPCSTR szUserSid, - MSIINSTALLCONTEXT dwContext, DWORD dwOptions ) +UINT WINAPI MsiSourceListClearAllExA( const char *szProduct, const char *szUserSid, MSIINSTALLCONTEXT dwContext, + DWORD dwOptions ) { - FIXME("(%s %s %d %08x)\n", debugstr_a(szProduct), debugstr_a(szUserSid), - dwContext, dwOptions); + FIXME( "%s, %s, %d, %#lx\n", debugstr_a(szProduct), debugstr_a(szUserSid), dwContext, dwOptions ); return ERROR_SUCCESS; } /****************************************************************** * MsiSourceListClearAllExW (MSI.@) */ -UINT WINAPI MsiSourceListClearAllExW( LPCWSTR szProduct, LPCWSTR szUserSid, - MSIINSTALLCONTEXT dwContext, DWORD dwOptions ) +UINT WINAPI MsiSourceListClearAllExW( const WCHAR *szProduct, const WCHAR *szUserSid, MSIINSTALLCONTEXT dwContext, + DWORD dwOptions ) { - FIXME("(%s %s %d %08x)\n", debugstr_w(szProduct), debugstr_w(szUserSid), - dwContext, dwOptions); + FIXME( "%s, %s, %d, %#lx\n", debugstr_w(szProduct), debugstr_w(szUserSid), dwContext, dwOptions ); return ERROR_SUCCESS; } /****************************************************************** * MsiSourceListClearSourceA (MSI.@) */ -UINT WINAPI MsiSourceListClearSourceA(LPCSTR szProductCodeOrPatchCode, LPCSTR szUserSid, - MSIINSTALLCONTEXT dwContext, DWORD dwOptions, - LPCSTR szSource) +UINT WINAPI MsiSourceListClearSourceA( const char *szProductCodeOrPatchCode, const char *szUserSid, + MSIINSTALLCONTEXT dwContext, DWORD dwOptions, const char *szSource ) { - FIXME("(%s %s %x %x %s)\n", debugstr_a(szProductCodeOrPatchCode), debugstr_a(szUserSid), - dwContext, dwOptions, debugstr_a(szSource)); + FIXME( "%s, %s, %d, %#lx, %s\n", debugstr_a(szProductCodeOrPatchCode), debugstr_a(szUserSid), dwContext, + dwOptions, debugstr_a(szSource) ); return ERROR_SUCCESS; } /****************************************************************** * MsiSourceListClearSourceW (MSI.@) */ -UINT WINAPI MsiSourceListClearSourceW(LPCWSTR szProductCodeOrPatchCode, LPCWSTR szUserSid, - MSIINSTALLCONTEXT dwContext, DWORD dwOptions, - LPCWSTR szSource) +UINT WINAPI MsiSourceListClearSourceW( const WCHAR *szProductCodeOrPatchCode, const WCHAR *szUserSid, + MSIINSTALLCONTEXT dwContext, DWORD dwOptions, LPCWSTR szSource ) { - FIXME("(%s %s %x %x %s)\n", debugstr_w(szProductCodeOrPatchCode), debugstr_w(szUserSid), - dwContext, dwOptions, debugstr_w(szSource)); + FIXME( "%s, %s, %d, %#lx, %s\n", debugstr_w(szProductCodeOrPatchCode), debugstr_w(szUserSid), dwContext, + dwOptions, debugstr_w(szSource) ); return ERROR_SUCCESS; } /****************************************************************** * MsiSourceListForceResolutionA (MSI.@) */ -UINT WINAPI MsiSourceListForceResolutionA(const CHAR *product, const CHAR *user, DWORD reserved) +UINT WINAPI MsiSourceListForceResolutionA( const char *product, const char *user, DWORD reserved ) { - FIXME("(%s %s %x)\n", debugstr_a(product), debugstr_a(user), reserved); + FIXME( "%s, %s, %#lx\n", debugstr_a(product), debugstr_a(user), reserved ); return ERROR_SUCCESS; } /****************************************************************** * MsiSourceListForceResolutionW (MSI.@) */ -UINT WINAPI MsiSourceListForceResolutionW(const WCHAR *product, const WCHAR *user, DWORD reserved) +UINT WINAPI MsiSourceListForceResolutionW( const WCHAR *product, const WCHAR *user, DWORD reserved ) { - FIXME("(%s %s %x)\n", debugstr_w(product), debugstr_w(user), reserved); + FIXME( "%s, %s, %#lx\n", debugstr_w(product), debugstr_w(user), reserved ); return ERROR_SUCCESS; } diff --git a/dll/win32/msi/streams.c b/dll/win32/msi/streams.c index 53698f32872..faa9fe4333a 100644 --- a/dll/win32/msi/streams.c +++ b/dll/win32/msi/streams.c @@ -481,7 +481,7 @@ static UINT load_streams( MSIDATABASE *db ) CoTaskMemFree( stat.pwcsName ); if (FAILED( hr )) { - ERR("unable to open stream %08x\n", hr); + ERR( "unable to open stream %#lx\n", hr ); r = ERROR_FUNCTION_FAILED; break; } @@ -584,7 +584,7 @@ static HRESULT write_stream( IStream *dst, IStream *src ) hr = IStream_Read( src, buf, size, &count ); if (FAILED( hr ) || count != size) { - WARN("failed to read stream: %08x\n", hr); + WARN( "failed to read stream: %#lx\n", hr ); return E_INVALIDARG; } stat.cbSize.QuadPart -= count; @@ -594,7 +594,7 @@ static HRESULT write_stream( IStream *dst, IStream *src ) hr = IStream_Write( dst, buf, size, &count ); if (FAILED( hr ) || count != size) { - WARN("failed to write stream: %08x\n", hr); + WARN( "failed to write stream: %#lx\n", hr ); return E_INVALIDARG; } } @@ -628,7 +628,7 @@ UINT msi_commit_streams( MSIDATABASE *db ) hr = write_stream( stream, db->streams[i].stream ); if (FAILED( hr )) { - ERR("failed to write stream %s (hr = %08x)\n", debugstr_w(encname), hr); + ERR( "failed to write stream %s (hr = %#lx)\n", debugstr_w(encname), hr ); msi_free( encname ); IStream_Release( stream ); return ERROR_FUNCTION_FAILED; @@ -637,14 +637,14 @@ UINT msi_commit_streams( MSIDATABASE *db ) IStream_Release( stream ); if (FAILED( hr )) { - ERR("failed to commit stream %s (hr = %08x)\n", debugstr_w(encname), hr); + ERR( "failed to commit stream %s (hr = %#lx)\n", debugstr_w(encname), hr ); msi_free( encname ); return ERROR_FUNCTION_FAILED; } } else if (hr != STG_E_FILEALREADYEXISTS) { - ERR("failed to create stream %s (hr = %08x)\n", debugstr_w(encname), hr); + ERR( "failed to create stream %s (hr = %#lx)\n", debugstr_w(encname), hr ); msi_free( encname ); return ERROR_FUNCTION_FAILED; } diff --git a/dll/win32/msi/string.c b/dll/win32/msi/string.c index fb0134810b9..70c6873a331 100644 --- a/dll/win32/msi/string.c +++ b/dll/win32/msi/string.c @@ -544,15 +544,15 @@ string_table *msi_load_string_table( IStorage *stg, UINT *bytes_per_strref ) r = add_string( st, n, data+offset, len, refs, TRUE ); if( r != n ) - ERR("Failed to add string %d\n", n ); + ERR( "Failed to add string %lu\n", n ); n++; offset += len; } if ( datasize != offset ) - ERR("string table load failed! (%08x != %08x), please report\n", datasize, offset ); + ERR( "string table load failed! (%u != %lu), please report\n", datasize, offset ); - TRACE("Loaded %d strings\n", count); + TRACE( "loaded %lu strings\n", count ); end: msi_free( pool ); diff --git a/dll/win32/msi/suminfo.c b/dll/win32/msi/suminfo.c index 2337ac2bbdf..0280b036bda 100644 --- a/dll/win32/msi/suminfo.c +++ b/dll/win32/msi/suminfo.c @@ -197,14 +197,14 @@ static void read_properties_from_data( PROPVARIANT *prop, LPBYTE data, DWORD sz { if( idofs[i].propid >= MSI_MAX_PROPS ) { - ERR("Unknown property ID %d\n", idofs[i].propid ); + ERR( "unknown property ID %lu\n", idofs[i].propid ); break; } type = get_type( idofs[i].propid ); if( type == VT_EMPTY ) { - ERR("propid %d has unknown type\n", idofs[i].propid); + ERR( "propid %lu has unknown type\n", idofs[i].propid ); break; } @@ -295,7 +295,7 @@ static UINT load_summary_info( MSISUMMARYINFO *si, IStream *stm ) if( section_hdr.cProperties > MSI_MAX_PROPS ) { - ERR("too many properties %d\n", section_hdr.cProperties); + ERR( "too many properties %lu\n", section_hdr.cProperties ); return ERROR_FUNCTION_FAILED; } @@ -311,7 +311,7 @@ static UINT load_summary_info( MSISUMMARYINFO *si, IStream *stm ) if( SUCCEEDED(r) && count == sz ) read_properties_from_data( si->property, data, sz + SECT_HDR_SIZE ); else - ERR("failed to read properties %d %d\n", count, sz); + ERR( "failed to read properties %lu %lu\n", count, sz ); msi_free( data ); return ERROR_SUCCESS; @@ -511,15 +511,14 @@ UINT msi_get_db_suminfo( MSIDATABASE *db, UINT uiUpdateCount, MSISUMMARYINFO **r return ERROR_SUCCESS; } -UINT WINAPI MsiGetSummaryInformationW( MSIHANDLE hDatabase, - LPCWSTR szDatabase, UINT uiUpdateCount, MSIHANDLE *pHandle ) +UINT WINAPI MsiGetSummaryInformationW( MSIHANDLE hDatabase, const WCHAR *szDatabase, UINT uiUpdateCount, + MSIHANDLE *pHandle ) { MSISUMMARYINFO *si; MSIDATABASE *db; UINT ret; - TRACE("%d %s %d %p\n", hDatabase, debugstr_w(szDatabase), - uiUpdateCount, pHandle); + TRACE( "%lu, %s, %u, %p\n", hDatabase, debugstr_w(szDatabase), uiUpdateCount, pHandle ); if( !pHandle ) return ERROR_INVALID_PARAMETER; @@ -582,14 +581,13 @@ UINT WINAPI MsiGetSummaryInformationW( MSIHANDLE hDatabase, return ret; } -UINT WINAPI MsiGetSummaryInformationA(MSIHANDLE hDatabase, - LPCSTR szDatabase, UINT uiUpdateCount, MSIHANDLE *pHandle) +UINT WINAPI MsiGetSummaryInformationA( MSIHANDLE hDatabase, const char *szDatabase, UINT uiUpdateCount, + MSIHANDLE *pHandle ) { - LPWSTR szwDatabase = NULL; + WCHAR *szwDatabase = NULL; UINT ret; - TRACE("%d %s %d %p\n", hDatabase, debugstr_a(szDatabase), - uiUpdateCount, pHandle); + TRACE( "%lu, %s, %u, %p\n", hDatabase, debugstr_a(szDatabase), uiUpdateCount, pHandle ); if( szDatabase ) { @@ -605,11 +603,11 @@ UINT WINAPI MsiGetSummaryInformationA(MSIHANDLE hDatabase, return ret; } -UINT WINAPI MsiSummaryInfoGetPropertyCount(MSIHANDLE hSummaryInfo, PUINT pCount) +UINT WINAPI MsiSummaryInfoGetPropertyCount( MSIHANDLE hSummaryInfo, UINT *pCount ) { MSISUMMARYINFO *si; - TRACE("%d %p\n", hSummaryInfo, pCount); + TRACE( "%lu, %p\n", hSummaryInfo, pCount ); si = msihandle2msiinfo( hSummaryInfo, MSIHANDLETYPE_SUMMARYINFO ); if( !si ) @@ -736,16 +734,15 @@ LPWSTR msi_get_suminfo_product( IStorage *stg ) return prod; } -UINT WINAPI MsiSummaryInfoGetPropertyA( - MSIHANDLE handle, UINT uiProperty, PUINT puiDataType, LPINT piValue, - FILETIME *pftValue, LPSTR szValueBuf, LPDWORD pcchValueBuf) +UINT WINAPI MsiSummaryInfoGetPropertyA( MSIHANDLE handle, UINT uiProperty, UINT *puiDataType, INT *piValue, + FILETIME *pftValue, char *szValueBuf, DWORD *pcchValueBuf ) { MSISUMMARYINFO *si; awstring str; UINT r; - TRACE("%u, %u, %p, %p, %p, %p, %p\n", handle, uiProperty, puiDataType, - piValue, pftValue, szValueBuf, pcchValueBuf ); + TRACE( "%lu, %u, %p, %p, %p, %p, %p\n", handle, uiProperty, puiDataType, piValue, pftValue, szValueBuf, + pcchValueBuf ); if (uiProperty >= MSI_MAX_PROPS) { @@ -788,16 +785,15 @@ UINT WINAPI MsiSummaryInfoGetPropertyA( return r; } -UINT WINAPI MsiSummaryInfoGetPropertyW( - MSIHANDLE handle, UINT uiProperty, PUINT puiDataType, LPINT piValue, - FILETIME *pftValue, LPWSTR szValueBuf, LPDWORD pcchValueBuf) +UINT WINAPI MsiSummaryInfoGetPropertyW( MSIHANDLE handle, UINT uiProperty, UINT *puiDataType, INT *piValue, + FILETIME *pftValue, WCHAR *szValueBuf, DWORD *pcchValueBuf ) { MSISUMMARYINFO *si; awstring str; UINT r; - TRACE("%u, %u, %p, %p, %p, %p, %p\n", handle, uiProperty, puiDataType, - piValue, pftValue, szValueBuf, pcchValueBuf ); + TRACE( "%lu, %u, %p, %p, %p, %p, %p\n", handle, uiProperty, puiDataType, piValue, pftValue, szValueBuf, + pcchValueBuf ); if (uiProperty >= MSI_MAX_PROPS) { @@ -908,15 +904,14 @@ static UINT msi_set_prop( MSISUMMARYINFO *si, UINT uiProperty, UINT uiDataType, return set_prop( si, uiProperty, type, iValue, pftValue, str ); } -UINT WINAPI MsiSummaryInfoSetPropertyW( MSIHANDLE handle, UINT uiProperty, UINT uiDataType, - INT iValue, FILETIME *pftValue, LPCWSTR szValue ) +UINT WINAPI MsiSummaryInfoSetPropertyW( MSIHANDLE handle, UINT uiProperty, UINT uiDataType, INT iValue, + FILETIME *pftValue, const WCHAR *szValue ) { awcstring str; MSISUMMARYINFO *si; UINT ret; - TRACE("%u, %u, %u, %d, %p, %s\n", handle, uiProperty, uiDataType, iValue, pftValue, - debugstr_w(szValue) ); + TRACE( "%lu, %u, %u, %d, %p, %s\n", handle, uiProperty, uiDataType, iValue, pftValue, debugstr_w(szValue) ); if (!(si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO ))) { @@ -939,15 +934,14 @@ UINT WINAPI MsiSummaryInfoSetPropertyW( MSIHANDLE handle, UINT uiProperty, UINT return ret; } -UINT WINAPI MsiSummaryInfoSetPropertyA( MSIHANDLE handle, UINT uiProperty, UINT uiDataType, - INT iValue, FILETIME *pftValue, LPCSTR szValue ) +UINT WINAPI MsiSummaryInfoSetPropertyA( MSIHANDLE handle, UINT uiProperty, UINT uiDataType, INT iValue, + FILETIME *pftValue, const char *szValue ) { awcstring str; MSISUMMARYINFO *si; UINT ret; - TRACE("%u, %u, %u, %d, %p, %s\n", handle, uiProperty, uiDataType, iValue, pftValue, - debugstr_a(szValue) ); + TRACE( "%lu, %u, %u, %d, %p, %s\n", handle, uiProperty, uiDataType, iValue, pftValue, debugstr_a(szValue) ); if (!(si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO ))) { @@ -1230,7 +1224,7 @@ UINT WINAPI MsiSummaryInfoPersist( MSIHANDLE handle ) MSISUMMARYINFO *si; UINT ret; - TRACE("%d\n", handle ); + TRACE( "%lu\n", handle ); si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO ); if( !si ) @@ -1242,12 +1236,13 @@ UINT WINAPI MsiSummaryInfoPersist( MSIHANDLE handle ) return ret; } -UINT WINAPI MsiCreateTransformSummaryInfoA( MSIHANDLE db, MSIHANDLE db_ref, LPCSTR transform, int error, int validation ) +UINT WINAPI MsiCreateTransformSummaryInfoA( MSIHANDLE db, MSIHANDLE db_ref, const char *transform, int error, + int validation ) { UINT r; WCHAR *transformW = NULL; - TRACE("%u, %u, %s, %d, %d\n", db, db_ref, debugstr_a(transform), error, validation); + TRACE( "%lu, %lu, %s, %d, %d\n", db, db_ref, debugstr_a(transform), error, validation ); if (transform && !(transformW = strdupAtoW( transform ))) return ERROR_OUTOFMEMORY; @@ -1257,9 +1252,10 @@ UINT WINAPI MsiCreateTransformSummaryInfoA( MSIHANDLE db, MSIHANDLE db_ref, LPCS return r; } -UINT WINAPI MsiCreateTransformSummaryInfoW( MSIHANDLE db, MSIHANDLE db_ref, LPCWSTR transform, int error, int validation ) +UINT WINAPI MsiCreateTransformSummaryInfoW( MSIHANDLE db, MSIHANDLE db_ref, const WCHAR *transform, int error, + int validation ) { - FIXME("%u, %u, %s, %d, %d\n", db, db_ref, debugstr_w(transform), error, validation); + FIXME( "%lu, %lu, %s, %d, %d\n", db, db_ref, debugstr_w(transform), error, validation ); return ERROR_FUNCTION_FAILED; } diff --git a/dll/win32/msi/table.c b/dll/win32/msi/table.c index abffe75a1c9..8168e2f837d 100644 --- a/dll/win32/msi/table.c +++ b/dll/win32/msi/table.c @@ -221,8 +221,7 @@ void enum_stream_names( IStorage *stg ) if( FAILED( r ) || !count ) break; decode_streamname( stat.pwcsName, name ); - TRACE("stream %2d -> %s %s\n", n, - debugstr_w(stat.pwcsName), debugstr_w(name) ); + TRACE( "stream %2lu -> %s %s\n", n, debugstr_w(stat.pwcsName), debugstr_w(name) ); CoTaskMemFree( stat.pwcsName ); n++; } @@ -250,14 +249,14 @@ UINT read_stream_data( IStorage *stg, LPCWSTR stname, BOOL table, msi_free( encname ); if( FAILED( r ) ) { - WARN("open stream failed r = %08x - empty table?\n", r); + WARN( "open stream failed r = %#lx - empty table?\n", r ); return ret; } r = IStream_Stat(stm, &stat, STATFLAG_NONAME ); if( FAILED( r ) ) { - WARN("open stream failed r = %08x!\n", r); + WARN( "open stream failed r = %#lx!\n", r ); goto end; } @@ -271,7 +270,7 @@ UINT read_stream_data( IStorage *stg, LPCWSTR stname, BOOL table, data = msi_alloc( sz ); if( !data ) { - WARN("couldn't allocate memory r=%08x!\n", r); + WARN( "couldn't allocate memory r = %#lx!\n", r ); ret = ERROR_NOT_ENOUGH_MEMORY; goto end; } @@ -280,7 +279,7 @@ UINT read_stream_data( IStorage *stg, LPCWSTR stname, BOOL table, if( FAILED( r ) || ( count != sz ) ) { msi_free( data ); - WARN("read stream failed r = %08x!\n", r); + WARN("read stream failed r = %#lx!\n", r); goto end; } @@ -316,7 +315,7 @@ UINT write_stream_data( IStorage *stg, LPCWSTR stname, msi_free( encname ); if( FAILED( r ) ) { - WARN("open stream failed r = %08x\n", r); + WARN( "open stream failed r = %#lx\n", r ); return ret; } @@ -1929,7 +1928,7 @@ static UINT TABLE_add_ref(struct tagMSIVIEW *view) { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; - TRACE("%p %d\n", view, tv->table->ref_count); + TRACE( "%p, %ld\n", view, tv->table->ref_count ); return InterlockedIncrement(&tv->table->ref_count); } @@ -2914,7 +2913,7 @@ UINT MSI_CommitTables( MSIDATABASE *db ) hr = IStorage_Commit( db->storage, 0 ); if (FAILED( hr )) { - WARN("failed to commit changes 0x%08x\n", hr); + WARN( "failed to commit changes %#lx\n", hr ); r = ERROR_FUNCTION_FAILED; } return r; diff --git a/dll/win32/msi/upgrade.c b/dll/win32/msi/upgrade.c index 18649fced3d..c9744e51859 100644 --- a/dll/win32/msi/upgrade.c +++ b/dll/win32/msi/upgrade.c @@ -142,7 +142,7 @@ static UINT ITERATE_FindRelatedProducts(MSIRECORD *rec, LPVOID param) HKEY hukey; INT r; - TRACE("Looking at index %u product %s\n", index, debugstr_w(product)); + TRACE( "looking at index %lu product %s\n", index, debugstr_w(product) ); unsquash_guid(product, productid); if (MSIREG_OpenProductKey(productid, NULL, MSIINSTALLCONTEXT_USERMANAGED, &hukey, FALSE) &&

2 years, 9 months

[reactos] 353/360: [WINESYNC] msi: Use correct integral type.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=36bf55494295a147add92… commit 36bf55494295a147add926190fca19326d55cd92 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Mon Mar 14 21:20:24 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:44 2022 +0100 [WINESYNC] msi: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 337d7911bfb83b0e775a34c96b67b4e67c1fa871 by Eric Pouech <eric.pouech(a)gmail.com> --- dll/win32/msi/action.c | 5 +++-- dll/win32/msi/appsearch.c | 6 ++++-- dll/win32/msi/assembly.c | 4 ++-- dll/win32/msi/custom.c | 4 ++-- dll/win32/msi/database.c | 3 ++- dll/win32/msi/files.c | 5 +++-- dll/win32/msi/msi.c | 3 ++- dll/win32/msi/storages.c | 3 ++- dll/win32/msi/streams.c | 6 ++++-- dll/win32/msi/suminfo.c | 7 ++++--- dll/win32/msi/table.c | 16 ++++++++++------ 11 files changed, 38 insertions(+), 24 deletions(-) diff --git a/dll/win32/msi/action.c b/dll/win32/msi/action.c index 98e503694ba..b3bfa26bea7 100644 --- a/dll/win32/msi/action.c +++ b/dll/win32/msi/action.c @@ -1960,7 +1960,7 @@ static WCHAR *create_temp_dir( MSIDATABASE *db ) if (!db->tempfolder) { WCHAR tmp[MAX_PATH]; - UINT len = ARRAY_SIZE( tmp ); + DWORD len = ARRAY_SIZE( tmp ); if (msi_get_property( db, L"TempFolder", tmp, &len ) || GetFileAttributesW( tmp ) != FILE_ATTRIBUTE_DIRECTORY) @@ -7220,7 +7220,8 @@ static UINT ACTION_InstallAdminPackage( MSIPACKAGE *package ) static UINT ACTION_SetODBCFolders( MSIPACKAGE *package ) { MSIQUERY *view; - UINT r, count; + UINT r; + DWORD count; r = MSI_DatabaseOpenViewW( package->db, L"SELECT * FROM `ODBCDriver`", &view ); if (r == ERROR_SUCCESS) diff --git a/dll/win32/msi/appsearch.c b/dll/win32/msi/appsearch.c index abd3c9d3fd9..d3a8ccc03f3 100644 --- a/dll/win32/msi/appsearch.c +++ b/dll/win32/msi/appsearch.c @@ -157,7 +157,8 @@ static void free_signature( MSISIGNATURE *sig ) static WCHAR *search_file( MSIPACKAGE *package, WCHAR *path, MSISIGNATURE *sig ) { VS_FIXEDFILEINFO *info; - DWORD attr, size; + DWORD attr; + UINT size; LPWSTR val = NULL; LPBYTE buffer; @@ -622,7 +623,8 @@ static BOOL match_languages( const void *version, const WCHAR *languages ) USHORT id; USHORT codepage; } *lang; - DWORD len, num_ids, i, j; + UINT len, j; + DWORD num_ids, i; BOOL found = FALSE; LANGID *ids; diff --git a/dll/win32/msi/assembly.c b/dll/win32/msi/assembly.c index 1007979827a..9cddfd2e68d 100644 --- a/dll/win32/msi/assembly.c +++ b/dll/win32/msi/assembly.c @@ -152,7 +152,7 @@ static MSIRECORD *get_assembly_record( MSIPACKAGE *package, const WCHAR *comp ) struct assembly_name { - UINT count; + DWORD count; UINT index; WCHAR **attrs; }; @@ -268,7 +268,7 @@ IAssemblyEnum *msi_create_assembly_enum( MSIPACKAGE *package, const WCHAR *displ IAssemblyName *name; IAssemblyEnum *ret; WCHAR *str; - UINT len = 0; + DWORD len = 0; if (!package->pCreateAssemblyNameObject || !package->pCreateAssemblyEnum) return NULL; diff --git a/dll/win32/msi/custom.c b/dll/win32/msi/custom.c index 3ee4f82e41f..e33acad3005 100644 --- a/dll/win32/msi/custom.c +++ b/dll/win32/msi/custom.c @@ -219,7 +219,7 @@ WCHAR *msi_create_temp_file( MSIDATABASE *db ) if (!db->tempfolder) { WCHAR tmp[MAX_PATH]; - UINT len = ARRAY_SIZE( tmp ); + DWORD len = ARRAY_SIZE( tmp ); if (msi_get_property( db, L"TempFolder", tmp, &len ) || GetFileAttributesW( tmp ) != FILE_ATTRIBUTE_DIRECTORY) @@ -669,7 +669,7 @@ static DWORD WINAPI custom_client_thread(void *arg) HANDLE thread; HANDLE pipe; DWORD size; - UINT rc; + DWORD rc; CoInitializeEx(NULL, COINIT_MULTITHREADED); /* needed to marshal streams */ diff --git a/dll/win32/msi/database.c b/dll/win32/msi/database.c index c84fd1f6440..dd5a6977460 100644 --- a/dll/win32/msi/database.c +++ b/dll/win32/msi/database.c @@ -1362,7 +1362,8 @@ static LPWSTR get_key_value(MSIQUERY *view, LPCWSTR key, MSIRECORD *rec) { MSIRECORD *colnames; LPWSTR str, val; - UINT r, i = 0, sz = 0; + UINT r, i = 0; + DWORD sz = 0; int cmp; r = MSI_ViewGetColumnInfo(view, MSICOLINFO_NAMES, &colnames); diff --git a/dll/win32/msi/files.c b/dll/win32/msi/files.c index 61694ee19ae..8cb876b2468 100644 --- a/dll/win32/msi/files.c +++ b/dll/win32/msi/files.c @@ -161,7 +161,8 @@ DWORD msi_get_file_version_info( MSIPACKAGE *package, const WCHAR *path, DWORD b VS_FIXEDFILEINFO *msi_get_disk_file_version( MSIPACKAGE *package, const WCHAR *filename ) { VS_FIXEDFILEINFO *ptr, *ret; - DWORD version_size, size; + DWORD version_size; + UINT size; void *version; if (!(version_size = msi_get_file_version_info( package, filename, 0, NULL ))) return NULL; @@ -742,7 +743,7 @@ static UINT patch_assembly( MSIPACKAGE *package, MSIASSEMBLY *assembly, MSIFILEP while ((IAssemblyEnum_GetNextAssembly( iter, NULL, &name, 0 ) == S_OK)) { WCHAR *displayname, *path; - UINT len = 0; + DWORD len = 0; HRESULT hr; hr = IAssemblyName_GetDisplayName( name, NULL, &len, 0 ); diff --git a/dll/win32/msi/msi.c b/dll/win32/msi/msi.c index 960624c0d79..a9e0fbeeda6 100644 --- a/dll/win32/msi/msi.c +++ b/dll/win32/msi/msi.c @@ -3167,7 +3167,8 @@ static UINT get_file_version( const WCHAR *path, WCHAR *verbuf, DWORD *verlen, WCHAR *langbuf, DWORD *langlen ) { UINT ret = ERROR_MORE_DATA; - DWORD len, error; + UINT len; + DWORD error; LPVOID version; VS_FIXEDFILEINFO *ffi; USHORT *lang; diff --git a/dll/win32/msi/storages.c b/dll/win32/msi/storages.c index 336b40a3ae1..8262f601693 100644 --- a/dll/win32/msi/storages.c +++ b/dll/win32/msi/storages.c @@ -466,7 +466,8 @@ static INT add_storages_to_table(MSISTORAGESVIEW *sv) IEnumSTATSTG *stgenum = NULL; STATSTG stat; HRESULT hr; - UINT count = 0, size; + UINT count = 0; + ULONG size; hr = IStorage_EnumElements(sv->db->storage, 0, NULL, 0, &stgenum); if (FAILED(hr)) diff --git a/dll/win32/msi/streams.c b/dll/win32/msi/streams.c index 8f6986039a9..53698f32872 100644 --- a/dll/win32/msi/streams.c +++ b/dll/win32/msi/streams.c @@ -448,7 +448,8 @@ static UINT load_streams( MSIDATABASE *db ) IEnumSTATSTG *stgenum; STATSTG stat; HRESULT hr; - UINT count, r = ERROR_SUCCESS; + ULONG count; + UINT r = ERROR_SUCCESS; IStream *stream; hr = IStorage_EnumElements( db->storage, 0, NULL, 0, &stgenum ); @@ -564,7 +565,8 @@ static HRESULT write_stream( IStream *dst, IStream *src ) char buf[4096]; STATSTG stat; LARGE_INTEGER pos; - UINT count, size; + ULONG count; + UINT size; hr = IStream_Stat( src, &stat, STATFLAG_NONAME ); if (FAILED( hr )) return hr; diff --git a/dll/win32/msi/suminfo.c b/dll/win32/msi/suminfo.c index cd65d68f0eb..2337ac2bbdf 100644 --- a/dll/win32/msi/suminfo.c +++ b/dll/win32/msi/suminfo.c @@ -1124,12 +1124,12 @@ static UINT save_prop( MSISUMMARYINFO *si, HANDLE handle, UINT row ) static const char fmt_begin[] = "%u\t"; static const char data_end[] = "\r\n"; static const char fmt_int[] = "%u"; - UINT r, data_type, len; + UINT r, data_type; SYSTEMTIME system_time; FILETIME file_time; INT int_value; awstring str; - DWORD sz; + DWORD len, sz; str.unicode = FALSE; str.str.a = NULL; @@ -1267,7 +1267,8 @@ UINT msi_load_suminfo_properties( MSIPACKAGE *package ) { MSISUMMARYINFO *si; WCHAR *package_code; - UINT r, len; + UINT r; + DWORD len; awstring str; INT count; diff --git a/dll/win32/msi/table.c b/dll/win32/msi/table.c index bfddd6125e9..abffe75a1c9 100644 --- a/dll/win32/msi/table.c +++ b/dll/win32/msi/table.c @@ -66,7 +66,7 @@ struct tagMSITABLE MSICOLUMNINFO *colinfo; UINT col_count; MSICONDITION persistent; - INT ref_count; + LONG ref_count; WCHAR name[1]; }; @@ -2261,9 +2261,10 @@ static WCHAR* create_key_string(MSITABLEVIEW *tv, MSIRECORD *rec) return key; } -static UINT msi_record_stream_name( const MSITABLEVIEW *tv, MSIRECORD *rec, LPWSTR name, UINT *len ) +static UINT msi_record_stream_name( const MSITABLEVIEW *tv, MSIRECORD *rec, LPWSTR name, DWORD *len ) { - UINT p = 0, l, i, r; + UINT p = 0, i, r; + DWORD l; l = wcslen( tv->name ); if (name && *len > l) @@ -2327,7 +2328,8 @@ static UINT TransformView_set_row( MSIVIEW *view, UINT row, MSIRECORD *rec, UINT MSIRECORD *old_rec; MSIQUERY *q; WCHAR *key; - UINT i, p, r, len, qlen; + UINT i, p, r, qlen; + DWORD len; if (!wcscmp( tv->name, L"_Columns" )) { @@ -2503,7 +2505,8 @@ static UINT TransformView_add_column( MSITABLEVIEW *tv, MSIRECORD *rec ) L"INSERT INTO `_TransformView` (`new`, `Table`, `Current`, `Column`, `Data`) VALUES (1, '"; WCHAR buf[256], *query = buf; - UINT i, p, len, r, qlen; + UINT i, p, r, qlen; + DWORD len; MSIQUERY *q; qlen = p = wcslen( query_pfx ); @@ -2946,7 +2949,8 @@ static UINT read_raw_int(const BYTE *data, UINT col, UINT bytes) static UINT msi_record_encoded_stream_name( const MSITABLEVIEW *tv, MSIRECORD *rec, LPWSTR *pstname ) { - UINT r, len; + UINT r; + DWORD len; WCHAR *name; TRACE("%p %p\n", tv, rec);

2 years, 9 months

[reactos] 352/360: [WINESYNC] msiexec: Enable compilation with long types.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d683397fb91129f4119ff… commit d683397fb91129f4119ff5b020e95607c32acd99 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Mon Mar 14 21:12:26 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:44 2022 +0100 [WINESYNC] msiexec: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 081bd13f1159b43b4d9167d878217669d0eff3cd by Eric Pouech <eric.pouech(a)gmail.com> --- base/system/msiexec/msiexec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/base/system/msiexec/msiexec.c b/base/system/msiexec/msiexec.c index 2ee7d05427c..4fca2655131 100644 --- a/base/system/msiexec/msiexec.c +++ b/base/system/msiexec/msiexec.c @@ -61,13 +61,13 @@ static void ShowUsage(int ExitCode) *filename = 0; res = GetModuleFileNameW(hmsi, filename, ARRAY_SIZE(filename)); if (!res) - WINE_ERR("GetModuleFileName failed: %d\n", GetLastError()); + WINE_ERR("GetModuleFileName failed: %ld\n", GetLastError()); len = ARRAY_SIZE(msiexec_version); *msiexec_version = 0; res = MsiGetFileVersionW(filename, msiexec_version, &len, NULL, NULL); if (res) - WINE_ERR("MsiGetFileVersion failed with %d\n", res); + WINE_ERR("MsiGetFileVersion failed with %ld\n", res); /* Return the length of the resource. No typo: The LPWSTR parameter must be a LPWSTR * for this mode */ @@ -413,7 +413,7 @@ static int custom_action_server(const WCHAR *arg) pipe = CreateFileW(buffer, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); if (pipe == INVALID_HANDLE_VALUE) { - ERR("Failed to create custom action server pipe: %u\n", GetLastError()); + ERR("Failed to create custom action server pipe: %lu\n", GetLastError()); return GetLastError(); } @@ -438,12 +438,12 @@ static int custom_action_server(const WCHAR *arg) thread64 = (DWORD_PTR)thread; if (!WriteFile(pipe, &thread64, sizeof(thread64), &size, NULL) || size != sizeof(thread64)) { - ERR("Failed to write to custom action server pipe: %u\n", GetLastError()); + ERR("Failed to write to custom action server pipe: %lu\n", GetLastError()); CoUninitialize(); return GetLastError(); } } - ERR("Failed to read from custom action server pipe: %u\n", GetLastError()); + ERR("Failed to read from custom action server pipe: %lu\n", GetLastError()); CoUninitialize(); return GetLastError(); }

2 years, 9 months

← Newer
1
2
3
4
5
6
7
8
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2022