February 2022 - Wine-Commits

Eric Pouech : dispex: Enable compilation with long types.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 5646bb686a0b91ad95eb814c5362b95a20c99128 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5646bb686a0b91ad95eb814c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 9 09:27:10 2022 +0100 dispex: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dispex/Makefile.in | 1 - dlls/dispex/usrmarshal.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dispex/Makefile.in b/dlls/dispex/Makefile.in index a40e2b49215..98a05926727 100644 --- a/dlls/dispex/Makefile.in +++ b/dlls/dispex/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dispex.dll IMPORTS = uuid oleaut32 ole32 rpcrt4 advapi32 diff --git a/dlls/dispex/usrmarshal.c b/dlls/dispex/usrmarshal.c index 6e3c7239f16..4c837b53397 100644 --- a/dlls/dispex/usrmarshal.c +++ b/dlls/dispex/usrmarshal.c @@ -50,7 +50,7 @@ HRESULT CALLBACK IDispatchEx_InvokeEx_Proxy(IDispatchEx* This, DISPID id, LCID l UINT *ref_idx = &dummy_idx; DWORD dword_flags = wFlags & 0xf; - TRACE("(%p)->(%08x, %04x, %04x, %p, %p, %p, %p)\n", This, id, lcid, wFlags, + TRACE("(%p)->(%08lx, %04lx, %04x, %p, %p, %p, %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); if(!pvarRes) @@ -118,7 +118,7 @@ HRESULT __RPC_STUB IDispatchEx_InvokeEx_Stub(IDispatchEx* This, DISPID id, LCID UINT arg; VARTYPE *vt_list = NULL; - TRACE("(%p)->(%08x, %04x, %08x, %p, %p, %p, %p, %d, %p, %p)\n", This, id, lcid, dwFlags, + TRACE("(%p)->(%08lx, %04lx, %08lx, %p, %p, %p, %p, %d, %p, %p)\n", This, id, lcid, dwFlags, pdp, result, pei, pspCaller, byref_args, ref_idx, ref_arg); VariantInit(result);

1 0

Zhiyi Zhang : uxtheme/tests: Test more WM_CTLCOLOR* messages for dialog theming.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: f0e6cfbc0b677bc543604a8824c8b2c3c3d4ee26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0e6cfbc0b677bc543604a88… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Feb 9 16:44:25 2022 +0800 uxtheme/tests: Test more WM_CTLCOLOR* messages for dialog theming. Test that some WM_CTLCOLOR* other than WM_CTLCOLORSTATIC also use tab background as dialog texture. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/tests/system.c | 150 +++++++++++++++++++++++++++----------------- 1 file changed, 94 insertions(+), 56 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 980676f9e57..77a12f3fa44 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -1617,6 +1617,7 @@ static void test_EnableThemeDialogTexture(void) LRESULT lr; POINT org; SIZE size; + UINT msg; BOOL ret; struct @@ -1822,74 +1823,111 @@ static void test_EnableThemeDialogTexture(void) GetSysColorBrush(COLOR_MENU), brush); handle_WM_CTLCOLORSTATIC = FALSE; - /* Test that WM_CTLCOLORSTATIC changes brush origin when dialog texture is on */ - ret = SetBrushOrgEx(child_hdc, 0, 0, NULL); - ok(ret, "SetBrushOrgEx failed, error %u.\n", GetLastError()); - SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - ret = GetBrushOrgEx(child_hdc, &org); - ok(ret, "GetBrushOrgEx failed, error %u.\n", GetLastError()); - ok(org.x == -1 && org.y == -2, "Expected (-1,-2), got %s.\n", wine_dbgstr_point(&org)); - - /* Test that WM_CTLCOLORSTATIC changes background mode when dialog texture is on */ - old_mode = SetBkMode(child_hdc, OPAQUE); - ok(old_mode != 0, "SetBkMode failed.\n"); - SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - mode = SetBkMode(child_hdc, old_mode); - ok(mode == TRANSPARENT, "Expected mode %#x, got %#x.\n", TRANSPARENT, mode); - - /* Test that WM_CTLCOLORSTATIC changes background color when dialog texture is on */ - old_color = SetBkColor(child_hdc, 0xaa5511); - ok(old_color != CLR_INVALID, "SetBkColor failed.\n"); - SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - color = SetBkColor(child_hdc, old_color); - ok(color == GetSysColor(COLOR_BTNFACE), "Expected background color %#x, got %#x.\n", - GetSysColor(COLOR_BTNFACE), color); - /* Test that dialog doesn't have theme handle opened for itself */ ok(GetWindowTheme(dialog) == NULL, "Expected NULL theme handle.\n"); - /* Test that the returned brush is a pattern brush created from the tab body */ - brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - memset(&log_brush, 0, sizeof(log_brush)); - count = GetObjectA(brush, sizeof(log_brush), &log_brush); - ok(count == sizeof(log_brush), "GetObjectA failed, error %u.\n", GetLastError()); - ok(log_brush.lbColor == 0, "Expected brush color %#x, got %#x.\n", 0, log_brush.lbColor); - ok(log_brush.lbStyle == BS_PATTERN, "Expected brush style %#x, got %#x.\n", BS_PATTERN, - log_brush.lbStyle); - - memset(&bmp, 0, sizeof(bmp)); - count = GetObjectA((HBITMAP)log_brush.lbHatch, sizeof(bmp), &bmp); - ok(count == sizeof(bmp), "GetObjectA failed, error %u.\n", GetLastError()); - theme = OpenThemeData(NULL, L"Tab"); ok(theme != NULL, "OpenThemeData failed.\n"); - size.cx = 0; size.cy = 0; hr = GetThemePartSize(theme, NULL, TABP_BODY, 0, NULL, TS_TRUE, &size); ok(hr == S_OK, "GetThemePartSize failed, hr %#x.\n", hr); - ok(bmp.bmWidth == size.cx, "Expected width %d, got %d.\n", size.cx, bmp.bmWidth); - ok(bmp.bmHeight == size.cy, "Expected height %d, got %d.\n", size.cy, bmp.bmHeight); - CloseThemeData(theme); - /* Test that DefDlgProcA/W() are hooked for WM_CTLCOLORSTATIC */ - brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - ok(brush != GetSysColorBrush(COLOR_BTNFACE), "Expected a different brush.\n"); - brush2 = (HBRUSH)DefDlgProcW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - ok(brush2 == brush, "Expected the same brush.\n"); - brush2 = (HBRUSH)DefDlgProcA(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - ok(brush2 == brush, "Expected the same brush.\n"); + /* Test which WM_CTLCOLOR* message uses tab background as dialog texture */ + for (msg = WM_CTLCOLORMSGBOX; msg <= WM_CTLCOLORSTATIC; ++msg) + { + winetest_push_context("msg %#x", msg); + + /* Test that some WM_CTLCOLOR* messages change brush origin when dialog texture is on */ + ret = SetBrushOrgEx(child_hdc, 0, 0, NULL); + ok(ret, "SetBrushOrgEx failed, error %u.\n", GetLastError()); + SendMessageW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); + ret = GetBrushOrgEx(child_hdc, &org); + ok(ret, "GetBrushOrgEx failed, error %u.\n", GetLastError()); + /* WM_CTLCOLOREDIT, WM_CTLCOLORLISTBOX and WM_CTLCOLORSCROLLBAR don't use tab background */ + if (msg == WM_CTLCOLOREDIT || msg == WM_CTLCOLORLISTBOX || msg == WM_CTLCOLORSCROLLBAR) + { + ok(org.x == 0 && org.y == 0, "Expected (0,0), got %s.\n", wine_dbgstr_point(&org)); + winetest_pop_context(); + continue; + } + else + { + todo_wine_if(msg != WM_CTLCOLORSTATIC) + ok(org.x == -1 && org.y == -2, "Expected (-1,-2), got %s.\n", wine_dbgstr_point(&org)); + } - /* Test that DefWindowProcA/W() are also hooked for WM_CTLCOLORSTATIC */ - brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - ok(brush != GetSysColorBrush(COLOR_BTNFACE), "Expected a different brush.\n"); - brush2 = (HBRUSH)DefWindowProcW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - todo_wine - ok(brush2 == brush, "Expected the same brush.\n"); - brush2 = (HBRUSH)DefWindowProcA(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - todo_wine - ok(brush2 == brush, "Expected the same brush.\n"); + /* Test that some WM_CTLCOLOR* messages change background mode when dialog texture is on */ + old_mode = SetBkMode(child_hdc, OPAQUE); + ok(old_mode != 0, "SetBkMode failed.\n"); + SendMessageW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); + mode = SetBkMode(child_hdc, old_mode); + todo_wine_if(msg != WM_CTLCOLORSTATIC) + ok(mode == TRANSPARENT, "Expected mode %#x, got %#x.\n", TRANSPARENT, mode); + + /* Test that some WM_CTLCOLOR* messages change background color when dialog texture is on */ + old_color = SetBkColor(child_hdc, 0xaa5511); + ok(old_color != CLR_INVALID, "SetBkColor failed.\n"); + SendMessageW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); + color = SetBkColor(child_hdc, old_color); + ok(color == GetSysColor(COLOR_BTNFACE), "Expected background color %#x, got %#x.\n", + GetSysColor(COLOR_BTNFACE), color); + + /* Test that the returned brush is a pattern brush created from the tab body */ + brush = (HBRUSH)SendMessageW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); + memset(&log_brush, 0, sizeof(log_brush)); + count = GetObjectA(brush, sizeof(log_brush), &log_brush); + ok(count == sizeof(log_brush), "GetObjectA failed, error %u.\n", GetLastError()); + todo_wine_if(msg != WM_CTLCOLORSTATIC) + ok(log_brush.lbColor == 0, "Expected brush color %#x, got %#x.\n", 0, log_brush.lbColor); + todo_wine_if(msg != WM_CTLCOLORSTATIC) + ok(log_brush.lbStyle == BS_PATTERN, "Expected brush style %#x, got %#x.\n", BS_PATTERN, + log_brush.lbStyle); + + memset(&bmp, 0, sizeof(bmp)); + count = GetObjectA((HBITMAP)log_brush.lbHatch, sizeof(bmp), &bmp); + todo_wine_if(msg != WM_CTLCOLORSTATIC) + ok(count == sizeof(bmp), "GetObjectA failed, error %u.\n", GetLastError()); + todo_wine_if(msg != WM_CTLCOLORSTATIC) + ok(bmp.bmWidth == size.cx, "Expected width %d, got %d.\n", size.cx, bmp.bmWidth); + todo_wine_if(msg != WM_CTLCOLORSTATIC) + ok(bmp.bmHeight == size.cy, "Expected height %d, got %d.\n", size.cy, bmp.bmHeight); + + /* Test that DefDlgProcA/W() are hooked for some WM_CTLCOLOR* messages */ + brush = (HBRUSH)SendMessageW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); + todo_wine_if(msg != WM_CTLCOLORSTATIC) + ok(brush != GetSysColorBrush(COLOR_BTNFACE), "Expected a different brush.\n"); + brush2 = (HBRUSH)DefDlgProcW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); + ok(brush2 == brush, "Expected the same brush.\n"); + brush2 = (HBRUSH)DefDlgProcA(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); + ok(brush2 == brush, "Expected the same brush.\n"); + + /* Test that DefWindowProcA/W() are also hooked for some WM_CTLCOLOR* messages */ + brush = (HBRUSH)SendMessageW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); + todo_wine_if(msg != WM_CTLCOLORSTATIC) + ok(brush != GetSysColorBrush(COLOR_BTNFACE), "Expected a different brush.\n"); + if (msg != WM_CTLCOLORDLG) + { + brush2 = (HBRUSH)DefWindowProcW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); + todo_wine_if(msg == WM_CTLCOLORSTATIC) + ok(brush2 == brush, "Expected the same brush.\n"); + brush2 = (HBRUSH)DefWindowProcA(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); + todo_wine_if(msg == WM_CTLCOLORSTATIC) + ok(brush2 == brush, "Expected the same brush.\n"); + } + else + { + brush2 = (HBRUSH)DefWindowProcW(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); + todo_wine + ok(brush2 != brush, "Expected a different brush.\n"); + brush2 = (HBRUSH)DefWindowProcA(dialog, msg, (WPARAM)child_hdc, (LPARAM)child); + todo_wine + ok(brush2 != brush, "Expected a different brush.\n"); + } + + winetest_pop_context(); + } /* Test that DefWindowProcA/W() are not hooked for WM_ERASEBKGND. So the background is still * drawn with hbrBackground, which in this case, is GRAY_BRUSH.

1 0

Eric Pouech : dhcpcsvc: Enable compilation with long types.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: eb7a79f60a53d84069e9f477e3d58fbac1d27206 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb7a79f60a53d84069e9f477… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 9 09:26:33 2022 +0100 dhcpcsvc: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dhcpcsvc/Makefile.in | 1 - dlls/dhcpcsvc/dhcpcsvc.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dhcpcsvc/Makefile.in b/dlls/dhcpcsvc/Makefile.in index 34add6620d1..989264d8b43 100644 --- a/dlls/dhcpcsvc/Makefile.in +++ b/dlls/dhcpcsvc/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dhcpcsvc.dll DELAYIMPORTS = iphlpapi IMPORTLIB = dhcpcsvc diff --git a/dlls/dhcpcsvc/dhcpcsvc.c b/dlls/dhcpcsvc/dhcpcsvc.c index dfce5a8dc84..57bb9a9b6ff 100644 --- a/dlls/dhcpcsvc/dhcpcsvc.c +++ b/dlls/dhcpcsvc/dhcpcsvc.c @@ -87,15 +87,15 @@ DWORD WINAPI DhcpRequestParams( DWORD flags, void *reserved, WCHAR *adapter, DHC HANDLE mgr; char unix_name[IF_NAMESIZE]; - TRACE( "(%08x, %p, %s, %p, %u, %u, %p, %p, %s)\n", flags, reserved, debugstr_w(adapter), class_id, + TRACE( "(%08lx, %p, %s, %p, %lu, %lu, %p, %p, %s)\n", flags, reserved, debugstr_w(adapter), class_id, send_params.nParams, recv_params.nParams, buf, buflen, debugstr_w(request_id) ); if (!adapter || !buflen) return ERROR_INVALID_PARAMETER; - if (flags != DHCPCAPI_REQUEST_SYNCHRONOUS) FIXME( "unsupported flags %08x\n", flags ); + if (flags != DHCPCAPI_REQUEST_SYNCHRONOUS) FIXME( "unsupported flags %08lx\n", flags ); if ((err = get_adapter_name( adapter, unix_name, sizeof(unix_name) ))) return err; for (i = 0; i < send_params.nParams; i++) - FIXME( "send option %u not supported\n", send_params.Params->OptionId ); + FIXME( "send option %lu not supported\n", send_params.Params->OptionId ); mgr = CreateFileW( MOUNTMGR_DOS_DEVICE_NAME, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 );

1 0

Eric Pouech : credui: Enable compilation with long types.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 3aeb2f67b9c9a7f45398b5b99f13086ec979b539 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3aeb2f67b9c9a7f45398b5b9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 9 09:26:14 2022 +0100 credui: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/credui/Makefile.in | 1 - dlls/credui/credui_main.c | 18 +++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/credui/Makefile.in b/dlls/credui/Makefile.in index e8b3d407fa7..149f6ddbbee 100644 --- a/dlls/credui/Makefile.in +++ b/dlls/credui/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = credui.dll IMPORTLIB = credui IMPORTS = comctl32 user32 advapi32 diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index b5a0897f520..221965f6182 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -67,7 +67,7 @@ static CRITICAL_SECTION csPendingCredentials = { &critsect_debug, -1, 0, 0, 0, 0 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { struct pending_credentials *entry, *cursor2; - TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved); + TRACE("(0x%p, %ld, %p)\n",hinstDLL,fdwReason,lpvReserved); switch (fdwReason) { @@ -120,7 +120,7 @@ static DWORD save_credentials(PCWSTR pszTargetName, PCWSTR pszUsername, else { DWORD ret = GetLastError(); - ERR("CredWriteW failed with error %d\n", ret); + ERR("CredWriteW failed with error %ld\n", ret); return ret; } } @@ -566,7 +566,7 @@ static BOOL find_existing_credential(const WCHAR *target, WCHAR *username, ULONG if (credentials[i]->Type != CRED_TYPE_DOMAIN_PASSWORD && credentials[i]->Type != CRED_TYPE_GENERIC) { - FIXME("no support for type %u credentials\n", credentials[i]->Type); + FIXME("no support for type %lu credentials\n", credentials[i]->Type); continue; } if ((!*username || !lstrcmpW(username, credentials[i]->UserName)) && @@ -604,7 +604,7 @@ DWORD WINAPI CredUIPromptForCredentialsW(PCREDUI_INFOW pUIInfo, struct cred_dialog_params params; DWORD result = ERROR_SUCCESS; - TRACE("(%p, %s, %p, %d, %s, %d, %p, %d, %p, 0x%08x)\n", pUIInfo, + TRACE("(%p, %s, %p, %ld, %s, %ld, %p, %ld, %p, 0x%08lx)\n", pUIInfo, debugstr_w(pszTargetName), Reserved, dwAuthError, debugstr_w(pszUsername), ulUsernameMaxChars, pszPassword, ulPasswordMaxChars, pfSave, dwFlags); @@ -758,7 +758,7 @@ DWORD WINAPI CredUIParseUserNameW(PCWSTR pszUserName, PWSTR pszUser, { PWSTR p; - TRACE("(%s, %p, %d, %p, %d)\n", debugstr_w(pszUserName), pszUser, + TRACE("(%s, %p, %ld, %p, %ld)\n", debugstr_w(pszUserName), pszUser, ulMaxUserChars, pszDomain, ulMaxDomainChars); if (!pszUserName || !pszUser || !ulMaxUserChars || !pszDomain || @@ -873,7 +873,7 @@ ULONG SEC_ENTRY SspiPromptForCredentialsW( PCWSTR target, void *info, CREDUI_INFOW *cred_info = info; SEC_WINNT_AUTH_IDENTITY_W *id = input_id; - FIXME( "(%s, %p, %u, %s, %p, %p, %p, %x) stub\n", debugstr_w(target), info, + FIXME( "(%s, %p, %lu, %s, %p, %p, %p, %lx) stub\n", debugstr_w(target), info, error, debugstr_w(package), input_id, output_id, save, sspi_flags ); if (!target) return ERROR_INVALID_PARAMETER; @@ -967,7 +967,7 @@ DWORD WINAPI CredUIPromptForWindowsCredentialsW( CREDUI_INFOW *info, DWORD error const void *in_buf, ULONG in_buf_size, void **out_buf, ULONG *out_buf_size, BOOL *save, DWORD flags ) { - FIXME( "(%p, %u, %p, %p, %u, %p, %p, %p, %08x) stub\n", info, error, package, in_buf, in_buf_size, + FIXME( "(%p, %lu, %p, %p, %lu, %p, %p, %p, %08lx) stub\n", info, error, package, in_buf, in_buf_size, out_buf, out_buf_size, save, flags ); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -978,7 +978,7 @@ DWORD WINAPI CredUIPromptForWindowsCredentialsW( CREDUI_INFOW *info, DWORD error BOOL WINAPI CredPackAuthenticationBufferW( DWORD flags, WCHAR *username, WCHAR *password, BYTE *buf, DWORD *size ) { - FIXME( "(%08x, %s, %p, %p, %p) stub\n", flags, debugstr_w(username), password, buf, size ); + FIXME( "(%08lx, %s, %p, %p, %p) stub\n", flags, debugstr_w(username), password, buf, size ); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -989,7 +989,7 @@ BOOL WINAPI CredUnPackAuthenticationBufferW( DWORD flags, void *buf, DWORD size DWORD *len_username, WCHAR *domain, DWORD *len_domain, WCHAR *password, DWORD *len_password ) { - FIXME( "(%08x, %p, %u, %p, %p, %p, %p, %p, %p) stub\n", flags, buf, size, username, len_username, + FIXME( "(%08lx, %p, %lu, %p, %p, %p, %p, %p, %p) stub\n", flags, buf, size, username, len_username, domain, len_domain, password, len_password ); return ERROR_CALL_NOT_IMPLEMENTED; }

1 0

Eric Pouech : cryptui: Enable compilation with long types.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: a4087cec735fded970fc3014b46f7959dea0ff16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4087cec735fded970fc3014… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 9 09:26:08 2022 +0100 cryptui: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptui/Makefile.in | 1 - dlls/cryptui/main.c | 38 +++++++++++++++++++------------------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/cryptui/Makefile.in b/dlls/cryptui/Makefile.in index 60b38f058e1..9e2031dc17b 100644 --- a/dlls/cryptui/Makefile.in +++ b/dlls/cryptui/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = cryptui.dll IMPORTS = uuid crypt32 ole32 comctl32 comdlg32 user32 gdi32 advapi32 DELAYIMPORTS = wintrust urlmon diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 500ed439a5b..03054ae180c 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -48,7 +48,7 @@ static const WCHAR empty[] = {0}; BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + TRACE("(0x%p, %ld, %p)\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) { @@ -1298,7 +1298,7 @@ BOOL WINAPI CryptUIDlgCertMgr(PCCRYPTUI_CERT_MGR_STRUCT pCryptUICertMgr) if (pCryptUICertMgr->dwSize != sizeof(CRYPTUI_CERT_MGR_STRUCT)) { - WARN("unexpected size %d\n", pCryptUICertMgr->dwSize); + WARN("unexpected size %ld\n", pCryptUICertMgr->dwSize); SetLastError(E_INVALIDARG); return FALSE; } @@ -1605,7 +1605,7 @@ HCERTSTORE WINAPI CryptUIDlgSelectStoreW(PCRYPTUI_SELECTSTORE_INFO_W info) if (info->dwSize != sizeof(CRYPTUI_SELECTSTORE_INFO_W)) { - WARN("unexpected size %d\n", info->dwSize); + WARN("unexpected size %ld\n", info->dwSize); SetLastError(E_INVALIDARG); return NULL; } @@ -1627,7 +1627,7 @@ HCERTSTORE WINAPI CryptUIDlgSelectStoreA(PCRYPTUI_SELECTSTORE_INFO_A info) if (info->dwSize != sizeof(CRYPTUI_SELECTSTORE_INFO_A)) { - WARN("unexpected size %d\n", info->dwSize); + WARN("unexpected size %ld\n", info->dwSize); SetLastError(E_INVALIDARG); return NULL; } @@ -1706,7 +1706,7 @@ static DWORD CALLBACK read_text_callback(DWORD_PTR dwCookie, LPBYTE buf, struct ReadStringStruct *string = (struct ReadStringStruct *)dwCookie; LONG cch = min(cb / sizeof(WCHAR), string->len - string->pos); - TRACE("(%p, %p, %d, %p)\n", string, buf, cb, pcb); + TRACE("(%p, %p, %ld, %p)\n", string, buf, cb, pcb); memmove(buf, string->buf + string->pos, cch * sizeof(WCHAR)); string->pos += cch; @@ -2497,7 +2497,7 @@ static INT_PTR CALLBACK general_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, PROPSHEETPAGEW *page; PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertViewInfo; - TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); + TRACE("(%p, %08x, %08Ix, %08Ix)\n", hwnd, msg, wp, lp); switch (msg) { @@ -3586,7 +3586,7 @@ static INT_PTR CALLBACK cert_properties_general_dlg_proc(HWND hwnd, UINT msg, { PROPSHEETPAGEW *page; - TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); + TRACE("(%p, %08x, %08Ix, %08Ix)\n", hwnd, msg, wp, lp); switch (msg) { @@ -3781,7 +3781,7 @@ static INT_PTR CALLBACK detail_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, PROPSHEETPAGEW *page; struct detail_data *data; - TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); + TRACE("(%p, %08x, %08Ix, %08Ix)\n", hwnd, msg, wp, lp); switch (msg) { @@ -4138,7 +4138,7 @@ static INT_PTR CALLBACK hierarchy_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, INT_PTR ret = 0; HWND tree = GetDlgItem(hwnd, IDC_CERTPATH); - TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); + TRACE("(%p, %08x, %08Ix, %08Ix)\n", hwnd, msg, wp, lp); switch (msg) { @@ -4267,7 +4267,7 @@ static int CALLBACK cert_prop_sheet_proc(HWND hwnd, UINT msg, LPARAM lp) { RECT rc; - TRACE("(%p, %08x, %08lx)\n", hwnd, msg, lp); + TRACE("(%p, %08x, %08Ix)\n", hwnd, msg, lp); switch (msg) { @@ -4469,7 +4469,7 @@ BOOL WINAPI CryptUIDlgViewContext(DWORD dwContextType, LPVOID pvContext, { BOOL ret; - TRACE("(%d, %p, %p, %s, %08x, %p)\n", dwContextType, pvContext, hwnd, + TRACE("(%ld, %p, %p, %s, %08lx, %p)\n", dwContextType, pvContext, hwnd, debugstr_w(pwszTitle), dwFlags, pvReserved); switch (dwContextType) @@ -4487,7 +4487,7 @@ BOOL WINAPI CryptUIDlgViewContext(DWORD dwContextType, LPVOID pvContext, break; } default: - FIXME("unimplemented for context type %d\n", dwContextType); + FIXME("unimplemented for context type %ld\n", dwContextType); SetLastError(E_INVALIDARG); ret = FALSE; } @@ -5335,7 +5335,7 @@ static BOOL do_import(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardTitle, pImportSrc->u.hCertStore, hDestCertStore); break; default: - WARN("unknown source type: %u\n", pImportSrc->dwSubjectChoice); + WARN("unknown source type: %lu\n", pImportSrc->dwSubjectChoice); SetLastError(E_INVALIDARG); ret = FALSE; } @@ -5536,7 +5536,7 @@ BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardT { BOOL ret; - TRACE("(0x%08x, %p, %s, %p, %p)\n", dwFlags, hwndParent, debugstr_w(pwszWizardTitle), + TRACE("(0x%08lx, %p, %s, %p, %p)\n", dwFlags, hwndParent, debugstr_w(pwszWizardTitle), pImportSrc, hDestCertStore); if (pImportSrc && @@ -6967,7 +6967,7 @@ BOOL WINAPI CryptUIWizExport(DWORD dwFlags, HWND hwndParent, { BOOL ret; - TRACE("(%08x, %p, %s, %p, %p)\n", dwFlags, hwndParent, + TRACE("(%08lx, %p, %s, %p, %p)\n", dwFlags, hwndParent, debugstr_w(pwszWizardTitle), pExportInfo, pvoid); if (!(dwFlags & CRYPTUI_WIZ_NO_UI)) @@ -7409,7 +7409,7 @@ PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateW(PCCRYPTUI_SELECTCERTIFICATE_S if (pcsc->dwSize != sizeof(*pcsc) && pcsc->dwSize != sizeof(*pcsc) - sizeof(HCERTSTORE)) { - WARN("unexpected size %d\n", pcsc->dwSize); + WARN("unexpected size %ld\n", pcsc->dwSize); SetLastError(E_INVALIDARG); return NULL; } @@ -7511,7 +7511,7 @@ PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateA(PCCRYPTUI_SELECTCERTIFICATE_S if (pcsc->dwSize != sizeof(*pcsc) && pcsc->dwSize != sizeof(*pcsc) - sizeof(HCERTSTORE)) { - WARN("unexpected size %d\n", pcsc->dwSize); + WARN("unexpected size %ld\n", pcsc->dwSize); SetLastError(E_INVALIDARG); return NULL; } @@ -7548,7 +7548,7 @@ PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateFromStore(HCERTSTORE hCertStore { CRYPTUI_SELECTCERTIFICATE_STRUCTW sc; - TRACE("%p %p %s %s %x %x %p\n", hCertStore, hwnd, debugstr_w(pwszTitle), debugstr_w(pwszDisplayString), dwDontUseColumn, dwFlags, pvReserved); + TRACE("%p %p %s %s %lx %lx %p\n", hCertStore, hwnd, debugstr_w(pwszTitle), debugstr_w(pwszDisplayString), dwDontUseColumn, dwFlags, pvReserved); memset(&sc, 0, sizeof(sc)); @@ -7566,6 +7566,6 @@ PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateFromStore(HCERTSTORE hCertStore BOOL WINAPI CryptUIWizDigitalSign(DWORD flags, HWND parent, LPCWSTR title, PCCRYPTUI_WIZ_DIGITAL_SIGN_INFO info, PCCRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT *context) { - FIXME("%d %p %s %p %p: stub\n", flags, parent, debugstr_w(title), info, context); + FIXME("%ld %p %s %p %p: stub\n", flags, parent, debugstr_w(title), info, context); return FALSE; }

1 0

Eric Pouech : cryptnet: Enable compilation with long types.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 0db20c448ab0993285d0231db42d05597264aec0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0db20c448ab0993285d0231d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 9 09:26:02 2022 +0100 cryptnet: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptnet/Makefile.in | 1 - dlls/cryptnet/cryptnet_main.c | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/cryptnet/Makefile.in b/dlls/cryptnet/Makefile.in index f394b0c1f79..8b13861da1e 100644 --- a/dlls/cryptnet/Makefile.in +++ b/dlls/cryptnet/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = cryptnet.dll IMPORTLIB = cryptnet IMPORTS = crypt32 shell32 ole32 diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index e1b32216353..8aec76e9b81 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -145,7 +145,7 @@ static BOOL WINAPI CRYPT_GetUrlFromCertificateIssuer(LPCSTR pszUrlOid, } } else - FIXME("unsupported alt name type %d\n", + FIXME("unsupported alt name type %ld\n", aia->rgAccDescr[i].AccessLocation.dwAltNameChoice); } if (!pcbUrlArray) @@ -358,7 +358,7 @@ BOOL WINAPI CryptGetObjectUrl(LPCSTR pszUrlOid, LPVOID pvPara, DWORD dwFlags, HCRYPTOIDFUNCADDR hFunc = NULL; BOOL ret = FALSE; - TRACE("(%s, %p, %08x, %p, %p, %p, %p, %p)\n", debugstr_a(pszUrlOid), + TRACE("(%s, %p, %08lx, %p, %p, %p, %p, %p)\n", debugstr_a(pszUrlOid), pvPara, dwFlags, pUrlArray, pcbUrlArray, pUrlInfo, pcbUrlInfo, pvReserved); if (IS_INTOID(pszUrlOid)) @@ -404,7 +404,7 @@ BOOL WINAPI CryptRetrieveObjectByUrlA(LPCSTR pszURL, LPCSTR pszObjectOid, BOOL ret = FALSE; int len; - TRACE("(%s, %s, %08x, %d, %p, %p, %p, %p, %p)\n", debugstr_a(pszURL), + TRACE("(%s, %s, %08lx, %ld, %p, %p, %p, %p, %p)\n", debugstr_a(pszURL), debugstr_a(pszObjectOid), dwRetrievalFlags, dwTimeout, ppvObject, hAsyncRetrieve, pCredentials, pvVerify, pAuxInfo); @@ -842,7 +842,7 @@ static BOOL WINAPI FTP_RetrieveEncodedObjectW(LPCWSTR pszURL, void **ppvFreeContext, HCRYPTASYNC hAsyncRetrieve, PCRYPT_CREDENTIALS pCredentials, PCRYPT_RETRIEVE_AUX_INFO pAuxInfo) { - FIXME("(%s, %s, %08x, %d, %p, %p, %p, %p, %p, %p)\n", debugstr_w(pszURL), + FIXME("(%s, %s, %08lx, %ld, %p, %p, %p, %p, %p, %p)\n", debugstr_w(pszURL), debugstr_a(pszObjectOid), dwRetrievalFlags, dwTimeout, pObject, ppfnFreeObject, ppvFreeContext, hAsyncRetrieve, pCredentials, pAuxInfo); @@ -861,7 +861,7 @@ static BOOL WINAPI HTTP_RetrieveEncodedObjectW(LPCWSTR pszURL, { BOOL ret = FALSE; - TRACE("(%s, %s, %08x, %d, %p, %p, %p, %p, %p, %p)\n", debugstr_w(pszURL), + TRACE("(%s, %s, %08lx, %ld, %p, %p, %p, %p, %p, %p)\n", debugstr_w(pszURL), debugstr_a(pszObjectOid), dwRetrievalFlags, dwTimeout, pObject, ppfnFreeObject, ppvFreeContext, hAsyncRetrieve, pCredentials, pAuxInfo); @@ -971,7 +971,7 @@ static BOOL WINAPI File_RetrieveEncodedObjectW(LPCWSTR pszURL, URL_COMPONENTSW components = { sizeof(components), 0 }; BOOL ret; - TRACE("(%s, %s, %08x, %d, %p, %p, %p, %p, %p, %p)\n", debugstr_w(pszURL), + TRACE("(%s, %s, %08lx, %ld, %p, %p, %p, %p, %p, %p)\n", debugstr_w(pszURL), debugstr_a(pszObjectOid), dwRetrievalFlags, dwTimeout, pObject, ppfnFreeObject, ppvFreeContext, hAsyncRetrieve, pCredentials, pAuxInfo); @@ -1477,7 +1477,7 @@ BOOL WINAPI CryptRetrieveObjectByUrlW(LPCWSTR pszURL, LPCSTR pszObjectOid, ContextDllCreateObjectContext create; HCRYPTOIDFUNCADDR hRetrieve = 0, hCreate = 0; - TRACE("(%s, %s, %08x, %d, %p, %p, %p, %p, %p)\n", debugstr_w(pszURL), + TRACE("(%s, %s, %08lx, %ld, %p, %p, %p, %p, %p)\n", debugstr_w(pszURL), debugstr_a(pszObjectOid), dwRetrievalFlags, dwTimeout, ppvObject, hAsyncRetrieve, pCredentials, pvVerify, pAuxInfo); @@ -1546,7 +1546,7 @@ static FILE *open_cached_revocation_file(const CRYPT_INTEGER_BLOB *serial, const if (FAILED(hr = SHGetKnownFolderPath(&FOLDERID_LocalAppDataLow, 0, NULL, &appdata_path))) { - ERR("Failed to get LocalAppDataLow path, hr %#x.\n", hr); + ERR("Failed to get LocalAppDataLow path, hr %#lx.\n", hr); return INVALID_HANDLE_VALUE; } @@ -1617,7 +1617,7 @@ static BOOL find_cached_revocation_status(const CRYPT_INTEGER_BLOB *serial, return FALSE; } - TRACE("Using cached status %#x, reason %#x.\n", status->dwError, status->dwReason); + TRACE("Using cached status %#lx, reason %#lx.\n", status->dwError, status->dwReason); return TRUE; } @@ -1742,7 +1742,7 @@ static DWORD verify_cert_revocation_from_aia_ext(const CRYPT_DATA_BLOB *value, c FIXME("OCSP URL = %s\n", debugstr_w(aia->rgAccDescr[i].AccessLocation.u.pwszURL)); else - FIXME("unsupported AccessLocation type %d\n", + FIXME("unsupported AccessLocation type %ld\n", aia->rgAccDescr[i].AccessLocation.dwAltNameChoice); } LocalFree(aia); @@ -1902,7 +1902,7 @@ BOOL WINAPI CertDllVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType, FILETIME now; LPFILETIME pTime = NULL; - TRACE("(%08x, %d, %d, %p, %08x, %p, %p)\n", dwEncodingType, dwRevType, + TRACE("(%08lx, %ld, %ld, %p, %08lx, %p, %p)\n", dwEncodingType, dwRevType, cContext, rgpvContext, dwFlags, pRevPara, pRevStatus); if (pRevStatus->cbSize != sizeof(OLD_CERT_REVOCATION_STATUS) && @@ -1943,6 +1943,6 @@ BOOL WINAPI CertDllVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType, SetLastError(error); pRevStatus->dwError = error; } - TRACE("returning %d (%08x)\n", !error, error); + TRACE("returning %d (%08lx)\n", !error, error); return !error; }

1 0

Eric Pouech : comsvcs: Enable compilation with long types.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: c7c44c593a881f7f7aa22f3242584a365872d0bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7c44c593a881f7f7aa22f32… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 9 09:25:44 2022 +0100 comsvcs: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/Makefile.in | 1 - dlls/comsvcs/main.c | 32 ++++++++++++++++---------------- dlls/comsvcs/property.c | 10 +++++----- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/comsvcs/Makefile.in b/dlls/comsvcs/Makefile.in index 5eede59d5b6..22090938b52 100644 --- a/dlls/comsvcs/Makefile.in +++ b/dlls/comsvcs/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = comsvcs.dll IMPORTLIB = comsvcs IMPORTS = ole32 uuid diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 797e2db97db..b34c7d21309 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -97,7 +97,7 @@ static ULONG WINAPI holder_AddRef(IHolder *iface) { holder *This = impl_from_IHolder(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE("(%p)->(%ld)\n", This, ref); return ref; } @@ -105,7 +105,7 @@ static ULONG WINAPI holder_Release(IHolder *iface) { holder *This = impl_from_IHolder(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE("(%p)->(%ld)\n", This, ref); if (!ref) { @@ -121,11 +121,11 @@ static HRESULT WINAPI holder_AllocResource(IHolder *iface, const RESTYPID typeid HRESULT hr; TIMEINSECS secs; - TRACE("(%p)->(%08lx, %p) stub\n", This, typeid, resid); + TRACE("(%p)->(%08Ix, %p) stub\n", This, typeid, resid); hr = IDispenserDriver_CreateResource(This->driver, typeid, resid, &secs); - TRACE("<- 0x%08x\n", hr); + TRACE("<- 0x%08lx\n", hr); return hr; } @@ -134,11 +134,11 @@ static HRESULT WINAPI holder_FreeResource(IHolder *iface, const RESID resid) holder *This = impl_from_IHolder(iface); HRESULT hr; - TRACE("(%p)->(%08lx) stub\n", This, resid); + TRACE("(%p)->(%08Ix) stub\n", This, resid); hr = IDispenserDriver_DestroyResource(This->driver, resid); - TRACE("<- 0x%08x\n", hr); + TRACE("<- 0x%08lx\n", hr); return hr; } @@ -147,7 +147,7 @@ static HRESULT WINAPI holder_TrackResource(IHolder *iface, const RESID resid) { holder *This = impl_from_IHolder(iface); - FIXME("(%p)->(%08lx) stub\n", This, resid); + FIXME("(%p)->(%08Ix) stub\n", This, resid); return E_NOTIMPL; } @@ -165,7 +165,7 @@ static HRESULT WINAPI holder_UntrackResource(IHolder *iface, const RESID resid, { holder *This = impl_from_IHolder(iface); - FIXME("(%p)->(%08lx, %d) stub\n", This, resid, value); + FIXME("(%p)->(%08Ix, %d) stub\n", This, resid, value); return E_NOTIMPL; } @@ -194,7 +194,7 @@ static HRESULT WINAPI holder_RequestDestroyResource(IHolder *iface, const RESID { holder *This = impl_from_IHolder(iface); - FIXME("(%p)->(%08lx) stub\n", This, resid); + FIXME("(%p)->(%08Ix) stub\n", This, resid); return E_NOTIMPL; } @@ -263,7 +263,7 @@ static ULONG WINAPI dismanager_AddRef(IDispenserManager *iface) { dispensermanager *This = impl_from_IDispenserManager(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE("(%p)->(%ld)\n", This, ref); return ref; } @@ -271,7 +271,7 @@ static ULONG WINAPI dismanager_Release(IDispenserManager *iface) { dispensermanager *This = impl_from_IDispenserManager(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE("(%p)->(%ld)\n", This, ref); if (!ref) { @@ -299,7 +299,7 @@ static HRESULT WINAPI dismanager_RegisterDispenser(IDispenserManager *iface, IDi if (!This->mta_cookie) CoIncrementMTAUsage(&This->mta_cookie); - TRACE("<-- 0x%08x, %p\n", hr, *dispenser); + TRACE("<-- 0x%08lx, %p\n", hr, *dispenser); return hr; } @@ -429,7 +429,7 @@ static ULONG WINAPI new_moniker_AddRef(IMoniker* iface) struct new_moniker *moniker = impl_from_IMoniker(iface); ULONG refcount = InterlockedIncrement(&moniker->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -439,7 +439,7 @@ static ULONG WINAPI new_moniker_Release(IMoniker* iface) struct new_moniker *moniker = impl_from_IMoniker(iface); ULONG refcount = InterlockedDecrement(&moniker->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -600,7 +600,7 @@ static HRESULT WINAPI new_moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc, static HRESULT WINAPI new_moniker_Reduce(IMoniker *iface, IBindCtx *pbc, DWORD flags, IMoniker **ppmkToLeft, IMoniker **ret) { - TRACE("%p, %p, %d, %p, %p.\n", iface, pbc, flags, ppmkToLeft, ret); + TRACE("%p, %p, %ld, %p, %p.\n", iface, pbc, flags, ppmkToLeft, ret); if (!ret) return E_POINTER; @@ -758,7 +758,7 @@ static ULONG WINAPI new_moniker_rotdata_Release(IROTData *iface) static HRESULT WINAPI new_moniker_rotdata_GetComparisonData(IROTData *iface, byte *data, ULONG data_len, ULONG *length) { - FIXME("%p, %p, %u, %p.\n", iface, data, data_len, length); + FIXME("%p, %p, %lu, %p.\n", iface, data, data_len, length); return E_NOTIMPL; } diff --git a/dlls/comsvcs/property.c b/dlls/comsvcs/property.c index 4dc6e1d9a46..7a47135769e 100644 --- a/dlls/comsvcs/property.c +++ b/dlls/comsvcs/property.c @@ -59,7 +59,7 @@ static ULONG WINAPI group_manager_AddRef(ISharedPropertyGroupManager *iface) struct group_manager *manager = impl_from_ISharedPropertyGroupManager(iface); ULONG refcount = InterlockedIncrement(&manager->refcount); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p increasing refcount to %lu.\n", iface, refcount); return refcount; } @@ -69,7 +69,7 @@ static ULONG WINAPI group_manager_Release(ISharedPropertyGroupManager *iface) struct group_manager *manager = impl_from_ISharedPropertyGroupManager(iface); ULONG refcount = InterlockedDecrement(&manager->refcount); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); return refcount; } @@ -83,14 +83,14 @@ static HRESULT WINAPI group_manager_GetTypeInfoCount(ISharedPropertyGroupManager static HRESULT WINAPI group_manager_GetTypeInfo(ISharedPropertyGroupManager *iface, UINT index, LCID lcid, ITypeInfo **info) { - FIXME("iface %p, index %u, lcid %u, info %p: stub.\n", iface, index, lcid, info); + FIXME("iface %p, index %u, lcid %lu, info %p: stub.\n", iface, index, lcid, info); return E_NOTIMPL; } static HRESULT WINAPI group_manager_GetIDsOfNames(ISharedPropertyGroupManager *iface, REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid) { - FIXME("iface %p, riid %s, names %p, count %u, lcid %u, dispid %p: stub.\n", + FIXME("iface %p, riid %s, names %p, count %u, lcid %lu, dispid %p: stub.\n", iface, debugstr_guid(riid), names, count, lcid, dispid); return E_NOTIMPL; @@ -99,7 +99,7 @@ static HRESULT WINAPI group_manager_GetIDsOfNames(ISharedPropertyGroupManager *i static HRESULT WINAPI group_manager_Invoke(ISharedPropertyGroupManager *iface, DISPID member, REFIID riid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *except, UINT *argerr) { - FIXME("iface %p, member %u, riid %s, lcid %u, flags %x, params %p, result %p, except %p, argerr %p: stub.\n", + FIXME("iface %p, member %lu, riid %s, lcid %lu, flags %x, params %p, result %p, except %p, argerr %p: stub.\n", iface, member, debugstr_guid(riid), lcid, flags, params, result, except, argerr); return E_NOTIMPL; }

1 0

Eric Pouech : compobj.dll16: Enable compilation with long types.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 3f0469131ecf4afbeeb7ae289d64a0f9babf671f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f0469131ecf4afbeeb7ae28… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 9 09:25:38 2022 +0100 compobj.dll16: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/compobj.dll16/Makefile.in | 1 - dlls/compobj.dll16/compobj.c | 28 ++++++++++++++-------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/compobj.dll16/Makefile.in b/dlls/compobj.dll16/Makefile.in index 8ab9d824683..5b11e840c7f 100644 --- a/dlls/compobj.dll16/Makefile.in +++ b/dlls/compobj.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = compobj.dll16 IMPORTS = uuid ole32 advapi32 EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll diff --git a/dlls/compobj.dll16/compobj.c b/dlls/compobj.dll16/compobj.c index 831d62d25ee..12a41775333 100644 --- a/dlls/compobj.dll16/compobj.c +++ b/dlls/compobj.dll16/compobj.c @@ -143,7 +143,7 @@ ULONG CDECL IMalloc16_fnAddRef(IMalloc16 *iface) { IMalloc16Impl *malloc = impl_from_IMalloc16(iface); ULONG refcount = InterlockedIncrement(&malloc->refcount); - TRACE("%p increasing refcount to %u.\n", malloc, refcount); + TRACE("%p increasing refcount to %lu.\n", malloc, refcount); return refcount; } @@ -154,7 +154,7 @@ ULONG CDECL IMalloc16_fnRelease(SEGPTR iface) { IMalloc16Impl *malloc = impl_from_IMalloc16(MapSL(iface)); ULONG refcount = InterlockedDecrement(&malloc->refcount); - TRACE("%p decreasing refcount to %u.\n", malloc, refcount); + TRACE("%p decreasing refcount to %lu.\n", malloc, refcount); if (!refcount) { UnMapLS(iface); @@ -169,7 +169,7 @@ ULONG CDECL IMalloc16_fnRelease(SEGPTR iface) SEGPTR CDECL IMalloc16_fnAlloc(IMalloc16* iface,DWORD cb) { IMalloc16Impl *This = impl_from_IMalloc16(iface); - TRACE("(%p)->Alloc(%d)\n",This,cb); + TRACE("(%p)->Alloc(%ld)\n",This,cb); return MapLS( HeapAlloc( GetProcessHeap(), 0, cb ) ); } @@ -180,7 +180,7 @@ VOID CDECL IMalloc16_fnFree(IMalloc16* iface,SEGPTR pv) { void *ptr = MapSL(pv); IMalloc16Impl *This = impl_from_IMalloc16(iface); - TRACE("(%p)->Free(%08x)\n",This,pv); + TRACE("(%p)->Free(%08lx)\n",This,pv); UnMapLS(pv); HeapFree( GetProcessHeap(), 0, ptr ); } @@ -193,7 +193,7 @@ SEGPTR CDECL IMalloc16_fnRealloc(IMalloc16* iface,SEGPTR pv,DWORD cb) SEGPTR ret; IMalloc16Impl *This = impl_from_IMalloc16(iface); - TRACE("(%p)->Realloc(%08x,%d)\n",This,pv,cb); + TRACE("(%p)->Realloc(%08lx,%ld)\n",This,pv,cb); if (!pv) ret = IMalloc16_fnAlloc(iface, cb); else if (cb) { @@ -213,7 +213,7 @@ DWORD CDECL IMalloc16_fnGetSize(IMalloc16* iface,SEGPTR pv) { IMalloc16Impl *This = impl_from_IMalloc16(iface); - TRACE("(%p)->GetSize(%08x)\n",This,pv); + TRACE("(%p)->GetSize(%08lx)\n",This,pv); return HeapSize( GetProcessHeap(), 0, MapSL(pv) ); } @@ -301,11 +301,11 @@ HRESULT WINAPI CoCreateStandardMalloc16(MEMCTX context, SEGPTR *malloc) */ SEGPTR WINAPI CoMemAlloc(DWORD size, MEMCTX context, DWORD unknown) { - TRACE("size %u, context %d, unknown %#x.\n", size, context, unknown); + TRACE("size %lu, context %d, unknown %#lx.\n", size, context, unknown); if (context != MEMCTX_TASK) FIXME("Ignoring context %d.\n", context); if (unknown) - FIXME("Ignoring unknown parameter %#x.\n", unknown); + FIXME("Ignoring unknown parameter %#lx.\n", unknown); return call_IMalloc_Alloc(compobj_malloc, size); } @@ -504,7 +504,7 @@ HRESULT WINAPI CoRegisterClassObject16( DWORD flags, /* [in] REGCLS flags indicating how connections are made */ LPDWORD lpdwRegister ) { - FIXME("(%s,%p,0x%08x,0x%08x,%p),stub\n", + FIXME("(%s,%p,0x%08lx,0x%08lx,%p),stub\n", debugstr_guid(rclsid),pUnk,dwClsContext,flags,lpdwRegister ); return 0; @@ -516,7 +516,7 @@ HRESULT WINAPI CoRegisterClassObject16( */ HRESULT WINAPI CoRevokeClassObject16(DWORD dwRegister) /* [in] token on class obj */ { - FIXME("(0x%08x),stub!\n", dwRegister); + FIXME("(0x%08lx),stub!\n", dwRegister); return 0; } @@ -613,7 +613,7 @@ HRESULT WINAPI CoGetState16(LPDWORD state) */ BOOL WINAPI COMPOBJ_DllEntryPoint(DWORD Reason, HINSTANCE16 hInst, WORD ds, WORD HeapSize, DWORD res1, WORD res2) { - TRACE("(%08x, %04x, %04x, %04x, %08x, %04x)\n", Reason, hInst, ds, HeapSize, res1, res2); + TRACE("(%08lx, %04x, %04x, %04x, %08lx, %04x)\n", Reason, hInst, ds, HeapSize, res1, res2); return TRUE; } @@ -738,7 +738,7 @@ HRESULT WINAPI CoGetClassObject16( WOWCallback16Ex((DWORD) DllGetClassObject, WCB16_PASCAL, sizeof(args), args, &dwRet); if (dwRet != S_OK) { - ERR("DllGetClassObject returned error 0x%08x\n", dwRet); + ERR("DllGetClassObject returned error 0x%08lx\n", dwRet); FreeLibrary16(dll); return dwRet; } @@ -768,7 +768,7 @@ HRESULT WINAPI CoCreateInstance16( REFIID iid, LPVOID *ppv) { - FIXME("(%s, %p, %x, %s, %p), stub!\n", + FIXME("(%s, %p, %lx, %s, %p), stub!\n", debugstr_guid(rclsid), pUnkOuter, dwClsContext, debugstr_guid(iid), ppv ); @@ -780,6 +780,6 @@ HRESULT WINAPI CoCreateInstance16( */ HRESULT WINAPI CoDisconnectObject16( LPUNKNOWN lpUnk, DWORD reserved ) { - FIXME("(%p, 0x%08x): stub!\n", lpUnk, reserved); + FIXME("(%p, 0x%08lx): stub!\n", lpUnk, reserved); return E_NOTIMPL; }

1 0

Eric Pouech : crypt32: Enable compilation with long types.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 5fc99b35baefd49502f3625fa3a457ee477db98e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fc99b35baefd49502f3625f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 9 09:25:50 2022 +0100 crypt32: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/Makefile.in | 2 +- dlls/crypt32/base64.c | 16 +-- dlls/crypt32/cert.c | 94 ++++++++-------- dlls/crypt32/chain.c | 76 ++++++------- dlls/crypt32/collectionstore.c | 14 +-- dlls/crypt32/context.c | 4 +- dlls/crypt32/crl.c | 30 +++--- dlls/crypt32/ctl.c | 24 ++--- dlls/crypt32/decode.c | 240 ++++++++++++++++++++--------------------- dlls/crypt32/encode.c | 42 ++++---- dlls/crypt32/filestore.c | 26 ++--- dlls/crypt32/main.c | 28 ++--- dlls/crypt32/message.c | 18 ++-- dlls/crypt32/msg.c | 52 ++++----- dlls/crypt32/object.c | 22 ++-- dlls/crypt32/oid.c | 42 ++++---- dlls/crypt32/pfx.c | 20 ++-- dlls/crypt32/proplist.c | 2 +- dlls/crypt32/protectdata.c | 14 +-- dlls/crypt32/provstore.c | 8 +- dlls/crypt32/regstore.c | 22 ++-- dlls/crypt32/rootstore.c | 6 +- dlls/crypt32/serialize.c | 20 ++-- dlls/crypt32/sip.c | 10 +- dlls/crypt32/store.c | 66 ++++++------ dlls/crypt32/str.c | 48 ++++----- 26 files changed, 473 insertions(+), 473 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5fc99b35baefd49502f3…

1 0

Eric Pouech : davclnt: Enable compilation with long types.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 3b2681b671b75beaf56a668249d3d4bf3d959653 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b2681b671b75beaf56a6682… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 9 09:26:20 2022 +0100 davclnt: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/davclnt/Makefile.in | 1 - dlls/davclnt/main.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/davclnt/Makefile.in b/dlls/davclnt/Makefile.in index bc6e4b04132..007258ed236 100644 --- a/dlls/davclnt/Makefile.in +++ b/dlls/davclnt/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = davclnt.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/davclnt/main.c b/dlls/davclnt/main.c index 5859c3c06c5..b55c435b8a1 100644 --- a/dlls/davclnt/main.c +++ b/dlls/davclnt/main.c @@ -34,7 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(davclnt); */ OPAQUE_HANDLE WINAPI DavRegisterAuthCallback(PFNDAVAUTHCALLBACK cb, ULONG version) { - FIXME("%p, %u\n", cb, version); + FIXME("%p, %lu\n", cb, version); return 0xdeadbeef; } @@ -43,5 +43,5 @@ OPAQUE_HANDLE WINAPI DavRegisterAuthCallback(PFNDAVAUTHCALLBACK cb, ULONG versio */ VOID WINAPI DavUnregisterAuthCallback(OPAQUE_HANDLE handle) { - FIXME("%08x\n", handle); + FIXME("%08lx\n", handle); }

1 0