Commit f158558d authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard

regedit: Enable compilation with long types.

parent 0b4a16fb
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = regedit.exe MODULE = regedit.exe
IMPORTS = advapi32 IMPORTS = advapi32
DELAYIMPORTS = shlwapi shell32 comdlg32 comctl32 user32 gdi32 DELAYIMPORTS = shlwapi shell32 comdlg32 comctl32 user32 gdi32
......
...@@ -288,7 +288,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) ...@@ -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) { if (DialogBoxW(0, MAKEINTRESOURCEW(IDD_EDIT_DWORD), hwnd, modify_dlgproc) == IDOK) {
DWORD val; DWORD val;
CHAR* valueA = GetMultiByteString(stringValueData); 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)); lRet = RegSetValueExW(hKey, valueName, 0, type, (BYTE*)&val, sizeof(val));
if (lRet == ERROR_SUCCESS) result = TRUE; if (lRet == ERROR_SUCCESS) result = TRUE;
else error_code_messagebox(hwnd, IDS_SET_VALUE_FAILED); else error_code_messagebox(hwnd, IDS_SET_VALUE_FAILED);
......
...@@ -220,7 +220,7 @@ static int add_favourite_key_items(HMENU hMenu, HWND hList) ...@@ -220,7 +220,7 @@ static int add_favourite_key_items(HMENU hMenu, HWND hList)
&max_value_len, NULL, NULL, NULL); &max_value_len, NULL, NULL, NULL);
if (rc != ERROR_SUCCESS) if (rc != ERROR_SUCCESS)
{ {
ERR("RegQueryInfoKey failed: %d\n", rc); ERR("RegQueryInfoKey failed: %ld\n", rc);
goto exit; goto exit;
} }
......
...@@ -167,7 +167,7 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi ...@@ -167,7 +167,7 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi
GetExitCodeProcess( pi.hProcess, &exit_code ); GetExitCodeProcess( pi.hProcess, &exit_code );
ExitProcess( 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 ); Wow64RevertWow64FsRedirection( redir );
} }
......
...@@ -59,7 +59,7 @@ static void output_formatstring(const WCHAR *fmt, va_list va_args) ...@@ -59,7 +59,7 @@ static void output_formatstring(const WCHAR *fmt, va_list va_args)
fmt, 0, 0, (WCHAR *)&str, 0, &va_args); fmt, 0, 0, (WCHAR *)&str, 0, &va_args);
if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) 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; return;
} }
output_writeconsole(str, len); output_writeconsole(str, len);
...@@ -73,7 +73,7 @@ void WINAPIV output_message(unsigned int id, ...) ...@@ -73,7 +73,7 @@ void WINAPIV output_message(unsigned int id, ...)
if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, ARRAY_SIZE(fmt))) 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; return;
} }
va_start(va_args, id); va_start(va_args, id);
...@@ -88,7 +88,7 @@ void WINAPIV error_exit(unsigned int id, ...) ...@@ -88,7 +88,7 @@ void WINAPIV error_exit(unsigned int id, ...)
if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, ARRAY_SIZE(fmt))) 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; return;
} }
va_start(va_args, id); va_start(va_args, id);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment