Module: wine Branch: master Commit: f158558d193583b2e5a3c1cca3279cc20e632fce URL: https://source.winehq.org/git/wine.git/?a=commit;h=f158558d193583b2e5a3c1cca...
Author: Eric Pouech eric.pouech@gmail.com Date: Fri Feb 4 09:57:23 2022 +0100
regedit: Enable compilation with long types.
Signed-off-by: Eric Pouech eric.pouech@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
programs/regedit/Makefile.in | 1 - programs/regedit/edit.c | 2 +- programs/regedit/framewnd.c | 2 +- programs/regedit/main.c | 2 +- programs/regedit/regedit.c | 6 +++--- 5 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/programs/regedit/Makefile.in b/programs/regedit/Makefile.in index d53a1c5ccfc..9f8fb5af165 100644 --- a/programs/regedit/Makefile.in +++ b/programs/regedit/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = regedit.exe IMPORTS = advapi32 DELAYIMPORTS = shlwapi shell32 comdlg32 comctl32 user32 gdi32 diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 13f2256b2cb..3f99626dd23 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -288,7 +288,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) if (DialogBoxW(0, MAKEINTRESOURCEW(IDD_EDIT_DWORD), hwnd, modify_dlgproc) == IDOK) { DWORD val; CHAR* valueA = GetMultiByteString(stringValueData); - if (sscanf(valueA, isDecimal ? "%u" : "%x", &val)) { + if (sscanf(valueA, isDecimal ? "%lu" : "%lx", &val)) { lRet = RegSetValueExW(hKey, valueName, 0, type, (BYTE*)&val, sizeof(val)); if (lRet == ERROR_SUCCESS) result = TRUE; else error_code_messagebox(hwnd, IDS_SET_VALUE_FAILED); diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index bb843a89af4..7a1507bb54e 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -220,7 +220,7 @@ static int add_favourite_key_items(HMENU hMenu, HWND hList) &max_value_len, NULL, NULL, NULL); if (rc != ERROR_SUCCESS) { - ERR("RegQueryInfoKey failed: %d\n", rc); + ERR("RegQueryInfoKey failed: %ld\n", rc); goto exit; }
diff --git a/programs/regedit/main.c b/programs/regedit/main.c index d9f81218acb..e0f89255461 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -167,7 +167,7 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi 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 ); }
diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index c60d1ddb9b6..d2e27340300 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -59,7 +59,7 @@ static void output_formatstring(const WCHAR *fmt, va_list va_args) fmt, 0, 0, (WCHAR *)&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); @@ -73,7 +73,7 @@ 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); @@ -88,7 +88,7 @@ void WINAPIV error_exit(unsigned int id, ...)
if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, ARRAY_SIZE(fmt))) { - WINE_FIXME("LoadString failed with %u\n", GetLastError()); + WINE_FIXME("LoadString failed with %lu\n", GetLastError()); return; } va_start(va_args, id);