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

[PATCH] mfmediaengine/tests: Build without -DWINE_NO_LONG_TYPES.
by Nikolay Sivov Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfmediaengine/tests/Makefile.in | 1 - dlls/mfmediaengine/tests/mfmediaengine.c | 255 +++++++++++------------ 2 files changed, 126 insertions(+), 130 deletions(-) diff --git a/dlls/mfmediaengine/tests/Makefile.in b/dlls/mfmediaengine/tests/Makefile.in index d8331277412..421b75587a0 100644 --- a/dlls/mfmediaengine/tests/Makefile.in +++ b/dlls/mfmediaengine/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mfmediaengine.dll IMPORTS = ole32 mfplat oleaut32 mfuuid uuid diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index d5a118677e5..f67b6512db7 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -45,7 +45,7 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line) ULONG rc; IUnknown_AddRef(obj); rc = IUnknown_Release(obj); - ok_(__FILE__,line)(rc == ref, "Unexpected refcount %d, expected %d.\n", rc, ref); + ok_(__FILE__,line)(rc == ref, "Unexpected refcount %ld, expected %ld.\n", rc, ref); } #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) @@ -58,7 +58,7 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO expected_hr = supported ? S_OK : E_NOINTERFACE; hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); - ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#lx, expected %#lx.\n", hr, expected_hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); } @@ -148,18 +148,18 @@ static IMFMediaEngine *create_media_engine(IMFMediaEngineNotify *callback) HRESULT hr; hr = pMFCreateDXGIDeviceManager(&token, &manager); - ok(hr == S_OK, "Failed to create dxgi device manager, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = MFCreateAttributes(&attributes, 3); - ok(hr == S_OK, "Failed to create attributes, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, (IUnknown *)callback); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFAttributes_SetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, DXGI_FORMAT_UNKNOWN); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngineClassFactory_CreateInstance(factory, 0, attributes, &media_engine); - ok(hr == S_OK, "Failed to create media engine, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFAttributes_Release(attributes); IMFDXGIDeviceManager_Release(manager); @@ -193,7 +193,7 @@ static void test_factory(void) hr = CoCreateInstance(&CLSID_MFMediaEngineClassFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IMFMediaEngineClassFactory, (void **)&factory); - ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG) /* pre-win8 */, "Failed to create class factory, hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG) /* pre-win8 */, "Failed to create class factory, hr %#lx.\n", hr); if (FAILED(hr)) { win_skip("Media Engine is not supported.\n"); @@ -205,32 +205,29 @@ static void test_factory(void) /* Aggregation is not supported. */ hr = CoCreateInstance(&CLSID_MFMediaEngineClassFactory, (IUnknown *)factory, CLSCTX_INPROC_SERVER, &IID_IMFMediaEngineClassFactory, (void **)&factory2); - ok(hr == CLASS_E_NOAGGREGATION, "Unexpected hr %#x.\n", hr); + ok(hr == CLASS_E_NOAGGREGATION, "Unexpected hr %#lx.\n", hr); hr = pMFCreateDXGIDeviceManager(&token, &manager); - ok(hr == S_OK, "MFCreateDXGIDeviceManager failed: %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = MFCreateAttributes(&attributes, 3); - ok(hr == S_OK, "MFCreateAttributes failed: %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, - attributes, &media_engine); - ok(hr == MF_E_ATTRIBUTENOTFOUND, "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, attributes, &media_engine); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_OPM_HWND, NULL); - ok(hr == S_OK, "IMFAttributes_SetUnknown failed: %#x.\n", hr); - hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, - attributes, &media_engine); - ok(hr == MF_E_ATTRIBUTENOTFOUND, "IMFMediaEngineClassFactory_CreateInstance got %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, attributes, &media_engine); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); IMFAttributes_DeleteAllItems(attributes); hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, (IUnknown *)&notify->IMFMediaEngineNotify_iface); - ok(hr == S_OK, "IMFAttributes_SetUnknown failed: %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFAttributes_SetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, DXGI_FORMAT_UNKNOWN); - ok(hr == S_OK, "IMFAttributes_SetUINT32 failed: %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); EXPECT_REF(factory, 1); - hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, - attributes, &media_engine); - ok(hr == S_OK, "IMFMediaEngineClassFactory_CreateInstance failed: %#x.\n", hr); + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, attributes, &media_engine); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); EXPECT_REF(factory, 1); IMFMediaEngine_Release(media_engine); @@ -253,36 +250,36 @@ static void test_CreateInstance(void) notify = create_callback(); hr = pMFCreateDXGIDeviceManager(&token, &manager); - ok(hr == S_OK, "Failed to create dxgi device manager, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = MFCreateAttributes(&attributes, 3); - ok(hr == S_OK, "Failed to create attributes, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, attributes, &media_engine); - ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_OPM_HWND, NULL); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, attributes, &media_engine); - ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); IMFAttributes_DeleteAllItems(attributes); hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, (IUnknown *)&notify->IMFMediaEngineNotify_iface); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFAttributes_SetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, DXGI_FORMAT_UNKNOWN); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, attributes, &media_engine); - ok(hr == S_OK, "Failed to create media engine, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); check_interface(media_engine, &IID_IMFMediaEngine, TRUE); hr = IMFMediaEngine_QueryInterface(media_engine, &IID_IMFGetService, (void **)&unk); - ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* supported since win10 */, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* supported since win10 */, "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); @@ -310,16 +307,16 @@ static void test_Shutdown(void) media_engine = create_media_engine(&notify->IMFMediaEngineNotify_iface); hr = IMFMediaEngine_Shutdown(media_engine); - ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to shut down, hr %#lx.\n", hr); hr = IMFMediaEngine_Shutdown(media_engine); - ok(hr == MF_E_SHUTDOWN || broken(hr == S_OK) /* before win10 */, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN || broken(hr == S_OK) /* before win10 */, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngine_SetSource(media_engine, NULL); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngine_GetCurrentSource(media_engine, &str); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); state = IMFMediaEngine_GetNetworkState(media_engine); ok(!state, "Unexpected state %d.\n", state); @@ -329,26 +326,26 @@ static void test_Shutdown(void) ok(!state, "Unexpected state %d.\n", state); hr = IMFMediaEngine_SetPreload(media_engine, MF_MEDIA_ENGINE_PRELOAD_AUTOMATIC); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); state = IMFMediaEngine_GetPreload(media_engine); ok(state == MF_MEDIA_ENGINE_PRELOAD_AUTOMATIC, "Unexpected state %d.\n", state); hr = IMFMediaEngine_SetPreload(media_engine, 100); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); state = IMFMediaEngine_GetPreload(media_engine); ok(state == 100, "Unexpected state %d.\n", state); hr = IMFMediaEngine_GetBuffered(media_engine, &time_range); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngine_Load(media_engine); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); str = SysAllocString(L"video/mp4"); hr = IMFMediaEngine_CanPlayType(media_engine, str, &state); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); SysFreeString(str); state = IMFMediaEngine_GetReadyState(media_engine); @@ -361,7 +358,7 @@ static void test_Shutdown(void) ok(val == 0.0, "Unexpected time %f.\n", val); hr = IMFMediaEngine_SetCurrentTime(media_engine, 1.0); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); val = IMFMediaEngine_GetStartTime(media_engine); ok(val == 0.0, "Unexpected time %f.\n", val); @@ -373,16 +370,16 @@ static void test_Shutdown(void) ok(val == 1.0, "Unexpected rate %f.\n", val); hr = IMFMediaEngine_SetDefaultPlaybackRate(media_engine, 2.0); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); val = IMFMediaEngine_GetPlaybackRate(media_engine); ok(val == 1.0, "Unexpected rate %f.\n", val); hr = IMFMediaEngine_GetPlayed(media_engine, &time_range); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngine_GetSeekable(media_engine, &time_range); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); state = IMFMediaEngine_IsEnded(media_engine); ok(!state, "Unexpected state %d.\n", state); @@ -392,7 +389,7 @@ static void test_Shutdown(void) ok(!state, "Unexpected state.\n"); hr = IMFMediaEngine_SetAutoPlay(media_engine, TRUE); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); state = IMFMediaEngine_GetAutoPlay(media_engine); ok(!!state, "Unexpected state.\n"); @@ -402,28 +399,28 @@ static void test_Shutdown(void) ok(!state, "Unexpected state.\n"); hr = IMFMediaEngine_SetLoop(media_engine, TRUE); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); state = IMFMediaEngine_GetLoop(media_engine); ok(!!state, "Unexpected state.\n"); hr = IMFMediaEngine_Play(media_engine); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngine_Pause(media_engine); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); state = IMFMediaEngine_GetMuted(media_engine); ok(!state, "Unexpected state.\n"); hr = IMFMediaEngine_SetMuted(media_engine, TRUE); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); val = IMFMediaEngine_GetVolume(media_engine); ok(val == 1.0, "Unexpected value %f.\n", val); hr = IMFMediaEngine_SetVolume(media_engine, 2.0); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); state = IMFMediaEngine_HasVideo(media_engine); ok(!state, "Unexpected state.\n"); @@ -432,27 +429,27 @@ static void test_Shutdown(void) ok(!state, "Unexpected state.\n"); hr = IMFMediaEngine_GetNativeVideoSize(media_engine, &cx, &cy); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngine_GetVideoAspectRatio(media_engine, &cx, &cy); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(IMFMediaEngine_QueryInterface(media_engine, &IID_IMFMediaEngineEx, (void **)&media_engine_ex))) { hr = IMFMediaEngineEx_SetSourceFromByteStream(media_engine_ex, NULL, NULL); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngineEx_GetAudioStreamCategory(media_engine_ex, &value); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngineEx_GetAudioEndpointRole(media_engine_ex, &value); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngineEx_SetAudioStreamCategory(media_engine_ex, AudioCategory_ForegroundOnlyMedia); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngineEx_SetAudioEndpointRole(media_engine_ex, eConsole); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); IMFMediaEngineEx_Release(media_engine_ex); } @@ -476,13 +473,13 @@ static void test_Play(void) media_engine = create_media_engine(&notify->IMFMediaEngineNotify_iface); hr = IMFMediaEngine_GetBuffered(media_engine, &range); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngine_GetBuffered(media_engine, &range1); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(range != range1, "Unexpected pointer.\n"); count = IMFMediaTimeRange_GetLength(range); - ok(!count, "Unexpected count %u.\n", count); + ok(!count, "Unexpected count %lu.\n", count); IMFMediaTimeRange_Release(range); IMFMediaTimeRange_Release(range1); @@ -491,30 +488,30 @@ static void test_Play(void) ok(ret, "Unexpected state %d.\n", ret); hr = IMFMediaEngine_OnVideoStreamTick(media_engine, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); pts = 0; hr = IMFMediaEngine_OnVideoStreamTick(media_engine, &pts); - ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); ok(pts == MINLONGLONG, "Unexpected timestamp.\n"); hr = IMFMediaEngine_Play(media_engine); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ret = IMFMediaEngine_IsPaused(media_engine); ok(!ret, "Unexpected state %d.\n", ret); hr = IMFMediaEngine_Play(media_engine); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngine_Shutdown(media_engine); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngine_OnVideoStreamTick(media_engine, NULL); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngine_OnVideoStreamTick(media_engine, &pts); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); ret = IMFMediaEngine_IsPaused(media_engine); ok(!ret, "Unexpected state %d.\n", ret); @@ -525,13 +522,13 @@ static void test_Play(void) media_engine = create_media_engine(&notify->IMFMediaEngineNotify_iface); hr = IMFMediaEngine_Play(media_engine); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ret = IMFMediaEngine_IsPaused(media_engine); ok(!ret, "Unexpected state %d.\n", ret); hr = IMFMediaEngine_Pause(media_engine); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ret = IMFMediaEngine_IsPaused(media_engine); ok(!!ret, "Unexpected state %d.\n", ret); @@ -558,13 +555,13 @@ static void test_playback_rate(void) ok(rate == 1.0, "Unexpected default rate.\n"); hr = IMFMediaEngine_SetPlaybackRate(media_engine, 0.0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); rate = IMFMediaEngine_GetPlaybackRate(media_engine); ok(rate == 0.0, "Unexpected default rate.\n"); hr = IMFMediaEngine_SetDefaultPlaybackRate(media_engine, 0.0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFMediaEngine_Release(media_engine); IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface); @@ -585,13 +582,13 @@ static void test_mute(void) ok(!ret, "Unexpected state.\n"); hr = IMFMediaEngine_SetMuted(media_engine, TRUE); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ret = IMFMediaEngine_GetMuted(media_engine); ok(ret, "Unexpected state.\n"); hr = IMFMediaEngine_Shutdown(media_engine); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ret = IMFMediaEngine_GetMuted(media_engine); ok(ret, "Unexpected state.\n"); @@ -614,73 +611,73 @@ static void test_error(void) eo = (void *)0xdeadbeef; hr = IMFMediaEngine_GetError(media_engine, &eo); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!eo, "Unexpected instance.\n"); hr = IMFMediaEngine_SetErrorCode(media_engine, MF_MEDIA_ENGINE_ERR_ENCRYPTED + 1); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngine_SetErrorCode(media_engine, MF_MEDIA_ENGINE_ERR_ABORTED); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); eo = NULL; hr = IMFMediaEngine_GetError(media_engine, &eo); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!!eo, "Unexpected instance.\n"); eo2 = NULL; hr = IMFMediaEngine_GetError(media_engine, &eo2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(eo2 != eo, "Unexpected instance.\n"); IMFMediaError_Release(eo2); IMFMediaError_Release(eo); hr = IMFMediaEngine_SetErrorCode(media_engine, MF_MEDIA_ENGINE_ERR_NOERROR); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); eo = (void *)0xdeadbeef; hr = IMFMediaEngine_GetError(media_engine, &eo); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!eo, "Unexpected instance.\n"); hr = IMFMediaEngine_Shutdown(media_engine); - ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); eo = (void *)0xdeadbeef; hr = IMFMediaEngine_GetError(media_engine, &eo); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); ok(!eo, "Unexpected instance.\n"); hr = IMFMediaEngine_SetErrorCode(media_engine, MF_MEDIA_ENGINE_ERR_NOERROR); - ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); IMFMediaEngine_Release(media_engine); /* Error object. */ hr = IMFMediaEngineClassFactory_CreateError(factory, &eo); - ok(hr == S_OK, "Failed to create error object, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); code = IMFMediaError_GetErrorCode(eo); ok(code == MF_MEDIA_ENGINE_ERR_NOERROR, "Unexpected code %u.\n", code); hr = IMFMediaError_GetExtendedErrorCode(eo); - ok(hr == S_OK, "Unexpected code %#x.\n", hr); + ok(hr == S_OK, "Unexpected code %#lx.\n", hr); hr = IMFMediaError_SetErrorCode(eo, MF_MEDIA_ENGINE_ERR_ENCRYPTED + 1); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IMFMediaError_SetErrorCode(eo, MF_MEDIA_ENGINE_ERR_ABORTED); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); code = IMFMediaError_GetErrorCode(eo); ok(code == MF_MEDIA_ENGINE_ERR_ABORTED, "Unexpected code %u.\n", code); hr = IMFMediaError_SetExtendedErrorCode(eo, E_FAIL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaError_GetExtendedErrorCode(eo); - ok(hr == E_FAIL, "Unexpected code %#x.\n", hr); + ok(hr == E_FAIL, "Unexpected code %#lx.\n", hr); IMFMediaError_Release(eo); IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface); @@ -695,11 +692,11 @@ static void test_time_range(void) BOOL ret; hr = IMFMediaEngineClassFactory_CreateTimeRange(factory, &range); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* Empty ranges. */ hr = IMFMediaTimeRange_Clear(range); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ret = IMFMediaTimeRange_ContainsTime(range, 10.0); ok(!ret, "Unexpected return value %d.\n", ret); @@ -708,155 +705,155 @@ static void test_time_range(void) ok(!count, "Unexpected range count.\n"); hr = IMFMediaTimeRange_GetStart(range, 0, &start); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IMFMediaTimeRange_GetEnd(range, 0, &end); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); /* Add a range. */ hr = IMFMediaTimeRange_AddRange(range, 10.0, 1.0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); count = IMFMediaTimeRange_GetLength(range); ok(count == 1, "Unexpected range count.\n"); hr = IMFMediaTimeRange_GetStart(range, 0, &start); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(start == 10.0, "Unexpected start %.e.\n", start); hr = IMFMediaTimeRange_GetEnd(range, 0, &end); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(end == 1.0, "Unexpected end %.e.\n", end); hr = IMFMediaTimeRange_AddRange(range, 2.0, 3.0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); count = IMFMediaTimeRange_GetLength(range); ok(count == 1, "Unexpected range count.\n"); hr = IMFMediaTimeRange_GetStart(range, 0, &start); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(start == 2.0, "Unexpected start %.8e.\n", start); hr = IMFMediaTimeRange_GetEnd(range, 0, &end); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(end == 3.0, "Unexpected end %.8e.\n", end); hr = IMFMediaTimeRange_AddRange(range, 10.0, 9.0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); count = IMFMediaTimeRange_GetLength(range); ok(count == 2, "Unexpected range count.\n"); hr = IMFMediaTimeRange_GetStart(range, 0, &start); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(start == 2.0, "Unexpected start %.8e.\n", start); hr = IMFMediaTimeRange_GetEnd(range, 0, &end); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(end == 3.0, "Unexpected end %.8e.\n", end); start = 0.0; hr = IMFMediaTimeRange_GetStart(range, 1, &start); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(start == 10.0, "Unexpected start %.8e.\n", start); hr = IMFMediaTimeRange_GetEnd(range, 1, &end); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(end == 9.0, "Unexpected end %.8e.\n", end); hr = IMFMediaTimeRange_AddRange(range, 2.0, 9.1); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); count = IMFMediaTimeRange_GetLength(range); ok(count == 2, "Unexpected range count.\n"); hr = IMFMediaTimeRange_GetStart(range, 0, &start); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(start == 2.0, "Unexpected start %.8e.\n", start); hr = IMFMediaTimeRange_GetEnd(range, 0, &end); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(end == 9.1, "Unexpected end %.8e.\n", end); hr = IMFMediaTimeRange_GetStart(range, 1, &start); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(start == 10.0, "Unexpected start %.8e.\n", start); hr = IMFMediaTimeRange_GetEnd(range, 1, &end); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(end == 9.0, "Unexpected end %.8e.\n", end); hr = IMFMediaTimeRange_AddRange(range, 8.5, 2.5); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); count = IMFMediaTimeRange_GetLength(range); ok(count == 2, "Unexpected range count.\n"); hr = IMFMediaTimeRange_GetStart(range, 0, &start); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(start == 2.0, "Unexpected start %.8e.\n", start); hr = IMFMediaTimeRange_GetEnd(range, 0, &end); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(end == 9.1, "Unexpected end %.8e.\n", end); hr = IMFMediaTimeRange_AddRange(range, 20.0, 20.0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); count = IMFMediaTimeRange_GetLength(range); ok(count == 3, "Unexpected range count.\n"); hr = IMFMediaTimeRange_Clear(range); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); count = IMFMediaTimeRange_GetLength(range); ok(!count, "Unexpected range count.\n"); /* Intersect */ hr = IMFMediaTimeRange_AddRange(range, 5.0, 10.0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaTimeRange_AddRange(range, 6.0, 12.0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaTimeRange_GetStart(range, 0, &start); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(start == 5.0, "Unexpected start %.8e.\n", start); hr = IMFMediaTimeRange_GetEnd(range, 0, &end); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(end == 12.0, "Unexpected end %.8e.\n", end); count = IMFMediaTimeRange_GetLength(range); ok(count == 1, "Unexpected range count.\n"); hr = IMFMediaTimeRange_AddRange(range, 4.0, 6.0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); count = IMFMediaTimeRange_GetLength(range); ok(count == 1, "Unexpected range count.\n"); hr = IMFMediaTimeRange_GetStart(range, 0, &start); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(start == 4.0, "Unexpected start %.8e.\n", start); hr = IMFMediaTimeRange_GetEnd(range, 0, &end); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(end == 12.0, "Unexpected end %.8e.\n", end); hr = IMFMediaTimeRange_AddRange(range, 5.0, 3.0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); count = IMFMediaTimeRange_GetLength(range); ok(count == 1, "Unexpected range count.\n"); hr = IMFMediaTimeRange_GetStart(range, 0, &start); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(start == 4.0, "Unexpected start %.8e.\n", start); hr = IMFMediaTimeRange_GetEnd(range, 0, &end); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(end == 12.0, "Unexpected end %.8e.\n", end); IMFMediaTimeRange_Release(range); @@ -879,7 +876,7 @@ static void test_SetSourceFromByteStream(void) } hr = IMFMediaEngineEx_SetSourceFromByteStream(media_engine, NULL, NULL); - ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); IMFMediaEngineEx_Release(media_engine); IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface); @@ -902,11 +899,11 @@ static void test_audio_configuration(void) } hr = IMFMediaEngineEx_GetAudioStreamCategory(media_engine, &value); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(value == AudioCategory_Other, "Unexpected value %u.\n", value); hr = IMFMediaEngineEx_GetAudioEndpointRole(media_engine, &value); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(value == eMultimedia, "Unexpected value %u.\n", value); IMFMediaEngineEx_Release(media_engine); @@ -931,7 +928,7 @@ START_TEST(mfmediaengine) init_functions(); hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); - ok(hr == S_OK, "MFStartup failed: %#x.\n", hr); + ok(hr == S_OK, "MFStartup failed: %#lx.\n", hr); test_factory(); test_CreateInstance(); -- 2.34.1

1 0

[PATCH 4/4] wmiutils: Build without -DWINE_NO_LONG_TYPES.
by Hans Leidekker Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wmiutils/Makefile.in | 1 - dlls/wmiutils/path.c | 46 ++--- dlls/wmiutils/statuscode.c | 4 +- dlls/wmiutils/tests/Makefile.in | 1 - dlls/wmiutils/tests/path.c | 323 ++++++++++++++++---------------- 5 files changed, 185 insertions(+), 190 deletions(-) diff --git a/dlls/wmiutils/Makefile.in b/dlls/wmiutils/Makefile.in index 8086851e047..22d756c1f5a 100644 --- a/dlls/wmiutils/Makefile.in +++ b/dlls/wmiutils/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wmiutils.dll IMPORTS = oleaut32 ole32 advapi32 diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index 6a7587ad23f..ce2fc90ba1f 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -145,7 +145,7 @@ static HRESULT WINAPI keylist_SetKey( ULONG uCimType, LPVOID pKeyVal ) { - FIXME("%p, %s, 0x%x, %u, %p\n", iface, debugstr_w(wszName), uFlags, uCimType, pKeyVal); + FIXME("%p, %s, %#lx, %lu, %p\n", iface, debugstr_w(wszName), uFlags, uCimType, pKeyVal); return E_NOTIMPL; } @@ -156,7 +156,7 @@ static HRESULT WINAPI keylist_SetKey2( ULONG uCimType, VARIANT *pKeyVal ) { - FIXME("%p, %s, 0x%x, %u, %p\n", iface, debugstr_w(wszName), uFlags, uCimType, pKeyVal); + FIXME("%p, %s, %#lx, %lu, %p\n", iface, debugstr_w(wszName), uFlags, uCimType, pKeyVal); return E_NOTIMPL; } @@ -170,7 +170,7 @@ static HRESULT WINAPI keylist_GetKey( LPVOID pKeyVal, ULONG *puApparentCimType ) { - FIXME("%p, %u, 0x%x, %p, %p, %p, %p, %p\n", iface, uKeyIx, uFlags, puNameBufSize, + FIXME("%p, %lu, %#lx, %p, %p, %p, %p, %p\n", iface, uKeyIx, uFlags, puNameBufSize, pszKeyName, puKeyValBufSize, pKeyVal, puApparentCimType); return E_NOTIMPL; } @@ -184,7 +184,7 @@ static HRESULT WINAPI keylist_GetKey2( VARIANT *pKeyValue, ULONG *puApparentCimType ) { - FIXME("%p, %u, 0x%x, %p, %p, %p, %p\n", iface, uKeyIx, uFlags, puNameBufSize, + FIXME("%p, %lu, %#lx, %p, %p, %p, %p\n", iface, uKeyIx, uFlags, puNameBufSize, pszKeyName, pKeyValue, puApparentCimType); return E_NOTIMPL; } @@ -194,7 +194,7 @@ static HRESULT WINAPI keylist_RemoveKey( LPCWSTR wszName, ULONG uFlags ) { - FIXME("%p, %s, 0x%x\n", iface, debugstr_w(wszName), uFlags); + FIXME("%p, %s, %#lx\n", iface, debugstr_w(wszName), uFlags); return E_NOTIMPL; } @@ -217,7 +217,7 @@ static HRESULT WINAPI keylist_RemoveAllKeys( struct keylist *keylist = impl_from_IWbemPathKeyList( iface ); struct path *parent = impl_from_IWbemPath( keylist->parent ); - TRACE("%p, 0x%x\n", iface, uFlags); + TRACE("%p, %#lx\n", iface, uFlags); if (uFlags) return WBEM_E_INVALID_PARAMETER; @@ -244,7 +244,7 @@ static HRESULT WINAPI keylist_GetInfo( ULONG uRequestedInfo, ULONGLONG *puResponse ) { - FIXME("%p, %u, %p\n", iface, uRequestedInfo, puResponse); + FIXME("%p, %lu, %p\n", iface, uRequestedInfo, puResponse); return E_NOTIMPL; } @@ -254,7 +254,7 @@ static HRESULT WINAPI keylist_GetText( ULONG *puBuffLength, LPWSTR pszText ) { - FIXME("%p, 0x%x, %p, %p\n", iface, lFlags, puBuffLength, pszText); + FIXME("%p, %#lx, %p, %p\n", iface, lFlags, puBuffLength, pszText); return E_NOTIMPL; } @@ -517,7 +517,7 @@ static HRESULT WINAPI path_SetText( HRESULT hr = S_OK; int len; - TRACE("%p, %u, %s\n", iface, uMode, debugstr_w(pszPath)); + TRACE("%p, %lu, %s\n", iface, uMode, debugstr_w(pszPath)); if (!uMode || !pszPath) return WBEM_E_INVALID_PARAMETER; @@ -761,7 +761,7 @@ static WCHAR *build_path( struct path *path, LONG flags, int *len ) return strdupW( path->text ); default: - ERR("unhandled flags 0x%x\n", flags); + ERR( "unhandled flags %#lx\n", flags ); return NULL; } } @@ -777,7 +777,7 @@ static HRESULT WINAPI path_GetText( WCHAR *str; int len; - TRACE("%p, 0x%x, %p, %p\n", iface, lFlags, puBufferLength, pszText); + TRACE("%p, %#lx, %p, %p\n", iface, lFlags, puBufferLength, pszText); if (!puBufferLength) return WBEM_E_INVALID_PARAMETER; @@ -813,7 +813,7 @@ static HRESULT WINAPI path_GetInfo( { struct path *path = impl_from_IWbemPath( iface ); - TRACE("%p, %u, %p\n", iface, info, response); + TRACE("%p, %lu, %p\n", iface, info, response); if (info || !response) return WBEM_E_INVALID_PARAMETER; @@ -934,7 +934,7 @@ static HRESULT WINAPI path_SetNamespaceAt( WCHAR **tmp, *new; DWORD size; - TRACE("%p, %u, %s\n", iface, idx, debugstr_w(name)); + TRACE( "%p, %lu, %s\n", iface, idx, debugstr_w(name) ); EnterCriticalSection( &path->cs ); @@ -990,7 +990,7 @@ static HRESULT WINAPI path_GetNamespaceAt( { struct path *path = impl_from_IWbemPath( iface ); - TRACE("%p, %u, %p, %p\n", iface, idx, len, name); + TRACE( "%p, %lu, %p, %p\n", iface, idx, len, name ); EnterCriticalSection( &path->cs ); @@ -1012,7 +1012,7 @@ static HRESULT WINAPI path_RemoveNamespaceAt( { struct path *path = impl_from_IWbemPath( iface ); - TRACE("%p, %u\n", iface, idx); + TRACE( "%p, %lu\n", iface, idx ); EnterCriticalSection( &path->cs ); @@ -1068,7 +1068,7 @@ static HRESULT WINAPI path_SetScope( ULONG uIndex, LPWSTR pszClass) { - FIXME("%p, %u, %s\n", iface, uIndex, debugstr_w(pszClass)); + FIXME("%p, %lu, %s\n", iface, uIndex, debugstr_w(pszClass)); return E_NOTIMPL; } @@ -1077,7 +1077,7 @@ static HRESULT WINAPI path_SetScopeFromText( ULONG uIndex, LPWSTR pszText) { - FIXME("%p, %u, %s\n", iface, uIndex, debugstr_w(pszText)); + FIXME("%p, %lu, %s\n", iface, uIndex, debugstr_w(pszText)); return E_NOTIMPL; } @@ -1088,7 +1088,7 @@ static HRESULT WINAPI path_GetScope( LPWSTR pszClass, IWbemPathKeyList **pKeyList) { - FIXME("%p, %u, %p, %p, %p\n", iface, uIndex, puClassNameBufSize, pszClass, pKeyList); + FIXME("%p, %lu, %p, %p, %p\n", iface, uIndex, puClassNameBufSize, pszClass, pKeyList); return E_NOTIMPL; } @@ -1098,7 +1098,7 @@ static HRESULT WINAPI path_GetScopeAsText( ULONG *puTextBufSize, LPWSTR pszText) { - FIXME("%p, %u, %p, %p\n", iface, uIndex, puTextBufSize, pszText); + FIXME("%p, %lu, %p, %p\n", iface, uIndex, puTextBufSize, pszText); return E_NOTIMPL; } @@ -1106,7 +1106,7 @@ static HRESULT WINAPI path_RemoveScope( IWbemPath *iface, ULONG uIndex) { - FIXME("%p, %u\n", iface, uIndex); + FIXME("%p, %lu\n", iface, uIndex); return E_NOTIMPL; } @@ -1192,7 +1192,7 @@ static HRESULT WINAPI path_CreateClassPart( LONG lFlags, LPCWSTR Name) { - FIXME("%p, 0x%x, %s\n", iface, lFlags, debugstr_w(Name)); + FIXME("%p, %#lx, %s\n", iface, lFlags, debugstr_w(Name)); return E_NOTIMPL; } @@ -1200,7 +1200,7 @@ static HRESULT WINAPI path_DeleteClassPart( IWbemPath *iface, LONG lFlags) { - FIXME("%p, 0x%x\n", iface, lFlags); + FIXME("%p, %#lx\n", iface, lFlags); return E_NOTIMPL; } @@ -1219,7 +1219,7 @@ static BOOL WINAPI path_IsRelativeOrChild( LPWSTR wszNamespace, LONG lFlags) { - FIXME("%p, %s, %s, 0x%x\n", iface, debugstr_w(wszMachine), debugstr_w(wszNamespace), lFlags); + FIXME("%p, %s, %s, %#lx\n", iface, debugstr_w(wszMachine), debugstr_w(wszNamespace), lFlags); return FALSE; } diff --git a/dlls/wmiutils/statuscode.c b/dlls/wmiutils/statuscode.c index 7137bf1c699..b9a3e71eb68 100644 --- a/dlls/wmiutils/statuscode.c +++ b/dlls/wmiutils/statuscode.c @@ -94,7 +94,7 @@ static HRESULT WINAPI status_code_GetErrorCodeText( { WCHAR msg[32]; - FIXME("%p, 0x%08x, 0x%04x, 0x%08x, %p\n", iface, res, lcid, flags, text); + FIXME("%p, %#lx, %#lx, %#lx, %p\n", iface, res, lcid, flags, text); swprintf(msg, ARRAY_SIZE(msg), L"Error code: 0x%08x", res); *text = SysAllocString(msg); @@ -110,7 +110,7 @@ static HRESULT WINAPI status_code_GetFacilityCodeText( { WCHAR msg[32]; - FIXME("%p, 0x%08x, 0x%04x, 0x%08x, %p\n", iface, res, lcid, flags, text); + FIXME("%p, %#lx, %#lx, %#lx, %p\n", iface, res, lcid, flags, text); swprintf(msg, ARRAY_SIZE(msg), L"Facility code: 0x%08x", res); *text = SysAllocString(msg); diff --git a/dlls/wmiutils/tests/Makefile.in b/dlls/wmiutils/tests/Makefile.in index 60135dcc0a1..3099d506bed 100644 --- a/dlls/wmiutils/tests/Makefile.in +++ b/dlls/wmiutils/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wmiutils.dll IMPORTS = ole32 diff --git a/dlls/wmiutils/tests/path.c b/dlls/wmiutils/tests/path.c index 0b5473c4d0d..879d86af32e 100644 --- a/dlls/wmiutils/tests/path.c +++ b/dlls/wmiutils/tests/path.c @@ -105,16 +105,16 @@ static void test_IWbemPath_SetText(void) if (!(path = create_path())) return; hr = IWbemPath_SetText( path, 0, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); for (i = 0; i < ARRAY_SIZE(test); i++) { hr = IWbemPath_SetText( path, test[i].mode, test[i].path ); todo_wine_if (test[i].todo) - ok( hr == test[i].ret, "%u got %08x\n", i, hr ); + ok( hr == test[i].ret, "%u got %#lx\n", i, hr ); if (test[i].ret == S_OK) { @@ -124,9 +124,9 @@ static void test_IWbemPath_SetText(void) memset( buf, 0x55, sizeof(buf) ); len = ARRAY_SIZE(buf); hr = IWbemPath_GetText( path, WBEMPATH_GET_ORIGINAL, &len, buf ); - ok( hr == S_OK, "%u got %08x\n", i, hr ); + ok( hr == S_OK, "%u got %#lx\n", i, hr ); ok( !lstrcmpW( buf, test[i].path ), "%u unexpected path %s\n", i, wine_dbgstr_w(buf) ); - ok( len == lstrlenW( test[i].path ) + 1, "%u unexpected length %u\n", i, len ); + ok( len == lstrlenW( test[i].path ) + 1, "%u unexpected length %lu\n", i, len ); } } IWbemPath_Release( path ); @@ -147,181 +147,181 @@ static void test_IWbemPath_GetText(void) if (!(path = create_path())) return; hr = IWbemPath_GetText( path, 0, NULL, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); len = ARRAY_SIZE(buf); hr = IWbemPath_GetText( path, 0, &len, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - ok( len == ARRAY_SIZE(buf), "unexpected length %u\n", len ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); + ok( len == ARRAY_SIZE(buf), "unexpected length %lu\n", len ); len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, 0, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !buf[0], "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == 1, "unexpected length %u\n", len ); + ok( len == 1, "unexpected length %lu\n", len ); hr = IWbemPath_GetText( path, WBEMPATH_GET_ORIGINAL, NULL, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); len = ARRAY_SIZE(buf); hr = IWbemPath_GetText( path, WBEMPATH_GET_ORIGINAL, &len, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - ok( len == ARRAY_SIZE(buf), "unexpected length %u\n", len ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); + ok( len == ARRAY_SIZE(buf), "unexpected length %lu\n", len ); len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_ORIGINAL, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !buf[0], "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == 1, "unexpected length %u\n", len ); + ok( len == 1, "unexpected length %lu\n", len ); len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_SERVER_TOO, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); todo_wine ok( !buf[0], "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - todo_wine ok( len == 1, "unexpected length %u\n", len ); + todo_wine ok( len == 1, "unexpected length %lu\n", len ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path8 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( count == 2, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( count == 2, "got %lu\n", count ); len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_SERVER_TOO, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, path9 ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( path9 ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( path9 ) + 1, "unexpected length %lu\n", len ); len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_SERVER_AND_NAMESPACE_ONLY, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, path13 ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( path13 ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( path13 ) + 1, "unexpected length %lu\n", len ); len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_RELATIVE_ONLY, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, path14 ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( path14 ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( path14 ) + 1, "unexpected length %lu\n", len ); len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_NAMESPACE_ONLY, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, path15 ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( path15 ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( path15 ) + 1, "unexpected length %lu\n", len ); len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, 0, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, path12 ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( path12 ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( path12 ) + 1, "unexpected length %lu\n", len ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !count, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !count, "got %lu\n", count ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path6 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( count == 2, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( count == 2, "got %lu\n", count ); len = 0; hr = IWbemPath_GetText( path, WBEMPATH_GET_SERVER_TOO, &len, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( len == lstrlenW( path16 ) + 1, "unexpected length %u\n", len ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( len == lstrlenW( path16 ) + 1, "unexpected length %lu\n", len ); len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_SERVER_TOO, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, path16 ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( path16 ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( path16 ) + 1, "unexpected length %lu\n", len ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_SERVER_TOO, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, path17 ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( path17 ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( path17 ) + 1, "unexpected length %lu\n", len ); len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, 0, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, expected1W ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( expected1W ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( expected1W ) + 1, "unexpected length %lu\n", len ); len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_RELATIVE_ONLY, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, expected2W ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( expected2W ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( expected2W ) + 1, "unexpected length %lu\n", len ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path15 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_SERVER_TOO, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, expected3W ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( expected3W ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( expected3W ) + 1, "unexpected length %lu\n", len ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path18 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path19 ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path20 ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); IWbemPath_Release( path ); if (!(path = create_path())) return; hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, serviceW ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_RELATIVE_ONLY, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, serviceW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( serviceW ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( serviceW ) + 1, "unexpected length %lu\n", len ); IWbemPath_Release( path ); if (!(path = create_path())) return; hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, classW ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); len = ARRAY_SIZE(buf); memset( buf, 0x55, sizeof(buf) ); hr = IWbemPath_GetText( path, WBEMPATH_GET_RELATIVE_ONLY, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, classW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( classW ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( classW ) + 1, "unexpected length %lu\n", len ); IWbemPath_Release( path ); } @@ -337,39 +337,39 @@ static void test_IWbemPath_GetClassName(void) if (!(path = create_path())) return; hr = IWbemPath_GetClassName( path, NULL, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); len = 0; hr = IWbemPath_GetClassName( path, &len, NULL ); - ok( hr == WBEM_E_INVALID_OBJECT_PATH, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_OBJECT_PATH, "got %#lx\n", hr ); len = ARRAY_SIZE(buf); hr = IWbemPath_GetClassName( path, &len, buf ); - ok( hr == WBEM_E_INVALID_OBJECT_PATH, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_OBJECT_PATH, "got %#lx\n", hr ); len = ARRAY_SIZE(buf); hr = IWbemPath_GetClassName( path, &len, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - ok( len == ARRAY_SIZE(buf), "unexpected length %u\n", len ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); + ok( len == ARRAY_SIZE(buf), "unexpected length %lu\n", len ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); len = 0; hr = IWbemPath_GetClassName( path, &len, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); len = ARRAY_SIZE(buf); hr = IWbemPath_GetClassName( path, &len, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - ok( len == ARRAY_SIZE(buf), "unexpected length %u\n", len ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); + ok( len == ARRAY_SIZE(buf), "unexpected length %lu\n", len ); buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetClassName( path, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, classW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( classW ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( classW ) + 1, "unexpected length %lu\n", len ); IWbemPath_Release( path ); } @@ -386,23 +386,23 @@ static void test_IWbemPath_SetClassName(void) if (!(path = create_path())) return; hr = IWbemPath_SetClassName( path, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); hr = IWbemPath_SetClassName( path, L"" ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWbemPath_SetClassName( path, classW ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetClassName( path, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, classW ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( flags == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_IS_CLASS_REF | WBEMPATH_INFO_HAS_SUBSCOPES | WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT), @@ -421,39 +421,39 @@ static void test_IWbemPath_GetServer(void) if (!(path = create_path())) return; hr = IWbemPath_GetServer( path, NULL, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); len = 0; hr = IWbemPath_GetServer( path, &len, NULL ); - ok( hr == WBEM_E_NOT_AVAILABLE, "got %08x\n", hr ); + ok( hr == WBEM_E_NOT_AVAILABLE, "got %#lx\n", hr ); len = ARRAY_SIZE(buf); hr = IWbemPath_GetServer( path, &len, buf ); - ok( hr == WBEM_E_NOT_AVAILABLE, "got %08x\n", hr ); + ok( hr == WBEM_E_NOT_AVAILABLE, "got %#lx\n", hr ); len = ARRAY_SIZE(buf); hr = IWbemPath_GetServer( path, &len, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - ok( len == ARRAY_SIZE(buf), "unexpected length %u\n", len ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); + ok( len == ARRAY_SIZE(buf), "unexpected length %lu\n", len ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); len = 0; hr = IWbemPath_GetServer( path, &len, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); len = ARRAY_SIZE(buf); hr = IWbemPath_GetServer( path, &len, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - ok( len == ARRAY_SIZE(buf), "unexpected length %u\n", len ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); + ok( len == ARRAY_SIZE(buf), "unexpected length %lu\n", len ); buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetServer( path, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, L"." ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW(L"." ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW(L"." ) + 1, "unexpected length %lu\n", len ); IWbemPath_Release( path ); } @@ -467,29 +467,29 @@ static void test_IWbemPath_GetInfo(void) if (!(path = create_path())) return; hr = IWbemPath_GetInfo( path, 0, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); hr = IWbemPath_GetInfo( path, 1, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); resp = 0xdeadbeef; hr = IWbemPath_GetInfo( path, 0, &resp ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( resp == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_SERVER_NAMESPACE_ONLY), "got %s\n", wine_dbgstr_longlong(resp) ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWbemPath_GetInfo( path, 0, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); hr = IWbemPath_GetInfo( path, 1, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); resp = 0xdeadbeef; hr = IWbemPath_GetInfo( path, 0, &resp ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( resp == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_IS_INST_REF | WBEMPATH_INFO_HAS_SUBSCOPES | WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT | WBEMPATH_INFO_PATH_HAD_SERVER), @@ -499,22 +499,22 @@ static void test_IWbemPath_GetInfo(void) if (!(path = create_path())) return; hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path12 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); resp = 0xdeadbeef; hr = IWbemPath_GetInfo( path, 0, &resp ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( resp == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_IS_CLASS_REF | WBEMPATH_INFO_HAS_SUBSCOPES | WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT), "got %s\n", wine_dbgstr_longlong(resp) ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path1 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); resp = 0xdeadbeef; hr = IWbemPath_GetInfo( path, 0, &resp ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( resp == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_SERVER_NAMESPACE_ONLY), "got %s\n", wine_dbgstr_longlong(resp) ); @@ -532,42 +532,42 @@ static void test_IWbemPath_SetServer(void) if (!(path = create_path())) return; hr = IWbemPath_SetServer( path, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); len = ARRAY_SIZE(buf); hr = IWbemPath_GetServer( path, &len, buf ); - ok( hr == WBEM_E_NOT_AVAILABLE, "got %08x\n", hr ); + ok( hr == WBEM_E_NOT_AVAILABLE, "got %#lx\n", hr ); hr = IWbemPath_SetServer( path, L"" ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWbemPath_SetServer( path, L"server" ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetServer( path, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, L"server" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( flags == (WBEMPATH_INFO_HAS_MACHINE_NAME | WBEMPATH_INFO_V1_COMPLIANT | WBEMPATH_INFO_V2_COMPLIANT | WBEMPATH_INFO_CIM_COMPLIANT | WBEMPATH_INFO_SERVER_NAMESPACE_ONLY | WBEMPATH_INFO_PATH_HAD_SERVER), "got %s\n", wine_dbgstr_longlong(flags) ); hr = IWbemPath_SetServer( path, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); len = ARRAY_SIZE(buf); hr = IWbemPath_GetServer( path, &len, buf ); - ok( hr == WBEM_E_NOT_AVAILABLE, "got %08x\n", hr ); + ok( hr == WBEM_E_NOT_AVAILABLE, "got %#lx\n", hr ); flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( flags == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_SERVER_NAMESPACE_ONLY), "got %s\n", wine_dbgstr_longlong(flags) ); @@ -584,46 +584,46 @@ static void test_IWbemPath_GetNamespaceAt(void) if (!(path = create_path())) return; hr = IWbemPath_GetNamespaceAt( path, 0, NULL, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); len = 0; hr = IWbemPath_GetNamespaceAt( path, 0, &len, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - ok( len == ARRAY_SIZE(buf), "unexpected length %u\n", len ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); + ok( len == ARRAY_SIZE(buf), "unexpected length %lu\n", len ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); len = 0; hr = IWbemPath_GetNamespaceAt( path, 2, &len, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - ok( len == ARRAY_SIZE(buf), "unexpected length %u\n", len ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); + ok( len == ARRAY_SIZE(buf), "unexpected length %lu\n", len ); buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, L"root" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( L"root" ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( L"root" ) + 1, "unexpected length %lu\n", len ); buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 1, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, L"cimv2" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( L"cimv2" ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( L"cimv2" ) + 1, "unexpected length %lu\n", len ); IWbemPath_Release( path ); } @@ -643,30 +643,30 @@ static void test_IWbemPath_RemoveAllNamespaces(void) if (!(path = create_path())) return; hr = IWbemPath_RemoveAllNamespaces( path ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( flags == expected_flags, "got %s\n", wine_dbgstr_longlong(flags) ); hr = IWbemPath_RemoveAllNamespaces( path ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( flags == expected_flags, "got %s\n", wine_dbgstr_longlong(flags) ); buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); IWbemPath_Release( path ); } @@ -686,61 +686,60 @@ static void test_IWbemPath_RemoveNamespaceAt(void) if (!(path = create_path())) return; hr = IWbemPath_RemoveNamespaceAt( path, 0 ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( flags == expected_flags, "got %s\n", wine_dbgstr_longlong(flags) ); count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( count == 2, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( count == 2, "got %lu\n", count ); hr = IWbemPath_RemoveNamespaceAt( path, 0 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( flags == expected_flags, "got %s\n", wine_dbgstr_longlong(flags) ); count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( count == 1, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( count == 1, "got %lu\n", count ); buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, L"cimv2" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( L"cimv2" ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( L"cimv2" ) + 1, "unexpected length %lu\n", len ); hr = IWbemPath_RemoveNamespaceAt( path, 0 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( flags == expected_flags, - "got %s\n", wine_dbgstr_longlong(flags) ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( flags == expected_flags, "got %s\n", wine_dbgstr_longlong(flags) ); count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !count, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !count, "got %lu\n", count ); buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); IWbemPath_Release( path ); } @@ -760,59 +759,57 @@ static void test_IWbemPath_SetNamespaceAt(void) if (!(path = create_path())) return; hr = IWbemPath_SetNamespaceAt( path, 0, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); hr = IWbemPath_SetNamespaceAt( path, 1, L"cimv2" ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); hr = IWbemPath_SetNamespaceAt( path, 0, L"cimv2" ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( count == 1, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( count == 1, "got %lu\n", count ); flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( flags == expected_flags, - "got %s\n", wine_dbgstr_longlong(flags) ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( flags == expected_flags, "got %s\n", wine_dbgstr_longlong(flags) ); buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, L"cimv2" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( L"cimv2" ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( L"cimv2" ) + 1, "unexpected length %lu\n", len ); hr = IWbemPath_SetNamespaceAt( path, 0, L"root" ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( flags == expected_flags, - "got %s\n", wine_dbgstr_longlong(flags) ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( flags == expected_flags, "got %s\n", wine_dbgstr_longlong(flags) ); count = 0xdeadbeef; hr = IWbemPath_GetNamespaceCount( path, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( count == 2, "got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( count == 2, "got %lu\n", count ); buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, L"root" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( L"root" ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( L"root" ) + 1, "unexpected length %lu\n", len ); buf[0] = 0; len = ARRAY_SIZE(buf); hr = IWbemPath_GetNamespaceAt( path, 1, &len, buf ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !lstrcmpW( buf, L"cimv2" ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); - ok( len == lstrlenW( L"cimv2" ) + 1, "unexpected length %u\n", len ); + ok( len == lstrlenW( L"cimv2" ) + 1, "unexpected length %lu\n", len ); IWbemPath_Release( path ); } -- 2.30.2

1 0

[PATCH 3/4] wbemdisp: Build without -DWINE_NO_LONG_TYPES.
by Hans Leidekker Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemdisp/Makefile.in | 1 - dlls/wbemdisp/locator.c | 104 ++++++++++---------- dlls/wbemdisp/tests/Makefile.in | 1 - dlls/wbemdisp/tests/wbemdisp.c | 163 ++++++++++++++++---------------- 4 files changed, 134 insertions(+), 135 deletions(-) diff --git a/dlls/wbemdisp/Makefile.in b/dlls/wbemdisp/Makefile.in index 88de6e935bd..682cee35391 100644 --- a/dlls/wbemdisp/Makefile.in +++ b/dlls/wbemdisp/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wbemdisp.dll IMPORTS = oleaut32 ole32 diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index ffd6debec4d..6966e7f356d 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -109,7 +109,7 @@ static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) hr = LoadRegTypeLib( &LIBID_WbemScripting, 1, 2, LOCALE_SYSTEM_DEFAULT, &typelib ); if (FAILED( hr )) { - ERR( "LoadRegTypeLib failed: %08x\n", hr ); + ERR( "LoadRegTypeLib failed: %#lx\n", hr ); return hr; } if (InterlockedCompareExchangePointer( (void **)&wbemdisp_typelib, typelib, NULL )) @@ -122,7 +122,7 @@ static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) hr = ITypeLib_GetTypeInfoOfGuid( wbemdisp_typelib, wbemdisp_tid_id[tid], &typeinfo ); if (FAILED( hr )) { - ERR( "GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(wbemdisp_tid_id[tid]), hr ); + ERR( "GetTypeInfoOfGuid(%s) failed: %#lx\n", debugstr_guid(wbemdisp_tid_id[tid]), hr ); return hr; } if (InterlockedCompareExchangePointer( (void **)(wbemdisp_typeinfo + tid), typeinfo, NULL )) @@ -199,7 +199,7 @@ static HRESULT WINAPI property_GetTypeInfo( ISWbemProperty *iface, UINT index, LCID lcid, ITypeInfo **info ) { struct property *property = impl_from_ISWbemProperty( iface ); - TRACE( "%p, %u, %u, %p\n", property, index, lcid, info ); + TRACE( "%p, %u, %#lx, %p\n", property, index, lcid, info ); return get_typeinfo( ISWbemProperty_tid, info ); } @@ -211,7 +211,7 @@ static HRESULT WINAPI property_GetIDsOfNames( ISWbemProperty *iface, REFIID riid ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %s, %p, %u, %u, %p\n", property, debugstr_guid(riid), names, count, lcid, dispid ); + TRACE( "%p, %s, %p, %u, %#lx, %p\n", property, debugstr_guid(riid), names, count, lcid, dispid ); if (!names || !count || !dispid) return E_INVALIDARG; @@ -232,7 +232,7 @@ static HRESULT WINAPI property_Invoke( ISWbemProperty *iface, DISPID member, REF ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", property, member, debugstr_guid(riid), + TRACE( "%p, %ld, %s, %#lx, %#x, %p, %p, %p, %p\n", property, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); hr = get_typeinfo( ISWbemProperty_tid, &typeinfo ); @@ -398,7 +398,7 @@ static HRESULT WINAPI propertyset_GetTypeInfo( ISWbemPropertySet *iface, UINT index, LCID lcid, ITypeInfo **info ) { struct propertyset *propertyset = impl_from_ISWbemPropertySet( iface ); - TRACE( "%p, %u, %u, %p\n", propertyset, index, lcid, info ); + TRACE( "%p, %u, %#lx, %p\n", propertyset, index, lcid, info ); return get_typeinfo( ISWbemPropertySet_tid, info ); } @@ -410,7 +410,7 @@ static HRESULT WINAPI propertyset_GetIDsOfNames( ISWbemPropertySet *iface, REFII ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %s, %p, %u, %u, %p\n", propertyset, debugstr_guid(riid), names, count, lcid, dispid ); + TRACE( "%p, %s, %p, %u, %#lx, %p\n", propertyset, debugstr_guid(riid), names, count, lcid, dispid ); if (!names || !count || !dispid) return E_INVALIDARG; @@ -431,7 +431,7 @@ static HRESULT WINAPI propertyset_Invoke( ISWbemPropertySet *iface, DISPID membe ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", propertyset, member, debugstr_guid(riid), + TRACE( "%p, %ld, %s, %#lx, %#x, %p, %p, %p, %p\n", propertyset, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); hr = get_typeinfo( ISWbemPropertySet_tid, &typeinfo ); @@ -457,7 +457,7 @@ static HRESULT WINAPI propertyset_Item( ISWbemPropertySet *iface, BSTR name, HRESULT hr; VARIANT var; - TRACE( "%p, %s, %08x, %p\n", propertyset, debugstr_w(name), flags, prop ); + TRACE( "%p, %s, %#lx, %p\n", propertyset, debugstr_w(name), flags, prop ); hr = IWbemClassObject_Get( propertyset->object, name, 0, &var, NULL, NULL ); if (SUCCEEDED(hr)) @@ -637,7 +637,7 @@ static HRESULT WINAPI method_GetTypeInfo( { struct method *method = impl_from_ISWbemMethod( iface ); - TRACE( "%p, %u, %u, %p\n", method, index, lcid, info ); + TRACE( "%p, %u, %#lx, %p\n", method, index, lcid, info ); return get_typeinfo( ISWbemMethod_tid, info ); } @@ -654,7 +654,7 @@ static HRESULT WINAPI method_GetIDsOfNames( ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %s, %p, %u, %u, %p\n", method, debugstr_guid(riid), names, count, lcid, dispid ); + TRACE( "%p, %s, %p, %u, %#lx, %p\n", method, debugstr_guid(riid), names, count, lcid, dispid ); if (!names || !count || !dispid) return E_INVALIDARG; @@ -682,7 +682,7 @@ static HRESULT WINAPI method_Invoke( ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", method, member, debugstr_guid(riid), + TRACE( "%p, %ld, %s, %#lx, %#x, %p, %p, %p, %p\n", method, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); hr = get_typeinfo( ISWbemMethod_tid, &typeinfo ); @@ -858,7 +858,7 @@ static HRESULT WINAPI methodset_GetTypeInfo( ISWbemMethodSet *iface, { struct methodset *set = impl_from_ISWbemMethodSet( iface ); - TRACE( "%p, %u, %u, %p\n", set, index, lcid, info ); + TRACE( "%p, %u, %#lx, %p\n", set, index, lcid, info ); return get_typeinfo( ISWbemMethodSet_tid, info ); } @@ -875,7 +875,7 @@ static HRESULT WINAPI methodset_GetIDsOfNames( ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %s, %p, %u, %u, %p\n", set, debugstr_guid(riid), names, count, lcid, dispid ); + TRACE( "%p, %s, %p, %u, %#lx, %p\n", set, debugstr_guid(riid), names, count, lcid, dispid ); if (!names || !count || !dispid) return E_INVALIDARG; @@ -903,7 +903,7 @@ static HRESULT WINAPI methodset_Invoke( ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", set, member, debugstr_guid(riid), + TRACE( "%p, %ld, %s, %#lx, %#x, %p, %p, %p, %p\n", set, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); hr = get_typeinfo( ISWbemMethodSet_tid, &typeinfo ); @@ -935,7 +935,7 @@ static HRESULT WINAPI methodset_Item( IWbemClassObject *in_sign, *out_sign; HRESULT hr; - TRACE("%p, %s, %#x, %p\n", set, debugstr_w(name), flags, method); + TRACE("%p, %s, %#lx, %p\n", set, debugstr_w(name), flags, method); *method = NULL; @@ -1069,7 +1069,7 @@ static HRESULT WINAPI object_GetTypeInfo( ITypeInfo **info ) { struct object *object = impl_from_ISWbemObject( iface ); - FIXME( "%p, %u, %u, %p\n", object, index, lcid, info ); + FIXME( "%p, %u, %#lx, %p\n", object, index, lcid, info ); return E_NOTIMPL; } @@ -1189,7 +1189,7 @@ static HRESULT WINAPI object_GetIDsOfNames( UINT i; ITypeInfo *typeinfo; - TRACE( "%p, %s, %p, %u, %u, %p\n", object, debugstr_guid(riid), names, count, lcid, dispid ); + TRACE( "%p, %s, %p, %u, %#lx, %p\n", object, debugstr_guid(riid), names, count, lcid, dispid ); if (!names || !count || !dispid) return E_INVALIDARG; @@ -1251,7 +1251,7 @@ static VARTYPE to_vartype( CIMTYPE type ) case CIM_REAL32: return VT_R4; default: - ERR("unhandled type %u\n", type); + ERR( "unhandled type %lu\n", type ); break; } return 0; @@ -1276,7 +1276,7 @@ static HRESULT WINAPI object_Invoke( CIMTYPE type; HRESULT hr; - TRACE( "%p, %x, %s, %u, %x, %p, %p, %p, %p\n", object, member, debugstr_guid(riid), + TRACE( "%p, %ld, %s, %#lx, %#x, %p, %p, %p, %p\n", object, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); if (member <= DISPID_BASE_METHOD) @@ -1318,7 +1318,7 @@ static HRESULT WINAPI object_Invoke( } else { - FIXME( "flags %x not supported\n", flags ); + FIXME( "flags %#x not supported\n", flags ); return E_NOTIMPL; } } @@ -1486,7 +1486,7 @@ static HRESULT WINAPI object_ExecMethod_( VARIANT path; HRESULT hr; - TRACE( "%p, %s, %p, %#x, %p, %p\n", object, debugstr_w(method), in_params, flags, valueset, out_params ); + TRACE( "%p, %s, %p, %#lx, %p, %p\n", object, debugstr_w(method), in_params, flags, valueset, out_params ); V_VT( &path ) = VT_EMPTY; hr = IWbemClassObject_Get( object->object, L"__PATH", 0, &path, NULL, NULL ); @@ -1536,7 +1536,7 @@ static HRESULT WINAPI object_GetObjectText_( { struct object *object = impl_from_ISWbemObject( iface ); - TRACE( "%p, %#x, %p\n", object, flags, text ); + TRACE( "%p, %#lx, %p\n", object, flags, text ); return IWbemClassObject_GetObjectText( object->object, flags, text ); } @@ -1769,7 +1769,7 @@ static HRESULT WINAPI objectset_GetTypeInfo( ITypeInfo **info ) { struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); - TRACE( "%p, %u, %u, %p\n", objectset, index, lcid, info ); + TRACE( "%p, %u, %#lx, %p\n", objectset, index, lcid, info ); return get_typeinfo( ISWbemObjectSet_tid, info ); } @@ -1786,7 +1786,7 @@ static HRESULT WINAPI objectset_GetIDsOfNames( ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %s, %p, %u, %u, %p\n", objectset, debugstr_guid(riid), names, count, lcid, dispid ); + TRACE( "%p, %s, %p, %u, %#lx, %p\n", objectset, debugstr_guid(riid), names, count, lcid, dispid ); if (!names || !count || !dispid) return E_INVALIDARG; @@ -1814,7 +1814,7 @@ static HRESULT WINAPI objectset_Invoke( ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", objectset, member, debugstr_guid(riid), + TRACE( "%p, %ld, %s, %#lx, %#x, %p, %p, %p, %p\n", objectset, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); hr = get_typeinfo( ISWbemObjectSet_tid, &typeinfo ); @@ -1886,7 +1886,7 @@ static HRESULT WINAPI objectset_ItemIndex( IEnumVARIANT *enum_var; VARIANT var; - TRACE( "%p, %d, %p\n", objectset, lIndex, objWbemObject ); + TRACE( "%p, %ld, %p\n", objectset, lIndex, objWbemObject ); *objWbemObject = NULL; hr = ISWbemObjectSet_get_Count( iface, &count ); @@ -2025,7 +2025,7 @@ static HRESULT WINAPI enumvar_Next( IEnumVARIANT *iface, ULONG celt, VARIANT *va IWbemClassObject *obj; ULONG count = 0; - TRACE( "%p, %u, %p, %p\n", iface, celt, var, fetched ); + TRACE( "%p, %lu, %p, %p\n", iface, celt, var, fetched ); if (celt) IEnumWbemClassObject_Next( enumvar->objectenum, WBEM_INFINITE, 1, &obj, &count ); if (count) @@ -2048,7 +2048,7 @@ static HRESULT WINAPI enumvar_Skip( IEnumVARIANT *iface, ULONG celt ) { struct enumvar *enumvar = impl_from_IEnumVARIANT( iface ); - TRACE( "%p, %u\n", iface, celt ); + TRACE( "%p, %lu\n", iface, celt ); return IEnumWbemClassObject_Skip( enumvar->objectenum, WBEM_INFINITE, celt ); } @@ -2166,7 +2166,7 @@ static HRESULT WINAPI services_GetTypeInfo( ITypeInfo **info ) { struct services *services = impl_from_ISWbemServices( iface ); - TRACE( "%p, %u, %u, %p\n", services, index, lcid, info ); + TRACE( "%p, %u, %#lx, %p\n", services, index, lcid, info ); return get_typeinfo( ISWbemServices_tid, info ); } @@ -2183,7 +2183,7 @@ static HRESULT WINAPI services_GetIDsOfNames( ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %s, %p, %u, %u, %p\n", services, debugstr_guid(riid), names, count, lcid, dispid ); + TRACE( "%p, %s, %p, %u, %#lx, %p\n", services, debugstr_guid(riid), names, count, lcid, dispid ); if (!names || !count || !dispid) return E_INVALIDARG; @@ -2211,7 +2211,7 @@ static HRESULT WINAPI services_Invoke( ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", services, member, debugstr_guid(riid), + TRACE( "%p, %ld, %s, %#lx, %#x, %p, %p, %p, %p\n", services, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); hr = get_typeinfo( ISWbemServices_tid, &typeinfo ); @@ -2235,7 +2235,7 @@ static HRESULT WINAPI services_Get( IWbemClassObject *obj; HRESULT hr; - TRACE( "%p, %s, %d, %p, %p\n", iface, debugstr_w(strObjectPath), iFlags, objWbemNamedValueSet, + TRACE( "%p, %s, %#lx, %p, %p\n", iface, debugstr_w(strObjectPath), iFlags, objWbemNamedValueSet, objWbemObject ); if (objWbemNamedValueSet) FIXME( "ignoring context\n" ); @@ -2303,7 +2303,7 @@ static HRESULT WINAPI services_InstancesOf( BSTR query, wql = SysAllocString( L"WQL" ); HRESULT hr; - TRACE( "%p, %s, %x, %p, %p\n", iface, debugstr_w(strClass), iFlags, objWbemNamedValueSet, + TRACE( "%p, %s, %#lx, %p, %p\n", iface, debugstr_w(strClass), iFlags, objWbemNamedValueSet, objWbemObjectSet ); if (!(query = build_query_string( strClass ))) @@ -2364,7 +2364,7 @@ static HRESULT WINAPI services_ExecQuery( IEnumWbemClassObject *iter; HRESULT hr; - TRACE( "%p, %s, %s, %x, %p, %p\n", iface, debugstr_w(strQuery), debugstr_w(strQueryLanguage), + TRACE( "%p, %s, %s, %#lx, %p, %p\n", iface, debugstr_w(strQuery), debugstr_w(strQueryLanguage), iFlags, objWbemNamedValueSet, objWbemObjectSet ); if (objWbemNamedValueSet) FIXME( "ignoring context\n" ); @@ -2502,7 +2502,7 @@ static HRESULT WINAPI services_ExecMethod( IWbemContext *context; HRESULT hr; - TRACE( "%p, %s, %s, %p, %#x, %p, %p\n", services, debugstr_w(path), debugstr_w(method), in_sparams, + TRACE( "%p, %s, %s, %p, %#lx, %p, %p\n", services, debugstr_w(path), debugstr_w(method), in_sparams, flags, valueset, out_sparams ); in_params = unsafe_object_impl_from_IDispatch( in_sparams ); @@ -2671,7 +2671,7 @@ static HRESULT WINAPI locator_GetTypeInfo( ITypeInfo **info ) { struct locator *locator = impl_from_ISWbemLocator( iface ); - TRACE( "%p, %u, %u, %p\n", locator, index, lcid, info ); + TRACE( "%p, %u, %#lx, %p\n", locator, index, lcid, info ); return get_typeinfo( ISWbemLocator_tid, info ); } @@ -2688,7 +2688,7 @@ static HRESULT WINAPI locator_GetIDsOfNames( ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %s, %p, %u, %u, %p\n", locator, debugstr_guid(riid), names, count, lcid, dispid ); + TRACE( "%p, %s, %p, %u, %#lx, %p\n", locator, debugstr_guid(riid), names, count, lcid, dispid ); if (!names || !count || !dispid) return E_INVALIDARG; @@ -2716,7 +2716,7 @@ static HRESULT WINAPI locator_Invoke( ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", locator, member, debugstr_guid(riid), + TRACE( "%p, %ld, %s, %#lx, %#x, %p, %p, %p, %p\n", locator, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); hr = get_typeinfo( ISWbemLocator_tid, &typeinfo ); @@ -2771,7 +2771,7 @@ static HRESULT WINAPI locator_ConnectServer( BSTR resource; HRESULT hr; - TRACE( "%p, %s, %s, %s, %p, %s, %s, 0x%08x, %p, %p\n", iface, debugstr_w(strServer), + TRACE( "%p, %s, %s, %s, %p, %s, %s, %#lx, %p, %p\n", iface, debugstr_w(strServer), debugstr_w(strNamespace), debugstr_w(strUser), strPassword, debugstr_w(strLocale), debugstr_w(strAuthority), iSecurityFlags, objWbemNamedValueSet, objWbemServices ); @@ -2910,7 +2910,7 @@ static HRESULT WINAPI security_GetTypeInfo( ITypeInfo **info ) { struct security *security = impl_from_ISWbemSecurity( iface ); - TRACE( "%p, %u, %u, %p\n", security, index, lcid, info ); + TRACE( "%p, %u, %#lx, %p\n", security, index, lcid, info ); return get_typeinfo( ISWbemSecurity_tid, info ); } @@ -2927,7 +2927,7 @@ static HRESULT WINAPI security_GetIDsOfNames( ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %s, %p, %u, %u, %p\n", security, debugstr_guid(riid), names, count, lcid, dispid ); + TRACE( "%p, %s, %p, %u, %#lx, %p\n", security, debugstr_guid(riid), names, count, lcid, dispid ); if (!names || !count || !dispid) return E_INVALIDARG; @@ -2955,7 +2955,7 @@ static HRESULT WINAPI security_Invoke( ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", security, member, debugstr_guid(riid), + TRACE( "%p, %ld, %s, %#lx, %#x, %p, %p, %p, %p\n", security, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); hr = get_typeinfo( ISWbemSecurity_tid, &typeinfo ); @@ -3143,7 +3143,7 @@ static HRESULT WINAPI namedvalue_GetTypeInfo( { struct namedvalue *value = impl_from_ISWbemNamedValue( iface ); - TRACE( "%p, %u, %u, %p\n", value, index, lcid, info ); + TRACE( "%p, %u, %#lx, %p\n", value, index, lcid, info ); return get_typeinfo( ISWbemNamedValue_tid, info ); } @@ -3160,7 +3160,7 @@ static HRESULT WINAPI namedvalue_GetIDsOfNames( ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %s, %p, %u, %u, %p\n", value, debugstr_guid(riid), names, count, lcid, dispid ); + TRACE( "%p, %s, %p, %u, %#lx, %p\n", value, debugstr_guid(riid), names, count, lcid, dispid ); if (!names || !count || !dispid) return E_INVALIDARG; @@ -3188,7 +3188,7 @@ static HRESULT WINAPI namedvalue_Invoke( ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", set, member, debugstr_guid(riid), + TRACE( "%p, %ld, %s, %#lx, %#x, %p, %p, %p, %p\n", set, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); hr = get_typeinfo( ISWbemNamedValue_tid, &typeinfo ); @@ -3321,7 +3321,7 @@ static HRESULT WINAPI namedvalueset_GetTypeInfo( { struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); - TRACE( "%p, %u, %u, %p\n", set, index, lcid, info ); + TRACE( "%p, %u, %#lx, %p\n", set, index, lcid, info ); return get_typeinfo( ISWbemNamedValueSet_tid, info ); } @@ -3338,7 +3338,7 @@ static HRESULT WINAPI namedvalueset_GetIDsOfNames( ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %s, %p, %u, %u, %p\n", set, debugstr_guid(riid), names, count, lcid, dispid ); + TRACE( "%p, %s, %p, %u, %#lx, %p\n", set, debugstr_guid(riid), names, count, lcid, dispid ); if (!names || !count || !dispid) return E_INVALIDARG; @@ -3366,7 +3366,7 @@ static HRESULT WINAPI namedvalueset_Invoke( ITypeInfo *typeinfo; HRESULT hr; - TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", set, member, debugstr_guid(riid), + TRACE( "%p, %ld, %s, %#lx, %#x, %p, %p, %p, %p\n", set, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); hr = get_typeinfo( ISWbemNamedValueSet_tid, &typeinfo ); @@ -3398,7 +3398,7 @@ static HRESULT WINAPI namedvalueset_Item( VARIANT var; HRESULT hr; - TRACE("%p, %s, %#x, %p\n", set, debugstr_w(name), flags, value); + TRACE("%p, %s, %#lx, %p\n", set, debugstr_w(name), flags, value); if (SUCCEEDED(hr = IWbemContext_GetValue( set->context, name, flags, &var ))) { @@ -3428,7 +3428,7 @@ static HRESULT WINAPI namedvalueset_Add( struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); HRESULT hr; - TRACE("%p, %s, %s, %#x, %p\n", set, debugstr_w(name), debugstr_variant(var), flags, value); + TRACE("%p, %s, %s, %#lx, %p\n", set, debugstr_w(name), debugstr_variant(var), flags, value); if (!name || !var || !value) return WBEM_E_INVALID_PARAMETER; @@ -3448,7 +3448,7 @@ static HRESULT WINAPI namedvalueset_Remove( { struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); - TRACE("%p, %s, %#x\n", set, debugstr_w(name), flags); + TRACE("%p, %s, %#lx\n", set, debugstr_w(name), flags); return IWbemContext_DeleteValue( set->context, name, flags ); } diff --git a/dlls/wbemdisp/tests/Makefile.in b/dlls/wbemdisp/tests/Makefile.in index 0a8d63bddb5..f509d374f24 100644 --- a/dlls/wbemdisp/tests/Makefile.in +++ b/dlls/wbemdisp/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wbemdisp.dll IMPORTS = oleaut32 ole32 diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index 4ce847fac84..187cb8d9e80 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -56,7 +56,8 @@ static void test_ParseDisplayName(void) IMoniker *moniker; IUnknown *obj; BSTR str; - ULONG i, eaten, count; + ULONG i, eaten; + UINT count; HRESULT hr; CLSID clsid; @@ -68,7 +69,7 @@ static void test_ParseDisplayName(void) } hr = CreateBindCtx( 0, &ctx ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (i =0; i < ARRAY_SIZE( tests ); i++) { @@ -77,17 +78,17 @@ static void test_ParseDisplayName(void) moniker = NULL; hr = IParseDisplayName_ParseDisplayName( displayname, NULL, str, &eaten, &moniker ); SysFreeString( str ); - ok( hr == tests[i].hr, "%u: got %x\n", i, hr ); - ok( eaten == tests[i].eaten, "%u: got %u\n", i, eaten ); + ok( hr == tests[i].hr, "%lu: got %#lx\n", i, hr ); + ok( eaten == tests[i].eaten, "%lu: got %lu\n", i, eaten ); if (moniker) { hr = IMoniker_GetClassID( moniker, &clsid ); - ok( hr == S_OK, "%u: got %x\n", i, hr ); - ok( IsEqualCLSID( &clsid, &CLSID_PointerMoniker ), "%u: got %s\n", i, wine_dbgstr_guid( &clsid ) ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); + ok( IsEqualCLSID( &clsid, &CLSID_PointerMoniker ), "%lu: got %s\n", i, wine_dbgstr_guid( &clsid ) ); obj = NULL; hr = IMoniker_BindToObject( moniker, ctx, NULL, tests[i].iid, (void **)&obj ); - ok( hr == S_OK, "%u: got %x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); if (obj) IUnknown_Release( obj ); IMoniker_Release( moniker ); } @@ -98,18 +99,18 @@ static void test_ParseDisplayName(void) moniker = NULL; hr = IParseDisplayName_ParseDisplayName( displayname, NULL, str, &eaten, &moniker ); SysFreeString( str ); - ok( hr == S_OK, "got %x\n", hr ); - ok( eaten == lstrlenW(name1), "got %u\n", eaten ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( eaten == lstrlenW(name1), "got %lu\n", eaten ); if (moniker) { ISWbemServices *services = NULL; hr = IMoniker_GetClassID( moniker, &clsid ); - ok( hr == S_OK, "%u: got %x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); ok( IsEqualCLSID( &clsid, &CLSID_PointerMoniker ), "got %s\n", wine_dbgstr_guid( &clsid ) ); hr = IMoniker_BindToObject( moniker, ctx, NULL, &IID_IUnknown, (void **)&services ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (services) { ISWbemObjectSet *objectset = NULL; @@ -117,17 +118,17 @@ static void test_ParseDisplayName(void) str = SysAllocString( L"Win32_Bios" ); hr = ISWbemServices_InstancesOf( services, str, 0, NULL, &objectset ); SysFreeString( str ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (objectset) { hr = ISWbemObjectSet_get__NewEnum( objectset, &obj ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (obj) { IEnumVARIANT *enumvar = NULL; hr = IUnknown_QueryInterface( obj, &IID_IEnumVARIANT, (void **)&enumvar ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (enumvar) { @@ -140,51 +141,51 @@ static void test_ParseDisplayName(void) fetched = 0xdeadbeef; hr = IEnumVARIANT_Next( enumvar, 0, &var, &fetched ); - ok( hr == S_OK, "got %x\n", hr ); - ok( !fetched, "got %u\n", fetched ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( !fetched, "got %lu\n", fetched ); fetched = 0xdeadbeef; V_VT( &var ) = VT_ERROR; V_ERROR( &var ) = 0xdeadbeef; hr = IEnumVARIANT_Next( enumvar, 1, &var, &fetched ); - ok( hr == S_OK, "got %x\n", hr ); - ok( fetched == 1, "got %u\n", fetched ); - ok( V_VT( &var ) == VT_DISPATCH, "got %u\n", V_VT( &var ) ); - ok( V_DISPATCH( &var ) != (IDispatch *)0xdeadbeef, "got %u\n", V_VT( &var ) ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( fetched == 1, "got %lu\n", fetched ); + ok( V_VT( &var ) == VT_DISPATCH, "got %#x\n", V_VT( &var ) ); + ok( V_DISPATCH( &var ) != (IDispatch *)0xdeadbeef, "got %#x\n", V_VT( &var ) ); dispatch = V_DISPATCH( &var ); count = 0; hr = IDispatch_GetTypeInfoCount( dispatch, &count ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( count == 1, "got %u\n", count ); str = SysAllocString( L"Manufacturer" ); dispid = 0xdeadbeef; hr = IDispatch_GetIDsOfNames( dispatch, &IID_NULL, &str, 1, english, &dispid ); SysFreeString( str ); - ok( hr == S_OK, "got %x\n", hr ); - ok( dispid == 0x1800001 || dispid == 0x10b /* win2k */, "got %x\n", dispid ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( dispid == 0x1800001 || dispid == 0x10b /* win2k */, "got %#lx\n", dispid ); str = SysAllocString( L"version" ); dispid = 0xdeadbeef; hr = IDispatch_GetIDsOfNames( dispatch, &IID_NULL, &str, 1, english, &dispid ); SysFreeString( str ); - ok( hr == S_OK, "got %x\n", hr ); - ok( dispid == 0x1800002 || dispid == 0x119 /* win2k */, "got %x\n", dispid ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( dispid == 0x1800002 || dispid == 0x119 /* win2k */, "got %#lx\n", dispid ); str = SysAllocString( L"NoSuch" ); dispid = 0xdeadbeef; hr = IDispatch_GetIDsOfNames( dispatch, &IID_NULL, &str, 1, english, &dispid ); SysFreeString( str ); - ok( hr == DISP_E_UNKNOWNNAME, "got %x\n", hr ); - ok( dispid == DISPID_UNKNOWN, "got %x\n", dispid ); + ok( hr == DISP_E_UNKNOWNNAME, "got %#lx\n", hr ); + ok( dispid == DISPID_UNKNOWN, "got %#lx\n", dispid ); str = SysAllocString( L"Manufacturer" ); dispid = 0xdeadbeef; hr = IDispatch_GetIDsOfNames( dispatch, &IID_NULL, &str, 1, english, &dispid ); SysFreeString( str ); - ok( hr == S_OK, "got %x\n", hr ); - ok( dispid == 0x1800001 || dispid == 0x10b /* win2k */, "got %x\n", dispid ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( dispid == 0x1800001 || dispid == 0x10b /* win2k */, "got %#lx\n", dispid ); if (dispid == 0x1800001) /* crashes on win2k */ { @@ -197,7 +198,7 @@ static void test_ParseDisplayName(void) hr = IDispatch_Invoke( dispatch, DISPID_UNKNOWN, &IID_NULL, english, DISPATCH_METHOD|DISPATCH_PROPERTYGET, &params, &res, NULL, &arg_err ); - ok( hr == DISP_E_MEMBERNOTFOUND || hr == S_OK /* winxp */, "got %x\n", hr ); + ok( hr == DISP_E_MEMBERNOTFOUND || hr == S_OK /* winxp */, "got %#lx\n", hr ); ok( params.rgvarg == (VARIANTARG *)0xdeadbeef, "got %p\n", params.rgvarg ); ok( params.rgdispidNamedArgs == (DISPID *)0xdeadbeef, "got %p\n", params.rgdispidNamedArgs ); ok( params.cArgs == 0xdeadbeef, "got %u\n", params.cArgs ); @@ -214,7 +215,7 @@ static void test_ParseDisplayName(void) hr = IDispatch_Invoke( dispatch, dispid, &IID_NULL, english, DISPATCH_METHOD|DISPATCH_PROPERTYGET, &params, &res, NULL, NULL ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( params.rgvarg == NULL, "got %p\n", params.rgvarg ); ok( params.rgdispidNamedArgs == NULL, "got %p\n", params.rgdispidNamedArgs ); ok( !params.cArgs, "got %u\n", params.cArgs ); @@ -226,8 +227,8 @@ static void test_ParseDisplayName(void) fetched = 0xdeadbeef; hr = IEnumVARIANT_Next( enumvar, 1, &var, &fetched ); - ok( hr == S_FALSE, "got %x\n", hr ); - ok( !fetched, "got %u\n", fetched ); + ok( hr == S_FALSE, "got %#lx\n", hr ); + ok( !fetched, "got %lu\n", fetched ); IEnumVARIANT_Release( enumvar ); } @@ -243,11 +244,11 @@ static void test_ParseDisplayName(void) IBindCtx_Release( ctx ); hr = CreateBindCtx( 0, &ctx ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); str = SysAllocString( L"winmgmts:\\\\.\\root\\default:StdRegProv" ); hr = IParseDisplayName_ParseDisplayName( displayname, NULL, str, &eaten, &moniker ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( str ); if (moniker) @@ -255,19 +256,19 @@ static void test_ParseDisplayName(void) ISWbemObject *sobj = NULL; hr = IMoniker_GetClassID( moniker, &clsid ); - ok( hr == S_OK, "%u: got %x\n", i, hr ); + ok( hr == S_OK, "%lu: got %#lx\n", i, hr ); ok( IsEqualCLSID( &clsid, &CLSID_PointerMoniker ), "got %s\n", wine_dbgstr_guid( &clsid ) ); hr = IMoniker_BindToObject( moniker, ctx, NULL, &IID_ISWbemObject, (void **)&sobj ); - ok( hr == S_OK, "got %x\n",hr ); + ok( hr == S_OK, "got %#lx\n",hr ); if (sobj) { DISPID dispid = 0xdeadbeef; str = SysAllocString( L"GetStringValue" ); hr = ISWbemObject_GetIDsOfNames( sobj, &IID_NULL, &str, 1, english, &dispid ); - ok( hr == S_OK, "got %x\n", hr ); - ok( dispid == 0x1000001, "got %x\n", dispid ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( dispid == 0x1000001, "got %#lx\n", dispid ); ISWbemObject_Release( sobj ); SysFreeString( str ); @@ -285,7 +286,7 @@ static void _expect_ref(IUnknown* obj, ULONG ref, int line) ULONG rc; IUnknown_AddRef(obj); rc = IUnknown_Release(obj); - ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); + ok_(__FILE__,line)(rc == ref, "expected refcount %ld, got %lu\n", ref, rc); } static void test_locator(void) @@ -307,12 +308,12 @@ static void test_locator(void) WbemAuthenticationLevelEnum auth_level; hr = CoCreateInstance( &CLSID_SWbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_ISWbemLocator, (void **)&locator ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); host_bstr = SysAllocString( L"localhost" ); root_bstr = SysAllocString( L"root\\CIMV2" ); hr = ISWbemLocator_ConnectServer( locator, host_bstr, root_bstr, NULL, NULL, NULL, NULL, 0, NULL, &services); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( root_bstr ); SysFreeString( host_bstr ); @@ -320,87 +321,87 @@ static void test_locator(void) query_bstr = SysAllocString( L"Select ProcessorId from Win32_Processor" ); lang_bstr = SysAllocString( L"WQL" ); hr = ISWbemServices_ExecQuery( services, query_bstr, lang_bstr, wbemFlagForwardOnly, NULL, &object_set); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( lang_bstr ); SysFreeString( query_bstr ); EXPECT_REF( services, 2 ); hr = ISWbemLocator_get_Security_( locator, &security ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); imp_level = 0xdeadbeef; hr = ISWbemSecurity_get_ImpersonationLevel( security, &imp_level ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( imp_level == wbemImpersonationLevelImpersonate, "got %u\n", imp_level ); hr = ISWbemSecurity_put_ImpersonationLevel( security, wbemImpersonationLevelAnonymous ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); imp_level = 0xdeadbeef; hr = ISWbemSecurity_get_ImpersonationLevel( security, &imp_level ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( imp_level == wbemImpersonationLevelAnonymous, "got %u\n", imp_level ); auth_level = 0xdeadbeef; hr = ISWbemSecurity_get_AuthenticationLevel( security, &auth_level ); todo_wine { - ok( hr == WBEM_E_FAILED, "got %x\n", hr ); + ok( hr == WBEM_E_FAILED, "got %#lx\n", hr ); ok( auth_level == 0xdeadbeef, "got %u\n", auth_level ); } hr = ISWbemSecurity_put_AuthenticationLevel( security, wbemAuthenticationLevelNone ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); auth_level = 0xdeadbeef; hr = ISWbemSecurity_get_AuthenticationLevel( security, &auth_level ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( auth_level == wbemAuthenticationLevelNone, "got %u\n", auth_level ); ISWbemSecurity_Release( security ); security = NULL; hr = ISWbemObjectSet_get__NewEnum( object_set, (IUnknown**)&enum_var ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); VariantInit( &var ); hr = IEnumVARIANT_Next( enum_var, 1, &var, NULL ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( V_VT(&var) == VT_DISPATCH, "got %x\n", V_VT(&var)); props_bstr = SysAllocString( L"Properties_" ); hr = IDispatch_GetIDsOfNames( V_DISPATCH(&var), &IID_NULL, &props_bstr, 1, english, &id ); - ok( hr == S_OK, "got %x\n", hr ); - ok( id == 21, "got %d\n", id ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( id == 21, "got %ld\n", id ); hr = IDispatch_QueryInterface( V_DISPATCH(&var), &IID_ISWbemObject, (void**)&object ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); VariantClear( &var ); hr = ISWbemObject_get_Properties_( object, &prop_set ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = ISWbemPropertySet_Item( prop_set, props_bstr, 0, &prop ); - ok( hr == WBEM_E_NOT_FOUND, "got %x\n", hr ); + ok( hr == WBEM_E_NOT_FOUND, "got %#lx\n", hr ); SysFreeString( props_bstr ); procid_bstr = SysAllocString( L"ProcessorId" ); hr = ISWbemPropertySet_Item( prop_set, procid_bstr, 0, &prop ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( procid_bstr ); count = 0; hr = ISWbemPropertySet_get_Count( prop_set, &count ); - ok( hr == S_OK, "got %x\n", hr ); - ok( count > 0, "got %d\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( count > 0, "got %lu\n", count ); hr = ISWbemProperty_get_Value( prop, &var ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( V_VT(&var) == VT_BSTR, "got %x\n", V_VT(&var) ); VariantClear( &var ); hr = ISWbemServices_get_Security_( services, &security ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); imp_level = 0xdeadbeef; hr = ISWbemSecurity_get_ImpersonationLevel( security, &imp_level ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( imp_level == wbemImpersonationLevelImpersonate, "got %u\n", imp_level ); auth_level = 0xdeadbeef; hr = ISWbemSecurity_get_AuthenticationLevel( security, &auth_level ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( auth_level == wbemAuthenticationLevelPktPrivacy, "got %u\n", auth_level ); ISWbemSecurity_Release(security); @@ -424,33 +425,33 @@ static void test_namedvalueset(void) LONG count; hr = CoCreateInstance( &CLSID_SWbemNamedValueSet, NULL, CLSCTX_INPROC_SERVER, &IID_ISWbemNamedValueSet, (void **)&set ); - ok( hr == S_OK, "got %x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); name = SysAllocString( L"name" ); V_VT(&var) = VT_I4; V_I4(&var) = 10; hr = ISWbemNamedValueSet_Add( set, name, &var, 0, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "Unexpected hr %#x.\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "Unexpected hr %#lx.\n", hr ); hr = ISWbemNamedValueSet_Add( set, name, &var, 0, &value ); - ok( hr == S_OK, "Unexpected hr %#x.\n", hr ); + ok( hr == S_OK, "Unexpected hr %#lx.\n", hr ); /* New instance is returned, referencing same entry. */ hr = ISWbemNamedValueSet_Item( set, name, 0, &value2 ); - ok( hr == S_OK, "Unexpected hr %#x.\n", hr ); + ok( hr == S_OK, "Unexpected hr %#lx.\n", hr ); ok( value != value2, "Unexpected value instance.\n" ); V_I4(&var) = 20; hr = ISWbemNamedValue_put_Value( value2, &var ); todo_wine - ok( hr == S_OK, "Unexpected hr %#x.\n", hr ); + ok( hr == S_OK, "Unexpected hr %#lx.\n", hr ); V_I4(&var) = 0; hr = ISWbemNamedValue_get_Value( value, &var ); todo_wine { - ok( hr == S_OK, "Unexpected hr %#x.\n", hr ); - ok( V_I4(&var) == 20, "Unexpected value %d.\n", V_I4(&var) ); + ok( hr == S_OK, "Unexpected hr %#lx.\n", hr ); + ok( V_I4(&var) == 20, "Unexpected value %ld.\n", V_I4(&var) ); } ISWbemNamedValue_Release( value ); ISWbemNamedValue_Release( value2 ); @@ -460,39 +461,39 @@ todo_wine { /* Embedded nulls in names */ name = SysAllocStringLen(nameW, ARRAY_SIZE(nameW)); hr = ISWbemNamedValueSet_Item( set, name, 0, &value ); - ok( hr == S_OK, "Unexpected hr %#x.\n", hr ); + ok( hr == S_OK, "Unexpected hr %#lx.\n", hr ); ISWbemNamedValue_Release( value ); V_I4(&var) = 11; hr = ISWbemNamedValueSet_Add( set, name, &var, 0, &value ); - ok( hr == S_OK, "Unexpected hr %#x.\n", hr ); + ok( hr == S_OK, "Unexpected hr %#lx.\n", hr ); count = 0; hr = ISWbemNamedValueSet_get_Count( set, &count ); todo_wine { - ok( hr == S_OK, "Unexpected hr %#x.\n", hr ); - ok( count == 1, "Unexpected count %d.\n", count ); + ok( hr == S_OK, "Unexpected hr %#lx.\n", hr ); + ok( count == 1, "Unexpected count %ld.\n", count ); } hr = ISWbemNamedValueSet_DeleteAll( set ); todo_wine - ok( hr == S_OK, "Unexpected hr %#x.\n", hr ); + ok( hr == S_OK, "Unexpected hr %#lx.\n", hr ); count = 1; hr = ISWbemNamedValueSet_get_Count( set, &count ); todo_wine { - ok( hr == S_OK, "Unexpected hr %#x.\n", hr ); - ok( count == 0, "Unexpected count %d.\n", count ); + ok( hr == S_OK, "Unexpected hr %#lx.\n", hr ); + ok( count == 0, "Unexpected count %ld.\n", count ); } V_I4(&var) = 20; hr = ISWbemNamedValue_put_Value( value, &var ); todo_wine - ok( hr == S_OK, "Unexpected hr %#x.\n", hr ); + ok( hr == S_OK, "Unexpected hr %#lx.\n", hr ); count = 0; hr = ISWbemNamedValueSet_get_Count( set, &count ); todo_wine { - ok( hr == S_OK, "Unexpected hr %#x.\n", hr ); - ok( count == 1, "Unexpected count %d.\n", count ); + ok( hr == S_OK, "Unexpected hr %#lx.\n", hr ); + ok( count == 1, "Unexpected count %ld.\n", count ); } ISWbemNamedValue_Release( value ); SysFreeString( name ); -- 2.30.2

1 0

[PATCH 2/4] wbemprox/tests: Build without -DWINE_NO_LONG_TYPES.
by Hans Leidekker Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/tests/Makefile.in | 1 - dlls/wbemprox/tests/query.c | 538 ++++++++++++++++---------------- dlls/wbemprox/tests/services.c | 78 +++-- 3 files changed, 307 insertions(+), 310 deletions(-) diff --git a/dlls/wbemprox/tests/Makefile.in b/dlls/wbemprox/tests/Makefile.in index 92a15b6c8e9..565edd0a289 100644 --- a/dlls/wbemprox/tests/Makefile.in +++ b/dlls/wbemprox/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wbemprox.dll IMPORTS = uuid oleaut32 ole32 user32 advapi32 diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 954d39d244b..0a8c97ad166 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -60,10 +60,10 @@ static HRESULT exec_query( IWbemServices *services, const WCHAR *str, IEnumWbemC } hr = IWbemClassObject_GetQualifierSet( obj, &qualifiers ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWbemQualifierSet_GetNames( qualifiers, 0, &names ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SafeArrayDestroy( names ); IWbemQualifierSet_Release( qualifiers ); @@ -103,29 +103,29 @@ static void test_select( IWbemServices *services ) UINT i; hr = IWbemServices_ExecQuery( services, NULL, NULL, 0, NULL, &result ); - ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %#lx\n", hr ); hr = IWbemServices_ExecQuery( services, NULL, query, 0, NULL, &result ); - ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %#lx\n", hr ); hr = IWbemServices_ExecQuery( services, wql, NULL, 0, NULL, &result ); - ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %#lx\n", hr ); hr = IWbemServices_ExecQuery( services, sql, query, 0, NULL, &result ); - ok( hr == WBEM_E_INVALID_QUERY_TYPE, "query failed %08x\n", hr ); + ok( hr == WBEM_E_INVALID_QUERY_TYPE, "query failed %#lx\n", hr ); hr = IWbemServices_ExecQuery( services, sql, NULL, 0, NULL, &result ); - ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %#lx\n", hr ); SysFreeString( query ); query = SysAllocString( L"" ); hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %#lx\n", hr ); for (i = 0; i < ARRAY_SIZE( test ); i++) { hr = exec_query( services, test[i], &result ); - ok( hr == S_OK, "query %u failed: %08x\n", i, hr ); + ok( hr == S_OK, "query %u failed: %#lx\n", i, hr ); if (result) IEnumWbemClassObject_Release( result ); } @@ -153,7 +153,7 @@ static void test_associators( IWbemServices *services ) for (i = 0; i < ARRAY_SIZE( test ); i++) { hr = exec_query( services, test[i], &result ); - ok( hr == S_OK, "query %u failed: %08x\n", i, hr ); + ok( hr == S_OK, "query %u failed: %#lx\n", i, hr ); if (result) IEnumWbemClassObject_Release( result ); } } @@ -168,20 +168,20 @@ static void test_IEnumWbemClassObject_Next( IWbemServices *services ) int i; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); count = 2; hr = IEnumWbemClassObject_Next( result, 10000, 1, NULL, &count ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); - ok( count == 2, "expected 0, got %u\n", count ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); + ok( count == 2, "expected 0, got %lu\n", count ); hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj1, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); count = 2; hr = IEnumWbemClassObject_Next( result, 10000, 0, &obj1, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( count == 0, "expected 0, got %u\n", count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( count == 0, "expected 0, got %lu\n", count ); for (;;) { @@ -192,25 +192,25 @@ static void test_IEnumWbemClassObject_Next( IWbemServices *services ) } hr = IEnumWbemClassObject_Reset( result ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); obj = malloc( num_objects * sizeof( IWbemClassObject * ) ); count = 0; hr = IEnumWbemClassObject_Next( result, 10000, num_objects, obj, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( count == num_objects, "expected %u, got %u\n", num_objects, count ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( count == num_objects, "expected %lu, got %lu\n", num_objects, count ); for (i = 0; i < count; i++) IWbemClassObject_Release( obj[i] ); hr = IEnumWbemClassObject_Reset( result ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); count = 0; hr = IEnumWbemClassObject_Next( result, 10000, num_objects + 1, obj, &count ); - ok( hr == S_FALSE, "got %08x\n", hr ); - ok( count == num_objects, "expected %u, got %u\n", num_objects, count ); + ok( hr == S_FALSE, "got %#lx\n", hr ); + ok( count == num_objects, "expected %lu, got %lu\n", num_objects, count ); for (i = 0; i < count; i++) IWbemClassObject_Release( obj[i] ); @@ -230,9 +230,9 @@ static void _check_property( ULONG line, IWbemClassObject *obj, const WCHAR *pro VariantInit( &val ); hr = IWbemClassObject_Get( obj, prop, 0, &val, &type, NULL ); - ok( hr == S_OK, "%u: failed to get description %08x\n", line, hr ); - ok( V_VT( &val ) == vartype, "%u: unexpected variant type 0x%x\n", line, V_VT(&val) ); - ok( type == cimtype, "%u: unexpected type 0x%x\n", line, type ); + ok( hr == S_OK, "%lu: failed to get description %#lx\n", line, hr ); + ok( V_VT( &val ) == vartype, "%lu: unexpected variant type 0x%x\n", line, V_VT(&val) ); + ok( type == cimtype, "%lu: unexpected type %#lx\n", line, type ); switch (V_VT(&val)) { case VT_BSTR: @@ -242,7 +242,7 @@ static void _check_property( ULONG line, IWbemClassObject *obj, const WCHAR *pro trace( "%s: %d\n", wine_dbgstr_w(prop), V_I2(&val) ); break; case VT_I4: - trace( "%s: %d\n", wine_dbgstr_w(prop), V_I4(&val) ); + trace( "%s: %ld\n", wine_dbgstr_w(prop), V_I4(&val) ); break; case VT_R4: trace( "%s: %f\n", wine_dbgstr_w(prop), V_R4(&val) ); @@ -278,45 +278,45 @@ static void test_Win32_Service( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &state ); hr = IWbemClassObject_Get( service, L"State", 0, &state, &type, NULL ); - ok( hr == S_OK, "failed to get service state %08x\n", hr ); + ok( hr == S_OK, "failed to get service state %#lx\n", hr ); ok( V_VT( &state ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &state ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + ok( type == CIM_STRING, "unexpected type %#lx\n", type ); if (!lstrcmpW( V_BSTR( &state ), L"Stopped" )) { out = NULL; method = SysAllocString( L"StartService" ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, NULL, &out, NULL ); - ok( hr == S_OK, "failed to execute method %08x\n", hr ); + ok( hr == S_OK, "failed to execute method %#lx\n", hr ); SysFreeString( method ); VariantInit( &retval ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, NULL, NULL ); - ok( hr == S_OK, "failed to get return value %08x\n", hr ); - ok( !V_I4( &retval ), "unexpected error %u\n", V_UI4( &retval ) ); + ok( hr == S_OK, "failed to get return value %#lx\n", hr ); + ok( !V_I4( &retval ), "unexpected error %lu\n", V_UI4( &retval ) ); IWbemClassObject_Release( out ); } out = NULL; method = SysAllocString( L"PauseService" ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, NULL, &out, NULL ); - ok( hr == S_OK, "failed to execute method %08x\n", hr ); + ok( hr == S_OK, "failed to execute method %#lx\n", hr ); SysFreeString( method ); VariantInit( &retval ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, NULL, NULL ); - ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( hr == S_OK, "failed to get return value %#lx\n", hr ); ok( V_I4( &retval ), "unexpected success\n" ); IWbemClassObject_Release( out ); out = NULL; method = SysAllocString( L"ResumeService" ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, NULL, &out, NULL ); - ok( hr == S_OK, "failed to execute method %08x\n", hr ); + ok( hr == S_OK, "failed to execute method %#lx\n", hr ); SysFreeString( method ); VariantInit( &retval ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, NULL, NULL ); - ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( hr == S_OK, "failed to get return value %#lx\n", hr ); ok( V_I4( &retval ), "unexpected success\n" ); IWbemClassObject_Release( out ); @@ -325,13 +325,13 @@ static void test_Win32_Service( IWbemServices *services ) out = NULL; method = SysAllocString( L"StopService" ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, NULL, &out, NULL ); - ok( hr == S_OK, "failed to execute method %08x\n", hr ); + ok( hr == S_OK, "failed to execute method %#lx\n", hr ); SysFreeString( method ); VariantInit( &retval ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, NULL, NULL ); - ok( hr == S_OK, "failed to get return value %08x\n", hr ); - ok( !V_I4( &retval ), "unexpected error %u\n", V_UI4( &retval ) ); + ok( hr == S_OK, "failed to get return value %#lx\n", hr ); + ok( !V_I4( &retval ), "unexpected error %lu\n", V_UI4( &retval ) ); IWbemClassObject_Release( out ); } VariantClear( &state ); @@ -339,20 +339,20 @@ static void test_Win32_Service( IWbemServices *services ) service = NULL; hr = IWbemServices_GetObject( services, NULL, 0, NULL, &service, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !!service, "expected non-NULL service\n" ); VariantInit(&classvar); V_VT(&classvar) = VT_BSTR; V_BSTR(&classvar) = SysAllocString(L"MyClass"); hr = IWbemClassObject_Put(service, L"__CLASS", 0, &classvar, 0); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); VariantClear(&classvar); IWbemClassObject_Release( service ); service = NULL; hr = IWbemServices_GetObject( services, empty, 0, NULL, &service, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !!service, "expected non-NULL service\n" ); IWbemClassObject_Release( service ); @@ -362,7 +362,7 @@ static void test_Win32_Service( IWbemServices *services ) class = SysAllocString( L"Win32_Service.Name=\"nonexistent\"" ); service = (IWbemClassObject *)0xdeadbeef; hr = IWbemServices_GetObject( services, class, 0, NULL, &service, NULL ); - ok( hr == WBEM_E_NOT_FOUND, "got %#08x\n", hr ); + ok( hr == WBEM_E_NOT_FOUND, "got %#lx\n", hr ); ok( service == NULL, "expected NULL service, got %p\n", service ); SysFreeString( class ); } @@ -378,10 +378,10 @@ static void test_Win32_Bios( IWbemServices *services ) HRESULT hr; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK, "IWbemServices_ExecQuery failed %08x\n", hr ); + ok( hr == S_OK, "IWbemServices_ExecQuery failed %#lx\n", hr ); hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); - ok( hr == S_OK, "IEnumWbemClassObject_Next failed %08x\n", hr ); + ok( hr == S_OK, "IEnumWbemClassObject_Next failed %#lx\n", hr ); check_property( obj, L"Description", VT_BSTR, CIM_STRING ); check_property( obj, L"IdentificationCode", VT_NULL, CIM_STRING ); @@ -392,10 +392,10 @@ static void test_Win32_Bios( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, L"SerialNumber", 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get serial number %08x\n", hr ); + ok( hr == S_OK, "failed to get serial number %#lx\n", hr ); ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL /* Testbot VMs */, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + ok( type == CIM_STRING, "unexpected type %#lx\n", type ); VariantClear( &val ); check_property( obj, L"SMBIOSBIOSVersion", VT_BSTR, CIM_STRING ); @@ -420,7 +420,7 @@ static void test_Win32_Baseboard( IWbemServices *services ) HRESULT hr; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK, "IWbemServices_ExecQuery failed %08x\n", hr ); + ok( hr == S_OK, "IWbemServices_ExecQuery failed %#lx\n", hr ); hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); if (hr != S_OK) @@ -428,16 +428,16 @@ static void test_Win32_Baseboard( IWbemServices *services ) win_skip( "Win32_Baseboard not available\n" ); return; } - ok( hr == S_OK, "IEnumWbemClassObject_Next failed %08x\n", hr ); + ok( hr == S_OK, "IEnumWbemClassObject_Next failed %#lx\n", hr ); check_property( obj, L"Manufacturer", VT_BSTR, CIM_STRING ); type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, L"Model", 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get model %08x\n", hr ); + ok( hr == S_OK, "failed to get model %#lx\n", hr ); ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + ok( type == CIM_STRING, "unexpected type %#lx\n", type ); trace( "model: %s\n", wine_dbgstr_w(V_BSTR(&val)) ); VariantClear( &val ); @@ -498,15 +498,15 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) } names = NULL; hr = IWbemClassObject_GetNames( process, NULL, 0, NULL, &names ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( names != NULL, "names not set\n" ); hr = SafeArrayGetUBound( names, 1, &bound ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (i = 0; i <= bound; i++) { BSTR str; hr = SafeArrayGetElement( names, &i, &str ); - ok( hr == S_OK, "%d: got %08x\n", i, hr ); + ok( hr == S_OK, "%ld: got %#lx\n", i, hr ); SysFreeString( str ); } SafeArrayDestroy( names ); @@ -514,116 +514,116 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) sig_in = (void *)0xdeadbeef; sig_out = (void *)0xdeadbeef; hr = IWbemClassObject_GetMethod( process, L"unknown", 0, &sig_in, &sig_out ); - ok( hr == WBEM_E_NOT_FOUND, "Got unexpected hr %#x\n", hr ); + ok( hr == WBEM_E_NOT_FOUND, "Got unexpected hr %#lx\n", hr ); ok( !sig_in, "Got unexpected sig_in %p.\n", sig_in ); ok( !sig_out, "Got unexpected sig_out %p.\n", sig_out ); sig_in = (void *)0xdeadbeef; sig_out = (void *)0xdeadbeef; hr = IWbemClassObject_GetMethod( process, L"Create", 0, &sig_in, &sig_out ); - ok( hr == S_OK, "Got unexpected hr %#x\n", hr ); + ok( hr == S_OK, "Got unexpected hr %#lx\n", hr ); ok( !!sig_in, "Got unexpected sig_in %p.\n", sig_in ); ok( !!sig_out, "Got unexpected sig_out %p.\n", sig_out ); hr = IWbemClassObject_SpawnInstance( sig_in, 0, &params ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); out = NULL; class = SysAllocString( L"Win32_Process" ); method = SysAllocString( L"Create" ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, params, &out, NULL ); - ok( hr == S_OK, "failed to execute method %08x\n", hr ); + ok( hr == S_OK, "failed to execute method %#lx\n", hr ); SysFreeString( method ); SysFreeString( class ); VariantInit( &retval ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, &type, NULL ); - ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( hr == S_OK, "failed to get return value %#lx\n", hr ); ok( V_VT( &retval ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &retval ) ); - ok( V_I4( &retval ) == 21, "unexpected error %u\n", V_I4( &retval ) ); + ok( V_I4( &retval ) == 21, "unexpected error %ld\n", V_I4( &retval ) ); IWbemClassObject_Release( out ); V_VT( &val ) = VT_BSTR; V_BSTR( &val ) = SysAllocString( L"unknown" ); hr = IWbemClassObject_Put( params, L"CommandLine", 0, &val, 0 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); VariantClear( &val ); out = NULL; class = SysAllocString( L"Win32_Process" ); method = SysAllocString( L"Create" ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, params, &out, NULL ); - ok( hr == S_OK, "failed to execute method %08x\n", hr ); + ok( hr == S_OK, "failed to execute method %#lx\n", hr ); SysFreeString( method ); SysFreeString( class ); VariantInit( &retval ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, &type, NULL ); - ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( hr == S_OK, "failed to get return value %#lx\n", hr ); ok( V_VT( &retval ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &retval ) ); - ok( V_I4( &retval ) == 9, "unexpected error %u\n", V_I4( &retval ) ); + ok( V_I4( &retval ) == 9, "unexpected error %ld\n", V_I4( &retval ) ); VariantInit( &retval ); V_VT( &retval ) = VT_I4; hr = IWbemClassObject_Get( out, L"ProcessId", 0, &retval, &type, NULL ); - ok( hr == S_OK, "failed to get return value %08x\n", hr ); - todo_wine ok( V_VT( &retval ) == VT_NULL && type == CIM_UINT32, "unexpected variant type 0x%x, type %u\n", + ok( hr == S_OK, "failed to get return value %#lx\n", hr ); + todo_wine ok( V_VT( &retval ) == VT_NULL && type == CIM_UINT32, "unexpected variant type %#x, type %lu\n", V_VT( &retval ), type ); IWbemClassObject_Release( out ); ret = GetModuleFileNameW( NULL, cmdlineW, MAX_PATH + 1 ); - ok( ret < MAX_PATH + 1, "Got unexpected ret %u.\n", ret ); + ok( ret < MAX_PATH + 1, "got unexpected ret %lu\n", ret ); lstrcatW( cmdlineW, L" query created_process"); V_VT( &val ) = VT_BSTR; V_BSTR( &val ) = SysAllocString( cmdlineW ); hr = IWbemClassObject_Put( params, L"CommandLine", 0, &val, 0 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); VariantClear( &val ); out = NULL; class = SysAllocString( L"Win32_Process" ); method = SysAllocString( L"Create" ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, params, &out, NULL ); - ok( hr == S_OK, "failed to execute method %08x\n", hr ); + ok( hr == S_OK, "failed to execute method %#lx\n", hr ); SysFreeString( method ); SysFreeString( class ); VariantInit( &retval ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, &type, NULL ); - ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( hr == S_OK, "failed to get return value %#lx\n", hr ); ok( V_VT( &retval ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &retval ) ); - ok( !V_I4( &retval ), "unexpected error %u\n", V_I4( &retval ) ); + ok( !V_I4( &retval ), "unexpected error %ld\n", V_I4( &retval ) ); VariantInit( &retval ); V_VT( &retval ) = VT_I4; hr = IWbemClassObject_Get( out, L"ProcessId", 0, &retval, &type, NULL ); - ok( hr == S_OK, "failed to get return value %08x\n", hr ); - ok( V_VT( &retval ) == VT_I4 && type == CIM_UINT32, "unexpected variant type 0x%x, type %u\n", + ok( hr == S_OK, "failed to get return value %#lx\n", hr ); + ok( V_VT( &retval ) == VT_I4 && type == CIM_UINT32, "unexpected variant type %#x, type %lu\n", V_VT( &retval ), type ); ok( !!V_UI4( &retval ), "unexpected zero pid\n" ); IWbemClassObject_Release( out ); h = OpenProcess( SYNCHRONIZE, FALSE, V_UI4( &retval )); - ok( !!h, "failed to open process %#x.\n", V_UI4( &retval )); + ok( !!h, "failed to open process %#lx\n", V_UI4( &retval )); ret = WaitForSingleObject( h, INFINITE ); - ok( ret == WAIT_OBJECT_0, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError() ); + ok( ret == WAIT_OBJECT_0, "got unexpected ret %lu, GetLastError() %lu\n", ret, GetLastError() ); CloseHandle( h ); refcount = IWbemClassObject_Release( params ); - ok( !refcount, "Got unexpected refcount %u.\n", refcount ); + ok( !refcount, "got unexpected refcount %lu\n", refcount ); refcount = IWbemClassObject_Release( sig_in ); - ok( !refcount, "Got unexpected refcount %u.\n", refcount ); + ok( !refcount, "got unexpected refcount %lu\n", refcount ); refcount = IWbemClassObject_Release( sig_out ); - ok( !refcount, "Got unexpected refcount %u.\n", refcount ); + ok( !refcount, "got unexpected refcount %lu\n", refcount ); sig_in = (void*)0xdeadbeef; hr = IWbemClassObject_GetMethod( process, L"getowner", 0, &sig_in, NULL ); - ok( hr == S_OK, "failed to get GetOwner method %08x\n", hr ); + ok( hr == S_OK, "failed to get GetOwner method %#lx\n", hr ); ok( !sig_in, "sig_in != NULL\n"); IWbemClassObject_Release( process ); @@ -633,54 +633,54 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) memcpy( class, full_path, full_path_len * sizeof(WCHAR) ); wsprintfW( class + full_path_len, L"Win32_Process.Handle=\"%u\"", GetCurrentProcessId() ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, NULL, &out, NULL ); - ok( hr == S_OK, "failed to execute method %08x\n", hr ); + ok( hr == S_OK, "failed to execute method %#lx\n", hr ); SysFreeString( method ); SysFreeString( class ); type = 0xdeadbeef; VariantInit( &retval ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, &type, NULL ); - ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( hr == S_OK, "failed to get return value %#lx\n", hr ); ok( V_VT( &retval ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &retval ) ); - ok( !V_I4( &retval ), "unexpected error %u\n", V_I4( &retval ) ); - ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); + ok( !V_I4( &retval ), "unexpected error %ld\n", V_I4( &retval ) ); + ok( type == CIM_UINT32, "unexpected type %#lx\n", type ); check_property( out, L"User", VT_BSTR, CIM_STRING ); check_property( out, L"Domain", VT_BSTR, CIM_STRING ); hr = IWbemClassObject_GetPropertyQualifierSet( out, L"User", &qualifiers ); - ok( hr == S_OK, "failed to get qualifier set %08x\n", hr ); + ok( hr == S_OK, "failed to get qualifier set %#lx\n", hr ); flavor = -1; V_I4(&val) = -1; V_VT(&val) = VT_ERROR; hr = IWbemQualifierSet_Get( qualifiers, L"ID", 0, &val, &flavor ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( flavor == expected_flavor, "got %d\n", flavor ); - ok( V_VT(&val) == VT_I4, "got %u\n", V_VT(&val) ); - ok( V_I4(&val) == 0, "got %u\n", V_I4(&val) ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( flavor == expected_flavor, "got %ld\n", flavor ); + ok( V_VT(&val) == VT_I4, "got %#x\n", V_VT(&val) ); + ok( V_I4(&val) == 0, "got %ld\n", V_I4(&val) ); VariantClear( &val ); IWbemQualifierSet_Release( qualifiers ); hr = IWbemClassObject_GetPropertyQualifierSet( out, L"Domain", &qualifiers ); - ok( hr == S_OK, "failed to get qualifier set %08x\n", hr ); + ok( hr == S_OK, "failed to get qualifier set %#lx\n", hr ); flavor = -1; V_I4(&val) = -1; V_VT(&val) = VT_ERROR; hr = IWbemQualifierSet_Get( qualifiers, L"ID", 0, &val, &flavor ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( flavor == expected_flavor, "got %d\n", flavor ); - ok( V_VT(&val) == VT_I4, "got %u\n", V_VT(&val) ); - ok( V_I4(&val) == 1, "got %u\n", V_I4(&val) ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( flavor == expected_flavor, "got %ld\n", flavor ); + ok( V_VT(&val) == VT_I4, "got %#x\n", V_VT(&val) ); + ok( V_I4(&val) == 1, "got %ld\n", V_I4(&val) ); VariantClear( &val ); IWbemQualifierSet_Release( qualifiers ); hr = IWbemClassObject_GetPropertyQualifierSet( out, L"ReturnValue", &qualifiers ); - ok( hr == S_OK, "failed to get qualifier set %08x\n", hr ); + ok( hr == S_OK, "failed to get qualifier set %#lx\n", hr ); hr = IWbemQualifierSet_Get( qualifiers, L"ID", 0, &val, &flavor ); - ok( hr == WBEM_E_NOT_FOUND, "got %08x\n", hr ); + ok( hr == WBEM_E_NOT_FOUND, "got %#lx\n", hr ); IWbemQualifierSet_Release( qualifiers ); IWbemClassObject_Release( out ); @@ -722,33 +722,33 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) } hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); type = 0xdeadbeef; VariantInit( &value ); hr = IWbemClassObject_Get( obj, L"MemoryType", 0, &value, &type, NULL ); - ok( hr == WBEM_E_NOT_FOUND, "got %08x\n", hr ); + ok( hr == WBEM_E_NOT_FOUND, "got %#lx\n", hr ); check_property( obj, L"Model", VT_BSTR, CIM_STRING ); type = 0xdeadbeef; VariantInit( &value ); hr = IWbemClassObject_Get( obj, L"Name", 0, &value, &type, NULL ); - ok( hr == S_OK, "failed to get computer name %08x\n", hr ); + ok( hr == S_OK, "failed to get computer name %#lx\n", hr ); ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + ok( type == CIM_STRING, "unexpected type %#lx\n", type ); ok( !lstrcmpiW( V_BSTR( &value ), compname ), "got %s, expected %s\n", wine_dbgstr_w(V_BSTR(&value)), wine_dbgstr_w(compname) ); VariantClear( &value ); type = 0xdeadbeef; VariantInit( &value ); hr = IWbemClassObject_Get( obj, L"NumberOfLogicalProcessors", 0, &value, &type, NULL ); - ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND) /* win2k3 */, "got %08x\n", hr ); + ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND) /* win2k3 */, "got %#lx\n", hr ); if (hr == S_OK) { - ok( V_VT( &value ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &value ) ); - ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); - trace( "numlogicalprocessors %u\n", V_I4( &value ) ); + ok( V_VT( &value ) == VT_I4, "unexpected variant type %#x\n", V_VT( &value ) ); + ok( type == CIM_UINT32, "unexpected type %#lx\n", type ); + trace( "numlogicalprocessors %ld\n", V_I4( &value ) ); } check_property( obj, L"NumberOfProcessors", VT_I4, CIM_UINT32 ); @@ -756,9 +756,9 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &value ); hr = IWbemClassObject_Get( obj, L"UserName", 0, &value, &type, NULL ); - ok( hr == S_OK, "failed to get computer name %08x\n", hr ); + ok( hr == S_OK, "failed to get computer name %#lx\n", hr ); ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + ok( type == CIM_STRING, "unexpected type %#lx\n", type ); ok( !lstrcmpiW( V_BSTR( &value ), username ), "got %s, expected %s\n", wine_dbgstr_w(V_BSTR(&value)), wine_dbgstr_w(username) ); VariantClear( &value ); @@ -781,36 +781,36 @@ static void test_Win32_SystemEnclosure( IWbemServices *services ) HRESULT hr; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK, "IWbemServices_ExecQuery failed %08x\n", hr ); + ok( hr == S_OK, "IWbemServices_ExecQuery failed %#lx\n", hr ); hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); - ok( hr == S_OK, "IEnumWbemClassObject_Next failed %08x\n", hr ); + ok( hr == S_OK, "IEnumWbemClassObject_Next failed %#lx\n", hr ); check_property( obj, L"Caption", VT_BSTR, CIM_STRING ); type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, L"ChassisTypes", 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get chassis types %08x\n", hr ); - ok( V_VT( &val ) == (VT_I4|VT_ARRAY), "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == (CIM_UINT16|CIM_FLAG_ARRAY), "unexpected type 0x%x\n", type ); + ok( hr == S_OK, "failed to get chassis types %#lx\n", hr ); + ok( V_VT( &val ) == (VT_I4|VT_ARRAY), "unexpected variant type %#x\n", V_VT( &val ) ); + ok( type == (CIM_UINT16|CIM_FLAG_ARRAY), "unexpected type %#lx\n", type ); hr = SafeArrayAccessData( V_ARRAY( &val ), (void **)&data ); - ok( hr == S_OK, "SafeArrayAccessData failed %x\n", hr ); + ok( hr == S_OK, "SafeArrayAccessData failed %#lx\n", hr ); if (SUCCEEDED(hr)) { LONG i, lower, upper; hr = SafeArrayGetLBound( V_ARRAY( &val ), 1, &lower ); - ok( hr == S_OK, "SafeArrayGetLBound failed %x\n", hr ); + ok( hr == S_OK, "SafeArrayGetLBound failed %#lx\n", hr ); hr = SafeArrayGetUBound( V_ARRAY( &val ), 1, &upper ); - ok( hr == S_OK, "SafeArrayGetUBound failed %x\n", hr ); + ok( hr == S_OK, "SafeArrayGetUBound failed %#lx\n", hr ); if (V_VT( &val ) == (VT_I4|VT_ARRAY)) { for (i = 0; i < upper - lower + 1; i++) - trace( "chassis type: %u\n", data[i] ); + trace( "chassis type: %lu\n", data[i] ); } hr = SafeArrayUnaccessData( V_ARRAY( &val ) ); - ok( hr == S_OK, "SafeArrayUnaccessData failed %x\n", hr ); + ok( hr == S_OK, "SafeArrayUnaccessData failed %#lx\n", hr ); } VariantClear( &val ); @@ -843,7 +843,7 @@ static void test_StdRegProv( IWbemServices *services ) } hr = IWbemClassObject_BeginMethodEnumeration( reg, 0 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); while (IWbemClassObject_NextMethod( reg, 0, &name, &sig_in, &sig_out ) == S_OK) { @@ -853,59 +853,59 @@ static void test_StdRegProv( IWbemServices *services ) } hr = IWbemClassObject_EndMethodEnumeration( reg ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWbemClassObject_BeginEnumeration( reg, 0 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); while (IWbemClassObject_Next( reg, 0, &name, NULL, NULL, NULL ) == S_OK) SysFreeString( name ); hr = IWbemClassObject_EndEnumeration( reg ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWbemClassObject_GetMethod( reg, L"CreateKey", 0, &sig_in, NULL ); - ok( hr == S_OK, "failed to get CreateKey method %08x\n", hr ); + ok( hr == S_OK, "failed to get CreateKey method %#lx\n", hr ); hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); - ok( hr == S_OK, "failed to spawn instance %08x\n", hr ); + ok( hr == S_OK, "failed to spawn instance %#lx\n", hr ); hr = IWbemClassObject_BeginEnumeration( in, 0 ); - ok( hr == S_OK, "failed to start enumeration %08x\n", hr ); + ok( hr == S_OK, "failed to start enumeration %#lx\n", hr ); hr = IWbemClassObject_Next( in, 0, &name, NULL, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( name ); hr = IWbemClassObject_EndEnumeration( in ); - ok( hr == S_OK, "failed to end enumeration %08x\n", hr ); + ok( hr == S_OK, "failed to end enumeration %#lx\n", hr ); V_VT( &defkey ) = VT_I4; V_I4( &defkey ) = 0x80000001; hr = IWbemClassObject_Put( in, L"hDefKey", 0, &defkey, 0 ); - ok( hr == S_OK, "failed to set root %08x\n", hr ); + ok( hr == S_OK, "failed to set root %#lx\n", hr ); V_VT( &subkey ) = VT_BSTR; V_BSTR( &subkey ) = SysAllocString( L"Software\\StdRegProvTest" ); hr = IWbemClassObject_Put( in, L"sSubKeyName", 0, &subkey, 0 ); - ok( hr == S_OK, "failed to set subkey %08x\n", hr ); + ok( hr == S_OK, "failed to set subkey %#lx\n", hr ); out = NULL; method = SysAllocString( L"CreateKey" ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); - ok( hr == S_OK, "failed to execute method %08x\n", hr ); + ok( hr == S_OK, "failed to execute method %#lx\n", hr ); SysFreeString( method ); type = 0xdeadbeef; VariantInit( &retval ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, &type, NULL ); - ok( hr == S_OK, "failed to get return value %08x\n", hr ); - ok( V_VT( &retval ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &retval ) ); - ok( !V_I4( &retval ), "unexpected error %u\n", V_UI4( &retval ) ); - ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); + ok( hr == S_OK, "failed to get return value %#lx\n", hr ); + ok( V_VT( &retval ) == VT_I4, "unexpected variant type %#x\n", V_VT( &retval ) ); + ok( !V_I4( &retval ), "unexpected error %ld\n", V_UI4( &retval ) ); + ok( type == CIM_UINT32, "unexpected type %#lx\n", type ); res = RegDeleteKeyW( HKEY_CURRENT_USER, L"Software\\StdRegProvTest" ); - ok( !res, "got %d\n", res ); + ok( !res, "got %ld\n", res ); VariantClear( &subkey ); IWbemClassObject_Release( in ); @@ -913,34 +913,34 @@ static void test_StdRegProv( IWbemServices *services ) IWbemClassObject_Release( sig_in ); hr = IWbemClassObject_GetMethod( reg, L"EnumKey", 0, &sig_in, NULL ); - ok( hr == S_OK, "failed to get EnumKey method %08x\n", hr ); + ok( hr == S_OK, "failed to get EnumKey method %#lx\n", hr ); hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); - ok( hr == S_OK, "failed to spawn instance %08x\n", hr ); + ok( hr == S_OK, "failed to spawn instance %#lx\n", hr ); V_VT( &defkey ) = VT_I4; V_I4( &defkey ) = 0x80000002; hr = IWbemClassObject_Put( in, L"hDefKey", 0, &defkey, 0 ); - ok( hr == S_OK, "failed to set root %08x\n", hr ); + ok( hr == S_OK, "failed to set root %#lx\n", hr ); V_VT( &subkey ) = VT_BSTR; V_BSTR( &subkey ) = SysAllocString( L"Software\\microsoft\\Windows\\CurrentVersion" ); hr = IWbemClassObject_Put( in, L"sSubKeyName", 0, &subkey, 0 ); - ok( hr == S_OK, "failed to set subkey %08x\n", hr ); + ok( hr == S_OK, "failed to set subkey %#lx\n", hr ); out = NULL; method = SysAllocString( L"EnumKey" ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); - ok( hr == S_OK, "failed to execute method %08x\n", hr ); + ok( hr == S_OK, "failed to execute method %#lx\n", hr ); SysFreeString( method ); type = 0xdeadbeef; VariantInit( &retval ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, &type, NULL ); - ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( hr == S_OK, "failed to get return value %#lx\n", hr ); ok( V_VT( &retval ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &retval ) ); - ok( !V_I4( &retval ), "unexpected error %u\n", V_UI4( &retval ) ); - ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); + ok( !V_I4( &retval ), "unexpected error %lu\n", V_UI4( &retval ) ); + ok( type == CIM_UINT32, "unexpected type %#lx\n", type ); check_property( out, L"sNames", VT_BSTR|VT_ARRAY, CIM_STRING|CIM_FLAG_ARRAY ); @@ -950,34 +950,34 @@ static void test_StdRegProv( IWbemServices *services ) IWbemClassObject_Release( sig_in ); hr = IWbemClassObject_GetMethod( reg, L"EnumValues", 0, &sig_in, NULL ); - ok( hr == S_OK, "failed to get EnumValues method %08x\n", hr ); + ok( hr == S_OK, "failed to get EnumValues method %#lx\n", hr ); hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); - ok( hr == S_OK, "failed to spawn instance %08x\n", hr ); + ok( hr == S_OK, "failed to spawn instance %#lx\n", hr ); V_VT( &defkey ) = VT_I4; V_I4( &defkey ) = 0x80000002; hr = IWbemClassObject_Put( in, L"hDefKey", 0, &defkey, 0 ); - ok( hr == S_OK, "failed to set root %08x\n", hr ); + ok( hr == S_OK, "failed to set root %#lx\n", hr ); V_VT( &subkey ) = VT_BSTR; V_BSTR( &subkey ) = SysAllocString( L"Software\\microsoft\\Windows\\CurrentVersion" ); hr = IWbemClassObject_Put( in, L"sSubKeyName", 0, &subkey, 0 ); - ok( hr == S_OK, "failed to set subkey %08x\n", hr ); + ok( hr == S_OK, "failed to set subkey %#lx\n", hr ); out = NULL; method = SysAllocString( L"EnumValues" ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); - ok( hr == S_OK, "failed to execute method %08x\n", hr ); + ok( hr == S_OK, "failed to execute method %#lx\n", hr ); SysFreeString( method ); type = 0xdeadbeef; VariantInit( &retval ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, &type, NULL ); - ok( hr == S_OK, "failed to get return value %08x\n", hr ); - ok( V_VT( &retval ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &retval ) ); - ok( !V_I4( &retval ), "unexpected error %u\n", V_I4( &retval ) ); - ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); + ok( hr == S_OK, "failed to get return value %#lx\n", hr ); + ok( V_VT( &retval ) == VT_I4, "unexpected variant type %#x\n", V_VT( &retval ) ); + ok( !V_I4( &retval ), "unexpected error %ld\n", V_I4( &retval ) ); + ok( type == CIM_UINT32, "unexpected type %#lx\n", type ); check_property( out, L"sNames", VT_BSTR|VT_ARRAY, CIM_STRING|CIM_FLAG_ARRAY ); check_property( out, L"Types", VT_I4|VT_ARRAY, CIM_SINT32|CIM_FLAG_ARRAY ); @@ -988,39 +988,39 @@ static void test_StdRegProv( IWbemServices *services ) IWbemClassObject_Release( sig_in ); hr = IWbemClassObject_GetMethod( reg, L"GetStringValue", 0, &sig_in, NULL ); - ok( hr == S_OK, "failed to get GetStringValue method %08x\n", hr ); + ok( hr == S_OK, "failed to get GetStringValue method %#lx\n", hr ); hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); - ok( hr == S_OK, "failed to spawn instance %08x\n", hr ); + ok( hr == S_OK, "failed to spawn instance %#lx\n", hr ); V_VT( &defkey ) = VT_I4; V_I4( &defkey ) = 0x80000002; hr = IWbemClassObject_Put( in, L"hDefKey", 0, &defkey, 0 ); - ok( hr == S_OK, "failed to set root %08x\n", hr ); + ok( hr == S_OK, "failed to set root %#lx\n", hr ); V_VT( &subkey ) = VT_BSTR; V_BSTR( &subkey ) = SysAllocString( L"Software\\microsoft\\Windows\\CurrentVersion" ); hr = IWbemClassObject_Put( in, L"sSubKeyName", 0, &subkey, 0 ); - ok( hr == S_OK, "failed to set subkey %08x\n", hr ); + ok( hr == S_OK, "failed to set subkey %#lx\n", hr ); V_VT( &valuename ) = VT_BSTR; V_BSTR( &valuename ) = SysAllocString( L"ProgramFilesDir" ); hr = IWbemClassObject_Put( in, L"sValueName", 0, &valuename, 0 ); - ok( hr == S_OK, "failed to set value name %08x\n", hr ); + ok( hr == S_OK, "failed to set value name %#lx\n", hr ); out = NULL; method = SysAllocString( L"GetStringValue" ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); - ok( hr == S_OK, "failed to execute method %08x\n", hr ); + ok( hr == S_OK, "failed to execute method %#lx\n", hr ); SysFreeString( method ); type = 0xdeadbeef; VariantInit( &retval ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, &type, NULL ); - ok( hr == S_OK, "failed to get return value %08x\n", hr ); - ok( V_VT( &retval ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &retval ) ); - ok( !V_I4( &retval ), "unexpected error %u\n", V_I4( &retval ) ); - ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); + ok( hr == S_OK, "failed to get return value %#lx\n", hr ); + ok( V_VT( &retval ) == VT_I4, "unexpected variant type %#x\n", V_VT( &retval ) ); + ok( !V_I4( &retval ), "unexpected error %ld\n", V_I4( &retval ) ); + ok( type == CIM_UINT32, "unexpected type %#lx\n", type ); check_property( out, L"sValue", VT_BSTR, CIM_STRING ); @@ -1064,14 +1064,14 @@ static ULONG WINAPI sink_Release( static HRESULT WINAPI sink_Indicate( IWbemObjectSink *iface, LONG count, IWbemClassObject **objects ) { - trace("Indicate: %d, %p\n", count, objects); + trace( "Indicate: %ld, %p\n", count, objects ); return S_OK; } static HRESULT WINAPI sink_SetStatus( IWbemObjectSink *iface, LONG flags, HRESULT hresult, BSTR str_param, IWbemClassObject *obj_param ) { - trace("SetStatus: %08x, %08x, %s, %p\n", flags, hresult, wine_dbgstr_w(str_param), obj_param); + trace( "SetStatus: %#lx, %#lx, %s, %p\n", flags, hresult, wine_dbgstr_w(str_param), obj_param ); return S_OK; } @@ -1093,15 +1093,15 @@ static void test_notification_query_async( IWbemServices *services ) HRESULT hr; hr = IWbemServices_ExecNotificationQueryAsync( services, wql, query, 0, NULL, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); prev_sink_refs = sink_refs; hr = IWbemServices_ExecNotificationQueryAsync( services, wql, query, 0, NULL, &sink ); - ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND), "got %08x\n", hr ); - ok( sink_refs > prev_sink_refs || broken(!sink_refs), "got %u refs\n", sink_refs ); + ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND), "got %#lx\n", hr ); + ok( sink_refs > prev_sink_refs || broken(!sink_refs), "got %lu refs\n", sink_refs ); hr = IWbemServices_CancelAsyncCall( services, &sink ); - ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND), "got %08x\n", hr ); + ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND), "got %#lx\n", hr ); SysFreeString( wql ); SysFreeString( query ); @@ -1113,16 +1113,16 @@ static void test_query_async( IWbemServices *services ) HRESULT hr; hr = IWbemServices_ExecQueryAsync( services, wql, query, 0, NULL, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); hr = IWbemServices_ExecQueryAsync( services, wql, query, 0, NULL, &sink ); - ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND), "got %08x\n", hr ); + ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND), "got %#lx\n", hr ); hr = IWbemServices_CancelAsyncCall( services, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); hr = IWbemServices_CancelAsyncCall( services, &sink ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( wql ); SysFreeString( query ); @@ -1138,15 +1138,15 @@ static void test_query_semisync( IWbemServices *services ) hr = IWbemServices_ExecQuery( services, wql, query, WBEM_FLAG_RETURN_IMMEDIATELY | WBEM_FLAG_FORWARD_ONLY, NULL, &result ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); count = 1; obj = (void *)0xdeadbeef; hr = IEnumWbemClassObject_Next( result, -1, 1, &obj, &count ); todo_wine - ok( hr == WBEM_E_INVALID_CLASS, "Unexpected hr %#x.\n", hr ); - ok( count == 0, "Unexpected count %u.\n", count ); - ok( obj == (void *)0xdeadbeef, "Got object %p\n", obj ); + ok( hr == WBEM_E_INVALID_CLASS, "unexpected hr %#lx\n", hr ); + ok( count == 0, "unexpected count %lu\n", count ); + ok( obj == (void *)0xdeadbeef, "got object %p\n", obj ); IEnumWbemClassObject_Release( result ); @@ -1161,7 +1161,7 @@ static void test_GetNames( IWbemServices *services ) HRESULT hr; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (;;) { @@ -1174,23 +1174,23 @@ static void test_GetNames( IWbemServices *services ) if (!count) break; hr = IWbemClassObject_GetNames( obj, NULL, 0, NULL, NULL ); - ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %#lx\n", hr ); hr = IWbemClassObject_GetNames( obj, NULL, 0, NULL, &names ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SafeArrayDestroy( names ); hr = IWbemClassObject_GetNames( obj, NULL, WBEM_FLAG_ALWAYS, NULL, &names ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SafeArrayDestroy( names ); hr = IWbemClassObject_GetNames( obj, NULL, WBEM_FLAG_ALWAYS | WBEM_MASK_CONDITION_ORIGIN, NULL, &names ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SafeArrayDestroy( names ); VariantInit( &val ); hr = IWbemClassObject_GetNames( obj, NULL, WBEM_FLAG_NONSYSTEM_ONLY, &val, &names ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SafeArrayDestroy( names ); IWbemClassObject_Release( obj ); @@ -1229,7 +1229,7 @@ static void test_SystemSecurity( IWbemServices *services ) out = NULL; method = SysAllocString( L"GetSD" ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, NULL, &out, NULL ); - ok( hr == S_OK || hr == WBEM_E_ACCESS_DENIED, "failed to execute method %08x\n", hr ); + ok( hr == S_OK || hr == WBEM_E_ACCESS_DENIED, "failed to execute method %#lx\n", hr ); SysFreeString( method ); if (SUCCEEDED(hr)) @@ -1237,20 +1237,20 @@ static void test_SystemSecurity( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &retval ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &retval, &type, NULL ); - ok( hr == S_OK, "failed to get return value %08x\n", hr ); - ok( V_VT( &retval ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &retval ) ); - ok( !V_I4( &retval ), "unexpected error %u\n", V_UI4( &retval ) ); - ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); + ok( hr == S_OK, "failed to get return value %#lx\n", hr ); + ok( V_VT( &retval ) == VT_I4, "unexpected variant type %#x\n", V_VT( &retval ) ); + ok( !V_I4( &retval ), "unexpected error %lu\n", V_UI4( &retval ) ); + ok( type == CIM_UINT32, "unexpected type %#lx\n", type ); type = 0xdeadbeef; VariantInit( &var_sd ); hr = IWbemClassObject_Get( out, L"SD", 0, &var_sd, &type, NULL ); - ok( hr == S_OK, "failed to get names %08x\n", hr ); - ok( V_VT( &var_sd ) == (VT_UI1|VT_ARRAY), "unexpected variant type 0x%x\n", V_VT( &var_sd ) ); - ok( type == (CIM_UINT8|CIM_FLAG_ARRAY), "unexpected type 0x%x\n", type ); + ok( hr == S_OK, "failed to get names %#lx\n", hr ); + ok( V_VT( &var_sd ) == (VT_UI1|VT_ARRAY), "unexpected variant type %#x\n", V_VT( &var_sd ) ); + ok( type == (CIM_UINT8|CIM_FLAG_ARRAY), "unexpected type %#lx\n", type ); hr = SafeArrayAccessData( V_ARRAY( &var_sd ), &data ); - ok( hr == S_OK, "SafeArrayAccessData failed %x\n", hr ); + ok( hr == S_OK, "SafeArrayAccessData failed %#lx\n", hr ); if (SUCCEEDED(hr)) { sd = data; @@ -1262,7 +1262,7 @@ static void test_SystemSecurity( IWbemServices *services ) ok( EqualSid( (PSID)((LPBYTE)sd + sd->Group), sid_admin ), "unexpected group SID\n" ); hr = SafeArrayUnaccessData( V_ARRAY( &var_sd ) ); - ok( hr == S_OK, "SafeArrayUnaccessData failed %x\n", hr ); + ok( hr == S_OK, "SafeArrayUnaccessData failed %#lx\n", hr ); } VariantClear( &var_sd ); @@ -1283,7 +1283,7 @@ static void test_Win32_NetworkAdapter( IWbemServices *services ) DWORD count; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (;;) { @@ -1301,10 +1301,10 @@ static void test_Win32_NetworkAdapter( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, L"ServiceName", 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get service name %08x\n", hr ); + ok( hr == S_OK, "failed to get service name %#lx\n", hr ); ok( V_VT( &val ) == VT_BSTR || broken(V_VT( &val ) == VT_NULL) /* win2k8 */, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + ok( type == CIM_STRING, "unexpected type %#lx\n", type ); VariantClear( &val ); IWbemClassObject_Release( obj ); @@ -1315,12 +1315,12 @@ static void test_Win32_NetworkAdapter( IWbemServices *services ) query = SysAllocString( L"SELECT * FROM Win32_NetworkAdapter WHERE PNPDeviceID LIKE \"PCI\\\\%\"" ); hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( query ); query = SysAllocString( L"SELECT * FROM Win32_NetworkAdapter WHERE PNPDeviceID LIKE \"PCI\\%\"" ); hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - todo_wine ok( hr == WBEM_E_INVALID_QUERY, "got %08x\n", hr ); + todo_wine ok( hr == WBEM_E_INVALID_QUERY, "got %#lx\n", hr ); SysFreeString( query ); SysFreeString( wql ); } @@ -1336,7 +1336,7 @@ static void test_Win32_NetworkAdapterConfiguration( IWbemServices *services ) VARIANT val; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (;;) { @@ -1350,9 +1350,9 @@ static void test_Win32_NetworkAdapterConfiguration( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, L"DNSDomain", 0, &val, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + ok( type == CIM_STRING, "unexpected type %#lx\n", type ); trace( "DNSDomain %s\n", wine_dbgstr_w(V_BSTR( &val )) ); VariantClear( &val ); @@ -1375,18 +1375,18 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) HRESULT hr; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK, "IWbemServices_ExecQuery failed %08x\n", hr ); + ok( hr == S_OK, "IWbemServices_ExecQuery failed %#lx\n", hr ); hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); - ok( hr == S_OK, "IEnumWbemClassObject_Next failed %08x\n", hr ); + ok( hr == S_OK, "IEnumWbemClassObject_Next failed %#lx\n", hr ); hr = IWbemClassObject_BeginEnumeration( obj, 0 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); while (IWbemClassObject_Next( obj, 0, NULL, NULL, NULL, NULL ) == S_OK) {} hr = IWbemClassObject_EndEnumeration( obj ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_property( obj, L"BuildNumber", VT_BSTR, CIM_STRING ); check_property( obj, L"Caption", VT_BSTR, CIM_STRING ); @@ -1394,9 +1394,9 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, L"CSDVersion", 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get csdversion %08x\n", hr ); + ok( hr == S_OK, "failed to get csdversion %#lx\n", hr ); ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + ok( type == CIM_STRING, "unexpected type %#lx\n", type ); trace( "csdversion: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); VariantClear( &val ); @@ -1406,22 +1406,22 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, L"OperatingSystemSKU", 0, &val, &type, NULL ); - ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND) /* winxp */, "failed to get operatingsystemsku %08x\n", hr ); + ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND) /* winxp */, "failed to get operatingsystemsku %#lx\n", hr ); if (hr == S_OK) { ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); - trace( "operatingsystemsku: %08x\n", V_I4( &val ) ); + ok( type == CIM_UINT32, "unexpected type %#lx\n", type ); + trace( "operatingsystemsku: %#lx\n", V_I4( &val ) ); VariantClear( &val ); } type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, L"OSProductSuite", 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get osproductsuite %08x\n", hr ); + ok( hr == S_OK, "failed to get osproductsuite %#lx\n", hr ); ok( V_VT( &val ) == VT_I4 || broken(V_VT( &val ) == VT_NULL) /* winxp */, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); - trace( "osproductsuite: %d (%08x)\n", V_I4( &val ), V_I4( &val ) ); + ok( type == CIM_UINT32, "unexpected type %#lx\n", type ); + trace( "osproductsuite: %ld (%#lx)\n", V_I4( &val ), V_I4( &val ) ); VariantClear( &val ); check_property( obj, L"CSName", VT_BSTR, CIM_STRING ); @@ -1460,7 +1460,7 @@ static void test_Win32_ComputerSystemProduct( IWbemServices *services ) } hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); check_property( obj, L"IdentifyingNumber", VT_BSTR, CIM_STRING ); check_property( obj, L"Name", VT_BSTR, CIM_STRING ); @@ -1507,29 +1507,29 @@ static void test_Win32_PhysicalMemory( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, L"ConfiguredClockSpeed", 0, &val, &type, NULL ); - ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND) /* < win10 */, "got %08x\n", hr ); + ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND) /* < win10 */, "got %#lx\n", hr ); if (hr == S_OK) { - ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); - trace( "ConfiguredClockSpeed %u\n", V_I4( &val ) ); + ok( V_VT( &val ) == VT_I4, "unexpected variant type %#x\n", V_VT( &val ) ); + ok( type == CIM_UINT32, "unexpected type %#lx\n", type ); + trace( "ConfiguredClockSpeed %ld\n", V_I4( &val ) ); } type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, L"PartNumber", 0, &val, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type %#x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type %#lx\n", type ); trace( "PartNumber %s\n", wine_dbgstr_w(V_BSTR( &val )) ); VariantClear( &val ); type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, L"SerialNumber", 0, &val, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type %#x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type %#lx\n", type ); trace( "SerialNumber %s\n", wine_dbgstr_w(V_BSTR( &val )) ); VariantClear( &val ); @@ -1583,7 +1583,7 @@ static void test_Win32_Processor( IWbemServices *services ) DWORD count; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (;;) { @@ -1604,23 +1604,23 @@ static void test_Win32_Processor( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, L"NumberOfLogicalProcessors", 0, &val, &type, NULL ); - ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND) /* win2k3 */, "got %08x\n", hr ); + ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND) /* win2k3 */, "got %#lx\n", hr ); if (hr == S_OK) { - ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); - trace( "numlogicalprocessors %u\n", V_I4( &val ) ); + ok( V_VT( &val ) == VT_I4, "unexpected variant type %#x\n", V_VT( &val ) ); + ok( type == CIM_UINT32, "unexpected type %#lx\n", type ); + trace( "numlogicalprocessors %ld\n", V_I4( &val ) ); } type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, L"NumberOfCores", 0, &val, &type, NULL ); - ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND) /* win2k3 */, "got %08x\n", hr ); + ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND) /* win2k3 */, "got %#lx\n", hr ); if (hr == S_OK) { - ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); - trace( "numcores %u\n", V_I4( &val ) ); + ok( V_VT( &val ) == VT_I4, "unexpected variant type %#x\n", V_VT( &val ) ); + ok( type == CIM_UINT32, "unexpected type %#lx\n", type ); + trace( "numcores %ld\n", V_I4( &val ) ); } IWbemClassObject_Release( obj ); @@ -1669,9 +1669,9 @@ static void test_Win32_VideoController( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, L"InstalledDisplayDrivers", 0, &val, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + ok( type == CIM_STRING, "unexpected type %#lx\n", type ); trace( "installeddisplaydrivers %s\n", wine_dbgstr_w(V_BSTR( &val )) ); VariantClear( &val ); @@ -1738,9 +1738,9 @@ static void test_Win32_Printer( IWbemServices *services ) type = 0xdeadbeef; memset( &val, 0, sizeof(val) ); hr = IWbemClassObject_Get( obj, L"Location", 0, &val, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + ok( type == CIM_STRING, "unexpected type %#lx\n", type ); trace( "location %s\n", wine_dbgstr_w(V_BSTR( &val )) ); VariantClear( &val ); @@ -1765,7 +1765,7 @@ static void test_Win32_PnPEntity( IWbemServices *services ) bstr = SysAllocString( L"Win32_PnPEntity" ); hr = IWbemServices_CreateInstanceEnum( services, bstr, 0, NULL, &enm ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( bstr ); bstr = SysAllocString( L"DeviceId" ); @@ -1774,7 +1774,7 @@ static void test_Win32_PnPEntity( IWbemServices *services ) hr = IEnumWbemClassObject_Next( enm, 1000, 1, &obj, &count ); ok( (count == 1 && (hr == WBEM_S_FALSE || hr == WBEM_S_NO_ERROR)) || (count == 0 && (hr == WBEM_S_FALSE || hr == WBEM_S_TIMEDOUT)), - "got %08x with %u objects returned\n", hr, count ); + "got %#lx with %lu objects returned\n", hr, count ); if (count == 0) break; @@ -1782,12 +1782,12 @@ static void test_Win32_PnPEntity( IWbemServices *services ) for (i = 0; i < count; ++i) { hr = IWbemClassObject_Get( obj, bstr, 0, &val, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); if (SUCCEEDED( hr )) { - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type %#x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type %#lx\n", type ); VariantClear( &val ); } } @@ -1807,7 +1807,7 @@ static void test_Win32_WinSAT( IWbemServices *services ) DWORD count; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK || broken(hr == WBEM_E_INVALID_CLASS) /* win2k8 */, "got %08x\n", hr ); + ok( hr == S_OK || broken(hr == WBEM_E_INVALID_CLASS) /* win2k8 */, "got %#lx\n", hr ); if (hr == WBEM_E_INVALID_CLASS) { win_skip( "class not found\n" ); @@ -1843,7 +1843,7 @@ static void test_SoftwareLicensingProduct( IWbemServices *services ) DWORD count; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK , "got %08x\n", hr ); + ok( hr == S_OK , "got %#lx\n", hr ); for (;;) { @@ -1868,7 +1868,7 @@ static void test_Win32_DesktopMonitor( IWbemServices *services ) DWORD count; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (;;) { @@ -1894,7 +1894,7 @@ static void test_Win32_DiskDrive( IWbemServices *services ) DWORD count; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (;;) { @@ -1920,7 +1920,7 @@ static void test_Win32_DisplayControllerConfiguration( IWbemServices *services ) DWORD count; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (;;) { @@ -1951,7 +1951,7 @@ static void test_Win32_QuickFixEngineering( IWbemServices *services ) CIMTYPE type; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (;;) { @@ -1961,10 +1961,10 @@ static void test_Win32_QuickFixEngineering( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &caption ); hr = IWbemClassObject_Get( obj, L"Caption", 0, &caption, &type, NULL ); - ok( hr == S_OK, "failed to get caption %08x\n", hr ); + ok( hr == S_OK, "failed to get caption %#lx\n", hr ); ok( V_VT( &caption ) == VT_BSTR || V_VT( &caption ) == VT_NULL /* winxp */, - "unexpected variant type 0x%x\n", V_VT( &caption ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + "unexpected variant type %#x\n", V_VT( &caption ) ); + ok( type == CIM_STRING, "unexpected type %#lx\n", type ); check_property( obj, L"HotFixID", VT_BSTR, CIM_STRING ); IWbemClassObject_Release( obj ); @@ -1986,7 +1986,7 @@ static void test_Win32_SoundDevice( IWbemServices *services ) DWORD count; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (;;) { @@ -2037,28 +2037,28 @@ static void test_SystemRestore( IWbemServices *services ) method = SysAllocString( L"Enable" ); sig_in = NULL; hr = IWbemClassObject_GetMethod( service, method, 0, &sig_in, NULL ); - ok( hr == S_OK, "failed to get Enable method %08x\n", hr ); + ok( hr == S_OK, "failed to get Enable method %#lx\n", hr ); hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); - ok( hr == S_OK, "failed to spawn instance %08x\n", hr ); + ok( hr == S_OK, "failed to spawn instance %#lx\n", hr ); GetWindowsDirectoryW(path, ARRAY_SIZE(path)); path[3] = 0; /* otherwise XP fails */ V_VT( &var ) = VT_BSTR; V_BSTR( &var ) = SysAllocString( path ); hr = IWbemClassObject_Put( in, L"Drive", 0, &var, 0 ); - ok( hr == S_OK, "failed to set Drive %08x\n", hr ); + ok( hr == S_OK, "failed to set Drive %#lx\n", hr ); SysFreeString( V_BSTR( &var ) ); out = NULL; hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); - ok( hr == S_OK || hr == WBEM_E_ACCESS_DENIED, "failed to execute method %08x\n", hr ); + ok( hr == S_OK || hr == WBEM_E_ACCESS_DENIED, "failed to execute method %#lx\n", hr ); if (hr == S_OK) { VariantInit( &var ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &var, NULL, NULL ); - ok( hr == S_OK, "failed to get return value %08x\n", hr ); - ok( V_I4( &var ) == ERROR_SUCCESS, "unexpected error %u\n", V_UI4( &var ) ); + ok( hr == S_OK, "failed to get return value %#lx\n", hr ); + ok( V_I4( &var ) == ERROR_SUCCESS, "unexpected error %ld\n", V_UI4( &var ) ); IWbemClassObject_Release( out ); } @@ -2082,7 +2082,7 @@ static void test_Win32_LogicalDisk( IWbemServices *services ) DWORD count; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); for (;;) { @@ -2109,16 +2109,16 @@ static void test_empty_namespace( IWbemLocator *locator ) HRESULT hr; hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); - ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + ok( hr == S_OK, "failed to get IWbemServices interface %#lx\n", hr ); query = SysAllocString( L"SELECT * FROM __ASSOCIATORS" ); hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == WBEM_E_INVALID_CLASS, "Query failed: %08x\n", hr ); + ok( hr == WBEM_E_INVALID_CLASS, "Query failed: %#lx\n", hr ); SysFreeString( query ); query = SysAllocString( L"SELECT * FROM Win32_OperatingSystem" ); hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); - ok( hr == WBEM_E_INVALID_CLASS, "got %08x\n", hr ); + ok( hr == WBEM_E_INVALID_CLASS, "got %#lx\n", hr ); SysFreeString( query ); SysFreeString( wql ); @@ -2139,20 +2139,20 @@ static void test_MSSMBios_RawSMBiosTables( IWbemLocator *locator ) HRESULT hr; hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); - ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + ok( hr == S_OK, "failed to get IWbemServices interface %#lx\n", hr ); hr = IWbemServices_CreateInstanceEnum( services, bios, 0, NULL, &iter ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IEnumWbemClassObject_Next( iter, WBEM_INFINITE, 1, &obj, &count ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); type = 0; VariantInit( &val ); hr = IWbemClassObject_Get( obj, L"SMBiosData", 0, &val, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - todo_wine ok( V_VT( &val ) == (VT_UI1 | VT_ARRAY), "got %08x\n", V_VT(&val) ); - ok( type == (CIM_UINT8 | CIM_FLAG_ARRAY), "got %08x\n", type ); + ok( hr == S_OK, "got %#lx\n", hr ); + todo_wine ok( V_VT( &val ) == (VT_UI1 | VT_ARRAY), "got %#x\n", V_VT(&val) ); + ok( type == (CIM_UINT8 | CIM_FLAG_ARRAY), "got %#lx\n", type ); IWbemClassObject_Release( obj ); IEnumWbemClassObject_Release( iter ); @@ -2190,17 +2190,17 @@ START_TEST(query) return; } hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); - ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + ok( hr == S_OK, "failed to get IWbemServices interface %#lx\n", hr ); hr = CoQueryProxyBlanket( (IUnknown *)services, NULL, NULL, NULL, NULL, NULL, NULL, NULL ); - ok( hr == S_OK, "failed to query proxy blanket %08x\n", hr ); + ok( hr == S_OK, "failed to query proxy blanket %#lx\n", hr ); hr = CoQueryProxyBlanket( (IUnknown *)services, &authn_svc, NULL, NULL, NULL, NULL, NULL, NULL ); - ok( hr == S_OK, "failed to query proxy blanket %08x\n", hr ); + ok( hr == S_OK, "failed to query proxy blanket %#lx\n", hr ); hr = CoSetProxyBlanket( (IUnknown *)services, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE ); - ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); + ok( hr == S_OK, "failed to set proxy blanket %#lx\n", hr ); test_GetNames( services ); test_IEnumWbemClassObject_Next( services ); @@ -2248,10 +2248,10 @@ START_TEST(query) /* Some tests need other connection point */ path = SysAllocString( L"ROOT\\DEFAULT" ); hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); - ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + ok( hr == S_OK, "failed to get IWbemServices interface %#lx\n", hr ); hr = CoSetProxyBlanket( (IUnknown *)services, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE ); - ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); + ok( hr == S_OK, "failed to set proxy blanket %#lx\n", hr ); test_StdRegProv( services ); test_SystemRestore( services ); diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index 651beaef6a2..e7fbc90cf61 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -30,7 +30,7 @@ static void _expect_ref(IUnknown* obj, ULONG ref, int line) ULONG rc; IUnknown_AddRef(obj); rc = IUnknown_Release(obj); - ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); + ok_(__FILE__,line)(rc == ref, "expected refcount %lu, got %lu\n", ref, rc); } static void test_IClientSecurity(void) @@ -48,45 +48,45 @@ static void test_IClientSecurity(void) win_skip("can't create instance of WbemLocator\n"); return; } - ok( hr == S_OK, "failed to create IWbemLocator interface %08x\n", hr ); + ok( hr == S_OK, "failed to create IWbemLocator interface %#lx\n", hr ); refs = IWbemLocator_Release( locator ); - ok( refs == 0, "unexpected refcount %u\n", refs ); + ok( refs == 0, "unexpected refcount %lu\n", refs ); hr = CoCreateInstance( &CLSID_WbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemLocator, (void **)&locator ); - ok( hr == S_OK, "failed to create IWbemLocator interface %08x\n", hr ); + ok( hr == S_OK, "failed to create IWbemLocator interface %#lx\n", hr ); hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); - ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + ok( hr == S_OK, "failed to get IWbemServices interface %#lx\n", hr ); refs = IWbemServices_Release( services ); - ok( refs == 0, "unexpected refcount %u\n", refs ); + ok( refs == 0, "unexpected refcount %lu\n", refs ); hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); - ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + ok( hr == S_OK, "failed to get IWbemServices interface %#lx\n", hr ); hr = IWbemServices_QueryInterface( services, &IID_IClientSecurity, (void **)&security ); - ok( hr == S_OK, "failed to query IClientSecurity interface %08x\n", hr ); + ok( hr == S_OK, "failed to query IClientSecurity interface %#lx\n", hr ); ok( (void *)services != (void *)security, "expected pointers to be different\n" ); refs = IClientSecurity_Release( security ); - ok( refs == 1, "unexpected refcount %u\n", refs ); + ok( refs == 1, "unexpected refcount %lu\n", refs ); refs = IWbemServices_Release( services ); - ok( refs == 0, "unexpected refcount %u\n", refs ); + ok( refs == 0, "unexpected refcount %lu\n", refs ); hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); - ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + ok( hr == S_OK, "failed to get IWbemServices interface %#lx\n", hr ); hr = IWbemServices_QueryInterface( services, &IID_IClientSecurity, (void **)&security ); - ok( hr == S_OK, "failed to query IClientSecurity interface %08x\n", hr ); + ok( hr == S_OK, "failed to query IClientSecurity interface %#lx\n", hr ); ok( (void *)services != (void *)security, "expected pointers to be different\n" ); refs = IWbemServices_Release( services ); - todo_wine ok( refs == 1, "unexpected refcount %u\n", refs ); + todo_wine ok( refs == 1, "unexpected refcount %lu\n", refs ); refs = IClientSecurity_Release( security ); - todo_wine ok( refs == 0, "unexpected refcount %u\n", refs ); + todo_wine ok( refs == 0, "unexpected refcount %lu\n", refs ); IWbemLocator_Release( locator ); SysFreeString( path ); @@ -144,7 +144,7 @@ static void test_IWbemLocator(void) win_skip("can't create instance of WbemLocator\n"); return; } - ok( hr == S_OK, "failed to create IWbemLocator interface %08x\n", hr ); + ok( hr == S_OK, "failed to create IWbemLocator interface %#lx\n", hr ); for (i = 0; i < ARRAY_SIZE( test ); i++) { @@ -152,24 +152,22 @@ static void test_IWbemLocator(void) hr = IWbemLocator_ConnectServer( locator, resource, NULL, NULL, NULL, 0, NULL, NULL, &services ); todo_wine_if (test[i].todo) ok( hr == test[i].result || broken(hr == test[i].result_broken), - "%u: expected %08x got %08x\n", i, test[i].result, hr ); + "%u: expected %#lx got %#lx\n", i, test[i].result, hr ); SysFreeString( resource ); if (hr == S_OK) IWbemServices_Release( services ); } hr = CoCreateInstance( &CLSID_WbemContext, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemContext, (void **)&context ); - ok(hr == S_OK, "Failed to create context object, hr %#x.\n", hr); + ok(hr == S_OK, "failed to create context object, hr %#lx\n", hr); EXPECT_REF(context, 1); resource = SysAllocString( L"root\\default" ); hr = IWbemLocator_ConnectServer( locator, resource, NULL, NULL, NULL, 0, NULL, context, &services ); - ok(hr == S_OK, "Failed to connect, hr %#x.\n", hr); + ok(hr == S_OK, "failed to connect, hr %#lx\n", hr); SysFreeString( resource ); EXPECT_REF(context, 1); IWbemServices_Release( services ); - IWbemContext_Release( context ); - IWbemLocator_Release( locator ); } @@ -181,68 +179,68 @@ static void test_IWbemContext(void) BSTR str; hr = CoCreateInstance( &CLSID_WbemContext, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemContext, (void **)&context ); - ok(hr == S_OK, "Failed to create context object, hr %#x.\n", hr); + ok(hr == S_OK, "failed to create context object, hr %#lx\n", hr); hr = IWbemContext_SetValue(context, L"name", 0, NULL); - ok(hr == WBEM_E_INVALID_PARAMETER, "Unexpected hr %#x.\n", hr); + ok(hr == WBEM_E_INVALID_PARAMETER, "unexpected hr %#lx\n", hr); V_VT(&var) = VT_I4; V_I4(&var) = 12; hr = IWbemContext_SetValue(context, NULL, 0, &var); - ok(hr == WBEM_E_INVALID_PARAMETER, "Unexpected hr %#x.\n", hr); + ok(hr == WBEM_E_INVALID_PARAMETER, "unexpected hr %#lx\n", hr); hr = IWbemContext_SetValue(context, L"name", 0, &var); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "unexpected hr %#lx\n", hr); hr = IWbemContext_GetValue(context, NULL, 0, &var); - ok(hr == WBEM_E_INVALID_PARAMETER, "Unexpected hr %#x.\n", hr); + ok(hr == WBEM_E_INVALID_PARAMETER, "unexpected hr %#lx\n", hr); hr = IWbemContext_GetValue(context, L"name", 0, NULL); - ok(hr == WBEM_E_INVALID_PARAMETER, "Unexpected hr %#x.\n", hr); + ok(hr == WBEM_E_INVALID_PARAMETER, "unexpected hr %#lx\n", hr); hr = IWbemContext_GetValue(context, L"noname", 0, &var); - ok(hr == WBEM_E_NOT_FOUND, "Unexpected hr %#x.\n", hr); + ok(hr == WBEM_E_NOT_FOUND, "unexpected hr %#lx\n", hr); V_VT(&var) = VT_EMPTY; hr = IWbemContext_GetValue(context, L"NAME", 0, &var); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(V_VT(&var) == VT_I4, "Unexpected value type.\n"); + ok(hr == S_OK, "unexpected hr %#lx\n", hr); + ok(V_VT(&var) == VT_I4, "unexpected value type\n"); V_VT(&var) = VT_I4; V_I4(&var) = 13; hr = IWbemContext_SetValue(context, L"name2", 0, &var); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "unexpected hr %#lx\n", hr); hr = IWbemContext_Next(context, 0, &str, &var); todo_wine - ok(hr == WBEM_E_UNEXPECTED, "Unexpected hr %#x.\n", hr); + ok(hr == WBEM_E_UNEXPECTED, "unexpected hr %#lx\n", hr); hr = IWbemContext_BeginEnumeration(context, 0); todo_wine - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "unexpected hr %#lx\n", hr); str = NULL; hr = IWbemContext_Next(context, 0, &str, &var); todo_wine { - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(!lstrcmpW(str, L"name"), "Unexpected name %s.\n", wine_dbgstr_w(str)); + ok(hr == S_OK, "unexpected hr %#lx\n", hr); + ok(!lstrcmpW(str, L"name"), "unexpected name %s\n", wine_dbgstr_w(str)); SysFreeString(str); } hr = IWbemContext_EndEnumeration(context); todo_wine - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "unexpected hr %#lx\n", hr); /* Overwrite */ V_VT(&var) = VT_I4; V_I4(&var) = 14; hr = IWbemContext_SetValue(context, L"name", 0, &var); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "unexpected hr %#lx\n", hr); V_VT(&var) = VT_EMPTY; hr = IWbemContext_GetValue(context, L"name", 0, &var); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(V_VT(&var) == VT_I4, "Unexpected value type.\n"); - ok(V_I4(&var) == 14, "Unexpected value.\n"); + ok(hr == S_OK, "unexpected hr %#lx\n", hr); + ok(V_VT(&var) == VT_I4, "unexpected value type\n"); + ok(V_I4(&var) == 14, "unexpected value\n"); IWbemContext_Release( context ); } @@ -277,7 +275,7 @@ static void test_namespaces(void) { resource = SysAllocString( tests[i].path ); hr = IWbemLocator_ConnectServer( locator, resource, NULL, NULL, NULL, 0, NULL, NULL, &services ); - ok( hr == S_OK || broken( tests[i].broken && hr == WBEM_E_INVALID_NAMESPACE ), "%u: got %08x\n", i, hr ); + ok( hr == S_OK || broken( tests[i].broken && hr == WBEM_E_INVALID_NAMESPACE ), "%u: got %#lx\n", i, hr ); SysFreeString( resource ); if (hr == S_OK) IWbemServices_Release( services ); -- 2.30.2

1 0

[PATCH 1/4] wbemprox: Build without -DWINE_NO_LONG_TYPES.
by Hans Leidekker Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/Makefile.in | 1 - dlls/wbemprox/builtin.c | 9 +++---- dlls/wbemprox/class.c | 44 +++++++++++++++++----------------- dlls/wbemprox/process.c | 10 ++++---- dlls/wbemprox/qualifier.c | 16 ++++++------- dlls/wbemprox/query.c | 4 ++-- dlls/wbemprox/reg.c | 4 ++-- dlls/wbemprox/service.c | 2 +- dlls/wbemprox/services.c | 48 ++++++++++++++++++------------------- dlls/wbemprox/table.c | 4 ++-- dlls/wbemprox/wbemlocator.c | 4 ++-- 11 files changed, 73 insertions(+), 73 deletions(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index 89c209ab183..48a43646491 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wbemprox.dll IMPORTS = winspool version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 rpcrt4 setupapi diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 050e9462a4c..fb6fb654400 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -3128,7 +3128,8 @@ static enum fill_status fill_printer( struct table *table, const struct expr *co struct record_printer *rec; enum fill_status status = FILL_STATUS_UNFILTERED; PRINTER_INFO_2W *info; - DWORD i, offset = 0, count = 0, size = 0, num_rows = 0; + DWORD i, offset = 0, count = 0, size = 0; + UINT num_rows = 0; WCHAR id[20]; EnumPrintersW( PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &size, &count ); @@ -3656,7 +3657,7 @@ static const WCHAR *get_service_type( DWORD type ) else if (type & SERVICE_FILE_SYSTEM_DRIVER) return L"File System Driver"; else if (type & SERVICE_WIN32_OWN_PROCESS) return L"Own Process"; else if (type & SERVICE_WIN32_SHARE_PROCESS) return L"Share Process"; - else ERR("unhandled type 0x%08x\n", type); + else ERR( "unhandled type %#lx\n", type ); return NULL; } static const WCHAR *get_service_state( DWORD state ) @@ -3668,7 +3669,7 @@ static const WCHAR *get_service_state( DWORD state ) case SERVICE_STOP_PENDING: return L"Stop Pending"; case SERVICE_RUNNING: return L"Running"; default: - ERR("unknown state %u\n", state); + ERR( "unknown state %lu\n", state ); return L"Unknown"; } } @@ -3682,7 +3683,7 @@ static const WCHAR *get_service_startmode( DWORD mode ) case SERVICE_DEMAND_START: return L"Manual"; case SERVICE_DISABLED: return L"Disabled"; default: - ERR("unknown mode 0x%x\n", mode); + ERR( "unknown mode %#lx\n", mode ); return L"Unknown"; } } diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 6f93c58a0df..37150769816 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -119,7 +119,7 @@ static HRESULT WINAPI enum_class_object_Next( HRESULT hr; ULONG i, j; - TRACE("%p, %d, %u, %p, %p\n", iface, lTimeout, uCount, apObjects, puReturned); + TRACE( "%p, %ld, %lu, %p, %p\n", iface, lTimeout, uCount, apObjects, puReturned ); if (!apObjects || !puReturned) return WBEM_E_INVALID_PARAMETER; if (lTimeout != WBEM_INFINITE && !once++) FIXME("timeout not supported\n"); @@ -148,7 +148,7 @@ static HRESULT WINAPI enum_class_object_NextAsync( ULONG uCount, IWbemObjectSink *pSink ) { - FIXME("%p, %u, %p\n", iface, uCount, pSink); + FIXME( "%p, %lu, %p\n", iface, uCount, pSink ); return E_NOTIMPL; } @@ -172,7 +172,7 @@ static HRESULT WINAPI enum_class_object_Skip( struct view *view = ec->query->view; static int once = 0; - TRACE("%p, %d, %u\n", iface, lTimeout, nCount); + TRACE( "%p, %ld, %lu\n", iface, lTimeout, nCount ); if (lTimeout != WBEM_INFINITE && !once++) FIXME("timeout not supported\n"); @@ -396,7 +396,7 @@ static HRESULT WINAPI class_object_Get( struct class_object *co = impl_from_IWbemClassObject( iface ); struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter ); - TRACE("%p, %s, %08x, %p, %p, %p\n", iface, debugstr_w(wszName), lFlags, pVal, pType, plFlavor); + TRACE( "%p, %s, %#lx, %p, %p, %p\n", iface, debugstr_w(wszName), lFlags, pVal, pType, plFlavor ); if (co->record) { @@ -437,7 +437,7 @@ static HRESULT record_set_value( struct record *record, UINT index, VARIANT *var record->fields[index].u.ival = val; return S_OK; default: - FIXME("unhandled type %u\n", type); + FIXME( "unhandled type %lu\n", type ); break; } return WBEM_E_INVALID_PARAMETER; @@ -453,7 +453,7 @@ static HRESULT WINAPI class_object_Put( struct class_object *co = impl_from_IWbemClassObject( iface ); struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter ); - TRACE("%p, %s, %08x, %p, %u\n", iface, debugstr_w(wszName), lFlags, pVal, Type); + TRACE( "%p, %s, %#lx, %p, %lu\n", iface, debugstr_w(wszName), lFlags, pVal, Type ); if (co->record) { @@ -487,7 +487,7 @@ static HRESULT WINAPI class_object_GetNames( struct class_object *co = impl_from_IWbemClassObject( iface ); struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter ); - TRACE("%p, %s, %08x, %s, %p\n", iface, debugstr_w(wszQualifierName), lFlags, + TRACE( "%p, %s, %#lx, %s, %p\n", iface, debugstr_w(wszQualifierName), lFlags, debugstr_variant(pQualifierVal), pNames); if (!pNames) @@ -501,7 +501,7 @@ static HRESULT WINAPI class_object_GetNames( lFlags != WBEM_FLAG_NONSYSTEM_ONLY && lFlags != WBEM_FLAG_SYSTEM_ONLY)) { - FIXME("flags %08x not supported\n", lFlags); + FIXME( "flags %#lx not supported\n", lFlags ); return E_NOTIMPL; } @@ -517,9 +517,9 @@ static HRESULT WINAPI class_object_BeginEnumeration( { struct class_object *co = impl_from_IWbemClassObject( iface ); - TRACE("%p, %08x\n", iface, lEnumFlags); + TRACE( "%p, %#lx\n", iface, lEnumFlags ); - if (lEnumFlags) FIXME("flags 0x%08x not supported\n", lEnumFlags); + if (lEnumFlags) FIXME( "flags %#lx not supported\n", lEnumFlags ); co->index_property = 0; return S_OK; @@ -541,7 +541,7 @@ static HRESULT WINAPI class_object_Next( HRESULT hr; UINT i; - TRACE("%p, %08x, %p, %p, %p, %p\n", iface, lFlags, strName, pVal, pType, plFlavor); + TRACE( "%p, %#lx, %p, %p, %p, %p\n", iface, lFlags, strName, pVal, pType, plFlavor ); for (i = obj->index_property; i < table->num_cols; i++) { @@ -661,9 +661,9 @@ static HRESULT WINAPI class_object_GetObjectText( struct view *view = ec->query->view; BSTR text; - TRACE("%p, %08x, %p\n", iface, lFlags, pstrObjectText); + TRACE( "%p, %#lx, %p\n", iface, lFlags, pstrObjectText ); - if (lFlags) FIXME("flags %08x not implemented\n", lFlags); + if (lFlags) FIXME( "flags %#lx not implemented\n", lFlags ); if (!(text = get_object_text( view, co->index ))) return E_OUTOFMEMORY; *pstrObjectText = text; @@ -675,7 +675,7 @@ static HRESULT WINAPI class_object_SpawnDerivedClass( LONG lFlags, IWbemClassObject **ppNewClass ) { - FIXME("%p, %08x, %p\n", iface, lFlags, ppNewClass); + FIXME( "%p, %#lx, %p\n", iface, lFlags, ppNewClass ); return E_NOTIMPL; } @@ -691,7 +691,7 @@ static HRESULT WINAPI class_object_SpawnInstance( struct record *record; HRESULT hr; - TRACE("%p, %08x, %p\n", iface, lFlags, ppNewInstance); + TRACE( "%p, %#lx, %p\n", iface, lFlags, ppNewInstance ); if (!(record = create_record( table ))) return E_OUTOFMEMORY; if (FAILED(hr = IEnumWbemClassObject_Clone( co->iter, &iter ))) @@ -709,7 +709,7 @@ static HRESULT WINAPI class_object_CompareTo( LONG lFlags, IWbemClassObject *pCompareTo ) { - FIXME("%p, %08x, %p\n", iface, lFlags, pCompareTo); + FIXME( "%p, %#lx, %p\n", iface, lFlags, pCompareTo ); return E_NOTIMPL; } @@ -755,7 +755,7 @@ static void set_default_value( CIMTYPE type, UINT val, BYTE *ptr ) *(UINT32 *)ptr = val; break; default: - FIXME("unhandled type %u\n", type); + FIXME( "unhandled type %lu\n", type ); break; } } @@ -892,7 +892,7 @@ static HRESULT WINAPI class_object_GetMethod( unsigned int i; HRESULT hr; - TRACE("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszName), lFlags, ppInSignature, ppOutSignature); + TRACE( "%p, %s, %#lx, %p, %p\n", iface, debugstr_w(wszName), lFlags, ppInSignature, ppOutSignature ); if (ppInSignature) *ppInSignature = NULL; if (ppOutSignature) *ppOutSignature = NULL; @@ -931,7 +931,7 @@ static HRESULT WINAPI class_object_PutMethod( IWbemClassObject *pInSignature, IWbemClassObject *pOutSignature ) { - FIXME("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszName), lFlags, pInSignature, pOutSignature); + FIXME( "%p, %s, %#lx, %p, %p\n", iface, debugstr_w(wszName), lFlags, pInSignature, pOutSignature ); return E_NOTIMPL; } @@ -949,9 +949,9 @@ static HRESULT WINAPI class_object_BeginMethodEnumeration( { struct class_object *co = impl_from_IWbemClassObject( iface ); - TRACE("%p, %08x\n", iface, lEnumFlags); + TRACE( "%p, %#lx\n", iface, lEnumFlags ); - if (lEnumFlags) FIXME("flags 0x%08x not supported\n", lEnumFlags); + if (lEnumFlags) FIXME( "flags %#lx not supported\n", lEnumFlags ); co->index_method = 0; return S_OK; @@ -968,7 +968,7 @@ static HRESULT WINAPI class_object_NextMethod( BSTR method; HRESULT hr; - TRACE("%p, %08x, %p, %p, %p\n", iface, lFlags, pstrName, ppInSignature, ppOutSignature); + TRACE( "%p, %#lx, %p, %p, %p\n", iface, lFlags, pstrName, ppInSignature, ppOutSignature ); if (!(method = get_method_name( co->ns, co->name, co->index_method ))) return WBEM_S_NO_MORE_DATA; diff --git a/dlls/wbemprox/process.c b/dlls/wbemprox/process.c index 93136e9aefc..0fdd9340d16 100644 --- a/dlls/wbemprox/process.c +++ b/dlls/wbemprox/process.c @@ -135,19 +135,19 @@ HRESULT process_create( IWbemClassObject *obj, IWbemContext *context, IWbemClass if (FAILED(hr = IWbemClassObject_Get( in, L"CommandLine", 0, &command_line, &type, NULL )) || V_VT( &command_line ) != VT_BSTR) - WARN( "Invalid CommandLine, hr %#x, type %u.\n", hr, V_VT( &command_line )); + WARN( "invalid CommandLine, hr %#lx, type %u\n", hr, V_VT( &command_line )); else TRACE( "CommandLine %s.\n", debugstr_w( V_BSTR( &command_line ))); if (FAILED(hr = IWbemClassObject_Get( in, L"CurrentDirectory", 0, &current_directory, &type, NULL )) || V_VT( &current_directory ) != VT_BSTR) - WARN("Invalid CurrentDirectory, hr %#x, type %u.\n", hr, V_VT( &current_directory )); + WARN("invalid CurrentDirectory, hr %#lx, type %u\n", hr, V_VT( &current_directory )); else TRACE( "CurrentDirectory %s.\n", debugstr_w( V_BSTR( &current_directory ))); if (SUCCEEDED(IWbemClassObject_Get( in, L"ProcessStartupInformation", 0, &startup_info, &type, NULL )) && V_VT( &startup_info ) == VT_UNKNOWN && V_UNKNOWN( &startup_info )) - FIXME( "ProcessStartupInformation is not implemented, vt_type %u, type %u, val %p.\n", + FIXME( "ProcessStartupInformation is not implemented, vt_type %u, type %lu, val %p\n", V_VT( &startup_info ), type, V_UNKNOWN( &startup_info )); if (out && (hr = IWbemClassObject_SpawnInstance( sig, 0, &out_params ))) @@ -164,7 +164,7 @@ HRESULT process_create( IWbemClassObject *obj, IWbemContext *context, IWbemClass bret = CreateProcessW( NULL, V_BSTR( &command_line ), NULL, NULL, FALSE, 0L, V_VT( &current_directory ) == VT_BSTR ? V_BSTR( &current_directory ) : NULL, NULL, &si, &pi ); - TRACE( "CreateProcessW ret %#x, GetLastError() %u.\n", bret, GetLastError() ); + TRACE( "CreateProcessW ret %d, GetLastError() %lu\n", bret, GetLastError() ); if (bret) { CloseHandle( pi.hThread ); @@ -217,6 +217,6 @@ done: VariantClear( &command_line ); VariantClear( &current_directory ); VariantClear( &startup_info ); - TRACE( "ret %#x.\n", ret ); + TRACE( "ret %#lx\n", ret ); return ret; } diff --git a/dlls/wbemprox/qualifier.c b/dlls/wbemprox/qualifier.c index aa032388759..826c48e9d93 100644 --- a/dlls/wbemprox/qualifier.c +++ b/dlls/wbemprox/qualifier.c @@ -159,7 +159,7 @@ static HRESULT get_qualifier_value( enum wbm_namespace ns, const WCHAR *class, c hr = IWbemClassObject_Get( obj, L"BoolValue", 0, val, NULL, NULL ); break; default: - ERR("unhandled type %u\n", V_UI4( &var )); + ERR( "unhandled type %lu\n", V_UI4( &var ) ); break; } @@ -177,10 +177,10 @@ static HRESULT WINAPI qualifier_set_Get( { struct qualifier_set *set = impl_from_IWbemQualifierSet( iface ); - TRACE("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszName), lFlags, pVal, plFlavor); + TRACE( "%p, %s, %#lx, %p, %p\n", iface, debugstr_w(wszName), lFlags, pVal, plFlavor ); if (lFlags) { - FIXME("flags %08x not supported\n", lFlags); + FIXME( "flags %#lx not supported\n", lFlags ); return E_NOTIMPL; } return get_qualifier_value( set->ns, set->class, set->member, wszName, pVal, plFlavor ); @@ -192,7 +192,7 @@ static HRESULT WINAPI qualifier_set_Put( VARIANT *pVal, LONG lFlavor ) { - FIXME("%p, %s, %p, %d\n", iface, debugstr_w(wszName), pVal, lFlavor); + FIXME( "%p, %s, %p, %ld\n", iface, debugstr_w(wszName), pVal, lFlavor ); return E_NOTIMPL; } @@ -214,10 +214,10 @@ static HRESULT WINAPI qualifier_set_GetNames( IWbemClassObject *obj; HRESULT hr; - TRACE("%p, %08x, %p\n", iface, lFlags, pNames); + TRACE( "%p, %#lx, %p\n", iface, lFlags, pNames ); if (lFlags) { - FIXME("flags %08x not supported\n", lFlags); + FIXME( "flags %#lx not supported\n", lFlags ); return E_NOTIMPL; } @@ -237,7 +237,7 @@ static HRESULT WINAPI qualifier_set_BeginEnumeration( IWbemQualifierSet *iface, LONG lFlags ) { - FIXME("%p, %08x\n", iface, lFlags); + FIXME( "%p, %#lx\n", iface, lFlags ); return E_NOTIMPL; } @@ -248,7 +248,7 @@ static HRESULT WINAPI qualifier_set_Next( VARIANT *pVal, LONG *plFlavor ) { - FIXME("%p, %08x, %p, %p, %p\n", iface, lFlags, pstrName, pVal, plFlavor); + FIXME( "%p, %#lx, %p, %p, %p\n", iface, lFlags, pstrName, pVal, plFlavor ); return E_NOTIMPL; } diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 56631cbca9e..d02ae82420c 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -300,7 +300,7 @@ static const WCHAR *format_int( WCHAR *buf, UINT len, CIMTYPE type, LONGLONG val return buf; default: - ERR( "unhandled type %u\n", type ); + ERR( "unhandled type %lu\n", type ); return NULL; } } @@ -1047,7 +1047,7 @@ VARTYPE to_vartype( CIMTYPE type ) case CIM_REAL32: return VT_R4; default: - ERR("unhandled type %u\n", type); + ERR( "unhandled type %lu\n", type ); break; } return 0; diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index eaa1db8bdde..81ed914ae2f 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -564,12 +564,12 @@ HRESULT reg_set_stringvalue( IWbemClassObject *obj, IWbemContext *context, IWbem } static void set_dwordvalue( HKEY root, const WCHAR *subkey, const WCHAR *name, DWORD value, IWbemContext *context, - VARIANT *retval ) + VARIANT *retval ) { HKEY hkey; LONG res; - TRACE("%p, %s, %s, %#x\n", root, debugstr_w(subkey), debugstr_w(name), value); + TRACE( "%p, %s, %s, %#lx\n", root, debugstr_w(subkey), debugstr_w(name), value ); if ((res = RegOpenKeyExW( root, subkey, 0, KEY_SET_VALUE | reg_get_access_mask( context ), &hkey ))) { diff --git a/dlls/wbemprox/service.c b/dlls/wbemprox/service.c index b0b7bce0872..a0988d83b54 100644 --- a/dlls/wbemprox/service.c +++ b/dlls/wbemprox/service.c @@ -45,7 +45,7 @@ static UINT map_error( DWORD error ) case ERROR_SERVICE_REQUEST_TIMEOUT: return 7; case ERROR_SERVICE_ALREADY_RUNNING: return 10; default: - WARN("unknown error %u\n", error); + WARN( "unknown error %lu\n", error ); break; } return 8; diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 5184bf4a4fa..9b9e1f37abd 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -122,8 +122,8 @@ static HRESULT WINAPI client_security_SetBlanket( const OLECHAR *princname = (pServerPrincName == COLE_DEFAULT_PRINCIPAL) ? L"<COLE_DEFAULT_PRINCIPAL>" : pServerPrincName; - FIXME("%p, %p, %u, %u, %s, %u, %u, %p, 0x%08x\n", iface, pProxy, AuthnSvc, AuthzSvc, - debugstr_w(princname), AuthnLevel, ImpLevel, pAuthInfo, Capabilities); + FIXME( "%p, %p, %lu, %lu, %s, %lu, %lu, %p, %#lx\n", iface, pProxy, AuthnSvc, AuthzSvc, + debugstr_w(princname), AuthnLevel, ImpLevel, pAuthInfo, Capabilities ); return WBEM_NO_ERROR; } @@ -290,8 +290,8 @@ static HRESULT WINAPI wbem_services_OpenNamespace( { struct wbem_services *ws = impl_from_IWbemServices( iface ); - TRACE("%p, %s, 0x%08x, %p, %p, %p\n", iface, debugstr_w(strNamespace), lFlags, - pCtx, ppWorkingNamespace, ppResult); + TRACE( "%p, %s, %#lx, %p, %p, %p\n", iface, debugstr_w(strNamespace), lFlags, + pCtx, ppWorkingNamespace, ppResult ); if (ws->ns != WBEMPROX_NAMESPACE_LAST || !strNamespace) return WBEM_E_INVALID_NAMESPACE; @@ -502,10 +502,10 @@ static HRESULT WINAPI wbem_services_GetObject( { struct wbem_services *services = impl_from_IWbemServices( iface ); - TRACE("%p, %s, 0x%08x, %p, %p, %p\n", iface, debugstr_w(strObjectPath), lFlags, - pCtx, ppObject, ppCallResult); + TRACE( "%p, %s, %#lx, %p, %p, %p\n", iface, debugstr_w(strObjectPath), lFlags, + pCtx, ppObject, ppCallResult ); - if (lFlags) FIXME("unsupported flags 0x%08x\n", lFlags); + if (lFlags) FIXME( "unsupported flags %#lx\n", lFlags ); if (!strObjectPath || !strObjectPath[0]) return create_class_object( services->ns, NULL, NULL, 0, NULL, ppObject ); @@ -645,9 +645,9 @@ static HRESULT WINAPI wbem_services_CreateInstanceEnum( struct path *path; HRESULT hr; - TRACE("%p, %s, 0%08x, %p, %p\n", iface, debugstr_w(strClass), lFlags, pCtx, ppEnum); + TRACE( "%p, %s, %#lx, %p, %p\n", iface, debugstr_w(strClass), lFlags, pCtx, ppEnum ); - if (lFlags) FIXME("unsupported flags 0x%08x\n", lFlags); + if (lFlags) FIXME( "unsupported flags %#lx\n", lFlags ); hr = parse_path( strClass, &path ); if (hr != S_OK) return hr; @@ -678,8 +678,8 @@ static HRESULT WINAPI wbem_services_ExecQuery( { struct wbem_services *services = impl_from_IWbemServices( iface ); - TRACE("%p, %s, %s, 0x%08x, %p, %p\n", iface, debugstr_w(strQueryLanguage), - debugstr_w(strQuery), lFlags, pCtx, ppEnum); + TRACE( "%p, %s, %s, %#lx, %p, %p\n", iface, debugstr_w(strQueryLanguage), + debugstr_w(strQuery), lFlags, pCtx, ppEnum ); if (!strQueryLanguage || !strQuery || !strQuery[0]) return WBEM_E_INVALID_PARAMETER; if (wcsicmp( strQueryLanguage, L"WQL" )) return WBEM_E_INVALID_QUERY_TYPE; @@ -724,8 +724,8 @@ static HRESULT WINAPI wbem_services_ExecQueryAsync( struct async_header *async; struct async_query *query; - TRACE("%p, %s, %s, 0x%08x, %p, %p\n", iface, debugstr_w(strQueryLanguage), debugstr_w(strQuery), - lFlags, pCtx, pResponseHandler); + TRACE( "%p, %s, %s, %#lx, %p, %p\n", iface, debugstr_w(strQueryLanguage), debugstr_w(strQuery), + lFlags, pCtx, pResponseHandler ); if (!pResponseHandler) return WBEM_E_INVALID_PARAMETER; @@ -794,8 +794,8 @@ static HRESULT WINAPI wbem_services_ExecNotificationQueryAsync( struct async_header *async; struct async_query *query; - TRACE("%p, %s, %s, 0x%08x, %p, %p\n", iface, debugstr_w(strQueryLanguage), debugstr_w(strQuery), - lFlags, pCtx, pResponseHandler); + TRACE( "%p, %s, %s, %#lx, %p, %p\n", iface, debugstr_w(strQueryLanguage), debugstr_w(strQuery), + lFlags, pCtx, pResponseHandler ); if (!pResponseHandler) return WBEM_E_INVALID_PARAMETER; @@ -857,10 +857,10 @@ static HRESULT WINAPI wbem_services_ExecMethod( struct table *table; HRESULT hr; - TRACE("%p, %s, %s, %08x, %p, %p, %p, %p\n", iface, debugstr_w(strObjectPath), - debugstr_w(strMethodName), lFlags, context, pInParams, ppOutParams, ppCallResult); + TRACE( "%p, %s, %s, %#lx, %p, %p, %p, %p\n", iface, debugstr_w(strObjectPath), + debugstr_w(strMethodName), lFlags, context, pInParams, ppOutParams, ppCallResult ); - if (lFlags) FIXME("flags %08x not supported\n", lFlags); + if (lFlags) FIXME( "flags %#lx not supported\n", lFlags ); if ((hr = parse_path( strObjectPath, &path )) != S_OK) return hr; if (!(str = query_from_path( path ))) @@ -1084,7 +1084,7 @@ static HRESULT WINAPI wbem_context_GetNames( LONG flags, SAFEARRAY **names ) { - FIXME("%p, %#x, %p\n", iface, flags, names); + FIXME( "%p, %#lx, %p\n", iface, flags, names ); return E_NOTIMPL; } @@ -1093,7 +1093,7 @@ static HRESULT WINAPI wbem_context_BeginEnumeration( IWbemContext *iface, LONG flags ) { - FIXME("%p, %#x\n", iface, flags); + FIXME( "%p, %#lx\n", iface, flags ); return E_NOTIMPL; } @@ -1104,7 +1104,7 @@ static HRESULT WINAPI wbem_context_Next( BSTR *name, VARIANT *value ) { - FIXME("%p, %#x, %p, %p\n", iface, flags, name, value); + FIXME( "%p, %#lx, %p, %p\n", iface, flags, name, value ); return E_NOTIMPL; } @@ -1139,7 +1139,7 @@ static HRESULT WINAPI wbem_context_SetValue( struct wbem_context_value *value; HRESULT hr; - TRACE("%p, %s, %#x, %s\n", iface, debugstr_w(name), flags, debugstr_variant(var)); + TRACE( "%p, %s, %#lx, %s\n", iface, debugstr_w(name), flags, debugstr_variant(var) ); if (!name || !var) return WBEM_E_INVALID_PARAMETER; @@ -1179,7 +1179,7 @@ static HRESULT WINAPI wbem_context_GetValue( struct wbem_context *context = impl_from_IWbemContext( iface ); struct wbem_context_value *value; - TRACE("%p, %s, %#x, %p\n", iface, debugstr_w(name), flags, var); + TRACE( "%p, %s, %#lx, %p\n", iface, debugstr_w(name), flags, var ); if (!name || !var) return WBEM_E_INVALID_PARAMETER; @@ -1196,7 +1196,7 @@ static HRESULT WINAPI wbem_context_DeleteValue( LPCWSTR name, LONG flags ) { - FIXME("%p, %s, %#x\n", iface, debugstr_w(name), flags); + FIXME( "%p, %s, %#lx\n", iface, debugstr_w(name), flags ); return E_NOTIMPL; } diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index d08646a1c50..005c7678170 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -70,7 +70,7 @@ UINT get_type_size( CIMTYPE type ) case CIM_REAL32: return sizeof(FLOAT); default: - ERR("unhandled type %u\n", type); + ERR( "unhandled type %lu\n", type ); break; } return sizeof(LONGLONG); @@ -250,7 +250,7 @@ HRESULT set_value( const struct table *table, UINT row, UINT column, LONGLONG va *(UINT64 *)ptr = val; break; default: - FIXME("unhandled column type %u\n", type); + FIXME( "unhandled column type %lu\n", type ); return WBEM_E_FAILED; } return S_OK; diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c index 58cb4a86991..32408cf6a90 100644 --- a/dlls/wbemprox/wbemlocator.c +++ b/dlls/wbemprox/wbemlocator.c @@ -165,8 +165,8 @@ static HRESULT WINAPI wbem_locator_ConnectServer( HRESULT hr; WCHAR *server, *namespace; - TRACE("%p, %s, %s, %s, %s, 0x%08x, %s, %p, %p)\n", iface, debugstr_w(NetworkResource), debugstr_w(User), - debugstr_w(Password), debugstr_w(Locale), SecurityFlags, debugstr_w(Authority), context, ppNamespace); + TRACE( "%p, %s, %s, %s, %s, %#lx, %s, %p, %p)\n", iface, debugstr_w(NetworkResource), debugstr_w(User), + debugstr_w(Password), debugstr_w(Locale), SecurityFlags, debugstr_w(Authority), context, ppNamespace ); hr = parse_resource( NetworkResource, &server, &namespace ); if (hr != S_OK) return hr; -- 2.30.2

1 0

[PATCH] ntoskrnl.exe/tests: Fix some memory leaks (Valgrind).
by Sven Baars Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index f53663f17d0..6207ce00ccb 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -235,11 +235,15 @@ static void testsign_cleanup(struct testsign_context *ctx) ret = CertDeleteCertificateFromStore(ctx->root_cert); ok(ret, "Failed to remove certificate, error %u\n", GetLastError()); + ret = CertFreeCertificateContext(ctx->root_cert); + ok(ret, "Failed to free certificate context, error %u\n", GetLastError()); ret = CertCloseStore(ctx->root_store, CERT_CLOSE_STORE_CHECK_FLAG); ok(ret, "Failed to close store, error %u\n", GetLastError()); ret = CertDeleteCertificateFromStore(ctx->publisher_cert); ok(ret, "Failed to remove certificate, error %u\n", GetLastError()); + ret = CertFreeCertificateContext(ctx->publisher_cert); + ok(ret, "Failed to free certificate context, error %u\n", GetLastError()); ret = CertCloseStore(ctx->publisher_store, CERT_CLOSE_STORE_CHECK_FLAG); ok(ret, "Failed to close store, error %u\n", GetLastError()); @@ -1360,6 +1364,8 @@ static void add_file_to_catalog(HANDLE catalog, const WCHAR *file) sizeof(L"2:6.0"), (BYTE *)L"2:6.0"); ok(ret, "Failed to write attr, error %u\n", GetLastError()); } + + free(indirect_data); } static const GUID bus_class = {0xdeadbeef, 0x29ef, 0x4538, {0xa5, 0xfd, 0xb6, 0x95, 0x73, 0xa3, 0x62, 0xc1}}; @@ -1816,6 +1822,8 @@ static void test_pnp_driver(struct testsign_context *ctx) ok(ret, "failed to remove device, error %#x\n", GetLastError()); } + SetupDiDestroyDeviceInfoList(set); + /* Windows stops the service but does not delete it. */ manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_CONNECT); ok(!!manager, "failed to open service manager, error %u\n", GetLastError()); -- 2.30.0.335.ge6362826a0

2 2

[PATCH resend] comctl32/tests: Drop mru test workarounds for Windows <= 2000
by Alex Henrie Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/comctl32/tests/mru.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c index 87677b33902..6a9a04d9663 100644 --- a/dlls/comctl32/tests/mru.c +++ b/dlls/comctl32/tests/mru.c @@ -340,15 +340,11 @@ static void test_MRUListA(void) iRet, GetLastError()); /* Add (NULL string) */ - if (0) - { - /* Some native versions crash when passed NULL or fail to SetLastError() */ SetLastError(0); iRet = pAddMRUStringA(hMRU, NULL); - ok(iRet == 0 && GetLastError() == ERROR_INVALID_PARAMETER, - "AddMRUStringA(NULL str) expected 0,ERROR_INVALID_PARAMETER got %d,%d\n", + todo_wine ok(iRet == 0 && !GetLastError(), + "AddMRUStringA(NULL str) expected 0,0 got %d,%d\n", iRet, GetLastError()); - } /* Add 3 strings. Check the registry is correct after each add */ SetLastError(0); @@ -450,7 +446,7 @@ static void test_MRUListA(void) pFreeMRUList(hMRU); } - /* FreeMRUList(NULL) crashes on Win98 OSR0 */ + pFreeMRUList(NULL); /* should not crash */ } typedef struct { @@ -504,13 +500,9 @@ static void test_EnumMRUList(void) return; } - /* NULL handle */ - if (0) - { - /* crashes on NT4, passed on Win2k, XP, 2k3, Vista, 2k8 */ - pEnumMRUListA(NULL, 0, NULL, 0); - pEnumMRUListW(NULL, 0, NULL, 0); - } + /* NULL handle - should not crash */ + pEnumMRUListA(NULL, 0, NULL, 0); + pEnumMRUListW(NULL, 0, NULL, 0); } static void test_FindMRUData(void) -- 2.35.1

1 0

[PATCH v2 1/4] d3dx9: Do not use d3dx_effect_cleanup() in D3DXCreateEffectEx().
by Zebediah Figura Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dx9_36/effect.c | 57 +++++++++++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 310e5c0bf17..6ea138e632f 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -6422,15 +6422,6 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev effect->ID3DXEffect_iface.lpVtbl = &ID3DXEffect_Vtbl; effect->ref = 1; - if (pool) - { - effect->pool = unsafe_impl_from_ID3DXEffectPool(pool); - pool->lpVtbl->AddRef(pool); - } - - IDirect3DDevice9_AddRef(device); - effect->device = device; - effect->flags = flags; list_init(&effect->parameter_block_list); @@ -6487,6 +6478,15 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev TRACE("Tag: %x\n", tag); } + if (pool) + { + effect->pool = unsafe_impl_from_ID3DXEffectPool(pool); + pool->lpVtbl->AddRef(pool); + } + + IDirect3DDevice9_AddRef(device); + effect->device = device; + if (skip_constants_string) { skip_constants_buffer = HeapAlloc(GetProcessHeap(), 0, @@ -6495,7 +6495,8 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev { if (bytecode) ID3D10Blob_Release(bytecode); - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto fail; } strcpy(skip_constants_buffer, skip_constants_string); @@ -6504,7 +6505,8 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev HeapFree(GetProcessHeap(), 0, skip_constants_buffer); if (bytecode) ID3D10Blob_Release(bytecode); - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto fail; } } read_dword(&ptr, &offset); @@ -6518,7 +6520,7 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev FIXME("Failed to parse effect.\n"); HeapFree(GetProcessHeap(), 0, skip_constants_buffer); HeapFree(GetProcessHeap(), 0, skip_constants); - return hr; + goto fail; } for (i = 0; i < skip_constants_count; ++i) @@ -6535,7 +6537,8 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev debugstr_a(skip_constants[i]), j); HeapFree(GetProcessHeap(), 0, skip_constants_buffer); HeapFree(GetProcessHeap(), 0, skip_constants); - return D3DERR_INVALIDCALL; + hr = D3DERR_INVALIDCALL; + goto fail; } } } @@ -6557,6 +6560,33 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev } return D3D_OK; + +fail: + if (effect->techniques) + { + for (i = 0; i < effect->technique_count; ++i) + free_technique(&effect->techniques[i]); + heap_free(effect->techniques); + } + + if (effect->parameters) + { + for (i = 0; i < effect->parameter_count; ++i) + free_top_level_parameter(&effect->parameters[i]); + heap_free(effect->parameters); + } + + if (effect->objects) + { + for (i = 0; i < effect->object_count; ++i) + free_object(&effect->objects[i]); + heap_free(effect->objects); + } + + IDirect3DDevice9_Release(effect->device); + if (pool) + pool->lpVtbl->Release(pool); + return hr; } HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *srcdata, UINT srcdatalen, @@ -6593,7 +6623,6 @@ HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *s if (FAILED(hr)) { WARN("Failed to create effect object, hr %#x.\n", hr); - d3dx_effect_cleanup(object); return hr; } -- 2.34.1

3 8

[PATCH vkd3d] vkd3d: Lock the heap mutex while binding heap memory.
by Conor McCarthy Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/resource.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 19a163be..dff785da 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1941,11 +1941,17 @@ static HRESULT vkd3d_bind_heap_memory(struct d3d12_device *device, goto allocate_memory; } + /* Syncronisation is not required for binding, but vkMapMemory() may be called + * and it requires exclusive access. */ + pthread_mutex_lock(&heap->mutex); + if (d3d12_resource_is_buffer(resource)) vr = VK_CALL(vkBindBufferMemory(vk_device, resource->u.vk_buffer, heap->vk_memory, heap_offset)); else vr = VK_CALL(vkBindImageMemory(vk_device, resource->u.vk_image, heap->vk_memory, heap_offset)); + pthread_mutex_unlock(&heap->mutex); + if (vr == VK_SUCCESS) { resource->heap = heap; -- 2.34.1

1 0

[PATCH 1/5] kernelbase: Include the null terminator in the length passed to WideCharToMultiByte() in UrlGetPartA().
by Zebediah Figura Feb. 13, 2022

Feb. 13, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/kernelbase/path.c | 4 ++-- dlls/shlwapi/tests/url.c | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 7cfff358fdb..15280a7ea4b 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4148,10 +4148,10 @@ HRESULT WINAPI UrlGetPartA(const char *url, char *out, DWORD *out_len, DWORD par return hr; } - len2 = WideCharToMultiByte(CP_ACP, 0, outW, len, NULL, 0, NULL, NULL); + len2 = WideCharToMultiByte(CP_ACP, 0, outW, len + 1, NULL, 0, NULL, NULL); if (len2 > *out_len) { - *out_len = len2 + 1; + *out_len = len2; heap_free(inW); return E_POINTER; } diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 212ee039a0b..b4b66aec2f1 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -782,7 +782,7 @@ static void test_UrlGetPart(void) size = 1; strcpy(buffer, "x"); hr = UrlGetPartA(url, buffer, &size, part, flags); - todo_wine_if (tests[i].todo_hr || !strcmp(url, "http://host?a:b(a)c:d")) + todo_wine_if (tests[i].todo_hr) { if (tests[i].hr == S_OK) ok(hr == E_POINTER, "Got hr %#x.\n", hr); @@ -807,11 +807,9 @@ static void test_UrlGetPart(void) } else { - todo_wine_if (hr == S_OK) - ok(size == 1, "Got size %u.\n", size); + ok(size == 1, "Got size %u.\n", size); } - todo_wine_if (hr == S_OK) - ok(!strcmp(buffer, "x"), "Got result %s.\n", debugstr_a(buffer)); + ok(!strcmp(buffer, "x"), "Got result %s.\n", debugstr_a(buffer)); } size = sizeof(buffer); -- 2.34.1

1 4

Wine staging 7.2 release
by Alistair Leslie-Hughes Feb. 13, 2022

Feb. 13, 2022

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 7.2 (567 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * d3dx9_*: Add D3DXSHProjectCubeMap stub Added: * [47331] Stop Steam browser flickering. Updated: * xactengine3_7-callbacks * winepulse-PulseAudio_Support Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 1/4] d3dx9: Return D3DERR_INVALIDCALL from ID3DXEffect::BeginPass() if the effect is not started.
by Zebediah Figura Feb. 12, 2022

Feb. 12, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dx9_36/effect.c | 6 ++++++ dlls/d3dx9_36/tests/effect.c | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 22afa649db3..e623c10035a 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4001,6 +4001,12 @@ static HRESULT WINAPI d3dx_effect_BeginPass(ID3DXEffect *iface, UINT pass) TRACE("iface %p, pass %u\n", effect, pass); + if (!effect->started) + { + WARN("Effect is not started, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } + if (technique && pass < technique->pass_count && !effect->active_pass) { HRESULT hr; diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index ea90299f936..d4efc1101d9 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -3081,6 +3081,12 @@ static void test_effect_states(IDirect3DDevice9 *device) NULL, NULL, 0, NULL, &effect, NULL); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); + hr = effect->lpVtbl->End(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = effect->lpVtbl->BeginPass(effect, 0); + ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); + /* State affected in passes saved/restored even if no pass was performed. States not present in passes are not saved & restored */ -- 2.34.1

3 10

[PATCH] oleaut32: Build without -DWINE_NO_LONG_TYPES.
by Nikolay Sivov Feb. 12, 2022

Feb. 12, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/Makefile.in | 2 +- dlls/oleaut32/connpt.c | 120 +++-------------- dlls/oleaut32/dispatch.c | 13 +- dlls/oleaut32/hash.c | 4 +- dlls/oleaut32/oleaut.c | 10 +- dlls/oleaut32/olefont.c | 53 +++----- dlls/oleaut32/olepicture.c | 79 ++++------- dlls/oleaut32/olepropframe.c | 10 +- dlls/oleaut32/recinfo.c | 23 ++-- dlls/oleaut32/safearray.c | 20 +-- dlls/oleaut32/typelib.c | 254 +++++++++++++++-------------------- dlls/oleaut32/usrmarshal.c | 97 ++++++------- dlls/oleaut32/varformat.c | 36 ++--- dlls/oleaut32/variant.c | 40 +++--- dlls/oleaut32/vartype.c | 24 ++-- 15 files changed, 312 insertions(+), 473 deletions(-) diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in index d9e7c7df332..a7dea7a37c7 100644 --- a/dlls/oleaut32/Makefile.in +++ b/dlls/oleaut32/Makefile.in @@ -2,7 +2,7 @@ MODULE = oleaut32.dll IMPORTLIB = oleaut32 IMPORTS = uuid ole32 rpcrt4 user32 gdi32 advapi32 DELAYIMPORTS = comctl32 urlmon windowscodecs -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_OLEAUT32_ +EXTRADEFS = -D_OLEAUT32_ C_SRCS = \ connpt.c \ diff --git a/dlls/oleaut32/connpt.c b/dlls/oleaut32/connpt.c index 0405d3857c8..993f2d9cf08 100644 --- a/dlls/oleaut32/connpt.c +++ b/dlls/oleaut32/connpt.c @@ -101,9 +101,6 @@ static inline EnumConnectionsImpl *impl_from_IEnumConnections(IEnumConnections * return CONTAINING_RECORD(iface, EnumConnectionsImpl, IEnumConnections_iface); } -/************************************************************************ - * ConnectionPointImpl_Destroy - */ static void ConnectionPointImpl_Destroy(ConnectionPointImpl *Obj) { DWORD i; @@ -118,11 +115,6 @@ static void ConnectionPointImpl_Destroy(ConnectionPointImpl *Obj) return; } -/************************************************************************ - * ConnectionPointImpl_QueryInterface (IUnknown) - * - * See Windows documentation for more details on IUnknown methods. - */ static HRESULT WINAPI ConnectionPointImpl_QueryInterface( IConnectionPoint* iface, REFIID riid, @@ -160,47 +152,29 @@ static HRESULT WINAPI ConnectionPointImpl_QueryInterface( return S_OK; } - -/************************************************************************ - * ConnectionPointImpl_AddRef (IUnknown) - * - * See Windows documentation for more details on IUnknown methods. - */ static ULONG WINAPI ConnectionPointImpl_AddRef(IConnectionPoint* iface) { ConnectionPointImpl *This = impl_from_IConnectionPoint(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%d)\n", This, refCount - 1); + TRACE("%p, refcount %lu.\n", iface, refCount); return refCount; } -/************************************************************************ - * ConnectionPointImpl_Release (IUnknown) - * - * See Windows documentation for more details on IUnknown methods. - */ static ULONG WINAPI ConnectionPointImpl_Release( IConnectionPoint* iface) { ConnectionPointImpl *This = impl_from_IConnectionPoint(iface); ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%d)\n", This, refCount + 1); + TRACE("%p, refcount %lu.\n", iface, refCount); - /* - * If the reference count goes down to 0, perform suicide. - */ if (!refCount) ConnectionPointImpl_Destroy(This); return refCount; } -/************************************************************************ - * ConnectionPointImpl_GetConnectionInterface (IConnectionPoint) - * - */ static HRESULT WINAPI ConnectionPointImpl_GetConnectionInterface( IConnectionPoint *iface, IID *piid) @@ -211,10 +185,6 @@ static HRESULT WINAPI ConnectionPointImpl_GetConnectionInterface( return S_OK; } -/************************************************************************ - * ConnectionPointImpl_GetConnectionPointContainer (IConnectionPoint) - * - */ static HRESULT WINAPI ConnectionPointImpl_GetConnectionPointContainer( IConnectionPoint *iface, IConnectionPointContainer **ppCPC) @@ -225,10 +195,6 @@ static HRESULT WINAPI ConnectionPointImpl_GetConnectionPointContainer( return IUnknown_QueryInterface(This->Obj, &IID_IConnectionPointContainer, (void**)ppCPC); } -/************************************************************************ - * ConnectionPointImpl_Advise (IConnectionPoint) - * - */ static HRESULT WINAPI ConnectionPointImpl_Advise(IConnectionPoint *iface, IUnknown *lpUnk, DWORD *pdwCookie) @@ -258,15 +224,11 @@ static HRESULT WINAPI ConnectionPointImpl_Advise(IConnectionPoint *iface, } -/************************************************************************ - * ConnectionPointImpl_Unadvise (IConnectionPoint) - * - */ -static HRESULT WINAPI ConnectionPointImpl_Unadvise(IConnectionPoint *iface, - DWORD dwCookie) +static HRESULT WINAPI ConnectionPointImpl_Unadvise(IConnectionPoint *iface, DWORD dwCookie) { ConnectionPointImpl *This = impl_from_IConnectionPoint(iface); - TRACE("(%p)->(%d)\n", This, dwCookie); + + TRACE("%p, %#lx.\n", iface, dwCookie); if(dwCookie == 0 || dwCookie > This->maxSinks) return E_INVALIDARG; @@ -278,13 +240,7 @@ static HRESULT WINAPI ConnectionPointImpl_Unadvise(IConnectionPoint *iface, return S_OK; } -/************************************************************************ - * ConnectionPointImpl_EnumConnections (IConnectionPoint) - * - */ -static HRESULT WINAPI ConnectionPointImpl_EnumConnections( - IConnectionPoint *iface, - LPENUMCONNECTIONS *ppEnum) +static HRESULT WINAPI ConnectionPointImpl_EnumConnections(IConnectionPoint *iface, IEnumConnections **ppEnum) { ConnectionPointImpl *This = impl_from_IConnectionPoint(iface); CONNECTDATA *pCD; @@ -337,9 +293,6 @@ static const IConnectionPointVtbl ConnectionPointImpl_VTable = static const IEnumConnectionsVtbl EnumConnectionsImpl_VTable; -/************************************************************************ - * EnumConnectionsImpl_Construct - */ static EnumConnectionsImpl *EnumConnectionsImpl_Construct(IUnknown *pUnk, DWORD nSinks, CONNECTDATA *pCD) @@ -361,9 +314,6 @@ static EnumConnectionsImpl *EnumConnectionsImpl_Construct(IUnknown *pUnk, return Obj; } -/************************************************************************ - * EnumConnectionsImpl_Destroy - */ static void EnumConnectionsImpl_Destroy(EnumConnectionsImpl *Obj) { DWORD i; @@ -376,11 +326,6 @@ static void EnumConnectionsImpl_Destroy(EnumConnectionsImpl *Obj) return; } -/************************************************************************ - * EnumConnectionsImpl_QueryInterface (IUnknown) - * - * See Windows documentation for more details on IUnknown methods. - */ static HRESULT WINAPI EnumConnectionsImpl_QueryInterface( IEnumConnections* iface, REFIID riid, @@ -417,56 +362,37 @@ static HRESULT WINAPI EnumConnectionsImpl_QueryInterface( return S_OK; } - -/************************************************************************ - * EnumConnectionsImpl_AddRef (IUnknown) - * - * See Windows documentation for more details on IUnknown methods. - */ static ULONG WINAPI EnumConnectionsImpl_AddRef(IEnumConnections* iface) { EnumConnectionsImpl *This = impl_from_IEnumConnections(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%d)\n", This, refCount - 1); + TRACE("%p, refcount %lu.\n", iface, refCount); IUnknown_AddRef(This->pUnk); return refCount; } -/************************************************************************ - * EnumConnectionsImpl_Release (IUnknown) - * - * See Windows documentation for more details on IUnknown methods. - */ static ULONG WINAPI EnumConnectionsImpl_Release(IEnumConnections* iface) { EnumConnectionsImpl *This = impl_from_IEnumConnections(iface); ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%d)\n", This, refCount + 1); + TRACE("%p, refcount %lu.\n", iface, refCount); IUnknown_Release(This->pUnk); - /* - * If the reference count goes down to 0, perform suicide. - */ if (!refCount) EnumConnectionsImpl_Destroy(This); return refCount; } -/************************************************************************ - * EnumConnectionsImpl_Next (IEnumConnections) - * - */ -static HRESULT WINAPI EnumConnectionsImpl_Next(IEnumConnections* iface, - ULONG cConn, LPCONNECTDATA pCD, - ULONG *pEnum) +static HRESULT WINAPI EnumConnectionsImpl_Next(IEnumConnections* iface, ULONG cConn, LPCONNECTDATA pCD, ULONG *pEnum) { EnumConnectionsImpl *This = impl_from_IEnumConnections(iface); DWORD nRet = 0; - TRACE("(%p)->(%d, %p, %p)\n", This, cConn, pCD, pEnum); + + TRACE("%p, %lu, %p, %p.\n", iface, cConn, pCD, pEnum); if(pEnum == NULL) { if(cConn != 1) @@ -491,16 +417,11 @@ static HRESULT WINAPI EnumConnectionsImpl_Next(IEnumConnections* iface, return S_OK; } - -/************************************************************************ - * EnumConnectionsImpl_Skip (IEnumConnections) - * - */ -static HRESULT WINAPI EnumConnectionsImpl_Skip(IEnumConnections* iface, - ULONG cSkip) +static HRESULT WINAPI EnumConnectionsImpl_Skip(IEnumConnections* iface, ULONG cSkip) { EnumConnectionsImpl *This = impl_from_IEnumConnections(iface); - TRACE("(%p)->(%d)\n", This, cSkip); + + TRACE("%p, %lu.\n", iface, cSkip); if(This->nCur + cSkip >= This->nConns) return S_FALSE; @@ -510,11 +431,6 @@ static HRESULT WINAPI EnumConnectionsImpl_Skip(IEnumConnections* iface, return S_OK; } - -/************************************************************************ - * EnumConnectionsImpl_Reset (IEnumConnections) - * - */ static HRESULT WINAPI EnumConnectionsImpl_Reset(IEnumConnections* iface) { EnumConnectionsImpl *This = impl_from_IEnumConnections(iface); @@ -525,13 +441,7 @@ static HRESULT WINAPI EnumConnectionsImpl_Reset(IEnumConnections* iface) return S_OK; } - -/************************************************************************ - * EnumConnectionsImpl_Clone (IEnumConnections) - * - */ -static HRESULT WINAPI EnumConnectionsImpl_Clone(IEnumConnections* iface, - LPENUMCONNECTIONS *ppEnum) +static HRESULT WINAPI EnumConnectionsImpl_Clone(IEnumConnections* iface, IEnumConnections **ppEnum) { EnumConnectionsImpl *This = impl_from_IEnumConnections(iface); EnumConnectionsImpl *newObj; diff --git a/dlls/oleaut32/dispatch.c b/dlls/oleaut32/dispatch.c index 39d6fddee51..7fa96e5af83 100644 --- a/dlls/oleaut32/dispatch.c +++ b/dlls/oleaut32/dispatch.c @@ -248,7 +248,7 @@ static ULONG WINAPI StdDispatch_AddRef(LPDISPATCH iface) StdDispatch *This = impl_from_IDispatch(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n",This, refCount - 1); + TRACE("%p, refcount %lu.\n", iface, refCount); return refCount; } @@ -263,7 +263,7 @@ static ULONG WINAPI StdDispatch_Release(LPDISPATCH iface) StdDispatch *This = impl_from_IDispatch(iface); ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); + TRACE("%p, refcount %lu.\n", iface, refCount); if (!refCount) { @@ -319,7 +319,8 @@ static HRESULT WINAPI StdDispatch_GetTypeInfoCount(LPDISPATCH iface, UINT * pcti static HRESULT WINAPI StdDispatch_GetTypeInfo(LPDISPATCH iface, UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo) { StdDispatch *This = impl_from_IDispatch(iface); - TRACE("(%d, %x, %p)\n", iTInfo, lcid, ppTInfo); + + TRACE("%d, %#lx, %p.\n", iTInfo, lcid, ppTInfo); *ppTInfo = NULL; if (iTInfo != 0) @@ -360,7 +361,8 @@ static HRESULT WINAPI StdDispatch_GetTypeInfo(LPDISPATCH iface, UINT iTInfo, LCI static HRESULT WINAPI StdDispatch_GetIDsOfNames(LPDISPATCH iface, REFIID riid, LPOLESTR * rgszNames, UINT cNames, LCID lcid, DISPID * rgDispId) { StdDispatch *This = impl_from_IDispatch(iface); - TRACE("(%s, %p, %d, 0x%x, %p)\n", debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + TRACE("%s, %p, %d, %#lx, %p.\n", debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); if (!IsEqualGUID(riid, &IID_NULL)) { @@ -398,7 +400,8 @@ static HRESULT WINAPI StdDispatch_Invoke(LPDISPATCH iface, DISPID dispIdMember, EXCEPINFO * pExcepInfo, UINT * puArgErr) { StdDispatch *This = impl_from_IDispatch(iface); - TRACE("(%d, %s, 0x%x, 0x%x, %p, %p, %p, %p)\n", dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + TRACE("%ld, %s, %#lx, 0x%x, %p, %p, %p, %p.\n", dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); if (!IsEqualGUID(riid, &IID_NULL)) { diff --git a/dlls/oleaut32/hash.c b/dlls/oleaut32/hash.c index 43043980adb..f1df69ef5e3 100644 --- a/dlls/oleaut32/hash.c +++ b/dlls/oleaut32/hash.c @@ -509,7 +509,7 @@ ULONG WINAPI LHashValOfNameSysA( SYSKIND skind, LCID lcid, LPCSTR lpStr) ULONG nHiWord, nLoWord = 0x0deadbee; const unsigned char *str = (const unsigned char *)lpStr, *pnLookup = NULL; - TRACE("(%d, 0x%x, %s) %s\n", skind, lcid, debugstr_a(lpStr), + TRACE("%d, %#lx, %s, %s.\n", skind, lcid, debugstr_a(lpStr), (skind == SYS_WIN16) ? "SYS_WIN16" : (skind == SYS_WIN32) ? "SYS_WIN32" : ""); if (!str) @@ -520,7 +520,7 @@ ULONG WINAPI LHashValOfNameSysA( SYSKIND skind, LCID lcid, LPCSTR lpStr) switch (PRIMARYLANGID(LANGIDFROMLCID(lcid))) { default: - ERR("Unknown lcid %x, treating as latin-based, please report\n", lcid); + ERR("Unknown lcid %lx, treating as latin-based, please report\n", lcid); /* .. Fall Through .. */ case LANG_AFRIKAANS: case LANG_ALBANIAN: case LANG_ARMENIAN: case LANG_ASSAMESE: case LANG_AZERI: case LANG_BASQUE: diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index c29e64a4091..858622c833c 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -691,7 +691,7 @@ HRESULT WINAPI OleTranslateColor( COLORREF colorref; BYTE b = HIBYTE(HIWORD(clr)); - TRACE("(%08x, %p, %p)\n", clr, hpal, pColorRef); + TRACE("%#lx, %p, %p.\n", clr, hpal, pColorRef); /* * In case pColorRef is NULL, provide our own to simplify the code. @@ -814,7 +814,7 @@ static BOOL actctx_get_typelib_module(REFIID iid, WCHAR *module, DWORD len) if (tlib->name_len/sizeof(WCHAR) >= len) { - ERR("need larger module buffer, %u\n", tlib->name_len); + ERR("need larger module buffer, %lu.\n", tlib->name_len); return FALSE; } @@ -979,7 +979,7 @@ static HRESULT WINAPI dispatch_typelib_ps_CreateProxy(IPSFactoryBuffer *iface, hr = dispatch_create_proxy(outer, proxy, out); if (FAILED(hr)) - ERR("Failed to create proxy, hr %#x.\n", hr); + ERR("Failed to create proxy, hr %#lx.\n", hr); ITypeInfo_ReleaseTypeAttr(typeinfo, attr); ITypeInfo_Release(typeinfo); @@ -1025,7 +1025,7 @@ static HRESULT WINAPI dispatch_typelib_ps_CreateStub(IPSFactoryBuffer *iface, hr = dispatch_create_stub(server, stub); if (FAILED(hr)) - ERR("Failed to create proxy, hr %#x.\n", hr); + ERR("Failed to create proxy, hr %#lx.\n", hr); ITypeInfo_ReleaseTypeAttr(typeinfo, attr); ITypeInfo_Release(typeinfo); @@ -1173,7 +1173,7 @@ HRESULT WINAPI GetAltMonthNames(LCID lcid, LPOLESTR **str) NULL }; - TRACE("%#x, %p\n", lcid, str); + TRACE("%#lx, %p.\n", lcid, str); if (PRIMARYLANGID(LANGIDFROMLCID(lcid)) == LANG_ARABIC) *str = (LPOLESTR *)arabic_hijri; diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index f071d00c602..28cfcdf933c 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -489,28 +489,20 @@ static HRESULT WINAPI OLEFontImpl_QueryInterface( return S_OK; } -/************************************************************************ - * OLEFontImpl_AddRef (IUnknown) - */ -static ULONG WINAPI OLEFontImpl_AddRef( - IFont* iface) +static ULONG WINAPI OLEFontImpl_AddRef(IFont* iface) { OLEFontImpl *this = impl_from_IFont(iface); - TRACE("(%p)->(ref=%d)\n", this, this->ref); - return InterlockedIncrement(&this->ref); + ULONG ref = InterlockedIncrement(&this->ref); + TRACE("%p, refcount %lu.\n", iface, ref); + return ref; } -/************************************************************************ - * OLEFontImpl_Release (IUnknown) - */ static ULONG WINAPI OLEFontImpl_Release(IFont* iface) { OLEFontImpl *this = impl_from_IFont(iface); - ULONG ref; + ULONG ref = InterlockedDecrement(&this->ref); - TRACE("(%p)->(ref=%d)\n", this, this->ref); - - ref = InterlockedDecrement(&this->ref); + TRACE("%p, refcount %lu.\n", iface, ref); if (ref == 0) { @@ -712,15 +704,10 @@ static HRESULT WINAPI OLEFontImpl_get_Size( return S_OK; } -/************************************************************************ - * OLEFontImpl_put_Size (IFont) - */ -static HRESULT WINAPI OLEFontImpl_put_Size( - IFont* iface, - CY size) +static HRESULT WINAPI OLEFontImpl_put_Size(IFont *iface, CY size) { OLEFontImpl *this = impl_from_IFont(iface); - TRACE("(%p)->(%d)\n", this, size.s.Lo); + TRACE("%p, %ld.\n", iface, size.s.Lo); this->description.cySize.s.Hi = 0; this->description.cySize.s.Lo = size.s.Lo; OLEFont_SendNotify(this, DISPID_FONT_SIZE); @@ -728,14 +715,7 @@ static HRESULT WINAPI OLEFontImpl_put_Size( return S_OK; } -/************************************************************************ - * OLEFontImpl_get_Bold (IFont) - * - * See Windows documentation for more details on IFont methods. - */ -static HRESULT WINAPI OLEFontImpl_get_Bold( - IFont* iface, - BOOL* pbold) +static HRESULT WINAPI OLEFontImpl_get_Bold(IFont *iface, BOOL *pbold) { OLEFontImpl *this = impl_from_IFont(iface); TRACE("(%p)->(%p)\n", this, pbold); @@ -1063,7 +1043,8 @@ static HRESULT WINAPI OLEFontImpl_SetRatio( LONG cyHimetric) { OLEFontImpl *this = impl_from_IFont(iface); - TRACE("(%p)->(%d, %d)\n", this, cyLogical, cyHimetric); + + TRACE("%p, %ld, %ld.\n", iface, cyLogical, cyHimetric); if(cyLogical == 0 || cyHimetric == 0) return E_FAIL; @@ -1243,9 +1224,9 @@ static HRESULT WINAPI OLEFontImpl_GetTypeInfo( } hres = ITypeLib_GetTypeInfoOfGuid(tl, &IID_IFontDisp, ppTInfo); ITypeLib_Release(tl); - if (FAILED(hres)) { - FIXME("Did not IDispatch typeinfo from typelib, hres %x\n",hres); - } + if (FAILED(hres)) + FIXME("Did not IDispatch typeinfo from typelib, hres %#lx.\n", hres); + return hres; } @@ -1302,7 +1283,7 @@ static HRESULT WINAPI OLEFontImpl_Invoke( OLEFontImpl *this = impl_from_IDispatch(iface); HRESULT hr; - TRACE("%p->(%d,%s,0x%x,0x%x,%p,%p,%p,%p)\n", this, dispIdMember, + TRACE("%p, %ld, %s, %#lx, %#x, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); @@ -1499,7 +1480,7 @@ static HRESULT WINAPI OLEFontImpl_Invoke( } break; default: - ERR("member not found for dispid 0x%x\n", dispIdMember); + ERR("member not found for dispid %#lx.\n", dispIdMember); return DISP_E_MEMBERNOTFOUND; } } @@ -2006,7 +1987,7 @@ static HRESULT WINAPI OLEFontImpl_IPersistPropertyBag_Load( } if (FAILED(iRes)) - WARN("-- 0x%08x\n", iRes); + WARN("-- %#lx.\n", iRes); return iRes; } diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 5dac8e4ee61..2f9e27042d9 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -401,49 +401,30 @@ static void OLEPictureImpl_Destroy(OLEPictureImpl* Obj) HeapFree(GetProcessHeap(), 0, Obj); } - -/************************************************************************ - * OLEPictureImpl_AddRef (IUnknown) - * - * See Windows documentation for more details on IUnknown methods. - */ static ULONG WINAPI OLEPictureImpl_AddRef( IPicture* iface) { OLEPictureImpl *This = impl_from_IPicture(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%d)\n", This, refCount - 1); + TRACE("%p, refcount %lu.\n", iface, refCount); return refCount; } -/************************************************************************ - * OLEPictureImpl_Release (IUnknown) - * - * See Windows documentation for more details on IUnknown methods. - */ static ULONG WINAPI OLEPictureImpl_Release( IPicture* iface) { OLEPictureImpl *This = impl_from_IPicture(iface); ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%d)\n", This, refCount + 1); + TRACE("%p, refcount %lu.\n", iface, refCount); - /* - * If the reference count goes down to 0, perform suicide. - */ if (!refCount) OLEPictureImpl_Destroy(This); return refCount; } -/************************************************************************ - * OLEPictureImpl_QueryInterface (IUnknown) - * - * See Windows documentation for more details on IUnknown methods. - */ static HRESULT WINAPI OLEPictureImpl_QueryInterface( IPicture* iface, REFIID riid, @@ -578,26 +559,18 @@ static HRESULT WINAPI OLEPictureImpl_get_Type(IPicture *iface, return S_OK; } -/************************************************************************ - * OLEPictureImpl_get_Width - */ -static HRESULT WINAPI OLEPictureImpl_get_Width(IPicture *iface, - OLE_XSIZE_HIMETRIC *pwidth) +static HRESULT WINAPI OLEPictureImpl_get_Width(IPicture *iface, OLE_XSIZE_HIMETRIC *pwidth) { OLEPictureImpl *This = impl_from_IPicture(iface); - TRACE("(%p)->(%p): width is %d\n", This, pwidth, This->himetricWidth); + TRACE("%p, %p.\n", iface, pwidth); *pwidth = This->himetricWidth; return S_OK; } -/************************************************************************ - * OLEPictureImpl_get_Height - */ -static HRESULT WINAPI OLEPictureImpl_get_Height(IPicture *iface, - OLE_YSIZE_HIMETRIC *pheight) +static HRESULT WINAPI OLEPictureImpl_get_Height(IPicture *iface, OLE_YSIZE_HIMETRIC *pheight) { OLEPictureImpl *This = impl_from_IPicture(iface); - TRACE("(%p)->(%p): height is %d\n", This, pheight, This->himetricHeight); + TRACE("%p, %p.\n", iface, pheight); *pheight = This->himetricHeight; return S_OK; } @@ -656,8 +629,8 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc, LPCRECT prcWBounds) { OLEPictureImpl *This = impl_from_IPicture(iface); - TRACE("(%p)->(%p, (%d,%d), (%d,%d) <- (%d,%d), (%d,%d), %p)\n", - This, hdc, x, y, cx, cy, xSrc, ySrc, cxSrc, cySrc, prcWBounds); + TRACE("%p, %p, (%ld,%ld), (%ld,%ld), (%ld,%ld), (%ld,%ld), %p)\n", iface, hdc, x, y, cx, cy, xSrc, ySrc, + cxSrc, cySrc, prcWBounds); if(prcWBounds) TRACE("prcWBounds %s\n", wine_dbgstr_rect(prcWBounds)); @@ -1225,7 +1198,7 @@ static HRESULT OLEPictureImpl_LoadIcon(OLEPictureImpl *This, BYTE *xbuf, ULONG x HDC hdcRef; int i; - TRACE("(this %p, xbuf %p, xread %u)\n", This, xbuf, xread); + TRACE("(this %p, xbuf %p, xread %lu)\n", This, xbuf, xread); /* FIXME("icon.idReserved=%d\n",cifd->idReserved); @@ -1263,7 +1236,7 @@ static HRESULT OLEPictureImpl_LoadIcon(OLEPictureImpl *This, BYTE *xbuf, ULONG x } if (xread < cifd->idEntries[i].dwDIBOffset + cifd->idEntries[i].dwDIBSize) { - ERR("Icon data address %u is over %u bytes available.\n", + ERR("Icon data address %lu is over %lu bytes available.\n", cifd->idEntries[i].dwDIBOffset + cifd->idEntries[i].dwDIBSize, xread); return E_FAIL; } @@ -1402,7 +1375,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) */ hr = IStream_Stat(pStm,&statstg,STATFLAG_NONAME); if (hr != S_OK) { - TRACE("stat failed with hres %x, proceeding to read all data.\n",hr); + TRACE("stat failed with hres %#lx, proceeding to read all data.\n",hr); statfailed = TRUE; /* we will read at least 8 byte ... just right below */ statstg.cbSize.QuadPart = 8; @@ -1414,7 +1387,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) do { hr = IStream_Read(pStm, header, 8, &xread); if (hr != S_OK || xread!=8) { - ERR("Failure while reading picture header (hr is %x, nread is %d).\n",hr,xread); + ERR("Failure while reading picture header (hr is %#lx, nread is %ld).\n",hr,xread); return (hr?hr:E_FAIL); } headerread += xread; @@ -1422,7 +1395,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) if (!memcmp(&(header[0]),"lt\0\0", 4) && (statfailed || (header[1] + headerread <= statstg.cbSize.QuadPart))) { if (toread != 0 && toread != header[1]) - FIXME("varying lengths of image data (prev=%u curr=%u), only last one will be used\n", + FIXME("varying lengths of image data (prev=%lu curr=%lu), only last one will be used\n", toread, header[1]); toread = header[1]; if (statfailed) @@ -1447,7 +1420,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) else toread -= 8; xread = 8; } else { - FIXME("Unknown stream header magic: %08x\n", header[0]); + FIXME("Unknown stream header magic: %#lx.\n", header[0]); toread = header[1]; } } @@ -1478,8 +1451,8 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) } } if (hr != S_OK) - TRACE("hr in no-stat loader case is %08x\n", hr); - TRACE("loaded %d bytes.\n", xread); + TRACE("hr in no-stat loader case is %#lx.\n", hr); + TRACE("loaded %ld bytes.\n", xread); This->datalen = xread; This->data = xbuf; } else { @@ -1499,7 +1472,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) break; } if (xread != This->datalen) - ERR("Could only read %d of %d bytes out of stream?\n",xread,This->datalen); + ERR("Could only read %ld of %d bytes out of stream?\n", xread, This->datalen); } if (This->datalen == 0) { /* Marks the "NONE" picture */ This->desc.picType = PICTYPE_NONE; @@ -1542,7 +1515,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) hr = OLEPictureImpl_LoadEnhMetafile(This, xbuf, xread); if (hr == S_OK) break; - FIXME("Unknown magic %04x, %d read bytes:\n",magic,xread); + FIXME("Unknown magic %04x, %ld read bytes:\n", magic, xread); hr=E_FAIL; for (i=0;i<xread+8;i++) { if (i<8) MESSAGE("%02x ",((unsigned char*)header)[i]); @@ -1771,8 +1744,7 @@ static BOOL serializeIcon(HICON hIcon, void ** ppBuffer, unsigned int * pLength) if (infoIcon.hbmColor) DeleteObject(infoIcon.hbmColor); HeapFree(GetProcessHeap(), 0, pInfoBitmap); } else { - printf("ERROR: Unable to get icon information (error %u)\n", - GetLastError()); + ERR("Unable to get icon information (error %lu)\n", GetLastError()); } return success; } @@ -1964,7 +1936,7 @@ static HRESULT WINAPI OLEPictureImpl_GetTypeInfo( hres = ITypeLib_GetTypeInfoOfGuid(tl, &IID_IPictureDisp, ppTInfo); if (FAILED(hres)) - ERR("Did not get IPictureDisp typeinfo from typelib, hres %x\n", hres); + ERR("Did not get IPictureDisp typeinfo from typelib, hres %#lx.\n", hres); return hres; } @@ -2160,7 +2132,7 @@ static HRESULT WINAPI OLEPictureImpl_Invoke( break; } - ERR("invalid dispid 0x%x or wFlags 0x%x\n", dispIdMember, wFlags); + ERR("invalid dispid %#lx or wFlags 0x%x\n", dispIdMember, wFlags); return DISP_E_MEMBERNOTFOUND; } @@ -2259,7 +2231,7 @@ HRESULT WINAPI OleLoadPicture( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, IPicture *newpic; HRESULT hr; - TRACE("(%p,%d,%d,%s,%p), partially implemented.\n", + TRACE("%p, %ld, %d, %s, %p), partially implemented.\n", lpstream, lSize, fRunmode, debugstr_guid(riid), ppvObj); hr = OleCreatePictureIndirect(NULL,riid,!fRunmode,(LPVOID*)&newpic); @@ -2298,7 +2270,7 @@ HRESULT WINAPI OleLoadPictureEx( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, IPicture *newpic; HRESULT hr; - FIXME("(%p,%d,%d,%s,x=%d,y=%d,f=%x,%p), partially implemented.\n", + FIXME("%p, %ld, %d, %s, %lu, %lu, %#lx, %p, partially implemented.\n", lpstream, lSize, fRunmode, debugstr_guid(riid), xsiz, ysiz, flags, ppvObj); hr = OleCreatePictureIndirect(NULL,riid,!fRunmode,(LPVOID*)&newpic); @@ -2365,9 +2337,8 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, WCHAR *file_candidate; WCHAR path_buf[MAX_PATH]; - TRACE("(%s,%p,%d,%08x,%s,%p): stub\n", - debugstr_w(szURLorPath), punkCaller, dwReserved, clrReserved, - debugstr_guid(riid), ppvRet); + TRACE("%s, %p, %ld, %#lx, %s, %p.\n", debugstr_w(szURLorPath), punkCaller, dwReserved, + clrReserved, debugstr_guid(riid), ppvRet); if (!szURLorPath || !ppvRet) return E_INVALIDARG; diff --git a/dlls/oleaut32/olepropframe.c b/dlls/oleaut32/olepropframe.c index a351d73d468..6ffd8f3d3e4 100644 --- a/dlls/oleaut32/olepropframe.c +++ b/dlls/oleaut32/olepropframe.c @@ -93,7 +93,7 @@ static ULONG WINAPI PropertyPageSite_AddRef(IPropertyPageSite* iface) PropertyPageSite *this = impl_from_IPropertyPageSite(iface); LONG ref = InterlockedIncrement(&this->ref); - TRACE("(%p) ref=%d\n", this, ref); + TRACE("%p, refcount %ld.\n", iface, ref); return ref; } @@ -102,7 +102,7 @@ static ULONG WINAPI PropertyPageSite_Release(IPropertyPageSite* iface) PropertyPageSite *this = impl_from_IPropertyPageSite(iface); LONG ref = InterlockedDecrement(&this->ref); - TRACE("(%p) ref=%d\n", this, ref); + TRACE("%p, refcount %ld.\n", iface, ref); if(!ref) HeapFree(GetProcessHeap(), 0, this); return ref; @@ -111,7 +111,7 @@ static ULONG WINAPI PropertyPageSite_Release(IPropertyPageSite* iface) static HRESULT WINAPI PropertyPageSite_OnStatusChange( IPropertyPageSite *iface, DWORD dwFlags) { - TRACE("(%p, %x)\n", iface, dwFlags); + TRACE("%p, %lx.\n", iface, dwFlags); return S_OK; } @@ -178,7 +178,7 @@ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams) if(!lpParams) return E_POINTER; - TRACE("(%d %p %d %d %s %d %p %d %p %d %d)\n", lpParams->cbStructSize, + TRACE("%ld, %p, %d, %d, %s, %ld, %p, %ld, %p, %ld, %ld.\n", lpParams->cbStructSize, lpParams->hWndOwner, lpParams->x, lpParams->y, debugstr_w(lpParams->lpszCaption), lpParams->cObjects, lpParams->lplpUnk, lpParams->cPages, lpParams->lpPages, @@ -286,7 +286,7 @@ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams) res = IPropertyPage_SetObjects(property_page[i], lpParams->cObjects, lpParams->lplpUnk); if(FAILED(res)) - WARN("SetObjects() failed, hr %#x.\n", res); + WARN("SetObjects() failed, hr %#lx.\n", res); res = IPropertyPage_GetPageInfo(property_page[i], &page_info); if(FAILED(res)) diff --git a/dlls/oleaut32/recinfo.c b/dlls/oleaut32/recinfo.c index 44d46595e85..7d46d6c4299 100644 --- a/dlls/oleaut32/recinfo.c +++ b/dlls/oleaut32/recinfo.c @@ -163,7 +163,7 @@ static ULONG WINAPI IRecordInfoImpl_AddRef(IRecordInfo *iface) { IRecordInfoImpl *This = impl_from_IRecordInfo(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) -> %d\n", This, ref); + TRACE("%p, refcount %lu.\n", iface, ref); return ref; } @@ -172,7 +172,7 @@ static ULONG WINAPI IRecordInfoImpl_Release(IRecordInfo *iface) IRecordInfoImpl *This = impl_from_IRecordInfo(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) -> %d\n", This, ref); + TRACE("%p, refcount %lu.\n", iface, ref); if(!ref) { int i; @@ -441,8 +441,7 @@ static HRESULT WINAPI IRecordInfoImpl_PutField(IRecordInfo *iface, ULONG wFlags, IRecordInfoImpl *This = impl_from_IRecordInfo(iface); int i; - TRACE("(%p)->(%08x %p %s %p)\n", This, wFlags, pvData, debugstr_w(szFieldName), - pvarField); + TRACE("%p, %#lx, %p, %s, %p.\n", iface, wFlags, pvData, debugstr_w(szFieldName), pvarField); if(!pvData || !szFieldName || !pvarField || (wFlags != INVOKE_PROPERTYPUTREF && wFlags != INVOKE_PROPERTYPUT)) @@ -469,7 +468,7 @@ static HRESULT WINAPI IRecordInfoImpl_PutFieldNoCopy(IRecordInfo *iface, ULONG w IRecordInfoImpl *This = impl_from_IRecordInfo(iface); int i; - FIXME("(%p)->(%08x %p %s %p) stub\n", This, wFlags, pvData, debugstr_w(szFieldName), pvarField); + FIXME("%p, %#lx, %p, %s, %p stub\n", iface, wFlags, pvData, debugstr_w(szFieldName), pvarField); if(!pvData || !szFieldName || !pvarField || (wFlags != INVOKE_PROPERTYPUTREF && wFlags != INVOKE_PROPERTYPUT)) @@ -597,8 +596,8 @@ HRESULT WINAPI GetRecordInfoFromGuids(REFGUID rGuidTypeLib, ULONG uVerMajor, ITypeInfo *pTypeInfo; ITypeLib *pTypeLib; HRESULT hres; - - TRACE("(%p,%d,%d,%d,%s,%p)\n", rGuidTypeLib, uVerMajor, uVerMinor, + + TRACE("%p, %lu, %lu, %#lx, %s, %p.\n", rGuidTypeLib, uVerMajor, uVerMinor, lcid, debugstr_guid(rGuidTypeInfo), ppRecInfo); hres = LoadRegTypeLib(rGuidTypeLib, uVerMajor, uVerMinor, lcid, &pTypeLib); @@ -637,7 +636,7 @@ HRESULT WINAPI GetRecordInfoFromTypeInfo(ITypeInfo* pTI, IRecordInfo** ppRecInfo hres = ITypeInfo_GetTypeAttr(pTI, &typeattr); if(FAILED(hres) || !typeattr) { - WARN("GetTypeAttr failed: %08x\n", hres); + WARN("GetTypeAttr failed: %#lx.\n", hres); return hres; } @@ -646,13 +645,13 @@ HRESULT WINAPI GetRecordInfoFromTypeInfo(ITypeInfo* pTI, IRecordInfo** ppRecInfo guid = typeattr->guid; ITypeInfo_ReleaseTypeAttr(pTI, typeattr); if(FAILED(hres)) { - WARN("GetRefTypeInfo failed: %08x\n", hres); + WARN("GetRefTypeInfo failed: %#lx.\n", hres); return hres; } hres = ITypeInfo_GetTypeAttr(pTypeInfo, &typeattr); if(FAILED(hres)) { ITypeInfo_Release(pTypeInfo); - WARN("GetTypeAttr failed for referenced type: %08x\n", hres); + WARN("GetTypeAttr failed for referenced type: %#lx.\n", hres); return hres; } }else { @@ -702,8 +701,8 @@ HRESULT WINAPI GetRecordInfoFromTypeInfo(ITypeInfo* pTI, IRecordInfo** ppRecInfo hres = ITypeInfo_GetDocumentation(pTypeInfo, vardesc->memid, &ret->fields[i].name, NULL, NULL, NULL); if(FAILED(hres)) - WARN("GetDocumentation failed: %08x\n", hres); - TRACE("field=%s, offset=%d\n", debugstr_w(ret->fields[i].name), ret->fields[i].offset); + WARN("GetDocumentation failed: %#lx.\n", hres); + TRACE("field=%s, offset=%ld\n", debugstr_w(ret->fields[i].name), ret->fields[i].offset); ITypeInfo_ReleaseVarDesc(pTypeInfo, vardesc); } diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index 0b769358f65..92d55752e8a 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -287,7 +287,7 @@ static HRESULT SAFEARRAY_DestroyData(SAFEARRAY *psa, ULONG ulStartCell) ULONG ulCellCount = SAFEARRAY_GetCellCount(psa); if (ulStartCell > ulCellCount) { - FIXME("unexpected ulCellCount %d, start %d\n",ulCellCount,ulStartCell); + FIXME("unexpected ulCellCount %ld, start %ld\n", ulCellCount, ulStartCell); return E_UNEXPECTED; } @@ -372,7 +372,7 @@ static HRESULT SAFEARRAY_CopyData(SAFEARRAY *psa, SAFEARRAY *dest) /* destination is cleared automatically */ hRet = VariantCopy(dest_var, src_var); - if (FAILED(hRet)) FIXME("VariantCopy failed with 0x%08x, element %u\n", hRet, ulCellCount); + if (FAILED(hRet)) FIXME("VariantCopy failed with %#lx, element %lu.\n", hRet, ulCellCount); src_var++; dest_var++; } @@ -495,7 +495,7 @@ HRESULT WINAPI SafeArrayAllocDescriptor(UINT cDims, SAFEARRAY **ppsaOut) (*ppsaOut)->cDims = cDims; - TRACE("(%d): %u bytes allocated for descriptor.\n", cDims, allocSize); + TRACE("%d: %lu bytes allocated for descriptor.\n", cDims, allocSize); return S_OK; } @@ -569,7 +569,7 @@ HRESULT WINAPI SafeArrayAllocData(SAFEARRAY *psa) if (psa->pvData) { hRet = S_OK; - TRACE("%u bytes allocated for data at %p (%u objects).\n", + TRACE("%lu bytes allocated for data at %p (%lu objects).\n", ulSize * psa->cbElements, psa->pvData, ulSize); } else @@ -676,7 +676,7 @@ SAFEARRAY* WINAPI SafeArrayCreateEx(VARTYPE vt, UINT cDims, SAFEARRAYBOUND *rgsa */ SAFEARRAY* WINAPI SafeArrayCreateVector(VARTYPE vt, LONG lLbound, ULONG cElements) { - TRACE("(%s,%d,%u)\n", debugstr_vt(vt), lLbound, cElements); + TRACE("%s, %ld, %lu.\n", debugstr_vt(vt), lLbound, cElements); if (vt == VT_RECORD) return NULL; @@ -708,7 +708,7 @@ SAFEARRAY* WINAPI SafeArrayCreateVectorEx(VARTYPE vt, LONG lLbound, ULONG cEleme IRecordInfo* iRecInfo = pvExtra; SAFEARRAY* psa; - TRACE("(%s,%d,%u,%p)\n", debugstr_vt(vt), lLbound, cElements, pvExtra); + TRACE("%s, %ld, %lu, %p.\n", debugstr_vt(vt), lLbound, cElements, pvExtra); if (vt == VT_RECORD) { @@ -886,7 +886,7 @@ HRESULT WINAPI SafeArrayPutElement(SAFEARRAY *psa, LONG *rgIndices, void *pvData VARIANT* lpDest = lpvDest; hRet = VariantCopy(lpDest, lpVariant); - if (FAILED(hRet)) FIXME("VariantCopy failed with 0x%x\n", hRet); + if (FAILED(hRet)) FIXME("VariantCopy failed with %#lx.\n", hRet); } else if (psa->fFeatures & FADF_BSTR) { @@ -971,7 +971,7 @@ HRESULT WINAPI SafeArrayGetElement(SAFEARRAY *psa, LONG *rgIndices, void *pvData /* The original content of pvData is ignored. */ V_VT(lpDest) = VT_EMPTY; hRet = VariantCopy(lpDest, lpVariant); - if (FAILED(hRet)) FIXME("VariantCopy failed with 0x%x\n", hRet); + if (FAILED(hRet)) FIXME("VariantCopy failed with %#lx.\n", hRet); } else if (psa->fFeatures & FADF_BSTR) { @@ -1113,8 +1113,8 @@ UINT WINAPI SafeArrayGetDim(SAFEARRAY *psa) */ UINT WINAPI SafeArrayGetElemsize(SAFEARRAY *psa) { - TRACE("(%p) returning %d\n", psa, psa ? psa->cbElements : 0u); - return psa ? psa->cbElements : 0; + TRACE("%p, returning %ld.\n", psa, psa ? psa->cbElements : 0u); + return psa ? psa->cbElements : 0; } /************************************************************************* diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 2a453a1f0e0..cdc48e9c7fe 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -297,7 +297,7 @@ static HRESULT query_typelib_path( REFGUID guid, WORD wMaj, WORD wMin, WCHAR Path[MAX_PATH]; LONG res; - TRACE_(typelib)("(%s, %x.%x, 0x%x, %p)\n", debugstr_guid(guid), wMaj, wMin, lcid, path); + TRACE_(typelib)("%s, %x.%x, %#lx, %p\n", debugstr_guid(guid), wMaj, wMin, lcid, path); if (redir) { @@ -370,7 +370,7 @@ static HRESULT query_typelib_path( REFGUID guid, WORD wMaj, WORD wMin, } } RegCloseKey( hkey ); - TRACE_(typelib)("-- 0x%08x\n", hr); + TRACE_(typelib)("-- %#lx\n", hr); return hr; } @@ -486,7 +486,7 @@ HRESULT WINAPI LoadTypeLibEx( break; } - TRACE(" returns %08x\n",res); + TRACE(" returns %#lx\n",res); return res; } @@ -1018,7 +1018,7 @@ HRESULT WINAPI UnRegisterTypeLibForUser( LCID lcid, /* [in] locale id */ SYSKIND syskind) { - FIXME("(%s, %u, %u, %u, %u) unregistering the typelib system-wide\n", + FIXME("%s, %u, %u, %#lx, %u unregistering the typelib system-wide\n", debugstr_guid(libid), wVerMajor, wVerMinor, lcid, syskind); return UnRegisterTypeLib(libid, wVerMajor, wVerMinor, lcid, syskind); } @@ -1352,8 +1352,7 @@ static void dump_TypeDesc(const TYPEDESC *pTD,char *szVarType) { case VT_VARIANT: sprintf(szVarType, "VT_VARIANT"); break; case VT_VOID: sprintf(szVarType, "VT_VOID"); break; case VT_HRESULT: sprintf(szVarType, "VT_HRESULT"); break; - case VT_USERDEFINED: sprintf(szVarType, "VT_USERDEFINED ref = %x", - pTD->u.hreftype); break; + case VT_USERDEFINED: sprintf(szVarType, "VT_USERDEFINED ref = %lx", pTD->u.hreftype); break; case VT_LPSTR: sprintf(szVarType, "VT_LPSTR"); break; case VT_LPWSTR: sprintf(szVarType, "VT_LPWSTR"); break; case VT_PTR: sprintf(szVarType, "ptr to "); @@ -1389,7 +1388,7 @@ static void dump_ELEMDESC(const ELEMDESC *edesc) { } static void dump_FUNCDESC(const FUNCDESC *funcdesc) { int i; - MESSAGE("memid is %08x\n",funcdesc->memid); + MESSAGE("memid is %#lx\n", funcdesc->memid); for (i=0;i<funcdesc->cParams;i++) { MESSAGE("Param %d:\n",i); dump_ELEMDESC(funcdesc->lprgelemdescParam+i); @@ -1482,8 +1481,7 @@ static void dump_TLBImpLib(const TLBImpLib *import) { TRACE_(typelib)("%s %s\n", debugstr_guid(TLB_get_guidref(import->guid)), debugstr_w(import->name)); - TRACE_(typelib)("v%d.%d lcid=%x offset=%x\n", import->wVersionMajor, - import->wVersionMinor, import->lcid, import->offset); + TRACE_(typelib)("v%d.%d lcid %#lx offset=%x\n", import->wVersionMajor, import->wVersionMinor, import->lcid, import->offset); } static void dump_TLBRefType(const ITypeLibImpl *pTL) @@ -1492,7 +1490,7 @@ static void dump_TLBRefType(const ITypeLibImpl *pTL) LIST_FOR_EACH_ENTRY(ref, &pTL->ref_list, TLBRefType, entry) { - TRACE_(typelib)("href:0x%08x\n", ref->reference); + TRACE_(typelib)("href:%#lx\n", ref->reference); if(ref->index == -1) TRACE_(typelib)("%s\n", debugstr_guid(TLB_get_guidref(ref->guid))); else @@ -1511,7 +1509,7 @@ static void dump_TLBImplType(const TLBImplType * impl, UINT n) if(!impl) return; while (n) { - TRACE_(typelib)("implementing/inheriting interface hRef = %x implflags %x\n", + TRACE_(typelib)("implementing/inheriting interface hRef = %lx implflags %x\n", impl->hRef, impl->implflags); ++impl; --n; @@ -1528,7 +1526,7 @@ static void dump_DispParms(const DISPPARAMS * pdp) { TRACE("named args:\n"); for (index = 0; index < pdp->cNamedArgs; index++) - TRACE( "\t0x%x\n", pdp->rgdispidNamedArgs[index] ); + TRACE( "\t0x%lx\n", pdp->rgdispidNamedArgs[index] ); } if (pdp->cArgs && pdp->rgvarg) @@ -1541,7 +1539,7 @@ static void dump_DispParms(const DISPPARAMS * pdp) static void dump_TypeInfo(const ITypeInfoImpl * pty) { - TRACE("%p ref=%u\n", pty, pty->ref); + TRACE("%p ref %lu\n", pty, pty->ref); TRACE("%s %s\n", debugstr_w(TLB_get_bstr(pty->Name)), debugstr_w(TLB_get_bstr(pty->DocString))); TRACE("attr:%s\n", debugstr_guid(TLB_get_guidref(pty->guid))); TRACE("kind:%s\n", typekind_desc[pty->typeattr.typekind]); @@ -1557,9 +1555,9 @@ static void dump_TypeInfo(const ITypeInfoImpl * pty) static void dump_VARDESC(const VARDESC *v) { - MESSAGE("memid %d\n",v->memid); + MESSAGE("memid %ld\n",v->memid); MESSAGE("lpstrSchema %s\n",debugstr_w(v->lpstrSchema)); - MESSAGE("oInst %d\n",v->u.oInst); + MESSAGE("oInst %ld\n", v->u.oInst); dump_ELEMDESC(&(v->elemdescVar)); MESSAGE("wVarFlags %x\n",v->wVarFlags); MESSAGE("varkind %d\n",v->varkind); @@ -2033,7 +2031,7 @@ static inline void MSFT_Seek(TLBContext *pcx, LONG where) if (where > pcx->length) { /* FIXME */ - ERR("seek beyond end (%d/%d)\n", where, pcx->length ); + ERR("seek beyond end (%ld/%d)\n", where, pcx->length ); TLB_abort(); } pcx->pos = where; @@ -2043,7 +2041,7 @@ static inline void MSFT_Seek(TLBContext *pcx, LONG where) /* read function */ static DWORD MSFT_Read(void *buffer, DWORD count, TLBContext *pcx, LONG where ) { - TRACE_(typelib)("pos=0x%08x len=0x%08x 0x%08x 0x%08x 0x%08x\n", + TRACE_(typelib)("pos=0x%08x len %#lx, %u, %u, %#lx\n", pcx->pos, count, pcx->oStart, pcx->length, where); MSFT_Seek(pcx, where); @@ -3371,7 +3369,7 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath *ppTypeLib = ITypeLib2_Constructor_SLTG(pBase, dwTLBLength); else { - FIXME("Header type magic 0x%08x not supported.\n",dwSignature); + FIXME("Header type magic %#lx not supported.\n", dwSignature); ret = TYPE_E_CANTLOADLIBRARY; } } @@ -3398,7 +3396,7 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath else { if(ret != E_FAIL) - ERR("Loading of typelib %s failed with error %d\n", debugstr_w(pszFileName), GetLastError()); + ERR("Loading of typelib %s failed with error %ld\n", debugstr_w(pszFileName), GetLastError()); ret = TYPE_E_CANTLOADLIBRARY; } @@ -3446,7 +3444,7 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) ITypeLibImpl * pTypeLibImpl; int i; - TRACE("%p, TLB length = %d\n", pLib, dwTLBLength); + TRACE("%p, TLB length = %ld\n", pLib, dwTLBLength); pTypeLibImpl = TypeLibImpl_Constructor(); if (!pTypeLibImpl) return NULL; @@ -3474,14 +3472,14 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) lPSegDir = sizeof(tlbHeader) + (tlbHeader.nrtypeinfos)*4 + ((tlbHeader.varflags & HELPDLLFLAG)? 4 :0); /* now read the segment directory */ - TRACE("read segment directory (at %d)\n",lPSegDir); + TRACE("read segment directory (at %ld)\n",lPSegDir); MSFT_ReadLEDWords(&tlbSegDir, sizeof(tlbSegDir), &cx, lPSegDir); cx.pTblDir = &tlbSegDir; /* just check two entries */ if ( tlbSegDir.pTypeInfoTab.res0c != 0x0F || tlbSegDir.pImpInfo.res0c != 0x0F) { - ERR("cannot find the table directory, ptr=0x%x\n",lPSegDir); + ERR("cannot find the table directory, ptr %#lx\n",lPSegDir); heap_free(pTypeLibImpl); return NULL; } @@ -3930,7 +3928,7 @@ static sltg_ref_lookup_t *SLTG_DoRefs(SLTG_RefInfo *pRef, ITypeLibImpl *pTL, import->offset = lib_offs; TLB_GUIDFromString( pNameTable + lib_offs + 4, &tmpguid); import->guid = TLB_append_guid(&pTL->guid_list, &tmpguid, 2); - if(sscanf(pNameTable + lib_offs + 40, "}#%hd.%hd#%x#%s", + if(sscanf(pNameTable + lib_offs + 40, "}#%hd.%hd#%lx#%s", &import->wVersionMajor, &import->wVersionMinor, &import->lcid, fname) != 4) { @@ -4035,7 +4033,7 @@ static void SLTG_DoVars(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, unsign TRACE_(typelib)("name: %s\n", debugstr_w(TLB_get_bstr(pVarDesc->Name))); TRACE_(typelib)("byte_offs = 0x%x\n", pItem->byte_offs); - TRACE_(typelib)("memid = 0x%x\n", pItem->memid); + TRACE_(typelib)("memid = %#lx\n", pItem->memid); if(pItem->flags & 0x02) pType = &pItem->type; @@ -4402,7 +4400,7 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) DWORD len, order; ITypeInfoImpl **ppTypeInfoImpl; - TRACE_(typelib)("%p, TLB length = %d\n", pLib, dwTLBLength); + TRACE_(typelib)("%p, TLB length = %ld\n", pLib, dwTLBLength); pTypeLibImpl = TypeLibImpl_Constructor(); @@ -4411,11 +4409,11 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) pHeader = pLib; TRACE_(typelib)("header:\n"); - TRACE_(typelib)("\tmagic=0x%08x, file blocks = %d\n", pHeader->SLTG_magic, + TRACE_(typelib)("\tmagic %#lx, file blocks = %d\n", pHeader->SLTG_magic, pHeader->nrOfFileBlks ); - if (pHeader->SLTG_magic != SLTG_SIGNATURE) { - FIXME_(typelib)("Header type magic 0x%08x not supported.\n", - pHeader->SLTG_magic); + if (pHeader->SLTG_magic != SLTG_SIGNATURE) + { + FIXME_(typelib)("Header type magic %#lx not supported.\n", pHeader->SLTG_magic); return NULL; } @@ -4566,8 +4564,8 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) heap_free(pOtherTypeInfoBlks); return NULL; } - TRACE_(typelib)("pTIHeader->res06 = %x, pTIHeader->res0e = %x, " - "pTIHeader->res16 = %x, pTIHeader->res1e = %x\n", + TRACE_(typelib)("pTIHeader->res06 = %lx, pTIHeader->res0e = %lx, " + "pTIHeader->res16 = %lx, pTIHeader->res1e = %lx\n", pTIHeader->res06, pTIHeader->res0e, pTIHeader->res16, pTIHeader->res1e); *ppTypeInfoImpl = ITypeInfoImpl_Constructor(); @@ -4710,7 +4708,7 @@ static ULONG WINAPI ITypeLib2_fnAddRef( ITypeLib2 *iface) ITypeLibImpl *This = impl_from_ITypeLib2(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("%p, refcount %lu.\n", iface, ref); return ref; } @@ -4720,7 +4718,7 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface) ITypeLibImpl *This = impl_from_ITypeLib2(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%u\n",This, ref); + TRACE("%p, refcount %lu.\n", iface, ref); if (!ref) { @@ -5036,8 +5034,7 @@ static HRESULT WINAPI ITypeLib2_fnIsName( int tic; UINT nNameBufLen = (lstrlenW(szNameBuf)+1)*sizeof(WCHAR), fdc, vrc; - TRACE("(%p)->(%s,%08x,%p)\n", This, debugstr_w(szNameBuf), lHashVal, - pfName); + TRACE("%p, %s, %#lx, %p.\n", iface, debugstr_w(szNameBuf), lHashVal, pfName); *pfName=TRUE; for(tic = 0; tic < This->TypeInfoCount; ++tic){ @@ -5086,7 +5083,7 @@ static HRESULT WINAPI ITypeLib2_fnFindName( UINT count = 0; UINT len; - TRACE("(%p)->(%s %u %p %p %p)\n", This, debugstr_w(name), hash, ppTInfo, memid, found); + TRACE("%p, %s %#lx, %p, %p, %p.\n", iface, debugstr_w(name), hash, ppTInfo, memid, found); if ((!name && hash == 0) || !ppTInfo || !memid || !found) return E_INVALIDARG; @@ -5207,7 +5204,7 @@ static HRESULT WINAPI ITypeLib2_fnGetDocumentation2( HRESULT result; ITypeInfo *pTInfo; - FIXME("(%p) index %d lcid %d half implemented stub!\n", This, index, lcid); + FIXME("%p, %d, %#lx, partially implemented stub!\n", iface, index, lcid); /* the help string should be obtained from the helpstringdll, * using the _DLLGetDocumentation function, based on the supplied @@ -5353,7 +5350,7 @@ static HRESULT WINAPI ITypeLibComp_fnBind( BOOL typemismatch = FALSE; int i; - TRACE("(%p)->(%s, 0x%x, 0x%x, %p, %p, %p)\n", This, debugstr_w(szName), lHash, wFlags, ppTInfo, pDescKind, pBindPtr); + TRACE("%p, %s, %#lx, %#x, %p, %p, %p.\n", iface, debugstr_w(szName), lHash, wFlags, ppTInfo, pDescKind, pBindPtr); *pDescKind = DESCKIND_NONE; pBindPtr->lptcomp = NULL; @@ -5489,7 +5486,7 @@ static HRESULT WINAPI ITypeLibComp_fnBindType( ITypeLibImpl *This = impl_from_ITypeComp(iface); ITypeInfoImpl *info; - TRACE("(%s, %x, %p, %p)\n", debugstr_w(szName), lHash, ppTInfo, ppTComp); + TRACE("%p, %s, %#lx, %p, %p.\n", iface, debugstr_w(szName), lHash, ppTInfo, ppTComp); if(!szName || !ppTInfo || !ppTComp) return E_INVALIDARG; @@ -5573,14 +5570,12 @@ static HRESULT WINAPI ITypeInfo_fnQueryInterface( return E_NOINTERFACE; } -/* ITypeInfo::AddRef - */ static ULONG WINAPI ITypeInfo_fnAddRef( ITypeInfo2 *iface) { ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->ref is %u\n",This, ref); + TRACE("%p, refcount %lu.\n", iface, ref); if (ref == 1 /* incremented from 0 */) ITypeLib2_AddRef(&This->pTypeLib->ITypeLib2_iface); @@ -5642,14 +5637,12 @@ static void ITypeInfoImpl_Destroy(ITypeInfoImpl *This) heap_free(This); } -/* ITypeInfo::Release - */ static ULONG WINAPI ITypeInfo_fnRelease(ITypeInfo2 *iface) { ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%u)\n",This, ref); + TRACE("%p, refcount %lu.\n", iface, ref); if (!ref) { @@ -5663,12 +5656,6 @@ static ULONG WINAPI ITypeInfo_fnRelease(ITypeInfo2 *iface) return ref; } -/* ITypeInfo::GetTypeAttr - * - * Retrieves a TYPEATTR structure that contains the attributes of the type - * description. - * - */ static HRESULT WINAPI ITypeInfo_fnGetTypeAttr( ITypeInfo2 *iface, LPTYPEATTR *ppTypeAttr) { @@ -6018,7 +6005,7 @@ static HRESULT WINAPI ITypeInfo_fnGetFuncDesc( ITypeInfo2 *iface, UINT index, if ((This->typeattr.typekind == TKIND_DISPATCH) && hrefoffset) ITypeInfoImpl_FuncDescAddHrefOffset(*ppFuncDesc, hrefoffset); - TRACE("-- 0x%08x\n", hr); + TRACE("-- %#lx.\n", hr); return hr; } @@ -6182,7 +6169,7 @@ static HRESULT WINAPI ITypeInfo_fnGetNames( ITypeInfo2 *iface, MEMBERID memid, { ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); - TRACE("(%p) memid 0x%08x max_names %d\n", This, memid, max_names); + TRACE("%p, %#lx, %p, %d, %p\n", iface, memid, names, max_names, num_names); if (!names) return E_INVALIDARG; @@ -6243,9 +6230,9 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeOfImplType( if(TRACE_ON(ole)) { if(SUCCEEDED(hr)) - TRACE("SUCCESS -- hRef = 0x%08x\n", *pRefType ); + TRACE("SUCCESS -- hRef %#lx.\n", *pRefType ); else - TRACE("FAILURE -- hresult = 0x%08x\n", hr); + TRACE("FAILURE -- hresult %#lx.\n", hr); } return hr; @@ -6291,8 +6278,7 @@ static HRESULT WINAPI ITypeInfo_fnGetIDsOfNames( ITypeInfo2 *iface, HRESULT ret=S_OK; UINT i, fdc; - TRACE("(%p) Name %s cNames %d\n", This, debugstr_w(*rgszNames), - cNames); + TRACE("%p, %s, %d.\n", iface, debugstr_w(*rgszNames), cNames); /* init out parameters in case of failure */ for (i = 0; i < cNames; i++) @@ -6312,7 +6298,7 @@ static HRESULT WINAPI ITypeInfo_fnGetIDsOfNames( ITypeInfo2 *iface, else ret=DISP_E_UNKNOWNNAME; }; - TRACE("-- 0x%08x\n", ret); + TRACE("-- %#lx.\n", ret); return ret; } } @@ -6547,7 +6533,7 @@ HRESULT WINAPI DispCallFunc( void* pvInstance, ULONG_PTR oVft, CALLCONV cc, VART DWORD_PTR *args; void *func; - TRACE("(%p, %ld, %d, %d, %d, %p, %p, %p (vt=%d))\n", + TRACE("%p, %Id, %d, %d, %d, %p, %p, %p (vt=%d).\n", pvInstance, oVft, cc, vtReturn, cActuals, prgvt, prgpvarg, pvargResult, V_VT(pvargResult)); @@ -7013,15 +6999,13 @@ static HRESULT userdefined_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, hr = ITypeInfo_GetRefTypeInfo(tinfo, tdesc->u.hreftype, &tinfo2); if (hr) { - ERR("Could not get typeinfo of hreftype %x for VT_USERDEFINED, " - "hr = 0x%08x\n", - tdesc->u.hreftype, hr); + ERR("Could not get typeinfo of hreftype %lx for VT_USERDEFINED, hr %#lx.\n", tdesc->u.hreftype, hr); return hr; } hr = ITypeInfo_GetTypeAttr(tinfo2, &tattr); if (hr) { - ERR("ITypeInfo_GetTypeAttr failed, hr = 0x%08x\n", hr); + ERR("ITypeInfo_GetTypeAttr failed, hr %#lx.\n", hr); ITypeInfo_Release(tinfo2); return hr; } @@ -7224,9 +7208,8 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( const TLBFuncDesc *pFuncInfo; UINT fdc; - TRACE("(%p)(%p,id=%d,flags=0x%08x,%p,%p,%p,%p)\n", - This,pIUnk,memid,wFlags,pDispParams,pVarResult,pExcepInfo,pArgErr - ); + TRACE("%p, %p, %ld, %#x, %p, %p, %p, %p.\n", iface, pIUnk, memid, wFlags, pDispParams, + pVarResult, pExcepInfo, pArgErr); if( This->typeattr.wTypeFlags & TYPEFLAG_FRESTRICTED ) return DISP_E_MEMBERNOTFOUND; @@ -7406,7 +7389,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( hres = SafeArrayAccessData(a, (LPVOID)&v); if (hres != S_OK) { - ERR("SafeArrayAccessData failed with %x\n", hres); + ERR("SafeArrayAccessData failed with %#lx.\n", hres); SafeArrayDestroy(a); break; } @@ -7415,7 +7398,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( hres = SafeArrayUnaccessData(a); if (hres != S_OK) { - ERR("SafeArrayUnaccessData failed with %x\n", hres); + ERR("SafeArrayUnaccessData failed with %#lx.\n", hres); SafeArrayDestroy(a); break; } @@ -7585,13 +7568,13 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( hres = SafeArrayGetUBound(a, 1, &ubound); if (hres != S_OK) { - ERR("SafeArrayGetUBound failed with %x\n", hres); + ERR("SafeArrayGetUBound failed with %#lx.\n", hres); break; } hres = SafeArrayAccessData(a, (LPVOID)&v); if (hres != S_OK) { - ERR("SafeArrayAccessData failed with %x\n", hres); + ERR("SafeArrayAccessData failed with %#lx.\n", hres); break; } for (j = 0; j <= ubound; j++) @@ -7599,7 +7582,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( hres = SafeArrayUnaccessData(a); if (hres != S_OK) { - ERR("SafeArrayUnaccessData failed with %x\n", hres); + ERR("SafeArrayUnaccessData failed with %#lx.\n", hres); break; } } @@ -7617,7 +7600,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( if ((V_VT(&varresult) == VT_ERROR) && FAILED(V_ERROR(&varresult))) { - WARN("invoked function failed with error 0x%08x\n", V_ERROR(&varresult)); + WARN("invoked function failed with error %#lx.\n", V_ERROR(&varresult)); hres = DISP_E_EXCEPTION; if (pExcepInfo) { @@ -7685,7 +7668,7 @@ func_fail: pVarResult,pExcepInfo,pArgErr ); if (FAILED(hres)) - FIXME("IDispatch::Invoke failed with %08x. (Could be not a real error?)\n", hres); + FIXME("IDispatch::Invoke failed with %#lx. (Could be not a real error?)\n", hres); IDispatch_Release(disp); } else FIXME("FUNC_DISPATCH used on object without IDispatch iface?\n"); @@ -7697,7 +7680,7 @@ func_fail: break; } - TRACE("-- 0x%08x\n", hres); + TRACE("-- %#lx\n", hres); return hres; } else if(SUCCEEDED(hres = ITypeInfo2_GetVarIndexOfMemId(iface, memid, &var_index))) { @@ -7727,7 +7710,7 @@ func_fail: WARN("Could not search inherited interface!\n"); } } - WARN("did not find member id %d, flags 0x%x!\n", memid, wFlags); + WARN("did not find member id %ld, flags 0x%x!\n", memid, wFlags); return DISP_E_MEMBERNOTFOUND; } @@ -7745,9 +7728,8 @@ static HRESULT WINAPI ITypeInfo_fnGetDocumentation( ITypeInfo2 *iface, ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); const TLBFuncDesc *pFDesc; const TLBVarDesc *pVDesc; - TRACE("(%p) memid %d Name(%p) DocString(%p)" - " HelpContext(%p) HelpFile(%p)\n", - This, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile); + TRACE("%p, %ld, %p, %p, %p, %p.\n", + iface, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile); if(memid==MEMBERID_NIL){ /* documentation for the typeinfo */ if(pBstrName) *pBstrName=SysAllocString(TLB_get_bstr(This->Name)); @@ -7800,7 +7782,7 @@ static HRESULT WINAPI ITypeInfo_fnGetDocumentation( ITypeInfo2 *iface, WARN("Could not search inherited interface!\n"); } - WARN("member %d not found\n", memid); + WARN("member %ld not found\n", memid); return TYPE_E_ELEMENTNOTFOUND; } @@ -7816,7 +7798,7 @@ static HRESULT WINAPI ITypeInfo_fnGetDllEntry( ITypeInfo2 *iface, MEMBERID memid ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); const TLBFuncDesc *pFDesc; - TRACE("(%p)->(memid %x, %d, %p, %p, %p)\n", This, memid, invKind, pBstrDllName, pBstrName, pwOrdinal); + TRACE("%p, %#lx, %d, %p, %p, %p.\n", iface, memid, invKind, pBstrDllName, pBstrName, pwOrdinal); if (pBstrDllName) *pBstrDllName = NULL; if (pBstrName) *pBstrName = NULL; @@ -7854,7 +7836,7 @@ static HRESULT ITypeInfoImpl_GetDispatchRefTypeInfo( ITypeInfo *iface, ITypeInfoImpl *This = impl_from_ITypeInfo(iface); HRESULT hr; - TRACE("%p, 0x%x\n", iface, *hRefType); + TRACE("%p, %#lx.\n", iface, *hRefType); if (This->impltypes && (*hRefType & DISPATCH_HREF_MASK)) { @@ -7959,7 +7941,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( } if(&ref_type->entry == &This->pTypeLib->ref_list) { - FIXME("Can't find pRefType for ref %x\n", hRefType); + FIXME("Can't find pRefType for ref %lx\n", hRefType); return E_FAIL; } @@ -8028,7 +8010,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( ITypeLib_Release(pTLib); if (FAILED(result)) { - WARN("(%p) failed hreftype 0x%04x\n", This, hRefType); + WARN("(%p) failed hreftype %#lx.\n", iface, hRefType); return result; } } @@ -8037,7 +8019,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( ITypeInfo_Release(type_info); else *ppTInfo = type_info; - TRACE("(%p) hreftype 0x%04x loaded %s (%p)\n", This, hRefType, + TRACE("%p, hreftype %#lx, loaded %s (%p)\n", iface, hRefType, SUCCEEDED(result)? "SUCCESS":"FAILURE", *ppTInfo); return result; } @@ -8050,13 +8032,12 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( static HRESULT WINAPI ITypeInfo_fnAddressOfMember( ITypeInfo2 *iface, MEMBERID memid, INVOKEKIND invKind, PVOID *ppv) { - ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); HRESULT hr; BSTR dll, entry; WORD ordinal; HMODULE module; - TRACE("(%p)->(0x%x, 0x%x, %p)\n", This, memid, invKind, ppv); + TRACE("%p, %lx, %#x, %p.\n", iface, memid, invKind, ppv); hr = ITypeInfo2_GetDllEntry(iface, memid, invKind, &dll, &entry, &ordinal); if (FAILED(hr)) @@ -8138,7 +8119,7 @@ static HRESULT WINAPI ITypeInfo_fnCreateInstance( ITypeInfo2 *iface, { IUnknown *pUnk; hr = GetActiveObject(&pTA->guid, NULL, &pUnk); - TRACE("GetActiveObject rets %08x\n", hr); + TRACE("GetActiveObject rets %#lx.\n", hr); if(hr == S_OK) { hr = IUnknown_QueryInterface(pUnk, riid, ppvObj); @@ -8160,11 +8141,9 @@ end: * * Retrieves marshalling information. */ -static HRESULT WINAPI ITypeInfo_fnGetMops( ITypeInfo2 *iface, MEMBERID memid, - BSTR *pBstrMops) +static HRESULT WINAPI ITypeInfo_fnGetMops( ITypeInfo2 *iface, MEMBERID memid, BSTR *pBstrMops) { - ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); - FIXME("(%p %d) stub!\n", This, memid); + FIXME("%p, %ld stub!\n", iface, memid); *pBstrMops = NULL; return S_OK; } @@ -8264,8 +8243,8 @@ static HRESULT WINAPI ITypeInfo2_fnGetTypeKind( ITypeInfo2 * iface, static HRESULT WINAPI ITypeInfo2_fnGetTypeFlags( ITypeInfo2 *iface, ULONG *pTypeFlags) { ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); + TRACE("%p, %p.\n", iface, pTypeFlags); *pTypeFlags=This->typeattr.wTypeFlags; - TRACE("(%p) flags 0x%x\n", This,*pTypeFlags); return S_OK; } @@ -8292,8 +8271,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetFuncIndexOfMemId( ITypeInfo2 * iface, } else result = TYPE_E_ELEMENTNOTFOUND; - TRACE("(%p) memid 0x%08x invKind 0x%04x -> %s\n", This, - memid, invKind, SUCCEEDED(result) ? "SUCCESS" : "FAILED"); + TRACE("%p, %#lx, %#x, hr %#lx.\n", iface, memid, invKind, result); return result; } @@ -8309,7 +8287,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetVarIndexOfMemId( ITypeInfo2 * iface, ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); TLBVarDesc *pVarInfo; - TRACE("%p %d %p\n", iface, memid, pVarIndex); + TRACE("%p, %ld, %p.\n", iface, memid, pVarIndex); pVarInfo = TLB_get_vardesc_by_memberid(This, memid); if(!pVarInfo) @@ -8490,9 +8468,8 @@ static HRESULT WINAPI ITypeInfo2_fnGetDocumentation2( ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); const TLBFuncDesc *pFDesc; const TLBVarDesc *pVDesc; - TRACE("(%p) memid %d lcid(0x%x) HelpString(%p) " - "HelpStringContext(%p) HelpStringDll(%p)\n", - This, memid, lcid, pbstrHelpString, pdwHelpStringContext, + TRACE("%p, %ld, %#lx, %p, %p, %p.\n", + iface, memid, lcid, pbstrHelpString, pdwHelpStringContext, pbstrHelpStringDll ); /* the help string should be obtained from the helpstringdll, * using the _DLLGetDocumentation function, based on the supplied @@ -8842,7 +8819,7 @@ static HRESULT WINAPI ITypeComp_fnBind( HRESULT hr = DISP_E_MEMBERNOTFOUND; UINT fdc; - TRACE("(%p)->(%s, %x, 0x%x, %p, %p, %p)\n", This, debugstr_w(szName), lHash, wFlags, ppTInfo, pDescKind, pBindPtr); + TRACE("%p, %s, %#lx, 0x%x, %p, %p, %p.\n", iface, debugstr_w(szName), lHash, wFlags, ppTInfo, pDescKind, pBindPtr); *pDescKind = DESCKIND_NONE; pBindPtr->lpfuncdesc = NULL; @@ -8923,7 +8900,7 @@ static HRESULT WINAPI ITypeComp_fnBindType( ITypeInfo ** ppTInfo, ITypeComp ** ppTComp) { - TRACE("(%s, %x, %p, %p)\n", debugstr_w(szName), lHash, ppTInfo, ppTComp); + TRACE("%s, %#lx, %p, %p.\n", debugstr_w(szName), lHash, ppTInfo, ppTComp); /* strange behaviour (does nothing) but like the * original */ @@ -9142,7 +9119,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetHelpContext(ICreateTypeLib2 *iface, { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - TRACE("%p %d\n", This, helpContext); + TRACE("%p, %ld.\n", iface, helpContext); This->dwHelpContext = helpContext; @@ -9154,7 +9131,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetLcid(ICreateTypeLib2 *iface, { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - TRACE("%p %x\n", This, lcid); + TRACE("%p, %#lx.\n", iface, lcid); This->set_lcid = lcid; @@ -9387,7 +9364,7 @@ static DWORD WMSFT_encode_variant(VARIANT *value, WMSFT_TLBFile *file) if(V_VT(value) != arg_type) { hres = VariantChangeType(&v, value, 0, arg_type); if(FAILED(hres)){ - ERR("VariantChangeType failed: %08x\n", hres); + ERR("VariantChangeType failed: %#lx.\n", hres); return -1; } } @@ -10314,61 +10291,61 @@ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 *iface) running_offset = 0; - TRACE("header at: 0x%x\n", running_offset); + TRACE("header at: 0x%lx\n", running_offset); running_offset += sizeof(file.header); - TRACE("junk at: 0x%x\n", running_offset); + TRACE("junk at: 0x%lx\n", running_offset); running_offset += junk_size; - TRACE("segdir at: 0x%x\n", running_offset); + TRACE("segdir at: 0x%lx\n", running_offset); running_offset += sizeof(file.segdir); - TRACE("typeinfo at: 0x%x\n", running_offset); + TRACE("typeinfo at: 0x%lx\n", running_offset); tmp_fill_segdir_seg(&file.segdir.pTypeInfoTab, &file.typeinfo_seg, &running_offset); - TRACE("guidhashtab at: 0x%x\n", running_offset); + TRACE("guidhashtab at: 0x%lx\n", running_offset); tmp_fill_segdir_seg(&file.segdir.pGuidHashTab, &file.guidhash_seg, &running_offset); - TRACE("guidtab at: 0x%x\n", running_offset); + TRACE("guidtab at: 0x%lx\n", running_offset); tmp_fill_segdir_seg(&file.segdir.pGuidTab, &file.guid_seg, &running_offset); - TRACE("reftab at: 0x%x\n", running_offset); + TRACE("reftab at: 0x%lx\n", running_offset); tmp_fill_segdir_seg(&file.segdir.pRefTab, &file.ref_seg, &running_offset); - TRACE("impinfo at: 0x%x\n", running_offset); + TRACE("impinfo at: 0x%lx\n", running_offset); tmp_fill_segdir_seg(&file.segdir.pImpInfo, &file.impinfo_seg, &running_offset); - TRACE("impfiles at: 0x%x\n", running_offset); + TRACE("impfiles at: 0x%lx\n", running_offset); tmp_fill_segdir_seg(&file.segdir.pImpFiles, &file.impfile_seg, &running_offset); - TRACE("namehashtab at: 0x%x\n", running_offset); + TRACE("namehashtab at: 0x%lx\n", running_offset); tmp_fill_segdir_seg(&file.segdir.pNameHashTab, &file.namehash_seg, &running_offset); - TRACE("nametab at: 0x%x\n", running_offset); + TRACE("nametab at: 0x%lx\n", running_offset); tmp_fill_segdir_seg(&file.segdir.pNametab, &file.name_seg, &running_offset); - TRACE("stringtab at: 0x%x\n", running_offset); + TRACE("stringtab at: 0x%lx\n", running_offset); tmp_fill_segdir_seg(&file.segdir.pStringtab, &file.string_seg, &running_offset); - TRACE("typdesc at: 0x%x\n", running_offset); + TRACE("typdesc at: 0x%lx\n", running_offset); tmp_fill_segdir_seg(&file.segdir.pTypdescTab, &file.typdesc_seg, &running_offset); - TRACE("arraydescriptions at: 0x%x\n", running_offset); + TRACE("arraydescriptions at: 0x%lx\n", running_offset); tmp_fill_segdir_seg(&file.segdir.pArrayDescriptions, &file.arraydesc_seg, &running_offset); - TRACE("custdata at: 0x%x\n", running_offset); + TRACE("custdata at: 0x%lx\n", running_offset); tmp_fill_segdir_seg(&file.segdir.pCustData, &file.custdata_seg, &running_offset); - TRACE("cdguids at: 0x%x\n", running_offset); + TRACE("cdguids at: 0x%lx\n", running_offset); tmp_fill_segdir_seg(&file.segdir.pCDGuids, &file.cdguids_seg, &running_offset); - TRACE("res0e at: 0x%x\n", running_offset); + TRACE("res0e at: 0x%lx\n", running_offset); tmp_fill_segdir_seg(&file.segdir.res0e, NULL, &running_offset); - TRACE("res0f at: 0x%x\n", running_offset); + TRACE("res0f at: 0x%lx\n", running_offset); tmp_fill_segdir_seg(&file.segdir.res0f, NULL, &running_offset); - TRACE("aux_seg at: 0x%x\n", running_offset); + TRACE("aux_seg at: 0x%lx\n", running_offset); WMSFT_fixup_typeinfos(This, &file, running_offset); @@ -10452,8 +10429,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetCustData(ICreateTypeLib2 *iface, static HRESULT WINAPI ICreateTypeLib2_fnSetHelpStringContext(ICreateTypeLib2 *iface, ULONG helpStringContext) { - ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - FIXME("%p %u - stub\n", This, helpStringContext); + FIXME("%p, %lu - stub\n", iface, helpStringContext); return E_NOTIMPL; } @@ -10587,7 +10563,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetHelpContext(ICreateTypeInfo2 *iface, { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - TRACE("%p %d\n", This, helpContext); + TRACE("%p, %ld.\n", iface, helpContext); This->dwHelpContext = helpContext; @@ -10663,7 +10639,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo(ICreateTypeInfo2 *iface, libattr->wMinorVerNum, libattr->lcid, &implib->name); if(FAILED(hres)){ implib->name = NULL; - TRACE("QueryPathOfRegTypeLib failed, no name stored: %08x\n", hres); + TRACE("QueryPathOfRegTypeLib failed, no name stored: %#lx.\n", hres); } } @@ -10845,7 +10821,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddImplType(ICreateTypeInfo2 *iface, TLBImplType *impl_type; HRESULT hres; - TRACE("%p %u %d\n", This, index, refType); + TRACE("%p, %u, %ld.\n", iface, index, refType); switch(This->typeattr.typekind){ case TKIND_COCLASS: { @@ -11134,7 +11110,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncHelpContext(ICreateTypeInfo2 *if ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); TLBFuncDesc *func_desc = &This->funcdescs[index]; - TRACE("%p %u %d\n", This, index, helpContext); + TRACE("%p, %u, %ld.\n", iface, index, helpContext); if(index >= This->typeattr.cFuncs) return TYPE_E_ELEMENTNOTFOUND; @@ -11150,7 +11126,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetVarHelpContext(ICreateTypeInfo2 *ifa ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); TLBVarDesc *var_desc = &This->vardescs[index]; - TRACE("%p %u %d\n", This, index, helpContext); + TRACE("%p, %u, %ld.\n", iface, index, helpContext); if(index >= This->typeattr.cVars) return TYPE_E_ELEMENTNOTFOUND; @@ -11347,24 +11323,21 @@ static HRESULT WINAPI ICreateTypeInfo2_fnDeleteFuncDesc(ICreateTypeInfo2 *iface, static HRESULT WINAPI ICreateTypeInfo2_fnDeleteFuncDescByMemId(ICreateTypeInfo2 *iface, MEMBERID memid, INVOKEKIND invKind) { - ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %x %d - stub\n", This, memid, invKind); + FIXME("%p, %#lx, %d - stub\n", iface, memid, invKind); return E_NOTIMPL; } static HRESULT WINAPI ICreateTypeInfo2_fnDeleteVarDesc(ICreateTypeInfo2 *iface, UINT index) { - ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %u - stub\n", This, index); + FIXME("%p, %u - stub\n", iface, index); return E_NOTIMPL; } static HRESULT WINAPI ICreateTypeInfo2_fnDeleteVarDescByMemId(ICreateTypeInfo2 *iface, MEMBERID memid) { - ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %x - stub\n", This, memid); + FIXME("%p, %#lx - stub\n", iface, memid); return E_NOTIMPL; } @@ -11447,7 +11420,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetHelpStringContext(ICreateTypeInfo2 * { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - TRACE("%p %u\n", This, helpStringContext); + TRACE("%p, %lu.\n", iface, helpStringContext); This->dwHelpStringContext = helpStringContext; @@ -11457,23 +11430,20 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetHelpStringContext(ICreateTypeInfo2 * static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncHelpStringContext(ICreateTypeInfo2 *iface, UINT index, ULONG helpStringContext) { - ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %u %u - stub\n", This, index, helpStringContext); + FIXME("%p, %u, %lu - stub\n", iface, index, helpStringContext); return E_NOTIMPL; } static HRESULT WINAPI ICreateTypeInfo2_fnSetVarHelpStringContext(ICreateTypeInfo2 *iface, UINT index, ULONG helpStringContext) { - ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %u %u - stub\n", This, index, helpStringContext); + FIXME("%p, %u, %lu - stub\n", iface, index, helpStringContext); return E_NOTIMPL; } static HRESULT WINAPI ICreateTypeInfo2_fnInvalidate(ICreateTypeInfo2 *iface) { - ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p - stub\n", This); + FIXME("%p - stub\n", iface); return E_NOTIMPL; } diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index fe21520b2e7..aa54a2b092b 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -102,7 +102,7 @@ unsigned char * WINAPI CLEANLOCALSTORAGE_UserMarshal(ULONG *pFlags, unsigned cha break; default: - ERR("Unknown type %x\n", pstg->flags); + ERR("Unknown type %lx\n", pstg->flags); } *(VOID**)pstg->pStorage = NULL; @@ -135,11 +135,11 @@ typedef struct ULONG WINAPI BSTR_UserSize(ULONG *pFlags, ULONG Start, BSTR *pstr) { - TRACE("(%x,%d,%p) => %p\n", *pFlags, Start, pstr, *pstr); + TRACE("%#lx, %lu, %p => %p\n", *pFlags, Start, pstr, *pstr); if (*pstr) TRACE("string=%s\n", debugstr_w(*pstr)); ALIGN_LENGTH(Start, 3); Start += sizeof(bstr_wire_t) + ((SysStringByteLen(*pstr) + 1) & ~1); - TRACE("returning %d\n", Start); + TRACE("returning %ld\n", Start); return Start; } @@ -148,7 +148,7 @@ unsigned char * WINAPI BSTR_UserMarshal(ULONG *pFlags, unsigned char *Buffer, BS bstr_wire_t *header; DWORD len = SysStringByteLen(*pstr); - TRACE("(%x,%p,%p) => %p\n", *pFlags, Buffer, pstr, *pstr); + TRACE("%#lx, %p, %p => %p\n", *pFlags, Buffer, pstr, *pstr); if (*pstr) TRACE("string=%s\n", debugstr_w(*pstr)); ALIGN_POINTER(Buffer, 3); @@ -168,12 +168,12 @@ unsigned char * WINAPI BSTR_UserMarshal(ULONG *pFlags, unsigned char *Buffer, BS unsigned char * WINAPI BSTR_UserUnmarshal(ULONG *pFlags, unsigned char *Buffer, BSTR *pstr) { bstr_wire_t *header; - TRACE("(%x,%p,%p) => %p\n", *pFlags, Buffer, pstr, *pstr); + TRACE("%#lx, %p, %p => %p\n", *pFlags, Buffer, pstr, *pstr); ALIGN_POINTER(Buffer, 3); header = (bstr_wire_t*)Buffer; if(header->len != header->len2) - FIXME("len %08x != len2 %08x\n", header->len, header->len2); + FIXME("len %#lx != len2 %#lx\n", header->len, header->len2); if (header->byte_len == 0xffffffff) { @@ -188,7 +188,7 @@ unsigned char * WINAPI BSTR_UserUnmarshal(ULONG *pFlags, unsigned char *Buffer, void WINAPI BSTR_UserFree(ULONG *pFlags, BSTR *pstr) { - TRACE("(%x,%p) => %p\n", *pFlags, pstr, *pstr); + TRACE("%#lx, %p => %p\n", *pFlags, pstr, *pstr); SysFreeString(*pstr); *pstr = NULL; } @@ -282,7 +282,7 @@ static unsigned interface_user_size(ULONG *pFlags, ULONG Start, REFIID riid, IUn } } size += sizeof(ULONG); - TRACE("wire-size extra of interface variant is %d\n", size); + TRACE("wire-size extra of interface variant is %ld.\n", size); return Start + size; } @@ -327,7 +327,7 @@ static ULONG wire_extra_user_size(ULONG *pFlags, ULONG Start, VARIANT *pvar) static unsigned char* interface_user_marshal(ULONG *pFlags, unsigned char *Buffer, REFIID riid, IUnknown *punk) { - TRACE("pFlags=%d, Buffer=%p, pUnk=%p\n", *pFlags, Buffer, punk); + TRACE("%#lx, %p, %p.\n", *pFlags, Buffer, punk); /* first DWORD is used to store pointer itself, truncated on win64 */ if(!punk) @@ -350,7 +350,7 @@ static unsigned char *interface_user_unmarshal(ULONG *pFlags, unsigned char *Buf { DWORD ptr; - TRACE("pFlags=%d, Buffer=%p, ppUnk=%p\n", *pFlags, Buffer, ppunk); + TRACE("%#lx, %p, %p.\n", *pFlags, Buffer, ppunk); /* skip pointer part itself */ ptr = *(DWORD*)Buffer; @@ -365,7 +365,7 @@ static unsigned char *interface_user_unmarshal(ULONG *pFlags, unsigned char *Buf ULONG WINAPI VARIANT_UserSize(ULONG *pFlags, ULONG Start, VARIANT *pvar) { int align; - TRACE("(%x,%d,%p)\n", *pFlags, Start, pvar); + TRACE("%#lx, %lu, %p.\n", *pFlags, Start, pvar); TRACE("vt=%04x\n", V_VT(pvar)); ALIGN_LENGTH(Start, 7); @@ -381,7 +381,7 @@ ULONG WINAPI VARIANT_UserSize(ULONG *pFlags, ULONG Start, VARIANT *pvar) Start += get_type_size(pFlags, V_VT(pvar)); Start = wire_extra_user_size(pFlags, Start, pvar); - TRACE("returning %d\n", Start); + TRACE("returning %ld\n", Start); return Start; } @@ -392,7 +392,7 @@ unsigned char * WINAPI VARIANT_UserMarshal(ULONG *pFlags, unsigned char *Buffer, int align; unsigned char *Pos; - TRACE("(%x,%p,%p)\n", *pFlags, Buffer, pvar); + TRACE("%#lx, %p, %p.\n", *pFlags, Buffer, pvar); TRACE("vt=%04x\n", V_VT(pvar)); ALIGN_POINTER(Buffer, 7); @@ -479,7 +479,7 @@ unsigned char * WINAPI VARIANT_UserMarshal(ULONG *pFlags, unsigned char *Buffer, } } header->clSize = ((Pos - Buffer) + 7) >> 3; - TRACE("marshalled size=%d\n", header->clSize); + TRACE("marshalled size %ld\n", header->clSize); return Pos; } @@ -490,7 +490,7 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe int align; unsigned char *Pos; - TRACE("(%x,%p,%p)\n", *pFlags, Buffer, pvar); + TRACE("%#lx, %p, %p.\n", *pFlags, Buffer, pvar); ALIGN_POINTER(Buffer, 7); @@ -617,7 +617,7 @@ void WINAPI VARIANT_UserFree(ULONG *pFlags, VARIANT *pvar) VARTYPE vt = V_VT(pvar); PVOID ref = NULL; - TRACE("(%x,%p)\n", *pFlags, pvar); + TRACE("%#lx, %p.\n", *pFlags, pvar); TRACE("vt=%04x\n", V_VT(pvar)); if (vt & VT_BYREF) ref = pvar->n1.n2.n3.byref; @@ -773,7 +773,7 @@ ULONG WINAPI LPSAFEARRAY_UserSize(ULONG *pFlags, ULONG StartingSize, LPSAFEARRAY { ULONG size = StartingSize; - TRACE("("); dump_user_flags(pFlags); TRACE(", %d, %p\n", StartingSize, *ppsa); + TRACE("("); dump_user_flags(pFlags); TRACE(", %ld, %p\n", StartingSize, *ppsa); ALIGN_LENGTH(size, 3); size += sizeof(ULONG); @@ -1248,7 +1248,7 @@ HRESULT CALLBACK IDispatch_Invoke_Proxy( UINT uArgErr; EXCEPINFO ExcepInfo; - TRACE("(%p)->(%d,%s,%x,%x,%p,%p,%p,%p)\n", This, + TRACE("%p, %ld, %s, %#lx, %x, %p, %p, %p, %p.\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); @@ -1488,7 +1488,7 @@ HRESULT CALLBACK ITypeComp_Bind_Proxy( VARDESC *vardesc; HRESULT hr; - TRACE("(%p, %s, %#x, %#x, %p, %p, %p)\n", This, debugstr_w(name), lHashVal, flags, ti, + TRACE("%p, %s, %#lx, %#x, %p, %p, %p.\n", This, debugstr_w(name), lHashVal, flags, ti, desckind, bindptr); *desckind = DESCKIND_NONE; @@ -1534,7 +1534,7 @@ HRESULT __RPC_STUB ITypeComp_Bind_Stub( BINDPTR bindptr; HRESULT hr; - TRACE("(%p, %s, %#x, %#x, %p, %p, %p, %p, %p, %p)\n", This, debugstr_w(name), + TRACE("%p, %s, %#lx, %#x, %p, %p, %p, %p, %p, %p.\n", This, debugstr_w(name), lHashVal, flags, ti, desckind, funcdesc, vardesc, typecomp, stg); memset(stg, 0, sizeof(*stg)); @@ -1586,7 +1586,7 @@ HRESULT CALLBACK ITypeComp_BindType_Proxy( { HRESULT hr; - TRACE("(%p, %s, %#x, %p, %p)\n", This, debugstr_w(name), lHashVal, ti, typecomp); + TRACE("%p, %s, %#lx, %p, %p.\n", This, debugstr_w(name), lHashVal, ti, typecomp); hr = ITypeComp_RemoteBindType_Proxy(This, name, lHashVal, ti); if (hr == S_OK) @@ -1606,7 +1606,7 @@ HRESULT __RPC_STUB ITypeComp_BindType_Stub( ITypeComp *typecomp = NULL; HRESULT hr; - TRACE("(%p, %s, %#x, %p)\n", This, debugstr_w(name), lHashVal, ti); + TRACE("%p, %s, %#lx, %p.\n", This, debugstr_w(name), lHashVal, ti); hr = ITypeComp_BindType(This, name, lHashVal, ti, &typecomp); @@ -1729,7 +1729,7 @@ HRESULT CALLBACK ITypeInfo_GetNames_Proxy( UINT cMaxNames, UINT* pcNames) { - TRACE("(%p, %08x, %p, %d, %p)\n", This, memid, rgBstrNames, cMaxNames, pcNames); + TRACE("%p, %#lx, %p, %d, %p.\n", This, memid, rgBstrNames, cMaxNames, pcNames); return ITypeInfo_RemoteGetNames_Proxy(This, memid, rgBstrNames, cMaxNames, pcNames); } @@ -1741,7 +1741,7 @@ HRESULT __RPC_STUB ITypeInfo_GetNames_Stub( UINT cMaxNames, UINT* pcNames) { - TRACE("(%p, %08x, %p, %d, %p)\n", This, memid, rgBstrNames, cMaxNames, pcNames); + TRACE("%p, %#lx, %p, %d, %p.\n", This, memid, rgBstrNames, cMaxNames, pcNames); return ITypeInfo_GetNames(This, memid, rgBstrNames, cMaxNames, pcNames); } @@ -1791,7 +1791,8 @@ HRESULT CALLBACK ITypeInfo_GetDocumentation_Proxy(ITypeInfo *This, MEMBERID memi DWORD dummy_help_context, flags = 0; BSTR dummy_name, dummy_doc_string, dummy_help_file; HRESULT hr; - TRACE("(%p, %08x, %p, %p, %p, %p)\n", This, memid, name, doc_string, help_context, help_file); + + TRACE("%p, %#lx, %p, %p, %p, %p.\n", This, memid, name, doc_string, help_context, help_file); if(!name) name = &dummy_name; else flags = 1; @@ -1816,7 +1817,7 @@ HRESULT __RPC_STUB ITypeInfo_GetDocumentation_Stub(ITypeInfo *This, MEMBERID mem DWORD flags, BSTR *name, BSTR *doc_string, DWORD *help_context, BSTR *help_file) { - TRACE("(%p, %08x, %08x, %p, %p, %p, %p)\n", This, memid, flags, name, doc_string, help_context, help_file); + TRACE("%p, %#lx, %#lx, %p, %p, %p, %p.\n", This, memid, flags, name, doc_string, help_context, help_file); *name = *doc_string = *help_file = NULL; *help_context = 0; @@ -1837,7 +1838,8 @@ HRESULT CALLBACK ITypeInfo_GetDllEntry_Proxy(ITypeInfo *This, MEMBERID memid, BSTR dummy_dll_name, dummy_name; WORD dummy_ordinal; HRESULT hr; - TRACE("(%p, %08x, %x, %p, %p, %p)\n", This, memid, invkind, dll_name, name, ordinal); + + TRACE("%p, %#lx, %#x, %p, %p, %p.\n", This, memid, invkind, dll_name, name, ordinal); if(!dll_name) dll_name = &dummy_dll_name; else flags = 1; @@ -1860,7 +1862,7 @@ HRESULT __RPC_STUB ITypeInfo_GetDllEntry_Stub(ITypeInfo *This, MEMBERID memid, BSTR *dll_name, BSTR *name, WORD *ordinal) { - TRACE("(%p, %08x, %x, %p, %p, %p)\n", This, memid, invkind, dll_name, name, ordinal); + TRACE("%p, %#lx, %x, %p, %p, %p.\n", This, memid, invkind, dll_name, name, ordinal); *dll_name = *name = NULL; *ordinal = 0; @@ -2017,7 +2019,8 @@ HRESULT CALLBACK ITypeInfo2_GetDocumentation2_Proxy(ITypeInfo2 *This, MEMBERID m DWORD dummy_help_context, flags = 0; BSTR dummy_help_string, dummy_help_dll; HRESULT hr; - TRACE("(%p, %08x, %08x, %p, %p, %p)\n", This, memid, lcid, help_string, help_context, help_dll); + + TRACE("%p, %#lx, %#lx, %p, %p, %p.\n", This, memid, lcid, help_string, help_context, help_dll); if(!help_string) help_string = &dummy_help_string; else flags = 1; @@ -2040,7 +2043,7 @@ HRESULT __RPC_STUB ITypeInfo2_GetDocumentation2_Stub(ITypeInfo2 *This, MEMBERID BSTR *help_string, DWORD *help_context, BSTR *help_dll) { - TRACE("(%p, %08x, %08x, %08x, %p, %p, %p)\n", This, memid, lcid, flags, help_string, help_context, help_dll); + TRACE("%p, %#lx, %#lx, %#lx, %p, %p, %p.\n", This, memid, lcid, flags, help_string, help_context, help_dll); *help_string = *help_dll = NULL; *help_context = 0; @@ -2139,7 +2142,7 @@ HRESULT __RPC_STUB ITypeLib_GetDocumentation_Stub(ITypeLib *This, INT index, DWO BSTR *name, BSTR *doc_string, DWORD *help_context, BSTR *help_file) { - TRACE("(%p, %d, %08x, %p, %p, %p, %p)\n", This, index, flags, name, doc_string, help_context, help_file); + TRACE("%p, %d, %#lx, %p, %p, %p, %p.\n", This, index, flags, name, doc_string, help_context, help_file); *name = *doc_string = *help_file = NULL; *help_context = 0; @@ -2241,7 +2244,8 @@ HRESULT CALLBACK ITypeLib2_GetDocumentation2_Proxy(ITypeLib2 *This, INT index, DWORD dummy_help_context, flags = 0; BSTR dummy_help_string, dummy_help_dll; HRESULT hr; - TRACE("(%p, %d, %08x, %p, %p, %p)\n", This, index, lcid, help_string, help_context, help_dll); + + TRACE("%p, %d, %#lx, %p, %p, %p.\n", This, index, lcid, help_string, help_context, help_dll); if(!help_string) help_string = &dummy_help_string; else flags = 1; @@ -2263,7 +2267,7 @@ HRESULT __RPC_STUB ITypeLib2_GetDocumentation2_Stub(ITypeLib2 *This, INT index, DWORD flags, BSTR *help_string, DWORD *help_context, BSTR *help_dll) { - TRACE("(%p, %d, %08x, %08x, %p, %p, %p)\n", This, index, lcid, flags, help_string, help_context, help_dll); + TRACE("%p, %d, %#lx, %#lx, %p, %p, %p.\n", This, index, lcid, flags, help_string, help_context, help_dll); *help_string = *help_dll = NULL; *help_context = 0; @@ -2323,7 +2327,8 @@ HRESULT __RPC_STUB IPropertyBag_Read_Stub( { IDispatch *disp; HRESULT hr; - TRACE("(%p, %s, %p, %p, %x, %p)\n", This, debugstr_w(pszPropName), pVar, + + TRACE("%p, %s, %p, %p, %lx, %p.\n", This, debugstr_w(pszPropName), pVar, pErrorLog, varType, pUnkObj); if(varType & (VT_BYREF | VT_ARRAY | VT_VECTOR)) @@ -2402,7 +2407,7 @@ HRESULT CALLBACK IEnumConnections_Next_Proxy( { ULONG fetched; - TRACE("(%u, %p %p)\n", cConnections, rgcd, pcFetched); + TRACE("%lu, %p, %p.\n", cConnections, rgcd, pcFetched); if (!pcFetched) pcFetched = &fetched; @@ -2418,7 +2423,7 @@ HRESULT __RPC_STUB IEnumConnections_Next_Stub( { HRESULT hr; - TRACE("(%u, %p, %p)\n", cConnections, rgcd, pcFetched); + TRACE("%lu, %p, %p.\n", cConnections, rgcd, pcFetched); *pcFetched = 0; hr = IEnumConnections_Next(This, cConnections, rgcd, pcFetched); @@ -2436,7 +2441,7 @@ HRESULT CALLBACK IEnumConnectionPoints_Next_Proxy( { ULONG fetched; - TRACE("(%u, %p %p)\n", cConnections, ppCP, pcFetched); + TRACE("%lu, %p %p.\n", cConnections, ppCP, pcFetched); if (!pcFetched) pcFetched = &fetched; @@ -2452,7 +2457,7 @@ HRESULT __RPC_STUB IEnumConnectionPoints_Next_Stub( { HRESULT hr; - TRACE("(%u, %p, %p)\n", cConnections, ppCP, pcFetched); + TRACE("%lu, %p, %p.\n", cConnections, ppCP, pcFetched); *pcFetched = 0; hr = IEnumConnectionPoints_Next(This, cConnections, ppCP, pcFetched); @@ -2467,7 +2472,7 @@ HRESULT CALLBACK IPersistMemory_Load_Proxy( LPVOID pMem, ULONG cbSize) { - TRACE("(%p, %u)\n", pMem, cbSize); + TRACE("%p, %lu.\n", pMem, cbSize); if (!pMem) return E_POINTER; @@ -2480,7 +2485,7 @@ HRESULT __RPC_STUB IPersistMemory_Load_Stub( BYTE *pMem, ULONG cbSize) { - TRACE("(%p, %u)\n", pMem, cbSize); + TRACE("%p, %lu.\n", pMem, cbSize); return IPersistMemory_Load(This, pMem, cbSize); } @@ -2490,7 +2495,7 @@ HRESULT CALLBACK IPersistMemory_Save_Proxy( BOOL fClearDirty, ULONG cbSize) { - TRACE("(%p, %d, %u)\n", pMem, fClearDirty, cbSize); + TRACE("%p, %d, %lu.\n", pMem, fClearDirty, cbSize); if (!pMem) return E_POINTER; @@ -2504,7 +2509,7 @@ HRESULT __RPC_STUB IPersistMemory_Save_Stub( BOOL fClearDirty, ULONG cbSize) { - TRACE("(%p, %d, %u)\n", pMem, fClearDirty, cbSize); + TRACE("%p, %d, %lu.\n", pMem, fClearDirty, cbSize); return IPersistMemory_Save(This, pMem, fClearDirty, cbSize); } @@ -2512,7 +2517,7 @@ void CALLBACK IAdviseSinkEx_OnViewStatusChange_Proxy( IAdviseSinkEx* This, DWORD dwViewStatus) { - TRACE("(%p, 0x%08x)\n", This, dwViewStatus); + TRACE("%p, %#lx.\n", This, dwViewStatus); IAdviseSinkEx_RemoteOnViewStatusChange_Proxy(This, dwViewStatus); } @@ -2520,7 +2525,7 @@ HRESULT __RPC_STUB IAdviseSinkEx_OnViewStatusChange_Stub( IAdviseSinkEx* This, DWORD dwViewStatus) { - TRACE("(%p, 0x%08x)\n", This, dwViewStatus); + TRACE("%p, %#lx.\n", This, dwViewStatus); IAdviseSinkEx_OnViewStatusChange(This, dwViewStatus); return S_OK; } @@ -2533,7 +2538,7 @@ HRESULT CALLBACK IEnumOleUndoUnits_Next_Proxy( { ULONG fetched; - TRACE("(%u, %p %p)\n", cElt, rgElt, pcEltFetched); + TRACE("%lu, %p %p.\n", cElt, rgElt, pcEltFetched); if (!pcEltFetched) pcEltFetched = &fetched; @@ -2549,7 +2554,7 @@ HRESULT __RPC_STUB IEnumOleUndoUnits_Next_Stub( { HRESULT hr; - TRACE("(%u, %p, %p)\n", cElt, rgElt, pcEltFetched); + TRACE("%lu, %p, %p.\n", cElt, rgElt, pcEltFetched); *pcEltFetched = 0; hr = IEnumOleUndoUnits_Next(This, cElt, rgElt, pcEltFetched); diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 8ed8f790d14..1d6fac4c518 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -492,7 +492,7 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok, DWORD fmt_state = 0; LPCWSTR pFormat = lpszFormat; - TRACE("(%s,%p,%d,%d,%d,0x%08x,%p)\n", debugstr_w(lpszFormat), rgbTok, cbTok, + TRACE("%s, %p, %d, %d, %d, %#lx, %p.\n", debugstr_w(lpszFormat), rgbTok, cbTok, nFirstDay, nFirstWeek, lcid, pcbActual); if (!rgbTok || @@ -1162,7 +1162,7 @@ static HRESULT VARIANT_FormatNumber(LPVARIANT pVarIn, LPOLESTR lpszFormat, const BYTE* pToken = NULL; HRESULT hRes = S_OK; - TRACE("(%s,%s,%p,0x%08x,%p,0x%08x)\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat), + TRACE("%s, %s, %p, %#lx, %p, %#lx.\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat), rgbTok, dwFlags, pbstrOut, lcid); V_VT(&vString) = VT_EMPTY; @@ -1570,7 +1570,7 @@ static HRESULT VARIANT_FormatDate(LPVARIANT pVarIn, LPOLESTR lpszFormat, const BYTE* pToken = NULL; HRESULT hRes; - TRACE("(%s,%s,%p,0x%08x,%p,0x%08x)\n", debugstr_variant(pVarIn), + TRACE("%s, %s, %p, %#lx, %p, %#lx.\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat), rgbTok, dwFlags, pbstrOut, lcid); V_VT(&vDate) = VT_EMPTY; @@ -1909,7 +1909,7 @@ static HRESULT VARIANT_FormatString(LPVARIANT pVarIn, LPOLESTR lpszFormat, BOOL bUpper = FALSE; HRESULT hRes = S_OK; - TRACE("%s,%s,%p,0x%08x,%p,0x%08x)\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat), + TRACE("%s, %s, %p, %#lx, %p, %#lx.\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat), rgbTok, dwFlags, pbstrOut, lcid); V_VT(&vStr) = VT_EMPTY; @@ -2035,7 +2035,7 @@ HRESULT WINAPI VarFormatFromTokens(LPVARIANT pVarIn, LPOLESTR lpszFormat, VARIANT vTmp; HRESULT hres; - TRACE("(%p,%s,%p,%x,%p,0x%08x)\n", pVarIn, debugstr_w(lpszFormat), + TRACE("%p, %s, %p, %#lx, %p, %#lx.\n", pVarIn, debugstr_w(lpszFormat), rgbTok, dwFlags, pbstrOut, lcid); if (!pbstrOut) @@ -2122,7 +2122,7 @@ HRESULT WINAPI VarFormat(LPVARIANT pVarIn, LPOLESTR lpszFormat, BYTE buff[256]; HRESULT hres; - TRACE("(%s,%s,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat), + TRACE("%s, %s, %d, %d, %#lx, %p.\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat), nFirstDay, nFirstWeek, dwFlags, pbstrOut); if (!pbstrOut) @@ -2134,7 +2134,7 @@ HRESULT WINAPI VarFormat(LPVARIANT pVarIn, LPOLESTR lpszFormat, if (SUCCEEDED(hres)) hres = VarFormatFromTokens(pVarIn, lpszFormat, buff, dwFlags, pbstrOut, LOCALE_USER_DEFAULT); - TRACE("returning 0x%08x, %s\n", hres, debugstr_w(*pbstrOut)); + TRACE("returning %#lx, %s\n", hres, debugstr_w(*pbstrOut)); return hres; } @@ -2172,7 +2172,7 @@ HRESULT WINAPI VarFormatDateTime(LPVARIANT pVarIn, INT nFormat, ULONG dwFlags, B static WCHAR szEmpty[] = L""; const BYTE* lpFmt = NULL; - TRACE("%s,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nFormat, dwFlags, pbstrOut); + TRACE("%s, %d, %#lx, %p.\n", debugstr_variant(pVarIn), nFormat, dwFlags, pbstrOut); if (!pVarIn || !pbstrOut || nFormat < 0 || nFormat > 4) return E_INVALIDARG; @@ -2224,7 +2224,7 @@ HRESULT WINAPI VarFormatNumber(LPVARIANT pVarIn, INT nDigits, INT nLeading, INT HRESULT hRet; VARIANT vStr; - TRACE("(%s,%d,%d,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nDigits, nLeading, + TRACE("%s, %d, %d, %d, %d, %#lx, %p.\n", debugstr_variant(pVarIn), nDigits, nLeading, nParens, nGrouping, dwFlags, pbstrOut); if (!pVarIn || !pbstrOut || nDigits > 9) @@ -2329,7 +2329,7 @@ HRESULT WINAPI VarFormatPercent(LPVARIANT pVarIn, INT nDigits, INT nLeading, INT HRESULT hRet; VARIANT vDbl; - TRACE("(%s,%d,%d,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nDigits, nLeading, + TRACE("%s, %d, %d, %d, %d, %#lx, %p.\n", debugstr_variant(pVarIn), nDigits, nLeading, nParens, nGrouping, dwFlags, pbstrOut); if (!pVarIn || !pbstrOut || nDigits > 9) @@ -2403,7 +2403,7 @@ HRESULT WINAPI VarFormatCurrency(LPVARIANT pVarIn, INT nDigits, INT nLeading, VARIANT vStr; CY cy; - TRACE("(%s,%d,%d,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nDigits, nLeading, + TRACE("%s, %d, %d, %d, %d, %#lx, %p.\n", debugstr_variant(pVarIn), nDigits, nLeading, nParens, nGrouping, dwFlags, pbstrOut); if (!pVarIn || !pbstrOut || nDigits > 9) @@ -2512,7 +2512,7 @@ HRESULT WINAPI VarMonthName(INT iMonth, INT fAbbrev, ULONG dwFlags, BSTR *pbstrO return E_INVALIDARG; if (dwFlags) - FIXME("Does not support dwFlags 0x%x, ignoring.\n", dwFlags); + FIXME("Does not support flags %#lx, ignoring.\n", dwFlags); if (fAbbrev) localeValue = LOCALE_SABBREVMONTHNAME1 + iMonth - 1; @@ -2521,7 +2521,7 @@ HRESULT WINAPI VarMonthName(INT iMonth, INT fAbbrev, ULONG dwFlags, BSTR *pbstrO size = GetLocaleInfoW(LOCALE_USER_DEFAULT,localeValue, NULL, 0); if (!size) { - ERR("GetLocaleInfo 0x%x failed.\n", localeValue); + ERR("GetLocaleInfo %#lx failed.\n", localeValue); return HRESULT_FROM_WIN32(GetLastError()); } *pbstrOut = SysAllocStringLen(NULL,size - 1); @@ -2529,7 +2529,7 @@ HRESULT WINAPI VarMonthName(INT iMonth, INT fAbbrev, ULONG dwFlags, BSTR *pbstrO return E_OUTOFMEMORY; size = GetLocaleInfoW(LOCALE_USER_DEFAULT,localeValue, *pbstrOut, size); if (!size) { - ERR("GetLocaleInfo of 0x%x failed in 2nd stage?!\n", localeValue); + ERR("GetLocaleInfo of %#lx failed in 2nd stage?!\n", localeValue); SysFreeString(*pbstrOut); return HRESULT_FROM_WIN32(GetLastError()); } @@ -2569,7 +2569,7 @@ HRESULT WINAPI VarWeekdayName(INT iWeekday, INT fAbbrev, INT iFirstDay, return E_INVALIDARG; if (dwFlags) - FIXME("Does not support dwFlags 0x%x, ignoring.\n", dwFlags); + FIXME("Does not support flags %#lx, ignoring.\n", dwFlags); /* If we have to use the default firstDay, find which one it is */ if (iFirstDay == 0) { @@ -2578,7 +2578,7 @@ HRESULT WINAPI VarWeekdayName(INT iWeekday, INT fAbbrev, INT iFirstDay, size = GetLocaleInfoW(LOCALE_USER_DEFAULT, localeValue, (LPWSTR)&firstDay, sizeof(firstDay) / sizeof(WCHAR)); if (!size) { - ERR("GetLocaleInfo 0x%x failed.\n", localeValue); + ERR("GetLocaleInfo %#lx failed.\n", localeValue); return HRESULT_FROM_WIN32(GetLastError()); } iFirstDay = firstDay + 2; @@ -2591,7 +2591,7 @@ HRESULT WINAPI VarWeekdayName(INT iWeekday, INT fAbbrev, INT iFirstDay, /* Determine the size of the data, allocate memory and retrieve the data */ size = GetLocaleInfoW(LOCALE_USER_DEFAULT, localeValue, NULL, 0); if (!size) { - ERR("GetLocaleInfo 0x%x failed.\n", localeValue); + ERR("GetLocaleInfo %#lx failed.\n", localeValue); return HRESULT_FROM_WIN32(GetLastError()); } *pbstrOut = SysAllocStringLen(NULL, size - 1); @@ -2599,7 +2599,7 @@ HRESULT WINAPI VarWeekdayName(INT iWeekday, INT fAbbrev, INT iFirstDay, return E_OUTOFMEMORY; size = GetLocaleInfoW(LOCALE_USER_DEFAULT, localeValue, *pbstrOut, size); if (!size) { - ERR("GetLocaleInfo 0x%x failed in 2nd stage?!\n", localeValue); + ERR("GetLocaleInfo %#lx failed in 2nd stage?!\n", localeValue); SysFreeString(*pbstrOut); return HRESULT_FROM_WIN32(GetLastError()); } diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 010b1143172..bf8f041b9c6 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -51,7 +51,7 @@ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags, VARTYPE vtFrom = V_TYPE(ps); DWORD dwFlags = 0; - TRACE("(%s,0x%08x,0x%04x,%s,%s)\n", debugstr_variant(pd), lcid, wFlags, + TRACE("%s, %#lx, 0x%04x, %s, %s.\n", debugstr_variant(pd), lcid, wFlags, debugstr_variant(ps), debugstr_vt(vt)); if (vt == VT_BSTR || vtFrom == VT_BSTR) @@ -918,7 +918,7 @@ VariantCopyInd_Return: if (pSrc != pvargSrc) VariantClear(&vTmp); - TRACE("returning 0x%08x, %s\n", hres, debugstr_variant(pvargDest)); + TRACE("returning %#lx, %s\n", hres, debugstr_variant(pvargDest)); return hres; } @@ -972,7 +972,7 @@ HRESULT WINAPI VariantChangeTypeEx(VARIANTARG* pvargDest, const VARIANTARG* pvar { HRESULT res = S_OK; - TRACE("(%s,%s,0x%08x,0x%04x,%s)\n", debugstr_variant(pvargDest), + TRACE("%s, %s, %#lx, 0x%04x, %s.\n", debugstr_variant(pvargDest), debugstr_variant(pvargSrc), lcid, wFlags, debugstr_vt(vt)); if (vt == VT_CLSID) @@ -1021,7 +1021,7 @@ HRESULT WINAPI VariantChangeTypeEx(VARIANTARG* pvargDest, const VARIANTARG* pvar } } - TRACE("returning 0x%08x, %s\n", res, debugstr_variant(pvargDest)); + TRACE("returning %#lx, %s\n", res, debugstr_variant(pvargDest)); return res; } @@ -1329,7 +1329,7 @@ HRESULT WINAPI VarDateFromUdateEx(UDATE *pUdateIn, LCID lcid, ULONG dwFlags, DAT UDATE ud; double dateVal = 0; - TRACE("(%p->%d/%d/%d %d:%d:%d:%d %d %d,0x%08x,0x%08x,%p)\n", pUdateIn, + TRACE("%p, %d/%d/%d, %d:%d:%d:%d, %#x, %d, %#lx, %#lx, %p.\n", pUdateIn, pUdateIn->st.wMonth, pUdateIn->st.wDay, pUdateIn->st.wYear, pUdateIn->st.wHour, pUdateIn->st.wMinute, pUdateIn->st.wSecond, pUdateIn->st.wMilliseconds, pUdateIn->st.wDayOfWeek, @@ -1338,7 +1338,7 @@ HRESULT WINAPI VarDateFromUdateEx(UDATE *pUdateIn, LCID lcid, ULONG dwFlags, DAT if (lcid != MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT)) FIXME("lcid possibly not handled, treating as en-us\n"); if (dwFlags & ~(VAR_TIMEVALUEONLY|VAR_DATEVALUEONLY)) - FIXME("unsupported flags: %x\n", dwFlags); + FIXME("unsupported flags: %lx\n", dwFlags); ud = *pUdateIn; @@ -1416,7 +1416,7 @@ HRESULT WINAPI VarUdateFromDate(DATE dateIn, ULONG dwFlags, UDATE *lpUdate) double datePart, timePart; int julianDays; - TRACE("(%g,0x%08x,%p)\n", dateIn, dwFlags, lpUdate); + TRACE("%g, %#lx, %p.\n", dateIn, dwFlags, lpUdate); if (dateIn <= (DATE_MIN - 1.0) || dateIn >= (DATE_MAX + 1.0)) return E_INVALIDARG; @@ -1507,7 +1507,7 @@ typedef struct tagVARIANT_NUMBER_CHARS WARN("buffer too small for " #fld "\n"); \ else \ if (buff[0]) lpChars->name = buff[0]; \ - TRACE("lcid 0x%x, " #name "=%s\n", lcid, wine_dbgstr_wn(&lpChars->name, 1)) + TRACE("lcid 0x%lx, " #name "=%s\n", lcid, wine_dbgstr_wn(&lpChars->name, 1)) /* Get the valid number characters for an lcid */ static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID lcid, DWORD dwFlags) @@ -1533,7 +1533,7 @@ static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID if (!*lpChars->sCurrency) wcscpy(lpChars->sCurrency, L"$"); lpChars->sCurrencyLen = wcslen(lpChars->sCurrency); - TRACE("lcid 0x%x, sCurrency=%u %s\n", lcid, lpChars->sCurrencyLen, wine_dbgstr_w(lpChars->sCurrency)); + TRACE("lcid %#lx, sCurrency %lu %s\n", lcid, lpChars->sCurrencyLen, wine_dbgstr_w(lpChars->sCurrency)); } /* Number Parsing States */ @@ -1590,7 +1590,7 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla int cchUsed = 0; OLECHAR cDigitSeparator2; - TRACE("(%s,%d,0x%08x,%p,%p)\n", debugstr_w(lpszStr), lcid, dwFlags, pNumprs, rgbDig); + TRACE("%s, %#lx, %#lx, %p, %p.\n", debugstr_w(lpszStr), lcid, dwFlags, pNumprs, rgbDig); if (!pNumprs || !rgbDig) return E_INVALIDARG; @@ -2083,7 +2083,7 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig, int wholeNumberDigits, fractionalDigits, divisor10 = 0, multiplier10 = 0; - TRACE("(%p,%p,0x%x,%p)\n", pNumprs, rgbDig, dwVtBits, pVarDst); + TRACE("%p, %p, %lx, %p.\n", pNumprs, rgbDig, dwVtBits, pVarDst); if (pNumprs->nBaseShift) { @@ -2182,7 +2182,7 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig, return S_OK; } - TRACE("Overflow: possible return types: 0x%x, value: %s\n", dwVtBits, wine_dbgstr_longlong(ul64)); + TRACE("Overflow: possible return types: %#lx, value: %s\n", dwVtBits, wine_dbgstr_longlong(ul64)); return DISP_E_OVERFLOW; } @@ -2783,7 +2783,7 @@ HRESULT WINAPI VarCmp(LPVARIANT left, LPVARIANT right, LCID lcid, DWORD flags) DWORD xmask; HRESULT rc; - TRACE("(%s,%s,0x%08x,0x%08x)\n", debugstr_variant(left), debugstr_variant(right), lcid, flags); + TRACE("%s, %s, %#lx, %#lx.\n", debugstr_variant(left), debugstr_variant(right), lcid, flags); lvt = V_VT(left) & VT_TYPEMASK; rvt = V_VT(right) & VT_TYPEMASK; @@ -3378,7 +3378,7 @@ end: VariantClear(&tv); VariantClear(&tempLeft); VariantClear(&tempRight); - TRACE("returning 0x%8x %s\n", hres, debugstr_variant(result)); + TRACE("returning %#lx, %s\n", hres, debugstr_variant(result)); return hres; } @@ -3567,7 +3567,7 @@ end: VariantClear(&tv); VariantClear(&tempLeft); VariantClear(&tempRight); - TRACE("returning 0x%8x %s\n", hres, debugstr_variant(result)); + TRACE("returning %#lx, %s\n", hres, debugstr_variant(result)); return hres; } @@ -3729,7 +3729,7 @@ end: VariantClear(&rv); VariantClear(&tempLeft); VariantClear(&tempRight); - TRACE("returning 0x%8x %s\n", hres, debugstr_variant(result)); + TRACE("returning %#lx, %s\n", hres, debugstr_variant(result)); return hres; } @@ -3992,7 +3992,7 @@ end: VariantClear(&rv); VariantClear(&tempLeft); VariantClear(&tempRight); - TRACE("returning 0x%8x %s\n", hres, debugstr_variant(result)); + TRACE("returning %#lx, %s\n", hres, debugstr_variant(result)); return hres; } @@ -5225,7 +5225,7 @@ VarRound_Exit: V_VT(pVarOut) = VT_EMPTY; VariantClear(&temp); - TRACE("returning 0x%08x %s\n", hRet, debugstr_variant(pVarOut)); + TRACE("returning %#lx, %s\n", hRet, debugstr_variant(pVarOut)); return hRet; } @@ -5585,14 +5585,14 @@ HRESULT WINAPI VarMod(LPVARIANT left, LPVARIANT right, LPVARIANT result) rc = VariantChangeType(&lv, left, 0, VT_I8); if(FAILED(rc)) { - FIXME("Could not convert left type %d to %d? rc == 0x%X\n", V_VT(left), VT_I8, rc); + FIXME("Could not convert left type %d to %d? rc == %#lx.\n", V_VT(left), VT_I8, rc); goto end; } rc = VariantChangeType(&rv, right, 0, VT_I8); if(FAILED(rc)) { - FIXME("Could not convert right type %d to %d? rc == 0x%X\n", V_VT(right), VT_I8, rc); + FIXME("Could not convert right type %d to %d? rc == %#lx.\n", V_VT(right), VT_I8, rc); goto end; } diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 916a4858607..3850fec7066 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -6723,7 +6723,7 @@ BOOL get_date_format(LCID lcid, DWORD flags, const SYSTEMTIME *st, }; if(flags & ~(LOCALE_NOUSEROVERRIDE|VAR_DATEVALUEONLY)) - FIXME("ignoring flags %x\n", flags); + FIXME("ignoring flags %lx\n", flags); flags &= LOCALE_NOUSEROVERRIDE; while(*fmt && date_len) { @@ -6814,7 +6814,7 @@ HRESULT WINAPI VarBstrFromDate(DATE dateIn, LCID lcid, ULONG dwFlags, BSTR* pbst DWORD dwFormatFlags = dwFlags & LOCALE_NOUSEROVERRIDE; WCHAR date[128], fmt_buff[80], *time; - TRACE("(%g,0x%08x,0x%08x,%p)\n", dateIn, lcid, dwFlags, pbstrOut); + TRACE("%g, %#lx, %#lx, %p.\n", dateIn, lcid, dwFlags, pbstrOut); if (!pbstrOut || !VariantTimeToSystemTime(dateIn, &st)) return E_INVALIDARG; @@ -6888,7 +6888,7 @@ HRESULT WINAPI VarBstrFromBool(VARIANT_BOOL boolIn, LCID lcid, ULONG dwFlags, BS DWORD dwResId = IDS_TRUE; LANGID langId; - TRACE("%d,0x%08x,0x%08x,%p\n", boolIn, lcid, dwFlags, pbstrOut); + TRACE("%d, %#lx, %#lx, %p.\n", boolIn, lcid, dwFlags, pbstrOut); if (!pbstrOut) return E_INVALIDARG; @@ -7193,7 +7193,7 @@ HRESULT WINAPI VarBstrCmp(BSTR pbstrLeft, BSTR pbstrRight, LCID lcid, DWORD dwFl HRESULT hres; int ret; - TRACE("%s,%s,%d,%08x\n", + TRACE("%s, %s, %#lx, %#lx.\n", debugstr_wn(pbstrLeft, SysStringLen(pbstrLeft)), debugstr_wn(pbstrRight, SysStringLen(pbstrRight)), lcid, dwFlags); @@ -7233,7 +7233,7 @@ HRESULT WINAPI VarBstrCmp(BSTR pbstrLeft, BSTR pbstrRight, LCID lcid, DWORD dwFl hres = CompareStringW(lcid, dwFlags, pbstrLeft, lenLeft, pbstrRight, lenRight) - CSTR_LESS_THAN; - TRACE("%d\n", hres); + TRACE("%ld\n", hres); return hres; } } @@ -7448,7 +7448,7 @@ static inline HRESULT VARIANT_MakeDate(DATEPARSE *dp, DWORD iDate, else v3 = dp->dwValues[offset + 2]; - TRACE("(%d,%d,%d,%d,%d)\n", v1, v2, v3, iDate, offset); + TRACE("%ld, %ld, %ld, %ld, %ld.\n", v1, v2, v3, iDate, offset); /* If one number must be a month (Because a month name was given), then only * consider orders with the month in that position. @@ -7476,7 +7476,7 @@ static inline HRESULT VARIANT_MakeDate(DATEPARSE *dp, DWORD iDate, } VARIANT_MakeDate_Start: - TRACE("dwAllOrders is 0x%08x\n", dwAllOrders); + TRACE("dwAllOrders is %#lx\n", dwAllOrders); while (dwAllOrders) { @@ -7508,7 +7508,7 @@ VARIANT_MakeDate_Start: dwTry = dwAllOrders; } - TRACE("Attempt %d, dwTry is 0x%08x\n", dwCount, dwTry); + TRACE("Attempt %ld, dwTry is %#lx\n", dwCount, dwTry); dwCount++; if (!dwTry) @@ -7604,7 +7604,7 @@ VARIANT_MakeDate_OK: * But Wine doesn't have/use that key at the time of writing. */ st->wYear = v3 <= 49 ? 2000 + v3 : v3 <= 99 ? 1900 + v3 : v3; - TRACE("Returning date %d/%d/%d\n", v1, v2, st->wYear); + TRACE("Returning date %ld/%ld/%d\n", v1, v2, st->wYear); return S_OK; } @@ -7673,13 +7673,13 @@ HRESULT WINAPI VarDateFromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, DA *pdateOut = 0.0; - TRACE("(%s,0x%08x,0x%08x,%p)\n", debugstr_w(strIn), lcid, dwFlags, pdateOut); + TRACE("%s, %#lx, %#lx, %p.\n", debugstr_w(strIn), lcid, dwFlags, pdateOut); memset(&dp, 0, sizeof(dp)); GetLocaleInfoW(lcid, LOCALE_IDATE|LOCALE_RETURN_NUMBER|(dwFlags & LOCALE_NOUSEROVERRIDE), (LPWSTR)&iDate, sizeof(iDate)/sizeof(WCHAR)); - TRACE("iDate is %d\n", iDate); + TRACE("iDate is %ld\n", iDate); /* Get the month/day/am/pm tokens for this locale */ for (i = 0; i < ARRAY_SIZE(tokens); i++) @@ -7831,7 +7831,7 @@ HRESULT WINAPI VarDateFromStr(const OLECHAR* strIn, LCID lcid, ULONG dwFlags, DA * magic here occurs in VARIANT_MakeDate() above, where we determine what * each date number must represent in the context of iDate. */ - TRACE("0x%08x\n", TIMEFLAG(0)|TIMEFLAG(1)|TIMEFLAG(2)|TIMEFLAG(3)|TIMEFLAG(4)); + TRACE("%#lx\n", TIMEFLAG(0)|TIMEFLAG(1)|TIMEFLAG(2)|TIMEFLAG(3)|TIMEFLAG(4)); switch (TIMEFLAG(0)|TIMEFLAG(1)|TIMEFLAG(2)|TIMEFLAG(3)|TIMEFLAG(4)) { -- 2.34.1

1 0

[PATCH 1/3] kernel32/tests: Add test for GetConsoleProcessList.
by Roman Pišl Feb. 12, 2022

Feb. 12, 2022

Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/kernel32/tests/console.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index e4d9d43f4c4..94a0a370462 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1304,8 +1304,8 @@ static void test_GetConsoleProcessList(void) GetLastError()); /* We should only have 1 process but only for these specific unit tests as - * we created our own console. An AttachConsole(ATTACH_PARENT_PROCESS) would - * give us two processes for example. + * we created our own console. An AttachConsole(ATTACH_PARENT_PROCESS) + * gives us two processes - see test_AttachConsole. */ list = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD)); @@ -4354,6 +4354,20 @@ static void test_AttachConsole_child(DWORD console_pid) res = AttachConsole(ATTACH_PARENT_PROCESS); ok(res, "AttachConsole failed: %u\n", GetLastError()); + if (pGetConsoleProcessList) + { + DWORD list[2]; + DWORD pid = GetCurrentProcessId(); + SetLastError(0xdeadbeef); + len = pGetConsoleProcessList(list, 2); + todo_wine + ok(len == 2, "Expected 2, got %d\n", len); + todo_wine + ok(list[0] == console_pid || list[1] == console_pid, "Parent PID not in list\n"); + todo_wine + ok(list[0] == pid || list[1] == pid, "PID not in list\n"); + } + ok(pipe_in != GetStdHandle(STD_INPUT_HANDLE), "std handle not set to console\n"); ok(pipe_out != GetStdHandle(STD_OUTPUT_HANDLE), "std handle not set to console\n"); -- 2.30.2

2 5

[PATCH 01/27] dlls/dpvoice: enable compilation with long types
by Eric Pouech Feb. 12, 2022

Feb. 12, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dpvoice/Makefile.in | 1 - dlls/dpvoice/client.c | 28 ++++++++++++++-------------- dlls/dpvoice/server.c | 18 +++++++++--------- 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/dlls/dpvoice/Makefile.in b/dlls/dpvoice/Makefile.in index a3d85b093c6..7767d141fa8 100644 --- a/dlls/dpvoice/Makefile.in +++ b/dlls/dpvoice/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dpvoice.dll IMPORTS = dxguid uuid diff --git a/dlls/dpvoice/client.c b/dlls/dpvoice/client.c index b611370659e..b84f27b0a22 100644 --- a/dlls/dpvoice/client.c +++ b/dlls/dpvoice/client.c @@ -74,7 +74,7 @@ static ULONG WINAPI dpvclient_AddRef(IDirectPlayVoiceClient *iface) IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref); return ref; } @@ -84,7 +84,7 @@ static ULONG WINAPI dpvclient_Release(IDirectPlayVoiceClient *iface) IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref); if (!ref) { @@ -97,7 +97,7 @@ static HRESULT WINAPI dpvclient_Initialize(IDirectPlayVoiceClient *iface,LPUNKNO void *pUserContext, DWORD *pdwMessageMask, DWORD dwMessageMaskElements) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %p %p %p %p %d\n", This, pVoid, pMessageHandler, pUserContext,pdwMessageMask, dwMessageMaskElements); + FIXME("%p %p %p %p %p %ld\n", This, pVoid, pMessageHandler, pUserContext,pdwMessageMask, dwMessageMaskElements); return E_NOTIMPL; } @@ -105,14 +105,14 @@ static HRESULT WINAPI dpvclient_Connect(IDirectPlayVoiceClient *iface, PDVSOUNDD PDVCLIENTCONFIG pdvClientConfig, DWORD dwFlags) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %p %p %d\n", This, pSoundDeviceConfig, pdvClientConfig, dwFlags); + FIXME("%p %p %p %ld\n", This, pSoundDeviceConfig, pdvClientConfig, dwFlags); return E_NOTIMPL; } static HRESULT WINAPI dpvclient_Disconnect(IDirectPlayVoiceClient *iface, DWORD dwFlags) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %d\n", This, dwFlags); + FIXME("%p %ld\n", This, dwFlags); return E_NOTIMPL; } @@ -148,7 +148,7 @@ static HRESULT WINAPI dpvclient_GetCompressionTypes(IDirectPlayVoiceClient *ifac DWORD *pdwDataSize, DWORD *pdwNumElements, DWORD dwFlags) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %p %p %p %d semi-stub\n", This, pData, pdwDataSize, pdwNumElements, dwFlags); + FIXME("%p %p %p %p %ld semi-stub\n", This, pData, pdwDataSize, pdwNumElements, dwFlags); return DPVOICE_GetCompressionTypes(pData, pdwDataSize, pdwNumElements, dwFlags); } @@ -156,7 +156,7 @@ static HRESULT WINAPI dpvclient_SetTransmitTargets(IDirectPlayVoiceClient *iface DWORD dwNumTargets, DWORD dwFlags) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %p %d %d\n", This, pdvIDTargets, dwNumTargets, dwFlags); + FIXME("%p %p %ld %ld\n", This, pdvIDTargets, dwNumTargets, dwFlags); return E_NOTIMPL; } @@ -164,7 +164,7 @@ static HRESULT WINAPI dpvclient_GetTransmitTargets(IDirectPlayVoiceClient *iface DWORD *pdwNumTargets, DWORD dwFlags) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %p %d\n", This, pdwNumTargets, dwFlags); + FIXME("%p %p %ld\n", This, pdwNumTargets, dwFlags); return E_NOTIMPL; } @@ -173,21 +173,21 @@ static HRESULT WINAPI dpvclient_Create3DSoundBuffer(IDirectPlayVoiceClient *ifac LPDIRECTSOUND3DBUFFER *lpUserBuffer) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %d %p %d %d %p\n", This, dvID, lpdsSourceBuffer, dwPriority, dwFlags, lpUserBuffer); + FIXME("%p %ld %p %ld %ld %p\n", This, dvID, lpdsSourceBuffer, dwPriority, dwFlags, lpUserBuffer); return E_NOTIMPL; } static HRESULT WINAPI dpvclient_Delete3DSoundBuffer(IDirectPlayVoiceClient *iface, DVID dvID, LPDIRECTSOUND3DBUFFER *lpUserBuffer) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %d %p\n", This, dvID, lpUserBuffer); + FIXME("%p %ld %p\n", This, dvID, lpUserBuffer); return E_NOTIMPL; } static HRESULT WINAPI dpvclient_SetNotifyMask(IDirectPlayVoiceClient *iface, DWORD *pdwMessageMask, DWORD dwMessageMaskElements) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %p %d\n", This, pdwMessageMask, dwMessageMaskElements); + FIXME("%p %p %ld\n", This, pdwMessageMask, dwMessageMaskElements); return E_NOTIMPL; } @@ -261,7 +261,7 @@ static ULONG WINAPI dpvtest_AddRef(IDirectPlayVoiceTest *iface) IDirectPlayVoiceTestImpl *This = impl_from_IDirectPlayVoiceTest(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref); return ref; } @@ -271,7 +271,7 @@ static ULONG WINAPI dpvtest_Release(IDirectPlayVoiceTest *iface) IDirectPlayVoiceTestImpl *This = impl_from_IDirectPlayVoiceTest(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref); if (!ref) { @@ -284,7 +284,7 @@ static HRESULT WINAPI dpvtest_CheckAudioSetup(IDirectPlayVoiceTest *iface, const HWND hwndParent, DWORD dwFlags) { IDirectPlayVoiceTestImpl *This = impl_from_IDirectPlayVoiceTest(iface); - FIXME("%p %s %s %p %d\n", This, debugstr_guid(pguidPlaybackDevice), + FIXME("%p %s %s %p %ld\n", This, debugstr_guid(pguidPlaybackDevice), debugstr_guid(pguidCaptureDevice), hwndParent, dwFlags); return E_NOTIMPL; } diff --git a/dlls/dpvoice/server.c b/dlls/dpvoice/server.c index a476a2e585d..42fea27a192 100644 --- a/dlls/dpvoice/server.c +++ b/dlls/dpvoice/server.c @@ -100,7 +100,7 @@ static ULONG WINAPI dpvserver_AddRef(IDirectPlayVoiceServer *iface) IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref); return ref; } @@ -110,7 +110,7 @@ static ULONG WINAPI dpvserver_Release(IDirectPlayVoiceServer *iface) IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("(%p) ref=%lu\n", This, ref); if (!ref) { @@ -123,21 +123,21 @@ static HRESULT WINAPI dpvserver_Initialize(IDirectPlayVoiceServer *iface, IUnkno void *pUserContext, DWORD *lpdwMessageMask, DWORD dwMessageMaskElements) { IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); - FIXME("%p %p %p %p %p %d\n", This, lpVoid, pMessageHandler, pUserContext,lpdwMessageMask, dwMessageMaskElements); + FIXME("%p %p %p %p %p %ld\n", This, lpVoid, pMessageHandler, pUserContext,lpdwMessageMask, dwMessageMaskElements); return E_NOTIMPL; } static HRESULT WINAPI dpvserver_StartSession(IDirectPlayVoiceServer *iface, PDVSESSIONDESC pSessionDesc, DWORD dwFlags) { IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); - FIXME("%p %p %d\n", This, pSessionDesc, dwFlags); + FIXME("%p %p %ld\n", This, pSessionDesc, dwFlags); return E_NOTIMPL; } static HRESULT WINAPI dpvserver_StopSession(IDirectPlayVoiceServer *iface, DWORD dwFlags) { IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); - FIXME("%p %d\n", This, dwFlags); + FIXME("%p %ld\n", This, dwFlags); return E_NOTIMPL; } @@ -166,7 +166,7 @@ static HRESULT WINAPI dpvserver_GetCompressionTypes(IDirectPlayVoiceServer *ifac DWORD *pdwNumElements, DWORD dwFlags) { IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); - FIXME("%p %p %p %p %d semi-stub\n", This, pData, pdwDataSize, pdwNumElements, dwFlags); + FIXME("%p %p %p %p %ld semi-stub\n", This, pData, pdwDataSize, pdwNumElements, dwFlags); return DPVOICE_GetCompressionTypes(pData, pdwDataSize, pdwNumElements, dwFlags); } @@ -174,7 +174,7 @@ static HRESULT WINAPI dpvserver_SetTransmitTargets(IDirectPlayVoiceServer *iface DWORD dwNumTargets, DWORD dwFlags) { IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); - FIXME("%p %d %p %d %d\n", This, dvSource, pdvIDTargets, dwNumTargets, dwFlags); + FIXME("%p %ld %p %ld %ld\n", This, dvSource, pdvIDTargets, dwNumTargets, dwFlags); return E_NOTIMPL; } @@ -182,14 +182,14 @@ static HRESULT WINAPI dpvserver_GetTransmitTargets(IDirectPlayVoiceServer *iface DWORD *pdwNumTargets, DWORD dwFlags) { IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); - FIXME("%p %d %p %p %d\n", This, dvSource, pdvIDTargets, pdwNumTargets, dwFlags); + FIXME("%p %ld %p %p %ld\n", This, dvSource, pdvIDTargets, pdwNumTargets, dwFlags); return E_NOTIMPL; } static HRESULT WINAPI dpvserver_SetNotifyMask(IDirectPlayVoiceServer *iface, DWORD *pdwMessageMask, DWORD dwMessageMaskElements) { IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); - FIXME("%p %p %d\n", This, pdwMessageMask, dwMessageMaskElements); + FIXME("%p %p %ld\n", This, pdwMessageMask, dwMessageMaskElements); return E_NOTIMPL; }

5 30

ucrtbase/tests: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban Feb. 11, 2022

Feb. 11, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ucrtbase/tests/Makefile.in | 2 +- dlls/ucrtbase/tests/misc.c | 20 +++++++++--------- dlls/ucrtbase/tests/printf.c | 4 ++-- dlls/ucrtbase/tests/string.c | 2 +- dlls/ucrtbase/tests/thread.c | 36 ++++++++++++++++----------------- 5 files changed, 32 insertions(+), 32 deletions(-)

1 0

msvcrt/tests: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban Feb. 11, 2022

Feb. 11, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/Makefile.in | 1 - dlls/msvcrt/tests/data.c | 10 ++++----- dlls/msvcrt/tests/file.c | 42 +++++++++++++++++------------------ dlls/msvcrt/tests/locale.c | 6 ++--- dlls/msvcrt/tests/misc.c | 22 +++++++++--------- dlls/msvcrt/tests/string.c | 26 +++++++++++----------- dlls/msvcrt/tests/time.c | 14 ++++++------ 7 files changed, 60 insertions(+), 61 deletions(-)

1 0

msvcr90/tests: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban Feb. 11, 2022

Feb. 11, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr90/tests/Makefile.in | 1 - dlls/msvcr90/tests/msvcr90.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-)

1 0

msvcrtd/tests: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban Feb. 11, 2022

Feb. 11, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrtd/tests/Makefile.in | 1 - dlls/msvcrtd/tests/debug.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)

1 0

msvcr120/tests: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban Feb. 11, 2022

Feb. 11, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr120/tests/Makefile.in | 1 - dlls/msvcr120/tests/msvcr120.c | 22 +++++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-)

1 0

msvcr100/tests: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban Feb. 11, 2022

Feb. 11, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr100/tests/Makefile.in | 1 - dlls/msvcr100/tests/msvcr100.c | 26 +++++++++++++------------- 2 files changed, 13 insertions(+), 14 deletions(-)

1 0

msvcp90/tests: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban Feb. 11, 2022

Feb. 11, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/tests/Makefile.in | 1 - dlls/msvcp90/tests/ios.c | 14 +++++++------- dlls/msvcp90/tests/misc.c | 8 ++++---- dlls/msvcp90/tests/string.c | 2 +- 4 files changed, 12 insertions(+), 13 deletions(-)

1 0

msvcp140/tests: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban Feb. 11, 2022

Feb. 11, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140/tests/Makefile.in | 1 - dlls/msvcp140/tests/msvcp140.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-)

1 0

msvcp140_atomic_wait/tests: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban Feb. 11, 2022

Feb. 11, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140_atomic_wait/tests/Makefile.in | 1 - .../tests/msvcp140_atomic_wait.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-)

1 0

msvcp120/tests: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban Feb. 11, 2022

Feb. 11, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp120/tests/Makefile.in | 1 - dlls/msvcp120/tests/msvcp120.c | 28 ++++++++++++++-------------- 2 files changed, 14 insertions(+), 15 deletions(-)

1 0