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

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

14 Feb '22

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

14 Feb '22

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

14 Feb '22

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

14 Feb '22

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

14 Feb '22

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

14 Feb '22

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

14 Feb '22

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

14 Feb '22

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

14 Feb '22

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

13 Feb '22

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