Eric Pouech : uninstaller: Enable compilation with long types.
Alexandre Julliard
julliard at winehq.org
Mon Feb 7 15:56:04 CST 2022
Module: wine
Branch: master
Commit: bae8ef750a944f6a047cd6ec47eb813bdff5bc18
URL: https://source.winehq.org/git/wine.git/?a=commit;h=bae8ef750a944f6a047cd6ec47eb813bdff5bc18
Author: Eric Pouech <eric.pouech at gmail.com>
Date: Mon Feb 7 08:40:13 2022 +0100
uninstaller: Enable compilation with long types.
Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
programs/uninstaller/Makefile.in | 1 -
programs/uninstaller/main.c | 8 ++++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/programs/uninstaller/Makefile.in b/programs/uninstaller/Makefile.in
index 0fc7d679f19..f7fef51a51c 100644
--- a/programs/uninstaller/Makefile.in
+++ b/programs/uninstaller/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = uninstaller.exe
IMPORTS = advapi32
DELAYIMPORTS = shlwapi shell32 user32 gdi32 comctl32
diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c
index d8203b6763b..68d0dfe49f9 100644
--- a/programs/uninstaller/main.c
+++ b/programs/uninstaller/main.c
@@ -79,7 +79,7 @@ static void output_formatstring(const WCHAR *fmt, va_list va_args)
fmt, 0, 0, (LPWSTR)&str, 0, &va_args);
if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE)
{
- WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt));
+ WINE_FIXME("Could not format string: le=%lu, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt));
return;
}
output_writeconsole(str, len);
@@ -93,7 +93,7 @@ static void WINAPIV output_message(unsigned int id, ...)
if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, ARRAY_SIZE(fmt)))
{
- WINE_FIXME("LoadString failed with %d\n", GetLastError());
+ WINE_FIXME("LoadString failed with %ld\n", GetLastError());
return;
}
va_start(va_args, id);
@@ -173,7 +173,7 @@ int __cdecl wmain(int argc, WCHAR *argv[])
GetExitCodeProcess( pi.hProcess, &exit_code );
ExitProcess( exit_code );
}
- else WINE_ERR( "failed to restart 64-bit %s, err %d\n", wine_dbgstr_w(filename), GetLastError() );
+ else WINE_ERR( "failed to restart 64-bit %s, err %ld\n", wine_dbgstr_w(filename), GetLastError() );
Wow64RevertWow64FsRedirection( redir );
}
@@ -347,7 +347,7 @@ static void UninstallProgram(void)
{ /* wait for the process to exit */
WaitForSingleObject(info.hProcess, INFINITE);
res = GetExitCodeProcess(info.hProcess, &exit_code);
- WINE_TRACE("%d: %08x\n", res, exit_code);
+ WINE_TRACE("%d: %08lx\n", res, exit_code);
}
else
{
More information about the wine-cvs
mailing list