[PATCH 12/15] programs/msiexec: enable compilation with long types
Eric Pouech
eric.pouech at gmail.com
Fri Jan 28 10:58:48 CST 2022
---
programs/msiexec/Makefile.in | 1 -
programs/msiexec/msiexec.c | 12 ++++++------
programs/msiexec/service.c | 4 ++--
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/programs/msiexec/Makefile.in b/programs/msiexec/Makefile.in
index 9aebdbdddf0..e873f7aeaa8 100644
--- a/programs/msiexec/Makefile.in
+++ b/programs/msiexec/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = msiexec.exe
IMPORTS = msi ole32 advapi32 user32 comctl32
diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c
index e9e74f5c19e..71ecc0e590a 100644
--- a/programs/msiexec/msiexec.c
+++ b/programs/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();
}
@@ -948,7 +948,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
LogFileName = argvW[i];
if(MsiEnableLogW(LogMode, LogFileName, LogAttributes) != ERROR_SUCCESS)
{
- fprintf(stderr, "Logging in %s (0x%08x, %u) failed\n",
+ fprintf(stderr, "Logging in %s (0x%08lx, %lu) failed\n",
wine_dbgstr_w(LogFileName), LogMode, LogAttributes);
ExitProcess(1);
}
diff --git a/programs/msiexec/service.c b/programs/msiexec/service.c
index 735cd5c0fb0..573b3782473 100644
--- a/programs/msiexec/service.c
+++ b/programs/msiexec/service.c
@@ -83,7 +83,7 @@ static BOOL UpdateSCMStatus(DWORD dwCurrentState, DWORD dwWin32ExitCode,
static void WINAPI ServiceCtrlHandler(DWORD code)
{
- WINE_TRACE("%d\n", code);
+ WINE_TRACE("%ld\n", code);
switch (code)
{
@@ -93,7 +93,7 @@ static void WINAPI ServiceCtrlHandler(DWORD code)
KillService();
break;
default:
- fprintf(stderr, "Unhandled service control code: %d\n", code);
+ fprintf(stderr, "Unhandled service control code: %ld\n", code);
UpdateSCMStatus(SERVICE_RUNNING, NO_ERROR, 0);
break;
}
More information about the wine-devel
mailing list