wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Zhiyi Zhang : uxtheme/tests: Test more WM_CTLCOLOR* messages for dialog theming.
by Alexandre Julliard 09 Feb '22

09 Feb '22

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 : dispex: Enable compilation with long types.
by Alexandre Julliard 09 Feb '22

09 Feb '22

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

Eric Pouech : directmanipulation: Enable compilation with long types.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: be94673486fa8672d21d1832d6b49a64910a6286 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be94673486fa8672d21d1832… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 9 09:27:04 2022 +0100 directmanipulation: 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/directmanipulation/Makefile.in | 1 - dlls/directmanipulation/directmanipulation.c | 40 ++++++++++++++-------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/directmanipulation/Makefile.in b/dlls/directmanipulation/Makefile.in index f33edbe6e8d..a258835e3ab 100644 --- a/dlls/directmanipulation/Makefile.in +++ b/dlls/directmanipulation/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = directmanipulation.dll IMPORTS = uuid diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c index 28fe52ac0fc..b20c41331e5 100644 --- a/dlls/directmanipulation/directmanipulation.c +++ b/dlls/directmanipulation/directmanipulation.c @@ -75,7 +75,7 @@ ULONG WINAPI update_manager_AddRef(IDirectManipulationUpdateManager *iface) struct directupdatemanager *This = impl_from_IDirectManipulationUpdateManager(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref); return ref; } @@ -85,7 +85,7 @@ ULONG WINAPI update_manager_Release(IDirectManipulationUpdateManager *iface) struct directupdatemanager *This = impl_from_IDirectManipulationUpdateManager(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref); if (!ref) { @@ -105,7 +105,7 @@ static HRESULT WINAPI update_manager_RegisterWaitHandleCallback(IDirectManipulat static HRESULT WINAPI update_manager_UnregisterWaitHandleCallback(IDirectManipulationUpdateManager *iface, DWORD cookie) { struct directupdatemanager *This = impl_from_IDirectManipulationUpdateManager(iface); - FIXME("%p, %x\n", This, cookie); + FIXME("%p, %lx\n", This, cookie); return E_NOTIMPL; } @@ -187,7 +187,7 @@ static ULONG WINAPI primary_AddRef(IDirectManipulationPrimaryContent *iface) struct primarycontext *This = impl_from_IDirectManipulationPrimaryContent(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref); return ref; } @@ -197,7 +197,7 @@ static ULONG WINAPI primary_Release(IDirectManipulationPrimaryContent *iface) struct primarycontext *This = impl_from_IDirectManipulationPrimaryContent(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref); if (!ref) { @@ -218,7 +218,7 @@ static HRESULT WINAPI primary_SetSnapPoints(IDirectManipulationPrimaryContent *i const float *points, DWORD count) { struct primarycontext *This = impl_from_IDirectManipulationPrimaryContent(iface); - FIXME("%p, %d, %p, %d\n", This, motion, points, count); + FIXME("%p, %d, %p, %ld\n", This, motion, points, count); return E_NOTIMPL; } @@ -262,7 +262,7 @@ static HRESULT WINAPI primary_SetVerticalAlignment(IDirectManipulationPrimaryCon static HRESULT WINAPI primary_GetInertiaEndTransform(IDirectManipulationPrimaryContent *iface, float *matrix, DWORD count) { struct primarycontext *This = impl_from_IDirectManipulationPrimaryContent(iface); - FIXME("%p, %p, %d\n", This, matrix, count); + FIXME("%p, %p, %ld\n", This, matrix, count); return E_NOTIMPL; } @@ -350,7 +350,7 @@ static HRESULT WINAPI content_GetOutputTransform(IDirectManipulationContent *ifa float *matrix, DWORD count) { struct primarycontext *This = impl_from_IDirectManipulationContent(iface); - FIXME("%p, %p, %d\n", This, matrix, count); + FIXME("%p, %p, %ld\n", This, matrix, count); return E_NOTIMPL; } @@ -358,7 +358,7 @@ static HRESULT WINAPI content_GetContentTransform(IDirectManipulationContent *if float *matrix, DWORD count) { struct primarycontext *This = impl_from_IDirectManipulationContent(iface); - FIXME("%p, %p, %d\n", This, matrix, count); + FIXME("%p, %p, %ld\n", This, matrix, count); return E_NOTIMPL; } @@ -366,7 +366,7 @@ static HRESULT WINAPI content_SyncContentTransform(IDirectManipulationContent *i const float *matrix, DWORD count) { struct primarycontext *This = impl_from_IDirectManipulationContent(iface); - FIXME("%p, %p, %d\n", This, matrix, count); + FIXME("%p, %p, %ld\n", This, matrix, count); return E_NOTIMPL; } @@ -419,7 +419,7 @@ static ULONG WINAPI viewport_AddRef(IDirectManipulationViewport2 *iface) struct directviewport *This = impl_from_IDirectManipulationViewport2(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref); return ref; } @@ -429,7 +429,7 @@ static ULONG WINAPI viewport_Release(IDirectManipulationViewport2 *iface) struct directviewport *This = impl_from_IDirectManipulationViewport2(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref); if (!ref) { @@ -520,7 +520,7 @@ static HRESULT WINAPI viewport_SetViewportTransform(IDirectManipulationViewport2 const float *matrix, DWORD count) { struct directviewport *This = impl_from_IDirectManipulationViewport2(iface); - FIXME("%p, %p, %d\n", This, matrix, count); + FIXME("%p, %p, %ld\n", This, matrix, count); return E_NOTIMPL; } @@ -528,7 +528,7 @@ static HRESULT WINAPI viewport_SyncDisplayTransform(IDirectManipulationViewport2 const float *matrix, DWORD count) { struct directviewport *This = impl_from_IDirectManipulationViewport2(iface); - FIXME("%p, %p, %d\n", This, matrix, count); + FIXME("%p, %p, %ld\n", This, matrix, count); return E_NOTIMPL; } @@ -624,7 +624,7 @@ static HRESULT WINAPI viewport_AddEventHandler(IDirectManipulationViewport2 *ifa static HRESULT WINAPI viewport_RemoveEventHandler(IDirectManipulationViewport2 *iface, DWORD cookie) { struct directviewport *This = impl_from_IDirectManipulationViewport2(iface); - FIXME("%p, %d\n", This, cookie); + FIXME("%p, %ld\n", This, cookie); return E_NOTIMPL; } @@ -666,7 +666,7 @@ static HRESULT WINAPI viewport_AddBehavior(IDirectManipulationViewport2 *iface, static HRESULT WINAPI viewport_RemoveBehavior(IDirectManipulationViewport2 *iface, DWORD cookie) { struct directviewport *This = impl_from_IDirectManipulationViewport2(iface); - FIXME("%p, %d\n", This, cookie); + FIXME("%p, %ld\n", This, cookie); return E_NOTIMPL; } @@ -750,7 +750,7 @@ static ULONG WINAPI direct_manip_AddRef(IDirectManipulationManager2 *iface) struct directmanipulation *This = impl_from_IDirectManipulationManager2(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref); return ref; } @@ -760,7 +760,7 @@ static ULONG WINAPI direct_manip_Release(IDirectManipulationManager2 *iface) struct directmanipulation *This = impl_from_IDirectManipulationManager2(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref); if (!ref) { @@ -946,7 +946,7 @@ static ULONG WINAPI compositor_AddRef(IDirectManipulationCompositor2 *iface) struct directcompositor *This = impl_from_IDirectManipulationCompositor2(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref); return ref; } @@ -956,7 +956,7 @@ static ULONG WINAPI compositor_Release(IDirectManipulationCompositor2 *iface) struct directcompositor *This = impl_from_IDirectManipulationCompositor2(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref); if (!ref) {

1 0

Eric Pouech : difxapi: Enable compilation with long types.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 1c9a0679a9a5deaec48614b4f3f713bac585fa29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c9a0679a9a5deaec48614b4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 9 09:26:58 2022 +0100 difxapi: 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/difxapi/Makefile.in | 1 - dlls/difxapi/main.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/difxapi/Makefile.in b/dlls/difxapi/Makefile.in index 7ca39d4e8ca..3f61fd319ff 100644 --- a/dlls/difxapi/Makefile.in +++ b/dlls/difxapi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = difxapi.dll C_SRCS = \ diff --git a/dlls/difxapi/main.c b/dlls/difxapi/main.c index 7b7b1d6d949..8addbc304f7 100644 --- a/dlls/difxapi/main.c +++ b/dlls/difxapi/main.c @@ -27,40 +27,40 @@ WINE_DEFAULT_DEBUG_CHANNEL(difxapi); DWORD WINAPI DriverPackagePreinstallA(LPCSTR inf, DWORD flags) { - FIXME("(%s, %u) stub\n", wine_dbgstr_a(inf), flags); + FIXME("(%s, %lu) stub\n", wine_dbgstr_a(inf), flags); return ERROR_SUCCESS; } DWORD WINAPI DriverPackagePreinstallW(LPCWSTR inf, DWORD flags) { - FIXME("(%s, %u) stub\n", wine_dbgstr_w(inf), flags); + FIXME("(%s, %lu) stub\n", wine_dbgstr_w(inf), flags); return ERROR_SUCCESS; } DWORD WINAPI DriverPackageInstallA(LPCSTR inf, DWORD flags, PCINSTALLERINFO_A info, BOOL *reboot) { - FIXME("(%s, %u, %p, %p) stub\n", wine_dbgstr_a(inf), flags, info, reboot); + FIXME("(%s, %lu, %p, %p) stub\n", wine_dbgstr_a(inf), flags, info, reboot); if (reboot) *reboot = FALSE; return ERROR_SUCCESS; } DWORD WINAPI DriverPackageInstallW(LPCWSTR inf, DWORD flags, PCINSTALLERINFO_W info, BOOL *reboot) { - FIXME("(%s, %u, %p, %p) stub\n", wine_dbgstr_w(inf), flags, info, reboot); + FIXME("(%s, %lu, %p, %p) stub\n", wine_dbgstr_w(inf), flags, info, reboot); if (reboot) *reboot = FALSE; return ERROR_SUCCESS; } DWORD WINAPI DriverPackageUninstallA(LPCSTR inf, DWORD flags, PCINSTALLERINFO_A info, BOOL *reboot) { - FIXME("(%s, %u, %p, %p) stub\n", wine_dbgstr_a(inf), flags, info, reboot); + FIXME("(%s, %lu, %p, %p) stub\n", wine_dbgstr_a(inf), flags, info, reboot); if (reboot) *reboot = FALSE; return ERROR_SUCCESS; } DWORD WINAPI DriverPackageUninstallW(LPCWSTR inf, DWORD flags, PCINSTALLERINFO_W info, BOOL *reboot) { - FIXME("(%s, %u, %p, %p) stub\n", wine_dbgstr_w(inf), flags, info, reboot); + FIXME("(%s, %lu, %p, %p) stub\n", wine_dbgstr_w(inf), flags, info, reboot); if (reboot) *reboot = FALSE; return ERROR_SUCCESS; }

1 0

Eric Pouech : dhtmled.ocx: Enable compilation with long types.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: ec0645c983a33e16e8cec420dec29c3e1c50f8f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec0645c983a33e16e8cec420… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 9 09:26:39 2022 +0100 dhtmled.ocx: 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/dhtmled.ocx/Makefile.in | 1 - dlls/dhtmled.ocx/edit.c | 68 ++++++++++++++++++++++---------------------- dlls/dhtmled.ocx/main.c | 2 +- 3 files changed, 35 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ec0645c983a33e16e8ce…

1 0

Eric Pouech : dhcpcsvc: Enable compilation with long types.
by Alexandre Julliard 09 Feb '22

09 Feb '22

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 : dbghelp: Enable compilation with long types.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: a64d15792808aa9283f13e4dad84fa9fd2fdf222 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a64d15792808aa9283f13e4d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 9 09:26:26 2022 +0100 dbghelp: 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/dbghelp/Makefile.in | 2 +- dlls/dbghelp/coff.c | 6 +- dlls/dbghelp/cpu_i386.c | 14 ++-- dlls/dbghelp/cpu_x86_64.c | 20 +++--- dlls/dbghelp/dbghelp.c | 20 +++--- dlls/dbghelp/dwarf.c | 162 ++++++++++++++++++++++---------------------- dlls/dbghelp/elf_module.c | 20 +++--- dlls/dbghelp/image.c | 2 +- dlls/dbghelp/macho_module.c | 44 ++++++------ dlls/dbghelp/minidump.c | 2 +- dlls/dbghelp/module.c | 10 +-- dlls/dbghelp/msc.c | 42 ++++++------ dlls/dbghelp/path.c | 4 +- dlls/dbghelp/pe_module.c | 6 +- dlls/dbghelp/source.c | 4 +- dlls/dbghelp/stabs.c | 10 +-- dlls/dbghelp/stack.c | 12 ++-- dlls/dbghelp/symbol.c | 46 ++++++------- 18 files changed, 213 insertions(+), 213 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a64d15792808aa9283f1…

1 0

Eric Pouech : davclnt: Enable compilation with long types.
by Alexandre Julliard 09 Feb '22

09 Feb '22

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

Eric Pouech : credui: Enable compilation with long types.
by Alexandre Julliard 09 Feb '22

09 Feb '22

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 09 Feb '22

09 Feb '22

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2022