February 2022 - Wine-Devel - list.winehq.org

[PATCH v2 1/5] msvcp: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban Feb. 8, 2022

Feb. 8, 2022

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2 (supersedes 225926) - split the patch into msvcrt and msvcp part - use %llx format in msvcrt/except_x86_64.c when printing ULONG64 - add some whitespace changes dlls/msvcirt/Makefile.in | 2 +- dlls/msvcirt/msvcirt.c | 30 +++++++++++++++--------------- dlls/msvcp100/Makefile.in | 2 +- dlls/msvcp110/Makefile.in | 2 +- dlls/msvcp120/Makefile.in | 2 +- dlls/msvcp140/Makefile.in | 2 +- dlls/msvcp60/Makefile.in | 2 +- dlls/msvcp60/main.c | 2 +- dlls/msvcp70/Makefile.in | 2 +- dlls/msvcp71/Makefile.in | 2 +- dlls/msvcp80/Makefile.in | 2 +- dlls/msvcp90/Makefile.in | 2 +- dlls/msvcp90/locale.c | 20 ++++++++++---------- dlls/msvcp90/misc.c | 18 +++++++++--------- dlls/msvcp90/msvcp_main.c | 2 +- 15 files changed, 46 insertions(+), 46 deletions(-)

1 1

[PATCH v2 5/5] msvcp: Print 0x prefix with %#x format in traces.
by Piotr Caban Feb. 8, 2022

Feb. 8, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/misc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH v2 4/5] msvcrt: Print 0x prefix with %#x format in traces.
by Piotr Caban Feb. 8, 2022

Feb. 8, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/data.c | 2 +- dlls/msvcrt/file.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-)

1 0

[PATCH v2 3/5] msvcrt: Use %#llx format in traces.
by Piotr Caban Feb. 8, 2022

Feb. 8, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/concurrency.c | 2 +- dlls/msvcrt/console.c | 4 ++-- dlls/msvcrt/except_x86_64.c | 4 ++-- dlls/msvcrt/file.c | 33 +++++++++++++++------------------ dlls/msvcrt/scanf.c | 8 ++++---- dlls/msvcrt/string.c | 10 +++++----- dlls/msvcrt/wcs.c | 14 +++++++------- 7 files changed, 36 insertions(+), 39 deletions(-)

1 0

[PATCH v2 2/5] msvcr: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban Feb. 8, 2022

Feb. 8, 2022

1 0

[PATCH] winegstreamer: Handle EnableDiscreteOutput and SpeakerConfig settings in WMSyncReader_SetOutputSetting().
by Andrey Gusev Feb. 8, 2022

Feb. 8, 2022

Resident Evil 5 cutscenes have audio and don't hang. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/winegstreamer/wm_syncreader.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/winegstreamer/wm_syncreader.c b/dlls/winegstreamer/wm_syncreader.c index e86645a207a..55940e2b370 100644 --- a/dlls/winegstreamer/wm_syncreader.c +++ b/dlls/winegstreamer/wm_syncreader.c @@ -271,6 +271,16 @@ static HRESULT WINAPI WMSyncReader_SetOutputSetting(IWMSyncReader2 *iface, DWORD FIXME("Ignoring VideoSampleDurations setting.\n"); return S_OK; } + if (!wcscmp(name, L"EnableDiscreteOutput")) + { + FIXME("Ignoring EnableDiscreteOutput setting.\n"); + return S_OK; + } + if (!wcscmp(name, L"SpeakerConfig")) + { + FIXME("Ignoring SpeakerConfig setting.\n"); + return S_OK; + } else { FIXME("Unknown setting %s; returning E_NOTIMPL.\n", debugstr_w(name)); -- 2.34.1

2 1

[PATCH vkd3d 2/2] vkd3d-shader: Undefine ERROR to avoid a compiler warning on Windows.
by Alexandre Julliard Feb. 8, 2022

Feb. 8, 2022

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.l | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 54542331bed6..20cb0c357611 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -22,6 +22,8 @@ #include "preproc.tab.h" +#undef ERROR /* defined in wingdi.h */ + #define YYSTYPE PREPROC_YYSTYPE #define YYLTYPE PREPROC_YYLTYPE -- 2.34.1

2 1

[PATCH vkd3d 1/2] vkd3d-shader: Define S_ISREG if necessary for the Windows build.
by Alexandre Julliard Feb. 8, 2022

Feb. 8, 2022

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.y | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index ac6f6479c4c2..3f02ac03612b 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -48,6 +48,10 @@ int preproc_yylex(PREPROC_YYSTYPE *yylval_param, PREPROC_YYLTYPE *yylloc_param, #define YYLLOC_DEFAULT(cur, rhs, n) (cur) = YYRHSLOC(rhs, !!n) +#ifndef S_ISREG +# define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) +#endif + static void preproc_error(struct preproc_ctx *ctx, const struct vkd3d_shader_location *loc, enum vkd3d_shader_error error, const char *format, ...) { -- 2.34.1

2 1

[PATCH v2 8/8] server: Don't allow creating children of orphaned windows.
by Jacek Caban Feb. 8, 2022

Feb. 8, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/tests/win.c | 33 +++++++++++++++++++++++++++++++-- server/window.c | 10 +++++++++- 2 files changed, 40 insertions(+), 3 deletions(-)

2 1

[PATCH v2 7/8] server: Orphan child windows when unlinking them from parent.
by Jacek Caban Feb. 8, 2022

Feb. 8, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/tests/win.c | 34 ++++++++++++++++++++++++++++++++++ server/window.c | 5 ++++- 2 files changed, 38 insertions(+), 1 deletion(-)

2 1

[PATCH v2 6/8] server: Don't allow orphaned windows in set_parent request.
by Jacek Caban Feb. 8, 2022

Feb. 8, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/tests/win.c | 3 --- dlls/user32/win.c | 2 +- server/window.c | 10 +++++++++- 3 files changed, 10 insertions(+), 5 deletions(-)

2 1

[PATCH v2 5/8] user32/tests: Add a test for child window destruction on thread exit.
by Jacek Caban Feb. 8, 2022

Feb. 8, 2022

From: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/tests/win.c | 235 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 235 insertions(+)

2 1

[PATCH] ddraw/tests: Skip a crashy test on WARP (v2).
by Stefan Dösinger Feb. 8, 2022

Feb. 8, 2022

ddraw1 doesn't draw, so presumably not affected. Can't find any crashes in the testbot history http://test.winehq.org/data/4364ff8d5c0387edd6fae142affe8e844b291518/win81_… http://test.winehq.org/data/d03984709d87d6eaa0e2e7746f0db5d8fdf81b5a/win150… I haven't found any examples of ddraw7 crashing in this test. Doesn't mean there aren't any. Let's wait and see. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- Version 2: Fixed the skip path, somehow releasing the uninitialized surface slipped through. --- dlls/ddraw/tests/ddraw2.c | 20 ++++++++++++++------ dlls/ddraw/tests/ddraw4.c | 11 ++++++++++- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 625776c652c..1285fa1b682 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -1076,6 +1076,17 @@ static void test_coop_level_d3d_state(void) window = create_window(); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); + + if (ddraw_is_warp(ddraw)) + { + /* ddraw2 crashes in EndScene, and if it doesn't crash it fails with + * DDERR_SURFACELOST on WARP. */ + win_skip("Skipping test that crashes WARP occasionally.\n"); + IDirectDraw2_Release(ddraw); + DestroyWindow(window); + return; + } + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) { skip("Failed to create a 3D device, skipping test.\n"); @@ -1159,12 +1170,9 @@ static void test_coop_level_d3d_state(void) hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DVT_LVERTEX, quad, ARRAY_SIZE(quad), 0); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice2_EndScene(device); - ok(hr == DD_OK || broken(ddraw_is_warp(ddraw) && hr == DDERR_SURFACELOST), "Got unexpected hr %#x.\n", hr); - if (hr == DD_OK) - { - color = get_surface_color(rt, 320, 240); - ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color); - } + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color); destroy_viewport(device, viewport); destroy_material(background); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 9b8acb674e3..399ef157497 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1301,6 +1301,14 @@ static void test_coop_level_d3d_state(void) hr = IDirect3D3_QueryInterface(d3d, &IID_IDirectDraw4, (void **)&ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); IDirect3D3_Release(d3d); + + if (ddraw_is_warp(ddraw)) + { + /* ddraw4 occasionally crashes in GetRenderTarget. */ + win_skip("Skipping test that crashes WARP occasionally.\n"); + goto done; + } + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(rt); @@ -1324,6 +1332,7 @@ static void test_coop_level_d3d_state(void) hr = IDirect3DDevice3_GetRenderTarget(device, &surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(surface == rt, "Got unexpected surface %p.\n", surface); + IDirectDrawSurface4_Release(surface); hr = IDirect3DDevice3_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &value); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(!!value, "Got unexpected z-enable state %#x.\n", value); @@ -1349,8 +1358,8 @@ static void test_coop_level_d3d_state(void) || broken(ddraw_is_warp(ddraw) && compare_color(color, 0x0000ff00, 0)), "Got unexpected color 0x%08x.\n", color); +done: destroy_viewport(device, viewport); - IDirectDrawSurface4_Release(surface); IDirectDrawSurface4_Release(rt); IDirect3DDevice3_Release(device); IDirectDraw4_Release(ddraw); -- 2.34.1

3 2

[PATCH 2/2] winealsa: Remove alsa-pulse handle underrun workaround.
by Huw Davies Feb. 8, 2022

Feb. 8, 2022

Pulse-based systems should be using winepulse.drv. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/mmdevdrv.c | 102 +---------------------------------- 1 file changed, 1 insertion(+), 101 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 8713b6153ce..0c4bd786342 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -50,7 +50,6 @@ #include <alsa/asoundlib.h> WINE_DEFAULT_DEBUG_CHANNEL(alsa); -WINE_DECLARE_DEBUG_CHANNEL(winediag); #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) @@ -613,89 +612,6 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, return S_OK; } -/* Using the pulse PCM device from alsa-plugins 1.0.24 triggers a bug - * which causes audio to cease playing after a few minutes of playback. - * Setting handle_underrun=1 on pulse-backed ALSA devices seems to work - * around this issue. */ -static snd_config_t *make_handle_underrun_config(const char *name) -{ - snd_config_t *lconf, *dev_node, *hu_node, *type_node; - char dev_node_name[260]; - const char *type_str; - int err; - - snd_config_update(); - - if((err = snd_config_copy(&lconf, snd_config)) < 0){ - WARN("snd_config_copy failed: %d (%s)\n", err, snd_strerror(err)); - return NULL; - } - - sprintf(dev_node_name, "pcm.%s", name); - err = snd_config_search(lconf, dev_node_name, &dev_node); - if(err == -ENOENT){ - snd_config_delete(lconf); - return NULL; - } - if(err < 0){ - snd_config_delete(lconf); - WARN("snd_config_search failed: %d (%s)\n", err, snd_strerror(err)); - return NULL; - } - - /* ALSA is extremely fragile. If it runs into a config setting it doesn't - * recognize, it tends to fail or assert. So we only want to inject - * handle_underrun=1 on devices that we know will recognize it. */ - err = snd_config_search(dev_node, "type", &type_node); - if(err == -ENOENT){ - snd_config_delete(lconf); - return NULL; - } - if(err < 0){ - snd_config_delete(lconf); - WARN("snd_config_search failed: %d (%s)\n", err, snd_strerror(err)); - return NULL; - } - - if((err = snd_config_get_string(type_node, &type_str)) < 0){ - snd_config_delete(lconf); - return NULL; - } - - if(strcmp(type_str, "pulse") != 0){ - snd_config_delete(lconf); - return NULL; - } - - err = snd_config_search(dev_node, "handle_underrun", &hu_node); - if(err >= 0){ - /* user already has an explicit handle_underrun setting, so don't - * use a local config */ - snd_config_delete(lconf); - return NULL; - } - if(err != -ENOENT){ - snd_config_delete(lconf); - WARN("snd_config_search failed: %d (%s)\n", err, snd_strerror(err)); - return NULL; - } - - if((err = snd_config_imake_integer(&hu_node, "handle_underrun", 1)) < 0){ - snd_config_delete(lconf); - WARN("snd_config_imake_integer failed: %d (%s)\n", err, - snd_strerror(err)); - return NULL; - } - - if((err = snd_config_add(dev_node, hu_node)) < 0){ - snd_config_delete(lconf); - WARN("snd_config_add failed: %d (%s)\n", err, snd_strerror(err)); - return NULL; - } - - return lconf; -} - static BOOL get_alsa_name_by_guid(GUID *guid, char *name, DWORD name_size, EDataFlow *flow) { HKEY devices_key; @@ -762,8 +678,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient ACImpl *This; int err; snd_pcm_stream_t stream; - snd_config_t *lconf; - static BOOL handle_underrun = TRUE; char alsa_name[256]; EDataFlow dataflow; HRESULT hr; @@ -800,21 +714,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient } This->dataflow = dataflow; - if(handle_underrun && ((lconf = make_handle_underrun_config(alsa_name)))){ - err = snd_pcm_open_lconf(&This->pcm_handle, alsa_name, stream, SND_PCM_NONBLOCK, lconf); - TRACE("Opening PCM device \"%s\" with handle_underrun: %d\n", alsa_name, err); - snd_config_delete(lconf); - /* Pulse <= 2010 returns EINVAL, it does not know handle_underrun. */ - if(err == -EINVAL){ - ERR_(winediag)("PulseAudio \"%s\" %d without handle_underrun. Audio may hang." - " Please upgrade to alsa_plugins >= 1.0.24\n", alsa_name, err); - handle_underrun = FALSE; - } - }else - err = -EINVAL; - if(err == -EINVAL){ - err = snd_pcm_open(&This->pcm_handle, alsa_name, stream, SND_PCM_NONBLOCK); - } + err = snd_pcm_open(&This->pcm_handle, alsa_name, stream, SND_PCM_NONBLOCK); if(err < 0){ HeapFree(GetProcessHeap(), 0, This); WARN("Unable to open PCM \"%s\": %d (%s)\n", alsa_name, err, snd_strerror(err)); -- 2.25.1

1 0

[PATCH v2 4/8] server: Don't immediately destroy child windows belonging to different thread in free_window_handle.
by Jacek Caban Feb. 8, 2022

Feb. 8, 2022

Notify their thread instead. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/user_private.h | 18 ------------------ dlls/user32/win.c | 12 +----------- include/ntuser.h | 19 +++++++++++++++++++ server/window.c | 14 +++++++++----- 4 files changed, 29 insertions(+), 34 deletions(-)

1 0

[PATCH v2 3/8] server: Keep a reference to parent in window objects.
by Jacek Caban Feb. 8, 2022

Feb. 8, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/window.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-)

1 0

[PATCH v2 2/8] server: Make window struct a server object.
by Jacek Caban Feb. 8, 2022

Feb. 8, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Tests show that orphaned windows' parents handles are no longer valid, but a number of operations of children still need to work, even things like MoveWindow(). For that to work, we still need to have parent object around. Following patches will use that for ref-counting, while having full server object is nice for things like leak detection. We could avoid making window object ref-counted by detecting if we're the last child alive when freeing its handle (and then destroying parent), but that doesn't seem cleaner. server/user.h | 2 +- server/window.c | 94 ++++++++++++++++++++++++++++++++++----------- server/winstation.c | 4 +- 3 files changed, 75 insertions(+), 25 deletions(-)

1 0

[PATCH v2 1/8] server: Allocate extra_bytes separatelly from window struct.
by Jacek Caban Feb. 8, 2022

Feb. 8, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: fixed issues spotted by Huw server/window.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)

1 0

[PATCH 1/8] server: Allocate extra_bytes separatelly from window struct.
by Jacek Caban Feb. 8, 2022

Feb. 8, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- We will eventually use window_shared for that when it's ready. server/window.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)

2 2

[PATCH] combase: Build without WINE_NO_LONG_TYPES.
by Nikolay Sivov Feb. 8, 2022

Feb. 8, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/combase/Makefile.in | 1 - dlls/combase/apartment.c | 18 +++--- dlls/combase/combase.c | 60 +++++++++---------- dlls/combase/errorinfo.c | 10 ++-- dlls/combase/hglobalstream.c | 10 ++-- dlls/combase/malloc.c | 4 +- dlls/combase/marshal.c | 111 +++++++++++++++++------------------ dlls/combase/roapi.c | 4 +- dlls/combase/rpc.c | 60 +++++++++---------- dlls/combase/stubmanager.c | 22 +++---- dlls/combase/usrmarshal.c | 18 +++--- 11 files changed, 157 insertions(+), 161 deletions(-) diff --git a/dlls/combase/Makefile.in b/dlls/combase/Makefile.in index da83ab6154c..987616773dd 100644 --- a/dlls/combase/Makefile.in +++ b/dlls/combase/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = combase.dll IMPORTLIB = combase IMPORTS = advapi32 ole32 user32 gdi32 uuid rpcrt4 diff --git a/dlls/combase/apartment.c b/dlls/combase/apartment.c index 690bc69db1b..c1b381879d3 100644 --- a/dlls/combase/apartment.c +++ b/dlls/combase/apartment.c @@ -264,7 +264,7 @@ static ULONG WINAPI local_server_AddRef(IServiceProvider *iface) struct local_server *local_server = impl_from_IServiceProvider(iface); LONG refcount = InterlockedIncrement(&local_server->refcount); - TRACE("%p, refcount %d\n", iface, refcount); + TRACE("%p, refcount %ld\n", iface, refcount); return refcount; } @@ -274,7 +274,7 @@ static ULONG WINAPI local_server_Release(IServiceProvider *iface) struct local_server *local_server = impl_from_IServiceProvider(iface); LONG refcount = InterlockedDecrement(&local_server->refcount); - TRACE("%p, refcount %d\n", iface, refcount); + TRACE("%p, refcount %ld\n", iface, refcount); if (!refcount) { @@ -355,7 +355,7 @@ HRESULT apartment_get_local_server_stream(struct apartment *apt, IStream **ret) LeaveCriticalSection(&apt->cs); if (FAILED(hr)) - ERR("Failed: %#x\n", hr); + ERR("Failed: %#lx\n", hr); return hr; } @@ -365,7 +365,7 @@ static struct apartment *apartment_construct(DWORD model) { struct apartment *apt; - TRACE("creating new apartment, model %d\n", model); + TRACE("creating new apartment, model %ld\n", model); apt = heap_alloc_zero(sizeof(*apt)); apt->tid = GetCurrentThreadId(); @@ -450,7 +450,7 @@ void apartment_release(struct apartment *apt) EnterCriticalSection(&apt_cs); refcount = InterlockedDecrement(&apt->refs); - TRACE("%s: after = %d\n", wine_dbgstr_longlong(apt->oxid), refcount); + TRACE("%s: after = %ld\n", wine_dbgstr_longlong(apt->oxid), refcount); if (apt->being_destroyed) { @@ -544,7 +544,7 @@ void apartment_release(struct apartment *apt) static DWORD apartment_addref(struct apartment *apt) { DWORD refs = InterlockedIncrement(&apt->refs); - TRACE("%s: before = %d\n", wine_dbgstr_longlong(apt->oxid), refs - 1); + TRACE("%s: before = %ld\n", wine_dbgstr_longlong(apt->oxid), refs - 1); return refs; } @@ -779,7 +779,7 @@ static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath, hr = p_ole32_DllGetClassObject(rclsid, riid, ppv); if (hr != S_OK) - ERR("DllGetClassObject returned error 0x%08x for dll %s\n", hr, debugstr_w(dllpath)); + ERR("DllGetClassObject returned error %#lx for dll %s\n", hr, debugstr_w(dllpath)); return hr; } @@ -828,7 +828,7 @@ static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath, hr = apartment_loaded_dll->dll->DllGetClassObject(rclsid, riid, ppv); if (hr != S_OK) - ERR("DllGetClassObject returned error 0x%08x for dll %s\n", hr, debugstr_w(dllpath)); + ERR("DllGetClassObject returned error %#lx for dll %s\n", hr, debugstr_w(dllpath)); } return hr; @@ -1260,7 +1260,7 @@ HRESULT apartment_createwindowifneeded(struct apartment *apt) hwnd = CreateWindowW(aptwinclassW, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, 0, hProxyDll, NULL); if (!hwnd) { - ERR("CreateWindow failed with error %d\n", GetLastError()); + ERR("CreateWindow failed with error %ld\n", GetLastError()); return HRESULT_FROM_WIN32(GetLastError()); } if (InterlockedCompareExchangePointer((void **)&apt->win, hwnd, NULL)) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 4677972656f..3ffd08ab635 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -465,7 +465,7 @@ static ULONG WINAPI global_options_AddRef(IGlobalOptions *iface) struct global_options *options = impl_from_IGlobalOptions(iface); LONG refcount = InterlockedIncrement(&options->refcount); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); return refcount; } @@ -475,7 +475,7 @@ static ULONG WINAPI global_options_Release(IGlobalOptions *iface) struct global_options *options = impl_from_IGlobalOptions(iface); LONG refcount = InterlockedDecrement(&options->refcount); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); if (!refcount) heap_free(options); @@ -485,7 +485,7 @@ static ULONG WINAPI global_options_Release(IGlobalOptions *iface) static HRESULT WINAPI global_options_Set(IGlobalOptions *iface, GLOBALOPT_PROPERTIES property, ULONG_PTR value) { - FIXME("%p, %u, %lx.\n", iface, property, value); + FIXME("%p, %u, %Ix.\n", iface, property, value); return S_OK; } @@ -587,7 +587,7 @@ HRESULT WINAPI FreePropVariantArray(ULONG count, PROPVARIANT *rgvars) { ULONG i; - TRACE("%u, %p.\n", count, rgvars); + TRACE("%lu, %p.\n", count, rgvars); if (!rgvars) return E_INVALIDARG; @@ -1030,7 +1030,7 @@ HRESULT WINAPI CoQueryProxyBlanket(IUnknown *proxy, DWORD *authn_service, IClientSecurity_Release(client_security); } - if (FAILED(hr)) ERR("-- failed with %#x.\n", hr); + if (FAILED(hr)) ERR("-- failed with %#lx.\n", hr); return hr; } @@ -1043,7 +1043,7 @@ HRESULT WINAPI CoSetProxyBlanket(IUnknown *proxy, DWORD authn_service, DWORD aut IClientSecurity *client_security; HRESULT hr; - TRACE("%p, %u, %u, %p, %u, %u, %p, %#x.\n", proxy, authn_service, authz_service, servername, + TRACE("%p, %lu, %lu, %p, %lu, %lu, %p, %#lx.\n", proxy, authn_service, authz_service, servername, authn_level, imp_level, auth_info, capabilities); hr = IUnknown_QueryInterface(proxy, &IID_IClientSecurity, (void **)&client_security); @@ -1054,7 +1054,7 @@ HRESULT WINAPI CoSetProxyBlanket(IUnknown *proxy, DWORD authn_service, DWORD aut IClientSecurity_Release(client_security); } - if (FAILED(hr)) ERR("-- failed with %#x.\n", hr); + if (FAILED(hr)) ERR("-- failed with %#lx.\n", hr); return hr; } @@ -1075,7 +1075,7 @@ HRESULT WINAPI CoCopyProxy(IUnknown *proxy, IUnknown **proxy_copy) IClientSecurity_Release(client_security); } - if (FAILED(hr)) ERR("-- failed with %#x.\n", hr); + if (FAILED(hr)) ERR("-- failed with %#lx.\n", hr); return hr; } @@ -1149,7 +1149,7 @@ HRESULT WINAPI CoInitializeSecurity(PSECURITY_DESCRIPTOR sd, LONG cAuthSvc, SOLE_AUTHENTICATION_SERVICE *asAuthSvc, void *reserved1, DWORD authn_level, DWORD imp_level, void *reserved2, DWORD capabilities, void *reserved3) { - FIXME("%p, %d, %p, %p, %d, %d, %p, %d, %p stub\n", sd, cAuthSvc, asAuthSvc, reserved1, authn_level, + FIXME("%p, %ld, %p, %p, %ld, %ld, %p, %ld, %p stub\n", sd, cAuthSvc, asAuthSvc, reserved1, authn_level, imp_level, reserved2, capabilities, reserved3); return S_OK; @@ -1198,7 +1198,7 @@ HRESULT WINAPI CoGetCallState(int arg1, ULONG *arg2) */ HRESULT WINAPI CoGetActivationState(GUID guid, DWORD arg2, DWORD *arg3) { - FIXME("%s, %x, %p.\n", debugstr_guid(&guid), arg2, arg3); + FIXME("%s, %lx, %p.\n", debugstr_guid(&guid), arg2, arg3); return E_NOTIMPL; } @@ -1235,7 +1235,7 @@ HRESULT WINAPI CoGetTreatAsClass(REFCLSID clsidOld, CLSID *clsidNew) hr = CLSIDFromString(buffW, clsidNew); if (FAILED(hr)) - ERR("Failed to get CLSID from string %s, hr %#x.\n", debugstr_w(buffW), hr); + ERR("Failed to get CLSID from string %s, hr %#lx.\n", debugstr_w(buffW), hr); done: if (hkey) RegCloseKey(hkey); return hr; @@ -1667,7 +1667,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstance(REFCLSID rclsid, IUnknown *out MULTI_QI multi_qi = { .pIID = riid }; HRESULT hr; - TRACE("%s, %p, %#x, %s, %p.\n", debugstr_guid(rclsid), outer, cls_context, debugstr_guid(riid), obj); + TRACE("%s, %p, %#lx, %s, %p.\n", debugstr_guid(rclsid), outer, cls_context, debugstr_guid(riid), obj); if (!obj) return E_POINTER; @@ -1683,7 +1683,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstance(REFCLSID rclsid, IUnknown *out HRESULT WINAPI CoCreateInstanceFromApp(REFCLSID rclsid, IUnknown *outer, DWORD cls_context, void *server_info, ULONG count, MULTI_QI *results) { - TRACE("%s, %p, %#x, %p, %u, %p\n", debugstr_guid(rclsid), outer, cls_context, server_info, + TRACE("%s, %p, %#lx, %p, %lu, %p\n", debugstr_guid(rclsid), outer, cls_context, server_info, count, results); return CoCreateInstanceEx(rclsid, outer, cls_context | CLSCTX_APPCONTAINER, server_info, @@ -1850,7 +1850,7 @@ static HRESULT com_get_class_object(REFCLSID rclsid, DWORD clscontext, } if (FAILED(hr)) - ERR("no class object %s could be created for context %#x\n", debugstr_guid(rclsid), clscontext); + ERR("no class object %s could be created for context %#lx\n", debugstr_guid(rclsid), clscontext); return hr; } @@ -1866,7 +1866,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx(REFCLSID rclsid, IUnknown *o CLSID clsid; HRESULT hr; - TRACE("%s, %p, %#x, %p, %u, %p\n", debugstr_guid(rclsid), outer, cls_context, server_info, count, results); + TRACE("%s, %p, %#lx, %p, %lu, %p\n", debugstr_guid(rclsid), outer, cls_context, server_info, count, results); if (!count || !results) return E_INVALIDARG; @@ -1890,7 +1890,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx(REFCLSID rclsid, IUnknown *o if (hr == CLASS_E_NOAGGREGATION && outer) FIXME("Class %s does not support aggregation\n", debugstr_guid(&clsid)); else - FIXME("no instance created for interface %s of class %s, hr %#x.\n", + FIXME("no instance created for interface %s of class %s, hr %#lx.\n", debugstr_guid(results[0].pIID), debugstr_guid(&clsid), hr); return hr; } @@ -1904,7 +1904,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx(REFCLSID rclsid, IUnknown *o HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject(REFCLSID rclsid, DWORD clscontext, COSERVERINFO *server_info, REFIID riid, void **obj) { - TRACE("%s, %#x, %s\n", debugstr_guid(rclsid), clscontext, debugstr_guid(riid)); + TRACE("%s, %#lx, %s\n", debugstr_guid(rclsid), clscontext, debugstr_guid(riid)); return com_get_class_object(rclsid, clscontext, server_info, riid, obj); } @@ -2053,7 +2053,7 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD flags, DWORD timeout, ULONG handle UINT exit_code; HRESULT hr; - TRACE("%#x, %#x, %u, %p, %p\n", flags, timeout, handle_count, handles, index); + TRACE("%#lx, %#lx, %lu, %p, %p\n", flags, timeout, handle_count, handles, index); if (!index) return E_INVALIDARG; @@ -2118,7 +2118,7 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD flags, DWORD timeout, ULONG handle PENDINGTYPE pendingtype = tlsdata->pending_call_count_server ? PENDINGTYPE_NESTED : PENDINGTYPE_TOPLEVEL; DWORD be_handled = IMessageFilter_MessagePending(apt->filter, 0 /* FIXME */, now - start_time, pendingtype); - TRACE("IMessageFilter_MessagePending returned %d\n", be_handled); + TRACE("IMessageFilter_MessagePending returned %ld\n", be_handled); switch (be_handled) { @@ -2188,7 +2188,7 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD flags, DWORD timeout, ULONG handle } if (post_quit) PostQuitMessage(exit_code); - TRACE("-- 0x%08x\n", hr); + TRACE("-- %#lx\n", hr); return hr; } @@ -2562,7 +2562,7 @@ static ULONG WINAPI thread_object_context_Release(IObjContext *iface) static HRESULT WINAPI thread_object_context_SetProperty(IObjContext *iface, REFGUID propid, CPFLAGS flags, IUnknown *punk) { - FIXME("%p, %s, %x, %p\n", iface, debugstr_guid(propid), flags, punk); + FIXME("%p, %s, %lx, %p\n", iface, debugstr_guid(propid), flags, punk); return E_NOTIMPL; } @@ -2771,7 +2771,7 @@ static void unlock_init_spies(struct tlsdata *tlsdata) */ HRESULT WINAPI CoInitializeWOW(DWORD arg1, DWORD arg2) { - FIXME("%#x, %#x\n", arg1, arg2); + FIXME("%#lx, %#lx\n", arg1, arg2); return S_OK; } @@ -2785,7 +2785,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoInitializeEx(void *reserved, DWORD model) struct init_spy *cursor; HRESULT hr; - TRACE("%p, %#x\n", reserved, model); + TRACE("%p, %#lx\n", reserved, model); if (reserved) WARN("Unexpected reserved argument %p\n", reserved); @@ -2868,7 +2868,7 @@ void WINAPI DECLSPEC_HOTPATCH CoUninitialize(void) } else if (lockcount < 1) { - ERR("Unbalanced lock count %d\n", lockcount); + ERR("Unbalanced lock count %ld\n", lockcount); InterlockedExchangeAdd(&com_lockcount, 1); } @@ -2956,7 +2956,7 @@ HRESULT WINAPI CoRegisterClassObject(REFCLSID rclsid, IUnknown *object, DWORD cl struct apartment *apt; HRESULT hr = S_OK; - TRACE("%s, %p, %#x, %#x, %p\n", debugstr_guid(rclsid), object, clscontext, flags, cookie); + TRACE("%s, %p, %#lx, %#lx, %p\n", debugstr_guid(rclsid), object, clscontext, flags, cookie); if (!cookie || !object) return E_INVALIDARG; @@ -3089,7 +3089,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoRevokeClassObject(DWORD cookie) struct registered_class *cur; struct apartment *apt; - TRACE("%#x\n", cookie); + TRACE("%#lx\n", cookie); if (!(apt = apartment_get_current_or_mta())) { @@ -3137,7 +3137,7 @@ ULONG WINAPI CoAddRefServerProcess(void) refs = ++com_server_process_refcount; LeaveCriticalSection(&registered_classes_cs); - TRACE("refs before: %d\n", refs - 1); + TRACE("refs before: %ld\n", refs - 1); return refs; } @@ -3158,7 +3158,7 @@ ULONG WINAPI CoReleaseServerProcess(void) LeaveCriticalSection(&registered_classes_cs); - TRACE("refs after: %d\n", refs); + TRACE("refs after: %ld\n", refs); return refs; } @@ -3173,7 +3173,7 @@ HRESULT WINAPI CoDisconnectObject(IUnknown *object, DWORD reserved) IMarshal *marshal; HRESULT hr; - TRACE("%p, %#x\n", object, reserved); + TRACE("%p, %#lx\n", object, reserved); if (!object) return E_INVALIDARG; @@ -3360,7 +3360,7 @@ HRESULT WINAPI CoRegisterSurrogateEx(REFGUID guid, void *reserved) */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) { - TRACE("%p 0x%x %p\n", hinstDLL, reason, reserved); + TRACE("%p, %#lx, %p\n", hinstDLL, reason, reserved); switch (reason) { diff --git a/dlls/combase/errorinfo.c b/dlls/combase/errorinfo.c index 83e2f0b7103..4ce9117d50d 100644 --- a/dlls/combase/errorinfo.c +++ b/dlls/combase/errorinfo.c @@ -111,7 +111,7 @@ static ULONG WINAPI errorinfo_AddRef(IErrorInfo *iface) struct error_info *error_info = impl_from_IErrorInfo(iface); ULONG refcount = InterlockedIncrement(&error_info->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -121,7 +121,7 @@ static ULONG WINAPI errorinfo_Release(IErrorInfo *iface) struct error_info *error_info = impl_from_IErrorInfo(iface); ULONG refcount = InterlockedDecrement(&error_info->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -275,7 +275,7 @@ static HRESULT WINAPI create_errorinfo_SetHelpContext(ICreateErrorInfo *iface, D { struct error_info *error_info = impl_from_ICreateErrorInfo(iface); - TRACE("%p, %#x.\n", iface, help_context); + TRACE("%p, %#lx.\n", iface, help_context); error_info->help_context = help_context; @@ -365,7 +365,7 @@ HRESULT WINAPI GetErrorInfo(ULONG reserved, IErrorInfo **error_info) struct tlsdata *tlsdata; HRESULT hr; - TRACE("%u, %p\n", reserved, error_info); + TRACE("%lu, %p\n", reserved, error_info); if (reserved || !error_info) return E_INVALIDARG; @@ -393,7 +393,7 @@ HRESULT WINAPI SetErrorInfo(ULONG reserved, IErrorInfo *error_info) struct tlsdata *tlsdata; HRESULT hr; - TRACE("%u, %p\n", reserved, error_info); + TRACE("%lu, %p\n", reserved, error_info); if (reserved) return E_INVALIDARG; diff --git a/dlls/combase/hglobalstream.c b/dlls/combase/hglobalstream.c index d957fae2c7d..3dc770a47ac 100644 --- a/dlls/combase/hglobalstream.c +++ b/dlls/combase/hglobalstream.c @@ -146,7 +146,7 @@ static HRESULT WINAPI stream_Read(IStream *iface, void *pv, ULONG cb, ULONG *rea ULONG dummy, len; char *buffer; - TRACE("%p, %p, %d, %p\n", iface, pv, cb, read_len); + TRACE("%p, %p, %ld, %p\n", iface, pv, cb, read_len); if (!read_len) read_len = &dummy; @@ -178,7 +178,7 @@ static HRESULT WINAPI stream_Write(IStream *iface, const void *pv, ULONG cb, ULO ULONG dummy = 0; char *buffer; - TRACE("%p, %p, %d, %p\n", iface, pv, cb, written); + TRACE("%p, %p, %ld, %p\n", iface, pv, cb, written); if (!written) written = &dummy; @@ -197,7 +197,7 @@ static HRESULT WINAPI stream_Write(IStream *iface, const void *pv, ULONG cb, ULO HRESULT hr = IStream_SetSize(iface, size); if (FAILED(hr)) { - ERR("IStream_SetSize failed with error 0x%08x\n", hr); + ERR("IStream_SetSize failed with error %#lx\n", hr); return hr; } } @@ -227,7 +227,7 @@ static HRESULT WINAPI stream_Seek(IStream *iface, LARGE_INTEGER move, DWORD orig ULARGE_INTEGER position = stream->position; HRESULT hr = S_OK; - TRACE("%p, %s, %d, %p\n", iface, wine_dbgstr_longlong(move.QuadPart), origin, pos); + TRACE("%p, %s, %ld, %p\n", iface, wine_dbgstr_longlong(move.QuadPart), origin, pos); switch (origin) { @@ -289,7 +289,7 @@ static HRESULT WINAPI stream_CopyTo(IStream *iface, IStream *dest, ULARGE_INTEGE HRESULT hr = S_OK; BYTE buffer[128]; - TRACE("%p, %p, %d, %p, %p\n", iface, dest, cb.u.LowPart, read_len, written); + TRACE("%p, %p, %ld, %p, %p\n", iface, dest, cb.u.LowPart, read_len, written); if (!dest) return STG_E_INVALIDPOINTER; diff --git a/dlls/combase/malloc.c b/dlls/combase/malloc.c index 2be03ae1e31..f31e1ef7705 100644 --- a/dlls/combase/malloc.c +++ b/dlls/combase/malloc.c @@ -144,7 +144,7 @@ static void * WINAPI allocator_Alloc(IMalloc *iface, SIZE_T cb) { void *addr; - TRACE("%ld.\n", cb); + TRACE("%Id.\n", cb); if (allocator.spy) { @@ -178,7 +178,7 @@ static void * WINAPI allocator_Realloc(IMalloc *iface, void *pv, SIZE_T cb) { void *addr; - TRACE("%p, %ld.\n",pv,cb); + TRACE("%p, %Id.\n", pv, cb); if (allocator.spy) { diff --git a/dlls/combase/marshal.c b/dlls/combase/marshal.c index f3ea3fcad50..b943c0dd6fa 100644 --- a/dlls/combase/marshal.c +++ b/dlls/combase/marshal.c @@ -206,7 +206,7 @@ static ULONG WINAPI ftmarshaler_inner_AddRef(IUnknown *iface) struct ftmarshaler *marshaler = impl_ft_from_IUnknown(iface); ULONG refcount = InterlockedIncrement(&marshaler->refcount); - TRACE("%p, refcount %u\n", iface, refcount); + TRACE("%p, refcount %lu\n", iface, refcount); return refcount; } @@ -216,7 +216,7 @@ static ULONG WINAPI ftmarshaler_inner_Release(IUnknown *iface) struct ftmarshaler *marshaler = impl_ft_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&marshaler->refcount); - TRACE("%p, refcount %u\n", iface, refcount); + TRACE("%p, refcount %lu\n", iface, refcount); if (!refcount) heap_free(marshaler); @@ -261,7 +261,7 @@ static ULONG WINAPI ftmarshaler_Release(IMarshal *iface) static HRESULT WINAPI ftmarshaler_GetUnmarshalClass(IMarshal *iface, REFIID riid, void *pv, DWORD dest_context, void *pvDestContext, DWORD mshlflags, CLSID *clsid) { - TRACE("%s, %p, %#x, %p, %#x, %p\n", debugstr_guid(riid), pv, dest_context, pvDestContext, mshlflags, clsid); + TRACE("%s, %p, %#lx, %p, %#lx, %p\n", debugstr_guid(riid), pv, dest_context, pvDestContext, mshlflags, clsid); if (dest_context == MSHCTX_INPROC || dest_context == MSHCTX_CROSSCTX) *clsid = CLSID_InProcFreeMarshaler; @@ -283,7 +283,7 @@ static HRESULT WINAPI ftmarshaler_GetMarshalSizeMax(IMarshal *iface, REFIID riid IMarshal *marshal = NULL; HRESULT hr; - TRACE("%s, %p, %#x, %p, %#x, %p\n", debugstr_guid(riid), pv, dest_context, pvDestContext, mshlflags, size); + TRACE("%s, %p, %#lx, %p, %#lx, %p\n", debugstr_guid(riid), pv, dest_context, pvDestContext, mshlflags, size); /* If the marshalling happens inside the same process the interface pointer is copied between the apartments */ @@ -306,7 +306,7 @@ static HRESULT WINAPI ftmarshaler_MarshalInterface(IMarshal *iface, IStream *str IMarshal *marshal = NULL; HRESULT hr; - TRACE("%p, %s, %p, %#x, %p, %#x\n", stream, debugstr_guid(riid), pv, + TRACE("%p, %s, %p, %#lx, %p, %#lx\n", stream, debugstr_guid(riid), pv, dest_context, pvDestContext, mshlflags); /* If the marshalling happens inside the same process the interface pointer is @@ -488,7 +488,7 @@ HRESULT WINAPI CoMarshalInterface(IStream *stream, REFIID riid, IUnknown *unk, IMarshal *marshal; HRESULT hr; - TRACE("%p, %s, %p, %x, %p, ", stream, debugstr_guid(riid), unk, dest_context, pvDestContext); + TRACE("%p, %s, %p, %lx, %p, ", stream, debugstr_guid(riid), unk, dest_context, pvDestContext); dump_mshflags(mshlFlags); TRACE("\n"); @@ -500,7 +500,7 @@ HRESULT WINAPI CoMarshalInterface(IStream *stream, REFIID riid, IUnknown *unk, hr = CoGetStandardMarshal(riid, unk, dest_context, pvDestContext, mshlFlags, &marshal); if (hr != S_OK) { - ERR("Failed to get marshaller, %#x\n", hr); + ERR("Failed to get marshaller, %#lx\n", hr); return hr; } @@ -508,7 +508,7 @@ HRESULT WINAPI CoMarshalInterface(IStream *stream, REFIID riid, IUnknown *unk, &marshaler_clsid); if (hr != S_OK) { - ERR("IMarshal::GetUnmarshalClass failed, %#x\n", hr); + ERR("IMarshal::GetUnmarshalClass failed, %#lx\n", hr); goto cleanup; } @@ -532,14 +532,14 @@ HRESULT WINAPI CoMarshalInterface(IStream *stream, REFIID riid, IUnknown *unk, &objref.u_objref.u_custom.size); if (hr != S_OK) { - ERR("Failed to get max size of marshal data, error %#x\n", hr); + ERR("Failed to get max size of marshal data, error %#lx\n", hr); goto cleanup; } /* write constant sized common header and OR_CUSTOM data into stream */ hr = IStream_Write(stream, &objref, FIELD_OFFSET(OBJREF, u_objref.u_custom.pData), NULL); if (hr != S_OK) { - ERR("Failed to write OR_CUSTOM header to stream with %#x\n", hr); + ERR("Failed to write OR_CUSTOM header to stream with %#lx\n", hr); goto cleanup; } } @@ -549,14 +549,14 @@ HRESULT WINAPI CoMarshalInterface(IStream *stream, REFIID riid, IUnknown *unk, hr = IMarshal_MarshalInterface(marshal, stream, riid, unk, dest_context, pvDestContext, mshlFlags); if (hr != S_OK) { - ERR("Failed to marshal the interface %s, hr %#x\n", debugstr_guid(riid), hr); + ERR("Failed to marshal the interface %s, hr %#lx\n", debugstr_guid(riid), hr); goto cleanup; } cleanup: IMarshal_Release(marshal); - TRACE("completed with hr %#x\n", hr); + TRACE("completed with hr %#lx\n", hr); return hr; } @@ -575,14 +575,14 @@ static HRESULT get_unmarshaler_from_stream(IStream *stream, IMarshal **marshal, hr = IStream_Read(stream, &objref, FIELD_OFFSET(OBJREF, u_objref), &res); if (hr != S_OK || (res != FIELD_OFFSET(OBJREF, u_objref))) { - ERR("Failed to read common OBJREF header, 0x%08x\n", hr); + ERR("Failed to read common OBJREF header, %#lx\n", hr); return STG_E_READFAULT; } /* sanity check on header */ if (objref.signature != OBJREF_SIGNATURE) { - ERR("Bad OBJREF signature 0x%08x\n", objref.signature); + ERR("Bad OBJREF signature %#lx\n", objref.signature); return RPC_E_INVALID_OBJREF; } @@ -605,7 +605,7 @@ static HRESULT get_unmarshaler_from_stream(IStream *stream, IMarshal **marshal, custom_header_size, &res); if (hr != S_OK || (res != custom_header_size)) { - ERR("Failed to read OR_CUSTOM header, 0x%08x\n", hr); + ERR("Failed to read OR_CUSTOM header, %#lx\n", hr); return STG_E_READFAULT; } /* now create the marshaler specified in the stream */ @@ -615,13 +615,12 @@ static HRESULT get_unmarshaler_from_stream(IStream *stream, IMarshal **marshal, } else { - FIXME("Invalid or unimplemented marshaling type specified: %x\n", - objref.flags); + FIXME("Invalid or unimplemented marshaling type specified: %lx\n", objref.flags); return RPC_E_INVALID_OBJREF; } if (hr != S_OK) - ERR("Failed to create marshal, 0x%08x\n", hr); + ERR("Failed to create marshal, %#lx\n", hr); return hr; } @@ -684,7 +683,7 @@ HRESULT WINAPI CoReleaseMarshalData(IStream *stream) { hr = std_release_marshal_data(stream); if (hr != S_OK) - ERR("StdMarshal ReleaseMarshalData failed with error %#x\n", hr); + ERR("StdMarshal ReleaseMarshalData failed with error %#lx\n", hr); return hr; } if (hr != S_OK) @@ -693,7 +692,7 @@ HRESULT WINAPI CoReleaseMarshalData(IStream *stream) /* call the helper object to do the releasing of marshal data */ hr = IMarshal_ReleaseMarshalData(marshal, stream); if (hr != S_OK) - ERR("IMarshal::ReleaseMarshalData failed with error %#x\n", hr); + ERR("IMarshal::ReleaseMarshalData failed with error %#lx\n", hr); IMarshal_Release(marshal); return hr; @@ -780,7 +779,7 @@ static HRESULT std_unmarshal_interface(MSHCTX dest_context, void *dest_context_d if (stubmgr) stub_manager_int_release(stubmgr); if (stub_apt) apartment_release(stub_apt); - if (hres != S_OK) WARN("Failed with error 0x%08x\n", hres); + if (hres != S_OK) WARN("Failed with error %#lx\n", hres); else TRACE("Successfully created proxy %p\n", *ppv); apartment_release(apt); @@ -807,7 +806,7 @@ HRESULT WINAPI CoUnmarshalInterface(IStream *stream, REFIID riid, void **ppv) { hr = std_unmarshal_interface(0, NULL, stream, &iid, (void **)&object); if (hr != S_OK) - ERR("StdMarshal UnmarshalInterface failed, hr %#x\n", hr); + ERR("StdMarshal UnmarshalInterface failed, hr %#lx\n", hr); } else if (hr == S_OK) { @@ -815,7 +814,7 @@ HRESULT WINAPI CoUnmarshalInterface(IStream *stream, REFIID riid, void **ppv) hr = IMarshal_UnmarshalInterface(marshal, stream, &iid, (void **)&object); IMarshal_Release(marshal); if (hr != S_OK) - ERR("IMarshal::UnmarshalInterface failed, hr %#x\n", hr); + ERR("IMarshal::UnmarshalInterface failed, hr %#lx\n", hr); } if (hr == S_OK) @@ -826,7 +825,7 @@ HRESULT WINAPI CoUnmarshalInterface(IStream *stream, REFIID riid, void **ppv) TRACE("requested interface != marshalled interface, additional QI needed\n"); hr = IUnknown_QueryInterface(object, riid, ppv); if (hr != S_OK) - ERR("Couldn't query for interface %s, hr %#x\n", debugstr_guid(riid), hr); + ERR("Couldn't query for interface %s, hr %#lx\n", debugstr_guid(riid), hr); IUnknown_Release(object); } else @@ -835,7 +834,7 @@ HRESULT WINAPI CoUnmarshalInterface(IStream *stream, REFIID riid, void **ppv) } } - TRACE("completed with hr 0x%x\n", hr); + TRACE("completed with hr %#lx\n", hr); return hr; } @@ -909,7 +908,7 @@ HRESULT marshal_object(struct apartment *apt, STDOBJREF *stdobjref, REFIID riid, hr = IPSFactoryBuffer_CreateStub(psfb, riid, manager->object, &stub); IPSFactoryBuffer_Release(psfb); if (hr != S_OK) - ERR("Failed to create an IRpcStubBuffer from IPSFactory for %s with error 0x%08x\n", + ERR("Failed to create an IRpcStubBuffer from IPSFactory for %s with error %#lx\n", debugstr_guid(riid), hr); }else { WARN("couldn't get IPSFactory buffer for interface %s\n", debugstr_guid(riid)); @@ -981,7 +980,7 @@ static HRESULT WINAPI ClientIdentity_QueryInterface(IMultiQI * iface, REFIID rii static ULONG WINAPI ClientIdentity_AddRef(IMultiQI *iface) { struct proxy_manager *This = impl_from_IMultiQI(iface); - TRACE("%p - before %d\n", iface, This->refs); + TRACE("%p - before %ld\n", iface, This->refs); return InterlockedIncrement(&This->refs); } @@ -989,7 +988,7 @@ static ULONG WINAPI ClientIdentity_Release(IMultiQI *iface) { struct proxy_manager *This = impl_from_IMultiQI(iface); ULONG refs = InterlockedDecrement(&This->refs); - TRACE("%p - after %d\n", iface, refs); + TRACE("%p - after %ld\n", iface, refs); if (!refs) proxy_manager_destroy(This); return refs; @@ -1006,13 +1005,13 @@ static HRESULT WINAPI ClientIdentity_QueryMultipleInterfaces(IMultiQI *iface, UL /* mapping of RemQueryInterface index to QueryMultipleInterfaces index */ ULONG *mapping = HeapAlloc(GetProcessHeap(), 0, cMQIs * sizeof(*mapping)); - TRACE("cMQIs: %d\n", cMQIs); + TRACE("cMQIs: %ld\n", cMQIs); /* try to get a local interface - this includes already active proxy * interfaces and also interfaces exposed by the proxy manager */ for (i = 0; i < cMQIs; i++) { - TRACE("iid[%d] = %s\n", i, debugstr_guid(pMQIs[i].pIID)); + TRACE("iid[%ld] = %s\n", i, debugstr_guid(pMQIs[i].pIID)); pMQIs[i].hr = proxy_manager_query_local_interface(This, pMQIs[i].pIID, (void **)&pMQIs[i].pItf); if (pMQIs[i].hr == S_OK) successful_mqis++; @@ -1024,7 +1023,7 @@ static HRESULT WINAPI ClientIdentity_QueryMultipleInterfaces(IMultiQI *iface, UL } } - TRACE("%d interfaces not found locally\n", nonlocal_mqis); + TRACE("%ld interfaces not found locally\n", nonlocal_mqis); /* if we have more than one interface not found locally then we must try * to query the remote object for it */ @@ -1048,7 +1047,7 @@ static HRESULT WINAPI ClientIdentity_QueryMultipleInterfaces(IMultiQI *iface, UL nonlocal_mqis, iids, &qiresults); IRemUnknown_Release(remunk); if (FAILED(hr)) - WARN("IRemUnknown_RemQueryInterface failed with error 0x%08x\n", hr); + WARN("IRemUnknown_RemQueryInterface failed with error %#lx\n", hr); } /* IRemUnknown_RemQueryInterface can return S_FALSE if only some of @@ -1083,7 +1082,7 @@ static HRESULT WINAPI ClientIdentity_QueryMultipleInterfaces(IMultiQI *iface, UL CoTaskMemFree(qiresults); } - TRACE("%d/%d successfully queried\n", successful_mqis, cMQIs); + TRACE("%ld/%ld successfully queried\n", successful_mqis, cMQIs); HeapFree(GetProcessHeap(), 0, iids); HeapFree(GetProcessHeap(), 0, mapping); @@ -1208,7 +1207,7 @@ static HRESULT WINAPI Proxy_MarshalInterface( stdobjref.cPublicRefs = rif.cPublicRefs; } else - ERR("IRemUnknown_RemAddRef returned with 0x%08x, hrref = 0x%08x\n", hr, hrref); + ERR("IRemUnknown_RemAddRef returned with %#lx, hrref = %#lx\n", hr, hrref); } } @@ -1216,7 +1215,7 @@ static HRESULT WINAPI Proxy_MarshalInterface( { OBJREF objref; - TRACE("writing stdobjref: flags = %04x cPublicRefs = %d oxid = %s oid = %s ipid = %s\n", + TRACE("writing stdobjref: flags = %#lx cPublicRefs = %ld oxid = %s oid = %s ipid = %s\n", stdobjref.flags, stdobjref.cPublicRefs, wine_dbgstr_longlong(stdobjref.oxid), wine_dbgstr_longlong(stdobjref.oid), @@ -1265,7 +1264,7 @@ static HRESULT WINAPI Proxy_MarshalInterface( CoTaskMemFree(qiresults); } else - ERR("IRemUnknown_RemQueryInterface failed with error 0x%08x\n", hr); + ERR("IRemUnknown_RemQueryInterface failed with error %#lx\n", hr); IRemUnknown_Release(remunk); } } @@ -1316,7 +1315,7 @@ static HRESULT WINAPI Proxy_DisconnectObject(IMarshal *iface, DWORD dwReserved) IMarshal *marshal; HRESULT hr; - TRACE("(%p, %x)\n", This, dwReserved); + TRACE("%p, %#lx\n", This, dwReserved); hr = StdMarshalImpl_Construct(&IID_IMarshal, This->dest_context, This->dest_context_data, (void**)&marshal); @@ -1399,7 +1398,7 @@ static HRESULT WINAPI ProxyCliSec_SetBlanket(IClientSecurity *iface, void *pAuthInfo, DWORD Capabilities) { - FIXME("(%p, %d, %d, %s, %d, %d, %p, 0x%x): stub\n", pProxy, AuthnSvc, AuthzSvc, + FIXME("%p, %ld, %ld, %s, %ld, %ld, %p, %#lx: stub\n", pProxy, AuthnSvc, AuthzSvc, pServerPrincName == COLE_DEFAULT_PRINCIPAL ? "<default principal>" : debugstr_w(pServerPrincName), AuthnLevel, ImpLevel, pAuthInfo, Capabilities); return E_NOTIMPL; @@ -1452,7 +1451,7 @@ static HRESULT ifproxy_get_public_ref(struct ifproxy * This) if (hr == S_OK && hrref == S_OK) InterlockedExchangeAdd((LONG *)&This->refs, NORMALEXTREFS); else - ERR("IRemUnknown_RemAddRef returned with 0x%08x, hrref = 0x%08x\n", hr, hrref); + ERR("IRemUnknown_RemAddRef returned with %#lx, hrref = %#lx\n", hr, hrref); } } ReleaseMutex(This->parent->remoting_mutex); @@ -1476,7 +1475,7 @@ static HRESULT ifproxy_release_public_refs(struct ifproxy * This) { IRemUnknown *remunk = NULL; - TRACE("releasing %d refs\n", public_refs); + TRACE("releasing %ld refs\n", public_refs); hr = proxy_manager_get_remunknown(This->parent, &remunk); if (hr == S_OK) @@ -1495,7 +1494,7 @@ static HRESULT ifproxy_release_public_refs(struct ifproxy * This) wine_dbgstr_longlong(This->parent->oxid), wine_dbgstr_longlong(This->parent->oid)); else - ERR("IRemUnknown_RemRelease failed with error 0x%08x\n", hr); + ERR("IRemUnknown_RemRelease failed with error %#lx\n", hr); } } ReleaseMutex(This->parent->remoting_mutex); @@ -1754,12 +1753,10 @@ static HRESULT proxy_manager_create_ifproxy( &ifproxy->proxy, &ifproxy->iface); IPSFactoryBuffer_Release(psfb); if (hr != S_OK) - ERR("Could not create proxy for interface %s, error 0x%08x\n", - debugstr_guid(riid), hr); + ERR("Could not create proxy for interface %s, error %#lx\n", debugstr_guid(riid), hr); } else - ERR("Could not get IPSFactoryBuffer for interface %s, error 0x%08x\n", - debugstr_guid(riid), hr); + ERR("Could not get IPSFactoryBuffer for interface %s, error %#lx\n", debugstr_guid(riid), hr); if (hr == S_OK) hr = IRpcProxyBuffer_Connect(ifproxy->proxy, ifproxy->chan); @@ -1772,7 +1769,7 @@ static HRESULT proxy_manager_create_ifproxy( LeaveCriticalSection(&This->cs); *iif_out = ifproxy; - TRACE("ifproxy %p created for IPID %s, interface %s with %u public refs\n", + TRACE("ifproxy %p created for IPID %s, interface %s with %lu public refs\n", ifproxy, debugstr_guid(&stdobjref->ipid), debugstr_guid(riid), stdobjref->cPublicRefs); } else @@ -1886,7 +1883,7 @@ static HRESULT proxy_manager_get_remunknown(struct proxy_manager * This, IRemUnk LeaveCriticalSection(&This->cs); apartment_release(apt); - TRACE("got IRemUnknown* pointer %p, hr = 0x%08x\n", *remunk, hr); + TRACE("got IRemUnknown* pointer %p, hr = %#lx\n", *remunk, hr); return hr; } @@ -2061,7 +2058,7 @@ static HRESULT WINAPI StdMarshalImpl_MarshalInterface(IMarshal *iface, IStream * apartment_release(apt); if (hr != S_OK) { - ERR("Failed to create ifstub, hr %#x\n", hr); + ERR("Failed to create ifstub, hr %#lx\n", hr); return hr; } @@ -2079,7 +2076,7 @@ static HRESULT unmarshal_object(const STDOBJREF *stdobjref, struct apartment *ap assert(apt); - TRACE("stdobjref: flags = %04x cPublicRefs = %d oxid = %s oid = %s ipid = %s\n", + TRACE("stdobjref: flags = %#lx cPublicRefs = %ld oxid = %s oid = %s ipid = %s\n", stdobjref->flags, stdobjref->cPublicRefs, wine_dbgstr_longlong(stdobjref->oxid), wine_dbgstr_longlong(stdobjref->oid), @@ -2145,19 +2142,19 @@ static HRESULT WINAPI StdMarshalImpl_UnmarshalInterface(IMarshal *iface, IStream hr = IStream_Read(stream, &objref, FIELD_OFFSET(OBJREF, u_objref), &res); if (hr != S_OK || (res != FIELD_OFFSET(OBJREF, u_objref))) { - ERR("Failed to read common OBJREF header, 0x%08x\n", hr); + ERR("Failed to read common OBJREF header, %#lx\n", hr); return STG_E_READFAULT; } if (objref.signature != OBJREF_SIGNATURE) { - ERR("Bad OBJREF signature 0x%08x\n", objref.signature); + ERR("Bad OBJREF signature %#lx\n", objref.signature); return RPC_E_INVALID_OBJREF; } if (!(objref.flags & OBJREF_STANDARD)) { - FIXME("unsupported objref.flags = %x\n", objref.flags); + FIXME("unsupported objref.flags = %lx\n", objref.flags); return E_NOTIMPL; } @@ -2175,19 +2172,19 @@ static HRESULT WINAPI StdMarshalImpl_ReleaseMarshalData(IMarshal *iface, IStream hr = IStream_Read(stream, &objref, FIELD_OFFSET(OBJREF, u_objref), &res); if (hr != S_OK || (res != FIELD_OFFSET(OBJREF, u_objref))) { - ERR("Failed to read common OBJREF header, 0x%08x\n", hr); + ERR("Failed to read common OBJREF header, %#lx\n", hr); return STG_E_READFAULT; } if (objref.signature != OBJREF_SIGNATURE) { - ERR("Bad OBJREF signature 0x%08x\n", objref.signature); + ERR("Bad OBJREF signature %#lx\n", objref.signature); return RPC_E_INVALID_OBJREF; } if (!(objref.flags & OBJREF_STANDARD)) { - FIXME("unsupported objref.flags = %x\n", objref.flags); + FIXME("unsupported objref.flags = %lx\n", objref.flags); return E_NOTIMPL; } @@ -2246,11 +2243,11 @@ HRESULT WINAPI CoGetStandardMarshal(REFIID riid, IUnknown *pUnk, DWORD dwDestCon { if (pUnk == NULL) { - FIXME("(%s,NULL,%x,%p,%x,%p), unimplemented yet.\n", debugstr_guid(riid), dwDestContext, + FIXME("%s, NULL, %lx, %p, %lx, %p, unimplemented yet.\n", debugstr_guid(riid), dwDestContext, dest_context, flags, marshal); return E_NOTIMPL; } - TRACE("%s, %p, %x, %p, %x, %p\n", debugstr_guid(riid), pUnk, dwDestContext, dest_context, flags, marshal); + TRACE("%s, %p, %lx, %p, %lx, %p\n", debugstr_guid(riid), pUnk, dwDestContext, dest_context, flags, marshal); return StdMarshalImpl_Construct(&IID_IMarshal, dwDestContext, dest_context, (void **)marshal); } diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index 7d871fb885c..0a17f02b776 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -286,7 +286,7 @@ HRESULT WINAPI GetRestrictedErrorInfo(IRestrictedErrorInfo **info) */ BOOL WINAPI RoOriginateLanguageException(HRESULT error, HSTRING message, IUnknown *language_exception) { - FIXME("(%x %s %p) stub\n", error, debugstr_hstring(message), language_exception); + FIXME("%#lx, %s, %p: stub\n", error, debugstr_hstring(message), language_exception); return FALSE; } @@ -295,7 +295,7 @@ BOOL WINAPI RoOriginateLanguageException(HRESULT error, HSTRING message, IUnknow */ BOOL WINAPI RoOriginateError(HRESULT error, HSTRING message) { - FIXME("(%x %s) stub\n", error, debugstr_hstring(message)); + FIXME("%#lx, %s: stub\n", error, debugstr_hstring(message)); return FALSE; } diff --git a/dlls/combase/rpc.c b/dlls/combase/rpc.c index 7337498e9fa..0a86183030a 100644 --- a/dlls/combase/rpc.c +++ b/dlls/combase/rpc.c @@ -224,7 +224,7 @@ static BOOL start_rpcss(void) } while (status.dwCurrentState == SERVICE_START_PENDING); if (status.dwCurrentState != SERVICE_RUNNING) - WARN("RpcSs failed to start %u\n", status.dwCurrentState); + WARN("RpcSs failed to start %lu\n", status.dwCurrentState); } else ERR("Failed to start RpcSs service\n"); @@ -388,7 +388,7 @@ static DWORD start_local_service(const WCHAR *name, DWORD num, LPCWSTR *params) SC_HANDLE handle, hsvc; DWORD r = ERROR_FUNCTION_FAILED; - TRACE("Starting service %s %d params\n", debugstr_w(name), num); + TRACE("Starting service %s %ld params\n", debugstr_w(name), num); handle = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT); if (!handle) @@ -408,7 +408,7 @@ static DWORD start_local_service(const WCHAR *name, DWORD num, LPCWSTR *params) r = GetLastError(); CloseServiceHandle(handle); - TRACE("StartService returned error %u (%s)\n", r, (r == ERROR_SUCCESS) ? "ok":"failed"); + TRACE("StartService returned error %lu (%s)\n", r, (r == ERROR_SUCCESS) ? "ok":"failed"); return r; } @@ -601,7 +601,7 @@ HRESULT rpc_register_local_server(REFCLSID clsid, IStream *stream, DWORD flags, SIZE_T size; HRESULT hr; - TRACE("%s, %#x\n", debugstr_guid(clsid), flags); + TRACE("%s, %#lx\n", debugstr_guid(clsid), flags); hr = GetHGlobalFromStream(stream, &hmem); if (FAILED(hr)) return hr; @@ -652,7 +652,7 @@ static ULONG ChannelHooks_ClientGetSize(SChannelHookCallInfo *info, struct chann IChannelHook_ClientGetSize(entry->hook, &entry->id, &info->iid, &extension_size); - TRACE("%s: extension_size = %u\n", debugstr_guid(&entry->id), extension_size); + TRACE("%s: extension_size = %lu\n", debugstr_guid(&entry->id), extension_size); extension_size = (extension_size+7)&~7; (*data)[hook_index].id = entry->id; @@ -698,7 +698,7 @@ static unsigned char * ChannelHooks_ClientFillBuffer(SChannelHookCallInfo *info, IChannelHook_ClientFillBuffer(entry->hook, &entry->id, &info->iid, &extension_size, buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT, data[0])); - TRACE("%s: extension_size = %u\n", debugstr_guid(&entry->id), extension_size); + TRACE("%s: extension_size = %lu\n", debugstr_guid(&entry->id), extension_size); /* FIXME: set unused portion of wire_orpc_extent->data to 0? */ @@ -771,7 +771,7 @@ static ULONG ChannelHooks_ServerGetSize(SChannelHookCallInfo *info, IChannelHook_ServerGetSize(entry->hook, &entry->id, &info->iid, S_OK, &extension_size); - TRACE("%s: extension_size = %u\n", debugstr_guid(&entry->id), extension_size); + TRACE("%s: extension_size = %lu\n", debugstr_guid(&entry->id), extension_size); extension_size = (extension_size+7)&~7; (*data)[hook_index].id = entry->id; @@ -818,7 +818,7 @@ static unsigned char * ChannelHooks_ServerFillBuffer(SChannelHookCallInfo *info, &extension_size, buffer + FIELD_OFFSET(WIRE_ORPC_EXTENT, data[0]), S_OK); - TRACE("%s: extension_size = %u\n", debugstr_guid(&entry->id), extension_size); + TRACE("%s: extension_size = %lu\n", debugstr_guid(&entry->id), extension_size); /* FIXME: set unused portion of wire_orpc_extent->data to 0? */ @@ -1033,7 +1033,7 @@ static HRESULT WINAPI ServerRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, /* save away the message state again */ msg->Handle = message_state; - TRACE("-- %d\n", status); + TRACE("-- %ld\n", status); return HRESULT_FROM_WIN32(status); } @@ -1216,7 +1216,7 @@ static HRESULT WINAPI ClientRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, HeapFree(GetProcessHeap(), 0, channel_hook_data); - TRACE("-- %d\n", status); + TRACE("-- %ld\n", status); return HRESULT_FROM_WIN32(status); } @@ -1236,7 +1236,7 @@ static DWORD WINAPI rpc_sendreceive_thread(LPVOID param) * RPC functions do */ data->status = I_RpcSendReceive((RPC_MESSAGE *)data->msg); - TRACE("completed with status 0x%x\n", data->status); + TRACE("completed with status %#lx\n", data->status); SetEvent(data->handle); @@ -1267,7 +1267,7 @@ static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac struct apartment *apt = apartment_get_current_or_mta(); struct tlsdata *tlsdata; - TRACE("(%p) iMethod=%d\n", olemsg, olemsg->iMethod); + TRACE("%p, iMethod %ld\n", olemsg, olemsg->iMethod); hr = ClientRpcChannelBuffer_IsCorrectApartment(This, apt); if (hr != S_OK) @@ -1311,14 +1311,14 @@ static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac message_state->params.msg = olemsg; if (message_state->params.bypass_rpcrt) { - TRACE("Calling apartment thread 0x%08x...\n", message_state->target_tid); + TRACE("Calling apartment thread %#lx...\n", message_state->target_tid); msg->ProcNum &= ~RPC_FLAGS_VALID_BIT; if (!PostMessageW(message_state->target_hwnd, DM_EXECUTERPC, 0, (LPARAM)&message_state->params)) { - ERR("PostMessage failed with error %u\n", GetLastError()); + ERR("PostMessage failed with error %lu\n", GetLastError()); /* Note: message_state->params.iface doesn't have a reference and * so doesn't need to be released */ @@ -1336,7 +1336,7 @@ static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac */ if (!QueueUserWorkItem(rpc_sendreceive_thread, &message_state->params, WT_EXECUTEDEFAULT)) { - ERR("QueueUserWorkItem failed with error %u\n", GetLastError()); + ERR("QueueUserWorkItem failed with error %lu\n", GetLastError()); hr = E_UNEXPECTED; } else @@ -1363,11 +1363,11 @@ static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac orpcthat.flags = ORPCF_NULL; orpcthat.extensions = NULL; - TRACE("RPC call status: 0x%x\n", status); + TRACE("RPC call status: %#lx\n", status); if (status != RPC_S_OK) hr = HRESULT_FROM_WIN32(status); - TRACE("hrFault = 0x%08x\n", hrFault); + TRACE("hrFault = %#lx\n", hrFault); /* FIXME: this condition should be * "hr == S_OK && (!hrFault || msg->BufferLength > FIELD_OFFSET(ORPCTHAT, extensions) + 4)" @@ -1407,7 +1407,7 @@ static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac if (hr == S_OK) hr = hrFault; - TRACE("-- 0x%08x\n", hr); + TRACE("-- %#lx\n", hr); apartment_release(apt); return hr; @@ -1438,7 +1438,7 @@ static HRESULT WINAPI ServerRpcChannelBuffer_FreeBuffer(LPRPCCHANNELBUFFER iface msg->Handle = message_state; - TRACE("-- %d\n", status); + TRACE("-- %ld\n", status); return HRESULT_FROM_WIN32(status); } @@ -1474,7 +1474,7 @@ static HRESULT WINAPI ClientRpcChannelBuffer_FreeBuffer(LPRPCCHANNELBUFFER iface IRpcChannelBuffer_Release(message_state->params.chan); HeapFree(GetProcessHeap(), 0, message_state); - TRACE("-- %d\n", status); + TRACE("-- %ld\n", status); return HRESULT_FROM_WIN32(status); } @@ -1575,7 +1575,7 @@ HRESULT rpc_create_clientchannel(const OXID *oxid, const IPID *ipid, if (status != RPC_S_OK) { - ERR("Couldn't get binding for endpoint %s, status = %d\n", debugstr_w(endpoint), status); + ERR("Couldn't get binding for endpoint %s, status = %ld\n", debugstr_w(endpoint), status); return HRESULT_FROM_WIN32(status); } @@ -1649,7 +1649,7 @@ static HRESULT unmarshal_ORPC_EXTENT_ARRAY(RPC_MESSAGE *msg, const char *end, /* arbitrary limit for security (don't know what native does) */ if (extensions->size > 256) { - ERR("too many extensions: %d\n", extensions->size); + ERR("too many extensions: %ld\n", extensions->size); return RPC_S_INVALID_BOUND; } @@ -1662,7 +1662,7 @@ static HRESULT unmarshal_ORPC_EXTENT_ARRAY(RPC_MESSAGE *msg, const char *end, return RPC_S_INVALID_BOUND; if ((const char *)&wire_orpc_extent->data[wire_orpc_extent->conformance] > end) return RPC_S_INVALID_BOUND; - TRACE("size %u, guid %s\n", wire_orpc_extent->size, debugstr_guid(&wire_orpc_extent->id)); + TRACE("size %lu, guid %s\n", wire_orpc_extent->size, debugstr_guid(&wire_orpc_extent->id)); wire_orpc_extent = (WIRE_ORPC_EXTENT *)&wire_orpc_extent->data[wire_orpc_extent->conformance]; } msg->Buffer = wire_orpc_extent; @@ -1716,7 +1716,7 @@ static HRESULT unmarshal_ORPCTHIS(RPC_MESSAGE *msg, ORPCTHIS *orpcthis, if (orpcthis->flags & ~(ORPCF_LOCAL|ORPCF_RESERVED1|ORPCF_RESERVED2|ORPCF_RESERVED3|ORPCF_RESERVED4)) { - ERR("invalid flags 0x%x\n", orpcthis->flags & ~(ORPCF_LOCAL|ORPCF_RESERVED1|ORPCF_RESERVED2|ORPCF_RESERVED3|ORPCF_RESERVED4)); + ERR("invalid flags %#lx\n", orpcthis->flags & ~(ORPCF_LOCAL|ORPCF_RESERVED1|ORPCF_RESERVED2|ORPCF_RESERVED3|ORPCF_RESERVED4)); return RPC_E_INVALID_HEADER; } @@ -1759,7 +1759,7 @@ static HRESULT unmarshal_ORPCTHAT(RPC_MESSAGE *msg, ORPCTHAT *orpcthat, if (orpcthat->flags & ~(ORPCF_LOCAL|ORPCF_RESERVED1|ORPCF_RESERVED2|ORPCF_RESERVED3|ORPCF_RESERVED4)) { - ERR("invalid flags 0x%x\n", orpcthat->flags & ~(ORPCF_LOCAL|ORPCF_RESERVED1|ORPCF_RESERVED2|ORPCF_RESERVED3|ORPCF_RESERVED4)); + ERR("invalid flags %#lx\n", orpcthat->flags & ~(ORPCF_LOCAL|ORPCF_RESERVED1|ORPCF_RESERVED2|ORPCF_RESERVED3|ORPCF_RESERVED4)); return RPC_E_INVALID_HEADER; } @@ -1842,7 +1842,7 @@ void rpc_execute_call(struct dispatch_params *params) UlongToHandle(GetCurrentProcessId()), 0 /* FIXME */, &interface_info); - TRACE("IMessageFilter_HandleInComingCall returned %d\n", handlecall); + TRACE("IMessageFilter_HandleInComingCall returned %ld\n", handlecall); switch (handlecall) { case SERVERCALL_REJECTED: @@ -1931,13 +1931,13 @@ static void __RPC_STUB dispatch_rpc(RPC_MESSAGE *msg) { params->handle = CreateEventW(NULL, FALSE, FALSE, NULL); - TRACE("Calling apartment thread 0x%08x...\n", apt->tid); + TRACE("Calling apartment thread %#lx...\n", apt->tid); if (PostMessageW(apartment_getwindow(apt), DM_EXECUTERPC, 0, (LPARAM)params)) WaitForSingleObject(params->handle, INFINITE); else { - ERR("PostMessage failed with error %u\n", GetLastError()); + ERR("PostMessage failed with error %lu\n", GetLastError()); IRpcChannelBuffer_Release(params->chan); IRpcStubBuffer_Release(params->stub); } @@ -2022,7 +2022,7 @@ HRESULT rpc_register_interface(REFIID riid) list_add_tail(&registered_interfaces, &rif->entry); else { - ERR("RpcServerRegisterIfEx failed with error %d\n", status); + ERR("RpcServerRegisterIfEx failed with error %ld\n", status); HeapFree(GetProcessHeap(), 0, rif); hr = HRESULT_FROM_WIN32(status); } @@ -2115,6 +2115,6 @@ BOOL WINAPI DllDebugObjectRPCHook(BOOL trace, /* ORPC_INIT_ARGS * */ void *args) */ HRESULT WINAPI CoDecodeProxy(DWORD client_pid, UINT64 proxy_addr, ServerInformation *server_info) { - FIXME("%x %s %p\n", client_pid, wine_dbgstr_longlong(proxy_addr), server_info); + FIXME("%lx, %s, %p.\n", client_pid, wine_dbgstr_longlong(proxy_addr), server_info); return E_NOTIMPL; } diff --git a/dlls/combase/stubmanager.c b/dlls/combase/stubmanager.c index e9f20962e3b..931d32f7f2e 100644 --- a/dlls/combase/stubmanager.c +++ b/dlls/combase/stubmanager.c @@ -74,7 +74,7 @@ struct ifstub * stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer * struct ifstub *stub; HRESULT hr; - TRACE("oid=%s, stubbuffer=%p, iid=%s, dest_context=%x\n", wine_dbgstr_longlong(m->oid), sb, + TRACE("oid=%s, stubbuffer=%p, iid=%s, dest_context=%lx\n", wine_dbgstr_longlong(m->oid), sb, debugstr_guid(iid), dest_context); stub = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct ifstub)); @@ -300,7 +300,7 @@ static ULONG stub_manager_int_addref(struct stub_manager *m) refs = ++m->refs; LeaveCriticalSection(&m->apt->cs); - TRACE("before %d\n", refs - 1); + TRACE("before %ld\n", refs - 1); return refs; } @@ -314,7 +314,7 @@ ULONG stub_manager_int_release(struct stub_manager *m) EnterCriticalSection(&apt->cs); refs = --m->refs; - TRACE("after %d\n", refs); + TRACE("after %ld\n", refs); /* remove from apartment so no other thread can access it... */ if (!refs) @@ -341,7 +341,7 @@ struct stub_manager * get_stub_manager_from_object(struct apartment *apt, IUnkno hres = IUnknown_QueryInterface(obj, &IID_IUnknown, (void**)&object); if (FAILED(hres)) { - ERR("QueryInterface(IID_IUnknown failed): %08x\n", hres); + ERR("QueryInterface(IID_IUnknown failed): %#lx\n", hres); return NULL; } @@ -421,7 +421,7 @@ ULONG stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak LeaveCriticalSection(&m->lock); - TRACE("added %u refs to %p (oid %s), rc is now %u\n", refs, m, wine_dbgstr_longlong(m->oid), rc); + TRACE("added %lu refs to %p (oid %s), rc is now %lu\n", refs, m, wine_dbgstr_longlong(m->oid), rc); /* * NOTE: According to tests, creating a stub causes two AddConnection calls followed by @@ -454,7 +454,7 @@ ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tablewea LeaveCriticalSection(&m->lock); - TRACE("removed %u refs from %p (oid %s), rc is now %u\n", refs, m, wine_dbgstr_longlong(m->oid), rc); + TRACE("removed %lu refs from %p (oid %s), rc is now %lu\n", refs, m, wine_dbgstr_longlong(m->oid), rc); if (last_extern_ref && m->extern_conn) IExternalConnection_ReleaseConnection(m->extern_conn, EXTCONN_STRONG, 0, last_unlock_releases); @@ -672,7 +672,7 @@ static ULONG WINAPI RemUnknown_AddRef(IRemUnknown *iface) refs = InterlockedIncrement(&remunk->refs); - TRACE("%p before: %d\n", iface, refs-1); + TRACE("%p before: %ld\n", iface, refs-1); return refs; } @@ -685,7 +685,7 @@ static ULONG WINAPI RemUnknown_Release(IRemUnknown *iface) if (!refs) HeapFree(GetProcessHeap(), 0, remunk); - TRACE("%p after: %d\n", iface, refs); + TRACE("%p after: %ld\n", iface, refs); return refs; } @@ -702,7 +702,7 @@ static HRESULT WINAPI RemUnknown_RemQueryInterface(IRemUnknown *iface, DWORD dest_context; void *dest_context_data; - TRACE("%p, %s, %d, %d, %p, %p\n", iface, debugstr_guid(ripid), cRefs, cIids, iids, ppQIResults); + TRACE("%p, %s, %ld, %d, %p, %p.\n", iface, debugstr_guid(ripid), cRefs, cIids, iids, ppQIResults); hr = ipid_to_ifstub(ripid, &apt, &stubmgr, &ifstub); if (hr != S_OK) return hr; @@ -755,7 +755,7 @@ static HRESULT WINAPI RemUnknown_RemAddRef(IRemUnknown *iface, stub_manager_ext_addref(stubmgr, InterfaceRefs[i].cPublicRefs, FALSE); if (InterfaceRefs[i].cPrivateRefs) - FIXME("Adding %d refs securely not implemented\n", InterfaceRefs[i].cPrivateRefs); + FIXME("Adding %ld refs securely not implemented\n", InterfaceRefs[i].cPrivateRefs); stub_manager_int_release(stubmgr); apartment_release(apt); @@ -788,7 +788,7 @@ static HRESULT WINAPI RemUnknown_RemRelease(IRemUnknown *iface, stub_manager_ext_release(stubmgr, InterfaceRefs[i].cPublicRefs, FALSE, TRUE); if (InterfaceRefs[i].cPrivateRefs) - FIXME("Releasing %d refs securely not implemented\n", InterfaceRefs[i].cPrivateRefs); + FIXME("Releasing %ld refs securely not implemented\n", InterfaceRefs[i].cPrivateRefs); stub_manager_int_release(stubmgr); apartment_release(apt); diff --git a/dlls/combase/usrmarshal.c b/dlls/combase/usrmarshal.c index 48a6c2de4be..d12ea7f759c 100644 --- a/dlls/combase/usrmarshal.c +++ b/dlls/combase/usrmarshal.c @@ -112,25 +112,25 @@ static void handle_UserFree(ULONG *pFlags, HANDLE *handle) #define IMPL_WIREM_HANDLE(type) \ ULONG __RPC_USER type##_UserSize(ULONG *pFlags, ULONG StartingSize, type *handle) \ { \ - TRACE("(%s, %d, %p\n", debugstr_user_flags(pFlags), StartingSize, handle); \ + TRACE("%s, %lu, %p.\n", debugstr_user_flags(pFlags), StartingSize, handle); \ return handle_UserSize(pFlags, StartingSize, (HANDLE *)handle); \ } \ \ unsigned char * __RPC_USER type##_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, type *handle) \ { \ - TRACE("(%s, %p, &%p\n", debugstr_user_flags(pFlags), pBuffer, *handle); \ + TRACE("%s, %p, &%p.\n", debugstr_user_flags(pFlags), pBuffer, *handle); \ return handle_UserMarshal(pFlags, pBuffer, (HANDLE *)handle); \ } \ \ unsigned char * __RPC_USER type##_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, type *handle) \ { \ - TRACE("(%s, %p, %p\n", debugstr_user_flags(pFlags), pBuffer, handle); \ + TRACE("%s, %p, %p.\n", debugstr_user_flags(pFlags), pBuffer, handle); \ return handle_UserUnmarshal(pFlags, pBuffer, (HANDLE *)handle); \ } \ \ void __RPC_USER type##_UserFree(ULONG *pFlags, type *handle) \ { \ - TRACE("(%s, &%p\n", debugstr_user_flags(pFlags), *handle); \ + TRACE("%s, &%p.\n", debugstr_user_flags(pFlags), *handle); \ handle_UserFree(pFlags, (HANDLE *)handle); \ } @@ -163,7 +163,7 @@ IMPL_WIREM_HANDLE(HWND) */ ULONG __RPC_USER CLIPFORMAT_UserSize(ULONG *pFlags, ULONG size, CLIPFORMAT *pCF) { - TRACE("%s, %u, %p\n", debugstr_user_flags(pFlags), size, pCF); + TRACE("%s, %lu, %p.\n", debugstr_user_flags(pFlags), size, pCF); ALIGN_LENGTH(size, 3); @@ -363,7 +363,7 @@ void __RPC_USER CLIPFORMAT_UserFree(ULONG *pFlags, CLIPFORMAT *pCF) */ ULONG __RPC_USER HBITMAP_UserSize(ULONG *flags, ULONG size, HBITMAP *bmp) { - TRACE("(%s, %d, %p)\n", debugstr_user_flags(flags), size, *bmp); + TRACE("%s, %lu, %p.\n", debugstr_user_flags(flags), size, *bmp); ALIGN_LENGTH(size, 3); @@ -642,7 +642,7 @@ ULONG __RPC_USER HGLOBAL_UserSize(ULONG *pFlags, ULONG StartingSize, HGLOBAL *ph { ULONG size = StartingSize; - TRACE("%s, %u, %p.\n", debugstr_user_flags(pFlags), StartingSize, phGlobal); + TRACE("%s, %lu, %p.\n", debugstr_user_flags(pFlags), StartingSize, phGlobal); ALIGN_LENGTH(size, 3); @@ -886,7 +886,7 @@ ULONG __RPC_USER WdtpInterfacePointer_UserSize(ULONG *pFlags, ULONG RealFlags, U DWORD marshal_size = 0; HRESULT hr; - TRACE("%s, %#x, %u, %p, %s.\n", debugstr_user_flags(pFlags), RealFlags, StartingSize, punk, debugstr_guid(riid)); + TRACE("%s, %#lx, %lu, %p, %s.\n", debugstr_user_flags(pFlags), RealFlags, StartingSize, punk, debugstr_guid(riid)); hr = CoGetMarshalSizeMax(&marshal_size, riid, punk, LOWORD(RealFlags), NULL, MSHLFLAGS_NORMAL); if (FAILED(hr)) return StartingSize; @@ -923,7 +923,7 @@ unsigned char * WINAPI WdtpInterfacePointer_UserMarshal(ULONG *pFlags, ULONG Rea DWORD size; void *ptr; - TRACE("%s, %#x, %p, &%p, %s.\n", debugstr_user_flags(pFlags), RealFlags, pBuffer, punk, debugstr_guid(riid)); + TRACE("%s, %#lx, %p, &%p, %s.\n", debugstr_user_flags(pFlags), RealFlags, pBuffer, punk, debugstr_guid(riid)); if (!h) return NULL; if (CreateStreamOnHGlobal(h, TRUE, &stm) != S_OK) -- 2.34.1

1 0

[PATCH] ntdll: Map ETXTBSY to STATUS_SHARING_VIOLATION.
by Jinoh Kang Feb. 8, 2022

Feb. 8, 2022

This complements commit c75edd04c2c (server: Map ETXTBSY to STATUS_SHARING_VIOLATION., 2007-09-11). Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/unix/file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index a29b5cbb980..dbd9063e025 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -318,6 +318,7 @@ NTSTATUS errno_to_status( int err ) TRACE( "errno = %d\n", err ); switch (err) { + case ETXTBSY: case EAGAIN: return STATUS_SHARING_VIOLATION; case EBADF: return STATUS_INVALID_HANDLE; case EBUSY: return STATUS_DEVICE_BUSY; -- 2.34.1

1 0

[PATCH 1/5] user32/tests: Add more tests for windows destroyed by thread exit.
by Jacek Caban Feb. 8, 2022

Feb. 8, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/tests/msg.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)

3 6

[PATCH 8/8] server: Don't allow creating children of orphaned windows.
by Jacek Caban Feb. 8, 2022

Feb. 8, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/tests/win.c | 33 +++++++++++++++++++++++++++++++-- server/window.c | 10 +++++++++- 2 files changed, 40 insertions(+), 3 deletions(-)

1 0

[PATCH 7/8] server: Orphan child windows when unlinking them from parent.
by Jacek Caban Feb. 8, 2022

Feb. 8, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/tests/win.c | 34 ++++++++++++++++++++++++++++++++++ server/window.c | 5 ++++- 2 files changed, 38 insertions(+), 1 deletion(-)

1 0

[PATCH 6/8] server: Don't allow orphaned windows in set_parent request.
by Jacek Caban Feb. 8, 2022

Feb. 8, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/tests/win.c | 3 --- dlls/user32/win.c | 2 +- server/window.c | 10 +++++++++- 3 files changed, 10 insertions(+), 5 deletions(-)

1 0