February 2022 - Wine-Commits

Zebediah Figura : d3d10core/tests: Don't run the 32-bit tests multithreaded.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 364aed6829113969d81fe4c63a8a0bb4737dff2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=364aed6829113969d81fe4c6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 7 14:46:31 2022 +0100 d3d10core/tests: Don't run the 32-bit tests multithreaded. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index a5f7f4202d5..49622bd0e26 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -19223,6 +19223,11 @@ START_TEST(d3d10core) char **argv; use_mt = !getenv("WINETEST_NO_MT_D3D"); + /* Some host drivers (MacOS, Mesa radeonsi) never unmap memory even when + * requested. When using the chunk allocator, running the tests with more + * than one thread can exceed the 32-bit virtual address space. */ + if (sizeof(void *) == 4 && !strcmp(winetest_platform, "wine")) + use_mt = FALSE; argc = winetest_get_mainargs(&argv); for (i = 2; i < argc; ++i)

1 0

Zebediah Figura : d2d1/tests: Don't run the 32-bit tests multithreaded.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 0823de79c19cb65242cf7f4e6290810e01e13b15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0823de79c19cb65242cf7f4e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 7 14:46:30 2022 +0100 d2d1/tests: Don't run the 32-bit tests multithreaded. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 2ac48e026c3..ba67dd53111 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10551,6 +10551,11 @@ START_TEST(d2d1) pD2D1ConvertColorSpace = (void *)GetProcAddress(d2d1_dll, "D2D1ConvertColorSpace"); use_mt = !getenv("WINETEST_NO_MT_D3D"); + /* Some host drivers (MacOS, Mesa radeonsi) never unmap memory even when + * requested. When using the chunk allocator, running the tests with more + * than one thread can exceed the 32-bit virtual address space. */ + if (sizeof(void *) == 4 && !strcmp(winetest_platform, "wine")) + use_mt = FALSE; argc = winetest_get_mainargs(&argv); for (i = 2; i < argc; ++i)

1 0

Andrey Gusev : api-ms-win-security-lsalookup-ansi-l2-1-0: Add dll.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 0894a4ad48c14f40956c7cc85c5ffc12985442d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0894a4ad48c14f40956c7cc8… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Feb 4 14:52:40 2022 +0200 api-ms-win-security-lsalookup-ansi-l2-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/Makefile.in | 1 + .../api-ms-win-security-lsalookup-ansi-l2-1-0.spec | 5 +++++ tools/make_specfiles | 1 + 5 files changed, 10 insertions(+) diff --git a/configure b/configure index 2d4aed06f6f..4a9f9010f94 100755 --- a/configure +++ b/configure @@ -1158,6 +1158,7 @@ enable_api_ms_win_security_base_private_l1_1_1 enable_api_ms_win_security_credentials_l1_1_0 enable_api_ms_win_security_cryptoapi_l1_1_0 enable_api_ms_win_security_grouppolicy_l1_1_0 +enable_api_ms_win_security_lsalookup_ansi_l2_1_0 enable_api_ms_win_security_lsalookup_l1_1_0 enable_api_ms_win_security_lsalookup_l1_1_1 enable_api_ms_win_security_lsalookup_l2_1_0 @@ -21652,6 +21653,7 @@ wine_fn_config_makefile dlls/api-ms-win-security-base-private-l1-1-1 enable_api_ wine_fn_config_makefile dlls/api-ms-win-security-credentials-l1-1-0 enable_api_ms_win_security_credentials_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-security-cryptoapi-l1-1-0 enable_api_ms_win_security_cryptoapi_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-security-grouppolicy-l1-1-0 enable_api_ms_win_security_grouppolicy_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-security-lsalookup-ansi-l2-1-0 enable_api_ms_win_security_lsalookup_ansi_l2_1_0 wine_fn_config_makefile dlls/api-ms-win-security-lsalookup-l1-1-0 enable_api_ms_win_security_lsalookup_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-security-lsalookup-l1-1-1 enable_api_ms_win_security_lsalookup_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-security-lsalookup-l2-1-0 enable_api_ms_win_security_lsalookup_l2_1_0 diff --git a/configure.ac b/configure.ac index 63e7aa7f5dd..e51e114c45e 100644 --- a/configure.ac +++ b/configure.ac @@ -2545,6 +2545,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-base-private-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-credentials-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-cryptoapi-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-grouppolicy-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-lsalookup-ansi-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-lsalookup-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-lsalookup-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-lsalookup-l2-1-0) diff --git a/dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/Makefile.in b/dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/Makefile.in new file mode 100644 index 00000000000..3a880198bd7 --- /dev/null +++ b/dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-security-lsalookup-ansi-l2-1-0.dll diff --git a/dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/api-ms-win-security-lsalookup-ansi-l2-1-0.spec b/dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/api-ms-win-security-lsalookup-ansi-l2-1-0.spec new file mode 100644 index 00000000000..fcb48049250 --- /dev/null +++ b/dlls/api-ms-win-security-lsalookup-ansi-l2-1-0/api-ms-win-security-lsalookup-ansi-l2-1-0.spec @@ -0,0 +1,5 @@ +@ stdcall LookupAccountNameA(str str ptr ptr ptr ptr ptr) advapi32.LookupAccountNameA +@ stdcall LookupAccountSidA(str ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidA +@ stdcall LookupPrivilegeDisplayNameA(str str str ptr ptr) advapi32.LookupPrivilegeDisplayNameA +@ stdcall LookupPrivilegeNameA(str ptr ptr ptr) advapi32.LookupPrivilegeNameA +@ stdcall LookupPrivilegeValueA(str str ptr) advapi32.LookupPrivilegeValueA diff --git a/tools/make_specfiles b/tools/make_specfiles index b5e6443dd3c..594e01396db 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -137,6 +137,7 @@ my @dll_groups = "api-ms-win-security-base-private-l1-1-1", "api-ms-win-security-credentials-l1-1-0", "api-ms-win-security-cryptoapi-l1-1-0", + "api-ms-win-security-lsalookup-ansi-l2-1-0", "api-ms-win-security-lsalookup-l1-1-0", "api-ms-win-security-lsalookup-l1-1-1", "api-ms-win-security-lsalookup-l2-1-0",

1 0

Eric Pouech : wineconsole: Enable compilation with long types.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: c4b0c89b78596e22c81ab240e90a532f613de34b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4b0c89b78596e22c81ab240… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:40:43 2022 +0100 wineconsole: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/Makefile.in | 1 - programs/wineconsole/wineconsole.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/wineconsole/Makefile.in b/programs/wineconsole/Makefile.in index 882ee9a3b1d..b859ef8a27a 100644 --- a/programs/wineconsole/Makefile.in +++ b/programs/wineconsole/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wineconsole.exe IMPORTS = advapi32 DELAYIMPORTS = comctl32 user32 gdi32 diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index d398e6eb1a8..1924bf791e6 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -44,7 +44,7 @@ int WINAPI wWinMain( HINSTANCE inst, HINSTANCE prev, WCHAR *cmdline, INT show ) FreeConsole(); /* make sure we're not connected to inherited console */ if (!AllocConsole()) { - ERR( "failed to allocate console: %u\n", GetLastError() ); + ERR( "failed to allocate console: %lu\n", GetLastError() ); return 1; } @@ -63,7 +63,7 @@ int WINAPI wWinMain( HINSTANCE inst, HINSTANCE prev, WCHAR *cmdline, INT show ) INPUT_RECORD ir; DWORD len; exit_code = GetLastError(); - WARN( "CreateProcess failed: %u\n", exit_code ); + WARN( "CreateProcess failed: %lu\n", exit_code ); LoadStringW( GetModuleHandleW( NULL ), IDS_CMD_LAUNCH_FAILED, format, ARRAY_SIZE(format) ); len = wcslen( format ) + wcslen( cmd ); if ((buf = malloc( len * sizeof(WCHAR) )))

1 0

Eric Pouech : winhlp32: Enable compilation with long types.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 54e3c301beea717e75e41b85551d9f5005bcb917 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54e3c301beea717e75e41b85… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:41:19 2022 +0100 winhlp32: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winhlp32/Makefile.in | 1 - programs/winhlp32/hlpfile.c | 38 +++++++++++++++---------------- programs/winhlp32/macro.c | 52 +++++++++++++++++++++---------------------- programs/winhlp32/winhelp.c | 6 ++--- 4 files changed, 48 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=54e3c301beea717e75e4…

1 0

Eric Pouech : winemenubuilder: Enable compilation with long types.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 11afedfec3d35171365265190a602e81870a9b5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=11afedfec3d3517136526519… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:41:01 2022 +0100 winemenubuilder: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/Makefile.in | 1 - programs/winemenubuilder/winemenubuilder.c | 72 +++++++++++++++--------------- 2 files changed, 36 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=11afedfec3d351713652…

1 0

Eric Pouech : winedevice: Enable compilation with long types.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: a4ff46823c0effbcc3d41c8720cfa141b8e2cc66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4ff46823c0effbcc3d41c87… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:40:55 2022 +0100 winedevice: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedevice/Makefile.in | 1 - programs/winedevice/device.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/winedevice/Makefile.in b/programs/winedevice/Makefile.in index dd5349418a9..6f3868013d1 100644 --- a/programs/winedevice/Makefile.in +++ b/programs/winedevice/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winedevice.exe IMPORTS = advapi32 ntoskrnl diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index 07a76b911e9..0a96307a017 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -86,7 +86,7 @@ static DWORD device_handler( DWORD ctrl, const WCHAR *driver_name ) break; default: - FIXME( "got driver ctrl %x for %s\n", ctrl, wine_dbgstr_w(driver_name) ); + FIXME( "got driver ctrl %lx for %s\n", ctrl, wine_dbgstr_w(driver_name) ); break; } @@ -113,7 +113,7 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_ SetEvent( stop_event ); return NO_ERROR; default: - FIXME( "got service ctrl %x for %s\n", ctrl, wine_dbgstr_w(service_group) ); + FIXME( "got service ctrl %lx for %s\n", ctrl, wine_dbgstr_w(service_group) ); set_service_status( service_handle, SERVICE_RUNNING, SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN ); return NO_ERROR;

1 0

Eric Pouech : winecfg: Enable compilation with long types.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 27aacaa73e47542f4ba5fae0b42734252751c3ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=27aacaa73e47542f4ba5fae0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:40:37 2022 +0100 winecfg: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/Makefile.in | 1 - programs/winecfg/audio.c | 8 ++++---- programs/winecfg/drive.c | 14 +++++++------- programs/winecfg/driveui.c | 4 ++-- programs/winecfg/main.c | 2 +- programs/winecfg/winecfg.c | 14 +++++++------- programs/winecfg/x11drvdlg.c | 2 +- 7 files changed, 22 insertions(+), 23 deletions(-) diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in index f7540a55372..84be34eab10 100644 --- a/programs/winecfg/Makefile.in +++ b/programs/winecfg/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winecfg.exe IMPORTS = uuid comdlg32 comctl32 shell32 ole32 winmm shlwapi uxtheme user32 gdi32 advapi32 diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index d1cb530e4eb..cd73703a0dd 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -412,7 +412,7 @@ static void apply_speaker_configs(void) CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&devenum); if(FAILED(hr)){ - ERR("Unable to create MMDeviceEnumerator: 0x%08x\n", hr); + ERR("Unable to create MMDeviceEnumerator: 0x%08lx\n", hr); return; } @@ -423,14 +423,14 @@ static void apply_speaker_configs(void) hr = IMMDeviceEnumerator_GetDevice(devenum, render_devs[i].id, &dev); if(FAILED(hr)){ - WARN("Could not get MMDevice for %s: 0x%08x\n", wine_dbgstr_w(render_devs[i].id), hr); + WARN("Could not get MMDevice for %s: 0x%08lx\n", wine_dbgstr_w(render_devs[i].id), hr); continue; } hr = IMMDevice_OpenPropertyStore(dev, STGM_WRITE, &ps); if(FAILED(hr)){ - WARN("Could not open property store for %s: 0x%08x\n", wine_dbgstr_w(render_devs[i].id), hr); + WARN("Could not open property store for %s: 0x%08lx\n", wine_dbgstr_w(render_devs[i].id), hr); IMMDevice_Release(dev); continue; } @@ -440,7 +440,7 @@ static void apply_speaker_configs(void) hr = IPropertyStore_SetValue(ps, &PKEY_AudioEndpoint_PhysicalSpeakers, &pv); if (FAILED(hr)) - WARN("IPropertyStore_SetValue failed for %s: 0x%08x\n", wine_dbgstr_w(render_devs[i].id), hr); + WARN("IPropertyStore_SetValue failed for %s: 0x%08lx\n", wine_dbgstr_w(render_devs[i].id), hr); IPropertyStore_Release(ps); IMMDevice_Release(dev); diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c index b4b4239c003..4d798ef7671 100644 --- a/programs/winecfg/drive.c +++ b/programs/winecfg/drive.c @@ -85,7 +85,7 @@ ULONG drive_available_mask(char letter) result = ~result; if (letter) result |= DRIVE_MASK_BIT(letter); - WINE_TRACE("finished drive letter loop with %x\n", result); + WINE_TRACE("finished drive letter loop with %lx\n", result); return result; } @@ -97,7 +97,7 @@ BOOL add_drive(char letter, const char *targetpath, const char *device, const WC if(drives[driveIndex].in_use) return FALSE; - WINE_TRACE("letter == '%c', unixpath == %s, device == %s, label == %s, serial == %08x, type == %d\n", + WINE_TRACE("letter == '%c', unixpath == %s, device == %s, label == %s, serial == %08lx, type == %ld\n", letter, wine_dbgstr_a(targetpath), wine_dbgstr_a(device), wine_dbgstr_w(label), serial, type); @@ -183,7 +183,7 @@ static void set_drive_serial( WCHAR letter, DWORD serial ) HANDLE hFile; filename[0] = letter; - WINE_TRACE("Putting serial number of %08X into file %s\n", serial, wine_dbgstr_w(filename)); + WINE_TRACE("Putting serial number of %08lX into file %s\n", serial, wine_dbgstr_w(filename)); hFile = CreateFileW(filename, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile != INVALID_HANDLE_VALUE) @@ -191,7 +191,7 @@ static void set_drive_serial( WCHAR letter, DWORD serial ) DWORD w; char buffer[16]; - sprintf( buffer, "%X\n", serial ); + sprintf( buffer, "%lX\n", serial ); WriteFile(hFile, buffer, strlen(buffer), &w, NULL); CloseHandle(hFile); } @@ -204,7 +204,7 @@ static HANDLE open_mountmgr(void) if ((ret = CreateFileW( MOUNTMGR_DOS_DEVICE_NAME, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 )) == INVALID_HANDLE_VALUE) - WINE_ERR( "failed to open mount manager err %u\n", GetLastError() ); + WINE_ERR( "failed to open mount manager err %lu\n", GetLastError() ); return ret; } @@ -315,10 +315,10 @@ void apply_drive_changes(void) { set_drive_label( drives[i].letter, drives[i].label ); if (drives[i].in_use) set_drive_serial( drives[i].letter, drives[i].serial ); - WINE_TRACE( "set drive %c: to %s type %u\n", 'a' + i, + WINE_TRACE( "set drive %c: to %s type %lu\n", 'a' + i, wine_dbgstr_a(drives[i].unixpath), drives[i].type ); } - else WINE_WARN( "failed to set drive %c: to %s type %u err %u\n", 'a' + i, + else WINE_WARN( "failed to set drive %c: to %s type %lu err %lu\n", 'a' + i, wine_dbgstr_a(drives[i].unixpath), drives[i].type, GetLastError() ); HeapFree( GetProcessHeap(), 0, ioctl ); } diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index 35689ac6007..28fc6cf02d6 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -463,7 +463,7 @@ static void update_controls(HWND dialog) set_textW(dialog, IDC_EDIT_LABEL, current_drive->label ? current_drive->label : emptyW); /* set serial edit text */ - sprintf( serial, "%X", current_drive->serial ); + sprintf( serial, "%lX", current_drive->serial ); set_text(dialog, IDC_EDIT_SERIAL, serial); set_text(dialog, IDC_EDIT_DEVICE, current_drive->device); @@ -542,7 +542,7 @@ static void on_edit_changed(HWND dialog, WORD id) HeapFree(GetProcessHeap(), 0, serial); current_drive->modified = TRUE; - WINE_TRACE("set serial to %08X\n", current_drive->serial); + WINE_TRACE("set serial to %08lX\n", current_drive->serial); /* enable the apply button */ SendMessageW(GetParent(dialog), PSM_CHANGED, (WPARAM) dialog, 0); diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c index 77b732d6819..67df9146f3d 100644 --- a/programs/winecfg/main.c +++ b/programs/winecfg/main.c @@ -247,7 +247,7 @@ wWinMain (HINSTANCE hInstance, HINSTANCE hPrev, LPWSTR cmdline, int nShow) 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/winecfg/winecfg.c b/programs/winecfg/winecfg.c index 23aa10cd2d4..ed319e91f5d 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -120,7 +120,7 @@ static WCHAR *get_config_key (HKEY root, const WCHAR *subkey, const WCHAR *name, } else { - WINE_ERR("RegOpenKey failed on wine config key (res=%d)\n", res); + WINE_ERR("RegOpenKey failed on wine config key (res=%ld)\n", res); } goto end; } @@ -133,7 +133,7 @@ static WCHAR *get_config_key (HKEY root, const WCHAR *subkey, const WCHAR *name, goto end; } else if (res != ERROR_SUCCESS) { - WINE_ERR("Couldn't query value's length (res=%d)\n", res); + WINE_ERR("Couldn't query value's length (res=%ld)\n", res); goto end; } @@ -164,7 +164,7 @@ static int set_config_key(HKEY root, const WCHAR *subkey, REGSAM access, const W DWORD res = 1; HKEY key = NULL; - WINE_TRACE("subkey=%s: name=%s, value=%p, type=%d\n", wine_dbgstr_w(subkey), + WINE_TRACE("subkey=%s: name=%s, value=%p, type=%ld\n", wine_dbgstr_w(subkey), wine_dbgstr_w(name), value, type); assert( subkey != NULL ); @@ -189,7 +189,7 @@ static int set_config_key(HKEY root, const WCHAR *subkey, REGSAM access, const W end: if (key && key != root) RegCloseKey(key); if (res != 0) - WINE_ERR("Unable to set configuration key %s in section %s, res=%d\n", + WINE_ERR("Unable to set configuration key %s in section %s, res=%ld\n", wine_dbgstr_w(name), wine_dbgstr_w(subkey), res); return res; } @@ -430,13 +430,13 @@ WCHAR **enumerate_values(HKEY root, const WCHAR *path) else values = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR*)); values[valueslen++] = strdupW(name); - WINE_TRACE("valueslen is now %d\n", valueslen); + WINE_TRACE("valueslen is now %ld\n", valueslen); i++; } } else { - WINE_WARN("failed opening registry key %s, res=0x%x\n", + WINE_WARN("failed opening registry key %s, res=0x%lx\n", wine_dbgstr_w(path), res); } @@ -610,7 +610,7 @@ BOOL initialize(HINSTANCE hInstance) DWORD res = RegCreateKeyW(HKEY_CURRENT_USER, WINE_KEY_ROOT, &config_key); if (res != ERROR_SUCCESS) { - WINE_ERR("RegOpenKey failed on wine config key (%d)\n", res); + WINE_ERR("RegOpenKey failed on wine config key (%ld)\n", res); return TRUE; } diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index f1b543d5311..a480eac7ead 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -245,7 +245,7 @@ static void init_dpi_editbox(HWND hDlg) updating_ui = TRUE; dwLogpixels = read_logpixels_reg(); - WINE_TRACE("%u\n", dwLogpixels); + WINE_TRACE("%lu\n", dwLogpixels); SetDlgItemInt(hDlg, IDC_RES_DPIEDIT, dwLogpixels, FALSE);

1 0

Eric Pouech : whoami: Enable compilation with long types.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: be493aa6ab29e69ae709d07bdc2347283bb0cf44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be493aa6ab29e69ae709d07b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:40:19 2022 +0100 whoami: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/whoami/Makefile.in | 1 - programs/whoami/main.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/whoami/Makefile.in b/programs/whoami/Makefile.in index 8ae2dd94d2f..4898a96f456 100644 --- a/programs/whoami/Makefile.in +++ b/programs/whoami/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = whoami.exe IMPORTS = secur32 diff --git a/programs/whoami/main.c b/programs/whoami/main.c index 297f12c9a91..7f6381d161a 100644 --- a/programs/whoami/main.c +++ b/programs/whoami/main.c @@ -70,7 +70,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) result = GetUserNameExW(NameSamCompatible, NULL, &size); if (result || GetLastError() != ERROR_MORE_DATA) { - WINE_ERR("GetUserNameExW failed, result %d, error %d\n", result, GetLastError()); + WINE_ERR("GetUserNameExW failed, result %d, error %ld\n", result, GetLastError()); return 1; } @@ -88,7 +88,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) output_write(L"\r\n", 2); } else - WINE_ERR("GetUserNameExW failed, error %d\n", GetLastError()); + WINE_ERR("GetUserNameExW failed, error %ld\n", GetLastError()); HeapFree(GetProcessHeap(), 0, buf); return 0;

1 0

Nikolay Sivov : comctl32: Fix long types warnings in traces.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 8806159bcd37d30754d975906ac5af28ede5aee9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8806159bcd37d30754d97590… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 7 09:07:55 2022 +0300 comctl32: Fix long types warnings in traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/Makefile.in | 2 +- dlls/comctl32/animate.c | 80 ++++++++++++------------ dlls/comctl32/combo.c | 6 +- dlls/comctl32/comboex.c | 74 +++++++++++----------- dlls/comctl32/commctrl.c | 53 ++++++++-------- dlls/comctl32/datetime.c | 19 +++--- dlls/comctl32/dpa.c | 16 +++-- dlls/comctl32/draglist.c | 3 +- dlls/comctl32/edit.c | 16 ++--- dlls/comctl32/flatsb.c | 7 +-- dlls/comctl32/header.c | 9 ++- dlls/comctl32/hotkey.c | 11 ++-- dlls/comctl32/imagelist.c | 33 +++++----- dlls/comctl32/ipaddress.c | 6 +- dlls/comctl32/listbox.c | 5 +- dlls/comctl32/listview.c | 70 ++++++++++----------- dlls/comctl32/monthcal.c | 27 ++++---- dlls/comctl32/nativefont.c | 6 +- dlls/comctl32/pager.c | 13 ++-- dlls/comctl32/progress.c | 6 +- dlls/comctl32/propsheet.c | 30 ++++----- dlls/comctl32/rebar.c | 70 ++++++++++----------- dlls/comctl32/smoothscroll.c | 4 +- dlls/comctl32/static.c | 4 +- dlls/comctl32/status.c | 12 ++-- dlls/comctl32/syslink.c | 4 +- dlls/comctl32/tab.c | 38 +++++------- dlls/comctl32/taskdialog.c | 2 +- dlls/comctl32/toolbar.c | 143 +++++++++++++++++++------------------------ dlls/comctl32/tooltips.c | 26 ++++---- dlls/comctl32/trackbar.c | 11 ++-- dlls/comctl32/treeview.c | 40 ++++++------ dlls/comctl32/updown.c | 9 ++- 33 files changed, 401 insertions(+), 454 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8806159bcd37d30754d9…

1 0