[PATCH 01/27] dlls/devenum/tests: enable compilation with long types
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/devenum/tests/Makefile.in | 1 dlls/devenum/tests/devenum.c | 266 ++++++++++++++++++++-------------------- 2 files changed, 133 insertions(+), 134 deletions(-) diff --git a/dlls/devenum/tests/Makefile.in b/dlls/devenum/tests/Makefile.in index 762c007deee..2d6ec2d87ea 100644 --- a/dlls/devenum/tests/Makefile.in +++ b/dlls/devenum/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = devenum.dll IMPORTS = advapi32 dsound msdmo msvfw32 oleaut32 ole32 winmm diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 3e0d6f57dc3..d91f8699985 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -48,26 +48,26 @@ static void test_devenum(void) hr = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, &IID_ICreateDevEnum, (LPVOID*)&create_devenum); - ok(hr == S_OK, "Failed to create devenum: %#x\n", hr); + ok(hr == S_OK, "Failed to create devenum: %#lx\n", hr); hr = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_ActiveMovieCategories, &enum_cat, 0); - ok(hr == S_OK, "Failed to enum categories: %#x\n", hr); + ok(hr == S_OK, "Failed to enum categories: %#lx\n", hr); while (IEnumMoniker_Next(enum_cat, 1, &moniker, NULL) == S_OK) { hr = IMoniker_BindToStorage(moniker, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); - ok(hr == S_OK, "IMoniker_BindToStorage failed: %#x\n", hr); + ok(hr == S_OK, "IMoniker_BindToStorage failed: %#lx\n", hr); VariantInit(&var); hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL); - ok(hr == S_OK, "Failed to read CLSID: %#x\n", hr); + ok(hr == S_OK, "Failed to read CLSID: %#lx\n", hr); hr = CLSIDFromString(V_BSTR(&var), &cat_guid); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == S_OK, "Failed to read FriendlyName: %#x\n", hr); + ok(hr == S_OK, "Failed to read FriendlyName: %#lx\n", hr); if (winetest_debug > 1) trace("%s %s:\n", wine_dbgstr_guid(&cat_guid), wine_dbgstr_w(V_BSTR(&var))); @@ -77,7 +77,7 @@ static void test_devenum(void) IMoniker_Release(moniker); hr = ICreateDevEnum_CreateClassEnumerator(create_devenum, &cat_guid, &enum_moniker, 0); - ok(SUCCEEDED(hr), "Failed to enum devices: %#x\n", hr); + ok(SUCCEEDED(hr), "Failed to enum devices: %#lx\n", hr); if (hr == S_OK) { @@ -86,29 +86,29 @@ static void test_devenum(void) while (IEnumMoniker_Next(enum_moniker, 1, &moniker, NULL) == S_OK) { hr = IMoniker_GetDisplayName(moniker, NULL, NULL, &displayname); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = IMoniker_GetClassID(moniker, NULL); - ok(hr == E_INVALIDARG, "IMoniker_GetClassID should failed %x\n", hr); + ok(hr == E_INVALIDARG, "IMoniker_GetClassID should failed %lx\n", hr); hr = IMoniker_GetClassID(moniker, &clsid); - ok(hr == S_OK, "IMoniker_GetClassID failed with error %x\n", hr); + ok(hr == S_OK, "IMoniker_GetClassID failed with error %lx\n", hr); ok(IsEqualGUID(&clsid, &CLSID_CDeviceMoniker), "Expected CLSID_CDeviceMoniker got %s\n", wine_dbgstr_guid(&clsid)); VariantInit(&var); hr = IMoniker_BindToStorage(moniker, NULL, NULL, &IID_IPropertyBag, (LPVOID*)&prop_bag); - ok(hr == S_OK, "IMoniker_BindToStorage failed with error %x\n", hr); + ok(hr == S_OK, "IMoniker_BindToStorage failed with error %lx\n", hr); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); ok((hr == S_OK) | (hr == ERROR_KEY_DOES_NOT_EXIST), - "IPropertyBag_Read failed: %#x\n", hr); + "IPropertyBag_Read failed: %#lx\n", hr); if (winetest_debug > 1) trace(" %s %s\n", wine_dbgstr_w(displayname), wine_dbgstr_w(V_BSTR(&var))); hr = IMoniker_BindToObject(moniker, NULL, NULL, &IID_IUnknown, NULL); - ok(hr == E_POINTER, "got %#x\n", hr); + ok(hr == E_POINTER, "got %#lx\n", hr); VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL); @@ -122,13 +122,13 @@ static void test_devenum(void) &IID_IUnknown, (void **)&unk); if (hr2 == S_OK) IUnknown_Release(unk); - ok(hr2 == hr, "Expected hr %#x, got %#x.\n", hr, hr2); + ok(hr2 == hr, "Expected hr %#lx, got %#lx.\n", hr, hr2); } hr = CreateBindCtx(0, &bindctx); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IPropertyBag, (LPVOID*)&prop_bag); - ok(hr == S_OK, "IMoniker_BindToStorage failed with error %x\n", hr); + ok(hr == S_OK, "IMoniker_BindToStorage failed with error %lx\n", hr); IPropertyBag_Release(prop_bag); IBindCtx_Release(bindctx); @@ -159,22 +159,22 @@ static void test_moniker_isequal(void) &IID_ICreateDevEnum, (LPVOID*)&create_devenum); if (FAILED(res)) { - skip("Cannot create SystemDeviceEnum object (%x)\n", res); + skip("Cannot create SystemDeviceEnum object (%lx)\n", res); return; } res = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_LegacyAmFilterCategory, &enum_moniker0, 0); - ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); + ok(SUCCEEDED(res), "Cannot create enum moniker (res = %lx)\n", res); if (SUCCEEDED(res)) { if (IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL) == S_OK && IEnumMoniker_Next(enum_moniker0, 1, &moniker1, NULL) == S_OK) { res = IMoniker_IsEqual(moniker0, moniker1); - ok(res == S_FALSE, "IMoniker_IsEqual should fail (res = %x)\n", res); + ok(res == S_FALSE, "IMoniker_IsEqual should fail (res = %lx)\n", res); res = IMoniker_IsEqual(moniker1, moniker0); - ok(res == S_FALSE, "IMoniker_IsEqual should fail (res = %x)\n", res); + ok(res == S_FALSE, "IMoniker_IsEqual should fail (res = %lx)\n", res); IMoniker_Release(moniker0); IMoniker_Release(moniker1); @@ -185,19 +185,19 @@ static void test_moniker_isequal(void) IEnumMoniker_Release(enum_moniker0); res = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_LegacyAmFilterCategory, &enum_moniker0, 0); - ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); + ok(SUCCEEDED(res), "Cannot create enum moniker (res = %lx)\n", res); res = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_AudioRendererCategory, &enum_moniker1, 0); - ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); + ok(SUCCEEDED(res), "Cannot create enum moniker (res = %lx)\n", res); if (SUCCEEDED(res)) { if (IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL) == S_OK && IEnumMoniker_Next(enum_moniker1, 1, &moniker1, NULL) == S_OK) { res = IMoniker_IsEqual(moniker0, moniker1); - ok(res == S_FALSE, "IMoniker_IsEqual should failed (res = %x)\n", res); + ok(res == S_FALSE, "IMoniker_IsEqual should failed (res = %lx)\n", res); res = IMoniker_IsEqual(moniker1, moniker0); - ok(res == S_FALSE, "IMoniker_IsEqual should failed (res = %x)\n", res); + ok(res == S_FALSE, "IMoniker_IsEqual should failed (res = %lx)\n", res); IMoniker_Release(moniker0); IMoniker_Release(moniker1); @@ -209,19 +209,19 @@ static void test_moniker_isequal(void) IEnumMoniker_Release(enum_moniker1); res = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_LegacyAmFilterCategory, &enum_moniker0, 0); - ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); + ok(SUCCEEDED(res), "Cannot create enum moniker (res = %lx)\n", res); res = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_LegacyAmFilterCategory, &enum_moniker1, 0); - ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); + ok(SUCCEEDED(res), "Cannot create enum moniker (res = %lx)\n", res); if (SUCCEEDED(res)) { if (IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL) == S_OK && IEnumMoniker_Next(enum_moniker1, 1, &moniker1, NULL) == S_OK) { res = IMoniker_IsEqual(moniker0, moniker1); - ok(res == S_OK, "IMoniker_IsEqual failed (res = %x)\n", res); + ok(res == S_OK, "IMoniker_IsEqual failed (res = %lx)\n", res); res = IMoniker_IsEqual(moniker1, moniker0); - ok(res == S_OK, "IMoniker_IsEqual failed (res = %x)\n", res); + ok(res == S_OK, "IMoniker_IsEqual failed (res = %lx)\n", res); IMoniker_Release(moniker0); IMoniker_Release(moniker1); @@ -271,7 +271,7 @@ static void test_register_filter(void) HRESULT hr; hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC, &IID_IFilterMapper2, (void **)&mapper2); - ok(hr == S_OK, "Failed to create FilterMapper2: %#x\n", hr); + ok(hr == S_OK, "Failed to create FilterMapper2: %#lx\n", hr); rgf2.dwVersion = 2; rgf2.dwMerit = MERIT_UNLIKELY; @@ -284,24 +284,24 @@ static void test_register_filter(void) IFilterMapper2_Release(mapper2); return; } - ok(hr == S_OK, "RegisterFilter failed: %#x\n", hr); + ok(hr == S_OK, "RegisterFilter failed: %#lx\n", hr); ok(find_moniker(&CLSID_LegacyAmFilterCategory, mon), "filter should be registered\n"); hr = IFilterMapper2_UnregisterFilter(mapper2, NULL, NULL, &CLSID_TestFilter); - ok(hr == S_OK, "UnregisterFilter failed: %#x\n", hr); + ok(hr == S_OK, "UnregisterFilter failed: %#lx\n", hr); ok(!find_moniker(&CLSID_LegacyAmFilterCategory, mon), "filter should not be registered\n"); IMoniker_Release(mon); mon = NULL; hr = IFilterMapper2_RegisterFilter(mapper2, &CLSID_TestFilter, L"devenum test", &mon, &CLSID_AudioRendererCategory, NULL, &rgf2); - ok(hr == S_OK, "RegisterFilter failed: %#x\n", hr); + ok(hr == S_OK, "RegisterFilter failed: %#lx\n", hr); ok(find_moniker(&CLSID_AudioRendererCategory, mon), "filter should be registered\n"); hr = IFilterMapper2_UnregisterFilter(mapper2, &CLSID_AudioRendererCategory, NULL, &CLSID_TestFilter); - ok(hr == S_OK, "UnregisterFilter failed: %#x\n", hr); + ok(hr == S_OK, "UnregisterFilter failed: %#lx\n", hr); ok(!find_moniker(&CLSID_AudioRendererCategory, mon), "filter should not be registered\n"); IMoniker_Release(mon); @@ -317,10 +317,10 @@ static IMoniker *check_display_name_(int line, IParseDisplayName *parser, WCHAR WCHAR *str; hr = IParseDisplayName_ParseDisplayName(parser, NULL, buffer, &eaten, &mon); - ok_(__FILE__, line)(hr == S_OK, "ParseDisplayName failed: %#x\n", hr); + ok_(__FILE__, line)(hr == S_OK, "ParseDisplayName failed: %#lx\n", hr); hr = IMoniker_GetDisplayName(mon, NULL, NULL, &str); - ok_(__FILE__, line)(hr == S_OK, "GetDisplayName failed: %#x\n", hr); + ok_(__FILE__, line)(hr == S_OK, "GetDisplayName failed: %#lx\n", hr); ok_(__FILE__, line)(!wcscmp(str, buffer), "got %s\n", wine_dbgstr_w(str)); CoTaskMemFree(str); @@ -343,7 +343,7 @@ static void test_directshow_filter(void) /* Test ParseDisplayName and GetDisplayName */ hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser); - ok(hr == S_OK, "Failed to create ParseDisplayName: %#x\n", hr); + ok(hr == S_OK, "Failed to create ParseDisplayName: %#lx\n", hr); wcscpy(buffer, L"@device:sw:"); StringFromGUID2(&CLSID_AudioRendererCategory, buffer + wcslen(buffer), CHARS_IN_GUID); @@ -354,11 +354,11 @@ static void test_directshow_filter(void) ok(!find_moniker(&CLSID_AudioRendererCategory, mon), "filter should not be registered\n"); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); - ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + ok(hr == S_OK, "BindToStorage failed: %#lx\n", hr); VariantInit(&var); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got %#lx\n", hr); /* writing causes the key to be created */ V_VT(&var) = VT_BSTR; @@ -366,60 +366,60 @@ static void test_directshow_filter(void) hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var); if (hr != E_ACCESSDENIED) { - ok(hr == S_OK, "Write failed: %#x\n", hr); + ok(hr == S_OK, "Write failed: %#lx\n", hr); ok(find_moniker(&CLSID_AudioRendererCategory, mon), "filter should be registered\n"); VariantClear(&var); V_VT(&var) = VT_EMPTY; hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(V_VT(&var) == VT_BSTR, "Got type %#x.\n", V_VT(&var)); ok(!wcscmp(V_BSTR(&var), L"test"), "Got name %s.\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); V_VT(&var) = VT_LPWSTR; hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); V_VT(&var) = VT_BSTR; hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(V_VT(&var) == VT_BSTR, "Got type %#x.\n", V_VT(&var)); ok(!wcscmp(V_BSTR(&var), L"test"), "Got name %s.\n", wine_dbgstr_w(V_BSTR(&var))); V_VT(&var) = VT_LPWSTR; hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); VariantClear(&var); V_VT(&var) = VT_I4; V_I4(&var) = 0xdeadbeef; hr = IPropertyBag_Write(prop_bag, L"foobar", &var); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); V_VT(&var) = VT_EMPTY; hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(V_VT(&var) == VT_I4, "Got type %#x.\n", V_VT(&var)); - ok(V_I4(&var) == 0xdeadbeef, "Got value %#x.\n", V_I4(&var)); + ok(V_I4(&var) == 0xdeadbeef, "Got value %#lx.\n", V_I4(&var)); V_VT(&var) = VT_UI4; hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); V_VT(&var) = VT_BSTR; hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); V_VT(&var) = VT_I4; hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(V_VT(&var) == VT_I4, "Got type %#x.\n", V_VT(&var)); - ok(V_I4(&var) == 0xdeadbeef, "Got value %#x.\n", V_I4(&var)); + ok(V_I4(&var) == 0xdeadbeef, "Got value %#lx.\n", V_I4(&var)); V_VT(&var) = VT_UI4; hr = IPropertyBag_Write(prop_bag, L"foobar", &var); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); V_VT(&var) = VT_ARRAY | VT_UI1; V_ARRAY(&var) = SafeArrayCreate(VT_UI1, 1, &bound); @@ -427,12 +427,12 @@ static void test_directshow_filter(void) memcpy(array_data, "test data", 10); SafeArrayUnaccessData(V_ARRAY(&var)); hr = IPropertyBag_Write(prop_bag, L"foobar", &var); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); VariantClear(&var); V_VT(&var) = VT_EMPTY; hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(V_VT(&var) == (VT_ARRAY | VT_UI1), "Got type %#x.\n", V_VT(&var)); SafeArrayAccessData(V_ARRAY(&var), &array_data); ok(!memcmp(array_data, "test data", 10), "Got wrong data.\n"); @@ -445,7 +445,7 @@ static void test_directshow_filter(void) StringFromGUID2(&CLSID_AudioRendererCategory, buffer + wcslen(buffer), CHARS_IN_GUID); wcscat(buffer, L"\\Instance\\test"); res = RegDeleteKeyW(HKEY_CLASSES_ROOT, buffer); - ok(!res, "RegDeleteKey failed: %lu\n", res); + ok(!res, "RegDeleteKey failed: %Iu\n", res); } VariantClear(&var); @@ -457,22 +457,22 @@ static void test_directshow_filter(void) mon = check_display_name(parser, buffer); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); - ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + ok(hr == S_OK, "BindToStorage failed: %#lx\n", hr); VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got %#lx\n", hr); V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(L"test"); hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var); if (hr != E_ACCESSDENIED) { - ok(hr == S_OK, "Write failed: %#x\n", hr); + ok(hr == S_OK, "Write failed: %#lx\n", hr); VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); ok(!wcscmp(V_BSTR(&var), L"test"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); IMoniker_Release(mon); @@ -481,7 +481,7 @@ static void test_directshow_filter(void) RegDeleteKeyA(HKEY_CLASSES_ROOT, "CLSID\\test\\Instance"); res = RegDeleteKeyA(HKEY_CLASSES_ROOT, "CLSID\\test"); - ok(!res, "RegDeleteKey failed: %lu\n", res); + ok(!res, "RegDeleteKey failed: %Iu\n", res); } VariantClear(&var); @@ -502,7 +502,7 @@ static void test_codec(void) /* Test ParseDisplayName and GetDisplayName */ hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser); - ok(hr == S_OK, "Failed to create ParseDisplayName: %#x\n", hr); + ok(hr == S_OK, "Failed to create ParseDisplayName: %#lx\n", hr); wcscpy(buffer, L"@device:cm:"); StringFromGUID2(&CLSID_AudioRendererCategory, buffer + wcslen(buffer), CHARS_IN_GUID); @@ -513,66 +513,66 @@ static void test_codec(void) ok(!find_moniker(&CLSID_AudioRendererCategory, mon), "codec should not be registered\n"); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); - ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + ok(hr == S_OK, "BindToStorage failed: %#lx\n", hr); VariantInit(&var); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got %#lx\n", hr); V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(L"test"); hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var); - ok(hr == S_OK, "Write failed: %#x\n", hr); + ok(hr == S_OK, "Write failed: %#lx\n", hr); V_VT(&var) = VT_LPWSTR; hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); VariantClear(&var); V_VT(&var) = VT_EMPTY; hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(V_VT(&var) == VT_BSTR, "Got type %#x.\n", V_VT(&var)); ok(!wcscmp(V_BSTR(&var), L"test"), "Got name %s.\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); V_VT(&var) = VT_LPWSTR; hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); V_VT(&var) = VT_BSTR; hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(V_VT(&var) == VT_BSTR, "Got type %#x.\n", V_VT(&var)); ok(!wcscmp(V_BSTR(&var), L"test"), "Got name %s.\n", wine_dbgstr_w(V_BSTR(&var))); V_VT(&var) = VT_I4; V_I4(&var) = 0xdeadbeef; hr = IPropertyBag_Write(prop_bag, L"foobar", &var); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); V_VT(&var) = VT_EMPTY; hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(V_VT(&var) == VT_I4, "Got type %#x.\n", V_VT(&var)); - ok(V_I4(&var) == 0xdeadbeef, "Got value %#x.\n", V_I4(&var)); + ok(V_I4(&var) == 0xdeadbeef, "Got value %#lx.\n", V_I4(&var)); V_VT(&var) = VT_UI4; hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); V_VT(&var) = VT_BSTR; hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); V_VT(&var) = VT_I4; hr = IPropertyBag_Read(prop_bag, L"foobar", &var, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(V_VT(&var) == VT_I4, "Got type %#x.\n", V_VT(&var)); - ok(V_I4(&var) == 0xdeadbeef, "Got value %#x.\n", V_I4(&var)); + ok(V_I4(&var) == 0xdeadbeef, "Got value %#lx.\n", V_I4(&var)); V_VT(&var) = VT_UI4; hr = IPropertyBag_Write(prop_bag, L"foobar", &var); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); V_VT(&var) = VT_ARRAY | VT_UI1; V_ARRAY(&var) = SafeArrayCreate(VT_UI1, 1, &bound); @@ -580,7 +580,7 @@ static void test_codec(void) memcpy(array_data, "test data", 10); SafeArrayUnaccessData(V_ARRAY(&var)); hr = IPropertyBag_Write(prop_bag, L"foobar", &var); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); /* unlike DirectShow filters, these are automatically generated, so * enumerating them will destroy the key */ @@ -588,7 +588,7 @@ static void test_codec(void) VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got %#lx\n", hr); IPropertyBag_Release(prop_bag); IMoniker_Release(mon); @@ -611,7 +611,7 @@ static void test_dmo(const GUID *dmo_category, const GUID *enum_category) GUID clsid; hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser); - ok(hr == S_OK, "Failed to create ParseDisplayName: %#x\n", hr); + ok(hr == S_OK, "Failed to create ParseDisplayName: %#lx\n", hr); wcscpy(buffer, L"@device:dmo:"); StringFromGUID2(&CLSID_TestFilter, buffer + wcslen(buffer), CHARS_IN_GUID); @@ -621,47 +621,47 @@ static void test_dmo(const GUID *dmo_category, const GUID *enum_category) ok(!find_moniker(enum_category, mon), "DMO should not be registered\n"); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); VariantInit(&var); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == E_FAIL, "got %#x\n", hr); + ok(hr == E_FAIL, "got %#lx\n", hr); V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(L"devenum test"); hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var); - ok(hr == E_ACCESSDENIED, "Write failed: %#x\n", hr); + ok(hr == E_ACCESSDENIED, "Write failed: %#lx\n", hr); hr = DMORegister(L"devenum test", &CLSID_TestFilter, dmo_category, 0, 0, NULL, 0, NULL); if (hr != E_FAIL) { - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(find_moniker(enum_category, mon), "DMO should be registered\n"); VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(!wcscmp(V_BSTR(&var), L"devenum test"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(L"devenum test"); hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var); - ok(hr == E_ACCESSDENIED, "Write failed: %#x\n", hr); + ok(hr == E_ACCESSDENIED, "Write failed: %#lx\n", hr); VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL); - ok(hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "got %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "got %#lx\n", hr); hr = DMOUnregister(&CLSID_TestFilter, dmo_category); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); } IPropertyBag_Release(prop_bag); IMoniker_Release(mon); hr = DMOEnum(&DMOCATEGORY_AUDIO_DECODER, 0, 0, NULL, 0, NULL, &enumdmo); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); while (IEnumDMO_Next(enumdmo, 1, &clsid, &name, NULL) == S_OK) { @@ -672,35 +672,35 @@ static void test_dmo(const GUID *dmo_category, const GUID *enum_category) ok(find_moniker(&DMOCATEGORY_AUDIO_DECODER, mon), "DMO was not found.\n"); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(!wcscmp(V_BSTR(&var), name), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(L"devenum test"); hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var); - ok(hr == E_ACCESSDENIED, "Write failed: %#x\n", hr); + ok(hr == E_ACCESSDENIED, "Write failed: %#lx\n", hr); VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL); - ok(hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "got %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "got %#lx\n", hr); IPropertyBag_Release(prop_bag); CoTaskMemFree(name); hr = IMoniker_BindToObject(mon, NULL, NULL, &IID_IBaseFilter, (void **)&filter); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = IBaseFilter_GetClassID(filter, &clsid); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(IsEqualGUID(&clsid, &CLSID_DMOWrapperFilter), "Got CLSID %s.\n", debugstr_guid(&clsid)); hr = IBaseFilter_QueryInterface(filter, &IID_IMediaObject, (void **)&dmo); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); IMediaObject_Release(dmo); IBaseFilter_Release(filter); @@ -721,10 +721,10 @@ static void test_legacy_filter(void) HRESULT hr; hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser); - ok(hr == S_OK, "Failed to create ParseDisplayName: %#x\n", hr); + ok(hr == S_OK, "Failed to create ParseDisplayName: %#lx\n", hr); hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC, &IID_IFilterMapper, (void **)&mapper); - ok(hr == S_OK, "Failed to create FilterMapper: %#x\n", hr); + ok(hr == S_OK, "Failed to create FilterMapper: %#lx\n", hr); hr = IFilterMapper_RegisterFilter(mapper, CLSID_TestFilter, L"test", 0xdeadbeef); if (hr == VFW_E_BAD_KEY) @@ -732,7 +732,7 @@ static void test_legacy_filter(void) win_skip("not enough permissions to register filters\n"); goto end; } - ok(hr == S_OK, "RegisterFilter failed: %#x\n", hr); + ok(hr == S_OK, "RegisterFilter failed: %#lx\n", hr); wcscpy(buffer, L"@device:cm:"); StringFromGUID2(&CLSID_LegacyAmFilterCategory, buffer + wcslen(buffer), CHARS_IN_GUID); @@ -743,11 +743,11 @@ static void test_legacy_filter(void) ok(find_moniker(&CLSID_LegacyAmFilterCategory, mon), "filter should be registered\n"); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); - ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + ok(hr == S_OK, "BindToStorage failed: %#lx\n", hr); VariantInit(&var); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); StringFromGUID2(&CLSID_TestFilter, buffer, CHARS_IN_GUID); ok(!wcscmp(buffer, V_BSTR(&var)), "expected %s, got %s\n", @@ -755,7 +755,7 @@ static void test_legacy_filter(void) VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL); - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); ok(!wcscmp(buffer, V_BSTR(&var)), "expected %s, got %s\n", wine_dbgstr_w(buffer), wine_dbgstr_w(V_BSTR(&var))); @@ -763,7 +763,7 @@ static void test_legacy_filter(void) IPropertyBag_Release(prop_bag); hr = IFilterMapper_UnregisterFilter(mapper, CLSID_TestFilter); - ok(hr == S_OK, "UnregisterFilter failed: %#x\n", hr); + ok(hr == S_OK, "UnregisterFilter failed: %#lx\n", hr); ok(!find_moniker(&CLSID_LegacyAmFilterCategory, mon), "filter should not be registered\n"); IMoniker_Release(mon); @@ -795,7 +795,7 @@ static BOOL CALLBACK test_dsound(GUID *guid, const WCHAR *desc, const WCHAR *mod } hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser); - ok(hr == S_OK, "Failed to create ParseDisplayName: %#x\n", hr); + ok(hr == S_OK, "Failed to create ParseDisplayName: %#lx\n", hr); wcscpy(buffer, L"@device:cm:"); StringFromGUID2(&CLSID_AudioRendererCategory, buffer + wcslen(buffer), CHARS_IN_GUID); @@ -805,7 +805,7 @@ static BOOL CALLBACK test_dsound(GUID *guid, const WCHAR *desc, const WCHAR *mod mon = check_display_name(parser, buffer); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); - ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + ok(hr == S_OK, "BindToStorage failed: %#lx\n", hr); VariantInit(&var); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); @@ -823,19 +823,19 @@ static BOOL CALLBACK test_dsound(GUID *guid, const WCHAR *desc, const WCHAR *mod mon = check_display_name(parser, buffer); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); - ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + ok(hr == S_OK, "BindToStorage failed: %#lx\n", hr); VariantInit(&var); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); } - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); ok(!wcscmp(name, V_BSTR(&var)), "expected %s, got %s\n", wine_dbgstr_w(name), wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL); - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); StringFromGUID2(&CLSID_DSoundRender, buffer, CHARS_IN_GUID); ok(!wcscmp(buffer, V_BSTR(&var)), "expected %s, got %s\n", @@ -843,7 +843,7 @@ static BOOL CALLBACK test_dsound(GUID *guid, const WCHAR *desc, const WCHAR *mod VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"DSGuid", &var, NULL); - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); StringFromGUID2(guid, buffer, CHARS_IN_GUID); ok(!wcscmp(buffer, V_BSTR(&var)), "expected %s, got %s\n", @@ -871,7 +871,7 @@ static void test_waveout(void) HRESULT hr; hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser); - ok(hr == S_OK, "Failed to create ParseDisplayName: %#x\n", hr); + ok(hr == S_OK, "Failed to create ParseDisplayName: %#lx\n", hr); count = waveOutGetNumDevs(); @@ -892,7 +892,7 @@ static void test_waveout(void) mon = check_display_name(parser, buffer); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); - ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + ok(hr == S_OK, "BindToStorage failed: %#lx\n", hr); VariantInit(&var); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); @@ -914,18 +914,18 @@ static void test_waveout(void) mon = check_display_name(parser, buffer); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); - ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + ok(hr == S_OK, "BindToStorage failed: %#lx\n", hr); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); } - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); ok(!wcsncmp(name, V_BSTR(&var), wcslen(name)), "expected %s, got %s\n", wine_dbgstr_w(name), wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL); - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); StringFromGUID2(&CLSID_AudioRender, buffer, CHARS_IN_GUID); ok(!wcscmp(buffer, V_BSTR(&var)), "expected %s, got %s\n", @@ -933,9 +933,9 @@ static void test_waveout(void) VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"WaveOutId", &var, NULL); - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); - ok(V_I4(&var) == i, "expected %d, got %d\n", i, V_I4(&var)); + ok(V_I4(&var) == i, "expected %d, got %ld\n", i, V_I4(&var)); IPropertyBag_Release(prop_bag); IMoniker_Release(mon); @@ -958,7 +958,7 @@ static void test_wavein(void) HRESULT hr; hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser); - ok(hr == S_OK, "Failed to create ParseDisplayName: %#x\n", hr); + ok(hr == S_OK, "Failed to create ParseDisplayName: %#lx\n", hr); count = waveInGetNumDevs(); @@ -974,7 +974,7 @@ static void test_wavein(void) mon = check_display_name(parser, buffer); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); - ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + ok(hr == S_OK, "BindToStorage failed: %#lx\n", hr); VariantInit(&var); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); @@ -996,18 +996,18 @@ static void test_wavein(void) mon = check_display_name(parser, buffer); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); - ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + ok(hr == S_OK, "BindToStorage failed: %#lx\n", hr); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); } - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); ok(!wcsncmp(caps.szPname, V_BSTR(&var), wcslen(caps.szPname)), "expected %s, got %s\n", wine_dbgstr_w(caps.szPname), wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL); - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); StringFromGUID2(&CLSID_AudioRecord, buffer, CHARS_IN_GUID); ok(!wcscmp(buffer, V_BSTR(&var)), "expected %s, got %s\n", @@ -1015,9 +1015,9 @@ static void test_wavein(void) VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"WaveInId", &var, NULL); - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); - ok(V_I4(&var) == i, "expected %d, got %d\n", i, V_I4(&var)); + ok(V_I4(&var) == i, "expected %d, got %ld\n", i, V_I4(&var)); IPropertyBag_Release(prop_bag); IMoniker_Release(mon); @@ -1039,7 +1039,7 @@ static void test_midiout(void) HRESULT hr; hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser); - ok(hr == S_OK, "Failed to create ParseDisplayName: %#x\n", hr); + ok(hr == S_OK, "Failed to create ParseDisplayName: %#lx\n", hr); count = midiOutGetNumDevs(); @@ -1060,18 +1060,18 @@ static void test_midiout(void) mon = check_display_name(parser, buffer); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); - ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + ok(hr == S_OK, "BindToStorage failed: %#lx\n", hr); VariantInit(&var); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); ok(!wcscmp(name, V_BSTR(&var)), "expected %s, got %s\n", wine_dbgstr_w(name), wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL); - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); StringFromGUID2(&CLSID_AVIMIDIRender, buffer, CHARS_IN_GUID); ok(!wcscmp(buffer, V_BSTR(&var)), "expected %s, got %s\n", @@ -1079,9 +1079,9 @@ static void test_midiout(void) VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"MidiOutId", &var, NULL); - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); - ok(V_I4(&var) == i, "expected %d, got %d\n", i, V_I4(&var)); + ok(V_I4(&var) == i, "expected %d, got %ld\n", i, V_I4(&var)); IPropertyBag_Release(prop_bag); IMoniker_Release(mon); @@ -1109,7 +1109,7 @@ static void test_vfw(void) } hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser); - ok(hr == S_OK, "Failed to create ParseDisplayName: %#x\n", hr); + ok(hr == S_OK, "Failed to create ParseDisplayName: %#lx\n", hr); while (ICInfo(ICTYPE_VIDEO, i++, &info)) { @@ -1128,18 +1128,18 @@ static void test_vfw(void) mon = check_display_name(parser, buffer); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); - ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + ok(hr == S_OK, "BindToStorage failed: %#lx\n", hr); VariantInit(&var); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); ok(!wcscmp(info.szDescription, V_BSTR(&var)), "expected %s, got %s\n", wine_dbgstr_w(info.szDescription), wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL); - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); StringFromGUID2(&CLSID_AVICo, buffer, CHARS_IN_GUID); ok(!wcscmp(buffer, V_BSTR(&var)), "expected %s, got %s\n", @@ -1147,7 +1147,7 @@ static void test_vfw(void) VariantClear(&var); hr = IPropertyBag_Read(prop_bag, L"FccHandler", &var, NULL); - ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(hr == S_OK, "Read failed: %#lx\n", hr); ok(!wcscmp(name, V_BSTR(&var)), "expected %s, got %s\n", wine_dbgstr_w(name), wine_dbgstr_w(V_BSTR(&var))); @@ -1176,7 +1176,7 @@ START_TEST(devenum) test_legacy_filter(); hr = DirectSoundEnumerateW(test_dsound, NULL); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); test_waveout(); test_wavein(); test_midiout();
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- include/ddraw.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/include/ddraw.h b/include/ddraw.h index 0c14c468121..eed8aebf275 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -858,17 +858,17 @@ typedef struct _DDPIXELFORMAT { #define DDFXALPHACAPS_OVERLAYALPHASURFACESNEG 0x00000200 /* DDCAPS.dwPalCaps */ -#define DDPCAPS_4BIT 0x00000001 -#define DDPCAPS_8BITENTRIES 0x00000002 -#define DDPCAPS_8BIT 0x00000004 -#define DDPCAPS_INITIALIZE 0x00000008 -#define DDPCAPS_PRIMARYSURFACE 0x00000010 -#define DDPCAPS_PRIMARYSURFACELEFT 0x00000020 -#define DDPCAPS_ALLOW256 0x00000040 -#define DDPCAPS_VSYNC 0x00000080 -#define DDPCAPS_1BIT 0x00000100 -#define DDPCAPS_2BIT 0x00000200 -#define DDPCAPS_ALPHA 0x00000400 +#define DDPCAPS_4BIT __MSABI_LONG(0x00000001) +#define DDPCAPS_8BITENTRIES __MSABI_LONG(0x00000002) +#define DDPCAPS_8BIT __MSABI_LONG(0x00000004) +#define DDPCAPS_INITIALIZE __MSABI_LONG(0x00000008) +#define DDPCAPS_PRIMARYSURFACE __MSABI_LONG(0x00000010) +#define DDPCAPS_PRIMARYSURFACELEFT __MSABI_LONG(0x00000020) +#define DDPCAPS_ALLOW256 __MSABI_LONG(0x00000040) +#define DDPCAPS_VSYNC __MSABI_LONG(0x00000080) +#define DDPCAPS_1BIT __MSABI_LONG(0x00000100) +#define DDPCAPS_2BIT __MSABI_LONG(0x00000200) +#define DDPCAPS_ALPHA __MSABI_LONG(0x00000400) /* DDCAPS.dwSVCaps */ /* the first 4 of these are now obsolete */
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dsound/tests/Makefile.in | 1 dlls/dsound/tests/capture.c | 150 +++++++------- dlls/dsound/tests/ds3d.c | 250 ++++++++++++------------ dlls/dsound/tests/ds3d8.c | 238 +++++++++++------------ dlls/dsound/tests/dsound.c | 386 +++++++++++++++++++------------------ dlls/dsound/tests/dsound8.c | 426 +++++++++++++++++++++-------------------- dlls/dsound/tests/duplex.c | 76 ++++--- dlls/dsound/tests/propset.c | 124 ++++++------ 8 files changed, 825 insertions(+), 826 deletions(-) diff --git a/dlls/dsound/tests/Makefile.in b/dlls/dsound/tests/Makefile.in index cc39c4bda22..234b49b1bba 100644 --- a/dlls/dsound/tests/Makefile.in +++ b/dlls/dsound/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dsound.dll IMPORTS = dmoguids dsound msdmo ole32 version user32 diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index 2d8138aa19e..63998276a77 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -90,7 +90,7 @@ const char * format_string(const WAVEFORMATEX* wfx) { static char str[64]; - sprintf(str, "%5dx%2dx%d %s", + sprintf(str, "%5ldx%2dx%d %s", wfx->nSamplesPerSec, wfx->wBitsPerSample, wfx->nChannels, get_format_str(wfx->wFormatTag)); @@ -110,14 +110,14 @@ static void IDirectSoundCapture_test(LPDIRECTSOUNDCAPTURE dsco, rc=IDirectSoundCapture_QueryInterface(dsco, &IID_IUnknown, (LPVOID*)&unknown); ok(rc==DS_OK, "IDirectSoundCapture_QueryInterface(IID_IUnknown) " - "failed: %08x\n", rc); + "failed: %08lx\n", rc); if (rc==DS_OK) IUnknown_Release(unknown); rc=IDirectSoundCapture_QueryInterface(dsco, &IID_IDirectSoundCapture, (LPVOID*)&dsc); ok(rc==DS_OK, "IDirectSoundCapture_QueryInterface(IID_IDirectSoundCapture) " - "failed: %08x\n", rc); + "failed: %08lx\n", rc); if (rc==DS_OK) IDirectSoundCapture_Release(dsc); @@ -126,16 +126,16 @@ static void IDirectSoundCapture_test(LPDIRECTSOUNDCAPTURE dsco, rc=IDirectSoundCapture_GetCaps(dsco,0); ok(rc==DSERR_UNINITIALIZED||rc==E_INVALIDARG, "IDirectSoundCapture_GetCaps(NULL) should have returned " - "DSERR_UNINITIALIZED or E_INVALIDARG, returned: %08x\n", rc); + "DSERR_UNINITIALIZED or E_INVALIDARG, returned: %08lx\n", rc); rc=IDirectSoundCapture_GetCaps(dsco, &dsccaps); ok(rc==DSERR_UNINITIALIZED,"IDirectSoundCapture_GetCaps() " - "should have returned DSERR_UNINITIALIZED, returned: %08x\n", rc); + "should have returned DSERR_UNINITIALIZED, returned: %08lx\n", rc); rc=IDirectSoundCapture_Initialize(dsco, lpGuid); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED|| rc==E_FAIL||rc==E_INVALIDARG, - "IDirectSoundCapture_Initialize() failed: %08x\n", rc); + "IDirectSoundCapture_Initialize() failed: %08lx\n", rc); if (rc==DSERR_NODRIVER||rc==E_INVALIDARG) { trace(" No Driver\n"); goto EXIT; @@ -150,25 +150,25 @@ static void IDirectSoundCapture_test(LPDIRECTSOUNDCAPTURE dsco, rc=IDirectSoundCapture_Initialize(dsco, lpGuid); ok(rc==DSERR_ALREADYINITIALIZED, "IDirectSoundCapture_Initialize() " - "should have returned DSERR_ALREADYINITIALIZED: %08x\n", rc); + "should have returned DSERR_ALREADYINITIALIZED: %08lx\n", rc); /* DSOUND: Error: Invalid caps buffer */ rc=IDirectSoundCapture_GetCaps(dsco, 0); ok(rc==DSERR_INVALIDPARAM, "IDirectSoundCapture_GetCaps(NULL) " - "should have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "should have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc); ZeroMemory(&dsccaps, sizeof(dsccaps)); /* DSOUND: Error: Invalid caps buffer */ rc=IDirectSoundCapture_GetCaps(dsco, &dsccaps); ok(rc==DSERR_INVALIDPARAM, "IDirectSound_GetCaps() " - "should have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "should have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc); dsccaps.dwSize=sizeof(dsccaps); /* DSOUND: Running on a certified driver */ rc=IDirectSoundCapture_GetCaps(dsco, &dsccaps); - ok(rc==DS_OK, "IDirectSoundCapture_GetCaps() failed: %08x\n", rc); + ok(rc==DS_OK, "IDirectSoundCapture_GetCaps() failed: %08lx\n", rc); EXIT: ref=IDirectSoundCapture_Release(dsco); @@ -187,17 +187,17 @@ static void test_capture(void) rc=CoGetClassObject(&CLSID_DirectSoundCapture, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void**)&cf); ok(rc==S_OK,"CoGetClassObject(CLSID_DirectSoundCapture, IID_IClassFactory) " - "failed: %08x\n", rc); + "failed: %08lx\n", rc); rc=CoGetClassObject(&CLSID_DirectSoundCapture, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&cf); ok(rc==S_OK,"CoGetClassObject(CLSID_DirectSoundCapture, IID_IUnknown) " - "failed: %08x\n", rc); + "failed: %08lx\n", rc); /* try the COM class factory method of creation with no device specified */ rc=CoCreateInstance(&CLSID_DirectSoundCapture, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSoundCapture, (void**)&dsco); - ok(rc==S_OK||rc==REGDB_E_CLASSNOTREG,"CoCreateInstance(CLSID_DirectSoundCapture) failed: %08x\n", rc); + ok(rc==S_OK||rc==REGDB_E_CLASSNOTREG,"CoCreateInstance(CLSID_DirectSoundCapture) failed: %08lx\n", rc); if (rc==REGDB_E_CLASSNOTREG) { trace(" Class Not Registered\n"); return; @@ -209,7 +209,7 @@ static void test_capture(void) * device specified */ rc=CoCreateInstance(&CLSID_DirectSoundCapture, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSoundCapture, (void**)&dsco); - ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSoundCapture) failed: %08x\n", rc); + ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSoundCapture) failed: %08lx\n", rc); if (dsco) IDirectSoundCapture_test(dsco, FALSE, &DSDEVID_DefaultCapture); @@ -217,7 +217,7 @@ static void test_capture(void) * capture device specified */ rc=CoCreateInstance(&CLSID_DirectSoundCapture, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSoundCapture, (void**)&dsco); - ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSoundCapture) failed: %08x\n", rc); + ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSoundCapture) failed: %08lx\n", rc); if (dsco) IDirectSoundCapture_test(dsco, FALSE, &DSDEVID_DefaultVoiceCapture); @@ -227,26 +227,26 @@ static void test_capture(void) &CLSID_DirectSoundPrivate, (void**)&dsco); ok(rc==E_NOINTERFACE, "CoCreateInstance(CLSID_DirectSoundCapture,CLSID_DirectSoundPrivate) " - "should have failed: %08x\n",rc); + "should have failed: %08lx\n",rc); /* try with no device specified */ rc = DirectSoundCaptureCreate(NULL, &dsco, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, - "DirectSoundCaptureCreate(NULL) failed: %08x\n",rc); + "DirectSoundCaptureCreate(NULL) failed: %08lx\n",rc); if (rc==S_OK && dsco) IDirectSoundCapture_test(dsco, TRUE, NULL); /* try with default capture device specified */ rc = DirectSoundCaptureCreate(&DSDEVID_DefaultCapture, &dsco, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, - "DirectSoundCaptureCreate(DSDEVID_DefaultCapture) failed: %08x\n", rc); + "DirectSoundCaptureCreate(DSDEVID_DefaultCapture) failed: %08lx\n", rc); if (rc==DS_OK && dsco) IDirectSoundCapture_test(dsco, TRUE, NULL); /* try with default voice capture device specified */ rc = DirectSoundCaptureCreate(&DSDEVID_DefaultVoiceCapture, &dsco, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, - "DirectSoundCaptureCreate(DSDEVID_DefaultVoiceCapture) failed: %08x\n", rc); + "DirectSoundCaptureCreate(DSDEVID_DefaultVoiceCapture) failed: %08lx\n", rc); if (rc==DS_OK && dsco) IDirectSoundCapture_test(dsco, TRUE, NULL); @@ -254,7 +254,7 @@ static void test_capture(void) rc = DirectSoundCaptureCreate(&DSDEVID_DefaultVoicePlayback, &dsco, NULL); ok(rc==DSERR_NODRIVER, "DirectSoundCaptureCreate(DSDEVID_DefaultVoicePlatback) " - "should have failed: %08x\n",rc); + "should have failed: %08lx\n",rc); if (rc==DS_OK && dsco) IDirectSoundCapture_Release(dsco); } @@ -286,18 +286,18 @@ static BOOL capture_buffer_service(capture_state_t* state) rc=IDirectSoundCaptureBuffer_GetCurrentPosition(state->dscbo,&capture_pos, &read_pos); - ok(rc==DS_OK,"IDirectSoundCaptureBuffer_GetCurrentPosition() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundCaptureBuffer_GetCurrentPosition() failed: %08lx\n", rc); if (rc!=DS_OK) return FALSE; rc=IDirectSoundCaptureBuffer_Lock(state->dscbo,state->offset,state->size, &ptr1,&len1,&ptr2,&len2,0); - ok(rc==DS_OK,"IDirectSoundCaptureBuffer_Lock() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundCaptureBuffer_Lock() failed: %08lx\n", rc); if (rc!=DS_OK) return FALSE; rc=IDirectSoundCaptureBuffer_Unlock(state->dscbo,ptr1,len1,ptr2,len2); - ok(rc==DS_OK,"IDirectSoundCaptureBuffer_Unlock() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundCaptureBuffer_Unlock() failed: %08lx\n", rc); if (rc!=DS_OK) return FALSE; @@ -319,19 +319,19 @@ static void test_capture_buffer(LPDIRECTSOUNDCAPTURE dsco, /* Private dsound.dll: Error: Invalid caps pointer */ rc=IDirectSoundCaptureBuffer_GetCaps(dscbo,0); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundCaptureBuffer_GetCaps() should " - "have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc); /* Private dsound.dll: Error: Invalid caps pointer */ dscbcaps.dwSize=0; rc=IDirectSoundCaptureBuffer_GetCaps(dscbo,&dscbcaps); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundCaptureBuffer_GetCaps() should " - "have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc); dscbcaps.dwSize=sizeof(dscbcaps); rc=IDirectSoundCaptureBuffer_GetCaps(dscbo,&dscbcaps); - ok(rc==DS_OK,"IDirectSoundCaptureBuffer_GetCaps() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundCaptureBuffer_GetCaps() failed: %08lx\n", rc); if (rc==DS_OK && winetest_debug > 1) { - trace(" Caps: size = %d flags=0x%08x buffer size=%d\n", + trace(" Caps: size = %ld flags=0x%08lx buffer size=%ld\n", dscbcaps.dwSize,dscbcaps.dwFlags,dscbcaps.dwBufferBytes); } @@ -340,17 +340,17 @@ static void test_capture_buffer(LPDIRECTSOUNDCAPTURE dsco, * be non-NULL */ rc=IDirectSoundCaptureBuffer_GetFormat(dscbo,NULL,0,NULL); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundCaptureBuffer_GetFormat() should " - "have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc); size=0; rc=IDirectSoundCaptureBuffer_GetFormat(dscbo,NULL,0,&size); ok(rc==DS_OK && size!=0,"IDirectSoundCaptureBuffer_GetFormat() should " - "have returned the needed size: rc=%08x, size=%d\n", rc,size); + "have returned the needed size: rc=%08lx, size=%ld\n", rc,size); rc=IDirectSoundCaptureBuffer_GetFormat(dscbo,&wfx,sizeof(wfx),NULL); - ok(rc==DS_OK,"IDirectSoundCaptureBuffer_GetFormat() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundCaptureBuffer_GetFormat() failed: %08lx\n", rc); if (rc==DS_OK && winetest_debug > 1) { - trace(" Format: tag=0x%04x %dx%dx%d avg.B/s=%d align=%d\n", + trace(" Format: tag=0x%04x %ldx%dx%d avg.B/s=%ld align=%d\n", wfx.wFormatTag,wfx.nSamplesPerSec,wfx.wBitsPerSample, wfx.nChannels,wfx.nAvgBytesPerSec,wfx.nBlockAlign); } @@ -358,12 +358,12 @@ static void test_capture_buffer(LPDIRECTSOUNDCAPTURE dsco, /* Private dsound.dll: Error: Invalid status pointer */ rc=IDirectSoundCaptureBuffer_GetStatus(dscbo,0); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundCaptureBuffer_GetStatus() should " - "have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc); rc=IDirectSoundCaptureBuffer_GetStatus(dscbo,&status); - ok(rc==DS_OK,"IDirectSoundCaptureBuffer_GetStatus() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundCaptureBuffer_GetStatus() failed: %08lx\n", rc); if (rc==DS_OK && winetest_debug > 1) { - trace(" Status=0x%04x\n",status); + trace(" Status=0x%04lx\n",status); } ZeroMemory(&state, sizeof(state)); @@ -377,7 +377,7 @@ static void test_capture_buffer(LPDIRECTSOUNDCAPTURE dsco, rc=IDirectSoundCaptureBuffer_QueryInterface(dscbo,&IID_IDirectSoundNotify, (void **)&(state.notify)); ok((rc==DS_OK)&&(state.notify!=NULL), - "IDirectSoundCaptureBuffer_QueryInterface() failed: %08x\n", rc); + "IDirectSoundCaptureBuffer_QueryInterface() failed: %08lx\n", rc); for (i = 0; i < TIMESTAMP_NOTIFICATIONS; i++) { state.posnotify[i].dwOffset = (i * state.size) + state.size - 1; @@ -389,32 +389,32 @@ static void test_capture_buffer(LPDIRECTSOUNDCAPTURE dsco, rc = IDirectSoundNotify_SetNotificationPositions(state.notify, TOTAL_NOTIFICATIONS, state.posnotify); - ok(rc==DS_OK,"IDirectSoundNotify_SetNotificationPositions() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundNotify_SetNotificationPositions() failed: %08lx\n", rc); ref=IDirectSoundNotify_Release(state.notify); ok(ref==0,"IDirectSoundNotify_Release(): has %d references, should have " "0\n",ref); rc=IDirectSoundCaptureBuffer_Start(dscbo,DSCBSTART_LOOPING); - ok(rc==DS_OK,"IDirectSoundCaptureBuffer_Start() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundCaptureBuffer_Start() failed: %08lx\n", rc); rc=IDirectSoundCaptureBuffer_Start(dscbo,0); - ok(rc==DS_OK,"IDirectSoundCaptureBuffer_Start() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundCaptureBuffer_Start() failed: %08lx\n", rc); rc=IDirectSoundCaptureBuffer_GetStatus(dscbo,&status); - ok(rc==DS_OK,"IDirectSoundCaptureBuffer_GetStatus() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundCaptureBuffer_GetStatus() failed: %08lx\n", rc); ok(status==(DSCBSTATUS_CAPTURING|DSCBSTATUS_LOOPING) || broken(status==DSCBSTATUS_CAPTURING), - "GetStatus: bad status: %x\n",status); + "GetStatus: bad status: %lx\n",status); if (record) { /* wait for timestamp notifications */ for (i = 0; i < (TIMESTAMP_NOTIFICATIONS * 2); i++) { rc = WaitForMultipleObjects(TOTAL_NOTIFICATIONS, state.event, FALSE, 3000); ok(rc == (WAIT_OBJECT_0 + (i % TIMESTAMP_NOTIFICATIONS)), - "WaitForMultipleObjects failed: 0x%x\n",rc); + "WaitForMultipleObjects failed: 0x%lx\n",rc); if (rc != (WAIT_OBJECT_0 + (i % TIMESTAMP_NOTIFICATIONS))) { ok((rc==WAIT_TIMEOUT)||(rc==WAIT_FAILED), - "Wrong notification: should be %d, got %d\n", + "Wrong notification: should be %d, got %ld\n", i % TIMESTAMP_NOTIFICATIONS, rc - WAIT_OBJECT_0); } if (!capture_buffer_service(&state)) @@ -423,14 +423,14 @@ static void test_capture_buffer(LPDIRECTSOUNDCAPTURE dsco, } rc=IDirectSoundCaptureBuffer_Stop(dscbo); - ok(rc==DS_OK,"IDirectSoundCaptureBuffer_Stop() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundCaptureBuffer_Stop() failed: %08lx\n", rc); /* wait for stop notification */ rc = WaitForSingleObject(state.event[TIMESTAMP_NOTIFICATIONS], 3000); - ok(rc == WAIT_OBJECT_0, "WaitForSingleObject failed: 0x%x\n", rc); + ok(rc == WAIT_OBJECT_0, "WaitForSingleObject failed: 0x%lx\n", rc); rc=IDirectSoundCaptureBuffer_Stop(dscbo); - ok(rc==DS_OK,"IDirectSoundCaptureBuffer_Stop() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundCaptureBuffer_Stop() failed: %08lx\n", rc); } static BOOL WINAPI dscenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, @@ -449,11 +449,11 @@ static BOOL WINAPI dscenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, trace("*** Testing %s - %s ***\n",lpcstrDescription,lpcstrModule); rc = DirectSoundCaptureCreate(lpGuid, NULL, NULL); ok(rc==DSERR_INVALIDPARAM,"DirectSoundCaptureCreate() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n",rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n",rc); rc = DirectSoundCaptureCreate(lpGuid, &dsco, NULL); ok((rc==DS_OK)||(rc==DSERR_NODRIVER)||(rc==E_FAIL)||(rc==DSERR_ALLOCATED), - "DirectSoundCaptureCreate() failed: %08x\n",rc); + "DirectSoundCaptureCreate() failed: %08lx\n",rc); if (rc!=DS_OK) { if (rc==DSERR_NODRIVER) trace(" No Driver\n"); @@ -467,19 +467,19 @@ static BOOL WINAPI dscenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, /* Private dsound.dll: Error: Invalid caps buffer */ rc=IDirectSoundCapture_GetCaps(dsco,NULL); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundCapture_GetCaps() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n",rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n",rc); /* Private dsound.dll: Error: Invalid caps buffer */ dsccaps.dwSize=0; rc=IDirectSoundCapture_GetCaps(dsco,&dsccaps); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundCapture_GetCaps() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n",rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n",rc); dsccaps.dwSize=sizeof(dsccaps); rc=IDirectSoundCapture_GetCaps(dsco,&dsccaps); - ok(rc==DS_OK,"IDirectSoundCapture_GetCaps() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundCapture_GetCaps() failed: %08lx\n", rc); if (rc==DS_OK && winetest_debug > 1) { - trace(" Caps: size=%d flags=0x%08x formats=%05x channels=%d\n", + trace(" Caps: size=%ld flags=0x%08lx formats=%05lx channels=%ld\n", dsccaps.dwSize,dsccaps.dwFlags,dsccaps.dwFormats, dsccaps.dwChannels); } @@ -494,7 +494,7 @@ static BOOL WINAPI dscenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, bufdesc.lpwfxFormat=NULL; rc=IDirectSoundCapture_CreateCaptureBuffer(dsco,&bufdesc,&dscbo,NULL); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundCapture_CreateCaptureBuffer() " - "should have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "should have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc); if (rc==DS_OK) { ref=IDirectSoundCaptureBuffer_Release(dscbo); ok(ref==0,"IDirectSoundCaptureBuffer_Release() has %d references, " @@ -511,7 +511,7 @@ static BOOL WINAPI dscenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, bufdesc.lpwfxFormat=NULL; rc=IDirectSoundCapture_CreateCaptureBuffer(dsco,&bufdesc,&dscbo,NULL); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundCapture_CreateCaptureBuffer() " - "should have returned DSERR_INVALIDPARAM, returned %08x\n", rc); + "should have returned DSERR_INVALIDPARAM, returned %08lx\n", rc); if (rc==DS_OK) { ref=IDirectSoundCaptureBuffer_Release(dscbo); ok(ref==0,"IDirectSoundCaptureBuffer_Release() has %d references, " @@ -529,7 +529,7 @@ static BOOL WINAPI dscenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, bufdesc.lpwfxFormat=&wfx; rc=IDirectSoundCapture_CreateCaptureBuffer(dsco,&bufdesc,&dscbo,NULL); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundCapture_CreateCaptureBuffer() " - "should have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "should have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc); if (rc==DS_OK) { ref=IDirectSoundCaptureBuffer_Release(dscbo); ok(ref==0,"IDirectSoundCaptureBuffer_Release() has %d references, " @@ -547,7 +547,7 @@ static BOOL WINAPI dscenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, bufdesc.lpwfxFormat=&wfx; rc=IDirectSoundCapture_CreateCaptureBuffer(dsco,&bufdesc,&dscbo,NULL); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundCapture_CreateCaptureBuffer() " - "should have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "should have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc); if (rc==DS_OK) { ref=IDirectSoundCaptureBuffer_Release(dscbo); ok(ref==0,"IDirectSoundCaptureBuffer_Release() has %d references, " @@ -571,7 +571,7 @@ static BOOL WINAPI dscenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, || rc==DSERR_BADFORMAT || rc==DSERR_INVALIDCALL || rc==DSERR_NODRIVER || rc==DSERR_ALLOCATED || rc==E_INVALIDARG || rc==E_FAIL, "IDirectSoundCapture_CreateCaptureBuffer() failed to create a " - "%s capture buffer: %08x\n",format_string(&wfx),rc); + "%s capture buffer: %08lx\n",format_string(&wfx),rc); if (rc==DS_OK) { test_capture_buffer(dsco, dscbo, winetest_interactive); ref=IDirectSoundCaptureBuffer_Release(dscbo); @@ -599,7 +599,7 @@ static BOOL WINAPI dscenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, (DSCBUFFERDESC*)&bufdesc1,&dscbo,NULL); ok(rc==DS_OK || broken(rc==DSERR_INVALIDPARAM), "IDirectSoundCapture_CreateCaptureBuffer() failed to create a " - "%s capture buffer: %08x\n",format_string(&wfx), rc); + "%s capture buffer: %08lx\n",format_string(&wfx), rc); if (rc==DSERR_INVALIDPARAM) { skip("broken driver\n"); goto EXIT; @@ -634,7 +634,7 @@ static BOOL WINAPI dscenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, trace(" Testing the capture buffer at %s\n", format_string(&wfx)); rc=IDirectSoundCapture_CreateCaptureBuffer(dsco,&bufdesc,&dscbo,NULL); ok((rc==DS_OK)&&(dscbo!=NULL),"IDirectSoundCapture_CreateCaptureBuffer() " - "failed to create a capture buffer: %08x\n",rc); + "failed to create a capture buffer: %08lx\n",rc); if ((rc==DS_OK)&&(dscbo!=NULL)) { test_capture_buffer(dsco, dscbo, winetest_interactive); ref=IDirectSoundCaptureBuffer_Release(dscbo); @@ -658,7 +658,7 @@ static BOOL WINAPI dscenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, trace(" Testing the capture buffer at %s\n", format_string(&wfx)); rc=IDirectSoundCapture_CreateCaptureBuffer(dsco,&bufdesc,&dscbo,NULL); ok(rc!=DS_OK,"IDirectSoundCapture_CreateCaptureBuffer() should have failed " - "at 2 MHz %08x\n",rc); + "at 2 MHz %08lx\n",rc); } EXIT: @@ -675,7 +675,7 @@ static void test_enumerate(void) { HRESULT rc; rc = DirectSoundCaptureEnumerateA(dscenum_callback, NULL); - ok(rc==DS_OK,"DirectSoundCaptureEnumerateA() failed: %08x\n", rc); + ok(rc==DS_OK,"DirectSoundCaptureEnumerateA() failed: %08lx\n", rc); } static void test_COM(void) @@ -691,7 +691,7 @@ static void test_COM(void) hr = DirectSoundCaptureCreate(NULL, &dsc, (IUnknown *)0xdeadbeef); ok(hr == DSERR_NOAGGREGATION, - "DirectSoundCaptureCreate failed: %08x, expected DSERR_NOAGGREGATION\n", hr); + "DirectSoundCaptureCreate failed: %08lx, expected DSERR_NOAGGREGATION\n", hr); ok(dsc == (IDirectSoundCapture*)0xdeadbeef, "dsc = %p\n", dsc); hr = DirectSoundCaptureCreate(NULL, &dsc, NULL); @@ -699,15 +699,15 @@ static void test_COM(void) skip("No driver\n"); return; } - ok(hr == DS_OK, "DirectSoundCaptureCreate failed: %08x, expected DS_OK\n", hr); + ok(hr == DS_OK, "DirectSoundCaptureCreate failed: %08lx, expected DS_OK\n", hr); /* Different refcount for IDirectSoundCapture and for IUnknown */ refcount = IDirectSoundCapture_AddRef(dsc); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectSoundCapture_QueryInterface(dsc, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08lx\n", hr); refcount = IUnknown_AddRef(unk); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); IUnknown_Release(unk); IUnknown_Release(unk); IDirectSoundCapture_Release(dsc); @@ -725,37 +725,37 @@ static void test_COM(void) hr = IDirectSoundCapture_CreateCaptureBuffer(dsc, &bufdesc, &buffer, (IUnknown*)0xdeadbeef); } ok(hr == DSERR_NOAGGREGATION, - "IDirectSoundCapture_CreateCaptureBuffer failed: %08x, expected DSERR_NOAGGREGATION\n", hr); + "IDirectSoundCapture_CreateCaptureBuffer failed: %08lx, expected DSERR_NOAGGREGATION\n", hr); ok(buffer == (IDirectSoundCaptureBuffer*)0xdeadbeef || !buffer /* Win2k without DirectX9 */, "buffer = %p\n", buffer); hr = IDirectSoundCapture_CreateCaptureBuffer(dsc, &bufdesc, &buffer, NULL); - ok(hr == DS_OK, "IDirectSoundCapture_CreateCaptureBuffer failed: %08x, expected DS_OK\n", hr); + ok(hr == DS_OK, "IDirectSoundCapture_CreateCaptureBuffer failed: %08lx, expected DS_OK\n", hr); /* IDirectSoundCaptureBuffer and IDirectSoundNotify have separate refcounts */ IDirectSoundCaptureBuffer_AddRef(buffer); refcount = IDirectSoundCaptureBuffer_AddRef(buffer); - ok(refcount == 3, "IDirectSoundCaptureBuffer refcount is %u, expected 3\n", refcount); + ok(refcount == 3, "IDirectSoundCaptureBuffer refcount is %lu, expected 3\n", refcount); hr = IDirectSoundCaptureBuffer_QueryInterface(buffer, &IID_IDirectSoundNotify, (void**)¬ify); - ok(hr == DS_OK, "IDirectSoundCapture_QueryInterface failed: %08x, expected DS_OK\n", hr); + ok(hr == DS_OK, "IDirectSoundCapture_QueryInterface failed: %08lx, expected DS_OK\n", hr); refcount = IDirectSoundNotify_AddRef(notify); - ok(refcount == 2, "IDirectSoundNotify refcount is %u, expected 2\n", refcount); + ok(refcount == 2, "IDirectSoundNotify refcount is %lu, expected 2\n", refcount); IDirectSoundCaptureBuffer_AddRef(buffer); refcount = IDirectSoundCaptureBuffer_Release(buffer); - ok(refcount == 3, "IDirectSoundCaptureBuffer refcount is %u, expected 3\n", refcount); + ok(refcount == 3, "IDirectSoundCaptureBuffer refcount is %lu, expected 3\n", refcount); /* Release IDirectSoundCaptureBuffer while keeping IDirectSoundNotify alive */ while (IDirectSoundCaptureBuffer_Release(buffer) > 0); refcount = IDirectSoundNotify_AddRef(notify); - ok(refcount == 3, "IDirectSoundNotify refcount is %u, expected 3\n", refcount); + ok(refcount == 3, "IDirectSoundNotify refcount is %lu, expected 3\n", refcount); refcount = IDirectSoundCaptureBuffer_AddRef(buffer); - ok(refcount == 1, "IDirectSoundCaptureBuffer refcount is %u, expected 1\n", refcount); + ok(refcount == 1, "IDirectSoundCaptureBuffer refcount is %lu, expected 1\n", refcount); while (IDirectSoundNotify_Release(notify) > 0); refcount = IDirectSoundCaptureBuffer_Release(buffer); - ok(refcount == 0, "IDirectSoundCaptureBuffer refcount is %u, expected 0\n", refcount); + ok(refcount == 0, "IDirectSoundCaptureBuffer refcount is %lu, expected 0\n", refcount); refcount = IDirectSoundCapture_Release(dsc); - ok(refcount == 0, "IDirectSoundCapture refcount is %u, expected 0\n", refcount); + ok(refcount == 0, "IDirectSoundCapture refcount is %lu, expected 0\n", refcount); } START_TEST(capture) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index a6b31641d4a..577c4155e9f 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -197,10 +197,10 @@ static int buffer_refill(play_state_t* state, DWORD size) /* some broken apps like Navyfield mistakenly pass NULL for a ppValue */ rc=IDirectSoundBuffer_Lock(state->dsbo,state->offset,size, &ptr1,NULL,&ptr2,&len2,0); - ok(rc==DSERR_INVALIDPARAM,"expected %08x got %08x\n",DSERR_INVALIDPARAM, rc); + ok(rc==DSERR_INVALIDPARAM,"expected %08lx got %08lx\n",DSERR_INVALIDPARAM, rc); rc=IDirectSoundBuffer_Lock(state->dsbo,state->offset,size, &ptr1,&len1,&ptr2,&len2,0); - ok(rc==DS_OK,"IDirectSoundBuffer_Lock() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_Lock() failed: %08lx\n", rc); if (rc!=DS_OK) return -1; @@ -213,9 +213,9 @@ static int buffer_refill(play_state_t* state, DWORD size) state->offset=state->written % state->buffer_size; /* some apps blindly pass &ptr1 instead of ptr1 */ rc=IDirectSoundBuffer_Unlock(state->dsbo,&ptr1,len1,ptr2,len2); - ok(rc==DSERR_INVALIDPARAM, "IDDirectSoundBuffer_Unlock(): expected %08x got %08x, %p %p\n",DSERR_INVALIDPARAM, rc, &ptr1, ptr1); + ok(rc==DSERR_INVALIDPARAM, "IDDirectSoundBuffer_Unlock(): expected %08lx got %08lx, %p %p\n",DSERR_INVALIDPARAM, rc, &ptr1, ptr1); rc=IDirectSoundBuffer_Unlock(state->dsbo,ptr1,len1,ptr2,len2); - ok(rc==DS_OK,"IDirectSoundBuffer_Unlock() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_Unlock() failed: %08lx\n", rc); if (rc!=DS_OK) return -1; return size; @@ -230,7 +230,7 @@ static int buffer_silence(play_state_t* state, DWORD size) rc=IDirectSoundBuffer_Lock(state->dsbo,state->offset,size, &ptr1,&len1,&ptr2,&len2,0); - ok(rc==DS_OK,"IDirectSoundBuffer_Lock() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_Lock() failed: %08lx\n", rc); if (rc!=DS_OK) return -1; @@ -241,7 +241,7 @@ static int buffer_silence(play_state_t* state, DWORD size) } state->offset=(state->offset+size) % state->buffer_size; rc=IDirectSoundBuffer_Unlock(state->dsbo,ptr1,len1,ptr2,len2); - ok(rc==DS_OK,"IDirectSoundBuffer_Unlock() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_Unlock() failed: %08lx\n", rc); if (rc!=DS_OK) return -1; return size; @@ -253,7 +253,7 @@ static BOOL buffer_service(play_state_t* state) HRESULT rc; rc=IDirectSoundBuffer_GetCurrentPosition(state->dsbo,&play_pos,NULL); - ok(rc==DS_OK,"IDirectSoundBuffer_GetCurrentPosition() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetCurrentPosition() failed: %08lx\n", rc); if (rc!=DS_OK) { goto STOP; } @@ -266,7 +266,7 @@ static BOOL buffer_service(play_state_t* state) state->played+=play_pos-last_play_pos; if (winetest_debug > 1) - trace("buf size=%d last_play_pos=%d play_pos=%d played=%d / %d\n", + trace("buf size=%ld last_play_pos=%ld play_pos=%ld played=%ld / %ld\n", state->buffer_size,last_play_pos,play_pos,state->played, state->wave_len); @@ -283,7 +283,7 @@ static BOOL buffer_service(play_state_t* state) buf_free=state->buffer_size-state->offset+play_pos; if (winetest_debug > 1) - trace("offset=%d free=%d written=%d / %d\n", + trace("offset=%ld free=%ld written=%ld / %ld\n", state->offset,buf_free,state->written,state->wave_len); if (buf_free==0) return TRUE; @@ -295,14 +295,14 @@ static BOOL buffer_service(play_state_t* state) goto STOP; buf_free-=w; if (state->written==state->wave_len && winetest_debug > 1) - trace("last sound byte at %d\n", + trace("last sound byte at %ld\n", (state->written % state->buffer_size)); } if (buf_free>0) { /* Fill with silence */ if (winetest_debug > 1) - trace("writing %d bytes of silence\n",buf_free); + trace("writing %ld bytes of silence\n",buf_free); if (buffer_silence(state,buf_free)==-1) goto STOP; } @@ -312,7 +312,7 @@ STOP: if (winetest_debug > 1) trace("stopping playback\n"); rc=IDirectSoundBuffer_Stop(state->dsbo); - ok(rc==DS_OK,"IDirectSoundBuffer_Stop() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_Stop() failed: %08lx\n", rc); return FALSE; } @@ -333,7 +333,7 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, if (set_frequency) { rc=IDirectSoundBuffer_SetFrequency(*dsbo,frequency); ok(rc==DS_OK||rc==DSERR_CONTROLUNAVAIL, - "IDirectSoundBuffer_SetFrequency() failed to set frequency %08x\n",rc); + "IDirectSoundBuffer_SetFrequency() failed to set frequency %08lx\n",rc); if (rc!=DS_OK) return; } @@ -341,20 +341,20 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, /* DSOUND: Error: Invalid caps pointer */ rc=IDirectSoundBuffer_GetCaps(*dsbo,0); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundBuffer_GetCaps() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n",rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n",rc); ZeroMemory(&dsbcaps, sizeof(dsbcaps)); /* DSOUND: Error: Invalid caps pointer */ rc=IDirectSoundBuffer_GetCaps(*dsbo,&dsbcaps); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundBuffer_GetCaps() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n",rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n",rc); dsbcaps.dwSize=sizeof(dsbcaps); rc=IDirectSoundBuffer_GetCaps(*dsbo,&dsbcaps); - ok(rc==DS_OK,"IDirectSoundBuffer_GetCaps() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetCaps() failed: %08lx\n", rc); if (rc==DS_OK && winetest_debug > 1) { - trace(" Caps: flags=0x%08x size=%d\n",dsbcaps.dwFlags, + trace(" Caps: flags=0x%08lx size=%ld\n",dsbcaps.dwFlags, dsbcaps.dwBufferBytes); } @@ -362,10 +362,10 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, size=0; rc=IDirectSoundBuffer_GetFormat(*dsbo,NULL,0,&size); ok(rc==DS_OK && size!=0,"IDirectSoundBuffer_GetFormat() should have " - "returned the needed size: rc=%08x size=%d\n",rc,size); + "returned the needed size: rc=%08lx size=%ld\n",rc,size); ok(size == sizeof(WAVEFORMATEX) || size == sizeof(WAVEFORMATEXTENSIBLE), - "Expected a correct structure size, got %d\n", size); + "Expected a correct structure size, got %ld\n", size); if (size == sizeof(WAVEFORMATEX)) { rc=IDirectSoundBuffer_GetFormat(*dsbo,&wfx,size,NULL); @@ -380,9 +380,9 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, return; ok(rc==DS_OK, - "IDirectSoundBuffer_GetFormat() failed: %08x\n", rc); + "IDirectSoundBuffer_GetFormat() failed: %08lx\n", rc); if (rc==DS_OK && winetest_debug > 1) { - trace(" Format: %s tag=0x%04x %dx%dx%d avg.B/s=%d align=%d\n", + trace(" Format: %s tag=0x%04x %ldx%dx%d avg.B/s=%ld align=%d\n", is_primary ? "Primary" : "Secondary", wfx.wFormatTag,wfx.nSamplesPerSec,wfx.wBitsPerSample, wfx.nChannels,wfx.nAvgBytesPerSec,wfx.nBlockAlign); @@ -391,45 +391,45 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, /* DSOUND: Error: Invalid frequency buffer */ rc=IDirectSoundBuffer_GetFrequency(*dsbo,0); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundBuffer_GetFrequency() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n",rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n",rc); /* DSOUND: Error: Primary buffers don't support CTRLFREQUENCY */ rc=IDirectSoundBuffer_GetFrequency(*dsbo,&freq); ok((rc==DS_OK && !is_primary) || (rc==DSERR_CONTROLUNAVAIL&&is_primary) || (rc==DSERR_CONTROLUNAVAIL&&!(dsbcaps.dwFlags&DSBCAPS_CTRLFREQUENCY)), - "IDirectSoundBuffer_GetFrequency() failed: %08x\n",rc); + "IDirectSoundBuffer_GetFrequency() failed: %08lx\n",rc); if (rc==DS_OK) { DWORD f = set_frequency?frequency:wfx.nSamplesPerSec; ok(freq==f,"The frequency returned by GetFrequency " - "%d does not match the format %d\n",freq,f); + "%ld does not match the format %ld\n",freq,f); } /* DSOUND: Error: Invalid status pointer */ rc=IDirectSoundBuffer_GetStatus(*dsbo,0); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundBuffer_GetStatus() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n",rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n",rc); rc=IDirectSoundBuffer_GetStatus(*dsbo,&status); - ok(rc==DS_OK,"IDirectSoundBuffer_GetStatus() failed: %08x\n", rc); - ok(status==0,"status=0x%x instead of 0\n",status); + ok(rc==DS_OK,"IDirectSoundBuffer_GetStatus() failed: %08lx\n", rc); + ok(status==0,"status=0x%lx instead of 0\n",status); if (is_primary) { DSBCAPS new_dsbcaps; /* We must call SetCooperativeLevel to be allowed to call SetFormat */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08lx\n",rc); if (rc!=DS_OK) return; /* DSOUND: Error: Invalid format pointer */ rc=IDirectSoundBuffer_SetFormat(*dsbo,0); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundBuffer_SetFormat() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n",rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n",rc); init_format(&wfx2,WAVE_FORMAT_PCM,11025,16,2); rc=IDirectSoundBuffer_SetFormat(*dsbo,&wfx2); - ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %08x\n", + ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %08lx\n", format_string(&wfx2), rc); /* There is no guarantee that SetFormat will actually change the @@ -437,16 +437,16 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, * supports. So we must re-query the format. */ rc=IDirectSoundBuffer_GetFormat(*dsbo,&wfx,sizeof(wfx),NULL); - ok(rc==DS_OK,"IDirectSoundBuffer_GetFormat() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetFormat() failed: %08lx\n", rc); if (rc==DS_OK && (wfx.wFormatTag!=wfx2.wFormatTag || wfx.nSamplesPerSec!=wfx2.nSamplesPerSec || wfx.wBitsPerSample!=wfx2.wBitsPerSample || wfx.nChannels!=wfx2.nChannels)) { - trace("Requested format tag=0x%04x %dx%dx%d avg.B/s=%d align=%d\n", + trace("Requested format tag=0x%04x %ldx%dx%d avg.B/s=%ld align=%d\n", wfx2.wFormatTag,wfx2.nSamplesPerSec,wfx2.wBitsPerSample, wfx2.nChannels,wfx2.nAvgBytesPerSec,wfx2.nBlockAlign); - trace("Got tag=0x%04x %dx%dx%d avg.B/s=%d align=%d\n", + trace("Got tag=0x%04x %ldx%dx%d avg.B/s=%ld align=%d\n", wfx.wFormatTag,wfx.nSamplesPerSec,wfx.wBitsPerSample, wfx.nChannels,wfx.nAvgBytesPerSec,wfx.nBlockAlign); } @@ -454,29 +454,29 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, ZeroMemory(&new_dsbcaps, sizeof(new_dsbcaps)); new_dsbcaps.dwSize = sizeof(new_dsbcaps); rc=IDirectSoundBuffer_GetCaps(*dsbo,&new_dsbcaps); - ok(rc==DS_OK,"IDirectSoundBuffer_GetCaps() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetCaps() failed: %08lx\n", rc); if (rc==DS_OK && winetest_debug > 1) { - trace(" new Caps: flags=0x%08x size=%d\n",new_dsbcaps.dwFlags, + trace(" new Caps: flags=0x%08lx size=%ld\n",new_dsbcaps.dwFlags, new_dsbcaps.dwBufferBytes); } /* Check for primary buffer size change */ ok(new_dsbcaps.dwBufferBytes == dsbcaps.dwBufferBytes, " buffer size changed after SetFormat() - " - "previous size was %u, current size is %u\n", + "previous size was %lu, current size is %lu\n", dsbcaps.dwBufferBytes, new_dsbcaps.dwBufferBytes); dsbcaps.dwBufferBytes = new_dsbcaps.dwBufferBytes; /* Check for primary buffer flags change */ ok(new_dsbcaps.dwFlags == dsbcaps.dwFlags, " flags changed after SetFormat() - " - "previous flags were %08x, current flags are %08x\n", + "previous flags were %08lx, current flags are %08lx\n", dsbcaps.dwFlags, new_dsbcaps.dwFlags); /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_NORMAL) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_NORMAL) failed: %08lx\n",rc); } if (play) { @@ -490,12 +490,12 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, if (winetest_interactive) { if (set_frequency) - trace(" Playing %g second 440Hz tone at %dx%dx%d with a " - "frequency of %d (%dHz)\n", duration, + trace(" Playing %g second 440Hz tone at %ldx%dx%d with a " + "frequency of %ld (%ldHz)\n", duration, wfx.nSamplesPerSec, wfx.wBitsPerSample, wfx.nChannels, frequency, (440 * frequency) / wfx.nSamplesPerSec); else - trace(" Playing %g second 440Hz tone at %dx%dx%d\n", duration, + trace(" Playing %g second 440Hz tone at %ldx%dx%d\n", duration, wfx.nSamplesPerSec, wfx.wBitsPerSample, wfx.nChannels); } @@ -506,7 +506,7 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(), DSSCL_WRITEPRIMARY); ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_WRITEPRIMARY) " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); if (rc!=DS_OK) return; } @@ -515,7 +515,7 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, rc=IDirectSoundBuffer_QueryInterface(*dsbo,&IID_IDirectSound3DBuffer, (LPVOID *)&buffer); - ok(rc==DS_OK,"IDirectSoundBuffer_QueryInterface() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_QueryInterface() failed: %08lx\n", rc); if (rc!=DS_OK) return; @@ -523,7 +523,7 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, rc=IDirectSoundBuffer_QueryInterface(*dsbo, &IID_IDirectSoundBuffer, (LPVOID *)&temp_buffer); ok(rc==DS_OK && temp_buffer!=NULL, - "IDirectSoundBuffer_QueryInterface() failed: %08x\n", rc); + "IDirectSoundBuffer_QueryInterface() failed: %08lx\n", rc); ok(temp_buffer==*dsbo,"COM interface broken: %p != %p\n", temp_buffer,*dsbo); ref=IDirectSoundBuffer_Release(temp_buffer); @@ -538,37 +538,37 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, &IID_IDirectSoundBuffer, (LPVOID *)dsbo); ok(rc==DS_OK && *dsbo!=NULL,"IDirectSound3DBuffer_QueryInterface() " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); /* DSOUND: Error: Invalid buffer */ rc=IDirectSound3DBuffer_GetAllParameters(buffer,0); ok(rc==DSERR_INVALIDPARAM,"IDirectSound3DBuffer_GetAllParameters() " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); ZeroMemory(&buffer_param, sizeof(buffer_param)); /* DSOUND: Error: Invalid buffer */ rc=IDirectSound3DBuffer_GetAllParameters(buffer,&buffer_param); ok(rc==DSERR_INVALIDPARAM,"IDirectSound3DBuffer_GetAllParameters() " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); buffer_param.dwSize=sizeof(buffer_param); rc=IDirectSound3DBuffer_GetAllParameters(buffer,&buffer_param); - ok(rc==DS_OK,"IDirectSound3DBuffer_GetAllParameters() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound3DBuffer_GetAllParameters() failed: %08lx\n", rc); } if (set_volume) { if (dsbcaps.dwFlags & DSBCAPS_CTRLVOLUME) { LONG val; rc=IDirectSoundBuffer_GetVolume(*dsbo,&val); - ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume() failed: %08lx\n", rc); rc=IDirectSoundBuffer_SetVolume(*dsbo,volume); - ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume() failed: %08lx\n", rc); } else { /* DSOUND: Error: Buffer does not have CTRLVOLUME */ rc=IDirectSoundBuffer_GetVolume(*dsbo,&volume); ok(rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer_GetVolume() " - "should have returned DSERR_CONTROLUNAVAIL, returned: %08x\n", rc); + "should have returned DSERR_CONTROLUNAVAIL, returned: %08lx\n", rc); } } @@ -576,15 +576,15 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, if (dsbcaps.dwFlags & DSBCAPS_CTRLPAN) { LONG val; rc=IDirectSoundBuffer_GetPan(*dsbo,&val); - ok(rc==DS_OK,"IDirectSoundBuffer_GetPan() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetPan() failed: %08lx\n", rc); rc=IDirectSoundBuffer_SetPan(*dsbo,pan); - ok(rc==DS_OK,"IDirectSoundBuffer_SetPan() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_SetPan() failed: %08lx\n", rc); } else { /* DSOUND: Error: Buffer does not have CTRLPAN */ rc=IDirectSoundBuffer_GetPan(*dsbo,&pan); ok(rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer_GetPan() " - "should have returned DSERR_CONTROLUNAVAIL, returned: %08x\n", rc); + "should have returned DSERR_CONTROLUNAVAIL, returned: %08lx\n", rc); } } @@ -593,14 +593,14 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, &length1, NULL, NULL, DSBLOCK_ENTIREBUFFER); ok(rc==DSERR_INVALIDPARAM, "IDirectSoundBuffer_Lock() should have " - "returned DSERR_INVALIDPARAM, returned %08x\n", rc); + "returned DSERR_INVALIDPARAM, returned %08lx\n", rc); /* try a size larger than the buffer */ rc = IDirectSoundBuffer_Lock(*dsbo, 0, dsbcaps.dwBufferBytes + 1, &buffer1, &length1, NULL, NULL, DSBLOCK_FROMWRITECURSOR); ok(rc==DSERR_INVALIDPARAM, "IDirectSoundBuffer_Lock() should have " - "returned DSERR_INVALIDPARAM, returned %08x\n", rc); + "returned DSERR_INVALIDPARAM, returned %08lx\n", rc); if (set_frequency) state.wave=wave_generate_la(&wfx,(duration*frequency)/wfx.nSamplesPerSec,&state.wave_len,ieee); @@ -614,12 +614,12 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, buffer_refill(&state,state.buffer_size); rc=IDirectSoundBuffer_Play(*dsbo,0,0,DSBPLAY_LOOPING); - ok(rc==DS_OK,"IDirectSoundBuffer_Play() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_Play() failed: %08lx\n", rc); rc=IDirectSoundBuffer_GetStatus(*dsbo,&status); - ok(rc==DS_OK,"IDirectSoundBuffer_GetStatus() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetStatus() failed: %08lx\n", rc); ok(status==(DSBSTATUS_PLAYING|DSBSTATUS_LOOPING), - "GetStatus: bad status: %x\n",status); + "GetStatus: bad status: %lx\n",status); if (listener) { ZeroMemory(&listener_param,sizeof(listener_param)); @@ -627,7 +627,7 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, rc=IDirectSound3DListener_GetAllParameters(listener, &listener_param); ok(rc==DS_OK,"IDirectSound3dListener_GetAllParameters() " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); if (move_listener) { listener_param.vPosition.x = -5.0f; listener_param.vVelocity.x = (float)(10.0/duration); @@ -635,7 +635,7 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, rc=IDirectSound3DListener_SetAllParameters(listener, &listener_param, DS3D_IMMEDIATE); - ok(rc==DS_OK,"IDirectSound3dListener_SetPosition() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound3dListener_SetPosition() failed: %08lx\n", rc); } if (buffer3d) { if (move_sound) { @@ -645,7 +645,7 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, buffer_param.flMinDistance = 10; rc=IDirectSound3DBuffer_SetAllParameters(buffer,&buffer_param, DS3D_IMMEDIATE); - ok(rc==DS_OK,"IDirectSound3dBuffer_SetPosition() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound3dBuffer_SetPosition() failed: %08lx\n", rc); } start_time=GetTickCount(); @@ -659,7 +659,7 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, rc=IDirectSound3DListener_SetPosition(listener, listener_param.vPosition.x,listener_param.vPosition.y, listener_param.vPosition.z,DS3D_IMMEDIATE); - ok(rc==DS_OK,"IDirectSound3dListener_SetPosition() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound3dListener_SetPosition() failed: %08lx\n",rc); } if (buffer3d && move_sound) { buffer_param.vPosition.x = (float)(100-200.0*(now-start_time)/1000/duration); @@ -668,13 +668,13 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, rc=IDirectSound3DBuffer_SetPosition(buffer, buffer_param.vPosition.x,buffer_param.vPosition.y, buffer_param.vPosition.z,DS3D_IMMEDIATE); - ok(rc==DS_OK,"IDirectSound3dBuffer_SetPosition() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound3dBuffer_SetPosition() failed: %08lx\n", rc); } } /* Check the sound duration was within 10% of the expected value */ now=GetTickCount(); ok(fabs(1000*duration-now+start_time)<=100*duration, - "The sound played for %d ms instead of %g ms\n", + "The sound played for %ld ms instead of %g ms\n", now-start_time,1000*duration); HeapFree(GetProcessHeap(), 0, state.wave); @@ -683,7 +683,7 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_NORMAL) " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); } if (buffer3d) { ref=IDirectSound3DBuffer_Release(buffer); @@ -708,14 +708,14 @@ static HRESULT test_secondary(LPGUID lpGuid, int play, /* Create the DirectSound object */ rc = DirectSoundCreate(lpGuid, &dso, NULL); - ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate() failed: %08x\n", rc); + ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate() failed: %08lx\n", rc); if (rc!=DS_OK) return rc; /* We must call SetCooperativeLevel before creating primary buffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT; @@ -728,12 +728,12 @@ static HRESULT test_secondary(LPGUID lpGuid, int play, bufdesc.dwFlags|=(DSBCAPS_CTRLVOLUME|DSBCAPS_CTRLPAN); rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok((rc==DS_OK && primary!=NULL) || (rc==DSERR_CONTROLUNAVAIL), - "IDirectSound_CreateSoundBuffer() failed to create a %sprimary buffer: %08x\n",has_3d?"3D ":"", rc); + "IDirectSound_CreateSoundBuffer() failed to create a %sprimary buffer: %08lx\n",has_3d?"3D ":"", rc); if (rc==DSERR_CONTROLUNAVAIL) trace(" No Primary\n"); else if (rc==DS_OK && primary!=NULL) { rc=IDirectSoundBuffer_GetFormat(primary,&wfx1,sizeof(wfx1),NULL); - ok(rc==DS_OK,"IDirectSoundBuffer8_Getformat() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer8_Getformat() failed: %08lx\n", rc); if (rc!=DS_OK) goto EXIT1; @@ -742,7 +742,7 @@ static HRESULT test_secondary(LPGUID lpGuid, int play, &IID_IDirectSound3DListener, (void **)&listener); ok(rc==DS_OK && listener!=NULL, - "IDirectSoundBuffer_QueryInterface() failed to get a 3D listener: %08x\n",rc); + "IDirectSoundBuffer_QueryInterface() failed to get a 3D listener: %08lx\n",rc); ref=IDirectSoundBuffer_Release(primary); ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references, " "should have 0\n",ref); @@ -753,20 +753,20 @@ static HRESULT test_secondary(LPGUID lpGuid, int play, rc=IDirectSound3DListener_GetAllParameters(listener,0); ok(rc==DSERR_INVALIDPARAM, "IDirectSound3dListener_GetAllParameters() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n", rc); /* DSOUND: Error: Invalid buffer */ rc=IDirectSound3DListener_GetAllParameters(listener, &listener_param); ok(rc==DSERR_INVALIDPARAM, "IDirectSound3dListener_GetAllParameters() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n", rc); listener_param.dwSize=sizeof(listener_param); rc=IDirectSound3DListener_GetAllParameters(listener, &listener_param); ok(rc==DS_OK,"IDirectSound3dListener_GetAllParameters() " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); } else { ok(listener==NULL, "IDirectSoundBuffer_QueryInterface() " "failed but returned a listener anyway\n"); @@ -793,8 +793,8 @@ static HRESULT test_secondary(LPGUID lpGuid, int play, wfx.nBlockAlign); bufdesc.lpwfxFormat=&wfx; if (winetest_interactive) { - trace(" Testing a %s%ssecondary buffer %s%s%s%sat %dx%dx%d " - "with a primary buffer at %dx%dx%d\n", + trace(" Testing a %s%ssecondary buffer %s%s%s%sat %ldx%dx%d " + "with a primary buffer at %ldx%dx%d\n", has_3dbuffer?"3D ":"", has_duplicate?"duplicated ":"", listener!=NULL||move_sound?"with ":"", @@ -807,7 +807,7 @@ static HRESULT test_secondary(LPGUID lpGuid, int play, } rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok((rc==DS_OK && secondary!=NULL) || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */ - "IDirectSound_CreateSoundBuffer() failed to create a %s%ssecondary buffer %s%s%s%sat %dx%dx%d (%s): %08x\n", + "IDirectSound_CreateSoundBuffer() failed to create a %s%ssecondary buffer %s%s%s%sat %ldx%dx%d (%s): %08lx\n", has_3dbuffer?"3D ":"", has_duplicate?"duplicated ":"", listener!=NULL||move_sound?"with ":"", move_listener?"moving ":"", listener!=NULL?"listener ":"", @@ -820,7 +820,7 @@ static HRESULT test_secondary(LPGUID lpGuid, int play, rc=IDirectSoundBuffer_QueryInterface(secondary, &IID_IDirectSound3DBuffer, (void**)&ds3d); ok((has_3dbuffer && rc==DS_OK) || (!has_3dbuffer && rc==E_NOINTERFACE), - "Wrong return trying to get 3D buffer on %s3D secondary interface: %08x\n", has_3dbuffer ? "" : "non-", rc); + "Wrong return trying to get 3D buffer on %s3D secondary interface: %08lx\n", has_3dbuffer ? "" : "non-", rc); if(rc==DS_OK) IDirectSound3DBuffer_Release(ds3d); @@ -829,53 +829,53 @@ static HRESULT test_secondary(LPGUID lpGuid, int play, /* Check the initial secondary buffer's volume and pan */ rc=IDirectSoundBuffer_GetVolume(secondary,&vol); - ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume(secondary) failed: %08x\n",rc); - ok(vol==0,"wrong volume for a new secondary buffer: %d\n",vol); + ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume(secondary) failed: %08lx\n",rc); + ok(vol==0,"wrong volume for a new secondary buffer: %ld\n",vol); rc=IDirectSoundBuffer_GetPan(secondary,&pan); - ok(rc==DS_OK,"IDirectSoundBuffer_GetPan(secondary) failed: %08x\n",rc); - ok(pan==0,"wrong pan for a new secondary buffer: %d\n",pan); + ok(rc==DS_OK,"IDirectSoundBuffer_GetPan(secondary) failed: %08lx\n",rc); + ok(pan==0,"wrong pan for a new secondary buffer: %ld\n",pan); /* Check that changing the secondary buffer's volume and pan * does not impact the primary buffer's volume and pan */ rc=IDirectSoundBuffer_GetVolume(primary,&refvol); - ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume(primary) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume(primary) failed: %08lx\n",rc); rc=IDirectSoundBuffer_GetPan(primary,&refpan); - ok(rc==DS_OK,"IDirectSoundBuffer_GetPan(primary) failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetPan(primary) failed: %08lx\n", rc); rc=IDirectSoundBuffer_SetVolume(secondary,-1000); - ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume(secondary) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume(secondary) failed: %08lx\n",rc); rc=IDirectSoundBuffer_GetVolume(secondary,&vol); - ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume(secondary) failed: %08x\n",rc); - ok(vol==-1000,"secondary: wrong volume %d instead of -1000\n", + ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume(secondary) failed: %08lx\n",rc); + ok(vol==-1000,"secondary: wrong volume %ld instead of -1000\n", vol); rc=IDirectSoundBuffer_SetPan(secondary,-1000); - ok(rc==DS_OK,"IDirectSoundBuffer_SetPan(secondary) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSoundBuffer_SetPan(secondary) failed: %08lx\n",rc); rc=IDirectSoundBuffer_GetPan(secondary,&pan); - ok(rc==DS_OK,"IDirectSoundBuffer_SetPan(secondary) failed: %08x\n",rc); - ok(pan==-1000,"secondary: wrong pan %d instead of -1000\n", + ok(rc==DS_OK,"IDirectSoundBuffer_SetPan(secondary) failed: %08lx\n",rc); + ok(pan==-1000,"secondary: wrong pan %ld instead of -1000\n", pan); rc=IDirectSoundBuffer_GetVolume(primary,&vol); - ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume(primary) failed: %08x\n",rc); - ok(vol==refvol,"The primary volume changed from %d to %d\n", + ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume(primary) failed: %08lx\n",rc); + ok(vol==refvol,"The primary volume changed from %ld to %ld\n", refvol,vol); rc=IDirectSoundBuffer_GetPan(primary,&pan); - ok(rc==DS_OK,"IDirectSoundBuffer_GetPan(primary) failed: %08x\n", rc); - ok(pan==refpan,"The primary pan changed from %d to %d\n", + ok(rc==DS_OK,"IDirectSoundBuffer_GetPan(primary) failed: %08lx\n", rc); + ok(pan==refpan,"The primary pan changed from %ld to %ld\n", refpan,pan); rc=IDirectSoundBuffer_SetVolume(secondary,0); - ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume(secondary) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume(secondary) failed: %08lx\n",rc); rc=IDirectSoundBuffer_SetPan(secondary,0); - ok(rc==DS_OK,"IDirectSoundBuffer_SetPan(secondary) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSoundBuffer_SetPan(secondary) failed: %08lx\n",rc); } else if (has_3dbuffer) { LONG pan; rc=IDirectSoundBuffer_GetPan(secondary,&pan); - ok(rc==DS_OK,"IDirectSoundBuffer_GetPan() failed, returned: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetPan() failed, returned: %08lx\n", rc); rc=IDirectSoundBuffer_SetPan(secondary,0); - ok(rc==DS_OK,"IDirectSoundBuffer_SetPan() failed, returned: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_SetPan() failed, returned: %08lx\n", rc); } if (has_duplicate) { @@ -885,26 +885,26 @@ static HRESULT test_secondary(LPGUID lpGuid, int play, rc=IDirectSound_DuplicateSoundBuffer(dso,0,0); ok(rc==DSERR_INVALIDPARAM, "IDirectSound_DuplicateSoundBuffer() should have returned " - "DSERR_INVALIDPARAM, returned: %08x\n",rc); + "DSERR_INVALIDPARAM, returned: %08lx\n",rc); /* DSOUND: Error: Invalid dest buffer */ rc=IDirectSound_DuplicateSoundBuffer(dso,secondary,0); ok(rc==DSERR_INVALIDPARAM, "IDirectSound_DuplicateSoundBuffer() should have returned " - "DSERR_INVALIDPARAM, returned: %08x\n",rc); + "DSERR_INVALIDPARAM, returned: %08lx\n",rc); /* DSOUND: Error: Invalid source buffer */ rc=IDirectSound_DuplicateSoundBuffer(dso,0,&duplicated); ok(rc==DSERR_INVALIDPARAM, "IDirectSound_DuplicateSoundBuffer() should have returned " - "DSERR_INVALIDPARAM, returned: %08x\n",rc); + "DSERR_INVALIDPARAM, returned: %08lx\n",rc); duplicated=NULL; rc=IDirectSound_DuplicateSoundBuffer(dso,secondary, &duplicated); ok(rc==DS_OK && duplicated!=NULL, "IDirectSound_DuplicateSoundBuffer() failed to duplicate " - "a secondary buffer: %08x\n",rc); + "a secondary buffer: %08lx\n",rc); if (rc==DS_OK && duplicated!=NULL) { ref=IDirectSoundBuffer_Release(secondary); @@ -951,7 +951,7 @@ EXIT2: /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_NORMAL) failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_NORMAL) failed: %08lx\n", rc); EXIT: ref=IDirectSound_Release(dso); @@ -971,7 +971,7 @@ static HRESULT test_for_driver(LPGUID lpGuid) /* Create the DirectSound object */ rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, - "DirectSoundCreate() failed: %08x\n",rc); + "DirectSoundCreate() failed: %08lx\n",rc); if (rc!=DS_OK) return rc; @@ -994,7 +994,7 @@ static HRESULT test_primary(LPGUID lpGuid) /* Create the DirectSound object */ rc = DirectSoundCreate(lpGuid, &dso, NULL); - ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate() failed: %08x\n", rc); + ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate() failed: %08lx\n", rc); if (rc!=DS_OK) return rc; @@ -1002,14 +1002,14 @@ static HRESULT test_primary(LPGUID lpGuid) ZeroMemory(&dscaps, sizeof(dscaps)); dscaps.dwSize=sizeof(dscaps); rc=IDirectSound_GetCaps(dso,&dscaps); - ok(rc==DS_OK,"IDirectSound_GetCaps() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound_GetCaps() failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT; /* We must call SetCooperativeLevel before calling CreateSoundBuffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT; @@ -1020,7 +1020,7 @@ static HRESULT test_primary(LPGUID lpGuid) bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER|DSBCAPS_CTRLVOLUME|DSBCAPS_CTRLPAN; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok((rc==DS_OK && primary!=NULL) || (rc==DSERR_CONTROLUNAVAIL), - "IDirectSound_CreateSoundBuffer() failed to create a primary buffer: %08x\n",rc); + "IDirectSound_CreateSoundBuffer() failed to create a primary buffer: %08lx\n",rc); if (rc==DSERR_CONTROLUNAVAIL) trace(" No Primary\n"); else if (rc==DS_OK && primary!=NULL) { @@ -1055,7 +1055,7 @@ static HRESULT test_primary(LPGUID lpGuid) /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_NORMAL) failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_NORMAL) failed: %08lx\n", rc); EXIT: ref=IDirectSound_Release(dso); @@ -1077,7 +1077,7 @@ static HRESULT test_primary_3d(LPGUID lpGuid) /* Create the DirectSound object */ rc = DirectSoundCreate(lpGuid, &dso, NULL); - ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate() failed: %08x\n", rc); + ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate() failed: %08lx\n", rc); if (rc!=DS_OK) return rc; @@ -1085,14 +1085,14 @@ static HRESULT test_primary_3d(LPGUID lpGuid) ZeroMemory(&dscaps, sizeof(dscaps)); dscaps.dwSize=sizeof(dscaps); rc=IDirectSound_GetCaps(dso,&dscaps); - ok(rc==DS_OK,"IDirectSound_GetCaps() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound_GetCaps() failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT; /* We must call SetCooperativeLevel before calling CreateSoundBuffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT; @@ -1102,7 +1102,7 @@ static HRESULT test_primary_3d(LPGUID lpGuid) bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DS_OK && primary!=NULL,"IDirectSound_CreateSoundBuffer() failed " - "to create a primary buffer: %08x\n",rc); + "to create a primary buffer: %08lx\n",rc); if (rc==DS_OK && primary!=NULL) { ref=IDirectSoundBuffer_Release(primary); ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references, " @@ -1113,7 +1113,7 @@ static HRESULT test_primary_3d(LPGUID lpGuid) bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER|DSBCAPS_CTRL3D; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DS_OK && primary!=NULL,"IDirectSound_CreateSoundBuffer() " - "failed to create a 3D primary buffer: %08x\n",rc); + "failed to create a 3D primary buffer: %08lx\n",rc); if (rc==DS_OK && primary!=NULL) { test_buffer(dso,&primary,1,FALSE,0,FALSE,0,winetest_interactive && !(dscaps.dwFlags & DSCAPS_EMULDRIVER),1.0,0,0,0,0, @@ -1126,7 +1126,7 @@ static HRESULT test_primary_3d(LPGUID lpGuid) /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_NORMAL) failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_NORMAL) failed: %08lx\n", rc); EXIT: ref=IDirectSound_Release(dso); @@ -1148,7 +1148,7 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) /* Create the DirectSound object */ rc = DirectSoundCreate(lpGuid, &dso, NULL); - ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate() failed: %08x\n", rc); + ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate() failed: %08lx\n", rc); if (rc!=DS_OK) return rc; @@ -1156,14 +1156,14 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) ZeroMemory(&dscaps, sizeof(dscaps)); dscaps.dwSize=sizeof(dscaps); rc=IDirectSound_GetCaps(dso,&dscaps); - ok(rc==DS_OK,"IDirectSound_GetCaps() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound_GetCaps() failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT; /* We must call SetCooperativeLevel before calling CreateSoundBuffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT; primary=NULL; @@ -1172,7 +1172,7 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER|DSBCAPS_CTRL3D; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DS_OK && primary!=NULL,"IDirectSound_CreateSoundBuffer() failed " - "to create a 3D primary buffer: %08x\n",rc); + "to create a 3D primary buffer: %08lx\n",rc); if (rc==DS_OK && primary!=NULL) { LPDIRECTSOUND3DLISTENER listener=NULL; LPDIRECTSOUNDBUFFER temp_buffer=NULL; @@ -1181,13 +1181,13 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) rc=IDirectSoundBuffer_QueryInterface(primary, &IID_IDirectSound3DListener,(void **)&listener); ok(rc==DS_OK && listener!=NULL,"IDirectSoundBuffer_QueryInterface() " - "failed to get a 3D listener: %08x\n",rc); + "failed to get a 3D listener: %08lx\n",rc); if (rc==DS_OK && listener!=NULL) { /* Checking the COM interface */ rc=IDirectSoundBuffer_QueryInterface(primary, &IID_IDirectSoundBuffer,(LPVOID *)&temp_buffer); ok(rc==DS_OK && temp_buffer!=NULL, - "IDirectSoundBuffer_QueryInterface() failed: %08x\n", rc); + "IDirectSoundBuffer_QueryInterface() failed: %08lx\n", rc); ok(temp_buffer==primary, "COM interface broken: %p != %p\n", temp_buffer,primary); @@ -1200,7 +1200,7 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) rc=IDirectSound3DListener_QueryInterface(listener, &IID_IDirectSoundBuffer,(LPVOID *)&temp_buffer); ok(rc==DS_OK && temp_buffer!=NULL, - "IDirectSoundBuffer_QueryInterface() failed: %08x\n", rc); + "IDirectSoundBuffer_QueryInterface() failed: %08lx\n", rc); ok(temp_buffer==primary, "COM interface broken: %p != %p\n", temp_buffer,primary); @@ -1218,7 +1218,7 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) rc = IDirectSound3DListener_QueryInterface(listener, &IID_IKsPropertySet, (void **)&propset); ok(rc == DS_OK && propset != NULL, - "IDirectSound3DListener_QueryInterface didn't handle IKsPropertySet: ret = %08x\n", rc); + "IDirectSound3DListener_QueryInterface didn't handle IKsPropertySet: ret = %08lx\n", rc); IKsPropertySet_Release(propset); } @@ -1231,7 +1231,7 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) propset = NULL; rc = IDirectSoundBuffer_QueryInterface(primary, &IID_IKsPropertySet, (void **)&propset); ok(rc == DS_OK && propset != NULL, - "IDirectSoundBuffer_QueryInterface didn't handle IKsPropertySet on primary buffer: ret = %08x\n", rc); + "IDirectSoundBuffer_QueryInterface didn't handle IKsPropertySet on primary buffer: ret = %08lx\n", rc); IKsPropertySet_Release(propset); /* Testing the reference counting */ @@ -1302,7 +1302,7 @@ static void ds3d_tests(void) { HRESULT rc; rc = DirectSoundEnumerateA(dsenum_callback, NULL); - ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08x\n",rc); + ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08lx\n",rc); trace("tested %u DirectSound drivers\n", driver_count); } diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index 465ba040a33..9c4a132b545 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -57,7 +57,7 @@ static int buffer_refill8(play_state_t* state, DWORD size) rc=IDirectSoundBuffer_Lock(state->dsbo,state->offset,size, &ptr1,&len1,&ptr2,&len2,0); - ok(rc==DS_OK,"IDirectSoundBuffer_Lock() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_Lock() failed: %08lx\n", rc); if (rc!=DS_OK) return -1; @@ -69,7 +69,7 @@ static int buffer_refill8(play_state_t* state, DWORD size) } state->offset=state->written % state->buffer_size; rc=IDirectSoundBuffer_Unlock(state->dsbo,ptr1,len1,ptr2,len2); - ok(rc==DS_OK,"IDirectSoundBuffer_Unlock() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_Unlock() failed: %08lx\n", rc); if (rc!=DS_OK) return -1; return size; @@ -84,7 +84,7 @@ static int buffer_silence8(play_state_t* state, DWORD size) rc=IDirectSoundBuffer_Lock(state->dsbo,state->offset,size, &ptr1,&len1,&ptr2,&len2,0); - ok(rc==DS_OK,"IDirectSoundBuffer_Lock() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_Lock() failed: %08lx\n", rc); if (rc!=DS_OK) return -1; @@ -95,7 +95,7 @@ static int buffer_silence8(play_state_t* state, DWORD size) } state->offset=(state->offset+size) % state->buffer_size; rc=IDirectSoundBuffer_Unlock(state->dsbo,ptr1,len1,ptr2,len2); - ok(rc==DS_OK,"IDirectSoundBuffer_Unlock() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_Unlock() failed: %08lx\n", rc); if (rc!=DS_OK) return -1; return size; @@ -107,7 +107,7 @@ static BOOL buffer_service8(play_state_t* state) HRESULT rc; rc=IDirectSoundBuffer_GetCurrentPosition(state->dsbo,&play_pos,NULL); - ok(rc==DS_OK,"IDirectSoundBuffer_GetCurrentPosition() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetCurrentPosition() failed: %08lx\n", rc); if (rc!=DS_OK) { goto STOP; } @@ -120,7 +120,7 @@ static BOOL buffer_service8(play_state_t* state) state->played+=play_pos-last_play_pos; if (winetest_debug > 1) - trace("buf size=%d last_play_pos=%d play_pos=%d played=%d / %d\n", + trace("buf size=%ld last_play_pos=%ld play_pos=%ld played=%ld / %ld\n", state->buffer_size,last_play_pos,play_pos,state->played, state->wave_len); @@ -137,7 +137,7 @@ static BOOL buffer_service8(play_state_t* state) buf_free=state->buffer_size-state->offset+play_pos; if (winetest_debug > 1) - trace("offset=%d free=%d written=%d / %d\n", + trace("offset=%ld free=%ld written=%ld / %ld\n", state->offset,buf_free,state->written,state->wave_len); if (buf_free==0) return TRUE; @@ -149,14 +149,14 @@ static BOOL buffer_service8(play_state_t* state) goto STOP; buf_free-=w; if (state->written==state->wave_len && winetest_debug > 1) - trace("last sound byte at %d\n", + trace("last sound byte at %ld\n", (state->written % state->buffer_size)); } if (buf_free>0) { /* Fill with silence */ if (winetest_debug > 1) - trace("writing %d bytes of silence\n",buf_free); + trace("writing %ld bytes of silence\n",buf_free); if (buffer_silence8(state,buf_free)==-1) goto STOP; } @@ -166,7 +166,7 @@ STOP: if (winetest_debug > 1) trace("stopping playback\n"); rc=IDirectSoundBuffer_Stop(state->dsbo); - ok(rc==DS_OK,"IDirectSoundBuffer_Stop() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_Stop() failed: %08lx\n", rc); return FALSE; } @@ -186,20 +186,20 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, /* DSOUND: Error: Invalid caps pointer */ rc=IDirectSoundBuffer_GetCaps(*dsbo,0); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundBuffer_GetCaps() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n",rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n",rc); ZeroMemory(&dsbcaps, sizeof(dsbcaps)); /* DSOUND: Error: Invalid caps pointer */ rc=IDirectSoundBuffer_GetCaps(*dsbo,&dsbcaps); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundBuffer_GetCaps() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n",rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n",rc); dsbcaps.dwSize=sizeof(dsbcaps); rc=IDirectSoundBuffer_GetCaps(*dsbo,&dsbcaps); - ok(rc==DS_OK,"IDirectSoundBuffer_GetCaps() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetCaps() failed: %08lx\n", rc); if (rc==DS_OK && winetest_debug > 1) { - trace(" Caps: flags=0x%08x size=%d\n",dsbcaps.dwFlags, + trace(" Caps: flags=0x%08lx size=%ld\n",dsbcaps.dwFlags, dsbcaps.dwBufferBytes); } @@ -207,10 +207,10 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, size=0; rc=IDirectSoundBuffer_GetFormat(*dsbo,NULL,0,&size); ok(rc==DS_OK && size!=0,"IDirectSoundBuffer_GetFormat() should have " - "returned the needed size: rc=%08x size=%d\n",rc,size); + "returned the needed size: rc=%08lx size=%ld\n",rc,size); ok(size == sizeof(WAVEFORMATEX) || size == sizeof(WAVEFORMATEXTENSIBLE), - "Expected a correct structure size, got %d\n", size); + "Expected a correct structure size, got %ld\n", size); if (size == sizeof(WAVEFORMATEX)) { rc=IDirectSoundBuffer_GetFormat(*dsbo,&wfx,size,NULL); @@ -223,9 +223,9 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, } else return; - ok(rc==DS_OK,"IDirectSoundBuffer_GetFormat() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetFormat() failed: %08lx\n", rc); if (rc==DS_OK && winetest_debug > 1) { - trace(" Format: %s tag=0x%04x %dx%dx%d avg.B/s=%d align=%d\n", + trace(" Format: %s tag=0x%04x %ldx%dx%d avg.B/s=%ld align=%d\n", is_primary ? "Primary" : "Secondary", wfx.wFormatTag,wfx.nSamplesPerSec,wfx.wBitsPerSample, wfx.nChannels,wfx.nAvgBytesPerSec,wfx.nBlockAlign); @@ -234,26 +234,26 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, /* DSOUND: Error: Invalid frequency buffer */ rc=IDirectSoundBuffer_GetFrequency(*dsbo,0); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundBuffer_GetFrequency() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n",rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n",rc); /* DSOUND: Error: Primary buffers don't support CTRLFREQUENCY */ rc=IDirectSoundBuffer_GetFrequency(*dsbo,&freq); ok((rc==DS_OK && !is_primary) || (rc==DSERR_CONTROLUNAVAIL&&is_primary) || (rc==DSERR_CONTROLUNAVAIL&&!(dsbcaps.dwFlags&DSBCAPS_CTRLFREQUENCY)), - "IDirectSoundBuffer_GetFrequency() failed: %08x\n",rc); + "IDirectSoundBuffer_GetFrequency() failed: %08lx\n",rc); if (rc==DS_OK) { ok(freq==wfx.nSamplesPerSec,"The frequency returned by GetFrequency " - "%d does not match the format %d\n",freq,wfx.nSamplesPerSec); + "%ld does not match the format %ld\n",freq,wfx.nSamplesPerSec); } /* DSOUND: Error: Invalid status pointer */ rc=IDirectSoundBuffer_GetStatus(*dsbo,0); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundBuffer_GetStatus() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n",rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n",rc); rc=IDirectSoundBuffer_GetStatus(*dsbo,&status); - ok(rc==DS_OK,"IDirectSoundBuffer_GetStatus() failed: %08x\n", rc); - ok(status==0,"status=0x%x instead of 0\n",status); + ok(rc==DS_OK,"IDirectSoundBuffer_GetStatus() failed: %08lx\n", rc); + ok(status==0,"status=0x%lx instead of 0\n",status); if (is_primary) { DSBCAPS new_dsbcaps; @@ -261,18 +261,18 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel(DSSCL_PRIORITY) " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); if (rc!=DS_OK) return; /* DSOUND: Error: Invalid format pointer */ rc=IDirectSoundBuffer_SetFormat(*dsbo,0); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundBuffer_SetFormat() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n",rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n",rc); init_format(&wfx2,WAVE_FORMAT_PCM,11025,16,2); rc=IDirectSoundBuffer_SetFormat(*dsbo,&wfx2); - ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %08x\n", + ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %08lx\n", format_string(&wfx2), rc); /* There is no guarantee that SetFormat will actually change the @@ -280,16 +280,16 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, * supports. So we must re-query the format. */ rc=IDirectSoundBuffer_GetFormat(*dsbo,&wfx,sizeof(wfx),NULL); - ok(rc==DS_OK,"IDirectSoundBuffer_GetFormat() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetFormat() failed: %08lx\n", rc); if (rc==DS_OK && (wfx.wFormatTag!=wfx2.wFormatTag || wfx.nSamplesPerSec!=wfx2.nSamplesPerSec || wfx.wBitsPerSample!=wfx2.wBitsPerSample || wfx.nChannels!=wfx2.nChannels)) { - trace("Requested format tag=0x%04x %dx%dx%d avg.B/s=%d align=%d\n", + trace("Requested format tag=0x%04x %ldx%dx%d avg.B/s=%ld align=%d\n", wfx2.wFormatTag,wfx2.nSamplesPerSec,wfx2.wBitsPerSample, wfx2.nChannels,wfx2.nAvgBytesPerSec,wfx2.nBlockAlign); - trace("Got tag=0x%04x %dx%dx%d avg.B/s=%d align=%d\n", + trace("Got tag=0x%04x %ldx%dx%d avg.B/s=%ld align=%d\n", wfx.wFormatTag,wfx.nSamplesPerSec,wfx.wBitsPerSample, wfx.nChannels,wfx.nAvgBytesPerSec,wfx.nBlockAlign); } @@ -297,30 +297,30 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, ZeroMemory(&new_dsbcaps, sizeof(new_dsbcaps)); new_dsbcaps.dwSize = sizeof(new_dsbcaps); rc=IDirectSoundBuffer_GetCaps(*dsbo,&new_dsbcaps); - ok(rc==DS_OK,"IDirectSoundBuffer_GetCaps() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetCaps() failed: %08lx\n", rc); if (rc==DS_OK && winetest_debug > 1) { - trace(" new Caps: flags=0x%08x size=%d\n",new_dsbcaps.dwFlags, + trace(" new Caps: flags=0x%08lx size=%ld\n",new_dsbcaps.dwFlags, new_dsbcaps.dwBufferBytes); } /* Check for primary buffer size change */ ok(new_dsbcaps.dwBufferBytes == dsbcaps.dwBufferBytes, " buffer size changed after SetFormat() - " - "previous size was %u, current size is %u\n", + "previous size was %lu, current size is %lu\n", dsbcaps.dwBufferBytes, new_dsbcaps.dwBufferBytes); dsbcaps.dwBufferBytes = new_dsbcaps.dwBufferBytes; /* Check for primary buffer flags change */ ok(new_dsbcaps.dwFlags == dsbcaps.dwFlags, " flags changed after SetFormat() - " - "previous flags were %08x, current flags are %08x\n", + "previous flags were %08lx, current flags are %08lx\n", dsbcaps.dwFlags, new_dsbcaps.dwFlags); /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel(DSSCL_NORMAL) " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); } if (play) { @@ -333,7 +333,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, DWORD length1; if (winetest_interactive) { - trace(" Playing %g second 440Hz tone at %dx%dx%d\n", duration, + trace(" Playing %g second 440Hz tone at %ldx%dx%d\n", duration, wfx.nSamplesPerSec, wfx.wBitsPerSample,wfx.nChannels); } @@ -344,7 +344,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(), DSSCL_WRITEPRIMARY); ok(rc==DS_OK, - "IDirectSound8_SetCooperativeLevel(DSSCL_WRITEPRIMARY) failed: %08x\n",rc); + "IDirectSound8_SetCooperativeLevel(DSSCL_WRITEPRIMARY) failed: %08lx\n",rc); if (rc!=DS_OK) return; } @@ -353,7 +353,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, rc=IDirectSoundBuffer_QueryInterface(*dsbo,&IID_IDirectSound3DBuffer, (LPVOID *)&buffer); - ok(rc==DS_OK,"IDirectSoundBuffer_QueryInterface() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_QueryInterface() failed: %08lx\n", rc); if (rc!=DS_OK) return; @@ -361,7 +361,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, rc=IDirectSoundBuffer_QueryInterface(*dsbo, &IID_IDirectSoundBuffer, (LPVOID *)&temp_buffer); ok(rc==DS_OK && temp_buffer!=NULL, - "IDirectSoundBuffer_QueryInterface() failed: %08x\n", rc); + "IDirectSoundBuffer_QueryInterface() failed: %08lx\n", rc); ok(temp_buffer==*dsbo,"COM interface broken: %p != %p\n", temp_buffer,*dsbo); ref=IDirectSoundBuffer_Release(temp_buffer); @@ -376,37 +376,37 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, &IID_IDirectSoundBuffer, (LPVOID *)dsbo); ok(rc==DS_OK && *dsbo!=NULL,"IDirectSound3DBuffer_QueryInterface() " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); /* DSOUND: Error: Invalid buffer */ rc=IDirectSound3DBuffer_GetAllParameters(buffer,0); ok(rc==DSERR_INVALIDPARAM,"IDirectSound3DBuffer_GetAllParameters() " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); ZeroMemory(&buffer_param, sizeof(buffer_param)); /* DSOUND: Error: Invalid buffer */ rc=IDirectSound3DBuffer_GetAllParameters(buffer,&buffer_param); ok(rc==DSERR_INVALIDPARAM,"IDirectSound3DBuffer_GetAllParameters() " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); buffer_param.dwSize=sizeof(buffer_param); rc=IDirectSound3DBuffer_GetAllParameters(buffer,&buffer_param); - ok(rc==DS_OK,"IDirectSound3DBuffer_GetAllParameters() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound3DBuffer_GetAllParameters() failed: %08lx\n", rc); } if (set_volume) { if (dsbcaps.dwFlags & DSBCAPS_CTRLVOLUME) { LONG val; rc=IDirectSoundBuffer_GetVolume(*dsbo,&val); - ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume() failed: %08lx\n", rc); rc=IDirectSoundBuffer_SetVolume(*dsbo,volume); - ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume() failed: %08lx\n", rc); } else { /* DSOUND: Error: Buffer does not have CTRLVOLUME */ rc=IDirectSoundBuffer_GetVolume(*dsbo,&volume); ok(rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer_GetVolume() " - "should have returned DSERR_CONTROLUNAVAIL, returned: %08x\n", rc); + "should have returned DSERR_CONTROLUNAVAIL, returned: %08lx\n", rc); } } @@ -414,15 +414,15 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, if (dsbcaps.dwFlags & DSBCAPS_CTRLPAN) { LONG val; rc=IDirectSoundBuffer_GetPan(*dsbo,&val); - ok(rc==DS_OK,"IDirectSoundBuffer_GetPan() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetPan() failed: %08lx\n", rc); rc=IDirectSoundBuffer_SetPan(*dsbo,pan); - ok(rc==DS_OK,"IDirectSoundBuffer_SetPan() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_SetPan() failed: %08lx\n", rc); } else { /* DSOUND: Error: Buffer does not have CTRLPAN */ rc=IDirectSoundBuffer_GetPan(*dsbo,&pan); ok(rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer_GetPan() " - "should have returned DSERR_CONTROLUNAVAIL, returned: %08x\n", rc); + "should have returned DSERR_CONTROLUNAVAIL, returned: %08lx\n", rc); } } @@ -431,14 +431,14 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, &length1, NULL, NULL, DSBLOCK_ENTIREBUFFER); ok(rc==DSERR_INVALIDPARAM, "IDirectSoundBuffer_Lock() should have " - "returned DSERR_INVALIDPARAM, returned %08x\n", rc); + "returned DSERR_INVALIDPARAM, returned %08lx\n", rc); /* try a size larger than the buffer */ rc = IDirectSoundBuffer_Lock(*dsbo, 0, dsbcaps.dwBufferBytes + 1, &buffer1, &length1, NULL, NULL, DSBLOCK_FROMWRITECURSOR); ok(rc==DSERR_INVALIDPARAM, "IDirectSoundBuffer_Lock() should have " - "returned DSERR_INVALIDPARAM, returned %08x\n", rc); + "returned DSERR_INVALIDPARAM, returned %08lx\n", rc); state.wave=wave_generate_la(&wfx,duration,&state.wave_len,ieee); @@ -449,19 +449,19 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, buffer_refill8(&state,state.buffer_size); rc=IDirectSoundBuffer_Play(*dsbo,0,0,DSBPLAY_LOOPING); - ok(rc==DS_OK,"IDirectSoundBuffer_Play() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_Play() failed: %08lx\n", rc); rc=IDirectSoundBuffer_GetStatus(*dsbo,&status); - ok(rc==DS_OK,"IDirectSoundBuffer_GetStatus() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetStatus() failed: %08lx\n", rc); ok(status==(DSBSTATUS_PLAYING|DSBSTATUS_LOOPING), - "GetStatus: bad status: %x\n",status); + "GetStatus: bad status: %lx\n",status); if (listener) { ZeroMemory(&listener_param,sizeof(listener_param)); listener_param.dwSize=sizeof(listener_param); rc=IDirectSound3DListener_GetAllParameters(listener,&listener_param); ok(rc==DS_OK,"IDirectSound3dListener_GetAllParameters() " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); if (move_listener) { listener_param.vPosition.x = -5.0f; listener_param.vVelocity.x = (float)(10.0/duration); @@ -469,7 +469,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, rc=IDirectSound3DListener_SetAllParameters(listener, &listener_param, DS3D_IMMEDIATE); - ok(rc==DS_OK,"IDirectSound3dListener_SetPosition() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound3dListener_SetPosition() failed: %08lx\n", rc); } if (buffer3d) { if (move_sound) { @@ -479,7 +479,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, buffer_param.flMinDistance = 10; rc=IDirectSound3DBuffer_SetAllParameters(buffer,&buffer_param, DS3D_IMMEDIATE); - ok(rc==DS_OK,"IDirectSound3dBuffer_SetPosition() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound3dBuffer_SetPosition() failed: %08lx\n", rc); } start_time=GetTickCount(); @@ -493,7 +493,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, rc=IDirectSound3DListener_SetPosition(listener, listener_param.vPosition.x,listener_param.vPosition.y, listener_param.vPosition.z,DS3D_IMMEDIATE); - ok(rc==DS_OK,"IDirectSound3dListener_SetPosition() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound3dListener_SetPosition() failed: %08lx\n",rc); } if (buffer3d && move_sound) { buffer_param.vPosition.x = (float)(100-200.0*(now-start_time)/1000/duration); @@ -502,13 +502,13 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, rc=IDirectSound3DBuffer_SetPosition(buffer, buffer_param.vPosition.x,buffer_param.vPosition.y, buffer_param.vPosition.z,DS3D_IMMEDIATE); - ok(rc==DS_OK,"IDirectSound3dBuffer_SetPosition() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound3dBuffer_SetPosition() failed: %08lx\n", rc); } } /* Check the sound duration was within 10% of the expected value */ now=GetTickCount(); ok(fabs(1000*duration-now+start_time)<=100*duration, - "The sound played for %d ms instead of %g ms\n", + "The sound played for %ld ms instead of %g ms\n", now-start_time,1000*duration); HeapFree(GetProcessHeap(), 0, state.wave); @@ -517,7 +517,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel(DSSCL_NORMAL) " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); } if (buffer3d) { ref=IDirectSound3DBuffer_Release(buffer); @@ -542,14 +542,14 @@ static HRESULT test_secondary8(LPGUID lpGuid, BOOL play, /* Create the DirectSound object */ rc = DirectSoundCreate8(lpGuid, &dso, NULL); - ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate8() failed: %08x\n", rc); + ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate8() failed: %08lx\n", rc); if (rc!=DS_OK) return rc; /* We must call SetCooperativeLevel before creating primary buffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT; @@ -562,12 +562,12 @@ static HRESULT test_secondary8(LPGUID lpGuid, BOOL play, bufdesc.dwFlags|=(DSBCAPS_CTRLVOLUME|DSBCAPS_CTRLPAN); rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok((rc==DS_OK && primary!=NULL) || (rc == DSERR_CONTROLUNAVAIL), - "IDirectSound8_CreateSoundBuffer() failed to create a %sprimary buffer: %08x\n",has_3d?"3D ":"", rc); + "IDirectSound8_CreateSoundBuffer() failed to create a %sprimary buffer: %08lx\n",has_3d?"3D ":"", rc); if (rc == DSERR_CONTROLUNAVAIL) trace(" No Primary\n"); else if (rc==DS_OK && primary!=NULL) { rc=IDirectSoundBuffer_GetFormat(primary,&wfx1,sizeof(wfx1),NULL); - ok(rc==DS_OK,"IDirectSoundBuffer8_Getformat() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer8_Getformat() failed: %08lx\n", rc); if (rc!=DS_OK) goto EXIT1; @@ -577,7 +577,7 @@ static HRESULT test_secondary8(LPGUID lpGuid, BOOL play, (void **)&listener); ok(rc==DS_OK && listener!=NULL, "IDirectSoundBuffer_QueryInterface() failed to get a 3D " - "listener %08x\n",rc); + "listener %08lx\n",rc); ref=IDirectSoundBuffer_Release(primary); ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references, " "should have 0\n",ref); @@ -588,20 +588,20 @@ static HRESULT test_secondary8(LPGUID lpGuid, BOOL play, rc=IDirectSound3DListener_GetAllParameters(listener,0); ok(rc==DSERR_INVALIDPARAM, "IDirectSound3dListener_GetAllParameters() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n", rc); /* DSOUND: Error: Invalid buffer */ rc=IDirectSound3DListener_GetAllParameters(listener, &listener_param); ok(rc==DSERR_INVALIDPARAM, "IDirectSound3dListener_GetAllParameters() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n", rc); listener_param.dwSize=sizeof(listener_param); rc=IDirectSound3DListener_GetAllParameters(listener, &listener_param); ok(rc==DS_OK,"IDirectSound3dListener_GetAllParameters() " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); } else { ok(listener==NULL, "IDirectSoundBuffer_QueryInterface() " "failed but returned a listener anyway\n"); @@ -634,7 +634,7 @@ static HRESULT test_secondary8(LPGUID lpGuid, BOOL play, rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DSERR_INVALIDPARAM, "IDirectSound8_CreateSoundBuffer(secondary) should have " - "returned DSERR_INVALIDPARAM, returned %08x\n", rc); + "returned DSERR_INVALIDPARAM, returned %08lx\n", rc); init_format(&wfx,WAVE_FORMAT_PCM,22050,16,1); /* Invalid flag combination */ @@ -642,13 +642,13 @@ static HRESULT test_secondary8(LPGUID lpGuid, BOOL play, rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DSERR_INVALIDPARAM, "IDirectSound8_CreateSoundBuffer(secondary) should have " - "returned DSERR_INVALIDPARAM, returned %08x\n", rc); + "returned DSERR_INVALIDPARAM, returned %08lx\n", rc); bufdesc.dwFlags&=~DSBCAPS_CTRLPAN; } if (winetest_interactive) { - trace(" Testing a %s%ssecondary buffer %s%s%s%sat %dx%dx%d " - "with a primary buffer at %dx%dx%d\n", + trace(" Testing a %s%ssecondary buffer %s%s%s%sat %ldx%dx%d " + "with a primary buffer at %ldx%dx%d\n", has_3dbuffer?"3D ":"", has_duplicate?"duplicated ":"", listener!=NULL||move_sound?"with ":"", @@ -661,7 +661,7 @@ static HRESULT test_secondary8(LPGUID lpGuid, BOOL play, } rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DS_OK && secondary!=NULL,"IDirectSound8_CreateSoundBuffer() " - "failed to create a %s%ssecondary buffer %s%s%s%sat %dx%dx%d (%s): %08x\n", + "failed to create a %s%ssecondary buffer %s%s%s%sat %ldx%dx%d (%s): %08lx\n", has_3dbuffer?"3D ":"", has_duplicate?"duplicated ":"", listener!=NULL||move_sound?"with ":"", move_listener?"moving ":"", listener!=NULL?"listener ":"", @@ -675,55 +675,55 @@ static HRESULT test_secondary8(LPGUID lpGuid, BOOL play, /* Check the initial secondary buffer's volume and pan */ rc=IDirectSoundBuffer_GetVolume(secondary,&vol); - ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume(secondary) failed: %08x\n",rc); - ok(vol==0,"wrong volume for a new secondary buffer: %d\n",vol); + ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume(secondary) failed: %08lx\n",rc); + ok(vol==0,"wrong volume for a new secondary buffer: %ld\n",vol); rc=IDirectSoundBuffer_GetPan(secondary,&pan); - ok(rc==DS_OK,"IDirectSoundBuffer_GetPan(secondary) failed: %08x\n",rc); - ok(pan==0,"wrong pan for a new secondary buffer: %d\n",pan); + ok(rc==DS_OK,"IDirectSoundBuffer_GetPan(secondary) failed: %08lx\n",rc); + ok(pan==0,"wrong pan for a new secondary buffer: %ld\n",pan); /* Check that changing the secondary buffer's volume and pan * does not impact the primary buffer's volume and pan */ rc=IDirectSoundBuffer_GetVolume(primary,&refvol); - ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume(primary) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume(primary) failed: %08lx\n",rc); rc=IDirectSoundBuffer_GetPan(primary,&refpan); - ok(rc==DS_OK,"IDirectSoundBuffer_GetPan(primary) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetPan(primary) failed: %08lx\n",rc); rc=IDirectSoundBuffer_SetVolume(secondary,-1000); - ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume(secondary) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume(secondary) failed: %08lx\n",rc); rc=IDirectSoundBuffer_GetVolume(secondary,&vol); - ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume(secondary) failed: %08x\n",rc); - ok(vol==-1000,"secondary: wrong volume %d instead of -1000\n", + ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume(secondary) failed: %08lx\n",rc); + ok(vol==-1000,"secondary: wrong volume %ld instead of -1000\n", vol); rc=IDirectSoundBuffer_SetPan(secondary,-1000); - ok(rc==DS_OK,"IDirectSoundBuffer_SetPan(secondary) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSoundBuffer_SetPan(secondary) failed: %08lx\n",rc); rc=IDirectSoundBuffer_GetPan(secondary,&pan); - ok(rc==DS_OK,"IDirectSoundBuffer_GetPan(secondary) failed: %08x\n",rc); - ok(pan==-1000,"secondary: wrong pan %d instead of -1000\n", + ok(rc==DS_OK,"IDirectSoundBuffer_GetPan(secondary) failed: %08lx\n",rc); + ok(pan==-1000,"secondary: wrong pan %ld instead of -1000\n", pan); rc=IDirectSoundBuffer_GetVolume(primary,&vol); - ok(rc==DS_OK,"IDirectSoundBuffer_`GetVolume(primary) failed: i%08x\n",rc); - ok(vol==refvol,"The primary volume changed from %d to %d\n", + ok(rc==DS_OK,"IDirectSoundBuffer_`GetVolume(primary) failed: i%08lx\n",rc); + ok(vol==refvol,"The primary volume changed from %ld to %ld\n", refvol,vol); rc=IDirectSoundBuffer_GetPan(primary,&pan); - ok(rc==DS_OK,"IDirectSoundBuffer_GetPan(primary) failed: %08x\n",rc); - ok(pan==refpan,"The primary pan changed from %d to %d\n", + ok(rc==DS_OK,"IDirectSoundBuffer_GetPan(primary) failed: %08lx\n",rc); + ok(pan==refpan,"The primary pan changed from %ld to %ld\n", refpan,pan); rc=IDirectSoundBuffer_SetVolume(secondary,0); - ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume(secondary) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume(secondary) failed: %08lx\n",rc); rc=IDirectSoundBuffer_SetPan(secondary,0); - ok(rc==DS_OK,"IDirectSoundBuffer_SetPan(secondary) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSoundBuffer_SetPan(secondary) failed: %08lx\n",rc); } else { LONG pan; rc=IDirectSoundBuffer_GetPan(secondary,&pan); ok(rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer_GetPan() " - "should have returned DSERR_CONTROLUNAVAIL, returned: %08x\n", rc); + "should have returned DSERR_CONTROLUNAVAIL, returned: %08lx\n", rc); rc=IDirectSoundBuffer_SetPan(secondary,0); ok(rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer_SetPan() " - "should have returned DSERR_CONTROLUNAVAIL, returned: %08x\n", rc); + "should have returned DSERR_CONTROLUNAVAIL, returned: %08lx\n", rc); } if (has_duplicate) { @@ -733,26 +733,26 @@ static HRESULT test_secondary8(LPGUID lpGuid, BOOL play, rc=IDirectSound8_DuplicateSoundBuffer(dso,0,0); ok(rc==DSERR_INVALIDPARAM, "IDirectSound8_DuplicateSoundBuffer() should have returned " - "DSERR_INVALIDPARAM, returned: %08x\n",rc); + "DSERR_INVALIDPARAM, returned: %08lx\n",rc); /* DSOUND: Error: Invalid dest buffer */ rc=IDirectSound8_DuplicateSoundBuffer(dso,secondary,0); ok(rc==DSERR_INVALIDPARAM, "IDirectSound8_DuplicateSoundBuffer() should have returned " - "DSERR_INVALIDPARAM, returned: %08x\n",rc); + "DSERR_INVALIDPARAM, returned: %08lx\n",rc); /* DSOUND: Error: Invalid source buffer */ rc=IDirectSound8_DuplicateSoundBuffer(dso,0,&duplicated); ok(rc==DSERR_INVALIDPARAM, "IDirectSound8_DuplicateSoundBuffer() should have returned " - "DSERR_INVALIDPARAM, returned: %08x\n",rc); + "DSERR_INVALIDPARAM, returned: %08lx\n",rc); duplicated=NULL; rc=IDirectSound8_DuplicateSoundBuffer(dso,secondary, &duplicated); ok(rc==DS_OK && duplicated!=NULL, "IDirectSound8_DuplicateSoundBuffer() failed to duplicate " - "a secondary buffer: %08x\n",rc); + "a secondary buffer: %08lx\n",rc); if (rc==DS_OK && duplicated!=NULL) { ref=IDirectSoundBuffer_Release(secondary); @@ -801,7 +801,7 @@ EXIT2: /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); - ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel(DSSCL_NORMAL) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel(DSSCL_NORMAL) failed: %08lx\n",rc); EXIT: ref=IDirectSound8_Release(dso); @@ -821,7 +821,7 @@ static HRESULT test_for_driver8(LPGUID lpGuid) /* Create the DirectSound object */ rc = DirectSoundCreate8(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, - "DirectSoundCreate8() failed: %08x\n",rc); + "DirectSoundCreate8() failed: %08lx\n",rc); if (rc!=DS_OK) return rc; @@ -844,7 +844,7 @@ static HRESULT test_primary8(LPGUID lpGuid) /* Create the DirectSound object */ rc = DirectSoundCreate8(lpGuid, &dso, NULL); - ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate8() failed: %08x\n", rc); + ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate8() failed: %08lx\n", rc); if (rc!=DS_OK) return rc; @@ -852,14 +852,14 @@ static HRESULT test_primary8(LPGUID lpGuid) ZeroMemory(&dscaps, sizeof(dscaps)); dscaps.dwSize=sizeof(dscaps); rc=IDirectSound8_GetCaps(dso,&dscaps); - ok(rc==DS_OK,"IDirectSound8_GetCaps() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound8_GetCaps() failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT; /* We must call SetCooperativeLevel before calling CreateSoundBuffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT; @@ -870,7 +870,7 @@ static HRESULT test_primary8(LPGUID lpGuid) bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER|DSBCAPS_CTRLVOLUME|DSBCAPS_CTRLPAN; rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok((rc==DS_OK && primary!=NULL) || (rc == DSERR_CONTROLUNAVAIL), - "IDirectSound8_CreateSoundBuffer() failed to create a primary buffer: %08x\n",rc); + "IDirectSound8_CreateSoundBuffer() failed to create a primary buffer: %08lx\n",rc); if (rc == DSERR_CONTROLUNAVAIL) trace(" No Primary\n"); else if (rc==DS_OK && primary!=NULL) { @@ -904,7 +904,7 @@ static HRESULT test_primary8(LPGUID lpGuid) /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); - ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel(DSSCL_NORMAL) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel(DSSCL_NORMAL) failed: %08lx\n",rc); EXIT: ref=IDirectSound8_Release(dso); @@ -926,7 +926,7 @@ static HRESULT test_primary_3d8(LPGUID lpGuid) /* Create the DirectSound object */ rc = DirectSoundCreate8(lpGuid, &dso, NULL); - ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate8() failed: %08x\n", rc); + ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate8() failed: %08lx\n", rc); if (rc!=DS_OK) return rc; @@ -934,14 +934,14 @@ static HRESULT test_primary_3d8(LPGUID lpGuid) ZeroMemory(&dscaps, sizeof(dscaps)); dscaps.dwSize=sizeof(dscaps); rc=IDirectSound8_GetCaps(dso,&dscaps); - ok(rc==DS_OK,"IDirectSound8_GetCaps failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound8_GetCaps failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT; /* We must call SetCooperativeLevel before calling CreateSoundBuffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT; @@ -951,7 +951,7 @@ static HRESULT test_primary_3d8(LPGUID lpGuid) bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER; rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DS_OK && primary!=NULL,"IDirectSound8_CreateSoundBuffer() failed " - "to create a primary buffer: %08x\n",rc); + "to create a primary buffer: %08lx\n",rc); if (rc==DS_OK && primary!=NULL) { ref=IDirectSoundBuffer_Release(primary); ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references, " @@ -962,7 +962,7 @@ static HRESULT test_primary_3d8(LPGUID lpGuid) bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER|DSBCAPS_CTRL3D; rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DS_OK && primary!=NULL,"IDirectSound8_CreateSoundBuffer() " - "failed to create a 3D primary buffer: %08x\n",rc); + "failed to create a 3D primary buffer: %08lx\n",rc); if (rc==DS_OK && primary!=NULL) { test_buffer8(dso,&primary,TRUE,FALSE,0,FALSE,0, winetest_interactive && !(dscaps.dwFlags & DSCAPS_EMULDRIVER), @@ -975,7 +975,7 @@ static HRESULT test_primary_3d8(LPGUID lpGuid) /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); - ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel(DSSCL_NORMAL) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel(DSSCL_NORMAL) failed: %08lx\n",rc); EXIT: ref=IDirectSound8_Release(dso); @@ -997,7 +997,7 @@ static HRESULT test_primary_3d_with_listener8(LPGUID lpGuid) /* Create the DirectSound object */ rc = DirectSoundCreate8(lpGuid, &dso, NULL); - ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate8() failed: %08x\n", rc); + ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate8() failed: %08lx\n", rc); if (rc!=DS_OK) return rc; @@ -1005,14 +1005,14 @@ static HRESULT test_primary_3d_with_listener8(LPGUID lpGuid) ZeroMemory(&dscaps, sizeof(dscaps)); dscaps.dwSize=sizeof(dscaps); rc=IDirectSound8_GetCaps(dso,&dscaps); - ok(rc==DS_OK,"IDirectSound8_GetCaps() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound8_GetCaps() failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT; /* We must call SetCooperativeLevel before calling CreateSoundBuffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT; primary=NULL; @@ -1021,14 +1021,14 @@ static HRESULT test_primary_3d_with_listener8(LPGUID lpGuid) bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER|DSBCAPS_CTRL3D; rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DS_OK && primary!=NULL,"IDirectSound8_CreateSoundBuffer() failed " - "to create a 3D primary buffer %08x\n",rc); + "to create a 3D primary buffer %08lx\n",rc); if (rc==DS_OK && primary!=NULL) { LPDIRECTSOUND3DLISTENER listener=NULL; rc=IDirectSoundBuffer_QueryInterface(primary, &IID_IDirectSound3DListener, (void **)&listener); ok(rc==DS_OK && listener!=NULL,"IDirectSoundBuffer_QueryInterface() " - "failed to get a 3D listener: %08x\n",rc); + "failed to get a 3D listener: %08lx\n",rc); if (rc==DS_OK && listener!=NULL) { LPDIRECTSOUNDBUFFER temp_buffer=NULL; @@ -1037,7 +1037,7 @@ static HRESULT test_primary_3d_with_listener8(LPGUID lpGuid) &IID_IDirectSoundBuffer, (LPVOID *)&temp_buffer); ok(rc==DS_OK && temp_buffer!=NULL, - "IDirectSoundBuffer_QueryInterface() failed: %08x\n", rc); + "IDirectSoundBuffer_QueryInterface() failed: %08lx\n", rc); ok(temp_buffer==primary,"COM interface broken: %p != %p\n",temp_buffer,primary); if (rc==DS_OK && temp_buffer!=NULL) { ref=IDirectSoundBuffer_Release(temp_buffer); @@ -1048,7 +1048,7 @@ static HRESULT test_primary_3d_with_listener8(LPGUID lpGuid) rc=IDirectSound3DListener_QueryInterface(listener, &IID_IDirectSoundBuffer,(LPVOID *)&temp_buffer); ok(rc==DS_OK && temp_buffer!=NULL, - "IDirectSoundBuffer_QueryInterface() failed: %08x\n", rc); + "IDirectSoundBuffer_QueryInterface() failed: %08lx\n", rc); ok(temp_buffer==primary,"COM interface broken: %p != %p\n",temp_buffer,primary); ref=IDirectSoundBuffer_Release(temp_buffer); ok(ref==1,"IDirectSoundBuffer_Release() has %d references, " @@ -1134,7 +1134,7 @@ static void ds3d8_tests(void) { HRESULT rc; rc = DirectSoundEnumerateA(dsenum_callback, NULL); - ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08x\n",rc); + ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08lx\n",rc); trace("tested %u DirectSound drivers\n", driver_count); } diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index a4f59efaad9..d5a3ccad8fd 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -54,18 +54,18 @@ static void IDirectSound_test(LPDIRECTSOUND dso, BOOL initialized, /* Try to Query for objects */ rc=IDirectSound_QueryInterface(dso,&IID_IUnknown,(LPVOID*)&unknown); - ok(rc==DS_OK,"IDirectSound_QueryInterface(IID_IUnknown) failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_QueryInterface(IID_IUnknown) failed: %08lx\n", rc); if (rc==DS_OK) IUnknown_Release(unknown); rc=IDirectSound_QueryInterface(dso,&IID_IDirectSound,(LPVOID*)&ds); - ok(rc==DS_OK,"IDirectSound_QueryInterface(IID_IDirectSound) failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_QueryInterface(IID_IDirectSound) failed: %08lx\n", rc); if (rc==DS_OK) IDirectSound_Release(ds); rc=IDirectSound_QueryInterface(dso,&IID_IDirectSound8,(LPVOID*)&ds8); ok(rc==E_NOINTERFACE,"IDirectSound_QueryInterface(IID_IDirectSound8) " - "should have failed: %08x\n",rc); + "should have failed: %08lx\n",rc); if (rc==DS_OK) IDirectSound8_Release(ds8); @@ -73,23 +73,23 @@ static void IDirectSound_test(LPDIRECTSOUND dso, BOOL initialized, /* try uninitialized object */ rc=IDirectSound_GetCaps(dso,0); ok(rc==DSERR_UNINITIALIZED,"IDirectSound_GetCaps(NULL) " - "should have returned DSERR_UNINITIALIZED, returned: %08x\n", rc); + "should have returned DSERR_UNINITIALIZED, returned: %08lx\n", rc); rc=IDirectSound_GetCaps(dso,&dscaps); ok(rc==DSERR_UNINITIALIZED,"IDirectSound_GetCaps() " - "should have returned DSERR_UNINITIALIZED, returned: %08x\n", rc); + "should have returned DSERR_UNINITIALIZED, returned: %08lx\n", rc); rc=IDirectSound_Compact(dso); ok(rc==DSERR_UNINITIALIZED,"IDirectSound_Compact() " - "should have returned DSERR_UNINITIALIZED, returned: %08x\n", rc); + "should have returned DSERR_UNINITIALIZED, returned: %08lx\n", rc); rc=IDirectSound_GetSpeakerConfig(dso,&speaker_config); ok(rc==DSERR_UNINITIALIZED,"IDirectSound_GetSpeakerConfig() " - "should have returned DSERR_UNINITIALIZED, returned: %08x\n", rc); + "should have returned DSERR_UNINITIALIZED, returned: %08lx\n", rc); rc=IDirectSound_Initialize(dso,lpGuid); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, - "IDirectSound_Initialize() failed: %08x\n",rc); + "IDirectSound_Initialize() failed: %08lx\n",rc); if (rc==DSERR_NODRIVER) { trace(" No Driver\n"); goto EXIT; @@ -104,41 +104,41 @@ static void IDirectSound_test(LPDIRECTSOUND dso, BOOL initialized, rc=IDirectSound_Initialize(dso,lpGuid); ok(rc==DSERR_ALREADYINITIALIZED, "IDirectSound_Initialize() " - "should have returned DSERR_ALREADYINITIALIZED: %08x\n", rc); + "should have returned DSERR_ALREADYINITIALIZED: %08lx\n", rc); /* DSOUND: Error: Invalid caps buffer */ rc=IDirectSound_GetCaps(dso,0); ok(rc==DSERR_INVALIDPARAM,"IDirectSound_GetCaps(NULL) " - "should have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "should have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc); ZeroMemory(&dscaps, sizeof(dscaps)); /* DSOUND: Error: Invalid caps buffer */ rc=IDirectSound_GetCaps(dso,&dscaps); ok(rc==DSERR_INVALIDPARAM,"IDirectSound_GetCaps() " - "should have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "should have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc); dscaps.dwSize=sizeof(dscaps); /* DSOUND: Running on a certified driver */ rc=IDirectSound_GetCaps(dso,&dscaps); - ok(rc==DS_OK,"IDirectSound_GetCaps() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound_GetCaps() failed: %08lx\n",rc); rc=IDirectSound_Compact(dso); - ok(rc==DSERR_PRIOLEVELNEEDED,"IDirectSound_Compact() failed: %08x\n", rc); + ok(rc==DSERR_PRIOLEVELNEEDED,"IDirectSound_Compact() failed: %08lx\n", rc); rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08lx\n", rc); rc=IDirectSound_Compact(dso); - ok(rc==DS_OK,"IDirectSound_Compact() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound_Compact() failed: %08lx\n",rc); rc=IDirectSound_GetSpeakerConfig(dso,0); ok(rc==DSERR_INVALIDPARAM,"IDirectSound_GetSpeakerConfig(NULL) " - "should have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "should have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc); rc=IDirectSound_GetSpeakerConfig(dso,&speaker_config); - ok(rc==DS_OK,"IDirectSound_GetSpeakerConfig() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_GetSpeakerConfig() failed: %08lx\n", rc); ref_speaker_config = speaker_config; speaker_config = DSSPEAKER_COMBINED(DSSPEAKER_STEREO, @@ -148,14 +148,14 @@ static void IDirectSound_test(LPDIRECTSOUND dso, BOOL initialized, DSSPEAKER_GEOMETRY_NARROW); if(rc==DS_OK) { rc=IDirectSound_SetSpeakerConfig(dso,speaker_config); - ok(rc==DS_OK,"IDirectSound_SetSpeakerConfig() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetSpeakerConfig() failed: %08lx\n", rc); } if (rc==DS_OK) { rc=IDirectSound_GetSpeakerConfig(dso,&new_speaker_config); - ok(rc==DS_OK,"IDirectSound_GetSpeakerConfig() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_GetSpeakerConfig() failed: %08lx\n", rc); if (rc==DS_OK && speaker_config!=new_speaker_config && ref_speaker_config!=new_speaker_config) trace("IDirectSound_GetSpeakerConfig() failed to set speaker " - "config: expected 0x%08x or 0x%08x, got 0x%08x\n", + "config: expected 0x%08lx or 0x%08lx, got 0x%08lx\n", speaker_config,ref_speaker_config,new_speaker_config); IDirectSound_SetSpeakerConfig(dso,ref_speaker_config); } @@ -176,23 +176,23 @@ static void IDirectSound_tests(void) rc=CoGetClassObject(&CLSID_DirectSound, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void**)&cf); ok(rc==S_OK,"CoGetClassObject(CLSID_DirectSound, IID_IClassFactory) " - "failed: %08x\n", rc); + "failed: %08lx\n", rc); rc=CoGetClassObject(&CLSID_DirectSound, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&cf); ok(rc==S_OK,"CoGetClassObject(CLSID_DirectSound, IID_IUnknown) " - "failed: %08x\n", rc); + "failed: %08lx\n", rc); /* COM aggregation */ rc=CoCreateInstance(&CLSID_DirectSound, (IUnknown*)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IDirectSound, (void**)&dso); ok(rc==CLASS_E_NOAGGREGATION || broken(rc==DSERR_INVALIDPARAM), - "DirectMusicPerformance create failed: %08x, expected CLASS_E_NOAGGREGATION\n", rc); + "DirectMusicPerformance create failed: %08lx, expected CLASS_E_NOAGGREGATION\n", rc); /* try the COM class factory method of creation with no device specified */ rc=CoCreateInstance(&CLSID_DirectSound, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSound, (void**)&dso); - ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSound) failed: %08x\n", rc); + ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSound) failed: %08lx\n", rc); if (dso) IDirectSound_test(dso, FALSE, NULL); @@ -200,7 +200,7 @@ static void IDirectSound_tests(void) * device specified */ rc=CoCreateInstance(&CLSID_DirectSound, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSound, (void**)&dso); - ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSound) failed: %08x\n", rc); + ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSound) failed: %08lx\n", rc); if (dso) IDirectSound_test(dso, FALSE, &DSDEVID_DefaultPlayback); @@ -208,7 +208,7 @@ static void IDirectSound_tests(void) * playback device specified */ rc=CoCreateInstance(&CLSID_DirectSound, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSound, (void**)&dso); - ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSound) failed: %08x\n", rc); + ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSound) failed: %08lx\n", rc); if (dso) IDirectSound_test(dso, FALSE, &DSDEVID_DefaultVoicePlayback); @@ -218,7 +218,7 @@ static void IDirectSound_tests(void) &CLSID_DirectSoundPrivate, (void**)&dso); ok(rc==E_NOINTERFACE, "CoCreateInstance(CLSID_DirectSound,CLSID_DirectSoundPrivate) " - "should have failed: %08x\n",rc); + "should have failed: %08lx\n",rc); /* try the COM class factory method of creation with a bad * GUID and IID specified */ @@ -226,33 +226,33 @@ static void IDirectSound_tests(void) &IID_IDirectSound, (void**)&dso); ok(rc==REGDB_E_CLASSNOTREG, "CoCreateInstance(CLSID_DirectSoundPrivate,IID_IDirectSound) " - "should have failed: %08x\n",rc); + "should have failed: %08lx\n",rc); /* try with no device specified */ rc = DirectSoundCreate(NULL, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, - "DirectSoundCreate(NULL) failed: %08x\n",rc); + "DirectSoundCreate(NULL) failed: %08lx\n",rc); if (rc==S_OK && dso) IDirectSound_test(dso, TRUE, NULL); /* try with default playback device specified */ rc = DirectSoundCreate(&DSDEVID_DefaultPlayback, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, - "DirectSoundCreate(DSDEVID_DefaultPlayback) failed: %08x\n", rc); + "DirectSoundCreate(DSDEVID_DefaultPlayback) failed: %08lx\n", rc); if (rc==DS_OK && dso) IDirectSound_test(dso, TRUE, NULL); /* try with default voice playback device specified */ rc = DirectSoundCreate(&DSDEVID_DefaultVoicePlayback, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, - "DirectSoundCreate(DSDEVID_DefaultVoicePlayback) failed: %08x\n", rc); + "DirectSoundCreate(DSDEVID_DefaultVoicePlayback) failed: %08lx\n", rc); if (rc==DS_OK && dso) IDirectSound_test(dso, TRUE, NULL); /* try with a bad device specified */ rc = DirectSoundCreate(&DSDEVID_DefaultVoiceCapture, &dso, NULL); ok(rc==DSERR_NODRIVER,"DirectSoundCreate(DSDEVID_DefaultVoiceCapture) " - "should have failed: %08x\n",rc); + "should have failed: %08lx\n",rc); if (rc==DS_OK && dso) IDirectSound_Release(dso); } @@ -266,12 +266,12 @@ static HRESULT test_dsound(LPGUID lpGuid) /* DSOUND: Error: Invalid interface buffer */ rc = DirectSoundCreate(lpGuid, 0, NULL); ok(rc==DSERR_INVALIDPARAM,"DirectSoundCreate() should have returned " - "DSERR_INVALIDPARAM, returned: %08x\n",rc); + "DSERR_INVALIDPARAM, returned: %08lx\n",rc); /* Create the DirectSound object */ rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, - "DirectSoundCreate() failed: %08x\n",rc); + "DirectSoundCreate() failed: %08lx\n",rc); if (rc!=DS_OK) return rc; @@ -281,19 +281,19 @@ static HRESULT test_dsound(LPGUID lpGuid) /* Try the COM class factory method of creation with enumerated device */ rc=CoCreateInstance(&CLSID_DirectSound, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSound, (void**)&dso); - ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSound) failed: %08x\n", rc); + ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSound) failed: %08lx\n", rc); if (dso) IDirectSound_test(dso, FALSE, lpGuid); /* Create a DirectSound object */ rc = DirectSoundCreate(lpGuid, &dso, NULL); - ok(rc==DS_OK,"DirectSoundCreate() failed: %08x\n",rc); + ok(rc==DS_OK,"DirectSoundCreate() failed: %08lx\n",rc); if (rc==DS_OK) { LPDIRECTSOUND dso1=NULL; /* Create a second DirectSound object */ rc = DirectSoundCreate(lpGuid, &dso1, NULL); - ok(rc==DS_OK,"DirectSoundCreate() failed: %08x\n",rc); + ok(rc==DS_OK,"DirectSoundCreate() failed: %08lx\n",rc); if (rc==DS_OK) { /* Release the second DirectSound object */ ref=IDirectSound_Release(dso1); @@ -313,7 +313,7 @@ static HRESULT test_dsound(LPGUID lpGuid) /* Create a DirectSound object */ rc = DirectSoundCreate(lpGuid, &dso, NULL); - ok(rc==DS_OK,"DirectSoundCreate() failed: %08x\n",rc); + ok(rc==DS_OK,"DirectSoundCreate() failed: %08lx\n",rc); if (rc==DS_OK) { LPDIRECTSOUNDBUFFER secondary; DSBUFFERDESC bufdesc; @@ -329,13 +329,13 @@ static HRESULT test_dsound(LPGUID lpGuid) rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok((rc==DS_OK && secondary!=NULL) || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */ "IDirectSound_CreateSoundBuffer() failed to create a secondary " - "buffer %08x\n",rc); + "buffer %08lx\n",rc); if (rc==DS_OK && secondary!=NULL) { LPDIRECTSOUND3DBUFFER buffer3d; rc = IDirectSoundBuffer_QueryInterface(secondary, &IID_IDirectSound3DBuffer, (void **)&buffer3d); ok(rc==DS_OK && buffer3d!=NULL,"IDirectSound_QueryInterface() " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); if (rc==DS_OK && buffer3d!=NULL) { ref=IDirectSound3DBuffer_AddRef(buffer3d); ok(ref==2,"IDirectSound3DBuffer_AddRef() has %d references, " @@ -370,7 +370,7 @@ static HRESULT test_primary(LPGUID lpGuid) /* Create the DirectSound object */ rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, - "DirectSoundCreate() failed: %08x\n",rc); + "DirectSoundCreate() failed: %08lx\n",rc); if (rc!=DS_OK) return rc; @@ -378,20 +378,20 @@ static HRESULT test_primary(LPGUID lpGuid) ZeroMemory(&dscaps, sizeof(dscaps)); dscaps.dwSize=sizeof(dscaps); rc=IDirectSound_GetCaps(dso,&dscaps); - ok(rc==DS_OK,"IDirectSound_GetCaps() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound_GetCaps() failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT; /* DSOUND: Error: Invalid buffer description pointer */ rc=IDirectSound_CreateSoundBuffer(dso,0,0,NULL); ok(rc==DSERR_INVALIDPARAM, - "IDirectSound_CreateSoundBuffer() should have failed: %08x\n", rc); + "IDirectSound_CreateSoundBuffer() should have failed: %08lx\n", rc); /* DSOUND: Error: NULL pointer is invalid */ /* DSOUND: Error: Invalid buffer description pointer */ rc=IDirectSound_CreateSoundBuffer(dso,0,&primary,NULL); ok(rc==DSERR_INVALIDPARAM && primary==0, - "IDirectSound_CreateSoundBuffer() should have failed: rc=%08x," + "IDirectSound_CreateSoundBuffer() should have failed: rc=%08lx," "dsbo=%p\n",rc,primary); /* DSOUND: Error: Invalid size */ @@ -401,7 +401,7 @@ static HRESULT test_primary(LPGUID lpGuid) bufdesc.dwSize=sizeof(bufdesc)-1; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DSERR_INVALIDPARAM && primary==0, - "IDirectSound_CreateSoundBuffer() should have failed: rc=%08x," + "IDirectSound_CreateSoundBuffer() should have failed: rc=%08lx," "primary=%p\n",rc,primary); /* DSOUND: Error: DSBCAPS_PRIMARYBUFFER flag with non-NULL lpwfxFormat */ @@ -413,7 +413,7 @@ static HRESULT test_primary(LPGUID lpGuid) bufdesc.lpwfxFormat=&wfx; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DSERR_INVALIDPARAM && primary==0, - "IDirectSound_CreateSoundBuffer() should have failed: rc=%08x," + "IDirectSound_CreateSoundBuffer() should have failed: rc=%08lx," "primary=%p\n",rc,primary); /* DSOUND: Error: No DSBCAPS_PRIMARYBUFFER flag with NULL lpwfxFormat */ @@ -425,13 +425,13 @@ static HRESULT test_primary(LPGUID lpGuid) bufdesc.lpwfxFormat=NULL; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DSERR_INVALIDPARAM && primary==0, - "IDirectSound_CreateSoundBuffer() should have failed: rc=%08x," + "IDirectSound_CreateSoundBuffer() should have failed: rc=%08lx," "primary=%p\n",rc,primary); /* We must call SetCooperativeLevel before calling CreateSoundBuffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08lx\n", rc); if (rc!=DS_OK) goto EXIT; @@ -444,7 +444,7 @@ static HRESULT test_primary(LPGUID lpGuid) init_format(&wfx,WAVE_FORMAT_PCM,11025,8,2); rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DSERR_INVALIDPARAM,"IDirectSound_CreateSoundBuffer() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n", rc); if (rc==DS_OK && primary!=NULL) IDirectSoundBuffer_Release(primary); @@ -454,7 +454,7 @@ static HRESULT test_primary(LPGUID lpGuid) bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER|DSBCAPS_CTRLVOLUME; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok((rc==DS_OK && primary!=NULL) || (rc==DSERR_CONTROLUNAVAIL), - "IDirectSound_CreateSoundBuffer() failed to create a primary buffer: %08x\n",rc); + "IDirectSound_CreateSoundBuffer() failed to create a primary buffer: %08lx\n",rc); if (rc==DSERR_CONTROLUNAVAIL) trace(" No Primary\n"); else if (rc==DS_OK && primary!=NULL) { @@ -467,7 +467,7 @@ static HRESULT test_primary(LPGUID lpGuid) rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&second,NULL); ok(rc==DS_OK && second==primary, "IDirectSound_CreateSoundBuffer() should have returned original " - "primary buffer: %08x\n",rc); + "primary buffer: %08lx\n",rc); ref=IDirectSoundBuffer_Release(second); ok(ref==1,"IDirectSoundBuffer_Release() primary has %d references, " "should have 1\n",ref); @@ -477,16 +477,16 @@ static HRESULT test_primary(LPGUID lpGuid) rc=IDirectSound_DuplicateSoundBuffer(dso,primary,&third); /* rc=0x88780032 */ ok(rc!=DS_OK,"IDirectSound_DuplicateSoundBuffer() primary buffer " - "should have failed %08x\n",rc); + "should have failed %08lx\n",rc); rc=IDirectSoundBuffer_GetVolume(primary,&vol); - ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume() failed: %08lx\n", rc); if (winetest_interactive) { trace("Playing a 5 seconds reference tone at the current " "volume.\n"); if (rc==DS_OK) - trace("(the current volume is %d according to DirectSound)\n", + trace("(the current volume is %ld according to DirectSound)\n", vol); trace("All subsequent tones should be identical to this one.\n"); trace("Listen for stutter, changes in pitch, volume, etc.\n"); @@ -507,13 +507,13 @@ static HRESULT test_primary(LPGUID lpGuid) ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references\n",ref); rc=IDirectSoundBuffer_QueryInterface(primary,&IID_IDirectSoundNotify,(void **)¬ify); - ok(rc==E_NOINTERFACE,"IDirectSoundBuffer_QueryInterface() failed %08x\n",rc); + ok(rc==E_NOINTERFACE,"IDirectSoundBuffer_QueryInterface() failed %08lx\n",rc); } /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08lx\n", rc); EXIT: ref=IDirectSound_Release(dso); @@ -541,7 +541,7 @@ static HRESULT test_primary_secondary(LPGUID lpGuid) /* Create the DirectSound object */ rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, - "DirectSoundCreate() failed: %08x\n",rc); + "DirectSoundCreate() failed: %08lx\n",rc); if (rc!=DS_OK) return rc; @@ -549,14 +549,14 @@ static HRESULT test_primary_secondary(LPGUID lpGuid) ZeroMemory(&dscaps, sizeof(dscaps)); dscaps.dwSize=sizeof(dscaps); rc=IDirectSound_GetCaps(dso,&dscaps); - ok(rc==DS_OK,"IDirectSound_GetCaps() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound_GetCaps() failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT; /* We must call SetCooperativeLevel before creating primary buffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08lx\n", rc); if (rc!=DS_OK) goto EXIT; @@ -565,7 +565,7 @@ static HRESULT test_primary_secondary(LPGUID lpGuid) bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DS_OK && primary!=NULL, - "IDirectSound_CreateSoundBuffer() failed to create a primary buffer %08x\n",rc); + "IDirectSound_CreateSoundBuffer() failed to create a primary buffer %08lx\n",rc); if (rc==DS_OK && primary!=NULL) { for (f = 0; f < ARRAY_SIZE(formats); f++) { @@ -579,7 +579,7 @@ static HRESULT test_primary_secondary(LPGUID lpGuid) /* DSOUND: Setting DirectSound cooperative level to * DSSCL_PRIORITY */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08lx\n", rc); if (rc!=DS_OK) goto EXIT; @@ -589,10 +589,10 @@ static HRESULT test_primary_secondary(LPGUID lpGuid) rc=IDirectSoundBuffer_SetFormat(primary,&wfx); if (wfx.wBitsPerSample <= 16) - ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %08x\n", + ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %08lx\n", format_string(&wfx), rc); else - ok(rc==DS_OK || rc == E_INVALIDARG, "SetFormat (%s) failed: %08x\n", + ok(rc==DS_OK || rc == E_INVALIDARG, "SetFormat (%s) failed: %08lx\n", format_string(&wfx), rc); /* There is no guarantee that SetFormat will actually change the @@ -600,17 +600,17 @@ static HRESULT test_primary_secondary(LPGUID lpGuid) * supports. So we must re-query the format. */ rc=IDirectSoundBuffer_GetFormat(primary,&wfx,sizeof(wfx),NULL); - ok(rc==DS_OK,"IDirectSoundBuffer_GetFormat() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetFormat() failed: %08lx\n", rc); if (rc==DS_OK && (wfx.wFormatTag!=wfx2.wFormatTag || wfx.nSamplesPerSec!=wfx2.nSamplesPerSec || wfx.wBitsPerSample!=wfx2.wBitsPerSample || wfx.nChannels!=wfx2.nChannels)) { - trace("Requested primary format tag=0x%04x %dx%dx%d " - "avg.B/s=%d align=%d\n", + trace("Requested primary format tag=0x%04x %ldx%dx%d " + "avg.B/s=%ld align=%d\n", wfx2.wFormatTag,wfx2.nSamplesPerSec,wfx2.wBitsPerSample, wfx2.nChannels,wfx2.nAvgBytesPerSec,wfx2.nBlockAlign); - trace("Got tag=0x%04x %dx%dx%d avg.B/s=%d align=%d\n", + trace("Got tag=0x%04x %ldx%dx%d avg.B/s=%ld align=%d\n", wfx.wFormatTag,wfx.nSamplesPerSec,wfx.wBitsPerSample, wfx.nChannels,wfx.nAvgBytesPerSec,wfx.nBlockAlign); } @@ -618,7 +618,7 @@ static HRESULT test_primary_secondary(LPGUID lpGuid) /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08lx\n", rc); init_format(&wfx2,WAVE_FORMAT_PCM,11025,16,2); @@ -630,14 +630,14 @@ static HRESULT test_primary_secondary(LPGUID lpGuid) wfx.nBlockAlign); bufdesc.lpwfxFormat=&wfx2; if (winetest_interactive) { - trace(" Testing a primary buffer at %dx%dx%d (fmt=%d) with a " - "secondary buffer at %dx%dx%d\n", + trace(" Testing a primary buffer at %ldx%dx%d (fmt=%d) with a " + "secondary buffer at %ldx%dx%d\n", wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels,format_tags[tag], wfx2.nSamplesPerSec,wfx2.wBitsPerSample,wfx2.nChannels); } rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok((rc==DS_OK && secondary!=NULL) || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */ - "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08x\n",rc); + "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08lx\n",rc); if (rc==DS_OK && secondary!=NULL) { test_buffer(dso,&secondary,0,FALSE,0,FALSE,0, @@ -658,7 +658,7 @@ static HRESULT test_primary_secondary(LPGUID lpGuid) /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08lx\n", rc); EXIT: ref=IDirectSound_Release(dso); @@ -683,7 +683,7 @@ static HRESULT test_secondary(LPGUID lpGuid) /* Create the DirectSound object */ rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, - "DirectSoundCreate() failed: %08x\n",rc); + "DirectSoundCreate() failed: %08lx\n",rc); if (rc!=DS_OK) return rc; @@ -691,14 +691,14 @@ static HRESULT test_secondary(LPGUID lpGuid) ZeroMemory(&dscaps, sizeof(dscaps)); dscaps.dwSize=sizeof(dscaps); rc=IDirectSound_GetCaps(dso,&dscaps); - ok(rc==DS_OK,"IDirectSound_GetCaps() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound_GetCaps() failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT; /* We must call SetCooperativeLevel before creating primary buffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08lx\n", rc); if (rc!=DS_OK) goto EXIT; @@ -707,11 +707,11 @@ static HRESULT test_secondary(LPGUID lpGuid) bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DS_OK && primary!=NULL, - "IDirectSound_CreateSoundBuffer() failed to create a primary buffer %08x\n",rc); + "IDirectSound_CreateSoundBuffer() failed to create a primary buffer %08lx\n",rc); if (rc==DS_OK && primary!=NULL) { rc=IDirectSoundBuffer_GetFormat(primary,&wfx1,sizeof(wfx1),NULL); - ok(rc==DS_OK,"IDirectSoundBuffer8_Getformat() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer8_Getformat() failed: %08lx\n", rc); if (rc!=DS_OK) goto EXIT1; @@ -733,7 +733,7 @@ static HRESULT test_secondary(LPGUID lpGuid) wfx.nBlockAlign); rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DSERR_INVALIDPARAM,"IDirectSound_CreateSoundBuffer() " - "should have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "should have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc); if (rc==DS_OK && secondary!=NULL) IDirectSoundBuffer_Release(secondary); @@ -751,10 +751,10 @@ static HRESULT test_secondary(LPGUID lpGuid) || rc == DS_OK, /* driver dependent? */ "IDirectSound_CreateSoundBuffer() " "should have returned (DSERR_CONTROLUNAVAIL or DSERR_INVALIDCALL) " - "and NULL, returned: %08x %p\n", rc, secondary); + "and NULL, returned: %08lx %p\n", rc, secondary); else ok((rc==DS_OK && secondary!=NULL) || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */ - "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08x\n",rc); + "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08lx\n",rc); if (secondary) IDirectSoundBuffer_Release(secondary); @@ -770,7 +770,7 @@ static HRESULT test_secondary(LPGUID lpGuid) rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok((rc==DSERR_INVALIDPARAM || rc==DSERR_INVALIDCALL /* 2003 */) && !secondary, - "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", + "IDirectSound_CreateSoundBuffer() returned: %08lx %p\n", rc, secondary); if (secondary) { @@ -784,7 +784,7 @@ static HRESULT test_secondary(LPGUID lpGuid) ok(((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL || rc==DSERR_INVALIDPARAM) && !secondary) || rc==DS_OK, /* 2003 / 2008 */ - "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", + "IDirectSound_CreateSoundBuffer() returned: %08lx %p\n", rc, secondary); if (secondary) { @@ -796,7 +796,7 @@ static HRESULT test_secondary(LPGUID lpGuid) wfxe.SubFormat = GUID_NULL; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok((rc==DSERR_INVALIDPARAM || rc==DSERR_INVALIDCALL) && !secondary, - "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", + "IDirectSound_CreateSoundBuffer() returned: %08lx %p\n", rc, secondary); if (secondary) { @@ -808,7 +808,7 @@ static HRESULT test_secondary(LPGUID lpGuid) ++wfxe.Samples.wValidBitsPerSample; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DSERR_INVALIDPARAM && !secondary, - "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", + "IDirectSound_CreateSoundBuffer() returned: %08lx %p\n", rc, secondary); if (secondary) { @@ -820,7 +820,7 @@ static HRESULT test_secondary(LPGUID lpGuid) wfxe.Samples.wValidBitsPerSample = 0; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DS_OK && secondary, - "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", + "IDirectSound_CreateSoundBuffer() returned: %08lx %p\n", rc, secondary); if (secondary) { @@ -831,12 +831,12 @@ static HRESULT test_secondary(LPGUID lpGuid) rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DS_OK && secondary!=NULL, - "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08x\n",rc); + "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08lx\n",rc); if (rc==DS_OK && secondary!=NULL) { if (winetest_interactive) { - trace(" Testing a secondary buffer at %dx%dx%d (fmt=%d) " - "with a primary buffer at %dx%dx%d\n", + trace(" Testing a secondary buffer at %ldx%dx%d (fmt=%d) " + "with a primary buffer at %ldx%dx%d\n", wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels,format_tags[tag], wfx1.nSamplesPerSec,wfx1.wBitsPerSample,wfx1.nChannels); } @@ -858,7 +858,7 @@ EXIT1: /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08lx\n", rc); EXIT: ref=IDirectSound_Release(dso); @@ -883,7 +883,7 @@ static HRESULT test_block_align(LPGUID lpGuid) /* Create the DirectSound object */ rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, - "DirectSoundCreate() failed: %08x\n",rc); + "DirectSoundCreate() failed: %08lx\n",rc); if (rc!=DS_OK) return rc; @@ -895,30 +895,30 @@ static HRESULT test_block_align(LPGUID lpGuid) bufdesc.lpwfxFormat=&wfx; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc == DS_OK || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */ - "IDirectSound_CreateSoundBuffer() should have returned DS_OK, returned: %08x\n", rc); + "IDirectSound_CreateSoundBuffer() should have returned DS_OK, returned: %08lx\n", rc); if (rc==DS_OK && secondary!=NULL) { ZeroMemory(&dsbcaps, sizeof(dsbcaps)); dsbcaps.dwSize = sizeof(dsbcaps); rc=IDirectSoundBuffer_GetCaps(secondary,&dsbcaps); ok(rc==DS_OK,"IDirectSoundBuffer_GetCaps() should have returned DS_OK, " - "returned: %08x\n", rc); + "returned: %08lx\n", rc); if (rc==DS_OK && wfx.nBlockAlign > 1) { ok(dsbcaps.dwBufferBytes==(wfx.nAvgBytesPerSec + wfx.nBlockAlign), - "Buffer size not a multiple of nBlockAlign: requested %d, " - "got %d, should be %d\n", bufdesc.dwBufferBytes, + "Buffer size not a multiple of nBlockAlign: requested %ld, " + "got %ld, should be %ld\n", bufdesc.dwBufferBytes, dsbcaps.dwBufferBytes, wfx.nAvgBytesPerSec + wfx.nBlockAlign); rc = IDirectSoundBuffer_SetCurrentPosition(secondary, 0); - ok(rc == DS_OK, "Could not set position to 0: %08x\n", rc); + ok(rc == DS_OK, "Could not set position to 0: %08lx\n", rc); rc = IDirectSoundBuffer_GetCurrentPosition(secondary, &pos, NULL); - ok(rc == DS_OK, "Could not get position: %08x\n", rc); + ok(rc == DS_OK, "Could not get position: %08lx\n", rc); rc = IDirectSoundBuffer_SetCurrentPosition(secondary, 1); - ok(rc == DS_OK, "Could not set position to 1: %08x\n", rc); + ok(rc == DS_OK, "Could not set position to 1: %08lx\n", rc); rc = IDirectSoundBuffer_GetCurrentPosition(secondary, &pos2, NULL); - ok(rc == DS_OK, "Could not get new position: %08x\n", rc); - ok(pos == pos2, "Positions not the same! Old position: %d, new position: %d\n", pos, pos2); + ok(rc == DS_OK, "Could not get new position: %08lx\n", rc); + ok(pos == pos2, "Positions not the same! Old position: %ld, new position: %ld\n", pos, pos2); } ref=IDirectSoundBuffer_Release(secondary); ok(ref==0,"IDirectSoundBuffer_Release() secondary has %d references, " @@ -954,7 +954,7 @@ static HRESULT test_frequency(LPGUID lpGuid) /* Create the DirectSound object */ rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, - "DirectSoundCreate() failed: %08x\n",rc); + "DirectSoundCreate() failed: %08lx\n",rc); if (rc!=DS_OK) return rc; @@ -962,14 +962,14 @@ static HRESULT test_frequency(LPGUID lpGuid) ZeroMemory(&dscaps, sizeof(dscaps)); dscaps.dwSize=sizeof(dscaps); rc=IDirectSound_GetCaps(dso,&dscaps); - ok(rc==DS_OK,"IDirectSound_GetCaps() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound_GetCaps() failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT; /* We must call SetCooperativeLevel before creating primary buffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08lx\n", rc); if (rc!=DS_OK) goto EXIT; @@ -978,11 +978,11 @@ static HRESULT test_frequency(LPGUID lpGuid) bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DS_OK && primary!=NULL, - "IDirectSound_CreateSoundBuffer() failed to create a primary buffer %08x\n",rc); + "IDirectSound_CreateSoundBuffer() failed to create a primary buffer %08lx\n",rc); if (rc==DS_OK && primary!=NULL) { rc=IDirectSoundBuffer_GetFormat(primary,&wfx1,sizeof(wfx1),NULL); - ok(rc==DS_OK,"IDirectSoundBuffer8_Getformat() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer8_Getformat() failed: %08lx\n", rc); if (rc!=DS_OK) goto EXIT1; @@ -998,14 +998,14 @@ static HRESULT test_frequency(LPGUID lpGuid) BUFFER_LEN/1000,wfx.nBlockAlign); bufdesc.lpwfxFormat=&wfx; if (winetest_interactive) { - trace(" Testing a secondary buffer at %dx%dx%d " - "with a primary buffer at %dx%dx%d\n", + trace(" Testing a secondary buffer at %ldx%dx%d " + "with a primary buffer at %ldx%dx%d\n", wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels, wfx1.nSamplesPerSec,wfx1.wBitsPerSample,wfx1.nChannels); } rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok((rc==DS_OK && secondary!=NULL) || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */ - "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08x\n",rc); + "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08lx\n",rc); if (rc==DS_OK && secondary!=NULL) { test_buffer(dso,&secondary,0,FALSE,0,FALSE,0, @@ -1026,7 +1026,7 @@ EXIT1: /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08lx\n", rc); EXIT: ref=IDirectSound_Release(dso); @@ -1046,30 +1046,30 @@ static HRESULT test_notify(LPDIRECTSOUNDBUFFER dsb, rc=IDirectSoundBuffer_SetCurrentPosition(dsb,0); ok(rc==DS_OK, - "IDirectSoundBuffer_SetCurrentPosition failed %08x\n",rc); + "IDirectSoundBuffer_SetCurrentPosition failed %08lx\n",rc); if(rc!=DS_OK) return rc; rc=IDirectSoundBuffer_Play(dsb,0,0,0); - ok(rc==DS_OK,"IDirectSoundBuffer_Play failed %08x\n",rc); + ok(rc==DS_OK,"IDirectSoundBuffer_Play failed %08lx\n",rc); if(rc!=DS_OK) return rc; rc = IDirectSoundBuffer_GetStatus(dsb, &status); - ok(rc == DS_OK,"Failed %08x\n",rc); - ok(status == DSBSTATUS_PLAYING,"got %08x\n", status); + ok(rc == DS_OK,"Failed %08lx\n",rc); + ok(status == DSBSTATUS_PLAYING,"got %08lx\n", status); rc=IDirectSoundBuffer_Stop(dsb); - ok(rc==DS_OK,"IDirectSoundBuffer_Stop failed %08x\n",rc); + ok(rc==DS_OK,"IDirectSoundBuffer_Stop failed %08lx\n",rc); if(rc!=DS_OK) return rc; rc = IDirectSoundBuffer_GetStatus(dsb, &status); - ok(rc == DS_OK,"Failed %08x\n",rc); - ok(status == 0 /* Stopped */,"got %08x\n", status); + ok(rc == DS_OK,"Failed %08lx\n",rc); + ok(status == 0 /* Stopped */,"got %08lx\n", status); ret = WaitForMultipleObjects(count, event, FALSE, 3000); - ok(ret==expected,"expected %d. got %d\n",expected,ret); + ok(ret==expected,"expected %ld. got %ld\n",expected,ret); return rc; } @@ -1085,14 +1085,14 @@ static HRESULT test_duplicate(LPGUID lpGuid) /* Create the DirectSound object */ rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, - "DirectSoundCreate() failed: %08x\n",rc); + "DirectSoundCreate() failed: %08lx\n",rc); if (rc!=DS_OK) return rc; /* We must call SetCooperativeLevel before creating primary buffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08lx\n", rc); if (rc!=DS_OK) goto EXIT; @@ -1101,7 +1101,7 @@ static HRESULT test_duplicate(LPGUID lpGuid) bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DS_OK && primary!=NULL,"IDirectSound_CreateSoundBuffer() failed " - "to create a primary buffer %08x\n",rc); + "to create a primary buffer %08lx\n",rc); if (rc==DS_OK && primary!=NULL) { LPDIRECTSOUNDBUFFER original=NULL; @@ -1116,7 +1116,7 @@ static HRESULT test_duplicate(LPGUID lpGuid) rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&original,NULL); ok(rc==DS_OK && original!=NULL, "IDirectSound_CreateSoundBuffer() failed to create an original " - "buffer %08x\n",rc); + "buffer %08lx\n",rc); if (rc==DS_OK && original!=NULL) { LPDIRECTSOUNDBUFFER duplicated=NULL; LPDIRECTSOUNDNOTIFY notify=NULL; @@ -1134,7 +1134,7 @@ static HRESULT test_duplicate(LPGUID lpGuid) rc=IDirectSoundBuffer_Lock(original,0,0,&buf,&bufsize, NULL,NULL,DSBLOCK_ENTIREBUFFER); ok(rc==DS_OK && buf!=NULL, - "IDirectSoundBuffer_Lock failed to lock the buffer %08x\n",rc); + "IDirectSoundBuffer_Lock failed to lock the buffer %08lx\n",rc); if (rc==DS_OK && buf!=NULL) { if (sizeof(void*)==4) { /* crashes on 64-bit */ /* broken apps like Asuka 120% Return BURNING Fest, @@ -1147,7 +1147,7 @@ static HRESULT test_duplicate(LPGUID lpGuid) rc=IDirectSoundBuffer_Unlock(original,buf,bufsize, NULL,0); ok(rc==DS_OK,"IDirectSoundBuffer_Unlock failed to unlock " - "%08x\n",rc); + "%08lx\n",rc); } rc=IDirectSoundBuffer_QueryInterface(original, @@ -1155,7 +1155,7 @@ static HRESULT test_duplicate(LPGUID lpGuid) (void**)¬ify); ok(rc==DS_OK && notify!=NULL, "IDirectSoundBuffer_QueryInterface() failed to create a " - "notification %08x\n",rc); + "notification %08lx\n",rc); if (rc==DS_OK && notify!=NULL) { DSBPOSITIONNOTIFY dsbpn; LPDIRECTSOUNDNOTIFY dup_notify=NULL; @@ -1165,11 +1165,11 @@ static HRESULT test_duplicate(LPGUID lpGuid) rc=IDirectSoundNotify_SetNotificationPositions(notify, 1,&dsbpn); ok(rc==DS_OK,"IDirectSoundNotify_SetNotificationPositions " - "failed %08x\n",rc); + "failed %08lx\n",rc); rc=IDirectSound_DuplicateSoundBuffer(dso,original,&duplicated); ok(rc==DS_OK && duplicated!=NULL, - "IDirectSound_DuplicateSoundBuffer failed %08x\n",rc); + "IDirectSound_DuplicateSoundBuffer failed %08lx\n",rc); trace("testing duplicated buffer without notifications.\n"); test_notify(duplicated, ARRAY_SIZE(event), event, WAIT_TIMEOUT); @@ -1179,14 +1179,14 @@ static HRESULT test_duplicate(LPGUID lpGuid) (void**)&dup_notify); ok(rc==DS_OK&&dup_notify!=NULL, "IDirectSoundBuffer_QueryInterface() failed to create a " - "notification %08x\n",rc); + "notification %08lx\n",rc); if(rc==DS_OK&&dup_notify!=NULL) { dsbpn.dwOffset=DSBPN_OFFSETSTOP; dsbpn.hEventNotify=event[1]; rc=IDirectSoundNotify_SetNotificationPositions(dup_notify, 1,&dsbpn); ok(rc==DS_OK,"IDirectSoundNotify_SetNotificationPositions " - "failed %08x\n",rc); + "failed %08lx\n",rc); trace("testing duplicated buffer with a notification.\n"); test_notify(duplicated, ARRAY_SIZE(event), event, WAIT_OBJECT_0 + 1); @@ -1218,7 +1218,7 @@ static HRESULT test_duplicate(LPGUID lpGuid) /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08lx\n", rc); EXIT: ref=IDirectSound_Release(dso); @@ -1267,7 +1267,7 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); - ok(rc == E_INVALIDARG, "%s: SetFormat: %08x\n", testname, rc); + ok(rc == E_INVALIDARG, "%s: SetFormat: %08lx\n", testname, rc); wfx.nChannels = 2; wfx.nSamplesPerSec = 44100; @@ -1275,7 +1275,7 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); - ok(rc == E_INVALIDARG, "%s: SetFormat: %08x\n", testname, rc); + ok(rc == E_INVALIDARG, "%s: SetFormat: %08lx\n", testname, rc); wfx.nChannels = 2; wfx.nSamplesPerSec = 44100; @@ -1283,7 +1283,7 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); - ok(rc == E_INVALIDARG, "%s: SetFormat: %08x\n", testname, rc); + ok(rc == E_INVALIDARG, "%s: SetFormat: %08lx\n", testname, rc); wfx.nChannels = 2; wfx.nSamplesPerSec = 44100; @@ -1291,7 +1291,7 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); - ok(rc == E_INVALIDARG, "%s: SetFormat: %08x\n", testname, rc); + ok(rc == E_INVALIDARG, "%s: SetFormat: %08lx\n", testname, rc); wfx.nChannels = 2; wfx.nSamplesPerSec = 0; @@ -1299,7 +1299,7 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); - ok(rc == E_INVALIDARG, "%s: SetFormat: %08x\n", testname, rc); + ok(rc == E_INVALIDARG, "%s: SetFormat: %08lx\n", testname, rc); wfx.nChannels = 2; wfx.nSamplesPerSec = 44100; @@ -1307,7 +1307,7 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I wfx.nBlockAlign = 0; wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); - ok(rc == E_INVALIDARG, "%s: SetFormat: %08x\n", testname, rc); + ok(rc == E_INVALIDARG, "%s: SetFormat: %08lx\n", testname, rc); wfx.nChannels = 2; wfx.nSamplesPerSec = 44100; @@ -1315,7 +1315,7 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; wfx.nAvgBytesPerSec = 0; rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); - ok(rc == E_INVALIDARG, "%s: SetFormat: %08x\n", testname, rc); + ok(rc == E_INVALIDARG, "%s: SetFormat: %08lx\n", testname, rc); wfx.nChannels = 2; wfx.nSamplesPerSec = 44100; @@ -1323,7 +1323,7 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I wfx.nBlockAlign = (wfx.nChannels * wfx.wBitsPerSample / 8) - 1; wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); - ok(rc == E_INVALIDARG, "%s: SetFormat: %08x\n", testname, rc); + ok(rc == E_INVALIDARG, "%s: SetFormat: %08lx\n", testname, rc); wfx.nChannels = 2; wfx.nSamplesPerSec = 44100; @@ -1331,7 +1331,7 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I wfx.nBlockAlign = (wfx.nChannels * wfx.wBitsPerSample / 8) + 1; wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); - ok(rc == E_INVALIDARG, "%s: SetFormat: %08x\n", testname, rc); + ok(rc == E_INVALIDARG, "%s: SetFormat: %08lx\n", testname, rc); wfx.nChannels = 2; wfx.nSamplesPerSec = 44100; @@ -1339,16 +1339,16 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign + 1; rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); - ok(rc == S_OK, "%s: SetFormat: %08x\n", testname, rc); + ok(rc == S_OK, "%s: SetFormat: %08lx\n", testname, rc); rc = IDirectSoundBuffer_GetFormat(got_buf, &wfx, sizeof(wfx), NULL); - ok(rc == S_OK, "%s: GetFormat: %08x\n", testname, rc); + ok(rc == S_OK, "%s: GetFormat: %08lx\n", testname, rc); ok(wfx.wFormatTag == WAVE_FORMAT_PCM, "%s: format: 0x%x\n", testname, wfx.wFormatTag); ok(wfx.nChannels == 2, "%s: channels: %u\n", testname, wfx.nChannels); - ok(wfx.nSamplesPerSec == 44100, "%s: rate: %u\n", testname, wfx.nSamplesPerSec); + ok(wfx.nSamplesPerSec == 44100, "%s: rate: %lu\n", testname, wfx.nSamplesPerSec); ok(wfx.wBitsPerSample == 16, "%s: bps: %u\n", testname, wfx.wBitsPerSample); ok(wfx.nBlockAlign == 4, "%s: blockalign: %u\n", testname, wfx.nBlockAlign); - ok(wfx.nAvgBytesPerSec == 44100 * 4 + 1, "%s: avgbytes: %u\n", testname, wfx.nAvgBytesPerSec); + ok(wfx.nAvgBytesPerSec == 44100 * 4 + 1, "%s: avgbytes: %lu\n", testname, wfx.nAvgBytesPerSec); IDirectSoundBuffer_Release(got_buf); wfx.nChannels = 2; @@ -1357,16 +1357,16 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign - 1; rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); - ok(rc == S_OK, "%s: SetFormat: %08x\n", testname, rc); + ok(rc == S_OK, "%s: SetFormat: %08lx\n", testname, rc); rc = IDirectSoundBuffer_GetFormat(got_buf, &wfx, sizeof(wfx), NULL); - ok(rc == S_OK, "%s: GetFormat: %08x\n", testname, rc); + ok(rc == S_OK, "%s: GetFormat: %08lx\n", testname, rc); ok(wfx.wFormatTag == WAVE_FORMAT_PCM, "%s: format: 0x%x\n", testname, wfx.wFormatTag); ok(wfx.nChannels == 2, "%s: channels: %u\n", testname, wfx.nChannels); - ok(wfx.nSamplesPerSec == 44100, "%s: rate: %u\n", testname, wfx.nSamplesPerSec); + ok(wfx.nSamplesPerSec == 44100, "%s: rate: %lu\n", testname, wfx.nSamplesPerSec); ok(wfx.wBitsPerSample == 16, "%s: bps: %u\n", testname, wfx.wBitsPerSample); ok(wfx.nBlockAlign == 4, "%s: blockalign: %u\n", testname, wfx.nBlockAlign); - ok(wfx.nAvgBytesPerSec == 44100 * 4 - 1, "%s: avgbytes: %u\n", testname, wfx.nAvgBytesPerSec); + ok(wfx.nAvgBytesPerSec == 44100 * 4 - 1, "%s: avgbytes: %lu\n", testname, wfx.nAvgBytesPerSec); IDirectSoundBuffer_Release(got_buf); wfx.nChannels = 2; @@ -1375,16 +1375,16 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign + 1; rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); - ok(rc == S_OK, "%s: SetFormat: %08x\n", testname, rc); + ok(rc == S_OK, "%s: SetFormat: %08lx\n", testname, rc); rc = IDirectSoundBuffer_GetFormat(got_buf, &wfx, sizeof(wfx), NULL); - ok(rc == S_OK, "%s: GetFormat: %08x\n", testname, rc); + ok(rc == S_OK, "%s: GetFormat: %08lx\n", testname, rc); ok(wfx.wFormatTag == WAVE_FORMAT_PCM, "%s: format: 0x%x\n", testname, wfx.wFormatTag); ok(wfx.nChannels == 2, "%s: channels: %u\n", testname, wfx.nChannels); - ok(wfx.nSamplesPerSec == 44100, "%s: rate: %u\n", testname, wfx.nSamplesPerSec); + ok(wfx.nSamplesPerSec == 44100, "%s: rate: %lu\n", testname, wfx.nSamplesPerSec); ok(wfx.wBitsPerSample == 16, "%s: bps: %u\n", testname, wfx.wBitsPerSample); ok(wfx.nBlockAlign == 4, "%s: blockalign: %u\n", testname, wfx.nBlockAlign); - ok(wfx.nAvgBytesPerSec == 44100 * 4 + 1, "%s: avgbytes: %u\n", testname, wfx.nAvgBytesPerSec); + ok(wfx.nAvgBytesPerSec == 44100 * 4 + 1, "%s: avgbytes: %lu\n", testname, wfx.nAvgBytesPerSec); IDirectSoundBuffer_Release(got_buf); if(buf){ @@ -1395,17 +1395,17 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); - ok(rc == S_OK, "%s: SetFormat: %08x\n", testname, rc); + ok(rc == S_OK, "%s: SetFormat: %08lx\n", testname, rc); if(got_buf){ rc = IDirectSoundBuffer_GetFormat(got_buf, &wfx, sizeof(wfx), NULL); - ok(rc == S_OK, "%s: GetFormat: %08x\n", testname, rc); + ok(rc == S_OK, "%s: GetFormat: %08lx\n", testname, rc); ok(wfx.wFormatTag == WAVE_FORMAT_ALAW, "%s: format: 0x%x\n", testname, wfx.wFormatTag); ok(wfx.nChannels == 2, "%s: channels: %u\n", testname, wfx.nChannels); - ok(wfx.nSamplesPerSec == 44100, "%s: rate: %u\n", testname, wfx.nSamplesPerSec); + ok(wfx.nSamplesPerSec == 44100, "%s: rate: %lu\n", testname, wfx.nSamplesPerSec); ok(wfx.wBitsPerSample == 16, "%s: bps: %u\n", testname, wfx.wBitsPerSample); ok(wfx.nBlockAlign == 4, "%s: blockalign: %u\n", testname, wfx.nBlockAlign); - ok(wfx.nAvgBytesPerSec == 44100 * 4, "%s: avgbytes: %u\n", testname, wfx.nAvgBytesPerSec); + ok(wfx.nAvgBytesPerSec == 44100 * 4, "%s: avgbytes: %lu\n", testname, wfx.nAvgBytesPerSec); IDirectSoundBuffer_Release(got_buf); } } @@ -1421,16 +1421,16 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I fmtex.dwChannelMask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; fmtex.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; rc = do_invalid_fmt_test(dso, buf, (WAVEFORMATEX*)&fmtex, &got_buf); - ok(rc == S_OK, "%s: SetFormat: %08x\n", testname, rc); + ok(rc == S_OK, "%s: SetFormat: %08lx\n", testname, rc); rc = IDirectSoundBuffer_GetFormat(got_buf, (WAVEFORMATEX*)&fmtex, sizeof(fmtex), NULL); - ok(rc == S_OK, "%s: GetFormat: %08x\n", testname, rc); + ok(rc == S_OK, "%s: GetFormat: %08lx\n", testname, rc); ok(fmtex.Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE, "%s: format: 0x%x\n", testname, fmtex.Format.wFormatTag); ok(fmtex.Format.nChannels == 2, "%s: channels: %u\n", testname, fmtex.Format.nChannels); - ok(fmtex.Format.nSamplesPerSec == 44100, "%s: rate: %u\n", testname, fmtex.Format.nSamplesPerSec); + ok(fmtex.Format.nSamplesPerSec == 44100, "%s: rate: %lu\n", testname, fmtex.Format.nSamplesPerSec); ok(fmtex.Format.wBitsPerSample == 16, "%s: bps: %u\n", testname, fmtex.Format.wBitsPerSample); ok(fmtex.Format.nBlockAlign == 4, "%s: blockalign: %u\n", testname, fmtex.Format.nBlockAlign); - ok(fmtex.Format.nAvgBytesPerSec == 44100 * 4, "%s: avgbytes: %u\n", testname, fmtex.Format.nAvgBytesPerSec); + ok(fmtex.Format.nAvgBytesPerSec == 44100 * 4, "%s: avgbytes: %lu\n", testname, fmtex.Format.nAvgBytesPerSec); ok(fmtex.Samples.wValidBitsPerSample == 0 || /* <= XP */ fmtex.Samples.wValidBitsPerSample == 16, /* >= Vista */ "%s: validbits: %u\n", testname, fmtex.Samples.wValidBitsPerSample); @@ -1448,16 +1448,16 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I fmtex.dwChannelMask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; fmtex.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; rc = do_invalid_fmt_test(dso, buf, (WAVEFORMATEX*)&fmtex, &got_buf); - ok(rc == S_OK, "%s: SetFormat: %08x\n", testname, rc); + ok(rc == S_OK, "%s: SetFormat: %08lx\n", testname, rc); rc = IDirectSoundBuffer_GetFormat(got_buf, (WAVEFORMATEX*)&fmtex, sizeof(fmtex), NULL); - ok(rc == S_OK, "%s: GetFormat: %08x\n", testname, rc); + ok(rc == S_OK, "%s: GetFormat: %08lx\n", testname, rc); ok(fmtex.Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE, "%s: format: 0x%x\n", testname, fmtex.Format.wFormatTag); ok(fmtex.Format.nChannels == 2, "%s: channels: %u\n", testname, fmtex.Format.nChannels); - ok(fmtex.Format.nSamplesPerSec == 44100, "%s: rate: %u\n", testname, fmtex.Format.nSamplesPerSec); + ok(fmtex.Format.nSamplesPerSec == 44100, "%s: rate: %lu\n", testname, fmtex.Format.nSamplesPerSec); ok(fmtex.Format.wBitsPerSample == 24, "%s: bps: %u\n", testname, fmtex.Format.wBitsPerSample); ok(fmtex.Format.nBlockAlign == 6, "%s: blockalign: %u\n", testname, fmtex.Format.nBlockAlign); - ok(fmtex.Format.nAvgBytesPerSec == 44100 * 6, "%s: avgbytes: %u\n", testname, fmtex.Format.nAvgBytesPerSec); + ok(fmtex.Format.nAvgBytesPerSec == 44100 * 6, "%s: avgbytes: %lu\n", testname, fmtex.Format.nAvgBytesPerSec); ok(fmtex.Samples.wValidBitsPerSample == 20, "%s: validbits: %u\n", testname, fmtex.Samples.wValidBitsPerSample); ok(IsEqualGUID(&fmtex.SubFormat, &KSDATAFORMAT_SUBTYPE_PCM), "%s: subtype incorrect\n", testname); IDirectSoundBuffer_Release(got_buf); @@ -1473,7 +1473,7 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I fmtex.dwChannelMask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; fmtex.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; rc = do_invalid_fmt_test(dso, buf, (WAVEFORMATEX*)&fmtex, &got_buf); - ok(rc == E_INVALIDARG, "%s: SetFormat: %08x\n", testname, rc); + ok(rc == E_INVALIDARG, "%s: SetFormat: %08lx\n", testname, rc); } static HRESULT test_invalid_fmts(LPGUID lpGuid) @@ -1486,14 +1486,14 @@ static HRESULT test_invalid_fmts(LPGUID lpGuid) /* Create the DirectSound object */ rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, - "DirectSoundCreate() failed: %08x\n",rc); + "DirectSoundCreate() failed: %08lx\n",rc); if (rc!=DS_OK) return rc; /* We must call SetCooperativeLevel before creating primary buffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08lx\n", rc); if (rc!=DS_OK){ IDirectSound_Release(dso); return rc; @@ -1504,7 +1504,7 @@ static HRESULT test_invalid_fmts(LPGUID lpGuid) bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&buffer,NULL); ok(rc==DS_OK && buffer!=NULL,"IDirectSound_CreateSoundBuffer() failed " - "to create a primary buffer %08x\n",rc); + "to create a primary buffer %08lx\n",rc); if (rc==DS_OK && buffer!=NULL) { perform_invalid_fmt_tests("primary", dso, buffer); IDirectSoundBuffer_Release(buffer); @@ -1532,12 +1532,12 @@ static void test_notifications(LPGUID lpGuid) rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc == DS_OK || rc == DSERR_NODRIVER || rc == DSERR_ALLOCATED, - "DirectSoundCreate() failed: %08x\n", rc); + "DirectSoundCreate() failed: %08lx\n", rc); if(rc != DS_OK) return; rc = IDirectSound_SetCooperativeLevel(dso, get_hwnd(), DSSCL_PRIORITY); - ok(rc == DS_OK, "IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc == DS_OK, "IDirectSound_SetCooperativeLevel() failed: %08lx\n", rc); if(rc != DS_OK){ IDirectSound_Release(dso); return; @@ -1558,10 +1558,10 @@ static void test_notifications(LPGUID lpGuid) bufdesc.lpwfxFormat = &wfx; rc = IDirectSound_CreateSoundBuffer(dso, &bufdesc, &buf, NULL); ok(rc == DS_OK && buf != NULL, "IDirectSound_CreateSoundBuffer() failed " - "to create a buffer %08x\n", rc); + "to create a buffer %08lx\n", rc); rc = IDirectSoundBuffer_QueryInterface(buf, &IID_IDirectSoundNotify, (void**)&buf_notif); - ok(rc == E_NOINTERFACE, "QueryInterface(IID_IDirectSoundNotify): %08x\n", rc); + ok(rc == E_NOINTERFACE, "QueryInterface(IID_IDirectSoundNotify): %08lx\n", rc); IDirectSoundBuffer_Release(buf); ZeroMemory(&bufdesc, sizeof(bufdesc)); @@ -1571,10 +1571,10 @@ static void test_notifications(LPGUID lpGuid) bufdesc.lpwfxFormat = &wfx; rc = IDirectSound_CreateSoundBuffer(dso, &bufdesc, &buf, NULL); ok(rc == DS_OK && buf != NULL, "IDirectSound_CreateSoundBuffer() failed " - "to create a buffer %08x\n", rc); + "to create a buffer %08lx\n", rc); rc = IDirectSoundBuffer_QueryInterface(buf, &IID_IDirectSoundNotify, (void**)&buf_notif); - ok(rc == DS_OK, "QueryInterface(IID_IDirectSoundNotify): %08x\n", rc); + ok(rc == DS_OK, "QueryInterface(IID_IDirectSoundNotify): %08lx\n", rc); notifies[0].dwOffset = 0; handles[0] = notifies[0].hEventNotify = CreateEventW(NULL, FALSE, FALSE, NULL); @@ -1582,12 +1582,12 @@ static void test_notifications(LPGUID lpGuid) handles[1] = notifies[1].hEventNotify = CreateEventW(NULL, FALSE, FALSE, NULL); rc = IDirectSoundNotify_SetNotificationPositions(buf_notif, 2, notifies); - ok(rc == DS_OK, "SetNotificationPositions: %08x\n", rc); + ok(rc == DS_OK, "SetNotificationPositions: %08lx\n", rc); IDirectSoundNotify_Release(buf_notif); rc = IDirectSoundBuffer_Play(buf, 0, 0, DSBPLAY_LOOPING); - ok(rc == DS_OK, "Play: %08x\n", rc); + ok(rc == DS_OK, "Play: %08lx\n", rc); expect = 0; for(cycles = 0; cycles < 6 /* 1.5s */; ++cycles){ @@ -1595,21 +1595,21 @@ static void test_notifications(LPGUID lpGuid) wait = WaitForMultipleObjects(2, handles, FALSE, 1000); ok(wait <= WAIT_OBJECT_0 + 1 && wait - WAIT_OBJECT_0 == expect, - "Got unexpected notification order or timeout: %u\n", wait); + "Got unexpected notification order or timeout: %lu\n", wait); rc = IDirectSoundBuffer_GetStatus(buf, &status); - ok(rc == DS_OK,"Failed %08x\n",rc); - ok(status == (DSBSTATUS_PLAYING | DSBSTATUS_LOOPING),"got %08x\n", status); + ok(rc == DS_OK,"Failed %08lx\n",rc); + ok(status == (DSBSTATUS_PLAYING | DSBSTATUS_LOOPING),"got %08lx\n", status); expect = !expect; } rc = IDirectSoundBuffer_Stop(buf); - ok(rc == DS_OK, "Stop: %08x\n", rc); + ok(rc == DS_OK, "Stop: %08lx\n", rc); rc = IDirectSoundBuffer_GetStatus(buf, &status); - ok(rc == DS_OK,"Failed %08x\n",rc); - ok(status == 0,"got %08x\n", status); + ok(rc == DS_OK,"Failed %08lx\n",rc); + ok(status == 0,"got %08lx\n", status); CloseHandle(notifies[0].hEventNotify); CloseHandle(notifies[1].hEventNotify); @@ -1658,7 +1658,7 @@ static void dsound_tests(void) { HRESULT rc; rc = DirectSoundEnumerateA(&dsenum_callback, NULL); - ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08x\n",rc); + ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08lx\n",rc); } static void test_hw_buffers(void) @@ -1675,16 +1675,16 @@ static void test_hw_buffers(void) hr = DirectSoundCreate(NULL, &ds, NULL); ok(hr == S_OK || hr == DSERR_NODRIVER || hr == DSERR_ALLOCATED || hr == E_FAIL, - "DirectSoundCreate failed: %08x\n", hr); + "DirectSoundCreate failed: %08lx\n", hr); if(hr != S_OK) return; caps.dwSize = sizeof(caps); hr = IDirectSound_GetCaps(ds, &caps); - ok(hr == S_OK, "GetCaps failed: %08x\n", hr); + ok(hr == S_OK, "GetCaps failed: %08lx\n", hr); - ok(caps.dwPrimaryBuffers == 1, "Got wrong number of primary buffers: %u\n", + ok(caps.dwPrimaryBuffers == 1, "Got wrong number of primary buffers: %lu\n", caps.dwPrimaryBuffers); /* DSBCAPS_LOC* is ignored for primary buffers */ @@ -1697,7 +1697,7 @@ static void test_hw_buffers(void) bufdesc.guid3DAlgorithm = GUID_NULL; hr = IDirectSound_CreateSoundBuffer(ds, &bufdesc, &primary, NULL); - ok(hr == S_OK, "CreateSoundBuffer failed: %08x\n", hr); + ok(hr == S_OK, "CreateSoundBuffer failed: %08lx\n", hr); if(hr != S_OK){ IDirectSound_Release(ds); return; @@ -1707,7 +1707,7 @@ static void test_hw_buffers(void) DSBCAPS_PRIMARYBUFFER; hr = IDirectSound_CreateSoundBuffer(ds, &bufdesc, &primary2, NULL); - ok(hr == S_OK, "CreateSoundBuffer failed: %08x\n", hr); + ok(hr == S_OK, "CreateSoundBuffer failed: %08lx\n", hr); ok(primary == primary2, "Got different primary buffers: %p, %p\n", primary, primary2); if(hr == S_OK) IDirectSoundBuffer_Release(primary2); @@ -1715,7 +1715,7 @@ static void test_hw_buffers(void) buf8 = (IDirectSoundBuffer8 *)0xDEADBEEF; hr = IDirectSoundBuffer_QueryInterface(primary, &IID_IDirectSoundBuffer8, (void**)&buf8); - ok(hr == E_NOINTERFACE, "QueryInterface gave wrong failure: %08x\n", hr); + ok(hr == E_NOINTERFACE, "QueryInterface gave wrong failure: %08lx\n", hr); ok(buf8 == NULL, "Pointer didn't get set to NULL\n"); fmt.wFormatTag = WAVE_FORMAT_PCM; @@ -1735,21 +1735,21 @@ static void test_hw_buffers(void) sizeof(IDirectSoundBuffer *) * caps.dwMaxHwMixingAllBuffers); /* try to fill all of the hw buffers */ - trace("dwMaxHwMixingAllBuffers: %u\n", caps.dwMaxHwMixingAllBuffers); - trace("dwMaxHwMixingStaticBuffers: %u\n", caps.dwMaxHwMixingStaticBuffers); - trace("dwMaxHwMixingStreamingBuffers: %u\n", caps.dwMaxHwMixingStreamingBuffers); + trace("dwMaxHwMixingAllBuffers: %lu\n", caps.dwMaxHwMixingAllBuffers); + trace("dwMaxHwMixingStaticBuffers: %lu\n", caps.dwMaxHwMixingStaticBuffers); + trace("dwMaxHwMixingStreamingBuffers: %lu\n", caps.dwMaxHwMixingStreamingBuffers); for(i = 0; i < caps.dwMaxHwMixingAllBuffers; ++i){ hr = IDirectSound_CreateSoundBuffer(ds, &bufdesc, &secondaries[i], NULL); ok(hr == S_OK || hr == E_NOTIMPL || broken(hr == DSERR_CONTROLUNAVAIL) || broken(hr == E_FAIL), - "CreateSoundBuffer(%u) failed: %08x\n", i, hr); + "CreateSoundBuffer(%u) failed: %08lx\n", i, hr); if(hr != S_OK) break; bufcaps.dwSize = sizeof(bufcaps); hr = IDirectSoundBuffer_GetCaps(secondaries[i], &bufcaps); - ok(hr == S_OK, "GetCaps failed: %08x\n", hr); + ok(hr == S_OK, "GetCaps failed: %08lx\n", hr); ok((bufcaps.dwFlags & DSBCAPS_LOCHARDWARE) != 0, - "Buffer wasn't allocated in hardware, dwFlags: %x\n", bufcaps.dwFlags); + "Buffer wasn't allocated in hardware, dwFlags: %lx\n", bufcaps.dwFlags); } /* see if we can create one more */ @@ -1760,7 +1760,7 @@ static void test_hw_buffers(void) broken(hr == DSERR_CONTROLUNAVAIL) || /* vmware winxp, others? */ broken(hr == E_FAIL) || /* broken AC97 driver */ broken(hr == S_OK) /* broken driver allows more hw bufs than dscaps claims */, - "CreateSoundBuffer(%u) gave wrong error: %08x\n", i, hr); + "CreateSoundBuffer(%u) gave wrong error: %08lx\n", i, hr); if(hr == S_OK) IDirectSoundBuffer_Release(secondary); diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index e3adbfbe70e..70db008a0df 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -70,18 +70,18 @@ static void IDirectSound8_test(LPDIRECTSOUND8 dso, BOOL initialized, /* Try to Query for objects */ rc=IDirectSound8_QueryInterface(dso,&IID_IUnknown,(LPVOID*)&unknown); - ok(rc==DS_OK,"IDirectSound8_QueryInterface(IID_IUnknown) failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound8_QueryInterface(IID_IUnknown) failed: %08lx\n", rc); if (rc==DS_OK) IUnknown_Release(unknown); rc=IDirectSound8_QueryInterface(dso,&IID_IDirectSound,(LPVOID*)&ds); - ok(rc==DS_OK,"IDirectSound8_QueryInterface(IID_IDirectSound) failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound8_QueryInterface(IID_IDirectSound) failed: %08lx\n", rc); if (rc==DS_OK) IDirectSound_Release(ds); rc=IDirectSound8_QueryInterface(dso,&IID_IDirectSound8,(LPVOID*)&ds8); ok(rc==DS_OK,"IDirectSound8_QueryInterface(IID_IDirectSound8) " - "should have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "should have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc); if (rc==DS_OK) IDirectSound8_Release(ds8); @@ -89,27 +89,27 @@ static void IDirectSound8_test(LPDIRECTSOUND8 dso, BOOL initialized, /* try uninitialized object */ rc=IDirectSound8_GetCaps(dso,0); ok(rc==DSERR_UNINITIALIZED,"IDirectSound8_GetCaps(NULL) " - "should have returned DSERR_UNINITIALIZED, returned: %08x\n", rc); + "should have returned DSERR_UNINITIALIZED, returned: %08lx\n", rc); rc=IDirectSound8_GetCaps(dso,&dscaps); ok(rc==DSERR_UNINITIALIZED,"IDirectSound8_GetCaps() " - "should have returned DSERR_UNINITIALIZED, returned: %08x\n", rc); + "should have returned DSERR_UNINITIALIZED, returned: %08lx\n", rc); rc=IDirectSound8_Compact(dso); ok(rc==DSERR_UNINITIALIZED,"IDirectSound8_Compact() " - "should have returned DSERR_UNINITIALIZED, returned: %08x\n", rc); + "should have returned DSERR_UNINITIALIZED, returned: %08lx\n", rc); rc=IDirectSound8_GetSpeakerConfig(dso,&speaker_config); ok(rc==DSERR_UNINITIALIZED,"IDirectSound8_GetSpeakerConfig() " - "should have returned DSERR_UNINITIALIZED, returned: %08x\n", rc); + "should have returned DSERR_UNINITIALIZED, returned: %08lx\n", rc); rc=IDirectSound8_VerifyCertification(dso, &certified); ok(rc==DSERR_UNINITIALIZED,"IDirectSound8_VerifyCertification() " - "should have returned DSERR_UNINITIALIZED, returned: %08x\n", rc); + "should have returned DSERR_UNINITIALIZED, returned: %08lx\n", rc); rc=IDirectSound8_Initialize(dso,lpGuid); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, - "IDirectSound8_Initialize() failed: %08x\n",rc); + "IDirectSound8_Initialize() failed: %08lx\n",rc); if (rc==DSERR_NODRIVER) { trace(" No Driver\n"); goto EXIT; @@ -124,41 +124,41 @@ static void IDirectSound8_test(LPDIRECTSOUND8 dso, BOOL initialized, rc=IDirectSound8_Initialize(dso,lpGuid); ok(rc==DSERR_ALREADYINITIALIZED, "IDirectSound8_Initialize() " - "should have returned DSERR_ALREADYINITIALIZED: %08x\n", rc); + "should have returned DSERR_ALREADYINITIALIZED: %08lx\n", rc); /* DSOUND: Error: Invalid caps buffer */ rc=IDirectSound8_GetCaps(dso,0); ok(rc==DSERR_INVALIDPARAM,"IDirectSound8_GetCaps() " - "should have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "should have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc); ZeroMemory(&dscaps, sizeof(dscaps)); /* DSOUND: Error: Invalid caps buffer */ rc=IDirectSound8_GetCaps(dso,&dscaps); ok(rc==DSERR_INVALIDPARAM,"IDirectSound8_GetCaps() " - "should have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "should have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc); dscaps.dwSize=sizeof(dscaps); /* DSOUND: Running on a certified driver */ rc=IDirectSound8_GetCaps(dso,&dscaps); - ok(rc==DS_OK,"IDirectSound8_GetCaps() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound8_GetCaps() failed: %08lx\n",rc); rc=IDirectSound8_Compact(dso); - ok(rc==DSERR_PRIOLEVELNEEDED,"IDirectSound8_Compact() failed: %08x\n", rc); + ok(rc==DSERR_PRIOLEVELNEEDED,"IDirectSound8_Compact() failed: %08lx\n", rc); rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08lx\n", rc); rc=IDirectSound8_Compact(dso); - ok(rc==DS_OK,"IDirectSound8_Compact() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound8_Compact() failed: %08lx\n",rc); rc=IDirectSound8_GetSpeakerConfig(dso,0); ok(rc==DSERR_INVALIDPARAM,"IDirectSound8_GetSpeakerConfig(NULL) " - "should have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "should have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc); rc=IDirectSound8_GetSpeakerConfig(dso,&speaker_config); - ok(rc==DS_OK,"IDirectSound8_GetSpeakerConfig() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound8_GetSpeakerConfig() failed: %08lx\n", rc); ref_speaker_config = speaker_config; speaker_config = DSSPEAKER_COMBINED(DSSPEAKER_STEREO, @@ -168,20 +168,20 @@ static void IDirectSound8_test(LPDIRECTSOUND8 dso, BOOL initialized, DSSPEAKER_GEOMETRY_NARROW); if(rc==DS_OK) { rc=IDirectSound8_SetSpeakerConfig(dso,speaker_config); - ok(rc==DS_OK,"IDirectSound8_SetSpeakerConfig() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound8_SetSpeakerConfig() failed: %08lx\n", rc); } if (rc==DS_OK) { rc=IDirectSound8_GetSpeakerConfig(dso,&new_speaker_config); - ok(rc==DS_OK,"IDirectSound8_GetSpeakerConfig() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound8_GetSpeakerConfig() failed: %08lx\n", rc); if (rc==DS_OK && speaker_config!=new_speaker_config && ref_speaker_config!=new_speaker_config) trace("IDirectSound8_GetSpeakerConfig() failed to set speaker " - "config: expected 0x%08x or 0x%08x, got 0x%08x\n", + "config: expected 0x%08lx or 0x%08lx, got 0x%08lx\n", speaker_config,ref_speaker_config,new_speaker_config); IDirectSound8_SetSpeakerConfig(dso,ref_speaker_config); } rc=IDirectSound8_VerifyCertification(dso, &certified); - ok(rc==DS_OK||rc==E_NOTIMPL,"IDirectSound8_VerifyCertification() failed: %08x\n", rc); + ok(rc==DS_OK||rc==E_NOTIMPL,"IDirectSound8_VerifyCertification() failed: %08lx\n", rc); EXIT: ref=IDirectSound8_Release(dso); @@ -199,17 +199,17 @@ static void IDirectSound8_tests(void) rc=CoGetClassObject(&CLSID_DirectSound8, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void**)&cf); ok(rc==S_OK,"CoGetClassObject(CLSID_DirectSound8, IID_IClassFactory) " - "failed: %08x\n", rc); + "failed: %08lx\n", rc); rc=CoGetClassObject(&CLSID_DirectSound8, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&cf); ok(rc==S_OK,"CoGetClassObject(CLSID_DirectSound8, IID_IUnknown) " - "failed: %08x\n", rc); + "failed: %08lx\n", rc); /* try the COM class factory method of creation with no device specified */ rc=CoCreateInstance(&CLSID_DirectSound8, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSound8, (void**)&dso); - ok(rc==S_OK||rc==REGDB_E_CLASSNOTREG,"CoCreateInstance() failed: %08x\n", rc); + ok(rc==S_OK||rc==REGDB_E_CLASSNOTREG,"CoCreateInstance() failed: %08lx\n", rc); if (rc==REGDB_E_CLASSNOTREG) { trace(" Class Not Registered\n"); return; @@ -221,7 +221,7 @@ static void IDirectSound8_tests(void) * device specified */ rc=CoCreateInstance(&CLSID_DirectSound8, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSound8, (void**)&dso); - ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSound8) failed: %08x\n", rc); + ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSound8) failed: %08lx\n", rc); if (dso) IDirectSound8_test(dso, FALSE, &DSDEVID_DefaultPlayback); @@ -229,7 +229,7 @@ static void IDirectSound8_tests(void) * playback device specified */ rc=CoCreateInstance(&CLSID_DirectSound8, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSound8, (void**)&dso); - ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSound8) failed: %08x\n", rc); + ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSound8) failed: %08lx\n", rc); if (dso) IDirectSound8_test(dso, FALSE, &DSDEVID_DefaultVoicePlayback); @@ -239,7 +239,7 @@ static void IDirectSound8_tests(void) &CLSID_DirectSoundPrivate, (void**)&dso); ok(rc==E_NOINTERFACE, "CoCreateInstance(CLSID_DirectSound8,CLSID_DirectSoundPrivate) " - "should have failed: %08x\n",rc); + "should have failed: %08lx\n",rc); /* try the COM class factory method of creation with a bad * GUID and IID specified */ @@ -247,33 +247,33 @@ static void IDirectSound8_tests(void) &IID_IDirectSound8, (void**)&dso); ok(rc==REGDB_E_CLASSNOTREG, "CoCreateInstance(CLSID_DirectSoundPrivate,IID_IDirectSound8) " - "should have failed: %08x\n",rc); + "should have failed: %08lx\n",rc); /* try with no device specified */ rc = DirectSoundCreate8(NULL, &dso, NULL); ok(rc==S_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, - "DirectSoundCreate8() failed: %08x\n",rc); + "DirectSoundCreate8() failed: %08lx\n",rc); if (rc==DS_OK && dso) IDirectSound8_test(dso, TRUE, NULL); /* try with default playback device specified */ rc = DirectSoundCreate8(&DSDEVID_DefaultPlayback, &dso, NULL); ok(rc==S_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, - "DirectSoundCreate8() failed: %08x\n",rc); + "DirectSoundCreate8() failed: %08lx\n",rc); if (rc==DS_OK && dso) IDirectSound8_test(dso, TRUE, NULL); /* try with default voice playback device specified */ rc = DirectSoundCreate8(&DSDEVID_DefaultVoicePlayback, &dso, NULL); ok(rc==S_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, - "DirectSoundCreate8() failed: %08x\n",rc); + "DirectSoundCreate8() failed: %08lx\n",rc); if (rc==DS_OK && dso) IDirectSound8_test(dso, TRUE, NULL); /* try with a bad device specified */ rc = DirectSoundCreate8(&DSDEVID_DefaultVoiceCapture, &dso, NULL); ok(rc==DSERR_NODRIVER,"DirectSoundCreate8(DSDEVID_DefaultVoiceCapture) " - "should have failed: %08x\n",rc); + "should have failed: %08lx\n",rc); } static HRESULT test_dsound8(LPGUID lpGuid) @@ -285,12 +285,12 @@ static HRESULT test_dsound8(LPGUID lpGuid) /* DSOUND: Error: Invalid interface buffer */ rc = DirectSoundCreate8(lpGuid, 0, NULL); ok(rc==DSERR_INVALIDPARAM,"DirectSoundCreate8() should have returned " - "DSERR_INVALIDPARAM, returned: %08x\n",rc); + "DSERR_INVALIDPARAM, returned: %08lx\n",rc); /* Create the DirectSound8 object */ rc = DirectSoundCreate8(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, - "DirectSoundCreate8() failed: %08x\n",rc); + "DirectSoundCreate8() failed: %08lx\n",rc); if (rc!=DS_OK) return rc; @@ -300,19 +300,19 @@ static HRESULT test_dsound8(LPGUID lpGuid) /* Try the COM class factory method of creation with enumerated device */ rc=CoCreateInstance(&CLSID_DirectSound8, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSound8, (void**)&dso); - ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSound) failed: %08x\n", rc); + ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSound) failed: %08lx\n", rc); if (dso) IDirectSound8_test(dso, FALSE, lpGuid); /* Create a DirectSound8 object */ rc = DirectSoundCreate8(lpGuid, &dso, NULL); - ok(rc==DS_OK,"DirectSoundCreate8() failed: %08x\n",rc); + ok(rc==DS_OK,"DirectSoundCreate8() failed: %08lx\n",rc); if (rc==DS_OK) { LPDIRECTSOUND8 dso1=NULL; /* Create a second DirectSound8 object */ rc = DirectSoundCreate8(lpGuid, &dso1, NULL); - ok(rc==DS_OK,"DirectSoundCreate8() failed: %08x\n",rc); + ok(rc==DS_OK,"DirectSoundCreate8() failed: %08lx\n",rc); if (rc==DS_OK) { /* Release the second DirectSound8 object */ ref=IDirectSound8_Release(dso1); @@ -333,7 +333,7 @@ static HRESULT test_dsound8(LPGUID lpGuid) /* Create a DirectSound8 object */ rc = DirectSoundCreate8(lpGuid, &dso, NULL); - ok(rc==DS_OK,"DirectSoundCreate8() failed: %08x\n",rc); + ok(rc==DS_OK,"DirectSoundCreate8() failed: %08lx\n",rc); if (rc==DS_OK) { LPDIRECTSOUNDBUFFER secondary; DSBUFFERDESC bufdesc; @@ -349,7 +349,7 @@ static HRESULT test_dsound8(LPGUID lpGuid) rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DS_OK && secondary!=NULL, "IDirectSound8_CreateSoundBuffer() failed to create a secondary " - "buffer: %08x\n",rc); + "buffer: %08lx\n",rc); if (rc==DS_OK && secondary!=NULL) { LPDIRECTSOUND3DBUFFER buffer3d; LPDIRECTSOUNDBUFFER8 buffer8; @@ -357,7 +357,7 @@ static HRESULT test_dsound8(LPGUID lpGuid) &IID_IDirectSound3DBuffer, (void **)&buffer3d); ok(rc==DS_OK && buffer3d!=NULL, - "IDirectSound8_QueryInterface() failed: %08x\n", rc); + "IDirectSound8_QueryInterface() failed: %08lx\n", rc); if (rc==DS_OK && buffer3d!=NULL) { ref=IDirectSound3DBuffer_AddRef(buffer3d); ok(ref==2,"IDirectSound3DBuffer_AddRef() has %d references, " @@ -403,7 +403,7 @@ static HRESULT test_primary8(LPGUID lpGuid) /* Create the DirectSound object */ rc = DirectSoundCreate8(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, - "DirectSoundCreate8() failed: %08x\n",rc); + "DirectSoundCreate8() failed: %08lx\n",rc); if (rc!=DS_OK) return rc; @@ -411,7 +411,7 @@ static HRESULT test_primary8(LPGUID lpGuid) ZeroMemory(&dscaps, sizeof(dscaps)); dscaps.dwSize=sizeof(dscaps); rc=IDirectSound8_GetCaps(dso,&dscaps); - ok(rc==DS_OK,"IDirectSound8_GetCaps() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound8_GetCaps() failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT; @@ -419,13 +419,13 @@ static HRESULT test_primary8(LPGUID lpGuid) rc=IDirectSound8_CreateSoundBuffer(dso,0,0,NULL); ok(rc==DSERR_INVALIDPARAM, "IDirectSound8_CreateSoundBuffer should have returned " - "DSERR_INVALIDPARAM, returned: %08x\n",rc); + "DSERR_INVALIDPARAM, returned: %08lx\n",rc); /* DSOUND: Error: Invalid buffer description pointer */ rc=IDirectSound8_CreateSoundBuffer(dso,0,&primary,NULL); ok(rc==DSERR_INVALIDPARAM && primary==0, "IDirectSound8_CreateSoundBuffer() should have returned " - "DSERR_INVALIDPARAM, returned: rc=%08x,dsbo=%p\n", + "DSERR_INVALIDPARAM, returned: rc=%08lx,dsbo=%p\n", rc,primary); ZeroMemory(&bufdesc, sizeof(bufdesc)); @@ -434,7 +434,7 @@ static HRESULT test_primary8(LPGUID lpGuid) /* DSOUND: Error: Invalid dsound buffer interface pointer */ rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,0,NULL); ok(rc==DSERR_INVALIDPARAM && primary==0, - "IDirectSound8_CreateSoundBuffer() should have failed: rc=%08x," + "IDirectSound8_CreateSoundBuffer() should have failed: rc=%08lx," "dsbo=%p\n",rc,primary); ZeroMemory(&bufdesc, sizeof(bufdesc)); @@ -443,13 +443,13 @@ static HRESULT test_primary8(LPGUID lpGuid) /* DSOUND: Error: Invalid buffer description */ rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DSERR_INVALIDPARAM && primary==0, - "IDirectSound8_CreateSoundBuffer() should have failed: rc=%08x," + "IDirectSound8_CreateSoundBuffer() should have failed: rc=%08lx," "primary=%p\n",rc,primary); /* We must call SetCooperativeLevel before calling CreateSoundBuffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08lx\n", rc); if (rc!=DS_OK) goto EXIT; @@ -462,7 +462,7 @@ static HRESULT test_primary8(LPGUID lpGuid) init_format(&wfx,WAVE_FORMAT_PCM,11025,8,2); rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DSERR_INVALIDPARAM,"IDirectSound8_CreateSoundBuffer() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n", rc); if (rc==DS_OK && primary!=NULL) IDirectSoundBuffer_Release(primary); @@ -473,7 +473,7 @@ static HRESULT test_primary8(LPGUID lpGuid) rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok((rc==DS_OK && primary!=NULL) || (rc==DSERR_CONTROLUNAVAIL), "IDirectSound8_CreateSoundBuffer() failed to create a primary buffer: " - "%08x\n",rc); + "%08lx\n",rc); if (rc==DSERR_CONTROLUNAVAIL) trace(" No Primary\n"); else if (rc==DS_OK && primary!=NULL) { @@ -485,7 +485,7 @@ static HRESULT test_primary8(LPGUID lpGuid) rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&second,NULL); ok(rc==DS_OK && second==primary, "IDirectSound8_CreateSoundBuffer() should have returned original " - "primary buffer: %08x\n",rc); + "primary buffer: %08lx\n",rc); ref=IDirectSoundBuffer_Release(second); ok(ref==1,"IDirectSoundBuffer_Release() primary has %d references, " "should have 1\n",ref); @@ -495,19 +495,19 @@ static HRESULT test_primary8(LPGUID lpGuid) rc=IDirectSound8_DuplicateSoundBuffer(dso,primary,&third); /* rc=0x88780032 */ ok(rc!=DS_OK,"IDirectSound8_DuplicateSoundBuffer() primary buffer " - "should have failed %08x\n",rc); + "should have failed %08lx\n",rc); /* Primary buffers don't have an IDirectSoundBuffer8 */ rc = IDirectSoundBuffer_QueryInterface(primary, &IID_IDirectSoundBuffer8, (LPVOID*)&pb8); - ok(FAILED(rc), "Primary buffer does have an IDirectSoundBuffer8: %08x\n", rc); + ok(FAILED(rc), "Primary buffer does have an IDirectSoundBuffer8: %08lx\n", rc); rc=IDirectSoundBuffer_GetVolume(primary,&vol); - ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume() failed: %08lx\n", rc); if (winetest_interactive) { trace("Playing a 5 seconds reference tone at the current volume.\n"); if (rc==DS_OK) - trace("(the current volume is %d according to DirectSound)\n", + trace("(the current volume is %ld according to DirectSound)\n", vol); trace("All subsequent tones should be identical to this one.\n"); trace("Listen for stutter, changes in pitch, volume, etc.\n"); @@ -524,7 +524,7 @@ static HRESULT test_primary8(LPGUID lpGuid) /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); - ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08lx\n", rc); EXIT: ref=IDirectSound8_Release(dso); @@ -553,7 +553,7 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) /* Create the DirectSound object */ rc = DirectSoundCreate8(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, - "DirectSoundCreate8() failed: %08x\n",rc); + "DirectSoundCreate8() failed: %08lx\n",rc); if (rc!=DS_OK) return rc; @@ -561,14 +561,14 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) ZeroMemory(&dscaps, sizeof(dscaps)); dscaps.dwSize=sizeof(dscaps); rc=IDirectSound8_GetCaps(dso,&dscaps); - ok(rc==DS_OK,"IDirectSound8_GetCaps() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound8_GetCaps() failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT; /* We must call SetCooperativeLevel before creating primary buffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08lx\n", rc); if (rc!=DS_OK) goto EXIT; @@ -578,7 +578,7 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DS_OK && primary!=NULL, "IDirectSound8_CreateSoundBuffer() failed to create a primary buffer " - "%08x\n",rc); + "%08lx\n",rc); if (rc==DS_OK && primary!=NULL) { for (f = 0; f < ARRAY_SIZE(formats); f++) { @@ -592,7 +592,7 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) /* DSOUND: Setting DirectSound cooperative level to * DSSCL_PRIORITY */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08lx\n", rc); if (rc!=DS_OK) goto EXIT; @@ -602,7 +602,7 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) rc=IDirectSoundBuffer_SetFormat(primary,&wfx); ok(rc==DS_OK || rc==DSERR_INVALIDPARAM, /* 2003 */ - "IDirectSoundBuffer_SetFormat(%s) failed: %08x\n", + "IDirectSoundBuffer_SetFormat(%s) failed: %08lx\n", format_string(&wfx), rc); /* There is no guarantee that SetFormat will actually change the @@ -610,17 +610,17 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) * supports. So we must re-query the format. */ rc=IDirectSoundBuffer_GetFormat(primary,&wfx,sizeof(wfx),NULL); - ok(rc==DS_OK,"IDirectSoundBuffer_GetFormat() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetFormat() failed: %08lx\n", rc); if (rc==DS_OK && (wfx.wFormatTag!=wfx2.wFormatTag || wfx.nSamplesPerSec!=wfx2.nSamplesPerSec || wfx.wBitsPerSample!=wfx2.wBitsPerSample || wfx.nChannels!=wfx2.nChannels)) { - trace("Requested primary format tag=0x%04x %dx%dx%d " - "avg.B/s=%d align=%d\n", + trace("Requested primary format tag=0x%04x %ldx%dx%d " + "avg.B/s=%ld align=%d\n", wfx2.wFormatTag,wfx2.nSamplesPerSec,wfx2.wBitsPerSample, wfx2.nChannels,wfx2.nAvgBytesPerSec,wfx2.nBlockAlign); - trace("Got tag=0x%04x %dx%dx%d avg.B/s=%d align=%d\n", + trace("Got tag=0x%04x %ldx%dx%d avg.B/s=%ld align=%d\n", wfx.wFormatTag,wfx.nSamplesPerSec,wfx.wBitsPerSample, wfx.nChannels,wfx.nAvgBytesPerSec,wfx.nBlockAlign); } @@ -628,7 +628,7 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); - ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08lx\n", rc); init_format(&wfx2,WAVE_FORMAT_PCM,11025,16,2); @@ -640,15 +640,15 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) wfx.nBlockAlign); bufdesc.lpwfxFormat=&wfx2; if (winetest_interactive) { - trace(" Testing a primary buffer at %dx%dx%d (fmt=%d) with a " - "secondary buffer at %dx%dx%d\n", + trace(" Testing a primary buffer at %ldx%dx%d (fmt=%d) with a " + "secondary buffer at %ldx%dx%d\n", wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels,format_tags[tag], wfx2.nSamplesPerSec,wfx2.wBitsPerSample,wfx2.nChannels); } rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DS_OK && secondary!=NULL, "IDirectSound_CreateSoundBuffer() failed to create a secondary " - "buffer %08x\n",rc); + "buffer %08lx\n",rc); if (rc==DS_OK && secondary!=NULL) { test_buffer8(dso,&secondary,FALSE,FALSE,0,FALSE,0, @@ -669,7 +669,7 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); - ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08lx\n", rc); EXIT: ref=IDirectSound8_Release(dso); @@ -694,7 +694,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) /* Create the DirectSound object */ rc = DirectSoundCreate8(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, - "DirectSoundCreate8() failed: %08x\n",rc); + "DirectSoundCreate8() failed: %08lx\n",rc); if (rc!=DS_OK) return rc; @@ -702,14 +702,14 @@ static HRESULT test_secondary8(LPGUID lpGuid) ZeroMemory(&dscaps, sizeof(dscaps)); dscaps.dwSize=sizeof(dscaps); rc=IDirectSound8_GetCaps(dso,&dscaps); - ok(rc==DS_OK,"IDirectSound8_GetCaps() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound8_GetCaps() failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT; /* We must call SetCooperativeLevel before creating primary buffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08lx\n", rc); if (rc!=DS_OK) goto EXIT; @@ -719,11 +719,11 @@ static HRESULT test_secondary8(LPGUID lpGuid) rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DS_OK && primary!=NULL, "IDirectSound8_CreateSoundBuffer() failed to create a primary buffer " - "%08x\n",rc); + "%08lx\n",rc); if (rc==DS_OK && primary!=NULL) { rc=IDirectSoundBuffer_GetFormat(primary,&wfx1,sizeof(wfx1),NULL); - ok(rc==DS_OK,"IDirectSoundBuffer8_Getformat() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer8_Getformat() failed: %08lx\n", rc); if (rc!=DS_OK) goto EXIT1; @@ -745,7 +745,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfx.nBlockAlign); rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DSERR_INVALIDPARAM,"IDirectSound8_CreateSoundBuffer() " - "should have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "should have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc); if (rc==DS_OK && secondary!=NULL) IDirectSoundBuffer_Release(secondary); @@ -762,11 +762,11 @@ static HRESULT test_secondary8(LPGUID lpGuid) || rc == DS_OK, /* driver dependent? */ "IDirectSound_CreateSoundBuffer() " "should have returned (DSERR_CONTROLUNAVAIL or DSERR_INVALIDCALL) " - "and NULL, returned: %08x %p\n", rc, secondary); + "and NULL, returned: %08lx %p\n", rc, secondary); else ok(rc==DS_OK && secondary!=NULL, "IDirectSound_CreateSoundBuffer() failed to create a secondary " - "buffer %08x\n",rc); + "buffer %08lx\n",rc); if (secondary) IDirectSoundBuffer_Release(secondary); secondary = NULL; @@ -781,7 +781,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DSERR_INVALIDPARAM && !secondary, - "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", + "IDirectSound_CreateSoundBuffer() returned: %08lx %p\n", rc, secondary); if (secondary) { @@ -794,7 +794,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL /* 2003 */ || rc==DSERR_INVALIDPARAM) && !secondary) || rc==DS_OK /* driver dependent? */, - "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", + "IDirectSound_CreateSoundBuffer() returned: %08lx %p\n", rc, secondary); if (secondary) { @@ -806,7 +806,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.SubFormat = GUID_NULL; rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok((rc==DSERR_INVALIDPARAM || rc==DSERR_INVALIDCALL) && !secondary, - "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", + "IDirectSound_CreateSoundBuffer() returned: %08lx %p\n", rc, secondary); if (secondary) { @@ -817,7 +817,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.Format.cbSize = sizeof(wfxe); rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL || rc==DSERR_INVALIDPARAM) && !secondary, - "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", + "IDirectSound_CreateSoundBuffer() returned: %08lx %p\n", rc, secondary); if (secondary) { @@ -828,7 +828,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.SubFormat = (format_tags[tag] == WAVE_FORMAT_PCM ? KSDATAFORMAT_SUBTYPE_PCM : KSDATAFORMAT_SUBTYPE_IEEE_FLOAT); rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DS_OK && secondary, - "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", + "IDirectSound_CreateSoundBuffer() returned: %08lx %p\n", rc, secondary); if (secondary) { @@ -840,7 +840,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL /* 2003 */ || rc==DSERR_INVALIDPARAM) && !secondary) || rc==DS_OK /* driver dependent? */, - "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", + "IDirectSound_CreateSoundBuffer() returned: %08lx %p\n", rc, secondary); if (secondary) { @@ -852,7 +852,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) ++wfxe.Samples.wValidBitsPerSample; rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DSERR_INVALIDPARAM && !secondary, - "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", + "IDirectSound_CreateSoundBuffer() returned: %08lx %p\n", rc, secondary); if (secondary) { @@ -864,7 +864,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.Samples.wValidBitsPerSample = 0; rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DS_OK && secondary, - "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", + "IDirectSound_CreateSoundBuffer() returned: %08lx %p\n", rc, secondary); if (secondary) { @@ -876,12 +876,12 @@ static HRESULT test_secondary8(LPGUID lpGuid) rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DS_OK && secondary!=NULL, "IDirectSound_CreateSoundBuffer() failed to create a secondary " - "buffer %08x\n",rc); + "buffer %08lx\n",rc); if (rc==DS_OK && secondary!=NULL) { if (winetest_interactive) { - trace(" Testing a secondary buffer at %dx%dx%d (fmt=%d) " - "with a primary buffer at %dx%dx%d\n", + trace(" Testing a secondary buffer at %ldx%dx%d (fmt=%d) " + "with a primary buffer at %ldx%dx%d\n", wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels,format_tags[tag], wfx1.nSamplesPerSec,wfx1.wBitsPerSample,wfx1.nChannels); } @@ -903,7 +903,7 @@ EXIT1: /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); - ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08lx\n", rc); EXIT: ref=IDirectSound8_Release(dso); @@ -939,7 +939,7 @@ static void dsound8_tests(void) { HRESULT rc; rc = DirectSoundEnumerateA(dsenum_callback, NULL); - ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08x\n",rc); + ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08lx\n",rc); } static void test_hw_buffers(void) @@ -956,16 +956,16 @@ static void test_hw_buffers(void) hr = DirectSoundCreate8(NULL, &ds, NULL); ok(hr == S_OK || hr == DSERR_NODRIVER || hr == DSERR_ALLOCATED || hr == E_FAIL, - "DirectSoundCreate8 failed: %08x\n", hr); + "DirectSoundCreate8 failed: %08lx\n", hr); if(hr != S_OK) return; caps.dwSize = sizeof(caps); hr = IDirectSound8_GetCaps(ds, &caps); - ok(hr == S_OK, "GetCaps failed: %08x\n", hr); + ok(hr == S_OK, "GetCaps failed: %08lx\n", hr); - ok(caps.dwPrimaryBuffers == 1, "Got wrong number of primary buffers: %u\n", + ok(caps.dwPrimaryBuffers == 1, "Got wrong number of primary buffers: %lu\n", caps.dwPrimaryBuffers); /* DSBCAPS_LOC* is ignored for primary buffers */ @@ -978,7 +978,7 @@ static void test_hw_buffers(void) bufdesc.guid3DAlgorithm = GUID_NULL; hr = IDirectSound8_CreateSoundBuffer(ds, &bufdesc, &primary, NULL); - ok(hr == S_OK, "CreateSoundBuffer failed: %08x\n", hr); + ok(hr == S_OK, "CreateSoundBuffer failed: %08lx\n", hr); if(hr != S_OK){ IDirectSound8_Release(ds); return; @@ -988,7 +988,7 @@ static void test_hw_buffers(void) DSBCAPS_PRIMARYBUFFER; hr = IDirectSound8_CreateSoundBuffer(ds, &bufdesc, &primary2, NULL); - ok(hr == S_OK, "CreateSoundBuffer failed: %08x\n", hr); + ok(hr == S_OK, "CreateSoundBuffer failed: %08lx\n", hr); ok(primary == primary2, "Got different primary buffers: %p, %p\n", primary, primary2); if(hr == S_OK) IDirectSoundBuffer_Release(primary2); @@ -996,7 +996,7 @@ static void test_hw_buffers(void) buf8 = (IDirectSoundBuffer8 *)0xDEADBEEF; hr = IDirectSoundBuffer_QueryInterface(primary, &IID_IDirectSoundBuffer8, (void**)&buf8); - ok(hr == E_NOINTERFACE, "QueryInterface gave wrong failure: %08x\n", hr); + ok(hr == E_NOINTERFACE, "QueryInterface gave wrong failure: %08lx\n", hr); ok(buf8 == NULL, "Pointer didn't get set to NULL\n"); fmt.wFormatTag = WAVE_FORMAT_PCM; @@ -1016,21 +1016,21 @@ static void test_hw_buffers(void) sizeof(IDirectSoundBuffer *) * caps.dwMaxHwMixingAllBuffers); /* try to fill all of the hw buffers */ - trace("dwMaxHwMixingAllBuffers: %u\n", caps.dwMaxHwMixingAllBuffers); - trace("dwMaxHwMixingStaticBuffers: %u\n", caps.dwMaxHwMixingStaticBuffers); - trace("dwMaxHwMixingStreamingBuffers: %u\n", caps.dwMaxHwMixingStreamingBuffers); + trace("dwMaxHwMixingAllBuffers: %lu\n", caps.dwMaxHwMixingAllBuffers); + trace("dwMaxHwMixingStaticBuffers: %lu\n", caps.dwMaxHwMixingStaticBuffers); + trace("dwMaxHwMixingStreamingBuffers: %lu\n", caps.dwMaxHwMixingStreamingBuffers); for(i = 0; i < caps.dwMaxHwMixingAllBuffers; ++i){ hr = IDirectSound8_CreateSoundBuffer(ds, &bufdesc, &secondaries[i], NULL); ok(hr == S_OK || hr == E_NOTIMPL || broken(hr == DSERR_CONTROLUNAVAIL) || broken(hr == E_FAIL), - "CreateSoundBuffer(%u) failed: %08x\n", i, hr); + "CreateSoundBuffer(%u) failed: %08lx\n", i, hr); if(hr != S_OK) break; bufcaps.dwSize = sizeof(bufcaps); hr = IDirectSoundBuffer_GetCaps(secondaries[i], &bufcaps); - ok(hr == S_OK, "GetCaps failed: %08x\n", hr); + ok(hr == S_OK, "GetCaps failed: %08lx\n", hr); ok((bufcaps.dwFlags & DSBCAPS_LOCHARDWARE) != 0, - "Buffer wasn't allocated in hardware, dwFlags: %x\n", bufcaps.dwFlags); + "Buffer wasn't allocated in hardware, dwFlags: %lx\n", bufcaps.dwFlags); } /* see if we can create one more */ @@ -1041,7 +1041,7 @@ static void test_hw_buffers(void) broken(hr == DSERR_CONTROLUNAVAIL) || /* vmware winxp, others? */ broken(hr == E_FAIL) || /* broken AC97 driver */ broken(hr == S_OK) /* broken driver allows more hw bufs than dscaps claims */, - "CreateSoundBuffer(%u) gave wrong error: %08x\n", i, hr); + "CreateSoundBuffer(%u) gave wrong error: %08lx\n", i, hr); if(hr == S_OK) IDirectSoundBuffer_Release(secondary); @@ -1102,15 +1102,15 @@ static void test_first_device(void) win_skip("No default device found\n"); return; } - ok(hr == S_OK, "GetDefaultAudioEndpoint failed: %08x\n", hr); + ok(hr == S_OK, "GetDefaultAudioEndpoint failed: %08lx\n", hr); hr = IMMDevice_OpenPropertyStore(defdev, STGM_READ, &ps); - ok(hr == S_OK, "OpenPropertyStore failed: %08x\n", hr); + ok(hr == S_OK, "OpenPropertyStore failed: %08lx\n", hr); PropVariantInit(&pv); hr = IPropertyStore_GetValue(ps, &PKEY_AudioEndpoint_GUID, &pv); - ok(hr == S_OK, "GetValue failed: %08x\n", hr); + ok(hr == S_OK, "GetValue failed: %08lx\n", hr); CLSIDFromString(pv.pwszVal, &default_info.guid); @@ -1120,7 +1120,7 @@ static void test_first_device(void) IMMDeviceEnumerator_Release(devenum); hr = DirectSoundEnumerateA(default_device_cb, NULL); - ok(hr == S_OK, "DirectSoundEnumerateA failed: %08x\n", hr); + ok(hr == S_OK, "DirectSoundEnumerateA failed: %08lx\n", hr); } static void test_COM(void) @@ -1135,39 +1135,39 @@ static void test_COM(void) hr = CoCreateInstance(&CLSID_DirectSound8, (IUnknown*)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&ds8); ok(hr == CLASS_E_NOAGGREGATION, - "DirectSound create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectSound create failed: %08lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!ds8, "ds8 = %p\n", ds8); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectSound8, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSound3DBuffer, (void**)&ds8); ok(hr == E_NOINTERFACE, - "DirectSound create failed: %08x, expected E_NOINTERFACE\n", hr); + "DirectSound create failed: %08lx, expected E_NOINTERFACE\n", hr); /* Same refcount for IDirectSound and IDirectSound8 */ hr = CoCreateInstance(&CLSID_DirectSound8, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSound8, (void**)&ds8); - ok(hr == S_OK, "DirectSound create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectSound create failed: %08lx, expected S_OK\n", hr); refcount = IDirectSound8_AddRef(ds8); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectSound8_QueryInterface(ds8, &IID_IDirectSound, (void**)&ds); - ok(hr == S_OK, "QueryInterface for IID_IDirectSound failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IDirectSound failed: %08lx\n", hr); refcount = IDirectSound8_AddRef(ds8); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); refcount = IDirectSound_AddRef(ds); - ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + ok(refcount == 5, "refcount == %lu, expected 5\n", refcount); /* Separate refcount for IUnknown */ hr = IDirectSound_QueryInterface(ds, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08lx\n", hr); refcount = IUnknown_AddRef(unk); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectSound8_QueryInterface(ds8, &IID_IUnknown, (void**)&unk8); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08lx\n", hr); refcount = IUnknown_AddRef(unk8); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); refcount = IDirectSound_AddRef(ds); - ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + ok(refcount == 6, "refcount == %lu, expected 6\n", refcount); while (IDirectSound_Release(ds)); while (IUnknown_Release(unk)); @@ -1184,13 +1184,13 @@ static void test_primary_flags(void) /* Create a DirectSound8 object */ rc = DirectSoundCreate8(NULL, &dso, NULL); - ok(rc == DS_OK || rc==DSERR_NODRIVER, "Failed: %08x\n",rc); + ok(rc == DS_OK || rc==DSERR_NODRIVER, "Failed: %08lx\n",rc); if (rc!=DS_OK) return; rc = IDirectSound8_SetCooperativeLevel(dso, get_hwnd(), DSSCL_PRIORITY); - ok(rc == DS_OK,"Failed: %08x\n", rc); + ok(rc == DS_OK,"Failed: %08lx\n", rc); if (rc != DS_OK) { IDirectSound8_Release(dso); return; @@ -1198,23 +1198,23 @@ static void test_primary_flags(void) dscaps.dwSize = sizeof(dscaps); rc = IDirectSound8_GetCaps(dso, &dscaps); - ok(rc == DS_OK,"Failed: %08x\n", rc); - trace("0x%x\n", dscaps.dwFlags); + ok(rc == DS_OK,"Failed: %08lx\n", rc); + trace("0x%lx\n", dscaps.dwFlags); ZeroMemory(&bufdesc, sizeof(bufdesc)); bufdesc.dwSize = sizeof(bufdesc); bufdesc.dwFlags = DSBCAPS_PRIMARYBUFFER | DSBCAPS_CTRLFX; rc = IDirectSound8_CreateSoundBuffer(dso, &bufdesc, &primary, NULL); - ok(rc == E_INVALIDARG, "got %08x\n", rc); + ok(rc == E_INVALIDARG, "got %08lx\n", rc); ZeroMemory(&bufdesc, sizeof(bufdesc)); bufdesc.dwSize = sizeof(bufdesc); bufdesc.dwFlags = DSBCAPS_PRIMARYBUFFER | DSBCAPS_CTRL3D; rc = IDirectSound8_CreateSoundBuffer(dso, &bufdesc, &primary, NULL); - ok((rc == DS_OK && primary != NULL), "Failed to create a primary buffer: %08x\n", rc); + ok((rc == DS_OK && primary != NULL), "Failed to create a primary buffer: %08lx\n", rc); if (rc == DS_OK) { rc = IDirectSoundBuffer_QueryInterface(primary, &IID_IDirectSoundFXI3DL2Reverb, (LPVOID*)&reverb); - ok(rc==E_NOINTERFACE,"Failed: %08x\n", rc); + ok(rc==E_NOINTERFACE,"Failed: %08lx\n", rc); IDirectSoundBuffer_Release(primary); } @@ -1292,8 +1292,8 @@ static HRESULT WINAPI dmo_SetInputType(IMediaObject *iface, DWORD index, const D if (winetest_debug > 1) trace("SetInputType()\n"); - ok(!index, "Got unexpected index %u.\n", index); - ok(!flags, "Got unexpected flags %#x.\n", flags); + ok(!index, "Got unexpected index %lu.\n", index); + ok(!flags, "Got unexpected flags %#lx.\n", flags); ok(IsEqualGUID(&type->majortype, &MEDIATYPE_Audio), "Got major type %s.\n", debugstr_guid(&type->majortype)); todo_wine ok(IsEqualGUID(&type->subtype, &MEDIASUBTYPE_PCM), "Got subtype %s.\n", debugstr_guid(&type->subtype)); @@ -1301,10 +1301,10 @@ static HRESULT WINAPI dmo_SetInputType(IMediaObject *iface, DWORD index, const D ok(!type->bTemporalCompression, "Got temporal compression %d.\n", type->bTemporalCompression); ok(IsEqualGUID(&type->formattype, &FORMAT_WaveFormatEx), "Got format type %s.\n", debugstr_guid(&type->formattype)); ok(!type->pUnk, "Got pUnk %p.\n", type->pUnk); - ok(type->cbFormat == sizeof(WAVEFORMATEX), "Got format size %u.\n", type->cbFormat); + ok(type->cbFormat == sizeof(WAVEFORMATEX), "Got format size %lu.\n", type->cbFormat); wfx = (WAVEFORMATEX *)type->pbFormat; - todo_wine ok(type->lSampleSize == wfx->nBlockAlign, "Got sample size %u.\n", type->lSampleSize); + todo_wine ok(type->lSampleSize == wfx->nBlockAlign, "Got sample size %lu.\n", type->lSampleSize); if (wfx->wBitsPerSample != 8) return DMO_E_TYPE_NOT_ACCEPTED; @@ -1318,8 +1318,8 @@ static HRESULT WINAPI dmo_SetOutputType(IMediaObject *iface, DWORD index, const { if (winetest_debug > 1) trace("SetOutputType()\n"); - ok(!index, "Got unexpected index %u.\n", index); - ok(!flags, "Got unexpected flags %#x.\n", flags); + ok(!index, "Got unexpected index %lu.\n", index); + ok(!flags, "Got unexpected flags %#lx.\n", flags); ok(testdmo_input_type_set, "Expected the input type to be set.\n"); @@ -1327,10 +1327,10 @@ static HRESULT WINAPI dmo_SetOutputType(IMediaObject *iface, DWORD index, const ok(IsEqualGUID(&type->subtype, &MEDIASUBTYPE_PCM), "Got subtype %s.\n", debugstr_guid(&type->subtype)); ok(type->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", type->bFixedSizeSamples); ok(!type->bTemporalCompression, "Got temporal compression %d.\n", type->bTemporalCompression); - ok(type->lSampleSize == 1, "Got sample size %u.\n", type->lSampleSize); + ok(type->lSampleSize == 1, "Got sample size %lu.\n", type->lSampleSize); ok(IsEqualGUID(&type->formattype, &FORMAT_WaveFormatEx), "Got format type %s.\n", debugstr_guid(&type->formattype)); ok(!type->pUnk, "Got pUnk %p.\n", type->pUnk); - ok(type->cbFormat == sizeof(WAVEFORMATEX), "Got format size %u.\n", type->cbFormat); + ok(type->cbFormat == sizeof(WAVEFORMATEX), "Got format size %lu.\n", type->cbFormat); ok(!memcmp(type->pbFormat, &testdmo_input_type, sizeof(WAVEFORMATEX)), "Format blocks didn't match.\n"); @@ -1472,10 +1472,10 @@ static ULONG WINAPI dmo_inplace_Release(IMediaObjectInPlace *iface) static HRESULT WINAPI dmo_inplace_Process(IMediaObjectInPlace *iface, ULONG size, BYTE *data, REFERENCE_TIME start, DWORD flags) { - if (winetest_debug > 1) trace("Process(size %u)\n", size); + if (winetest_debug > 1) trace("Process(size %lu)\n", size); ok(!start, "Got start time %s.\n", wine_dbgstr_longlong(start)); - ok(!flags, "Got flags %#x.\n", flags); + ok(!flags, "Got flags %#lx.\n", flags); SetEvent(got_Process); @@ -1574,12 +1574,12 @@ static void test_effects(void) ULONG ref; hr = DirectSoundCreate8(NULL, &dsound, NULL); - ok(hr == DS_OK || hr == DSERR_NODRIVER, "Got hr %#x.\n", hr); + ok(hr == DS_OK || hr == DSERR_NODRIVER, "Got hr %#lx.\n", hr); if (FAILED(hr)) return; hr = IDirectSound8_SetCooperativeLevel(dsound, get_hwnd(), DSSCL_PRIORITY); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); effects[0].dwSize = effects[1].dwSize = sizeof(effects[0]); effects[0].guidDSFXClass = GUID_DSFX_STANDARD_PARAMEQ; @@ -1588,161 +1588,161 @@ static void test_effects(void) buffer_desc.dwBufferBytes = align(wfx.nAvgBytesPerSec * BUFFER_LEN / 1000, wfx.nBlockAlign); buffer_desc.lpwfxFormat = &wfx; hr = IDirectSound8_CreateSoundBuffer(dsound, &buffer_desc, &buffer, NULL); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); hr = IDirectSoundBuffer_QueryInterface(buffer, &IID_IDirectSoundBuffer8, (void **)&buffer8); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); hr = IDirectSoundBuffer8_SetFX(buffer8, 1, effects, results); - ok(hr == DSERR_CONTROLUNAVAIL, "Got hr %#x.\n", hr); + ok(hr == DSERR_CONTROLUNAVAIL, "Got hr %#lx.\n", hr); IDirectSoundBuffer8_Release(buffer8); IDirectSoundBuffer_Release(buffer); buffer_desc.dwFlags = DSBCAPS_CTRLFX | DSBCAPS_CTRLPOSITIONNOTIFY; hr = IDirectSound8_CreateSoundBuffer(dsound, &buffer_desc, &buffer, NULL); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); hr = IDirectSoundBuffer_QueryInterface(buffer, &IID_IDirectSoundBuffer8, (void **)&buffer8); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); hr = IDirectSoundBuffer8_QueryInterface(buffer, &IID_IDirectSoundNotify, (void **)¬ify); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); hr = IDirectSoundNotify_SetNotificationPositions(notify, 1, ¬ify_params); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); hr = IDirectSoundBuffer8_SetFX(buffer8, 1, NULL, NULL); - ok(hr == DSERR_INVALIDPARAM, "Got hr %#x.\n", hr); + ok(hr == DSERR_INVALIDPARAM, "Got hr %#lx.\n", hr); hr = IDirectSoundBuffer8_SetFX(buffer8, 0, effects, NULL); - ok(hr == DSERR_INVALIDPARAM, "Got hr %#x.\n", hr); + ok(hr == DSERR_INVALIDPARAM, "Got hr %#lx.\n", hr); hr = IDirectSoundBuffer8_SetFX(buffer8, 0, NULL, results); - ok(hr == DSERR_INVALIDPARAM, "Got hr %#x.\n", hr); + ok(hr == DSERR_INVALIDPARAM, "Got hr %#lx.\n", hr); results[0] = 0xdeadbeef; hr = IDirectSoundBuffer8_SetFX(buffer8, 1, effects, results); - ok(hr == DS_OK, "Got hr %#x.\n", hr); - ok(results[0] == DSFXR_LOCSOFTWARE, "Got result %#x.\n", results[0]); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); + ok(results[0] == DSFXR_LOCSOFTWARE, "Got result %#lx.\n", results[0]); hr = IDirectSoundBuffer8_Lock(buffer8, 0, 0, &ptr1, &size1, &ptr2, &size2, DSBLOCK_ENTIREBUFFER); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); results[0] = 0xdeadbeef; hr = IDirectSoundBuffer8_SetFX(buffer8, 1, effects, results); - ok(hr == DSERR_INVALIDCALL, "Got hr %#x.\n", hr); - todo_wine ok(results[0] == 0xdeadbeef, "Got result %#x.\n", results[0]); + ok(hr == DSERR_INVALIDCALL, "Got hr %#lx.\n", hr); + todo_wine ok(results[0] == 0xdeadbeef, "Got result %#lx.\n", results[0]); hr = IDirectSoundBuffer8_Unlock(buffer8, ptr1, size1, ptr2, size2); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); hr = IDirectSoundBuffer8_Play(buffer8, 0, 0, DSBPLAY_LOOPING); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); results[0] = 0xdeadbeef; hr = IDirectSoundBuffer8_SetFX(buffer8, 1, effects, results); - ok(hr == DSERR_INVALIDCALL, "Got hr %#x.\n", hr); - todo_wine ok(results[0] == 0xdeadbeef, "Got result %#x.\n", results[0]); + ok(hr == DSERR_INVALIDCALL, "Got hr %#lx.\n", hr); + todo_wine ok(results[0] == 0xdeadbeef, "Got result %#lx.\n", results[0]); hr = IDirectSoundBuffer8_Stop(buffer8); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); ok(!WaitForSingleObject(notify_params.hEventNotify, 1000), "Wait timed out.\n"); effects[0].guidDSFXClass = GUID_NULL; results[0] = 0xdeadbeef; hr = IDirectSoundBuffer8_SetFX(buffer8, 1, effects, results); - ok(hr == REGDB_E_CLASSNOTREG, "Got hr %#x.\n", hr); - ok(results[0] == DSFXR_UNKNOWN, "Got result %#x.\n", results[0]); + ok(hr == REGDB_E_CLASSNOTREG, "Got hr %#lx.\n", hr); + ok(results[0] == DSFXR_UNKNOWN, "Got result %#lx.\n", results[0]); effects[0].guidDSFXClass = GUID_DSFX_STANDARD_PARAMEQ; results[0] = 0xdeadbeef; hr = IDirectSoundBuffer8_SetFX(buffer8, 1, effects, results); - ok(hr == DS_OK, "Got hr %#x.\n", hr); - ok(results[0] == DSFXR_LOCSOFTWARE, "Got result %#x.\n", results[0]); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); + ok(results[0] == DSFXR_LOCSOFTWARE, "Got result %#lx.\n", results[0]); hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &IID_IMediaObject, NULL); - ok(hr == DSERR_INVALIDPARAM, "Got hr %#x.\n", hr); + ok(hr == DSERR_INVALIDPARAM, "Got hr %#lx.\n", hr); dmo = (IMediaObject *)0xdeadbeef; hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &GUID_NULL, (void **)&dmo); - ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got hr %#lx.\n", hr); ok(!dmo, "Got object %p.\n", dmo); dmo = (IMediaObject *)0xdeadbeef; hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_NULL, 0, &IID_IMediaObject, (void **)&dmo); - ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#x.\n", hr); + ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#lx.\n", hr); ok(dmo == (IMediaObject *)0xdeadbeef, "Got object %p.\n", dmo); dmo = NULL; hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &IID_IMediaObject, (void **)&dmo); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); ok(!!dmo, "Expected a non-NULL object.\n"); IMediaObject_Release(dmo); dmo = NULL; hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_DSFX_STANDARD_PARAMEQ, 0, &IID_IMediaObject, (void **)&dmo); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); ok(!!dmo, "Expected a non-NULL object.\n"); IMediaObject_Release(dmo); dmo = (IMediaObject *)0xdeadbeef; hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 1, &IID_IMediaObject, (void **)&dmo); - ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#x.\n", hr); + ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#lx.\n", hr); ok(dmo == (IMediaObject *)0xdeadbeef, "Got object %p.\n", dmo); effects[0].guidDSFXClass = GUID_DSFX_STANDARD_PARAMEQ; effects[1].guidDSFXClass = GUID_NULL; results[0] = results[1] = 0xdeadbeef; hr = IDirectSoundBuffer8_SetFX(buffer8, 2, effects, results); - ok(hr == REGDB_E_CLASSNOTREG, "Got hr %#x.\n", hr); - ok(results[0] == DSFXR_PRESENT, "Got result %#x.\n", results[0]); - ok(results[1] == DSFXR_UNKNOWN, "Got result %#x.\n", results[1]); + ok(hr == REGDB_E_CLASSNOTREG, "Got hr %#lx.\n", hr); + ok(results[0] == DSFXR_PRESENT, "Got result %#lx.\n", results[0]); + ok(results[1] == DSFXR_UNKNOWN, "Got result %#lx.\n", results[1]); hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &IID_IMediaObject, (void **)&dmo); - todo_wine ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#x.\n", hr); + todo_wine ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#lx.\n", hr); effects[0].guidDSFXClass = GUID_DSFX_STANDARD_PARAMEQ; effects[1].guidDSFXClass = GUID_DSFX_STANDARD_I3DL2REVERB; results[0] = results[1] = 0xdeadbeef; hr = IDirectSoundBuffer8_SetFX(buffer8, 2, effects, results); - ok(hr == DS_OK, "Got hr %#x.\n", hr); - ok(results[0] == DSFXR_LOCSOFTWARE, "Got result %#x.\n", results[0]); - ok(results[1] == DSFXR_LOCSOFTWARE, "Got result %#x.\n", results[1]); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); + ok(results[0] == DSFXR_LOCSOFTWARE, "Got result %#lx.\n", results[0]); + ok(results[1] == DSFXR_LOCSOFTWARE, "Got result %#lx.\n", results[1]); hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_DSFX_STANDARD_PARAMEQ, 0, &IID_IMediaObject, (void **)&dmo); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); echo = dmo; hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_DSFX_STANDARD_I3DL2REVERB, 0, &IID_IMediaObject, (void **)&dmo); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); reverb = dmo; hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &IID_IMediaObject, (void **)&dmo); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); ok(dmo == echo, "Expected %p, got %p.\n", echo, dmo); IMediaObject_Release(dmo); hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 1, &IID_IMediaObject, (void **)&dmo); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); ok(dmo == reverb, "Expected %p, got %p.\n", reverb, dmo); IMediaObject_Release(dmo); hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_DSFX_STANDARD_I3DL2REVERB, 1, &IID_IMediaObject, (void **)&dmo); - ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#x.\n", hr); + ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#lx.\n", hr); hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &IID_IDirectSoundFXParamEq, (void **)&unk); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); IUnknown_Release(unk); hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &IID_IDirectSoundFXParamEq, (void **)&unk); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); IUnknown_Release(unk); hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &IID_IDirectSoundFXI3DL2Reverb, (void **)&unk); - ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got hr %#lx.\n", hr); hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 1, &IID_IDirectSoundFXI3DL2Reverb, (void **)&unk); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); IUnknown_Release(unk); hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_DSFX_STANDARD_I3DL2REVERB, 0, &IID_IDirectSoundFXI3DL2Reverb, (void **)&unk); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); IUnknown_Release(unk); IMediaObject_Release(echo); @@ -1753,60 +1753,60 @@ static void test_effects(void) effects[0].guidDSFXClass = testdmo_clsid; results[0] = 0xdeadbeef; hr = IDirectSoundBuffer8_SetFX(buffer8, 1, effects, results); - todo_wine ok(hr == DS_OK, "Got hr %#x.\n", hr); - todo_wine ok(results[0] == DSFXR_LOCSOFTWARE, "Got result %#x.\n", results[0]); + todo_wine ok(hr == DS_OK, "Got hr %#lx.\n", hr); + todo_wine ok(results[0] == DSFXR_LOCSOFTWARE, "Got result %#lx.\n", results[0]); todo_wine ok(!memcmp(&testdmo_input_type, &wfx, sizeof(WAVEFORMATEX)), "Format blocks didn't match.\n"); ResetEvent(notify_params.hEventNotify); hr = IDirectSoundBuffer8_Play(buffer8, 0, 0, 0); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); todo_wine ok(got_Discontinuity == 1, "Got %u calls to IMediaObject::Discontinuity().\n", got_Discontinuity); todo_wine ok(!WaitForSingleObject(got_Process, 100), "Wait timed out.\n"); hr = IDirectSoundBuffer8_Stop(buffer8); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); todo_wine ok(got_Discontinuity == 1, "Got %u calls to IMediaObject::Discontinuity().\n", got_Discontinuity); ok(!WaitForSingleObject(notify_params.hEventNotify, 1000), "Wait timed out.\n"); ResetEvent(notify_params.hEventNotify); hr = IDirectSoundBuffer8_Play(buffer8, 0, 0, 0); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); todo_wine ok(got_Discontinuity == 2, "Got %u calls to IMediaObject::Discontinuity().\n", got_Discontinuity); hr = IDirectSoundBuffer8_Stop(buffer8); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); ok(!WaitForSingleObject(notify_params.hEventNotify, 1000), "Wait timed out.\n"); hr = IDirectSoundBuffer8_SetFX(buffer8, 0, NULL, NULL); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &IID_IMediaObject, (void **)&dmo); - ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#x.\n", hr); + ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#lx.\n", hr); CloseHandle(got_Process); IDirectSoundBuffer8_Release(buffer8); ref = IDirectSoundBuffer_Release(buffer); - ok(!ref, "Got outstanding refcount %u.\n", ref); + ok(!ref, "Got outstanding refcount %lu.\n", ref); init_format(&wfx, WAVE_FORMAT_PCM, 11025, 16, 1); hr = IDirectSound8_CreateSoundBuffer(dsound, &buffer_desc, &buffer, NULL); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); hr = IDirectSoundBuffer_QueryInterface(buffer, &IID_IDirectSoundBuffer8, (void **)&buffer8); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); results[0] = 0xdeadbeef; hr = IDirectSoundBuffer8_SetFX(buffer8, 1, effects, results); - ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); - todo_wine ok(results[0] == DSFXR_UNKNOWN, "Got result %#x.\n", results[0]); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#lx.\n", hr); + todo_wine ok(results[0] == DSFXR_UNKNOWN, "Got result %#lx.\n", results[0]); IDirectSoundNotify_Release(notify); IDirectSoundBuffer8_Release(buffer8); ref = IDirectSoundBuffer_Release(buffer); - ok(!ref, "Got outstanding refcount %u.\n", ref); + ok(!ref, "Got outstanding refcount %lu.\n", ref); ref = IDirectSound8_Release(dsound); - ok(!ref, "Got outstanding refcount %u.\n", ref); + ok(!ref, "Got outstanding refcount %lu.\n", ref); } static void test_AcquireResources(void) @@ -1818,12 +1818,12 @@ static void test_AcquireResources(void) HRESULT hr; hr = DirectSoundCreate8(NULL, &dsound, NULL); - ok(hr == DS_OK || hr == DSERR_NODRIVER, "Got hr %#x.\n", hr); + ok(hr == DS_OK || hr == DSERR_NODRIVER, "Got hr %#lx.\n", hr); if (FAILED(hr)) return; hr = IDirectSound8_SetCooperativeLevel(dsound, get_hwnd(), DSSCL_PRIORITY); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); bufdesc.dwSize = sizeof(bufdesc); bufdesc.dwFlags = DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_PRIMARYBUFFER; @@ -1833,7 +1833,7 @@ static void test_AcquireResources(void) bufdesc.guid3DAlgorithm = GUID_NULL; hr = IDirectSound8_CreateSoundBuffer(dsound, &bufdesc, &primary, NULL); - ok(hr == S_OK, "CreateSoundBuffer failed: %08x\n", hr); + ok(hr == S_OK, "CreateSoundBuffer failed: %08lx\n", hr); if(hr != S_OK) { IDirectSound_Release(dsound); return; @@ -1853,26 +1853,26 @@ static void test_AcquireResources(void) /* see if we can create one more */ hr = IDirectSound8_CreateSoundBuffer(dsound, &bufdesc, &secondary, NULL); - ok(hr == S_OK, "CreateSoundBuffer gave wrong error: %08x\n", hr); + ok(hr == S_OK, "CreateSoundBuffer gave wrong error: %08lx\n", hr); if(hr == S_OK) { DWORD status; IDirectSoundBuffer8 *buffer8; hr = IDirectSoundBuffer_QueryInterface(secondary, &IID_IDirectSoundBuffer8, (void **)&buffer8); - ok(hr == S_OK, "got: %08x\n", hr); + ok(hr == S_OK, "got: %08lx\n", hr); status = 0xFFFF; hr = IDirectSoundBuffer8_GetStatus(buffer8, &status); - ok(hr == S_OK, "got: %08x\n", hr); - todo_wine ok(status == 0, "got: %08x\n", status); + ok(hr == S_OK, "got: %08lx\n", hr); + todo_wine ok(status == 0, "got: %08lx\n", status); hr = IDirectSoundBuffer8_AcquireResources(buffer8, 0, 0, NULL); - ok(hr == S_OK, "got: %08x\n", hr); + ok(hr == S_OK, "got: %08lx\n", hr); status = 0xFFFF; hr = IDirectSoundBuffer8_GetStatus(buffer8, &status); - ok(hr == S_OK, "got: %08x\n", hr); - ok(status == DSBSTATUS_LOCSOFTWARE, "got: %08x\n", status); + ok(hr == S_OK, "got: %08lx\n", hr); + ok(status == DSBSTATUS_LOCSOFTWARE, "got: %08lx\n", status); IDirectSoundBuffer8_Release(buffer8); IDirectSoundBuffer_Release(secondary); @@ -1899,7 +1899,7 @@ START_TEST(dsound8) hr = CoRegisterClassObject(&testdmo_clsid, (IUnknown *)&testdmo_cf, CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &cookie); - ok(hr == S_OK, "Failed to register class, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to register class, hr %#lx.\n", hr); test_effects(); diff --git a/dlls/dsound/tests/duplex.c b/dlls/dsound/tests/duplex.c index 59507c566c1..3ea1aabe20a 100644 --- a/dlls/dsound/tests/duplex.c +++ b/dlls/dsound/tests/duplex.c @@ -43,7 +43,7 @@ static void IDirectSoundFullDuplex_test(LPDIRECTSOUNDFULLDUPLEX dsfdo, /* Try to Query for objects */ rc=IDirectSoundFullDuplex_QueryInterface(dsfdo,&IID_IUnknown,(LPVOID*)&unknown); - ok(rc==DS_OK,"IDirectSoundFullDuplex_QueryInterface(IID_IUnknown) failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundFullDuplex_QueryInterface(IID_IUnknown) failed: %08lx\n", rc); if (rc==DS_OK) { ref = IUnknown_Release(unknown); ok(ref==0, "IDirectSoundFullDuplex_Release() has %d references, " @@ -51,7 +51,7 @@ static void IDirectSoundFullDuplex_test(LPDIRECTSOUNDFULLDUPLEX dsfdo, } rc=IDirectSoundFullDuplex_QueryInterface(dsfdo,&IID_IDirectSound,(LPVOID*)&ds); - ok(rc==(initialized?DS_OK:E_NOINTERFACE),"IDirectSoundFullDuplex_QueryInterface(IID_IDirectSound) failed: %08x\n", rc); + ok(rc==(initialized?DS_OK:E_NOINTERFACE),"IDirectSoundFullDuplex_QueryInterface(IID_IDirectSound) failed: %08lx\n", rc); if (rc==DS_OK) { ref=IDirectSound_Release(ds); ok(ref==0, "IDirectSound_Release() has %d references, " @@ -60,12 +60,12 @@ static void IDirectSoundFullDuplex_test(LPDIRECTSOUNDFULLDUPLEX dsfdo, rc=IDirectSoundFullDuplex_QueryInterface(dsfdo,&IID_IDirectSound8,(LPVOID*)&ds8); ok(rc==(initialized?DS_OK:E_NOINTERFACE),"IDirectSoundFullDuplex_QueryInterface(IID_IDirectSound8) " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); if (rc==DS_OK) { IDirectSoundFullDuplex * dsfd1; rc=IDirectSound8_QueryInterface(ds8,&IID_IDirectSoundFullDuplex,(LPVOID*)&dsfd1); ok(rc==DS_OK,"IDirectSound8_QueryInterface(IID_IDirectSoundFullDuplex) " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); if (rc==DS_OK) { ref=IDirectSoundFullDuplex_Release(dsfd1); ok(ref==1, "IDirectSoundFullDuplex_Release() has %d references, " @@ -78,7 +78,7 @@ static void IDirectSoundFullDuplex_test(LPDIRECTSOUNDFULLDUPLEX dsfdo, rc=IDirectSoundFullDuplex_QueryInterface(dsfdo,&IID_IDirectSoundCapture,(LPVOID*)&dsc); ok(rc==(initialized?DS_OK:E_NOINTERFACE),"IDirectSoundFullDuplex_QueryInterface(IID_IDirectSoundCapture) " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); if (rc==DS_OK) { ref=IDirectSoundCapture_Release(dsc); ok(ref==0, "IDirectSoundCapture_Release() has %d references, " @@ -87,7 +87,7 @@ static void IDirectSoundFullDuplex_test(LPDIRECTSOUNDFULLDUPLEX dsfdo, rc=IDirectSoundFullDuplex_QueryInterface(dsfdo,&IID_IDirectSoundFullDuplex,(LPVOID*)&dsfd); ok(rc==DS_OK,"IDirectSoundFullDuplex_QueryInterface(IID_IDirectSoundFullDuplex) " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); if (rc==DS_OK) { ok(dsfdo==dsfd, "different interfaces\n"); ref=IDirectSoundFullDuplex_Release(dsfd); @@ -116,7 +116,7 @@ static void IDirectSoundFullDuplex_tests(void) CLSCTX_INPROC_SERVER, &IID_IDirectSoundFullDuplex, (void**)&dsfdo); ok(rc==S_OK||rc==REGDB_E_CLASSNOTREG||rc==CLASS_E_CLASSNOTAVAILABLE, - "CoCreateInstance(CLSID_DirectSoundFullDuplex) failed: 0x%08x\n", rc); + "CoCreateInstance(CLSID_DirectSoundFullDuplex) failed: 0x%08lx\n", rc); if (rc==REGDB_E_CLASSNOTREG) { trace(" Class Not Registered\n"); return; @@ -132,7 +132,7 @@ static void IDirectSoundFullDuplex_tests(void) rc=CoCreateInstance(&CLSID_DirectSoundFullDuplex, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSoundFullDuplex, (void**)&dsfdo); - ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSoundFullDuplex) failed: 0x%08x\n", rc); + ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSoundFullDuplex) failed: 0x%08lx\n", rc); if (dsfdo) IDirectSoundFullDuplex_test(dsfdo, FALSE, &DSDEVID_DefaultCapture, &DSDEVID_DefaultPlayback); @@ -142,7 +142,7 @@ static void IDirectSoundFullDuplex_tests(void) rc=CoCreateInstance(&CLSID_DirectSoundFullDuplex, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSoundFullDuplex, (void**)&dsfdo); - ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSoundFullDuplex) failed: 0x%08x\n", rc); + ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSoundFullDuplex) failed: 0x%08lx\n", rc); if (dsfdo) IDirectSoundFullDuplex_test(dsfdo, FALSE, &DSDEVID_DefaultVoiceCapture, &DSDEVID_DefaultVoicePlayback); @@ -154,7 +154,7 @@ static void IDirectSoundFullDuplex_tests(void) (void**)&dsfdo); ok(rc==E_NOINTERFACE, "CoCreateInstance(CLSID_DirectSoundFullDuplex,CLSID_DirectSoundPrivate) " - "should have failed: 0x%08x\n", rc); + "should have failed: 0x%08lx\n", rc); ZeroMemory(&wfex, sizeof(wfex)); wfex.wFormatTag = WAVE_FORMAT_PCM; @@ -180,7 +180,7 @@ static void IDirectSoundFullDuplex_tests(void) rc = DirectSoundFullDuplexCreate(NULL, NULL, &DSCBufferDesc, &DSBufferDesc, get_hwnd(), DSSCL_EXCLUSIVE, &dsfdo, &pDSCBuffer8, &pDSBuffer8, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL||rc==DSERR_INVALIDCALL, - "DirectSoundFullDuplexCreate(NULL,NULL) failed: %08x\n",rc); + "DirectSoundFullDuplexCreate(NULL,NULL) failed: %08lx\n",rc); if (rc==S_OK && dsfdo) IDirectSoundFullDuplex_test(dsfdo, TRUE, NULL, NULL); @@ -190,7 +190,7 @@ static void IDirectSoundFullDuplex_tests(void) DSSCL_EXCLUSIVE, &dsfdo, &pDSCBuffer8,&pDSBuffer8, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL||rc==DSERR_INVALIDCALL, "DirectSoundFullDuplexCreate(DSDEVID_DefaultCapture," - "DSDEVID_DefaultPlayback) failed: %08x\n", rc); + "DSDEVID_DefaultPlayback) failed: %08lx\n", rc); if (rc==DS_OK && dsfdo) IDirectSoundFullDuplex_test(dsfdo, TRUE, NULL, NULL); @@ -200,7 +200,7 @@ static void IDirectSoundFullDuplex_tests(void) get_hwnd(), DSSCL_EXCLUSIVE, &dsfdo, &pDSCBuffer8, &pDSBuffer8, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL||rc==DSERR_INVALIDCALL, "DirectSoundFullDuplexCreate(DSDEVID_DefaultVoiceCapture," - "DSDEVID_DefaultVoicePlayback) failed: %08x\n", rc); + "DSDEVID_DefaultVoicePlayback) failed: %08lx\n", rc); if (rc==DS_OK && dsfdo) IDirectSoundFullDuplex_test(dsfdo, TRUE, NULL, NULL); @@ -210,7 +210,7 @@ static void IDirectSoundFullDuplex_tests(void) get_hwnd(), DSSCL_EXCLUSIVE, &dsfdo, &pDSCBuffer8, &pDSBuffer8, NULL); ok(rc==DSERR_NODRIVER||rc==DSERR_INVALIDCALL, "DirectSoundFullDuplexCreate(DSDEVID_DefaultVoicePlayback," - "DSDEVID_DefaultVoiceCapture) should have failed: %08x\n", rc); + "DSDEVID_DefaultVoiceCapture) should have failed: %08lx\n", rc); if (rc==DS_OK && dsfdo) IDirectSoundFullDuplex_Release(dsfdo); } @@ -234,33 +234,33 @@ static void test_COM(void) hr = CoCreateInstance(&CLSID_DirectSoundFullDuplex, (IUnknown*)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&dsfd); ok(hr == CLASS_E_NOAGGREGATION, - "DirectSoundFullDuplex create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectSoundFullDuplex create failed: %08lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!dsfd, "dsfd = %p\n", dsfd); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectSoundFullDuplex, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSound3DBuffer, (void**)&dsfd); ok(hr == E_NOINTERFACE, - "DirectSoundFullDuplex create failed: %08x, expected E_NOINTERFACE\n", hr); + "DirectSoundFullDuplex create failed: %08lx, expected E_NOINTERFACE\n", hr); /* Different refcount for IDirectSoundFullDuplex and for IUnknown */ hr = CoCreateInstance(&CLSID_DirectSoundFullDuplex, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSoundFullDuplex, (void**)&dsfd); - ok(hr == S_OK, "DirectSoundFullDuplex create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectSoundFullDuplex create failed: %08lx, expected S_OK\n", hr); refcount = IDirectSoundFullDuplex_AddRef(dsfd); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectSoundFullDuplex_QueryInterface(dsfd, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08lx\n", hr); refcount = IUnknown_AddRef(unk); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); /* Not initialized */ hr = IDirectSoundFullDuplex_QueryInterface(dsfd, &IID_IDirectSound8, (void**)&ds8); ok(hr == E_NOINTERFACE, - "QueryInterface for IID_IDirectSound8 failed: %08x, expected E_NOINTERFACE\n", hr); + "QueryInterface for IID_IDirectSound8 failed: %08lx, expected E_NOINTERFACE\n", hr); hr = IDirectSoundFullDuplex_QueryInterface(dsfd, &IID_IDirectSoundCapture, (void**)&dsc); ok(hr == E_NOINTERFACE, - "QueryInterface for IID_IDirectSoundCapture failed: %08x, expected E_NOINTERFACE\n", hr); + "QueryInterface for IID_IDirectSoundCapture failed: %08lx, expected E_NOINTERFACE\n", hr); init_format(&wfx, WAVE_FORMAT_PCM, 44100, 16, 1); ZeroMemory(&bufdesc, sizeof(bufdesc)); @@ -274,49 +274,49 @@ static void test_COM(void) hr = IDirectSoundFullDuplex_Initialize(dsfd, NULL, NULL, &cbufdesc, &bufdesc, get_hwnd(), DSSCL_EXCLUSIVE, NULL, NULL); ok(hr == E_INVALIDARG, - "IDirectSoundFullDuplex_Initialize failed: %08x, expected E_INVALIDARG\n", hr); + "IDirectSoundFullDuplex_Initialize failed: %08lx, expected E_INVALIDARG\n", hr); hr = IDirectSoundFullDuplex_Initialize(dsfd, NULL, NULL, &cbufdesc, &bufdesc, get_hwnd(), DSSCL_EXCLUSIVE, &dscb8, &dsb8); if (hr == DSERR_NODRIVER || hr == DSERR_INVALIDCALL) { skip("No driver\n"); return; } - ok(hr == S_OK, "IDirectSoundFullDuplex_Initialize failed: %08x\n", hr); + ok(hr == S_OK, "IDirectSoundFullDuplex_Initialize failed: %08lx\n", hr); /* IDirectSound and IDirectSound8 */ hr = IDirectSoundFullDuplex_QueryInterface(dsfd, &IID_IDirectSound8, (void**)&ds8); - ok(hr == S_OK, "QueryInterface for IID_IDirectSound8 failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IDirectSound8 failed: %08lx\n", hr); refcount = IDirectSound8_AddRef(ds8); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectSoundFullDuplex_QueryInterface(dsfd, &IID_IDirectSound, (void**)&ds); - ok(hr == S_OK, "QueryInterface for IID_IDirectSound failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IDirectSound failed: %08lx\n", hr); refcount = IDirectSound8_AddRef(ds8); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); refcount = IDirectSound_AddRef(ds); - ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + ok(refcount == 5, "refcount == %lu, expected 5\n", refcount); hr = IDirectSound8_QueryInterface(ds8, &IID_IUnknown, (void**)&unk8); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08lx\n", hr); ok(unk == unk8, "Got different IUnknown when QI'ing IDirectSoundFullDuplex and IDirectSound\n"); refcount = IUnknown_AddRef(unk8); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); refcount = IDirectSound_AddRef(ds); - ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + ok(refcount == 6, "refcount == %lu, expected 6\n", refcount); refcount = IDirectSoundFullDuplex_AddRef(dsfd); - ok(refcount == 3, "refcount == %u, expected 3\n", refcount); + ok(refcount == 3, "refcount == %lu, expected 3\n", refcount); /* IDirectSoundCapture */ hr = IDirectSoundFullDuplex_QueryInterface(dsfd, &IID_IDirectSoundCapture, (void**)&dsc); - ok(hr == S_OK, "QueryInterface for IID_IDirectSoundCapture failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IDirectSoundCapture failed: %08lx\n", hr); refcount = IDirectSoundCapture_AddRef(dsc); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); refcount = IDirectSoundFullDuplex_AddRef(dsfd); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); hr = IDirectSound8_QueryInterface(ds8, &IID_IUnknown, (void**)&unk8); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08lx\n", hr); ok(unk == unk8, "Got different IUnknown when QI'ing IDirectSoundFullDuplex and IDirectSoundCapture\n"); refcount = IUnknown_AddRef(unk8); - ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + ok(refcount == 6, "refcount == %lu, expected 6\n", refcount); IDirectSoundBuffer8_Release(dsb8); IDirectSoundCaptureBuffer8_Release(dscb8); diff --git a/dlls/dsound/tests/propset.c b/dlls/dsound/tests/propset.c index 94f0d36345f..71040a70c77 100644 --- a/dlls/dsound/tests/propset.c +++ b/dlls/dsound/tests/propset.c @@ -67,7 +67,7 @@ static BOOL CALLBACK callback(PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_DATA dat trace(" Description: %s\n", data->Description); trace(" Module: %s\n", data->Module); trace(" Interface: %s\n", data->Interface); - trace(" WaveDeviceId: %d\n", data->WaveDeviceId); + trace(" WaveDeviceId: %ld\n", data->WaveDeviceId); return TRUE; } @@ -94,7 +94,7 @@ static BOOL CALLBACK callback1(PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA trace(" ModuleA: %s\n", data->ModuleA); WideCharToMultiByte(CP_ACP, 0, data->ModuleW, -1, moduleA, sizeof(moduleA), NULL, NULL); trace(" ModuleW: %s\n", moduleA); - trace(" WaveDeviceId: %d\n", data->WaveDeviceId); + trace(" WaveDeviceId: %ld\n", data->WaveDeviceId); return TRUE; } @@ -115,7 +115,7 @@ static BOOL CALLBACK callbackA(PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA trace(" Description: %s\n", data->Description); trace(" Module: %s\n", data->Module); trace(" Interface: %s\n", data->Interface); - trace(" WaveDeviceId: %d\n", data->WaveDeviceId); + trace(" WaveDeviceId: %ld\n", data->WaveDeviceId); return TRUE; } @@ -143,7 +143,7 @@ static BOOL CALLBACK callbackW(PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA trace("\tDescription: %s\n", descriptionA); trace("\tModule: %s\n", moduleA); trace("\tInterface: %s\n", interfaceA); - trace("\tWaveDeviceId: %d\n", data->WaveDeviceId); + trace("\tWaveDeviceId: %ld\n", data->WaveDeviceId); return TRUE; } @@ -160,20 +160,20 @@ static void propset_private_tests(void) rc = (pDllGetClassObject)(&CLSID_DirectSound, &IID_IClassFactory, NULL); ok(rc==DSERR_INVALIDPARAM,"DllGetClassObject(CLSID_DirectSound, " "IID_IClassFactory) should have returned DSERR_INVALIDPARAM, " - "returned: %08x\n",rc); + "returned: %08lx\n",rc); rc = (pDllGetClassObject)(&CLSID_DirectSound, &IID_IDirectSound, (void **)(&pcf)); ok(rc==E_NOINTERFACE,"DllGetClassObject(CLSID_DirectSound, " "IID_IDirectSound) should have returned E_NOINTERFACE, " - "returned: %08x\n",rc); + "returned: %08lx\n",rc); rc = (pDllGetClassObject)(&CLSID_DirectSound, &IID_IUnknown, (void **)(&pcf)); ok(rc==DS_OK,"DllGetClassObject(CLSID_DirectSound, " - "IID_IUnknown) failed: %08x\n",rc); + "IID_IUnknown) failed: %08lx\n",rc); rc = (pDllGetClassObject)(&CLSID_DirectSound, &IID_IClassFactory, (void **)(&pcf)); ok(pcf!=0, "DllGetClassObject(CLSID_DirectSound, IID_IClassFactory) " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); if (pcf==0) return; @@ -182,17 +182,17 @@ static void propset_private_tests(void) rc = IClassFactory_CreateInstance(pcf, NULL, &IID_IKsPropertySet, NULL); ok(rc==DSERR_INVALIDPARAM, "CreateInstance(IID_IKsPropertySet) should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n",rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n",rc); rc = IClassFactory_CreateInstance(pcf, NULL, &IID_IKsPropertySet, (void **)(&pps)); ok(rc==E_NOINTERFACE, "CreateInstance(IID_IKsPropertySet) should have " - "returned E_NOINTERFACE, returned: %08x\n",rc); + "returned E_NOINTERFACE, returned: %08lx\n",rc); /* and the direct sound 8 version */ rc = pDllGetClassObject(&CLSID_DirectSound8, &IID_IClassFactory, (void **)&pcf); ok(pcf!=0, "DllGetClassObject(CLSID_DirectSound8, IID_IClassFactory) " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); if (pcf==0) return; @@ -200,12 +200,12 @@ static void propset_private_tests(void) rc = IClassFactory_CreateInstance(pcf, NULL, &IID_IKsPropertySet, (void **)(&pps)); ok(rc==E_NOINTERFACE, "CreateInstance(IID_IKsPropertySet) should have " - "returned E_NOINTERFACE, returned: %08x\n",rc); + "returned E_NOINTERFACE, returned: %08lx\n",rc); /* try direct sound capture next */ rc = pDllGetClassObject(&CLSID_DirectSoundCapture, &IID_IClassFactory, (void **)&pcf); ok(pcf!=0, "DllGetClassObject(CLSID_DirectSoundCapture, IID_IClassFactory) " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); if (pcf==0) return; @@ -213,12 +213,12 @@ static void propset_private_tests(void) rc = IClassFactory_CreateInstance(pcf, NULL, &IID_IKsPropertySet, (void **)(&pps)); ok(rc==E_NOINTERFACE, "CreateInstance(IID_IKsPropertySet) should have " - "returned E_NOINTERFACE,returned: %08x\n",rc); + "returned E_NOINTERFACE,returned: %08lx\n",rc); /* and the direct sound capture 8 version */ rc = pDllGetClassObject(&CLSID_DirectSoundCapture8, &IID_IClassFactory, (void **)&pcf); ok(pcf!=0, "DllGetClassObject(CLSID_DirectSoundCapture8, " - "IID_IClassFactory) failed: %08x\n",rc); + "IID_IClassFactory) failed: %08lx\n",rc); if (pcf==0) return; @@ -226,13 +226,13 @@ static void propset_private_tests(void) rc = IClassFactory_CreateInstance(pcf, NULL, &IID_IKsPropertySet, (void **)(&pps)); ok(rc==E_NOINTERFACE, "CreateInstance(IID_IKsPropertySet) should have " - "returned E_NOINTERFACE, returned: %08x\n",rc); + "returned E_NOINTERFACE, returned: %08lx\n",rc); /* try direct sound full duplex next */ rc = (pDllGetClassObject)(&CLSID_DirectSoundFullDuplex, &IID_IClassFactory, (void **)(&pcf)); ok(pcf!=0, "DllGetClassObject(CLSID_DirectSoundFullDuplex, " - "IID_IClassFactory) failed: %08x\n",rc); + "IID_IClassFactory) failed: %08lx\n",rc); if (pcf==0) return; @@ -240,7 +240,7 @@ static void propset_private_tests(void) rc = IClassFactory_CreateInstance(pcf, NULL, &IID_IKsPropertySet, (void **)(&pps)); ok(rc==E_NOINTERFACE, "CreateInstance(IID_IKsPropertySet) should have " - "returned NOINTERFACE, returned: %08x\n",rc); + "returned NOINTERFACE, returned: %08lx\n",rc); /* try direct sound private last */ rc = (pDllGetClassObject)(&CLSID_DirectSoundPrivate, &IID_IClassFactory, @@ -253,7 +253,7 @@ static void propset_private_tests(void) /* direct sound private does have an IKsPropertySet */ rc = IClassFactory_CreateInstance(pcf, NULL, &IID_IKsPropertySet, (void **)(&pps)); - ok(rc==DS_OK, "CreateInstance(IID_IKsPropertySet) failed: %08x\n", + ok(rc==DS_OK, "CreateInstance(IID_IKsPropertySet) failed: %08lx\n", rc); if (rc!=DS_OK) return; @@ -264,7 +264,7 @@ static void propset_private_tests(void) &support); ok(rc==DS_OK||rc==E_INVALIDARG, "QuerySupport(DSPROPSETID_DirectSoundDevice, " - "DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION) failed: %08x\n", + "DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION) failed: %08lx\n", rc); if (rc!=DS_OK) { if (rc==E_INVALIDARG) @@ -274,10 +274,10 @@ static void propset_private_tests(void) ok(support & KSPROPERTY_SUPPORT_GET, "Couldn't get DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION: " - "support = 0x%x\n",support); + "support = 0x%lx\n",support); ok(!(support & KSPROPERTY_SUPPORT_SET), "Shouldn't be able to set DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION: " - "support = 0x%x\n",support); + "support = 0x%lx\n",support); /* test DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1 */ rc = IKsPropertySet_QuerySupport(pps, &DSPROPSETID_DirectSoundDevice, @@ -285,7 +285,7 @@ static void propset_private_tests(void) &support); ok(rc==DS_OK||rc==E_INVALIDARG, "QuerySupport(DSPROPSETID_DirectSoundDevice, " - "DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1) failed: %08x\n", + "DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1) failed: %08lx\n", rc); if (rc!=DS_OK) { if (rc==E_INVALIDARG) @@ -295,10 +295,10 @@ static void propset_private_tests(void) ok(support & KSPROPERTY_SUPPORT_GET, "Couldn't get DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1: " - "support = 0x%x\n",support); + "support = 0x%lx\n",support); ok(!(support & KSPROPERTY_SUPPORT_SET), "Shouldn't be able to set DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1: " - "support = 0x%x\n",support); + "support = 0x%lx\n",support); /* test DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A */ rc = IKsPropertySet_QuerySupport(pps, &DSPROPSETID_DirectSoundDevice, @@ -306,7 +306,7 @@ static void propset_private_tests(void) &support); ok(rc==DS_OK||rc==E_INVALIDARG, "QuerySupport(DSPROPSETID_DirectSoundDevice, " - "DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A) failed: %08x\n", + "DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A) failed: %08lx\n", rc); if (rc!=DS_OK) { if (rc==E_INVALIDARG) @@ -316,10 +316,10 @@ static void propset_private_tests(void) ok(support & KSPROPERTY_SUPPORT_GET, "Couldn't get DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A: " - "support = 0x%x\n",support); + "support = 0x%lx\n",support); ok(!(support & KSPROPERTY_SUPPORT_SET), "Shouldn't be able to set DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A: " - "support = 0x%x\n",support); + "support = 0x%lx\n",support); /* test DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W */ rc = IKsPropertySet_QuerySupport(pps, &DSPROPSETID_DirectSoundDevice, @@ -327,7 +327,7 @@ static void propset_private_tests(void) &support); ok(rc==DS_OK||rc==E_INVALIDARG, "QuerySupport(DSPROPSETID_DirectSoundDevice, " - "DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W) failed: %08x\n", + "DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W) failed: %08lx\n", rc); if (rc!=DS_OK) { if (rc==E_INVALIDARG) @@ -337,58 +337,58 @@ static void propset_private_tests(void) ok(support & KSPROPERTY_SUPPORT_GET, "Couldn't get DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W: " - "support = 0x%x\n",support); + "support = 0x%lx\n",support); ok(!(support & KSPROPERTY_SUPPORT_SET), "Shouldn't be able to set DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W: " - "support = 0x%x\n",support); + "support = 0x%lx\n",support); /* test generic DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING */ rc = IKsPropertySet_QuerySupport(pps, &DSPROPSETID_DirectSoundDevice, DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING, &support); ok(rc==DS_OK, "QuerySupport(DSPROPSETID_DirectSoundDevice, " - "DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING) failed: %08x\n", + "DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING) failed: %08lx\n", rc); if (rc!=DS_OK) return; ok(support & KSPROPERTY_SUPPORT_GET, "Couldn't get DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING: " - "support = 0x%x\n",support); + "support = 0x%lx\n",support); ok(!(support & KSPROPERTY_SUPPORT_SET), "Shouldn't be able to set " "DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING: support = " - "0x%x\n",support); + "0x%lx\n",support); /* test DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A */ rc = IKsPropertySet_QuerySupport(pps, &DSPROPSETID_DirectSoundDevice, DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A, &support); ok(rc==DS_OK, "QuerySupport(DSPROPSETID_DirectSoundDevice, " - "DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A) failed: %08x\n", + "DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A) failed: %08lx\n", rc); if (rc!=DS_OK) return; ok(support & KSPROPERTY_SUPPORT_GET, "Couldn't get DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A: " - "support = 0x%x\n",support); + "support = 0x%lx\n",support); ok(!(support & KSPROPERTY_SUPPORT_SET), "Shouldn't be able to set " "DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A: support = " - "0x%x\n",support); + "0x%lx\n",support); /* test DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W */ rc = IKsPropertySet_QuerySupport(pps, &DSPROPSETID_DirectSoundDevice, DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W, &support); ok(rc==DS_OK, "QuerySupport(DSPROPSETID_DirectSoundDevice, " - "DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W) failed: %08x\n", + "DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W) failed: %08lx\n", rc); if (rc!=DS_OK) return; ok(support & KSPROPERTY_SUPPORT_GET, "Couldn't get DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W: " - "support = 0x%x\n",support); + "support = 0x%lx\n",support); ok(!(support & KSPROPERTY_SUPPORT_SET), "Shouldn't be able to set " "DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W: support = " - "0x%x\n",support); + "0x%lx\n",support); /* test generic DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE */ trace("*** Testing DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE ***\n"); @@ -396,16 +396,16 @@ static void propset_private_tests(void) DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE, &support); ok(rc==DS_OK, "QuerySupport(DSPROPSETID_DirectSoundDevice, " - "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE) failed: %08x\n", + "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE) failed: %08lx\n", rc); if (rc!=DS_OK) return; ok(support & KSPROPERTY_SUPPORT_GET, "Couldn't get DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE: " - "support = 0x%x\n",support); + "support = 0x%lx\n",support); ok(!(support & KSPROPERTY_SUPPORT_SET),"Shouldn't be able to set " - "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE: support = 0x%x\n",support); + "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE: support = 0x%lx\n",support); if (support & KSPROPERTY_SUPPORT_GET) { DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_DATA data; @@ -417,7 +417,7 @@ static void propset_private_tests(void) rc = IKsPropertySet_Get(pps, &DSPROPSETID_DirectSoundDevice, DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE, NULL, 0, &data, sizeof(data), &bytes); - ok(rc==DS_OK, "Couldn't enumerate: 0x%x\n",rc); + ok(rc==DS_OK, "Couldn't enumerate: 0x%lx\n",rc); } /* test DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1 */ @@ -426,16 +426,16 @@ static void propset_private_tests(void) DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1, &support); ok(rc==DS_OK, "QuerySupport(DSPROPSETID_DirectSoundDevice, " - "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1) failed: %08x\n", + "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1) failed: %08lx\n", rc); if (rc!=DS_OK) return; ok(support & KSPROPERTY_SUPPORT_GET, "Couldn't get DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1: " - "support = 0x%x\n",support); + "support = 0x%lx\n",support); ok(!(support & KSPROPERTY_SUPPORT_SET),"Shouldn't be able to set " - "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1: support = 0x%x\n",support); + "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1: support = 0x%lx\n",support); if (support & KSPROPERTY_SUPPORT_GET) { DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1_DATA data; @@ -447,7 +447,7 @@ static void propset_private_tests(void) rc = IKsPropertySet_Get(pps, &DSPROPSETID_DirectSoundDevice, DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1, NULL, 0, &data, sizeof(data), &bytes); - ok(rc==DS_OK, "Couldn't enumerate: 0x%x\n",rc); + ok(rc==DS_OK, "Couldn't enumerate: 0x%lx\n",rc); } /* test DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A */ @@ -456,16 +456,16 @@ static void propset_private_tests(void) DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A, &support); ok(rc==DS_OK, "QuerySupport(DSPROPSETID_DirectSoundDevice, " - "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A) failed: %08x\n", + "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A) failed: %08lx\n", rc); if (rc!=DS_OK) return; ok(support & KSPROPERTY_SUPPORT_GET, "Couldn't get DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A: " - "support = 0x%x\n",support); + "support = 0x%lx\n",support); ok(!(support & KSPROPERTY_SUPPORT_SET),"Shouldn't be able to set " - "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A: support = 0x%x\n",support); + "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A: support = 0x%lx\n",support); if (support & KSPROPERTY_SUPPORT_GET) { DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A_DATA data; @@ -477,7 +477,7 @@ static void propset_private_tests(void) rc = IKsPropertySet_Get(pps, &DSPROPSETID_DirectSoundDevice, DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A, NULL, 0, &data, sizeof(data), &bytes); - ok(rc==DS_OK, "Couldn't enumerate: 0x%x\n",rc); + ok(rc==DS_OK, "Couldn't enumerate: 0x%lx\n",rc); } /* test DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W */ @@ -486,16 +486,16 @@ static void propset_private_tests(void) DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W, &support); ok(rc==DS_OK, "QuerySupport(DSPROPSETID_DirectSoundDevice, " - "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W) failed: %08x\n", + "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W) failed: %08lx\n", rc); if (rc!=DS_OK) return; ok(support & KSPROPERTY_SUPPORT_GET, "Couldn't get DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W: " - "support = 0x%x\n",support); + "support = 0x%lx\n",support); ok(!(support & KSPROPERTY_SUPPORT_SET),"Shouldn't be able to set " - "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W: support = 0x%x\n",support); + "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W: support = 0x%lx\n",support); if (support & KSPROPERTY_SUPPORT_GET) { DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA data; @@ -507,7 +507,7 @@ static void propset_private_tests(void) rc = IKsPropertySet_Get(pps, &DSPROPSETID_DirectSoundDevice, DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W, NULL, 0, &data, sizeof(data), &bytes); - ok(rc==DS_OK, "Couldn't enumerate: 0x%x\n",rc); + ok(rc==DS_OK, "Couldn't enumerate: 0x%lx\n",rc); } IKsPropertySet_Release(pps); } @@ -529,7 +529,7 @@ static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, - "DirectSoundCreate() failed: %08x\n",rc); + "DirectSoundCreate() failed: %08lx\n",rc); if (rc!=DS_OK) { if (rc==DSERR_NODRIVER) trace(" No Driver\n"); @@ -543,7 +543,7 @@ static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, /* We must call SetCooperativeLevel before calling CreateSoundBuffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08x\n", + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08lx\n", rc); if (rc!=DS_OK) goto EXIT; @@ -557,7 +557,7 @@ static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, ok((rc==DS_OK&&primary!=NULL) || broken(rc==DSERR_INVALIDPARAM), "IDirectSound_CreateSoundBuffer() failed to " - "create a hardware 3D primary buffer: %08x\n",rc); + "create a hardware 3D primary buffer: %08lx\n",rc); if(rc==DSERR_INVALIDPARAM) { skip("broken driver\n"); goto EXIT; @@ -575,11 +575,11 @@ static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, bufdesc.dwFlags=DSBCAPS_CTRLDEFAULT|DSBCAPS_GETCURRENTPOSITION2; bufdesc.dwBufferBytes=wfx.nAvgBytesPerSec; bufdesc.lpwfxFormat=&wfx; - trace(" Testing a secondary buffer at %dx%dx%d\n", + trace(" Testing a secondary buffer at %ldx%dx%d\n", wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels); rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok((rc==DS_OK && secondary!=NULL) || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */ - "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer: %08x\n",rc); + "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer: %08lx\n",rc); if (rc==DS_OK&&secondary!=NULL) { IKsPropertySet * pPropertySet=NULL; rc=IDirectSoundBuffer_QueryInterface(secondary, @@ -671,7 +671,7 @@ static void propset_buffer_tests(void) { HRESULT rc; rc = DirectSoundEnumerateA(dsenum_callback, NULL); - ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08x\n",rc); + ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08lx\n",rc); trace("tested %u DirectSound drivers\n", driver_count); }
Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> On Tue, Mar 01, 2022 at 08:32:42AM +0100, Eric Pouech wrote:
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
--- dlls/dsound/tests/Makefile.in | 1 dlls/dsound/tests/capture.c | 150 +++++++------- dlls/dsound/tests/ds3d.c | 250 ++++++++++++------------ dlls/dsound/tests/ds3d8.c | 238 +++++++++++------------ dlls/dsound/tests/dsound.c | 386 +++++++++++++++++++------------------ dlls/dsound/tests/dsound8.c | 426 +++++++++++++++++++++-------------------- dlls/dsound/tests/duplex.c | 76 ++++--- dlls/dsound/tests/propset.c | 124 ++++++------ 8 files changed, 825 insertions(+), 826 deletions(-)
diff --git a/dlls/dsound/tests/Makefile.in b/dlls/dsound/tests/Makefile.in index cc39c4bda22..234b49b1bba 100644 --- a/dlls/dsound/tests/Makefile.in +++ b/dlls/dsound/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dsound.dll IMPORTS = dmoguids dsound msdmo ole32 version user32
diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index 2d8138aa19e..63998276a77 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -90,7 +90,7 @@ const char * format_string(const WAVEFORMATEX* wfx) { static char str[64];
- sprintf(str, "%5dx%2dx%d %s", + sprintf(str, "%5ldx%2dx%d %s", wfx->nSamplesPerSec, wfx->wBitsPerSample, wfx->nChannels, get_format_str(wfx->wFormatTag));
@@ -110,14 +110,14 @@ static void IDirectSoundCapture_test(LPDIRECTSOUNDCAPTURE dsco, rc=IDirectSoundCapture_QueryInterface(dsco, &IID_IUnknown, (LPVOID*)&unknown); ok(rc==DS_OK, "IDirectSoundCapture_QueryInterface(IID_IUnknown) " - "failed: %08x\n", rc); + "failed: %08lx\n", rc); if (rc==DS_OK) IUnknown_Release(unknown);
rc=IDirectSoundCapture_QueryInterface(dsco, &IID_IDirectSoundCapture, (LPVOID*)&dsc); ok(rc==DS_OK, "IDirectSoundCapture_QueryInterface(IID_IDirectSoundCapture) " - "failed: %08x\n", rc); + "failed: %08lx\n", rc); if (rc==DS_OK) IDirectSoundCapture_Release(dsc);
@@ -126,16 +126,16 @@ static void IDirectSoundCapture_test(LPDIRECTSOUNDCAPTURE dsco, rc=IDirectSoundCapture_GetCaps(dsco,0); ok(rc==DSERR_UNINITIALIZED||rc==E_INVALIDARG, "IDirectSoundCapture_GetCaps(NULL) should have returned " - "DSERR_UNINITIALIZED or E_INVALIDARG, returned: %08x\n", rc); + "DSERR_UNINITIALIZED or E_INVALIDARG, returned: %08lx\n", rc);
rc=IDirectSoundCapture_GetCaps(dsco, &dsccaps); ok(rc==DSERR_UNINITIALIZED,"IDirectSoundCapture_GetCaps() " - "should have returned DSERR_UNINITIALIZED, returned: %08x\n", rc); + "should have returned DSERR_UNINITIALIZED, returned: %08lx\n", rc);
rc=IDirectSoundCapture_Initialize(dsco, lpGuid); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED|| rc==E_FAIL||rc==E_INVALIDARG, - "IDirectSoundCapture_Initialize() failed: %08x\n", rc); + "IDirectSoundCapture_Initialize() failed: %08lx\n", rc); if (rc==DSERR_NODRIVER||rc==E_INVALIDARG) { trace(" No Driver\n"); goto EXIT; @@ -150,25 +150,25 @@ static void IDirectSoundCapture_test(LPDIRECTSOUNDCAPTURE dsco,
rc=IDirectSoundCapture_Initialize(dsco, lpGuid); ok(rc==DSERR_ALREADYINITIALIZED, "IDirectSoundCapture_Initialize() " - "should have returned DSERR_ALREADYINITIALIZED: %08x\n", rc); + "should have returned DSERR_ALREADYINITIALIZED: %08lx\n", rc);
/* DSOUND: Error: Invalid caps buffer */ rc=IDirectSoundCapture_GetCaps(dsco, 0); ok(rc==DSERR_INVALIDPARAM, "IDirectSoundCapture_GetCaps(NULL) " - "should have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "should have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc);
ZeroMemory(&dsccaps, sizeof(dsccaps));
/* DSOUND: Error: Invalid caps buffer */ rc=IDirectSoundCapture_GetCaps(dsco, &dsccaps); ok(rc==DSERR_INVALIDPARAM, "IDirectSound_GetCaps() " - "should have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "should have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc);
dsccaps.dwSize=sizeof(dsccaps);
/* DSOUND: Running on a certified driver */ rc=IDirectSoundCapture_GetCaps(dsco, &dsccaps); - ok(rc==DS_OK, "IDirectSoundCapture_GetCaps() failed: %08x\n", rc); + ok(rc==DS_OK, "IDirectSoundCapture_GetCaps() failed: %08lx\n", rc);
EXIT: ref=IDirectSoundCapture_Release(dsco); @@ -187,17 +187,17 @@ static void test_capture(void) rc=CoGetClassObject(&CLSID_DirectSoundCapture, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void**)&cf); ok(rc==S_OK,"CoGetClassObject(CLSID_DirectSoundCapture, IID_IClassFactory) " - "failed: %08x\n", rc); + "failed: %08lx\n", rc);
rc=CoGetClassObject(&CLSID_DirectSoundCapture, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&cf); ok(rc==S_OK,"CoGetClassObject(CLSID_DirectSoundCapture, IID_IUnknown) " - "failed: %08x\n", rc); + "failed: %08lx\n", rc);
/* try the COM class factory method of creation with no device specified */ rc=CoCreateInstance(&CLSID_DirectSoundCapture, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSoundCapture, (void**)&dsco); - ok(rc==S_OK||rc==REGDB_E_CLASSNOTREG,"CoCreateInstance(CLSID_DirectSoundCapture) failed: %08x\n", rc); + ok(rc==S_OK||rc==REGDB_E_CLASSNOTREG,"CoCreateInstance(CLSID_DirectSoundCapture) failed: %08lx\n", rc); if (rc==REGDB_E_CLASSNOTREG) { trace(" Class Not Registered\n"); return; @@ -209,7 +209,7 @@ static void test_capture(void) * device specified */ rc=CoCreateInstance(&CLSID_DirectSoundCapture, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSoundCapture, (void**)&dsco); - ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSoundCapture) failed: %08x\n", rc); + ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSoundCapture) failed: %08lx\n", rc); if (dsco) IDirectSoundCapture_test(dsco, FALSE, &DSDEVID_DefaultCapture);
@@ -217,7 +217,7 @@ static void test_capture(void) * capture device specified */ rc=CoCreateInstance(&CLSID_DirectSoundCapture, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSoundCapture, (void**)&dsco); - ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSoundCapture) failed: %08x\n", rc); + ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSoundCapture) failed: %08lx\n", rc); if (dsco) IDirectSoundCapture_test(dsco, FALSE, &DSDEVID_DefaultVoiceCapture);
@@ -227,26 +227,26 @@ static void test_capture(void) &CLSID_DirectSoundPrivate, (void**)&dsco); ok(rc==E_NOINTERFACE, "CoCreateInstance(CLSID_DirectSoundCapture,CLSID_DirectSoundPrivate) " - "should have failed: %08x\n",rc); + "should have failed: %08lx\n",rc);
/* try with no device specified */ rc = DirectSoundCaptureCreate(NULL, &dsco, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, - "DirectSoundCaptureCreate(NULL) failed: %08x\n",rc); + "DirectSoundCaptureCreate(NULL) failed: %08lx\n",rc); if (rc==S_OK && dsco) IDirectSoundCapture_test(dsco, TRUE, NULL);
/* try with default capture device specified */ rc = DirectSoundCaptureCreate(&DSDEVID_DefaultCapture, &dsco, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, - "DirectSoundCaptureCreate(DSDEVID_DefaultCapture) failed: %08x\n", rc); + "DirectSoundCaptureCreate(DSDEVID_DefaultCapture) failed: %08lx\n", rc); if (rc==DS_OK && dsco) IDirectSoundCapture_test(dsco, TRUE, NULL);
/* try with default voice capture device specified */ rc = DirectSoundCaptureCreate(&DSDEVID_DefaultVoiceCapture, &dsco, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, - "DirectSoundCaptureCreate(DSDEVID_DefaultVoiceCapture) failed: %08x\n", rc); + "DirectSoundCaptureCreate(DSDEVID_DefaultVoiceCapture) failed: %08lx\n", rc); if (rc==DS_OK && dsco) IDirectSoundCapture_test(dsco, TRUE, NULL);
@@ -254,7 +254,7 @@ static void test_capture(void) rc = DirectSoundCaptureCreate(&DSDEVID_DefaultVoicePlayback, &dsco, NULL); ok(rc==DSERR_NODRIVER, "DirectSoundCaptureCreate(DSDEVID_DefaultVoicePlatback) " - "should have failed: %08x\n",rc); + "should have failed: %08lx\n",rc); if (rc==DS_OK && dsco) IDirectSoundCapture_Release(dsco); } @@ -286,18 +286,18 @@ static BOOL capture_buffer_service(capture_state_t* state)
rc=IDirectSoundCaptureBuffer_GetCurrentPosition(state->dscbo,&capture_pos, &read_pos); - ok(rc==DS_OK,"IDirectSoundCaptureBuffer_GetCurrentPosition() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundCaptureBuffer_GetCurrentPosition() failed: %08lx\n", rc); if (rc!=DS_OK) return FALSE;
rc=IDirectSoundCaptureBuffer_Lock(state->dscbo,state->offset,state->size, &ptr1,&len1,&ptr2,&len2,0); - ok(rc==DS_OK,"IDirectSoundCaptureBuffer_Lock() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundCaptureBuffer_Lock() failed: %08lx\n", rc); if (rc!=DS_OK) return FALSE;
rc=IDirectSoundCaptureBuffer_Unlock(state->dscbo,ptr1,len1,ptr2,len2); - ok(rc==DS_OK,"IDirectSoundCaptureBuffer_Unlock() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundCaptureBuffer_Unlock() failed: %08lx\n", rc); if (rc!=DS_OK) return FALSE;
@@ -319,19 +319,19 @@ static void test_capture_buffer(LPDIRECTSOUNDCAPTURE dsco, /* Private dsound.dll: Error: Invalid caps pointer */ rc=IDirectSoundCaptureBuffer_GetCaps(dscbo,0); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundCaptureBuffer_GetCaps() should " - "have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc);
/* Private dsound.dll: Error: Invalid caps pointer */ dscbcaps.dwSize=0; rc=IDirectSoundCaptureBuffer_GetCaps(dscbo,&dscbcaps); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundCaptureBuffer_GetCaps() should " - "have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc);
dscbcaps.dwSize=sizeof(dscbcaps); rc=IDirectSoundCaptureBuffer_GetCaps(dscbo,&dscbcaps); - ok(rc==DS_OK,"IDirectSoundCaptureBuffer_GetCaps() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundCaptureBuffer_GetCaps() failed: %08lx\n", rc); if (rc==DS_OK && winetest_debug > 1) { - trace(" Caps: size = %d flags=0x%08x buffer size=%d\n", + trace(" Caps: size = %ld flags=0x%08lx buffer size=%ld\n", dscbcaps.dwSize,dscbcaps.dwFlags,dscbcaps.dwBufferBytes); }
@@ -340,17 +340,17 @@ static void test_capture_buffer(LPDIRECTSOUNDCAPTURE dsco, * be non-NULL */ rc=IDirectSoundCaptureBuffer_GetFormat(dscbo,NULL,0,NULL); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundCaptureBuffer_GetFormat() should " - "have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc);
size=0; rc=IDirectSoundCaptureBuffer_GetFormat(dscbo,NULL,0,&size); ok(rc==DS_OK && size!=0,"IDirectSoundCaptureBuffer_GetFormat() should " - "have returned the needed size: rc=%08x, size=%d\n", rc,size); + "have returned the needed size: rc=%08lx, size=%ld\n", rc,size);
rc=IDirectSoundCaptureBuffer_GetFormat(dscbo,&wfx,sizeof(wfx),NULL); - ok(rc==DS_OK,"IDirectSoundCaptureBuffer_GetFormat() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundCaptureBuffer_GetFormat() failed: %08lx\n", rc); if (rc==DS_OK && winetest_debug > 1) { - trace(" Format: tag=0x%04x %dx%dx%d avg.B/s=%d align=%d\n", + trace(" Format: tag=0x%04x %ldx%dx%d avg.B/s=%ld align=%d\n", wfx.wFormatTag,wfx.nSamplesPerSec,wfx.wBitsPerSample, wfx.nChannels,wfx.nAvgBytesPerSec,wfx.nBlockAlign); } @@ -358,12 +358,12 @@ static void test_capture_buffer(LPDIRECTSOUNDCAPTURE dsco, /* Private dsound.dll: Error: Invalid status pointer */ rc=IDirectSoundCaptureBuffer_GetStatus(dscbo,0); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundCaptureBuffer_GetStatus() should " - "have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc);
rc=IDirectSoundCaptureBuffer_GetStatus(dscbo,&status); - ok(rc==DS_OK,"IDirectSoundCaptureBuffer_GetStatus() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundCaptureBuffer_GetStatus() failed: %08lx\n", rc); if (rc==DS_OK && winetest_debug > 1) { - trace(" Status=0x%04x\n",status); + trace(" Status=0x%04lx\n",status); }
ZeroMemory(&state, sizeof(state)); @@ -377,7 +377,7 @@ static void test_capture_buffer(LPDIRECTSOUNDCAPTURE dsco, rc=IDirectSoundCaptureBuffer_QueryInterface(dscbo,&IID_IDirectSoundNotify, (void **)&(state.notify)); ok((rc==DS_OK)&&(state.notify!=NULL), - "IDirectSoundCaptureBuffer_QueryInterface() failed: %08x\n", rc); + "IDirectSoundCaptureBuffer_QueryInterface() failed: %08lx\n", rc);
for (i = 0; i < TIMESTAMP_NOTIFICATIONS; i++) { state.posnotify[i].dwOffset = (i * state.size) + state.size - 1; @@ -389,32 +389,32 @@ static void test_capture_buffer(LPDIRECTSOUNDCAPTURE dsco,
rc = IDirectSoundNotify_SetNotificationPositions(state.notify, TOTAL_NOTIFICATIONS, state.posnotify); - ok(rc==DS_OK,"IDirectSoundNotify_SetNotificationPositions() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundNotify_SetNotificationPositions() failed: %08lx\n", rc);
ref=IDirectSoundNotify_Release(state.notify); ok(ref==0,"IDirectSoundNotify_Release(): has %d references, should have " "0\n",ref);
rc=IDirectSoundCaptureBuffer_Start(dscbo,DSCBSTART_LOOPING); - ok(rc==DS_OK,"IDirectSoundCaptureBuffer_Start() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundCaptureBuffer_Start() failed: %08lx\n", rc);
rc=IDirectSoundCaptureBuffer_Start(dscbo,0); - ok(rc==DS_OK,"IDirectSoundCaptureBuffer_Start() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundCaptureBuffer_Start() failed: %08lx\n", rc);
rc=IDirectSoundCaptureBuffer_GetStatus(dscbo,&status); - ok(rc==DS_OK,"IDirectSoundCaptureBuffer_GetStatus() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundCaptureBuffer_GetStatus() failed: %08lx\n", rc); ok(status==(DSCBSTATUS_CAPTURING|DSCBSTATUS_LOOPING) || broken(status==DSCBSTATUS_CAPTURING), - "GetStatus: bad status: %x\n",status); + "GetStatus: bad status: %lx\n",status);
if (record) { /* wait for timestamp notifications */ for (i = 0; i < (TIMESTAMP_NOTIFICATIONS * 2); i++) { rc = WaitForMultipleObjects(TOTAL_NOTIFICATIONS, state.event, FALSE, 3000); ok(rc == (WAIT_OBJECT_0 + (i % TIMESTAMP_NOTIFICATIONS)), - "WaitForMultipleObjects failed: 0x%x\n",rc); + "WaitForMultipleObjects failed: 0x%lx\n",rc); if (rc != (WAIT_OBJECT_0 + (i % TIMESTAMP_NOTIFICATIONS))) { ok((rc==WAIT_TIMEOUT)||(rc==WAIT_FAILED), - "Wrong notification: should be %d, got %d\n", + "Wrong notification: should be %d, got %ld\n", i % TIMESTAMP_NOTIFICATIONS, rc - WAIT_OBJECT_0); } if (!capture_buffer_service(&state)) @@ -423,14 +423,14 @@ static void test_capture_buffer(LPDIRECTSOUNDCAPTURE dsco,
} rc=IDirectSoundCaptureBuffer_Stop(dscbo); - ok(rc==DS_OK,"IDirectSoundCaptureBuffer_Stop() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundCaptureBuffer_Stop() failed: %08lx\n", rc);
/* wait for stop notification */ rc = WaitForSingleObject(state.event[TIMESTAMP_NOTIFICATIONS], 3000); - ok(rc == WAIT_OBJECT_0, "WaitForSingleObject failed: 0x%x\n", rc); + ok(rc == WAIT_OBJECT_0, "WaitForSingleObject failed: 0x%lx\n", rc);
rc=IDirectSoundCaptureBuffer_Stop(dscbo); - ok(rc==DS_OK,"IDirectSoundCaptureBuffer_Stop() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundCaptureBuffer_Stop() failed: %08lx\n", rc); }
static BOOL WINAPI dscenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, @@ -449,11 +449,11 @@ static BOOL WINAPI dscenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, trace("*** Testing %s - %s ***\n",lpcstrDescription,lpcstrModule); rc = DirectSoundCaptureCreate(lpGuid, NULL, NULL); ok(rc==DSERR_INVALIDPARAM,"DirectSoundCaptureCreate() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n",rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n",rc);
rc = DirectSoundCaptureCreate(lpGuid, &dsco, NULL); ok((rc==DS_OK)||(rc==DSERR_NODRIVER)||(rc==E_FAIL)||(rc==DSERR_ALLOCATED), - "DirectSoundCaptureCreate() failed: %08x\n",rc); + "DirectSoundCaptureCreate() failed: %08lx\n",rc); if (rc!=DS_OK) { if (rc==DSERR_NODRIVER) trace(" No Driver\n"); @@ -467,19 +467,19 @@ static BOOL WINAPI dscenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, /* Private dsound.dll: Error: Invalid caps buffer */ rc=IDirectSoundCapture_GetCaps(dsco,NULL); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundCapture_GetCaps() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n",rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n",rc);
/* Private dsound.dll: Error: Invalid caps buffer */ dsccaps.dwSize=0; rc=IDirectSoundCapture_GetCaps(dsco,&dsccaps); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundCapture_GetCaps() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n",rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n",rc);
dsccaps.dwSize=sizeof(dsccaps); rc=IDirectSoundCapture_GetCaps(dsco,&dsccaps); - ok(rc==DS_OK,"IDirectSoundCapture_GetCaps() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundCapture_GetCaps() failed: %08lx\n", rc); if (rc==DS_OK && winetest_debug > 1) { - trace(" Caps: size=%d flags=0x%08x formats=%05x channels=%d\n", + trace(" Caps: size=%ld flags=0x%08lx formats=%05lx channels=%ld\n", dsccaps.dwSize,dsccaps.dwFlags,dsccaps.dwFormats, dsccaps.dwChannels); } @@ -494,7 +494,7 @@ static BOOL WINAPI dscenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, bufdesc.lpwfxFormat=NULL; rc=IDirectSoundCapture_CreateCaptureBuffer(dsco,&bufdesc,&dscbo,NULL); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundCapture_CreateCaptureBuffer() " - "should have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "should have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc); if (rc==DS_OK) { ref=IDirectSoundCaptureBuffer_Release(dscbo); ok(ref==0,"IDirectSoundCaptureBuffer_Release() has %d references, " @@ -511,7 +511,7 @@ static BOOL WINAPI dscenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, bufdesc.lpwfxFormat=NULL; rc=IDirectSoundCapture_CreateCaptureBuffer(dsco,&bufdesc,&dscbo,NULL); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundCapture_CreateCaptureBuffer() " - "should have returned DSERR_INVALIDPARAM, returned %08x\n", rc); + "should have returned DSERR_INVALIDPARAM, returned %08lx\n", rc); if (rc==DS_OK) { ref=IDirectSoundCaptureBuffer_Release(dscbo); ok(ref==0,"IDirectSoundCaptureBuffer_Release() has %d references, " @@ -529,7 +529,7 @@ static BOOL WINAPI dscenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, bufdesc.lpwfxFormat=&wfx; rc=IDirectSoundCapture_CreateCaptureBuffer(dsco,&bufdesc,&dscbo,NULL); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundCapture_CreateCaptureBuffer() " - "should have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "should have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc); if (rc==DS_OK) { ref=IDirectSoundCaptureBuffer_Release(dscbo); ok(ref==0,"IDirectSoundCaptureBuffer_Release() has %d references, " @@ -547,7 +547,7 @@ static BOOL WINAPI dscenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, bufdesc.lpwfxFormat=&wfx; rc=IDirectSoundCapture_CreateCaptureBuffer(dsco,&bufdesc,&dscbo,NULL); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundCapture_CreateCaptureBuffer() " - "should have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "should have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc); if (rc==DS_OK) { ref=IDirectSoundCaptureBuffer_Release(dscbo); ok(ref==0,"IDirectSoundCaptureBuffer_Release() has %d references, " @@ -571,7 +571,7 @@ static BOOL WINAPI dscenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, || rc==DSERR_BADFORMAT || rc==DSERR_INVALIDCALL || rc==DSERR_NODRIVER || rc==DSERR_ALLOCATED || rc==E_INVALIDARG || rc==E_FAIL, "IDirectSoundCapture_CreateCaptureBuffer() failed to create a " - "%s capture buffer: %08x\n",format_string(&wfx),rc); + "%s capture buffer: %08lx\n",format_string(&wfx),rc); if (rc==DS_OK) { test_capture_buffer(dsco, dscbo, winetest_interactive); ref=IDirectSoundCaptureBuffer_Release(dscbo); @@ -599,7 +599,7 @@ static BOOL WINAPI dscenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, (DSCBUFFERDESC*)&bufdesc1,&dscbo,NULL); ok(rc==DS_OK || broken(rc==DSERR_INVALIDPARAM), "IDirectSoundCapture_CreateCaptureBuffer() failed to create a " - "%s capture buffer: %08x\n",format_string(&wfx), rc); + "%s capture buffer: %08lx\n",format_string(&wfx), rc); if (rc==DSERR_INVALIDPARAM) { skip("broken driver\n"); goto EXIT; @@ -634,7 +634,7 @@ static BOOL WINAPI dscenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, trace(" Testing the capture buffer at %s\n", format_string(&wfx)); rc=IDirectSoundCapture_CreateCaptureBuffer(dsco,&bufdesc,&dscbo,NULL); ok((rc==DS_OK)&&(dscbo!=NULL),"IDirectSoundCapture_CreateCaptureBuffer() " - "failed to create a capture buffer: %08x\n",rc); + "failed to create a capture buffer: %08lx\n",rc); if ((rc==DS_OK)&&(dscbo!=NULL)) { test_capture_buffer(dsco, dscbo, winetest_interactive); ref=IDirectSoundCaptureBuffer_Release(dscbo); @@ -658,7 +658,7 @@ static BOOL WINAPI dscenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, trace(" Testing the capture buffer at %s\n", format_string(&wfx)); rc=IDirectSoundCapture_CreateCaptureBuffer(dsco,&bufdesc,&dscbo,NULL); ok(rc!=DS_OK,"IDirectSoundCapture_CreateCaptureBuffer() should have failed " - "at 2 MHz %08x\n",rc); + "at 2 MHz %08lx\n",rc); }
EXIT: @@ -675,7 +675,7 @@ static void test_enumerate(void) { HRESULT rc; rc = DirectSoundCaptureEnumerateA(dscenum_callback, NULL); - ok(rc==DS_OK,"DirectSoundCaptureEnumerateA() failed: %08x\n", rc); + ok(rc==DS_OK,"DirectSoundCaptureEnumerateA() failed: %08lx\n", rc); }
static void test_COM(void) @@ -691,7 +691,7 @@ static void test_COM(void)
hr = DirectSoundCaptureCreate(NULL, &dsc, (IUnknown *)0xdeadbeef); ok(hr == DSERR_NOAGGREGATION, - "DirectSoundCaptureCreate failed: %08x, expected DSERR_NOAGGREGATION\n", hr); + "DirectSoundCaptureCreate failed: %08lx, expected DSERR_NOAGGREGATION\n", hr); ok(dsc == (IDirectSoundCapture*)0xdeadbeef, "dsc = %p\n", dsc);
hr = DirectSoundCaptureCreate(NULL, &dsc, NULL); @@ -699,15 +699,15 @@ static void test_COM(void) skip("No driver\n"); return; } - ok(hr == DS_OK, "DirectSoundCaptureCreate failed: %08x, expected DS_OK\n", hr); + ok(hr == DS_OK, "DirectSoundCaptureCreate failed: %08lx, expected DS_OK\n", hr);
/* Different refcount for IDirectSoundCapture and for IUnknown */ refcount = IDirectSoundCapture_AddRef(dsc); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectSoundCapture_QueryInterface(dsc, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08lx\n", hr); refcount = IUnknown_AddRef(unk); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); IUnknown_Release(unk); IUnknown_Release(unk); IDirectSoundCapture_Release(dsc); @@ -725,37 +725,37 @@ static void test_COM(void) hr = IDirectSoundCapture_CreateCaptureBuffer(dsc, &bufdesc, &buffer, (IUnknown*)0xdeadbeef); } ok(hr == DSERR_NOAGGREGATION, - "IDirectSoundCapture_CreateCaptureBuffer failed: %08x, expected DSERR_NOAGGREGATION\n", hr); + "IDirectSoundCapture_CreateCaptureBuffer failed: %08lx, expected DSERR_NOAGGREGATION\n", hr); ok(buffer == (IDirectSoundCaptureBuffer*)0xdeadbeef || !buffer /* Win2k without DirectX9 */, "buffer = %p\n", buffer);
hr = IDirectSoundCapture_CreateCaptureBuffer(dsc, &bufdesc, &buffer, NULL); - ok(hr == DS_OK, "IDirectSoundCapture_CreateCaptureBuffer failed: %08x, expected DS_OK\n", hr); + ok(hr == DS_OK, "IDirectSoundCapture_CreateCaptureBuffer failed: %08lx, expected DS_OK\n", hr);
/* IDirectSoundCaptureBuffer and IDirectSoundNotify have separate refcounts */ IDirectSoundCaptureBuffer_AddRef(buffer); refcount = IDirectSoundCaptureBuffer_AddRef(buffer); - ok(refcount == 3, "IDirectSoundCaptureBuffer refcount is %u, expected 3\n", refcount); + ok(refcount == 3, "IDirectSoundCaptureBuffer refcount is %lu, expected 3\n", refcount); hr = IDirectSoundCaptureBuffer_QueryInterface(buffer, &IID_IDirectSoundNotify, (void**)¬ify); - ok(hr == DS_OK, "IDirectSoundCapture_QueryInterface failed: %08x, expected DS_OK\n", hr); + ok(hr == DS_OK, "IDirectSoundCapture_QueryInterface failed: %08lx, expected DS_OK\n", hr); refcount = IDirectSoundNotify_AddRef(notify); - ok(refcount == 2, "IDirectSoundNotify refcount is %u, expected 2\n", refcount); + ok(refcount == 2, "IDirectSoundNotify refcount is %lu, expected 2\n", refcount); IDirectSoundCaptureBuffer_AddRef(buffer); refcount = IDirectSoundCaptureBuffer_Release(buffer); - ok(refcount == 3, "IDirectSoundCaptureBuffer refcount is %u, expected 3\n", refcount); + ok(refcount == 3, "IDirectSoundCaptureBuffer refcount is %lu, expected 3\n", refcount);
/* Release IDirectSoundCaptureBuffer while keeping IDirectSoundNotify alive */ while (IDirectSoundCaptureBuffer_Release(buffer) > 0); refcount = IDirectSoundNotify_AddRef(notify); - ok(refcount == 3, "IDirectSoundNotify refcount is %u, expected 3\n", refcount); + ok(refcount == 3, "IDirectSoundNotify refcount is %lu, expected 3\n", refcount); refcount = IDirectSoundCaptureBuffer_AddRef(buffer); - ok(refcount == 1, "IDirectSoundCaptureBuffer refcount is %u, expected 1\n", refcount); + ok(refcount == 1, "IDirectSoundCaptureBuffer refcount is %lu, expected 1\n", refcount);
while (IDirectSoundNotify_Release(notify) > 0); refcount = IDirectSoundCaptureBuffer_Release(buffer); - ok(refcount == 0, "IDirectSoundCaptureBuffer refcount is %u, expected 0\n", refcount); + ok(refcount == 0, "IDirectSoundCaptureBuffer refcount is %lu, expected 0\n", refcount); refcount = IDirectSoundCapture_Release(dsc); - ok(refcount == 0, "IDirectSoundCapture refcount is %u, expected 0\n", refcount); + ok(refcount == 0, "IDirectSoundCapture refcount is %lu, expected 0\n", refcount); }
START_TEST(capture) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index a6b31641d4a..577c4155e9f 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -197,10 +197,10 @@ static int buffer_refill(play_state_t* state, DWORD size) /* some broken apps like Navyfield mistakenly pass NULL for a ppValue */ rc=IDirectSoundBuffer_Lock(state->dsbo,state->offset,size, &ptr1,NULL,&ptr2,&len2,0); - ok(rc==DSERR_INVALIDPARAM,"expected %08x got %08x\n",DSERR_INVALIDPARAM, rc); + ok(rc==DSERR_INVALIDPARAM,"expected %08lx got %08lx\n",DSERR_INVALIDPARAM, rc); rc=IDirectSoundBuffer_Lock(state->dsbo,state->offset,size, &ptr1,&len1,&ptr2,&len2,0); - ok(rc==DS_OK,"IDirectSoundBuffer_Lock() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_Lock() failed: %08lx\n", rc); if (rc!=DS_OK) return -1;
@@ -213,9 +213,9 @@ static int buffer_refill(play_state_t* state, DWORD size) state->offset=state->written % state->buffer_size; /* some apps blindly pass &ptr1 instead of ptr1 */ rc=IDirectSoundBuffer_Unlock(state->dsbo,&ptr1,len1,ptr2,len2); - ok(rc==DSERR_INVALIDPARAM, "IDDirectSoundBuffer_Unlock(): expected %08x got %08x, %p %p\n",DSERR_INVALIDPARAM, rc, &ptr1, ptr1); + ok(rc==DSERR_INVALIDPARAM, "IDDirectSoundBuffer_Unlock(): expected %08lx got %08lx, %p %p\n",DSERR_INVALIDPARAM, rc, &ptr1, ptr1); rc=IDirectSoundBuffer_Unlock(state->dsbo,ptr1,len1,ptr2,len2); - ok(rc==DS_OK,"IDirectSoundBuffer_Unlock() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_Unlock() failed: %08lx\n", rc); if (rc!=DS_OK) return -1; return size; @@ -230,7 +230,7 @@ static int buffer_silence(play_state_t* state, DWORD size)
rc=IDirectSoundBuffer_Lock(state->dsbo,state->offset,size, &ptr1,&len1,&ptr2,&len2,0); - ok(rc==DS_OK,"IDirectSoundBuffer_Lock() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_Lock() failed: %08lx\n", rc); if (rc!=DS_OK) return -1;
@@ -241,7 +241,7 @@ static int buffer_silence(play_state_t* state, DWORD size) } state->offset=(state->offset+size) % state->buffer_size; rc=IDirectSoundBuffer_Unlock(state->dsbo,ptr1,len1,ptr2,len2); - ok(rc==DS_OK,"IDirectSoundBuffer_Unlock() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_Unlock() failed: %08lx\n", rc); if (rc!=DS_OK) return -1; return size; @@ -253,7 +253,7 @@ static BOOL buffer_service(play_state_t* state) HRESULT rc;
rc=IDirectSoundBuffer_GetCurrentPosition(state->dsbo,&play_pos,NULL); - ok(rc==DS_OK,"IDirectSoundBuffer_GetCurrentPosition() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetCurrentPosition() failed: %08lx\n", rc); if (rc!=DS_OK) { goto STOP; } @@ -266,7 +266,7 @@ static BOOL buffer_service(play_state_t* state) state->played+=play_pos-last_play_pos;
if (winetest_debug > 1) - trace("buf size=%d last_play_pos=%d play_pos=%d played=%d / %d\n", + trace("buf size=%ld last_play_pos=%ld play_pos=%ld played=%ld / %ld\n", state->buffer_size,last_play_pos,play_pos,state->played, state->wave_len);
@@ -283,7 +283,7 @@ static BOOL buffer_service(play_state_t* state) buf_free=state->buffer_size-state->offset+play_pos;
if (winetest_debug > 1) - trace("offset=%d free=%d written=%d / %d\n", + trace("offset=%ld free=%ld written=%ld / %ld\n", state->offset,buf_free,state->written,state->wave_len); if (buf_free==0) return TRUE; @@ -295,14 +295,14 @@ static BOOL buffer_service(play_state_t* state) goto STOP; buf_free-=w; if (state->written==state->wave_len && winetest_debug > 1) - trace("last sound byte at %d\n", + trace("last sound byte at %ld\n", (state->written % state->buffer_size)); }
if (buf_free>0) { /* Fill with silence */ if (winetest_debug > 1) - trace("writing %d bytes of silence\n",buf_free); + trace("writing %ld bytes of silence\n",buf_free); if (buffer_silence(state,buf_free)==-1) goto STOP; } @@ -312,7 +312,7 @@ STOP: if (winetest_debug > 1) trace("stopping playback\n"); rc=IDirectSoundBuffer_Stop(state->dsbo); - ok(rc==DS_OK,"IDirectSoundBuffer_Stop() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_Stop() failed: %08lx\n", rc); return FALSE; }
@@ -333,7 +333,7 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, if (set_frequency) { rc=IDirectSoundBuffer_SetFrequency(*dsbo,frequency); ok(rc==DS_OK||rc==DSERR_CONTROLUNAVAIL, - "IDirectSoundBuffer_SetFrequency() failed to set frequency %08x\n",rc); + "IDirectSoundBuffer_SetFrequency() failed to set frequency %08lx\n",rc); if (rc!=DS_OK) return; } @@ -341,20 +341,20 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, /* DSOUND: Error: Invalid caps pointer */ rc=IDirectSoundBuffer_GetCaps(*dsbo,0); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundBuffer_GetCaps() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n",rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n",rc);
ZeroMemory(&dsbcaps, sizeof(dsbcaps));
/* DSOUND: Error: Invalid caps pointer */ rc=IDirectSoundBuffer_GetCaps(*dsbo,&dsbcaps); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundBuffer_GetCaps() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n",rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n",rc);
dsbcaps.dwSize=sizeof(dsbcaps); rc=IDirectSoundBuffer_GetCaps(*dsbo,&dsbcaps); - ok(rc==DS_OK,"IDirectSoundBuffer_GetCaps() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetCaps() failed: %08lx\n", rc); if (rc==DS_OK && winetest_debug > 1) { - trace(" Caps: flags=0x%08x size=%d\n",dsbcaps.dwFlags, + trace(" Caps: flags=0x%08lx size=%ld\n",dsbcaps.dwFlags, dsbcaps.dwBufferBytes); }
@@ -362,10 +362,10 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, size=0; rc=IDirectSoundBuffer_GetFormat(*dsbo,NULL,0,&size); ok(rc==DS_OK && size!=0,"IDirectSoundBuffer_GetFormat() should have " - "returned the needed size: rc=%08x size=%d\n",rc,size); + "returned the needed size: rc=%08lx size=%ld\n",rc,size);
ok(size == sizeof(WAVEFORMATEX) || size == sizeof(WAVEFORMATEXTENSIBLE), - "Expected a correct structure size, got %d\n", size); + "Expected a correct structure size, got %ld\n", size);
if (size == sizeof(WAVEFORMATEX)) { rc=IDirectSoundBuffer_GetFormat(*dsbo,&wfx,size,NULL); @@ -380,9 +380,9 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, return;
ok(rc==DS_OK, - "IDirectSoundBuffer_GetFormat() failed: %08x\n", rc); + "IDirectSoundBuffer_GetFormat() failed: %08lx\n", rc); if (rc==DS_OK && winetest_debug > 1) { - trace(" Format: %s tag=0x%04x %dx%dx%d avg.B/s=%d align=%d\n", + trace(" Format: %s tag=0x%04x %ldx%dx%d avg.B/s=%ld align=%d\n", is_primary ? "Primary" : "Secondary", wfx.wFormatTag,wfx.nSamplesPerSec,wfx.wBitsPerSample, wfx.nChannels,wfx.nAvgBytesPerSec,wfx.nBlockAlign); @@ -391,45 +391,45 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, /* DSOUND: Error: Invalid frequency buffer */ rc=IDirectSoundBuffer_GetFrequency(*dsbo,0); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundBuffer_GetFrequency() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n",rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n",rc);
/* DSOUND: Error: Primary buffers don't support CTRLFREQUENCY */ rc=IDirectSoundBuffer_GetFrequency(*dsbo,&freq); ok((rc==DS_OK && !is_primary) || (rc==DSERR_CONTROLUNAVAIL&&is_primary) || (rc==DSERR_CONTROLUNAVAIL&&!(dsbcaps.dwFlags&DSBCAPS_CTRLFREQUENCY)), - "IDirectSoundBuffer_GetFrequency() failed: %08x\n",rc); + "IDirectSoundBuffer_GetFrequency() failed: %08lx\n",rc); if (rc==DS_OK) { DWORD f = set_frequency?frequency:wfx.nSamplesPerSec; ok(freq==f,"The frequency returned by GetFrequency " - "%d does not match the format %d\n",freq,f); + "%ld does not match the format %ld\n",freq,f); }
/* DSOUND: Error: Invalid status pointer */ rc=IDirectSoundBuffer_GetStatus(*dsbo,0); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundBuffer_GetStatus() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n",rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n",rc);
rc=IDirectSoundBuffer_GetStatus(*dsbo,&status); - ok(rc==DS_OK,"IDirectSoundBuffer_GetStatus() failed: %08x\n", rc); - ok(status==0,"status=0x%x instead of 0\n",status); + ok(rc==DS_OK,"IDirectSoundBuffer_GetStatus() failed: %08lx\n", rc); + ok(status==0,"status=0x%lx instead of 0\n",status);
if (is_primary) { DSBCAPS new_dsbcaps; /* We must call SetCooperativeLevel to be allowed to call SetFormat */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08lx\n",rc); if (rc!=DS_OK) return;
/* DSOUND: Error: Invalid format pointer */ rc=IDirectSoundBuffer_SetFormat(*dsbo,0); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundBuffer_SetFormat() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n",rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n",rc);
init_format(&wfx2,WAVE_FORMAT_PCM,11025,16,2); rc=IDirectSoundBuffer_SetFormat(*dsbo,&wfx2); - ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %08x\n", + ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %08lx\n", format_string(&wfx2), rc);
/* There is no guarantee that SetFormat will actually change the @@ -437,16 +437,16 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, * supports. So we must re-query the format. */ rc=IDirectSoundBuffer_GetFormat(*dsbo,&wfx,sizeof(wfx),NULL); - ok(rc==DS_OK,"IDirectSoundBuffer_GetFormat() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetFormat() failed: %08lx\n", rc); if (rc==DS_OK && (wfx.wFormatTag!=wfx2.wFormatTag || wfx.nSamplesPerSec!=wfx2.nSamplesPerSec || wfx.wBitsPerSample!=wfx2.wBitsPerSample || wfx.nChannels!=wfx2.nChannels)) { - trace("Requested format tag=0x%04x %dx%dx%d avg.B/s=%d align=%d\n", + trace("Requested format tag=0x%04x %ldx%dx%d avg.B/s=%ld align=%d\n", wfx2.wFormatTag,wfx2.nSamplesPerSec,wfx2.wBitsPerSample, wfx2.nChannels,wfx2.nAvgBytesPerSec,wfx2.nBlockAlign); - trace("Got tag=0x%04x %dx%dx%d avg.B/s=%d align=%d\n", + trace("Got tag=0x%04x %ldx%dx%d avg.B/s=%ld align=%d\n", wfx.wFormatTag,wfx.nSamplesPerSec,wfx.wBitsPerSample, wfx.nChannels,wfx.nAvgBytesPerSec,wfx.nBlockAlign); } @@ -454,29 +454,29 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, ZeroMemory(&new_dsbcaps, sizeof(new_dsbcaps)); new_dsbcaps.dwSize = sizeof(new_dsbcaps); rc=IDirectSoundBuffer_GetCaps(*dsbo,&new_dsbcaps); - ok(rc==DS_OK,"IDirectSoundBuffer_GetCaps() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetCaps() failed: %08lx\n", rc); if (rc==DS_OK && winetest_debug > 1) { - trace(" new Caps: flags=0x%08x size=%d\n",new_dsbcaps.dwFlags, + trace(" new Caps: flags=0x%08lx size=%ld\n",new_dsbcaps.dwFlags, new_dsbcaps.dwBufferBytes); }
/* Check for primary buffer size change */ ok(new_dsbcaps.dwBufferBytes == dsbcaps.dwBufferBytes, " buffer size changed after SetFormat() - " - "previous size was %u, current size is %u\n", + "previous size was %lu, current size is %lu\n", dsbcaps.dwBufferBytes, new_dsbcaps.dwBufferBytes); dsbcaps.dwBufferBytes = new_dsbcaps.dwBufferBytes;
/* Check for primary buffer flags change */ ok(new_dsbcaps.dwFlags == dsbcaps.dwFlags, " flags changed after SetFormat() - " - "previous flags were %08x, current flags are %08x\n", + "previous flags were %08lx, current flags are %08lx\n", dsbcaps.dwFlags, new_dsbcaps.dwFlags);
/* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_NORMAL) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_NORMAL) failed: %08lx\n",rc); }
if (play) { @@ -490,12 +490,12 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo,
if (winetest_interactive) { if (set_frequency) - trace(" Playing %g second 440Hz tone at %dx%dx%d with a " - "frequency of %d (%dHz)\n", duration, + trace(" Playing %g second 440Hz tone at %ldx%dx%d with a " + "frequency of %ld (%ldHz)\n", duration, wfx.nSamplesPerSec, wfx.wBitsPerSample, wfx.nChannels, frequency, (440 * frequency) / wfx.nSamplesPerSec); else - trace(" Playing %g second 440Hz tone at %dx%dx%d\n", duration, + trace(" Playing %g second 440Hz tone at %ldx%dx%d\n", duration, wfx.nSamplesPerSec, wfx.wBitsPerSample, wfx.nChannels); }
@@ -506,7 +506,7 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(), DSSCL_WRITEPRIMARY); ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_WRITEPRIMARY) " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); if (rc!=DS_OK) return; } @@ -515,7 +515,7 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo,
rc=IDirectSoundBuffer_QueryInterface(*dsbo,&IID_IDirectSound3DBuffer, (LPVOID *)&buffer); - ok(rc==DS_OK,"IDirectSoundBuffer_QueryInterface() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_QueryInterface() failed: %08lx\n", rc); if (rc!=DS_OK) return;
@@ -523,7 +523,7 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, rc=IDirectSoundBuffer_QueryInterface(*dsbo, &IID_IDirectSoundBuffer, (LPVOID *)&temp_buffer); ok(rc==DS_OK && temp_buffer!=NULL, - "IDirectSoundBuffer_QueryInterface() failed: %08x\n", rc); + "IDirectSoundBuffer_QueryInterface() failed: %08lx\n", rc); ok(temp_buffer==*dsbo,"COM interface broken: %p != %p\n", temp_buffer,*dsbo); ref=IDirectSoundBuffer_Release(temp_buffer); @@ -538,37 +538,37 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, &IID_IDirectSoundBuffer, (LPVOID *)dsbo); ok(rc==DS_OK && *dsbo!=NULL,"IDirectSound3DBuffer_QueryInterface() " - "failed: %08x\n",rc); + "failed: %08lx\n",rc);
/* DSOUND: Error: Invalid buffer */ rc=IDirectSound3DBuffer_GetAllParameters(buffer,0); ok(rc==DSERR_INVALIDPARAM,"IDirectSound3DBuffer_GetAllParameters() " - "failed: %08x\n",rc); + "failed: %08lx\n",rc);
ZeroMemory(&buffer_param, sizeof(buffer_param));
/* DSOUND: Error: Invalid buffer */ rc=IDirectSound3DBuffer_GetAllParameters(buffer,&buffer_param); ok(rc==DSERR_INVALIDPARAM,"IDirectSound3DBuffer_GetAllParameters() " - "failed: %08x\n",rc); + "failed: %08lx\n",rc);
buffer_param.dwSize=sizeof(buffer_param); rc=IDirectSound3DBuffer_GetAllParameters(buffer,&buffer_param); - ok(rc==DS_OK,"IDirectSound3DBuffer_GetAllParameters() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound3DBuffer_GetAllParameters() failed: %08lx\n", rc); } if (set_volume) { if (dsbcaps.dwFlags & DSBCAPS_CTRLVOLUME) { LONG val; rc=IDirectSoundBuffer_GetVolume(*dsbo,&val); - ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume() failed: %08lx\n", rc);
rc=IDirectSoundBuffer_SetVolume(*dsbo,volume); - ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume() failed: %08lx\n", rc); } else { /* DSOUND: Error: Buffer does not have CTRLVOLUME */ rc=IDirectSoundBuffer_GetVolume(*dsbo,&volume); ok(rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer_GetVolume() " - "should have returned DSERR_CONTROLUNAVAIL, returned: %08x\n", rc); + "should have returned DSERR_CONTROLUNAVAIL, returned: %08lx\n", rc); } }
@@ -576,15 +576,15 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, if (dsbcaps.dwFlags & DSBCAPS_CTRLPAN) { LONG val; rc=IDirectSoundBuffer_GetPan(*dsbo,&val); - ok(rc==DS_OK,"IDirectSoundBuffer_GetPan() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetPan() failed: %08lx\n", rc);
rc=IDirectSoundBuffer_SetPan(*dsbo,pan); - ok(rc==DS_OK,"IDirectSoundBuffer_SetPan() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_SetPan() failed: %08lx\n", rc); } else { /* DSOUND: Error: Buffer does not have CTRLPAN */ rc=IDirectSoundBuffer_GetPan(*dsbo,&pan); ok(rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer_GetPan() " - "should have returned DSERR_CONTROLUNAVAIL, returned: %08x\n", rc); + "should have returned DSERR_CONTROLUNAVAIL, returned: %08lx\n", rc); } }
@@ -593,14 +593,14 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, &length1, NULL, NULL, DSBLOCK_ENTIREBUFFER); ok(rc==DSERR_INVALIDPARAM, "IDirectSoundBuffer_Lock() should have " - "returned DSERR_INVALIDPARAM, returned %08x\n", rc); + "returned DSERR_INVALIDPARAM, returned %08lx\n", rc);
/* try a size larger than the buffer */ rc = IDirectSoundBuffer_Lock(*dsbo, 0, dsbcaps.dwBufferBytes + 1, &buffer1, &length1, NULL, NULL, DSBLOCK_FROMWRITECURSOR); ok(rc==DSERR_INVALIDPARAM, "IDirectSoundBuffer_Lock() should have " - "returned DSERR_INVALIDPARAM, returned %08x\n", rc); + "returned DSERR_INVALIDPARAM, returned %08lx\n", rc);
if (set_frequency) state.wave=wave_generate_la(&wfx,(duration*frequency)/wfx.nSamplesPerSec,&state.wave_len,ieee); @@ -614,12 +614,12 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, buffer_refill(&state,state.buffer_size);
rc=IDirectSoundBuffer_Play(*dsbo,0,0,DSBPLAY_LOOPING); - ok(rc==DS_OK,"IDirectSoundBuffer_Play() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_Play() failed: %08lx\n", rc);
rc=IDirectSoundBuffer_GetStatus(*dsbo,&status); - ok(rc==DS_OK,"IDirectSoundBuffer_GetStatus() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetStatus() failed: %08lx\n", rc); ok(status==(DSBSTATUS_PLAYING|DSBSTATUS_LOOPING), - "GetStatus: bad status: %x\n",status); + "GetStatus: bad status: %lx\n",status);
if (listener) { ZeroMemory(&listener_param,sizeof(listener_param)); @@ -627,7 +627,7 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, rc=IDirectSound3DListener_GetAllParameters(listener, &listener_param); ok(rc==DS_OK,"IDirectSound3dListener_GetAllParameters() " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); if (move_listener) { listener_param.vPosition.x = -5.0f; listener_param.vVelocity.x = (float)(10.0/duration); @@ -635,7 +635,7 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, rc=IDirectSound3DListener_SetAllParameters(listener, &listener_param, DS3D_IMMEDIATE); - ok(rc==DS_OK,"IDirectSound3dListener_SetPosition() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound3dListener_SetPosition() failed: %08lx\n", rc); } if (buffer3d) { if (move_sound) { @@ -645,7 +645,7 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, buffer_param.flMinDistance = 10; rc=IDirectSound3DBuffer_SetAllParameters(buffer,&buffer_param, DS3D_IMMEDIATE); - ok(rc==DS_OK,"IDirectSound3dBuffer_SetPosition() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound3dBuffer_SetPosition() failed: %08lx\n", rc); }
start_time=GetTickCount(); @@ -659,7 +659,7 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, rc=IDirectSound3DListener_SetPosition(listener, listener_param.vPosition.x,listener_param.vPosition.y, listener_param.vPosition.z,DS3D_IMMEDIATE); - ok(rc==DS_OK,"IDirectSound3dListener_SetPosition() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound3dListener_SetPosition() failed: %08lx\n",rc); } if (buffer3d && move_sound) { buffer_param.vPosition.x = (float)(100-200.0*(now-start_time)/1000/duration); @@ -668,13 +668,13 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, rc=IDirectSound3DBuffer_SetPosition(buffer, buffer_param.vPosition.x,buffer_param.vPosition.y, buffer_param.vPosition.z,DS3D_IMMEDIATE); - ok(rc==DS_OK,"IDirectSound3dBuffer_SetPosition() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound3dBuffer_SetPosition() failed: %08lx\n", rc); } } /* Check the sound duration was within 10% of the expected value */ now=GetTickCount(); ok(fabs(1000*duration-now+start_time)<=100*duration, - "The sound played for %d ms instead of %g ms\n", + "The sound played for %ld ms instead of %g ms\n", now-start_time,1000*duration);
HeapFree(GetProcessHeap(), 0, state.wave); @@ -683,7 +683,7 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_NORMAL) " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); } if (buffer3d) { ref=IDirectSound3DBuffer_Release(buffer); @@ -708,14 +708,14 @@ static HRESULT test_secondary(LPGUID lpGuid, int play,
/* Create the DirectSound object */ rc = DirectSoundCreate(lpGuid, &dso, NULL); - ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate() failed: %08x\n", rc); + ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate() failed: %08lx\n", rc); if (rc!=DS_OK) return rc;
/* We must call SetCooperativeLevel before creating primary buffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT;
@@ -728,12 +728,12 @@ static HRESULT test_secondary(LPGUID lpGuid, int play, bufdesc.dwFlags|=(DSBCAPS_CTRLVOLUME|DSBCAPS_CTRLPAN); rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok((rc==DS_OK && primary!=NULL) || (rc==DSERR_CONTROLUNAVAIL), - "IDirectSound_CreateSoundBuffer() failed to create a %sprimary buffer: %08x\n",has_3d?"3D ":"", rc); + "IDirectSound_CreateSoundBuffer() failed to create a %sprimary buffer: %08lx\n",has_3d?"3D ":"", rc); if (rc==DSERR_CONTROLUNAVAIL) trace(" No Primary\n"); else if (rc==DS_OK && primary!=NULL) { rc=IDirectSoundBuffer_GetFormat(primary,&wfx1,sizeof(wfx1),NULL); - ok(rc==DS_OK,"IDirectSoundBuffer8_Getformat() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer8_Getformat() failed: %08lx\n", rc); if (rc!=DS_OK) goto EXIT1;
@@ -742,7 +742,7 @@ static HRESULT test_secondary(LPGUID lpGuid, int play, &IID_IDirectSound3DListener, (void **)&listener); ok(rc==DS_OK && listener!=NULL, - "IDirectSoundBuffer_QueryInterface() failed to get a 3D listener: %08x\n",rc); + "IDirectSoundBuffer_QueryInterface() failed to get a 3D listener: %08lx\n",rc); ref=IDirectSoundBuffer_Release(primary); ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references, " "should have 0\n",ref); @@ -753,20 +753,20 @@ static HRESULT test_secondary(LPGUID lpGuid, int play, rc=IDirectSound3DListener_GetAllParameters(listener,0); ok(rc==DSERR_INVALIDPARAM, "IDirectSound3dListener_GetAllParameters() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n", rc);
/* DSOUND: Error: Invalid buffer */ rc=IDirectSound3DListener_GetAllParameters(listener, &listener_param); ok(rc==DSERR_INVALIDPARAM, "IDirectSound3dListener_GetAllParameters() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n", rc);
listener_param.dwSize=sizeof(listener_param); rc=IDirectSound3DListener_GetAllParameters(listener, &listener_param); ok(rc==DS_OK,"IDirectSound3dListener_GetAllParameters() " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); } else { ok(listener==NULL, "IDirectSoundBuffer_QueryInterface() " "failed but returned a listener anyway\n"); @@ -793,8 +793,8 @@ static HRESULT test_secondary(LPGUID lpGuid, int play, wfx.nBlockAlign); bufdesc.lpwfxFormat=&wfx; if (winetest_interactive) { - trace(" Testing a %s%ssecondary buffer %s%s%s%sat %dx%dx%d " - "with a primary buffer at %dx%dx%d\n", + trace(" Testing a %s%ssecondary buffer %s%s%s%sat %ldx%dx%d " + "with a primary buffer at %ldx%dx%d\n", has_3dbuffer?"3D ":"", has_duplicate?"duplicated ":"", listener!=NULL||move_sound?"with ":"", @@ -807,7 +807,7 @@ static HRESULT test_secondary(LPGUID lpGuid, int play, } rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok((rc==DS_OK && secondary!=NULL) || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */ - "IDirectSound_CreateSoundBuffer() failed to create a %s%ssecondary buffer %s%s%s%sat %dx%dx%d (%s): %08x\n", + "IDirectSound_CreateSoundBuffer() failed to create a %s%ssecondary buffer %s%s%s%sat %ldx%dx%d (%s): %08lx\n", has_3dbuffer?"3D ":"", has_duplicate?"duplicated ":"", listener!=NULL||move_sound?"with ":"", move_listener?"moving ":"", listener!=NULL?"listener ":"", @@ -820,7 +820,7 @@ static HRESULT test_secondary(LPGUID lpGuid, int play,
rc=IDirectSoundBuffer_QueryInterface(secondary, &IID_IDirectSound3DBuffer, (void**)&ds3d); ok((has_3dbuffer && rc==DS_OK) || (!has_3dbuffer && rc==E_NOINTERFACE), - "Wrong return trying to get 3D buffer on %s3D secondary interface: %08x\n", has_3dbuffer ? "" : "non-", rc); + "Wrong return trying to get 3D buffer on %s3D secondary interface: %08lx\n", has_3dbuffer ? "" : "non-", rc); if(rc==DS_OK) IDirectSound3DBuffer_Release(ds3d);
@@ -829,53 +829,53 @@ static HRESULT test_secondary(LPGUID lpGuid, int play,
/* Check the initial secondary buffer's volume and pan */ rc=IDirectSoundBuffer_GetVolume(secondary,&vol); - ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume(secondary) failed: %08x\n",rc); - ok(vol==0,"wrong volume for a new secondary buffer: %d\n",vol); + ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume(secondary) failed: %08lx\n",rc); + ok(vol==0,"wrong volume for a new secondary buffer: %ld\n",vol); rc=IDirectSoundBuffer_GetPan(secondary,&pan); - ok(rc==DS_OK,"IDirectSoundBuffer_GetPan(secondary) failed: %08x\n",rc); - ok(pan==0,"wrong pan for a new secondary buffer: %d\n",pan); + ok(rc==DS_OK,"IDirectSoundBuffer_GetPan(secondary) failed: %08lx\n",rc); + ok(pan==0,"wrong pan for a new secondary buffer: %ld\n",pan);
/* Check that changing the secondary buffer's volume and pan * does not impact the primary buffer's volume and pan */ rc=IDirectSoundBuffer_GetVolume(primary,&refvol); - ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume(primary) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume(primary) failed: %08lx\n",rc); rc=IDirectSoundBuffer_GetPan(primary,&refpan); - ok(rc==DS_OK,"IDirectSoundBuffer_GetPan(primary) failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetPan(primary) failed: %08lx\n", rc);
rc=IDirectSoundBuffer_SetVolume(secondary,-1000); - ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume(secondary) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume(secondary) failed: %08lx\n",rc); rc=IDirectSoundBuffer_GetVolume(secondary,&vol); - ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume(secondary) failed: %08x\n",rc); - ok(vol==-1000,"secondary: wrong volume %d instead of -1000\n", + ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume(secondary) failed: %08lx\n",rc); + ok(vol==-1000,"secondary: wrong volume %ld instead of -1000\n", vol); rc=IDirectSoundBuffer_SetPan(secondary,-1000); - ok(rc==DS_OK,"IDirectSoundBuffer_SetPan(secondary) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSoundBuffer_SetPan(secondary) failed: %08lx\n",rc); rc=IDirectSoundBuffer_GetPan(secondary,&pan); - ok(rc==DS_OK,"IDirectSoundBuffer_SetPan(secondary) failed: %08x\n",rc); - ok(pan==-1000,"secondary: wrong pan %d instead of -1000\n", + ok(rc==DS_OK,"IDirectSoundBuffer_SetPan(secondary) failed: %08lx\n",rc); + ok(pan==-1000,"secondary: wrong pan %ld instead of -1000\n", pan);
rc=IDirectSoundBuffer_GetVolume(primary,&vol); - ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume(primary) failed: %08x\n",rc); - ok(vol==refvol,"The primary volume changed from %d to %d\n", + ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume(primary) failed: %08lx\n",rc); + ok(vol==refvol,"The primary volume changed from %ld to %ld\n", refvol,vol); rc=IDirectSoundBuffer_GetPan(primary,&pan); - ok(rc==DS_OK,"IDirectSoundBuffer_GetPan(primary) failed: %08x\n", rc); - ok(pan==refpan,"The primary pan changed from %d to %d\n", + ok(rc==DS_OK,"IDirectSoundBuffer_GetPan(primary) failed: %08lx\n", rc); + ok(pan==refpan,"The primary pan changed from %ld to %ld\n", refpan,pan);
rc=IDirectSoundBuffer_SetVolume(secondary,0); - ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume(secondary) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume(secondary) failed: %08lx\n",rc); rc=IDirectSoundBuffer_SetPan(secondary,0); - ok(rc==DS_OK,"IDirectSoundBuffer_SetPan(secondary) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSoundBuffer_SetPan(secondary) failed: %08lx\n",rc); } else if (has_3dbuffer) { LONG pan;
rc=IDirectSoundBuffer_GetPan(secondary,&pan); - ok(rc==DS_OK,"IDirectSoundBuffer_GetPan() failed, returned: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetPan() failed, returned: %08lx\n", rc); rc=IDirectSoundBuffer_SetPan(secondary,0); - ok(rc==DS_OK,"IDirectSoundBuffer_SetPan() failed, returned: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_SetPan() failed, returned: %08lx\n", rc); }
if (has_duplicate) { @@ -885,26 +885,26 @@ static HRESULT test_secondary(LPGUID lpGuid, int play, rc=IDirectSound_DuplicateSoundBuffer(dso,0,0); ok(rc==DSERR_INVALIDPARAM, "IDirectSound_DuplicateSoundBuffer() should have returned " - "DSERR_INVALIDPARAM, returned: %08x\n",rc); + "DSERR_INVALIDPARAM, returned: %08lx\n",rc);
/* DSOUND: Error: Invalid dest buffer */ rc=IDirectSound_DuplicateSoundBuffer(dso,secondary,0); ok(rc==DSERR_INVALIDPARAM, "IDirectSound_DuplicateSoundBuffer() should have returned " - "DSERR_INVALIDPARAM, returned: %08x\n",rc); + "DSERR_INVALIDPARAM, returned: %08lx\n",rc);
/* DSOUND: Error: Invalid source buffer */ rc=IDirectSound_DuplicateSoundBuffer(dso,0,&duplicated); ok(rc==DSERR_INVALIDPARAM, "IDirectSound_DuplicateSoundBuffer() should have returned " - "DSERR_INVALIDPARAM, returned: %08x\n",rc); + "DSERR_INVALIDPARAM, returned: %08lx\n",rc);
duplicated=NULL; rc=IDirectSound_DuplicateSoundBuffer(dso,secondary, &duplicated); ok(rc==DS_OK && duplicated!=NULL, "IDirectSound_DuplicateSoundBuffer() failed to duplicate " - "a secondary buffer: %08x\n",rc); + "a secondary buffer: %08lx\n",rc);
if (rc==DS_OK && duplicated!=NULL) { ref=IDirectSoundBuffer_Release(secondary); @@ -951,7 +951,7 @@ EXIT2: /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_NORMAL) failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_NORMAL) failed: %08lx\n", rc);
EXIT: ref=IDirectSound_Release(dso); @@ -971,7 +971,7 @@ static HRESULT test_for_driver(LPGUID lpGuid) /* Create the DirectSound object */ rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, - "DirectSoundCreate() failed: %08x\n",rc); + "DirectSoundCreate() failed: %08lx\n",rc); if (rc!=DS_OK) return rc;
@@ -994,7 +994,7 @@ static HRESULT test_primary(LPGUID lpGuid)
/* Create the DirectSound object */ rc = DirectSoundCreate(lpGuid, &dso, NULL); - ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate() failed: %08x\n", rc); + ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate() failed: %08lx\n", rc); if (rc!=DS_OK) return rc;
@@ -1002,14 +1002,14 @@ static HRESULT test_primary(LPGUID lpGuid) ZeroMemory(&dscaps, sizeof(dscaps)); dscaps.dwSize=sizeof(dscaps); rc=IDirectSound_GetCaps(dso,&dscaps); - ok(rc==DS_OK,"IDirectSound_GetCaps() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound_GetCaps() failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT;
/* We must call SetCooperativeLevel before calling CreateSoundBuffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT;
@@ -1020,7 +1020,7 @@ static HRESULT test_primary(LPGUID lpGuid) bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER|DSBCAPS_CTRLVOLUME|DSBCAPS_CTRLPAN; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok((rc==DS_OK && primary!=NULL) || (rc==DSERR_CONTROLUNAVAIL), - "IDirectSound_CreateSoundBuffer() failed to create a primary buffer: %08x\n",rc); + "IDirectSound_CreateSoundBuffer() failed to create a primary buffer: %08lx\n",rc); if (rc==DSERR_CONTROLUNAVAIL) trace(" No Primary\n"); else if (rc==DS_OK && primary!=NULL) { @@ -1055,7 +1055,7 @@ static HRESULT test_primary(LPGUID lpGuid) /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_NORMAL) failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_NORMAL) failed: %08lx\n", rc);
EXIT: ref=IDirectSound_Release(dso); @@ -1077,7 +1077,7 @@ static HRESULT test_primary_3d(LPGUID lpGuid)
/* Create the DirectSound object */ rc = DirectSoundCreate(lpGuid, &dso, NULL); - ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate() failed: %08x\n", rc); + ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate() failed: %08lx\n", rc); if (rc!=DS_OK) return rc;
@@ -1085,14 +1085,14 @@ static HRESULT test_primary_3d(LPGUID lpGuid) ZeroMemory(&dscaps, sizeof(dscaps)); dscaps.dwSize=sizeof(dscaps); rc=IDirectSound_GetCaps(dso,&dscaps); - ok(rc==DS_OK,"IDirectSound_GetCaps() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound_GetCaps() failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT;
/* We must call SetCooperativeLevel before calling CreateSoundBuffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT;
@@ -1102,7 +1102,7 @@ static HRESULT test_primary_3d(LPGUID lpGuid) bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DS_OK && primary!=NULL,"IDirectSound_CreateSoundBuffer() failed " - "to create a primary buffer: %08x\n",rc); + "to create a primary buffer: %08lx\n",rc); if (rc==DS_OK && primary!=NULL) { ref=IDirectSoundBuffer_Release(primary); ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references, " @@ -1113,7 +1113,7 @@ static HRESULT test_primary_3d(LPGUID lpGuid) bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER|DSBCAPS_CTRL3D; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DS_OK && primary!=NULL,"IDirectSound_CreateSoundBuffer() " - "failed to create a 3D primary buffer: %08x\n",rc); + "failed to create a 3D primary buffer: %08lx\n",rc); if (rc==DS_OK && primary!=NULL) { test_buffer(dso,&primary,1,FALSE,0,FALSE,0,winetest_interactive && !(dscaps.dwFlags & DSCAPS_EMULDRIVER),1.0,0,0,0,0, @@ -1126,7 +1126,7 @@ static HRESULT test_primary_3d(LPGUID lpGuid) /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_NORMAL) failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_NORMAL) failed: %08lx\n", rc);
EXIT: ref=IDirectSound_Release(dso); @@ -1148,7 +1148,7 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid)
/* Create the DirectSound object */ rc = DirectSoundCreate(lpGuid, &dso, NULL); - ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate() failed: %08x\n", rc); + ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate() failed: %08lx\n", rc); if (rc!=DS_OK) return rc;
@@ -1156,14 +1156,14 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) ZeroMemory(&dscaps, sizeof(dscaps)); dscaps.dwSize=sizeof(dscaps); rc=IDirectSound_GetCaps(dso,&dscaps); - ok(rc==DS_OK,"IDirectSound_GetCaps() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound_GetCaps() failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT;
/* We must call SetCooperativeLevel before calling CreateSoundBuffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT; primary=NULL; @@ -1172,7 +1172,7 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER|DSBCAPS_CTRL3D; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DS_OK && primary!=NULL,"IDirectSound_CreateSoundBuffer() failed " - "to create a 3D primary buffer: %08x\n",rc); + "to create a 3D primary buffer: %08lx\n",rc); if (rc==DS_OK && primary!=NULL) { LPDIRECTSOUND3DLISTENER listener=NULL; LPDIRECTSOUNDBUFFER temp_buffer=NULL; @@ -1181,13 +1181,13 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) rc=IDirectSoundBuffer_QueryInterface(primary, &IID_IDirectSound3DListener,(void **)&listener); ok(rc==DS_OK && listener!=NULL,"IDirectSoundBuffer_QueryInterface() " - "failed to get a 3D listener: %08x\n",rc); + "failed to get a 3D listener: %08lx\n",rc); if (rc==DS_OK && listener!=NULL) { /* Checking the COM interface */ rc=IDirectSoundBuffer_QueryInterface(primary, &IID_IDirectSoundBuffer,(LPVOID *)&temp_buffer); ok(rc==DS_OK && temp_buffer!=NULL, - "IDirectSoundBuffer_QueryInterface() failed: %08x\n", rc); + "IDirectSoundBuffer_QueryInterface() failed: %08lx\n", rc); ok(temp_buffer==primary, "COM interface broken: %p != %p\n", temp_buffer,primary); @@ -1200,7 +1200,7 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) rc=IDirectSound3DListener_QueryInterface(listener, &IID_IDirectSoundBuffer,(LPVOID *)&temp_buffer); ok(rc==DS_OK && temp_buffer!=NULL, - "IDirectSoundBuffer_QueryInterface() failed: %08x\n", rc); + "IDirectSoundBuffer_QueryInterface() failed: %08lx\n", rc); ok(temp_buffer==primary, "COM interface broken: %p != %p\n", temp_buffer,primary); @@ -1218,7 +1218,7 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) rc = IDirectSound3DListener_QueryInterface(listener, &IID_IKsPropertySet, (void **)&propset); ok(rc == DS_OK && propset != NULL, - "IDirectSound3DListener_QueryInterface didn't handle IKsPropertySet: ret = %08x\n", rc); + "IDirectSound3DListener_QueryInterface didn't handle IKsPropertySet: ret = %08lx\n", rc); IKsPropertySet_Release(propset); }
@@ -1231,7 +1231,7 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) propset = NULL; rc = IDirectSoundBuffer_QueryInterface(primary, &IID_IKsPropertySet, (void **)&propset); ok(rc == DS_OK && propset != NULL, - "IDirectSoundBuffer_QueryInterface didn't handle IKsPropertySet on primary buffer: ret = %08x\n", rc); + "IDirectSoundBuffer_QueryInterface didn't handle IKsPropertySet on primary buffer: ret = %08lx\n", rc); IKsPropertySet_Release(propset);
/* Testing the reference counting */ @@ -1302,7 +1302,7 @@ static void ds3d_tests(void) { HRESULT rc; rc = DirectSoundEnumerateA(dsenum_callback, NULL); - ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08x\n",rc); + ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08lx\n",rc); trace("tested %u DirectSound drivers\n", driver_count); }
diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index 465ba040a33..9c4a132b545 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -57,7 +57,7 @@ static int buffer_refill8(play_state_t* state, DWORD size)
rc=IDirectSoundBuffer_Lock(state->dsbo,state->offset,size, &ptr1,&len1,&ptr2,&len2,0); - ok(rc==DS_OK,"IDirectSoundBuffer_Lock() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_Lock() failed: %08lx\n", rc); if (rc!=DS_OK) return -1;
@@ -69,7 +69,7 @@ static int buffer_refill8(play_state_t* state, DWORD size) } state->offset=state->written % state->buffer_size; rc=IDirectSoundBuffer_Unlock(state->dsbo,ptr1,len1,ptr2,len2); - ok(rc==DS_OK,"IDirectSoundBuffer_Unlock() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_Unlock() failed: %08lx\n", rc); if (rc!=DS_OK) return -1; return size; @@ -84,7 +84,7 @@ static int buffer_silence8(play_state_t* state, DWORD size)
rc=IDirectSoundBuffer_Lock(state->dsbo,state->offset,size, &ptr1,&len1,&ptr2,&len2,0); - ok(rc==DS_OK,"IDirectSoundBuffer_Lock() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_Lock() failed: %08lx\n", rc); if (rc!=DS_OK) return -1;
@@ -95,7 +95,7 @@ static int buffer_silence8(play_state_t* state, DWORD size) } state->offset=(state->offset+size) % state->buffer_size; rc=IDirectSoundBuffer_Unlock(state->dsbo,ptr1,len1,ptr2,len2); - ok(rc==DS_OK,"IDirectSoundBuffer_Unlock() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_Unlock() failed: %08lx\n", rc); if (rc!=DS_OK) return -1; return size; @@ -107,7 +107,7 @@ static BOOL buffer_service8(play_state_t* state) HRESULT rc;
rc=IDirectSoundBuffer_GetCurrentPosition(state->dsbo,&play_pos,NULL); - ok(rc==DS_OK,"IDirectSoundBuffer_GetCurrentPosition() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetCurrentPosition() failed: %08lx\n", rc); if (rc!=DS_OK) { goto STOP; } @@ -120,7 +120,7 @@ static BOOL buffer_service8(play_state_t* state) state->played+=play_pos-last_play_pos;
if (winetest_debug > 1) - trace("buf size=%d last_play_pos=%d play_pos=%d played=%d / %d\n", + trace("buf size=%ld last_play_pos=%ld play_pos=%ld played=%ld / %ld\n", state->buffer_size,last_play_pos,play_pos,state->played, state->wave_len);
@@ -137,7 +137,7 @@ static BOOL buffer_service8(play_state_t* state) buf_free=state->buffer_size-state->offset+play_pos;
if (winetest_debug > 1) - trace("offset=%d free=%d written=%d / %d\n", + trace("offset=%ld free=%ld written=%ld / %ld\n", state->offset,buf_free,state->written,state->wave_len); if (buf_free==0) return TRUE; @@ -149,14 +149,14 @@ static BOOL buffer_service8(play_state_t* state) goto STOP; buf_free-=w; if (state->written==state->wave_len && winetest_debug > 1) - trace("last sound byte at %d\n", + trace("last sound byte at %ld\n", (state->written % state->buffer_size)); }
if (buf_free>0) { /* Fill with silence */ if (winetest_debug > 1) - trace("writing %d bytes of silence\n",buf_free); + trace("writing %ld bytes of silence\n",buf_free); if (buffer_silence8(state,buf_free)==-1) goto STOP; } @@ -166,7 +166,7 @@ STOP: if (winetest_debug > 1) trace("stopping playback\n"); rc=IDirectSoundBuffer_Stop(state->dsbo); - ok(rc==DS_OK,"IDirectSoundBuffer_Stop() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_Stop() failed: %08lx\n", rc); return FALSE; }
@@ -186,20 +186,20 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, /* DSOUND: Error: Invalid caps pointer */ rc=IDirectSoundBuffer_GetCaps(*dsbo,0); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundBuffer_GetCaps() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n",rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n",rc);
ZeroMemory(&dsbcaps, sizeof(dsbcaps));
/* DSOUND: Error: Invalid caps pointer */ rc=IDirectSoundBuffer_GetCaps(*dsbo,&dsbcaps); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundBuffer_GetCaps() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n",rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n",rc);
dsbcaps.dwSize=sizeof(dsbcaps); rc=IDirectSoundBuffer_GetCaps(*dsbo,&dsbcaps); - ok(rc==DS_OK,"IDirectSoundBuffer_GetCaps() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetCaps() failed: %08lx\n", rc); if (rc==DS_OK && winetest_debug > 1) { - trace(" Caps: flags=0x%08x size=%d\n",dsbcaps.dwFlags, + trace(" Caps: flags=0x%08lx size=%ld\n",dsbcaps.dwFlags, dsbcaps.dwBufferBytes); }
@@ -207,10 +207,10 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, size=0; rc=IDirectSoundBuffer_GetFormat(*dsbo,NULL,0,&size); ok(rc==DS_OK && size!=0,"IDirectSoundBuffer_GetFormat() should have " - "returned the needed size: rc=%08x size=%d\n",rc,size); + "returned the needed size: rc=%08lx size=%ld\n",rc,size);
ok(size == sizeof(WAVEFORMATEX) || size == sizeof(WAVEFORMATEXTENSIBLE), - "Expected a correct structure size, got %d\n", size); + "Expected a correct structure size, got %ld\n", size);
if (size == sizeof(WAVEFORMATEX)) { rc=IDirectSoundBuffer_GetFormat(*dsbo,&wfx,size,NULL); @@ -223,9 +223,9 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, } else return;
- ok(rc==DS_OK,"IDirectSoundBuffer_GetFormat() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetFormat() failed: %08lx\n", rc); if (rc==DS_OK && winetest_debug > 1) { - trace(" Format: %s tag=0x%04x %dx%dx%d avg.B/s=%d align=%d\n", + trace(" Format: %s tag=0x%04x %ldx%dx%d avg.B/s=%ld align=%d\n", is_primary ? "Primary" : "Secondary", wfx.wFormatTag,wfx.nSamplesPerSec,wfx.wBitsPerSample, wfx.nChannels,wfx.nAvgBytesPerSec,wfx.nBlockAlign); @@ -234,26 +234,26 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, /* DSOUND: Error: Invalid frequency buffer */ rc=IDirectSoundBuffer_GetFrequency(*dsbo,0); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundBuffer_GetFrequency() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n",rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n",rc);
/* DSOUND: Error: Primary buffers don't support CTRLFREQUENCY */ rc=IDirectSoundBuffer_GetFrequency(*dsbo,&freq); ok((rc==DS_OK && !is_primary) || (rc==DSERR_CONTROLUNAVAIL&&is_primary) || (rc==DSERR_CONTROLUNAVAIL&&!(dsbcaps.dwFlags&DSBCAPS_CTRLFREQUENCY)), - "IDirectSoundBuffer_GetFrequency() failed: %08x\n",rc); + "IDirectSoundBuffer_GetFrequency() failed: %08lx\n",rc); if (rc==DS_OK) { ok(freq==wfx.nSamplesPerSec,"The frequency returned by GetFrequency " - "%d does not match the format %d\n",freq,wfx.nSamplesPerSec); + "%ld does not match the format %ld\n",freq,wfx.nSamplesPerSec); }
/* DSOUND: Error: Invalid status pointer */ rc=IDirectSoundBuffer_GetStatus(*dsbo,0); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundBuffer_GetStatus() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n",rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n",rc);
rc=IDirectSoundBuffer_GetStatus(*dsbo,&status); - ok(rc==DS_OK,"IDirectSoundBuffer_GetStatus() failed: %08x\n", rc); - ok(status==0,"status=0x%x instead of 0\n",status); + ok(rc==DS_OK,"IDirectSoundBuffer_GetStatus() failed: %08lx\n", rc); + ok(status==0,"status=0x%lx instead of 0\n",status);
if (is_primary) { DSBCAPS new_dsbcaps; @@ -261,18 +261,18 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel(DSSCL_PRIORITY) " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); if (rc!=DS_OK) return;
/* DSOUND: Error: Invalid format pointer */ rc=IDirectSoundBuffer_SetFormat(*dsbo,0); ok(rc==DSERR_INVALIDPARAM,"IDirectSoundBuffer_SetFormat() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n",rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n",rc);
init_format(&wfx2,WAVE_FORMAT_PCM,11025,16,2); rc=IDirectSoundBuffer_SetFormat(*dsbo,&wfx2); - ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %08x\n", + ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %08lx\n", format_string(&wfx2), rc);
/* There is no guarantee that SetFormat will actually change the @@ -280,16 +280,16 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, * supports. So we must re-query the format. */ rc=IDirectSoundBuffer_GetFormat(*dsbo,&wfx,sizeof(wfx),NULL); - ok(rc==DS_OK,"IDirectSoundBuffer_GetFormat() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetFormat() failed: %08lx\n", rc); if (rc==DS_OK && (wfx.wFormatTag!=wfx2.wFormatTag || wfx.nSamplesPerSec!=wfx2.nSamplesPerSec || wfx.wBitsPerSample!=wfx2.wBitsPerSample || wfx.nChannels!=wfx2.nChannels)) { - trace("Requested format tag=0x%04x %dx%dx%d avg.B/s=%d align=%d\n", + trace("Requested format tag=0x%04x %ldx%dx%d avg.B/s=%ld align=%d\n", wfx2.wFormatTag,wfx2.nSamplesPerSec,wfx2.wBitsPerSample, wfx2.nChannels,wfx2.nAvgBytesPerSec,wfx2.nBlockAlign); - trace("Got tag=0x%04x %dx%dx%d avg.B/s=%d align=%d\n", + trace("Got tag=0x%04x %ldx%dx%d avg.B/s=%ld align=%d\n", wfx.wFormatTag,wfx.nSamplesPerSec,wfx.wBitsPerSample, wfx.nChannels,wfx.nAvgBytesPerSec,wfx.nBlockAlign); } @@ -297,30 +297,30 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, ZeroMemory(&new_dsbcaps, sizeof(new_dsbcaps)); new_dsbcaps.dwSize = sizeof(new_dsbcaps); rc=IDirectSoundBuffer_GetCaps(*dsbo,&new_dsbcaps); - ok(rc==DS_OK,"IDirectSoundBuffer_GetCaps() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetCaps() failed: %08lx\n", rc); if (rc==DS_OK && winetest_debug > 1) { - trace(" new Caps: flags=0x%08x size=%d\n",new_dsbcaps.dwFlags, + trace(" new Caps: flags=0x%08lx size=%ld\n",new_dsbcaps.dwFlags, new_dsbcaps.dwBufferBytes); }
/* Check for primary buffer size change */ ok(new_dsbcaps.dwBufferBytes == dsbcaps.dwBufferBytes, " buffer size changed after SetFormat() - " - "previous size was %u, current size is %u\n", + "previous size was %lu, current size is %lu\n", dsbcaps.dwBufferBytes, new_dsbcaps.dwBufferBytes); dsbcaps.dwBufferBytes = new_dsbcaps.dwBufferBytes;
/* Check for primary buffer flags change */ ok(new_dsbcaps.dwFlags == dsbcaps.dwFlags, " flags changed after SetFormat() - " - "previous flags were %08x, current flags are %08x\n", + "previous flags were %08lx, current flags are %08lx\n", dsbcaps.dwFlags, new_dsbcaps.dwFlags);
/* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel(DSSCL_NORMAL) " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); }
if (play) { @@ -333,7 +333,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, DWORD length1;
if (winetest_interactive) { - trace(" Playing %g second 440Hz tone at %dx%dx%d\n", duration, + trace(" Playing %g second 440Hz tone at %ldx%dx%d\n", duration, wfx.nSamplesPerSec, wfx.wBitsPerSample,wfx.nChannels); }
@@ -344,7 +344,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(), DSSCL_WRITEPRIMARY); ok(rc==DS_OK, - "IDirectSound8_SetCooperativeLevel(DSSCL_WRITEPRIMARY) failed: %08x\n",rc); + "IDirectSound8_SetCooperativeLevel(DSSCL_WRITEPRIMARY) failed: %08lx\n",rc); if (rc!=DS_OK) return; } @@ -353,7 +353,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo,
rc=IDirectSoundBuffer_QueryInterface(*dsbo,&IID_IDirectSound3DBuffer, (LPVOID *)&buffer); - ok(rc==DS_OK,"IDirectSoundBuffer_QueryInterface() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_QueryInterface() failed: %08lx\n", rc); if (rc!=DS_OK) return;
@@ -361,7 +361,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, rc=IDirectSoundBuffer_QueryInterface(*dsbo, &IID_IDirectSoundBuffer, (LPVOID *)&temp_buffer); ok(rc==DS_OK && temp_buffer!=NULL, - "IDirectSoundBuffer_QueryInterface() failed: %08x\n", rc); + "IDirectSoundBuffer_QueryInterface() failed: %08lx\n", rc); ok(temp_buffer==*dsbo,"COM interface broken: %p != %p\n", temp_buffer,*dsbo); ref=IDirectSoundBuffer_Release(temp_buffer); @@ -376,37 +376,37 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, &IID_IDirectSoundBuffer, (LPVOID *)dsbo); ok(rc==DS_OK && *dsbo!=NULL,"IDirectSound3DBuffer_QueryInterface() " - "failed: %08x\n",rc); + "failed: %08lx\n",rc);
/* DSOUND: Error: Invalid buffer */ rc=IDirectSound3DBuffer_GetAllParameters(buffer,0); ok(rc==DSERR_INVALIDPARAM,"IDirectSound3DBuffer_GetAllParameters() " - "failed: %08x\n",rc); + "failed: %08lx\n",rc);
ZeroMemory(&buffer_param, sizeof(buffer_param));
/* DSOUND: Error: Invalid buffer */ rc=IDirectSound3DBuffer_GetAllParameters(buffer,&buffer_param); ok(rc==DSERR_INVALIDPARAM,"IDirectSound3DBuffer_GetAllParameters() " - "failed: %08x\n",rc); + "failed: %08lx\n",rc);
buffer_param.dwSize=sizeof(buffer_param); rc=IDirectSound3DBuffer_GetAllParameters(buffer,&buffer_param); - ok(rc==DS_OK,"IDirectSound3DBuffer_GetAllParameters() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound3DBuffer_GetAllParameters() failed: %08lx\n", rc); } if (set_volume) { if (dsbcaps.dwFlags & DSBCAPS_CTRLVOLUME) { LONG val; rc=IDirectSoundBuffer_GetVolume(*dsbo,&val); - ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume() failed: %08lx\n", rc);
rc=IDirectSoundBuffer_SetVolume(*dsbo,volume); - ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume() failed: %08lx\n", rc); } else { /* DSOUND: Error: Buffer does not have CTRLVOLUME */ rc=IDirectSoundBuffer_GetVolume(*dsbo,&volume); ok(rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer_GetVolume() " - "should have returned DSERR_CONTROLUNAVAIL, returned: %08x\n", rc); + "should have returned DSERR_CONTROLUNAVAIL, returned: %08lx\n", rc); } }
@@ -414,15 +414,15 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, if (dsbcaps.dwFlags & DSBCAPS_CTRLPAN) { LONG val; rc=IDirectSoundBuffer_GetPan(*dsbo,&val); - ok(rc==DS_OK,"IDirectSoundBuffer_GetPan() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetPan() failed: %08lx\n", rc);
rc=IDirectSoundBuffer_SetPan(*dsbo,pan); - ok(rc==DS_OK,"IDirectSoundBuffer_SetPan() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_SetPan() failed: %08lx\n", rc); } else { /* DSOUND: Error: Buffer does not have CTRLPAN */ rc=IDirectSoundBuffer_GetPan(*dsbo,&pan); ok(rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer_GetPan() " - "should have returned DSERR_CONTROLUNAVAIL, returned: %08x\n", rc); + "should have returned DSERR_CONTROLUNAVAIL, returned: %08lx\n", rc); } }
@@ -431,14 +431,14 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, &length1, NULL, NULL, DSBLOCK_ENTIREBUFFER); ok(rc==DSERR_INVALIDPARAM, "IDirectSoundBuffer_Lock() should have " - "returned DSERR_INVALIDPARAM, returned %08x\n", rc); + "returned DSERR_INVALIDPARAM, returned %08lx\n", rc);
/* try a size larger than the buffer */ rc = IDirectSoundBuffer_Lock(*dsbo, 0, dsbcaps.dwBufferBytes + 1, &buffer1, &length1, NULL, NULL, DSBLOCK_FROMWRITECURSOR); ok(rc==DSERR_INVALIDPARAM, "IDirectSoundBuffer_Lock() should have " - "returned DSERR_INVALIDPARAM, returned %08x\n", rc); + "returned DSERR_INVALIDPARAM, returned %08lx\n", rc);
state.wave=wave_generate_la(&wfx,duration,&state.wave_len,ieee);
@@ -449,19 +449,19 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, buffer_refill8(&state,state.buffer_size);
rc=IDirectSoundBuffer_Play(*dsbo,0,0,DSBPLAY_LOOPING); - ok(rc==DS_OK,"IDirectSoundBuffer_Play() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_Play() failed: %08lx\n", rc);
rc=IDirectSoundBuffer_GetStatus(*dsbo,&status); - ok(rc==DS_OK,"IDirectSoundBuffer_GetStatus() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetStatus() failed: %08lx\n", rc); ok(status==(DSBSTATUS_PLAYING|DSBSTATUS_LOOPING), - "GetStatus: bad status: %x\n",status); + "GetStatus: bad status: %lx\n",status);
if (listener) { ZeroMemory(&listener_param,sizeof(listener_param)); listener_param.dwSize=sizeof(listener_param); rc=IDirectSound3DListener_GetAllParameters(listener,&listener_param); ok(rc==DS_OK,"IDirectSound3dListener_GetAllParameters() " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); if (move_listener) { listener_param.vPosition.x = -5.0f; listener_param.vVelocity.x = (float)(10.0/duration); @@ -469,7 +469,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, rc=IDirectSound3DListener_SetAllParameters(listener, &listener_param, DS3D_IMMEDIATE); - ok(rc==DS_OK,"IDirectSound3dListener_SetPosition() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound3dListener_SetPosition() failed: %08lx\n", rc); } if (buffer3d) { if (move_sound) { @@ -479,7 +479,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, buffer_param.flMinDistance = 10; rc=IDirectSound3DBuffer_SetAllParameters(buffer,&buffer_param, DS3D_IMMEDIATE); - ok(rc==DS_OK,"IDirectSound3dBuffer_SetPosition() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound3dBuffer_SetPosition() failed: %08lx\n", rc); }
start_time=GetTickCount(); @@ -493,7 +493,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, rc=IDirectSound3DListener_SetPosition(listener, listener_param.vPosition.x,listener_param.vPosition.y, listener_param.vPosition.z,DS3D_IMMEDIATE); - ok(rc==DS_OK,"IDirectSound3dListener_SetPosition() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound3dListener_SetPosition() failed: %08lx\n",rc); } if (buffer3d && move_sound) { buffer_param.vPosition.x = (float)(100-200.0*(now-start_time)/1000/duration); @@ -502,13 +502,13 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, rc=IDirectSound3DBuffer_SetPosition(buffer, buffer_param.vPosition.x,buffer_param.vPosition.y, buffer_param.vPosition.z,DS3D_IMMEDIATE); - ok(rc==DS_OK,"IDirectSound3dBuffer_SetPosition() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound3dBuffer_SetPosition() failed: %08lx\n", rc); } } /* Check the sound duration was within 10% of the expected value */ now=GetTickCount(); ok(fabs(1000*duration-now+start_time)<=100*duration, - "The sound played for %d ms instead of %g ms\n", + "The sound played for %ld ms instead of %g ms\n", now-start_time,1000*duration);
HeapFree(GetProcessHeap(), 0, state.wave); @@ -517,7 +517,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel(DSSCL_NORMAL) " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); } if (buffer3d) { ref=IDirectSound3DBuffer_Release(buffer); @@ -542,14 +542,14 @@ static HRESULT test_secondary8(LPGUID lpGuid, BOOL play,
/* Create the DirectSound object */ rc = DirectSoundCreate8(lpGuid, &dso, NULL); - ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate8() failed: %08x\n", rc); + ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate8() failed: %08lx\n", rc); if (rc!=DS_OK) return rc;
/* We must call SetCooperativeLevel before creating primary buffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT;
@@ -562,12 +562,12 @@ static HRESULT test_secondary8(LPGUID lpGuid, BOOL play, bufdesc.dwFlags|=(DSBCAPS_CTRLVOLUME|DSBCAPS_CTRLPAN); rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok((rc==DS_OK && primary!=NULL) || (rc == DSERR_CONTROLUNAVAIL), - "IDirectSound8_CreateSoundBuffer() failed to create a %sprimary buffer: %08x\n",has_3d?"3D ":"", rc); + "IDirectSound8_CreateSoundBuffer() failed to create a %sprimary buffer: %08lx\n",has_3d?"3D ":"", rc); if (rc == DSERR_CONTROLUNAVAIL) trace(" No Primary\n"); else if (rc==DS_OK && primary!=NULL) { rc=IDirectSoundBuffer_GetFormat(primary,&wfx1,sizeof(wfx1),NULL); - ok(rc==DS_OK,"IDirectSoundBuffer8_Getformat() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer8_Getformat() failed: %08lx\n", rc); if (rc!=DS_OK) goto EXIT1;
@@ -577,7 +577,7 @@ static HRESULT test_secondary8(LPGUID lpGuid, BOOL play, (void **)&listener); ok(rc==DS_OK && listener!=NULL, "IDirectSoundBuffer_QueryInterface() failed to get a 3D " - "listener %08x\n",rc); + "listener %08lx\n",rc); ref=IDirectSoundBuffer_Release(primary); ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references, " "should have 0\n",ref); @@ -588,20 +588,20 @@ static HRESULT test_secondary8(LPGUID lpGuid, BOOL play, rc=IDirectSound3DListener_GetAllParameters(listener,0); ok(rc==DSERR_INVALIDPARAM, "IDirectSound3dListener_GetAllParameters() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n", rc);
/* DSOUND: Error: Invalid buffer */ rc=IDirectSound3DListener_GetAllParameters(listener, &listener_param); ok(rc==DSERR_INVALIDPARAM, "IDirectSound3dListener_GetAllParameters() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n", rc);
listener_param.dwSize=sizeof(listener_param); rc=IDirectSound3DListener_GetAllParameters(listener, &listener_param); ok(rc==DS_OK,"IDirectSound3dListener_GetAllParameters() " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); } else { ok(listener==NULL, "IDirectSoundBuffer_QueryInterface() " "failed but returned a listener anyway\n"); @@ -634,7 +634,7 @@ static HRESULT test_secondary8(LPGUID lpGuid, BOOL play, rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DSERR_INVALIDPARAM, "IDirectSound8_CreateSoundBuffer(secondary) should have " - "returned DSERR_INVALIDPARAM, returned %08x\n", rc); + "returned DSERR_INVALIDPARAM, returned %08lx\n", rc); init_format(&wfx,WAVE_FORMAT_PCM,22050,16,1);
/* Invalid flag combination */ @@ -642,13 +642,13 @@ static HRESULT test_secondary8(LPGUID lpGuid, BOOL play, rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DSERR_INVALIDPARAM, "IDirectSound8_CreateSoundBuffer(secondary) should have " - "returned DSERR_INVALIDPARAM, returned %08x\n", rc); + "returned DSERR_INVALIDPARAM, returned %08lx\n", rc); bufdesc.dwFlags&=~DSBCAPS_CTRLPAN; }
if (winetest_interactive) { - trace(" Testing a %s%ssecondary buffer %s%s%s%sat %dx%dx%d " - "with a primary buffer at %dx%dx%d\n", + trace(" Testing a %s%ssecondary buffer %s%s%s%sat %ldx%dx%d " + "with a primary buffer at %ldx%dx%d\n", has_3dbuffer?"3D ":"", has_duplicate?"duplicated ":"", listener!=NULL||move_sound?"with ":"", @@ -661,7 +661,7 @@ static HRESULT test_secondary8(LPGUID lpGuid, BOOL play, } rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DS_OK && secondary!=NULL,"IDirectSound8_CreateSoundBuffer() " - "failed to create a %s%ssecondary buffer %s%s%s%sat %dx%dx%d (%s): %08x\n", + "failed to create a %s%ssecondary buffer %s%s%s%sat %ldx%dx%d (%s): %08lx\n", has_3dbuffer?"3D ":"", has_duplicate?"duplicated ":"", listener!=NULL||move_sound?"with ":"", move_listener?"moving ":"", listener!=NULL?"listener ":"", @@ -675,55 +675,55 @@ static HRESULT test_secondary8(LPGUID lpGuid, BOOL play,
/* Check the initial secondary buffer's volume and pan */ rc=IDirectSoundBuffer_GetVolume(secondary,&vol); - ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume(secondary) failed: %08x\n",rc); - ok(vol==0,"wrong volume for a new secondary buffer: %d\n",vol); + ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume(secondary) failed: %08lx\n",rc); + ok(vol==0,"wrong volume for a new secondary buffer: %ld\n",vol); rc=IDirectSoundBuffer_GetPan(secondary,&pan); - ok(rc==DS_OK,"IDirectSoundBuffer_GetPan(secondary) failed: %08x\n",rc); - ok(pan==0,"wrong pan for a new secondary buffer: %d\n",pan); + ok(rc==DS_OK,"IDirectSoundBuffer_GetPan(secondary) failed: %08lx\n",rc); + ok(pan==0,"wrong pan for a new secondary buffer: %ld\n",pan);
/* Check that changing the secondary buffer's volume and pan * does not impact the primary buffer's volume and pan */ rc=IDirectSoundBuffer_GetVolume(primary,&refvol); - ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume(primary) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume(primary) failed: %08lx\n",rc); rc=IDirectSoundBuffer_GetPan(primary,&refpan); - ok(rc==DS_OK,"IDirectSoundBuffer_GetPan(primary) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetPan(primary) failed: %08lx\n",rc);
rc=IDirectSoundBuffer_SetVolume(secondary,-1000); - ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume(secondary) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume(secondary) failed: %08lx\n",rc); rc=IDirectSoundBuffer_GetVolume(secondary,&vol); - ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume(secondary) failed: %08x\n",rc); - ok(vol==-1000,"secondary: wrong volume %d instead of -1000\n", + ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume(secondary) failed: %08lx\n",rc); + ok(vol==-1000,"secondary: wrong volume %ld instead of -1000\n", vol); rc=IDirectSoundBuffer_SetPan(secondary,-1000); - ok(rc==DS_OK,"IDirectSoundBuffer_SetPan(secondary) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSoundBuffer_SetPan(secondary) failed: %08lx\n",rc); rc=IDirectSoundBuffer_GetPan(secondary,&pan); - ok(rc==DS_OK,"IDirectSoundBuffer_GetPan(secondary) failed: %08x\n",rc); - ok(pan==-1000,"secondary: wrong pan %d instead of -1000\n", + ok(rc==DS_OK,"IDirectSoundBuffer_GetPan(secondary) failed: %08lx\n",rc); + ok(pan==-1000,"secondary: wrong pan %ld instead of -1000\n", pan);
rc=IDirectSoundBuffer_GetVolume(primary,&vol); - ok(rc==DS_OK,"IDirectSoundBuffer_`GetVolume(primary) failed: i%08x\n",rc); - ok(vol==refvol,"The primary volume changed from %d to %d\n", + ok(rc==DS_OK,"IDirectSoundBuffer_`GetVolume(primary) failed: i%08lx\n",rc); + ok(vol==refvol,"The primary volume changed from %ld to %ld\n", refvol,vol); rc=IDirectSoundBuffer_GetPan(primary,&pan); - ok(rc==DS_OK,"IDirectSoundBuffer_GetPan(primary) failed: %08x\n",rc); - ok(pan==refpan,"The primary pan changed from %d to %d\n", + ok(rc==DS_OK,"IDirectSoundBuffer_GetPan(primary) failed: %08lx\n",rc); + ok(pan==refpan,"The primary pan changed from %ld to %ld\n", refpan,pan);
rc=IDirectSoundBuffer_SetVolume(secondary,0); - ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume(secondary) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume(secondary) failed: %08lx\n",rc); rc=IDirectSoundBuffer_SetPan(secondary,0); - ok(rc==DS_OK,"IDirectSoundBuffer_SetPan(secondary) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSoundBuffer_SetPan(secondary) failed: %08lx\n",rc); } else { LONG pan;
rc=IDirectSoundBuffer_GetPan(secondary,&pan); ok(rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer_GetPan() " - "should have returned DSERR_CONTROLUNAVAIL, returned: %08x\n", rc); + "should have returned DSERR_CONTROLUNAVAIL, returned: %08lx\n", rc); rc=IDirectSoundBuffer_SetPan(secondary,0); ok(rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer_SetPan() " - "should have returned DSERR_CONTROLUNAVAIL, returned: %08x\n", rc); + "should have returned DSERR_CONTROLUNAVAIL, returned: %08lx\n", rc); }
if (has_duplicate) { @@ -733,26 +733,26 @@ static HRESULT test_secondary8(LPGUID lpGuid, BOOL play, rc=IDirectSound8_DuplicateSoundBuffer(dso,0,0); ok(rc==DSERR_INVALIDPARAM, "IDirectSound8_DuplicateSoundBuffer() should have returned " - "DSERR_INVALIDPARAM, returned: %08x\n",rc); + "DSERR_INVALIDPARAM, returned: %08lx\n",rc);
/* DSOUND: Error: Invalid dest buffer */ rc=IDirectSound8_DuplicateSoundBuffer(dso,secondary,0); ok(rc==DSERR_INVALIDPARAM, "IDirectSound8_DuplicateSoundBuffer() should have returned " - "DSERR_INVALIDPARAM, returned: %08x\n",rc); + "DSERR_INVALIDPARAM, returned: %08lx\n",rc);
/* DSOUND: Error: Invalid source buffer */ rc=IDirectSound8_DuplicateSoundBuffer(dso,0,&duplicated); ok(rc==DSERR_INVALIDPARAM, "IDirectSound8_DuplicateSoundBuffer() should have returned " - "DSERR_INVALIDPARAM, returned: %08x\n",rc); + "DSERR_INVALIDPARAM, returned: %08lx\n",rc);
duplicated=NULL; rc=IDirectSound8_DuplicateSoundBuffer(dso,secondary, &duplicated); ok(rc==DS_OK && duplicated!=NULL, "IDirectSound8_DuplicateSoundBuffer() failed to duplicate " - "a secondary buffer: %08x\n",rc); + "a secondary buffer: %08lx\n",rc);
if (rc==DS_OK && duplicated!=NULL) { ref=IDirectSoundBuffer_Release(secondary); @@ -801,7 +801,7 @@ EXIT2: /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); - ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel(DSSCL_NORMAL) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel(DSSCL_NORMAL) failed: %08lx\n",rc);
EXIT: ref=IDirectSound8_Release(dso); @@ -821,7 +821,7 @@ static HRESULT test_for_driver8(LPGUID lpGuid) /* Create the DirectSound object */ rc = DirectSoundCreate8(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, - "DirectSoundCreate8() failed: %08x\n",rc); + "DirectSoundCreate8() failed: %08lx\n",rc); if (rc!=DS_OK) return rc;
@@ -844,7 +844,7 @@ static HRESULT test_primary8(LPGUID lpGuid)
/* Create the DirectSound object */ rc = DirectSoundCreate8(lpGuid, &dso, NULL); - ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate8() failed: %08x\n", rc); + ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate8() failed: %08lx\n", rc); if (rc!=DS_OK) return rc;
@@ -852,14 +852,14 @@ static HRESULT test_primary8(LPGUID lpGuid) ZeroMemory(&dscaps, sizeof(dscaps)); dscaps.dwSize=sizeof(dscaps); rc=IDirectSound8_GetCaps(dso,&dscaps); - ok(rc==DS_OK,"IDirectSound8_GetCaps() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound8_GetCaps() failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT;
/* We must call SetCooperativeLevel before calling CreateSoundBuffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT;
@@ -870,7 +870,7 @@ static HRESULT test_primary8(LPGUID lpGuid) bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER|DSBCAPS_CTRLVOLUME|DSBCAPS_CTRLPAN; rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok((rc==DS_OK && primary!=NULL) || (rc == DSERR_CONTROLUNAVAIL), - "IDirectSound8_CreateSoundBuffer() failed to create a primary buffer: %08x\n",rc); + "IDirectSound8_CreateSoundBuffer() failed to create a primary buffer: %08lx\n",rc); if (rc == DSERR_CONTROLUNAVAIL) trace(" No Primary\n"); else if (rc==DS_OK && primary!=NULL) { @@ -904,7 +904,7 @@ static HRESULT test_primary8(LPGUID lpGuid) /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); - ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel(DSSCL_NORMAL) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel(DSSCL_NORMAL) failed: %08lx\n",rc);
EXIT: ref=IDirectSound8_Release(dso); @@ -926,7 +926,7 @@ static HRESULT test_primary_3d8(LPGUID lpGuid)
/* Create the DirectSound object */ rc = DirectSoundCreate8(lpGuid, &dso, NULL); - ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate8() failed: %08x\n", rc); + ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate8() failed: %08lx\n", rc); if (rc!=DS_OK) return rc;
@@ -934,14 +934,14 @@ static HRESULT test_primary_3d8(LPGUID lpGuid) ZeroMemory(&dscaps, sizeof(dscaps)); dscaps.dwSize=sizeof(dscaps); rc=IDirectSound8_GetCaps(dso,&dscaps); - ok(rc==DS_OK,"IDirectSound8_GetCaps failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound8_GetCaps failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT;
/* We must call SetCooperativeLevel before calling CreateSoundBuffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT;
@@ -951,7 +951,7 @@ static HRESULT test_primary_3d8(LPGUID lpGuid) bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER; rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DS_OK && primary!=NULL,"IDirectSound8_CreateSoundBuffer() failed " - "to create a primary buffer: %08x\n",rc); + "to create a primary buffer: %08lx\n",rc); if (rc==DS_OK && primary!=NULL) { ref=IDirectSoundBuffer_Release(primary); ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references, " @@ -962,7 +962,7 @@ static HRESULT test_primary_3d8(LPGUID lpGuid) bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER|DSBCAPS_CTRL3D; rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DS_OK && primary!=NULL,"IDirectSound8_CreateSoundBuffer() " - "failed to create a 3D primary buffer: %08x\n",rc); + "failed to create a 3D primary buffer: %08lx\n",rc); if (rc==DS_OK && primary!=NULL) { test_buffer8(dso,&primary,TRUE,FALSE,0,FALSE,0, winetest_interactive && !(dscaps.dwFlags & DSCAPS_EMULDRIVER), @@ -975,7 +975,7 @@ static HRESULT test_primary_3d8(LPGUID lpGuid) /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); - ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel(DSSCL_NORMAL) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel(DSSCL_NORMAL) failed: %08lx\n",rc);
EXIT: ref=IDirectSound8_Release(dso); @@ -997,7 +997,7 @@ static HRESULT test_primary_3d_with_listener8(LPGUID lpGuid)
/* Create the DirectSound object */ rc = DirectSoundCreate8(lpGuid, &dso, NULL); - ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate8() failed: %08x\n", rc); + ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate8() failed: %08lx\n", rc); if (rc!=DS_OK) return rc;
@@ -1005,14 +1005,14 @@ static HRESULT test_primary_3d_with_listener8(LPGUID lpGuid) ZeroMemory(&dscaps, sizeof(dscaps)); dscaps.dwSize=sizeof(dscaps); rc=IDirectSound8_GetCaps(dso,&dscaps); - ok(rc==DS_OK,"IDirectSound8_GetCaps() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound8_GetCaps() failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT;
/* We must call SetCooperativeLevel before calling CreateSoundBuffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel(DSSCL_PRIORITY) failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT; primary=NULL; @@ -1021,14 +1021,14 @@ static HRESULT test_primary_3d_with_listener8(LPGUID lpGuid) bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER|DSBCAPS_CTRL3D; rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DS_OK && primary!=NULL,"IDirectSound8_CreateSoundBuffer() failed " - "to create a 3D primary buffer %08x\n",rc); + "to create a 3D primary buffer %08lx\n",rc); if (rc==DS_OK && primary!=NULL) { LPDIRECTSOUND3DLISTENER listener=NULL; rc=IDirectSoundBuffer_QueryInterface(primary, &IID_IDirectSound3DListener, (void **)&listener); ok(rc==DS_OK && listener!=NULL,"IDirectSoundBuffer_QueryInterface() " - "failed to get a 3D listener: %08x\n",rc); + "failed to get a 3D listener: %08lx\n",rc); if (rc==DS_OK && listener!=NULL) { LPDIRECTSOUNDBUFFER temp_buffer=NULL;
@@ -1037,7 +1037,7 @@ static HRESULT test_primary_3d_with_listener8(LPGUID lpGuid) &IID_IDirectSoundBuffer, (LPVOID *)&temp_buffer); ok(rc==DS_OK && temp_buffer!=NULL, - "IDirectSoundBuffer_QueryInterface() failed: %08x\n", rc); + "IDirectSoundBuffer_QueryInterface() failed: %08lx\n", rc); ok(temp_buffer==primary,"COM interface broken: %p != %p\n",temp_buffer,primary); if (rc==DS_OK && temp_buffer!=NULL) { ref=IDirectSoundBuffer_Release(temp_buffer); @@ -1048,7 +1048,7 @@ static HRESULT test_primary_3d_with_listener8(LPGUID lpGuid) rc=IDirectSound3DListener_QueryInterface(listener, &IID_IDirectSoundBuffer,(LPVOID *)&temp_buffer); ok(rc==DS_OK && temp_buffer!=NULL, - "IDirectSoundBuffer_QueryInterface() failed: %08x\n", rc); + "IDirectSoundBuffer_QueryInterface() failed: %08lx\n", rc); ok(temp_buffer==primary,"COM interface broken: %p != %p\n",temp_buffer,primary); ref=IDirectSoundBuffer_Release(temp_buffer); ok(ref==1,"IDirectSoundBuffer_Release() has %d references, " @@ -1134,7 +1134,7 @@ static void ds3d8_tests(void) { HRESULT rc; rc = DirectSoundEnumerateA(dsenum_callback, NULL); - ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08x\n",rc); + ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08lx\n",rc); trace("tested %u DirectSound drivers\n", driver_count); }
diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index a4f59efaad9..d5a3ccad8fd 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -54,18 +54,18 @@ static void IDirectSound_test(LPDIRECTSOUND dso, BOOL initialized,
/* Try to Query for objects */ rc=IDirectSound_QueryInterface(dso,&IID_IUnknown,(LPVOID*)&unknown); - ok(rc==DS_OK,"IDirectSound_QueryInterface(IID_IUnknown) failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_QueryInterface(IID_IUnknown) failed: %08lx\n", rc); if (rc==DS_OK) IUnknown_Release(unknown);
rc=IDirectSound_QueryInterface(dso,&IID_IDirectSound,(LPVOID*)&ds); - ok(rc==DS_OK,"IDirectSound_QueryInterface(IID_IDirectSound) failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_QueryInterface(IID_IDirectSound) failed: %08lx\n", rc); if (rc==DS_OK) IDirectSound_Release(ds);
rc=IDirectSound_QueryInterface(dso,&IID_IDirectSound8,(LPVOID*)&ds8); ok(rc==E_NOINTERFACE,"IDirectSound_QueryInterface(IID_IDirectSound8) " - "should have failed: %08x\n",rc); + "should have failed: %08lx\n",rc); if (rc==DS_OK) IDirectSound8_Release(ds8);
@@ -73,23 +73,23 @@ static void IDirectSound_test(LPDIRECTSOUND dso, BOOL initialized, /* try uninitialized object */ rc=IDirectSound_GetCaps(dso,0); ok(rc==DSERR_UNINITIALIZED,"IDirectSound_GetCaps(NULL) " - "should have returned DSERR_UNINITIALIZED, returned: %08x\n", rc); + "should have returned DSERR_UNINITIALIZED, returned: %08lx\n", rc);
rc=IDirectSound_GetCaps(dso,&dscaps); ok(rc==DSERR_UNINITIALIZED,"IDirectSound_GetCaps() " - "should have returned DSERR_UNINITIALIZED, returned: %08x\n", rc); + "should have returned DSERR_UNINITIALIZED, returned: %08lx\n", rc);
rc=IDirectSound_Compact(dso); ok(rc==DSERR_UNINITIALIZED,"IDirectSound_Compact() " - "should have returned DSERR_UNINITIALIZED, returned: %08x\n", rc); + "should have returned DSERR_UNINITIALIZED, returned: %08lx\n", rc);
rc=IDirectSound_GetSpeakerConfig(dso,&speaker_config); ok(rc==DSERR_UNINITIALIZED,"IDirectSound_GetSpeakerConfig() " - "should have returned DSERR_UNINITIALIZED, returned: %08x\n", rc); + "should have returned DSERR_UNINITIALIZED, returned: %08lx\n", rc);
rc=IDirectSound_Initialize(dso,lpGuid); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, - "IDirectSound_Initialize() failed: %08x\n",rc); + "IDirectSound_Initialize() failed: %08lx\n",rc); if (rc==DSERR_NODRIVER) { trace(" No Driver\n"); goto EXIT; @@ -104,41 +104,41 @@ static void IDirectSound_test(LPDIRECTSOUND dso, BOOL initialized,
rc=IDirectSound_Initialize(dso,lpGuid); ok(rc==DSERR_ALREADYINITIALIZED, "IDirectSound_Initialize() " - "should have returned DSERR_ALREADYINITIALIZED: %08x\n", rc); + "should have returned DSERR_ALREADYINITIALIZED: %08lx\n", rc);
/* DSOUND: Error: Invalid caps buffer */ rc=IDirectSound_GetCaps(dso,0); ok(rc==DSERR_INVALIDPARAM,"IDirectSound_GetCaps(NULL) " - "should have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "should have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc);
ZeroMemory(&dscaps, sizeof(dscaps));
/* DSOUND: Error: Invalid caps buffer */ rc=IDirectSound_GetCaps(dso,&dscaps); ok(rc==DSERR_INVALIDPARAM,"IDirectSound_GetCaps() " - "should have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "should have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc);
dscaps.dwSize=sizeof(dscaps);
/* DSOUND: Running on a certified driver */ rc=IDirectSound_GetCaps(dso,&dscaps); - ok(rc==DS_OK,"IDirectSound_GetCaps() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound_GetCaps() failed: %08lx\n",rc);
rc=IDirectSound_Compact(dso); - ok(rc==DSERR_PRIOLEVELNEEDED,"IDirectSound_Compact() failed: %08x\n", rc); + ok(rc==DSERR_PRIOLEVELNEEDED,"IDirectSound_Compact() failed: %08lx\n", rc);
rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08lx\n", rc);
rc=IDirectSound_Compact(dso); - ok(rc==DS_OK,"IDirectSound_Compact() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound_Compact() failed: %08lx\n",rc);
rc=IDirectSound_GetSpeakerConfig(dso,0); ok(rc==DSERR_INVALIDPARAM,"IDirectSound_GetSpeakerConfig(NULL) " - "should have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "should have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc);
rc=IDirectSound_GetSpeakerConfig(dso,&speaker_config); - ok(rc==DS_OK,"IDirectSound_GetSpeakerConfig() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_GetSpeakerConfig() failed: %08lx\n", rc); ref_speaker_config = speaker_config;
speaker_config = DSSPEAKER_COMBINED(DSSPEAKER_STEREO, @@ -148,14 +148,14 @@ static void IDirectSound_test(LPDIRECTSOUND dso, BOOL initialized, DSSPEAKER_GEOMETRY_NARROW); if(rc==DS_OK) { rc=IDirectSound_SetSpeakerConfig(dso,speaker_config); - ok(rc==DS_OK,"IDirectSound_SetSpeakerConfig() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetSpeakerConfig() failed: %08lx\n", rc); } if (rc==DS_OK) { rc=IDirectSound_GetSpeakerConfig(dso,&new_speaker_config); - ok(rc==DS_OK,"IDirectSound_GetSpeakerConfig() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_GetSpeakerConfig() failed: %08lx\n", rc); if (rc==DS_OK && speaker_config!=new_speaker_config && ref_speaker_config!=new_speaker_config) trace("IDirectSound_GetSpeakerConfig() failed to set speaker " - "config: expected 0x%08x or 0x%08x, got 0x%08x\n", + "config: expected 0x%08lx or 0x%08lx, got 0x%08lx\n", speaker_config,ref_speaker_config,new_speaker_config); IDirectSound_SetSpeakerConfig(dso,ref_speaker_config); } @@ -176,23 +176,23 @@ static void IDirectSound_tests(void) rc=CoGetClassObject(&CLSID_DirectSound, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void**)&cf); ok(rc==S_OK,"CoGetClassObject(CLSID_DirectSound, IID_IClassFactory) " - "failed: %08x\n", rc); + "failed: %08lx\n", rc);
rc=CoGetClassObject(&CLSID_DirectSound, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&cf); ok(rc==S_OK,"CoGetClassObject(CLSID_DirectSound, IID_IUnknown) " - "failed: %08x\n", rc); + "failed: %08lx\n", rc);
/* COM aggregation */ rc=CoCreateInstance(&CLSID_DirectSound, (IUnknown*)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IDirectSound, (void**)&dso); ok(rc==CLASS_E_NOAGGREGATION || broken(rc==DSERR_INVALIDPARAM), - "DirectMusicPerformance create failed: %08x, expected CLASS_E_NOAGGREGATION\n", rc); + "DirectMusicPerformance create failed: %08lx, expected CLASS_E_NOAGGREGATION\n", rc);
/* try the COM class factory method of creation with no device specified */ rc=CoCreateInstance(&CLSID_DirectSound, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSound, (void**)&dso); - ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSound) failed: %08x\n", rc); + ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSound) failed: %08lx\n", rc); if (dso) IDirectSound_test(dso, FALSE, NULL);
@@ -200,7 +200,7 @@ static void IDirectSound_tests(void) * device specified */ rc=CoCreateInstance(&CLSID_DirectSound, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSound, (void**)&dso); - ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSound) failed: %08x\n", rc); + ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSound) failed: %08lx\n", rc); if (dso) IDirectSound_test(dso, FALSE, &DSDEVID_DefaultPlayback);
@@ -208,7 +208,7 @@ static void IDirectSound_tests(void) * playback device specified */ rc=CoCreateInstance(&CLSID_DirectSound, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSound, (void**)&dso); - ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSound) failed: %08x\n", rc); + ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSound) failed: %08lx\n", rc); if (dso) IDirectSound_test(dso, FALSE, &DSDEVID_DefaultVoicePlayback);
@@ -218,7 +218,7 @@ static void IDirectSound_tests(void) &CLSID_DirectSoundPrivate, (void**)&dso); ok(rc==E_NOINTERFACE, "CoCreateInstance(CLSID_DirectSound,CLSID_DirectSoundPrivate) " - "should have failed: %08x\n",rc); + "should have failed: %08lx\n",rc);
/* try the COM class factory method of creation with a bad * GUID and IID specified */ @@ -226,33 +226,33 @@ static void IDirectSound_tests(void) &IID_IDirectSound, (void**)&dso); ok(rc==REGDB_E_CLASSNOTREG, "CoCreateInstance(CLSID_DirectSoundPrivate,IID_IDirectSound) " - "should have failed: %08x\n",rc); + "should have failed: %08lx\n",rc);
/* try with no device specified */ rc = DirectSoundCreate(NULL, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, - "DirectSoundCreate(NULL) failed: %08x\n",rc); + "DirectSoundCreate(NULL) failed: %08lx\n",rc); if (rc==S_OK && dso) IDirectSound_test(dso, TRUE, NULL);
/* try with default playback device specified */ rc = DirectSoundCreate(&DSDEVID_DefaultPlayback, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, - "DirectSoundCreate(DSDEVID_DefaultPlayback) failed: %08x\n", rc); + "DirectSoundCreate(DSDEVID_DefaultPlayback) failed: %08lx\n", rc); if (rc==DS_OK && dso) IDirectSound_test(dso, TRUE, NULL);
/* try with default voice playback device specified */ rc = DirectSoundCreate(&DSDEVID_DefaultVoicePlayback, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, - "DirectSoundCreate(DSDEVID_DefaultVoicePlayback) failed: %08x\n", rc); + "DirectSoundCreate(DSDEVID_DefaultVoicePlayback) failed: %08lx\n", rc); if (rc==DS_OK && dso) IDirectSound_test(dso, TRUE, NULL);
/* try with a bad device specified */ rc = DirectSoundCreate(&DSDEVID_DefaultVoiceCapture, &dso, NULL); ok(rc==DSERR_NODRIVER,"DirectSoundCreate(DSDEVID_DefaultVoiceCapture) " - "should have failed: %08x\n",rc); + "should have failed: %08lx\n",rc); if (rc==DS_OK && dso) IDirectSound_Release(dso); } @@ -266,12 +266,12 @@ static HRESULT test_dsound(LPGUID lpGuid) /* DSOUND: Error: Invalid interface buffer */ rc = DirectSoundCreate(lpGuid, 0, NULL); ok(rc==DSERR_INVALIDPARAM,"DirectSoundCreate() should have returned " - "DSERR_INVALIDPARAM, returned: %08x\n",rc); + "DSERR_INVALIDPARAM, returned: %08lx\n",rc);
/* Create the DirectSound object */ rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, - "DirectSoundCreate() failed: %08x\n",rc); + "DirectSoundCreate() failed: %08lx\n",rc); if (rc!=DS_OK) return rc;
@@ -281,19 +281,19 @@ static HRESULT test_dsound(LPGUID lpGuid) /* Try the COM class factory method of creation with enumerated device */ rc=CoCreateInstance(&CLSID_DirectSound, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSound, (void**)&dso); - ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSound) failed: %08x\n", rc); + ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSound) failed: %08lx\n", rc); if (dso) IDirectSound_test(dso, FALSE, lpGuid);
/* Create a DirectSound object */ rc = DirectSoundCreate(lpGuid, &dso, NULL); - ok(rc==DS_OK,"DirectSoundCreate() failed: %08x\n",rc); + ok(rc==DS_OK,"DirectSoundCreate() failed: %08lx\n",rc); if (rc==DS_OK) { LPDIRECTSOUND dso1=NULL;
/* Create a second DirectSound object */ rc = DirectSoundCreate(lpGuid, &dso1, NULL); - ok(rc==DS_OK,"DirectSoundCreate() failed: %08x\n",rc); + ok(rc==DS_OK,"DirectSoundCreate() failed: %08lx\n",rc); if (rc==DS_OK) { /* Release the second DirectSound object */ ref=IDirectSound_Release(dso1); @@ -313,7 +313,7 @@ static HRESULT test_dsound(LPGUID lpGuid)
/* Create a DirectSound object */ rc = DirectSoundCreate(lpGuid, &dso, NULL); - ok(rc==DS_OK,"DirectSoundCreate() failed: %08x\n",rc); + ok(rc==DS_OK,"DirectSoundCreate() failed: %08lx\n",rc); if (rc==DS_OK) { LPDIRECTSOUNDBUFFER secondary; DSBUFFERDESC bufdesc; @@ -329,13 +329,13 @@ static HRESULT test_dsound(LPGUID lpGuid) rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok((rc==DS_OK && secondary!=NULL) || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */ "IDirectSound_CreateSoundBuffer() failed to create a secondary " - "buffer %08x\n",rc); + "buffer %08lx\n",rc); if (rc==DS_OK && secondary!=NULL) { LPDIRECTSOUND3DBUFFER buffer3d; rc = IDirectSoundBuffer_QueryInterface(secondary, &IID_IDirectSound3DBuffer, (void **)&buffer3d); ok(rc==DS_OK && buffer3d!=NULL,"IDirectSound_QueryInterface() " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); if (rc==DS_OK && buffer3d!=NULL) { ref=IDirectSound3DBuffer_AddRef(buffer3d); ok(ref==2,"IDirectSound3DBuffer_AddRef() has %d references, " @@ -370,7 +370,7 @@ static HRESULT test_primary(LPGUID lpGuid) /* Create the DirectSound object */ rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, - "DirectSoundCreate() failed: %08x\n",rc); + "DirectSoundCreate() failed: %08lx\n",rc); if (rc!=DS_OK) return rc;
@@ -378,20 +378,20 @@ static HRESULT test_primary(LPGUID lpGuid) ZeroMemory(&dscaps, sizeof(dscaps)); dscaps.dwSize=sizeof(dscaps); rc=IDirectSound_GetCaps(dso,&dscaps); - ok(rc==DS_OK,"IDirectSound_GetCaps() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound_GetCaps() failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT;
/* DSOUND: Error: Invalid buffer description pointer */ rc=IDirectSound_CreateSoundBuffer(dso,0,0,NULL); ok(rc==DSERR_INVALIDPARAM, - "IDirectSound_CreateSoundBuffer() should have failed: %08x\n", rc); + "IDirectSound_CreateSoundBuffer() should have failed: %08lx\n", rc);
/* DSOUND: Error: NULL pointer is invalid */ /* DSOUND: Error: Invalid buffer description pointer */ rc=IDirectSound_CreateSoundBuffer(dso,0,&primary,NULL); ok(rc==DSERR_INVALIDPARAM && primary==0, - "IDirectSound_CreateSoundBuffer() should have failed: rc=%08x," + "IDirectSound_CreateSoundBuffer() should have failed: rc=%08lx," "dsbo=%p\n",rc,primary);
/* DSOUND: Error: Invalid size */ @@ -401,7 +401,7 @@ static HRESULT test_primary(LPGUID lpGuid) bufdesc.dwSize=sizeof(bufdesc)-1; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DSERR_INVALIDPARAM && primary==0, - "IDirectSound_CreateSoundBuffer() should have failed: rc=%08x," + "IDirectSound_CreateSoundBuffer() should have failed: rc=%08lx," "primary=%p\n",rc,primary);
/* DSOUND: Error: DSBCAPS_PRIMARYBUFFER flag with non-NULL lpwfxFormat */ @@ -413,7 +413,7 @@ static HRESULT test_primary(LPGUID lpGuid) bufdesc.lpwfxFormat=&wfx; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DSERR_INVALIDPARAM && primary==0, - "IDirectSound_CreateSoundBuffer() should have failed: rc=%08x," + "IDirectSound_CreateSoundBuffer() should have failed: rc=%08lx," "primary=%p\n",rc,primary);
/* DSOUND: Error: No DSBCAPS_PRIMARYBUFFER flag with NULL lpwfxFormat */ @@ -425,13 +425,13 @@ static HRESULT test_primary(LPGUID lpGuid) bufdesc.lpwfxFormat=NULL; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DSERR_INVALIDPARAM && primary==0, - "IDirectSound_CreateSoundBuffer() should have failed: rc=%08x," + "IDirectSound_CreateSoundBuffer() should have failed: rc=%08lx," "primary=%p\n",rc,primary);
/* We must call SetCooperativeLevel before calling CreateSoundBuffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08lx\n", rc); if (rc!=DS_OK) goto EXIT;
@@ -444,7 +444,7 @@ static HRESULT test_primary(LPGUID lpGuid) init_format(&wfx,WAVE_FORMAT_PCM,11025,8,2); rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DSERR_INVALIDPARAM,"IDirectSound_CreateSoundBuffer() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n", rc); if (rc==DS_OK && primary!=NULL) IDirectSoundBuffer_Release(primary);
@@ -454,7 +454,7 @@ static HRESULT test_primary(LPGUID lpGuid) bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER|DSBCAPS_CTRLVOLUME; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok((rc==DS_OK && primary!=NULL) || (rc==DSERR_CONTROLUNAVAIL), - "IDirectSound_CreateSoundBuffer() failed to create a primary buffer: %08x\n",rc); + "IDirectSound_CreateSoundBuffer() failed to create a primary buffer: %08lx\n",rc); if (rc==DSERR_CONTROLUNAVAIL) trace(" No Primary\n"); else if (rc==DS_OK && primary!=NULL) { @@ -467,7 +467,7 @@ static HRESULT test_primary(LPGUID lpGuid) rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&second,NULL); ok(rc==DS_OK && second==primary, "IDirectSound_CreateSoundBuffer() should have returned original " - "primary buffer: %08x\n",rc); + "primary buffer: %08lx\n",rc); ref=IDirectSoundBuffer_Release(second); ok(ref==1,"IDirectSoundBuffer_Release() primary has %d references, " "should have 1\n",ref); @@ -477,16 +477,16 @@ static HRESULT test_primary(LPGUID lpGuid) rc=IDirectSound_DuplicateSoundBuffer(dso,primary,&third); /* rc=0x88780032 */ ok(rc!=DS_OK,"IDirectSound_DuplicateSoundBuffer() primary buffer " - "should have failed %08x\n",rc); + "should have failed %08lx\n",rc);
rc=IDirectSoundBuffer_GetVolume(primary,&vol); - ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume() failed: %08lx\n", rc);
if (winetest_interactive) { trace("Playing a 5 seconds reference tone at the current " "volume.\n"); if (rc==DS_OK) - trace("(the current volume is %d according to DirectSound)\n", + trace("(the current volume is %ld according to DirectSound)\n", vol); trace("All subsequent tones should be identical to this one.\n"); trace("Listen for stutter, changes in pitch, volume, etc.\n"); @@ -507,13 +507,13 @@ static HRESULT test_primary(LPGUID lpGuid) ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references\n",ref);
rc=IDirectSoundBuffer_QueryInterface(primary,&IID_IDirectSoundNotify,(void **)¬ify); - ok(rc==E_NOINTERFACE,"IDirectSoundBuffer_QueryInterface() failed %08x\n",rc); + ok(rc==E_NOINTERFACE,"IDirectSoundBuffer_QueryInterface() failed %08lx\n",rc); }
/* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08lx\n", rc);
EXIT: ref=IDirectSound_Release(dso); @@ -541,7 +541,7 @@ static HRESULT test_primary_secondary(LPGUID lpGuid) /* Create the DirectSound object */ rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, - "DirectSoundCreate() failed: %08x\n",rc); + "DirectSoundCreate() failed: %08lx\n",rc); if (rc!=DS_OK) return rc;
@@ -549,14 +549,14 @@ static HRESULT test_primary_secondary(LPGUID lpGuid) ZeroMemory(&dscaps, sizeof(dscaps)); dscaps.dwSize=sizeof(dscaps); rc=IDirectSound_GetCaps(dso,&dscaps); - ok(rc==DS_OK,"IDirectSound_GetCaps() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound_GetCaps() failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT;
/* We must call SetCooperativeLevel before creating primary buffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08lx\n", rc); if (rc!=DS_OK) goto EXIT;
@@ -565,7 +565,7 @@ static HRESULT test_primary_secondary(LPGUID lpGuid) bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DS_OK && primary!=NULL, - "IDirectSound_CreateSoundBuffer() failed to create a primary buffer %08x\n",rc); + "IDirectSound_CreateSoundBuffer() failed to create a primary buffer %08lx\n",rc);
if (rc==DS_OK && primary!=NULL) { for (f = 0; f < ARRAY_SIZE(formats); f++) { @@ -579,7 +579,7 @@ static HRESULT test_primary_secondary(LPGUID lpGuid) /* DSOUND: Setting DirectSound cooperative level to * DSSCL_PRIORITY */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08lx\n", rc); if (rc!=DS_OK) goto EXIT;
@@ -589,10 +589,10 @@ static HRESULT test_primary_secondary(LPGUID lpGuid) rc=IDirectSoundBuffer_SetFormat(primary,&wfx);
if (wfx.wBitsPerSample <= 16) - ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %08x\n", + ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %08lx\n", format_string(&wfx), rc); else - ok(rc==DS_OK || rc == E_INVALIDARG, "SetFormat (%s) failed: %08x\n", + ok(rc==DS_OK || rc == E_INVALIDARG, "SetFormat (%s) failed: %08lx\n", format_string(&wfx), rc);
/* There is no guarantee that SetFormat will actually change the @@ -600,17 +600,17 @@ static HRESULT test_primary_secondary(LPGUID lpGuid) * supports. So we must re-query the format. */ rc=IDirectSoundBuffer_GetFormat(primary,&wfx,sizeof(wfx),NULL); - ok(rc==DS_OK,"IDirectSoundBuffer_GetFormat() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetFormat() failed: %08lx\n", rc); if (rc==DS_OK && (wfx.wFormatTag!=wfx2.wFormatTag || wfx.nSamplesPerSec!=wfx2.nSamplesPerSec || wfx.wBitsPerSample!=wfx2.wBitsPerSample || wfx.nChannels!=wfx2.nChannels)) { - trace("Requested primary format tag=0x%04x %dx%dx%d " - "avg.B/s=%d align=%d\n", + trace("Requested primary format tag=0x%04x %ldx%dx%d " + "avg.B/s=%ld align=%d\n", wfx2.wFormatTag,wfx2.nSamplesPerSec,wfx2.wBitsPerSample, wfx2.nChannels,wfx2.nAvgBytesPerSec,wfx2.nBlockAlign); - trace("Got tag=0x%04x %dx%dx%d avg.B/s=%d align=%d\n", + trace("Got tag=0x%04x %ldx%dx%d avg.B/s=%ld align=%d\n", wfx.wFormatTag,wfx.nSamplesPerSec,wfx.wBitsPerSample, wfx.nChannels,wfx.nAvgBytesPerSec,wfx.nBlockAlign); } @@ -618,7 +618,7 @@ static HRESULT test_primary_secondary(LPGUID lpGuid) /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08lx\n", rc);
init_format(&wfx2,WAVE_FORMAT_PCM,11025,16,2);
@@ -630,14 +630,14 @@ static HRESULT test_primary_secondary(LPGUID lpGuid) wfx.nBlockAlign); bufdesc.lpwfxFormat=&wfx2; if (winetest_interactive) { - trace(" Testing a primary buffer at %dx%dx%d (fmt=%d) with a " - "secondary buffer at %dx%dx%d\n", + trace(" Testing a primary buffer at %ldx%dx%d (fmt=%d) with a " + "secondary buffer at %ldx%dx%d\n", wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels,format_tags[tag], wfx2.nSamplesPerSec,wfx2.wBitsPerSample,wfx2.nChannels); } rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok((rc==DS_OK && secondary!=NULL) || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */ - "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08x\n",rc); + "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08lx\n",rc);
if (rc==DS_OK && secondary!=NULL) { test_buffer(dso,&secondary,0,FALSE,0,FALSE,0, @@ -658,7 +658,7 @@ static HRESULT test_primary_secondary(LPGUID lpGuid) /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08lx\n", rc);
EXIT: ref=IDirectSound_Release(dso); @@ -683,7 +683,7 @@ static HRESULT test_secondary(LPGUID lpGuid) /* Create the DirectSound object */ rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, - "DirectSoundCreate() failed: %08x\n",rc); + "DirectSoundCreate() failed: %08lx\n",rc); if (rc!=DS_OK) return rc;
@@ -691,14 +691,14 @@ static HRESULT test_secondary(LPGUID lpGuid) ZeroMemory(&dscaps, sizeof(dscaps)); dscaps.dwSize=sizeof(dscaps); rc=IDirectSound_GetCaps(dso,&dscaps); - ok(rc==DS_OK,"IDirectSound_GetCaps() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound_GetCaps() failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT;
/* We must call SetCooperativeLevel before creating primary buffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08lx\n", rc); if (rc!=DS_OK) goto EXIT;
@@ -707,11 +707,11 @@ static HRESULT test_secondary(LPGUID lpGuid) bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DS_OK && primary!=NULL, - "IDirectSound_CreateSoundBuffer() failed to create a primary buffer %08x\n",rc); + "IDirectSound_CreateSoundBuffer() failed to create a primary buffer %08lx\n",rc);
if (rc==DS_OK && primary!=NULL) { rc=IDirectSoundBuffer_GetFormat(primary,&wfx1,sizeof(wfx1),NULL); - ok(rc==DS_OK,"IDirectSoundBuffer8_Getformat() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer8_Getformat() failed: %08lx\n", rc); if (rc!=DS_OK) goto EXIT1;
@@ -733,7 +733,7 @@ static HRESULT test_secondary(LPGUID lpGuid) wfx.nBlockAlign); rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DSERR_INVALIDPARAM,"IDirectSound_CreateSoundBuffer() " - "should have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "should have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc); if (rc==DS_OK && secondary!=NULL) IDirectSoundBuffer_Release(secondary);
@@ -751,10 +751,10 @@ static HRESULT test_secondary(LPGUID lpGuid) || rc == DS_OK, /* driver dependent? */ "IDirectSound_CreateSoundBuffer() " "should have returned (DSERR_CONTROLUNAVAIL or DSERR_INVALIDCALL) " - "and NULL, returned: %08x %p\n", rc, secondary); + "and NULL, returned: %08lx %p\n", rc, secondary); else ok((rc==DS_OK && secondary!=NULL) || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */ - "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08x\n",rc); + "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08lx\n",rc);
if (secondary) IDirectSoundBuffer_Release(secondary); @@ -770,7 +770,7 @@ static HRESULT test_secondary(LPGUID lpGuid)
rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok((rc==DSERR_INVALIDPARAM || rc==DSERR_INVALIDCALL /* 2003 */) && !secondary, - "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", + "IDirectSound_CreateSoundBuffer() returned: %08lx %p\n", rc, secondary); if (secondary) { @@ -784,7 +784,7 @@ static HRESULT test_secondary(LPGUID lpGuid) ok(((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL || rc==DSERR_INVALIDPARAM) && !secondary) || rc==DS_OK, /* 2003 / 2008 */ - "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", + "IDirectSound_CreateSoundBuffer() returned: %08lx %p\n", rc, secondary); if (secondary) { @@ -796,7 +796,7 @@ static HRESULT test_secondary(LPGUID lpGuid) wfxe.SubFormat = GUID_NULL; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok((rc==DSERR_INVALIDPARAM || rc==DSERR_INVALIDCALL) && !secondary, - "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", + "IDirectSound_CreateSoundBuffer() returned: %08lx %p\n", rc, secondary); if (secondary) { @@ -808,7 +808,7 @@ static HRESULT test_secondary(LPGUID lpGuid) ++wfxe.Samples.wValidBitsPerSample; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DSERR_INVALIDPARAM && !secondary, - "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", + "IDirectSound_CreateSoundBuffer() returned: %08lx %p\n", rc, secondary); if (secondary) { @@ -820,7 +820,7 @@ static HRESULT test_secondary(LPGUID lpGuid) wfxe.Samples.wValidBitsPerSample = 0; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DS_OK && secondary, - "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", + "IDirectSound_CreateSoundBuffer() returned: %08lx %p\n", rc, secondary); if (secondary) { @@ -831,12 +831,12 @@ static HRESULT test_secondary(LPGUID lpGuid)
rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DS_OK && secondary!=NULL, - "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08x\n",rc); + "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08lx\n",rc);
if (rc==DS_OK && secondary!=NULL) { if (winetest_interactive) { - trace(" Testing a secondary buffer at %dx%dx%d (fmt=%d) " - "with a primary buffer at %dx%dx%d\n", + trace(" Testing a secondary buffer at %ldx%dx%d (fmt=%d) " + "with a primary buffer at %ldx%dx%d\n", wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels,format_tags[tag], wfx1.nSamplesPerSec,wfx1.wBitsPerSample,wfx1.nChannels); } @@ -858,7 +858,7 @@ EXIT1: /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08lx\n", rc);
EXIT: ref=IDirectSound_Release(dso); @@ -883,7 +883,7 @@ static HRESULT test_block_align(LPGUID lpGuid) /* Create the DirectSound object */ rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, - "DirectSoundCreate() failed: %08x\n",rc); + "DirectSoundCreate() failed: %08lx\n",rc); if (rc!=DS_OK) return rc;
@@ -895,30 +895,30 @@ static HRESULT test_block_align(LPGUID lpGuid) bufdesc.lpwfxFormat=&wfx; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc == DS_OK || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */ - "IDirectSound_CreateSoundBuffer() should have returned DS_OK, returned: %08x\n", rc); + "IDirectSound_CreateSoundBuffer() should have returned DS_OK, returned: %08lx\n", rc);
if (rc==DS_OK && secondary!=NULL) { ZeroMemory(&dsbcaps, sizeof(dsbcaps)); dsbcaps.dwSize = sizeof(dsbcaps); rc=IDirectSoundBuffer_GetCaps(secondary,&dsbcaps); ok(rc==DS_OK,"IDirectSoundBuffer_GetCaps() should have returned DS_OK, " - "returned: %08x\n", rc); + "returned: %08lx\n", rc); if (rc==DS_OK && wfx.nBlockAlign > 1) { ok(dsbcaps.dwBufferBytes==(wfx.nAvgBytesPerSec + wfx.nBlockAlign), - "Buffer size not a multiple of nBlockAlign: requested %d, " - "got %d, should be %d\n", bufdesc.dwBufferBytes, + "Buffer size not a multiple of nBlockAlign: requested %ld, " + "got %ld, should be %ld\n", bufdesc.dwBufferBytes, dsbcaps.dwBufferBytes, wfx.nAvgBytesPerSec + wfx.nBlockAlign);
rc = IDirectSoundBuffer_SetCurrentPosition(secondary, 0); - ok(rc == DS_OK, "Could not set position to 0: %08x\n", rc); + ok(rc == DS_OK, "Could not set position to 0: %08lx\n", rc); rc = IDirectSoundBuffer_GetCurrentPosition(secondary, &pos, NULL); - ok(rc == DS_OK, "Could not get position: %08x\n", rc); + ok(rc == DS_OK, "Could not get position: %08lx\n", rc); rc = IDirectSoundBuffer_SetCurrentPosition(secondary, 1); - ok(rc == DS_OK, "Could not set position to 1: %08x\n", rc); + ok(rc == DS_OK, "Could not set position to 1: %08lx\n", rc); rc = IDirectSoundBuffer_GetCurrentPosition(secondary, &pos2, NULL); - ok(rc == DS_OK, "Could not get new position: %08x\n", rc); - ok(pos == pos2, "Positions not the same! Old position: %d, new position: %d\n", pos, pos2); + ok(rc == DS_OK, "Could not get new position: %08lx\n", rc); + ok(pos == pos2, "Positions not the same! Old position: %ld, new position: %ld\n", pos, pos2); } ref=IDirectSoundBuffer_Release(secondary); ok(ref==0,"IDirectSoundBuffer_Release() secondary has %d references, " @@ -954,7 +954,7 @@ static HRESULT test_frequency(LPGUID lpGuid) /* Create the DirectSound object */ rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, - "DirectSoundCreate() failed: %08x\n",rc); + "DirectSoundCreate() failed: %08lx\n",rc); if (rc!=DS_OK) return rc;
@@ -962,14 +962,14 @@ static HRESULT test_frequency(LPGUID lpGuid) ZeroMemory(&dscaps, sizeof(dscaps)); dscaps.dwSize=sizeof(dscaps); rc=IDirectSound_GetCaps(dso,&dscaps); - ok(rc==DS_OK,"IDirectSound_GetCaps() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound_GetCaps() failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT;
/* We must call SetCooperativeLevel before creating primary buffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08lx\n", rc); if (rc!=DS_OK) goto EXIT;
@@ -978,11 +978,11 @@ static HRESULT test_frequency(LPGUID lpGuid) bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DS_OK && primary!=NULL, - "IDirectSound_CreateSoundBuffer() failed to create a primary buffer %08x\n",rc); + "IDirectSound_CreateSoundBuffer() failed to create a primary buffer %08lx\n",rc);
if (rc==DS_OK && primary!=NULL) { rc=IDirectSoundBuffer_GetFormat(primary,&wfx1,sizeof(wfx1),NULL); - ok(rc==DS_OK,"IDirectSoundBuffer8_Getformat() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer8_Getformat() failed: %08lx\n", rc); if (rc!=DS_OK) goto EXIT1;
@@ -998,14 +998,14 @@ static HRESULT test_frequency(LPGUID lpGuid) BUFFER_LEN/1000,wfx.nBlockAlign); bufdesc.lpwfxFormat=&wfx; if (winetest_interactive) { - trace(" Testing a secondary buffer at %dx%dx%d " - "with a primary buffer at %dx%dx%d\n", + trace(" Testing a secondary buffer at %ldx%dx%d " + "with a primary buffer at %ldx%dx%d\n", wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels, wfx1.nSamplesPerSec,wfx1.wBitsPerSample,wfx1.nChannels); } rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok((rc==DS_OK && secondary!=NULL) || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */ - "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08x\n",rc); + "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08lx\n",rc);
if (rc==DS_OK && secondary!=NULL) { test_buffer(dso,&secondary,0,FALSE,0,FALSE,0, @@ -1026,7 +1026,7 @@ EXIT1: /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08lx\n", rc);
EXIT: ref=IDirectSound_Release(dso); @@ -1046,30 +1046,30 @@ static HRESULT test_notify(LPDIRECTSOUNDBUFFER dsb,
rc=IDirectSoundBuffer_SetCurrentPosition(dsb,0); ok(rc==DS_OK, - "IDirectSoundBuffer_SetCurrentPosition failed %08x\n",rc); + "IDirectSoundBuffer_SetCurrentPosition failed %08lx\n",rc); if(rc!=DS_OK) return rc;
rc=IDirectSoundBuffer_Play(dsb,0,0,0); - ok(rc==DS_OK,"IDirectSoundBuffer_Play failed %08x\n",rc); + ok(rc==DS_OK,"IDirectSoundBuffer_Play failed %08lx\n",rc); if(rc!=DS_OK) return rc;
rc = IDirectSoundBuffer_GetStatus(dsb, &status); - ok(rc == DS_OK,"Failed %08x\n",rc); - ok(status == DSBSTATUS_PLAYING,"got %08x\n", status); + ok(rc == DS_OK,"Failed %08lx\n",rc); + ok(status == DSBSTATUS_PLAYING,"got %08lx\n", status);
rc=IDirectSoundBuffer_Stop(dsb); - ok(rc==DS_OK,"IDirectSoundBuffer_Stop failed %08x\n",rc); + ok(rc==DS_OK,"IDirectSoundBuffer_Stop failed %08lx\n",rc); if(rc!=DS_OK) return rc;
rc = IDirectSoundBuffer_GetStatus(dsb, &status); - ok(rc == DS_OK,"Failed %08x\n",rc); - ok(status == 0 /* Stopped */,"got %08x\n", status); + ok(rc == DS_OK,"Failed %08lx\n",rc); + ok(status == 0 /* Stopped */,"got %08lx\n", status);
ret = WaitForMultipleObjects(count, event, FALSE, 3000); - ok(ret==expected,"expected %d. got %d\n",expected,ret); + ok(ret==expected,"expected %ld. got %ld\n",expected,ret);
return rc; } @@ -1085,14 +1085,14 @@ static HRESULT test_duplicate(LPGUID lpGuid) /* Create the DirectSound object */ rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, - "DirectSoundCreate() failed: %08x\n",rc); + "DirectSoundCreate() failed: %08lx\n",rc); if (rc!=DS_OK) return rc;
/* We must call SetCooperativeLevel before creating primary buffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08lx\n", rc); if (rc!=DS_OK) goto EXIT;
@@ -1101,7 +1101,7 @@ static HRESULT test_duplicate(LPGUID lpGuid) bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DS_OK && primary!=NULL,"IDirectSound_CreateSoundBuffer() failed " - "to create a primary buffer %08x\n",rc); + "to create a primary buffer %08lx\n",rc);
if (rc==DS_OK && primary!=NULL) { LPDIRECTSOUNDBUFFER original=NULL; @@ -1116,7 +1116,7 @@ static HRESULT test_duplicate(LPGUID lpGuid) rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&original,NULL); ok(rc==DS_OK && original!=NULL, "IDirectSound_CreateSoundBuffer() failed to create an original " - "buffer %08x\n",rc); + "buffer %08lx\n",rc); if (rc==DS_OK && original!=NULL) { LPDIRECTSOUNDBUFFER duplicated=NULL; LPDIRECTSOUNDNOTIFY notify=NULL; @@ -1134,7 +1134,7 @@ static HRESULT test_duplicate(LPGUID lpGuid) rc=IDirectSoundBuffer_Lock(original,0,0,&buf,&bufsize, NULL,NULL,DSBLOCK_ENTIREBUFFER); ok(rc==DS_OK && buf!=NULL, - "IDirectSoundBuffer_Lock failed to lock the buffer %08x\n",rc); + "IDirectSoundBuffer_Lock failed to lock the buffer %08lx\n",rc); if (rc==DS_OK && buf!=NULL) { if (sizeof(void*)==4) { /* crashes on 64-bit */ /* broken apps like Asuka 120% Return BURNING Fest, @@ -1147,7 +1147,7 @@ static HRESULT test_duplicate(LPGUID lpGuid) rc=IDirectSoundBuffer_Unlock(original,buf,bufsize, NULL,0); ok(rc==DS_OK,"IDirectSoundBuffer_Unlock failed to unlock " - "%08x\n",rc); + "%08lx\n",rc); }
rc=IDirectSoundBuffer_QueryInterface(original, @@ -1155,7 +1155,7 @@ static HRESULT test_duplicate(LPGUID lpGuid) (void**)¬ify); ok(rc==DS_OK && notify!=NULL, "IDirectSoundBuffer_QueryInterface() failed to create a " - "notification %08x\n",rc); + "notification %08lx\n",rc); if (rc==DS_OK && notify!=NULL) { DSBPOSITIONNOTIFY dsbpn; LPDIRECTSOUNDNOTIFY dup_notify=NULL; @@ -1165,11 +1165,11 @@ static HRESULT test_duplicate(LPGUID lpGuid) rc=IDirectSoundNotify_SetNotificationPositions(notify, 1,&dsbpn); ok(rc==DS_OK,"IDirectSoundNotify_SetNotificationPositions " - "failed %08x\n",rc); + "failed %08lx\n",rc);
rc=IDirectSound_DuplicateSoundBuffer(dso,original,&duplicated); ok(rc==DS_OK && duplicated!=NULL, - "IDirectSound_DuplicateSoundBuffer failed %08x\n",rc); + "IDirectSound_DuplicateSoundBuffer failed %08lx\n",rc);
trace("testing duplicated buffer without notifications.\n"); test_notify(duplicated, ARRAY_SIZE(event), event, WAIT_TIMEOUT); @@ -1179,14 +1179,14 @@ static HRESULT test_duplicate(LPGUID lpGuid) (void**)&dup_notify); ok(rc==DS_OK&&dup_notify!=NULL, "IDirectSoundBuffer_QueryInterface() failed to create a " - "notification %08x\n",rc); + "notification %08lx\n",rc); if(rc==DS_OK&&dup_notify!=NULL) { dsbpn.dwOffset=DSBPN_OFFSETSTOP; dsbpn.hEventNotify=event[1]; rc=IDirectSoundNotify_SetNotificationPositions(dup_notify, 1,&dsbpn); ok(rc==DS_OK,"IDirectSoundNotify_SetNotificationPositions " - "failed %08x\n",rc); + "failed %08lx\n",rc);
trace("testing duplicated buffer with a notification.\n"); test_notify(duplicated, ARRAY_SIZE(event), event, WAIT_OBJECT_0 + 1); @@ -1218,7 +1218,7 @@ static HRESULT test_duplicate(LPGUID lpGuid) /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08lx\n", rc);
EXIT: ref=IDirectSound_Release(dso); @@ -1267,7 +1267,7 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); - ok(rc == E_INVALIDARG, "%s: SetFormat: %08x\n", testname, rc); + ok(rc == E_INVALIDARG, "%s: SetFormat: %08lx\n", testname, rc);
wfx.nChannels = 2; wfx.nSamplesPerSec = 44100; @@ -1275,7 +1275,7 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); - ok(rc == E_INVALIDARG, "%s: SetFormat: %08x\n", testname, rc); + ok(rc == E_INVALIDARG, "%s: SetFormat: %08lx\n", testname, rc);
wfx.nChannels = 2; wfx.nSamplesPerSec = 44100; @@ -1283,7 +1283,7 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); - ok(rc == E_INVALIDARG, "%s: SetFormat: %08x\n", testname, rc); + ok(rc == E_INVALIDARG, "%s: SetFormat: %08lx\n", testname, rc);
wfx.nChannels = 2; wfx.nSamplesPerSec = 44100; @@ -1291,7 +1291,7 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); - ok(rc == E_INVALIDARG, "%s: SetFormat: %08x\n", testname, rc); + ok(rc == E_INVALIDARG, "%s: SetFormat: %08lx\n", testname, rc);
wfx.nChannels = 2; wfx.nSamplesPerSec = 0; @@ -1299,7 +1299,7 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); - ok(rc == E_INVALIDARG, "%s: SetFormat: %08x\n", testname, rc); + ok(rc == E_INVALIDARG, "%s: SetFormat: %08lx\n", testname, rc);
wfx.nChannels = 2; wfx.nSamplesPerSec = 44100; @@ -1307,7 +1307,7 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I wfx.nBlockAlign = 0; wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); - ok(rc == E_INVALIDARG, "%s: SetFormat: %08x\n", testname, rc); + ok(rc == E_INVALIDARG, "%s: SetFormat: %08lx\n", testname, rc);
wfx.nChannels = 2; wfx.nSamplesPerSec = 44100; @@ -1315,7 +1315,7 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; wfx.nAvgBytesPerSec = 0; rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); - ok(rc == E_INVALIDARG, "%s: SetFormat: %08x\n", testname, rc); + ok(rc == E_INVALIDARG, "%s: SetFormat: %08lx\n", testname, rc);
wfx.nChannels = 2; wfx.nSamplesPerSec = 44100; @@ -1323,7 +1323,7 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I wfx.nBlockAlign = (wfx.nChannels * wfx.wBitsPerSample / 8) - 1; wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); - ok(rc == E_INVALIDARG, "%s: SetFormat: %08x\n", testname, rc); + ok(rc == E_INVALIDARG, "%s: SetFormat: %08lx\n", testname, rc);
wfx.nChannels = 2; wfx.nSamplesPerSec = 44100; @@ -1331,7 +1331,7 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I wfx.nBlockAlign = (wfx.nChannels * wfx.wBitsPerSample / 8) + 1; wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); - ok(rc == E_INVALIDARG, "%s: SetFormat: %08x\n", testname, rc); + ok(rc == E_INVALIDARG, "%s: SetFormat: %08lx\n", testname, rc);
wfx.nChannels = 2; wfx.nSamplesPerSec = 44100; @@ -1339,16 +1339,16 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign + 1; rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); - ok(rc == S_OK, "%s: SetFormat: %08x\n", testname, rc); + ok(rc == S_OK, "%s: SetFormat: %08lx\n", testname, rc);
rc = IDirectSoundBuffer_GetFormat(got_buf, &wfx, sizeof(wfx), NULL); - ok(rc == S_OK, "%s: GetFormat: %08x\n", testname, rc); + ok(rc == S_OK, "%s: GetFormat: %08lx\n", testname, rc); ok(wfx.wFormatTag == WAVE_FORMAT_PCM, "%s: format: 0x%x\n", testname, wfx.wFormatTag); ok(wfx.nChannels == 2, "%s: channels: %u\n", testname, wfx.nChannels); - ok(wfx.nSamplesPerSec == 44100, "%s: rate: %u\n", testname, wfx.nSamplesPerSec); + ok(wfx.nSamplesPerSec == 44100, "%s: rate: %lu\n", testname, wfx.nSamplesPerSec); ok(wfx.wBitsPerSample == 16, "%s: bps: %u\n", testname, wfx.wBitsPerSample); ok(wfx.nBlockAlign == 4, "%s: blockalign: %u\n", testname, wfx.nBlockAlign); - ok(wfx.nAvgBytesPerSec == 44100 * 4 + 1, "%s: avgbytes: %u\n", testname, wfx.nAvgBytesPerSec); + ok(wfx.nAvgBytesPerSec == 44100 * 4 + 1, "%s: avgbytes: %lu\n", testname, wfx.nAvgBytesPerSec); IDirectSoundBuffer_Release(got_buf);
wfx.nChannels = 2; @@ -1357,16 +1357,16 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign - 1; rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); - ok(rc == S_OK, "%s: SetFormat: %08x\n", testname, rc); + ok(rc == S_OK, "%s: SetFormat: %08lx\n", testname, rc);
rc = IDirectSoundBuffer_GetFormat(got_buf, &wfx, sizeof(wfx), NULL); - ok(rc == S_OK, "%s: GetFormat: %08x\n", testname, rc); + ok(rc == S_OK, "%s: GetFormat: %08lx\n", testname, rc); ok(wfx.wFormatTag == WAVE_FORMAT_PCM, "%s: format: 0x%x\n", testname, wfx.wFormatTag); ok(wfx.nChannels == 2, "%s: channels: %u\n", testname, wfx.nChannels); - ok(wfx.nSamplesPerSec == 44100, "%s: rate: %u\n", testname, wfx.nSamplesPerSec); + ok(wfx.nSamplesPerSec == 44100, "%s: rate: %lu\n", testname, wfx.nSamplesPerSec); ok(wfx.wBitsPerSample == 16, "%s: bps: %u\n", testname, wfx.wBitsPerSample); ok(wfx.nBlockAlign == 4, "%s: blockalign: %u\n", testname, wfx.nBlockAlign); - ok(wfx.nAvgBytesPerSec == 44100 * 4 - 1, "%s: avgbytes: %u\n", testname, wfx.nAvgBytesPerSec); + ok(wfx.nAvgBytesPerSec == 44100 * 4 - 1, "%s: avgbytes: %lu\n", testname, wfx.nAvgBytesPerSec); IDirectSoundBuffer_Release(got_buf);
wfx.nChannels = 2; @@ -1375,16 +1375,16 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign + 1; rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); - ok(rc == S_OK, "%s: SetFormat: %08x\n", testname, rc); + ok(rc == S_OK, "%s: SetFormat: %08lx\n", testname, rc);
rc = IDirectSoundBuffer_GetFormat(got_buf, &wfx, sizeof(wfx), NULL); - ok(rc == S_OK, "%s: GetFormat: %08x\n", testname, rc); + ok(rc == S_OK, "%s: GetFormat: %08lx\n", testname, rc); ok(wfx.wFormatTag == WAVE_FORMAT_PCM, "%s: format: 0x%x\n", testname, wfx.wFormatTag); ok(wfx.nChannels == 2, "%s: channels: %u\n", testname, wfx.nChannels); - ok(wfx.nSamplesPerSec == 44100, "%s: rate: %u\n", testname, wfx.nSamplesPerSec); + ok(wfx.nSamplesPerSec == 44100, "%s: rate: %lu\n", testname, wfx.nSamplesPerSec); ok(wfx.wBitsPerSample == 16, "%s: bps: %u\n", testname, wfx.wBitsPerSample); ok(wfx.nBlockAlign == 4, "%s: blockalign: %u\n", testname, wfx.nBlockAlign); - ok(wfx.nAvgBytesPerSec == 44100 * 4 + 1, "%s: avgbytes: %u\n", testname, wfx.nAvgBytesPerSec); + ok(wfx.nAvgBytesPerSec == 44100 * 4 + 1, "%s: avgbytes: %lu\n", testname, wfx.nAvgBytesPerSec); IDirectSoundBuffer_Release(got_buf);
if(buf){ @@ -1395,17 +1395,17 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); - ok(rc == S_OK, "%s: SetFormat: %08x\n", testname, rc); + ok(rc == S_OK, "%s: SetFormat: %08lx\n", testname, rc);
if(got_buf){ rc = IDirectSoundBuffer_GetFormat(got_buf, &wfx, sizeof(wfx), NULL); - ok(rc == S_OK, "%s: GetFormat: %08x\n", testname, rc); + ok(rc == S_OK, "%s: GetFormat: %08lx\n", testname, rc); ok(wfx.wFormatTag == WAVE_FORMAT_ALAW, "%s: format: 0x%x\n", testname, wfx.wFormatTag); ok(wfx.nChannels == 2, "%s: channels: %u\n", testname, wfx.nChannels); - ok(wfx.nSamplesPerSec == 44100, "%s: rate: %u\n", testname, wfx.nSamplesPerSec); + ok(wfx.nSamplesPerSec == 44100, "%s: rate: %lu\n", testname, wfx.nSamplesPerSec); ok(wfx.wBitsPerSample == 16, "%s: bps: %u\n", testname, wfx.wBitsPerSample); ok(wfx.nBlockAlign == 4, "%s: blockalign: %u\n", testname, wfx.nBlockAlign); - ok(wfx.nAvgBytesPerSec == 44100 * 4, "%s: avgbytes: %u\n", testname, wfx.nAvgBytesPerSec); + ok(wfx.nAvgBytesPerSec == 44100 * 4, "%s: avgbytes: %lu\n", testname, wfx.nAvgBytesPerSec); IDirectSoundBuffer_Release(got_buf); } } @@ -1421,16 +1421,16 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I fmtex.dwChannelMask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; fmtex.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; rc = do_invalid_fmt_test(dso, buf, (WAVEFORMATEX*)&fmtex, &got_buf); - ok(rc == S_OK, "%s: SetFormat: %08x\n", testname, rc); + ok(rc == S_OK, "%s: SetFormat: %08lx\n", testname, rc);
rc = IDirectSoundBuffer_GetFormat(got_buf, (WAVEFORMATEX*)&fmtex, sizeof(fmtex), NULL); - ok(rc == S_OK, "%s: GetFormat: %08x\n", testname, rc); + ok(rc == S_OK, "%s: GetFormat: %08lx\n", testname, rc); ok(fmtex.Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE, "%s: format: 0x%x\n", testname, fmtex.Format.wFormatTag); ok(fmtex.Format.nChannels == 2, "%s: channels: %u\n", testname, fmtex.Format.nChannels); - ok(fmtex.Format.nSamplesPerSec == 44100, "%s: rate: %u\n", testname, fmtex.Format.nSamplesPerSec); + ok(fmtex.Format.nSamplesPerSec == 44100, "%s: rate: %lu\n", testname, fmtex.Format.nSamplesPerSec); ok(fmtex.Format.wBitsPerSample == 16, "%s: bps: %u\n", testname, fmtex.Format.wBitsPerSample); ok(fmtex.Format.nBlockAlign == 4, "%s: blockalign: %u\n", testname, fmtex.Format.nBlockAlign); - ok(fmtex.Format.nAvgBytesPerSec == 44100 * 4, "%s: avgbytes: %u\n", testname, fmtex.Format.nAvgBytesPerSec); + ok(fmtex.Format.nAvgBytesPerSec == 44100 * 4, "%s: avgbytes: %lu\n", testname, fmtex.Format.nAvgBytesPerSec); ok(fmtex.Samples.wValidBitsPerSample == 0 || /* <= XP */ fmtex.Samples.wValidBitsPerSample == 16, /* >= Vista */ "%s: validbits: %u\n", testname, fmtex.Samples.wValidBitsPerSample); @@ -1448,16 +1448,16 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I fmtex.dwChannelMask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; fmtex.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; rc = do_invalid_fmt_test(dso, buf, (WAVEFORMATEX*)&fmtex, &got_buf); - ok(rc == S_OK, "%s: SetFormat: %08x\n", testname, rc); + ok(rc == S_OK, "%s: SetFormat: %08lx\n", testname, rc);
rc = IDirectSoundBuffer_GetFormat(got_buf, (WAVEFORMATEX*)&fmtex, sizeof(fmtex), NULL); - ok(rc == S_OK, "%s: GetFormat: %08x\n", testname, rc); + ok(rc == S_OK, "%s: GetFormat: %08lx\n", testname, rc); ok(fmtex.Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE, "%s: format: 0x%x\n", testname, fmtex.Format.wFormatTag); ok(fmtex.Format.nChannels == 2, "%s: channels: %u\n", testname, fmtex.Format.nChannels); - ok(fmtex.Format.nSamplesPerSec == 44100, "%s: rate: %u\n", testname, fmtex.Format.nSamplesPerSec); + ok(fmtex.Format.nSamplesPerSec == 44100, "%s: rate: %lu\n", testname, fmtex.Format.nSamplesPerSec); ok(fmtex.Format.wBitsPerSample == 24, "%s: bps: %u\n", testname, fmtex.Format.wBitsPerSample); ok(fmtex.Format.nBlockAlign == 6, "%s: blockalign: %u\n", testname, fmtex.Format.nBlockAlign); - ok(fmtex.Format.nAvgBytesPerSec == 44100 * 6, "%s: avgbytes: %u\n", testname, fmtex.Format.nAvgBytesPerSec); + ok(fmtex.Format.nAvgBytesPerSec == 44100 * 6, "%s: avgbytes: %lu\n", testname, fmtex.Format.nAvgBytesPerSec); ok(fmtex.Samples.wValidBitsPerSample == 20, "%s: validbits: %u\n", testname, fmtex.Samples.wValidBitsPerSample); ok(IsEqualGUID(&fmtex.SubFormat, &KSDATAFORMAT_SUBTYPE_PCM), "%s: subtype incorrect\n", testname); IDirectSoundBuffer_Release(got_buf); @@ -1473,7 +1473,7 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I fmtex.dwChannelMask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; fmtex.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; rc = do_invalid_fmt_test(dso, buf, (WAVEFORMATEX*)&fmtex, &got_buf); - ok(rc == E_INVALIDARG, "%s: SetFormat: %08x\n", testname, rc); + ok(rc == E_INVALIDARG, "%s: SetFormat: %08lx\n", testname, rc); }
static HRESULT test_invalid_fmts(LPGUID lpGuid) @@ -1486,14 +1486,14 @@ static HRESULT test_invalid_fmts(LPGUID lpGuid) /* Create the DirectSound object */ rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, - "DirectSoundCreate() failed: %08x\n",rc); + "DirectSoundCreate() failed: %08lx\n",rc); if (rc!=DS_OK) return rc;
/* We must call SetCooperativeLevel before creating primary buffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08lx\n", rc); if (rc!=DS_OK){ IDirectSound_Release(dso); return rc; @@ -1504,7 +1504,7 @@ static HRESULT test_invalid_fmts(LPGUID lpGuid) bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&buffer,NULL); ok(rc==DS_OK && buffer!=NULL,"IDirectSound_CreateSoundBuffer() failed " - "to create a primary buffer %08x\n",rc); + "to create a primary buffer %08lx\n",rc); if (rc==DS_OK && buffer!=NULL) { perform_invalid_fmt_tests("primary", dso, buffer); IDirectSoundBuffer_Release(buffer); @@ -1532,12 +1532,12 @@ static void test_notifications(LPGUID lpGuid)
rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc == DS_OK || rc == DSERR_NODRIVER || rc == DSERR_ALLOCATED, - "DirectSoundCreate() failed: %08x\n", rc); + "DirectSoundCreate() failed: %08lx\n", rc); if(rc != DS_OK) return;
rc = IDirectSound_SetCooperativeLevel(dso, get_hwnd(), DSSCL_PRIORITY); - ok(rc == DS_OK, "IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc == DS_OK, "IDirectSound_SetCooperativeLevel() failed: %08lx\n", rc); if(rc != DS_OK){ IDirectSound_Release(dso); return; @@ -1558,10 +1558,10 @@ static void test_notifications(LPGUID lpGuid) bufdesc.lpwfxFormat = &wfx; rc = IDirectSound_CreateSoundBuffer(dso, &bufdesc, &buf, NULL); ok(rc == DS_OK && buf != NULL, "IDirectSound_CreateSoundBuffer() failed " - "to create a buffer %08x\n", rc); + "to create a buffer %08lx\n", rc);
rc = IDirectSoundBuffer_QueryInterface(buf, &IID_IDirectSoundNotify, (void**)&buf_notif); - ok(rc == E_NOINTERFACE, "QueryInterface(IID_IDirectSoundNotify): %08x\n", rc); + ok(rc == E_NOINTERFACE, "QueryInterface(IID_IDirectSoundNotify): %08lx\n", rc); IDirectSoundBuffer_Release(buf);
ZeroMemory(&bufdesc, sizeof(bufdesc)); @@ -1571,10 +1571,10 @@ static void test_notifications(LPGUID lpGuid) bufdesc.lpwfxFormat = &wfx; rc = IDirectSound_CreateSoundBuffer(dso, &bufdesc, &buf, NULL); ok(rc == DS_OK && buf != NULL, "IDirectSound_CreateSoundBuffer() failed " - "to create a buffer %08x\n", rc); + "to create a buffer %08lx\n", rc);
rc = IDirectSoundBuffer_QueryInterface(buf, &IID_IDirectSoundNotify, (void**)&buf_notif); - ok(rc == DS_OK, "QueryInterface(IID_IDirectSoundNotify): %08x\n", rc); + ok(rc == DS_OK, "QueryInterface(IID_IDirectSoundNotify): %08lx\n", rc);
notifies[0].dwOffset = 0; handles[0] = notifies[0].hEventNotify = CreateEventW(NULL, FALSE, FALSE, NULL); @@ -1582,12 +1582,12 @@ static void test_notifications(LPGUID lpGuid) handles[1] = notifies[1].hEventNotify = CreateEventW(NULL, FALSE, FALSE, NULL);
rc = IDirectSoundNotify_SetNotificationPositions(buf_notif, 2, notifies); - ok(rc == DS_OK, "SetNotificationPositions: %08x\n", rc); + ok(rc == DS_OK, "SetNotificationPositions: %08lx\n", rc);
IDirectSoundNotify_Release(buf_notif);
rc = IDirectSoundBuffer_Play(buf, 0, 0, DSBPLAY_LOOPING); - ok(rc == DS_OK, "Play: %08x\n", rc); + ok(rc == DS_OK, "Play: %08lx\n", rc);
expect = 0; for(cycles = 0; cycles < 6 /* 1.5s */; ++cycles){ @@ -1595,21 +1595,21 @@ static void test_notifications(LPGUID lpGuid)
wait = WaitForMultipleObjects(2, handles, FALSE, 1000); ok(wait <= WAIT_OBJECT_0 + 1 && wait - WAIT_OBJECT_0 == expect, - "Got unexpected notification order or timeout: %u\n", wait); + "Got unexpected notification order or timeout: %lu\n", wait);
rc = IDirectSoundBuffer_GetStatus(buf, &status); - ok(rc == DS_OK,"Failed %08x\n",rc); - ok(status == (DSBSTATUS_PLAYING | DSBSTATUS_LOOPING),"got %08x\n", status); + ok(rc == DS_OK,"Failed %08lx\n",rc); + ok(status == (DSBSTATUS_PLAYING | DSBSTATUS_LOOPING),"got %08lx\n", status);
expect = !expect; }
rc = IDirectSoundBuffer_Stop(buf); - ok(rc == DS_OK, "Stop: %08x\n", rc); + ok(rc == DS_OK, "Stop: %08lx\n", rc);
rc = IDirectSoundBuffer_GetStatus(buf, &status); - ok(rc == DS_OK,"Failed %08x\n",rc); - ok(status == 0,"got %08x\n", status); + ok(rc == DS_OK,"Failed %08lx\n",rc); + ok(status == 0,"got %08lx\n", status);
CloseHandle(notifies[0].hEventNotify); CloseHandle(notifies[1].hEventNotify); @@ -1658,7 +1658,7 @@ static void dsound_tests(void) { HRESULT rc; rc = DirectSoundEnumerateA(&dsenum_callback, NULL); - ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08x\n",rc); + ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08lx\n",rc); }
static void test_hw_buffers(void) @@ -1675,16 +1675,16 @@ static void test_hw_buffers(void)
hr = DirectSoundCreate(NULL, &ds, NULL); ok(hr == S_OK || hr == DSERR_NODRIVER || hr == DSERR_ALLOCATED || hr == E_FAIL, - "DirectSoundCreate failed: %08x\n", hr); + "DirectSoundCreate failed: %08lx\n", hr); if(hr != S_OK) return;
caps.dwSize = sizeof(caps);
hr = IDirectSound_GetCaps(ds, &caps); - ok(hr == S_OK, "GetCaps failed: %08x\n", hr); + ok(hr == S_OK, "GetCaps failed: %08lx\n", hr);
- ok(caps.dwPrimaryBuffers == 1, "Got wrong number of primary buffers: %u\n", + ok(caps.dwPrimaryBuffers == 1, "Got wrong number of primary buffers: %lu\n", caps.dwPrimaryBuffers);
/* DSBCAPS_LOC* is ignored for primary buffers */ @@ -1697,7 +1697,7 @@ static void test_hw_buffers(void) bufdesc.guid3DAlgorithm = GUID_NULL;
hr = IDirectSound_CreateSoundBuffer(ds, &bufdesc, &primary, NULL); - ok(hr == S_OK, "CreateSoundBuffer failed: %08x\n", hr); + ok(hr == S_OK, "CreateSoundBuffer failed: %08lx\n", hr); if(hr != S_OK){ IDirectSound_Release(ds); return; @@ -1707,7 +1707,7 @@ static void test_hw_buffers(void) DSBCAPS_PRIMARYBUFFER;
hr = IDirectSound_CreateSoundBuffer(ds, &bufdesc, &primary2, NULL); - ok(hr == S_OK, "CreateSoundBuffer failed: %08x\n", hr); + ok(hr == S_OK, "CreateSoundBuffer failed: %08lx\n", hr); ok(primary == primary2, "Got different primary buffers: %p, %p\n", primary, primary2); if(hr == S_OK) IDirectSoundBuffer_Release(primary2); @@ -1715,7 +1715,7 @@ static void test_hw_buffers(void) buf8 = (IDirectSoundBuffer8 *)0xDEADBEEF; hr = IDirectSoundBuffer_QueryInterface(primary, &IID_IDirectSoundBuffer8, (void**)&buf8); - ok(hr == E_NOINTERFACE, "QueryInterface gave wrong failure: %08x\n", hr); + ok(hr == E_NOINTERFACE, "QueryInterface gave wrong failure: %08lx\n", hr); ok(buf8 == NULL, "Pointer didn't get set to NULL\n");
fmt.wFormatTag = WAVE_FORMAT_PCM; @@ -1735,21 +1735,21 @@ static void test_hw_buffers(void) sizeof(IDirectSoundBuffer *) * caps.dwMaxHwMixingAllBuffers);
/* try to fill all of the hw buffers */ - trace("dwMaxHwMixingAllBuffers: %u\n", caps.dwMaxHwMixingAllBuffers); - trace("dwMaxHwMixingStaticBuffers: %u\n", caps.dwMaxHwMixingStaticBuffers); - trace("dwMaxHwMixingStreamingBuffers: %u\n", caps.dwMaxHwMixingStreamingBuffers); + trace("dwMaxHwMixingAllBuffers: %lu\n", caps.dwMaxHwMixingAllBuffers); + trace("dwMaxHwMixingStaticBuffers: %lu\n", caps.dwMaxHwMixingStaticBuffers); + trace("dwMaxHwMixingStreamingBuffers: %lu\n", caps.dwMaxHwMixingStreamingBuffers); for(i = 0; i < caps.dwMaxHwMixingAllBuffers; ++i){ hr = IDirectSound_CreateSoundBuffer(ds, &bufdesc, &secondaries[i], NULL); ok(hr == S_OK || hr == E_NOTIMPL || broken(hr == DSERR_CONTROLUNAVAIL) || broken(hr == E_FAIL), - "CreateSoundBuffer(%u) failed: %08x\n", i, hr); + "CreateSoundBuffer(%u) failed: %08lx\n", i, hr); if(hr != S_OK) break;
bufcaps.dwSize = sizeof(bufcaps); hr = IDirectSoundBuffer_GetCaps(secondaries[i], &bufcaps); - ok(hr == S_OK, "GetCaps failed: %08x\n", hr); + ok(hr == S_OK, "GetCaps failed: %08lx\n", hr); ok((bufcaps.dwFlags & DSBCAPS_LOCHARDWARE) != 0, - "Buffer wasn't allocated in hardware, dwFlags: %x\n", bufcaps.dwFlags); + "Buffer wasn't allocated in hardware, dwFlags: %lx\n", bufcaps.dwFlags); }
/* see if we can create one more */ @@ -1760,7 +1760,7 @@ static void test_hw_buffers(void) broken(hr == DSERR_CONTROLUNAVAIL) || /* vmware winxp, others? */ broken(hr == E_FAIL) || /* broken AC97 driver */ broken(hr == S_OK) /* broken driver allows more hw bufs than dscaps claims */, - "CreateSoundBuffer(%u) gave wrong error: %08x\n", i, hr); + "CreateSoundBuffer(%u) gave wrong error: %08lx\n", i, hr); if(hr == S_OK) IDirectSoundBuffer_Release(secondary);
diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index e3adbfbe70e..70db008a0df 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -70,18 +70,18 @@ static void IDirectSound8_test(LPDIRECTSOUND8 dso, BOOL initialized,
/* Try to Query for objects */ rc=IDirectSound8_QueryInterface(dso,&IID_IUnknown,(LPVOID*)&unknown); - ok(rc==DS_OK,"IDirectSound8_QueryInterface(IID_IUnknown) failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound8_QueryInterface(IID_IUnknown) failed: %08lx\n", rc); if (rc==DS_OK) IUnknown_Release(unknown);
rc=IDirectSound8_QueryInterface(dso,&IID_IDirectSound,(LPVOID*)&ds); - ok(rc==DS_OK,"IDirectSound8_QueryInterface(IID_IDirectSound) failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound8_QueryInterface(IID_IDirectSound) failed: %08lx\n", rc); if (rc==DS_OK) IDirectSound_Release(ds);
rc=IDirectSound8_QueryInterface(dso,&IID_IDirectSound8,(LPVOID*)&ds8); ok(rc==DS_OK,"IDirectSound8_QueryInterface(IID_IDirectSound8) " - "should have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "should have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc); if (rc==DS_OK) IDirectSound8_Release(ds8);
@@ -89,27 +89,27 @@ static void IDirectSound8_test(LPDIRECTSOUND8 dso, BOOL initialized, /* try uninitialized object */ rc=IDirectSound8_GetCaps(dso,0); ok(rc==DSERR_UNINITIALIZED,"IDirectSound8_GetCaps(NULL) " - "should have returned DSERR_UNINITIALIZED, returned: %08x\n", rc); + "should have returned DSERR_UNINITIALIZED, returned: %08lx\n", rc);
rc=IDirectSound8_GetCaps(dso,&dscaps); ok(rc==DSERR_UNINITIALIZED,"IDirectSound8_GetCaps() " - "should have returned DSERR_UNINITIALIZED, returned: %08x\n", rc); + "should have returned DSERR_UNINITIALIZED, returned: %08lx\n", rc);
rc=IDirectSound8_Compact(dso); ok(rc==DSERR_UNINITIALIZED,"IDirectSound8_Compact() " - "should have returned DSERR_UNINITIALIZED, returned: %08x\n", rc); + "should have returned DSERR_UNINITIALIZED, returned: %08lx\n", rc);
rc=IDirectSound8_GetSpeakerConfig(dso,&speaker_config); ok(rc==DSERR_UNINITIALIZED,"IDirectSound8_GetSpeakerConfig() " - "should have returned DSERR_UNINITIALIZED, returned: %08x\n", rc); + "should have returned DSERR_UNINITIALIZED, returned: %08lx\n", rc);
rc=IDirectSound8_VerifyCertification(dso, &certified); ok(rc==DSERR_UNINITIALIZED,"IDirectSound8_VerifyCertification() " - "should have returned DSERR_UNINITIALIZED, returned: %08x\n", rc); + "should have returned DSERR_UNINITIALIZED, returned: %08lx\n", rc);
rc=IDirectSound8_Initialize(dso,lpGuid); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, - "IDirectSound8_Initialize() failed: %08x\n",rc); + "IDirectSound8_Initialize() failed: %08lx\n",rc); if (rc==DSERR_NODRIVER) { trace(" No Driver\n"); goto EXIT; @@ -124,41 +124,41 @@ static void IDirectSound8_test(LPDIRECTSOUND8 dso, BOOL initialized,
rc=IDirectSound8_Initialize(dso,lpGuid); ok(rc==DSERR_ALREADYINITIALIZED, "IDirectSound8_Initialize() " - "should have returned DSERR_ALREADYINITIALIZED: %08x\n", rc); + "should have returned DSERR_ALREADYINITIALIZED: %08lx\n", rc);
/* DSOUND: Error: Invalid caps buffer */ rc=IDirectSound8_GetCaps(dso,0); ok(rc==DSERR_INVALIDPARAM,"IDirectSound8_GetCaps() " - "should have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "should have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc);
ZeroMemory(&dscaps, sizeof(dscaps));
/* DSOUND: Error: Invalid caps buffer */ rc=IDirectSound8_GetCaps(dso,&dscaps); ok(rc==DSERR_INVALIDPARAM,"IDirectSound8_GetCaps() " - "should have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "should have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc);
dscaps.dwSize=sizeof(dscaps);
/* DSOUND: Running on a certified driver */ rc=IDirectSound8_GetCaps(dso,&dscaps); - ok(rc==DS_OK,"IDirectSound8_GetCaps() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound8_GetCaps() failed: %08lx\n",rc);
rc=IDirectSound8_Compact(dso); - ok(rc==DSERR_PRIOLEVELNEEDED,"IDirectSound8_Compact() failed: %08x\n", rc); + ok(rc==DSERR_PRIOLEVELNEEDED,"IDirectSound8_Compact() failed: %08lx\n", rc);
rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08lx\n", rc);
rc=IDirectSound8_Compact(dso); - ok(rc==DS_OK,"IDirectSound8_Compact() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound8_Compact() failed: %08lx\n",rc);
rc=IDirectSound8_GetSpeakerConfig(dso,0); ok(rc==DSERR_INVALIDPARAM,"IDirectSound8_GetSpeakerConfig(NULL) " - "should have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "should have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc);
rc=IDirectSound8_GetSpeakerConfig(dso,&speaker_config); - ok(rc==DS_OK,"IDirectSound8_GetSpeakerConfig() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound8_GetSpeakerConfig() failed: %08lx\n", rc); ref_speaker_config = speaker_config;
speaker_config = DSSPEAKER_COMBINED(DSSPEAKER_STEREO, @@ -168,20 +168,20 @@ static void IDirectSound8_test(LPDIRECTSOUND8 dso, BOOL initialized, DSSPEAKER_GEOMETRY_NARROW); if(rc==DS_OK) { rc=IDirectSound8_SetSpeakerConfig(dso,speaker_config); - ok(rc==DS_OK,"IDirectSound8_SetSpeakerConfig() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound8_SetSpeakerConfig() failed: %08lx\n", rc); } if (rc==DS_OK) { rc=IDirectSound8_GetSpeakerConfig(dso,&new_speaker_config); - ok(rc==DS_OK,"IDirectSound8_GetSpeakerConfig() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound8_GetSpeakerConfig() failed: %08lx\n", rc); if (rc==DS_OK && speaker_config!=new_speaker_config && ref_speaker_config!=new_speaker_config) trace("IDirectSound8_GetSpeakerConfig() failed to set speaker " - "config: expected 0x%08x or 0x%08x, got 0x%08x\n", + "config: expected 0x%08lx or 0x%08lx, got 0x%08lx\n", speaker_config,ref_speaker_config,new_speaker_config); IDirectSound8_SetSpeakerConfig(dso,ref_speaker_config); }
rc=IDirectSound8_VerifyCertification(dso, &certified); - ok(rc==DS_OK||rc==E_NOTIMPL,"IDirectSound8_VerifyCertification() failed: %08x\n", rc); + ok(rc==DS_OK||rc==E_NOTIMPL,"IDirectSound8_VerifyCertification() failed: %08lx\n", rc);
EXIT: ref=IDirectSound8_Release(dso); @@ -199,17 +199,17 @@ static void IDirectSound8_tests(void) rc=CoGetClassObject(&CLSID_DirectSound8, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void**)&cf); ok(rc==S_OK,"CoGetClassObject(CLSID_DirectSound8, IID_IClassFactory) " - "failed: %08x\n", rc); + "failed: %08lx\n", rc);
rc=CoGetClassObject(&CLSID_DirectSound8, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&cf); ok(rc==S_OK,"CoGetClassObject(CLSID_DirectSound8, IID_IUnknown) " - "failed: %08x\n", rc); + "failed: %08lx\n", rc);
/* try the COM class factory method of creation with no device specified */ rc=CoCreateInstance(&CLSID_DirectSound8, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSound8, (void**)&dso); - ok(rc==S_OK||rc==REGDB_E_CLASSNOTREG,"CoCreateInstance() failed: %08x\n", rc); + ok(rc==S_OK||rc==REGDB_E_CLASSNOTREG,"CoCreateInstance() failed: %08lx\n", rc); if (rc==REGDB_E_CLASSNOTREG) { trace(" Class Not Registered\n"); return; @@ -221,7 +221,7 @@ static void IDirectSound8_tests(void) * device specified */ rc=CoCreateInstance(&CLSID_DirectSound8, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSound8, (void**)&dso); - ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSound8) failed: %08x\n", rc); + ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSound8) failed: %08lx\n", rc); if (dso) IDirectSound8_test(dso, FALSE, &DSDEVID_DefaultPlayback);
@@ -229,7 +229,7 @@ static void IDirectSound8_tests(void) * playback device specified */ rc=CoCreateInstance(&CLSID_DirectSound8, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSound8, (void**)&dso); - ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSound8) failed: %08x\n", rc); + ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSound8) failed: %08lx\n", rc); if (dso) IDirectSound8_test(dso, FALSE, &DSDEVID_DefaultVoicePlayback);
@@ -239,7 +239,7 @@ static void IDirectSound8_tests(void) &CLSID_DirectSoundPrivate, (void**)&dso); ok(rc==E_NOINTERFACE, "CoCreateInstance(CLSID_DirectSound8,CLSID_DirectSoundPrivate) " - "should have failed: %08x\n",rc); + "should have failed: %08lx\n",rc);
/* try the COM class factory method of creation with a bad * GUID and IID specified */ @@ -247,33 +247,33 @@ static void IDirectSound8_tests(void) &IID_IDirectSound8, (void**)&dso); ok(rc==REGDB_E_CLASSNOTREG, "CoCreateInstance(CLSID_DirectSoundPrivate,IID_IDirectSound8) " - "should have failed: %08x\n",rc); + "should have failed: %08lx\n",rc);
/* try with no device specified */ rc = DirectSoundCreate8(NULL, &dso, NULL); ok(rc==S_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, - "DirectSoundCreate8() failed: %08x\n",rc); + "DirectSoundCreate8() failed: %08lx\n",rc); if (rc==DS_OK && dso) IDirectSound8_test(dso, TRUE, NULL);
/* try with default playback device specified */ rc = DirectSoundCreate8(&DSDEVID_DefaultPlayback, &dso, NULL); ok(rc==S_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, - "DirectSoundCreate8() failed: %08x\n",rc); + "DirectSoundCreate8() failed: %08lx\n",rc); if (rc==DS_OK && dso) IDirectSound8_test(dso, TRUE, NULL);
/* try with default voice playback device specified */ rc = DirectSoundCreate8(&DSDEVID_DefaultVoicePlayback, &dso, NULL); ok(rc==S_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, - "DirectSoundCreate8() failed: %08x\n",rc); + "DirectSoundCreate8() failed: %08lx\n",rc); if (rc==DS_OK && dso) IDirectSound8_test(dso, TRUE, NULL);
/* try with a bad device specified */ rc = DirectSoundCreate8(&DSDEVID_DefaultVoiceCapture, &dso, NULL); ok(rc==DSERR_NODRIVER,"DirectSoundCreate8(DSDEVID_DefaultVoiceCapture) " - "should have failed: %08x\n",rc); + "should have failed: %08lx\n",rc); }
static HRESULT test_dsound8(LPGUID lpGuid) @@ -285,12 +285,12 @@ static HRESULT test_dsound8(LPGUID lpGuid) /* DSOUND: Error: Invalid interface buffer */ rc = DirectSoundCreate8(lpGuid, 0, NULL); ok(rc==DSERR_INVALIDPARAM,"DirectSoundCreate8() should have returned " - "DSERR_INVALIDPARAM, returned: %08x\n",rc); + "DSERR_INVALIDPARAM, returned: %08lx\n",rc);
/* Create the DirectSound8 object */ rc = DirectSoundCreate8(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, - "DirectSoundCreate8() failed: %08x\n",rc); + "DirectSoundCreate8() failed: %08lx\n",rc); if (rc!=DS_OK) return rc;
@@ -300,19 +300,19 @@ static HRESULT test_dsound8(LPGUID lpGuid) /* Try the COM class factory method of creation with enumerated device */ rc=CoCreateInstance(&CLSID_DirectSound8, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSound8, (void**)&dso); - ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSound) failed: %08x\n", rc); + ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSound) failed: %08lx\n", rc); if (dso) IDirectSound8_test(dso, FALSE, lpGuid);
/* Create a DirectSound8 object */ rc = DirectSoundCreate8(lpGuid, &dso, NULL); - ok(rc==DS_OK,"DirectSoundCreate8() failed: %08x\n",rc); + ok(rc==DS_OK,"DirectSoundCreate8() failed: %08lx\n",rc); if (rc==DS_OK) { LPDIRECTSOUND8 dso1=NULL;
/* Create a second DirectSound8 object */ rc = DirectSoundCreate8(lpGuid, &dso1, NULL); - ok(rc==DS_OK,"DirectSoundCreate8() failed: %08x\n",rc); + ok(rc==DS_OK,"DirectSoundCreate8() failed: %08lx\n",rc); if (rc==DS_OK) { /* Release the second DirectSound8 object */ ref=IDirectSound8_Release(dso1); @@ -333,7 +333,7 @@ static HRESULT test_dsound8(LPGUID lpGuid)
/* Create a DirectSound8 object */ rc = DirectSoundCreate8(lpGuid, &dso, NULL); - ok(rc==DS_OK,"DirectSoundCreate8() failed: %08x\n",rc); + ok(rc==DS_OK,"DirectSoundCreate8() failed: %08lx\n",rc); if (rc==DS_OK) { LPDIRECTSOUNDBUFFER secondary; DSBUFFERDESC bufdesc; @@ -349,7 +349,7 @@ static HRESULT test_dsound8(LPGUID lpGuid) rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DS_OK && secondary!=NULL, "IDirectSound8_CreateSoundBuffer() failed to create a secondary " - "buffer: %08x\n",rc); + "buffer: %08lx\n",rc); if (rc==DS_OK && secondary!=NULL) { LPDIRECTSOUND3DBUFFER buffer3d; LPDIRECTSOUNDBUFFER8 buffer8; @@ -357,7 +357,7 @@ static HRESULT test_dsound8(LPGUID lpGuid) &IID_IDirectSound3DBuffer, (void **)&buffer3d); ok(rc==DS_OK && buffer3d!=NULL, - "IDirectSound8_QueryInterface() failed: %08x\n", rc); + "IDirectSound8_QueryInterface() failed: %08lx\n", rc); if (rc==DS_OK && buffer3d!=NULL) { ref=IDirectSound3DBuffer_AddRef(buffer3d); ok(ref==2,"IDirectSound3DBuffer_AddRef() has %d references, " @@ -403,7 +403,7 @@ static HRESULT test_primary8(LPGUID lpGuid) /* Create the DirectSound object */ rc = DirectSoundCreate8(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, - "DirectSoundCreate8() failed: %08x\n",rc); + "DirectSoundCreate8() failed: %08lx\n",rc); if (rc!=DS_OK) return rc;
@@ -411,7 +411,7 @@ static HRESULT test_primary8(LPGUID lpGuid) ZeroMemory(&dscaps, sizeof(dscaps)); dscaps.dwSize=sizeof(dscaps); rc=IDirectSound8_GetCaps(dso,&dscaps); - ok(rc==DS_OK,"IDirectSound8_GetCaps() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound8_GetCaps() failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT;
@@ -419,13 +419,13 @@ static HRESULT test_primary8(LPGUID lpGuid) rc=IDirectSound8_CreateSoundBuffer(dso,0,0,NULL); ok(rc==DSERR_INVALIDPARAM, "IDirectSound8_CreateSoundBuffer should have returned " - "DSERR_INVALIDPARAM, returned: %08x\n",rc); + "DSERR_INVALIDPARAM, returned: %08lx\n",rc);
/* DSOUND: Error: Invalid buffer description pointer */ rc=IDirectSound8_CreateSoundBuffer(dso,0,&primary,NULL); ok(rc==DSERR_INVALIDPARAM && primary==0, "IDirectSound8_CreateSoundBuffer() should have returned " - "DSERR_INVALIDPARAM, returned: rc=%08x,dsbo=%p\n", + "DSERR_INVALIDPARAM, returned: rc=%08lx,dsbo=%p\n", rc,primary);
ZeroMemory(&bufdesc, sizeof(bufdesc)); @@ -434,7 +434,7 @@ static HRESULT test_primary8(LPGUID lpGuid) /* DSOUND: Error: Invalid dsound buffer interface pointer */ rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,0,NULL); ok(rc==DSERR_INVALIDPARAM && primary==0, - "IDirectSound8_CreateSoundBuffer() should have failed: rc=%08x," + "IDirectSound8_CreateSoundBuffer() should have failed: rc=%08lx," "dsbo=%p\n",rc,primary);
ZeroMemory(&bufdesc, sizeof(bufdesc)); @@ -443,13 +443,13 @@ static HRESULT test_primary8(LPGUID lpGuid) /* DSOUND: Error: Invalid buffer description */ rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DSERR_INVALIDPARAM && primary==0, - "IDirectSound8_CreateSoundBuffer() should have failed: rc=%08x," + "IDirectSound8_CreateSoundBuffer() should have failed: rc=%08lx," "primary=%p\n",rc,primary);
/* We must call SetCooperativeLevel before calling CreateSoundBuffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08lx\n", rc); if (rc!=DS_OK) goto EXIT;
@@ -462,7 +462,7 @@ static HRESULT test_primary8(LPGUID lpGuid) init_format(&wfx,WAVE_FORMAT_PCM,11025,8,2); rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DSERR_INVALIDPARAM,"IDirectSound8_CreateSoundBuffer() should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n", rc); if (rc==DS_OK && primary!=NULL) IDirectSoundBuffer_Release(primary);
@@ -473,7 +473,7 @@ static HRESULT test_primary8(LPGUID lpGuid) rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok((rc==DS_OK && primary!=NULL) || (rc==DSERR_CONTROLUNAVAIL), "IDirectSound8_CreateSoundBuffer() failed to create a primary buffer: " - "%08x\n",rc); + "%08lx\n",rc); if (rc==DSERR_CONTROLUNAVAIL) trace(" No Primary\n"); else if (rc==DS_OK && primary!=NULL) { @@ -485,7 +485,7 @@ static HRESULT test_primary8(LPGUID lpGuid) rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&second,NULL); ok(rc==DS_OK && second==primary, "IDirectSound8_CreateSoundBuffer() should have returned original " - "primary buffer: %08x\n",rc); + "primary buffer: %08lx\n",rc); ref=IDirectSoundBuffer_Release(second); ok(ref==1,"IDirectSoundBuffer_Release() primary has %d references, " "should have 1\n",ref); @@ -495,19 +495,19 @@ static HRESULT test_primary8(LPGUID lpGuid) rc=IDirectSound8_DuplicateSoundBuffer(dso,primary,&third); /* rc=0x88780032 */ ok(rc!=DS_OK,"IDirectSound8_DuplicateSoundBuffer() primary buffer " - "should have failed %08x\n",rc); + "should have failed %08lx\n",rc);
/* Primary buffers don't have an IDirectSoundBuffer8 */ rc = IDirectSoundBuffer_QueryInterface(primary, &IID_IDirectSoundBuffer8, (LPVOID*)&pb8); - ok(FAILED(rc), "Primary buffer does have an IDirectSoundBuffer8: %08x\n", rc); + ok(FAILED(rc), "Primary buffer does have an IDirectSoundBuffer8: %08lx\n", rc);
rc=IDirectSoundBuffer_GetVolume(primary,&vol); - ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume() failed: %08lx\n", rc);
if (winetest_interactive) { trace("Playing a 5 seconds reference tone at the current volume.\n"); if (rc==DS_OK) - trace("(the current volume is %d according to DirectSound)\n", + trace("(the current volume is %ld according to DirectSound)\n", vol); trace("All subsequent tones should be identical to this one.\n"); trace("Listen for stutter, changes in pitch, volume, etc.\n"); @@ -524,7 +524,7 @@ static HRESULT test_primary8(LPGUID lpGuid) /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); - ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08lx\n", rc);
EXIT: ref=IDirectSound8_Release(dso); @@ -553,7 +553,7 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) /* Create the DirectSound object */ rc = DirectSoundCreate8(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, - "DirectSoundCreate8() failed: %08x\n",rc); + "DirectSoundCreate8() failed: %08lx\n",rc); if (rc!=DS_OK) return rc;
@@ -561,14 +561,14 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) ZeroMemory(&dscaps, sizeof(dscaps)); dscaps.dwSize=sizeof(dscaps); rc=IDirectSound8_GetCaps(dso,&dscaps); - ok(rc==DS_OK,"IDirectSound8_GetCaps() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound8_GetCaps() failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT;
/* We must call SetCooperativeLevel before creating primary buffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08lx\n", rc); if (rc!=DS_OK) goto EXIT;
@@ -578,7 +578,7 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DS_OK && primary!=NULL, "IDirectSound8_CreateSoundBuffer() failed to create a primary buffer " - "%08x\n",rc); + "%08lx\n",rc);
if (rc==DS_OK && primary!=NULL) { for (f = 0; f < ARRAY_SIZE(formats); f++) { @@ -592,7 +592,7 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) /* DSOUND: Setting DirectSound cooperative level to * DSSCL_PRIORITY */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08lx\n", rc); if (rc!=DS_OK) goto EXIT;
@@ -602,7 +602,7 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) rc=IDirectSoundBuffer_SetFormat(primary,&wfx); ok(rc==DS_OK || rc==DSERR_INVALIDPARAM, /* 2003 */ - "IDirectSoundBuffer_SetFormat(%s) failed: %08x\n", + "IDirectSoundBuffer_SetFormat(%s) failed: %08lx\n", format_string(&wfx), rc);
/* There is no guarantee that SetFormat will actually change the @@ -610,17 +610,17 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) * supports. So we must re-query the format. */ rc=IDirectSoundBuffer_GetFormat(primary,&wfx,sizeof(wfx),NULL); - ok(rc==DS_OK,"IDirectSoundBuffer_GetFormat() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetFormat() failed: %08lx\n", rc); if (rc==DS_OK && (wfx.wFormatTag!=wfx2.wFormatTag || wfx.nSamplesPerSec!=wfx2.nSamplesPerSec || wfx.wBitsPerSample!=wfx2.wBitsPerSample || wfx.nChannels!=wfx2.nChannels)) { - trace("Requested primary format tag=0x%04x %dx%dx%d " - "avg.B/s=%d align=%d\n", + trace("Requested primary format tag=0x%04x %ldx%dx%d " + "avg.B/s=%ld align=%d\n", wfx2.wFormatTag,wfx2.nSamplesPerSec,wfx2.wBitsPerSample, wfx2.nChannels,wfx2.nAvgBytesPerSec,wfx2.nBlockAlign); - trace("Got tag=0x%04x %dx%dx%d avg.B/s=%d align=%d\n", + trace("Got tag=0x%04x %ldx%dx%d avg.B/s=%ld align=%d\n", wfx.wFormatTag,wfx.nSamplesPerSec,wfx.wBitsPerSample, wfx.nChannels,wfx.nAvgBytesPerSec,wfx.nBlockAlign); } @@ -628,7 +628,7 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); - ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08lx\n", rc);
init_format(&wfx2,WAVE_FORMAT_PCM,11025,16,2);
@@ -640,15 +640,15 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) wfx.nBlockAlign); bufdesc.lpwfxFormat=&wfx2; if (winetest_interactive) { - trace(" Testing a primary buffer at %dx%dx%d (fmt=%d) with a " - "secondary buffer at %dx%dx%d\n", + trace(" Testing a primary buffer at %ldx%dx%d (fmt=%d) with a " + "secondary buffer at %ldx%dx%d\n", wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels,format_tags[tag], wfx2.nSamplesPerSec,wfx2.wBitsPerSample,wfx2.nChannels); } rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DS_OK && secondary!=NULL, "IDirectSound_CreateSoundBuffer() failed to create a secondary " - "buffer %08x\n",rc); + "buffer %08lx\n",rc);
if (rc==DS_OK && secondary!=NULL) { test_buffer8(dso,&secondary,FALSE,FALSE,0,FALSE,0, @@ -669,7 +669,7 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); - ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08lx\n", rc);
EXIT: ref=IDirectSound8_Release(dso); @@ -694,7 +694,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) /* Create the DirectSound object */ rc = DirectSoundCreate8(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, - "DirectSoundCreate8() failed: %08x\n",rc); + "DirectSoundCreate8() failed: %08lx\n",rc); if (rc!=DS_OK) return rc;
@@ -702,14 +702,14 @@ static HRESULT test_secondary8(LPGUID lpGuid) ZeroMemory(&dscaps, sizeof(dscaps)); dscaps.dwSize=sizeof(dscaps); rc=IDirectSound8_GetCaps(dso,&dscaps); - ok(rc==DS_OK,"IDirectSound8_GetCaps() failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSound8_GetCaps() failed: %08lx\n",rc); if (rc!=DS_OK) goto EXIT;
/* We must call SetCooperativeLevel before creating primary buffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08lx\n", rc); if (rc!=DS_OK) goto EXIT;
@@ -719,11 +719,11 @@ static HRESULT test_secondary8(LPGUID lpGuid) rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); ok(rc==DS_OK && primary!=NULL, "IDirectSound8_CreateSoundBuffer() failed to create a primary buffer " - "%08x\n",rc); + "%08lx\n",rc);
if (rc==DS_OK && primary!=NULL) { rc=IDirectSoundBuffer_GetFormat(primary,&wfx1,sizeof(wfx1),NULL); - ok(rc==DS_OK,"IDirectSoundBuffer8_Getformat() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundBuffer8_Getformat() failed: %08lx\n", rc); if (rc!=DS_OK) goto EXIT1;
@@ -745,7 +745,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfx.nBlockAlign); rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DSERR_INVALIDPARAM,"IDirectSound8_CreateSoundBuffer() " - "should have returned DSERR_INVALIDPARAM, returned: %08x\n", rc); + "should have returned DSERR_INVALIDPARAM, returned: %08lx\n", rc); if (rc==DS_OK && secondary!=NULL) IDirectSoundBuffer_Release(secondary);
@@ -762,11 +762,11 @@ static HRESULT test_secondary8(LPGUID lpGuid) || rc == DS_OK, /* driver dependent? */ "IDirectSound_CreateSoundBuffer() " "should have returned (DSERR_CONTROLUNAVAIL or DSERR_INVALIDCALL) " - "and NULL, returned: %08x %p\n", rc, secondary); + "and NULL, returned: %08lx %p\n", rc, secondary); else ok(rc==DS_OK && secondary!=NULL, "IDirectSound_CreateSoundBuffer() failed to create a secondary " - "buffer %08x\n",rc); + "buffer %08lx\n",rc); if (secondary) IDirectSoundBuffer_Release(secondary); secondary = NULL; @@ -781,7 +781,7 @@ static HRESULT test_secondary8(LPGUID lpGuid)
rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DSERR_INVALIDPARAM && !secondary, - "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", + "IDirectSound_CreateSoundBuffer() returned: %08lx %p\n", rc, secondary); if (secondary) { @@ -794,7 +794,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL /* 2003 */ || rc==DSERR_INVALIDPARAM) && !secondary) || rc==DS_OK /* driver dependent? */, - "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", + "IDirectSound_CreateSoundBuffer() returned: %08lx %p\n", rc, secondary); if (secondary) { @@ -806,7 +806,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.SubFormat = GUID_NULL; rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok((rc==DSERR_INVALIDPARAM || rc==DSERR_INVALIDCALL) && !secondary, - "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", + "IDirectSound_CreateSoundBuffer() returned: %08lx %p\n", rc, secondary); if (secondary) { @@ -817,7 +817,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.Format.cbSize = sizeof(wfxe); rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL || rc==DSERR_INVALIDPARAM) && !secondary, - "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", + "IDirectSound_CreateSoundBuffer() returned: %08lx %p\n", rc, secondary); if (secondary) { @@ -828,7 +828,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.SubFormat = (format_tags[tag] == WAVE_FORMAT_PCM ? KSDATAFORMAT_SUBTYPE_PCM : KSDATAFORMAT_SUBTYPE_IEEE_FLOAT); rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DS_OK && secondary, - "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", + "IDirectSound_CreateSoundBuffer() returned: %08lx %p\n", rc, secondary); if (secondary) { @@ -840,7 +840,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL /* 2003 */ || rc==DSERR_INVALIDPARAM) && !secondary) || rc==DS_OK /* driver dependent? */, - "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", + "IDirectSound_CreateSoundBuffer() returned: %08lx %p\n", rc, secondary); if (secondary) { @@ -852,7 +852,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) ++wfxe.Samples.wValidBitsPerSample; rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DSERR_INVALIDPARAM && !secondary, - "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", + "IDirectSound_CreateSoundBuffer() returned: %08lx %p\n", rc, secondary); if (secondary) { @@ -864,7 +864,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.Samples.wValidBitsPerSample = 0; rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DS_OK && secondary, - "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", + "IDirectSound_CreateSoundBuffer() returned: %08lx %p\n", rc, secondary); if (secondary) { @@ -876,12 +876,12 @@ static HRESULT test_secondary8(LPGUID lpGuid) rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DS_OK && secondary!=NULL, "IDirectSound_CreateSoundBuffer() failed to create a secondary " - "buffer %08x\n",rc); + "buffer %08lx\n",rc);
if (rc==DS_OK && secondary!=NULL) { if (winetest_interactive) { - trace(" Testing a secondary buffer at %dx%dx%d (fmt=%d) " - "with a primary buffer at %dx%dx%d\n", + trace(" Testing a secondary buffer at %ldx%dx%d (fmt=%d) " + "with a primary buffer at %ldx%dx%d\n", wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels,format_tags[tag], wfx1.nSamplesPerSec,wfx1.wBitsPerSample,wfx1.nChannels); } @@ -903,7 +903,7 @@ EXIT1: /* Set the CooperativeLevel back to normal */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_NORMAL */ rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_NORMAL); - ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08lx\n", rc);
EXIT: ref=IDirectSound8_Release(dso); @@ -939,7 +939,7 @@ static void dsound8_tests(void) { HRESULT rc; rc = DirectSoundEnumerateA(dsenum_callback, NULL); - ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08x\n",rc); + ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08lx\n",rc); }
static void test_hw_buffers(void) @@ -956,16 +956,16 @@ static void test_hw_buffers(void)
hr = DirectSoundCreate8(NULL, &ds, NULL); ok(hr == S_OK || hr == DSERR_NODRIVER || hr == DSERR_ALLOCATED || hr == E_FAIL, - "DirectSoundCreate8 failed: %08x\n", hr); + "DirectSoundCreate8 failed: %08lx\n", hr); if(hr != S_OK) return;
caps.dwSize = sizeof(caps);
hr = IDirectSound8_GetCaps(ds, &caps); - ok(hr == S_OK, "GetCaps failed: %08x\n", hr); + ok(hr == S_OK, "GetCaps failed: %08lx\n", hr);
- ok(caps.dwPrimaryBuffers == 1, "Got wrong number of primary buffers: %u\n", + ok(caps.dwPrimaryBuffers == 1, "Got wrong number of primary buffers: %lu\n", caps.dwPrimaryBuffers);
/* DSBCAPS_LOC* is ignored for primary buffers */ @@ -978,7 +978,7 @@ static void test_hw_buffers(void) bufdesc.guid3DAlgorithm = GUID_NULL;
hr = IDirectSound8_CreateSoundBuffer(ds, &bufdesc, &primary, NULL); - ok(hr == S_OK, "CreateSoundBuffer failed: %08x\n", hr); + ok(hr == S_OK, "CreateSoundBuffer failed: %08lx\n", hr); if(hr != S_OK){ IDirectSound8_Release(ds); return; @@ -988,7 +988,7 @@ static void test_hw_buffers(void) DSBCAPS_PRIMARYBUFFER;
hr = IDirectSound8_CreateSoundBuffer(ds, &bufdesc, &primary2, NULL); - ok(hr == S_OK, "CreateSoundBuffer failed: %08x\n", hr); + ok(hr == S_OK, "CreateSoundBuffer failed: %08lx\n", hr); ok(primary == primary2, "Got different primary buffers: %p, %p\n", primary, primary2); if(hr == S_OK) IDirectSoundBuffer_Release(primary2); @@ -996,7 +996,7 @@ static void test_hw_buffers(void) buf8 = (IDirectSoundBuffer8 *)0xDEADBEEF; hr = IDirectSoundBuffer_QueryInterface(primary, &IID_IDirectSoundBuffer8, (void**)&buf8); - ok(hr == E_NOINTERFACE, "QueryInterface gave wrong failure: %08x\n", hr); + ok(hr == E_NOINTERFACE, "QueryInterface gave wrong failure: %08lx\n", hr); ok(buf8 == NULL, "Pointer didn't get set to NULL\n");
fmt.wFormatTag = WAVE_FORMAT_PCM; @@ -1016,21 +1016,21 @@ static void test_hw_buffers(void) sizeof(IDirectSoundBuffer *) * caps.dwMaxHwMixingAllBuffers);
/* try to fill all of the hw buffers */ - trace("dwMaxHwMixingAllBuffers: %u\n", caps.dwMaxHwMixingAllBuffers); - trace("dwMaxHwMixingStaticBuffers: %u\n", caps.dwMaxHwMixingStaticBuffers); - trace("dwMaxHwMixingStreamingBuffers: %u\n", caps.dwMaxHwMixingStreamingBuffers); + trace("dwMaxHwMixingAllBuffers: %lu\n", caps.dwMaxHwMixingAllBuffers); + trace("dwMaxHwMixingStaticBuffers: %lu\n", caps.dwMaxHwMixingStaticBuffers); + trace("dwMaxHwMixingStreamingBuffers: %lu\n", caps.dwMaxHwMixingStreamingBuffers); for(i = 0; i < caps.dwMaxHwMixingAllBuffers; ++i){ hr = IDirectSound8_CreateSoundBuffer(ds, &bufdesc, &secondaries[i], NULL); ok(hr == S_OK || hr == E_NOTIMPL || broken(hr == DSERR_CONTROLUNAVAIL) || broken(hr == E_FAIL), - "CreateSoundBuffer(%u) failed: %08x\n", i, hr); + "CreateSoundBuffer(%u) failed: %08lx\n", i, hr); if(hr != S_OK) break;
bufcaps.dwSize = sizeof(bufcaps); hr = IDirectSoundBuffer_GetCaps(secondaries[i], &bufcaps); - ok(hr == S_OK, "GetCaps failed: %08x\n", hr); + ok(hr == S_OK, "GetCaps failed: %08lx\n", hr); ok((bufcaps.dwFlags & DSBCAPS_LOCHARDWARE) != 0, - "Buffer wasn't allocated in hardware, dwFlags: %x\n", bufcaps.dwFlags); + "Buffer wasn't allocated in hardware, dwFlags: %lx\n", bufcaps.dwFlags); }
/* see if we can create one more */ @@ -1041,7 +1041,7 @@ static void test_hw_buffers(void) broken(hr == DSERR_CONTROLUNAVAIL) || /* vmware winxp, others? */ broken(hr == E_FAIL) || /* broken AC97 driver */ broken(hr == S_OK) /* broken driver allows more hw bufs than dscaps claims */, - "CreateSoundBuffer(%u) gave wrong error: %08x\n", i, hr); + "CreateSoundBuffer(%u) gave wrong error: %08lx\n", i, hr); if(hr == S_OK) IDirectSoundBuffer_Release(secondary);
@@ -1102,15 +1102,15 @@ static void test_first_device(void) win_skip("No default device found\n"); return; } - ok(hr == S_OK, "GetDefaultAudioEndpoint failed: %08x\n", hr); + ok(hr == S_OK, "GetDefaultAudioEndpoint failed: %08lx\n", hr);
hr = IMMDevice_OpenPropertyStore(defdev, STGM_READ, &ps); - ok(hr == S_OK, "OpenPropertyStore failed: %08x\n", hr); + ok(hr == S_OK, "OpenPropertyStore failed: %08lx\n", hr);
PropVariantInit(&pv);
hr = IPropertyStore_GetValue(ps, &PKEY_AudioEndpoint_GUID, &pv); - ok(hr == S_OK, "GetValue failed: %08x\n", hr); + ok(hr == S_OK, "GetValue failed: %08lx\n", hr);
CLSIDFromString(pv.pwszVal, &default_info.guid);
@@ -1120,7 +1120,7 @@ static void test_first_device(void) IMMDeviceEnumerator_Release(devenum);
hr = DirectSoundEnumerateA(default_device_cb, NULL); - ok(hr == S_OK, "DirectSoundEnumerateA failed: %08x\n", hr); + ok(hr == S_OK, "DirectSoundEnumerateA failed: %08lx\n", hr); }
static void test_COM(void) @@ -1135,39 +1135,39 @@ static void test_COM(void) hr = CoCreateInstance(&CLSID_DirectSound8, (IUnknown*)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&ds8); ok(hr == CLASS_E_NOAGGREGATION, - "DirectSound create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectSound create failed: %08lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!ds8, "ds8 = %p\n", ds8);
/* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectSound8, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSound3DBuffer, (void**)&ds8); ok(hr == E_NOINTERFACE, - "DirectSound create failed: %08x, expected E_NOINTERFACE\n", hr); + "DirectSound create failed: %08lx, expected E_NOINTERFACE\n", hr);
/* Same refcount for IDirectSound and IDirectSound8 */ hr = CoCreateInstance(&CLSID_DirectSound8, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSound8, (void**)&ds8); - ok(hr == S_OK, "DirectSound create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectSound create failed: %08lx, expected S_OK\n", hr); refcount = IDirectSound8_AddRef(ds8); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectSound8_QueryInterface(ds8, &IID_IDirectSound, (void**)&ds); - ok(hr == S_OK, "QueryInterface for IID_IDirectSound failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IDirectSound failed: %08lx\n", hr); refcount = IDirectSound8_AddRef(ds8); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); refcount = IDirectSound_AddRef(ds); - ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + ok(refcount == 5, "refcount == %lu, expected 5\n", refcount);
/* Separate refcount for IUnknown */ hr = IDirectSound_QueryInterface(ds, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08lx\n", hr); refcount = IUnknown_AddRef(unk); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectSound8_QueryInterface(ds8, &IID_IUnknown, (void**)&unk8); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08lx\n", hr); refcount = IUnknown_AddRef(unk8); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); refcount = IDirectSound_AddRef(ds); - ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + ok(refcount == 6, "refcount == %lu, expected 6\n", refcount);
while (IDirectSound_Release(ds)); while (IUnknown_Release(unk)); @@ -1184,13 +1184,13 @@ static void test_primary_flags(void)
/* Create a DirectSound8 object */ rc = DirectSoundCreate8(NULL, &dso, NULL); - ok(rc == DS_OK || rc==DSERR_NODRIVER, "Failed: %08x\n",rc); + ok(rc == DS_OK || rc==DSERR_NODRIVER, "Failed: %08lx\n",rc);
if (rc!=DS_OK) return;
rc = IDirectSound8_SetCooperativeLevel(dso, get_hwnd(), DSSCL_PRIORITY); - ok(rc == DS_OK,"Failed: %08x\n", rc); + ok(rc == DS_OK,"Failed: %08lx\n", rc); if (rc != DS_OK) { IDirectSound8_Release(dso); return; @@ -1198,23 +1198,23 @@ static void test_primary_flags(void)
dscaps.dwSize = sizeof(dscaps); rc = IDirectSound8_GetCaps(dso, &dscaps); - ok(rc == DS_OK,"Failed: %08x\n", rc); - trace("0x%x\n", dscaps.dwFlags); + ok(rc == DS_OK,"Failed: %08lx\n", rc); + trace("0x%lx\n", dscaps.dwFlags);
ZeroMemory(&bufdesc, sizeof(bufdesc)); bufdesc.dwSize = sizeof(bufdesc); bufdesc.dwFlags = DSBCAPS_PRIMARYBUFFER | DSBCAPS_CTRLFX; rc = IDirectSound8_CreateSoundBuffer(dso, &bufdesc, &primary, NULL); - ok(rc == E_INVALIDARG, "got %08x\n", rc); + ok(rc == E_INVALIDARG, "got %08lx\n", rc);
ZeroMemory(&bufdesc, sizeof(bufdesc)); bufdesc.dwSize = sizeof(bufdesc); bufdesc.dwFlags = DSBCAPS_PRIMARYBUFFER | DSBCAPS_CTRL3D; rc = IDirectSound8_CreateSoundBuffer(dso, &bufdesc, &primary, NULL); - ok((rc == DS_OK && primary != NULL), "Failed to create a primary buffer: %08x\n", rc); + ok((rc == DS_OK && primary != NULL), "Failed to create a primary buffer: %08lx\n", rc); if (rc == DS_OK) { rc = IDirectSoundBuffer_QueryInterface(primary, &IID_IDirectSoundFXI3DL2Reverb, (LPVOID*)&reverb); - ok(rc==E_NOINTERFACE,"Failed: %08x\n", rc); + ok(rc==E_NOINTERFACE,"Failed: %08lx\n", rc);
IDirectSoundBuffer_Release(primary); } @@ -1292,8 +1292,8 @@ static HRESULT WINAPI dmo_SetInputType(IMediaObject *iface, DWORD index, const D
if (winetest_debug > 1) trace("SetInputType()\n");
- ok(!index, "Got unexpected index %u.\n", index); - ok(!flags, "Got unexpected flags %#x.\n", flags); + ok(!index, "Got unexpected index %lu.\n", index); + ok(!flags, "Got unexpected flags %#lx.\n", flags);
ok(IsEqualGUID(&type->majortype, &MEDIATYPE_Audio), "Got major type %s.\n", debugstr_guid(&type->majortype)); todo_wine ok(IsEqualGUID(&type->subtype, &MEDIASUBTYPE_PCM), "Got subtype %s.\n", debugstr_guid(&type->subtype)); @@ -1301,10 +1301,10 @@ static HRESULT WINAPI dmo_SetInputType(IMediaObject *iface, DWORD index, const D ok(!type->bTemporalCompression, "Got temporal compression %d.\n", type->bTemporalCompression); ok(IsEqualGUID(&type->formattype, &FORMAT_WaveFormatEx), "Got format type %s.\n", debugstr_guid(&type->formattype)); ok(!type->pUnk, "Got pUnk %p.\n", type->pUnk); - ok(type->cbFormat == sizeof(WAVEFORMATEX), "Got format size %u.\n", type->cbFormat); + ok(type->cbFormat == sizeof(WAVEFORMATEX), "Got format size %lu.\n", type->cbFormat);
wfx = (WAVEFORMATEX *)type->pbFormat; - todo_wine ok(type->lSampleSize == wfx->nBlockAlign, "Got sample size %u.\n", type->lSampleSize); + todo_wine ok(type->lSampleSize == wfx->nBlockAlign, "Got sample size %lu.\n", type->lSampleSize);
if (wfx->wBitsPerSample != 8) return DMO_E_TYPE_NOT_ACCEPTED; @@ -1318,8 +1318,8 @@ static HRESULT WINAPI dmo_SetOutputType(IMediaObject *iface, DWORD index, const { if (winetest_debug > 1) trace("SetOutputType()\n");
- ok(!index, "Got unexpected index %u.\n", index); - ok(!flags, "Got unexpected flags %#x.\n", flags); + ok(!index, "Got unexpected index %lu.\n", index); + ok(!flags, "Got unexpected flags %#lx.\n", flags);
ok(testdmo_input_type_set, "Expected the input type to be set.\n");
@@ -1327,10 +1327,10 @@ static HRESULT WINAPI dmo_SetOutputType(IMediaObject *iface, DWORD index, const ok(IsEqualGUID(&type->subtype, &MEDIASUBTYPE_PCM), "Got subtype %s.\n", debugstr_guid(&type->subtype)); ok(type->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", type->bFixedSizeSamples); ok(!type->bTemporalCompression, "Got temporal compression %d.\n", type->bTemporalCompression); - ok(type->lSampleSize == 1, "Got sample size %u.\n", type->lSampleSize); + ok(type->lSampleSize == 1, "Got sample size %lu.\n", type->lSampleSize); ok(IsEqualGUID(&type->formattype, &FORMAT_WaveFormatEx), "Got format type %s.\n", debugstr_guid(&type->formattype)); ok(!type->pUnk, "Got pUnk %p.\n", type->pUnk); - ok(type->cbFormat == sizeof(WAVEFORMATEX), "Got format size %u.\n", type->cbFormat); + ok(type->cbFormat == sizeof(WAVEFORMATEX), "Got format size %lu.\n", type->cbFormat);
ok(!memcmp(type->pbFormat, &testdmo_input_type, sizeof(WAVEFORMATEX)), "Format blocks didn't match.\n");
@@ -1472,10 +1472,10 @@ static ULONG WINAPI dmo_inplace_Release(IMediaObjectInPlace *iface) static HRESULT WINAPI dmo_inplace_Process(IMediaObjectInPlace *iface, ULONG size, BYTE *data, REFERENCE_TIME start, DWORD flags) { - if (winetest_debug > 1) trace("Process(size %u)\n", size); + if (winetest_debug > 1) trace("Process(size %lu)\n", size);
ok(!start, "Got start time %s.\n", wine_dbgstr_longlong(start)); - ok(!flags, "Got flags %#x.\n", flags); + ok(!flags, "Got flags %#lx.\n", flags);
SetEvent(got_Process);
@@ -1574,12 +1574,12 @@ static void test_effects(void) ULONG ref;
hr = DirectSoundCreate8(NULL, &dsound, NULL); - ok(hr == DS_OK || hr == DSERR_NODRIVER, "Got hr %#x.\n", hr); + ok(hr == DS_OK || hr == DSERR_NODRIVER, "Got hr %#lx.\n", hr); if (FAILED(hr)) return;
hr = IDirectSound8_SetCooperativeLevel(dsound, get_hwnd(), DSSCL_PRIORITY); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr);
effects[0].dwSize = effects[1].dwSize = sizeof(effects[0]); effects[0].guidDSFXClass = GUID_DSFX_STANDARD_PARAMEQ; @@ -1588,161 +1588,161 @@ static void test_effects(void) buffer_desc.dwBufferBytes = align(wfx.nAvgBytesPerSec * BUFFER_LEN / 1000, wfx.nBlockAlign); buffer_desc.lpwfxFormat = &wfx; hr = IDirectSound8_CreateSoundBuffer(dsound, &buffer_desc, &buffer, NULL); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); hr = IDirectSoundBuffer_QueryInterface(buffer, &IID_IDirectSoundBuffer8, (void **)&buffer8); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); hr = IDirectSoundBuffer8_SetFX(buffer8, 1, effects, results); - ok(hr == DSERR_CONTROLUNAVAIL, "Got hr %#x.\n", hr); + ok(hr == DSERR_CONTROLUNAVAIL, "Got hr %#lx.\n", hr);
IDirectSoundBuffer8_Release(buffer8); IDirectSoundBuffer_Release(buffer);
buffer_desc.dwFlags = DSBCAPS_CTRLFX | DSBCAPS_CTRLPOSITIONNOTIFY; hr = IDirectSound8_CreateSoundBuffer(dsound, &buffer_desc, &buffer, NULL); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); hr = IDirectSoundBuffer_QueryInterface(buffer, &IID_IDirectSoundBuffer8, (void **)&buffer8); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); hr = IDirectSoundBuffer8_QueryInterface(buffer, &IID_IDirectSoundNotify, (void **)¬ify); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr);
hr = IDirectSoundNotify_SetNotificationPositions(notify, 1, ¬ify_params); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr);
hr = IDirectSoundBuffer8_SetFX(buffer8, 1, NULL, NULL); - ok(hr == DSERR_INVALIDPARAM, "Got hr %#x.\n", hr); + ok(hr == DSERR_INVALIDPARAM, "Got hr %#lx.\n", hr); hr = IDirectSoundBuffer8_SetFX(buffer8, 0, effects, NULL); - ok(hr == DSERR_INVALIDPARAM, "Got hr %#x.\n", hr); + ok(hr == DSERR_INVALIDPARAM, "Got hr %#lx.\n", hr); hr = IDirectSoundBuffer8_SetFX(buffer8, 0, NULL, results); - ok(hr == DSERR_INVALIDPARAM, "Got hr %#x.\n", hr); + ok(hr == DSERR_INVALIDPARAM, "Got hr %#lx.\n", hr);
results[0] = 0xdeadbeef; hr = IDirectSoundBuffer8_SetFX(buffer8, 1, effects, results); - ok(hr == DS_OK, "Got hr %#x.\n", hr); - ok(results[0] == DSFXR_LOCSOFTWARE, "Got result %#x.\n", results[0]); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); + ok(results[0] == DSFXR_LOCSOFTWARE, "Got result %#lx.\n", results[0]);
hr = IDirectSoundBuffer8_Lock(buffer8, 0, 0, &ptr1, &size1, &ptr2, &size2, DSBLOCK_ENTIREBUFFER); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); results[0] = 0xdeadbeef; hr = IDirectSoundBuffer8_SetFX(buffer8, 1, effects, results); - ok(hr == DSERR_INVALIDCALL, "Got hr %#x.\n", hr); - todo_wine ok(results[0] == 0xdeadbeef, "Got result %#x.\n", results[0]); + ok(hr == DSERR_INVALIDCALL, "Got hr %#lx.\n", hr); + todo_wine ok(results[0] == 0xdeadbeef, "Got result %#lx.\n", results[0]); hr = IDirectSoundBuffer8_Unlock(buffer8, ptr1, size1, ptr2, size2); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr);
hr = IDirectSoundBuffer8_Play(buffer8, 0, 0, DSBPLAY_LOOPING); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); results[0] = 0xdeadbeef; hr = IDirectSoundBuffer8_SetFX(buffer8, 1, effects, results); - ok(hr == DSERR_INVALIDCALL, "Got hr %#x.\n", hr); - todo_wine ok(results[0] == 0xdeadbeef, "Got result %#x.\n", results[0]); + ok(hr == DSERR_INVALIDCALL, "Got hr %#lx.\n", hr); + todo_wine ok(results[0] == 0xdeadbeef, "Got result %#lx.\n", results[0]); hr = IDirectSoundBuffer8_Stop(buffer8); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); ok(!WaitForSingleObject(notify_params.hEventNotify, 1000), "Wait timed out.\n");
effects[0].guidDSFXClass = GUID_NULL; results[0] = 0xdeadbeef; hr = IDirectSoundBuffer8_SetFX(buffer8, 1, effects, results); - ok(hr == REGDB_E_CLASSNOTREG, "Got hr %#x.\n", hr); - ok(results[0] == DSFXR_UNKNOWN, "Got result %#x.\n", results[0]); + ok(hr == REGDB_E_CLASSNOTREG, "Got hr %#lx.\n", hr); + ok(results[0] == DSFXR_UNKNOWN, "Got result %#lx.\n", results[0]);
effects[0].guidDSFXClass = GUID_DSFX_STANDARD_PARAMEQ; results[0] = 0xdeadbeef; hr = IDirectSoundBuffer8_SetFX(buffer8, 1, effects, results); - ok(hr == DS_OK, "Got hr %#x.\n", hr); - ok(results[0] == DSFXR_LOCSOFTWARE, "Got result %#x.\n", results[0]); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); + ok(results[0] == DSFXR_LOCSOFTWARE, "Got result %#lx.\n", results[0]);
hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &IID_IMediaObject, NULL); - ok(hr == DSERR_INVALIDPARAM, "Got hr %#x.\n", hr); + ok(hr == DSERR_INVALIDPARAM, "Got hr %#lx.\n", hr);
dmo = (IMediaObject *)0xdeadbeef; hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &GUID_NULL, (void **)&dmo); - ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got hr %#lx.\n", hr); ok(!dmo, "Got object %p.\n", dmo);
dmo = (IMediaObject *)0xdeadbeef; hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_NULL, 0, &IID_IMediaObject, (void **)&dmo); - ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#x.\n", hr); + ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#lx.\n", hr); ok(dmo == (IMediaObject *)0xdeadbeef, "Got object %p.\n", dmo);
dmo = NULL; hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &IID_IMediaObject, (void **)&dmo); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); ok(!!dmo, "Expected a non-NULL object.\n"); IMediaObject_Release(dmo);
dmo = NULL; hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_DSFX_STANDARD_PARAMEQ, 0, &IID_IMediaObject, (void **)&dmo); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); ok(!!dmo, "Expected a non-NULL object.\n"); IMediaObject_Release(dmo);
dmo = (IMediaObject *)0xdeadbeef; hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 1, &IID_IMediaObject, (void **)&dmo); - ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#x.\n", hr); + ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#lx.\n", hr); ok(dmo == (IMediaObject *)0xdeadbeef, "Got object %p.\n", dmo);
effects[0].guidDSFXClass = GUID_DSFX_STANDARD_PARAMEQ; effects[1].guidDSFXClass = GUID_NULL; results[0] = results[1] = 0xdeadbeef; hr = IDirectSoundBuffer8_SetFX(buffer8, 2, effects, results); - ok(hr == REGDB_E_CLASSNOTREG, "Got hr %#x.\n", hr); - ok(results[0] == DSFXR_PRESENT, "Got result %#x.\n", results[0]); - ok(results[1] == DSFXR_UNKNOWN, "Got result %#x.\n", results[1]); + ok(hr == REGDB_E_CLASSNOTREG, "Got hr %#lx.\n", hr); + ok(results[0] == DSFXR_PRESENT, "Got result %#lx.\n", results[0]); + ok(results[1] == DSFXR_UNKNOWN, "Got result %#lx.\n", results[1]);
hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &IID_IMediaObject, (void **)&dmo); - todo_wine ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#x.\n", hr); + todo_wine ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#lx.\n", hr);
effects[0].guidDSFXClass = GUID_DSFX_STANDARD_PARAMEQ; effects[1].guidDSFXClass = GUID_DSFX_STANDARD_I3DL2REVERB; results[0] = results[1] = 0xdeadbeef; hr = IDirectSoundBuffer8_SetFX(buffer8, 2, effects, results); - ok(hr == DS_OK, "Got hr %#x.\n", hr); - ok(results[0] == DSFXR_LOCSOFTWARE, "Got result %#x.\n", results[0]); - ok(results[1] == DSFXR_LOCSOFTWARE, "Got result %#x.\n", results[1]); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); + ok(results[0] == DSFXR_LOCSOFTWARE, "Got result %#lx.\n", results[0]); + ok(results[1] == DSFXR_LOCSOFTWARE, "Got result %#lx.\n", results[1]);
hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_DSFX_STANDARD_PARAMEQ, 0, &IID_IMediaObject, (void **)&dmo); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); echo = dmo; hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_DSFX_STANDARD_I3DL2REVERB, 0, &IID_IMediaObject, (void **)&dmo); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); reverb = dmo;
hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &IID_IMediaObject, (void **)&dmo); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); ok(dmo == echo, "Expected %p, got %p.\n", echo, dmo); IMediaObject_Release(dmo);
hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 1, &IID_IMediaObject, (void **)&dmo); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); ok(dmo == reverb, "Expected %p, got %p.\n", reverb, dmo); IMediaObject_Release(dmo);
hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_DSFX_STANDARD_I3DL2REVERB, 1, &IID_IMediaObject, (void **)&dmo); - ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#x.\n", hr); + ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#lx.\n", hr);
hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &IID_IDirectSoundFXParamEq, (void **)&unk); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); IUnknown_Release(unk);
hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &IID_IDirectSoundFXParamEq, (void **)&unk); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); IUnknown_Release(unk);
hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &IID_IDirectSoundFXI3DL2Reverb, (void **)&unk); - ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got hr %#lx.\n", hr);
hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 1, &IID_IDirectSoundFXI3DL2Reverb, (void **)&unk); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); IUnknown_Release(unk);
hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_DSFX_STANDARD_I3DL2REVERB, 0, &IID_IDirectSoundFXI3DL2Reverb, (void **)&unk); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); IUnknown_Release(unk);
IMediaObject_Release(echo); @@ -1753,60 +1753,60 @@ static void test_effects(void) effects[0].guidDSFXClass = testdmo_clsid; results[0] = 0xdeadbeef; hr = IDirectSoundBuffer8_SetFX(buffer8, 1, effects, results); - todo_wine ok(hr == DS_OK, "Got hr %#x.\n", hr); - todo_wine ok(results[0] == DSFXR_LOCSOFTWARE, "Got result %#x.\n", results[0]); + todo_wine ok(hr == DS_OK, "Got hr %#lx.\n", hr); + todo_wine ok(results[0] == DSFXR_LOCSOFTWARE, "Got result %#lx.\n", results[0]); todo_wine ok(!memcmp(&testdmo_input_type, &wfx, sizeof(WAVEFORMATEX)), "Format blocks didn't match.\n");
ResetEvent(notify_params.hEventNotify); hr = IDirectSoundBuffer8_Play(buffer8, 0, 0, 0); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); todo_wine ok(got_Discontinuity == 1, "Got %u calls to IMediaObject::Discontinuity().\n", got_Discontinuity);
todo_wine ok(!WaitForSingleObject(got_Process, 100), "Wait timed out.\n");
hr = IDirectSoundBuffer8_Stop(buffer8); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); todo_wine ok(got_Discontinuity == 1, "Got %u calls to IMediaObject::Discontinuity().\n", got_Discontinuity); ok(!WaitForSingleObject(notify_params.hEventNotify, 1000), "Wait timed out.\n");
ResetEvent(notify_params.hEventNotify); hr = IDirectSoundBuffer8_Play(buffer8, 0, 0, 0); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); todo_wine ok(got_Discontinuity == 2, "Got %u calls to IMediaObject::Discontinuity().\n", got_Discontinuity);
hr = IDirectSoundBuffer8_Stop(buffer8); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); ok(!WaitForSingleObject(notify_params.hEventNotify, 1000), "Wait timed out.\n");
hr = IDirectSoundBuffer8_SetFX(buffer8, 0, NULL, NULL); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr);
hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &IID_IMediaObject, (void **)&dmo); - ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#x.\n", hr); + ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#lx.\n", hr);
CloseHandle(got_Process); IDirectSoundBuffer8_Release(buffer8); ref = IDirectSoundBuffer_Release(buffer); - ok(!ref, "Got outstanding refcount %u.\n", ref); + ok(!ref, "Got outstanding refcount %lu.\n", ref);
init_format(&wfx, WAVE_FORMAT_PCM, 11025, 16, 1); hr = IDirectSound8_CreateSoundBuffer(dsound, &buffer_desc, &buffer, NULL); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr); hr = IDirectSoundBuffer_QueryInterface(buffer, &IID_IDirectSoundBuffer8, (void **)&buffer8); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr);
results[0] = 0xdeadbeef; hr = IDirectSoundBuffer8_SetFX(buffer8, 1, effects, results); - ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); - todo_wine ok(results[0] == DSFXR_UNKNOWN, "Got result %#x.\n", results[0]); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#lx.\n", hr); + todo_wine ok(results[0] == DSFXR_UNKNOWN, "Got result %#lx.\n", results[0]);
IDirectSoundNotify_Release(notify); IDirectSoundBuffer8_Release(buffer8); ref = IDirectSoundBuffer_Release(buffer); - ok(!ref, "Got outstanding refcount %u.\n", ref); + ok(!ref, "Got outstanding refcount %lu.\n", ref);
ref = IDirectSound8_Release(dsound); - ok(!ref, "Got outstanding refcount %u.\n", ref); + ok(!ref, "Got outstanding refcount %lu.\n", ref); }
static void test_AcquireResources(void) @@ -1818,12 +1818,12 @@ static void test_AcquireResources(void) HRESULT hr;
hr = DirectSoundCreate8(NULL, &dsound, NULL); - ok(hr == DS_OK || hr == DSERR_NODRIVER, "Got hr %#x.\n", hr); + ok(hr == DS_OK || hr == DSERR_NODRIVER, "Got hr %#lx.\n", hr); if (FAILED(hr)) return;
hr = IDirectSound8_SetCooperativeLevel(dsound, get_hwnd(), DSSCL_PRIORITY); - ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(hr == DS_OK, "Got hr %#lx.\n", hr);
bufdesc.dwSize = sizeof(bufdesc); bufdesc.dwFlags = DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_PRIMARYBUFFER; @@ -1833,7 +1833,7 @@ static void test_AcquireResources(void) bufdesc.guid3DAlgorithm = GUID_NULL;
hr = IDirectSound8_CreateSoundBuffer(dsound, &bufdesc, &primary, NULL); - ok(hr == S_OK, "CreateSoundBuffer failed: %08x\n", hr); + ok(hr == S_OK, "CreateSoundBuffer failed: %08lx\n", hr); if(hr != S_OK) { IDirectSound_Release(dsound); return; @@ -1853,26 +1853,26 @@ static void test_AcquireResources(void)
/* see if we can create one more */ hr = IDirectSound8_CreateSoundBuffer(dsound, &bufdesc, &secondary, NULL); - ok(hr == S_OK, "CreateSoundBuffer gave wrong error: %08x\n", hr); + ok(hr == S_OK, "CreateSoundBuffer gave wrong error: %08lx\n", hr); if(hr == S_OK) { DWORD status; IDirectSoundBuffer8 *buffer8;
hr = IDirectSoundBuffer_QueryInterface(secondary, &IID_IDirectSoundBuffer8, (void **)&buffer8); - ok(hr == S_OK, "got: %08x\n", hr); + ok(hr == S_OK, "got: %08lx\n", hr);
status = 0xFFFF; hr = IDirectSoundBuffer8_GetStatus(buffer8, &status); - ok(hr == S_OK, "got: %08x\n", hr); - todo_wine ok(status == 0, "got: %08x\n", status); + ok(hr == S_OK, "got: %08lx\n", hr); + todo_wine ok(status == 0, "got: %08lx\n", status);
hr = IDirectSoundBuffer8_AcquireResources(buffer8, 0, 0, NULL); - ok(hr == S_OK, "got: %08x\n", hr); + ok(hr == S_OK, "got: %08lx\n", hr);
status = 0xFFFF; hr = IDirectSoundBuffer8_GetStatus(buffer8, &status); - ok(hr == S_OK, "got: %08x\n", hr); - ok(status == DSBSTATUS_LOCSOFTWARE, "got: %08x\n", status); + ok(hr == S_OK, "got: %08lx\n", hr); + ok(status == DSBSTATUS_LOCSOFTWARE, "got: %08lx\n", status);
IDirectSoundBuffer8_Release(buffer8); IDirectSoundBuffer_Release(secondary); @@ -1899,7 +1899,7 @@ START_TEST(dsound8)
hr = CoRegisterClassObject(&testdmo_clsid, (IUnknown *)&testdmo_cf, CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &cookie); - ok(hr == S_OK, "Failed to register class, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to register class, hr %#lx.\n", hr);
test_effects();
diff --git a/dlls/dsound/tests/duplex.c b/dlls/dsound/tests/duplex.c index 59507c566c1..3ea1aabe20a 100644 --- a/dlls/dsound/tests/duplex.c +++ b/dlls/dsound/tests/duplex.c @@ -43,7 +43,7 @@ static void IDirectSoundFullDuplex_test(LPDIRECTSOUNDFULLDUPLEX dsfdo,
/* Try to Query for objects */ rc=IDirectSoundFullDuplex_QueryInterface(dsfdo,&IID_IUnknown,(LPVOID*)&unknown); - ok(rc==DS_OK,"IDirectSoundFullDuplex_QueryInterface(IID_IUnknown) failed: %08x\n", rc); + ok(rc==DS_OK,"IDirectSoundFullDuplex_QueryInterface(IID_IUnknown) failed: %08lx\n", rc); if (rc==DS_OK) { ref = IUnknown_Release(unknown); ok(ref==0, "IDirectSoundFullDuplex_Release() has %d references, " @@ -51,7 +51,7 @@ static void IDirectSoundFullDuplex_test(LPDIRECTSOUNDFULLDUPLEX dsfdo, }
rc=IDirectSoundFullDuplex_QueryInterface(dsfdo,&IID_IDirectSound,(LPVOID*)&ds); - ok(rc==(initialized?DS_OK:E_NOINTERFACE),"IDirectSoundFullDuplex_QueryInterface(IID_IDirectSound) failed: %08x\n", rc); + ok(rc==(initialized?DS_OK:E_NOINTERFACE),"IDirectSoundFullDuplex_QueryInterface(IID_IDirectSound) failed: %08lx\n", rc); if (rc==DS_OK) { ref=IDirectSound_Release(ds); ok(ref==0, "IDirectSound_Release() has %d references, " @@ -60,12 +60,12 @@ static void IDirectSoundFullDuplex_test(LPDIRECTSOUNDFULLDUPLEX dsfdo,
rc=IDirectSoundFullDuplex_QueryInterface(dsfdo,&IID_IDirectSound8,(LPVOID*)&ds8); ok(rc==(initialized?DS_OK:E_NOINTERFACE),"IDirectSoundFullDuplex_QueryInterface(IID_IDirectSound8) " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); if (rc==DS_OK) { IDirectSoundFullDuplex * dsfd1; rc=IDirectSound8_QueryInterface(ds8,&IID_IDirectSoundFullDuplex,(LPVOID*)&dsfd1); ok(rc==DS_OK,"IDirectSound8_QueryInterface(IID_IDirectSoundFullDuplex) " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); if (rc==DS_OK) { ref=IDirectSoundFullDuplex_Release(dsfd1); ok(ref==1, "IDirectSoundFullDuplex_Release() has %d references, " @@ -78,7 +78,7 @@ static void IDirectSoundFullDuplex_test(LPDIRECTSOUNDFULLDUPLEX dsfdo,
rc=IDirectSoundFullDuplex_QueryInterface(dsfdo,&IID_IDirectSoundCapture,(LPVOID*)&dsc); ok(rc==(initialized?DS_OK:E_NOINTERFACE),"IDirectSoundFullDuplex_QueryInterface(IID_IDirectSoundCapture) " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); if (rc==DS_OK) { ref=IDirectSoundCapture_Release(dsc); ok(ref==0, "IDirectSoundCapture_Release() has %d references, " @@ -87,7 +87,7 @@ static void IDirectSoundFullDuplex_test(LPDIRECTSOUNDFULLDUPLEX dsfdo,
rc=IDirectSoundFullDuplex_QueryInterface(dsfdo,&IID_IDirectSoundFullDuplex,(LPVOID*)&dsfd); ok(rc==DS_OK,"IDirectSoundFullDuplex_QueryInterface(IID_IDirectSoundFullDuplex) " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); if (rc==DS_OK) { ok(dsfdo==dsfd, "different interfaces\n"); ref=IDirectSoundFullDuplex_Release(dsfd); @@ -116,7 +116,7 @@ static void IDirectSoundFullDuplex_tests(void) CLSCTX_INPROC_SERVER, &IID_IDirectSoundFullDuplex, (void**)&dsfdo); ok(rc==S_OK||rc==REGDB_E_CLASSNOTREG||rc==CLASS_E_CLASSNOTAVAILABLE, - "CoCreateInstance(CLSID_DirectSoundFullDuplex) failed: 0x%08x\n", rc); + "CoCreateInstance(CLSID_DirectSoundFullDuplex) failed: 0x%08lx\n", rc); if (rc==REGDB_E_CLASSNOTREG) { trace(" Class Not Registered\n"); return; @@ -132,7 +132,7 @@ static void IDirectSoundFullDuplex_tests(void) rc=CoCreateInstance(&CLSID_DirectSoundFullDuplex, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSoundFullDuplex, (void**)&dsfdo); - ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSoundFullDuplex) failed: 0x%08x\n", rc); + ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSoundFullDuplex) failed: 0x%08lx\n", rc); if (dsfdo) IDirectSoundFullDuplex_test(dsfdo, FALSE, &DSDEVID_DefaultCapture, &DSDEVID_DefaultPlayback); @@ -142,7 +142,7 @@ static void IDirectSoundFullDuplex_tests(void) rc=CoCreateInstance(&CLSID_DirectSoundFullDuplex, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSoundFullDuplex, (void**)&dsfdo); - ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSoundFullDuplex) failed: 0x%08x\n", rc); + ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSoundFullDuplex) failed: 0x%08lx\n", rc); if (dsfdo) IDirectSoundFullDuplex_test(dsfdo, FALSE, &DSDEVID_DefaultVoiceCapture, &DSDEVID_DefaultVoicePlayback); @@ -154,7 +154,7 @@ static void IDirectSoundFullDuplex_tests(void) (void**)&dsfdo); ok(rc==E_NOINTERFACE, "CoCreateInstance(CLSID_DirectSoundFullDuplex,CLSID_DirectSoundPrivate) " - "should have failed: 0x%08x\n", rc); + "should have failed: 0x%08lx\n", rc);
ZeroMemory(&wfex, sizeof(wfex)); wfex.wFormatTag = WAVE_FORMAT_PCM; @@ -180,7 +180,7 @@ static void IDirectSoundFullDuplex_tests(void) rc = DirectSoundFullDuplexCreate(NULL, NULL, &DSCBufferDesc, &DSBufferDesc, get_hwnd(), DSSCL_EXCLUSIVE, &dsfdo, &pDSCBuffer8, &pDSBuffer8, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL||rc==DSERR_INVALIDCALL, - "DirectSoundFullDuplexCreate(NULL,NULL) failed: %08x\n",rc); + "DirectSoundFullDuplexCreate(NULL,NULL) failed: %08lx\n",rc); if (rc==S_OK && dsfdo) IDirectSoundFullDuplex_test(dsfdo, TRUE, NULL, NULL);
@@ -190,7 +190,7 @@ static void IDirectSoundFullDuplex_tests(void) DSSCL_EXCLUSIVE, &dsfdo, &pDSCBuffer8,&pDSBuffer8, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL||rc==DSERR_INVALIDCALL, "DirectSoundFullDuplexCreate(DSDEVID_DefaultCapture," - "DSDEVID_DefaultPlayback) failed: %08x\n", rc); + "DSDEVID_DefaultPlayback) failed: %08lx\n", rc); if (rc==DS_OK && dsfdo) IDirectSoundFullDuplex_test(dsfdo, TRUE, NULL, NULL);
@@ -200,7 +200,7 @@ static void IDirectSoundFullDuplex_tests(void) get_hwnd(), DSSCL_EXCLUSIVE, &dsfdo, &pDSCBuffer8, &pDSBuffer8, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL||rc==DSERR_INVALIDCALL, "DirectSoundFullDuplexCreate(DSDEVID_DefaultVoiceCapture," - "DSDEVID_DefaultVoicePlayback) failed: %08x\n", rc); + "DSDEVID_DefaultVoicePlayback) failed: %08lx\n", rc); if (rc==DS_OK && dsfdo) IDirectSoundFullDuplex_test(dsfdo, TRUE, NULL, NULL);
@@ -210,7 +210,7 @@ static void IDirectSoundFullDuplex_tests(void) get_hwnd(), DSSCL_EXCLUSIVE, &dsfdo, &pDSCBuffer8, &pDSBuffer8, NULL); ok(rc==DSERR_NODRIVER||rc==DSERR_INVALIDCALL, "DirectSoundFullDuplexCreate(DSDEVID_DefaultVoicePlayback," - "DSDEVID_DefaultVoiceCapture) should have failed: %08x\n", rc); + "DSDEVID_DefaultVoiceCapture) should have failed: %08lx\n", rc); if (rc==DS_OK && dsfdo) IDirectSoundFullDuplex_Release(dsfdo); } @@ -234,33 +234,33 @@ static void test_COM(void) hr = CoCreateInstance(&CLSID_DirectSoundFullDuplex, (IUnknown*)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&dsfd); ok(hr == CLASS_E_NOAGGREGATION, - "DirectSoundFullDuplex create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectSoundFullDuplex create failed: %08lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!dsfd, "dsfd = %p\n", dsfd);
/* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectSoundFullDuplex, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSound3DBuffer, (void**)&dsfd); ok(hr == E_NOINTERFACE, - "DirectSoundFullDuplex create failed: %08x, expected E_NOINTERFACE\n", hr); + "DirectSoundFullDuplex create failed: %08lx, expected E_NOINTERFACE\n", hr);
/* Different refcount for IDirectSoundFullDuplex and for IUnknown */ hr = CoCreateInstance(&CLSID_DirectSoundFullDuplex, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSoundFullDuplex, (void**)&dsfd); - ok(hr == S_OK, "DirectSoundFullDuplex create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectSoundFullDuplex create failed: %08lx, expected S_OK\n", hr); refcount = IDirectSoundFullDuplex_AddRef(dsfd); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectSoundFullDuplex_QueryInterface(dsfd, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08lx\n", hr); refcount = IUnknown_AddRef(unk); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount);
/* Not initialized */ hr = IDirectSoundFullDuplex_QueryInterface(dsfd, &IID_IDirectSound8, (void**)&ds8); ok(hr == E_NOINTERFACE, - "QueryInterface for IID_IDirectSound8 failed: %08x, expected E_NOINTERFACE\n", hr); + "QueryInterface for IID_IDirectSound8 failed: %08lx, expected E_NOINTERFACE\n", hr); hr = IDirectSoundFullDuplex_QueryInterface(dsfd, &IID_IDirectSoundCapture, (void**)&dsc); ok(hr == E_NOINTERFACE, - "QueryInterface for IID_IDirectSoundCapture failed: %08x, expected E_NOINTERFACE\n", hr); + "QueryInterface for IID_IDirectSoundCapture failed: %08lx, expected E_NOINTERFACE\n", hr);
init_format(&wfx, WAVE_FORMAT_PCM, 44100, 16, 1); ZeroMemory(&bufdesc, sizeof(bufdesc)); @@ -274,49 +274,49 @@ static void test_COM(void) hr = IDirectSoundFullDuplex_Initialize(dsfd, NULL, NULL, &cbufdesc, &bufdesc, get_hwnd(), DSSCL_EXCLUSIVE, NULL, NULL); ok(hr == E_INVALIDARG, - "IDirectSoundFullDuplex_Initialize failed: %08x, expected E_INVALIDARG\n", hr); + "IDirectSoundFullDuplex_Initialize failed: %08lx, expected E_INVALIDARG\n", hr); hr = IDirectSoundFullDuplex_Initialize(dsfd, NULL, NULL, &cbufdesc, &bufdesc, get_hwnd(), DSSCL_EXCLUSIVE, &dscb8, &dsb8); if (hr == DSERR_NODRIVER || hr == DSERR_INVALIDCALL) { skip("No driver\n"); return; } - ok(hr == S_OK, "IDirectSoundFullDuplex_Initialize failed: %08x\n", hr); + ok(hr == S_OK, "IDirectSoundFullDuplex_Initialize failed: %08lx\n", hr);
/* IDirectSound and IDirectSound8 */ hr = IDirectSoundFullDuplex_QueryInterface(dsfd, &IID_IDirectSound8, (void**)&ds8); - ok(hr == S_OK, "QueryInterface for IID_IDirectSound8 failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IDirectSound8 failed: %08lx\n", hr); refcount = IDirectSound8_AddRef(ds8); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectSoundFullDuplex_QueryInterface(dsfd, &IID_IDirectSound, (void**)&ds); - ok(hr == S_OK, "QueryInterface for IID_IDirectSound failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IDirectSound failed: %08lx\n", hr); refcount = IDirectSound8_AddRef(ds8); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); refcount = IDirectSound_AddRef(ds); - ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + ok(refcount == 5, "refcount == %lu, expected 5\n", refcount); hr = IDirectSound8_QueryInterface(ds8, &IID_IUnknown, (void**)&unk8); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08lx\n", hr); ok(unk == unk8, "Got different IUnknown when QI'ing IDirectSoundFullDuplex and IDirectSound\n"); refcount = IUnknown_AddRef(unk8); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); refcount = IDirectSound_AddRef(ds); - ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + ok(refcount == 6, "refcount == %lu, expected 6\n", refcount); refcount = IDirectSoundFullDuplex_AddRef(dsfd); - ok(refcount == 3, "refcount == %u, expected 3\n", refcount); + ok(refcount == 3, "refcount == %lu, expected 3\n", refcount);
/* IDirectSoundCapture */ hr = IDirectSoundFullDuplex_QueryInterface(dsfd, &IID_IDirectSoundCapture, (void**)&dsc); - ok(hr == S_OK, "QueryInterface for IID_IDirectSoundCapture failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IDirectSoundCapture failed: %08lx\n", hr); refcount = IDirectSoundCapture_AddRef(dsc); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); refcount = IDirectSoundFullDuplex_AddRef(dsfd); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); hr = IDirectSound8_QueryInterface(ds8, &IID_IUnknown, (void**)&unk8); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08lx\n", hr); ok(unk == unk8, "Got different IUnknown when QI'ing IDirectSoundFullDuplex and IDirectSoundCapture\n"); refcount = IUnknown_AddRef(unk8); - ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + ok(refcount == 6, "refcount == %lu, expected 6\n", refcount);
IDirectSoundBuffer8_Release(dsb8); IDirectSoundCaptureBuffer8_Release(dscb8); diff --git a/dlls/dsound/tests/propset.c b/dlls/dsound/tests/propset.c index 94f0d36345f..71040a70c77 100644 --- a/dlls/dsound/tests/propset.c +++ b/dlls/dsound/tests/propset.c @@ -67,7 +67,7 @@ static BOOL CALLBACK callback(PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_DATA dat trace(" Description: %s\n", data->Description); trace(" Module: %s\n", data->Module); trace(" Interface: %s\n", data->Interface); - trace(" WaveDeviceId: %d\n", data->WaveDeviceId); + trace(" WaveDeviceId: %ld\n", data->WaveDeviceId);
return TRUE; } @@ -94,7 +94,7 @@ static BOOL CALLBACK callback1(PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA trace(" ModuleA: %s\n", data->ModuleA); WideCharToMultiByte(CP_ACP, 0, data->ModuleW, -1, moduleA, sizeof(moduleA), NULL, NULL); trace(" ModuleW: %s\n", moduleA); - trace(" WaveDeviceId: %d\n", data->WaveDeviceId); + trace(" WaveDeviceId: %ld\n", data->WaveDeviceId);
return TRUE; } @@ -115,7 +115,7 @@ static BOOL CALLBACK callbackA(PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA trace(" Description: %s\n", data->Description); trace(" Module: %s\n", data->Module); trace(" Interface: %s\n", data->Interface); - trace(" WaveDeviceId: %d\n", data->WaveDeviceId); + trace(" WaveDeviceId: %ld\n", data->WaveDeviceId);
return TRUE; } @@ -143,7 +143,7 @@ static BOOL CALLBACK callbackW(PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA trace("\tDescription: %s\n", descriptionA); trace("\tModule: %s\n", moduleA); trace("\tInterface: %s\n", interfaceA); - trace("\tWaveDeviceId: %d\n", data->WaveDeviceId); + trace("\tWaveDeviceId: %ld\n", data->WaveDeviceId);
return TRUE; } @@ -160,20 +160,20 @@ static void propset_private_tests(void) rc = (pDllGetClassObject)(&CLSID_DirectSound, &IID_IClassFactory, NULL); ok(rc==DSERR_INVALIDPARAM,"DllGetClassObject(CLSID_DirectSound, " "IID_IClassFactory) should have returned DSERR_INVALIDPARAM, " - "returned: %08x\n",rc); + "returned: %08lx\n",rc);
rc = (pDllGetClassObject)(&CLSID_DirectSound, &IID_IDirectSound, (void **)(&pcf)); ok(rc==E_NOINTERFACE,"DllGetClassObject(CLSID_DirectSound, " "IID_IDirectSound) should have returned E_NOINTERFACE, " - "returned: %08x\n",rc); + "returned: %08lx\n",rc);
rc = (pDllGetClassObject)(&CLSID_DirectSound, &IID_IUnknown, (void **)(&pcf)); ok(rc==DS_OK,"DllGetClassObject(CLSID_DirectSound, " - "IID_IUnknown) failed: %08x\n",rc); + "IID_IUnknown) failed: %08lx\n",rc);
rc = (pDllGetClassObject)(&CLSID_DirectSound, &IID_IClassFactory, (void **)(&pcf)); ok(pcf!=0, "DllGetClassObject(CLSID_DirectSound, IID_IClassFactory) " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); if (pcf==0) return;
@@ -182,17 +182,17 @@ static void propset_private_tests(void) rc = IClassFactory_CreateInstance(pcf, NULL, &IID_IKsPropertySet, NULL); ok(rc==DSERR_INVALIDPARAM, "CreateInstance(IID_IKsPropertySet) should have " - "returned DSERR_INVALIDPARAM, returned: %08x\n",rc); + "returned DSERR_INVALIDPARAM, returned: %08lx\n",rc);
rc = IClassFactory_CreateInstance(pcf, NULL, &IID_IKsPropertySet, (void **)(&pps)); ok(rc==E_NOINTERFACE, "CreateInstance(IID_IKsPropertySet) should have " - "returned E_NOINTERFACE, returned: %08x\n",rc); + "returned E_NOINTERFACE, returned: %08lx\n",rc);
/* and the direct sound 8 version */ rc = pDllGetClassObject(&CLSID_DirectSound8, &IID_IClassFactory, (void **)&pcf); ok(pcf!=0, "DllGetClassObject(CLSID_DirectSound8, IID_IClassFactory) " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); if (pcf==0) return;
@@ -200,12 +200,12 @@ static void propset_private_tests(void) rc = IClassFactory_CreateInstance(pcf, NULL, &IID_IKsPropertySet, (void **)(&pps)); ok(rc==E_NOINTERFACE, "CreateInstance(IID_IKsPropertySet) should have " - "returned E_NOINTERFACE, returned: %08x\n",rc); + "returned E_NOINTERFACE, returned: %08lx\n",rc);
/* try direct sound capture next */ rc = pDllGetClassObject(&CLSID_DirectSoundCapture, &IID_IClassFactory, (void **)&pcf); ok(pcf!=0, "DllGetClassObject(CLSID_DirectSoundCapture, IID_IClassFactory) " - "failed: %08x\n",rc); + "failed: %08lx\n",rc); if (pcf==0) return;
@@ -213,12 +213,12 @@ static void propset_private_tests(void) rc = IClassFactory_CreateInstance(pcf, NULL, &IID_IKsPropertySet, (void **)(&pps)); ok(rc==E_NOINTERFACE, "CreateInstance(IID_IKsPropertySet) should have " - "returned E_NOINTERFACE,returned: %08x\n",rc); + "returned E_NOINTERFACE,returned: %08lx\n",rc);
/* and the direct sound capture 8 version */ rc = pDllGetClassObject(&CLSID_DirectSoundCapture8, &IID_IClassFactory, (void **)&pcf); ok(pcf!=0, "DllGetClassObject(CLSID_DirectSoundCapture8, " - "IID_IClassFactory) failed: %08x\n",rc); + "IID_IClassFactory) failed: %08lx\n",rc); if (pcf==0) return;
@@ -226,13 +226,13 @@ static void propset_private_tests(void) rc = IClassFactory_CreateInstance(pcf, NULL, &IID_IKsPropertySet, (void **)(&pps)); ok(rc==E_NOINTERFACE, "CreateInstance(IID_IKsPropertySet) should have " - "returned E_NOINTERFACE, returned: %08x\n",rc); + "returned E_NOINTERFACE, returned: %08lx\n",rc);
/* try direct sound full duplex next */ rc = (pDllGetClassObject)(&CLSID_DirectSoundFullDuplex, &IID_IClassFactory, (void **)(&pcf)); ok(pcf!=0, "DllGetClassObject(CLSID_DirectSoundFullDuplex, " - "IID_IClassFactory) failed: %08x\n",rc); + "IID_IClassFactory) failed: %08lx\n",rc); if (pcf==0) return;
@@ -240,7 +240,7 @@ static void propset_private_tests(void) rc = IClassFactory_CreateInstance(pcf, NULL, &IID_IKsPropertySet, (void **)(&pps)); ok(rc==E_NOINTERFACE, "CreateInstance(IID_IKsPropertySet) should have " - "returned NOINTERFACE, returned: %08x\n",rc); + "returned NOINTERFACE, returned: %08lx\n",rc);
/* try direct sound private last */ rc = (pDllGetClassObject)(&CLSID_DirectSoundPrivate, &IID_IClassFactory, @@ -253,7 +253,7 @@ static void propset_private_tests(void) /* direct sound private does have an IKsPropertySet */ rc = IClassFactory_CreateInstance(pcf, NULL, &IID_IKsPropertySet, (void **)(&pps)); - ok(rc==DS_OK, "CreateInstance(IID_IKsPropertySet) failed: %08x\n", + ok(rc==DS_OK, "CreateInstance(IID_IKsPropertySet) failed: %08lx\n", rc); if (rc!=DS_OK) return; @@ -264,7 +264,7 @@ static void propset_private_tests(void) &support); ok(rc==DS_OK||rc==E_INVALIDARG, "QuerySupport(DSPROPSETID_DirectSoundDevice, " - "DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION) failed: %08x\n", + "DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION) failed: %08lx\n", rc); if (rc!=DS_OK) { if (rc==E_INVALIDARG) @@ -274,10 +274,10 @@ static void propset_private_tests(void)
ok(support & KSPROPERTY_SUPPORT_GET, "Couldn't get DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION: " - "support = 0x%x\n",support); + "support = 0x%lx\n",support); ok(!(support & KSPROPERTY_SUPPORT_SET), "Shouldn't be able to set DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION: " - "support = 0x%x\n",support); + "support = 0x%lx\n",support);
/* test DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1 */ rc = IKsPropertySet_QuerySupport(pps, &DSPROPSETID_DirectSoundDevice, @@ -285,7 +285,7 @@ static void propset_private_tests(void) &support); ok(rc==DS_OK||rc==E_INVALIDARG, "QuerySupport(DSPROPSETID_DirectSoundDevice, " - "DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1) failed: %08x\n", + "DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1) failed: %08lx\n", rc); if (rc!=DS_OK) { if (rc==E_INVALIDARG) @@ -295,10 +295,10 @@ static void propset_private_tests(void)
ok(support & KSPROPERTY_SUPPORT_GET, "Couldn't get DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1: " - "support = 0x%x\n",support); + "support = 0x%lx\n",support); ok(!(support & KSPROPERTY_SUPPORT_SET), "Shouldn't be able to set DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1: " - "support = 0x%x\n",support); + "support = 0x%lx\n",support);
/* test DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A */ rc = IKsPropertySet_QuerySupport(pps, &DSPROPSETID_DirectSoundDevice, @@ -306,7 +306,7 @@ static void propset_private_tests(void) &support); ok(rc==DS_OK||rc==E_INVALIDARG, "QuerySupport(DSPROPSETID_DirectSoundDevice, " - "DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A) failed: %08x\n", + "DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A) failed: %08lx\n", rc); if (rc!=DS_OK) { if (rc==E_INVALIDARG) @@ -316,10 +316,10 @@ static void propset_private_tests(void)
ok(support & KSPROPERTY_SUPPORT_GET, "Couldn't get DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A: " - "support = 0x%x\n",support); + "support = 0x%lx\n",support); ok(!(support & KSPROPERTY_SUPPORT_SET), "Shouldn't be able to set DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A: " - "support = 0x%x\n",support); + "support = 0x%lx\n",support);
/* test DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W */ rc = IKsPropertySet_QuerySupport(pps, &DSPROPSETID_DirectSoundDevice, @@ -327,7 +327,7 @@ static void propset_private_tests(void) &support); ok(rc==DS_OK||rc==E_INVALIDARG, "QuerySupport(DSPROPSETID_DirectSoundDevice, " - "DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W) failed: %08x\n", + "DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W) failed: %08lx\n", rc); if (rc!=DS_OK) { if (rc==E_INVALIDARG) @@ -337,58 +337,58 @@ static void propset_private_tests(void)
ok(support & KSPROPERTY_SUPPORT_GET, "Couldn't get DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W: " - "support = 0x%x\n",support); + "support = 0x%lx\n",support); ok(!(support & KSPROPERTY_SUPPORT_SET), "Shouldn't be able to set DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W: " - "support = 0x%x\n",support); + "support = 0x%lx\n",support);
/* test generic DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING */ rc = IKsPropertySet_QuerySupport(pps, &DSPROPSETID_DirectSoundDevice, DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING, &support); ok(rc==DS_OK, "QuerySupport(DSPROPSETID_DirectSoundDevice, " - "DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING) failed: %08x\n", + "DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING) failed: %08lx\n", rc); if (rc!=DS_OK) return;
ok(support & KSPROPERTY_SUPPORT_GET, "Couldn't get DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING: " - "support = 0x%x\n",support); + "support = 0x%lx\n",support); ok(!(support & KSPROPERTY_SUPPORT_SET), "Shouldn't be able to set " "DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING: support = " - "0x%x\n",support); + "0x%lx\n",support);
/* test DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A */ rc = IKsPropertySet_QuerySupport(pps, &DSPROPSETID_DirectSoundDevice, DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A, &support); ok(rc==DS_OK, "QuerySupport(DSPROPSETID_DirectSoundDevice, " - "DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A) failed: %08x\n", + "DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A) failed: %08lx\n", rc); if (rc!=DS_OK) return;
ok(support & KSPROPERTY_SUPPORT_GET, "Couldn't get DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A: " - "support = 0x%x\n",support); + "support = 0x%lx\n",support); ok(!(support & KSPROPERTY_SUPPORT_SET), "Shouldn't be able to set " "DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A: support = " - "0x%x\n",support); + "0x%lx\n",support);
/* test DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W */ rc = IKsPropertySet_QuerySupport(pps, &DSPROPSETID_DirectSoundDevice, DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W, &support); ok(rc==DS_OK, "QuerySupport(DSPROPSETID_DirectSoundDevice, " - "DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W) failed: %08x\n", + "DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W) failed: %08lx\n", rc); if (rc!=DS_OK) return;
ok(support & KSPROPERTY_SUPPORT_GET, "Couldn't get DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W: " - "support = 0x%x\n",support); + "support = 0x%lx\n",support); ok(!(support & KSPROPERTY_SUPPORT_SET), "Shouldn't be able to set " "DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W: support = " - "0x%x\n",support); + "0x%lx\n",support);
/* test generic DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE */ trace("*** Testing DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE ***\n"); @@ -396,16 +396,16 @@ static void propset_private_tests(void) DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE, &support); ok(rc==DS_OK, "QuerySupport(DSPROPSETID_DirectSoundDevice, " - "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE) failed: %08x\n", + "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE) failed: %08lx\n", rc); if (rc!=DS_OK) return;
ok(support & KSPROPERTY_SUPPORT_GET, "Couldn't get DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE: " - "support = 0x%x\n",support); + "support = 0x%lx\n",support); ok(!(support & KSPROPERTY_SUPPORT_SET),"Shouldn't be able to set " - "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE: support = 0x%x\n",support); + "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE: support = 0x%lx\n",support);
if (support & KSPROPERTY_SUPPORT_GET) { DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_DATA data; @@ -417,7 +417,7 @@ static void propset_private_tests(void) rc = IKsPropertySet_Get(pps, &DSPROPSETID_DirectSoundDevice, DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE, NULL, 0, &data, sizeof(data), &bytes); - ok(rc==DS_OK, "Couldn't enumerate: 0x%x\n",rc); + ok(rc==DS_OK, "Couldn't enumerate: 0x%lx\n",rc); }
/* test DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1 */ @@ -426,16 +426,16 @@ static void propset_private_tests(void) DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1, &support); ok(rc==DS_OK, "QuerySupport(DSPROPSETID_DirectSoundDevice, " - "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1) failed: %08x\n", + "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1) failed: %08lx\n", rc); if (rc!=DS_OK) return;
ok(support & KSPROPERTY_SUPPORT_GET, "Couldn't get DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1: " - "support = 0x%x\n",support); + "support = 0x%lx\n",support); ok(!(support & KSPROPERTY_SUPPORT_SET),"Shouldn't be able to set " - "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1: support = 0x%x\n",support); + "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1: support = 0x%lx\n",support);
if (support & KSPROPERTY_SUPPORT_GET) { DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1_DATA data; @@ -447,7 +447,7 @@ static void propset_private_tests(void) rc = IKsPropertySet_Get(pps, &DSPROPSETID_DirectSoundDevice, DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1, NULL, 0, &data, sizeof(data), &bytes); - ok(rc==DS_OK, "Couldn't enumerate: 0x%x\n",rc); + ok(rc==DS_OK, "Couldn't enumerate: 0x%lx\n",rc); }
/* test DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A */ @@ -456,16 +456,16 @@ static void propset_private_tests(void) DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A, &support); ok(rc==DS_OK, "QuerySupport(DSPROPSETID_DirectSoundDevice, " - "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A) failed: %08x\n", + "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A) failed: %08lx\n", rc); if (rc!=DS_OK) return;
ok(support & KSPROPERTY_SUPPORT_GET, "Couldn't get DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A: " - "support = 0x%x\n",support); + "support = 0x%lx\n",support); ok(!(support & KSPROPERTY_SUPPORT_SET),"Shouldn't be able to set " - "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A: support = 0x%x\n",support); + "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A: support = 0x%lx\n",support);
if (support & KSPROPERTY_SUPPORT_GET) { DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A_DATA data; @@ -477,7 +477,7 @@ static void propset_private_tests(void) rc = IKsPropertySet_Get(pps, &DSPROPSETID_DirectSoundDevice, DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A, NULL, 0, &data, sizeof(data), &bytes); - ok(rc==DS_OK, "Couldn't enumerate: 0x%x\n",rc); + ok(rc==DS_OK, "Couldn't enumerate: 0x%lx\n",rc); }
/* test DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W */ @@ -486,16 +486,16 @@ static void propset_private_tests(void) DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W, &support); ok(rc==DS_OK, "QuerySupport(DSPROPSETID_DirectSoundDevice, " - "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W) failed: %08x\n", + "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W) failed: %08lx\n", rc); if (rc!=DS_OK) return;
ok(support & KSPROPERTY_SUPPORT_GET, "Couldn't get DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W: " - "support = 0x%x\n",support); + "support = 0x%lx\n",support); ok(!(support & KSPROPERTY_SUPPORT_SET),"Shouldn't be able to set " - "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W: support = 0x%x\n",support); + "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W: support = 0x%lx\n",support);
if (support & KSPROPERTY_SUPPORT_GET) { DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA data; @@ -507,7 +507,7 @@ static void propset_private_tests(void) rc = IKsPropertySet_Get(pps, &DSPROPSETID_DirectSoundDevice, DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W, NULL, 0, &data, sizeof(data), &bytes); - ok(rc==DS_OK, "Couldn't enumerate: 0x%x\n",rc); + ok(rc==DS_OK, "Couldn't enumerate: 0x%lx\n",rc); } IKsPropertySet_Release(pps); } @@ -529,7 +529,7 @@ static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription,
rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, - "DirectSoundCreate() failed: %08x\n",rc); + "DirectSoundCreate() failed: %08lx\n",rc); if (rc!=DS_OK) { if (rc==DSERR_NODRIVER) trace(" No Driver\n"); @@ -543,7 +543,7 @@ static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, /* We must call SetCooperativeLevel before calling CreateSoundBuffer */ /* DSOUND: Setting DirectSound cooperative level to DSSCL_PRIORITY */ rc=IDirectSound_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); - ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08x\n", + ok(rc==DS_OK,"IDirectSound_SetCooperativeLevel() failed: %08lx\n", rc); if (rc!=DS_OK) goto EXIT; @@ -557,7 +557,7 @@ static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, ok((rc==DS_OK&&primary!=NULL) || broken(rc==DSERR_INVALIDPARAM), "IDirectSound_CreateSoundBuffer() failed to " - "create a hardware 3D primary buffer: %08x\n",rc); + "create a hardware 3D primary buffer: %08lx\n",rc); if(rc==DSERR_INVALIDPARAM) { skip("broken driver\n"); goto EXIT; @@ -575,11 +575,11 @@ static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, bufdesc.dwFlags=DSBCAPS_CTRLDEFAULT|DSBCAPS_GETCURRENTPOSITION2; bufdesc.dwBufferBytes=wfx.nAvgBytesPerSec; bufdesc.lpwfxFormat=&wfx; - trace(" Testing a secondary buffer at %dx%dx%d\n", + trace(" Testing a secondary buffer at %ldx%dx%d\n", wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels); rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok((rc==DS_OK && secondary!=NULL) || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */ - "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer: %08x\n",rc); + "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer: %08lx\n",rc); if (rc==DS_OK&&secondary!=NULL) { IKsPropertySet * pPropertySet=NULL; rc=IDirectSoundBuffer_QueryInterface(secondary, @@ -671,7 +671,7 @@ static void propset_buffer_tests(void) { HRESULT rc; rc = DirectSoundEnumerateA(dsenum_callback, NULL); - ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08x\n",rc); + ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08lx\n",rc); trace("tested %u DirectSound drivers\n", driver_count); }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dxgi/tests/Makefile.in | 1 dlls/dxgi/tests/dxgi.c | 1590 ++++++++++++++++++++++--------------------- 2 files changed, 795 insertions(+), 796 deletions(-) diff --git a/dlls/dxgi/tests/Makefile.in b/dlls/dxgi/tests/Makefile.in index 3bbece2d0a1..1c99d70957d 100644 --- a/dlls/dxgi/tests/Makefile.in +++ b/dlls/dxgi/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dxgi.dll IMPORTS = d3d10_1 dxgi user32 diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index f70d849aebc..a01b38520b8 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -244,7 +244,7 @@ static HRESULT check_interface_(unsigned int line, void *iface, REFIID iid, out = (IUnknown *)0xdeadbeef; hr = IUnknown_QueryInterface(unknown, iid, (void **)&out); ok_(__FILE__, line)(hr == expected_hr || broken(is_broken && hr == broken_hr), - "Got hr %#x, expected %#x.\n", hr, expected_hr); + "Got hr %#lx, expected %#lx.\n", hr, expected_hr); if (SUCCEEDED(hr)) IUnknown_Release(out); else @@ -266,9 +266,9 @@ static unsigned int check_multisample_quality_levels(IDXGIDevice *dxgi_device, HRESULT hr; hr = IDXGIDevice_QueryInterface(dxgi_device, &IID_ID3D10Device, (void **)&device); - ok(hr == S_OK, "Failed to query ID3D10Device, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to query ID3D10Device, hr %#lx.\n", hr); hr = ID3D10Device_CheckMultisampleQualityLevels(device, format, sample_count, &levels); - ok(hr == S_OK, "Failed to check multisample quality levels, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to check multisample quality levels, hr %#lx.\n", hr); ID3D10Device_Release(device); return levels; @@ -353,16 +353,16 @@ static void check_adapter_desc_(unsigned int line, const DXGI_ADAPTER_DESC *desc "Got revision %02x, expected %02x.\n", desc->Revision, expected_desc->Revision); ok_(__FILE__, line)(desc->DedicatedVideoMemory == expected_desc->DedicatedVideoMemory, - "Got dedicated video memory %lu, expected %lu.\n", + "Got dedicated video memory %Iu, expected %Iu.\n", desc->DedicatedVideoMemory, expected_desc->DedicatedVideoMemory); ok_(__FILE__, line)(desc->DedicatedSystemMemory == expected_desc->DedicatedSystemMemory, - "Got dedicated system memory %lu, expected %lu.\n", + "Got dedicated system memory %Iu, expected %Iu.\n", desc->DedicatedSystemMemory, expected_desc->DedicatedSystemMemory); ok_(__FILE__, line)(desc->SharedSystemMemory == expected_desc->SharedSystemMemory, - "Got shared system memory %lu, expected %lu.\n", + "Got shared system memory %Iu, expected %Iu.\n", desc->SharedSystemMemory, expected_desc->SharedSystemMemory); ok_(__FILE__, line)(equal_luid(desc->AdapterLuid, expected_desc->AdapterLuid), - "Got LUID %08x:%08x, expected %08x:%08x.\n", + "Got LUID %08lx:%08lx, expected %08lx:%08lx.\n", desc->AdapterLuid.HighPart, desc->AdapterLuid.LowPart, expected_desc->AdapterLuid.HighPart, expected_desc->AdapterLuid.LowPart); } @@ -387,9 +387,9 @@ static void check_output_equal_(unsigned int line, IDXGIOutput *output1, IDXGIOu HRESULT hr; hr = IDXGIOutput_GetDesc(output1, &desc1); - ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "GetDesc failed, hr %#lx.\n", hr); hr = IDXGIOutput_GetDesc(output2, &desc2); - ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "GetDesc failed, hr %#lx.\n", hr); check_output_desc_(line, &desc1, &desc2); } @@ -401,12 +401,12 @@ static BOOL output_belongs_to_adapter(IDXGIOutput *output, IDXGIAdapter *adapter HRESULT hr; hr = IDXGIOutput_GetDesc(output, &output_desc); - ok(SUCCEEDED(hr), "Failed to get output desc, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to get output desc, hr %#lx.\n", hr); for (output_idx = 0; IDXGIAdapter_EnumOutputs(adapter, output_idx, &o) != DXGI_ERROR_NOT_FOUND; ++output_idx) { hr = IDXGIOutput_GetDesc(o, &desc); - ok(SUCCEEDED(hr), "Failed to get output desc, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to get output desc, hr %#lx.\n", hr); IDXGIOutput_Release(o); if (!lstrcmpW(desc.DeviceName, output_desc.DeviceName) @@ -462,10 +462,10 @@ static void check_fullscreen_state_(unsigned int line, const struct fullscreen_s { todo_wine_if(!windowed) ok_(__FILE__, line)((state->style & ~WS_VISIBLE) == (expected_state->style & ~WS_VISIBLE), - "Got style %#x, expected %#x.\n", + "Got style %#lx, expected %#lx.\n", state->style & ~(DWORD)WS_VISIBLE, expected_state->style & ~(DWORD)WS_VISIBLE); ok_(__FILE__, line)((state->exstyle & ~WS_EX_TOPMOST) == (expected_state->exstyle & ~WS_EX_TOPMOST), - "Got exstyle %#x, expected %#x.\n", + "Got exstyle %#lx, expected %#lx.\n", state->exstyle & ~(DWORD)WS_EX_TOPMOST, expected_state->exstyle & ~(DWORD)WS_EX_TOPMOST); ok_(__FILE__, line)(EqualRect(&state->window_rect, &expected_state->window_rect), "Got window rect %s, expected %s.\n", @@ -500,7 +500,7 @@ static void check_swapchain_fullscreen_state_(unsigned int line, IDXGISwapChain HRESULT hr; hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc); - ok_(__FILE__, line)(hr == S_OK, "Failed to get swapchain desc, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to get swapchain desc, hr %#lx.\n", hr); check_window_fullscreen_state_(line, swapchain_desc.OutputWindow, &expected_state->fullscreen_state, swapchain_desc.Windowed); @@ -509,7 +509,7 @@ static void check_swapchain_fullscreen_state_(unsigned int line, IDXGISwapChain swapchain_desc.Windowed, !expected_state->fullscreen); hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &target); - ok_(__FILE__, line)(hr == S_OK, "Failed to get fullscreen state, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to get fullscreen state, hr %#lx.\n", hr); ok_(__FILE__, line)(fullscreen == expected_state->fullscreen, "Got fullscreen %#x, expected %#x.\n", fullscreen, expected_state->fullscreen); @@ -518,10 +518,10 @@ static void check_swapchain_fullscreen_state_(unsigned int line, IDXGISwapChain IDXGIAdapter *adapter; hr = IDXGISwapChain_GetContainingOutput(swapchain, &containing_output); - ok_(__FILE__, line)(hr == S_OK, "Failed to get containing output, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to get containing output, hr %#lx.\n", hr); hr = IDXGIOutput_GetParent(containing_output, &IID_IDXGIAdapter, (void **)&adapter); - ok_(__FILE__, line)(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to get parent, hr %#lx.\n", hr); check_output_equal_(line, target, expected_state->target); ok_(__FILE__, line)(target == containing_output, "Got target %p, expected %p.\n", @@ -562,7 +562,7 @@ static void compute_expected_swapchain_fullscreen_state_after_fullscreen_change_ mode_desc.Width = new_width; mode_desc.Height = new_height; hr = IDXGIOutput_FindClosestMatchingMode(target, &mode_desc, &mode_desc, NULL); - ok_(__FILE__, line)(SUCCEEDED(hr), "FindClosestMatchingMode failed, hr %#x.\n", hr); + ok_(__FILE__, line)(SUCCEEDED(hr), "FindClosestMatchingMode failed, hr %#lx.\n", hr); new_width = mode_desc.Width; new_height = mode_desc.Height; } @@ -615,7 +615,7 @@ static void wait_fullscreen_state_(unsigned int line, IDXGISwapChain *swapchain, Sleep(wait_step); total_time += wait_step; } - ok_(__FILE__, line)(hr == S_OK, "Failed to get fullscreen state, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to get fullscreen state, hr %#lx.\n", hr); todo_wine_if(todo) ok_(__FILE__, line)(state == expected, "Got unexpected state %#x, expected %#x.\n", state, expected); } @@ -665,7 +665,7 @@ static IDXGIAdapter *create_adapter(void) if (FAILED(hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory))) { - trace("Failed to create IDXGIFactory, hr %#x.\n", hr); + trace("Failed to create IDXGIFactory, hr %#lx.\n", hr); return NULL; } @@ -679,7 +679,7 @@ static IDXGIAdapter *create_adapter(void) } else { - trace("Failed to get IDXGIFactory4, hr %#x.\n", hr); + trace("Failed to get IDXGIFactory4, hr %#lx.\n", hr); } } else @@ -688,7 +688,7 @@ static IDXGIAdapter *create_adapter(void) } IDXGIFactory_Release(factory); if (FAILED(hr)) - trace("Failed to get adapter, hr %#x.\n", hr); + trace("Failed to get adapter, hr %#lx.\n", hr); return adapter; } @@ -788,7 +788,7 @@ static ID3D12CommandQueue *create_d3d12_direct_queue(ID3D12Device *device) command_queue_desc.NodeMask = 0; hr = ID3D12Device_CreateCommandQueue(device, &command_queue_desc, &IID_ID3D12CommandQueue, (void **)&queue); - ok(hr == S_OK, "Failed to create command queue, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create command queue, hr %#lx.\n", hr); return queue; } @@ -823,12 +823,12 @@ static void wait_queue_idle_(unsigned int line, ID3D12Device *device, ID3D12Comm hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence); - ok_(__FILE__, line)(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to create fence, hr %#lx.\n", hr); hr = ID3D12CommandQueue_Signal(queue, fence, 1); - ok_(__FILE__, line)(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to signal fence, hr %#lx.\n", hr); hr = wait_for_fence(fence, 1); - ok_(__FILE__, line)(hr == S_OK, "Failed to wait for fence, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to wait for fence, hr %#lx.\n", hr); ID3D12Fence_Release(fence); } @@ -845,7 +845,7 @@ static void wait_device_idle_(unsigned int line, IUnknown *device) return; hr = ID3D12CommandQueue_GetDevice(queue, &IID_ID3D12Device, (void **)&d3d12_device); - ok_(__FILE__, line)(hr == S_OK, "Failed to get d3d12 device, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to get d3d12 device, hr %#lx.\n", hr); wait_queue_idle_(line, d3d12_device, queue); @@ -863,15 +863,15 @@ static void get_factory_(unsigned int line, IUnknown *device, BOOL is_d3d12, IDX if (is_d3d12) { hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)factory); - ok_(__FILE__, line)(hr == S_OK, "Failed to create factory, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to create factory, hr %#lx.\n", hr); } else { dxgi_device = (IDXGIDevice *)device; hr = IDXGIDevice_GetAdapter(dxgi_device, &adapter); - ok_(__FILE__, line)(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to get adapter, hr %#lx.\n", hr); hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)factory); - ok_(__FILE__, line)(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to get parent, hr %#lx.\n", hr); IDXGIAdapter_Release(adapter); } } @@ -890,11 +890,11 @@ static IDXGIAdapter *get_adapter_(unsigned int line, IUnknown *device, BOOL is_d { get_factory_(line, device, is_d3d12, &factory); hr = ID3D12CommandQueue_GetDevice((ID3D12CommandQueue *)device, &IID_ID3D12Device, (void **)&d3d12_device); - ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#lx.\n", hr); luid = ID3D12Device_GetAdapterLuid(d3d12_device); ID3D12Device_Release(d3d12_device); hr = IDXGIFactory_QueryInterface(factory, &IID_IDXGIFactory4, (void **)&factory4); - ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGIFactory4_EnumAdapterByLuid(factory4, luid, &IID_IDXGIAdapter, (void **)&adapter); IDXGIFactory4_Release(factory4); IDXGIFactory_Release(factory); @@ -902,7 +902,7 @@ static IDXGIAdapter *get_adapter_(unsigned int line, IUnknown *device, BOOL is_d else { hr = IDXGIDevice_GetAdapter((IDXGIDevice *)device, &adapter); - ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#lx.\n", hr); } return adapter; @@ -934,7 +934,7 @@ static IDXGISwapChain *create_swapchain_(unsigned int line, IUnknown *device, BO get_factory(device, is_d3d12, &factory); hr = IDXGIFactory_CreateSwapChain(factory, device, &desc, &swapchain); - ok_(__FILE__, line)(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to create swapchain, hr %#lx.\n", hr); IDXGIFactory_Release(factory); return swapchain; @@ -957,33 +957,33 @@ static void test_adapter_desc(void) } hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "GetAdapter failed, hr %#lx.\n", hr); hr = IDXGIAdapter_GetDesc(adapter, NULL); - ok(hr == E_INVALIDARG, "GetDesc returned %#x, expected %#x.\n", + ok(hr == E_INVALIDARG, "GetDesc returned %#lx, expected %#lx.\n", hr, E_INVALIDARG); hr = IDXGIAdapter_GetDesc(adapter, &desc); - ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "GetDesc failed, hr %#lx.\n", hr); trace("%s.\n", wine_dbgstr_w(desc.Description)); trace("%04x: %04x:%04x (rev %02x).\n", desc.SubSysId, desc.VendorId, desc.DeviceId, desc.Revision); - trace("Dedicated video memory: %lu (%lu MB).\n", + trace("Dedicated video memory: %Iu (%Iu MB).\n", desc.DedicatedVideoMemory, desc.DedicatedVideoMemory / (1024 * 1024)); - trace("Dedicated system memory: %lu (%lu MB).\n", + trace("Dedicated system memory: %Iu (%Iu MB).\n", desc.DedicatedSystemMemory, desc.DedicatedSystemMemory / (1024 * 1024)); - trace("Shared system memory: %lu (%lu MB).\n", + trace("Shared system memory: %Iu (%Iu MB).\n", desc.SharedSystemMemory, desc.SharedSystemMemory / (1024 * 1024)); - trace("LUID: %08x:%08x.\n", desc.AdapterLuid.HighPart, desc.AdapterLuid.LowPart); + trace("LUID: %08lx:%08lx.\n", desc.AdapterLuid.HighPart, desc.AdapterLuid.LowPart); hr = IDXGIAdapter_QueryInterface(adapter, &IID_IDXGIAdapter1, (void **)&adapter1); - ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE), "Got unexpected hr %#lx.\n", hr); if (hr == E_NOINTERFACE) goto done; hr = IDXGIAdapter1_GetDesc1(adapter1, &desc1); - ok(SUCCEEDED(hr), "GetDesc1 failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "GetDesc1 failed, hr %#lx.\n", hr); ok(!lstrcmpW(desc.Description, desc1.Description), "Got unexpected description %s.\n", wine_dbgstr_w(desc1.Description)); @@ -992,13 +992,13 @@ static void test_adapter_desc(void) ok(desc1.SubSysId == desc.SubSysId, "Got unexpected sub system ID %04x.\n", desc1.SubSysId); ok(desc1.Revision == desc.Revision, "Got unexpected revision %02x.\n", desc1.Revision); ok(desc1.DedicatedVideoMemory == desc.DedicatedVideoMemory, - "Got unexpected dedicated video memory %lu.\n", desc1.DedicatedVideoMemory); + "Got unexpected dedicated video memory %Iu.\n", desc1.DedicatedVideoMemory); ok(desc1.DedicatedSystemMemory == desc.DedicatedSystemMemory, - "Got unexpected dedicated system memory %lu.\n", desc1.DedicatedSystemMemory); + "Got unexpected dedicated system memory %Iu.\n", desc1.DedicatedSystemMemory); ok(desc1.SharedSystemMemory == desc.SharedSystemMemory, - "Got unexpected shared system memory %lu.\n", desc1.SharedSystemMemory); + "Got unexpected shared system memory %Iu.\n", desc1.SharedSystemMemory); ok(equal_luid(desc1.AdapterLuid, desc.AdapterLuid), - "Got unexpected adapter LUID %08x:%08x.\n", desc1.AdapterLuid.HighPart, desc1.AdapterLuid.LowPart); + "Got unexpected adapter LUID %08lx:%08lx.\n", desc1.AdapterLuid.HighPart, desc1.AdapterLuid.LowPart); trace("Flags: %08x.\n", desc1.Flags); IDXGIAdapter1_Release(adapter1); @@ -1006,7 +1006,7 @@ static void test_adapter_desc(void) done: IDXGIAdapter_Release(adapter); refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } static void test_adapter_luid(void) @@ -1031,22 +1031,22 @@ static void test_adapter_luid(void) } hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get adapter, hr %#lx.\n", hr); hr = IDXGIAdapter_GetDesc(adapter, &device_adapter_desc); - ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get adapter desc, hr %#lx.\n", hr); IDXGIAdapter_Release(adapter); refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); is_null_luid_adapter = !device_adapter_desc.AdapterLuid.LowPart && !device_adapter_desc.SubSysId && !device_adapter_desc.Revision && !device_adapter_desc.VendorId && !device_adapter_desc.DeviceId; hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory); - ok(hr == S_OK, "Failed to create DXGI factory, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create DXGI factory, hr %#lx.\n", hr); hr = IDXGIFactory_QueryInterface(factory, &IID_IDXGIFactory4, (void **)&factory4); - ok(hr == S_OK || hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK || hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); have_unique_luid = TRUE; found_adapter_count = 0; @@ -1054,7 +1054,7 @@ static void test_adapter_luid(void) while ((hr = IDXGIFactory_EnumAdapters(factory, adapter_index, &adapter)) == S_OK) { hr = IDXGIAdapter_GetDesc(adapter, &desc); - ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get adapter desc, hr %#lx.\n", hr); if (equal_luid(desc.AdapterLuid, device_adapter_desc.AdapterLuid)) { @@ -1069,32 +1069,32 @@ static void test_adapter_luid(void) { hr = IDXGIFactory4_EnumAdapterByLuid(factory4, desc.AdapterLuid, &IID_IDXGIAdapter, (void **)&adapter2); - ok(hr == S_OK, "Failed to enum adapter by LUID, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to enum adapter by LUID, hr %#lx.\n", hr); hr = IDXGIAdapter_GetDesc(adapter2, &desc2); - ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get adapter desc, hr %#lx.\n", hr); check_adapter_desc(&desc2, &desc); ok(adapter2 != adapter, "Expected to get new instance of IDXGIAdapter.\n"); refcount = IDXGIAdapter_Release(adapter2); - ok(!refcount, "Adapter has %u references left.\n", refcount); + ok(!refcount, "Adapter has %lu references left.\n", refcount); } refcount = IDXGIAdapter_Release(adapter); - ok(!refcount, "Adapter has %u references left.\n", refcount); + ok(!refcount, "Adapter has %lu references left.\n", refcount); ++adapter_index; } - ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#lx.\n", hr); /* Older versions of WARP aren't enumerated by IDXGIFactory_EnumAdapters(). */ ok(found_adapter_count == 1 || broken(is_null_luid_adapter), - "Found %u adapters for LUID %08x:%08x.\n", + "Found %u adapters for LUID %08lx:%08lx.\n", found_adapter_count, device_adapter_desc.AdapterLuid.HighPart, device_adapter_desc.AdapterLuid.LowPart); if (factory4) IDXGIFactory4_Release(factory4); refcount = IDXGIFactory_Release(factory); - ok(!refcount, "Factory has %u references left.\n", refcount); + ok(!refcount, "Factory has %lu references left.\n", refcount); if (!pCreateDXGIFactory2 || FAILED(hr = pCreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory4))) @@ -1105,24 +1105,24 @@ static void test_adapter_luid(void) hr = IDXGIFactory4_EnumAdapterByLuid(factory4, device_adapter_desc.AdapterLuid, &IID_IDXGIAdapter, NULL); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); hr = IDXGIFactory4_EnumAdapterByLuid(factory4, device_adapter_desc.AdapterLuid, &IID_IDXGIAdapter, (void **)&adapter); - ok(hr == S_OK, "Failed to enum adapter by LUID, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to enum adapter by LUID, hr %#lx.\n", hr); if (SUCCEEDED(hr)) { hr = IDXGIAdapter_GetDesc(adapter, &desc); - ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get adapter desc, hr %#lx.\n", hr); check_adapter_desc(&desc, &device_adapter_desc); refcount = IDXGIAdapter_Release(adapter); - ok(!refcount, "Adapter has %u references left.\n", refcount); + ok(!refcount, "Adapter has %lu references left.\n", refcount); } if (have_unique_luid) { hr = IDXGIFactory4_EnumAdapterByLuid(factory4, luid, &IID_IDXGIAdapter, (void **)&adapter); - ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#lx.\n", hr); } else { @@ -1130,7 +1130,7 @@ static void test_adapter_luid(void) } refcount = IDXGIFactory4_Release(factory4); - ok(!refcount, "Factory has %u references left.\n", refcount); + ok(!refcount, "Factory has %lu references left.\n", refcount); } static void test_query_video_memory_info(void) @@ -1149,14 +1149,14 @@ static void test_query_video_memory_info(void) } hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get adapter, hr %#lx.\n", hr); hr = IDXGIAdapter_QueryInterface(adapter, &IID_IDXGIAdapter3, (void **)&adapter3); - ok(hr == S_OK || hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK || hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); if (hr == E_NOINTERFACE) goto done; hr = IDXGIAdapter3_QueryVideoMemoryInfo(adapter3, 0, DXGI_MEMORY_SEGMENT_GROUP_LOCAL, &memory_info); - ok(hr == S_OK, "Failed to query video memory info, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to query video memory info, hr %#lx.\n", hr); ok(memory_info.Budget >= memory_info.AvailableForReservation, "Available for reservation 0x%s is greater than budget 0x%s.\n", wine_dbgstr_longlong(memory_info.AvailableForReservation), @@ -1165,7 +1165,7 @@ static void test_query_video_memory_info(void) wine_dbgstr_longlong(memory_info.CurrentReservation)); hr = IDXGIAdapter3_QueryVideoMemoryInfo(adapter3, 0, DXGI_MEMORY_SEGMENT_GROUP_NON_LOCAL, &memory_info); - ok(hr == S_OK, "Failed to query video memory info, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to query video memory info, hr %#lx.\n", hr); ok(memory_info.Budget >= memory_info.AvailableForReservation, "Available for reservation 0x%s is greater than budget 0x%s.\n", wine_dbgstr_longlong(memory_info.AvailableForReservation), @@ -1174,14 +1174,14 @@ static void test_query_video_memory_info(void) wine_dbgstr_longlong(memory_info.CurrentReservation)); hr = IDXGIAdapter3_QueryVideoMemoryInfo(adapter3, 0, DXGI_MEMORY_SEGMENT_GROUP_NON_LOCAL + 1, &memory_info); - ok(hr == E_INVALIDARG, "Failed to query video memory info, hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Failed to query video memory info, hr %#lx.\n", hr); IDXGIAdapter3_Release(adapter3); done: IDXGIAdapter_Release(adapter); refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } static void test_check_interface_support(void) @@ -1200,16 +1200,16 @@ static void test_check_interface_support(void) } hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "GetAdapter failed, hr %#lx.\n", hr); hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_IDXGIDevice, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_IDXGIDevice, &driver_version); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_ID3D10Device, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_ID3D10Device, &driver_version); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); trace("UMD version: %u.%u.%u.%u.\n", HIWORD(U(driver_version).HighPart), LOWORD(U(driver_version).HighPart), @@ -1220,9 +1220,9 @@ static void test_check_interface_support(void) { IUnknown_Release(iface); hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_ID3D10Device1, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_ID3D10Device1, &driver_version); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); } else { @@ -1230,16 +1230,16 @@ static void test_check_interface_support(void) } hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_ID3D11Device, NULL); - ok(hr == DXGI_ERROR_UNSUPPORTED, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_UNSUPPORTED, "Got unexpected hr %#lx.\n", hr); driver_version.LowPart = driver_version.HighPart = 0xdeadbeef; hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_ID3D11Device, &driver_version); - ok(hr == DXGI_ERROR_UNSUPPORTED, "Got unexpected hr %#x.\n", hr); - ok(driver_version.HighPart == 0xdeadbeef, "Got unexpected driver version %#x.\n", driver_version.HighPart); - ok(driver_version.LowPart == 0xdeadbeef, "Got unexpected driver version %#x.\n", driver_version.LowPart); + ok(hr == DXGI_ERROR_UNSUPPORTED, "Got unexpected hr %#lx.\n", hr); + ok(driver_version.HighPart == 0xdeadbeef, "Got unexpected driver version %#lx.\n", driver_version.HighPart); + ok(driver_version.LowPart == 0xdeadbeef, "Got unexpected driver version %#lx.\n", driver_version.LowPart); IDXGIAdapter_Release(adapter); refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } static void test_create_surface(void) @@ -1264,7 +1264,7 @@ static void test_create_surface(void) desc.SampleDesc.Quality = 0; hr = IDXGIDevice_CreateSurface(device, &desc, 1, DXGI_USAGE_RENDER_TARGET_OUTPUT, NULL, &surface); - ok(SUCCEEDED(hr), "Failed to create a dxgi surface, hr %#x\n", hr); + ok(SUCCEEDED(hr), "Failed to create a dxgi surface, hr %#lx\n", hr); check_interface(surface, &IID_ID3D10Texture2D, TRUE, FALSE); /* Not available on all Windows versions. */ @@ -1274,7 +1274,7 @@ static void test_create_surface(void) IDXGISurface_Release(surface); refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); /* DXGI_USAGE_UNORDERED_ACCESS */ if (!(device = create_d3d11_device())) @@ -1285,7 +1285,7 @@ static void test_create_surface(void) surface = NULL; hr = IDXGIDevice_CreateSurface(device, &desc, 1, DXGI_USAGE_UNORDERED_ACCESS, NULL, &surface); - ok(SUCCEEDED(hr), "Failed to create a dxgi surface, hr %#x\n", hr); + ok(SUCCEEDED(hr), "Failed to create a dxgi surface, hr %#lx\n", hr); if (surface) { @@ -1293,12 +1293,12 @@ static void test_create_surface(void) ID3D11Device *d3d_device; hr = IDXGISurface_QueryInterface(surface, &IID_ID3D11Texture2D, (void **)&texture2d); - ok(SUCCEEDED(hr), "Failed to get texture interface, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to get texture interface, hr %#lx.\n", hr); ID3D11Texture2D_GetDevice(texture2d, &d3d_device); hr = ID3D11Device_CreateUnorderedAccessView(d3d_device, (ID3D11Resource *)texture2d, NULL, &uav); - ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#lx.\n", hr); ID3D11UnorderedAccessView_Release(uav); ID3D11Device_Release(d3d_device); @@ -1308,7 +1308,7 @@ static void test_create_surface(void) } refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } static void test_parents(void) @@ -1336,16 +1336,16 @@ static void test_parents(void) surface_desc.SampleDesc.Quality = 0; hr = IDXGIDevice_CreateSurface(device, &surface_desc, 1, DXGI_USAGE_RENDER_TARGET_OUTPUT, NULL, &surface); - ok(SUCCEEDED(hr), "Failed to create a dxgi surface, hr %#x\n", hr); + ok(SUCCEEDED(hr), "Failed to create a dxgi surface, hr %#lx\n", hr); hr = IDXGISurface_GetParent(surface, &IID_IDXGIDevice, (void **)&parent); IDXGISurface_Release(surface); - ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "GetParent failed, hr %#lx.\n", hr); ok(parent == (IUnknown *)device, "Got parent %p, expected %p.\n", parent, device); IUnknown_Release(parent); hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "GetAdapter failed, hr %#lx.\n", hr); hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output); if (hr == DXGI_ERROR_NOT_FOUND) @@ -1354,31 +1354,31 @@ static void test_parents(void) } else { - ok(SUCCEEDED(hr), "EnumOutputs failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "EnumOutputs failed, hr %#lx.\n", hr); hr = IDXGIOutput_GetParent(output, &IID_IDXGIAdapter, (void **)&parent); IDXGIOutput_Release(output); - ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "GetParent failed, hr %#lx.\n", hr); ok(parent == (IUnknown *)adapter, "Got parent %p, expected %p.\n", parent, adapter); IUnknown_Release(parent); } hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "GetParent failed, hr %#lx.\n", hr); hr = IDXGIFactory_GetParent(factory, &IID_IUnknown, (void **)&parent); - ok(hr == E_NOINTERFACE, "GetParent returned %#x, expected %#x.\n", hr, E_NOINTERFACE); + ok(hr == E_NOINTERFACE, "GetParent returned %#lx, expected %#lx.\n", hr, E_NOINTERFACE); ok(parent == NULL, "Got parent %p, expected %p.\n", parent, NULL); IDXGIFactory_Release(factory); hr = IDXGIDevice_GetParent(device, &IID_IDXGIAdapter, (void **)&parent); - ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "GetParent failed, hr %#lx.\n", hr); ok(parent == (IUnknown *)adapter, "Got parent %p, expected %p.\n", parent, adapter); IUnknown_Release(parent); IDXGIAdapter_Release(adapter); refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } static void test_output(void) @@ -1399,10 +1399,10 @@ static void test_output(void) } hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "GetAdapter failed, hr %#lx.\n", hr); hr = IDXGIAdapter_EnumOutputs(adapter, 0, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output); if (hr == DXGI_ERROR_NOT_FOUND) @@ -1412,15 +1412,15 @@ static void test_output(void) IDXGIDevice_Release(device); return; } - ok(SUCCEEDED(hr), "EnumOutputs failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "EnumOutputs failed, hr %#lx.\n", hr); hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, NULL, NULL); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count, NULL); ok(SUCCEEDED(hr) || broken(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE), /* Remote Desktop Services / Win 7 testbot */ - "Failed to list modes, hr %#x.\n", hr); + "Failed to list modes, hr %#lx.\n", hr); if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE) { win_skip("GetDisplayModeList() not supported.\n"); @@ -1432,12 +1432,12 @@ static void test_output(void) mode_count_comp = mode_count; hr = IDXGIOutput_GetDisplayModeList(output, 0, 0, &mode_count, NULL); - ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to list modes, hr %#lx.\n", hr); ok(!mode_count, "Got unexpected mode_count %u.\n", mode_count); hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_ENUM_MODES_SCALING, &mode_count, NULL); - ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to list modes, hr %#lx.\n", hr); ok(mode_count >= mode_count_comp, "Got unexpected mode_count %u, expected >= %u.\n", mode_count, mode_count_comp); mode_count_comp = mode_count; @@ -1446,19 +1446,19 @@ static void test_output(void) hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_ENUM_MODES_SCALING, NULL, modes); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); ok(!modes[0].Height, "No output was expected.\n"); mode_count = 0; hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_ENUM_MODES_SCALING, &mode_count, modes); - ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#lx.\n", hr); ok(!modes[0].Height, "No output was expected.\n"); mode_count = mode_count_comp; hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_ENUM_MODES_SCALING, &mode_count, modes); - ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to list modes, hr %#lx.\n", hr); ok(mode_count == mode_count_comp, "Got unexpected mode_count %u, expected %u.\n", mode_count, mode_count_comp); last_width = last_height = 0; @@ -1498,7 +1498,7 @@ static void test_output(void) mode_count += 5; hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_ENUM_MODES_SCALING, &mode_count, modes); - ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to list modes, hr %#lx.\n", hr); ok(mode_count == mode_count_comp, "Got unexpected mode_count %u, expected %u.\n", mode_count, mode_count_comp); if (mode_count_comp) @@ -1506,7 +1506,7 @@ static void test_output(void) mode_count = mode_count_comp - 1; hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_ENUM_MODES_SCALING, &mode_count, modes); - ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#lx.\n", hr); ok(mode_count == mode_count_comp - 1, "Got unexpected mode_count %u, expected %u.\n", mode_count, mode_count_comp - 1); } @@ -1519,7 +1519,7 @@ static void test_output(void) IDXGIOutput_Release(output); IDXGIAdapter_Release(adapter); refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } static void test_find_closest_matching_mode(void) @@ -1544,7 +1544,7 @@ static void test_find_closest_matching_mode(void) } hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "GetAdapter failed, hr %#lx.\n", hr); hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output); if (hr == DXGI_ERROR_NOT_FOUND) @@ -1554,12 +1554,12 @@ static void test_find_closest_matching_mode(void) IDXGIDevice_Release(device); return; } - ok(SUCCEEDED(hr), "EnumOutputs failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "EnumOutputs failed, hr %#lx.\n", hr); memset(&mode, 0, sizeof(mode)); hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL); ok(hr == DXGI_ERROR_INVALID_CALL || broken(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE), /* Win 7 testbot */ - "Got unexpected hr %#x.\n", hr); + "Got unexpected hr %#lx.\n", hr); if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE) { win_skip("FindClosestMatchingMode() not supported.\n"); @@ -1568,42 +1568,42 @@ static void test_find_closest_matching_mode(void) memset(&mode, 0, sizeof(mode)); hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, (IUnknown *)device); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count, NULL); - ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to list modes, hr %#lx.\n", hr); modes = heap_calloc(mode_count, sizeof(*modes)); ok(!!modes, "Failed to allocate memory.\n"); hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count, modes); - ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to list modes, hr %#lx.\n", hr); for (i = 0; i < mode_count; ++i) { mode = modes[i]; hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_mode_desc(&matching_mode, &modes[i], MODE_DESC_IGNORE_SCALING); mode.Format = DXGI_FORMAT_UNKNOWN; hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); mode = modes[i]; mode.Width = 0; hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); mode = modes[i]; mode.Height = 0; hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); mode = modes[i]; mode.Width = mode.Height = 0; hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_mode_desc(&matching_mode, &modes[i], MODE_DESC_IGNORE_SCALING | MODE_DESC_IGNORE_RESOLUTION); ok(matching_mode.Width > 0 && matching_mode.Height > 0, "Got unexpected resolution %ux%u.\n", matching_mode.Width, matching_mode.Height); @@ -1611,7 +1611,7 @@ static void test_find_closest_matching_mode(void) mode = modes[i]; mode.RefreshRate.Numerator = mode.RefreshRate.Denominator = 0; hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_mode_desc(&matching_mode, &modes[i], MODE_DESC_IGNORE_SCALING | MODE_DESC_IGNORE_REFRESH_RATE); ok(matching_mode.RefreshRate.Numerator > 0 && matching_mode.RefreshRate.Denominator > 0, "Got unexpected refresh rate %u / %u.\n", @@ -1620,7 +1620,7 @@ static void test_find_closest_matching_mode(void) mode = modes[i]; mode.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_mode_desc(&matching_mode, &modes[i], MODE_DESC_IGNORE_SCALING | MODE_DESC_IGNORE_SCANLINE_ORDERING); ok(matching_mode.ScanlineOrdering, "Got unexpected scanline ordering %#x.\n", matching_mode.ScanlineOrdering); @@ -1630,7 +1630,7 @@ static void test_find_closest_matching_mode(void) mode.Height = modes[i].Height; mode.Format = DXGI_FORMAT_R8G8B8A8_UNORM; hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_mode_desc(&matching_mode, &modes[i], MODE_DESC_CHECK_RESOLUTION & MODE_DESC_CHECK_FORMAT); memset(&mode, 0, sizeof(mode)); @@ -1638,7 +1638,7 @@ static void test_find_closest_matching_mode(void) mode.Height = modes[i].Height - 1; mode.Format = DXGI_FORMAT_R8G8B8A8_UNORM; hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_mode_desc(&matching_mode, &modes[i], (MODE_DESC_CHECK_RESOLUTION & MODE_DESC_CHECK_FORMAT) | MODE_DESC_IGNORE_EXACT_RESOLUTION); @@ -1647,7 +1647,7 @@ static void test_find_closest_matching_mode(void) mode.Height = modes[i].Height + 1; mode.Format = DXGI_FORMAT_R8G8B8A8_UNORM; hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_mode_desc(&matching_mode, &modes[i], (MODE_DESC_CHECK_RESOLUTION & MODE_DESC_CHECK_FORMAT) | MODE_DESC_IGNORE_EXACT_RESOLUTION); } @@ -1656,7 +1656,7 @@ static void test_find_closest_matching_mode(void) mode.Width = mode.Height = 10; mode.Format = DXGI_FORMAT_R8G8B8A8_UNORM; hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); /* Find mode for the lowest resolution. */ mode = modes[0]; for (i = 0; i < mode_count; ++i) @@ -1672,7 +1672,7 @@ static void test_find_closest_matching_mode(void) mode.Format = modes[0].Format; mode.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UPPER_FIELD_FIRST; hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_mode_desc(&matching_mode, &modes[0], MODE_DESC_CHECK_RESOLUTION & MODE_DESC_CHECK_FORMAT); memset(&mode, 0, sizeof(mode)); @@ -1681,7 +1681,7 @@ static void test_find_closest_matching_mode(void) mode.Format = modes[0].Format; mode.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_LOWER_FIELD_FIRST; hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_mode_desc(&matching_mode, &modes[0], MODE_DESC_CHECK_RESOLUTION & MODE_DESC_CHECK_FORMAT); for (i = 0; i < ARRAY_SIZE(scaling_tests); ++i) @@ -1697,7 +1697,7 @@ static void test_find_closest_matching_mode(void) mode.Format = modes[j].Format; mode.Scaling = modes[j].Scaling; hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); check_mode_desc(&matching_mode, &modes[j], MODE_DESC_IGNORE_REFRESH_RATE | MODE_DESC_IGNORE_SCANLINE_ORDERING); break; @@ -1710,7 +1710,7 @@ done: IDXGIOutput_Release(output); IDXGIAdapter_Release(adapter); refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } struct refresh_rates @@ -1777,87 +1777,87 @@ static void test_create_swapchain(void) ok(hr == S_OK, "IDXGIDevice does not implement IUnknown.\n"); hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get adapter, hr %#lx.\n", hr); hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get parent, hr %#lx.\n", hr); expected_refcount = get_refcount(adapter); refcount = get_refcount(factory); - ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); + ok(refcount == 2, "Got unexpected refcount %lu.\n", refcount); refcount = get_refcount(device); - ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); + ok(refcount == 2, "Got unexpected refcount %lu.\n", refcount); creation_desc.OutputWindow = NULL; hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); creation_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 0, 0, 0, 0, 0, 0); memset(&initial_state, 0, sizeof(initial_state)); capture_fullscreen_state(&initial_state.fullscreen_state, creation_desc.OutputWindow); hr = IDXGIFactory_CreateSwapChain(factory, NULL, &creation_desc, &swapchain); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); hr = IDXGIFactory_CreateSwapChain(factory, obj, NULL, &swapchain); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, NULL); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); - ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create swapchain, hr %#lx.\n", hr); refcount = get_refcount(adapter); - ok(refcount >= expected_refcount, "Got refcount %u, expected >= %u.\n", refcount, expected_refcount); + ok(refcount >= expected_refcount, "Got refcount %lu, expected >= %lu.\n", refcount, expected_refcount); refcount = get_refcount(factory); - todo_wine ok(refcount == 4, "Got unexpected refcount %u.\n", refcount); + todo_wine ok(refcount == 4, "Got unexpected refcount %lu.\n", refcount); refcount = get_refcount(device); - ok(refcount == 3, "Got unexpected refcount %u.\n", refcount); + ok(refcount == 3, "Got unexpected refcount %lu.\n", refcount); hr = IDXGISwapChain_GetDesc(swapchain, NULL); - ok(hr == E_INVALIDARG, "GetDesc unexpectedly returned %#x.\n", hr); + ok(hr == E_INVALIDARG, "GetDesc unexpectedly returned %#lx.\n", hr); hr = IDXGISwapChain_GetParent(swapchain, &IID_IUnknown, (void **)&parent); - ok(hr == S_OK, "Failed to get parent,%#x.\n", hr); + ok(hr == S_OK, "Failed to get parent,%#lx.\n", hr); ok(parent == (IUnknown *)factory, "Got unexpected parent interface pointer %p.\n", parent); refcount = IUnknown_Release(parent); - todo_wine ok(refcount == 4, "Got unexpected refcount %u.\n", refcount); + todo_wine ok(refcount == 4, "Got unexpected refcount %lu.\n", refcount); hr = IDXGISwapChain_GetParent(swapchain, &IID_IDXGIFactory, (void **)&parent); - ok(hr == S_OK, "Failed to get parent,%#x.\n", hr); + ok(hr == S_OK, "Failed to get parent,%#lx.\n", hr); ok(parent == (IUnknown *)factory, "Got unexpected parent interface pointer %p.\n", parent); refcount = IUnknown_Release(parent); - todo_wine ok(refcount == 4, "Got unexpected refcount %u.\n", refcount); + todo_wine ok(refcount == 4, "Got unexpected refcount %lu.\n", refcount); hr = IDXGISwapChain_QueryInterface(swapchain, &IID_IDXGISwapChain1, (void **)&swapchain1); ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, - "Failed to query IDXGISwapChain1 interface, hr %#x.\n", hr); + "Failed to query IDXGISwapChain1 interface, hr %#lx.\n", hr); if (SUCCEEDED(hr)) { hr = IDXGISwapChain1_GetDesc1(swapchain1, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = IDXGISwapChain1_GetDesc1(swapchain1, &swapchain_desc); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!swapchain_desc.Stereo, "Got unexpected stereo %#x.\n", swapchain_desc.Stereo); ok(swapchain_desc.Scaling == DXGI_SCALING_STRETCH, "Got unexpected scaling %#x.\n", swapchain_desc.Scaling); ok(swapchain_desc.AlphaMode == DXGI_ALPHA_MODE_IGNORE, "Got unexpected alpha mode %#x.\n", swapchain_desc.AlphaMode); hr = IDXGISwapChain1_GetFullscreenDesc(swapchain1, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = IDXGISwapChain1_GetFullscreenDesc(swapchain1, &fullscreen_desc); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(fullscreen_desc.Windowed == creation_desc.Windowed, "Got unexpected windowed %#x.\n", fullscreen_desc.Windowed); hr = IDXGISwapChain1_GetHwnd(swapchain1, &window); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(window == creation_desc.OutputWindow, "Got unexpected window %p.\n", window); IDXGISwapChain1_Release(swapchain1); } refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "Swapchain has %u references left.\n", refcount); + ok(!refcount, "Swapchain has %lu references left.\n", refcount); refcount = get_refcount(factory); - ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); + ok(refcount == 2, "Got unexpected refcount %lu.\n", refcount); for (i = 0; i < ARRAY_SIZE(refresh_list); ++i) { @@ -1865,10 +1865,10 @@ static void test_create_swapchain(void) creation_desc.BufferDesc.RefreshRate.Denominator = refresh_list[i].denominator; hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); - ok(hr == S_OK, "Test %u: Failed to create swapchain, hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Failed to create swapchain, hr %#lx.\n", i, hr); hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); - ok(hr == S_OK, "Test %u: Failed to get swapchain desc, hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Failed to get swapchain desc, hr %#lx.\n", i, hr); ok(result_desc.Windowed == creation_desc.Windowed, "Test %u: Got unexpected windowed %#x.\n", i, result_desc.Windowed); @@ -1884,19 +1884,19 @@ static void test_create_swapchain(void) fullscreen = 0xdeadbeef; target = (void *)0xdeadbeef; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &target); - ok(hr == S_OK, "Test %u: Failed to get fullscreen state, hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Failed to get fullscreen state, hr %#lx.\n", i, hr); ok(!fullscreen, "Test %u: Got unexpected fullscreen %#x.\n", i, fullscreen); ok(!target, "Test %u: Got unexpected target %p.\n", i, target); hr = IDXGISwapChain_GetFullscreenState(swapchain, NULL, NULL); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); fullscreen = 0xdeadbeef; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); ok(!fullscreen, "Test %u: Got unexpected fullscreen %#x.\n", i, fullscreen); target = (void *)0xdeadbeef; hr = IDXGISwapChain_GetFullscreenState(swapchain, NULL, &target); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); ok(!target, "Test %u: Got unexpected target %p.\n", i, target); check_swapchain_fullscreen_state(swapchain, &initial_state); @@ -1913,7 +1913,7 @@ static void test_create_swapchain(void) ok(hr == S_OK, "IDXGIDevice does not implement IUnknown.\n"); hr = IDXGIFactory_CreateSwapChain(factory, obj2, &creation_desc, &swapchain); - ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create swapchain, hr %#lx.\n", hr); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface1, (void **)&surface); if (SUCCEEDED(hr)) @@ -1921,7 +1921,7 @@ static void test_create_swapchain(void) HDC hdc; hr = IDXGISurface1_GetDC(surface, FALSE, &hdc); - ok(FAILED(hr), "Expected GetDC() to fail, %#x\n", hr); + ok(FAILED(hr), "Expected GetDC() to fail, %#lx\n", hr); IDXGISurface1_Release(surface); IDXGISwapChain_Release(swapchain); @@ -1930,16 +1930,16 @@ static void test_create_swapchain(void) creation_desc.Flags = DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE; hr = IDXGIFactory_CreateSwapChain(factory, obj2, &creation_desc, &swapchain); - ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create swapchain, hr %#lx.\n", hr); creation_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; creation_desc.Flags = 0; hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface1, (void **)&surface); - ok(hr == S_OK, "Failed to get front buffer, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get front buffer, hr %#lx.\n", hr); hr = IDXGISurface1_GetDC(surface, FALSE, &hdc); - ok(hr == S_OK, "Expected GetDC() to succeed, %#x\n", hr); + ok(hr == S_OK, "Expected GetDC() to succeed, %#lx\n", hr); IDXGISurface1_ReleaseDC(surface, NULL); IDXGISurface1_Release(surface); @@ -1961,10 +1961,10 @@ static void test_create_swapchain(void) creation_desc.BufferDesc.RefreshRate.Denominator = refresh_list[i].denominator; hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); - ok(SUCCEEDED(hr), "Test %u: Failed to create swapchain, hr %#x.\n", i, hr); + ok(SUCCEEDED(hr), "Test %u: Failed to create swapchain, hr %#lx.\n", i, hr); hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); - ok(hr == S_OK, "Test %u: Failed to get swapchain desc, hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Failed to get swapchain desc, hr %#lx.\n", i, hr); /* When numerator is non-zero and denominator is zero, the windowed mode is used. * Additionally, some versions of WARP seem to always fail to change fullscreen state. */ @@ -1982,7 +1982,7 @@ static void test_create_swapchain(void) fullscreen = FALSE; target = NULL; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &target); - ok(hr == S_OK, "Test %u: Failed to get fullscreen state, hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Failed to get fullscreen state, hr %#lx.\n", i, hr); ok(fullscreen == !result_desc.Windowed, "Test %u: Got fullscreen %#x, expected %#x.\n", i, fullscreen, result_desc.Windowed); ok(result_desc.Windowed ? !target : !!target, "Test %u: Got unexpected target %p.\n", i, target); @@ -1990,7 +1990,7 @@ static void test_create_swapchain(void) { IDXGIOutput *containing_output; hr = IDXGISwapChain_GetContainingOutput(swapchain, &containing_output); - ok(hr == S_OK, "Test %u: Failed to get containing output, hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Failed to get containing output, hr %#lx.\n", i, hr); ok(containing_output == target, "Test %u: Got unexpected containing output pointer %p.\n", i, containing_output); IDXGIOutput_Release(containing_output); @@ -2001,25 +2001,25 @@ static void test_create_swapchain(void) IDXGIOutput_Release(target); hr = IDXGISwapChain_GetFullscreenState(swapchain, NULL, NULL); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); fullscreen = FALSE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); ok(fullscreen, "Test %u: Got unexpected fullscreen %#x.\n", i, fullscreen); target = NULL; hr = IDXGISwapChain_GetFullscreenState(swapchain, NULL, &target); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); ok(!!target, "Test %u: Got unexpected target %p.\n", i, target); IDXGIOutput_Release(target); } hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(hr == S_OK, "Test %u: Failed to set fullscreen state, hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Failed to set fullscreen state, hr %#lx.\n", i, hr); fullscreen = 0xdeadbeef; target = (void *)0xdeadbeef; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &target); - ok(hr == S_OK, "Test %u: Failed to get fullscreen state, hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Failed to get fullscreen state, hr %#lx.\n", i, hr); ok(!fullscreen, "Test %u: Got unexpected fullscreen %#x.\n", i, fullscreen); ok(!target, "Test %u: Got unexpected target %p.\n", i, target); @@ -2034,16 +2034,16 @@ static void test_create_swapchain(void) creation_desc.Windowed = TRUE; creation_desc.Flags = 0; hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); creation_desc.Windowed = FALSE; hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); creation_desc.BufferCount = 2; creation_desc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_DISCARD; hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); - ok(hr == E_INVALIDARG || hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG || hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); creation_desc.BufferCount = 1; creation_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; @@ -2063,9 +2063,9 @@ static void test_create_swapchain(void) creation_desc.Windowed = TRUE; creation_desc.Flags = 0; hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); - ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create swapchain, hr %#lx.\n", hr); hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); - ok(hr == S_OK, "Failed to get swapchain desc, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get swapchain desc, hr %#lx.\n", hr); ok(result_desc.BufferDesc.Width == expected_width, "Got width %u, expected %u.\n", result_desc.BufferDesc.Width, expected_width); ok(result_desc.BufferDesc.Height == expected_height, "Got height %u, expected %u.\n", @@ -2087,9 +2087,9 @@ static void test_create_swapchain(void) creation_desc.BufferDesc.Width = 0; creation_desc.BufferDesc.Height = 0; hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); - ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create swapchain, hr %#lx.\n", hr); hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); - ok(hr == S_OK, "Failed to get swapchain desc, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get swapchain desc, hr %#lx.\n", hr); ok(result_desc.BufferDesc.Width == expected_width, "Got width %u, expected %u.\n", result_desc.BufferDesc.Width, expected_width); ok(result_desc.BufferDesc.Height == expected_height, "Got height %u, expected %u.\n", @@ -2110,9 +2110,9 @@ static void test_create_swapchain(void) creation_desc.BufferDesc.Width = 0; creation_desc.BufferDesc.Height = 0; hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); - ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create swapchain, hr %#lx.\n", hr); hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); - ok(hr == S_OK, "Failed to get swapchain desc, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get swapchain desc, hr %#lx.\n", hr); ok(result_desc.BufferDesc.Width == expected_width, "Got width %u, expected %u.\n", result_desc.BufferDesc.Width, expected_width); ok(result_desc.BufferDesc.Height == expected_height, "Got height %u, expected %u.\n", @@ -2127,14 +2127,14 @@ static void test_create_swapchain(void) /* Fullscreen */ creation_desc.Windowed = FALSE; hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); - ok(SUCCEEDED(hr), "Failed to create swapchain, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to create swapchain, hr %#lx.\n", hr); hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); - ok(hr == S_OK, "Failed to get swapchain desc, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get swapchain desc, hr %#lx.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(hr == S_OK, "Failed to set fullscreen state, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set fullscreen state, hr %#lx.\n", hr); hr = IDXGISwapChain_GetContainingOutput(swapchain, &expected_state.target); ok(hr == S_OK || broken(hr == DXGI_ERROR_UNSUPPORTED) /* Win 7 testbot */, - "Failed to get containing output, hr %#x.\n", hr); + "Failed to get containing output, hr %#lx.\n", hr); check_swapchain_fullscreen_state(swapchain, &initial_state); IDXGISwapChain_Release(swapchain); if (hr == DXGI_ERROR_UNSUPPORTED) @@ -2159,16 +2159,16 @@ static void test_create_swapchain(void) expected_height = expected_client_rect->bottom - expected_client_rect->top; hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); - ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create swapchain, hr %#lx.\n", hr); hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); - ok(hr == S_OK, "Failed to get swapchain desc, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get swapchain desc, hr %#lx.\n", hr); todo_wine ok(result_desc.BufferDesc.Width == expected_width, "Got width %u, expected %u.\n", result_desc.BufferDesc.Width, expected_width); todo_wine ok(result_desc.BufferDesc.Height == expected_height, "Got height %u, expected %u.\n", result_desc.BufferDesc.Height, expected_height); check_swapchain_fullscreen_state(swapchain, &expected_state); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(hr == S_OK, "Failed to set fullscreen state, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set fullscreen state, hr %#lx.\n", hr); check_swapchain_fullscreen_state(swapchain, &initial_state); IDXGISwapChain_Release(swapchain); @@ -2183,16 +2183,16 @@ static void test_create_swapchain(void) expected_height = expected_client_rect->bottom - expected_client_rect->top; hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); - ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create swapchain, hr %#lx.\n", hr); hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); - ok(hr == S_OK, "Failed to get swapchain desc, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get swapchain desc, hr %#lx.\n", hr); todo_wine ok(result_desc.BufferDesc.Width == expected_width, "Got width %u, expected %u.\n", result_desc.BufferDesc.Width, expected_width); todo_wine ok(result_desc.BufferDesc.Height == expected_height, "Got height %u, expected %u.\n", result_desc.BufferDesc.Height, expected_height); check_swapchain_fullscreen_state(swapchain, &expected_state); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(hr == S_OK, "Failed to set fullscreen state, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set fullscreen state, hr %#lx.\n", hr); check_swapchain_fullscreen_state(swapchain, &initial_state); IDXGISwapChain_Release(swapchain); @@ -2201,11 +2201,11 @@ static void test_create_swapchain(void) done: IUnknown_Release(obj); refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); refcount = IDXGIAdapter_Release(adapter); - ok(!refcount, "Adapter has %u references left.\n", refcount); + ok(!refcount, "Adapter has %lu references left.\n", refcount); refcount = IDXGIFactory_Release(factory); - ok(!refcount, "Factory has %u references left.\n", refcount); + ok(!refcount, "Factory has %lu references left.\n", refcount); check_window_fullscreen_state(creation_desc.OutputWindow, &initial_state.fullscreen_state); DestroyWindow(creation_desc.OutputWindow); } @@ -2238,7 +2238,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) output_count = 0; while ((hr = IDXGIAdapter_EnumOutputs(adapter, output_count, &output)) != DXGI_ERROR_NOT_FOUND) { - ok(SUCCEEDED(hr), "Failed to enumerate output %u, hr %#x.\n", output_count, hr); + ok(SUCCEEDED(hr), "Failed to enumerate output %u, hr %#lx.\n", output_count, hr); IDXGIOutput_Release(output); ++output_count; } @@ -2263,7 +2263,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) get_factory(device, is_d3d12, &factory); hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); - ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#lx.\n", hr); monitor = MonitorFromWindow(swapchain_desc.OutputWindow, 0); ok(!!monitor, "MonitorFromWindow failed.\n"); @@ -2274,7 +2274,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) hr = IDXGISwapChain_GetContainingOutput(swapchain, &output); ok(SUCCEEDED(hr) || broken(hr == DXGI_ERROR_UNSUPPORTED) /* Win 7 testbot */, - "GetContainingOutput failed, hr %#x.\n", hr); + "GetContainingOutput failed, hr %#lx.\n", hr); if (hr == DXGI_ERROR_UNSUPPORTED) { win_skip("GetContainingOutput() not supported.\n"); @@ -2282,17 +2282,17 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) } hr = IDXGIOutput_GetDesc(output, &output_desc); - ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "GetDesc failed, hr %#lx.\n", hr); hr = IDXGISwapChain_GetContainingOutput(swapchain, &output2); - ok(SUCCEEDED(hr), "GetContainingOutput failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "GetContainingOutput failed, hr %#lx.\n", hr); ok(output != output2, "Got unexpected output pointers %p, %p.\n", output, output2); check_output_equal(output, output2); refcount = IDXGIOutput_Release(output); - ok(!refcount, "IDXGIOutput has %u references left.\n", refcount); + ok(!refcount, "IDXGIOutput has %lu references left.\n", refcount); refcount = IDXGIOutput_Release(output2); - ok(!refcount, "IDXGIOutput has %u references left.\n", refcount); + ok(!refcount, "IDXGIOutput has %lu references left.\n", refcount); ok(!lstrcmpW(output_desc.DeviceName, monitor_info.szDevice), "Got unexpected device name %s, expected %s.\n", @@ -2309,7 +2309,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) ++output_idx) { hr = IDXGIOutput_GetDesc(output, &output_desc); - ok(SUCCEEDED(hr), "Adapter %u output %u: GetDesc failed, hr %#x.\n", adapter_idx, + ok(SUCCEEDED(hr), "Adapter %u output %u: GetDesc failed, hr %#lx.\n", adapter_idx, output_idx, hr); /* Move the OutputWindow to the current output. */ @@ -2320,7 +2320,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) hr = IDXGISwapChain_GetContainingOutput(swapchain, &output2); if (FAILED(hr)) { - win_skip("Adapter %u output %u: GetContainingOutput failed, hr %#x.\n", + win_skip("Adapter %u output %u: GetContainingOutput failed, hr %#lx.\n", adapter_idx, output_idx, hr); IDXGIOutput_Release(output); continue; @@ -2329,7 +2329,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) check_output_equal(output, output2); refcount = IDXGIOutput_Release(output2); - ok(!refcount, "Adapter %u output %u: IDXGIOutput has %u references left.\n", + ok(!refcount, "Adapter %u output %u: IDXGIOutput has %lu references left.\n", adapter_idx, output_idx, refcount); /* Move the OutputWindow around the corners of the current output desktop coordinates. */ @@ -2393,17 +2393,17 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) hr = IDXGISwapChain_GetContainingOutput(swapchain, &output2); ok(hr == S_OK || broken(hr == DXGI_ERROR_UNSUPPORTED), - "Adapter %u output %u point %u: Failed to get containing output, hr %#x.\n", + "Adapter %u output %u point %u: Failed to get containing output, hr %#lx.\n", adapter_idx, output_idx, i, hr); if (hr != S_OK) continue; ok(!!output2, "Adapter %u output %u point %u: Got unexpected containing output %p.\n", adapter_idx, output_idx, i, output2); hr = IDXGIOutput_GetDesc(output2, &output_desc); - ok(hr == S_OK, "Adapter %u output %u point %u: Failed to get output desc, hr %#x.\n", + ok(hr == S_OK, "Adapter %u output %u point %u: Failed to get output desc, hr %#lx.\n", adapter_idx, output_idx, i, hr); refcount = IDXGIOutput_Release(output2); - ok(!refcount, "Adapter %u output %u point %u: IDXGIOutput has %u references left.\n", + ok(!refcount, "Adapter %u output %u point %u: IDXGIOutput has %lu references left.\n", adapter_idx, output_idx, i, refcount); ok(!lstrcmpW(output_desc.DeviceName, monitor_info.szDevice), @@ -2426,14 +2426,14 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); if (FAILED(hr)) { - skip("SetFullscreenState failed, hr %#x.\n", hr); + skip("SetFullscreenState failed, hr %#lx.\n", hr); goto done; } hr = IDXGISwapChain_GetContainingOutput(swapchain, &output2); if (FAILED(hr)) { - win_skip("GetContainingOutput failed, hr %#x.\n", hr); + win_skip("GetContainingOutput failed, hr %#lx.\n", hr); IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); goto done; } @@ -2445,7 +2445,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) ++output_idx) { hr = IDXGIOutput_GetDesc(output, &output_desc); - ok(hr == S_OK, "Adapter %u output %u: GetDesc failed, hr %#x.\n", adapter_idx, + ok(hr == S_OK, "Adapter %u output %u: GetDesc failed, hr %#lx.\n", adapter_idx, output_idx, hr); IDXGIOutput_Release(output); @@ -2455,7 +2455,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) ok(ret, "Adapter %u output %u: SetWindowPos failed.\n", adapter_idx, output_idx); hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &output); - ok(hr == S_OK, "Adapter %u output %u: GetFullscreenState failed, hr %#x.\n", + ok(hr == S_OK, "Adapter %u output %u: GetFullscreenState failed, hr %#lx.\n", adapter_idx, output_idx, hr); ok(fullscreen, "Adapter %u output %u: Expect swapchain full screen.\n", adapter_idx, output_idx); @@ -2464,7 +2464,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) IDXGIOutput_Release(output); hr = IDXGISwapChain_GetContainingOutput(swapchain, &output); - ok(hr == S_OK, "Adapter %u output %u: GetContainingOutput failed, hr %#x.\n", + ok(hr == S_OK, "Adapter %u output %u: GetContainingOutput failed, hr %#lx.\n", adapter_idx, output_idx, hr); ok(output == output2, "Adapter %u output %u: Expect output %p, got %p.\n", adapter_idx, output_idx, output2, output); @@ -2475,7 +2475,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) IDXGIOutput_Release(output2); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(hr == S_OK, "SetFullscreenState failed, hr %#x.\n", hr); + ok(hr == S_OK, "SetFullscreenState failed, hr %#lx.\n", hr); /* Test GetContainingOutput after a full screen swapchain is made windowed by pressing * Alt+Enter, then move it to another output and use Alt+Enter to enter full screen */ @@ -2502,7 +2502,7 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) IDXGIOutput_Release(output); if (FAILED(hr)) { - skip("SetFullscreenState failed, hr %#x.\n", hr); + skip("SetFullscreenState failed, hr %#lx.\n", hr); IDXGIOutput_Release(output2); goto done; } @@ -2512,12 +2512,12 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) (MapVirtualKeyA(VK_RETURN, MAPVK_VK_TO_VSC) << 16) | 0x20000001); flush_events(); hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - ok(hr == S_OK, "GetFullscreenState failed, hr %#x.\n", hr); + ok(hr == S_OK, "GetFullscreenState failed, hr %#lx.\n", hr); ok(!fullscreen, "Expect swapchain not full screen.\n"); /* Move the swapchain output window to the second output */ hr = IDXGIOutput_GetDesc(output2, &output_desc2); - ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); + ok(hr == S_OK, "GetDesc failed, hr %#lx.\n", hr); ret = SetWindowPos(swapchain_desc.OutputWindow, 0, output_desc2.DesktopCoordinates.left, output_desc2.DesktopCoordinates.top, 0, 0, SWP_NOSIZE | SWP_NOZORDER); ok(ret, "SetWindowPos failed.\n"); @@ -2528,13 +2528,13 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) flush_events(); output = NULL; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &output); - ok(hr == S_OK, "GetFullscreenState failed, hr %#x.\n", hr); + ok(hr == S_OK, "GetFullscreenState failed, hr %#lx.\n", hr); ok(fullscreen, "Expect swapchain full screen.\n"); ok(!!output, "Expect output not NULL.\n"); hr = IDXGIOutput_GetDesc(output, &output_desc); - ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); + ok(hr == S_OK, "GetDesc failed, hr %#lx.\n", hr); hr = IDXGIOutput_GetDesc(output2, &output_desc2); - ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); + ok(hr == S_OK, "GetDesc failed, hr %#lx.\n", hr); ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), "Expect device name %s, got %s.\n", wine_dbgstr_w(output_desc2.DeviceName), wine_dbgstr_w(output_desc.DeviceName)); @@ -2542,17 +2542,17 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) output = NULL; hr = IDXGISwapChain_GetContainingOutput(swapchain, &output); - ok(hr == S_OK, "GetContainingOutput failed, hr %#x.\n", hr); + ok(hr == S_OK, "GetContainingOutput failed, hr %#lx.\n", hr); hr = IDXGIOutput_GetDesc(output, &output_desc); - ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); + ok(hr == S_OK, "GetDesc failed, hr %#lx.\n", hr); hr = IDXGIOutput_GetDesc(output2, &output_desc2); - ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); + ok(hr == S_OK, "GetDesc failed, hr %#lx.\n", hr); ok(!lstrcmpW(output_desc.DeviceName, output_desc2.DeviceName), "Expect device name %s, got %s.\n", wine_dbgstr_w(output_desc2.DeviceName), wine_dbgstr_w(output_desc.DeviceName)); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(hr == S_OK, "SetFullscreenState failed, hr %#x.\n", hr); + ok(hr == S_OK, "SetFullscreenState failed, hr %#lx.\n", hr); } else { @@ -2566,9 +2566,9 @@ static void test_get_containing_output(IUnknown *device, BOOL is_d3d12) done: refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount); refcount = IDXGIFactory_Release(factory); - ok(refcount == !is_d3d12, "IDXGIFactory has %u references left.\n", refcount); + ok(refcount == !is_d3d12, "IDXGIFactory has %lu references left.\n", refcount); DestroyWindow(swapchain_desc.OutputWindow); } @@ -2585,7 +2585,7 @@ static void test_swapchain_fullscreen_state(IDXGISwapChain *swapchain, BOOL ret; hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc); - ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "GetDesc failed, hr %#lx.\n", hr); check_swapchain_fullscreen_state(swapchain, initial_state); @@ -2593,10 +2593,10 @@ static void test_swapchain_fullscreen_state(IDXGISwapChain *swapchain, compute_expected_swapchain_fullscreen_state_after_fullscreen_change(&expected_state, &swapchain_desc, &initial_state->fullscreen_state.monitor_rect, 800, 600, NULL); hr = IDXGISwapChain_GetContainingOutput(swapchain, &expected_state.target); - ok(SUCCEEDED(hr), "GetContainingOutput failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "GetContainingOutput failed, hr %#lx.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); - ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#lx.\n", hr); if (FAILED(hr)) { skip("Could not change fullscreen state.\n"); @@ -2606,15 +2606,15 @@ static void test_swapchain_fullscreen_state(IDXGISwapChain *swapchain, check_swapchain_fullscreen_state(swapchain, &expected_state); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_swapchain_fullscreen_state(swapchain, &expected_state); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#lx.\n", hr); check_swapchain_fullscreen_state(swapchain, initial_state); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_swapchain_fullscreen_state(swapchain, initial_state); IDXGIOutput_Release(expected_state.target); @@ -2632,10 +2632,10 @@ static void test_swapchain_fullscreen_state(IDXGISwapChain *swapchain, for (i = 0; i < output_count; ++i) { hr = IDXGIAdapter_EnumOutputs(adapter, i, &output); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGIOutput_GetDesc(output, &output_desc); - ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "GetDesc failed, hr %#lx.\n", hr); output_monitor_info[i].cbSize = sizeof(*output_monitor_info); ret = GetMonitorInfoW(output_desc.Monitor, (MONITORINFO *)&output_monitor_info[i]); @@ -2651,9 +2651,9 @@ static void test_swapchain_fullscreen_state(IDXGISwapChain *swapchain, BOOL fullscreen; hr = IDXGIAdapter_EnumOutputs(adapter, i, &output); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGIOutput_GetDesc(output, &output_desc); - ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "GetDesc failed, hr %#lx.\n", hr); expected_state = *initial_state; expected_state.target = output; @@ -2663,33 +2663,33 @@ static void test_swapchain_fullscreen_state(IDXGISwapChain *swapchain, &swapchain_desc, &orig_monitor_rect, 800, 600, NULL); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, output); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_swapchain_fullscreen_state(swapchain, &expected_state); target = NULL; hr = IDXGISwapChain_GetFullscreenState(swapchain, NULL, &target); - ok(SUCCEEDED(hr), "GetFullscreenState failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "GetFullscreenState failed, hr %#lx.\n", hr); ok(target == output, "Got target pointer %p, expected %p.\n", target, output); IDXGIOutput_Release(target); fullscreen = FALSE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - ok(SUCCEEDED(hr), "GetFullscreenState failed, hr %#x.\n", hr); - ok(fullscreen, "Got unexpected fullscreen %#x.\n", hr); + ok(SUCCEEDED(hr), "GetFullscreenState failed, hr %#lx.\n", hr); + ok(fullscreen, "Got unexpected fullscreen %#lx.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, output); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_swapchain_fullscreen_state(swapchain, &expected_state); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, output); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); check_swapchain_fullscreen_state(swapchain, &expected_state); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_swapchain_fullscreen_state(swapchain, initial_state); fullscreen = TRUE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - ok(SUCCEEDED(hr), "GetFullscreenState failed, hr %#x.\n", hr); - ok(!fullscreen, "Got unexpected fullscreen %#x.\n", hr); + ok(SUCCEEDED(hr), "GetFullscreenState failed, hr %#lx.\n", hr); + ok(!fullscreen, "Got unexpected fullscreen %#lx.\n", hr); check_swapchain_fullscreen_state(swapchain, initial_state); monitor_info.cbSize = sizeof(monitor_info); @@ -2699,22 +2699,22 @@ static void test_swapchain_fullscreen_state(IDXGISwapChain *swapchain, wine_dbgstr_rect(&monitor_info.rcMonitor), wine_dbgstr_rect(&orig_monitor_rect)); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, output); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); IDXGIOutput_Release(output); } hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_swapchain_fullscreen_state(swapchain, initial_state); for (i = 0; i < output_count; ++i) { hr = IDXGIAdapter_EnumOutputs(adapter, i, &output); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGIOutput_GetDesc(output, &output_desc); - ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "GetDesc failed, hr %#lx.\n", hr); monitor_info.cbSize = sizeof(monitor_info); ret = GetMonitorInfoW(output_desc.Monitor, (MONITORINFO *)&monitor_info); @@ -2764,105 +2764,105 @@ static void test_set_fullscreen(IUnknown *device, BOOL is_d3d12) memset(&initial_state, 0, sizeof(initial_state)); capture_fullscreen_state(&initial_state.fullscreen_state, swapchain_desc.OutputWindow); hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); - ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#lx.\n", hr); hr = IDXGISwapChain_GetContainingOutput(swapchain, &output); ok(SUCCEEDED(hr) || broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */ - "Failed to get containing output, hr %#x.\n", hr); + "Failed to get containing output, hr %#lx.\n", hr); if (FAILED(hr)) { skip("Could not get output.\n"); goto done; } hr = IDXGIOutput_GetParent(output, &IID_IDXGIAdapter, (void **)&adapter); - ok(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get parent, hr %#lx.\n", hr); IDXGIOutput_Release(output); check_swapchain_fullscreen_state(swapchain, &initial_state); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); ok(SUCCEEDED(hr) || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE || broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */ - "SetFullscreenState failed, hr %#x.\n", hr); + "SetFullscreenState failed, hr %#lx.\n", hr); if (FAILED(hr)) { skip("Could not change fullscreen state.\n"); goto done; } hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount); DestroyWindow(swapchain_desc.OutputWindow); swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); - ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#lx.\n", hr); check_swapchain_fullscreen_state(swapchain, &initial_state); test_swapchain_fullscreen_state(swapchain, adapter, &initial_state); refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount); DestroyWindow(swapchain_desc.OutputWindow); swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); DestroyWindow(swapchain_desc.OutputWindow); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); - ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#lx.\n", hr); hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount); swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); DestroyWindow(swapchain_desc.OutputWindow); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); - ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#lx.\n", hr); hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount); swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); swapchain_desc.Flags = DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH; hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); - ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#lx.\n", hr); check_swapchain_fullscreen_state(swapchain, &initial_state); test_swapchain_fullscreen_state(swapchain, adapter, &initial_state); @@ -2870,12 +2870,12 @@ done: if (adapter) IDXGIAdapter_Release(adapter); refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount); check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); DestroyWindow(swapchain_desc.OutputWindow); refcount = IDXGIFactory_Release(factory); - ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); + ok(refcount == !is_d3d12, "Got unexpected refcount %lu.\n", refcount); } static void test_default_fullscreen_target_output(IUnknown *device, BOOL is_d3d12) @@ -2919,11 +2919,11 @@ static void test_default_fullscreen_target_output(IUnknown *device, BOOL is_d3d1 swapchain_desc.OutputWindow = create_window(); swapchain_desc.Windowed = TRUE; hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); - ok(SUCCEEDED(hr), "Adapter %u output %u: CreateSwapChain failed, hr %#x.\n", + ok(SUCCEEDED(hr), "Adapter %u output %u: CreateSwapChain failed, hr %#lx.\n", adapter_idx, output_idx, hr); hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &containing_output); - ok(SUCCEEDED(hr), "Adapter %u output %u: GetFullscreenState failed, hr %#x.\n", + ok(SUCCEEDED(hr), "Adapter %u output %u: GetFullscreenState failed, hr %#lx.\n", adapter_idx, output_idx, hr); ok(!fullscreen, "Adapter %u output %u: Expected not fullscreen.\n", adapter_idx, output_idx); @@ -2932,17 +2932,17 @@ static void test_default_fullscreen_target_output(IUnknown *device, BOOL is_d3d1 /* Move the OutputWindow to the current output. */ hr = IDXGIOutput_GetDesc(output, &output_desc); - ok(SUCCEEDED(hr), "Adapter %u output %u: GetDesc failed, hr %#x.\n", adapter_idx, + ok(SUCCEEDED(hr), "Adapter %u output %u: GetDesc failed, hr %#lx.\n", adapter_idx, output_idx, hr); ret = SetWindowPos(swapchain_desc.OutputWindow, 0, output_desc.DesktopCoordinates.left, output_desc.DesktopCoordinates.top, 0, 0, SWP_NOSIZE | SWP_NOZORDER); - ok(ret, "Adapter %u output %u: SetWindowPos failed, error %#x.\n", adapter_idx, + ok(ret, "Adapter %u output %u: SetWindowPos failed, error %#lx.\n", adapter_idx, output_idx, GetLastError()); hr = IDXGISwapChain_GetContainingOutput(swapchain, &containing_output); ok(SUCCEEDED(hr) || broken(hr == DXGI_ERROR_UNSUPPORTED) /* Win 7 testbot */, - "Adapter %u output %u: GetContainingOutput failed, hr %#x.\n", adapter_idx, + "Adapter %u output %u: GetContainingOutput failed, hr %#lx.\n", adapter_idx, output_idx, hr); if (hr == DXGI_ERROR_UNSUPPORTED) { @@ -2956,7 +2956,7 @@ static void test_default_fullscreen_target_output(IUnknown *device, BOOL is_d3d1 hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); ok(SUCCEEDED(hr) || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, - "Adapter %u output %u: SetFullscreenState failed, hr %#x.\n", adapter_idx, + "Adapter %u output %u: SetFullscreenState failed, hr %#lx.\n", adapter_idx, output_idx, hr); if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE) { @@ -2976,7 +2976,7 @@ static void test_default_fullscreen_target_output(IUnknown *device, BOOL is_d3d1 target = NULL; hr = IDXGISwapChain_GetFullscreenState(swapchain, NULL, &target); - ok(SUCCEEDED(hr), "Adapter %u output %u: GetFullscreenState failed, hr %#x.\n", + ok(SUCCEEDED(hr), "Adapter %u output %u: GetFullscreenState failed, hr %#lx.\n", adapter_idx, output_idx, hr); ok(target != containing_output, "Adapter %u output %u: Got unexpected output %p, expected %p.\n", adapter_idx, @@ -2984,27 +2984,27 @@ static void test_default_fullscreen_target_output(IUnknown *device, BOOL is_d3d1 check_output_equal(target, containing_output); refcount = IDXGIOutput_Release(containing_output); - ok(!refcount, "Adapter %u output %u: IDXGIOutput has %u references left.\n", + ok(!refcount, "Adapter %u output %u: IDXGIOutput has %lu references left.\n", adapter_idx, output_idx, refcount); hr = IDXGISwapChain_GetContainingOutput(swapchain, &containing_output); - ok(SUCCEEDED(hr), "Adapter %u output %u: GetContainingOutput failed, hr %#x.\n", + ok(SUCCEEDED(hr), "Adapter %u output %u: GetContainingOutput failed, hr %#lx.\n", adapter_idx, output_idx, hr); ok(containing_output == target, "Adapter %u output %u: Got unexpected containing output %p, expected %p.\n", adapter_idx, output_idx, containing_output, target); refcount = IDXGIOutput_Release(containing_output); - ok(refcount >= 2, "Adapter %u output %u: Got unexpected refcount %u.\n", adapter_idx, + ok(refcount >= 2, "Adapter %u output %u: Got unexpected refcount %lu.\n", adapter_idx, output_idx, refcount); refcount = IDXGIOutput_Release(target); - ok(refcount >= 1, "Adapter %u output %u: Got unexpected refcount %u.\n", adapter_idx, + ok(refcount >= 1, "Adapter %u output %u: Got unexpected refcount %lu.\n", adapter_idx, output_idx, refcount); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(SUCCEEDED(hr), "Adapter %u output %u: SetFullscreenState failed, hr %#x.\n", + ok(SUCCEEDED(hr), "Adapter %u output %u: SetFullscreenState failed, hr %#lx.\n", adapter_idx, output_idx, hr); refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "Adapter %u output %u: IDXGISwapChain has %u references left.\n", + ok(!refcount, "Adapter %u output %u: IDXGISwapChain has %lu references left.\n", adapter_idx, output_idx, refcount); DestroyWindow(swapchain_desc.OutputWindow); @@ -3017,12 +3017,12 @@ static void test_default_fullscreen_target_output(IUnknown *device, BOOL is_d3d1 swapchain_desc.Windowed = FALSE; ret = SetWindowPos(swapchain_desc.OutputWindow, 0, output_desc.DesktopCoordinates.left, output_desc.DesktopCoordinates.top, 0, 0, SWP_NOSIZE | SWP_NOZORDER); - ok(ret, "Adapter %u output %u: SetWindowPos failed, error %#x.\n", adapter_idx, + ok(ret, "Adapter %u output %u: SetWindowPos failed, error %#lx.\n", adapter_idx, output_idx, GetLastError()); hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); if (FAILED(hr)) { - skip("Adapter %u output %u: CreateSwapChain failed, hr %#x.\n", adapter_idx, + skip("Adapter %u output %u: CreateSwapChain failed, hr %#lx.\n", adapter_idx, output_idx, hr); IDXGIOutput_Release(output); DestroyWindow(swapchain_desc.OutputWindow); @@ -3030,7 +3030,7 @@ static void test_default_fullscreen_target_output(IUnknown *device, BOOL is_d3d1 } hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &containing_output); - ok(SUCCEEDED(hr), "Adapter %u output %u: GetFullscreenState failed, hr %#x.\n", + ok(SUCCEEDED(hr), "Adapter %u output %u: GetFullscreenState failed, hr %#lx.\n", adapter_idx, output_idx, hr); ok(fullscreen, "Adapter %u output %u: Expected fullscreen.\n", adapter_idx, output_idx); ok(!!containing_output, "Adapter %u output %u: Expected a valid output.\n", adapter_idx, @@ -3039,7 +3039,7 @@ static void test_default_fullscreen_target_output(IUnknown *device, BOOL is_d3d1 IDXGIOutput_Release(containing_output); ret = GetWindowRect(swapchain_desc.OutputWindow, &window_rect); - ok(ret, "Adapter %u output %u: GetWindowRect failed, error %#x.\n", adapter_idx, + ok(ret, "Adapter %u output %u: GetWindowRect failed, error %#lx.\n", adapter_idx, output_idx, GetLastError()); ok(EqualRect(&window_rect, &output_desc.DesktopCoordinates), "Adapter %u output %u: Expect window rect %s, got %s.\n", adapter_idx, @@ -3047,7 +3047,7 @@ static void test_default_fullscreen_target_output(IUnknown *device, BOOL is_d3d1 wine_dbgstr_rect(&window_rect)); hr = IDXGISwapChain_GetContainingOutput(swapchain, &containing_output); - ok(hr == S_OK, "Adapter %u output %u: GetContainingOutput failed, hr %#x.\n", + ok(hr == S_OK, "Adapter %u output %u: GetContainingOutput failed, hr %#lx.\n", adapter_idx, output_idx, hr); ok(containing_output != output, "Adapter %u output %u: Got unexpected output %p, expected %p.\n", adapter_idx, @@ -3056,13 +3056,13 @@ static void test_default_fullscreen_target_output(IUnknown *device, BOOL is_d3d1 IDXGIOutput_Release(containing_output); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(hr == S_OK, "Adapter %u output %u: SetFullscreenState failed, hr %#x.\n", + ok(hr == S_OK, "Adapter %u output %u: SetFullscreenState failed, hr %#lx.\n", adapter_idx, output_idx, hr); refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "Adapter %u output %u: IDXGISwapChain has %u references left.\n", + ok(!refcount, "Adapter %u output %u: IDXGISwapChain has %lu references left.\n", adapter_idx, output_idx, refcount); refcount = IDXGIOutput_Release(output); - ok(!refcount, "Adapter %u output %u: IDXGIOutput has %u references left.\n", + ok(!refcount, "Adapter %u output %u: IDXGIOutput has %lu references left.\n", adapter_idx, output_idx, refcount); DestroyWindow(swapchain_desc.OutputWindow); } @@ -3070,7 +3070,7 @@ static void test_default_fullscreen_target_output(IUnknown *device, BOOL is_d3d1 } refcount = IDXGIFactory_Release(factory); - ok(refcount == !is_d3d12, "IDXGIFactory has %u references left.\n", refcount); + ok(refcount == !is_d3d12, "IDXGIFactory has %lu references left.\n", refcount); } static void test_windowed_resize_target(IDXGISwapChain *swapchain, HWND window, @@ -3129,20 +3129,20 @@ static void test_windowed_resize_target(IDXGISwapChain *swapchain, HWND window, mode.Width = sizes[i].width; mode.Height = sizes[i].height; hr = IDXGISwapChain_ResizeTarget(swapchain, &mode); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_swapchain_fullscreen_state(swapchain, &expected_state); } ret = SetWindowPos(window, 0, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOZORDER); - ok(ret, "SetWindowPos failed, error %#x.\n", GetLastError()); + ok(ret, "SetWindowPos failed, error %#lx.\n", GetLastError()); GetWindowRect(window, &e->window_rect); GetClientRect(window, &e->client_rect); ret = SetWindowPos(window, 0, 0, 0, 200, 200, SWP_NOMOVE | SWP_NOZORDER); - ok(ret, "SetWindowPos failed, error %#x.\n", GetLastError()); + ok(ret, "SetWindowPos failed, error %#lx.\n", GetLastError()); memset(&mode, 0, sizeof(mode)); hr = IDXGISwapChain_ResizeTarget(swapchain, &mode); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); check_swapchain_fullscreen_state(swapchain, &expected_state); GetWindowRect(window, &e->window_rect); @@ -3162,14 +3162,14 @@ static void test_fullscreen_resize_target(IDXGISwapChain *swapchain, HRESULT hr; hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc); - ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "GetDesc failed, hr %#lx.\n", hr); hr = IDXGISwapChain_GetFullscreenState(swapchain, NULL, &target); - ok(SUCCEEDED(hr), "GetFullscreenState failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "GetFullscreenState failed, hr %#lx.\n", hr); hr = IDXGIOutput_GetDisplayModeList(target, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count, NULL); ok(SUCCEEDED(hr) || broken(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE), /* Win 7 testbot */ - "Failed to list modes, hr %#x.\n", hr); + "Failed to list modes, hr %#lx.\n", hr); if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE) { win_skip("GetDisplayModeList() not supported.\n"); @@ -3181,7 +3181,7 @@ static void test_fullscreen_resize_target(IDXGISwapChain *swapchain, ok(!!modes, "Failed to allocate memory.\n"); hr = IDXGIOutput_GetDisplayModeList(target, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count, modes); - ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to list modes, hr %#lx.\n", hr); expected_state = *initial_state; for (i = 0; i < min(mode_count, 20); ++i) @@ -3192,13 +3192,13 @@ static void test_fullscreen_resize_target(IDXGISwapChain *swapchain, continue; hr = IDXGIOutput_GetDesc(target, &output_desc); - ok(hr == S_OK, "Failed to get desc, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get desc, hr %#lx.\n", hr); compute_expected_swapchain_fullscreen_state_after_fullscreen_change(&expected_state, &swapchain_desc, &output_desc.DesktopCoordinates, modes[i].Width, modes[i].Height, NULL); hr = IDXGISwapChain_ResizeTarget(swapchain, &modes[i]); - ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#lx.\n", hr); if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE) { skip("Failed to change to video mode %u.\n", i); @@ -3207,7 +3207,7 @@ static void test_fullscreen_resize_target(IDXGISwapChain *swapchain, check_swapchain_fullscreen_state(swapchain, &expected_state); hr = IDXGIOutput_GetDesc(target, &output_desc); - ok(hr == S_OK, "Failed to get desc, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get desc, hr %#lx.\n", hr); ok(EqualRect(&output_desc.DesktopCoordinates, &expected_state.fullscreen_state.monitor_rect), "Got desktop coordinates %s, expected %s.\n", wine_dbgstr_rect(&output_desc.DesktopCoordinates), @@ -3278,7 +3278,7 @@ static void test_resize_target(IUnknown *device, BOOL is_d3d12) ++output_idx) { hr = IDXGIOutput_GetDesc(output, &output_desc); - ok(hr == S_OK, "Adapter %u output %u: GetDesc failed, hr %#x.\n", adapter_idx, + ok(hr == S_OK, "Adapter %u output %u: GetDesc failed, hr %#lx.\n", adapter_idx, output_idx, hr); for (test_idx = 0; test_idx < ARRAY_SIZE(tests); ++test_idx) @@ -3300,7 +3300,7 @@ static void test_resize_target(IUnknown *device, BOOL is_d3d12) capture_fullscreen_state(&initial_state.fullscreen_state, swapchain_desc.OutputWindow); hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); - ok(SUCCEEDED(hr), "Adapter %u output %u test %u: CreateSwapChain failed, hr %#x.\n", + ok(SUCCEEDED(hr), "Adapter %u output %u test %u: CreateSwapChain failed, hr %#lx.\n", adapter_idx, output_idx, test_idx, hr); check_swapchain_fullscreen_state(swapchain, &initial_state); @@ -3312,7 +3312,7 @@ static void test_resize_target(IUnknown *device, BOOL is_d3d12) &swapchain_desc, &initial_state.fullscreen_state.monitor_rect, 800, 600, NULL); hr = IDXGISwapChain_GetContainingOutput(swapchain, &expected_state.target); ok(SUCCEEDED(hr) || broken(hr == DXGI_ERROR_UNSUPPORTED) /* Win 7 testbot */, - "Adapter %u output %u test %u: GetContainingOutput failed, hr %#x.\n", + "Adapter %u output %u test %u: GetContainingOutput failed, hr %#lx.\n", adapter_idx, output_idx, test_idx, hr); if (hr == DXGI_ERROR_UNSUPPORTED) { @@ -3325,7 +3325,7 @@ static void test_resize_target(IUnknown *device, BOOL is_d3d12) hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); ok(SUCCEEDED(hr) || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, - "Adapter %u output %u test %u: SetFullscreenState failed, hr %#x.\n", + "Adapter %u output %u test %u: SetFullscreenState failed, hr %#lx.\n", adapter_idx, output_idx, test_idx, hr); if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE) { @@ -3340,7 +3340,7 @@ static void test_resize_target(IUnknown *device, BOOL is_d3d12) check_swapchain_fullscreen_state(swapchain, &expected_state); hr = IDXGISwapChain_ResizeTarget(swapchain, NULL); - ok(hr == DXGI_ERROR_INVALID_CALL, "Adapter %u output %u test %u: Got unexpected hr %#x.\n", + ok(hr == DXGI_ERROR_INVALID_CALL, "Adapter %u output %u test %u: Got unexpected hr %#lx.\n", adapter_idx, output_idx, test_idx, hr); check_swapchain_fullscreen_state(swapchain, &expected_state); @@ -3349,7 +3349,7 @@ static void test_resize_target(IUnknown *device, BOOL is_d3d12) test_fullscreen_resize_target(swapchain, &expected_state); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(SUCCEEDED(hr), "Adapter %u output %u test %u: SetFullscreenState failed, hr %#x.\n", + ok(SUCCEEDED(hr), "Adapter %u output %u test %u: SetFullscreenState failed, hr %#lx.\n", adapter_idx, output_idx, test_idx, hr); check_swapchain_fullscreen_state(swapchain, &initial_state); IDXGIOutput_Release(expected_state.target); @@ -3364,7 +3364,7 @@ static void test_resize_target(IUnknown *device, BOOL is_d3d12) } refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "Adapter %u output %u test %u: IDXGISwapChain has %u references left.\n", + ok(!refcount, "Adapter %u output %u test %u: IDXGISwapChain has %lu references left.\n", adapter_idx, output_idx, test_idx, refcount); check_window_fullscreen_state(swapchain_desc.OutputWindow, &expected_state.fullscreen_state); DestroyWindow(swapchain_desc.OutputWindow); @@ -3374,7 +3374,7 @@ static void test_resize_target(IUnknown *device, BOOL is_d3d12) IDXGIAdapter_Release(adapter); } refcount = IDXGIFactory_Release(factory); - ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); + ok(refcount == !is_d3d12, "Got unexpected refcount %lu.\n", refcount); } static LRESULT CALLBACK resize_target_wndproc(HWND hwnd, unsigned int message, WPARAM wparam, LPARAM lparam) @@ -3388,7 +3388,7 @@ static LRESULT CALLBACK resize_target_wndproc(HWND hwnd, unsigned int message, W case WM_SIZE: ok(!!swapchain, "GWLP_USERDATA is NULL.\n"); hr = IDXGISwapChain_GetDesc(swapchain, &desc); - ok(hr == S_OK, "Failed to get desc, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get desc, hr %#lx.\n", hr); ok(desc.BufferDesc.Width == 800, "Got unexpected buffer width %u.\n", desc.BufferDesc.Width); ok(desc.BufferDesc.Height == 600, "Got unexpected buffer height %u.\n", desc.BufferDesc.Height); return 0; @@ -3421,7 +3421,7 @@ static DWORD WINAPI window_thread(void *data) ok(!!thread_data->window, "Failed to create window.\n"); ret = SetEvent(thread_data->window_created); - ok(ret, "Failed to set event, last error %#x.\n", GetLastError()); + ok(ret, "Failed to set event, last error %#lx.\n", GetLastError()); for (;;) { @@ -3432,7 +3432,7 @@ static DWORD WINAPI window_thread(void *data) if (ret != WAIT_TIMEOUT) break; } - ok(ret == WAIT_OBJECT_0, "Failed to wait for event, ret %#x, last error %#x.\n", ret, GetLastError()); + ok(ret == WAIT_OBJECT_0, "Failed to wait for event, ret %#x, last error %#lx.\n", ret, GetLastError()); DestroyWindow(thread_data->window); thread_data->window = NULL; @@ -3466,19 +3466,19 @@ static void test_resize_target_wndproc(void) memset(&thread_data, 0, sizeof(thread_data)); thread_data.window_created = CreateEventA(NULL, FALSE, FALSE, NULL); - ok(!!thread_data.window_created, "Failed to create event, last error %#x.\n", GetLastError()); + ok(!!thread_data.window_created, "Failed to create event, last error %#lx.\n", GetLastError()); thread_data.finished = CreateEventA(NULL, FALSE, FALSE, NULL); - ok(!!thread_data.finished, "Failed to create event, last error %#x.\n", GetLastError()); + ok(!!thread_data.finished, "Failed to create event, last error %#lx.\n", GetLastError()); thread = CreateThread(NULL, 0, window_thread, &thread_data, 0, NULL); - ok(!!thread, "Failed to create thread, last error %#x.\n", GetLastError()); + ok(!!thread, "Failed to create thread, last error %#lx.\n", GetLastError()); ret = WaitForSingleObject(thread_data.window_created, INFINITE); - ok(ret == WAIT_OBJECT_0, "Failed to wait for thread, ret %#x, last error %#x.\n", ret, GetLastError()); + ok(ret == WAIT_OBJECT_0, "Failed to wait for thread, ret %#x, last error %#lx.\n", ret, GetLastError()); hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get adapter, hr %#lx.\n", hr); hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get parent, hr %#lx.\n", hr); swapchain_desc.BufferDesc.Width = 800; swapchain_desc.BufferDesc.Height = 600; @@ -3496,7 +3496,7 @@ static void test_resize_target_wndproc(void) swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); - ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create swapchain, hr %#lx.\n", hr); data = SetWindowLongPtrA(thread_data.window, GWLP_USERDATA, (LONG_PTR)swapchain); ok(!data, "Got unexpected GWLP_USERDATA %p.\n", (void *)data); @@ -3505,10 +3505,10 @@ static void test_resize_target_wndproc(void) mode.Width = 600; mode.Height = 400; hr = IDXGISwapChain_ResizeTarget(swapchain, &mode); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc); - ok(hr == S_OK, "Getswapchain_desc failed, hr %#x.\n", hr); + ok(hr == S_OK, "Getswapchain_desc failed, hr %#lx.\n", hr); ok(swapchain_desc.BufferDesc.Width == 800, "Got unexpected buffer width %u.\n", swapchain_desc.BufferDesc.Width); ok(swapchain_desc.BufferDesc.Height == 600, @@ -3520,18 +3520,18 @@ static void test_resize_target_wndproc(void) "Got unexpected client rect %s.\n", wine_dbgstr_rect(&rect)); refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount); IDXGIAdapter_Release(adapter); refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); refcount = IDXGIFactory_Release(factory); - ok(!refcount, "Factory has %u references left.\n", refcount); + ok(!refcount, "Factory has %lu references left.\n", refcount); ret = SetEvent(thread_data.finished); - ok(ret, "Failed to set event, last error %#x.\n", GetLastError()); + ok(ret, "Failed to set event, last error %#lx.\n", GetLastError()); ret = WaitForSingleObject(thread, INFINITE); - ok(ret == WAIT_OBJECT_0, "Failed to wait for thread, ret %#x, last error %#x.\n", ret, GetLastError()); + ok(ret == WAIT_OBJECT_0, "Failed to wait for thread, ret %#x, last error %#lx.\n", ret, GetLastError()); CloseHandle(thread); CloseHandle(thread_data.window_created); CloseHandle(thread_data.finished); @@ -3568,10 +3568,10 @@ static void test_inexact_modes(void) } hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "GetAdapter failed, hr %#lx.\n", hr); hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "GetParent failed, hr %#lx.\n", hr); swapchain_desc.BufferDesc.Width = 800; swapchain_desc.BufferDesc.Height = 600; @@ -3593,16 +3593,16 @@ static void test_inexact_modes(void) capture_fullscreen_state(&initial_state.fullscreen_state, swapchain_desc.OutputWindow); hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); - ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#lx.\n", hr); hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); - ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "GetDesc failed, hr %#lx.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#lx.\n", hr); hr = IDXGISwapChain_GetContainingOutput(swapchain, &output); ok(SUCCEEDED(hr) || broken(hr == DXGI_ERROR_UNSUPPORTED) /* Win 7 testbot */, - "GetContainingOutput failed, hr %#x.\n", hr); + "GetContainingOutput failed, hr %#lx.\n", hr); refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount); if (hr == DXGI_ERROR_UNSUPPORTED) { win_skip("GetContainingOutput() not supported.\n"); @@ -3629,22 +3629,22 @@ static void test_inexact_modes(void) sizes[i].width, sizes[i].height, output); hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); - ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#lx.\n", hr); check_swapchain_fullscreen_state(swapchain, &expected_state); hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); - ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "GetDesc failed, hr %#lx.\n", hr); ok(result_desc.BufferDesc.Width == sizes[i].width, "Got width %u, expected %u.\n", result_desc.BufferDesc.Width, sizes[i].width); ok(result_desc.BufferDesc.Height == sizes[i].height, "Got height %u, expected %u.\n", result_desc.BufferDesc.Height, sizes[i].height); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#lx.\n", hr); check_swapchain_fullscreen_state(swapchain, &initial_state); refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount); /* Test SetFullscreenState(). */ swapchain_desc.BufferDesc.Width = sizes[i].width; @@ -3652,25 +3652,25 @@ static void test_inexact_modes(void) swapchain_desc.Windowed = TRUE; hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); - ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#lx.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, output); - ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#lx.\n", hr); check_swapchain_fullscreen_state(swapchain, &expected_state); hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); - ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "GetDesc failed, hr %#lx.\n", hr); ok(result_desc.BufferDesc.Width == sizes[i].width, "Got width %u, expected %u.\n", result_desc.BufferDesc.Width, sizes[i].width); ok(result_desc.BufferDesc.Height == sizes[i].height, "Got height %u, expected %u.\n", result_desc.BufferDesc.Height, sizes[i].height); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#lx.\n", hr); check_swapchain_fullscreen_state(swapchain, &initial_state); refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount); /* Test ResizeTarget(). */ swapchain_desc.BufferDesc.Width = 800; @@ -3678,28 +3678,28 @@ static void test_inexact_modes(void) swapchain_desc.Windowed = TRUE; hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); - ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#lx.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, output); - ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#lx.\n", hr); swapchain_desc.BufferDesc.Width = sizes[i].width; swapchain_desc.BufferDesc.Height = sizes[i].height; hr = IDXGISwapChain_ResizeTarget(swapchain, &swapchain_desc.BufferDesc); - ok(SUCCEEDED(hr), "ResizeTarget failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "ResizeTarget failed, hr %#lx.\n", hr); check_swapchain_fullscreen_state(swapchain, &expected_state); hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); - ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "GetDesc failed, hr %#lx.\n", hr); ok(result_desc.BufferDesc.Width == 800, "Got width %u.\n", result_desc.BufferDesc.Width); ok(result_desc.BufferDesc.Height == 600, "Got height %u.\n", result_desc.BufferDesc.Height); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#lx.\n", hr); check_swapchain_fullscreen_state(swapchain, &initial_state); refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount); } done: @@ -3707,9 +3707,9 @@ done: IDXGIOutput_Release(output); IDXGIAdapter_Release(adapter); refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); refcount = IDXGIFactory_Release(factory); - ok(!refcount, "Factory has %u references left.\n", refcount); + ok(!refcount, "Factory has %lu references left.\n", refcount); DestroyWindow(swapchain_desc.OutputWindow); } @@ -3721,35 +3721,35 @@ static void test_create_factory(void) iface = (void *)0xdeadbeef; hr = CreateDXGIFactory(&IID_IDXGIDevice, (void **)&iface); - ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); ok(!iface, "Got unexpected iface %p.\n", iface); hr = CreateDXGIFactory(&IID_IUnknown, (void **)&iface); - ok(SUCCEEDED(hr), "Failed to create factory with IID_IUnknown, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to create factory with IID_IUnknown, hr %#lx.\n", hr); IUnknown_Release(iface); hr = CreateDXGIFactory(&IID_IDXGIObject, (void **)&iface); - ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIObject, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIObject, hr %#lx.\n", hr); IUnknown_Release(iface); hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&iface); - ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIFactory, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIFactory, hr %#lx.\n", hr); check_interface(iface, &IID_IDXGIFactory1, FALSE, FALSE); IUnknown_Release(iface); iface = (void *)0xdeadbeef; hr = CreateDXGIFactory(&IID_IDXGIFactory1, (void **)&iface); - ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); ok(!iface, "Got unexpected iface %p.\n", iface); iface = NULL; hr = CreateDXGIFactory(&IID_IDXGIFactory2, (void **)&iface); ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, - "Got unexpected hr %#x.\n", hr); + "Got unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) { refcount = IUnknown_Release(iface); - ok(!refcount, "Factory has %u references left.\n", refcount); + ok(!refcount, "Factory has %lu references left.\n", refcount); } if (!pCreateDXGIFactory1) @@ -3760,35 +3760,35 @@ static void test_create_factory(void) iface = (void *)0xdeadbeef; hr = pCreateDXGIFactory1(&IID_IDXGIDevice, (void **)&iface); - ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); ok(!iface, "Got unexpected iface %p.\n", iface); hr = pCreateDXGIFactory1(&IID_IUnknown, (void **)&iface); - ok(SUCCEEDED(hr), "Failed to create factory with IID_IUnknown, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to create factory with IID_IUnknown, hr %#lx.\n", hr); IUnknown_Release(iface); hr = pCreateDXGIFactory1(&IID_IDXGIObject, (void **)&iface); - ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIObject, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIObject, hr %#lx.\n", hr); IUnknown_Release(iface); hr = pCreateDXGIFactory1(&IID_IDXGIFactory, (void **)&iface); - ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIFactory, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIFactory, hr %#lx.\n", hr); check_interface(iface, &IID_IDXGIFactory1, TRUE, FALSE); refcount = IUnknown_Release(iface); - ok(!refcount, "Factory has %u references left.\n", refcount); + ok(!refcount, "Factory has %lu references left.\n", refcount); hr = pCreateDXGIFactory1(&IID_IDXGIFactory1, (void **)&iface); - ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIFactory1, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIFactory1, hr %#lx.\n", hr); IUnknown_Release(iface); iface = NULL; hr = pCreateDXGIFactory1(&IID_IDXGIFactory2, (void **)&iface); ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, - "Got unexpected hr %#x.\n", hr); + "Got unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) { refcount = IUnknown_Release(iface); - ok(!refcount, "Factory has %u references left.\n", refcount); + ok(!refcount, "Factory has %lu references left.\n", refcount); } if (!pCreateDXGIFactory2) @@ -3798,7 +3798,7 @@ static void test_create_factory(void) } hr = pCreateDXGIFactory2(0, &IID_IDXGIFactory3, (void **)&iface); - ok(hr == S_OK, "Failed to create factory, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create factory, hr %#lx.\n", hr); check_interface(iface, &IID_IDXGIFactory, TRUE, FALSE); check_interface(iface, &IID_IDXGIFactory1, TRUE, FALSE); check_interface(iface, &IID_IDXGIFactory2, TRUE, FALSE); @@ -3807,16 +3807,16 @@ static void test_create_factory(void) check_interface(iface, &IID_IDXGIFactory4, TRUE, TRUE); check_interface(iface, &IID_IDXGIFactory5, TRUE, TRUE); refcount = IUnknown_Release(iface); - ok(!refcount, "Factory has %u references left.\n", refcount); + ok(!refcount, "Factory has %lu references left.\n", refcount); hr = pCreateDXGIFactory2(0, &IID_IDXGIFactory, (void **)&iface); - ok(hr == S_OK, "Failed to create factory, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create factory, hr %#lx.\n", hr); check_interface(iface, &IID_IDXGIFactory, TRUE, FALSE); check_interface(iface, &IID_IDXGIFactory1, TRUE, FALSE); check_interface(iface, &IID_IDXGIFactory2, TRUE, FALSE); check_interface(iface, &IID_IDXGIFactory3, TRUE, FALSE); refcount = IUnknown_Release(iface); - ok(!refcount, "Factory has %u references left.\n", refcount); + ok(!refcount, "Factory has %lu references left.\n", refcount); } static void test_private_data(void) @@ -3856,67 +3856,67 @@ static void test_private_data(void) * NULL interface is not considered a clear but as setting an interface pointer that * happens to be NULL. */ hr = IDXGIDevice_SetPrivateData(device, &dxgi_private_data_test_guid, 0, NULL); - ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + ok(hr == S_FALSE, "Got unexpected hr %#lx.\n", hr); hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGIDevice_SetPrivateData(device, &dxgi_private_data_test_guid, ~0U, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGIDevice_SetPrivateData(device, &dxgi_private_data_test_guid, ~0U, NULL); - ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + ok(hr == S_FALSE, "Got unexpected hr %#lx.\n", hr); hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = sizeof(ptr) * 2; ptr = (IUnknown *)0xdeadbeef; hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid, &size, &ptr); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!ptr, "Got unexpected pointer %p.\n", ptr); ok(size == sizeof(IUnknown *), "Got unexpected size %u.\n", size); refcount = get_refcount(test_object); hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid, (IUnknown *)test_object); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); expected_refcount = refcount + 1; refcount = get_refcount(test_object); - ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ok(refcount == expected_refcount, "Got unexpected refcount %lu, expected %lu.\n", refcount, expected_refcount); hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid, (IUnknown *)test_object); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = get_refcount(test_object); - ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ok(refcount == expected_refcount, "Got unexpected refcount %lu, expected %lu.\n", refcount, expected_refcount); hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); expected_refcount--; refcount = get_refcount(test_object); - ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ok(refcount == expected_refcount, "Got unexpected refcount %lu, expected %lu.\n", refcount, expected_refcount); hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid, (IUnknown *)test_object); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); size = sizeof(data); hr = IDXGIDevice_SetPrivateData(device, &dxgi_private_data_test_guid, size, data); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = get_refcount(test_object); - ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ok(refcount == expected_refcount, "Got unexpected refcount %lu, expected %lu.\n", refcount, expected_refcount); hr = IDXGIDevice_SetPrivateData(device, &dxgi_private_data_test_guid, 42, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGIDevice_SetPrivateData(device, &dxgi_private_data_test_guid, 42, NULL); - ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + ok(hr == S_FALSE, "Got unexpected hr %#lx.\n", hr); hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid, (IUnknown *)test_object); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); expected_refcount++; size = 2 * sizeof(ptr); ptr = NULL; hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid, &size, &ptr); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(size == sizeof(test_object), "Got unexpected size %u.\n", size); expected_refcount++; refcount = get_refcount(test_object); - ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ok(refcount == expected_refcount, "Got unexpected refcount %lu, expected %lu.\n", refcount, expected_refcount); if (ptr) IUnknown_Release(ptr); expected_refcount--; @@ -3924,35 +3924,35 @@ static void test_private_data(void) ptr = (IUnknown *)0xdeadbeef; size = 1; hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid, &size, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(size == sizeof(device), "Got unexpected size %u.\n", size); size = 2 * sizeof(ptr); hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid, &size, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(size == sizeof(device), "Got unexpected size %u.\n", size); refcount = get_refcount(test_object); - ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ok(refcount == expected_refcount, "Got unexpected refcount %lu, expected %lu.\n", refcount, expected_refcount); size = 1; hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid, &size, &ptr); - ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#lx.\n", hr); ok(size == sizeof(device), "Got unexpected size %u.\n", size); ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid2, NULL, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); size = 0xdeadbabe; hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid2, &size, &ptr); - ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#lx.\n", hr); ok(size == 0, "Got unexpected size %u.\n", size); ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid, NULL, &ptr); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); refcount = IDXGIDevice_Release(test_object); - ok(!refcount, "Test object has %u references left.\n", refcount); + ok(!refcount, "Test object has %lu references left.\n", refcount); } #define check_surface_desc(a, b) check_surface_desc_(__LINE__, a, b) @@ -3963,7 +3963,7 @@ static void check_surface_desc_(unsigned int line, IDXGISurface *surface, HRESULT hr; hr = IDXGISurface_GetDesc(surface, &surface_desc); - ok_(__FILE__, line)(hr == S_OK, "Failed to get surface desc, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to get surface desc, hr %#lx.\n", hr); ok_(__FILE__, line)(surface_desc.Width == swapchain_desc->BufferDesc.Width, "Got Width %u, expected %u.\n", surface_desc.Width, swapchain_desc->BufferDesc.Width); ok_(__FILE__, line)(surface_desc.Height == swapchain_desc->BufferDesc.Height, @@ -4074,17 +4074,17 @@ static void test_swapchain_resize(IUnknown *device, BOOL is_d3d12) swapchain_desc.Flags = 0; hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); - ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create swapchain, hr %#lx.\n", hr); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); expected_hr = is_d3d12 ? E_NOINTERFACE : S_OK; - ok(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + ok(hr == expected_hr, "Got hr %#lx, expected %#lx.\n", hr, expected_hr); ok(!surface || hr == S_OK, "Got unexpected pointer %p.\n", surface); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D10Texture2D, (void **)&texture); - ok(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + ok(hr == expected_hr, "Got hr %#lx, expected %#lx.\n", hr, expected_hr); ok(!texture || hr == S_OK, "Got unexpected pointer %p.\n", texture); expected_hr = is_d3d12 ? S_OK : E_NOINTERFACE; hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D12Resource, (void **)&resource); - ok(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + ok(hr == expected_hr, "Got hr %#lx, expected %#lx.\n", hr, expected_hr); ok(!resource || hr == S_OK, "Got unexpected pointer %p.\n", resource); ret = GetClientRect(window, &r); @@ -4094,7 +4094,7 @@ static void test_swapchain_resize(IUnknown *device, BOOL is_d3d12) memset(&swapchain_desc, 0, sizeof(swapchain_desc)); hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc); - ok(SUCCEEDED(hr), "Failed to get swapchain desc, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to get swapchain desc, hr %#lx.\n", hr); ok(swapchain_desc.BufferDesc.Width == 640, "Got unexpected BufferDesc.Width %u.\n", swapchain_desc.BufferDesc.Width); ok(swapchain_desc.BufferDesc.Height == 480, @@ -4136,7 +4136,7 @@ static void test_swapchain_resize(IUnknown *device, BOOL is_d3d12) check_resource_desc(resource, &swapchain_desc); hr = IDXGISwapChain_ResizeBuffers(swapchain, 2, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); ret = GetClientRect(window, &r); ok(ret, "Failed to get client rect.\n"); @@ -4145,7 +4145,7 @@ static void test_swapchain_resize(IUnknown *device, BOOL is_d3d12) memset(&swapchain_desc, 0, sizeof(swapchain_desc)); hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc); - ok(SUCCEEDED(hr), "Failed to get swapchain desc, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to get swapchain desc, hr %#lx.\n", hr); ok(swapchain_desc.BufferDesc.Width == 640, "Got unexpected BufferDesc.Width %u.\n", swapchain_desc.BufferDesc.Width); ok(swapchain_desc.BufferDesc.Height == 480, @@ -4196,17 +4196,17 @@ static void test_swapchain_resize(IUnknown *device, BOOL is_d3d12) } hr = IDXGISwapChain_ResizeBuffers(swapchain, 2, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0); - ok(hr == S_OK, "Failed to resize buffers, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to resize buffers, hr %#lx.\n", hr); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); expected_hr = is_d3d12 ? E_NOINTERFACE : S_OK; - ok(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + ok(hr == expected_hr, "Got hr %#lx, expected %#lx.\n", hr, expected_hr); ok(!surface || hr == S_OK, "Got unexpected pointer %p.\n", surface); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D10Texture2D, (void **)&texture); - ok(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + ok(hr == expected_hr, "Got hr %#lx, expected %#lx.\n", hr, expected_hr); ok(!texture || hr == S_OK, "Got unexpected pointer %p.\n", texture); expected_hr = is_d3d12 ? S_OK : E_NOINTERFACE; hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D12Resource, (void **)&resource); - ok(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + ok(hr == expected_hr, "Got hr %#lx, expected %#lx.\n", hr, expected_hr); ok(!resource || hr == S_OK, "Got unexpected pointer %p.\n", resource); ret = GetClientRect(window, &r); @@ -4216,7 +4216,7 @@ static void test_swapchain_resize(IUnknown *device, BOOL is_d3d12) memset(&swapchain_desc, 0, sizeof(swapchain_desc)); hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc); - ok(SUCCEEDED(hr), "Failed to get swapchain desc, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to get swapchain desc, hr %#lx.\n", hr); ok(swapchain_desc.BufferDesc.Width == 320, "Got unexpected BufferDesc.Width %u.\n", swapchain_desc.BufferDesc.Width); ok(swapchain_desc.BufferDesc.Height == 240, @@ -4267,16 +4267,16 @@ static void test_swapchain_resize(IUnknown *device, BOOL is_d3d12) } hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); - ok(hr == S_OK, "Failed to resize buffers, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to resize buffers, hr %#lx.\n", hr); memset(&swapchain_desc, 0, sizeof(swapchain_desc)); hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc); - ok(SUCCEEDED(hr), "Failed to get swapchain desc, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to get swapchain desc, hr %#lx.\n", hr); ok(swapchain_desc.BufferDesc.Width == client_rect.right - client_rect.left, - "Got unexpected BufferDesc.Width %u, expected %u.\n", + "Got unexpected BufferDesc.Width %u, expected %lu.\n", swapchain_desc.BufferDesc.Width, client_rect.right - client_rect.left); ok(swapchain_desc.BufferDesc.Height == client_rect.bottom - client_rect.top, - "Got unexpected bufferDesc.Height %u, expected %u.\n", + "Got unexpected bufferDesc.Height %u, expected %lu.\n", swapchain_desc.BufferDesc.Height, client_rect.bottom - client_rect.top); ok(swapchain_desc.BufferDesc.RefreshRate.Numerator == 60, "Got unexpected BufferDesc.RefreshRate.Numerator %u.\n", @@ -4318,34 +4318,34 @@ static void test_swapchain_resize(IUnknown *device, BOOL is_d3d12) else if (!is_d3d12) { hr = IDXGISwapChain3_ResizeBuffers1(swapchain3, 2, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0, node_mask, present_queue); - ok(hr == DXGI_ERROR_INVALID_CALL, "Expected DXGI_ERROR_INVALID_CALL, got hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Expected DXGI_ERROR_INVALID_CALL, got hr %#lx.\n", hr); IDXGISwapChain3_Release(swapchain3); } else { hr = IDXGISwapChain3_ResizeBuffers1(swapchain3, 2, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0, node_mask, present_queue); - ok(hr == S_OK, "Failed to resize buffers, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to resize buffers, hr %#lx.\n", hr); hr = IDXGISwapChain3_ResizeBuffers1(swapchain3, 2, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0, NULL, present_queue); - ok(hr == DXGI_ERROR_INVALID_CALL, "Expected DXGI_ERROR_INVALID_CALL, got hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Expected DXGI_ERROR_INVALID_CALL, got hr %#lx.\n", hr); hr = IDXGISwapChain3_ResizeBuffers1(swapchain3, 2, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0, NULL, NULL); - ok(hr == DXGI_ERROR_INVALID_CALL, "Expected DXGI_ERROR_INVALID_CALL, got hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Expected DXGI_ERROR_INVALID_CALL, got hr %#lx.\n", hr); hr = IDXGISwapChain3_ResizeBuffers1(swapchain3, 0, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0, NULL, NULL); - ok(hr == DXGI_ERROR_INVALID_CALL, "Expected DXGI_ERROR_INVALID_CALL, got hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Expected DXGI_ERROR_INVALID_CALL, got hr %#lx.\n", hr); node_mask[0] = 2; node_mask[1] = 2; hr = IDXGISwapChain3_ResizeBuffers1(swapchain3, 2, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0, node_mask, present_queue); - ok(hr == DXGI_ERROR_INVALID_CALL, "Expected DXGI_ERROR_INVALID_CALL, got hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Expected DXGI_ERROR_INVALID_CALL, got hr %#lx.\n", hr); /* Windows validates node masks even when the buffer count is zero. It defaults to the current buffer count. * NULL queues cause some Windows versions to crash. */ hr = IDXGISwapChain3_ResizeBuffers1(swapchain3, 0, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0, node_mask, present_queue); - ok(hr == DXGI_ERROR_INVALID_CALL, "Expected DXGI_ERROR_INVALID_CALL, got hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Expected DXGI_ERROR_INVALID_CALL, got hr %#lx.\n", hr); IDXGISwapChain3_Release(swapchain3); } IDXGISwapChain_Release(swapchain); DestroyWindow(window); refcount = IDXGIFactory_Release(factory); - ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); + ok(refcount == !is_d3d12, "Got unexpected refcount %lu.\n", refcount); } static void test_swapchain_parameters(void) @@ -4477,9 +4477,9 @@ static void test_swapchain_parameters(void) ok(hr == S_OK, "IDXGIDevice does not implement IUnknown.\n"); hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get adapter, hr %#lx.\n", hr); hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get parent, hr %#lx.\n", hr); IDXGIAdapter_Release(adapter); for (i = 0; i < ARRAY_SIZE(tests); ++i) @@ -4499,16 +4499,16 @@ static void test_swapchain_parameters(void) hr = IDXGIFactory_CreateSwapChain(factory, obj, &desc, &swapchain); ok(hr == tests[i].hr || broken(hr == tests[i].vista_hr) || (SUCCEEDED(tests[i].hr) && hr == DXGI_STATUS_OCCLUDED), - "Got unexpected hr %#x, test %u.\n", hr, i); + "Got unexpected hr %#lx, test %u.\n", hr, i); if (FAILED(hr)) continue; hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGIResource, (void **)&resource); - todo_wine ok(SUCCEEDED(hr), "GetBuffer(0) failed, hr %#x, test %u.\n", hr, i); + todo_wine ok(SUCCEEDED(hr), "GetBuffer(0) failed, hr %#lx, test %u.\n", hr, i); if (FAILED(hr)) { hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#lx.\n", hr); IDXGISwapChain_Release(swapchain); continue; @@ -4516,19 +4516,19 @@ static void test_swapchain_parameters(void) expected_usage = DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_BACK_BUFFER; hr = IDXGIResource_GetUsage(resource, &usage); - ok(SUCCEEDED(hr), "Failed to get resource usage, hr %#x, test %u.\n", hr, i); + ok(SUCCEEDED(hr), "Failed to get resource usage, hr %#lx, test %u.\n", hr, i); ok((usage & expected_usage) == expected_usage, "Got usage %x, expected %x, test %u.\n", usage, expected_usage, i); IDXGIResource_Release(resource); hr = IDXGISwapChain_GetDesc(swapchain, &desc); - ok(SUCCEEDED(hr), "Failed to get swapchain desc, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to get swapchain desc, hr %#lx.\n", hr); for (j = 1; j <= tests[i].highest_accessible_buffer; j++) { hr = IDXGISwapChain_GetBuffer(swapchain, j, &IID_IDXGIResource, (void **)&resource); - ok(SUCCEEDED(hr), "GetBuffer(%u) failed, hr %#x, test %u.\n", hr, i, j); + ok(SUCCEEDED(hr), "GetBuffer(%lu) failed, hr %#x, test %u.\n", hr, i, j); /* Buffers > 0 are supposed to be read only. This is the case except that in * fullscreen mode on Windows <= 8 the last backbuffer (BufferCount - 1) is @@ -4553,7 +4553,7 @@ static void test_swapchain_parameters(void) broken_usage |= DXGI_USAGE_READ_ONLY; hr = IDXGIResource_GetUsage(resource, &usage); - ok(SUCCEEDED(hr), "Failed to get resource usage, hr %#x, test %u, buffer %u.\n", hr, i, j); + ok(SUCCEEDED(hr), "Failed to get resource usage, hr %#lx, test %u, buffer %u.\n", hr, i, j); ok(usage == expected_usage || broken(usage == broken_usage), "Got usage %x, expected %x, test %u, buffer %u.\n", usage, expected_usage, i, j); @@ -4561,10 +4561,10 @@ static void test_swapchain_parameters(void) IDXGIResource_Release(resource); } hr = IDXGISwapChain_GetBuffer(swapchain, j, &IID_IDXGIResource, (void **)&resource); - ok(hr == DXGI_ERROR_INVALID_CALL, "GetBuffer(%u) returned unexpected hr %#x, test %u.\n", j, hr, i); + ok(hr == DXGI_ERROR_INVALID_CALL, "GetBuffer(%u) returned unexpected hr %#lx, test %u.\n", j, hr, i); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#lx.\n", hr); IDXGISwapChain_Release(swapchain); } @@ -4584,10 +4584,10 @@ static void test_swapchain_parameters(void) desc.Windowed = TRUE; desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; hr = IDXGIFactory_CreateSwapChain(factory, obj, &desc, &swapchain); - ok(hr == S_OK, "Got unexpected hr %#x, test %u.\n", hr, i); + ok(hr == S_OK, "Got unexpected hr %#lx, test %u.\n", hr, i); hr = IDXGISwapChain_GetDesc(swapchain, &desc); - ok(hr == S_OK, "Failed to get swapchain desc, hr %#x, test %u.\n", hr, i); + ok(hr == S_OK, "Failed to get swapchain desc, hr %#lx, test %u.\n", hr, i); todo_wine_if(usage & ~(DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_SHADER_INPUT)) ok(desc.BufferUsage == usage, "Got usage %#x, expected %#x, test %u.\n", desc.BufferUsage, usage, i); @@ -4598,7 +4598,7 @@ static void test_swapchain_parameters(void) expected_bind_flags |= D3D11_BIND_SHADER_RESOURCE; hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D10Texture2D, (void **)&d3d10_texture); - ok(hr == S_OK, "Failed to get d3d10 texture, hr %#x, test %u.\n", hr, i); + ok(hr == S_OK, "Failed to get d3d10 texture, hr %#lx, test %u.\n", hr, i); ID3D10Texture2D_GetDesc(d3d10_texture, &d3d10_texture_desc); ok(d3d10_texture_desc.BindFlags == expected_bind_flags, "Got d3d10 bind flags %#x, expected %#x, test %u.\n", @@ -4606,7 +4606,7 @@ static void test_swapchain_parameters(void) ID3D10Texture2D_Release(d3d10_texture); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D11Texture2D, (void **)&d3d11_texture); - ok(hr == S_OK || broken(hr == E_NOINTERFACE), "Failed to get d3d11 texture, hr %#x, test %u.\n", hr, i); + ok(hr == S_OK || broken(hr == E_NOINTERFACE), "Failed to get d3d11 texture, hr %#lx, test %u.\n", hr, i); if (SUCCEEDED(hr)) { ID3D11Texture2D_GetDesc(d3d11_texture, &d3d11_texture_desc); @@ -4617,7 +4617,7 @@ static void test_swapchain_parameters(void) } hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGIResource, (void **)&resource); - todo_wine ok(hr == S_OK, "Failed to get buffer, hr %#x, test %u.\n", hr, i); + todo_wine ok(hr == S_OK, "Failed to get buffer, hr %#lx, test %u.\n", hr, i); if (FAILED(hr)) { IDXGISwapChain_Release(swapchain); @@ -4625,7 +4625,7 @@ static void test_swapchain_parameters(void) } expected_usage = usage | DXGI_USAGE_BACK_BUFFER | DXGI_USAGE_DISCARD_ON_PRESENT; hr = IDXGIResource_GetUsage(resource, &usage); - ok(hr == S_OK, "Failed to get resource usage, hr %#x, test %u.\n", hr, i); + ok(hr == S_OK, "Failed to get resource usage, hr %#lx, test %u.\n", hr, i); ok(usage == expected_usage, "Got usage %x, expected %x, test %u.\n", usage, expected_usage, i); IDXGIResource_Release(resource); @@ -4644,19 +4644,19 @@ static void test_swapchain_parameters(void) desc.Windowed = TRUE; desc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL; hr = IDXGIFactory_CreateSwapChain(factory, obj, &desc, &swapchain); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); desc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_DISCARD; hr = IDXGIFactory_CreateSwapChain(factory, obj, &desc, &swapchain); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); if (check_multisample_quality_levels(device, desc.BufferDesc.Format, desc.SampleDesc.Count)) { desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; hr = IDXGIFactory_CreateSwapChain(factory, obj, &desc, &swapchain); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); IDXGISwapChain_Release(swapchain); desc.SwapEffect = DXGI_SWAP_EFFECT_SEQUENTIAL; hr = IDXGIFactory_CreateSwapChain(factory, obj, &desc, &swapchain); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); IDXGISwapChain_Release(swapchain); } else @@ -4667,7 +4667,7 @@ static void test_swapchain_parameters(void) IDXGIFactory_Release(factory); IUnknown_Release(obj); refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); DestroyWindow(window); } @@ -4702,16 +4702,16 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) swapchain_desc.Flags = 0; hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); - ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create swapchain, hr %#lx.\n", hr); for (i = 0; i < 10; ++i) { hr = IDXGISwapChain_Present(swapchain, i, 0); ok(hr == (i <= 4 ? S_OK : DXGI_ERROR_INVALID_CALL), - "Got unexpected hr %#x for sync interval %u.\n", hr, i); + "Got unexpected hr %#lx for sync interval %u.\n", hr, i); } hr = IDXGISwapChain_Present(swapchain, 0, 0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); for (i = 0; i < ARRAY_SIZE(flags); ++i) { @@ -4720,18 +4720,18 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) /* Another window covers the swapchain window. Not reported as occluded. */ hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); /* Minimised window. */ ShowWindow(swapchain_desc.OutputWindow, SW_MINIMIZE); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); - ok(hr == (is_d3d12 ? S_OK : DXGI_STATUS_OCCLUDED), "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == (is_d3d12 ? S_OK : DXGI_STATUS_OCCLUDED), "Test %u: Got unexpected hr %#lx.\n", i, hr); ShowWindow(swapchain_desc.OutputWindow, SW_NORMAL); /* Hidden window. */ ShowWindow(swapchain_desc.OutputWindow, SW_HIDE); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); ShowWindow(swapchain_desc.OutputWindow, SW_SHOW); DestroyWindow(occluding_window); @@ -4746,15 +4746,15 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) continue; } flush_events(); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); output = NULL; fullscreen = FALSE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &output); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); ok(!!output, "Test %u: Got unexpected output.\n", i); @@ -4763,14 +4763,14 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) /* Still fullscreen. */ fullscreen = FALSE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); /* Calling IDXGISwapChain_Present() will exit fullscreen. */ hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); fullscreen = TRUE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); /* Now fullscreen mode is exited. */ if (!flags[i] && !is_d3d12) /* Still fullscreen on vista and 2008. */ @@ -4789,26 +4789,26 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) * compositing. D3d12 fullscreen mode acts just like borderless * fullscreen window mode. */ hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); fullscreen = FALSE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); occluding_window = CreateWindowA("static", "occluding_window", WS_POPUP, 0, 0, 400, 200, 0, 0, 0, 0); /* An invisible window doesn't cause the swapchain to exit fullscreen * mode. */ hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); fullscreen = FALSE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); /* A visible, but with bottom z-order window still causes the * swapchain to exit fullscreen mode. */ @@ -4822,19 +4822,19 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) * for d3d12. */ fullscreen = TRUE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); todo_wine_if(!is_d3d12) ok(is_d3d12 ? fullscreen : !fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); todo_wine_if(is_d3d12) ok(hr == (is_d3d12 ? DXGI_STATUS_OCCLUDED : S_OK), - "Test %u: Got unexpected hr %#x.\n", i, hr); + "Test %u: Got unexpected hr %#lx.\n", i, hr); fullscreen = TRUE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); if (flags[i] == DXGI_PRESENT_TEST) todo_wine_if(!is_d3d12) ok(is_d3d12 ? fullscreen : !fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); @@ -4846,67 +4846,67 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) * IDXGISwapChain_Present() calls to work, otherwise they will return * DXGI_ERROR_INVALID_CALL */ hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); if (flags[i] == DXGI_PRESENT_TEST) todo_wine_if(is_d3d12) ok(hr == (is_d3d12 ? DXGI_STATUS_OCCLUDED : S_OK), - "Test %u: Got unexpected hr %#x.\n", i, hr); + "Test %u: Got unexpected hr %#lx.\n", i, hr); else - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); /* Trying to break out of fullscreen mode again. This time, don't call * IDXGISwapChain_GetFullscreenState() before IDXGISwapChain_Present(). */ ShowWindow(occluding_window, SW_HIDE); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); ShowWindow(occluding_window, SW_SHOW); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); /* hr == S_OK on vista and 2008 */ todo_wine ok(hr == DXGI_STATUS_OCCLUDED || broken(hr == S_OK), - "Test %u: Got unexpected hr %#x.\n", i, hr); + "Test %u: Got unexpected hr %#lx.\n", i, hr); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); if (flags[i] == DXGI_PRESENT_TEST) { todo_wine ok(hr == DXGI_STATUS_OCCLUDED || broken(hr == S_OK), - "Test %u: Got unexpected hr %#x.\n", i, hr); + "Test %u: Got unexpected hr %#lx.\n", i, hr); /* IDXGISwapChain_Present() without flags refreshes the occlusion * state. */ hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, 0); todo_wine ok(hr == DXGI_STATUS_OCCLUDED || broken(hr == S_OK), - "Test %u: Got unexpected hr %#x.\n", i, hr); + "Test %u: Got unexpected hr %#lx.\n", i, hr); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, DXGI_PRESENT_TEST); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); } else { - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); } fullscreen = TRUE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); todo_wine ok(!fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); DestroyWindow(occluding_window); flush_events(); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); } wait_device_idle(device); @@ -4914,7 +4914,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) IDXGISwapChain_Release(swapchain); DestroyWindow(swapchain_desc.OutputWindow); refcount = IDXGIFactory_Release(factory); - ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); + ok(refcount == !is_d3d12, "Got unexpected refcount %lu.\n", refcount); } static void test_swapchain_backbuffer_index(IUnknown *device, BOOL is_d3d12) @@ -4964,7 +4964,7 @@ static void test_swapchain_backbuffer_index(IUnknown *device, BOOL is_d3d12) swapchain_desc.SwapEffect = swap_effects[i]; expected_hr = is_d3d12 && !is_flip_model(swap_effects[i]) ? DXGI_ERROR_INVALID_CALL : S_OK; hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); - ok(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + ok(hr == expected_hr, "Got hr %#lx, expected %#lx.\n", hr, expected_hr); if (FAILED(hr)) continue; @@ -4982,20 +4982,20 @@ static void test_swapchain_backbuffer_index(IUnknown *device, BOOL is_d3d12) expected_index = is_d3d12 ? j % swapchain_desc.BufferCount : 0; ok(index == expected_index, "Got back buffer index %u, expected %u.\n", index, expected_index); hr = IDXGISwapChain3_Present(swapchain3, 0, 0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); } wait_device_idle(device); IDXGISwapChain3_Release(swapchain3); refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "Swapchain has %u references left.\n", refcount); + ok(!refcount, "Swapchain has %lu references left.\n", refcount); } done: DestroyWindow(swapchain_desc.OutputWindow); refcount = IDXGIFactory_Release(factory); - ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); + ok(refcount == !is_d3d12, "Got unexpected refcount %lu.\n", refcount); } static void test_swapchain_formats(IUnknown *device, BOOL is_d3d12) @@ -5082,18 +5082,18 @@ static void test_swapchain_formats(IUnknown *device, BOOL is_d3d12) ok(hr == expected_hr /* Flip presentation model not supported. */ || broken(hr == DXGI_ERROR_INVALID_CALL && is_flip_model(tests[i].swap_effect) && !is_d3d12), - "Test %u, d3d12 %#x: Got hr %#x, expected %#x.\n", i, is_d3d12, hr, expected_hr); + "Test %u, d3d12 %#x: Got hr %#lx, expected %#lx.\n", i, is_d3d12, hr, expected_hr); if (SUCCEEDED(hr)) { refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "Swapchain has %u references left.\n", refcount); + ok(!refcount, "Swapchain has %lu references left.\n", refcount); } } DestroyWindow(swapchain_desc.OutputWindow); refcount = IDXGIFactory_Release(factory); - ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); + ok(refcount == !is_d3d12, "Got unexpected refcount %lu.\n", refcount); } static void test_maximum_frame_latency(void) @@ -5113,28 +5113,28 @@ static void test_maximum_frame_latency(void) if (SUCCEEDED(IDXGIDevice_QueryInterface(device, &IID_IDXGIDevice1, (void **)&device1))) { hr = IDXGIDevice1_GetMaximumFrameLatency(device1, NULL); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); hr = IDXGIDevice1_GetMaximumFrameLatency(device1, &max_latency); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(max_latency == DEFAULT_FRAME_LATENCY, "Got unexpected maximum frame latency %u.\n", max_latency); hr = IDXGIDevice1_SetMaximumFrameLatency(device1, MAX_FRAME_LATENCY); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGIDevice1_GetMaximumFrameLatency(device1, &max_latency); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(max_latency == MAX_FRAME_LATENCY, "Got unexpected maximum frame latency %u.\n", max_latency); hr = IDXGIDevice1_SetMaximumFrameLatency(device1, MAX_FRAME_LATENCY + 1); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); hr = IDXGIDevice1_GetMaximumFrameLatency(device1, &max_latency); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(max_latency == MAX_FRAME_LATENCY, "Got unexpected maximum frame latency %u.\n", max_latency); hr = IDXGIDevice1_SetMaximumFrameLatency(device1, 0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGIDevice1_GetMaximumFrameLatency(device1, &max_latency); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); /* 0 does not reset to the default frame latency on all Windows versions. */ ok(max_latency == DEFAULT_FRAME_LATENCY || broken(!max_latency), "Got unexpected maximum frame latency %u.\n", max_latency); @@ -5147,7 +5147,7 @@ static void test_maximum_frame_latency(void) } refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } static void test_output_desc(void) @@ -5161,26 +5161,26 @@ static void test_output_desc(void) HRESULT hr; hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory); - ok(SUCCEEDED(hr), "Failed to create DXGI factory, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to create DXGI factory, hr %#lx.\n", hr); for (i = 0; ; ++i) { hr = IDXGIFactory_EnumAdapters(factory, i, &adapter); if (hr == DXGI_ERROR_NOT_FOUND) break; - ok(SUCCEEDED(hr), "Failed to enumerate adapter %u, hr %#x.\n", i, hr); + ok(SUCCEEDED(hr), "Failed to enumerate adapter %u, hr %#lx.\n", i, hr); hr = IDXGIFactory_EnumAdapters(factory, i, &adapter2); - ok(SUCCEEDED(hr), "Failed to enumerate adapter %u, hr %#x.\n", i, hr); + ok(SUCCEEDED(hr), "Failed to enumerate adapter %u, hr %#lx.\n", i, hr); ok(adapter != adapter2, "Expected to get new instance of IDXGIAdapter, %p == %p.\n", adapter, adapter2); refcount = get_refcount(adapter); - ok(refcount == 1, "Get unexpected refcount %u for adapter %u.\n", refcount, i); + ok(refcount == 1, "Get unexpected refcount %lu for adapter %u.\n", refcount, i); IDXGIAdapter_Release(adapter2); refcount = get_refcount(factory); - ok(refcount == 2, "Get unexpected refcount %u.\n", refcount); + ok(refcount == 2, "Get unexpected refcount %lu.\n", refcount); refcount = get_refcount(adapter); - ok(refcount == 1, "Get unexpected refcount %u for adapter %u.\n", refcount, i); + ok(refcount == 1, "Get unexpected refcount %lu for adapter %u.\n", refcount, i); for (j = 0; ; ++j) { @@ -5190,24 +5190,24 @@ static void test_output_desc(void) hr = IDXGIAdapter_EnumOutputs(adapter, j, &output); if (hr == DXGI_ERROR_NOT_FOUND) break; - ok(SUCCEEDED(hr), "Failed to enumerate output %u on adapter %u, hr %#x.\n", j, i, hr); + ok(SUCCEEDED(hr), "Failed to enumerate output %u on adapter %u, hr %#lx.\n", j, i, hr); hr = IDXGIAdapter_EnumOutputs(adapter, j, &output2); - ok(SUCCEEDED(hr), "Failed to enumerate output %u on adapter %u, hr %#x.\n", j, i, hr); + ok(SUCCEEDED(hr), "Failed to enumerate output %u on adapter %u, hr %#lx.\n", j, i, hr); ok(output != output2, "Expected to get new instance of IDXGIOutput, %p == %p.\n", output, output2); refcount = get_refcount(output); - ok(refcount == 1, "Get unexpected refcount %u for output %u, adapter %u.\n", refcount, j, i); + ok(refcount == 1, "Get unexpected refcount %lu for output %u, adapter %u.\n", refcount, j, i); IDXGIOutput_Release(output2); refcount = get_refcount(factory); - ok(refcount == 2, "Get unexpected refcount %u.\n", refcount); + ok(refcount == 2, "Get unexpected refcount %lu.\n", refcount); refcount = get_refcount(adapter); - ok(refcount == 2, "Get unexpected refcount %u for adapter %u.\n", refcount, i); + ok(refcount == 2, "Get unexpected refcount %lu for adapter %u.\n", refcount, i); refcount = get_refcount(output); - ok(refcount == 1, "Get unexpected refcount %u for output %u, adapter %u.\n", refcount, j, i); + ok(refcount == 1, "Get unexpected refcount %lu for output %u, adapter %u.\n", refcount, j, i); hr = IDXGIOutput_GetDesc(output, &desc); - ok(SUCCEEDED(hr), "Failed to get desc for output %u on adapter %u, hr %#x.\n", j, i, hr); + ok(SUCCEEDED(hr), "Failed to get desc for output %u on adapter %u, hr %#lx.\n", j, i, hr); monitor_info.cbSize = sizeof(monitor_info); ret = GetMonitorInfoW(desc.Monitor, (MONITORINFO *)&monitor_info); @@ -5221,16 +5221,16 @@ static void test_output_desc(void) IDXGIOutput_Release(output); refcount = get_refcount(adapter); - ok(refcount == 1, "Get unexpected refcount %u for adapter %u.\n", refcount, i); + ok(refcount == 1, "Get unexpected refcount %lu for adapter %u.\n", refcount, i); } IDXGIAdapter_Release(adapter); refcount = get_refcount(factory); - ok(refcount == 1, "Get unexpected refcount %u.\n", refcount); + ok(refcount == 1, "Get unexpected refcount %lu.\n", refcount); } refcount = IDXGIFactory_Release(factory); - ok(!refcount, "IDXGIFactory has %u references left.\n", refcount); + ok(!refcount, "IDXGIFactory has %lu references left.\n", refcount); } struct dxgi_factory @@ -5469,7 +5469,7 @@ static void test_object_wrapping(void) HRESULT hr; hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory); - ok(hr == S_OK, "Failed to create DXGI factory, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create DXGI factory, hr %#lx.\n", hr); hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); if (hr == DXGI_ERROR_NOT_FOUND) @@ -5478,7 +5478,7 @@ static void test_object_wrapping(void) IDXGIFactory_Release(factory); return; } - ok(hr == S_OK, "Failed to enumerate adapter, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to enumerate adapter, hr %#lx.\n", hr); wrapper.IDXGIAdapter_iface.lpVtbl = &dxgi_adapter_vtbl; wrapper.wrapped_iface = adapter; @@ -5492,19 +5492,19 @@ static void test_object_wrapping(void) if (SUCCEEDED(hr)) { refcount = ID3D10Device1_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } hr = IDXGIAdapter_GetDesc(&wrapper.IDXGIAdapter_iface, &desc); - ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get adapter desc, hr %#lx.\n", hr); ok(!wrapper.factory.wrapped_adapter_count, "Got unexpected wrapped adapter count %u.\n", wrapper.factory.wrapped_adapter_count); ok(!wrapper.wrapped_output_count, "Got unexpected wrapped output count %u.\n", wrapper.wrapped_output_count); refcount = IDXGIAdapter_Release(&wrapper.IDXGIAdapter_iface); - ok(!refcount, "Adapter has %u references left.\n", refcount); + ok(!refcount, "Adapter has %lu references left.\n", refcount); refcount = IDXGIFactory_Release(factory); - ok(!refcount, "Factory has %u references left.\n", refcount); + ok(!refcount, "Factory has %lu references left.\n", refcount); } struct adapter_info @@ -5558,12 +5558,12 @@ static void test_multi_adapter(void) if (FAILED(hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory))) { - skip("Failed to create IDXGIFactory, hr %#x.\n", hr); + skip("Failed to create IDXGIFactory, hr %#lx.\n", hr); return; } hr = IDXGIFactory_EnumAdapters(factory, 0, NULL); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); if (hr == DXGI_ERROR_NOT_FOUND) @@ -5572,14 +5572,14 @@ static void test_multi_adapter(void) IDXGIFactory_Release(factory); return; } - ok(hr == S_OK, "Failed to enumerate adapter, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to enumerate adapter, hr %#lx.\n", hr); for (adapter_index = 0; SUCCEEDED(IDXGIFactory_EnumAdapters(factory, adapter_index, &adapter)); ++adapter_index) { for (output_index = 0; SUCCEEDED(IDXGIAdapter_EnumOutputs(adapter, output_index, &output)); ++output_index) { hr = IDXGIOutput_GetDesc(output, &output_desc); - ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#x.\n", adapter_index, + ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#lx.\n", adapter_index, output_index, hr); found = FALSE; @@ -5596,15 +5596,15 @@ static void test_multi_adapter(void) adapter_index, output_index, wine_dbgstr_w(output_desc.DeviceName)); ok(display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP, - "Adapter %u output %u: Got unexpected state flags %#x.\n", adapter_index, + "Adapter %u output %u: Got unexpected state flags %#lx.\n", adapter_index, output_index, display_device.StateFlags); if (!adapter_index && !output_index) ok(display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE, - "Adapter %u output %u: Got unexpected state flags %#x.\n", adapter_index, + "Adapter %u output %u: Got unexpected state flags %#lx.\n", adapter_index, output_index, display_device.StateFlags); else ok(!(display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE), - "Adapter %u output %u: Got unexpected state flags %#x.\n", adapter_index, + "Adapter %u output %u: Got unexpected state flags %#lx.\n", adapter_index, output_index, display_device.StateFlags); /* Should have the same monitor handle. */ @@ -5618,7 +5618,7 @@ static void test_multi_adapter(void) /* Should have the same monitor rectangle. */ monitor_info.cbSize = sizeof(monitor_info); ret = GetMonitorInfoA(monitor, &monitor_info); - ok(ret, "Adapter %u output %u: Failed to get monitor info, error %#x.\n", adapter_index, + ok(ret, "Adapter %u output %u: Failed to get monitor info, error %#lx.\n", adapter_index, output_index, GetLastError()); ok(EqualRect(&monitor_info.rcMonitor, &output_desc.DesktopCoordinates), "Adapter %u output %u: Got unexpected output rect %s, expected %s.\n", @@ -5642,7 +5642,7 @@ static void test_multi_adapter(void) ret = EnumDisplaySettingsW(display_device.DeviceName, ENUM_CURRENT_SETTINGS, &old_mode); /* Win10 TestBots may return FALSE but it's actually successful */ ok(ret || broken(!ret), - "Adapter %u output %u: EnumDisplaySettingsW failed for %s, error %#x.\n", + "Adapter %u output %u: EnumDisplaySettingsW failed for %s, error %#lx.\n", adapter_index, output_index, wine_dbgstr_w(display_device.DeviceName), GetLastError()); @@ -5654,11 +5654,11 @@ static void test_multi_adapter(void) ret = ChangeDisplaySettingsExW(display_device.DeviceName, &mode, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); ok(ret == DISP_CHANGE_SUCCESSFUL, - "Adapter %u output %u: ChangeDisplaySettingsExW %s returned unexpected %d.\n", + "Adapter %u output %u: ChangeDisplaySettingsExW %s returned unexpected %ld.\n", adapter_index, output_index, wine_dbgstr_w(display_device.DeviceName), ret); ret = ChangeDisplaySettingsExW(display_device.DeviceName, NULL, NULL, 0, NULL); ok(ret == DISP_CHANGE_SUCCESSFUL, - "Adapter %u output %u: ChangeDisplaySettingsExW %s returned unexpected %d.\n", + "Adapter %u output %u: ChangeDisplaySettingsExW %s returned unexpected %ld.\n", adapter_index, output_index, wine_dbgstr_w(display_device.DeviceName), ret); /* Check if it is really detached */ @@ -5667,7 +5667,7 @@ static void test_multi_adapter(void) ret = EnumDisplaySettingsW(display_device.DeviceName, ENUM_CURRENT_SETTINGS, &mode); /* Win10 TestBots may return FALSE but it's actually successful */ ok(ret || broken(!ret) , - "Adapter %u output %u: EnumDisplaySettingsW failed for %s, error %#x.\n", + "Adapter %u output %u: EnumDisplaySettingsW failed for %s, error %#lx.\n", adapter_index, output_index, wine_dbgstr_w(display_device.DeviceName), GetLastError()); if (mode.dmPelsWidth && mode.dmPelsHeight) @@ -5684,7 +5684,7 @@ static void test_multi_adapter(void) * unimplemented in Wine */ memset(&output_desc, 0, sizeof(output_desc)); hr = IDXGIOutput_GetDesc(output, &output_desc); - ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#x.\n", adapter_index, + ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#lx.\n", adapter_index, output_index, hr); ok(!lstrcmpiW(output_desc.DeviceName, old_output_desc.DeviceName), "Adapter %u output %u: Expect device name %s, got %s.\n", adapter_index, @@ -5710,11 +5710,11 @@ static void test_multi_adapter(void) /* Call IDXGIAdapter_EnumOutputs() again to get up-to-date output description */ hr = IDXGIAdapter_EnumOutputs(adapter, output_index, &output); - ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#x.\n", adapter_index, + ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#lx.\n", adapter_index, output_index, hr); memset(&output_desc, 0, sizeof(output_desc)); hr = IDXGIOutput_GetDesc(output, &output_desc); - ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#x.\n", adapter_index, + ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#lx.\n", adapter_index, output_index, hr); ok(!lstrcmpiW(output_desc.DeviceName, display_device.DeviceName), "Adapter %u output %u: Expect device name %s, got %s.\n", adapter_index, @@ -5736,11 +5736,11 @@ static void test_multi_adapter(void) ret = ChangeDisplaySettingsExW(display_device.DeviceName, &old_mode, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); ok(ret == DISP_CHANGE_SUCCESSFUL, - "Adapter %u output %u: ChangeDisplaySettingsExW %s returned unexpected %d.\n", + "Adapter %u output %u: ChangeDisplaySettingsExW %s returned unexpected %ld.\n", adapter_index, output_index, wine_dbgstr_w(display_device.DeviceName), ret); ret = ChangeDisplaySettingsExW(display_device.DeviceName, NULL, NULL, 0, NULL); ok(ret == DISP_CHANGE_SUCCESSFUL, - "Adapter %u output %u: ChangeDisplaySettingsExW %s returned unexpected %d.\n", + "Adapter %u output %u: ChangeDisplaySettingsExW %s returned unexpected %ld.\n", adapter_index, output_index, wine_dbgstr_w(display_device.DeviceName), ret); IDXGIOutput_Release(output); @@ -5759,9 +5759,9 @@ static void test_multi_adapter(void) } hr = IDXGIFactory_EnumAdapters(factory, adapter_index - 1, &adapter); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGIAdapter_GetDesc(adapter, &adapter_desc); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine ok(!lstrcmpW(adapter_desc.Description, L"Microsoft Basic Render Driver"), "Got unexpected description %s.\n", wine_dbgstr_w(adapter_desc.Description)); todo_wine ok(adapter_desc.VendorId == 0x1414, @@ -5773,16 +5773,16 @@ static void test_multi_adapter(void) ok(adapter_desc.Revision == 0x0000, "Got unexpected revision %#x.\n", adapter_desc.Revision); todo_wine ok(!adapter_desc.DedicatedVideoMemory, - "Got unexpected DedicatedVideoMemory %#lx.\n", adapter_desc.DedicatedVideoMemory); + "Got unexpected DedicatedVideoMemory %#Ix.\n", adapter_desc.DedicatedVideoMemory); ok(!adapter_desc.DedicatedSystemMemory, - "Got unexpected DedicatedSystemMemory %#lx.\n", adapter_desc.DedicatedSystemMemory); + "Got unexpected DedicatedSystemMemory %#Ix.\n", adapter_desc.DedicatedSystemMemory); hr = IDXGIAdapter_QueryInterface(adapter, &IID_IDXGIAdapter1, (void **)&adapter1); - ok(hr == S_OK || broken(hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_NOINTERFACE), "Got unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) { hr = IDXGIAdapter1_GetDesc1(adapter1, &adapter_desc1); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine ok(adapter_desc1.Flags == DXGI_ADAPTER_FLAG_SOFTWARE, "Got unexpected flags %#x.\n", adapter_desc1.Flags); IDXGIAdapter1_Release(adapter1); @@ -5818,7 +5818,7 @@ static BOOL check_message(const struct message *expected, if (expected->check_wparam) { ok(wparam == expected->expect_wparam, - "Got unexpected wparam %lx for message %x, expected %lx.\n", + "Got unexpected wparam %Ix for message %x, expected %Ix.\n", wparam, message, expected->expect_wparam); } @@ -5827,7 +5827,7 @@ static BOOL check_message(const struct message *expected, static LRESULT CALLBACK test_wndproc(HWND hwnd, unsigned int message, WPARAM wparam, LPARAM lparam) { - ok(!expect_no_messages, "Got unexpected message %#x, hwnd %p, wparam %#lx, lparam %#lx.\n", + ok(!expect_no_messages, "Got unexpected message %#x, hwnd %p, wparam %#Ix, lparam %#Ix.\n", message, hwnd, wparam, lparam); if (expect_messages) @@ -5928,9 +5928,9 @@ static void test_swapchain_window_messages(void) ok(!!window, "Failed to create window.\n"); hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get adapter, hr %#lx.\n", hr); hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get parent, hr %#lx.\n", hr); IDXGIAdapter_Release(adapter); swapchain_desc.BufferDesc.Width = 800; @@ -5953,7 +5953,7 @@ static void test_swapchain_window_messages(void) flush_events(); expect_no_messages = TRUE; hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); - ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create swapchain, hr %#lx.\n", hr); flush_events(); expect_no_messages = FALSE; @@ -5963,7 +5963,7 @@ static void test_swapchain_window_messages(void) mode_desc.Width = 800; mode_desc.Height = 600; hr = IDXGISwapChain_ResizeTarget(swapchain, &mode_desc); - ok(hr == S_OK, "Failed to resize target, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to resize target, hr %#lx.\n", hr); flush_events(); ok(!expect_messages->message, "Expected message %#x.\n", expect_messages->message); @@ -5972,7 +5972,7 @@ static void test_swapchain_window_messages(void) mode_desc.Width = 400; mode_desc.Height = 200; hr = IDXGISwapChain_ResizeTarget(swapchain, &mode_desc); - ok(hr == S_OK, "Failed to resize target, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to resize target, hr %#lx.\n", hr); flush_events(); ok(!expect_messages->message, "Expected message %#x.\n", expect_messages->message); @@ -5982,7 +5982,7 @@ static void test_swapchain_window_messages(void) hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE || broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */ - "Failed to enter fullscreen, hr %#x.\n", hr); + "Failed to enter fullscreen, hr %#lx.\n", hr); if (FAILED(hr)) { skip("Could not change fullscreen state.\n"); @@ -5998,13 +5998,13 @@ static void test_swapchain_window_messages(void) /* leave fullscreen */ expect_messages = leave_fullscreen_messages; hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); flush_events(); ok(!expect_messages->message, "Expected message %#x.\n", expect_messages->message); expect_messages = NULL; refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount); /* create fullscreen swapchain */ DestroyWindow(window); @@ -6018,7 +6018,7 @@ static void test_swapchain_window_messages(void) expect_messages = enter_fullscreen_messages; expect_messages_broken = enter_fullscreen_messages_vista; hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); - ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create swapchain, hr %#lx.\n", hr); flush_events(); todo_wine ok(!expect_messages->message || broken(!expect_messages_broken->message), @@ -6029,20 +6029,20 @@ static void test_swapchain_window_messages(void) /* leave fullscreen */ expect_messages = leave_fullscreen_messages; hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); flush_events(); ok(!expect_messages->message, "Expected message %#x.\n", expect_messages->message); expect_messages = NULL; done: refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount); DestroyWindow(window); refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); refcount = IDXGIFactory_Release(factory); - ok(!refcount, "Factory has %u references left.\n", refcount); + ok(!refcount, "Factory has %lu references left.\n", refcount); UnregisterClassA("dxgi_test_wndproc_wc", GetModuleHandleA(NULL)); } @@ -6099,9 +6099,9 @@ static void test_swapchain_window_styles(void) } hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get adapter, hr %#lx.\n", hr); hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get parent, hr %#lx.\n", hr); IDXGIAdapter_Release(adapter); swapchain_desc.BufferDesc.Width = 800; @@ -6126,9 +6126,9 @@ static void test_swapchain_window_styles(void) style = GetWindowLongA(swapchain_desc.OutputWindow, GWL_STYLE); exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); - ok(style == tests[i].expected_style, "Test %u: Got style %#x, expected %#x.\n", + ok(style == tests[i].expected_style, "Test %u: Got style %#lx, expected %#lx.\n", i, style, tests[i].expected_style); - ok(exstyle == tests[i].expected_exstyle, "Test %u: Got exstyle %#x, expected %#x.\n", + ok(exstyle == tests[i].expected_exstyle, "Test %u: Got exstyle %#lx, expected %#lx.\n", i, exstyle, tests[i].expected_exstyle); fullscreen_style = tests[i].expected_style & ~(WS_POPUP | WS_MAXIMIZEBOX @@ -6138,31 +6138,31 @@ static void test_swapchain_window_styles(void) fullscreen_exstyle |= WS_EX_TOPMOST; hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); - ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create swapchain, hr %#lx.\n", hr); style = GetWindowLongA(swapchain_desc.OutputWindow, GWL_STYLE); exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); - ok(style == tests[i].expected_style, "Test %u: Got style %#x, expected %#x.\n", + ok(style == tests[i].expected_style, "Test %u: Got style %#lx, expected %#lx.\n", i, style, tests[i].expected_style); - ok(exstyle == tests[i].expected_exstyle, "Test %u: Got exstyle %#x, expected %#x.\n", + ok(exstyle == tests[i].expected_exstyle, "Test %u: Got exstyle %#lx, expected %#lx.\n", i, exstyle, tests[i].expected_exstyle); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE || broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */ - "Failed to set fullscreen state, hr %#x.\n", hr); + "Failed to set fullscreen state, hr %#lx.\n", hr); if (SUCCEEDED(hr)) { style = GetWindowLongA(swapchain_desc.OutputWindow, GWL_STYLE); exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); todo_wine - ok(style == fullscreen_style, "Test %u: Got style %#x, expected %#x.\n", + ok(style == fullscreen_style, "Test %u: Got style %#lx, expected %#lx.\n", i, style, fullscreen_style); - ok(exstyle == fullscreen_exstyle, "Test %u: Got exstyle %#x, expected %#x.\n", + ok(exstyle == fullscreen_exstyle, "Test %u: Got exstyle %#lx, expected %#lx.\n", i, exstyle, fullscreen_exstyle); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); } else { @@ -6171,38 +6171,38 @@ static void test_swapchain_window_styles(void) style = GetWindowLongA(swapchain_desc.OutputWindow, GWL_STYLE); exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); - ok(style == tests[i].expected_style, "Test %u: Got style %#x, expected %#x.\n", + ok(style == tests[i].expected_style, "Test %u: Got style %#lx, expected %#lx.\n", i, style, tests[i].expected_style); - ok(exstyle == tests[i].expected_exstyle, "Test %u: Got exstyle %#x, expected %#x.\n", + ok(exstyle == tests[i].expected_exstyle, "Test %u: Got exstyle %#lx, expected %#lx.\n", i, exstyle, tests[i].expected_exstyle); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE || broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */ - "Failed to set fullscreen state, hr %#x.\n", hr); + "Failed to set fullscreen state, hr %#lx.\n", hr); if (SUCCEEDED(hr)) { style = GetWindowLongA(swapchain_desc.OutputWindow, GWL_STYLE); exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); todo_wine - ok(style == fullscreen_style, "Test %u: Got style %#x, expected %#x.\n", + ok(style == fullscreen_style, "Test %u: Got style %#lx, expected %#lx.\n", i, style, fullscreen_style); - ok(exstyle == fullscreen_exstyle, "Test %u: Got exstyle %#x, expected %#x.\n", + ok(exstyle == fullscreen_exstyle, "Test %u: Got exstyle %#lx, expected %#lx.\n", i, exstyle, fullscreen_exstyle); SetWindowLongW(swapchain_desc.OutputWindow, GWL_STYLE, fullscreen_style); SetWindowLongW(swapchain_desc.OutputWindow, GWL_EXSTYLE, fullscreen_exstyle); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); style = GetWindowLongA(swapchain_desc.OutputWindow, GWL_STYLE); exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); todo_wine - ok(style == tests[i].expected_style, "Test %u: Got style %#x, expected %#x.\n", + ok(style == tests[i].expected_style, "Test %u: Got style %#lx, expected %#lx.\n", i, style, tests[i].expected_style); todo_wine - ok(exstyle == tests[i].expected_exstyle, "Test %u: Got exstyle %#x, expected %#x.\n", + ok(exstyle == tests[i].expected_exstyle, "Test %u: Got exstyle %#lx, expected %#lx.\n", i, exstyle, tests[i].expected_exstyle); } else @@ -6211,24 +6211,24 @@ static void test_swapchain_window_styles(void) } refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount); style = GetWindowLongA(swapchain_desc.OutputWindow, GWL_STYLE); exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); todo_wine - ok(style == tests[i].expected_style, "Test %u: Got style %#x, expected %#x.\n", + ok(style == tests[i].expected_style, "Test %u: Got style %#lx, expected %#lx.\n", i, style, tests[i].expected_style); todo_wine - ok(exstyle == tests[i].expected_exstyle, "Test %u: Got exstyle %#x, expected %#x.\n", + ok(exstyle == tests[i].expected_exstyle, "Test %u: Got exstyle %#lx, expected %#lx.\n", i, exstyle, tests[i].expected_exstyle); DestroyWindow(swapchain_desc.OutputWindow); } refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); refcount = IDXGIFactory_Release(factory); - ok(!refcount, "Factory has %u references left.\n", refcount); + ok(!refcount, "Factory has %lu references left.\n", refcount); } static void test_gamma_control(void) @@ -6252,7 +6252,7 @@ static void test_gamma_control(void) } hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output); if (hr == DXGI_ERROR_NOT_FOUND) @@ -6262,11 +6262,11 @@ static void test_gamma_control(void) IDXGIDevice_Release(device); return; } - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGIOutput_GetGammaControlCapabilities(output, &caps); todo_wine - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); IDXGIOutput_Release(output); swapchain_desc.BufferDesc.Width = 640; @@ -6286,14 +6286,14 @@ static void test_gamma_control(void) swapchain_desc.Flags = 0; hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); - ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create swapchain, hr %#lx.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE || broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */ - "Failed to enter fullscreen, hr %#x.\n", hr); + "Failed to enter fullscreen, hr %#lx.\n", hr); if (FAILED(hr)) { skip("Could not change fullscreen state.\n"); @@ -6301,11 +6301,11 @@ static void test_gamma_control(void) } hr = IDXGISwapChain_GetContainingOutput(swapchain, &output); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); memset(&caps, 0, sizeof(caps)); hr = IDXGIOutput_GetGammaControlCapabilities(output, &caps); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(caps.MaxConvertedValue > caps.MinConvertedValue || broken(caps.MaxConvertedValue == 0.0f && caps.MinConvertedValue == 1.0f) /* WARP */, @@ -6322,25 +6322,25 @@ static void test_gamma_control(void) memset(&gamma, 0, sizeof(gamma)); hr = IDXGIOutput_GetGammaControl(output, &gamma); todo_wine - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); hr = IDXGIOutput_SetGammaControl(output, &gamma); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); IDXGIOutput_Release(output); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); done: refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount); DestroyWindow(swapchain_desc.OutputWindow); IDXGIAdapter_Release(adapter); refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); refcount = IDXGIFactory_Release(factory); - ok(!refcount, "Factory has %u references left.\n", refcount); + ok(!refcount, "Factory has %lu references left.\n", refcount); } static void test_window_association(IUnknown *device, BOOL is_d3d12) @@ -6406,28 +6406,28 @@ static void test_window_association(IUnknown *device, BOOL is_d3d12) hwnd2 = CreateWindowA("static", "dxgi_test2", 0, 0, 0, 400, 200, 0, 0, 0, 0); hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory2); - ok(hr == S_OK, "Failed to create DXGI factory, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create DXGI factory, hr %#lx.\n", hr); get_factory(device, is_d3d12, &factory); hr = IDXGIFactory_GetWindowAssociation(factory, NULL); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); for (i = 0; i <= DXGI_MWA_VALID; ++i) { hr = IDXGIFactory_MakeWindowAssociation(factory, NULL, i); - ok(hr == S_OK, "Got unexpected hr %#x for flags %#x.\n", hr, i); + ok(hr == S_OK, "Got unexpected hr %#lx for flags %#x.\n", hr, i); hr = IDXGIFactory_MakeWindowAssociation(factory, swapchain_desc.OutputWindow, i); - ok(hr == S_OK, "Got unexpected hr %#x for flags %#x.\n", hr, i); + ok(hr == S_OK, "Got unexpected hr %#lx for flags %#x.\n", hr, i); wndproc = GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC); - ok(wndproc == original_wndproc, "Got unexpected wndproc %#lx, expected %#lx for flags %#x.\n", + ok(wndproc == original_wndproc, "Got unexpected wndproc %#Ix, expected %#Ix for flags %#x.\n", wndproc, original_wndproc, i); hwnd = (HWND)0xdeadbeef; hr = IDXGIFactory_GetWindowAssociation(factory, &hwnd); - ok(hr == S_OK, "Got unexpected hr %#x for flags %#x.\n", hr, i); + ok(hr == S_OK, "Got unexpected hr %#lx for flags %#x.\n", hr, i); /* Apparently GetWindowAssociation() always returns NULL, even when * MakeWindowAssociation() and GetWindowAssociation() are both * successfully called. */ @@ -6435,19 +6435,19 @@ static void test_window_association(IUnknown *device, BOOL is_d3d12) } hr = IDXGIFactory_MakeWindowAssociation(factory, swapchain_desc.OutputWindow, DXGI_MWA_VALID + 1); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); /* Alt+Enter tests. */ hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); wndproc = GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC); - ok(wndproc == original_wndproc, "Got unexpected wndproc %#lx, expected %#lx.\n", wndproc, original_wndproc); + ok(wndproc == original_wndproc, "Got unexpected wndproc %#Ix, expected %#Ix.\n", wndproc, original_wndproc); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE || broken(hr == DXGI_ERROR_UNSUPPORTED) /* Windows 7 testbot */, - "Got unexpected hr %#x.\n", hr); + "Got unexpected hr %#lx.\n", hr); if (FAILED(hr)) { skip("Could not change fullscreen state.\n"); @@ -6455,27 +6455,27 @@ static void test_window_association(IUnknown *device, BOOL is_d3d12) else { hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); for (i = 0; i < ARRAY_SIZE(tests); ++i) { /* First associate a window with the opposite flags. */ hr = IDXGIFactory_MakeWindowAssociation(factory, hwnd2, ~tests[i].flag & DXGI_MWA_VALID); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); /* Associate the current test window. */ hwnd = tests[i].flag ? swapchain_desc.OutputWindow : NULL; hr = IDXGIFactory_MakeWindowAssociation(factory, hwnd, tests[i].flag); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); /* Associating a new test window doesn't override the old window. */ hr = IDXGIFactory_MakeWindowAssociation(factory, hwnd2, ~tests[i].flag & DXGI_MWA_VALID); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); /* Associations with a different factory don't affect the existing * association. */ hr = IDXGIFactory_MakeWindowAssociation(factory2, hwnd, ~tests[i].flag & DXGI_MWA_VALID); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); /* Post synthesized Alt + VK_RETURN WM_SYSKEYDOWN. */ PostMessageA(swapchain_desc.OutputWindow, WM_SYSKEYDOWN, VK_RETURN, @@ -6483,7 +6483,7 @@ static void test_window_association(IUnknown *device, BOOL is_d3d12) flush_events(); output = NULL; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &output); - ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); ok(fullscreen == tests[i].expect_fullscreen || broken(tests[i].broken_d3d10 && fullscreen), "Test %u: Got unexpected fullscreen %#x.\n", i, fullscreen); @@ -6492,24 +6492,24 @@ static void test_window_association(IUnknown *device, BOOL is_d3d12) IDXGIOutput_Release(output); wndproc = GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC); - ok(wndproc == original_wndproc, "Test %u: Got unexpected wndproc %#lx, expected %#lx.\n", + ok(wndproc == original_wndproc, "Test %u: Got unexpected wndproc %#Ix, expected %#Ix.\n", i, wndproc, original_wndproc); } } hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = IDXGIFactory_Release(factory2); - ok(!refcount, "Factory has %u references left.\n", refcount); + ok(!refcount, "Factory has %lu references left.\n", refcount); DestroyWindow(hwnd2); refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount); DestroyWindow(swapchain_desc.OutputWindow); refcount = IDXGIFactory_Release(factory); - ok(refcount == !is_d3d12, "IDXGIFactory has %u references left.\n", refcount); + ok(refcount == !is_d3d12, "IDXGIFactory has %lu references left.\n", refcount); } static void test_output_ownership(IUnknown *device, BOOL is_d3d12) @@ -6552,19 +6552,19 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12) IDXGIFactory_Release(factory); return; } - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGIOutput_GetDesc(output, &output_desc); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); lstrcpyW(open_adapter_gdi_desc.DeviceName, output_desc.DeviceName); status = pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc); - ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status); check_ownership_desc.hAdapter = open_adapter_gdi_desc.hAdapter; check_ownership_desc.VidPnSourceId = open_adapter_gdi_desc.VidPnSourceId; status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS); - ok(status == STATUS_SUCCESS, "Got unexpected status %#x, expected %#x.\n", status, + ok(status == STATUS_SUCCESS, "Got unexpected status %#lx, expected %#lx.\n", status, STATUS_SUCCESS); swapchain_desc.BufferDesc.Width = 800; @@ -6583,7 +6583,7 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12) swapchain_desc.SwapEffect = is_d3d12 ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); /* Swapchain in fullscreen mode. */ hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, output); @@ -6594,17 +6594,17 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12) skip("Failed to change fullscreen state.\n"); goto done; } - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); fullscreen = FALSE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(fullscreen, "Got unexpected fullscreen state.\n"); /* Win10 1909 doesn't seem to grab output exclusive ownership. * And all output ownership calls return S_OK on D3D10 and D3D12 with 1909. */ if (is_d3d12) { status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS); - ok(status == STATUS_SUCCESS, "Got unexpected status %#x, expected %#x.\n", status, + ok(status == STATUS_SUCCESS, "Got unexpected status %#lx, expected %#lx.\n", status, STATUS_SUCCESS); } else @@ -6613,26 +6613,26 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12) STATUS_GRAPHICS_PRESENT_OCCLUDED); todo_wine ok(status == STATUS_GRAPHICS_PRESENT_OCCLUDED || broken(status == STATUS_SUCCESS), /* Win10 1909 */ - "Got unexpected status %#x, expected %#x.\n", status, + "Got unexpected status %#lx, expected %#lx.\n", status, STATUS_GRAPHICS_PRESENT_OCCLUDED); } hr = IDXGIOutput_TakeOwnership(output, NULL, FALSE); ok(hr == DXGI_ERROR_INVALID_CALL || broken(hr == S_OK), /* Win10 1909 */ - "Got unexpected hr %#x.\n", hr); + "Got unexpected hr %#lx.\n", hr); hr = IDXGIOutput_TakeOwnership(output, NULL, TRUE); ok(hr == DXGI_ERROR_INVALID_CALL || broken(hr == S_OK), /* Win10 1909 */ - "Got unexpected hr %#x.\n", hr); + "Got unexpected hr %#lx.\n", hr); hr = IDXGIOutput_TakeOwnership(output, device, FALSE); if (is_d3d12) - todo_wine ok(hr == E_NOINTERFACE || hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(hr == E_NOINTERFACE || hr == S_OK, "Got unexpected hr %#lx.\n", hr); else todo_wine ok(hr == E_INVALIDARG || broken(hr == S_OK), /* Win10 1909 */ - "Got unexpected hr %#x.\n", hr); + "Got unexpected hr %#lx.\n", hr); hr = IDXGIOutput_TakeOwnership(output, device, TRUE); - ok(hr == E_NOINTERFACE || hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE || hr == S_OK, "Got unexpected hr %#lx.\n", hr); IDXGIOutput_ReleaseOwnership(output); status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS); - ok(status == STATUS_SUCCESS, "Got unexpected status %#x, expected %#x.\n", status, + ok(status == STATUS_SUCCESS, "Got unexpected status %#lx, expected %#lx.\n", status, STATUS_SUCCESS); /* IDXGIOutput_TakeOwnership always returns E_NOINTERFACE for d3d12. Tests @@ -6642,46 +6642,46 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12) hr = IDXGIOutput_TakeOwnership(output, device, FALSE); ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE || broken(hr == S_OK), /* Win10 1909 */ - "Got unexpected hr %#x.\n", hr); + "Got unexpected hr %#lx.\n", hr); IDXGIOutput_ReleaseOwnership(output); hr = IDXGIOutput_TakeOwnership(output, device, TRUE); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); /* Note that the "exclusive" parameter to IDXGIOutput_TakeOwnership() * seems to behave opposite to what's described by MSDN. */ status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED); ok(status == STATUS_GRAPHICS_PRESENT_OCCLUDED || broken(status == STATUS_SUCCESS), /* Win10 1909 */ - "Got unexpected status %#x, expected %#x.\n", status, STATUS_GRAPHICS_PRESENT_OCCLUDED); + "Got unexpected status %#lx, expected %#lx.\n", status, STATUS_GRAPHICS_PRESENT_OCCLUDED); hr = IDXGIOutput_TakeOwnership(output, device, FALSE); - ok(hr == E_INVALIDARG || broken(hr == S_OK) /* Win10 1909 */, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG || broken(hr == S_OK) /* Win10 1909 */, "Got unexpected hr %#lx.\n", hr); IDXGIOutput_ReleaseOwnership(output); /* Swapchain in windowed mode. */ hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); fullscreen = TRUE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!fullscreen, "Unexpected fullscreen state.\n"); status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS); - ok(status == STATUS_SUCCESS, "Got unexpected status %#x, expected %#x.\n", status, + ok(status == STATUS_SUCCESS, "Got unexpected status %#lx, expected %#lx.\n", status, STATUS_SUCCESS); hr = IDXGIOutput_TakeOwnership(output, device, FALSE); ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE || broken(hr == S_OK), /* Win10 1909 */ - "Got unexpected hr %#x.\n", hr); + "Got unexpected hr %#lx.\n", hr); hr = IDXGIOutput_TakeOwnership(output, device, TRUE); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED); ok(status == STATUS_GRAPHICS_PRESENT_OCCLUDED || broken(hr == S_OK), /* Win10 1909 */ - "Got unexpected status %#x, expected %#x.\n", status, STATUS_GRAPHICS_PRESENT_OCCLUDED); + "Got unexpected status %#lx, expected %#lx.\n", status, STATUS_GRAPHICS_PRESENT_OCCLUDED); IDXGIOutput_ReleaseOwnership(output); status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS); - ok(status == STATUS_SUCCESS, "Got unexpected status %#x, expected %#x.\n", status, + ok(status == STATUS_SUCCESS, "Got unexpected status %#lx, expected %#lx.\n", status, STATUS_SUCCESS); done: @@ -6692,11 +6692,11 @@ done: IDXGISwapChain_Release(swapchain); DestroyWindow(swapchain_desc.OutputWindow); refcount = IDXGIFactory_Release(factory); - ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); + ok(refcount == !is_d3d12, "Got unexpected refcount %lu.\n", refcount); close_adapter_desc.hAdapter = open_adapter_gdi_desc.hAdapter; status = pD3DKMTCloseAdapter(&close_adapter_desc); - ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status); } static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12) @@ -6734,7 +6734,7 @@ static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12) hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count, NULL); ok(SUCCEEDED(hr) || broken(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE), /* Win 7 TestBots */ - "Adapter %u output %u: GetDisplayModeList failed, hr %#x.\n", adapter_idx, + "Adapter %u output %u: GetDisplayModeList failed, hr %#lx.\n", adapter_idx, output_idx, hr); if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE) { @@ -6747,11 +6747,11 @@ static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12) modes = heap_calloc(mode_count, sizeof(*modes)); hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count, modes); - ok(hr == S_OK, "Adapter %u output %u: GetDisplayModeList failed, hr %#x.\n", + ok(hr == S_OK, "Adapter %u output %u: GetDisplayModeList failed, hr %#lx.\n", adapter_idx, output_idx, hr); hr = IDXGIOutput_GetDesc(output, &output_desc); - ok(hr == S_OK, "Adapter %u output %u: GetDesc failed, hr %#x.\n", adapter_idx, + ok(hr == S_OK, "Adapter %u output %u: GetDesc failed, hr %#lx.\n", adapter_idx, output_idx, hr); width = output_desc.DesktopCoordinates.right - output_desc.DesktopCoordinates.left; height = output_desc.DesktopCoordinates.bottom - output_desc.DesktopCoordinates.top; @@ -6765,11 +6765,11 @@ static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12) adapter_idx, output_idx, width, height); ret = ClipCursor(NULL); - ok(ret, "Adapter %u output %u: ClipCursor failed, error %#x.\n", + ok(ret, "Adapter %u output %u: ClipCursor failed, error %#lx.\n", adapter_idx, output_idx, GetLastError()); get_virtual_rect(&virtual_rect); ret = GetClipCursor(&clip_rect); - ok(ret, "Adapter %u output %u: GetClipCursor failed, error %#x.\n", adapter_idx, + ok(ret, "Adapter %u output %u: GetClipCursor failed, error %#lx.\n", adapter_idx, output_idx, GetLastError()); ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u output %u: Expect clip rect %s, got %s.\n", adapter_idx, output_idx, @@ -6784,13 +6784,13 @@ static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12) swapchain_desc.OutputWindow = create_window(); heap_free(modes); hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); - ok(hr == S_OK, "Adapter %u output %u: CreateSwapChain failed, hr %#x.\n", + ok(hr == S_OK, "Adapter %u output %u: CreateSwapChain failed, hr %#lx.\n", adapter_idx, output_idx, hr); flush_events(); get_virtual_rect(&virtual_rect); ret = GetClipCursor(&clip_rect); - ok(ret, "Adapter %u output %u: GetClipCursor failed, error %#x.\n", adapter_idx, + ok(ret, "Adapter %u output %u: GetClipCursor failed, error %#lx.\n", adapter_idx, output_idx, GetLastError()); ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u output %u: Expect clip rect %s, got %s.\n", adapter_idx, output_idx, @@ -6799,11 +6799,11 @@ static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12) hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE || broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */ - "Adapter %u output %u: SetFullscreenState failed, hr %#x.\n", adapter_idx, + "Adapter %u output %u: SetFullscreenState failed, hr %#lx.\n", adapter_idx, output_idx, hr); if (FAILED(hr)) { - skip("Adapter %u output %u: Could not change fullscreen state, hr %#x.\n", + skip("Adapter %u output %u: Could not change fullscreen state, hr %#lx.\n", adapter_idx, output_idx, hr); IDXGISwapChain_Release(swapchain); IDXGIOutput_Release(output); @@ -6814,27 +6814,27 @@ static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12) flush_events(); get_virtual_rect(&virtual_rect); ret = GetClipCursor(&clip_rect); - ok(ret, "Adapter %u output %u: GetClipCursor failed, error %#x.\n", adapter_idx, + ok(ret, "Adapter %u output %u: GetClipCursor failed, error %#lx.\n", adapter_idx, output_idx, GetLastError()); ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u output %u: Expect clip rect %s, got %s.\n", adapter_idx, output_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#x.\n", adapter_idx, + ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#lx.\n", adapter_idx, output_idx, hr); refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "Adapter %u output %u: IDXGISwapChain has %u references left.\n", + ok(!refcount, "Adapter %u output %u: IDXGISwapChain has %lu references left.\n", adapter_idx, output_idx, refcount); refcount = IDXGIOutput_Release(output); - ok(!refcount, "Adapter %u output %u: IDXGIOutput has %u references left.\n", + ok(!refcount, "Adapter %u output %u: IDXGIOutput has %lu references left.\n", adapter_idx, output_idx, refcount); DestroyWindow(swapchain_desc.OutputWindow); flush_events(); get_virtual_rect(&virtual_rect); ret = GetClipCursor(&clip_rect); - ok(ret, "Adapter %u output %u: GetClipCursor failed, error %#x.\n", adapter_idx, + ok(ret, "Adapter %u output %u: GetClipCursor failed, error %#lx.\n", adapter_idx, output_idx, GetLastError()); ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u output %u: Expect clip rect %s, got %s.\n", adapter_idx, output_idx, @@ -6845,7 +6845,7 @@ static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12) } refcount = IDXGIFactory_Release(factory); - ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); + ok(refcount == !is_d3d12, "Got unexpected refcount %lu.\n", refcount); } static void test_factory_check_feature_support(void) @@ -6862,28 +6862,28 @@ static void test_factory_check_feature_support(void) } hr = IDXGIFactory5_CheckFeatureSupport(factory, 0x12345678, (void *)&data, sizeof(data)); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); /* Crashes on Windows. */ if (0) { hr = IDXGIFactory5_CheckFeatureSupport(factory, DXGI_FEATURE_PRESENT_ALLOW_TEARING, NULL, sizeof(data)); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); } hr = IDXGIFactory5_CheckFeatureSupport(factory, DXGI_FEATURE_PRESENT_ALLOW_TEARING, &data, sizeof(data) - 1); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); hr = IDXGIFactory5_CheckFeatureSupport(factory, DXGI_FEATURE_PRESENT_ALLOW_TEARING, &data, sizeof(data) + 1); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); data = (BOOL)0xdeadbeef; hr = IDXGIFactory5_CheckFeatureSupport(factory, DXGI_FEATURE_PRESENT_ALLOW_TEARING, &data, sizeof(data)); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(data == TRUE || data == FALSE, "Got unexpected data %#x.\n", data); ref_count = IDXGIFactory5_Release(factory); - ok(!ref_count, "Factory has %u references left.\n", ref_count); + ok(!ref_count, "Factory has %lu references left.\n", ref_count); } static void test_frame_latency_event(IUnknown *device, BOOL is_d3d12) @@ -6928,7 +6928,7 @@ static void test_frame_latency_event(IUnknown *device, BOOL is_d3d12) hr = IDXGIFactory2_CreateSwapChainForHwnd(factory2, device, window, &swapchain_desc, NULL, NULL, &swapchain1); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGISwapChain1_QueryInterface(swapchain1, &IID_IDXGISwapChain2, (void**)&swapchain2); IDXGISwapChain1_Release(swapchain1); @@ -6943,24 +6943,24 @@ static void test_frame_latency_event(IUnknown *device, BOOL is_d3d12) /* test swap chain without waitable object */ frame_latency = 0xdeadbeef; hr = IDXGISwapChain2_GetMaximumFrameLatency(swapchain2, &frame_latency); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); ok(frame_latency == 0xdeadbeef, "Got unexpected frame latency %#x.\n", frame_latency); hr = IDXGISwapChain2_SetMaximumFrameLatency(swapchain2, 1); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); event = IDXGISwapChain2_GetFrameLatencyWaitableObject(swapchain2); ok(!event, "Got unexpected event %p.\n", event); ref_count = IDXGISwapChain2_Release(swapchain2); - ok(!ref_count, "Swap chain has %u references left.\n", ref_count); + ok(!ref_count, "Swap chain has %lu references left.\n", ref_count); /* test swap chain with waitable object */ swapchain_desc.Flags = DXGI_SWAP_CHAIN_FLAG_FRAME_LATENCY_WAITABLE_OBJECT; hr = IDXGIFactory2_CreateSwapChainForHwnd(factory2, device, window, &swapchain_desc, NULL, NULL, &swapchain1); - ok(hr == S_OK, "Failed to create swap chain, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create swap chain, hr %#lx.\n", hr); hr = IDXGISwapChain1_QueryInterface(swapchain1, &IID_IDXGISwapChain2, (void**)&swapchain2); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); IDXGISwapChain1_Release(swapchain1); event = IDXGISwapChain2_GetFrameLatencyWaitableObject(swapchain2); @@ -6968,50 +6968,50 @@ static void test_frame_latency_event(IUnknown *device, BOOL is_d3d12) /* auto-reset event */ wait_result = WaitForSingleObject(event, 0); - ok(!wait_result, "Got unexpected wait result %#x.\n", wait_result); + ok(!wait_result, "Got unexpected wait result %#lx.\n", wait_result); wait_result = WaitForSingleObject(event, 0); - ok(wait_result == WAIT_TIMEOUT, "Got unexpected wait result %#x.\n", wait_result); + ok(wait_result == WAIT_TIMEOUT, "Got unexpected wait result %#lx.\n", wait_result); hr = IDXGISwapChain2_GetMaximumFrameLatency(swapchain2, &frame_latency); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(frame_latency == 1, "Got unexpected frame latency %#x.\n", frame_latency); hr = IDXGISwapChain2_SetMaximumFrameLatency(swapchain2, 0); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); hr = IDXGISwapChain2_GetMaximumFrameLatency(swapchain2, &frame_latency); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(frame_latency == 1, "Got unexpected frame latency %#x.\n", frame_latency); hr = IDXGISwapChain2_SetMaximumFrameLatency(swapchain2, 3); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGISwapChain2_GetMaximumFrameLatency(swapchain2, &frame_latency); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(frame_latency == 3, "Got unexpected frame latency %#x.\n", frame_latency); wait_result = WaitForSingleObject(event, 0); - todo_wine ok(!wait_result, "Got unexpected wait result %#x.\n", wait_result); + todo_wine ok(!wait_result, "Got unexpected wait result %#lx.\n", wait_result); wait_result = WaitForSingleObject(event, 0); - todo_wine ok(!wait_result, "Got unexpected wait result %#x.\n", wait_result); + todo_wine ok(!wait_result, "Got unexpected wait result %#lx.\n", wait_result); wait_result = WaitForSingleObject(event, 100); - ok(wait_result == WAIT_TIMEOUT, "Got unexpected wait result %#x.\n", wait_result); + ok(wait_result == WAIT_TIMEOUT, "Got unexpected wait result %#lx.\n", wait_result); for (i = 0; i < 5; i++) { hr = IDXGISwapChain2_Present(swapchain2, 0, 0); - ok(hr == S_OK, "Present %u failed with hr %#x.\n", i, hr); + ok(hr == S_OK, "Present %u failed with hr %#lx.\n", i, hr); wait_result = WaitForSingleObject(event, 100); - ok(!wait_result, "Got unexpected wait result %#x.\n", wait_result); + ok(!wait_result, "Got unexpected wait result %#lx.\n", wait_result); } wait_result = WaitForSingleObject(event, 100); - ok(wait_result == WAIT_TIMEOUT, "Got unexpected wait result %#x.\n", wait_result); + ok(wait_result == WAIT_TIMEOUT, "Got unexpected wait result %#lx.\n", wait_result); ref_count = IDXGISwapChain2_Release(swapchain2); - ok(!ref_count, "Swap chain has %u references left.\n", ref_count); + ok(!ref_count, "Swap chain has %lu references left.\n", ref_count); DestroyWindow(window); ref_count = IDXGIFactory2_Release(factory2); - ok(ref_count == !is_d3d12, "Factory has %u references left.\n", ref_count); + ok(ref_count == !is_d3d12, "Factory has %lu references left.\n", ref_count); } static void test_colour_space_support(IUnknown *device, BOOL is_d3d12) @@ -7078,7 +7078,7 @@ static void test_colour_space_support(IUnknown *device, BOOL is_d3d12) hr = IDXGIFactory2_CreateSwapChainForHwnd(factory2, device, window, &swapchain_desc, NULL, NULL, &swapchain1); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGISwapChain1_QueryInterface(swapchain1, &IID_IDXGISwapChain3, (void**)&swapchain3); IDXGISwapChain1_Release(swapchain1); @@ -7094,7 +7094,7 @@ static void test_colour_space_support(IUnknown *device, BOOL is_d3d12) { support = 0xdeadbeef; hr = IDXGISwapChain3_CheckColorSpaceSupport(swapchain3, colour_spaces[i], &support); - ok(hr == S_OK, "Got unexpected hr %#x for test %u.\n", hr, i); + ok(hr == S_OK, "Got unexpected hr %#lx for test %u.\n", hr, i); ok(!(support & ~DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG_PRESENT), "Got unexpected support flags %#x for test %u.\n", support, i); @@ -7110,14 +7110,14 @@ static void test_colour_space_support(IUnknown *device, BOOL is_d3d12) hr = IDXGISwapChain3_SetColorSpace1(swapchain3, colour_spaces[i]); ok(hr == (support & DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG_PRESENT) ? S_OK : E_INVALIDARG, - "Got unexpected hr %#x for text %u.\n", hr, i); + "Got unexpected hr %#lx for text %u.\n", hr, i); } ref_count = IDXGISwapChain3_Release(swapchain3); - ok(!ref_count, "Swap chain has %u references left.\n", ref_count); + ok(!ref_count, "Swap chain has %lu references left.\n", ref_count); DestroyWindow(window); ref_count = IDXGIFactory2_Release(factory2); - ok(ref_count == !is_d3d12, "Factory has %u references left.\n", ref_count); + ok(ref_count == !is_d3d12, "Factory has %lu references left.\n", ref_count); } static void test_mode_change(IUnknown *device, BOOL is_d3d12) @@ -7140,10 +7140,10 @@ static void test_mode_change(IUnknown *device, BOOL is_d3d12) memset(&devmode, 0, sizeof(devmode)); devmode.dmSize = sizeof(devmode); ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); - ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + ok(ret, "EnumDisplaySettingsW failed, error %#lx.\n", GetLastError()); ok(equal_mode_rect(&devmode, ®istry_mode), "Got a different mode.\n"); ret = EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &devmode); - ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + ok(ret, "EnumDisplaySettingsW failed, error %#lx.\n", GetLastError()); ok(equal_mode_rect(&devmode, ®istry_mode), "Got a different mode.\n"); while (EnumDisplaySettingsW(NULL, mode_idx++, &devmode)) @@ -7179,7 +7179,7 @@ static void test_mode_change(IUnknown *device, BOOL is_d3d12) /* Test that no mode restorations if no mode changes actually happened */ change_ret = ChangeDisplaySettingsW(&devmode, CDS_UPDATEREGISTRY | CDS_NORESET); - ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsW failed with %d.\n", change_ret); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsW failed with %ld.\n", change_ret); swapchain_desc.BufferDesc.Width = registry_mode.dmPelsWidth; swapchain_desc.BufferDesc.Height = registry_mode.dmPelsHeight; @@ -7198,14 +7198,14 @@ static void test_mode_change(IUnknown *device, BOOL is_d3d12) swapchain_desc.Flags = DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH; hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); - ok(hr == S_OK, "CreateSwapChain failed, hr %#x.\n", hr); + ok(hr == S_OK, "CreateSwapChain failed, hr %#lx.\n", hr); refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount); memset(&devmode2, 0, sizeof(devmode2)); devmode2.dmSize = sizeof(devmode2); ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + ok(ret, "EnumDisplaySettingsW failed, error %#lx.\n", GetLastError()); ok(equal_mode_rect(&devmode2, ®istry_mode), "Got a different mode.\n"); ret = restore_display_modes(original_modes, display_count); ok(ret, "Failed to restore display modes.\n"); @@ -7213,48 +7213,48 @@ static void test_mode_change(IUnknown *device, BOOL is_d3d12) /* If current display settings are different than the display settings in registry before * calling SetFullscreenState() */ change_ret = ChangeDisplaySettingsW(&devmode, CDS_UPDATEREGISTRY | CDS_NORESET); - ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsW failed with %d.\n", change_ret); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsW failed with %ld.\n", change_ret); hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); - ok(hr == S_OK, "CreateSwapChain failed, hr %#x.\n", hr); + ok(hr == S_OK, "CreateSwapChain failed, hr %#lx.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); ok(hr == DXGI_ERROR_UNSUPPORTED /* Win7 */ || hr == S_OK /* Win8~Win10 1909 */ || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, /* Win10 2004 */ - "Got unexpected hr %#x.\n", hr); + "Got unexpected hr %#lx.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount); ret = restore_display_modes(original_modes, display_count); ok(ret, "Failed to restore display modes.\n"); /* Test that mode restorations use display settings in the registry with a fullscreen device */ hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); - ok(hr == S_OK, "CreateSwapChain failed, hr %#x.\n", hr); + ok(hr == S_OK, "CreateSwapChain failed, hr %#lx.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); if (FAILED(hr)) { - skip("SetFullscreenState failed, hr %#x.\n", hr); + skip("SetFullscreenState failed, hr %#lx.\n", hr); refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount); goto done; } change_ret = ChangeDisplaySettingsW(&devmode, CDS_UPDATEREGISTRY | CDS_NORESET); - ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsW failed with %d.\n", change_ret); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsW failed with %ld.\n", change_ret); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + ok(ret, "EnumDisplaySettingsW failed, error %#lx.\n", GetLastError()); ok(equal_mode_rect(&devmode2, &devmode), "Got a different mode.\n"); ret = EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + ok(ret, "EnumDisplaySettingsW failed, error %#lx.\n", GetLastError()); ok(equal_mode_rect(&devmode2, &devmode), "Got a different mode.\n"); refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount); ret = restore_display_modes(original_modes, display_count); ok(ret, "Failed to restore display modes.\n"); @@ -7263,7 +7263,7 @@ static void test_mode_change(IUnknown *device, BOOL is_d3d12) for (output_idx = 0; SUCCEEDED(IDXGIAdapter_EnumOutputs(adapter, output_idx, &output)); ++output_idx) { hr = IDXGIOutput_GetDesc(output, &output_desc); - ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#x.\n", adapter_idx, output_idx, hr); + ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#lx.\n", adapter_idx, output_idx, hr); if ((adapter_idx || output_idx) && output_desc.AttachedToDesktop) { @@ -7289,7 +7289,7 @@ static void test_mode_change(IUnknown *device, BOOL is_d3d12) memset(&old_devmode, 0, sizeof(old_devmode)); old_devmode.dmSize = sizeof(old_devmode); ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &old_devmode); - ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + ok(ret, "EnumDisplaySettingsW failed, error %#lx.\n", GetLastError()); mode_idx = 0; d3d_width = 0; @@ -7324,88 +7324,88 @@ static void test_mode_change(IUnknown *device, BOOL is_d3d12) /* Test that mode restorations for non-primary outputs upon fullscreen state changes */ hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); - ok(hr == S_OK, "CreateSwapChain failed, hr %#x.\n", hr); + ok(hr == S_OK, "CreateSwapChain failed, hr %#lx.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); change_ret = ChangeDisplaySettingsExW(second_monitor_name, &devmode, NULL, CDS_RESET, NULL); - ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExW failed with %d.\n", change_ret); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExW failed with %ld.\n", change_ret); ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + ok(ret, "EnumDisplaySettingsW failed, error %#lx.\n", GetLastError()); if (devmode2.dmPelsWidth == old_devmode.dmPelsWidth && devmode2.dmPelsHeight == old_devmode.dmPelsHeight) { skip("Failed to change display settings of the second monitor.\n"); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount); goto done; } hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + ok(ret, "EnumDisplaySettingsW failed, error %#lx.\n", GetLastError()); ok(equal_mode_rect(&devmode2, &old_devmode), "Got a different mode.\n"); ret = EnumDisplaySettingsW(second_monitor_name, ENUM_REGISTRY_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + ok(ret, "EnumDisplaySettingsW failed, error %#lx.\n", GetLastError()); ok(equal_mode_rect(&devmode2, &old_devmode), "Got a different mode.\n"); hr = IDXGIOutput_GetDesc(second_output, &output_desc); - ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); + ok(hr == S_OK, "GetDesc failed, hr %#lx.\n", hr); ok(output_desc.DesktopCoordinates.right - output_desc.DesktopCoordinates.left == - old_devmode.dmPelsWidth, "Expected width %u, got %u.\n", old_devmode.dmPelsWidth, + old_devmode.dmPelsWidth, "Expected width %lu, got %lu.\n", old_devmode.dmPelsWidth, output_desc.DesktopCoordinates.right - output_desc.DesktopCoordinates.left); ok(output_desc.DesktopCoordinates.bottom - output_desc.DesktopCoordinates.top == - old_devmode.dmPelsHeight, "Expected height %u, got %u.\n", old_devmode.dmPelsHeight, + old_devmode.dmPelsHeight, "Expected height %lu, got %lu.\n", old_devmode.dmPelsHeight, output_desc.DesktopCoordinates.bottom - output_desc.DesktopCoordinates.top); refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount); ret = restore_display_modes(original_modes, display_count); ok(ret, "Failed to restore display modes.\n"); /* Test that mode restorations for non-primary outputs use display settings in the registry */ hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); - ok(hr == S_OK, "CreateSwapChain failed, hr %#x.\n", hr); + ok(hr == S_OK, "CreateSwapChain failed, hr %#lx.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); - ok(hr == S_OK, "SetFullscreenState failed, hr %#x.\n", hr); + ok(hr == S_OK, "SetFullscreenState failed, hr %#lx.\n", hr); change_ret = ChangeDisplaySettingsExW(second_monitor_name, &devmode, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); - ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExW failed with %d.\n", change_ret); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExW failed with %ld.\n", change_ret); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(hr == S_OK, "SetFullscreenState failed, hr %#x.\n", hr); + ok(hr == S_OK, "SetFullscreenState failed, hr %#lx.\n", hr); ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + ok(ret, "EnumDisplaySettingsW failed, error %#lx.\n", GetLastError()); ok(devmode2.dmPelsWidth == devmode.dmPelsWidth && devmode2.dmPelsHeight == devmode.dmPelsHeight, - "Expected resolution %ux%u, got %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight, + "Expected resolution %lux%lu, got %lux%lu.\n", devmode.dmPelsWidth, devmode.dmPelsHeight, devmode2.dmPelsWidth, devmode2.dmPelsHeight); ret = EnumDisplaySettingsW(second_monitor_name, ENUM_REGISTRY_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + ok(ret, "EnumDisplaySettingsW failed, error %#lx.\n", GetLastError()); ok(devmode2.dmPelsWidth == devmode.dmPelsWidth && devmode2.dmPelsHeight == devmode.dmPelsHeight, - "Expected resolution %ux%u, got %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight, + "Expected resolution %lux%lu, got %lux%lu.\n", devmode.dmPelsWidth, devmode.dmPelsHeight, devmode2.dmPelsWidth, devmode2.dmPelsHeight); hr = IDXGIOutput_GetDesc(second_output, &output_desc); - ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); + ok(hr == S_OK, "GetDesc failed, hr %#lx.\n", hr); ok(output_desc.DesktopCoordinates.right - output_desc.DesktopCoordinates.left == - devmode.dmPelsWidth, "Expected width %u, got %u.\n", devmode.dmPelsWidth, + devmode.dmPelsWidth, "Expected width %lu, got %lu.\n", devmode.dmPelsWidth, output_desc.DesktopCoordinates.right - output_desc.DesktopCoordinates.left); ok(output_desc.DesktopCoordinates.bottom - output_desc.DesktopCoordinates.top == - devmode.dmPelsHeight, "Expected height %u, got %u.\n", devmode.dmPelsHeight, + devmode.dmPelsHeight, "Expected height %lu, got %lu.\n", devmode.dmPelsHeight, output_desc.DesktopCoordinates.bottom - output_desc.DesktopCoordinates.top); refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount); ret = restore_display_modes(original_modes, display_count); ok(ret, "Failed to restore display modes.\n"); /* Test that mode restorations for non-primary outputs on fullscreen state changes when there * are two fullscreen swapchains on different outputs */ hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); - ok(hr == S_OK, "CreateSwapChain failed, hr %#x.\n", hr); + ok(hr == S_OK, "CreateSwapChain failed, hr %#lx.\n", hr); swapchain_desc2 = swapchain_desc; swapchain_desc.BufferDesc.Width = d3d_width; @@ -7413,52 +7413,52 @@ static void test_mode_change(IUnknown *device, BOOL is_d3d12) swapchain_desc2.OutputWindow = CreateWindowA("static", "dxgi_test2", 0, old_devmode.dmPosition.x, old_devmode.dmPosition.y, 400, 200, 0, 0, 0, 0); hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc2, &swapchain2); - ok(hr == S_OK, "CreateSwapChain failed, hr %#x.\n", hr); + ok(hr == S_OK, "CreateSwapChain failed, hr %#lx.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); - ok(hr == S_OK, "SetFullscreenState failed, hr %#x.\n", hr); + ok(hr == S_OK, "SetFullscreenState failed, hr %#lx.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain2, TRUE, NULL); if (FAILED(hr)) { - skip("SetFullscreenState failed, hr %#x.\n", hr); + skip("SetFullscreenState failed, hr %#lx.\n", hr); refcount = IDXGISwapChain_Release(swapchain2); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(hr == S_OK, "SetFullscreenState failed, hr %#x.\n", hr); + ok(hr == S_OK, "SetFullscreenState failed, hr %#lx.\n", hr); refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount); goto done; } hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(hr == S_OK, "SetFullscreenState failed, hr %#x.\n", hr); + ok(hr == S_OK, "SetFullscreenState failed, hr %#lx.\n", hr); hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - ok(hr == S_OK, "GetFullscreenState failed, hr %#x.\n", hr); + ok(hr == S_OK, "GetFullscreenState failed, hr %#lx.\n", hr); ok(!fullscreen, "Expected swapchain not fullscreen.\n"); hr = IDXGISwapChain_GetFullscreenState(swapchain2, &fullscreen, NULL); - ok(hr == S_OK, "GetFullscreenState failed, hr %#x.\n", hr); + ok(hr == S_OK, "GetFullscreenState failed, hr %#lx.\n", hr); ok(fullscreen, "Expected swapchain fullscreen.\n"); ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + ok(ret, "EnumDisplaySettingsW failed, error %#lx.\n", GetLastError()); ok(equal_mode_rect(&devmode2, &old_devmode), "Got a different mode.\n"); ret = EnumDisplaySettingsW(second_monitor_name, ENUM_REGISTRY_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + ok(ret, "EnumDisplaySettingsW failed, error %#lx.\n", GetLastError()); ok(equal_mode_rect(&devmode2, &old_devmode), "Got a different mode.\n"); hr = IDXGIOutput_GetDesc(second_output, &output_desc); - ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); + ok(hr == S_OK, "GetDesc failed, hr %#lx.\n", hr); ok(output_desc.DesktopCoordinates.right - output_desc.DesktopCoordinates.left == - old_devmode.dmPelsWidth, "Expected width %u, got %u.\n", old_devmode.dmPelsWidth, + old_devmode.dmPelsWidth, "Expected width %lu, got %lu.\n", old_devmode.dmPelsWidth, output_desc.DesktopCoordinates.right - output_desc.DesktopCoordinates.left); ok(output_desc.DesktopCoordinates.bottom - output_desc.DesktopCoordinates.top == - old_devmode.dmPelsHeight, "Expected height %u, got %u.\n", old_devmode.dmPelsHeight, + old_devmode.dmPelsHeight, "Expected height %lu, got %lu.\n", old_devmode.dmPelsHeight, output_desc.DesktopCoordinates.bottom - output_desc.DesktopCoordinates.top); hr = IDXGISwapChain_SetFullscreenState(swapchain2, FALSE, NULL); - ok(hr == S_OK, "SetFullscreenState failed, hr %#x.\n", hr); + ok(hr == S_OK, "SetFullscreenState failed, hr %#lx.\n", hr); refcount = IDXGISwapChain_Release(swapchain2); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount); refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + ok(!refcount, "IDXGISwapChain has %lu references left.\n", refcount); DestroyWindow(swapchain_desc2.OutputWindow); ret = restore_display_modes(original_modes, display_count); ok(ret, "Failed to restore display modes.\n"); @@ -7468,7 +7468,7 @@ done: IDXGIOutput_Release(second_output); DestroyWindow(swapchain_desc.OutputWindow); refcount = IDXGIFactory_Release(factory); - ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); + ok(refcount == !is_d3d12, "Got unexpected refcount %lu.\n", refcount); ret = restore_display_modes(original_modes, display_count); ok(ret, "Failed to restore display modes.\n"); heap_free(original_modes); @@ -7486,44 +7486,44 @@ static void test_swapchain_present_count(IUnknown *device, BOOL is_d3d12) present_count = ~0u; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!present_count, "Got unexpected present count %u.\n", present_count); hr = IDXGISwapChain_Present(swapchain, 0, 0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); expected = present_count + 1; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); hr = IDXGISwapChain_Present(swapchain, 10, 0); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); expected = present_count; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); hr = IDXGISwapChain_Present(swapchain, 0, DXGI_PRESENT_TEST); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); expected = present_count; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); ShowWindow(window, SW_MINIMIZE); hr = IDXGISwapChain_Present(swapchain, 0, 0); - ok(hr == (is_d3d12 ? S_OK : DXGI_STATUS_OCCLUDED), "Got unexpected hr %#x.\n", hr); + ok(hr == (is_d3d12 ? S_OK : DXGI_STATUS_OCCLUDED), "Got unexpected hr %#lx.\n", hr); expected = present_count + !!is_d3d12; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); ShowWindow(window, SW_NORMAL); hr = IDXGISwapChain_Present(swapchain, 0, 0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); expected = present_count + 1; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); IDXGISwapChain_Release(swapchain); @@ -7544,7 +7544,7 @@ static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12)) test_func((IUnknown *)device, FALSE); refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } static void run_on_d3d12(void (*test_func)(IUnknown *device, BOOL is_d3d12)) @@ -7566,9 +7566,9 @@ static void run_on_d3d12(void (*test_func)(IUnknown *device, BOOL is_d3d12)) wait_queue_idle(device, queue); refcount = ID3D12CommandQueue_Release(queue); - ok(!refcount, "Command queue has %u references left.\n", refcount); + ok(!refcount, "Command queue has %lu references left.\n", refcount); refcount = ID3D12Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } START_TEST(dxgi)
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mlang/tests/Makefile.in | 1 dlls/mlang/tests/mlang.c | 446 +++++++++++++++++++++--------------------- 2 files changed, 223 insertions(+), 224 deletions(-) diff --git a/dlls/mlang/tests/Makefile.in b/dlls/mlang/tests/Makefile.in index ab72ea8a987..21ec4b2465f 100644 --- a/dlls/mlang/tests/Makefile.in +++ b/dlls/mlang/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mlang.dll IMPORTS = mlang oleaut32 ole32 user32 gdi32 diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index fd0611c72ac..c9e22adfd4e 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -579,7 +579,7 @@ static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2) lenA = 0; lenW = ARRAY_SIZE(bufW); ret = IMultiLanguage2_ConvertStringToUnicode(iML2, NULL, 1252, stringA, &lenA, bufW, &lenW); - ok(ret == S_OK, "IMultiLanguage2_ConvertStringToUnicode failed: %08x\n", ret); + ok(ret == S_OK, "IMultiLanguage2_ConvertStringToUnicode failed: %08lx\n", ret); ok(lenA == 0, "expected lenA 0, got %u\n", lenA); ok(lenW == 0, "expected lenW 0, got %u\n", lenW); @@ -587,7 +587,7 @@ static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2) lenA = -1; lenW = ARRAY_SIZE(bufW); ret = IMultiLanguage2_ConvertStringToUnicode(iML2, NULL, 1252, stringA, &lenA, bufW, &lenW); - ok(ret == S_OK, "IMultiLanguage2_ConvertStringToUnicode failed: %08x\n", ret); + ok(ret == S_OK, "IMultiLanguage2_ConvertStringToUnicode failed: %08lx\n", ret); ok(lenA == lstrlenA(stringA), "expected lenA %u, got %u\n", lstrlenA(stringA), lenA); ok(lenW == lstrlenW(stringW), "expected lenW %u, got %u\n", lstrlenW(stringW), lenW); if (lenW < ARRAY_SIZE(bufW)) { @@ -601,7 +601,7 @@ static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2) lenA = -1; lenW = 5; ret = IMultiLanguage2_ConvertStringToUnicode(iML2, NULL, 1252, stringA, &lenA, bufW, &lenW); - ok(ret == E_FAIL, "IMultiLanguage2_ConvertStringToUnicode should fail: %08x\n", ret); + ok(ret == E_FAIL, "IMultiLanguage2_ConvertStringToUnicode should fail: %08lx\n", ret); ok(lenW == 0, "expected lenW 0, got %u\n", lenW); /* still has to do partial conversion */ ok(!memcmp(bufW, stringW, 5 * sizeof(WCHAR)), "bufW/stringW mismatch\n"); @@ -610,7 +610,7 @@ static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2) lenA = -1; lenW = ARRAY_SIZE(bufW); ret = IMultiLanguage2_ConvertStringToUnicode(iML2, NULL, CP_UNICODE, stringA, &lenA, bufW, &lenW); - ok(ret == S_OK, "IMultiLanguage2_ConvertStringToUnicode failed: %08x\n", ret); + ok(ret == S_OK, "IMultiLanguage2_ConvertStringToUnicode failed: %08lx\n", ret); ok(lenA == lstrlenA(stringA), "expected lenA %u, got %u\n", lstrlenA(stringA), lenA); ok(lenW == lstrlenW(stringW)/(int)sizeof(WCHAR), "wrong lenW %u\n", lenW); ok(bufW[lenW] != 0, "buf should not be 0 terminated\n"); @@ -621,7 +621,7 @@ static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2) lenA = lstrlenA(stringA); lenW = 0; ret = IMultiLanguage2_ConvertStringToUnicode(iML2, NULL, 1252, stringA, &lenA, NULL, &lenW); - ok(ret == S_OK, "IMultiLanguage2_ConvertStringToUnicode failed: %08x\n", ret); + ok(ret == S_OK, "IMultiLanguage2_ConvertStringToUnicode failed: %08lx\n", ret); ok(lenA == lstrlenA(stringA), "expected lenA %u, got %u\n", lstrlenA(stringA), lenA); expected_len = MultiByteToWideChar(1252, 0, stringA, lenA, NULL, 0); ok(lenW == expected_len, "expected lenW %u, got %u\n", expected_len, lenW); @@ -630,7 +630,7 @@ static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2) lenA = lstrlenA(stringA); lenW = ARRAY_SIZE(bufW); ret = pConvertINetMultiByteToUnicode(NULL, 1252, stringA, (INT *)&lenA, NULL, (INT *)&lenW); - ok(ret == S_OK, "ConvertINetMultiByteToUnicode failed: %08x\n", ret); + ok(ret == S_OK, "ConvertINetMultiByteToUnicode failed: %08lx\n", ret); ok(lenA == lstrlenA(stringA), "expected lenA %u, got %u\n", lstrlenA(stringA), lenA); expected_len = MultiByteToWideChar(1252, 0, stringA, lenA, NULL, 0); ok(lenW == expected_len, "expected lenW %u, got %u\n", expected_len, lenW); @@ -639,7 +639,7 @@ static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2) lenA = lstrlenA(stringA); lenW = 0; ret = pConvertINetMultiByteToUnicode(NULL, 1252, stringA, (INT *)&lenA, NULL, (INT *)&lenW); - ok(ret == S_OK, "ConvertINetMultiByteToUnicode failed: %08x\n", ret); + ok(ret == S_OK, "ConvertINetMultiByteToUnicode failed: %08lx\n", ret); ok(lenA == lstrlenA(stringA), "expected lenA %u, got %u\n", lstrlenA(stringA), lenA); expected_len = MultiByteToWideChar(1252, 0, stringA, lenA, NULL, 0); ok(lenW == expected_len, "expected lenW %u, got %u\n", expected_len, lenW); @@ -650,7 +650,7 @@ static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2) lenW = 0; lenA = sizeof(bufA); ret = IMultiLanguage2_ConvertStringFromUnicode(iML2, NULL, 1252, stringW, &lenW, bufA, &lenA); - ok(ret == S_OK, "IMultiLanguage2_ConvertStringFromUnicode failed: %08x\n", ret); + ok(ret == S_OK, "IMultiLanguage2_ConvertStringFromUnicode failed: %08lx\n", ret); ok(lenA == 0, "expected lenA 0, got %u\n", lenA); ok(lenW == 0, "expected lenW 0, got %u\n", lenW); @@ -658,7 +658,7 @@ static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2) lenW = -1; lenA = sizeof(bufA); ret = IMultiLanguage2_ConvertStringFromUnicode(iML2, NULL, 1252, stringW, &lenW, bufA, &lenA); - ok(ret == S_OK, "IMultiLanguage2_ConvertStringFromUnicode failed: %08x\n", ret); + ok(ret == S_OK, "IMultiLanguage2_ConvertStringFromUnicode failed: %08lx\n", ret); ok(lenA == lstrlenA(stringA), "expected lenA %u, got %u\n", lstrlenA(stringA), lenA); ok(lenW == lstrlenW(stringW), "expected lenW %u, got %u\n", lstrlenW(stringW), lenW); ok(bufA[lenA] != 0, "buf should not be 0 terminated\n"); @@ -669,7 +669,7 @@ static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2) lenW = -1; lenA = 5; ret = IMultiLanguage2_ConvertStringFromUnicode(iML2, NULL, 1252, stringW, &lenW, bufA, &lenA); - ok(ret == E_FAIL, "IMultiLanguage2_ConvertStringFromUnicode should fail: %08x\n", ret); + ok(ret == E_FAIL, "IMultiLanguage2_ConvertStringFromUnicode should fail: %08lx\n", ret); ok(lenA == 0, "expected lenA 0, got %u\n", lenA); /* still has to do partial conversion */ ok(!memcmp(bufA, stringA, 5), "bufW/stringW mismatch\n"); @@ -678,7 +678,7 @@ static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2) lenW = -1; lenA = sizeof(bufA); ret = IMultiLanguage2_ConvertStringFromUnicode(iML2, NULL, CP_UNICODE, stringW, &lenW, bufA, &lenA); - ok(ret == S_OK, "IMultiLanguage2_ConvertStringFromUnicode failed: %08x\n", ret); + ok(ret == S_OK, "IMultiLanguage2_ConvertStringFromUnicode failed: %08lx\n", ret); ok(lenA == lstrlenA(stringA) * (int)sizeof(WCHAR), "wrong lenA %u\n", lenA); ok(lenW == lstrlenW(stringW), "expected lenW %u, got %u\n", lstrlenW(stringW), lenW); ok(bufA[lenA] != 0 && bufA[lenA+1] != 0, "buf should not be 0 terminated\n"); @@ -690,7 +690,7 @@ static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2) lenW = lstrlenW(stringW); lenA = 0; ret = IMultiLanguage2_ConvertStringFromUnicode(iML2, NULL, 1252, stringW, &lenW, NULL, &lenA); - ok(ret == S_OK, "IMultiLanguage2_ConvertStringFromUnicode failed: %08x\n", ret); + ok(ret == S_OK, "IMultiLanguage2_ConvertStringFromUnicode failed: %08lx\n", ret); ok(lenW == lstrlenW(stringW), "expected lenW %u, got %u\n", lstrlenW(stringW), lenW); expected_len = WideCharToMultiByte(1252, 0, stringW, lenW, NULL, 0, NULL, NULL); ok(lenA == expected_len, "expected lenA %u, got %u\n", expected_len, lenA); @@ -698,7 +698,7 @@ static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2) static void cpinfo_cmp(MIMECPINFO *cpinfo1, MIMECPINFO *cpinfo2) { - ok(cpinfo1->dwFlags == cpinfo2->dwFlags, "dwFlags mismatch: %08x != %08x\n", cpinfo1->dwFlags, cpinfo2->dwFlags); + ok(cpinfo1->dwFlags == cpinfo2->dwFlags, "dwFlags mismatch: %08lx != %08lx\n", cpinfo1->dwFlags, cpinfo2->dwFlags); ok(cpinfo1->uiCodePage == cpinfo2->uiCodePage, "uiCodePage mismatch: %u != %u\n", cpinfo1->uiCodePage, cpinfo2->uiCodePage); ok(cpinfo1->uiFamilyCodePage == cpinfo2->uiFamilyCodePage, "uiFamilyCodePage mismatch: %u != %u\n", cpinfo1->uiFamilyCodePage, cpinfo2->uiFamilyCodePage); ok(!lstrcmpW(cpinfo1->wszDescription, cpinfo2->wszDescription), "wszDescription mismatch\n"); @@ -788,42 +788,42 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) total = 0; ret = IMultiLanguage2_GetNumberOfCodePageInfo(iML2, &total); - ok(ret == S_OK && total != 0, "IMultiLanguage2_GetNumberOfCodePageInfo: expected S_OK/!0, got %08x/%u\n", ret, total); + ok(ret == S_OK && total != 0, "IMultiLanguage2_GetNumberOfCodePageInfo: expected S_OK/!0, got %08lx/%u\n", ret, total); trace("total mlang supported codepages %u\n", total); ret = IMultiLanguage2_EnumCodePages(iML2, flags, LANG_NEUTRAL, &iEnumCP); - ok(ret == S_OK && iEnumCP, "IMultiLanguage2_EnumCodePages: expected S_OK/!NULL, got %08x/%p\n", ret, iEnumCP); + ok(ret == S_OK && iEnumCP, "IMultiLanguage2_EnumCodePages: expected S_OK/!NULL, got %08lx/%p\n", ret, iEnumCP); ret = IEnumCodePage_Reset(iEnumCP); - ok(ret == S_OK, "IEnumCodePage_Reset: expected S_OK, got %08x\n", ret); + ok(ret == S_OK, "IEnumCodePage_Reset: expected S_OK, got %08lx\n", ret); n = 65536; ret = IEnumCodePage_Next(iEnumCP, 0, NULL, &n); ok(ret == S_FALSE || ret == E_FAIL, - "IEnumCodePage_Next: expected S_FALSE or E_FAIL, got %08x\n", ret); + "IEnumCodePage_Next: expected S_FALSE or E_FAIL, got %08lx\n", ret); if (ret == S_FALSE) - ok(n == 0, "IEnumCodePage_Next: expected 0/S_FALSE, got %u/%08x\n", n, ret); + ok(n == 0, "IEnumCodePage_Next: expected 0/S_FALSE, got %lu/%08lx\n", n, ret); else if (ret == E_FAIL) - ok(n == 65536, "IEnumCodePage_Next: expected 65536/E_FAIL, got %u/%08x\n", n, ret); + ok(n == 65536, "IEnumCodePage_Next: expected 65536/E_FAIL, got %lu/%08lx\n", n, ret); ret = IEnumCodePage_Next(iEnumCP, 0, NULL, NULL); ok(ret == S_FALSE || ret == E_FAIL, - "IEnumCodePage_Next: expected S_FALSE or E_FAIL, got %08x\n", ret); + "IEnumCodePage_Next: expected S_FALSE or E_FAIL, got %08lx\n", ret); cpinfo = HeapAlloc(GetProcessHeap(), 0, sizeof(*cpinfo) * total * 2); n = total * 2; ret = IEnumCodePage_Next(iEnumCP, 0, cpinfo, &n); - ok(ret == S_FALSE && n == 0, "IEnumCodePage_Next: expected S_FALSE/0, got %08x/%u\n", ret, n); + ok(ret == S_FALSE && n == 0, "IEnumCodePage_Next: expected S_FALSE/0, got %08lx/%lu\n", ret, n); n = total * 2; ret = IEnumCodePage_Next(iEnumCP, n, cpinfo, &n); - ok(ret == S_OK && n != 0, "IEnumCodePage_Next: expected S_OK/!0, got %08x/%u\n", ret, n); + ok(ret == S_OK && n != 0, "IEnumCodePage_Next: expected S_OK/!0, got %08lx/%lu\n", ret, n); - trace("flags %08x, enumerated codepages %u\n", flags, n); + trace("flags %08lx, enumerated codepages %lu\n", flags, n); if (!flags) { - ok(n == total, "IEnumCodePage_Next: expected %u, got %u\n", total, n); + ok(n == total, "IEnumCodePage_Next: expected %u, got %lu\n", total, n); flags = MIMECONTF_MIME_LATEST; } @@ -862,7 +862,7 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) wine_dbgstr_w(cpinfo[i].wszProportionalFont), cpinfo[i].bGDICharset); #endif - ok(cpinfo[i].dwFlags & flags, "enumerated flags %08x do not include requested %08x\n", cpinfo[i].dwFlags, flags); + ok(cpinfo[i].dwFlags & flags, "enumerated flags %08lx do not include requested %08lx\n", cpinfo[i].dwFlags, flags); if (TranslateCharsetInfo((DWORD *)(INT_PTR)cpinfo[i].uiFamilyCodePage, &csi, TCI_SRCCODEPAGE)) ok(cpinfo[i].bGDICharset == csi.ciCharset, "%d != %d\n", cpinfo[i].bGDICharset, csi.ciCharset); @@ -880,17 +880,17 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) if (IsValidCodePage(cpinfo[i].uiCodePage)) { ret = IMultiLanguage2_IsConvertible(iML2, cpinfo[i].uiCodePage, CP_UNICODE); - ok(ret == S_OK, "IMultiLanguage2_IsConvertible(%u -> CP_UNICODE) = %08x\n", cpinfo[i].uiCodePage, ret); + ok(ret == S_OK, "IMultiLanguage2_IsConvertible(%u -> CP_UNICODE) = %08lx\n", cpinfo[i].uiCodePage, ret); ret = IMultiLanguage2_IsConvertible(iML2, CP_UNICODE, cpinfo[i].uiCodePage); - ok(ret == S_OK, "IMultiLanguage2_IsConvertible(CP_UNICODE -> %u) = %08x\n", cpinfo[i].uiCodePage, ret); + ok(ret == S_OK, "IMultiLanguage2_IsConvertible(CP_UNICODE -> %u) = %08lx\n", cpinfo[i].uiCodePage, ret); convertible = check_convertible(iML2, cpinfo[i].uiCodePage, CP_UTF8); if (convertible != E_FAIL) { ret = IMultiLanguage2_IsConvertible(iML2, cpinfo[i].uiCodePage, CP_UTF8); - ok(ret == convertible, "IMultiLanguage2_IsConvertible(%u -> CP_UTF8) = %08x\n", cpinfo[i].uiCodePage, ret); + ok(ret == convertible, "IMultiLanguage2_IsConvertible(%u -> CP_UTF8) = %08lx\n", cpinfo[i].uiCodePage, ret); ret = IMultiLanguage2_IsConvertible(iML2, CP_UTF8, cpinfo[i].uiCodePage); - ok(ret == convertible, "IMultiLanguage2_IsConvertible(CP_UTF8 -> %u) = %08x\n", cpinfo[i].uiCodePage, ret); + ok(ret == convertible, "IMultiLanguage2_IsConvertible(CP_UTF8 -> %u) = %08lx\n", cpinfo[i].uiCodePage, ret); } } else @@ -905,7 +905,7 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) /* _autoxxx charsets are a fake and GetCharsetInfo fails for them */ if (memcmp(cpinfo[i].wszWebCharset, autoW, 5 * sizeof(WCHAR))) { - ok (ret == S_OK, "IMultiLanguage2_GetCharsetInfo failed: %08x\n", ret); + ok (ret == S_OK, "IMultiLanguage2_GetCharsetInfo failed: %08lx\n", ret); #ifdef DUMP_CP_INFO trace("%s: %u %u %s\n", wine_dbgstr_w(cpinfo[i].wszWebCharset), mcsi.uiCodePage, mcsi.uiInternetEncoding, wine_dbgstr_w(mcsi.wszCharset)); #endif @@ -931,7 +931,7 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) /* _autoxxx charsets are a fake and GetCharsetInfo fails for them */ if (memcmp(cpinfo[i].wszHeaderCharset, autoW, 5 * sizeof(WCHAR))) { - ok (ret == S_OK, "IMultiLanguage2_GetCharsetInfo failed: %08x\n", ret); + ok (ret == S_OK, "IMultiLanguage2_GetCharsetInfo failed: %08lx\n", ret); #ifdef DUMP_CP_INFO trace("%s: %u %u %s\n", wine_dbgstr_w(cpinfo[i].wszHeaderCharset), mcsi.uiCodePage, mcsi.uiInternetEncoding, wine_dbgstr_w(mcsi.wszCharset)); #endif @@ -957,7 +957,7 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) /* _autoxxx charsets are a fake and GetCharsetInfo fails for them */ if (memcmp(cpinfo[i].wszBodyCharset, autoW, 5 * sizeof(WCHAR))) { - ok (ret == S_OK, "IMultiLanguage2_GetCharsetInfo failed: %08x\n", ret); + ok (ret == S_OK, "IMultiLanguage2_GetCharsetInfo failed: %08lx\n", ret); #ifdef DUMP_CP_INFO trace("%s: %u %u %s\n", wine_dbgstr_w(cpinfo[i].wszBodyCharset), mcsi.uiCodePage, mcsi.uiInternetEncoding, wine_dbgstr_w(mcsi.wszCharset)); #endif @@ -979,13 +979,13 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) /* now IEnumCodePage_Next should fail, since pointer is at the end */ n = 1; ret = IEnumCodePage_Next(iEnumCP, 1, &cpinfo2, &n); - ok(ret == S_FALSE && n == 0, "IEnumCodePage_Next: expected S_FALSE/0, got %08x/%u\n", ret, n); + ok(ret == S_FALSE && n == 0, "IEnumCodePage_Next: expected S_FALSE/0, got %08lx/%lu\n", ret, n); ret = IEnumCodePage_Reset(iEnumCP); - ok(ret == S_OK, "IEnumCodePage_Reset: expected S_OK, got %08x\n", ret); + ok(ret == S_OK, "IEnumCodePage_Reset: expected S_OK, got %08lx\n", ret); n = 0; ret = IEnumCodePage_Next(iEnumCP, 1, &cpinfo2, &n); - ok(n == 1 && ret == S_OK, "IEnumCodePage_Next: expected 1/S_OK, got %u/%08x\n", n, ret); + ok(n == 1 && ret == S_OK, "IEnumCodePage_Next: expected 1/S_OK, got %lu/%08lx\n", n, ret); cpinfo_cmp(cpinfo, &cpinfo2); if (0) @@ -994,13 +994,13 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) * it's not used here. */ ret = IEnumCodePage_Skip(iEnumCP, 1); - ok(ret == S_OK, "IEnumCodePage_Skip: expected S_OK, got %08x\n", ret); + ok(ret == S_OK, "IEnumCodePage_Skip: expected S_OK, got %08lx\n", ret); } for (i = 0; i < total - 1; i++) { n = 0; ret = IEnumCodePage_Next(iEnumCP, 1, &cpinfo2, &n); - ok(n == 1 && ret == S_OK, "IEnumCodePage_Next: expected 1/S_OK, got %u/%08x\n", n, ret); + ok(n == 1 && ret == S_OK, "IEnumCodePage_Next: expected 1/S_OK, got %lu/%08lx\n", n, ret); cpinfo_cmp(&cpinfo[i + 1], &cpinfo2); } @@ -1044,7 +1044,7 @@ static void test_GetCharsetInfo_other(IMultiLanguage *ml) hr = IMultiLanguage_GetCharsetInfo(ml, other[i].charset, &info); todo_wine_if(other[i].todo) - ok(hr == other[i].hr, "#%d: got %08x, expected %08x\n", i, hr, other[i].hr); + ok(hr == other[i].hr, "#%d: got %08lx, expected %08lx\n", i, hr, other[i].hr); if (hr == S_OK) todo_wine_if(other[i].todo) @@ -1073,36 +1073,36 @@ static void test_EnumScripts(IMultiLanguage2 *iML2, DWORD flags) total = 0; ret = IMultiLanguage2_GetNumberOfScripts(iML2, &total); - ok(ret == S_OK && total != 0, "IMultiLanguage2_GetNumberOfScripts: expected S_OK/!0, got %08x/%u\n", ret, total); + ok(ret == S_OK && total != 0, "IMultiLanguage2_GetNumberOfScripts: expected S_OK/!0, got %08lx/%u\n", ret, total); trace("total mlang supported scripts %u\n", total); ret = IMultiLanguage2_EnumScripts(iML2, flags, LANG_NEUTRAL, &iEnumScript); - ok(ret == S_OK && iEnumScript, "IMultiLanguage2_EnumScripts: expected S_OK/!NULL, got %08x/%p\n", ret, iEnumScript); + ok(ret == S_OK && iEnumScript, "IMultiLanguage2_EnumScripts: expected S_OK/!NULL, got %08lx/%p\n", ret, iEnumScript); ret = IEnumScript_Reset(iEnumScript); - ok(ret == S_OK, "IEnumScript_Reset: expected S_OK, got %08x\n", ret); + ok(ret == S_OK, "IEnumScript_Reset: expected S_OK, got %08lx\n", ret); n = 65536; ret = IEnumScript_Next(iEnumScript, 0, NULL, &n); - ok(n == 65536 && ret == E_FAIL, "IEnumScript_Next: expected 65536/E_FAIL, got %u/%08x\n", n, ret); + ok(n == 65536 && ret == E_FAIL, "IEnumScript_Next: expected 65536/E_FAIL, got %lu/%08lx\n", n, ret); ret = IEnumScript_Next(iEnumScript, 0, NULL, NULL); - ok(ret == E_FAIL, "IEnumScript_Next: expected E_FAIL, got %08x\n", ret); + ok(ret == E_FAIL, "IEnumScript_Next: expected E_FAIL, got %08lx\n", ret); sinfo = HeapAlloc(GetProcessHeap(), 0, sizeof(*sinfo) * total * 2); n = total * 2; ret = IEnumScript_Next(iEnumScript, 0, sinfo, &n); - ok(ret == S_FALSE && n == 0, "IEnumScript_Next: expected S_FALSE/0, got %08x/%u\n", ret, n); + ok(ret == S_FALSE && n == 0, "IEnumScript_Next: expected S_FALSE/0, got %08lx/%lu\n", ret, n); n = total * 2; ret = IEnumScript_Next(iEnumScript, n, sinfo, &n); - ok(ret == S_OK && n != 0, "IEnumScript_Next: expected S_OK, got %08x/%u\n", ret, n); + ok(ret == S_OK && n != 0, "IEnumScript_Next: expected S_OK, got %08lx/%lu\n", ret, n); - trace("flags %08x, enumerated scripts %u\n", flags, n); + trace("flags %08lx, enumerated scripts %lu\n", flags, n); if (!flags) { - ok(n == total, "IEnumScript_Next: expected %u, got %u\n", total, n); + ok(n == total, "IEnumScript_Next: expected %u, got %lu\n", total, n); } total = n; @@ -1129,13 +1129,13 @@ static void test_EnumScripts(IMultiLanguage2 *iML2, DWORD flags) /* now IEnumScript_Next should fail, since pointer is at the end */ n = 1; ret = IEnumScript_Next(iEnumScript, 1, &sinfo2, &n); - ok(ret == S_FALSE && n == 0, "IEnumScript_Next: expected S_FALSE/0, got %08x/%u\n", ret, n); + ok(ret == S_FALSE && n == 0, "IEnumScript_Next: expected S_FALSE/0, got %08lx/%lu\n", ret, n); ret = IEnumScript_Reset(iEnumScript); - ok(ret == S_OK, "IEnumScript_Reset: expected S_OK, got %08x\n", ret); + ok(ret == S_OK, "IEnumScript_Reset: expected S_OK, got %08lx\n", ret); n = 0; ret = IEnumScript_Next(iEnumScript, 1, &sinfo2, &n); - ok(n == 1 && ret == S_OK, "IEnumScript_Next: expected 1/S_OK, got %u/%08x\n", n, ret); + ok(n == 1 && ret == S_OK, "IEnumScript_Next: expected 1/S_OK, got %lu/%08lx\n", n, ret); scriptinfo_cmp(sinfo, &sinfo2); if (0) @@ -1144,13 +1144,13 @@ static void test_EnumScripts(IMultiLanguage2 *iML2, DWORD flags) * it's not used here. */ ret = IEnumScript_Skip(iEnumScript, 1); - ok(ret == S_OK, "IEnumScript_Skip: expected S_OK, got %08x\n", ret); + ok(ret == S_OK, "IEnumScript_Skip: expected S_OK, got %08lx\n", ret); } for (i = 0; i < total - 1; i++) { n = 0; ret = IEnumScript_Next(iEnumScript, 1, &sinfo2, &n); - ok(n == 1 && ret == S_OK, "IEnumScript_Next: expected 1/S_OK, got %u/%08x\n", n, ret); + ok(n == 1 && ret == S_OK, "IEnumScript_Next: expected 1/S_OK, got %lu/%08lx\n", n, ret); scriptinfo_cmp(&sinfo[i + 1], &sinfo2); } @@ -1169,38 +1169,38 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL) dwCodePages = ~0u; ret = IMLangFontLink_CodePageToCodePages(iMLFL, -1, &dwCodePages); - ok(ret == E_FAIL, "IMLangFontLink_CodePageToCodePages should fail: %x\n", ret); - ok(dwCodePages == 0, "expected 0, got %u\n", dwCodePages); + ok(ret == E_FAIL, "IMLangFontLink_CodePageToCodePages should fail: %lx\n", ret); + ok(dwCodePages == 0, "expected 0, got %lu\n", dwCodePages); dwCodePages = 0; ret = IMLangFontLink_CodePageToCodePages(iMLFL, 932, &dwCodePages); - ok(ret == S_OK, "IMLangFontLink_CodePageToCodePages error %x\n", ret); - ok(dwCodePages == FS_JISJAPAN, "expected FS_JISJAPAN, got %08x\n", dwCodePages); + ok(ret == S_OK, "IMLangFontLink_CodePageToCodePages error %lx\n", ret); + ok(dwCodePages == FS_JISJAPAN, "expected FS_JISJAPAN, got %08lx\n", dwCodePages); CodePage = 0; ret = IMLangFontLink_CodePagesToCodePage(iMLFL, dwCodePages, 1035, &CodePage); - ok(ret == S_OK, "IMLangFontLink_CodePagesToCodePage error %x\n", ret); + ok(ret == S_OK, "IMLangFontLink_CodePagesToCodePage error %lx\n", ret); ok(CodePage == 932, "Incorrect CodePage Returned (%i)\n",CodePage); dwManyCodePages = 0; ret = IMLangFontLink_CodePageToCodePages(iMLFL, 1252, &dwManyCodePages); - ok(ret == S_OK, "IMLangFontLink_CodePageToCodePages error %x\n", ret); - ok(dwManyCodePages == FS_LATIN1, "expected FS_LATIN1, got %08x\n", dwManyCodePages); + ok(ret == S_OK, "IMLangFontLink_CodePageToCodePages error %lx\n", ret); + ok(dwManyCodePages == FS_LATIN1, "expected FS_LATIN1, got %08lx\n", dwManyCodePages); dwCodePages = 0; ret = IMLangFontLink_CodePageToCodePages(iMLFL, 1256, &dwCodePages); - ok(ret == S_OK, "IMLangFontLink_CodePageToCodePages error %x\n", ret); - ok(dwCodePages == FS_ARABIC, "expected FS_ARABIC, got %08x\n", dwCodePages); + ok(ret == S_OK, "IMLangFontLink_CodePageToCodePages error %lx\n", ret); + ok(dwCodePages == FS_ARABIC, "expected FS_ARABIC, got %08lx\n", dwCodePages); dwManyCodePages |= dwCodePages; ret = IMLangFontLink_CodePageToCodePages(iMLFL, 874, &dwCodePages); - ok(ret == S_OK, "IMLangFontLink_CodePageToCodePages error %x\n", ret); - ok(dwCodePages == FS_THAI, "expected FS_THAI, got %08x\n", dwCodePages); + ok(ret == S_OK, "IMLangFontLink_CodePageToCodePages error %lx\n", ret); + ok(dwCodePages == FS_THAI, "expected FS_THAI, got %08lx\n", dwCodePages); dwManyCodePages |= dwCodePages; ret = IMLangFontLink_CodePagesToCodePage(iMLFL, dwManyCodePages, 1256, &CodePage); - ok(ret == S_OK, "IMLangFontLink_CodePagesToCodePage error %x\n", ret); + ok(ret == S_OK, "IMLangFontLink_CodePagesToCodePage error %lx\n", ret); ok(CodePage == 1256, "Incorrect CodePage Returned (%i)\n",CodePage); ret = IMLangFontLink_CodePagesToCodePage(iMLFL, dwManyCodePages, 936, &CodePage); - ok(ret == S_OK, "IMLangFontLink_CodePagesToCodePage error %x\n", ret); + ok(ret == S_OK, "IMLangFontLink_CodePagesToCodePage error %lx\n", ret); ok(CodePage == 1252, "Incorrect CodePage Returned (%i)\n",CodePage); /* Tests for GetCharCodePages */ @@ -1210,88 +1210,88 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL) | FS_HEBREW | FS_ARABIC | FS_BALTIC | FS_VIETNAMESE | FS_THAI | FS_JISJAPAN | FS_CHINESESIMP | FS_WANSUNG | FS_CHINESETRAD; ret = IMLangFontLink_GetCharCodePages(iMLFL, 'd', &dwCodePages); - ok(ret == S_OK, "IMLangFontLink_GetCharCodePages error %x\n", ret); - ok(dwCodePages == dwCmpCodePages, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); + ok(ret == S_OK, "IMLangFontLink_GetCharCodePages error %lx\n", ret); + ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); dwCodePages = 0; processed = 0; ret = IMLangFontLink_GetStrCodePages(iMLFL, str, 1, 0, &dwCodePages, &processed); - ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret); - ok(dwCodePages == dwCmpCodePages, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); - ok(processed == 1, "expected 1, got %d\n", processed); + ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %lx\n", ret); + ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); + ok(processed == 1, "expected 1, got %ld\n", processed); /* Cyrillic */ dwCmpCodePages = FS_CYRILLIC | FS_JISJAPAN | FS_CHINESESIMP | FS_WANSUNG; ret = IMLangFontLink_GetCharCodePages(iMLFL, 0x0436, &dwCodePages); - ok(ret == S_OK, "IMLangFontLink_GetCharCodePages error %x\n", ret); - ok(dwCodePages == dwCmpCodePages, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); + ok(ret == S_OK, "IMLangFontLink_GetCharCodePages error %lx\n", ret); + ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); dwCodePages = 0; processed = 0; ret = IMLangFontLink_GetStrCodePages(iMLFL, &str[1], 1, 0, &dwCodePages, &processed); - ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret); - ok(dwCodePages == dwCmpCodePages, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); - ok(processed == 1, "expected 1, got %d\n", processed); + ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %lx\n", ret); + ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); + ok(processed == 1, "expected 1, got %ld\n", processed); /* Japanese */ dwCmpCodePages = FS_JISJAPAN; ret = IMLangFontLink_GetCharCodePages(iMLFL, 0xff90, &dwCodePages); - ok(ret == S_OK, "IMLangFontLink_GetCharCodePages error %x\n", ret); - ok(dwCodePages == dwCmpCodePages, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); + ok(ret == S_OK, "IMLangFontLink_GetCharCodePages error %lx\n", ret); + ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); dwCodePages = 0; processed = 0; ret = IMLangFontLink_GetStrCodePages(iMLFL, &str[2], 1, 0, &dwCodePages, &processed); - ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret); - ok(dwCodePages == dwCmpCodePages, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); - ok(processed == 1, "expected 1, got %d\n", processed); + ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %lx\n", ret); + ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); + ok(processed == 1, "expected 1, got %ld\n", processed); dwCmpCodePages = FS_CYRILLIC | FS_JISJAPAN | FS_CHINESESIMP | FS_WANSUNG; dwCodePages = 0; processed = 0; ret = IMLangFontLink_GetStrCodePages(iMLFL, str, 2, 0, &dwCodePages, &processed); - ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret); - ok(dwCodePages == dwCmpCodePages, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); - ok(processed == 2, "expected 2, got %d\n", processed); + ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %lx\n", ret); + ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); + ok(processed == 2, "expected 2, got %ld\n", processed); dwCmpCodePages = FS_JISJAPAN; dwCodePages = 0; processed = 0; ret = IMLangFontLink_GetStrCodePages(iMLFL, str, 3, 0, &dwCodePages, &processed); - ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret); - ok(dwCodePages == dwCmpCodePages, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); - ok(processed == 3, "expected 3, got %d\n", processed); + ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %lx\n", ret); + ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); + ok(processed == 3, "expected 3, got %ld\n", processed); dwCodePages = 0xffff; processed = -1; ret = IMLangFontLink_GetStrCodePages(iMLFL, &str[2], 1, 0, &dwCodePages, &processed); - ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret); - ok(dwCodePages == dwCmpCodePages, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); - ok(processed == 1, "expected 0, got %d\n", processed); + ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %lx\n", ret); + ok(dwCodePages == dwCmpCodePages, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); + ok(processed == 1, "expected 0, got %ld\n", processed); ret = IMLangFontLink_GetStrCodePages(iMLFL, &str[2], 1, 0, NULL, NULL); - ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret); + ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %lx\n", ret); dwCodePages = 0xffff; processed = -1; ret = IMLangFontLink_GetStrCodePages(iMLFL, str, -1, 0, &dwCodePages, &processed); - ok(ret == E_INVALIDARG, "IMLangFontLink_GetStrCodePages should fail: %x\n", ret); - ok(dwCodePages == 0, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); - ok(processed == 0, "expected 0, got %d\n", processed); + ok(ret == E_INVALIDARG, "IMLangFontLink_GetStrCodePages should fail: %lx\n", ret); + ok(dwCodePages == 0, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); + ok(processed == 0, "expected 0, got %ld\n", processed); dwCodePages = 0xffff; processed = -1; ret = IMLangFontLink_GetStrCodePages(iMLFL, NULL, 1, 0, &dwCodePages, &processed); - ok(ret == E_INVALIDARG, "IMLangFontLink_GetStrCodePages should fail: %x\n", ret); - ok(dwCodePages == 0, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); - ok(processed == 0, "expected 0, got %d\n", processed); + ok(ret == E_INVALIDARG, "IMLangFontLink_GetStrCodePages should fail: %lx\n", ret); + ok(dwCodePages == 0, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); + ok(processed == 0, "expected 0, got %ld\n", processed); dwCodePages = 0xffff; processed = -1; ret = IMLangFontLink_GetStrCodePages(iMLFL, str, 0, 0, &dwCodePages, &processed); - ok(ret == E_INVALIDARG, "IMLangFontLink_GetStrCodePages should fail: %x\n", ret); - ok(dwCodePages == 0, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); - ok(processed == 0, "expected 0, got %d\n", processed); + ok(ret == E_INVALIDARG, "IMLangFontLink_GetStrCodePages should fail: %lx\n", ret); + ok(dwCodePages == 0, "expected %lx, got %lx\n", dwCmpCodePages, dwCodePages); + ok(processed == 0, "expected 0, got %ld\n", processed); } static void test_rfc1766(IMultiLanguage2 *iML2) @@ -1303,7 +1303,7 @@ static void test_rfc1766(IMultiLanguage2 *iML2) BSTR rfcstr; ret = IMultiLanguage2_EnumRfc1766(iML2, LANG_NEUTRAL, &pEnumRfc1766); - ok(ret == S_OK, "IMultiLanguage2_EnumRfc1766 error %08x\n", ret); + ok(ret == S_OK, "IMultiLanguage2_EnumRfc1766 error %08lx\n", ret); while (1) { @@ -1319,7 +1319,7 @@ static void test_rfc1766(IMultiLanguage2 *iML2) /* verify the Rfc1766 value */ ret = IMultiLanguage2_GetRfc1766FromLcid(iML2, info.lcid, &rfcstr); - ok(ret == S_OK, "Expected S_OK, got %08x\n", ret); + ok(ret == S_OK, "Expected S_OK, got %08lx\n", ret); /* not an exact 1:1 correspondence between lcid and rfc1766 in the * mlang database, e.g., nb-no -> 1044 -> no */ @@ -1351,41 +1351,41 @@ static void test_GetLcidFromRfc1766(IMultiLanguage2 *iML2) /* IE <6.0 guess 0x412 (ko) from "kok" */ ok((ret == lcid_table[i].hr) || broken(lcid_table[i].broken_lcid && (ret == S_FALSE)), - "#%02d: HRESULT 0x%x (expected 0x%x)\n", i, ret, lcid_table[i].hr); + "#%02ld: HRESULT 0x%lx (expected 0x%lx)\n", i, ret, lcid_table[i].hr); ok((lcid == lcid_table[i].lcid) || broken(lcid == lcid_table[i].broken_lcid), /* IE <6.0 */ - "#%02d: got LCID 0x%x (expected 0x%x)\n", i, lcid, lcid_table[i].lcid); + "#%02ld: got LCID 0x%lx (expected 0x%lx)\n", i, lcid, lcid_table[i].lcid); } ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, NULL, en); - ok(ret == E_INVALIDARG, "GetLcidFromRfc1766 returned: %08x\n", ret); + ok(ret == E_INVALIDARG, "GetLcidFromRfc1766 returned: %08lx\n", ret); ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, NULL); - ok(ret == E_INVALIDARG, "GetLcidFromRfc1766 returned: %08x\n", ret); + ok(ret == E_INVALIDARG, "GetLcidFromRfc1766 returned: %08lx\n", ret); ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, en_them); - ok((ret == E_FAIL || ret == S_FALSE), "GetLcidFromRfc1766 returned: %08x\n", ret); + ok((ret == E_FAIL || ret == S_FALSE), "GetLcidFromRfc1766 returned: %08lx\n", ret); if (ret == S_FALSE) { BSTR rfcstr; static WCHAR en[] = {'e','n',0}; ret = IMultiLanguage2_GetRfc1766FromLcid(iML2, lcid, &rfcstr); - ok(ret == S_OK, "Expected S_OK, got %08x\n", ret); + ok(ret == S_OK, "Expected S_OK, got %08lx\n", ret); ok_w2("Expected \"%s\", got \"%s\"n", en, rfcstr); } ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, english); - ok((ret == E_FAIL || ret == S_FALSE), "GetLcidFromRfc1766 returned: %08x\n", ret); + ok((ret == E_FAIL || ret == S_FALSE), "GetLcidFromRfc1766 returned: %08lx\n", ret); if (ret == S_FALSE) { BSTR rfcstr; static WCHAR en[] = {'e','n',0}; ret = IMultiLanguage2_GetRfc1766FromLcid(iML2, lcid, &rfcstr); - ok(ret == S_OK, "Expected S_OK, got %08x\n", ret); + ok(ret == S_OK, "Expected S_OK, got %08lx\n", ret); ok_w2("Expected \"%s\", got \"%s\"n", en, rfcstr); } @@ -1404,18 +1404,18 @@ static void test_Rfc1766ToLcid(void) /* IE <6.0 guess 0x412 (ko) from "kok" */ ok( (ret == lcid_table[i].hr) || broken(lcid_table[i].broken_lcid && (ret == S_FALSE)), - "#%02d: HRESULT 0x%x (expected 0x%x)\n", i, ret, lcid_table[i].hr); + "#%02ld: HRESULT 0x%lx (expected 0x%lx)\n", i, ret, lcid_table[i].hr); ok( (lcid == lcid_table[i].lcid) || broken(lcid == lcid_table[i].broken_lcid), /* IE <6.0 */ - "#%02d: got LCID 0x%x (expected 0x%x)\n", i, lcid, lcid_table[i].lcid); + "#%02ld: got LCID 0x%lx (expected 0x%lx)\n", i, lcid, lcid_table[i].lcid); } ret = pRfc1766ToLcidA(&lcid, NULL); - ok(ret == E_INVALIDARG, "got 0x%08x (expected E_INVALIDARG)\n", ret); + ok(ret == E_INVALIDARG, "got 0x%08lx (expected E_INVALIDARG)\n", ret); ret = pRfc1766ToLcidA(NULL, "en"); - ok(ret == E_INVALIDARG, "got 0x%08x (expected E_INVALIDARG)\n", ret); + ok(ret == E_INVALIDARG, "got 0x%08lx (expected E_INVALIDARG)\n", ret); } static void test_GetNumberOfCodePageInfo(IMultiLanguage2 *iML2) @@ -1426,10 +1426,10 @@ static void test_GetNumberOfCodePageInfo(IMultiLanguage2 *iML2) value = 0xdeadbeef; hr = IMultiLanguage2_GetNumberOfCodePageInfo(iML2, &value); ok( (hr == S_OK) && value, - "got 0x%x with %d (expected S_OK with '!= 0')\n", hr, value); + "got 0x%lx with %d (expected S_OK with '!= 0')\n", hr, value); hr = IMultiLanguage2_GetNumberOfCodePageInfo(iML2, NULL); - ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); + ok(hr == E_INVALIDARG, "got 0x%lx (expected E_INVALIDARG)\n", hr); } @@ -1447,7 +1447,7 @@ static void test_GetRfc1766FromLcid(IMultiLanguage2 *iML2) rfcstr = NULL; hr = IMultiLanguage2_GetRfc1766FromLcid(iML2, lcid_table[i].lcid, &rfcstr); ok(hr == lcid_table[i].hr, - "#%02d: HRESULT 0x%x (expected 0x%x)\n", i, hr, lcid_table[i].hr); + "#%02ld: HRESULT 0x%lx (expected 0x%lx)\n", i, hr, lcid_table[i].hr); if (hr != S_OK) continue; /* no result-string created */ @@ -1459,13 +1459,13 @@ static void test_GetRfc1766FromLcid(IMultiLanguage2 *iML2) /* IE <6.0 return "x-kok" for LCID 0x457 ("kok") */ ok( (!lstrcmpA(buffer, expected)) || broken(!lstrcmpA(buffer, lcid_table[i].broken_rfc)), - "#%02d: got '%s' (expected '%s')\n", i, buffer, expected); + "#%02ld: got '%s' (expected '%s')\n", i, buffer, expected); SysFreeString(rfcstr); } hr = IMultiLanguage2_GetRfc1766FromLcid(iML2, MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), NULL); - ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); + ok(hr == E_INVALIDARG, "got 0x%lx (expected E_INVALIDARG)\n", hr); } static void test_LcidToRfc1766(void) @@ -1485,7 +1485,7 @@ static void test_LcidToRfc1766(void) /* IE <5.0 does not recognize 0x180c (fr-mc) and 0x457 (kok) */ ok( (hr == lcid_table[i].hr) || broken(lcid_table[i].broken_lcid && (hr == E_FAIL)), - "#%02d: HRESULT 0x%x (expected 0x%x)\n", i, hr, lcid_table[i].hr); + "#%02ld: HRESULT 0x%lx (expected 0x%lx)\n", i, hr, lcid_table[i].hr); if (hr != S_OK) continue; @@ -1497,27 +1497,27 @@ static void test_LcidToRfc1766(void) /* IE <5.0 return "fr" for LCID 0x180c ("fr-mc") */ ok( (!lstrcmpA(buffer, expected)) || broken(!lstrcmpA(buffer, lcid_table[i].broken_rfc)), - "#%02d: got '%s' (expected '%s')\n", i, buffer, expected); + "#%02ld: got '%s' (expected '%s')\n", i, buffer, expected); } memset(buffer, '#', sizeof(buffer)-1); buffer[sizeof(buffer)-1] = '\0'; hr = pLcidToRfc1766A(-1, buffer, MAX_RFC1766_NAME); - ok(hr == E_FAIL, "got 0x%08x and '%s' (expected E_FAIL)\n", hr, buffer); + ok(hr == E_FAIL, "got 0x%08lx and '%s' (expected E_FAIL)\n", hr, buffer); hr = pLcidToRfc1766A(LANG_ENGLISH, NULL, MAX_RFC1766_NAME); - ok(hr == E_INVALIDARG, "got 0x%08x (expected E_INVALIDARG)\n", hr); + ok(hr == E_INVALIDARG, "got 0x%08lx (expected E_INVALIDARG)\n", hr); memset(buffer, '#', sizeof(buffer)-1); buffer[sizeof(buffer)-1] = '\0'; hr = pLcidToRfc1766A(LANG_ENGLISH, buffer, -1); - ok(hr == E_INVALIDARG, "got 0x%08x and '%s' (expected E_INVALIDARG)\n", hr, buffer); + ok(hr == E_INVALIDARG, "got 0x%08lx and '%s' (expected E_INVALIDARG)\n", hr, buffer); memset(buffer, '#', sizeof(buffer)-1); buffer[sizeof(buffer)-1] = '\0'; hr = pLcidToRfc1766A(LANG_ENGLISH, buffer, 0); - ok(hr == E_INVALIDARG, "got 0x%08x and '%s' (expected E_INVALIDARG)\n", hr, buffer); + ok(hr == E_INVALIDARG, "got 0x%08lx and '%s' (expected E_INVALIDARG)\n", hr, buffer); } static void test_GetRfc1766Info(IMultiLanguage2 *iML2) @@ -1536,12 +1536,12 @@ static void test_GetRfc1766Info(IMultiLanguage2 *iML2) ret = IMultiLanguage2_GetRfc1766Info(iML2, info_table[i].lcid, info_table[i].lang, prfc); WideCharToMultiByte(CP_ACP, 0, prfc->wszRfc1766, -1, rfc1766A, MAX_RFC1766_NAME, NULL, NULL); - ok(ret == S_OK, "#%02d: got 0x%x (expected S_OK)\n", i, ret); + ok(ret == S_OK, "#%02ld: got 0x%lx (expected S_OK)\n", i, ret); ok(prfc->lcid == info_table[i].lcid, - "#%02d: got 0x%04x (expected 0x%04x)\n", i, prfc->lcid, info_table[i].lcid); + "#%02ld: got 0x%04lx (expected 0x%04lx)\n", i, prfc->lcid, info_table[i].lcid); ok(!lstrcmpA(rfc1766A, info_table[i].rfc1766), - "#%02d: got '%s' (expected '%s')\n", i, rfc1766A, info_table[i].rfc1766); + "#%02ld: got '%s' (expected '%s')\n", i, rfc1766A, info_table[i].rfc1766); /* Some IE versions truncate an oversized name one character too short */ if (info_table[i].broken_name) { @@ -1554,24 +1554,24 @@ static void test_GetRfc1766Info(IMultiLanguage2 *iML2) (info_table[i].broken_name && ( broken(!lstrcmpW(prfc->wszLocaleName, info_table[i].broken_name)) || /* IE < 6.0 */ broken(!lstrcmpW(prfc->wszLocaleName, short_broken_name)))), - "#%02d: got %s (expected %s)\n", i, + "#%02ld: got %s (expected %s)\n", i, wine_dbgstr_w(prfc->wszLocaleName), wine_dbgstr_w(info_table[i].localename)); } } /* SUBLANG_NEUTRAL only allowed for English, Arabic, Chinese */ ret = IMultiLanguage2_GetRfc1766Info(iML2, MAKELANGID(LANG_GERMAN, SUBLANG_NEUTRAL), LANG_ENGLISH, prfc); - ok(ret == E_FAIL, "got 0x%x (expected E_FAIL)\n", ret); + ok(ret == E_FAIL, "got 0x%lx (expected E_FAIL)\n", ret); ret = IMultiLanguage2_GetRfc1766Info(iML2, MAKELANGID(LANG_ITALIAN, SUBLANG_NEUTRAL), LANG_ENGLISH, prfc); - ok(ret == E_FAIL, "got 0x%x (expected E_FAIL)\n", ret); + ok(ret == E_FAIL, "got 0x%lx (expected E_FAIL)\n", ret); /* NULL not allowed */ ret = IMultiLanguage2_GetRfc1766Info(iML2, 0, LANG_ENGLISH, prfc); - ok(ret == E_FAIL, "got 0x%x (expected E_FAIL)\n", ret); + ok(ret == E_FAIL, "got 0x%lx (expected E_FAIL)\n", ret); ret = IMultiLanguage2_GetRfc1766Info(iML2, LANG_ENGLISH, LANG_ENGLISH, NULL); - ok(ret == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", ret); + ok(ret == E_INVALIDARG, "got 0x%lx (expected E_INVALIDARG)\n", ret); } static void test_IMultiLanguage2_ConvertStringFromUnicode(IMultiLanguage2 *iML2) @@ -1591,7 +1591,7 @@ static void test_IMultiLanguage2_ConvertStringFromUnicode(IMultiLanguage2 *iML2) destsz = sizeof(dest); hr = IMultiLanguage2_ConvertStringFromUnicode(iML2, NULL, 1252, NULL, &srcsz, dest, &destsz); - ok(hr == S_OK || hr == E_FAIL,"expected S_OK or E_FAIL, got %08x\n",hr); + ok(hr == S_OK || hr == E_FAIL,"expected S_OK or E_FAIL, got %08lx\n",hr); if (hr == S_OK) { ok(srcsz == lstrlenW(src) + 1, @@ -1612,7 +1612,7 @@ static void test_IMultiLanguage2_ConvertStringFromUnicode(IMultiLanguage2 *iML2) destsz = sizeof(dest); hr = IMultiLanguage2_ConvertStringFromUnicode(iML2, NULL, 1252, src, NULL, dest, &destsz); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Expected S_OK, got %08lx\n", hr); ok(!strncmp(dest, "abc", 3), "Expected first three chars to be \"abc\"\n"); ok(!memcmp(&dest[3], invariate, sizeof(dest) - 3), @@ -1625,7 +1625,7 @@ static void test_IMultiLanguage2_ConvertStringFromUnicode(IMultiLanguage2 *iML2) destsz = sizeof(dest); hr = IMultiLanguage2_ConvertStringFromUnicode(iML2, NULL, 1252, NULL, NULL, dest, &destsz); - ok(hr == S_OK || hr == E_FAIL, "Expected S_OK or E_FAIL, got %08x\n", hr); + ok(hr == S_OK || hr == E_FAIL, "Expected S_OK or E_FAIL, got %08lx\n", hr); ok(!memcmp(dest, invariate, sizeof(dest)), "Expected dest to be unchanged, got %s\n", dest); ok(destsz == 0, "Expected 0, got %u\n", destsz); @@ -1636,7 +1636,7 @@ static void test_IMultiLanguage2_ConvertStringFromUnicode(IMultiLanguage2 *iML2) destsz = sizeof(dest); hr = IMultiLanguage2_ConvertStringFromUnicode(iML2, NULL, 1252, src, &srcsz, NULL, &destsz); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Expected S_OK, got %08lx\n", hr); ok(srcsz == lstrlenW(src) + 1, "Expected %u, got %u\n", lstrlenW(src) + 1, srcsz); ok(destsz == lstrlenW(src) + 1, @@ -1646,7 +1646,7 @@ static void test_IMultiLanguage2_ConvertStringFromUnicode(IMultiLanguage2 *iML2) memset(dest, 'x', sizeof(dest)); hr = IMultiLanguage2_ConvertStringFromUnicode(iML2, NULL, 1252, src, &srcsz, dest, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Expected S_OK, got %08lx\n", hr); ok(srcsz == lstrlenW(src) + 1, "Expected %u, got %u\n", lstrlenW(src) + 1, srcsz); ok(!memcmp(dest, invariate, sizeof(dest)), @@ -1658,7 +1658,7 @@ static void test_IMultiLanguage2_ConvertStringFromUnicode(IMultiLanguage2 *iML2) destsz = sizeof(dest); hr = IMultiLanguage2_ConvertStringFromUnicode(iML2, NULL, 1252, src, &srcsz, dest, &destsz); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Expected S_OK, got %08lx\n", hr); ok(srcsz == 0, "Expected 0, got %u\n", srcsz); ok(!memcmp(dest, invariate, sizeof(dest)), "Expected dest to be unchanged, got %s\n", dest); @@ -1670,7 +1670,7 @@ static void test_IMultiLanguage2_ConvertStringFromUnicode(IMultiLanguage2 *iML2) destsz = sizeof(dest); hr = IMultiLanguage2_ConvertStringFromUnicode(iML2, NULL, 1252, src, &srcsz, dest, &destsz); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Expected S_OK, got %08lx\n", hr); ok(srcsz == lstrlenW(src), "Expected %u, got %u\n", lstrlenW(src), srcsz); ok(!strncmp(dest, "abc", 3), "Expected first three chars to be \"abc\"\n"); @@ -1685,7 +1685,7 @@ static void test_IMultiLanguage2_ConvertStringFromUnicode(IMultiLanguage2 *iML2) destsz = sizeof(dest); hr = IMultiLanguage2_ConvertStringFromUnicode(iML2, NULL, 1252, src, &srcsz, dest, &destsz); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Expected S_OK, got %08lx\n", hr); ok(srcsz == lstrlenW(src) + 1, "Expected 3, got %u\n", srcsz); ok(!lstrcmpA(dest, "abc"), "Expected \"abc\", got \"%s\"\n", dest); ok(destsz == lstrlenW(src) + 1, @@ -1697,7 +1697,7 @@ static void test_IMultiLanguage2_ConvertStringFromUnicode(IMultiLanguage2 *iML2) destsz = sizeof(dest); hr = IMultiLanguage2_ConvertStringFromUnicode(iML2, NULL, 1252, src, &srcsz, dest, &destsz); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Expected S_OK, got %08lx\n", hr); ok(srcsz == lstrlenW(src), "Expected %u, got %u\n", lstrlenW(src), srcsz); ok(!strncmp(dest, "abc", 3), "Expected first three chars to be \"abc\"\n"); @@ -1712,7 +1712,7 @@ static void test_IMultiLanguage2_ConvertStringFromUnicode(IMultiLanguage2 *iML2) destsz = 0; hr = IMultiLanguage2_ConvertStringFromUnicode(iML2, NULL, 1252, src, &srcsz, dest, &destsz); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Expected S_OK, got %08lx\n", hr); ok(srcsz == lstrlenW(src) + 1, "Expected %u, got %u\n", lstrlenW(src) + 1, srcsz); ok(!memcmp(dest, invariate, sizeof(dest)), @@ -1726,7 +1726,7 @@ static void test_IMultiLanguage2_ConvertStringFromUnicode(IMultiLanguage2 *iML2) destsz = lstrlenW(src); hr = IMultiLanguage2_ConvertStringFromUnicode(iML2, NULL, 1252, src, &srcsz, dest, &destsz); - ok(hr == E_FAIL, "Expected E_FAIL, got %08x\n", hr); + ok(hr == E_FAIL, "Expected E_FAIL, got %08lx\n", hr); ok(srcsz == 0, "Expected 0, got %u\n", srcsz); ok(!strncmp(dest, "abc", 3), "Expected first three chars to be \"abc\"\n"); ok(!memcmp(&dest[3], invariate, sizeof(dest) - 3), @@ -1739,7 +1739,7 @@ static void test_IMultiLanguage2_ConvertStringFromUnicode(IMultiLanguage2 *iML2) destsz = lstrlenW(src) * sizeof(WCHAR); hr = IMultiLanguage2_ConvertStringFromUnicode(iML2, NULL, 1252, src, &srcsz, dest, &destsz); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Expected S_OK, got %08lx\n", hr); ok(srcsz == lstrlenW(src) + 1, "Expected %u, got %u\n", lstrlenW(src) + 1, srcsz); ok(!lstrcmpA(dest, "abc"), "Expected \"abc\", got \"%s\"\n", dest); @@ -1763,7 +1763,7 @@ static void test_ConvertINetUnicodeToMultiByte(void) srcsz = lstrlenW(src) + 1; destsz = sizeof(dest); hr = pConvertINetUnicodeToMultiByte(NULL, 1252, NULL, &srcsz, dest, &destsz); - ok(hr == S_OK || hr == E_FAIL, "Expected S_OK or E_FAIL, got %08x\n", hr); + ok(hr == S_OK || hr == E_FAIL, "Expected S_OK or E_FAIL, got %08lx\n", hr); if (hr == S_OK) ok(srcsz == lstrlenW(src) + 1, "Expected %u, got %u\n", lstrlenW(src) + 1, srcsz); @@ -1778,7 +1778,7 @@ static void test_ConvertINetUnicodeToMultiByte(void) memset(dest, 'x', sizeof(dest)); destsz = sizeof(dest); hr = pConvertINetUnicodeToMultiByte(NULL, 1252, src, NULL, dest, &destsz); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Expected S_OK, got %08lx\n", hr); ok(!strncmp(dest, "abc", 3), "Expected first three chars to be \"abc\"\n"); ok(!memcmp(&dest[3], invariate, sizeof(dest) - 3), @@ -1790,7 +1790,7 @@ static void test_ConvertINetUnicodeToMultiByte(void) memset(dest, 'x', sizeof(dest)); destsz = sizeof(dest); hr = pConvertINetUnicodeToMultiByte(NULL, 1252, NULL, NULL, dest, &destsz); - ok(hr == S_OK || hr == E_FAIL, "Expected S_OK or E_FAIL, got %08x\n", hr); + ok(hr == S_OK || hr == E_FAIL, "Expected S_OK or E_FAIL, got %08lx\n", hr); ok(!memcmp(dest, invariate, sizeof(dest)), "Expected dest to be unchanged, got %s\n", dest); ok(destsz == 0, "Expected 0, got %u\n", destsz); @@ -1800,7 +1800,7 @@ static void test_ConvertINetUnicodeToMultiByte(void) srcsz = lstrlenW(src) + 1; destsz = sizeof(dest); hr = pConvertINetUnicodeToMultiByte(NULL, 1252, src, &srcsz, NULL, &destsz); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Expected S_OK, got %08lx\n", hr); ok(srcsz == lstrlenW(src) + 1, "Expected %u, got %u\n", lstrlenW(src) + 1, srcsz); ok(destsz == lstrlenW(src) + 1, @@ -1809,7 +1809,7 @@ static void test_ConvertINetUnicodeToMultiByte(void) /* lpnMultiCharCount NULL */ memset(dest, 'x', sizeof(dest)); hr = pConvertINetUnicodeToMultiByte(NULL, 1252, src, &srcsz, dest, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Expected S_OK, got %08lx\n", hr); ok(srcsz == lstrlenW(src) + 1, "Expected %u, got %u\n", lstrlenW(src) + 1, srcsz); ok(!memcmp(dest, invariate, sizeof(dest)), @@ -1820,7 +1820,7 @@ static void test_ConvertINetUnicodeToMultiByte(void) srcsz = 0; destsz = sizeof(dest); hr = pConvertINetUnicodeToMultiByte(NULL, 1252, src, &srcsz, dest, &destsz); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Expected S_OK, got %08lx\n", hr); ok(srcsz == 0, "Expected 0, got %u\n", srcsz); ok(!memcmp(dest, invariate, sizeof(dest)), "Expected dest to be unchanged, got %s\n", dest); @@ -1831,7 +1831,7 @@ static void test_ConvertINetUnicodeToMultiByte(void) srcsz = lstrlenW(src); destsz = sizeof(dest); hr = pConvertINetUnicodeToMultiByte(NULL, 1252, src, &srcsz, dest, &destsz); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Expected S_OK, got %08lx\n", hr); ok(srcsz == lstrlenW(src), "Expected %u, got %u\n", lstrlenW(src), srcsz); ok(!strncmp(dest, "abc", 3), "Expected first three chars to be \"abc\"\n"); @@ -1845,7 +1845,7 @@ static void test_ConvertINetUnicodeToMultiByte(void) srcsz = lstrlenW(src) + 1; destsz = sizeof(dest); hr = pConvertINetUnicodeToMultiByte(NULL, 1252, src, &srcsz, dest, &destsz); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Expected S_OK, got %08lx\n", hr); ok(srcsz == lstrlenW(src) + 1, "Expected 3, got %u\n", srcsz); ok(!lstrcmpA(dest, "abc"), "Expected \"abc\", got \"%s\"\n", dest); ok(destsz == lstrlenW(src) + 1, @@ -1856,7 +1856,7 @@ static void test_ConvertINetUnicodeToMultiByte(void) srcsz = -1; destsz = sizeof(dest); hr = pConvertINetUnicodeToMultiByte(NULL, 1252, src, &srcsz, dest, &destsz); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Expected S_OK, got %08lx\n", hr); ok(srcsz == lstrlenW(src), "Expected %u, got %u\n", lstrlenW(src), srcsz); ok(!strncmp(dest, "abc", 3), "Expected first three chars to be \"abc\"\n"); @@ -1870,7 +1870,7 @@ static void test_ConvertINetUnicodeToMultiByte(void) srcsz = lstrlenW(src) + 1; destsz = 0; hr = pConvertINetUnicodeToMultiByte(NULL, 1252, src, &srcsz, dest, &destsz); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Expected S_OK, got %08lx\n", hr); ok(srcsz == lstrlenW(src) + 1, "Expected %u, got %u\n", lstrlenW(src) + 1, srcsz); ok(!memcmp(dest, invariate, sizeof(dest)), @@ -1883,7 +1883,7 @@ static void test_ConvertINetUnicodeToMultiByte(void) srcsz = lstrlenW(src) + 1; destsz = lstrlenW(src); hr = pConvertINetUnicodeToMultiByte(NULL, 1252, src, &srcsz, dest, &destsz); - ok(hr == E_FAIL, "Expected E_FAIL, got %08x\n", hr); + ok(hr == E_FAIL, "Expected E_FAIL, got %08lx\n", hr); ok(srcsz == 0, "Expected 0, got %u\n", srcsz); ok(!strncmp(dest, "abc", 3), "Expected first three chars to be \"abc\"\n"); ok(!memcmp(&dest[3], invariate, sizeof(dest) - 3), @@ -1895,7 +1895,7 @@ static void test_ConvertINetUnicodeToMultiByte(void) srcsz = lstrlenW(src) + 1; destsz = lstrlenW(src) * sizeof(WCHAR); hr = pConvertINetUnicodeToMultiByte(NULL, 1252, src, &srcsz, dest, &destsz); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Expected S_OK, got %08lx\n", hr); ok(srcsz == lstrlenW(src) + 1, "Expected %u, got %u\n", lstrlenW(src) + 1, srcsz); ok(!lstrcmpA(dest, "abc"), "Expected \"abc\", got \"%s\"\n", dest); @@ -1980,7 +1980,7 @@ static void test_JapaneseConversion(void) skip("Code page identifier 50220 is not supported\n"); break; } - ok(hr == S_OK,"(%i) Expected S_OK, got %08x\n", i, hr); + ok(hr == S_OK,"(%i) Expected S_OK, got %08lx\n", i, hr); ok(destsz == outlen, "(%i) Expected %i, got %i\n",i,outlen,destsz); ok(srcsz == unc_jp[i][0],"(%i) Expected %i, got %i\n",i,unc_jp[i][0],srcsz); ok(memcmp(output,&jis_jp[i][1],destsz)==0,"(%i) Strings do not match\n",i); @@ -1999,7 +1999,7 @@ static void test_JapaneseConversion(void) if (i == 2) j = 1; if (i == 5) j = 4; - ok(hr == S_OK,"(%i) Expected S_OK, got %08x\n",i, hr); + ok(hr == S_OK,"(%i) Expected S_OK, got %08lx\n",i, hr); ok(destsz == unc_jp[j][0],"(%i) Expected %i, got %i\n",i,unc_jp[j][0],destsz); ok(srcsz == outlen,"(%i) Expected %i, got %i\n",i,outlen,srcsz); ok(memcmp(outputW,&unc_jp[j][1],destsz)==0,"(%i) Strings do not match\n",i); @@ -2018,7 +2018,7 @@ static void test_JapaneseConversion(void) skip("Code page identifier 932 is not supported\n"); break; } - ok(hr == S_OK,"(%i) Expected S_OK, got %08x\n",i,hr); + ok(hr == S_OK,"(%i) Expected S_OK, got %08lx\n",i,hr); ok(destsz == outlen,"(%i) Expected %i, got %i\n",i,outlen,destsz); ok(srcsz == unc_jp[i][0],"(%i) Expected %i, got %i\n",i,unc_jp[i][0],srcsz); ok(memcmp(output,&sjis_jp[i][1],outlen)==0,"(%i) Strings do not match\n",i); @@ -2027,7 +2027,7 @@ static void test_JapaneseConversion(void) destsz = 30; hr = pConvertINetMultiByteToUnicode(NULL, 932, output, &srcsz, outputW,&destsz); - ok(hr == S_OK,"(%i) Expected S_OK, got %08x\n", i, hr); + ok(hr == S_OK,"(%i) Expected S_OK, got %08lx\n", i, hr); ok(destsz == unc_jp[i][0],"(%i) Expected %i, got %i\n",i,unc_jp[i][0],destsz); ok(srcsz == outlen,"(%i) Expected %i, got %i\n",i,outlen,srcsz); ok(memcmp(outputW,&unc_jp[i][1],destsz)==0,"(%i) Strings do not match\n",i); @@ -2046,7 +2046,7 @@ static void test_JapaneseConversion(void) skip("Code page identifier 51932 is not supported\n"); break; } - ok(hr == S_OK, "(%i) Expected S_OK, got %08x\n",i,hr); + ok(hr == S_OK, "(%i) Expected S_OK, got %08lx\n",i,hr); ok(destsz == outlen, "(%i) Expected %i, got %i\n",i,outlen,destsz); ok(srcsz == unc_jp[i][0],"(%i) Expected %i, got %i\n",i,unc_jp[i][0],destsz); ok(memcmp(output,&euc_jp[i][1],outlen)==0,"(%i) Strings do not match\n",i); @@ -2055,7 +2055,7 @@ static void test_JapaneseConversion(void) destsz = 30; hr = pConvertINetMultiByteToUnicode(NULL, 51932, output, &srcsz, outputW,&destsz); - ok(hr == S_OK,"(%i) Expected S_OK, got %08x\n",i,hr); + ok(hr == S_OK,"(%i) Expected S_OK, got %08lx\n",i,hr); ok(destsz == unc_jp[i][0],"(%i) Expected %i, got %i\n",i,unc_jp[i][0],destsz); ok(srcsz == outlen,"(%i) Expected %i, got %i\n",i,outlen,srcsz); ok(memcmp(outputW,&unc_jp[i][1],destsz)==0,"(%i) Strings do not match\n",i); @@ -2071,7 +2071,7 @@ static void test_JapaneseConversion(void) skip("Code page identifier 50932 is not supported\n"); return; } - ok(hr == S_OK,"(%i) Expected S_OK, got %08x\n",i,hr); + ok(hr == S_OK,"(%i) Expected S_OK, got %08lx\n",i,hr); ok(destsz == unc_jp[i][0],"(%i) Expected %i, got %i\n",i,unc_jp[i][0],destsz); ok(srcsz == jis_jp[i][0],"(%i) Expected %i, got %i\n",i,jis_jp[i][0],srcsz); ok(memcmp(outputW,&unc_jp[i][1],destsz)==0,"(%i) Strings do not match\n",i); @@ -2080,7 +2080,7 @@ static void test_JapaneseConversion(void) destsz = 30; srcsz = sjis_jp[i][0]; hr = pConvertINetMultiByteToUnicode(NULL, 50932, &sjis_jp[i][1], &srcsz, outputW, &destsz); - ok(hr == S_OK,"(%i) Expected S_OK, got %08x\n",i,hr); + ok(hr == S_OK,"(%i) Expected S_OK, got %08lx\n",i,hr); ok(destsz == unc_jp[i][0],"(%i) Expected %i, got %i\n",i,unc_jp[i][0],destsz); ok(srcsz == sjis_jp[i][0],"(%i) Expected %i, got %i\n",i,sjis_jp[i][0],srcsz); ok(memcmp(outputW,&unc_jp[i][1],destsz)==0,"(%i) Strings do not match\n",i); @@ -2094,23 +2094,23 @@ static void test_GetScriptFontInfo(IMLangFontLink2 *font_link) nfonts = 0; hr = IMLangFontLink2_GetScriptFontInfo(font_link, sidAsciiLatin, 0, &nfonts, NULL); - ok(hr == S_OK, "GetScriptFontInfo failed %u\n", GetLastError()); + ok(hr == S_OK, "GetScriptFontInfo failed %lu\n", GetLastError()); ok(nfonts, "unexpected result\n"); nfonts = 0; hr = IMLangFontLink2_GetScriptFontInfo(font_link, sidAsciiLatin, SCRIPTCONTF_FIXED_FONT, &nfonts, NULL); - ok(hr == S_OK, "GetScriptFontInfo failed %u\n", GetLastError()); + ok(hr == S_OK, "GetScriptFontInfo failed %lu\n", GetLastError()); ok(nfonts, "unexpected result\n"); nfonts = 0; hr = IMLangFontLink2_GetScriptFontInfo(font_link, sidAsciiLatin, SCRIPTCONTF_PROPORTIONAL_FONT, &nfonts, NULL); - ok(hr == S_OK, "GetScriptFontInfo failed %u\n", GetLastError()); + ok(hr == S_OK, "GetScriptFontInfo failed %lu\n", GetLastError()); ok(nfonts, "unexpected result\n"); nfonts = 1; memset(sfi, 0, sizeof(sfi)); hr = IMLangFontLink2_GetScriptFontInfo(font_link, sidAsciiLatin, SCRIPTCONTF_FIXED_FONT, &nfonts, sfi); - ok(hr == S_OK, "GetScriptFontInfo failed %u\n", GetLastError()); + ok(hr == S_OK, "GetScriptFontInfo failed %lu\n", GetLastError()); ok(nfonts == 1, "got %u, expected 1\n", nfonts); ok(sfi[0].scripts != 0, "unexpected result\n"); ok(sfi[0].wszFont[0], "unexpected result\n"); @@ -2118,7 +2118,7 @@ static void test_GetScriptFontInfo(IMLangFontLink2 *font_link) nfonts = 1; memset(sfi, 0, sizeof(sfi)); hr = IMLangFontLink2_GetScriptFontInfo(font_link, sidAsciiLatin, SCRIPTCONTF_PROPORTIONAL_FONT, &nfonts, sfi); - ok(hr == S_OK, "GetScriptFontInfo failed %u\n", GetLastError()); + ok(hr == S_OK, "GetScriptFontInfo failed %lu\n", GetLastError()); ok(nfonts == 1, "got %u, expected 1\n", nfonts); ok(sfi[0].scripts != 0, "unexpected result\n"); ok(sfi[0].wszFont[0], "unexpected result\n"); @@ -2157,7 +2157,7 @@ static void test_CodePageToScriptID(IMLangFontLink2 *font_link) for (i = 0; i < ARRAY_SIZE(cp_sid); i++) { hr = IMLangFontLink2_CodePageToScriptID(font_link, cp_sid[i].cp, &sid); - ok(hr == cp_sid[i].hr, "%u CodePageToScriptID failed 0x%08x %u\n", i, hr, GetLastError()); + ok(hr == cp_sid[i].hr, "%u CodePageToScriptID failed 0x%08lx %lu\n", i, hr, GetLastError()); if (SUCCEEDED(hr)) { ok(sid == cp_sid[i].sid, @@ -2183,24 +2183,24 @@ static void test_GetFontUnicodeRanges(IMLangFontLink2 *font_link) count = 0; hr = IMLangFontLink2_GetFontUnicodeRanges(font_link, NULL, &count, NULL); - ok(hr == E_FAIL, "expected E_FAIL, got 0x%08x\n", hr); + ok(hr == E_FAIL, "expected E_FAIL, got 0x%08lx\n", hr); hr = IMLangFontLink2_GetFontUnicodeRanges(font_link, hdc, NULL, NULL); - ok(hr == E_INVALIDARG, "expected E_FAIL, got 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "expected E_FAIL, got 0x%08lx\n", hr); count = 0; hr = IMLangFontLink2_GetFontUnicodeRanges(font_link, hdc, &count, NULL); - ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(hr == S_OK, "expected S_OK, got 0x%08lx\n", hr); ok(count, "expected count > 0\n"); ur = HeapAlloc(GetProcessHeap(), 0, sizeof(*ur) * count); hr = IMLangFontLink2_GetFontUnicodeRanges(font_link, hdc, &count, ur); - ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(hr == S_OK, "expected S_OK, got 0x%08lx\n", hr); count--; hr = IMLangFontLink2_GetFontUnicodeRanges(font_link, hdc, &count, ur); - ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(hr == S_OK, "expected S_OK, got 0x%08lx\n", hr); HeapFree(GetProcessHeap(), 0, ur); @@ -2225,7 +2225,7 @@ static void test_IsCodePageInstallable(IMultiLanguage2 *ml2) ok(hr == S_OK || broken(hr == S_FALSE) || /* win2k */ broken(hr == E_INVALIDARG), /* win2k */ - "code page %u is valid but not installable 0x%08x\n", i, hr); + "code page %u is valid but not installable 0x%08lx\n", i, hr); } } @@ -2235,12 +2235,12 @@ static void test_GetGlobalFontLinkObject(void) void *unknown; ret = GetGlobalFontLinkObject(NULL); - ok(ret == E_INVALIDARG, "expected E_INVALIDARG got %#x\n", ret); + ok(ret == E_INVALIDARG, "expected E_INVALIDARG got %#lx\n", ret); unknown = (void *)0xdeadbeef; ret = GetGlobalFontLinkObject(&unknown); todo_wine { - ok(ret == S_OK, "expected S_OK got %#x\n", ret); + ok(ret == S_OK, "expected S_OK got %#lx\n", ret); ok(unknown != NULL && unknown != (void *)0xdeadbeef, "GetGlobalFontLinkObject() returned %p\n", unknown); } @@ -2257,37 +2257,37 @@ static void test_IMLangConvertCharset(IMultiLanguage *ml) hr = IMultiLanguage_CreateConvertCharset(ml, CP_ACP, CP_UTF8, 0, &convert); todo_wine - ok(hr == S_FALSE, "expected S_FALSE got 0x%08x\n", hr); + ok(hr == S_FALSE, "expected S_FALSE got 0x%08lx\n", hr); hr = IMLangConvertCharset_GetSourceCodePage(convert, NULL); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "got 0x%08lx\n", hr); cp = CP_UTF8; hr = IMLangConvertCharset_GetSourceCodePage(convert, &cp); - ok(hr == S_OK, "expected S_OK got 0x%08x\n", hr); + ok(hr == S_OK, "expected S_OK got 0x%08lx\n", hr); ok(cp == CP_ACP, "got %d\n", cp); hr = IMLangConvertCharset_GetDestinationCodePage(convert, NULL); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "got 0x%08lx\n", hr); cp = CP_ACP; hr = IMLangConvertCharset_GetDestinationCodePage(convert, &cp); - ok(hr == S_OK, "expected S_OK got 0x%08x\n", hr); + ok(hr == S_OK, "expected S_OK got 0x%08lx\n", hr); ok(cp == CP_UTF8, "got %d\n", cp); /* DoConversionToUnicode */ hr = IMLangConvertCharset_Initialize(convert, CP_UTF8, CP_UNICODE, 0); - ok(hr == S_OK, "expected S_OK got 0x%08x\n", hr); + ok(hr == S_OK, "expected S_OK got 0x%08lx\n", hr); hr = IMLangConvertCharset_DoConversionToUnicode(convert, NULL, NULL, NULL, NULL); - ok(hr == E_FAIL || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); + ok(hr == E_FAIL || broken(hr == S_OK) /* win2k */, "got 0x%08lx\n", hr); src_size = -1; dst_size = 20; buffW[0] = 0; buffW[4] = 4; hr = IMLangConvertCharset_DoConversionToUnicode(convert, strA, &src_size, buffW, &dst_size); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(!memcmp(buffW, strW, 4*sizeof(WCHAR)), "got converted string %s\n", wine_dbgstr_wn(buffW, dst_size)); ok(dst_size == 4, "got %d\n", dst_size); ok(buffW[4] == 4, "got %d\n", buffW[4]); @@ -2297,13 +2297,13 @@ static void test_IMLangConvertCharset(IMultiLanguage *ml) dst_size = 0; buffW[0] = 1; hr = IMLangConvertCharset_DoConversionToUnicode(convert, strA, &src_size, buffW, &dst_size); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(buffW[0] == 1, "got %d\n", buffW[0]); ok(dst_size == 4, "got %d\n", dst_size); ok(src_size == 4, "got %d\n", src_size); hr = IMLangConvertCharset_Initialize(convert, CP_UNICODE, CP_UNICODE, 0); - ok(hr == S_OK, "expected S_OK got 0x%08x\n", hr); + ok(hr == S_OK, "expected S_OK got 0x%08lx\n", hr); IMLangConvertCharset_Release(convert); } @@ -2448,21 +2448,21 @@ static void test_DetectOutboundCodePageInIStream(IMultiLanguage3 *ml) hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, MLDETECTF_PRESERVE_ORDER, &test_stream, preferred, ARRAY_SIZE(preferred), detected, &nb_detected, NULL); - ok(hr == E_INVALIDARG, "got %08x\n", hr); + ok(hr == E_INVALIDARG, "got %08lx\n", hr); nb_detected = 1; memset(detected, 0, sizeof(detected)); hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, MLDETECTF_PRESERVE_ORDER, &test_stream, preferred, ARRAY_SIZE(preferred), NULL, &nb_detected, NULL); - ok(hr == E_INVALIDARG, "got %08x\n", hr); + ok(hr == E_INVALIDARG, "got %08lx\n", hr); nb_detected = 1; memset(detected, 0, sizeof(detected)); hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, MLDETECTF_PRESERVE_ORDER, &test_stream, preferred, ARRAY_SIZE(preferred), detected, &nb_detected, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "got %08lx\n", hr); ok(nb_detected == 1, "got %u\n", nb_detected); ok(detected[0] == 65001, "got %u\n", detected[0]); @@ -2471,7 +2471,7 @@ static void test_DetectOutboundCodePageInIStream(IMultiLanguage3 *ml) hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, MLDETECTF_PRESERVE_ORDER, &test_stream, preferred, ARRAY_SIZE(preferred), detected, &nb_detected, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "got %08lx\n", hr); todo_wine ok(nb_detected == 2, "got %u\n", nb_detected); ok(detected[0] == 65001, "got %u\n", detected[0]); todo_wine ok(detected[1] == 65000, "got %u\n", detected[1]); @@ -2481,7 +2481,7 @@ static void test_DetectOutboundCodePageInIStream(IMultiLanguage3 *ml) hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, MLDETECTF_PRESERVE_ORDER, &test_stream, preferred, ARRAY_SIZE(preferred), detected, &nb_detected, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "got %08lx\n", hr); todo_wine ok(nb_detected == 3, "got %u\n", nb_detected); ok(detected[0] == 65001, "got %u\n", detected[0]); todo_wine ok(detected[1] == 65000, "got %u\n", detected[1]); @@ -2492,7 +2492,7 @@ static void test_DetectOutboundCodePageInIStream(IMultiLanguage3 *ml) hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, MLDETECTF_PRESERVE_ORDER, &test_stream, preferred, ARRAY_SIZE(preferred), detected, &nb_detected, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "got %08lx\n", hr); todo_wine ok(nb_detected == 3, "got %u\n", nb_detected); ok(detected[0] == 65001, "got %u\n", detected[0]); todo_wine ok(detected[1] == 65000, "got %u\n", detected[1]); @@ -2504,7 +2504,7 @@ static void test_DetectOutboundCodePageInIStream(IMultiLanguage3 *ml) hr = IMultiLanguage3_DetectOutboundCodePageInIStream(ml, MLDETECTF_PRESERVE_ORDER, &test_stream, preferred2, ARRAY_SIZE(preferred2), detected, &nb_detected, NULL); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "got %08lx\n", hr); todo_wine ok(nb_detected == 3, "got %u\n", nb_detected); ok(detected[0] == 65001, "got %u\n", detected[0]); todo_wine ok(detected[1] == 65000, "got %u\n", detected[1]); @@ -2551,7 +2551,7 @@ static void test_GetCodePageInfo(IMultiLanguage2 *iML2) { ret = IMultiLanguage2_GetCodePageInfo(iML2, test_data[i].cpinfo.uiCodePage, LANG_NEUTRAL, &cpinfo); todo_wine_if(test_data[i].todo_GetCodePageInfo) - ok(ret == S_OK, "%d: IMultiLanguage2_GetCodePageInfo failed: 0x%08x.\n", i, ret); + ok(ret == S_OK, "%d: IMultiLanguage2_GetCodePageInfo failed: 0x%08lx.\n", i, ret); if (ret == S_OK) { @@ -2560,7 +2560,7 @@ static void test_GetCodePageInfo(IMultiLanguage2 *iML2) ok((cpinfo.dwFlags == cpinfo_cmp.dwFlags ) || /* some code pages are not installed on the Wine Test Bot */ ((cpinfo.dwFlags & VALID_MASK) == (cpinfo_cmp.dwFlags & VALID_MASK)), - "%d: got wrong dwFlags expected 0x%x return 0x%x.\n", + "%d: got wrong dwFlags expected 0x%lx return 0x%lx.\n", i, cpinfo_cmp.dwFlags, cpinfo.dwFlags); ok(cpinfo.uiCodePage == cpinfo_cmp.uiCodePage, "%d: got wrong uiCodePage expected %u return %u.\n", @@ -2630,68 +2630,68 @@ static void test_MapFont(IMLangFontLink *font_link, IMLangFontLink2 *font_link2) /* Tests for IMLangFontLink */ ret = IMLangFontLink_ResetFontMapping(font_link); - ok(ret == S_OK, "IMLangFontLink_ResetFontMapping: expected S_OK, got %08x\n", ret); + ok(ret == S_OK, "IMLangFontLink_ResetFontMapping: expected S_OK, got %08lx\n", ret); ret = IMLangFontLink_MapFont(font_link, NULL, 0, NULL, NULL); - ok(ret == E_FAIL, "IMLangFontLink_MapFont: expected E_FAIL, got %08x\n", ret); + ok(ret == E_FAIL, "IMLangFontLink_MapFont: expected E_FAIL, got %08lx\n", ret); ret = IMLangFontLink_MapFont(font_link, NULL, codepages, old_font, &new_font); - ok(ret == E_FAIL, "IMLangFontLink_MapFont: expected E_FAIL, got %08x\n", ret); + ok(ret == E_FAIL, "IMLangFontLink_MapFont: expected E_FAIL, got %08lx\n", ret); ret = IMLangFontLink_MapFont(font_link, hdc, codepages, NULL, &new_font); - ok(ret == E_FAIL, "IMLangFontLink_MapFont: expected E_FAIL, got %08x\n", ret); + ok(ret == E_FAIL, "IMLangFontLink_MapFont: expected E_FAIL, got %08lx\n", ret); ret = IMLangFontLink_MapFont(font_link, hdc, codepages, old_font, NULL); - ok(ret == S_OK, "IMLangFontLink_MapFont: expected S_OK, got %08x\n", ret); + ok(ret == S_OK, "IMLangFontLink_MapFont: expected S_OK, got %08lx\n", ret); ret = IMLangFontLink_MapFont(font_link, hdc, codepages, old_font, &new_font); - ok(ret == S_OK && new_font != NULL, "IMLangFontLink_MapFont: expected S_OK/!NULL, got %08x/%p\n", ret, new_font); + ok(ret == S_OK && new_font != NULL, "IMLangFontLink_MapFont: expected S_OK/!NULL, got %08lx/%p\n", ret, new_font); last_font = new_font; ret = IMLangFontLink_MapFont(font_link, hdc, codepages, old_font, &new_font); - ok(ret == S_OK && new_font == last_font, "IMLangFontLink_MapFont: expected S_OK/%p, got %08x/%p\n", last_font, ret, new_font); + ok(ret == S_OK && new_font == last_font, "IMLangFontLink_MapFont: expected S_OK/%p, got %08lx/%p\n", last_font, ret, new_font); ret = IMLangFontLink_ReleaseFont(font_link, NULL); - ok(ret == E_FAIL, "IMLangFontLink_ReleaseFont: expected E_FAIL, got %08x\n", ret); + ok(ret == E_FAIL, "IMLangFontLink_ReleaseFont: expected E_FAIL, got %08lx\n", ret); ret = IMLangFontLink_ReleaseFont(font_link, new_font); - ok(ret == S_OK, "IMLangFontLink_ReleaseFont: expected S_OK, got %08x\n", ret); + ok(ret == S_OK, "IMLangFontLink_ReleaseFont: expected S_OK, got %08lx\n", ret); ret = IMLangFontLink_ResetFontMapping(font_link); - ok(ret == S_OK, "IMLangFontLink_ResetFontMapping: expected S_OK, got %08x\n", ret); + ok(ret == S_OK, "IMLangFontLink_ResetFontMapping: expected S_OK, got %08lx\n", ret); /* Tests for IMLangFontLink2 */ ret = IMLangFontLink2_ResetFontMapping(font_link2); - ok(ret == S_OK, "IMLangFontLink2_ResetFontMapping: expected S_OK, got %08x\n", ret); + ok(ret == S_OK, "IMLangFontLink2_ResetFontMapping: expected S_OK, got %08lx\n", ret); ret = IMLangFontLink2_MapFont(font_link2, NULL, 0, 0, NULL); - ok(ret == E_FAIL, "IMLangFontLink2_MapFont: expected E_FAIL, got %08x\n", ret); + ok(ret == E_FAIL, "IMLangFontLink2_MapFont: expected E_FAIL, got %08lx\n", ret); ret = IMLangFontLink2_MapFont(font_link2, NULL, codepages, ch, &new_font); - ok(ret == E_FAIL, "IMLangFontLink2_MapFont: expected E_FAIL, got %08x\n", ret); + ok(ret == E_FAIL, "IMLangFontLink2_MapFont: expected E_FAIL, got %08lx\n", ret); ret = IMLangFontLink2_MapFont(font_link2, hdc, 0, 0, NULL); - ok(ret == E_INVALIDARG, "IMLangFontLink2_MapFont: expected E_INVALIDARG, got %08x\n", ret); + ok(ret == E_INVALIDARG, "IMLangFontLink2_MapFont: expected E_INVALIDARG, got %08lx\n", ret); ret = IMLangFontLink2_MapFont(font_link2, hdc, 0, ch, NULL); - ok(ret == E_INVALIDARG, "IMLangFontLink2_MapFont: expected E_INVALIDARG, got %08x\n", ret); + ok(ret == E_INVALIDARG, "IMLangFontLink2_MapFont: expected E_INVALIDARG, got %08lx\n", ret); ret = IMLangFontLink2_MapFont(font_link2, hdc, 0, ch, &new_font); todo_wine ok(ret == S_OK || broken(ret == E_FAIL), /* got E_FAIL on winxp and win2k */ - "IMLangFontLink2_MapFont: expected S_OK || E_FAIL, got %08x\n", ret); + "IMLangFontLink2_MapFont: expected S_OK || E_FAIL, got %08lx\n", ret); ret = IMLangFontLink2_MapFont(font_link2, hdc, codepages, 0, NULL); - ok(ret == S_OK, "IMLangFontLink2_MapFont: expected S_OK, got %08x\n", ret); + ok(ret == S_OK, "IMLangFontLink2_MapFont: expected S_OK, got %08lx\n", ret); ret = IMLangFontLink2_MapFont(font_link2, hdc, codepages, 0, &new_font); - ok(ret == S_OK && new_font != NULL, "IMLangFontLink2_MapFont: expected S_OK/!NULL, got %08x/%p\n", ret, new_font); + ok(ret == S_OK && new_font != NULL, "IMLangFontLink2_MapFont: expected S_OK/!NULL, got %08lx/%p\n", ret, new_font); last_font = new_font; ret = IMLangFontLink2_MapFont(font_link2, hdc, codepages, 0, &new_font); - ok(ret == S_OK && new_font == last_font, "IMLangFontLink2_MapFont: expected S_OK/%p, got %08x/%p\n", last_font, ret, new_font); + ok(ret == S_OK && new_font == last_font, "IMLangFontLink2_MapFont: expected S_OK/%p, got %08lx/%p\n", last_font, ret, new_font); ret = IMLangFontLink2_ReleaseFont(font_link2, NULL); - ok(ret == E_FAIL, "IMLangFontLink2_ReleaseFont: expected E_FAIL, got %08x\n", ret); + ok(ret == E_FAIL, "IMLangFontLink2_ReleaseFont: expected E_FAIL, got %08lx\n", ret); ret = IMLangFontLink2_ReleaseFont(font_link2, new_font); - ok(ret == S_OK, "IMLangFontLink2_ReleaseFont: expected S_OK, got %08x\n", ret); + ok(ret == S_OK, "IMLangFontLink2_ReleaseFont: expected S_OK, got %08lx\n", ret); ret = IMLangFontLink2_ResetFontMapping(font_link2); - ok(ret == S_OK, "IMLangFontLink2_ResetFontMapping: expected S_OK, got %08x\n", ret); + ok(ret == S_OK, "IMLangFontLink2_ResetFontMapping: expected S_OK, got %08lx\n", ret); /* Show that the font cache is global */ ret = IMLangFontLink_MapFont(font_link, hdc, codepages, old_font, &font1); - ok(ret == S_OK, "MapFont() failed, hr %#x.\n", ret); + ok(ret == S_OK, "MapFont() failed, hr %#lx.\n", ret); ret = IMLangFontLink2_MapFont(font_link2, hdc, codepages, 0, &font2); - ok(ret == S_OK, "MapFont() failed, hr %#x.\n", ret); + ok(ret == S_OK, "MapFont() failed, hr %#lx.\n", ret); ok(font1 != NULL && font2 != NULL, "expected !NULL/!NULL, got %p/%p\n", font1, font2); ok(font1 == font2, "expected equal, got not equal\n"); @@ -2762,9 +2762,9 @@ START_TEST(mlang) test_EnumScripts(iML2, SCRIPTCONTF_SCRIPT_USER | SCRIPTCONTF_SCRIPT_HIDE | SCRIPTCONTF_SCRIPT_SYSTEM); ret = IMultiLanguage2_IsConvertible(iML2, CP_UTF8, CP_UNICODE); - ok(ret == S_OK, "IMultiLanguage2_IsConvertible(CP_UTF8 -> CP_UNICODE) = %08x\n", ret); + ok(ret == S_OK, "IMultiLanguage2_IsConvertible(CP_UTF8 -> CP_UNICODE) = %08lx\n", ret); ret = IMultiLanguage2_IsConvertible(iML2, CP_UNICODE, CP_UTF8); - ok(ret == S_OK, "IMultiLanguage2_IsConvertible(CP_UNICODE -> CP_UTF8) = %08x\n", ret); + ok(ret == S_OK, "IMultiLanguage2_IsConvertible(CP_UNICODE -> CP_UTF8) = %08lx\n", ret); test_multibyte_to_unicode_translations(iML2); test_IMultiLanguage2_ConvertStringFromUnicode(iML2);
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mmcndmgr/tests/Makefile.in | 1 - dlls/mmcndmgr/tests/mmcndmgr.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mmcndmgr/tests/Makefile.in b/dlls/mmcndmgr/tests/Makefile.in index 3e595d6fe4a..22d79ebb65b 100644 --- a/dlls/mmcndmgr/tests/Makefile.in +++ b/dlls/mmcndmgr/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mmcndmgr.dll IMPORTS = ole32 shlwapi uuid diff --git a/dlls/mmcndmgr/tests/mmcndmgr.c b/dlls/mmcndmgr/tests/mmcndmgr.c index 07d905e762d..b1cc6d9e085 100644 --- a/dlls/mmcndmgr/tests/mmcndmgr.c +++ b/dlls/mmcndmgr/tests/mmcndmgr.c @@ -44,9 +44,9 @@ static void test_get_version(void) LONG lMajor, lMinor; hr = IMMCVersionInfo_GetMMCVersion(ver_info, &lMajor, &lMinor); - ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(hr == S_OK, "got 0x%08lx, expected 0x%08lx\n", hr, S_OK); if (hr == S_OK) - trace("MMC Version is %d.%d\n", lMajor, lMinor); + trace("MMC Version is %ld.%ld\n", lMajor, lMinor); } if (ver_info)
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mmdevapi/tests/Makefile.in | 1 dlls/mmdevapi/tests/capture.c | 398 +++++++++-------- dlls/mmdevapi/tests/dependency.c | 12 - dlls/mmdevapi/tests/mmdevenum.c | 86 ++-- dlls/mmdevapi/tests/propstore.c | 52 +- dlls/mmdevapi/tests/render.c | 820 ++++++++++++++++++------------------ dlls/mmdevapi/tests/spatialaudio.c | 108 ++--- 7 files changed, 738 insertions(+), 739 deletions(-) diff --git a/dlls/mmdevapi/tests/Makefile.in b/dlls/mmdevapi/tests/Makefile.in index 183c9f36588..dd180a253b9 100644 --- a/dlls/mmdevapi/tests/Makefile.in +++ b/dlls/mmdevapi/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mmdevapi.dll IMPORTS = ole32 version user32 advapi32 winmm diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 6c65128f2d2..5fbb62e4403 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -54,28 +54,28 @@ static void test_uninitialized(IAudioClient *ac) IUnknown *unk; hr = IAudioClient_GetBufferSize(ac, &num); - ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized GetBufferSize call returns %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized GetBufferSize call returns %08lx\n", hr); hr = IAudioClient_GetStreamLatency(ac, &t1); - ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized GetStreamLatency call returns %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized GetStreamLatency call returns %08lx\n", hr); hr = IAudioClient_GetCurrentPadding(ac, &num); - ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized GetCurrentPadding call returns %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized GetCurrentPadding call returns %08lx\n", hr); hr = IAudioClient_Start(ac); - ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized Start call returns %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized Start call returns %08lx\n", hr); hr = IAudioClient_Stop(ac); - ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized Stop call returns %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized Stop call returns %08lx\n", hr); hr = IAudioClient_Reset(ac); - ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized Reset call returns %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized Reset call returns %08lx\n", hr); hr = IAudioClient_SetEventHandle(ac, handle); - ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized SetEventHandle call returns %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized SetEventHandle call returns %08lx\n", hr); hr = IAudioClient_GetService(ac, &IID_IAudioStreamVolume, (void**)&unk); - ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized GetService call returns %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized GetService call returns %08lx\n", hr); CloseHandle(handle); } @@ -91,54 +91,54 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) REFERENCE_TIME period; hr = IAudioClient_GetService(ac, &IID_IAudioCaptureClient, (void**)&acc); - ok(hr == S_OK, "IAudioClient_GetService(IID_IAudioCaptureClient) returns %08x\n", hr); + ok(hr == S_OK, "IAudioClient_GetService(IID_IAudioCaptureClient) returns %08lx\n", hr); if (hr != S_OK) return; ok(ResetEvent(handle), "ResetEvent\n"); hr = IAudioCaptureClient_GetNextPacketSize(acc, &next); - ok(hr == S_OK, "IAudioCaptureClient_GetNextPacketSize returns %08x\n", hr); + ok(hr == S_OK, "IAudioCaptureClient_GetNextPacketSize returns %08lx\n", hr); hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding call returns %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding call returns %08lx\n", hr); ok(next == pad, "GetNextPacketSize %u vs. GCP %u\n", next, pad); /* later GCP will grow, while GNPS is 0 or period size */ hr = IAudioCaptureClient_GetNextPacketSize(acc, NULL); - ok(hr == E_POINTER, "IAudioCaptureClient_GetNextPacketSize(NULL) returns %08x\n", hr); + ok(hr == E_POINTER, "IAudioCaptureClient_GetNextPacketSize(NULL) returns %08lx\n", hr); data = (void*)0xdeadf00d; frames = 0xdeadbeef; flags = 0xabadcafe; hr = IAudioCaptureClient_GetBuffer(acc, &data, NULL, NULL, NULL, NULL); - ok(hr == E_POINTER, "IAudioCaptureClient_GetBuffer(data, NULL, NULL) returns %08x\n", hr); + ok(hr == E_POINTER, "IAudioCaptureClient_GetBuffer(data, NULL, NULL) returns %08lx\n", hr); hr = IAudioCaptureClient_GetBuffer(acc, NULL, &frames, NULL, NULL, NULL); - ok(hr == E_POINTER, "IAudioCaptureClient_GetBuffer(NULL, &frames, NULL) returns %08x\n", hr); + ok(hr == E_POINTER, "IAudioCaptureClient_GetBuffer(NULL, &frames, NULL) returns %08lx\n", hr); hr = IAudioCaptureClient_GetBuffer(acc, NULL, NULL, &flags, NULL, NULL); - ok(hr == E_POINTER, "IAudioCaptureClient_GetBuffer(NULL, NULL, &flags) returns %08x\n", hr); + ok(hr == E_POINTER, "IAudioCaptureClient_GetBuffer(NULL, NULL, &flags) returns %08lx\n", hr); hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, NULL, NULL, NULL); - ok(hr == E_POINTER, "IAudioCaptureClient_GetBuffer(&ata, &frames, NULL) returns %08x\n", hr); + ok(hr == E_POINTER, "IAudioCaptureClient_GetBuffer(&ata, &frames, NULL) returns %08lx\n", hr); ok(broken((DWORD_PTR)data == 0xdeadf00d) || /* <= win8 */ data == NULL, "data is reset to %p\n", data); ok(frames == 0xdeadbeef, "frames is reset to %08x\n", frames); - ok(flags == 0xabadcafe, "flags is reset to %08x\n", flags); + ok(flags == 0xabadcafe, "flags is reset to %08lx\n", flags); hr = IAudioClient_GetDevicePeriod(ac, &period, NULL); - ok(hr == S_OK, "GetDevicePeriod failed: %08x\n", hr); + ok(hr == S_OK, "GetDevicePeriod failed: %08lx\n", hr); period = MulDiv(period, wfx->nSamplesPerSec, 10000000); /* as in render.c */ hr = IAudioClient_Start(ac); - ok(hr == S_OK, "Start on a stopped stream returns %08x\n", hr); + ok(hr == S_OK, "Start on a stopped stream returns %08lx\n", hr); ok(WaitForSingleObject(handle, 1000) == WAIT_OBJECT_0, "Waiting on event handle failed!\n"); data = (void*)0xdeadf00d; hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, &flags, &pos, &qpc); - ok(hr == S_OK || hr == AUDCLNT_S_BUFFER_EMPTY, "Valid IAudioCaptureClient_GetBuffer returns %08x\n", hr); + ok(hr == S_OK || hr == AUDCLNT_S_BUFFER_EMPTY, "Valid IAudioCaptureClient_GetBuffer returns %08lx\n", hr); if (hr == S_OK){ ok(frames, "Amount of frames locked is 0!\n"); /* broken: some w7 machines return pad == 0 and DATA_DISCONTINUITY here, @@ -152,42 +152,42 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) data == NULL, "No data changed to %p\n", data); } - trace("Wait'ed position %d pad %u flags %x, amount of frames locked: %u\n", + trace("Wait'ed position %d pad %u flags %lx, amount of frames locked: %u\n", hr==S_OK ? (UINT)pos : -1, pad, flags, frames); hr = IAudioCaptureClient_GetNextPacketSize(acc, &next); - ok(hr == S_OK, "IAudioCaptureClient_GetNextPacketSize returns %08x\n", hr); + ok(hr == S_OK, "IAudioCaptureClient_GetNextPacketSize returns %08lx\n", hr); ok(next == frames, "GetNextPacketSize %u vs. GetBuffer %u\n", next, frames); hr = IAudioCaptureClient_ReleaseBuffer(acc, frames); - ok(hr == S_OK, "Releasing buffer returns %08x\n", hr); + ok(hr == S_OK, "Releasing buffer returns %08lx\n", hr); hr = IAudioCaptureClient_ReleaseBuffer(acc, 0); - ok(hr == S_OK, "Releasing 0 returns %08x\n", hr); + ok(hr == S_OK, "Releasing 0 returns %08lx\n", hr); hr = IAudioCaptureClient_GetNextPacketSize(acc, &next); - ok(hr == S_OK, "IAudioCaptureClient_GetNextPacketSize returns %08x\n", hr); + ok(hr == S_OK, "IAudioCaptureClient_GetNextPacketSize returns %08lx\n", hr); if (frames) { hr = IAudioCaptureClient_ReleaseBuffer(acc, frames); - ok(hr == AUDCLNT_E_OUT_OF_ORDER, "Releasing buffer twice returns %08x\n", hr); + ok(hr == AUDCLNT_E_OUT_OF_ORDER, "Releasing buffer twice returns %08lx\n", hr); sum += frames; } Sleep(350); /* for sure there's data now */ hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding call returns %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding call returns %08lx\n", hr); /** GetNextPacketSize * returns either 0 or one period worth of frames * whereas GetCurrentPadding grows when input is not consumed. */ hr = IAudioCaptureClient_GetNextPacketSize(acc, &next); - ok(hr == S_OK, "IAudioCaptureClient_GetNextPacketSize returns %08x\n", hr); + ok(hr == S_OK, "IAudioCaptureClient_GetNextPacketSize returns %08lx\n", hr); ok(next < pad, "GetNextPacketSize %u vs. GCP %u\n", next, pad); hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, &flags, &pos, &qpc); - ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08x\n", hr); + ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08lx\n", hr); ok(next == frames, "GetNextPacketSize %u vs. GetBuffer %u\n", next, frames); if(hr == S_OK){ @@ -197,17 +197,17 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) ok(pos == sum, "Position %u expected %u\n", (UINT)pos, sum); hr = IAudioCaptureClient_ReleaseBuffer(acc, 0); - ok(hr == S_OK, "Releasing 0 returns %08x\n", hr); + ok(hr == S_OK, "Releasing 0 returns %08lx\n", hr); /* GCP did not decrement, no data consumed */ hr = IAudioClient_GetCurrentPadding(ac, &frames); - ok(hr == S_OK, "GetCurrentPadding call returns %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding call returns %08lx\n", hr); ok(frames == pad || frames == pad + next /* concurrent feeder */, "GCP %u past ReleaseBuffer(0) initially %u\n", frames, pad); /* should re-get the same data */ hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, &flags, &pos2, &qpc2); - ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08x\n", hr); + ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08lx\n", hr); ok(frames2 == frames, "GetBuffer after ReleaseBuffer(0) %u/%u\n", frames2, frames); ok(pos2 == pos, "Position after ReleaseBuffer(0) %u/%u\n", (UINT)pos2, (UINT)pos); todo_wine_if(qpc2 != qpc) @@ -216,7 +216,7 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) } /* trace after the GCP test because log output to MS-DOS console disturbs timing */ - trace("Sleep.1 position %d pad %u flags %x, amount of frames locked: %u\n", + trace("Sleep.1 position %d pad %u flags %lx, amount of frames locked: %u\n", hr==S_OK ? (UINT)pos : -1, pad, flags, frames); if(hr == S_OK){ @@ -228,31 +228,31 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) pos = qpc = 0xdeadbeef; hr = IAudioCaptureClient_GetBuffer(acc, &data2, &frames2, &flags, &pos, &qpc); - ok(hr == AUDCLNT_E_OUT_OF_ORDER, "Out of order IAudioCaptureClient_GetBuffer returns %08x\n", hr); + ok(hr == AUDCLNT_E_OUT_OF_ORDER, "Out of order IAudioCaptureClient_GetBuffer returns %08lx\n", hr); ok(frames2 == 0xabadcafe, "Out of order frames changed to %x\n", frames2); ok(broken(data2 == (void*)0xdeadf00d) /* <= win8 */ || data2 == NULL, "Out of order data changed to %p\n", data2); - ok(flags == 0xabadcafe, "Out of order flags changed to %x\n", flags); + ok(flags == 0xabadcafe, "Out of order flags changed to %lx\n", flags); ok(pos == 0xdeadbeef, "Out of order position changed to %x\n", (UINT)pos); ok(qpc == 0xdeadbeef, "Out of order timer changed to %x\n", (UINT)qpc); hr = IAudioCaptureClient_ReleaseBuffer(acc, frames+1); - ok(hr == AUDCLNT_E_INVALID_SIZE, "Releasing buffer+1 returns %08x\n", hr); + ok(hr == AUDCLNT_E_INVALID_SIZE, "Releasing buffer+1 returns %08lx\n", hr); hr = IAudioCaptureClient_ReleaseBuffer(acc, 1); - ok(hr == AUDCLNT_E_INVALID_SIZE, "Releasing 1 returns %08x\n", hr); + ok(hr == AUDCLNT_E_INVALID_SIZE, "Releasing 1 returns %08lx\n", hr); hr = IAudioClient_Reset(ac); - ok(hr == AUDCLNT_E_NOT_STOPPED, "Reset failed: %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_STOPPED, "Reset failed: %08lx\n", hr); } hr = IAudioCaptureClient_ReleaseBuffer(acc, frames); - ok(hr == S_OK, "Releasing buffer returns %08x\n", hr); + ok(hr == S_OK, "Releasing buffer returns %08lx\n", hr); if (frames) { sum += frames; hr = IAudioCaptureClient_ReleaseBuffer(acc, frames); - ok(hr == AUDCLNT_E_OUT_OF_ORDER, "Releasing buffer twice returns %08x\n", hr); + ok(hr == AUDCLNT_E_OUT_OF_ORDER, "Releasing buffer twice returns %08lx\n", hr); } frames = period; @@ -260,18 +260,18 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) /* GetBufferSize is not a multiple of the period size! */ hr = IAudioClient_GetBufferSize(ac, &next); - ok(hr == S_OK, "GetBufferSize failed: %08x\n", hr); + ok(hr == S_OK, "GetBufferSize failed: %08lx\n", hr); trace("GetBufferSize %u period size %u\n", next, frames); Sleep(400); /* overrun */ hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding call returns %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding call returns %08lx\n", hr); hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, &flags, &pos, &qpc); - ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08x\n", hr); + ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08lx\n", hr); - trace("Overrun position %d pad %u flags %x, amount of frames locked: %u\n", + trace("Overrun position %d pad %u flags %lx, amount of frames locked: %u\n", hr==S_OK ? (UINT)pos : -1, pad, flags, frames); if(hr == S_OK){ @@ -289,85 +289,85 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) } hr = IAudioCaptureClient_ReleaseBuffer(acc, frames); - ok(hr == S_OK, "Releasing buffer returns %08x\n", hr); + ok(hr == S_OK, "Releasing buffer returns %08lx\n", hr); sum += frames; hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding call returns %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding call returns %08lx\n", hr); hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, &flags, &pos, &qpc); - ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08x\n", hr); + ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08lx\n", hr); - trace("Cont'ed position %d pad %u flags %x, amount of frames locked: %u\n", + trace("Cont'ed position %d pad %u flags %lx, amount of frames locked: %u\n", hr==S_OK ? (UINT)pos : -1, pad, flags, frames); if(hr == S_OK){ ok(pos == sum, "Position %u expected %u\n", (UINT)pos, sum); - ok(!flags, "flags %u\n", flags); + ok(!flags, "flags %lu\n", flags); hr = IAudioCaptureClient_ReleaseBuffer(acc, frames); - ok(hr == S_OK, "Releasing buffer returns %08x\n", hr); + ok(hr == S_OK, "Releasing buffer returns %08lx\n", hr); sum += frames; } hr = IAudioClient_Stop(ac); - ok(hr == S_OK, "Stop on a started stream returns %08x\n", hr); + ok(hr == S_OK, "Stop on a started stream returns %08lx\n", hr); hr = IAudioClient_Start(ac); - ok(hr == S_OK, "Start on a stopped stream returns %08x\n", hr); + ok(hr == S_OK, "Start on a stopped stream returns %08lx\n", hr); hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, &flags, &pos, &qpc); - ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08x\n", hr); + ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08lx\n", hr); hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding call returns %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding call returns %08lx\n", hr); - trace("Restart position %d pad %u flags %x, amount of frames locked: %u\n", + trace("Restart position %d pad %u flags %lx, amount of frames locked: %u\n", hr==S_OK ? (UINT)pos : -1, pad, flags, frames); ok(pad > sum, "restarted GCP %u\n", pad); /* GCP is still near buffer size */ if(frames){ ok(pos == sum, "Position %u expected %u\n", (UINT)pos, sum); - ok(!flags, "flags %u\n", flags); + ok(!flags, "flags %lu\n", flags); hr = IAudioCaptureClient_ReleaseBuffer(acc, frames); - ok(hr == S_OK, "Releasing buffer returns %08x\n", hr); + ok(hr == S_OK, "Releasing buffer returns %08lx\n", hr); sum += frames; } hr = IAudioClient_Stop(ac); - ok(hr == S_OK, "Stop on a started stream returns %08x\n", hr); + ok(hr == S_OK, "Stop on a started stream returns %08lx\n", hr); hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset on a stopped stream returns %08x\n", hr); + ok(hr == S_OK, "Reset on a stopped stream returns %08lx\n", hr); sum += pad - frames; hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding call returns %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding call returns %08lx\n", hr); ok(!pad, "reset GCP %u\n", pad); flags = 0xabadcafe; hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, &flags, &pos, &qpc); ok(hr == AUDCLNT_S_BUFFER_EMPTY, - "Initial IAudioCaptureClient_GetBuffer returns %08x\n", hr); + "Initial IAudioCaptureClient_GetBuffer returns %08lx\n", hr); - trace("Reset position %d pad %u flags %x, amount of frames locked: %u\n", + trace("Reset position %d pad %u flags %lx, amount of frames locked: %u\n", hr==S_OK ? (UINT)pos : -1, pad, flags, frames); if(SUCCEEDED(hr)) IAudioCaptureClient_ReleaseBuffer(acc, frames); hr = IAudioClient_Start(ac); - ok(hr == S_OK, "Start on a stopped stream returns %08x\n", hr); + ok(hr == S_OK, "Start on a stopped stream returns %08lx\n", hr); Sleep(180); hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding call returns %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding call returns %08lx\n", hr); hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, &flags, &pos, &qpc); - ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08x\n", hr); - trace("Running position %d pad %u flags %x, amount of frames locked: %u\n", + ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08lx\n", hr); + trace("Running position %d pad %u flags %lx, amount of frames locked: %u\n", SUCCEEDED(hr) ? (UINT)pos : -1, pad, flags, frames); if(SUCCEEDED(hr)){ @@ -392,56 +392,56 @@ static void test_audioclient(void) hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return; handle = CreateEventW(NULL, FALSE, FALSE, NULL); hr = IAudioClient_QueryInterface(ac, &IID_IUnknown, NULL); - ok(hr == E_POINTER, "QueryInterface(NULL) returned %08x\n", hr); + ok(hr == E_POINTER, "QueryInterface(NULL) returned %08lx\n", hr); unk = (void*)(LONG_PTR)0x12345678; hr = IAudioClient_QueryInterface(ac, &IID_NULL, (void**)&unk); - ok(hr == E_NOINTERFACE, "QueryInterface(IID_NULL) returned %08x\n", hr); + ok(hr == E_NOINTERFACE, "QueryInterface(IID_NULL) returned %08lx\n", hr); ok(!unk, "QueryInterface(IID_NULL) returned non-null pointer %p\n", unk); hr = IAudioClient_QueryInterface(ac, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface(IID_IUnknown) returned %08x\n", hr); + ok(hr == S_OK, "QueryInterface(IID_IUnknown) returned %08lx\n", hr); if (unk) { ref = IUnknown_Release(unk); - ok(ref == 1, "Released count is %u\n", ref); + ok(ref == 1, "Released count is %lu\n", ref); } hr = IAudioClient_QueryInterface(ac, &IID_IAudioClient, (void**)&unk); - ok(hr == S_OK, "QueryInterface(IID_IAudioClient) returned %08x\n", hr); + ok(hr == S_OK, "QueryInterface(IID_IAudioClient) returned %08lx\n", hr); if (unk) { ref = IUnknown_Release(unk); - ok(ref == 1, "Released count is %u\n", ref); + ok(ref == 1, "Released count is %lu\n", ref); } hr = IAudioClient_GetDevicePeriod(ac, NULL, NULL); - ok(hr == E_POINTER, "Invalid GetDevicePeriod call returns %08x\n", hr); + ok(hr == E_POINTER, "Invalid GetDevicePeriod call returns %08lx\n", hr); hr = IAudioClient_GetDevicePeriod(ac, &t1, NULL); - ok(hr == S_OK, "Valid GetDevicePeriod call returns %08x\n", hr); + ok(hr == S_OK, "Valid GetDevicePeriod call returns %08lx\n", hr); hr = IAudioClient_GetDevicePeriod(ac, NULL, &t2); - ok(hr == S_OK, "Valid GetDevicePeriod call returns %08x\n", hr); + ok(hr == S_OK, "Valid GetDevicePeriod call returns %08lx\n", hr); hr = IAudioClient_GetDevicePeriod(ac, &t1, &t2); - ok(hr == S_OK, "Valid GetDevicePeriod call returns %08x\n", hr); + ok(hr == S_OK, "Valid GetDevicePeriod call returns %08lx\n", hr); trace("Returned periods: %u.%04u ms %u.%04u ms\n", (UINT)(t1/10000), (UINT)(t1 % 10000), (UINT)(t2/10000), (UINT)(t2 % 10000)); hr = IAudioClient_GetMixFormat(ac, NULL); - ok(hr == E_POINTER, "GetMixFormat returns %08x\n", hr); + ok(hr == E_POINTER, "GetMixFormat returns %08lx\n", hr); hr = IAudioClient_GetMixFormat(ac, &pwfx); - ok(hr == S_OK, "Valid GetMixFormat returns %08x\n", hr); + ok(hr == S_OK, "Valid GetMixFormat returns %08lx\n", hr); if (hr == S_OK) { @@ -449,7 +449,7 @@ static void test_audioclient(void) trace("Tag: %04x\n", pwfx->wFormatTag); trace("bits: %u\n", pwfx->wBitsPerSample); trace("chan: %u\n", pwfx->nChannels); - trace("rate: %u\n", pwfx->nSamplesPerSec); + trace("rate: %lu\n", pwfx->nSamplesPerSec); trace("align: %u\n", pwfx->nBlockAlign); trace("extra: %u\n", pwfx->cbSize); ok(pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE, "wFormatTag is %x\n", pwfx->wFormatTag); @@ -457,7 +457,7 @@ static void test_audioclient(void) { WAVEFORMATEXTENSIBLE *pwfxe = (void*)pwfx; trace("Res: %u\n", pwfxe->Samples.wReserved); - trace("Mask: %x\n", pwfxe->dwChannelMask); + trace("Mask: %lx\n", pwfxe->dwChannelMask); trace("Alg: %s\n", IsEqualGUID(&pwfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM)?"PCM": (IsEqualGUID(&pwfxe->SubFormat, @@ -465,79 +465,79 @@ static void test_audioclient(void) } hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &pwfx2); - ok(hr == S_OK, "Valid IsFormatSupported(Shared) call returns %08x\n", hr); + ok(hr == S_OK, "Valid IsFormatSupported(Shared) call returns %08lx\n", hr); ok(pwfx2 == NULL, "pwfx2 is non-null\n"); CoTaskMemFree(pwfx2); hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, NULL, NULL); - ok(hr == E_POINTER, "IsFormatSupported(NULL) call returns %08x\n", hr); + ok(hr == E_POINTER, "IsFormatSupported(NULL) call returns %08lx\n", hr); hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, NULL); - ok(hr == E_POINTER, "IsFormatSupported(Shared,NULL) call returns %08x\n", hr); + ok(hr == E_POINTER, "IsFormatSupported(Shared,NULL) call returns %08lx\n", hr); hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_EXCLUSIVE, pwfx, NULL); - ok(hr == S_OK || hr == AUDCLNT_E_UNSUPPORTED_FORMAT, "IsFormatSupported(Exclusive) call returns %08x\n", hr); + ok(hr == S_OK || hr == AUDCLNT_E_UNSUPPORTED_FORMAT, "IsFormatSupported(Exclusive) call returns %08lx\n", hr); hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_EXCLUSIVE, pwfx, &pwfx2); - ok(hr == S_OK || hr == AUDCLNT_E_UNSUPPORTED_FORMAT, "IsFormatSupported(Exclusive) call returns %08x\n", hr); + ok(hr == S_OK || hr == AUDCLNT_E_UNSUPPORTED_FORMAT, "IsFormatSupported(Exclusive) call returns %08lx\n", hr); ok(pwfx2 == NULL, "pwfx2 non-null on exclusive IsFormatSupported\n"); hr = IAudioClient_IsFormatSupported(ac, 0xffffffff, pwfx, NULL); ok(hr == E_INVALIDARG/*w32*/ || broken(hr == AUDCLNT_E_UNSUPPORTED_FORMAT/*w64 response from exclusive mode driver */), - "IsFormatSupported(0xffffffff) call returns %08x\n", hr); + "IsFormatSupported(0xffffffff) call returns %08lx\n", hr); } test_uninitialized(ac); hr = IAudioClient_Initialize(ac, 3, 0, 5000000, 0, pwfx, NULL); ok(broken(hr == AUDCLNT_E_NOT_INITIALIZED) || /* <= win8 */ - hr == E_INVALIDARG, "Initialize with invalid sharemode returns %08x\n", hr); + hr == E_INVALIDARG, "Initialize with invalid sharemode returns %08lx\n", hr); hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0xffffffff, 5000000, 0, pwfx, NULL); - ok(hr == E_INVALIDARG || hr == AUDCLNT_E_INVALID_STREAM_FLAG, "Initialize with invalid flags returns %08x\n", hr); + ok(hr == E_INVALIDARG || hr == AUDCLNT_E_INVALID_STREAM_FLAG, "Initialize with invalid flags returns %08lx\n", hr); /* A period != 0 is ignored and the call succeeds. * Since we can only initialize successfully once, skip those tests. */ hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, NULL, NULL); - ok(hr == E_POINTER, "Initialize with null format returns %08x\n", hr); + ok(hr == E_POINTER, "Initialize with null format returns %08lx\n", hr); hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_EVENTCALLBACK, 4987654, 0, pwfx, NULL); - ok(hr == S_OK, "Valid Initialize returns %08x\n", hr); + ok(hr == S_OK, "Valid Initialize returns %08lx\n", hr); if (hr != S_OK) { - skip("Cannot initialize %08x, remainder of tests is useless\n", hr); + skip("Cannot initialize %08lx, remainder of tests is useless\n", hr); goto cleanup; } hr = IAudioClient_GetStreamLatency(ac, NULL); - ok(hr == E_POINTER, "GetStreamLatency(NULL) call returns %08x\n", hr); + ok(hr == E_POINTER, "GetStreamLatency(NULL) call returns %08lx\n", hr); hr = IAudioClient_GetStreamLatency(ac, &t1); - ok(hr == S_OK, "Valid GetStreamLatency call returns %08x\n", hr); + ok(hr == S_OK, "Valid GetStreamLatency call returns %08lx\n", hr); trace("Returned latency: %u.%04u ms\n", (UINT)(t1/10000), (UINT)(t1 % 10000)); hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); - ok(hr == AUDCLNT_E_ALREADY_INITIALIZED, "Calling Initialize twice returns %08x\n", hr); + ok(hr == AUDCLNT_E_ALREADY_INITIALIZED, "Calling Initialize twice returns %08lx\n", hr); hr = IAudioClient_SetEventHandle(ac, NULL); - ok(hr == E_INVALIDARG, "SetEventHandle(NULL) returns %08x\n", hr); + ok(hr == E_INVALIDARG, "SetEventHandle(NULL) returns %08lx\n", hr); hr = IAudioClient_Start(ac); ok(hr == AUDCLNT_E_EVENTHANDLE_NOT_SET || - hr == D3D11_ERROR_4E /* win10 */, "Start before SetEventHandle returns %08x\n", hr); + hr == D3D11_ERROR_4E /* win10 */, "Start before SetEventHandle returns %08lx\n", hr); hr = IAudioClient_SetEventHandle(ac, handle); - ok(hr == S_OK, "SetEventHandle returns %08x\n", hr); + ok(hr == S_OK, "SetEventHandle returns %08lx\n", hr); hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset on an already reset stream returns %08x\n", hr); + ok(hr == S_OK, "Reset on an already reset stream returns %08lx\n", hr); hr = IAudioClient_Stop(ac); - ok(hr == S_FALSE, "Stop on a stopped stream returns %08x\n", hr); + ok(hr == S_FALSE, "Stop on a stopped stream returns %08lx\n", hr); test_capture(ac, handle, pwfx); @@ -558,87 +558,87 @@ static void test_streamvolume(void) hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return; hr = IAudioClient_GetMixFormat(ac, &fmt); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr); hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, fmt, NULL); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr); if(hr != S_OK) return; hr = IAudioClient_GetService(ac, &IID_IAudioStreamVolume, (void**)&asv); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); hr = IAudioStreamVolume_GetChannelCount(asv, NULL); - ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08x\n", hr); + ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08lx\n", hr); hr = IAudioStreamVolume_GetChannelCount(asv, &chans); - ok(hr == S_OK, "GetChannelCount failed: %08x\n", hr); + ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(chans == fmt->nChannels, "GetChannelCount gave wrong number of channels: %d\n", chans); hr = IAudioStreamVolume_GetChannelVolume(asv, fmt->nChannels, NULL); - ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08x\n", hr); + ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08lx\n", hr); hr = IAudioStreamVolume_GetChannelVolume(asv, fmt->nChannels, &vol); - ok(hr == E_INVALIDARG, "GetChannelCount gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "GetChannelCount gave wrong error: %08lx\n", hr); hr = IAudioStreamVolume_GetChannelVolume(asv, 0, NULL); - ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08x\n", hr); + ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08lx\n", hr); hr = IAudioStreamVolume_GetChannelVolume(asv, 0, &vol); - ok(hr == S_OK, "GetChannelCount failed: %08x\n", hr); + ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(vol == 1.f, "Channel volume was not 1: %f\n", vol); hr = IAudioStreamVolume_SetChannelVolume(asv, fmt->nChannels, -1.f); - ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08lx\n", hr); hr = IAudioStreamVolume_SetChannelVolume(asv, 0, -1.f); - ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08lx\n", hr); hr = IAudioStreamVolume_SetChannelVolume(asv, 0, 2.f); - ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08lx\n", hr); hr = IAudioStreamVolume_SetChannelVolume(asv, 0, 0.2f); - ok(hr == S_OK, "SetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "SetChannelVolume failed: %08lx\n", hr); hr = IAudioStreamVolume_GetChannelVolume(asv, 0, &vol); - ok(hr == S_OK, "GetChannelCount failed: %08x\n", hr); + ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(fabsf(vol - 0.2f) < 0.05f, "Channel volume wasn't 0.2: %f\n", vol); hr = IAudioStreamVolume_GetAllVolumes(asv, 0, NULL); - ok(hr == E_POINTER, "GetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == E_POINTER, "GetAllVolumes gave wrong error: %08lx\n", hr); hr = IAudioStreamVolume_GetAllVolumes(asv, fmt->nChannels, NULL); - ok(hr == E_POINTER, "GetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == E_POINTER, "GetAllVolumes gave wrong error: %08lx\n", hr); vols = HeapAlloc(GetProcessHeap(), 0, fmt->nChannels * sizeof(float)); ok(vols != NULL, "HeapAlloc failed\n"); hr = IAudioStreamVolume_GetAllVolumes(asv, fmt->nChannels - 1, vols); - ok(hr == E_INVALIDARG, "GetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "GetAllVolumes gave wrong error: %08lx\n", hr); hr = IAudioStreamVolume_GetAllVolumes(asv, fmt->nChannels, vols); - ok(hr == S_OK, "GetAllVolumes failed: %08x\n", hr); + ok(hr == S_OK, "GetAllVolumes failed: %08lx\n", hr); ok(fabsf(vols[0] - 0.2f) < 0.05f, "Channel 0 volume wasn't 0.2: %f\n", vol); for(i = 1; i < fmt->nChannels; ++i) ok(vols[i] == 1.f, "Channel %d volume is not 1: %f\n", i, vols[i]); hr = IAudioStreamVolume_SetAllVolumes(asv, 0, NULL); - ok(hr == E_POINTER, "SetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == E_POINTER, "SetAllVolumes gave wrong error: %08lx\n", hr); hr = IAudioStreamVolume_SetAllVolumes(asv, fmt->nChannels, NULL); - ok(hr == E_POINTER, "SetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == E_POINTER, "SetAllVolumes gave wrong error: %08lx\n", hr); hr = IAudioStreamVolume_SetAllVolumes(asv, fmt->nChannels - 1, vols); - ok(hr == E_INVALIDARG, "SetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetAllVolumes gave wrong error: %08lx\n", hr); hr = IAudioStreamVolume_SetAllVolumes(asv, fmt->nChannels, vols); - ok(hr == S_OK, "SetAllVolumes failed: %08x\n", hr); + ok(hr == S_OK, "SetAllVolumes failed: %08lx\n", hr); HeapFree(GetProcessHeap(), 0, vols); IAudioStreamVolume_Release(asv); @@ -657,90 +657,90 @@ static void test_channelvolume(void) hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return; hr = IAudioClient_GetMixFormat(ac, &fmt); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr); hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST, 5000000, 0, fmt, NULL); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr); hr = IAudioClient_GetService(ac, &IID_IChannelAudioVolume, (void**)&acv); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); if(hr != S_OK) return; hr = IChannelAudioVolume_GetChannelCount(acv, NULL); - ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08lx\n", hr); hr = IChannelAudioVolume_GetChannelCount(acv, &chans); - ok(hr == S_OK, "GetChannelCount failed: %08x\n", hr); + ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(chans == fmt->nChannels, "GetChannelCount gave wrong number of channels: %d\n", chans); hr = IChannelAudioVolume_GetChannelVolume(acv, fmt->nChannels, NULL); - ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08lx\n", hr); hr = IChannelAudioVolume_GetChannelVolume(acv, fmt->nChannels, &vol); - ok(hr == E_INVALIDARG, "GetChannelCount gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "GetChannelCount gave wrong error: %08lx\n", hr); hr = IChannelAudioVolume_GetChannelVolume(acv, 0, NULL); - ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08lx\n", hr); hr = IChannelAudioVolume_GetChannelVolume(acv, 0, &vol); - ok(hr == S_OK, "GetChannelCount failed: %08x\n", hr); + ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(vol == 1.f, "Channel volume was not 1: %f\n", vol); hr = IChannelAudioVolume_SetChannelVolume(acv, fmt->nChannels, -1.f, NULL); - ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08lx\n", hr); hr = IChannelAudioVolume_SetChannelVolume(acv, 0, -1.f, NULL); - ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08lx\n", hr); hr = IChannelAudioVolume_SetChannelVolume(acv, 0, 2.f, NULL); - ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08lx\n", hr); hr = IChannelAudioVolume_SetChannelVolume(acv, 0, 0.2f, NULL); - ok(hr == S_OK, "SetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "SetChannelVolume failed: %08lx\n", hr); hr = IChannelAudioVolume_GetChannelVolume(acv, 0, &vol); - ok(hr == S_OK, "GetChannelCount failed: %08x\n", hr); + ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(fabsf(vol - 0.2f) < 0.05f, "Channel volume wasn't 0.2: %f\n", vol); hr = IChannelAudioVolume_GetAllVolumes(acv, 0, NULL); - ok(hr == NULL_PTR_ERR, "GetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "GetAllVolumes gave wrong error: %08lx\n", hr); hr = IChannelAudioVolume_GetAllVolumes(acv, fmt->nChannels, NULL); - ok(hr == NULL_PTR_ERR, "GetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "GetAllVolumes gave wrong error: %08lx\n", hr); vols = HeapAlloc(GetProcessHeap(), 0, fmt->nChannels * sizeof(float)); ok(vols != NULL, "HeapAlloc failed\n"); hr = IChannelAudioVolume_GetAllVolumes(acv, fmt->nChannels - 1, vols); - ok(hr == E_INVALIDARG, "GetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "GetAllVolumes gave wrong error: %08lx\n", hr); hr = IChannelAudioVolume_GetAllVolumes(acv, fmt->nChannels, vols); - ok(hr == S_OK, "GetAllVolumes failed: %08x\n", hr); + ok(hr == S_OK, "GetAllVolumes failed: %08lx\n", hr); ok(fabsf(vols[0] - 0.2f) < 0.05f, "Channel 0 volume wasn't 0.2: %f\n", vol); for(i = 1; i < fmt->nChannels; ++i) ok(vols[i] == 1.f, "Channel %d volume is not 1: %f\n", i, vols[i]); hr = IChannelAudioVolume_SetAllVolumes(acv, 0, NULL, NULL); - ok(hr == NULL_PTR_ERR, "SetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "SetAllVolumes gave wrong error: %08lx\n", hr); hr = IChannelAudioVolume_SetAllVolumes(acv, fmt->nChannels, NULL, NULL); - ok(hr == NULL_PTR_ERR, "SetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "SetAllVolumes gave wrong error: %08lx\n", hr); hr = IChannelAudioVolume_SetAllVolumes(acv, fmt->nChannels - 1, vols, NULL); - ok(hr == E_INVALIDARG, "SetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetAllVolumes gave wrong error: %08lx\n", hr); hr = IChannelAudioVolume_SetAllVolumes(acv, fmt->nChannels, vols, NULL); - ok(hr == S_OK, "SetAllVolumes failed: %08x\n", hr); + ok(hr == S_OK, "SetAllVolumes failed: %08lx\n", hr); hr = IChannelAudioVolume_SetChannelVolume(acv, 0, 1.0f, NULL); - ok(hr == S_OK, "SetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "SetChannelVolume failed: %08lx\n", hr); HeapFree(GetProcessHeap(), 0, vols); IChannelAudioVolume_Release(acv); @@ -759,71 +759,71 @@ static void test_simplevolume(void) hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return; hr = IAudioClient_GetMixFormat(ac, &fmt); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr); hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST, 5000000, 0, fmt, NULL); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr); hr = IAudioClient_GetService(ac, &IID_ISimpleAudioVolume, (void**)&sav); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); if(hr != S_OK) return; hr = ISimpleAudioVolume_GetMasterVolume(sav, NULL); - ok(hr == NULL_PTR_ERR, "GetMasterVolume gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "GetMasterVolume gave wrong error: %08lx\n", hr); hr = ISimpleAudioVolume_GetMasterVolume(sav, &vol); - ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "GetMasterVolume failed: %08lx\n", hr); hr = ISimpleAudioVolume_SetMasterVolume(sav, -1.f, NULL); - ok(hr == E_INVALIDARG, "SetMasterVolume gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetMasterVolume gave wrong error: %08lx\n", hr); hr = ISimpleAudioVolume_SetMasterVolume(sav, 2.f, NULL); - ok(hr == E_INVALIDARG, "SetMasterVolume gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetMasterVolume gave wrong error: %08lx\n", hr); hr = ISimpleAudioVolume_SetMasterVolume(sav, 0.2f, NULL); - ok(hr == S_OK, "SetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "SetMasterVolume failed: %08lx\n", hr); hr = ISimpleAudioVolume_GetMasterVolume(sav, &vol); - ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "GetMasterVolume failed: %08lx\n", hr); ok(fabsf(vol - 0.2f) < 0.05f, "Master volume wasn't 0.2: %f\n", vol); hr = ISimpleAudioVolume_GetMute(sav, NULL); - ok(hr == NULL_PTR_ERR, "GetMute gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "GetMute gave wrong error: %08lx\n", hr); mute = TRUE; hr = ISimpleAudioVolume_GetMute(sav, &mute); - ok(hr == S_OK, "GetMute failed: %08x\n", hr); + ok(hr == S_OK, "GetMute failed: %08lx\n", hr); ok(mute == FALSE, "Session is already muted\n"); hr = ISimpleAudioVolume_SetMute(sav, TRUE, NULL); - ok(hr == S_OK, "SetMute failed: %08x\n", hr); + ok(hr == S_OK, "SetMute failed: %08lx\n", hr); mute = FALSE; hr = ISimpleAudioVolume_GetMute(sav, &mute); - ok(hr == S_OK, "GetMute failed: %08x\n", hr); + ok(hr == S_OK, "GetMute failed: %08lx\n", hr); ok(mute == TRUE, "Session should have been muted\n"); hr = ISimpleAudioVolume_GetMasterVolume(sav, &vol); - ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "GetMasterVolume failed: %08lx\n", hr); ok(fabsf(vol - 0.2f) < 0.05f, "Master volume wasn't 0.2: %f\n", vol); hr = ISimpleAudioVolume_SetMasterVolume(sav, 1.f, NULL); - ok(hr == S_OK, "SetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "SetMasterVolume failed: %08lx\n", hr); mute = FALSE; hr = ISimpleAudioVolume_GetMute(sav, &mute); - ok(hr == S_OK, "GetMute failed: %08x\n", hr); + ok(hr == S_OK, "GetMute failed: %08lx\n", hr); ok(mute == TRUE, "Session should have been muted\n"); hr = ISimpleAudioVolume_SetMute(sav, FALSE, NULL); - ok(hr == S_OK, "SetMute failed: %08x\n", hr); + ok(hr == S_OK, "SetMute failed: %08lx\n", hr); ISimpleAudioVolume_Release(sav); IAudioClient_Release(ac); @@ -843,51 +843,51 @@ static void test_volume_dependence(void) UINT32 nch; hr = CoCreateGuid(&session); - ok(hr == S_OK, "CoCreateGuid failed: %08x\n", hr); + ok(hr == S_OK, "CoCreateGuid failed: %08lx\n", hr); hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return; hr = IAudioClient_GetMixFormat(ac, &fmt); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr); hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST, 5000000, 0, fmt, &session); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr); hr = IAudioClient_GetService(ac, &IID_ISimpleAudioVolume, (void**)&sav); - ok(hr == S_OK, "GetService (SimpleAudioVolume) failed: %08x\n", hr); + ok(hr == S_OK, "GetService (SimpleAudioVolume) failed: %08lx\n", hr); hr = IAudioClient_GetService(ac, &IID_IChannelAudioVolume, (void**)&cav); - ok(hr == S_OK, "GetService (ChannelAudioVolume) failed: %08x\n", hr); + ok(hr == S_OK, "GetService (ChannelAudioVolume) failed: %08lx\n", hr); hr = IAudioClient_GetService(ac, &IID_IAudioStreamVolume, (void**)&asv); - ok(hr == S_OK, "GetService (AudioStreamVolume) failed: %08x\n", hr); + ok(hr == S_OK, "GetService (AudioStreamVolume) failed: %08lx\n", hr); if(hr != S_OK) return; hr = IAudioStreamVolume_SetChannelVolume(asv, 0, 0.2f); - ok(hr == S_OK, "ASV_SetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "ASV_SetChannelVolume failed: %08lx\n", hr); hr = IChannelAudioVolume_SetChannelVolume(cav, 0, 0.4f, NULL); - ok(hr == S_OK, "CAV_SetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "CAV_SetChannelVolume failed: %08lx\n", hr); hr = ISimpleAudioVolume_SetMasterVolume(sav, 0.6f, NULL); - ok(hr == S_OK, "SAV_SetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "SAV_SetMasterVolume failed: %08lx\n", hr); hr = IAudioStreamVolume_GetChannelVolume(asv, 0, &vol); - ok(hr == S_OK, "ASV_GetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "ASV_GetChannelVolume failed: %08lx\n", hr); ok(fabsf(vol - 0.2f) < 0.05f, "ASV_GetChannelVolume gave wrong volume: %f\n", vol); hr = IChannelAudioVolume_GetChannelVolume(cav, 0, &vol); - ok(hr == S_OK, "CAV_GetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "CAV_GetChannelVolume failed: %08lx\n", hr); ok(fabsf(vol - 0.4f) < 0.05f, "CAV_GetChannelVolume gave wrong volume: %f\n", vol); hr = ISimpleAudioVolume_GetMasterVolume(sav, &vol); - ok(hr == S_OK, "SAV_GetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "SAV_GetMasterVolume failed: %08lx\n", hr); ok(fabsf(vol - 0.6f) < 0.05f, "SAV_GetMasterVolume gave wrong volume: %f\n", vol); hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, @@ -898,28 +898,28 @@ static void test_volume_dependence(void) hr = IAudioClient_Initialize(ac2, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST, 5000000, 0, fmt, &session); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr); hr = IAudioClient_GetService(ac2, &IID_IChannelAudioVolume, (void**)&cav2); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); hr = IAudioClient_GetService(ac2, &IID_IAudioStreamVolume, (void**)&asv2); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); hr = IChannelAudioVolume_GetChannelVolume(cav2, 0, &vol); - ok(hr == S_OK, "CAV_GetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "CAV_GetChannelVolume failed: %08lx\n", hr); ok(fabsf(vol - 0.4f) < 0.05f, "CAV_GetChannelVolume gave wrong volume: %f\n", vol); hr = IAudioStreamVolume_GetChannelVolume(asv2, 0, &vol); - ok(hr == S_OK, "ASV_GetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "ASV_GetChannelVolume failed: %08lx\n", hr); ok(vol == 1.f, "ASV_GetChannelVolume gave wrong volume: %f\n", vol); hr = IChannelAudioVolume_GetChannelCount(cav2, &nch); - ok(hr == S_OK, "GetChannelCount failed: %08x\n", hr); + ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(nch == fmt->nChannels, "Got wrong channel count, expected %u: %u\n", fmt->nChannels, nch); hr = IAudioStreamVolume_GetChannelCount(asv2, &nch); - ok(hr == S_OK, "GetChannelCount failed: %08x\n", hr); + ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(nch == fmt->nChannels, "Got wrong channel count, expected %u: %u\n", fmt->nChannels, nch); IAudioStreamVolume_Release(asv2); @@ -929,10 +929,10 @@ static void test_volume_dependence(void) skip("Unable to open the same device twice. Skipping session volume control tests\n"); hr = IChannelAudioVolume_SetChannelVolume(cav, 0, 1.f, NULL); - ok(hr == S_OK, "CAV_SetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "CAV_SetChannelVolume failed: %08lx\n", hr); hr = ISimpleAudioVolume_SetMasterVolume(sav, 1.f, NULL); - ok(hr == S_OK, "SAV_SetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "SAV_SetMasterVolume failed: %08lx\n", hr); CoTaskMemFree(fmt); ISimpleAudioVolume_Release(sav); @@ -951,37 +951,37 @@ static void test_marshal(void) hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return; hr = IAudioClient_GetMixFormat(ac, &pwfx); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr); hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr); CoTaskMemFree(pwfx); hr = IAudioClient_GetService(ac, &IID_IAudioCaptureClient, (void**)&cc); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); if(hr != S_OK) { IAudioClient_Release(ac); return; } hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); - ok(hr == S_OK, "CreateStreamOnHGlobal failed 0x%08x\n", hr); + ok(hr == S_OK, "CreateStreamOnHGlobal failed 0x%08lx\n", hr); /* marshal IAudioClient */ hr = CoMarshalInterface(pStream, &IID_IAudioClient, (IUnknown*)ac, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); - ok(hr == S_OK, "CoMarshalInterface IAudioClient failed 0x%08x\n", hr); + ok(hr == S_OK, "CoMarshalInterface IAudioClient failed 0x%08lx\n", hr); IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); hr = CoUnmarshalInterface(pStream, &IID_IAudioClient, (void **)&acDest); - ok(hr == S_OK, "CoUnmarshalInterface IAudioClient failed 0x%08x\n", hr); + ok(hr == S_OK, "CoUnmarshalInterface IAudioClient failed 0x%08lx\n", hr); if (hr == S_OK) IAudioClient_Release(acDest); @@ -989,11 +989,11 @@ static void test_marshal(void) /* marshal IAudioCaptureClient */ hr = CoMarshalInterface(pStream, &IID_IAudioCaptureClient, (IUnknown*)cc, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); - ok(hr == S_OK, "CoMarshalInterface IAudioCaptureClient failed 0x%08x\n", hr); + ok(hr == S_OK, "CoMarshalInterface IAudioCaptureClient failed 0x%08lx\n", hr); IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); hr = CoUnmarshalInterface(pStream, &IID_IAudioCaptureClient, (void **)&ccDest); - ok(hr == S_OK, "CoUnmarshalInterface IAudioCaptureClient failed 0x%08x\n", hr); + ok(hr == S_OK, "CoUnmarshalInterface IAudioCaptureClient failed 0x%08lx\n", hr); if (hr == S_OK) IAudioCaptureClient_Release(ccDest); @@ -1013,18 +1013,18 @@ START_TEST(capture) hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&mme); if (FAILED(hr)) { - skip("mmdevapi not available: 0x%08x\n", hr); + skip("mmdevapi not available: 0x%08lx\n", hr); goto cleanup; } hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(mme, eCapture, eMultimedia, &dev); - ok(hr == S_OK || hr == E_NOTFOUND, "GetDefaultAudioEndpoint failed: 0x%08x\n", hr); + ok(hr == S_OK || hr == E_NOTFOUND, "GetDefaultAudioEndpoint failed: 0x%08lx\n", hr); if (hr != S_OK || !dev) { if (hr == E_NOTFOUND) skip("No sound card available\n"); else - skip("GetDefaultAudioEndpoint returns 0x%08x\n", hr); + skip("GetDefaultAudioEndpoint returns 0x%08lx\n", hr); goto cleanup; } diff --git a/dlls/mmdevapi/tests/dependency.c b/dlls/mmdevapi/tests/dependency.c index 878056506a9..ef99d7bf239 100644 --- a/dlls/mmdevapi/tests/dependency.c +++ b/dlls/mmdevapi/tests/dependency.c @@ -42,25 +42,25 @@ START_TEST(dependency) hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&mme); if (FAILED(hr)) { - skip("mmdevapi not available: 0x%08x\n", hr); + skip("mmdevapi not available: 0x%08lx\n", hr); goto cleanup; } hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(mme, eRender, eMultimedia, &dev); - ok(hr == S_OK || hr == E_NOTFOUND, "GetDefaultAudioEndpoint failed: 0x%08x\n", hr); + ok(hr == S_OK || hr == E_NOTFOUND, "GetDefaultAudioEndpoint failed: 0x%08lx\n", hr); if (hr != S_OK) { if (hr == E_NOTFOUND) skip("No sound card available\n"); else - skip("GetDefaultAudioEndpoint returns 0x%08x\n", hr); + skip("GetDefaultAudioEndpoint returns 0x%08lx\n", hr); goto cleanup; } ok(!GetModuleHandleA("dsound.dll"), "dsound.dll was already loaded!\n"); hr = IMMDevice_Activate(dev, &IID_IDirectSound8, CLSCTX_INPROC_SERVER, NULL, (void**)&ds8); - ok(hr == S_OK, "Activating ds8 interface failed: 0x%08x\n", hr); + ok(hr == S_OK, "Activating ds8 interface failed: 0x%08lx\n", hr); if (hr == S_OK) { ok(GetModuleHandleA("dsound.dll") != NULL, "dsound.dll not loaded!\n"); @@ -71,7 +71,7 @@ START_TEST(dependency) ok(!GetModuleHandleA("quartz.dll"), "quartz.dll was already loaded!\n"); hr = IMMDevice_Activate(dev, &IID_IBaseFilter, CLSCTX_INPROC_SERVER, NULL, (void**)&bf); - ok(hr == S_OK, "Activating bf failed: 0x%08x\n", hr); + ok(hr == S_OK, "Activating bf failed: 0x%08lx\n", hr); if (hr == S_OK) { ok(GetModuleHandleA("quartz.dll") != NULL, "quartz.dll not loaded!\n"); @@ -80,7 +80,7 @@ START_TEST(dependency) { CLSID clsid; hr = IBaseFilter_GetClassID(bf, &clsid); - ok(hr == S_OK, "GetClassId failed with 0x%08x\n", hr); + ok(hr == S_OK, "GetClassId failed with 0x%08lx\n", hr); if (hr == S_OK) ok(IsEqualCLSID(&clsid, &CLSID_DSoundRender), "Wrong class id %s\n", wine_dbgstr_guid(&clsid)); } diff --git a/dlls/mmdevapi/tests/mmdevenum.c b/dlls/mmdevapi/tests/mmdevenum.c index 1fd1c7d4aca..a5b692a53ee 100644 --- a/dlls/mmdevapi/tests/mmdevenum.c +++ b/dlls/mmdevapi/tests/mmdevenum.c @@ -51,17 +51,17 @@ static void test_collection(IMMDeviceEnumerator *mme, IMMDeviceCollection *col) /* collection doesn't keep a ref on parent */ IMMDeviceEnumerator_AddRef(mme); ref = IMMDeviceEnumerator_Release(mme); - ok(ref == 2, "Reference count on parent is %u\n", ref); + ok(ref == 2, "Reference count on parent is %lu\n", ref); ref = IMMDeviceCollection_AddRef(col); IMMDeviceCollection_Release(col); - ok(ref == 2, "Invalid reference count %u on collection\n", ref); + ok(ref == 2, "Invalid reference count %lu on collection\n", ref); hr = IMMDeviceCollection_QueryInterface(col, &IID_IUnknown, NULL); - ok(hr == E_POINTER, "Null ppv returns %08x\n", hr); + ok(hr == E_POINTER, "Null ppv returns %08lx\n", hr); hr = IMMDeviceCollection_QueryInterface(col, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "Cannot query for IID_IUnknown: 0x%08x\n", hr); + ok(hr == S_OK, "Cannot query for IID_IUnknown: 0x%08lx\n", hr); if (hr == S_OK) { ok((IUnknown*)col == unk, "Pointers are not identical %p/%p/%p\n", col, unk, mme); @@ -69,24 +69,24 @@ static void test_collection(IMMDeviceEnumerator *mme, IMMDeviceCollection *col) } hr = IMMDeviceCollection_QueryInterface(col, &IID_IMMDeviceCollection, (void**)&col2); - ok(hr == S_OK, "Cannot query for IID_IMMDeviceCollection: 0x%08x\n", hr); + ok(hr == S_OK, "Cannot query for IID_IMMDeviceCollection: 0x%08lx\n", hr); if (hr == S_OK) IMMDeviceCollection_Release(col2); hr = IMMDeviceCollection_QueryInterface(col, &IID_IMMDeviceEnumerator, (void**)&mme2); - ok(hr == E_NOINTERFACE, "Query for IID_IMMDeviceEnumerator returned: 0x%08x\n", hr); + ok(hr == E_NOINTERFACE, "Query for IID_IMMDeviceEnumerator returned: 0x%08lx\n", hr); if (hr == S_OK) IMMDeviceEnumerator_Release(mme2); hr = IMMDeviceCollection_GetCount(col, NULL); - ok(hr == E_POINTER, "GetCount returned 0x%08x\n", hr); + ok(hr == E_POINTER, "GetCount returned 0x%08lx\n", hr); hr = IMMDeviceCollection_GetCount(col, &numdev); - ok(hr == S_OK, "GetCount returned 0x%08x\n", hr); + ok(hr == S_OK, "GetCount returned 0x%08lx\n", hr); dev = (void*)(LONG_PTR)0x12345678; hr = IMMDeviceCollection_Item(col, numdev, &dev); - ok(hr == E_INVALIDARG, "Asking for too high device returned 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "Asking for too high device returned 0x%08lx\n", hr); ok(dev == NULL, "Returned non-null device\n"); g_num_mmdevs = numdev; @@ -94,10 +94,10 @@ static void test_collection(IMMDeviceEnumerator *mme, IMMDeviceCollection *col) if (numdev) { hr = IMMDeviceCollection_Item(col, 0, NULL); - ok(hr == E_POINTER, "Query with null pointer returned 0x%08x\n", hr); + ok(hr == E_POINTER, "Query with null pointer returned 0x%08lx\n", hr); hr = IMMDeviceCollection_Item(col, 0, &dev); - ok(hr == S_OK, "Valid Item returned 0x%08x\n", hr); + ok(hr == S_OK, "Valid Item returned 0x%08lx\n", hr); ok(dev != NULL, "Device is null!\n"); if (dev != NULL) { @@ -113,7 +113,7 @@ static void test_collection(IMMDeviceEnumerator *mme, IMMDeviceCollection *col) trace("Device found: %s\n", temp); hr = IMMDeviceEnumerator_GetDevice(mme, id, &dev2); - ok(hr == S_OK, "GetDevice failed: %08x\n", hr); + ok(hr == S_OK, "GetDevice failed: %08lx\n", hr); IMMDevice_Release(dev2); @@ -188,7 +188,7 @@ static HRESULT WINAPI async_activate_ActivateCompleted( hr = IActivateAudioInterfaceAsyncOperation_GetActivateResult(op, &async_activate_test.result_hr, &async_activate_test.result_iface); ok(hr == S_OK, - "%s: GetActivateResult failed: %08x\n", + "%s: GetActivateResult failed: %08lx\n", async_activate_test.msg_pfx, hr); return S_OK; @@ -244,16 +244,16 @@ static void test_ActivateAudioInterfaceAsync(void) EnterCriticalSection(&async_activate_test.lock); hr = pActivateAudioInterfaceAsync(L"winetest_bogus", &IID_IAudioClient3, NULL, &async_activate_done, &async_activate_test.op); - ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08x\n", hr); + ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08lx\n", hr); LeaveCriticalSection(&async_activate_test.lock); IActivateAudioInterfaceAsyncOperation_Release(async_activate_test.op); dr = WaitForSingleObject(async_activate_test.evt, 1000); /* wait for all refs other than our own to be released */ ok(dr == WAIT_OBJECT_0, "Timed out waiting for async activate to complete\n"); - ok(async_activate_test.ref == 1, "ActivateAudioInterfaceAsync leaked a handler ref: %u\n", async_activate_test.ref); + ok(async_activate_test.ref == 1, "ActivateAudioInterfaceAsync leaked a handler ref: %lu\n", async_activate_test.ref); ok(async_activate_test.result_hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), - "mmdevice activation gave wrong result: %08x\n", async_activate_test.result_hr); + "mmdevice activation gave wrong result: %08lx\n", async_activate_test.result_hr); ok(async_activate_test.result_iface == NULL, "Got non-NULL iface pointer: %p\n", async_activate_test.result_iface); @@ -263,16 +263,16 @@ static void test_ActivateAudioInterfaceAsync(void) EnterCriticalSection(&async_activate_test.lock); hr = pActivateAudioInterfaceAsync(g_device_path, &IID_IAudioClient3, NULL, &async_activate_done, &async_activate_test.op); - ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08x\n", hr); + ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08lx\n", hr); LeaveCriticalSection(&async_activate_test.lock); IActivateAudioInterfaceAsyncOperation_Release(async_activate_test.op); dr = WaitForSingleObject(async_activate_test.evt, 1000); ok(dr == WAIT_OBJECT_0, "Timed out waiting for async activate to complete\n"); - ok(async_activate_test.ref == 1, "ActivateAudioInterfaceAsync leaked a handler ref: %u\n", async_activate_test.ref); + ok(async_activate_test.ref == 1, "ActivateAudioInterfaceAsync leaked a handler ref: %lu\n", async_activate_test.ref); ok(async_activate_test.result_hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), - "mmdevice activation gave wrong result: %08x\n", async_activate_test.result_hr); + "mmdevice activation gave wrong result: %08lx\n", async_activate_test.result_hr); ok(async_activate_test.result_iface == NULL, "Got non-NULL iface pointer: %p\n", async_activate_test.result_iface); } @@ -283,7 +283,7 @@ static void test_ActivateAudioInterfaceAsync(void) EnterCriticalSection(&async_activate_test.lock); hr = pActivateAudioInterfaceAsync(path, &IID_IAudioClient3, NULL, &async_activate_done, &async_activate_test.op); - ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08x\n", hr); + ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08lx\n", hr); LeaveCriticalSection(&async_activate_test.lock); IActivateAudioInterfaceAsyncOperation_Release(async_activate_test.op); @@ -294,14 +294,14 @@ static void test_ActivateAudioInterfaceAsync(void) ok(async_activate_test.result_hr == S_OK || (g_num_mmdevs == 0 && async_activate_test.result_hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) || /* no devices */ broken(async_activate_test.result_hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)), /* win8 doesn't support DEVINTERFACE_AUDIO_RENDER */ - "mmdevice activation gave wrong result: %08x\n", async_activate_test.result_hr); + "mmdevice activation gave wrong result: %08lx\n", async_activate_test.result_hr); if(async_activate_test.result_hr == S_OK){ ok(async_activate_test.result_iface != NULL, "Got NULL iface pointer on success?\n"); /* returned iface should be the IID we requested */ hr = IUnknown_QueryInterface(async_activate_test.result_iface, &IID_IAudioClient3, (void**)&ac3); - ok(hr == S_OK, "Failed to query IAudioClient3: %08x\n", hr); + ok(hr == S_OK, "Failed to query IAudioClient3: %08lx\n", hr); ok(async_activate_test.result_iface == (IUnknown*)ac3, "Activated interface other than IAudioClient3!\n"); IAudioClient3_Release(ac3); @@ -396,17 +396,17 @@ START_TEST(mmdevenum) hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&mme); if (FAILED(hr)) { - skip("mmdevapi not available: 0x%08x\n", hr); + skip("mmdevapi not available: 0x%08lx\n", hr); return; } /* Odd behavior.. bug? */ ref = IMMDeviceEnumerator_AddRef(mme); - ok(ref == 3, "Invalid reference count after incrementing: %u\n", ref); + ok(ref == 3, "Invalid reference count after incrementing: %lu\n", ref); IMMDeviceEnumerator_Release(mme); hr = IMMDeviceEnumerator_QueryInterface(mme, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "returned 0x%08x\n", hr); + ok(hr == S_OK, "returned 0x%08lx\n", hr); if (hr != S_OK) return; ok( (LONG_PTR)mme == (LONG_PTR)unk, "Pointers are unequal %p/%p\n", unk, mme); @@ -414,39 +414,39 @@ START_TEST(mmdevenum) /* Proving that it is static.. */ hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&mme2); - ok(hr == S_OK, "CoCreateInstance failed: 0x%08x\n", hr); + ok(hr == S_OK, "CoCreateInstance failed: 0x%08lx\n", hr); IMMDeviceEnumerator_Release(mme2); ok(mme == mme2, "Pointers are not equal!\n"); hr = IMMDeviceEnumerator_QueryInterface(mme, &IID_IUnknown, NULL); - ok(hr == E_POINTER, "Null pointer on QueryInterface returned %08x\n", hr); + ok(hr == E_POINTER, "Null pointer on QueryInterface returned %08lx\n", hr); hr = IMMDeviceEnumerator_QueryInterface(mme, &GUID_NULL, (void**)&unk); ok(!unk, "Unk not reset to null after invalid QI\n"); - ok(hr == E_NOINTERFACE, "Invalid hr %08x returned on IID_NULL\n", hr); + ok(hr == E_NOINTERFACE, "Invalid hr %08lx returned on IID_NULL\n", hr); hr = IMMDeviceEnumerator_GetDevice(mme, L"notadevice", NULL); - ok(hr == E_POINTER, "GetDevice gave wrong error: %08x\n", hr); + ok(hr == E_POINTER, "GetDevice gave wrong error: %08lx\n", hr); hr = IMMDeviceEnumerator_GetDevice(mme, NULL, &dev); - ok(hr == E_POINTER, "GetDevice gave wrong error: %08x\n", hr); + ok(hr == E_POINTER, "GetDevice gave wrong error: %08lx\n", hr); hr = IMMDeviceEnumerator_GetDevice(mme, L"notadevice", &dev); - ok(hr == E_INVALIDARG, "GetDevice gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "GetDevice gave wrong error: %08lx\n", hr); col = (void*)(LONG_PTR)0x12345678; hr = IMMDeviceEnumerator_EnumAudioEndpoints(mme, 0xffff, DEVICE_STATEMASK_ALL, &col); - ok(hr == E_INVALIDARG, "Setting invalid data flow returned 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "Setting invalid data flow returned 0x%08lx\n", hr); ok(col == NULL, "Collection pointer non-null on failure\n"); hr = IMMDeviceEnumerator_EnumAudioEndpoints(mme, eAll, DEVICE_STATEMASK_ALL+1, &col); - ok(hr == E_INVALIDARG, "Setting invalid mask returned 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "Setting invalid mask returned 0x%08lx\n", hr); hr = IMMDeviceEnumerator_EnumAudioEndpoints(mme, eAll, DEVICE_STATEMASK_ALL, NULL); - ok(hr == E_POINTER, "Invalid pointer returned: 0x%08x\n", hr); + ok(hr == E_POINTER, "Invalid pointer returned: 0x%08lx\n", hr); hr = IMMDeviceEnumerator_EnumAudioEndpoints(mme, eAll, DEVICE_STATEMASK_ALL, &col); - ok(hr == S_OK, "Valid EnumAudioEndpoints returned 0x%08x\n", hr); + ok(hr == S_OK, "Valid EnumAudioEndpoints returned 0x%08lx\n", hr); if (hr == S_OK) { ok(!!col, "Returned null pointer\n"); @@ -455,28 +455,28 @@ START_TEST(mmdevenum) } hr = IMMDeviceEnumerator_RegisterEndpointNotificationCallback(mme, NULL); - ok(hr == E_POINTER, "RegisterEndpointNotificationCallback failed: %08x\n", hr); + ok(hr == E_POINTER, "RegisterEndpointNotificationCallback failed: %08lx\n", hr); hr = IMMDeviceEnumerator_RegisterEndpointNotificationCallback(mme, ¬if); - ok(hr == S_OK, "RegisterEndpointNotificationCallback failed: %08x\n", hr); + ok(hr == S_OK, "RegisterEndpointNotificationCallback failed: %08lx\n", hr); hr = IMMDeviceEnumerator_RegisterEndpointNotificationCallback(mme, ¬if); - ok(hr == S_OK, "RegisterEndpointNotificationCallback failed: %08x\n", hr); + ok(hr == S_OK, "RegisterEndpointNotificationCallback failed: %08lx\n", hr); hr = IMMDeviceEnumerator_UnregisterEndpointNotificationCallback(mme, NULL); - ok(hr == E_POINTER, "UnregisterEndpointNotificationCallback failed: %08x\n", hr); + ok(hr == E_POINTER, "UnregisterEndpointNotificationCallback failed: %08lx\n", hr); hr = IMMDeviceEnumerator_UnregisterEndpointNotificationCallback(mme, (IMMNotificationClient*)0xdeadbeef); - ok(hr == E_NOTFOUND, "UnregisterEndpointNotificationCallback failed: %08x\n", hr); + ok(hr == E_NOTFOUND, "UnregisterEndpointNotificationCallback failed: %08lx\n", hr); hr = IMMDeviceEnumerator_UnregisterEndpointNotificationCallback(mme, ¬if); - ok(hr == S_OK, "UnregisterEndpointNotificationCallback failed: %08x\n", hr); + ok(hr == S_OK, "UnregisterEndpointNotificationCallback failed: %08lx\n", hr); hr = IMMDeviceEnumerator_UnregisterEndpointNotificationCallback(mme, ¬if); - ok(hr == S_OK, "UnregisterEndpointNotificationCallback failed: %08x\n", hr); + ok(hr == S_OK, "UnregisterEndpointNotificationCallback failed: %08lx\n", hr); hr = IMMDeviceEnumerator_UnregisterEndpointNotificationCallback(mme, ¬if); - ok(hr == E_NOTFOUND, "UnregisterEndpointNotificationCallback failed: %08x\n", hr); + ok(hr == E_NOTFOUND, "UnregisterEndpointNotificationCallback failed: %08lx\n", hr); IMMDeviceEnumerator_Release(mme); diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index 8999699fe6b..89eaada5fd7 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -45,7 +45,7 @@ static void test_propertystore(IPropertyStore *store) pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, &PKEY_AudioEndpoint_GUID, &pv); - ok(hr == S_OK, "Failed with %08x\n", hr); + ok(hr == S_OK, "Failed with %08lx\n", hr); ok(pv.vt == VT_LPWSTR, "Value should be %i, is %i\n", VT_LPWSTR, pv.vt); if (hr == S_OK && pv.vt == VT_LPWSTR) { @@ -56,19 +56,19 @@ static void test_propertystore(IPropertyStore *store) pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_FriendlyName, &pv); - ok(hr == S_OK, "Failed with %08x\n", hr); + ok(hr == S_OK, "Failed with %08lx\n", hr); ok(pv.vt == VT_LPWSTR && pv.pwszVal, "FriendlyName value had wrong type: 0x%x or was NULL\n", pv.vt); PropVariantClear(&pv); pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_Enabled, &pv); - ok(hr == S_OK, "Failed with %08x\n", hr); + ok(hr == S_OK, "Failed with %08lx\n", hr); ok(pv.vt == VT_EMPTY, "Key should not be found\n"); PropVariantClear(&pv); pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_ClassGuid, &pv); - ok(hr == S_OK, "Failed with %08x\n", hr); + ok(hr == S_OK, "Failed with %08lx\n", hr); ok(pv.vt == VT_EMPTY, "Key should not be found\n"); PropVariantClear(&pv); } @@ -84,7 +84,7 @@ static void test_deviceinterface(IPropertyStore *store) pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, &deviceinterface_key, &pv); - ok(hr == S_OK, "GetValue failed: %08x\n", hr); + ok(hr == S_OK, "GetValue failed: %08lx\n", hr); ok(pv.vt == VT_LPWSTR, "Got wrong variant type: 0x%x\n", pv.vt); trace("device interface: %s\n", wine_dbgstr_w(pv.pwszVal)); PropVariantClear(&pv); @@ -103,12 +103,12 @@ static void test_getat(IPropertyStore *store) hr = IPropertyStore_GetCount(store, &propcount); - ok(hr == S_OK, "Failed with %08x\n", hr); - ok(propcount > 0, "Propcount %d should be greater than zero\n", propcount); + ok(hr == S_OK, "Failed with %08lx\n", hr); + ok(propcount > 0, "Propcount %ld should be greater than zero\n", propcount); for (prop = 0; prop < propcount; prop++) { hr = IPropertyStore_GetAt(store, prop, &pkey); - ok(hr == S_OK, "Failed with %08x\n", hr); + ok(hr == S_OK, "Failed with %08lx\n", hr); if (IsEqualPropertyKey(pkey, DEVPKEY_Device_FriendlyName)) found_name = TRUE; if (IsEqualPropertyKey(pkey, DEVPKEY_Device_DeviceDesc)) @@ -137,7 +137,7 @@ static void test_setvalue_on_wow64(IPropertyStore *store) pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, &PKEY_AudioEndpoint_GUID, &pv); - ok(hr == S_OK, "Failed to get Endpoint GUID: %08x\n", hr); + ok(hr == S_OK, "Failed to get Endpoint GUID: %08lx\n", hr); guidW = pv.pwszVal; @@ -145,7 +145,7 @@ static void test_setvalue_on_wow64(IPropertyStore *store) pv.ulVal = 0xAB; hr = IPropertyStore_SetValue(store, &PKEY_Bogus, &pv); - ok(hr == S_OK || hr == E_ACCESSDENIED, "SetValue failed: %08x\n", hr); + ok(hr == S_OK || hr == E_ACCESSDENIED, "SetValue failed: %08lx\n", hr); if (hr != S_OK) { win_skip("Missing permission to write to registry\n"); @@ -155,25 +155,25 @@ static void test_setvalue_on_wow64(IPropertyStore *store) pv.ulVal = 0x00; hr = IPropertyStore_GetValue(store, &PKEY_Bogus, &pv); - ok(hr == S_OK, "GetValue failed: %08x\n", hr); - ok(pv.ulVal == 0xAB, "Got wrong value: 0x%x\n", pv.ulVal); + ok(hr == S_OK, "GetValue failed: %08lx\n", hr); + ok(pv.ulVal == 0xAB, "Got wrong value: 0x%lx\n", pv.ulVal); /* should find the key in 64-bit view */ ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, software_renderW, 0, KEY_READ|KEY_WOW64_64KEY, &root); - ok(ret == ERROR_SUCCESS, "Couldn't open mmdevices Render key: %u\n", ret); + ok(ret == ERROR_SUCCESS, "Couldn't open mmdevices Render key: %lu\n", ret); ret = RegOpenKeyExW(root, guidW, 0, KEY_READ|KEY_WOW64_64KEY, &devkey); - ok(ret == ERROR_SUCCESS, "Couldn't open mmdevice guid key: %u\n", ret); + ok(ret == ERROR_SUCCESS, "Couldn't open mmdevice guid key: %lu\n", ret); ret = RegOpenKeyExW(devkey, L"Properties", 0, KEY_READ|KEY_WOW64_64KEY, &props); - ok(ret == ERROR_SUCCESS, "Couldn't open mmdevice property key: %u\n", ret); + ok(ret == ERROR_SUCCESS, "Couldn't open mmdevice property key: %lu\n", ret); /* Note: the registry key exists even without calling IPropStore::Commit */ size = sizeof(regval); ret = RegQueryValueExW(props, bogusW, NULL, &type, (LPBYTE)®val, &size); - ok(ret == ERROR_SUCCESS, "Couldn't get bogus propertykey value: %u\n", ret); - ok(type == REG_DWORD, "Got wrong value type: %u\n", type); - ok(regval == 0xAB, "Got wrong value: 0x%x\n", regval); + ok(ret == ERROR_SUCCESS, "Couldn't get bogus propertykey value: %lu\n", ret); + ok(type == REG_DWORD, "Got wrong value type: %lu\n", type); + ok(regval == 0xAB, "Got wrong value: 0x%lx\n", regval); RegCloseKey(props); RegCloseKey(devkey); @@ -183,7 +183,7 @@ static void test_setvalue_on_wow64(IPropertyStore *store) /* should NOT find the key in 32-bit view */ ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, software_renderW, 0, KEY_READ, &root); - ok(ret == ERROR_FILE_NOT_FOUND, "Wrong error when opening mmdevices Render key: %u\n", ret); + ok(ret == ERROR_FILE_NOT_FOUND, "Wrong error when opening mmdevices Render key: %lu\n", ret); } START_TEST(propstore) @@ -204,39 +204,39 @@ START_TEST(propstore) hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&mme); if (FAILED(hr)) { - skip("mmdevapi not available: 0x%08x\n", hr); + skip("mmdevapi not available: 0x%08lx\n", hr); goto cleanup; } hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(mme, eRender, eMultimedia, &dev); - ok(hr == S_OK || hr == E_NOTFOUND, "GetDefaultAudioEndpoint failed: 0x%08x\n", hr); + ok(hr == S_OK || hr == E_NOTFOUND, "GetDefaultAudioEndpoint failed: 0x%08lx\n", hr); if (hr != S_OK) { if (hr == E_NOTFOUND) skip("No sound card available\n"); else - skip("GetDefaultAudioEndpoint returns 0x%08x\n", hr); + skip("GetDefaultAudioEndpoint returns 0x%08lx\n", hr); goto cleanup; } store = NULL; hr = IMMDevice_OpenPropertyStore(dev, 3, &store); - ok(hr == E_INVALIDARG, "Wrong hr returned: %08x\n", hr); + ok(hr == E_INVALIDARG, "Wrong hr returned: %08lx\n", hr); if (hr != S_OK) /* It seems on windows returning with E_INVALIDARG doesn't * set store to NULL, so just don't set store to non-null * before calling this function */ - ok(!store, "Store set to non-NULL on failure: %p/%08x\n", store, hr); + ok(!store, "Store set to non-NULL on failure: %p/%08lx\n", store, hr); else if (store) IPropertyStore_Release(store); hr = IMMDevice_OpenPropertyStore(dev, STGM_READ, NULL); - ok(hr == E_POINTER, "Wrong hr returned: %08x\n", hr); + ok(hr == E_POINTER, "Wrong hr returned: %08lx\n", hr); store = NULL; hr = IMMDevice_OpenPropertyStore(dev, STGM_READWRITE, &store); if(hr == E_ACCESSDENIED) hr = IMMDevice_OpenPropertyStore(dev, STGM_READ, &store); - ok(hr == S_OK, "Opening valid store returned %08x\n", hr); + ok(hr == S_OK, "Opening valid store returned %08lx\n", hr); if (store) { test_propertystore(store); diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 6b77edc569e..4e19b91c5f5 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -104,28 +104,28 @@ static void test_uninitialized(IAudioClient *ac) IUnknown *unk; hr = IAudioClient_GetBufferSize(ac, &num); - ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized GetBufferSize call returns %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized GetBufferSize call returns %08lx\n", hr); hr = IAudioClient_GetStreamLatency(ac, &t1); - ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized GetStreamLatency call returns %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized GetStreamLatency call returns %08lx\n", hr); hr = IAudioClient_GetCurrentPadding(ac, &num); - ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized GetCurrentPadding call returns %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized GetCurrentPadding call returns %08lx\n", hr); hr = IAudioClient_Start(ac); - ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized Start call returns %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized Start call returns %08lx\n", hr); hr = IAudioClient_Stop(ac); - ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized Stop call returns %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized Stop call returns %08lx\n", hr); hr = IAudioClient_Reset(ac); - ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized Reset call returns %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized Reset call returns %08lx\n", hr); hr = IAudioClient_SetEventHandle(ac, handle); - ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized SetEventHandle call returns %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized SetEventHandle call returns %08lx\n", hr); hr = IAudioClient_GetService(ac, &IID_IAudioStreamVolume, (void**)&unk); - ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized GetService call returns %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized GetService call returns %08lx\n", hr); CloseHandle(handle); } @@ -148,7 +148,7 @@ static void test_audioclient(void) NULL, (void**)&ac3); ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* win8 */, - "IAudioClient3 Activation failed with %08x\n", hr); + "IAudioClient3 Activation failed with %08lx\n", hr); if(hr == S_OK) IAudioClient3_Release(ac3); @@ -156,62 +156,62 @@ static void test_audioclient(void) NULL, (void**)&ac2); ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* win7 */, - "IAudioClient2 Activation failed with %08x\n", hr); + "IAudioClient2 Activation failed with %08lx\n", hr); if(hr == S_OK) IAudioClient2_Release(ac2); hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return; handle = CreateEventW(NULL, FALSE, FALSE, NULL); hr = IAudioClient_QueryInterface(ac, &IID_IUnknown, NULL); - ok(hr == E_POINTER, "QueryInterface(NULL) returned %08x\n", hr); + ok(hr == E_POINTER, "QueryInterface(NULL) returned %08lx\n", hr); unk = (void*)(LONG_PTR)0x12345678; hr = IAudioClient_QueryInterface(ac, &IID_NULL, (void**)&unk); - ok(hr == E_NOINTERFACE, "QueryInterface(IID_NULL) returned %08x\n", hr); + ok(hr == E_NOINTERFACE, "QueryInterface(IID_NULL) returned %08lx\n", hr); ok(!unk, "QueryInterface(IID_NULL) returned non-null pointer %p\n", unk); hr = IAudioClient_QueryInterface(ac, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface(IID_IUnknown) returned %08x\n", hr); + ok(hr == S_OK, "QueryInterface(IID_IUnknown) returned %08lx\n", hr); if (unk) { ref = IUnknown_Release(unk); - ok(ref == 1, "Released count is %u\n", ref); + ok(ref == 1, "Released count is %lu\n", ref); } hr = IAudioClient_QueryInterface(ac, &IID_IAudioClient, (void**)&unk); - ok(hr == S_OK, "QueryInterface(IID_IAudioClient) returned %08x\n", hr); + ok(hr == S_OK, "QueryInterface(IID_IAudioClient) returned %08lx\n", hr); if (unk) { ref = IUnknown_Release(unk); - ok(ref == 1, "Released count is %u\n", ref); + ok(ref == 1, "Released count is %lu\n", ref); } hr = IAudioClient_GetDevicePeriod(ac, NULL, NULL); - ok(hr == E_POINTER, "Invalid GetDevicePeriod call returns %08x\n", hr); + ok(hr == E_POINTER, "Invalid GetDevicePeriod call returns %08lx\n", hr); hr = IAudioClient_GetDevicePeriod(ac, &t1, NULL); - ok(hr == S_OK, "Valid GetDevicePeriod call returns %08x\n", hr); + ok(hr == S_OK, "Valid GetDevicePeriod call returns %08lx\n", hr); hr = IAudioClient_GetDevicePeriod(ac, NULL, &t2); - ok(hr == S_OK, "Valid GetDevicePeriod call returns %08x\n", hr); + ok(hr == S_OK, "Valid GetDevicePeriod call returns %08lx\n", hr); hr = IAudioClient_GetDevicePeriod(ac, &t1, &t2); - ok(hr == S_OK, "Valid GetDevicePeriod call returns %08x\n", hr); + ok(hr == S_OK, "Valid GetDevicePeriod call returns %08lx\n", hr); trace("Returned periods: %u.%04u ms %u.%04u ms\n", (UINT)(t1/10000), (UINT)(t1 % 10000), (UINT)(t2/10000), (UINT)(t2 % 10000)); hr = IAudioClient_GetMixFormat(ac, NULL); - ok(hr == E_POINTER, "GetMixFormat returns %08x\n", hr); + ok(hr == E_POINTER, "GetMixFormat returns %08lx\n", hr); hr = IAudioClient_GetMixFormat(ac, &pwfx); - ok(hr == S_OK, "Valid GetMixFormat returns %08x\n", hr); + ok(hr == S_OK, "Valid GetMixFormat returns %08lx\n", hr); if (hr == S_OK) { @@ -219,7 +219,7 @@ static void test_audioclient(void) trace("Tag: %04x\n", pwfx->wFormatTag); trace("bits: %u\n", pwfx->wBitsPerSample); trace("chan: %u\n", pwfx->nChannels); - trace("rate: %u\n", pwfx->nSamplesPerSec); + trace("rate: %lu\n", pwfx->nSamplesPerSec); trace("align: %u\n", pwfx->nBlockAlign); trace("extra: %u\n", pwfx->cbSize); ok(pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE, "wFormatTag is %x\n", pwfx->wFormatTag); @@ -227,7 +227,7 @@ static void test_audioclient(void) { WAVEFORMATEXTENSIBLE *pwfxe = (void*)pwfx; trace("Res: %u\n", pwfxe->Samples.wReserved); - trace("Mask: %x\n", pwfxe->dwChannelMask); + trace("Mask: %lx\n", pwfxe->dwChannelMask); trace("Alg: %s\n", IsEqualGUID(&pwfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM)?"PCM": (IsEqualGUID(&pwfxe->SubFormat, @@ -237,30 +237,30 @@ static void test_audioclient(void) pwfxe->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &pwfx2); - ok(hr == S_OK, "Valid IsFormatSupported(Shared) call returns %08x\n", hr); + ok(hr == S_OK, "Valid IsFormatSupported(Shared) call returns %08lx\n", hr); ok(pwfx2 == NULL, "pwfx2 is non-null\n"); CoTaskMemFree(pwfx2); } hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &pwfx2); - ok(hr == S_OK, "Valid IsFormatSupported(Shared) call returns %08x\n", hr); + ok(hr == S_OK, "Valid IsFormatSupported(Shared) call returns %08lx\n", hr); ok(pwfx2 == NULL, "pwfx2 is non-null\n"); CoTaskMemFree(pwfx2); hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, NULL, NULL); - ok(hr == E_POINTER, "IsFormatSupported(NULL) call returns %08x\n", hr); + ok(hr == E_POINTER, "IsFormatSupported(NULL) call returns %08lx\n", hr); hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, NULL); - ok(hr == E_POINTER, "IsFormatSupported(Shared,NULL) call returns %08x\n", hr); + ok(hr == E_POINTER, "IsFormatSupported(Shared,NULL) call returns %08lx\n", hr); hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_EXCLUSIVE, pwfx, NULL); ok(hr == S_OK || hr == AUDCLNT_E_UNSUPPORTED_FORMAT || hr == AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED, - "IsFormatSupported(Exclusive) call returns %08x\n", hr); + "IsFormatSupported(Exclusive) call returns %08lx\n", hr); hexcl = hr; pwfx2 = (WAVEFORMATEX*)0xDEADF00D; hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_EXCLUSIVE, pwfx, &pwfx2); - ok(hr == hexcl, "IsFormatSupported(Exclusive) call returns %08x\n", hr); + ok(hr == hexcl, "IsFormatSupported(Exclusive) call returns %08lx\n", hr); ok(pwfx2 == NULL, "pwfx2 non-null on exclusive IsFormatSupported\n"); if (hexcl != AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED) @@ -269,20 +269,20 @@ static void test_audioclient(void) hr = IAudioClient_IsFormatSupported(ac, 0xffffffff, pwfx, NULL); ok(hr == E_INVALIDARG/*w32*/ || broken(hr == AUDCLNT_E_UNSUPPORTED_FORMAT/*w64 response from exclusive mode driver */), - "IsFormatSupported(0xffffffff) call returns %08x\n", hr); + "IsFormatSupported(0xffffffff) call returns %08lx\n", hr); } hr = IAudioClient_QueryInterface(ac, &IID_IAudioClient2, (void**)&ac2); if (hr == S_OK) { hr = IAudioClient2_IsOffloadCapable(ac2, AudioCategory_BackgroundCapableMedia, NULL); - ok(hr == E_INVALIDARG, "IsOffloadCapable gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "IsOffloadCapable gave wrong error: %08lx\n", hr); hr = IAudioClient2_IsOffloadCapable(ac2, AudioCategory_BackgroundCapableMedia, &offload_capable); - ok(hr == S_OK, "IsOffloadCapable failed: %08x\n", hr); + ok(hr == S_OK, "IsOffloadCapable failed: %08lx\n", hr); hr = IAudioClient2_SetClientProperties(ac2, NULL); - ok(hr == E_POINTER, "SetClientProperties with NULL props gave wrong error: %08x\n", hr); + ok(hr == E_POINTER, "SetClientProperties with NULL props gave wrong error: %08lx\n", hr); /* invalid cbSize */ client_props.cbSize = 0; @@ -291,7 +291,7 @@ static void test_audioclient(void) client_props.Options = 0; hr = IAudioClient2_SetClientProperties(ac2, &client_props); - ok(hr == E_INVALIDARG, "SetClientProperties with invalid cbSize gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetClientProperties with invalid cbSize gave wrong error: %08lx\n", hr); /* offload consistency */ client_props.cbSize = sizeof(client_props) - sizeof(client_props.Options); @@ -299,21 +299,21 @@ static void test_audioclient(void) hr = IAudioClient2_SetClientProperties(ac2, &client_props); if(!offload_capable) - ok(hr == AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE, "SetClientProperties(offload) gave wrong error: %08x\n", hr); + ok(hr == AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE, "SetClientProperties(offload) gave wrong error: %08lx\n", hr); else - ok(hr == S_OK, "SetClientProperties(offload) failed: %08x\n", hr); + ok(hr == S_OK, "SetClientProperties(offload) failed: %08lx\n", hr); /* disable offload */ client_props.bIsOffload = FALSE; hr = IAudioClient2_SetClientProperties(ac2, &client_props); - ok(hr == S_OK, "SetClientProperties failed: %08x\n", hr); + ok(hr == S_OK, "SetClientProperties failed: %08lx\n", hr); /* Options field added in Win 8.1 */ client_props.cbSize = sizeof(client_props); hr = IAudioClient2_SetClientProperties(ac2, &client_props); ok(hr == S_OK || broken(hr == E_INVALIDARG) /* <= win8 */, - "SetClientProperties failed: %08x\n", hr); + "SetClientProperties failed: %08lx\n", hr); IAudioClient2_Release(ac2); } @@ -323,7 +323,7 @@ static void test_audioclient(void) hr = IAudioClient_QueryInterface(ac, &IID_IAudioClient3, (void**)&ac3); ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* win8 */, - "Failed to query IAudioClient3 interface: %08x\n", hr); + "Failed to query IAudioClient3 interface: %08lx\n", hr); if(hr == S_OK) IAudioClient3_Release(ac3); @@ -332,42 +332,42 @@ static void test_audioclient(void) hr = IAudioClient_Initialize(ac, 3, 0, 5000000, 0, pwfx, NULL); ok(broken(hr == AUDCLNT_E_NOT_INITIALIZED) || /* <= win8 */ - hr == E_INVALIDARG, "Initialize with invalid sharemode returns %08x\n", hr); + hr == E_INVALIDARG, "Initialize with invalid sharemode returns %08lx\n", hr); hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0xffffffff, 5000000, 0, pwfx, NULL); ok(hr == E_INVALIDARG || - hr == AUDCLNT_E_INVALID_STREAM_FLAG, "Initialize with invalid flags returns %08x\n", hr); + hr == AUDCLNT_E_INVALID_STREAM_FLAG, "Initialize with invalid flags returns %08lx\n", hr); /* A period != 0 is ignored and the call succeeds. * Since we can only initialize successfully once, skip those tests. */ hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, NULL, NULL); - ok(hr == E_POINTER, "Initialize with null format returns %08x\n", hr); + ok(hr == E_POINTER, "Initialize with null format returns %08lx\n", hr); hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 0, 0, pwfx, NULL); - ok(hr == S_OK, "Initialize with 0 buffer size returns %08x\n", hr); + ok(hr == S_OK, "Initialize with 0 buffer size returns %08lx\n", hr); if(hr == S_OK){ UINT32 num; hr = IAudioClient_GetBufferSize(ac, &num); - ok(hr == S_OK, "GetBufferSize from duration 0 returns %08x\n", hr); + ok(hr == S_OK, "GetBufferSize from duration 0 returns %08lx\n", hr); if(hr == S_OK) trace("Initialize(duration=0) GetBufferSize is %u\n", num); } hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); - ok(hr == AUDCLNT_E_ALREADY_INITIALIZED, "Calling Initialize twice returns %08x\n", hr); + ok(hr == AUDCLNT_E_ALREADY_INITIALIZED, "Calling Initialize twice returns %08lx\n", hr); hr = IAudioClient_Start(ac); ok(hr == S_OK || broken(hr == AUDCLNT_E_DEVICE_INVALIDATED), /* Win10 >= 1607 */ - "Start on a doubly initialized stream returns %08x\n", hr); + "Start on a doubly initialized stream returns %08lx\n", hr); IAudioClient_Release(ac); hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)pwfx; @@ -379,83 +379,83 @@ static void test_audioclient(void) hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); ok(hr == S_OK || - hr == AUDCLNT_E_UNSUPPORTED_FORMAT /* win10 */, "Initialize(dwChannelMask = 0xffff) returns %08x\n", hr); + hr == AUDCLNT_E_UNSUPPORTED_FORMAT /* win10 */, "Initialize(dwChannelMask = 0xffff) returns %08lx\n", hr); IAudioClient_Release(ac); hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); fmtex->dwChannelMask = 0; hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &fmt2); ok(hr == S_OK || broken(hr == S_FALSE /* w7 Realtek HDA */), - "IsFormatSupported(dwChannelMask = 0) call returns %08x\n", hr); + "IsFormatSupported(dwChannelMask = 0) call returns %08lx\n", hr); ok(fmtex->dwChannelMask == 0, "Passed format was modified\n"); CoTaskMemFree(fmt2); hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); - ok(hr == S_OK, "Initialize(dwChannelMask = 0) returns %08x\n", hr); + ok(hr == S_OK, "Initialize(dwChannelMask = 0) returns %08lx\n", hr); IAudioClient_Release(ac); hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); CoTaskMemFree(pwfx); hr = IAudioClient_GetMixFormat(ac, &pwfx); - ok(hr == S_OK, "Valid GetMixFormat returns %08x\n", hr); + ok(hr == S_OK, "Valid GetMixFormat returns %08lx\n", hr); }else skip("Skipping dwChannelMask tests\n"); hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); - ok(hr == S_OK, "Valid Initialize returns %08x\n", hr); + ok(hr == S_OK, "Valid Initialize returns %08lx\n", hr); if (hr != S_OK) goto cleanup; hr = IAudioClient_GetStreamLatency(ac, NULL); - ok(hr == E_POINTER, "GetStreamLatency(NULL) call returns %08x\n", hr); + ok(hr == E_POINTER, "GetStreamLatency(NULL) call returns %08lx\n", hr); hr = IAudioClient_GetStreamLatency(ac, &t2); - ok(hr == S_OK, "Valid GetStreamLatency call returns %08x\n", hr); + ok(hr == S_OK, "Valid GetStreamLatency call returns %08lx\n", hr); trace("Returned latency: %u.%04u ms\n", (UINT)(t2/10000), (UINT)(t2 % 10000)); ok(t2 >= t1 || broken(t2 >= t1/2 && pwfx->nSamplesPerSec > 48000) || broken(t2 == 0) /* (!) win10 */, - "Latency < default period, delta %dus (%s vs %s)\n", + "Latency < default period, delta %ldus (%s vs %s)\n", (LONG)((t2-t1)/10), wine_dbgstr_longlong(t2), wine_dbgstr_longlong(t1)); /* Native appears to add the engine period to the HW latency in shared mode */ if(t2 == 0) win10 = TRUE; hr = IAudioClient_SetEventHandle(ac, NULL); - ok(hr == E_INVALIDARG, "SetEventHandle(NULL) returns %08x\n", hr); + ok(hr == E_INVALIDARG, "SetEventHandle(NULL) returns %08lx\n", hr); hr = IAudioClient_SetEventHandle(ac, handle); ok(hr == AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED || broken(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME)) || broken(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) /* Some 2k8 */ || broken(hr == HRESULT_FROM_WIN32(ERROR_BAD_PATHNAME)) /* Some Vista */ - , "SetEventHandle returns %08x\n", hr); + , "SetEventHandle returns %08lx\n", hr); hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset on an initialized stream returns %08x\n", hr); + ok(hr == S_OK, "Reset on an initialized stream returns %08lx\n", hr); hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset on an already reset stream returns %08x\n", hr); + ok(hr == S_OK, "Reset on an already reset stream returns %08lx\n", hr); hr = IAudioClient_Stop(ac); - ok(hr == S_FALSE, "Stop on a stopped stream returns %08x\n", hr); + ok(hr == S_FALSE, "Stop on a stopped stream returns %08lx\n", hr); hr = IAudioClient_Start(ac); - ok(hr == S_OK, "Start on a stopped stream returns %08x\n", hr); + ok(hr == S_OK, "Start on a stopped stream returns %08lx\n", hr); hr = IAudioClient_Start(ac); - ok(hr == AUDCLNT_E_NOT_STOPPED, "Start twice returns %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_STOPPED, "Start twice returns %08lx\n", hr); cleanup: IAudioClient_Release(ac); @@ -476,12 +476,12 @@ static void test_formats(AUDCLNT_SHAREMODE mode) for(i = 0; i < ARRAY_SIZE(win_formats); i++) { hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) continue; hr = IAudioClient_GetMixFormat(ac, &pwfx); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr); fmt.nSamplesPerSec = win_formats[i][0]; fmt.wBitsPerSample = win_formats[i][1]; @@ -498,10 +498,10 @@ static void test_formats(AUDCLNT_SHAREMODE mode) /* 5:1 card exception when asked for 1 channel at mixer rate */ pwfx->nChannels > 2 && fmt.nSamplesPerSec == pwfx->nSamplesPerSec) : (hr == AUDCLNT_E_UNSUPPORTED_FORMAT || hr == hexcl)), - "IsFormatSupported(%d, %ux%2ux%u) returns %08x\n", mode, + "IsFormatSupported(%d, %lux%2ux%u) returns %08lx\n", mode, fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr); if (hr == S_OK) - trace("IsSupported(%s, %ux%2ux%u)\n", + trace("IsSupported(%s, %lux%2ux%u)\n", mode == AUDCLNT_SHAREMODE_SHARED ? "shared " : "exclus.", fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels); @@ -511,31 +511,31 @@ static void test_formats(AUDCLNT_SHAREMODE mode) && fmt.nChannels == pwfx->nChannels) ok(hr == S_OK, "Varying BitsPerSample %u\n", fmt.wBitsPerSample); - ok((hr == S_FALSE)^(pwfx2 == NULL), "hr %x<->suggest %p\n", hr, pwfx2); + ok((hr == S_FALSE)^(pwfx2 == NULL), "hr %lx<->suggest %p\n", hr, pwfx2); if (pwfx2 == (WAVEFORMATEX*)0xDEADF00D) pwfx2 = NULL; /* broken in Wine < 1.3.28 */ if (pwfx2) { ok(pwfx2->nSamplesPerSec == pwfx->nSamplesPerSec && pwfx2->nChannels == pwfx->nChannels && pwfx2->wBitsPerSample == pwfx->wBitsPerSample, - "Suggestion %ux%2ux%u differs from GetMixFormat\n", + "Suggestion %lux%2ux%u differs from GetMixFormat\n", pwfx2->nSamplesPerSec, pwfx2->wBitsPerSample, pwfx2->nChannels); } /* Vista returns E_INVALIDARG upon AUDCLNT_STREAMFLAGS_RATEADJUST */ hr = IAudioClient_Initialize(ac, mode, 0, 5000000, 0, &fmt, NULL); if ((hrs == S_OK) ^ (hr == S_OK)) - trace("Initialize (%s, %ux%2ux%u) returns %08x unlike IsFormatSupported\n", + trace("Initialize (%s, %lux%2ux%u) returns %08lx unlike IsFormatSupported\n", mode == AUDCLNT_SHAREMODE_SHARED ? "shared " : "exclus.", fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr); if (mode == AUDCLNT_SHAREMODE_SHARED) ok(hrs == S_OK ? hr == S_OK : hr == AUDCLNT_E_UNSUPPORTED_FORMAT, - "Initialize(shared, %ux%2ux%u) returns %08x\n", + "Initialize(shared, %lux%2ux%u) returns %08lx\n", fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr); else if (hrs == AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED) /* Unsupported format implies "create failed" and shadows "not allowed" */ ok(hrs == hexcl && (hr == AUDCLNT_E_ENDPOINT_CREATE_FAILED || hr == hrs), - "Initialize(noexcl., %ux%2ux%u) returns %08x(%08x)\n", + "Initialize(noexcl., %lux%2ux%u) returns %08lx(%08lx)\n", fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr, hrs); else /* On testbot 48000x16x1 claims support, but does not Initialize. @@ -546,7 +546,7 @@ static void test_formats(AUDCLNT_SHAREMODE mode) broken(hr == S_OK && ((fmt.nChannels == 1 && fmt.wBitsPerSample == 16) || (fmt.nSamplesPerSec == 12000 || fmt.nSamplesPerSec == 96000))), - "Initialize(exclus., %ux%2ux%u) returns %08x\n", + "Initialize(exclus., %lux%2ux%u) returns %08lx\n", fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr); /* Bug in native (Vista/w2k8/w7): after Initialize failed, better @@ -576,21 +576,21 @@ static void test_references(void) /* IAudioRenderClient */ hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return; hr = IAudioClient_GetMixFormat(ac, &pwfx); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr); hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr); CoTaskMemFree(pwfx); hr = IAudioClient_GetService(ac, &IID_IAudioRenderClient, (void**)&rc); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); if(hr != S_OK) { IAudioClient_Release(ac); return; @@ -598,100 +598,100 @@ static void test_references(void) IAudioRenderClient_AddRef(rc); ref = IAudioRenderClient_Release(rc); - ok(ref != 0, "RenderClient_Release gave wrong refcount: %u\n", ref); + ok(ref != 0, "RenderClient_Release gave wrong refcount: %lu\n", ref); ref = IAudioClient_Release(ac); - ok(ref != 0, "Client_Release gave wrong refcount: %u\n", ref); + ok(ref != 0, "Client_Release gave wrong refcount: %lu\n", ref); ref = IAudioRenderClient_Release(rc); - ok(ref == 0, "RenderClient_Release gave wrong refcount: %u\n", ref); + ok(ref == 0, "RenderClient_Release gave wrong refcount: %lu\n", ref); /* ISimpleAudioVolume */ hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return; hr = IAudioClient_GetMixFormat(ac, &pwfx); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr); hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr); CoTaskMemFree(pwfx); hr = IAudioClient_GetService(ac, &IID_ISimpleAudioVolume, (void**)&sav); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); ISimpleAudioVolume_AddRef(sav); ref = ISimpleAudioVolume_Release(sav); - ok(ref != 0, "SimpleAudioVolume_Release gave wrong refcount: %u\n", ref); + ok(ref != 0, "SimpleAudioVolume_Release gave wrong refcount: %lu\n", ref); ref = IAudioClient_Release(ac); - ok(ref != 0, "Client_Release gave wrong refcount: %u\n", ref); + ok(ref != 0, "Client_Release gave wrong refcount: %lu\n", ref); ref = ISimpleAudioVolume_Release(sav); - ok(ref == 0, "SimpleAudioVolume_Release gave wrong refcount: %u\n", ref); + ok(ref == 0, "SimpleAudioVolume_Release gave wrong refcount: %lu\n", ref); /* IAudioClock */ hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return; hr = IAudioClient_GetMixFormat(ac, &pwfx); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr); hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr); CoTaskMemFree(pwfx); hr = IAudioClient_GetService(ac, &IID_IAudioClock, (void**)&acl); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); IAudioClock_AddRef(acl); ref = IAudioClock_Release(acl); - ok(ref != 0, "AudioClock_Release gave wrong refcount: %u\n", ref); + ok(ref != 0, "AudioClock_Release gave wrong refcount: %lu\n", ref); ref = IAudioClient_Release(ac); - ok(ref != 0, "Client_Release gave wrong refcount: %u\n", ref); + ok(ref != 0, "Client_Release gave wrong refcount: %lu\n", ref); ref = IAudioClock_Release(acl); - ok(ref == 0, "AudioClock_Release gave wrong refcount: %u\n", ref); + ok(ref == 0, "AudioClock_Release gave wrong refcount: %lu\n", ref); /* IAudioStreamVolume */ hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return; hr = IAudioClient_GetMixFormat(ac, &pwfx); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr); hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr); CoTaskMemFree(pwfx); hr = IAudioClient_GetService(ac, &IID_IAudioStreamVolume, (void**)&asv); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); IAudioStreamVolume_AddRef(asv); ref = IAudioStreamVolume_Release(asv); - ok(ref != 0, "AudioStreamVolume_Release gave wrong refcount: %u\n", ref); + ok(ref != 0, "AudioStreamVolume_Release gave wrong refcount: %lu\n", ref); ref = IAudioClient_Release(ac); - ok(ref != 0, "Client_Release gave wrong refcount: %u\n", ref); + ok(ref != 0, "Client_Release gave wrong refcount: %lu\n", ref); ref = IAudioStreamVolume_Release(asv); - ok(ref == 0, "AudioStreamVolume_Release gave wrong refcount: %u\n", ref); + ok(ref == 0, "AudioStreamVolume_Release gave wrong refcount: %lu\n", ref); } static void test_event(void) @@ -704,17 +704,17 @@ static void test_event(void) hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return; hr = IAudioClient_GetMixFormat(ac, &pwfx); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr); hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_EVENTCALLBACK, 5000000, 0, pwfx, NULL); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr); CoTaskMemFree(pwfx); @@ -723,50 +723,50 @@ static void test_event(void) hr = IAudioClient_Start(ac); ok(hr == AUDCLNT_E_EVENTHANDLE_NOT_SET || - hr == D3D11_ERROR_4E /* win10 */, "Start failed: %08x\n", hr); + hr == D3D11_ERROR_4E /* win10 */, "Start failed: %08lx\n", hr); hr = IAudioClient_SetEventHandle(ac, event); - ok(hr == S_OK, "SetEventHandle failed: %08x\n", hr); + ok(hr == S_OK, "SetEventHandle failed: %08lx\n", hr); hr = IAudioClient_SetEventHandle(ac, event); ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME) || - hr == E_UNEXPECTED /* win10 */, "SetEventHandle returns %08x\n", hr); + hr == E_UNEXPECTED /* win10 */, "SetEventHandle returns %08lx\n", hr); r = WaitForSingleObject(event, 40); - ok(r == WAIT_TIMEOUT, "Wait(event) before Start gave %x\n", r); + ok(r == WAIT_TIMEOUT, "Wait(event) before Start gave %lx\n", r); hr = IAudioClient_Start(ac); - ok(hr == S_OK, "Start failed: %08x\n", hr); + ok(hr == S_OK, "Start failed: %08lx\n", hr); r = WaitForSingleObject(event, 20); - ok(r == WAIT_OBJECT_0, "Wait(event) after Start gave %x\n", r); + ok(r == WAIT_OBJECT_0, "Wait(event) after Start gave %lx\n", r); hr = IAudioClient_Stop(ac); - ok(hr == S_OK, "Stop failed: %08x\n", hr); + ok(hr == S_OK, "Stop failed: %08lx\n", hr); ok(ResetEvent(event), "ResetEvent\n"); /* Still receiving events! */ r = WaitForSingleObject(event, 20); - ok(r == WAIT_OBJECT_0, "Wait(event) after Stop gave %x\n", r); + ok(r == WAIT_OBJECT_0, "Wait(event) after Stop gave %lx\n", r); hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset failed: %08x\n", hr); + ok(hr == S_OK, "Reset failed: %08lx\n", hr); ok(ResetEvent(event), "ResetEvent\n"); r = WaitForSingleObject(event, 120); - ok(r == WAIT_OBJECT_0, "Wait(event) after Reset gave %x\n", r); + ok(r == WAIT_OBJECT_0, "Wait(event) after Reset gave %lx\n", r); hr = IAudioClient_SetEventHandle(ac, NULL); - ok(hr == E_INVALIDARG, "SetEventHandle(NULL) returns %08x\n", hr); + ok(hr == E_INVALIDARG, "SetEventHandle(NULL) returns %08lx\n", hr); r = WaitForSingleObject(event, 70); - ok(r == WAIT_OBJECT_0, "Wait(NULL event) gave %x\n", r); + ok(r == WAIT_OBJECT_0, "Wait(NULL event) gave %lx\n", r); /* test releasing a playing stream */ hr = IAudioClient_Start(ac); - ok(hr == S_OK, "Start failed: %08x\n", hr); + ok(hr == S_OK, "Start failed: %08lx\n", hr); IAudioClient_Release(ac); CloseHandle(event); @@ -784,18 +784,18 @@ static void test_padding(void) hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return; hr = IAudioClient_GetMixFormat(ac, &pwfx); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr); if(hr != S_OK) return; hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr); if(hr != S_OK) return; @@ -810,25 +810,25 @@ static void test_padding(void) * e.g. 10.1587ms is 28 * 16 = 448 frames at 44100 with HDA. * 441 observed with Vista, 448 with w7 on the same HW! */ hr = IAudioClient_GetDevicePeriod(ac, &defp, &minp); - ok(hr == S_OK, "GetDevicePeriod failed: %08x\n", hr); + ok(hr == S_OK, "GetDevicePeriod failed: %08lx\n", hr); /* some wineXYZ.drv use 20ms, not seen on native */ ok(defp == 100000 || broken(defp == 101587) || defp == 200000, - "Expected 10ms default period: %u\n", (ULONG)defp); + "Expected 10ms default period: %lu\n", (ULONG)defp); ok(minp != 0, "Minimum period is 0\n"); ok(minp <= defp, "Minimum period is greater than default period\n"); hr = IAudioClient_GetService(ac, &IID_IAudioRenderClient, (void**)&arc); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); psize = MulDiv(defp, pwfx->nSamplesPerSec, 10000000) * 10; written = 0; hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding failed: %08lx\n", hr); ok(pad == written, "GetCurrentPadding returned %u, should be %u\n", pad, written); hr = IAudioRenderClient_GetBuffer(arc, psize, &buf); - ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); + ok(hr == S_OK, "GetBuffer failed: %08lx\n", hr); ok(buf != NULL, "NULL buffer returned\n"); if(!win10){ /* win10 appears not to clear the buffer */ @@ -841,35 +841,35 @@ static void test_padding(void) } hr = IAudioRenderClient_GetBuffer(arc, 0, &buf); - ok(hr == AUDCLNT_E_OUT_OF_ORDER, "GetBuffer 0 size failed: %08x\n", hr); + ok(hr == AUDCLNT_E_OUT_OF_ORDER, "GetBuffer 0 size failed: %08lx\n", hr); ok(buf == NULL, "GetBuffer 0 gave %p\n", buf); /* MSDN instead documents buf remains untouched */ hr = IAudioClient_Reset(ac); - ok(hr == AUDCLNT_E_BUFFER_OPERATION_PENDING, "Reset failed: %08x\n", hr); + ok(hr == AUDCLNT_E_BUFFER_OPERATION_PENDING, "Reset failed: %08lx\n", hr); hr = IAudioRenderClient_ReleaseBuffer(arc, psize, AUDCLNT_BUFFERFLAGS_SILENT); - ok(hr == S_OK, "ReleaseBuffer failed: %08x\n", hr); + ok(hr == S_OK, "ReleaseBuffer failed: %08lx\n", hr); if(hr == S_OK) written += psize; hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding failed: %08lx\n", hr); ok(pad == written, "GetCurrentPadding returned %u, should be %u\n", pad, written); psize = MulDiv(minp, pwfx->nSamplesPerSec, 10000000) * 10; hr = IAudioRenderClient_GetBuffer(arc, psize, &buf); - ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); + ok(hr == S_OK, "GetBuffer failed: %08lx\n", hr); ok(buf != NULL, "NULL buffer returned\n"); hr = IAudioRenderClient_ReleaseBuffer(arc, psize, AUDCLNT_BUFFERFLAGS_SILENT); - ok(hr == S_OK, "ReleaseBuffer failed: %08x\n", hr); + ok(hr == S_OK, "ReleaseBuffer failed: %08lx\n", hr); written += psize; hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding failed: %08lx\n", hr); ok(pad == written, "GetCurrentPadding returned %u, should be %u\n", pad, written); /* overfull buffer. requested 1/2s buffer size, so try @@ -877,65 +877,65 @@ static void test_padding(void) psize = pwfx->nSamplesPerSec / 2; buf = (void*)0xDEADF00D; hr = IAudioRenderClient_GetBuffer(arc, psize, &buf); - ok(hr == AUDCLNT_E_BUFFER_TOO_LARGE, "GetBuffer gave wrong error: %08x\n", hr); + ok(hr == AUDCLNT_E_BUFFER_TOO_LARGE, "GetBuffer gave wrong error: %08lx\n", hr); ok(buf == NULL, "NULL expected %p\n", buf); hr = IAudioRenderClient_ReleaseBuffer(arc, psize, 0); - ok(hr == AUDCLNT_E_OUT_OF_ORDER, "ReleaseBuffer gave wrong error: %08x\n", hr); + ok(hr == AUDCLNT_E_OUT_OF_ORDER, "ReleaseBuffer gave wrong error: %08lx\n", hr); psize = MulDiv(minp, pwfx->nSamplesPerSec, 10000000) * 2; hr = IAudioRenderClient_GetBuffer(arc, psize, &buf); - ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); + ok(hr == S_OK, "GetBuffer failed: %08lx\n", hr); ok(buf != NULL, "NULL buffer returned\n"); hr = IAudioRenderClient_ReleaseBuffer(arc, 0, 0); - ok(hr == S_OK, "ReleaseBuffer 0 gave wrong error: %08x\n", hr); + ok(hr == S_OK, "ReleaseBuffer 0 gave wrong error: %08lx\n", hr); buf = (void*)0xDEADF00D; hr = IAudioRenderClient_GetBuffer(arc, 0, &buf); - ok(hr == S_OK, "GetBuffer 0 size failed: %08x\n", hr); + ok(hr == S_OK, "GetBuffer 0 size failed: %08lx\n", hr); ok(buf == NULL, "GetBuffer 0 gave %p\n", buf); /* MSDN instead documents buf remains untouched */ buf = (void*)0xDEADF00D; hr = IAudioRenderClient_GetBuffer(arc, 0, &buf); - ok(hr == S_OK, "GetBuffer 0 size #2 failed: %08x\n", hr); + ok(hr == S_OK, "GetBuffer 0 size #2 failed: %08lx\n", hr); ok(buf == NULL, "GetBuffer 0 #2 gave %p\n", buf); hr = IAudioRenderClient_ReleaseBuffer(arc, psize, 0); - ok(hr == AUDCLNT_E_OUT_OF_ORDER, "ReleaseBuffer not size 0 gave %08x\n", hr); + ok(hr == AUDCLNT_E_OUT_OF_ORDER, "ReleaseBuffer not size 0 gave %08lx\n", hr); hr = IAudioRenderClient_GetBuffer(arc, psize, &buf); - ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); + ok(hr == S_OK, "GetBuffer failed: %08lx\n", hr); ok(buf != NULL, "NULL buffer returned\n"); hr = IAudioRenderClient_ReleaseBuffer(arc, 0, 0); - ok(hr == S_OK, "ReleaseBuffer 0 gave wrong error: %08x\n", hr); + ok(hr == S_OK, "ReleaseBuffer 0 gave wrong error: %08lx\n", hr); hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding failed: %08lx\n", hr); ok(pad == written, "GetCurrentPadding returned %u, should be %u\n", pad, written); hr = IAudioRenderClient_GetBuffer(arc, psize, &buf); - ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); + ok(hr == S_OK, "GetBuffer failed: %08lx\n", hr); ok(buf != NULL, "NULL buffer returned\n"); hr = IAudioRenderClient_ReleaseBuffer(arc, psize+1, AUDCLNT_BUFFERFLAGS_SILENT); - ok(hr == AUDCLNT_E_INVALID_SIZE, "ReleaseBuffer too large error: %08x\n", hr); + ok(hr == AUDCLNT_E_INVALID_SIZE, "ReleaseBuffer too large error: %08lx\n", hr); /* todo_wine means Wine may overwrite memory */ if(hr == S_OK) written += psize+1; /* Buffer still hold */ hr = IAudioRenderClient_ReleaseBuffer(arc, psize/2, AUDCLNT_BUFFERFLAGS_SILENT); - ok(hr == S_OK, "ReleaseBuffer after error: %08x\n", hr); + ok(hr == S_OK, "ReleaseBuffer after error: %08lx\n", hr); if(hr == S_OK) written += psize/2; hr = IAudioRenderClient_ReleaseBuffer(arc, 0, 0); - ok(hr == S_OK, "ReleaseBuffer 0 gave wrong error: %08x\n", hr); + ok(hr == S_OK, "ReleaseBuffer 0 gave wrong error: %08lx\n", hr); hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding failed: %08lx\n", hr); ok(pad == written, "GetCurrentPadding returned %u, should be %u\n", pad, written); CoTaskMemFree(pwfx); @@ -963,18 +963,18 @@ static void test_clock(int share) hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return; hr = IAudioClient_GetMixFormat(ac, &pwfx); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr); if(hr != S_OK) return; hr = IAudioClient_GetDevicePeriod(ac, &defp, &minp); - ok(hr == S_OK, "GetDevicePeriod failed: %08x\n", hr); - ok(minp <= period, "desired period %u too small for %u\n", (ULONG)period, (ULONG)minp); + ok(hr == S_OK, "GetDevicePeriod failed: %08lx\n", hr); + ok(minp <= period, "desired period %lu too small for %lu\n", (ULONG)period, (ULONG)minp); if (share) { trace("Testing shared mode\n"); @@ -989,12 +989,12 @@ static void test_clock(int share) pwfx->wBitsPerSample = 16; /* no floating point */ pwfx->nBlockAlign = pwfx->nChannels * pwfx->wBitsPerSample / 8; pwfx->nAvgBytesPerSec = pwfx->nSamplesPerSec * pwfx->nBlockAlign; - trace("Testing exclusive mode at %u\n", pwfx->nSamplesPerSec); + trace("Testing exclusive mode at %lu\n", pwfx->nSamplesPerSec); hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_EXCLUSIVE, 0, duration, period, pwfx, NULL); } - ok(share ? hr == S_OK : hr == hexcl || hr == AUDCLNT_E_DEVICE_IN_USE, "Initialize failed: %08x\n", hr); + ok(share ? hr == S_OK : hr == hexcl || hr == AUDCLNT_E_DEVICE_IN_USE, "Initialize failed: %08lx\n", hr); if (hr != S_OK) { CoTaskMemFree(pwfx); IAudioClient_Release(ac); @@ -1008,7 +1008,7 @@ static void test_clock(int share) * Exclusive mode: testbot returns 2x period + a little, but * some HDA drivers return 1x period, some + a little. */ hr = IAudioClient_GetStreamLatency(ac, &t2); - ok(hr == S_OK, "GetStreamLatency failed: %08x\n", hr); + ok(hr == S_OK, "GetStreamLatency failed: %08lx\n", hr); trace("Latency: %u.%04u ms\n", (UINT)(t2/10000), (UINT)(t2 % 10000)); ok(t2 >= period || broken(t2 >= period/2 && share && pwfx->nSamplesPerSec > 48000) || broken(t2 == 0) /* win10 */, @@ -1024,7 +1024,7 @@ static void test_clock(int share) * is either the rounded period or a fixed constant like 1024, * whatever the driver implements. */ hr = IAudioClient_GetBufferSize(ac, &gbsize); - ok(hr == S_OK, "GetBufferSize failed: %08x\n", hr); + ok(hr == S_OK, "GetBufferSize failed: %08lx\n", hr); bufsize = MulDiv(duration, pwfx->nSamplesPerSec, 10000000); fragment = MulDiv(period, pwfx->nSamplesPerSec, 10000000); @@ -1035,10 +1035,10 @@ static void test_clock(int share) * but it is rounded down modulo fragment ! */ if (share) ok(gbsize == bufsize, - "BufferSize %u at rate %u\n", gbsize, pwfx->nSamplesPerSec); + "BufferSize %u at rate %lu\n", gbsize, pwfx->nSamplesPerSec); else ok(gbsize == parts * fragment || gbsize == MulDiv(bufsize, 1, 1024) * 1024, - "BufferSize %u misfits fragment size %u at rate %u\n", gbsize, fragment, pwfx->nSamplesPerSec); + "BufferSize %u misfits fragment size %u at rate %lu\n", gbsize, fragment, pwfx->nSamplesPerSec); /* In shared mode, GetCurrentPadding decreases in multiples of * fragment size (i.e. updated only at period ticks), whereas @@ -1049,10 +1049,10 @@ static void test_clock(int share) * GetCurrentPadding = GetPosition - frames held in mmdevapi */ hr = IAudioClient_GetService(ac, &IID_IAudioClock, (void**)&acl); - ok(hr == S_OK, "GetService(IAudioClock) failed: %08x\n", hr); + ok(hr == S_OK, "GetService(IAudioClock) failed: %08lx\n", hr); hr = IAudioClock_GetFrequency(acl, &freq); - ok(hr == S_OK, "GetFrequency failed: %08x\n", hr); + ok(hr == S_OK, "GetFrequency failed: %08lx\n", hr); trace("Clock Frequency %u\n", (UINT)freq); /* MSDN says it's arbitrary units, but shared mode is unlikely to change */ @@ -1064,74 +1064,74 @@ static void test_clock(int share) "Clock Frequency %u\n", (UINT)freq); hr = IAudioClock_GetPosition(acl, NULL, NULL); - ok(hr == E_POINTER, "GetPosition wrong error: %08x\n", hr); + ok(hr == E_POINTER, "GetPosition wrong error: %08lx\n", hr); pcpos0 = 0; hr = IAudioClock_GetPosition(acl, &pos, &pcpos0); - ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(hr == S_OK, "GetPosition failed: %08lx\n", hr); ok(pos == 0, "GetPosition returned non-zero pos before being started\n"); ok(pcpos0 != 0, "GetPosition returned zero pcpos\n"); hr = IAudioClient_GetService(ac, &IID_IAudioRenderClient, (void**)&arc); - ok(hr == S_OK, "GetService(IAudioRenderClient) failed: %08x\n", hr); + ok(hr == S_OK, "GetService(IAudioRenderClient) failed: %08lx\n", hr); hr = IAudioRenderClient_GetBuffer(arc, gbsize+1, &data); - ok(hr == AUDCLNT_E_BUFFER_TOO_LARGE, "GetBuffer too large failed: %08x\n", hr); + ok(hr == AUDCLNT_E_BUFFER_TOO_LARGE, "GetBuffer too large failed: %08lx\n", hr); avail = gbsize; data = NULL; hr = IAudioRenderClient_GetBuffer(arc, avail, &data); - ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); + ok(hr == S_OK, "GetBuffer failed: %08lx\n", hr); trace("data at %p\n", data); hr = IAudioRenderClient_ReleaseBuffer(arc, avail, winetest_debug>2 ? wave_generate_tone(pwfx, data, avail) : AUDCLNT_BUFFERFLAGS_SILENT); - ok(hr == S_OK, "ReleaseBuffer failed: %08x\n", hr); + ok(hr == S_OK, "ReleaseBuffer failed: %08lx\n", hr); if(hr == S_OK) sum += avail; hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding failed: %08lx\n", hr); ok(pad == sum, "padding %u prior to start\n", pad); hr = IAudioClock_GetPosition(acl, &pos, NULL); - ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(hr == S_OK, "GetPosition failed: %08lx\n", hr); ok(pos == 0, "GetPosition returned non-zero pos before being started\n"); hr = IAudioClient_Start(ac); /* #1 */ - ok(hr == S_OK, "Start failed: %08x\n", hr); + ok(hr == S_OK, "Start failed: %08lx\n", hr); Sleep(100); slept += 100; hr = IAudioClient_GetStreamLatency(ac, &t1); - ok(hr == S_OK, "GetStreamLatency failed: %08x\n", hr); + ok(hr == S_OK, "GetStreamLatency failed: %08lx\n", hr); ok(t1 == t2, "Latency not constant, delta %ld\n", (long)(t1-t2)); hr = IAudioClock_GetPosition(acl, &pos, NULL); - ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(hr == S_OK, "GetPosition failed: %08lx\n", hr); ok(pos > 0, "Position %u vs. last %u\n", (UINT)pos,0); /* in rare cases is slept*1.1 not enough with dmix */ ok(pos*1000/freq <= slept*1.4, "Position %u too far after playing %ums\n", (UINT)pos, slept); last = pos; hr = IAudioClient_Stop(ac); - ok(hr == S_OK, "Stop failed: %08x\n", hr); + ok(hr == S_OK, "Stop failed: %08lx\n", hr); hr = IAudioClock_GetPosition(acl, &pos, NULL); - ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(hr == S_OK, "GetPosition failed: %08lx\n", hr); ok(pos >= last, "Position %u vs. last %u\n", (UINT)pos,(UINT)last); last = pos; if(/*share &&*/ winetest_debug>1) ok(pos*1000/freq <= slept*1.1, "Position %u too far after stop %ums\n", (UINT)pos, slept); hr = IAudioClient_Start(ac); /* #2 */ - ok(hr == S_OK, "Start failed: %08x\n", hr); + ok(hr == S_OK, "Start failed: %08lx\n", hr); Sleep(100); slept += 100; hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding failed: %08lx\n", hr); trace("padding %u past sleep #2\n", pad); /** IAudioClient_Stop @@ -1144,13 +1144,13 @@ static void test_clock(int share) * padding 0 and bumping pos to sum minus 17 frames! */ hr = IAudioClient_Stop(ac); - ok(hr == S_OK, "Stop failed: %08x\n", hr); + ok(hr == S_OK, "Stop failed: %08lx\n", hr); hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding failed: %08lx\n", hr); hr = IAudioClock_GetPosition(acl, &pos, NULL); - ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(hr == S_OK, "GetPosition failed: %08lx\n", hr); trace("padding %u position %u past stop #2\n", pad, (UINT)pos); ok(pos * pwfx->nSamplesPerSec <= sum * freq, "Position %u > written %u\n", (UINT)pos, sum); /* Prove that Stop must not drop frames (in shared mode). */ @@ -1166,49 +1166,49 @@ static void test_clock(int share) Sleep(100); hr = IAudioClock_GetPosition(acl, &pos, NULL); - ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(hr == S_OK, "GetPosition failed: %08lx\n", hr); ok(pos == last, "Position %u should stop.\n", (UINT)pos); /* Restart from 0 */ hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset failed: %08x\n", hr); + ok(hr == S_OK, "Reset failed: %08lx\n", hr); slept = sum = 0; hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset on an already reset stream returns %08x\n", hr); + ok(hr == S_OK, "Reset on an already reset stream returns %08lx\n", hr); hr = IAudioClock_GetPosition(acl, &pos, &pcpos); - ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(hr == S_OK, "GetPosition failed: %08lx\n", hr); ok(pos == 0, "GetPosition returned non-zero pos after Reset\n"); ok(pcpos > pcpos0, "pcpos should increase\n"); avail = gbsize; /* implies GetCurrentPadding == 0 */ hr = IAudioRenderClient_GetBuffer(arc, avail, &data); - ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); + ok(hr == S_OK, "GetBuffer failed: %08lx\n", hr); trace("data at %p\n", data); hr = IAudioRenderClient_ReleaseBuffer(arc, avail, winetest_debug>2 ? wave_generate_tone(pwfx, data, avail) : AUDCLNT_BUFFERFLAGS_SILENT); - ok(hr == S_OK, "ReleaseBuffer failed: %08x\n", hr); + ok(hr == S_OK, "ReleaseBuffer failed: %08lx\n", hr); if(hr == S_OK) sum += avail; hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding failed: %08lx\n", hr); ok(pad == sum, "padding %u prior to start\n", pad); hr = IAudioClock_GetPosition(acl, &pos, NULL); - ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(hr == S_OK, "GetPosition failed: %08lx\n", hr); ok(pos == 0, "GetPosition returned non-zero pos after Reset\n"); last = pos; hr = IAudioClient_Start(ac); /* #3 */ - ok(hr == S_OK, "Start failed: %08x\n", hr); + ok(hr == S_OK, "Start failed: %08lx\n", hr); Sleep(100); slept += 100; hr = IAudioClock_GetPosition(acl, &pos, NULL); - ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(hr == S_OK, "GetPosition failed: %08lx\n", hr); trace("position %u past %ums sleep #3\n", (UINT)pos, slept); ok(pos > last, "Position %u vs. last %u\n", (UINT)pos,(UINT)last); ok(pos * pwfx->nSamplesPerSec <= sum * freq, "Position %u > written %u\n", (UINT)pos, sum); @@ -1219,16 +1219,16 @@ static void test_clock(int share) last = pos; hr = IAudioClient_Reset(ac); - ok(hr == AUDCLNT_E_NOT_STOPPED, "Reset while playing: %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_STOPPED, "Reset while playing: %08lx\n", hr); hr = IAudioClient_Stop(ac); - ok(hr == S_OK, "Stop failed: %08x\n", hr); + ok(hr == S_OK, "Stop failed: %08lx\n", hr); hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding failed: %08lx\n", hr); hr = IAudioClock_GetPosition(acl, &pos, &pcpos); - ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(hr == S_OK, "GetPosition failed: %08lx\n", hr); trace("padding %u position %u past stop #3\n", pad, (UINT)pos); ok(pos >= last, "Position %u vs. last %u\n", (UINT)pos,(UINT)last); ok(pcpos > pcpos0, "pcpos should increase\n"); @@ -1242,42 +1242,42 @@ static void test_clock(int share) /* Begin the big loop */ hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset failed: %08x\n", hr); + ok(hr == S_OK, "Reset failed: %08lx\n", hr); slept = last = sum = 0; pcpos0 = pcpos; ok(QueryPerformanceCounter(&hpctime0), "PerfCounter unavailable\n"); hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset on an already reset stream returns %08x\n", hr); + ok(hr == S_OK, "Reset on an already reset stream returns %08lx\n", hr); hr = IAudioClient_Start(ac); - ok(hr == S_OK, "Start failed: %08x\n", hr); + ok(hr == S_OK, "Start failed: %08lx\n", hr); avail = pwfx->nSamplesPerSec * 15 / 16 / 2; data = NULL; hr = IAudioRenderClient_GetBuffer(arc, avail, &data); - ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); + ok(hr == S_OK, "GetBuffer failed: %08lx\n", hr); trace("data at %p for prefill %u\n", data, avail); if (winetest_debug>2) { hr = IAudioClient_Stop(ac); - ok(hr == S_OK, "Stop failed: %08x\n", hr); + ok(hr == S_OK, "Stop failed: %08lx\n", hr); Sleep(20); slept += 20; hr = IAudioClient_Reset(ac); - ok(hr == AUDCLNT_E_BUFFER_OPERATION_PENDING, "Reset failed: %08x\n", hr); + ok(hr == AUDCLNT_E_BUFFER_OPERATION_PENDING, "Reset failed: %08lx\n", hr); hr = IAudioClient_Start(ac); - ok(hr == S_OK, "Start failed: %08x\n", hr); + ok(hr == S_OK, "Start failed: %08lx\n", hr); } /* Despite passed time, data must still point to valid memory... */ hr = IAudioRenderClient_ReleaseBuffer(arc, avail, wave_generate_tone(pwfx, data, avail)); - ok(hr == S_OK, "ReleaseBuffer after stop+start failed: %08x\n", hr); + ok(hr == S_OK, "ReleaseBuffer after stop+start failed: %08lx\n", hr); if(hr == S_OK) sum += avail; /* GetCurrentPadding(GCP) == 0 does not mean an underrun happened, as the @@ -1290,11 +1290,11 @@ static void test_clock(int share) Sleep(350); slept += 350; ok(QueryPerformanceCounter(&hpctime), "PerfCounter failed\n"); - trace("hpctime %u after %ums\n", + trace("hpctime %lu after %ums\n", (ULONG)((hpctime.QuadPart-hpctime0.QuadPart)*1000/hpcfreq.QuadPart), slept); hr = IAudioClock_GetPosition(acl, &pos, &pcpos); - ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(hr == S_OK, "GetPosition failed: %08lx\n", hr); ok(pos > last, "Position %u vs. last %u\n", (UINT)pos,(UINT)last); last = pos; @@ -1303,13 +1303,13 @@ static void test_clock(int share) slept += 100; hr = IAudioClock_GetPosition(acl, &pos, &pcpos); - ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(hr == S_OK, "GetPosition failed: %08lx\n", hr); hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding failed: %08lx\n", hr); ok(QueryPerformanceCounter(&hpctime), "PerfCounter failed\n"); - trace("hpctime %u pcpos %u\n", + trace("hpctime %lu pcpos %lu\n", (ULONG)((hpctime.QuadPart-hpctime0.QuadPart)*1000/hpcfreq.QuadPart), (ULONG)((pcpos-pcpos0)/10000)); @@ -1328,7 +1328,7 @@ static void test_clock(int share) last = pos; hr = IAudioClient_GetStreamLatency(ac, &t1); - ok(hr == S_OK, "GetStreamLatency failed: %08x\n", hr); + ok(hr == S_OK, "GetStreamLatency failed: %08lx\n", hr); ok(t1 == t2, "Latency not constant, delta %ld\n", (long)(t1-t2)); avail = pwfx->nSamplesPerSec * 15 / 16 / 2; @@ -1336,7 +1336,7 @@ static void test_clock(int share) hr = IAudioRenderClient_GetBuffer(arc, avail, &data); /* ok(hr == AUDCLNT_E_BUFFER_TOO_LARGE || (hr == S_OK && i==0) without todo_wine */ ok(hr == S_OK || hr == AUDCLNT_E_BUFFER_TOO_LARGE, - "GetBuffer large (%u) failed: %08x\n", avail, hr); + "GetBuffer large (%u) failed: %08lx\n", avail, hr); if(hr == S_OK && i) ok(FALSE, "GetBuffer large (%u) at iteration %d\n", avail, i); /* Only the first iteration should allow that large a buffer * as prefill was drained during the first 350+100ms sleep. @@ -1347,7 +1347,7 @@ static void test_clock(int share) } else { avail = gbsize - pad; hr = IAudioRenderClient_GetBuffer(arc, avail, &data); - ok(hr == S_OK, "GetBuffer small %u failed: %08x\n", avail, hr); + ok(hr == S_OK, "GetBuffer small %u failed: %08lx\n", avail, hr); trace("data at %p (small %u)\n", data, avail); } ok(data != NULL, "NULL buffer returned\n"); @@ -1358,21 +1358,21 @@ static void test_clock(int share) hr = IAudioRenderClient_ReleaseBuffer(arc, avail, wave_generate_tone(pwfx, data, avail)); } - ok(hr == S_OK, "ReleaseBuffer failed: %08x\n", hr); + ok(hr == S_OK, "ReleaseBuffer failed: %08lx\n", hr); if(hr == S_OK) sum += avail; } hr = IAudioClock_GetPosition(acl, &pos, NULL); - ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(hr == S_OK, "GetPosition failed: %08lx\n", hr); trace("position %u\n", (UINT)pos); Sleep(1000); /* 500ms buffer underrun past full buffer */ hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding failed: %08lx\n", hr); hr = IAudioClock_GetPosition(acl, &pos, NULL); - ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(hr == S_OK, "GetPosition failed: %08lx\n", hr); trace("position %u past underrun, %u padding left, %u frames written\n", (UINT)pos, pad, sum); if (share) { @@ -1391,14 +1391,14 @@ static void test_clock(int share) } hr = IAudioClient_GetStreamLatency(ac, &t1); - ok(hr == S_OK, "GetStreamLatency failed: %08x\n", hr); + ok(hr == S_OK, "GetStreamLatency failed: %08lx\n", hr); ok(t1 == t2, "Latency not constant, delta %ld\n", (long)(t1-t2)); ok(QueryPerformanceCounter(&hpctime), "PerfCounter failed\n"); - trace("hpctime %u after underrun\n", (ULONG)((hpctime.QuadPart-hpctime0.QuadPart)*1000/hpcfreq.QuadPart)); + trace("hpctime %lu after underrun\n", (ULONG)((hpctime.QuadPart-hpctime0.QuadPart)*1000/hpcfreq.QuadPart)); hr = IAudioClient_Stop(ac); - ok(hr == S_OK, "Stop failed: %08x\n", hr); + ok(hr == S_OK, "Stop failed: %08lx\n", hr); CoTaskMemFree(pwfx); @@ -1419,184 +1419,184 @@ static void test_session(void) HRESULT hr; hr = CoCreateGuid(&ses1_guid); - ok(hr == S_OK, "CoCreateGuid failed: %08x\n", hr); + ok(hr == S_OK, "CoCreateGuid failed: %08lx\n", hr); hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ses1_ac1); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if (FAILED(hr)) return; hr = IAudioClient_GetMixFormat(ses1_ac1, &pwfx); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr); hr = IAudioClient_Initialize(ses1_ac1, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, &ses1_guid); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr); if(hr == S_OK){ hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ses1_ac2); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); } if(hr != S_OK){ skip("Unable to open the same device twice. Skipping session tests\n"); ref = IAudioClient_Release(ses1_ac1); - ok(ref == 0, "AudioClient wasn't released: %u\n", ref); + ok(ref == 0, "AudioClient wasn't released: %lu\n", ref); CoTaskMemFree(pwfx); return; } hr = IAudioClient_Initialize(ses1_ac2, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, &ses1_guid); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr); hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(mme, eCapture, eMultimedia, &cap_dev); if(hr == S_OK){ hr = IMMDevice_Activate(cap_dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&cap_ac); - ok((hr == S_OK)^(cap_ac == NULL), "Activate %08x &out pointer\n", hr); - ok(hr == S_OK, "Activate failed: %08x\n", hr); + ok((hr == S_OK)^(cap_ac == NULL), "Activate %08lx &out pointer\n", hr); + ok(hr == S_OK, "Activate failed: %08lx\n", hr); IMMDevice_Release(cap_dev); } if(hr == S_OK){ WAVEFORMATEX *cap_pwfx; hr = IAudioClient_GetMixFormat(cap_ac, &cap_pwfx); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr); hr = IAudioClient_Initialize(cap_ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, cap_pwfx, &ses1_guid); - ok(hr == S_OK, "Initialize failed for capture in rendering session: %08x\n", hr); + ok(hr == S_OK, "Initialize failed for capture in rendering session: %08lx\n", hr); CoTaskMemFree(cap_pwfx); } if(hr == S_OK){ hr = IAudioClient_GetService(cap_ac, &IID_IAudioSessionControl, (void**)&cap_ctl); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); if(FAILED(hr)) cap_ctl = NULL; }else - skip("No capture session: %08x; skipping capture device in render session tests\n", hr); + skip("No capture session: %08lx; skipping capture device in render session tests\n", hr); hr = IAudioClient_GetService(ses1_ac1, &IID_IAudioSessionControl2, (void**)&ses1_ctl); - ok(hr == E_NOINTERFACE, "GetService gave wrong error: %08x\n", hr); + ok(hr == E_NOINTERFACE, "GetService gave wrong error: %08lx\n", hr); hr = IAudioClient_GetService(ses1_ac1, &IID_IAudioSessionControl, (void**)&ses1_ctl); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); hr = IAudioClient_GetService(ses1_ac1, &IID_IAudioSessionControl, (void**)&ses1_ctl2); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); ok(ses1_ctl == ses1_ctl2, "Got different controls: %p %p\n", ses1_ctl, ses1_ctl2); ref = IAudioSessionControl2_Release(ses1_ctl2); ok(ref != 0, "AudioSessionControl was destroyed\n"); hr = IAudioClient_GetService(ses1_ac2, &IID_IAudioSessionControl, (void**)&ses1_ctl2); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); hr = IAudioSessionControl2_GetState(ses1_ctl, NULL); - ok(hr == NULL_PTR_ERR, "GetState gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "GetState gave wrong error: %08lx\n", hr); hr = IAudioSessionControl2_GetState(ses1_ctl, &state); - ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(hr == S_OK, "GetState failed: %08lx\n", hr); ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); hr = IAudioSessionControl2_GetState(ses1_ctl2, &state); - ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(hr == S_OK, "GetState failed: %08lx\n", hr); ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); if(cap_ctl){ hr = IAudioSessionControl2_GetState(cap_ctl, &state); - ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(hr == S_OK, "GetState failed: %08lx\n", hr); ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); } hr = IAudioClient_Start(ses1_ac1); - ok(hr == S_OK, "Start failed: %08x\n", hr); + ok(hr == S_OK, "Start failed: %08lx\n", hr); hr = IAudioSessionControl2_GetState(ses1_ctl, &state); - ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(hr == S_OK, "GetState failed: %08lx\n", hr); ok(state == AudioSessionStateActive, "Got wrong state: %d\n", state); hr = IAudioSessionControl2_GetState(ses1_ctl2, &state); - ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(hr == S_OK, "GetState failed: %08lx\n", hr); ok(state == AudioSessionStateActive, "Got wrong state: %d\n", state); if(cap_ctl){ hr = IAudioSessionControl2_GetState(cap_ctl, &state); - ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(hr == S_OK, "GetState failed: %08lx\n", hr); ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); } hr = IAudioClient_Stop(ses1_ac1); - ok(hr == S_OK, "Start failed: %08x\n", hr); + ok(hr == S_OK, "Start failed: %08lx\n", hr); hr = IAudioSessionControl2_GetState(ses1_ctl, &state); - ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(hr == S_OK, "GetState failed: %08lx\n", hr); ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); hr = IAudioSessionControl2_GetState(ses1_ctl2, &state); - ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(hr == S_OK, "GetState failed: %08lx\n", hr); ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); if(cap_ctl){ hr = IAudioSessionControl2_GetState(cap_ctl, &state); - ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(hr == S_OK, "GetState failed: %08lx\n", hr); ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); hr = IAudioClient_Start(cap_ac); - ok(hr == S_OK, "Start failed: %08x\n", hr); + ok(hr == S_OK, "Start failed: %08lx\n", hr); hr = IAudioSessionControl2_GetState(ses1_ctl, &state); - ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(hr == S_OK, "GetState failed: %08lx\n", hr); ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); hr = IAudioSessionControl2_GetState(ses1_ctl2, &state); - ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(hr == S_OK, "GetState failed: %08lx\n", hr); ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); hr = IAudioSessionControl2_GetState(cap_ctl, &state); - ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(hr == S_OK, "GetState failed: %08lx\n", hr); ok(state == AudioSessionStateActive, "Got wrong state: %d\n", state); hr = IAudioClient_Stop(cap_ac); - ok(hr == S_OK, "Stop failed: %08x\n", hr); + ok(hr == S_OK, "Stop failed: %08lx\n", hr); hr = IAudioSessionControl2_GetState(ses1_ctl, &state); - ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(hr == S_OK, "GetState failed: %08lx\n", hr); ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); hr = IAudioSessionControl2_GetState(ses1_ctl2, &state); - ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(hr == S_OK, "GetState failed: %08lx\n", hr); ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); hr = IAudioSessionControl2_GetState(cap_ctl, &state); - ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(hr == S_OK, "GetState failed: %08lx\n", hr); ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); ref = IAudioSessionControl2_Release(cap_ctl); - ok(ref == 0, "AudioSessionControl wasn't released: %u\n", ref); + ok(ref == 0, "AudioSessionControl wasn't released: %lu\n", ref); ref = IAudioClient_Release(cap_ac); - ok(ref == 0, "AudioClient wasn't released: %u\n", ref); + ok(ref == 0, "AudioClient wasn't released: %lu\n", ref); } ref = IAudioSessionControl2_Release(ses1_ctl); - ok(ref == 0, "AudioSessionControl wasn't released: %u\n", ref); + ok(ref == 0, "AudioSessionControl wasn't released: %lu\n", ref); ref = IAudioClient_Release(ses1_ac1); - ok(ref == 0, "AudioClient wasn't released: %u\n", ref); + ok(ref == 0, "AudioClient wasn't released: %lu\n", ref); ref = IAudioClient_Release(ses1_ac2); - ok(ref == 1, "AudioClient had wrong refcount: %u\n", ref); + ok(ref == 1, "AudioClient had wrong refcount: %lu\n", ref); /* we've released all of our IAudioClient references, so check GetState */ hr = IAudioSessionControl2_GetState(ses1_ctl2, &state); - ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(hr == S_OK, "GetState failed: %08lx\n", hr); ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); ref = IAudioSessionControl2_Release(ses1_ctl2); - ok(ref == 0, "AudioSessionControl wasn't released: %u\n", ref); + ok(ref == 0, "AudioSessionControl wasn't released: %lu\n", ref); CoTaskMemFree(pwfx); } @@ -1612,20 +1612,20 @@ static void test_streamvolume(void) hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return; hr = IAudioClient_GetMixFormat(ac, &fmt); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr); hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, fmt, NULL); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr); if(hr == S_OK){ hr = IAudioClient_GetService(ac, &IID_IAudioStreamVolume, (void**)&asv); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); } if(hr != S_OK){ IAudioClient_Release(ac); @@ -1634,70 +1634,70 @@ static void test_streamvolume(void) } hr = IAudioStreamVolume_GetChannelCount(asv, NULL); - ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08x\n", hr); + ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08lx\n", hr); hr = IAudioStreamVolume_GetChannelCount(asv, &chans); - ok(hr == S_OK, "GetChannelCount failed: %08x\n", hr); + ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(chans == fmt->nChannels, "GetChannelCount gave wrong number of channels: %d\n", chans); hr = IAudioStreamVolume_GetChannelVolume(asv, fmt->nChannels, NULL); - ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08x\n", hr); + ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08lx\n", hr); hr = IAudioStreamVolume_GetChannelVolume(asv, fmt->nChannels, &vol); - ok(hr == E_INVALIDARG, "GetChannelCount gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "GetChannelCount gave wrong error: %08lx\n", hr); hr = IAudioStreamVolume_GetChannelVolume(asv, 0, NULL); - ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08x\n", hr); + ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08lx\n", hr); hr = IAudioStreamVolume_GetChannelVolume(asv, 0, &vol); - ok(hr == S_OK, "GetChannelCount failed: %08x\n", hr); + ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(vol == 1.f, "Channel volume was not 1: %f\n", vol); hr = IAudioStreamVolume_SetChannelVolume(asv, fmt->nChannels, -1.f); - ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08lx\n", hr); hr = IAudioStreamVolume_SetChannelVolume(asv, 0, -1.f); - ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08lx\n", hr); hr = IAudioStreamVolume_SetChannelVolume(asv, 0, 2.f); - ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08lx\n", hr); hr = IAudioStreamVolume_SetChannelVolume(asv, 0, 0.2f); - ok(hr == S_OK, "SetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "SetChannelVolume failed: %08lx\n", hr); hr = IAudioStreamVolume_GetChannelVolume(asv, 0, &vol); - ok(hr == S_OK, "GetChannelCount failed: %08x\n", hr); + ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(fabsf(vol - 0.2f) < 0.05f, "Channel volume wasn't 0.2: %f\n", vol); hr = IAudioStreamVolume_GetAllVolumes(asv, 0, NULL); - ok(hr == E_POINTER, "GetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == E_POINTER, "GetAllVolumes gave wrong error: %08lx\n", hr); hr = IAudioStreamVolume_GetAllVolumes(asv, fmt->nChannels, NULL); - ok(hr == E_POINTER, "GetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == E_POINTER, "GetAllVolumes gave wrong error: %08lx\n", hr); vols = HeapAlloc(GetProcessHeap(), 0, fmt->nChannels * sizeof(float)); ok(vols != NULL, "HeapAlloc failed\n"); hr = IAudioStreamVolume_GetAllVolumes(asv, fmt->nChannels - 1, vols); - ok(hr == E_INVALIDARG, "GetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "GetAllVolumes gave wrong error: %08lx\n", hr); hr = IAudioStreamVolume_GetAllVolumes(asv, fmt->nChannels, vols); - ok(hr == S_OK, "GetAllVolumes failed: %08x\n", hr); + ok(hr == S_OK, "GetAllVolumes failed: %08lx\n", hr); ok(fabsf(vols[0] - 0.2f) < 0.05f, "Channel 0 volume wasn't 0.2: %f\n", vol); for(i = 1; i < fmt->nChannels; ++i) ok(vols[i] == 1.f, "Channel %d volume is not 1: %f\n", i, vols[i]); hr = IAudioStreamVolume_SetAllVolumes(asv, 0, NULL); - ok(hr == E_POINTER, "SetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == E_POINTER, "SetAllVolumes gave wrong error: %08lx\n", hr); hr = IAudioStreamVolume_SetAllVolumes(asv, fmt->nChannels, NULL); - ok(hr == E_POINTER, "SetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == E_POINTER, "SetAllVolumes gave wrong error: %08lx\n", hr); hr = IAudioStreamVolume_SetAllVolumes(asv, fmt->nChannels - 1, vols); - ok(hr == E_INVALIDARG, "SetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetAllVolumes gave wrong error: %08lx\n", hr); hr = IAudioStreamVolume_SetAllVolumes(asv, fmt->nChannels, vols); - ok(hr == S_OK, "SetAllVolumes failed: %08x\n", hr); + ok(hr == S_OK, "SetAllVolumes failed: %08lx\n", hr); HeapFree(GetProcessHeap(), 0, vols); IAudioStreamVolume_Release(asv); @@ -1716,20 +1716,20 @@ static void test_channelvolume(void) hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return; hr = IAudioClient_GetMixFormat(ac, &fmt); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr); hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST, 5000000, 0, fmt, NULL); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr); if(hr == S_OK){ hr = IAudioClient_GetService(ac, &IID_IChannelAudioVolume, (void**)&acv); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); } if(hr != S_OK){ IAudioClient_Release(ac); @@ -1738,73 +1738,73 @@ static void test_channelvolume(void) } hr = IChannelAudioVolume_GetChannelCount(acv, NULL); - ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08lx\n", hr); hr = IChannelAudioVolume_GetChannelCount(acv, &chans); - ok(hr == S_OK, "GetChannelCount failed: %08x\n", hr); + ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(chans == fmt->nChannels, "GetChannelCount gave wrong number of channels: %d\n", chans); hr = IChannelAudioVolume_GetChannelVolume(acv, fmt->nChannels, NULL); - ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08lx\n", hr); hr = IChannelAudioVolume_GetChannelVolume(acv, fmt->nChannels, &vol); - ok(hr == E_INVALIDARG, "GetChannelCount gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "GetChannelCount gave wrong error: %08lx\n", hr); hr = IChannelAudioVolume_GetChannelVolume(acv, 0, NULL); - ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08lx\n", hr); hr = IChannelAudioVolume_GetChannelVolume(acv, 0, &vol); - ok(hr == S_OK, "GetChannelCount failed: %08x\n", hr); + ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(vol == 1.f, "Channel volume was not 1: %f\n", vol); hr = IChannelAudioVolume_SetChannelVolume(acv, fmt->nChannels, -1.f, NULL); - ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08lx\n", hr); hr = IChannelAudioVolume_SetChannelVolume(acv, 0, -1.f, NULL); - ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08lx\n", hr); hr = IChannelAudioVolume_SetChannelVolume(acv, 0, 2.f, NULL); - ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08lx\n", hr); hr = IChannelAudioVolume_SetChannelVolume(acv, 0, 0.2f, NULL); - ok(hr == S_OK, "SetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "SetChannelVolume failed: %08lx\n", hr); hr = IChannelAudioVolume_GetChannelVolume(acv, 0, &vol); - ok(hr == S_OK, "GetChannelCount failed: %08x\n", hr); + ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(fabsf(vol - 0.2f) < 0.05f, "Channel volume wasn't 0.2: %f\n", vol); hr = IChannelAudioVolume_GetAllVolumes(acv, 0, NULL); - ok(hr == NULL_PTR_ERR, "GetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "GetAllVolumes gave wrong error: %08lx\n", hr); hr = IChannelAudioVolume_GetAllVolumes(acv, fmt->nChannels, NULL); - ok(hr == NULL_PTR_ERR, "GetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "GetAllVolumes gave wrong error: %08lx\n", hr); vols = HeapAlloc(GetProcessHeap(), 0, fmt->nChannels * sizeof(float)); ok(vols != NULL, "HeapAlloc failed\n"); hr = IChannelAudioVolume_GetAllVolumes(acv, fmt->nChannels - 1, vols); - ok(hr == E_INVALIDARG, "GetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "GetAllVolumes gave wrong error: %08lx\n", hr); hr = IChannelAudioVolume_GetAllVolumes(acv, fmt->nChannels, vols); - ok(hr == S_OK, "GetAllVolumes failed: %08x\n", hr); + ok(hr == S_OK, "GetAllVolumes failed: %08lx\n", hr); ok(fabsf(vols[0] - 0.2f) < 0.05f, "Channel 0 volume wasn't 0.2: %f\n", vol); for(i = 1; i < fmt->nChannels; ++i) ok(vols[i] == 1.f, "Channel %d volume is not 1: %f\n", i, vols[i]); hr = IChannelAudioVolume_SetAllVolumes(acv, 0, NULL, NULL); - ok(hr == NULL_PTR_ERR, "SetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "SetAllVolumes gave wrong error: %08lx\n", hr); hr = IChannelAudioVolume_SetAllVolumes(acv, fmt->nChannels, NULL, NULL); - ok(hr == NULL_PTR_ERR, "SetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "SetAllVolumes gave wrong error: %08lx\n", hr); hr = IChannelAudioVolume_SetAllVolumes(acv, fmt->nChannels - 1, vols, NULL); - ok(hr == E_INVALIDARG, "SetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetAllVolumes gave wrong error: %08lx\n", hr); hr = IChannelAudioVolume_SetAllVolumes(acv, fmt->nChannels, vols, NULL); - ok(hr == S_OK, "SetAllVolumes failed: %08x\n", hr); + ok(hr == S_OK, "SetAllVolumes failed: %08lx\n", hr); hr = IChannelAudioVolume_SetChannelVolume(acv, 0, 1.0f, NULL); - ok(hr == S_OK, "SetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "SetChannelVolume failed: %08lx\n", hr); HeapFree(GetProcessHeap(), 0, vols); IChannelAudioVolume_Release(acv); @@ -1823,20 +1823,20 @@ static void test_simplevolume(void) hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return; hr = IAudioClient_GetMixFormat(ac, &fmt); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr); hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST, 5000000, 0, fmt, NULL); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr); if(hr == S_OK){ hr = IAudioClient_GetService(ac, &IID_ISimpleAudioVolume, (void**)&sav); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); } if(hr != S_OK){ IAudioClient_Release(ac); @@ -1845,55 +1845,55 @@ static void test_simplevolume(void) } hr = ISimpleAudioVolume_GetMasterVolume(sav, NULL); - ok(hr == NULL_PTR_ERR, "GetMasterVolume gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "GetMasterVolume gave wrong error: %08lx\n", hr); hr = ISimpleAudioVolume_GetMasterVolume(sav, &vol); - ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "GetMasterVolume failed: %08lx\n", hr); ok(vol == 1.f, "Master volume wasn't 1: %f\n", vol); hr = ISimpleAudioVolume_SetMasterVolume(sav, -1.f, NULL); - ok(hr == E_INVALIDARG, "SetMasterVolume gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetMasterVolume gave wrong error: %08lx\n", hr); hr = ISimpleAudioVolume_SetMasterVolume(sav, 2.f, NULL); - ok(hr == E_INVALIDARG, "SetMasterVolume gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetMasterVolume gave wrong error: %08lx\n", hr); hr = ISimpleAudioVolume_SetMasterVolume(sav, 0.2f, NULL); - ok(hr == S_OK, "SetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "SetMasterVolume failed: %08lx\n", hr); hr = ISimpleAudioVolume_GetMasterVolume(sav, &vol); - ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "GetMasterVolume failed: %08lx\n", hr); ok(fabsf(vol - 0.2f) < 0.05f, "Master volume wasn't 0.2: %f\n", vol); hr = ISimpleAudioVolume_GetMute(sav, NULL); - ok(hr == NULL_PTR_ERR, "GetMute gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "GetMute gave wrong error: %08lx\n", hr); mute = TRUE; hr = ISimpleAudioVolume_GetMute(sav, &mute); - ok(hr == S_OK, "GetMute failed: %08x\n", hr); + ok(hr == S_OK, "GetMute failed: %08lx\n", hr); ok(mute == FALSE, "Session is already muted\n"); hr = ISimpleAudioVolume_SetMute(sav, TRUE, NULL); - ok(hr == S_OK, "SetMute failed: %08x\n", hr); + ok(hr == S_OK, "SetMute failed: %08lx\n", hr); mute = FALSE; hr = ISimpleAudioVolume_GetMute(sav, &mute); - ok(hr == S_OK, "GetMute failed: %08x\n", hr); + ok(hr == S_OK, "GetMute failed: %08lx\n", hr); ok(mute == TRUE, "Session should have been muted\n"); hr = ISimpleAudioVolume_GetMasterVolume(sav, &vol); - ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "GetMasterVolume failed: %08lx\n", hr); ok(fabsf(vol - 0.2f) < 0.05f, "Master volume wasn't 0.2: %f\n", vol); hr = ISimpleAudioVolume_SetMasterVolume(sav, 1.f, NULL); - ok(hr == S_OK, "SetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "SetMasterVolume failed: %08lx\n", hr); mute = FALSE; hr = ISimpleAudioVolume_GetMute(sav, &mute); - ok(hr == S_OK, "GetMute failed: %08x\n", hr); + ok(hr == S_OK, "GetMute failed: %08lx\n", hr); ok(mute == TRUE, "Session should have been muted\n"); hr = ISimpleAudioVolume_SetMute(sav, FALSE, NULL); - ok(hr == S_OK, "SetMute failed: %08x\n", hr); + ok(hr == S_OK, "SetMute failed: %08lx\n", hr); ISimpleAudioVolume_Release(sav); IAudioClient_Release(ac); @@ -1913,24 +1913,24 @@ static void test_volume_dependence(void) UINT32 nch; hr = CoCreateGuid(&session); - ok(hr == S_OK, "CoCreateGuid failed: %08x\n", hr); + ok(hr == S_OK, "CoCreateGuid failed: %08lx\n", hr); hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return; hr = IAudioClient_GetMixFormat(ac, &fmt); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr); hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST, 5000000, 0, fmt, &session); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr); if(hr == S_OK){ hr = IAudioClient_GetService(ac, &IID_ISimpleAudioVolume, (void**)&sav); - ok(hr == S_OK, "GetService (SimpleAudioVolume) failed: %08x\n", hr); + ok(hr == S_OK, "GetService (SimpleAudioVolume) failed: %08lx\n", hr); } if(hr != S_OK){ IAudioClient_Release(ac); @@ -1939,40 +1939,40 @@ static void test_volume_dependence(void) } hr = IAudioClient_GetService(ac, &IID_IChannelAudioVolume, (void**)&cav); - ok(hr == S_OK, "GetService (ChannelAudioVolume) failed: %08x\n", hr); + ok(hr == S_OK, "GetService (ChannelAudioVolume) failed: %08lx\n", hr); hr = IAudioClient_GetService(ac, &IID_IAudioStreamVolume, (void**)&asv); - ok(hr == S_OK, "GetService (AudioStreamVolume) failed: %08x\n", hr); + ok(hr == S_OK, "GetService (AudioStreamVolume) failed: %08lx\n", hr); hr = IAudioStreamVolume_SetChannelVolume(asv, 0, 0.2f); - ok(hr == S_OK, "ASV_SetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "ASV_SetChannelVolume failed: %08lx\n", hr); hr = IChannelAudioVolume_SetChannelVolume(cav, 0, 0.4f, NULL); - ok(hr == S_OK, "CAV_SetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "CAV_SetChannelVolume failed: %08lx\n", hr); hr = ISimpleAudioVolume_SetMasterVolume(sav, 0.6f, NULL); - ok(hr == S_OK, "SAV_SetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "SAV_SetMasterVolume failed: %08lx\n", hr); hr = IAudioStreamVolume_GetChannelVolume(asv, 0, &vol); - ok(hr == S_OK, "ASV_GetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "ASV_GetChannelVolume failed: %08lx\n", hr); ok(fabsf(vol - 0.2f) < 0.05f, "ASV_GetChannelVolume gave wrong volume: %f\n", vol); hr = IChannelAudioVolume_GetChannelVolume(cav, 0, &vol); - ok(hr == S_OK, "CAV_GetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "CAV_GetChannelVolume failed: %08lx\n", hr); ok(fabsf(vol - 0.4f) < 0.05f, "CAV_GetChannelVolume gave wrong volume: %f\n", vol); hr = ISimpleAudioVolume_GetMasterVolume(sav, &vol); - ok(hr == S_OK, "SAV_GetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "SAV_GetMasterVolume failed: %08lx\n", hr); ok(fabsf(vol - 0.6f) < 0.05f, "SAV_GetMasterVolume gave wrong volume: %f\n", vol); hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac2); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr == S_OK){ hr = IAudioClient_Initialize(ac2, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST, 5000000, 0, fmt, &session); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr); if(hr != S_OK) IAudioClient_Release(ac2); } @@ -1982,25 +1982,25 @@ static void test_volume_dependence(void) IAudioStreamVolume *asv2; hr = IAudioClient_GetService(ac2, &IID_IChannelAudioVolume, (void**)&cav2); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); hr = IAudioClient_GetService(ac2, &IID_IAudioStreamVolume, (void**)&asv2); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); hr = IChannelAudioVolume_GetChannelVolume(cav2, 0, &vol); - ok(hr == S_OK, "CAV_GetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "CAV_GetChannelVolume failed: %08lx\n", hr); ok(fabsf(vol - 0.4f) < 0.05f, "CAV_GetChannelVolume gave wrong volume: %f\n", vol); hr = IAudioStreamVolume_GetChannelVolume(asv2, 0, &vol); - ok(hr == S_OK, "ASV_GetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "ASV_GetChannelVolume failed: %08lx\n", hr); ok(vol == 1.f, "ASV_GetChannelVolume gave wrong volume: %f\n", vol); hr = IChannelAudioVolume_GetChannelCount(cav2, &nch); - ok(hr == S_OK, "GetChannelCount failed: %08x\n", hr); + ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(nch == fmt->nChannels, "Got wrong channel count, expected %u: %u\n", fmt->nChannels, nch); hr = IAudioStreamVolume_GetChannelCount(asv2, &nch); - ok(hr == S_OK, "GetChannelCount failed: %08x\n", hr); + ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(nch == fmt->nChannels, "Got wrong channel count, expected %u: %u\n", fmt->nChannels, nch); IAudioStreamVolume_Release(asv2); @@ -2010,10 +2010,10 @@ static void test_volume_dependence(void) skip("Unable to open the same device twice. Skipping session volume control tests\n"); hr = IChannelAudioVolume_SetChannelVolume(cav, 0, 1.f, NULL); - ok(hr == S_OK, "CAV_SetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "CAV_SetChannelVolume failed: %08lx\n", hr); hr = ISimpleAudioVolume_SetMasterVolume(sav, 1.f, NULL); - ok(hr == S_OK, "SAV_SetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "SAV_SetMasterVolume failed: %08lx\n", hr); CoTaskMemFree(fmt); ISimpleAudioVolume_Release(sav); @@ -2037,15 +2037,15 @@ static void test_session_creation(void) hr = IMMDevice_Activate(dev, &IID_IAudioSessionManager, CLSCTX_INPROC_SERVER, NULL, (void**)&sesm); - ok((hr == S_OK)^(sesm == NULL), "Activate %08x &out pointer\n", hr); - ok(hr == S_OK, "Activate failed: %08x\n", hr); + ok((hr == S_OK)^(sesm == NULL), "Activate %08lx &out pointer\n", hr); + ok(hr == S_OK, "Activate failed: %08lx\n", hr); hr = IAudioSessionManager_GetSimpleAudioVolume(sesm, &session_guid, FALSE, &sav); - ok(hr == S_OK, "GetSimpleAudioVolume failed: %08x\n", hr); + ok(hr == S_OK, "GetSimpleAudioVolume failed: %08lx\n", hr); hr = ISimpleAudioVolume_SetMasterVolume(sav, 0.6f, NULL); - ok(hr == S_OK, "SetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "SetMasterVolume failed: %08lx\n", hr); /* Release completely to show session persistence */ ISimpleAudioVolume_Release(sav); @@ -2063,44 +2063,44 @@ static void test_session_creation(void) hr = IMMDevice_Activate(cap_dev, &IID_IAudioSessionManager, CLSCTX_INPROC_SERVER, NULL, (void**)&cap_sesm); - ok((hr == S_OK)^(cap_sesm == NULL), "Activate %08x &out pointer\n", hr); - ok(hr == S_OK, "Activate failed: %08x\n", hr); + ok((hr == S_OK)^(cap_sesm == NULL), "Activate %08lx &out pointer\n", hr); + ok(hr == S_OK, "Activate failed: %08lx\n", hr); hr = IAudioSessionManager_GetSimpleAudioVolume(cap_sesm, &session_guid, FALSE, &cap_sav); - ok(hr == S_OK, "GetSimpleAudioVolume failed: %08x\n", hr); + ok(hr == S_OK, "GetSimpleAudioVolume failed: %08lx\n", hr); vol = 0.5f; hr = ISimpleAudioVolume_GetMasterVolume(cap_sav, &vol); - ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "GetMasterVolume failed: %08lx\n", hr); ISimpleAudioVolume_Release(cap_sav); IAudioSessionManager_Release(cap_sesm); hr = IMMDevice_Activate(cap_dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&cap_ac); - ok(hr == S_OK, "Activate failed: %08x\n", hr); + ok(hr == S_OK, "Activate failed: %08lx\n", hr); IMMDevice_Release(cap_dev); hr = IAudioClient_GetMixFormat(cap_ac, &cap_pwfx); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr); hr = IAudioClient_Initialize(cap_ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, cap_pwfx, &session_guid); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr); CoTaskMemFree(cap_pwfx); if(hr == S_OK){ hr = IAudioClient_GetService(cap_ac, &IID_ISimpleAudioVolume, (void**)&cap_sav); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); } if(hr == S_OK){ vol = 0.5f; hr = ISimpleAudioVolume_GetMasterVolume(cap_sav, &vol); - ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "GetMasterVolume failed: %08lx\n", hr); ISimpleAudioVolume_Release(cap_sav); } @@ -2110,24 +2110,24 @@ static void test_session_creation(void) hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok((hr == S_OK)^(ac == NULL), "Activate %08x &out pointer\n", hr); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok((hr == S_OK)^(ac == NULL), "Activate %08lx &out pointer\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return; hr = IAudioClient_GetMixFormat(ac, &fmt); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr); hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST, 5000000, 0, fmt, &session_guid); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr); hr = IAudioClient_GetService(ac, &IID_ISimpleAudioVolume, (void**)&sav); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); if(hr == S_OK){ vol = 0.5f; hr = ISimpleAudioVolume_GetMasterVolume(sav, &vol); - ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "GetMasterVolume failed: %08lx\n", hr); ok(fabs(vol - 0.6f) < 0.05f, "Got wrong volume: %f\n", vol); ISimpleAudioVolume_Release(sav); @@ -2154,21 +2154,21 @@ static void test_worst_case(void) hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return; hr = IAudioClient_GetMixFormat(ac, &pwfx); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr); hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_EVENTCALLBACK, 500000, 0, pwfx, NULL); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr); if(hr != S_OK) return; hr = IAudioClient_GetDevicePeriod(ac, &defp, NULL); - ok(hr == S_OK, "GetDevicePeriod failed: %08x\n", hr); + ok(hr == S_OK, "GetDevicePeriod failed: %08lx\n", hr); fragment = MulDiv(defp, pwfx->nSamplesPerSec, 10000000); @@ -2176,74 +2176,74 @@ static void test_worst_case(void) ok(event != NULL, "CreateEvent failed\n"); hr = IAudioClient_SetEventHandle(ac, event); - ok(hr == S_OK, "SetEventHandle failed: %08x\n", hr); + ok(hr == S_OK, "SetEventHandle failed: %08lx\n", hr); hr = IAudioClient_GetService(ac, &IID_IAudioRenderClient, (void**)&arc); - ok(hr == S_OK, "GetService(IAudioRenderClient) failed: %08x\n", hr); + ok(hr == S_OK, "GetService(IAudioRenderClient) failed: %08lx\n", hr); hr = IAudioClient_GetService(ac, &IID_IAudioClock, (void**)&acl); - ok(hr == S_OK, "GetService(IAudioClock) failed: %08x\n", hr); + ok(hr == S_OK, "GetService(IAudioClock) failed: %08lx\n", hr); hr = IAudioClock_GetFrequency(acl, &freq); - ok(hr == S_OK, "GetFrequency failed: %08x\n", hr); + ok(hr == S_OK, "GetFrequency failed: %08lx\n", hr); for(j = 0; j <= (winetest_interactive ? 9 : 2); j++){ sum = 0; - trace("Should play %ums continuous tone with fragment size %u.\n", + trace("Should play %lums continuous tone with fragment size %u.\n", (ULONG)(defp/100), fragment); hr = IAudioClock_GetPosition(acl, &pos, &pcpos0); - ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(hr == S_OK, "GetPosition failed: %08lx\n", hr); /* XAudio2 prefills one period, play without it */ if(winetest_debug>2){ hr = IAudioRenderClient_GetBuffer(arc, fragment, &data); - ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); + ok(hr == S_OK, "GetBuffer failed: %08lx\n", hr); hr = IAudioRenderClient_ReleaseBuffer(arc, fragment, AUDCLNT_BUFFERFLAGS_SILENT); - ok(hr == S_OK, "ReleaseBuffer failed: %08x\n", hr); + ok(hr == S_OK, "ReleaseBuffer failed: %08lx\n", hr); if(hr == S_OK) sum += fragment; } hr = IAudioClient_Start(ac); - ok(hr == S_OK, "Start failed: %08x\n", hr); + ok(hr == S_OK, "Start failed: %08lx\n", hr); for(i = 0; i <= 99; i++){ /* 100 x 10ms = 1 second */ r = WaitForSingleObject(event, 60 + defp / 10000); - ok(r == WAIT_OBJECT_0, "Wait iteration %d gave %x\n", i, r); + ok(r == WAIT_OBJECT_0, "Wait iteration %d gave %lx\n", i, r); /* the app has nearly one period time to feed data */ Sleep((i % 10) * defp / 120000); hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding failed: %08lx\n", hr); /* XAudio2 writes only when there's little data left */ if(pad <= fragment){ hr = IAudioRenderClient_GetBuffer(arc, fragment, &data); - ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); + ok(hr == S_OK, "GetBuffer failed: %08lx\n", hr); hr = IAudioRenderClient_ReleaseBuffer(arc, fragment, wave_generate_tone(pwfx, data, fragment)); - ok(hr == S_OK, "ReleaseBuffer failed: %08x\n", hr); + ok(hr == S_OK, "ReleaseBuffer failed: %08lx\n", hr); if(hr == S_OK) sum += fragment; } } hr = IAudioClient_Stop(ac); - ok(hr == S_OK, "Stop failed: %08x\n", hr); + ok(hr == S_OK, "Stop failed: %08lx\n", hr); hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding failed: %08lx\n", hr); hr = IAudioClock_GetPosition(acl, &pos, &pcpos); - ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(hr == S_OK, "GetPosition failed: %08lx\n", hr); Sleep(100); - trace("Released %u=%ux%u -%u frames at %u worth %ums in %ums\n", + trace("Released %u=%ux%u -%u frames at %lu worth %ums in %lums\n", sum, sum/fragment, fragment, pad, pwfx->nSamplesPerSec, MulDiv(sum-pad, 1000, pwfx->nSamplesPerSec), (ULONG)((pcpos-pcpos0)/10000)); @@ -2252,7 +2252,7 @@ static void test_worst_case(void) "Position %u at end vs. %u-%u submitted frames\n", (UINT)pos, sum, pad); hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset failed: %08x\n", hr); + ok(hr == S_OK, "Reset failed: %08lx\n", hr); Sleep(250); } @@ -2274,37 +2274,37 @@ static void test_marshal(void) /* IAudioRenderClient */ hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return; hr = IAudioClient_GetMixFormat(ac, &pwfx); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr); hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr); CoTaskMemFree(pwfx); hr = IAudioClient_GetService(ac, &IID_IAudioRenderClient, (void**)&rc); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); if(hr != S_OK) { IAudioClient_Release(ac); return; } hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); - ok(hr == S_OK, "CreateStreamOnHGlobal failed 0x%08x\n", hr); + ok(hr == S_OK, "CreateStreamOnHGlobal failed 0x%08lx\n", hr); /* marshal IAudioClient */ hr = CoMarshalInterface(pStream, &IID_IAudioClient, (IUnknown*)ac, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); - ok(hr == S_OK, "CoMarshalInterface IAudioClient failed 0x%08x\n", hr); + ok(hr == S_OK, "CoMarshalInterface IAudioClient failed 0x%08lx\n", hr); IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); hr = CoUnmarshalInterface(pStream, &IID_IAudioClient, (void **)&acDest); - ok(hr == S_OK, "CoUnmarshalInterface IAudioClient failed 0x%08x\n", hr); + ok(hr == S_OK, "CoUnmarshalInterface IAudioClient failed 0x%08lx\n", hr); if (hr == S_OK) IAudioClient_Release(acDest); @@ -2312,11 +2312,11 @@ static void test_marshal(void) /* marshal IAudioRenderClient */ hr = CoMarshalInterface(pStream, &IID_IAudioRenderClient, (IUnknown*)rc, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); - ok(hr == S_OK, "CoMarshalInterface IAudioRenderClient failed 0x%08x\n", hr); + ok(hr == S_OK, "CoMarshalInterface IAudioRenderClient failed 0x%08lx\n", hr); IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); hr = CoUnmarshalInterface(pStream, &IID_IAudioRenderClient, (void **)&rcDest); - ok(hr == S_OK, "CoUnmarshalInterface IAudioRenderClient failed 0x%08x\n", hr); + ok(hr == S_OK, "CoUnmarshalInterface IAudioRenderClient failed 0x%08lx\n", hr); if (hr == S_OK) IAudioRenderClient_Release(rcDest); @@ -2337,31 +2337,31 @@ static void test_endpointvolume(void) hr = IMMDevice_Activate(dev, &IID_IAudioEndpointVolume, CLSCTX_INPROC_SERVER, NULL, (void**)&aev); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return; hr = IAudioEndpointVolume_GetVolumeRange(aev, &mindb, NULL, NULL); - ok(hr == E_POINTER, "GetVolumeRange should have failed with E_POINTER: 0x%08x\n", hr); + ok(hr == E_POINTER, "GetVolumeRange should have failed with E_POINTER: 0x%08lx\n", hr); hr = IAudioEndpointVolume_GetVolumeRange(aev, &mindb, &maxdb, &increment); - ok(hr == S_OK, "GetVolumeRange failed: 0x%08x\n", hr); + ok(hr == S_OK, "GetVolumeRange failed: 0x%08lx\n", hr); trace("got range: [%f,%f]/%f\n", mindb, maxdb, increment); hr = IAudioEndpointVolume_SetMasterVolumeLevel(aev, mindb - increment, NULL); - ok(hr == E_INVALIDARG, "SetMasterVolumeLevel failed: 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "SetMasterVolumeLevel failed: 0x%08lx\n", hr); hr = IAudioEndpointVolume_GetMasterVolumeLevel(aev, &volume); - ok(hr == S_OK, "GetMasterVolumeLevel failed: 0x%08x\n", hr); + ok(hr == S_OK, "GetMasterVolumeLevel failed: 0x%08lx\n", hr); hr = IAudioEndpointVolume_SetMasterVolumeLevel(aev, volume, NULL); - ok(hr == S_OK, "SetMasterVolumeLevel failed: 0x%08x\n", hr); + ok(hr == S_OK, "SetMasterVolumeLevel failed: 0x%08lx\n", hr); hr = IAudioEndpointVolume_GetMute(aev, &mute); - ok(hr == S_OK, "GetMute failed: %08x\n", hr); + ok(hr == S_OK, "GetMute failed: %08lx\n", hr); hr = IAudioEndpointVolume_SetMute(aev, mute, NULL); - ok(hr == S_OK || hr == S_FALSE, "SetMute failed: %08x\n", hr); + ok(hr == S_OK || hr == S_FALSE, "SetMute failed: %08lx\n", hr); IAudioEndpointVolume_Release(aev); } @@ -2375,18 +2375,18 @@ START_TEST(render) hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&mme); if (FAILED(hr)) { - skip("mmdevapi not available: 0x%08x\n", hr); + skip("mmdevapi not available: 0x%08lx\n", hr); goto cleanup; } hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(mme, eRender, eMultimedia, &dev); - ok(hr == S_OK || hr == E_NOTFOUND, "GetDefaultAudioEndpoint failed: 0x%08x\n", hr); + ok(hr == S_OK || hr == E_NOTFOUND, "GetDefaultAudioEndpoint failed: 0x%08lx\n", hr); if (hr != S_OK || !dev) { if (hr == E_NOTFOUND) skip("No sound card available\n"); else - skip("GetDefaultAudioEndpoint returns 0x%08x\n", hr); + skip("GetDefaultAudioEndpoint returns 0x%08lx\n", hr); goto cleanup; } diff --git a/dlls/mmdevapi/tests/spatialaudio.c b/dlls/mmdevapi/tests/spatialaudio.c index d9ccc429ce8..2f55b12f68e 100644 --- a/dlls/mmdevapi/tests/spatialaudio.c +++ b/dlls/mmdevapi/tests/spatialaudio.c @@ -46,22 +46,22 @@ static void test_formats(void) WAVEFORMATEX *fmt = NULL; hr = ISpatialAudioClient_GetSupportedAudioObjectFormatEnumerator(sac, &afe); - ok(hr == S_OK, "Getting format enumerator failed: 0x%08x\n", hr); + ok(hr == S_OK, "Getting format enumerator failed: 0x%08lx\n", hr); hr = IAudioFormatEnumerator_GetCount(afe, &format_count); - ok(hr == S_OK, "Getting format count failed: 0x%08x\n", hr); + ok(hr == S_OK, "Getting format count failed: 0x%08lx\n", hr); ok(format_count == 1, "Got wrong format count, expected 1 got %u\n", format_count); hr = IAudioFormatEnumerator_GetFormat(afe, 0, &fmt); - ok(hr == S_OK, "Getting format failed: 0x%08x\n", hr); + ok(hr == S_OK, "Getting format failed: 0x%08lx\n", hr); ok(fmt != NULL, "Expected to get non-NULL format\n"); ok(fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT, "Wrong format, expected WAVE_FORMAT_IEEE_FLOAT got %hx\n", fmt->wFormatTag); ok(fmt->nChannels == 1, "Wrong number of channels, expected 1 got %hu\n", fmt->nChannels); - ok(fmt->nSamplesPerSec == 48000, "Wrong sample ret, expected 48000 got %u\n", fmt->nSamplesPerSec); + ok(fmt->nSamplesPerSec == 48000, "Wrong sample ret, expected 48000 got %lu\n", fmt->nSamplesPerSec); ok(fmt->wBitsPerSample == 32, "Wrong bits per sample, expected 32 got %hu\n", fmt->wBitsPerSample); ok(fmt->nBlockAlign == 4, "Wrong block align, expected 4 got %hu\n", fmt->nBlockAlign); - ok(fmt->nAvgBytesPerSec == 192000, "Wrong avg bytes per sec, expected 192000 got %u\n", fmt->nAvgBytesPerSec); + ok(fmt->nAvgBytesPerSec == 192000, "Wrong avg bytes per sec, expected 192000 got %lu\n", fmt->nAvgBytesPerSec); ok(fmt->cbSize == 0, "Wrong cbSize for simple format, expected 0, got %hu\n", fmt->cbSize); memcpy(&format, fmt, sizeof(format)); @@ -160,19 +160,19 @@ static void test_stream_activation(void) /* correct params */ fill_activation_params(&activation_params); hr = ISpatialAudioClient_ActivateSpatialAudioStream(sac, &activation_params_prop, &IID_ISpatialAudioObjectRenderStream, (void**)&sas); - ok(hr == S_OK, "Failed to activate spatial audio stream: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to activate spatial audio stream: 0x%08lx\n", hr); ok(ISpatialAudioObjectRenderStream_Release(sas) == 0, "Expected to release the last reference\n"); /* event handle */ fill_activation_params(&activation_params); activation_params.EventHandle = NULL; hr = ISpatialAudioClient_ActivateSpatialAudioStream(sac, &activation_params_prop, &IID_ISpatialAudioObjectRenderStream, (void**)&sas); - ok(hr == E_INVALIDARG, "Expected lack of no EventHandle to be invalid: 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "Expected lack of no EventHandle to be invalid: 0x%08lx\n", hr); ok(sas == NULL, "Expected spatial audio stream to be set to NULL upon failed activation\n"); activation_params.EventHandle = INVALID_HANDLE_VALUE; hr = ISpatialAudioClient_ActivateSpatialAudioStream(sac, &activation_params_prop, &IID_ISpatialAudioObjectRenderStream, (void**)&sas); - ok(hr == E_INVALIDARG, "Expected INVALID_HANDLE_VALUE to be invalid: 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "Expected INVALID_HANDLE_VALUE to be invalid: 0x%08lx\n", hr); ok(sas == NULL, "Expected spatial audio stream to be set to NULL upon failed activation\n"); /* must use only queried sample rate */ @@ -182,7 +182,7 @@ static void test_stream_activation(void) wrong_format.nSamplesPerSec = 44100; wrong_format.nAvgBytesPerSec = wrong_format.nSamplesPerSec * wrong_format.nBlockAlign; hr = ISpatialAudioClient_ActivateSpatialAudioStream(sac, &activation_params_prop, &IID_ISpatialAudioObjectRenderStream, (void**)&sas); - ok(hr == AUDCLNT_E_UNSUPPORTED_FORMAT, "Expected format to be unsupported: 0x%08x\n", hr); + ok(hr == AUDCLNT_E_UNSUPPORTED_FORMAT, "Expected format to be unsupported: 0x%08lx\n", hr); ok(sas == NULL, "Expected spatial audio stream to be set to NULL upon failed activation\n"); /* dynamic objects are not supported */ @@ -191,7 +191,7 @@ static void test_stream_activation(void) fill_activation_params(&activation_params); activation_params.StaticObjectTypeMask |= AudioObjectType_Dynamic; hr = ISpatialAudioClient_ActivateSpatialAudioStream(sac, &activation_params_prop, &IID_ISpatialAudioObjectRenderStream, (void**)&sas); - ok(hr == E_INVALIDARG, "Expected dynamic objects type be invalid: 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "Expected dynamic objects type be invalid: 0x%08lx\n", hr); ok(sas == NULL, "Expected spatial audio stream to be set to NULL upon failed activation\n"); } @@ -199,9 +199,9 @@ static void test_stream_activation(void) activation_params.MaxDynamicObjectCount = max_dyn_count + 1; hr = ISpatialAudioClient_ActivateSpatialAudioStream(sac, &activation_params_prop, &IID_ISpatialAudioObjectRenderStream, (void**)&sas); if (max_dyn_count) - ok(hr == AUDCLNT_E_UNSUPPORTED_FORMAT, "Expected dynamic object count exceeding max to be unsupported: 0x%08x\n", hr); + ok(hr == AUDCLNT_E_UNSUPPORTED_FORMAT, "Expected dynamic object count exceeding max to be unsupported: 0x%08lx\n", hr); else - ok(hr == E_INVALIDARG, "Expected setting dynamic object count to be invalid: 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "Expected setting dynamic object count to be invalid: 0x%08lx\n", hr); /* ISpatialAudioObjectRenderStreamNotify */ fill_activation_params(&activation_params); @@ -209,7 +209,7 @@ static void test_stream_activation(void) notify_object.ref = 0; activation_params.NotifyObject = ¬ify_object.ISpatialAudioObjectRenderStreamNotify_iface; hr = ISpatialAudioClient_ActivateSpatialAudioStream(sac, &activation_params_prop, &IID_ISpatialAudioObjectRenderStream, (void**)&sas); - ok(hr == S_OK, "Failed to activate spatial audio stream: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to activate spatial audio stream: 0x%08lx\n", hr); ok(notify_object.ref == 1, "Expected to get increased NotifyObject's ref count\n"); ok(ISpatialAudioObjectRenderStream_Release(sas) == 0, "Expected to release the last reference\n"); ok(notify_object.ref == 0, "Expected to get lowered NotifyObject's ref count\n"); @@ -233,23 +233,23 @@ static void test_audio_object_activation(void) fill_activation_params(&activation_params); activation_params.StaticObjectTypeMask &= ~AudioObjectType_FrontRight; hr = ISpatialAudioClient_ActivateSpatialAudioStream(sac, &activation_params_prop, &IID_ISpatialAudioObjectRenderStream, (void**)&sas); - ok(hr == S_OK, "Failed to activate spatial audio stream: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to activate spatial audio stream: 0x%08lx\n", hr); hr = ISpatialAudioObjectRenderStream_ActivateSpatialAudioObject(sas, AudioObjectType_FrontLeft, &sao1); - ok(hr == S_OK, "Failed to activate spatial audio object: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to activate spatial audio object: 0x%08lx\n", hr); hr = ISpatialAudioObject_IsActive(sao1, &is_active); - todo_wine ok(hr == S_OK, "Failed to check if spatial audio object is active: 0x%08x\n", hr); + todo_wine ok(hr == S_OK, "Failed to check if spatial audio object is active: 0x%08lx\n", hr); if (hr == S_OK) ok(is_active, "Expected spaital audio object to be active\n"); hr = ISpatialAudioObjectRenderStream_ActivateSpatialAudioObject(sas, AudioObjectType_FrontLeft, &sao2); - ok(hr == SPTLAUDCLNT_E_OBJECT_ALREADY_ACTIVE, "Expected audio object to be already active: 0x%08x\n", hr); + ok(hr == SPTLAUDCLNT_E_OBJECT_ALREADY_ACTIVE, "Expected audio object to be already active: 0x%08lx\n", hr); hr = ISpatialAudioObjectRenderStream_ActivateSpatialAudioObject(sas, AudioObjectType_FrontRight, &sao2); - ok(hr == SPTLAUDCLNT_E_STATIC_OBJECT_NOT_AVAILABLE, "Expected static object to be not available: 0x%08x\n", hr); + ok(hr == SPTLAUDCLNT_E_STATIC_OBJECT_NOT_AVAILABLE, "Expected static object to be not available: 0x%08lx\n", hr); hr = ISpatialAudioObjectRenderStream_ActivateSpatialAudioObject(sas, AudioObjectType_Dynamic, &sao2); - ok(hr == SPTLAUDCLNT_E_NO_MORE_OBJECTS, "Expected to not have no more dynamic objects: 0x%08x\n", hr); + ok(hr == SPTLAUDCLNT_E_NO_MORE_OBJECTS, "Expected to not have no more dynamic objects: 0x%08lx\n", hr); ISpatialAudioObject_Release(sao1); ISpatialAudioObjectRenderStream_Release(sas); @@ -286,10 +286,10 @@ static void test_audio_object_buffers(void) fill_activation_params(&activation_params); hr = ISpatialAudioClient_ActivateSpatialAudioStream(sac, &activation_params_prop, &IID_ISpatialAudioObjectRenderStream, (void**)&sas); - ok(hr == S_OK, "Failed to activate spatial audio stream: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to activate spatial audio stream: 0x%08lx\n", hr); hr = ISpatialAudioClient_GetMaxFrameCount(sac, &format, &max_frame_count); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); frame_count = format.nSamplesPerSec / 100; /* 10ms */ /* Most of the time the frame count matches the 10ms interval exactly. * However (seen on some Testbot machines) it might be a bit higher for some reason. */ @@ -300,32 +300,32 @@ static void test_audio_object_buffers(void) max_frame_count = frame_count + frame_count / 4; hr = ISpatialAudioObjectRenderStream_ActivateSpatialAudioObject(sas, AudioObjectType_FrontLeft, &sao[0]); - ok(hr == S_OK, "Failed to activate spatial audio object: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to activate spatial audio object: 0x%08lx\n", hr); hr = ISpatialAudioObjectRenderStream_Start(sas); - ok(hr == S_OK, "Failed to activate spatial audio render stream: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to activate spatial audio render stream: 0x%08lx\n", hr); hr = ISpatialAudioObjectRenderStream_ActivateSpatialAudioObject(sas, AudioObjectType_FrontRight, &sao[1]); - ok(hr == S_OK, "Failed to activate spatial audio object: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to activate spatial audio object: 0x%08lx\n", hr); hr = WaitForSingleObject(event, 200); - ok(hr == WAIT_OBJECT_0, "Expected event to be flagged: 0x%08x\n", hr); + ok(hr == WAIT_OBJECT_0, "Expected event to be flagged: 0x%08lx\n", hr); hr = ISpatialAudioObjectRenderStream_ActivateSpatialAudioObject(sas, AudioObjectType_SideLeft, &sao[2]); - ok(hr == S_OK, "Failed to activate spatial audio object: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to activate spatial audio object: 0x%08lx\n", hr); hr = ISpatialAudioObjectRenderStream_BeginUpdatingAudioObjects(sas, &dyn_object_count, &frame_count); - ok(hr == S_OK, "Failed to beging updating audio objects: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to beging updating audio objects: 0x%08lx\n", hr); ok(dyn_object_count == 0, "Unexpected dynamic objects\n"); ok(frame_count <= max_frame_count, "Got unexpected frame count %u.\n", frame_count); hr = ISpatialAudioObjectRenderStream_ActivateSpatialAudioObject(sas, AudioObjectType_SideRight, &sao[3]); - ok(hr == S_OK, "Failed to activate spatial audio object: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to activate spatial audio object: 0x%08lx\n", hr); for (i = 0; i < ARRAYSIZE(sao); i++) { hr = ISpatialAudioObject_GetBuffer(sao[i], &buffer, &buffer_length); - ok(hr == S_OK, "Expected to be able to get buffers for audio object: 0x%08x\n", hr); + ok(hr == S_OK, "Expected to be able to get buffers for audio object: 0x%08lx\n", hr); ok(buffer != NULL, "Expected to get a non-NULL buffer\n"); ok(buffer_length == frame_count * format.wBitsPerSample / 8, "Expected buffer length to be sample_size * frame_count = %hu but got %u\n", frame_count * format.wBitsPerSample / 8, buffer_length); @@ -333,7 +333,7 @@ static void test_audio_object_buffers(void) } hr = ISpatialAudioObjectRenderStream_EndUpdatingAudioObjects(sas); - ok(hr == S_OK, "Failed to end updating audio objects: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to end updating audio objects: 0x%08lx\n", hr); /* Emulate underrun and test frame count approximate limit. */ @@ -342,10 +342,10 @@ static void test_audio_object_buffers(void) for (j = 0; j < 20; ++j) { hr = WaitForSingleObject(event, 200); - ok(hr == WAIT_OBJECT_0, "Expected event to be flagged: 0x%08x, j %u.\n", hr, j); + ok(hr == WAIT_OBJECT_0, "Expected event to be flagged: 0x%08lx, j %u.\n", hr, j); hr = ISpatialAudioObjectRenderStream_BeginUpdatingAudioObjects(sas, &dyn_object_count, &frame_count); - ok(hr == S_OK, "Failed to beging updating audio objects: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to beging updating audio objects: 0x%08lx\n", hr); ok(dyn_object_count == 0, "Unexpected dynamic objects\n"); ok(frame_count <= max_frame_count, "Got unexpected frame_count %u.\n", frame_count); @@ -358,7 +358,7 @@ static void test_audio_object_buffers(void) for (i = 0; i < ARRAYSIZE(sao); i++) { hr = ISpatialAudioObject_GetBuffer(sao[i], &buffer, &buffer_length); - ok(hr == S_OK, "Expected to be able to get buffers for audio object: 0x%08x, i %d\n", hr, i); + ok(hr == S_OK, "Expected to be able to get buffers for audio object: 0x%08lx, i %d\n", hr, i); ok(buffer != NULL, "Expected to get a non-NULL buffer\n"); ok(buffer_length == frame_count * format.wBitsPerSample / 8, "Expected buffer length to be sample_size * frame_count = %hu but got %u\n", @@ -380,22 +380,22 @@ static void test_audio_object_buffers(void) } } hr = ISpatialAudioObjectRenderStream_EndUpdatingAudioObjects(sas); - ok(hr == S_OK, "Failed to end updating audio objects: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to end updating audio objects: 0x%08lx\n", hr); } timeEndPeriod(1); hr = WaitForSingleObject(event, 200); - ok(hr == WAIT_OBJECT_0, "Expected event to be flagged: 0x%08x\n", hr); + ok(hr == WAIT_OBJECT_0, "Expected event to be flagged: 0x%08lx\n", hr); hr = ISpatialAudioObjectRenderStream_BeginUpdatingAudioObjects(sas, &dyn_object_count, &frame_count); - ok(hr == S_OK, "Failed to beging updating audio objects: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to beging updating audio objects: 0x%08lx\n", hr); ok(dyn_object_count == 0, "Unexpected dynamic objects\n"); /* one more iteration but not with every object */ for (i = 0; i < ARRAYSIZE(sao) - 1; i++) { hr = ISpatialAudioObject_GetBuffer(sao[i], &buffer, &buffer_length); - ok(hr == S_OK, "Expected to be able to get buffers for audio object: 0x%08x\n", hr); + ok(hr == S_OK, "Expected to be able to get buffers for audio object: 0x%08lx\n", hr); ok(buffer != NULL, "Expected to get a non-NULL buffer\n"); ok(buffer_length == frame_count * format.wBitsPerSample / 8, "Expected buffer length to be sample_size * frame_count = %hu but got %u\n", frame_count * format.wBitsPerSample / 8, buffer_length); @@ -403,40 +403,40 @@ static void test_audio_object_buffers(void) } hr = ISpatialAudioObjectRenderStream_EndUpdatingAudioObjects(sas); - ok(hr == S_OK, "Failed to end updating audio objects: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to end updating audio objects: 0x%08lx\n", hr); /* ending the stream */ hr = ISpatialAudioObject_SetEndOfStream(sao[0], 0); - todo_wine ok(hr == SPTLAUDCLNT_E_OUT_OF_ORDER, "Expected that ending the stream at this point won't be allowed: 0x%08x\n", hr); + todo_wine ok(hr == SPTLAUDCLNT_E_OUT_OF_ORDER, "Expected that ending the stream at this point won't be allowed: 0x%08lx\n", hr); hr = WaitForSingleObject(event, 200); - ok(hr == WAIT_OBJECT_0, "Expected event to be flagged: 0x%08x\n", hr); + ok(hr == WAIT_OBJECT_0, "Expected event to be flagged: 0x%08lx\n", hr); hr = ISpatialAudioObject_SetEndOfStream(sao[0], 0); - todo_wine ok(hr == SPTLAUDCLNT_E_OUT_OF_ORDER, "Expected that ending the stream at this point won't be allowed: 0x%08x\n", hr); + todo_wine ok(hr == SPTLAUDCLNT_E_OUT_OF_ORDER, "Expected that ending the stream at this point won't be allowed: 0x%08lx\n", hr); hr = ISpatialAudioObjectRenderStream_BeginUpdatingAudioObjects(sas, &dyn_object_count, &frame_count); - ok(hr == S_OK, "Failed to beging updating audio objects: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to beging updating audio objects: 0x%08lx\n", hr); ok(dyn_object_count == 0, "Unexpected dynamic objects\n"); /* expect the object that was not updated last cycle to be invalidated */ hr = ISpatialAudioObject_GetBuffer(sao[ARRAYSIZE(sao) - 1], &buffer, &buffer_length); - todo_wine ok(hr == SPTLAUDCLNT_E_RESOURCES_INVALIDATED, "Expected audio object to be invalidated: 0x%08x\n", hr); + todo_wine ok(hr == SPTLAUDCLNT_E_RESOURCES_INVALIDATED, "Expected audio object to be invalidated: 0x%08lx\n", hr); for (i = 0; i < ARRAYSIZE(sao) - 1; i++) { hr = ISpatialAudioObject_GetBuffer(sao[i], &buffer, &buffer_length); - ok(hr == S_OK, "Expected to be able to get buffers for audio object: 0x%08x\n", hr); + ok(hr == S_OK, "Expected to be able to get buffers for audio object: 0x%08lx\n", hr); hr = ISpatialAudioObject_SetEndOfStream(sao[i], 0); - todo_wine ok(hr == S_OK, "Failed to end the stream: 0x%08x\n", hr); + todo_wine ok(hr == S_OK, "Failed to end the stream: 0x%08lx\n", hr); hr = ISpatialAudioObject_GetBuffer(sao[i], &buffer, &buffer_length); - todo_wine ok(hr == SPTLAUDCLNT_E_RESOURCES_INVALIDATED, "Expected audio object to be invalidated: 0x%08x\n", hr); + todo_wine ok(hr == SPTLAUDCLNT_E_RESOURCES_INVALIDATED, "Expected audio object to be invalidated: 0x%08lx\n", hr); } hr = ISpatialAudioObjectRenderStream_EndUpdatingAudioObjects(sas); - ok(hr == S_OK, "Failed to end updating audio objects: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to end updating audio objects: 0x%08lx\n", hr); for (i = 0; i < ARRAYSIZE(sao); i++) { @@ -451,40 +451,40 @@ START_TEST(spatialaudio) HRESULT hr; event = CreateEventA(NULL, FALSE, FALSE, "spatial-audio-test-prog-event"); - ok(event != NULL, "Failed to create event, last error: 0x%08x\n", GetLastError()); + ok(event != NULL, "Failed to create event, last error: 0x%08lx\n", GetLastError()); CoInitializeEx(NULL, COINIT_MULTITHREADED); hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&mme); if (FAILED(hr)) { - skip("mmdevapi not available: 0x%08x\n", hr); + skip("mmdevapi not available: 0x%08lx\n", hr); goto cleanup; } hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(mme, eRender, eMultimedia, &dev); - ok(hr == S_OK || hr == E_NOTFOUND, "GetDefaultAudioEndpoint failed: 0x%08x\n", hr); + ok(hr == S_OK || hr == E_NOTFOUND, "GetDefaultAudioEndpoint failed: 0x%08lx\n", hr); if (hr != S_OK || !dev) { if (hr == E_NOTFOUND) skip("No sound card available\n"); else - skip("GetDefaultAudioEndpoint returns 0x%08x\n", hr); + skip("GetDefaultAudioEndpoint returns 0x%08lx\n", hr); goto cleanup; } hr = IMMDevice_Activate(dev, &IID_ISpatialAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&sac); - ok(hr == S_OK || hr == E_NOINTERFACE, "ISpatialAudioClient Activation failed: 0x%08x\n", hr); + ok(hr == S_OK || hr == E_NOINTERFACE, "ISpatialAudioClient Activation failed: 0x%08lx\n", hr); if (hr != S_OK || !dev) { if (hr == E_NOINTERFACE) skip("ISpatialAudioClient interface not found\n"); else - skip("ISpatialAudioClient Activation returns 0x%08x\n", hr); + skip("ISpatialAudioClient Activation returns 0x%08lx\n", hr); goto cleanup; } hr = ISpatialAudioClient_GetMaxDynamicObjectCount(sac, &max_dyn_count); - ok(hr == S_OK, "Failed to get max dynamic object count: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to get max dynamic object count: 0x%08lx\n", hr); /* that's the default, after manually enabling Windows Sonic it's possible to have max_dyn_count > 0 */ /* ok(max_dyn_count == 0, "expected max dynamic object count to be 0 got %u\n", max_dyn_count); */
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=109493 Your paranoid android. === w7u_2qxl (32 bit report) === mmdevapi: render.c:1114: Test failed: Position 6497 too far after playing 100ms === w8 (32 bit report) === mmdevapi: render.c:1340: Test failed: GetBuffer large (20671) at iteration 2 render.c:1340: Test failed: GetBuffer large (20671) at iteration 3 === w8adm (32 bit report) === mmdevapi: render.c:1340: Test failed: GetBuffer large (20671) at iteration 8 render.c:1114: Test failed: Position 6656 too far after playing 100ms render.c:1340: Test failed: GetBuffer large (20671) at iteration 4 === w864 (32 bit report) === mmdevapi: render.c:1340: Test failed: GetBuffer large (20671) at iteration 7 === w1064v1507 (32 bit report) === mmdevapi: render.c:1114: Test failed: Position 52576 too far after playing 100ms render.c:1340: Test failed: GetBuffer large (20671) at iteration 2 === w1064v1809 (32 bit report) === mmdevapi: render.c:1114: Test failed: Position 52280 too far after playing 100ms render.c:1114: Test failed: Position 6371 too far after playing 100ms === w1064 (32 bit report) === mmdevapi: render.c:1114: Test failed: Position 58488 too far after playing 100ms render.c:1114: Test failed: Position 7067 too far after playing 100ms === w1064_tsign (32 bit report) === mmdevapi: render.c:1114: Test failed: Position 58704 too far after playing 100ms render.c:1114: Test failed: Position 7036 too far after playing 100ms === w10pro64 (32 bit report) === mmdevapi: render.c:1114: Test failed: Position 55704 too far after playing 100ms render.c:1114: Test failed: Position 7418 too far after playing 100ms render.c:1340: Test failed: GetBuffer large (22500) at iteration 2 === w864 (64 bit report) === mmdevapi: render.c:1340: Test failed: GetBuffer large (20671) at iteration 5 === w1064v1507 (64 bit report) === mmdevapi: render.c:1114: Test failed: Position 52288 too far after playing 100ms render.c:1340: Test failed: GetBuffer large (20671) at iteration 4 render.c:1114: Test failed: Position 7033 too far after playing 100ms === w1064v1809 (64 bit report) === mmdevapi: render.c:1114: Test failed: Position 52152 too far after playing 100ms render.c:1114: Test failed: Position 6617 too far after playing 100ms === w1064 (64 bit report) === mmdevapi: render.c:1114: Test failed: Position 58568 too far after playing 100ms render.c:1114: Test failed: Position 7222 too far after playing 100ms === w1064_2qxl (64 bit report) === mmdevapi: render.c:1114: Test failed: Position 59104 too far after playing 100ms render.c:1114: Test failed: Position 7306 too far after playing 100ms === w1064_tsign (64 bit report) === mmdevapi: render.c:1114: Test failed: Position 57840 too far after playing 100ms === w10pro64 (64 bit report) === mmdevapi: render.c:1114: Test failed: Position 58664 too far after playing 100ms render.c:1114: Test failed: Position 7054 too far after playing 100ms === w10pro64_ar (64 bit report) === mmdevapi: render.c:1114: Test failed: Position 7308 too far after playing 100ms === w10pro64_he (64 bit report) === mmdevapi: render.c:1114: Test failed: Position 6949 too far after playing 100ms === w10pro64_ja (64 bit report) === mmdevapi: render.c:1114: Test failed: Position 58544 too far after playing 100ms render.c:1114: Test failed: Position 7002 too far after playing 100ms render.c:1340: Test failed: GetBuffer large (22500) at iteration 4 === w10pro64_zh_CN (64 bit report) === mmdevapi: render.c:1114: Test failed: Position 58664 too far after playing 100ms render.c:1114: Test failed: Position 7222 too far after playing 100ms
Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> On Tue, Mar 01, 2022 at 08:33:07AM +0100, Eric Pouech wrote:
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
--- dlls/mmdevapi/tests/Makefile.in | 1 dlls/mmdevapi/tests/capture.c | 398 +++++++++-------- dlls/mmdevapi/tests/dependency.c | 12 - dlls/mmdevapi/tests/mmdevenum.c | 86 ++-- dlls/mmdevapi/tests/propstore.c | 52 +- dlls/mmdevapi/tests/render.c | 820 ++++++++++++++++++------------------ dlls/mmdevapi/tests/spatialaudio.c | 108 ++--- 7 files changed, 738 insertions(+), 739 deletions(-)
diff --git a/dlls/mmdevapi/tests/Makefile.in b/dlls/mmdevapi/tests/Makefile.in index 183c9f36588..dd180a253b9 100644 --- a/dlls/mmdevapi/tests/Makefile.in +++ b/dlls/mmdevapi/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mmdevapi.dll IMPORTS = ole32 version user32 advapi32 winmm
diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 6c65128f2d2..5fbb62e4403 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -54,28 +54,28 @@ static void test_uninitialized(IAudioClient *ac) IUnknown *unk;
hr = IAudioClient_GetBufferSize(ac, &num); - ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized GetBufferSize call returns %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized GetBufferSize call returns %08lx\n", hr);
hr = IAudioClient_GetStreamLatency(ac, &t1); - ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized GetStreamLatency call returns %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized GetStreamLatency call returns %08lx\n", hr);
hr = IAudioClient_GetCurrentPadding(ac, &num); - ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized GetCurrentPadding call returns %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized GetCurrentPadding call returns %08lx\n", hr);
hr = IAudioClient_Start(ac); - ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized Start call returns %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized Start call returns %08lx\n", hr);
hr = IAudioClient_Stop(ac); - ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized Stop call returns %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized Stop call returns %08lx\n", hr);
hr = IAudioClient_Reset(ac); - ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized Reset call returns %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized Reset call returns %08lx\n", hr);
hr = IAudioClient_SetEventHandle(ac, handle); - ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized SetEventHandle call returns %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized SetEventHandle call returns %08lx\n", hr);
hr = IAudioClient_GetService(ac, &IID_IAudioStreamVolume, (void**)&unk); - ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized GetService call returns %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized GetService call returns %08lx\n", hr);
CloseHandle(handle); } @@ -91,54 +91,54 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) REFERENCE_TIME period;
hr = IAudioClient_GetService(ac, &IID_IAudioCaptureClient, (void**)&acc); - ok(hr == S_OK, "IAudioClient_GetService(IID_IAudioCaptureClient) returns %08x\n", hr); + ok(hr == S_OK, "IAudioClient_GetService(IID_IAudioCaptureClient) returns %08lx\n", hr); if (hr != S_OK) return;
ok(ResetEvent(handle), "ResetEvent\n");
hr = IAudioCaptureClient_GetNextPacketSize(acc, &next); - ok(hr == S_OK, "IAudioCaptureClient_GetNextPacketSize returns %08x\n", hr); + ok(hr == S_OK, "IAudioCaptureClient_GetNextPacketSize returns %08lx\n", hr);
hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding call returns %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding call returns %08lx\n", hr); ok(next == pad, "GetNextPacketSize %u vs. GCP %u\n", next, pad); /* later GCP will grow, while GNPS is 0 or period size */
hr = IAudioCaptureClient_GetNextPacketSize(acc, NULL); - ok(hr == E_POINTER, "IAudioCaptureClient_GetNextPacketSize(NULL) returns %08x\n", hr); + ok(hr == E_POINTER, "IAudioCaptureClient_GetNextPacketSize(NULL) returns %08lx\n", hr);
data = (void*)0xdeadf00d; frames = 0xdeadbeef; flags = 0xabadcafe; hr = IAudioCaptureClient_GetBuffer(acc, &data, NULL, NULL, NULL, NULL); - ok(hr == E_POINTER, "IAudioCaptureClient_GetBuffer(data, NULL, NULL) returns %08x\n", hr); + ok(hr == E_POINTER, "IAudioCaptureClient_GetBuffer(data, NULL, NULL) returns %08lx\n", hr);
hr = IAudioCaptureClient_GetBuffer(acc, NULL, &frames, NULL, NULL, NULL); - ok(hr == E_POINTER, "IAudioCaptureClient_GetBuffer(NULL, &frames, NULL) returns %08x\n", hr); + ok(hr == E_POINTER, "IAudioCaptureClient_GetBuffer(NULL, &frames, NULL) returns %08lx\n", hr);
hr = IAudioCaptureClient_GetBuffer(acc, NULL, NULL, &flags, NULL, NULL); - ok(hr == E_POINTER, "IAudioCaptureClient_GetBuffer(NULL, NULL, &flags) returns %08x\n", hr); + ok(hr == E_POINTER, "IAudioCaptureClient_GetBuffer(NULL, NULL, &flags) returns %08lx\n", hr);
hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, NULL, NULL, NULL); - ok(hr == E_POINTER, "IAudioCaptureClient_GetBuffer(&ata, &frames, NULL) returns %08x\n", hr); + ok(hr == E_POINTER, "IAudioCaptureClient_GetBuffer(&ata, &frames, NULL) returns %08lx\n", hr); ok(broken((DWORD_PTR)data == 0xdeadf00d) || /* <= win8 */ data == NULL, "data is reset to %p\n", data); ok(frames == 0xdeadbeef, "frames is reset to %08x\n", frames); - ok(flags == 0xabadcafe, "flags is reset to %08x\n", flags); + ok(flags == 0xabadcafe, "flags is reset to %08lx\n", flags);
hr = IAudioClient_GetDevicePeriod(ac, &period, NULL); - ok(hr == S_OK, "GetDevicePeriod failed: %08x\n", hr); + ok(hr == S_OK, "GetDevicePeriod failed: %08lx\n", hr); period = MulDiv(period, wfx->nSamplesPerSec, 10000000); /* as in render.c */
hr = IAudioClient_Start(ac); - ok(hr == S_OK, "Start on a stopped stream returns %08x\n", hr); + ok(hr == S_OK, "Start on a stopped stream returns %08lx\n", hr);
ok(WaitForSingleObject(handle, 1000) == WAIT_OBJECT_0, "Waiting on event handle failed!\n");
data = (void*)0xdeadf00d; hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, &flags, &pos, &qpc); - ok(hr == S_OK || hr == AUDCLNT_S_BUFFER_EMPTY, "Valid IAudioCaptureClient_GetBuffer returns %08x\n", hr); + ok(hr == S_OK || hr == AUDCLNT_S_BUFFER_EMPTY, "Valid IAudioCaptureClient_GetBuffer returns %08lx\n", hr); if (hr == S_OK){ ok(frames, "Amount of frames locked is 0!\n"); /* broken: some w7 machines return pad == 0 and DATA_DISCONTINUITY here, @@ -152,42 +152,42 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) data == NULL, "No data changed to %p\n", data); }
- trace("Wait'ed position %d pad %u flags %x, amount of frames locked: %u\n", + trace("Wait'ed position %d pad %u flags %lx, amount of frames locked: %u\n", hr==S_OK ? (UINT)pos : -1, pad, flags, frames);
hr = IAudioCaptureClient_GetNextPacketSize(acc, &next); - ok(hr == S_OK, "IAudioCaptureClient_GetNextPacketSize returns %08x\n", hr); + ok(hr == S_OK, "IAudioCaptureClient_GetNextPacketSize returns %08lx\n", hr); ok(next == frames, "GetNextPacketSize %u vs. GetBuffer %u\n", next, frames);
hr = IAudioCaptureClient_ReleaseBuffer(acc, frames); - ok(hr == S_OK, "Releasing buffer returns %08x\n", hr); + ok(hr == S_OK, "Releasing buffer returns %08lx\n", hr);
hr = IAudioCaptureClient_ReleaseBuffer(acc, 0); - ok(hr == S_OK, "Releasing 0 returns %08x\n", hr); + ok(hr == S_OK, "Releasing 0 returns %08lx\n", hr);
hr = IAudioCaptureClient_GetNextPacketSize(acc, &next); - ok(hr == S_OK, "IAudioCaptureClient_GetNextPacketSize returns %08x\n", hr); + ok(hr == S_OK, "IAudioCaptureClient_GetNextPacketSize returns %08lx\n", hr);
if (frames) { hr = IAudioCaptureClient_ReleaseBuffer(acc, frames); - ok(hr == AUDCLNT_E_OUT_OF_ORDER, "Releasing buffer twice returns %08x\n", hr); + ok(hr == AUDCLNT_E_OUT_OF_ORDER, "Releasing buffer twice returns %08lx\n", hr); sum += frames; }
Sleep(350); /* for sure there's data now */
hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding call returns %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding call returns %08lx\n", hr);
/** GetNextPacketSize * returns either 0 or one period worth of frames * whereas GetCurrentPadding grows when input is not consumed. */ hr = IAudioCaptureClient_GetNextPacketSize(acc, &next); - ok(hr == S_OK, "IAudioCaptureClient_GetNextPacketSize returns %08x\n", hr); + ok(hr == S_OK, "IAudioCaptureClient_GetNextPacketSize returns %08lx\n", hr); ok(next < pad, "GetNextPacketSize %u vs. GCP %u\n", next, pad);
hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, &flags, &pos, &qpc); - ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08x\n", hr); + ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08lx\n", hr); ok(next == frames, "GetNextPacketSize %u vs. GetBuffer %u\n", next, frames);
if(hr == S_OK){ @@ -197,17 +197,17 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) ok(pos == sum, "Position %u expected %u\n", (UINT)pos, sum);
hr = IAudioCaptureClient_ReleaseBuffer(acc, 0); - ok(hr == S_OK, "Releasing 0 returns %08x\n", hr); + ok(hr == S_OK, "Releasing 0 returns %08lx\n", hr);
/* GCP did not decrement, no data consumed */ hr = IAudioClient_GetCurrentPadding(ac, &frames); - ok(hr == S_OK, "GetCurrentPadding call returns %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding call returns %08lx\n", hr); ok(frames == pad || frames == pad + next /* concurrent feeder */, "GCP %u past ReleaseBuffer(0) initially %u\n", frames, pad);
/* should re-get the same data */ hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, &flags, &pos2, &qpc2); - ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08x\n", hr); + ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08lx\n", hr); ok(frames2 == frames, "GetBuffer after ReleaseBuffer(0) %u/%u\n", frames2, frames); ok(pos2 == pos, "Position after ReleaseBuffer(0) %u/%u\n", (UINT)pos2, (UINT)pos); todo_wine_if(qpc2 != qpc) @@ -216,7 +216,7 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) }
/* trace after the GCP test because log output to MS-DOS console disturbs timing */ - trace("Sleep.1 position %d pad %u flags %x, amount of frames locked: %u\n", + trace("Sleep.1 position %d pad %u flags %lx, amount of frames locked: %u\n", hr==S_OK ? (UINT)pos : -1, pad, flags, frames);
if(hr == S_OK){ @@ -228,31 +228,31 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx)
pos = qpc = 0xdeadbeef; hr = IAudioCaptureClient_GetBuffer(acc, &data2, &frames2, &flags, &pos, &qpc); - ok(hr == AUDCLNT_E_OUT_OF_ORDER, "Out of order IAudioCaptureClient_GetBuffer returns %08x\n", hr); + ok(hr == AUDCLNT_E_OUT_OF_ORDER, "Out of order IAudioCaptureClient_GetBuffer returns %08lx\n", hr); ok(frames2 == 0xabadcafe, "Out of order frames changed to %x\n", frames2); ok(broken(data2 == (void*)0xdeadf00d) /* <= win8 */ || data2 == NULL, "Out of order data changed to %p\n", data2); - ok(flags == 0xabadcafe, "Out of order flags changed to %x\n", flags); + ok(flags == 0xabadcafe, "Out of order flags changed to %lx\n", flags); ok(pos == 0xdeadbeef, "Out of order position changed to %x\n", (UINT)pos); ok(qpc == 0xdeadbeef, "Out of order timer changed to %x\n", (UINT)qpc);
hr = IAudioCaptureClient_ReleaseBuffer(acc, frames+1); - ok(hr == AUDCLNT_E_INVALID_SIZE, "Releasing buffer+1 returns %08x\n", hr); + ok(hr == AUDCLNT_E_INVALID_SIZE, "Releasing buffer+1 returns %08lx\n", hr);
hr = IAudioCaptureClient_ReleaseBuffer(acc, 1); - ok(hr == AUDCLNT_E_INVALID_SIZE, "Releasing 1 returns %08x\n", hr); + ok(hr == AUDCLNT_E_INVALID_SIZE, "Releasing 1 returns %08lx\n", hr);
hr = IAudioClient_Reset(ac); - ok(hr == AUDCLNT_E_NOT_STOPPED, "Reset failed: %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_STOPPED, "Reset failed: %08lx\n", hr); }
hr = IAudioCaptureClient_ReleaseBuffer(acc, frames); - ok(hr == S_OK, "Releasing buffer returns %08x\n", hr); + ok(hr == S_OK, "Releasing buffer returns %08lx\n", hr);
if (frames) { sum += frames; hr = IAudioCaptureClient_ReleaseBuffer(acc, frames); - ok(hr == AUDCLNT_E_OUT_OF_ORDER, "Releasing buffer twice returns %08x\n", hr); + ok(hr == AUDCLNT_E_OUT_OF_ORDER, "Releasing buffer twice returns %08lx\n", hr); }
frames = period; @@ -260,18 +260,18 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx)
/* GetBufferSize is not a multiple of the period size! */ hr = IAudioClient_GetBufferSize(ac, &next); - ok(hr == S_OK, "GetBufferSize failed: %08x\n", hr); + ok(hr == S_OK, "GetBufferSize failed: %08lx\n", hr); trace("GetBufferSize %u period size %u\n", next, frames);
Sleep(400); /* overrun */
hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding call returns %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding call returns %08lx\n", hr);
hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, &flags, &pos, &qpc); - ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08x\n", hr); + ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08lx\n", hr);
- trace("Overrun position %d pad %u flags %x, amount of frames locked: %u\n", + trace("Overrun position %d pad %u flags %lx, amount of frames locked: %u\n", hr==S_OK ? (UINT)pos : -1, pad, flags, frames);
if(hr == S_OK){ @@ -289,85 +289,85 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) }
hr = IAudioCaptureClient_ReleaseBuffer(acc, frames); - ok(hr == S_OK, "Releasing buffer returns %08x\n", hr); + ok(hr == S_OK, "Releasing buffer returns %08lx\n", hr); sum += frames;
hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding call returns %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding call returns %08lx\n", hr);
hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, &flags, &pos, &qpc); - ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08x\n", hr); + ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08lx\n", hr);
- trace("Cont'ed position %d pad %u flags %x, amount of frames locked: %u\n", + trace("Cont'ed position %d pad %u flags %lx, amount of frames locked: %u\n", hr==S_OK ? (UINT)pos : -1, pad, flags, frames);
if(hr == S_OK){ ok(pos == sum, "Position %u expected %u\n", (UINT)pos, sum); - ok(!flags, "flags %u\n", flags); + ok(!flags, "flags %lu\n", flags);
hr = IAudioCaptureClient_ReleaseBuffer(acc, frames); - ok(hr == S_OK, "Releasing buffer returns %08x\n", hr); + ok(hr == S_OK, "Releasing buffer returns %08lx\n", hr); sum += frames; }
hr = IAudioClient_Stop(ac); - ok(hr == S_OK, "Stop on a started stream returns %08x\n", hr); + ok(hr == S_OK, "Stop on a started stream returns %08lx\n", hr);
hr = IAudioClient_Start(ac); - ok(hr == S_OK, "Start on a stopped stream returns %08x\n", hr); + ok(hr == S_OK, "Start on a stopped stream returns %08lx\n", hr);
hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, &flags, &pos, &qpc); - ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08x\n", hr); + ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08lx\n", hr);
hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding call returns %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding call returns %08lx\n", hr);
- trace("Restart position %d pad %u flags %x, amount of frames locked: %u\n", + trace("Restart position %d pad %u flags %lx, amount of frames locked: %u\n", hr==S_OK ? (UINT)pos : -1, pad, flags, frames); ok(pad > sum, "restarted GCP %u\n", pad); /* GCP is still near buffer size */
if(frames){ ok(pos == sum, "Position %u expected %u\n", (UINT)pos, sum); - ok(!flags, "flags %u\n", flags); + ok(!flags, "flags %lu\n", flags);
hr = IAudioCaptureClient_ReleaseBuffer(acc, frames); - ok(hr == S_OK, "Releasing buffer returns %08x\n", hr); + ok(hr == S_OK, "Releasing buffer returns %08lx\n", hr); sum += frames; }
hr = IAudioClient_Stop(ac); - ok(hr == S_OK, "Stop on a started stream returns %08x\n", hr); + ok(hr == S_OK, "Stop on a started stream returns %08lx\n", hr);
hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset on a stopped stream returns %08x\n", hr); + ok(hr == S_OK, "Reset on a stopped stream returns %08lx\n", hr); sum += pad - frames;
hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding call returns %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding call returns %08lx\n", hr); ok(!pad, "reset GCP %u\n", pad);
flags = 0xabadcafe; hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, &flags, &pos, &qpc); ok(hr == AUDCLNT_S_BUFFER_EMPTY, - "Initial IAudioCaptureClient_GetBuffer returns %08x\n", hr); + "Initial IAudioCaptureClient_GetBuffer returns %08lx\n", hr);
- trace("Reset position %d pad %u flags %x, amount of frames locked: %u\n", + trace("Reset position %d pad %u flags %lx, amount of frames locked: %u\n", hr==S_OK ? (UINT)pos : -1, pad, flags, frames);
if(SUCCEEDED(hr)) IAudioCaptureClient_ReleaseBuffer(acc, frames);
hr = IAudioClient_Start(ac); - ok(hr == S_OK, "Start on a stopped stream returns %08x\n", hr); + ok(hr == S_OK, "Start on a stopped stream returns %08lx\n", hr);
Sleep(180);
hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding call returns %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding call returns %08lx\n", hr);
hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, &flags, &pos, &qpc); - ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08x\n", hr); - trace("Running position %d pad %u flags %x, amount of frames locked: %u\n", + ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08lx\n", hr); + trace("Running position %d pad %u flags %lx, amount of frames locked: %u\n", SUCCEEDED(hr) ? (UINT)pos : -1, pad, flags, frames);
if(SUCCEEDED(hr)){ @@ -392,56 +392,56 @@ static void test_audioclient(void)
hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return;
handle = CreateEventW(NULL, FALSE, FALSE, NULL);
hr = IAudioClient_QueryInterface(ac, &IID_IUnknown, NULL); - ok(hr == E_POINTER, "QueryInterface(NULL) returned %08x\n", hr); + ok(hr == E_POINTER, "QueryInterface(NULL) returned %08lx\n", hr);
unk = (void*)(LONG_PTR)0x12345678; hr = IAudioClient_QueryInterface(ac, &IID_NULL, (void**)&unk); - ok(hr == E_NOINTERFACE, "QueryInterface(IID_NULL) returned %08x\n", hr); + ok(hr == E_NOINTERFACE, "QueryInterface(IID_NULL) returned %08lx\n", hr); ok(!unk, "QueryInterface(IID_NULL) returned non-null pointer %p\n", unk);
hr = IAudioClient_QueryInterface(ac, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface(IID_IUnknown) returned %08x\n", hr); + ok(hr == S_OK, "QueryInterface(IID_IUnknown) returned %08lx\n", hr); if (unk) { ref = IUnknown_Release(unk); - ok(ref == 1, "Released count is %u\n", ref); + ok(ref == 1, "Released count is %lu\n", ref); }
hr = IAudioClient_QueryInterface(ac, &IID_IAudioClient, (void**)&unk); - ok(hr == S_OK, "QueryInterface(IID_IAudioClient) returned %08x\n", hr); + ok(hr == S_OK, "QueryInterface(IID_IAudioClient) returned %08lx\n", hr); if (unk) { ref = IUnknown_Release(unk); - ok(ref == 1, "Released count is %u\n", ref); + ok(ref == 1, "Released count is %lu\n", ref); }
hr = IAudioClient_GetDevicePeriod(ac, NULL, NULL); - ok(hr == E_POINTER, "Invalid GetDevicePeriod call returns %08x\n", hr); + ok(hr == E_POINTER, "Invalid GetDevicePeriod call returns %08lx\n", hr);
hr = IAudioClient_GetDevicePeriod(ac, &t1, NULL); - ok(hr == S_OK, "Valid GetDevicePeriod call returns %08x\n", hr); + ok(hr == S_OK, "Valid GetDevicePeriod call returns %08lx\n", hr);
hr = IAudioClient_GetDevicePeriod(ac, NULL, &t2); - ok(hr == S_OK, "Valid GetDevicePeriod call returns %08x\n", hr); + ok(hr == S_OK, "Valid GetDevicePeriod call returns %08lx\n", hr);
hr = IAudioClient_GetDevicePeriod(ac, &t1, &t2); - ok(hr == S_OK, "Valid GetDevicePeriod call returns %08x\n", hr); + ok(hr == S_OK, "Valid GetDevicePeriod call returns %08lx\n", hr); trace("Returned periods: %u.%04u ms %u.%04u ms\n", (UINT)(t1/10000), (UINT)(t1 % 10000), (UINT)(t2/10000), (UINT)(t2 % 10000));
hr = IAudioClient_GetMixFormat(ac, NULL); - ok(hr == E_POINTER, "GetMixFormat returns %08x\n", hr); + ok(hr == E_POINTER, "GetMixFormat returns %08lx\n", hr);
hr = IAudioClient_GetMixFormat(ac, &pwfx); - ok(hr == S_OK, "Valid GetMixFormat returns %08x\n", hr); + ok(hr == S_OK, "Valid GetMixFormat returns %08lx\n", hr);
if (hr == S_OK) { @@ -449,7 +449,7 @@ static void test_audioclient(void) trace("Tag: %04x\n", pwfx->wFormatTag); trace("bits: %u\n", pwfx->wBitsPerSample); trace("chan: %u\n", pwfx->nChannels); - trace("rate: %u\n", pwfx->nSamplesPerSec); + trace("rate: %lu\n", pwfx->nSamplesPerSec); trace("align: %u\n", pwfx->nBlockAlign); trace("extra: %u\n", pwfx->cbSize); ok(pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE, "wFormatTag is %x\n", pwfx->wFormatTag); @@ -457,7 +457,7 @@ static void test_audioclient(void) { WAVEFORMATEXTENSIBLE *pwfxe = (void*)pwfx; trace("Res: %u\n", pwfxe->Samples.wReserved); - trace("Mask: %x\n", pwfxe->dwChannelMask); + trace("Mask: %lx\n", pwfxe->dwChannelMask); trace("Alg: %s\n", IsEqualGUID(&pwfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM)?"PCM": (IsEqualGUID(&pwfxe->SubFormat, @@ -465,79 +465,79 @@ static void test_audioclient(void) }
hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &pwfx2); - ok(hr == S_OK, "Valid IsFormatSupported(Shared) call returns %08x\n", hr); + ok(hr == S_OK, "Valid IsFormatSupported(Shared) call returns %08lx\n", hr); ok(pwfx2 == NULL, "pwfx2 is non-null\n"); CoTaskMemFree(pwfx2);
hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, NULL, NULL); - ok(hr == E_POINTER, "IsFormatSupported(NULL) call returns %08x\n", hr); + ok(hr == E_POINTER, "IsFormatSupported(NULL) call returns %08lx\n", hr);
hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, NULL); - ok(hr == E_POINTER, "IsFormatSupported(Shared,NULL) call returns %08x\n", hr); + ok(hr == E_POINTER, "IsFormatSupported(Shared,NULL) call returns %08lx\n", hr);
hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_EXCLUSIVE, pwfx, NULL); - ok(hr == S_OK || hr == AUDCLNT_E_UNSUPPORTED_FORMAT, "IsFormatSupported(Exclusive) call returns %08x\n", hr); + ok(hr == S_OK || hr == AUDCLNT_E_UNSUPPORTED_FORMAT, "IsFormatSupported(Exclusive) call returns %08lx\n", hr);
hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_EXCLUSIVE, pwfx, &pwfx2); - ok(hr == S_OK || hr == AUDCLNT_E_UNSUPPORTED_FORMAT, "IsFormatSupported(Exclusive) call returns %08x\n", hr); + ok(hr == S_OK || hr == AUDCLNT_E_UNSUPPORTED_FORMAT, "IsFormatSupported(Exclusive) call returns %08lx\n", hr); ok(pwfx2 == NULL, "pwfx2 non-null on exclusive IsFormatSupported\n");
hr = IAudioClient_IsFormatSupported(ac, 0xffffffff, pwfx, NULL); ok(hr == E_INVALIDARG/*w32*/ || broken(hr == AUDCLNT_E_UNSUPPORTED_FORMAT/*w64 response from exclusive mode driver */), - "IsFormatSupported(0xffffffff) call returns %08x\n", hr); + "IsFormatSupported(0xffffffff) call returns %08lx\n", hr); }
test_uninitialized(ac);
hr = IAudioClient_Initialize(ac, 3, 0, 5000000, 0, pwfx, NULL); ok(broken(hr == AUDCLNT_E_NOT_INITIALIZED) || /* <= win8 */ - hr == E_INVALIDARG, "Initialize with invalid sharemode returns %08x\n", hr); + hr == E_INVALIDARG, "Initialize with invalid sharemode returns %08lx\n", hr);
hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0xffffffff, 5000000, 0, pwfx, NULL); - ok(hr == E_INVALIDARG || hr == AUDCLNT_E_INVALID_STREAM_FLAG, "Initialize with invalid flags returns %08x\n", hr); + ok(hr == E_INVALIDARG || hr == AUDCLNT_E_INVALID_STREAM_FLAG, "Initialize with invalid flags returns %08lx\n", hr);
/* A period != 0 is ignored and the call succeeds. * Since we can only initialize successfully once, skip those tests. */ hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, NULL, NULL); - ok(hr == E_POINTER, "Initialize with null format returns %08x\n", hr); + ok(hr == E_POINTER, "Initialize with null format returns %08lx\n", hr);
hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_EVENTCALLBACK, 4987654, 0, pwfx, NULL); - ok(hr == S_OK, "Valid Initialize returns %08x\n", hr); + ok(hr == S_OK, "Valid Initialize returns %08lx\n", hr);
if (hr != S_OK) { - skip("Cannot initialize %08x, remainder of tests is useless\n", hr); + skip("Cannot initialize %08lx, remainder of tests is useless\n", hr); goto cleanup; }
hr = IAudioClient_GetStreamLatency(ac, NULL); - ok(hr == E_POINTER, "GetStreamLatency(NULL) call returns %08x\n", hr); + ok(hr == E_POINTER, "GetStreamLatency(NULL) call returns %08lx\n", hr);
hr = IAudioClient_GetStreamLatency(ac, &t1); - ok(hr == S_OK, "Valid GetStreamLatency call returns %08x\n", hr); + ok(hr == S_OK, "Valid GetStreamLatency call returns %08lx\n", hr); trace("Returned latency: %u.%04u ms\n", (UINT)(t1/10000), (UINT)(t1 % 10000));
hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); - ok(hr == AUDCLNT_E_ALREADY_INITIALIZED, "Calling Initialize twice returns %08x\n", hr); + ok(hr == AUDCLNT_E_ALREADY_INITIALIZED, "Calling Initialize twice returns %08lx\n", hr);
hr = IAudioClient_SetEventHandle(ac, NULL); - ok(hr == E_INVALIDARG, "SetEventHandle(NULL) returns %08x\n", hr); + ok(hr == E_INVALIDARG, "SetEventHandle(NULL) returns %08lx\n", hr);
hr = IAudioClient_Start(ac); ok(hr == AUDCLNT_E_EVENTHANDLE_NOT_SET || - hr == D3D11_ERROR_4E /* win10 */, "Start before SetEventHandle returns %08x\n", hr); + hr == D3D11_ERROR_4E /* win10 */, "Start before SetEventHandle returns %08lx\n", hr);
hr = IAudioClient_SetEventHandle(ac, handle); - ok(hr == S_OK, "SetEventHandle returns %08x\n", hr); + ok(hr == S_OK, "SetEventHandle returns %08lx\n", hr);
hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset on an already reset stream returns %08x\n", hr); + ok(hr == S_OK, "Reset on an already reset stream returns %08lx\n", hr);
hr = IAudioClient_Stop(ac); - ok(hr == S_FALSE, "Stop on a stopped stream returns %08x\n", hr); + ok(hr == S_FALSE, "Stop on a stopped stream returns %08lx\n", hr);
test_capture(ac, handle, pwfx);
@@ -558,87 +558,87 @@ static void test_streamvolume(void)
hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return;
hr = IAudioClient_GetMixFormat(ac, &fmt); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr);
hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, fmt, NULL); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr); if(hr != S_OK) return;
hr = IAudioClient_GetService(ac, &IID_IAudioStreamVolume, (void**)&asv); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr);
hr = IAudioStreamVolume_GetChannelCount(asv, NULL); - ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08x\n", hr); + ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08lx\n", hr);
hr = IAudioStreamVolume_GetChannelCount(asv, &chans); - ok(hr == S_OK, "GetChannelCount failed: %08x\n", hr); + ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(chans == fmt->nChannels, "GetChannelCount gave wrong number of channels: %d\n", chans);
hr = IAudioStreamVolume_GetChannelVolume(asv, fmt->nChannels, NULL); - ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08x\n", hr); + ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08lx\n", hr);
hr = IAudioStreamVolume_GetChannelVolume(asv, fmt->nChannels, &vol); - ok(hr == E_INVALIDARG, "GetChannelCount gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "GetChannelCount gave wrong error: %08lx\n", hr);
hr = IAudioStreamVolume_GetChannelVolume(asv, 0, NULL); - ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08x\n", hr); + ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08lx\n", hr);
hr = IAudioStreamVolume_GetChannelVolume(asv, 0, &vol); - ok(hr == S_OK, "GetChannelCount failed: %08x\n", hr); + ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(vol == 1.f, "Channel volume was not 1: %f\n", vol);
hr = IAudioStreamVolume_SetChannelVolume(asv, fmt->nChannels, -1.f); - ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08lx\n", hr);
hr = IAudioStreamVolume_SetChannelVolume(asv, 0, -1.f); - ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08lx\n", hr);
hr = IAudioStreamVolume_SetChannelVolume(asv, 0, 2.f); - ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08lx\n", hr);
hr = IAudioStreamVolume_SetChannelVolume(asv, 0, 0.2f); - ok(hr == S_OK, "SetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "SetChannelVolume failed: %08lx\n", hr);
hr = IAudioStreamVolume_GetChannelVolume(asv, 0, &vol); - ok(hr == S_OK, "GetChannelCount failed: %08x\n", hr); + ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(fabsf(vol - 0.2f) < 0.05f, "Channel volume wasn't 0.2: %f\n", vol);
hr = IAudioStreamVolume_GetAllVolumes(asv, 0, NULL); - ok(hr == E_POINTER, "GetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == E_POINTER, "GetAllVolumes gave wrong error: %08lx\n", hr);
hr = IAudioStreamVolume_GetAllVolumes(asv, fmt->nChannels, NULL); - ok(hr == E_POINTER, "GetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == E_POINTER, "GetAllVolumes gave wrong error: %08lx\n", hr);
vols = HeapAlloc(GetProcessHeap(), 0, fmt->nChannels * sizeof(float)); ok(vols != NULL, "HeapAlloc failed\n");
hr = IAudioStreamVolume_GetAllVolumes(asv, fmt->nChannels - 1, vols); - ok(hr == E_INVALIDARG, "GetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "GetAllVolumes gave wrong error: %08lx\n", hr);
hr = IAudioStreamVolume_GetAllVolumes(asv, fmt->nChannels, vols); - ok(hr == S_OK, "GetAllVolumes failed: %08x\n", hr); + ok(hr == S_OK, "GetAllVolumes failed: %08lx\n", hr); ok(fabsf(vols[0] - 0.2f) < 0.05f, "Channel 0 volume wasn't 0.2: %f\n", vol); for(i = 1; i < fmt->nChannels; ++i) ok(vols[i] == 1.f, "Channel %d volume is not 1: %f\n", i, vols[i]);
hr = IAudioStreamVolume_SetAllVolumes(asv, 0, NULL); - ok(hr == E_POINTER, "SetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == E_POINTER, "SetAllVolumes gave wrong error: %08lx\n", hr);
hr = IAudioStreamVolume_SetAllVolumes(asv, fmt->nChannels, NULL); - ok(hr == E_POINTER, "SetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == E_POINTER, "SetAllVolumes gave wrong error: %08lx\n", hr);
hr = IAudioStreamVolume_SetAllVolumes(asv, fmt->nChannels - 1, vols); - ok(hr == E_INVALIDARG, "SetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetAllVolumes gave wrong error: %08lx\n", hr);
hr = IAudioStreamVolume_SetAllVolumes(asv, fmt->nChannels, vols); - ok(hr == S_OK, "SetAllVolumes failed: %08x\n", hr); + ok(hr == S_OK, "SetAllVolumes failed: %08lx\n", hr);
HeapFree(GetProcessHeap(), 0, vols); IAudioStreamVolume_Release(asv); @@ -657,90 +657,90 @@ static void test_channelvolume(void)
hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return;
hr = IAudioClient_GetMixFormat(ac, &fmt); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr);
hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST, 5000000, 0, fmt, NULL); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr);
hr = IAudioClient_GetService(ac, &IID_IChannelAudioVolume, (void**)&acv); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); if(hr != S_OK) return;
hr = IChannelAudioVolume_GetChannelCount(acv, NULL); - ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08lx\n", hr);
hr = IChannelAudioVolume_GetChannelCount(acv, &chans); - ok(hr == S_OK, "GetChannelCount failed: %08x\n", hr); + ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(chans == fmt->nChannels, "GetChannelCount gave wrong number of channels: %d\n", chans);
hr = IChannelAudioVolume_GetChannelVolume(acv, fmt->nChannels, NULL); - ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08lx\n", hr);
hr = IChannelAudioVolume_GetChannelVolume(acv, fmt->nChannels, &vol); - ok(hr == E_INVALIDARG, "GetChannelCount gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "GetChannelCount gave wrong error: %08lx\n", hr);
hr = IChannelAudioVolume_GetChannelVolume(acv, 0, NULL); - ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08lx\n", hr);
hr = IChannelAudioVolume_GetChannelVolume(acv, 0, &vol); - ok(hr == S_OK, "GetChannelCount failed: %08x\n", hr); + ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(vol == 1.f, "Channel volume was not 1: %f\n", vol);
hr = IChannelAudioVolume_SetChannelVolume(acv, fmt->nChannels, -1.f, NULL); - ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08lx\n", hr);
hr = IChannelAudioVolume_SetChannelVolume(acv, 0, -1.f, NULL); - ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08lx\n", hr);
hr = IChannelAudioVolume_SetChannelVolume(acv, 0, 2.f, NULL); - ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08lx\n", hr);
hr = IChannelAudioVolume_SetChannelVolume(acv, 0, 0.2f, NULL); - ok(hr == S_OK, "SetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "SetChannelVolume failed: %08lx\n", hr);
hr = IChannelAudioVolume_GetChannelVolume(acv, 0, &vol); - ok(hr == S_OK, "GetChannelCount failed: %08x\n", hr); + ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(fabsf(vol - 0.2f) < 0.05f, "Channel volume wasn't 0.2: %f\n", vol);
hr = IChannelAudioVolume_GetAllVolumes(acv, 0, NULL); - ok(hr == NULL_PTR_ERR, "GetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "GetAllVolumes gave wrong error: %08lx\n", hr);
hr = IChannelAudioVolume_GetAllVolumes(acv, fmt->nChannels, NULL); - ok(hr == NULL_PTR_ERR, "GetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "GetAllVolumes gave wrong error: %08lx\n", hr);
vols = HeapAlloc(GetProcessHeap(), 0, fmt->nChannels * sizeof(float)); ok(vols != NULL, "HeapAlloc failed\n");
hr = IChannelAudioVolume_GetAllVolumes(acv, fmt->nChannels - 1, vols); - ok(hr == E_INVALIDARG, "GetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "GetAllVolumes gave wrong error: %08lx\n", hr);
hr = IChannelAudioVolume_GetAllVolumes(acv, fmt->nChannels, vols); - ok(hr == S_OK, "GetAllVolumes failed: %08x\n", hr); + ok(hr == S_OK, "GetAllVolumes failed: %08lx\n", hr); ok(fabsf(vols[0] - 0.2f) < 0.05f, "Channel 0 volume wasn't 0.2: %f\n", vol); for(i = 1; i < fmt->nChannels; ++i) ok(vols[i] == 1.f, "Channel %d volume is not 1: %f\n", i, vols[i]);
hr = IChannelAudioVolume_SetAllVolumes(acv, 0, NULL, NULL); - ok(hr == NULL_PTR_ERR, "SetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "SetAllVolumes gave wrong error: %08lx\n", hr);
hr = IChannelAudioVolume_SetAllVolumes(acv, fmt->nChannels, NULL, NULL); - ok(hr == NULL_PTR_ERR, "SetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "SetAllVolumes gave wrong error: %08lx\n", hr);
hr = IChannelAudioVolume_SetAllVolumes(acv, fmt->nChannels - 1, vols, NULL); - ok(hr == E_INVALIDARG, "SetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetAllVolumes gave wrong error: %08lx\n", hr);
hr = IChannelAudioVolume_SetAllVolumes(acv, fmt->nChannels, vols, NULL); - ok(hr == S_OK, "SetAllVolumes failed: %08x\n", hr); + ok(hr == S_OK, "SetAllVolumes failed: %08lx\n", hr);
hr = IChannelAudioVolume_SetChannelVolume(acv, 0, 1.0f, NULL); - ok(hr == S_OK, "SetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "SetChannelVolume failed: %08lx\n", hr);
HeapFree(GetProcessHeap(), 0, vols); IChannelAudioVolume_Release(acv); @@ -759,71 +759,71 @@ static void test_simplevolume(void)
hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return;
hr = IAudioClient_GetMixFormat(ac, &fmt); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr);
hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST, 5000000, 0, fmt, NULL); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr);
hr = IAudioClient_GetService(ac, &IID_ISimpleAudioVolume, (void**)&sav); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); if(hr != S_OK) return;
hr = ISimpleAudioVolume_GetMasterVolume(sav, NULL); - ok(hr == NULL_PTR_ERR, "GetMasterVolume gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "GetMasterVolume gave wrong error: %08lx\n", hr);
hr = ISimpleAudioVolume_GetMasterVolume(sav, &vol); - ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "GetMasterVolume failed: %08lx\n", hr);
hr = ISimpleAudioVolume_SetMasterVolume(sav, -1.f, NULL); - ok(hr == E_INVALIDARG, "SetMasterVolume gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetMasterVolume gave wrong error: %08lx\n", hr);
hr = ISimpleAudioVolume_SetMasterVolume(sav, 2.f, NULL); - ok(hr == E_INVALIDARG, "SetMasterVolume gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetMasterVolume gave wrong error: %08lx\n", hr);
hr = ISimpleAudioVolume_SetMasterVolume(sav, 0.2f, NULL); - ok(hr == S_OK, "SetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "SetMasterVolume failed: %08lx\n", hr);
hr = ISimpleAudioVolume_GetMasterVolume(sav, &vol); - ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "GetMasterVolume failed: %08lx\n", hr); ok(fabsf(vol - 0.2f) < 0.05f, "Master volume wasn't 0.2: %f\n", vol);
hr = ISimpleAudioVolume_GetMute(sav, NULL); - ok(hr == NULL_PTR_ERR, "GetMute gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "GetMute gave wrong error: %08lx\n", hr);
mute = TRUE; hr = ISimpleAudioVolume_GetMute(sav, &mute); - ok(hr == S_OK, "GetMute failed: %08x\n", hr); + ok(hr == S_OK, "GetMute failed: %08lx\n", hr); ok(mute == FALSE, "Session is already muted\n");
hr = ISimpleAudioVolume_SetMute(sav, TRUE, NULL); - ok(hr == S_OK, "SetMute failed: %08x\n", hr); + ok(hr == S_OK, "SetMute failed: %08lx\n", hr);
mute = FALSE; hr = ISimpleAudioVolume_GetMute(sav, &mute); - ok(hr == S_OK, "GetMute failed: %08x\n", hr); + ok(hr == S_OK, "GetMute failed: %08lx\n", hr); ok(mute == TRUE, "Session should have been muted\n");
hr = ISimpleAudioVolume_GetMasterVolume(sav, &vol); - ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "GetMasterVolume failed: %08lx\n", hr); ok(fabsf(vol - 0.2f) < 0.05f, "Master volume wasn't 0.2: %f\n", vol);
hr = ISimpleAudioVolume_SetMasterVolume(sav, 1.f, NULL); - ok(hr == S_OK, "SetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "SetMasterVolume failed: %08lx\n", hr);
mute = FALSE; hr = ISimpleAudioVolume_GetMute(sav, &mute); - ok(hr == S_OK, "GetMute failed: %08x\n", hr); + ok(hr == S_OK, "GetMute failed: %08lx\n", hr); ok(mute == TRUE, "Session should have been muted\n");
hr = ISimpleAudioVolume_SetMute(sav, FALSE, NULL); - ok(hr == S_OK, "SetMute failed: %08x\n", hr); + ok(hr == S_OK, "SetMute failed: %08lx\n", hr);
ISimpleAudioVolume_Release(sav); IAudioClient_Release(ac); @@ -843,51 +843,51 @@ static void test_volume_dependence(void) UINT32 nch;
hr = CoCreateGuid(&session); - ok(hr == S_OK, "CoCreateGuid failed: %08x\n", hr); + ok(hr == S_OK, "CoCreateGuid failed: %08lx\n", hr);
hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return;
hr = IAudioClient_GetMixFormat(ac, &fmt); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr);
hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST, 5000000, 0, fmt, &session); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr);
hr = IAudioClient_GetService(ac, &IID_ISimpleAudioVolume, (void**)&sav); - ok(hr == S_OK, "GetService (SimpleAudioVolume) failed: %08x\n", hr); + ok(hr == S_OK, "GetService (SimpleAudioVolume) failed: %08lx\n", hr);
hr = IAudioClient_GetService(ac, &IID_IChannelAudioVolume, (void**)&cav); - ok(hr == S_OK, "GetService (ChannelAudioVolume) failed: %08x\n", hr); + ok(hr == S_OK, "GetService (ChannelAudioVolume) failed: %08lx\n", hr);
hr = IAudioClient_GetService(ac, &IID_IAudioStreamVolume, (void**)&asv); - ok(hr == S_OK, "GetService (AudioStreamVolume) failed: %08x\n", hr); + ok(hr == S_OK, "GetService (AudioStreamVolume) failed: %08lx\n", hr); if(hr != S_OK) return;
hr = IAudioStreamVolume_SetChannelVolume(asv, 0, 0.2f); - ok(hr == S_OK, "ASV_SetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "ASV_SetChannelVolume failed: %08lx\n", hr);
hr = IChannelAudioVolume_SetChannelVolume(cav, 0, 0.4f, NULL); - ok(hr == S_OK, "CAV_SetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "CAV_SetChannelVolume failed: %08lx\n", hr);
hr = ISimpleAudioVolume_SetMasterVolume(sav, 0.6f, NULL); - ok(hr == S_OK, "SAV_SetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "SAV_SetMasterVolume failed: %08lx\n", hr);
hr = IAudioStreamVolume_GetChannelVolume(asv, 0, &vol); - ok(hr == S_OK, "ASV_GetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "ASV_GetChannelVolume failed: %08lx\n", hr); ok(fabsf(vol - 0.2f) < 0.05f, "ASV_GetChannelVolume gave wrong volume: %f\n", vol);
hr = IChannelAudioVolume_GetChannelVolume(cav, 0, &vol); - ok(hr == S_OK, "CAV_GetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "CAV_GetChannelVolume failed: %08lx\n", hr); ok(fabsf(vol - 0.4f) < 0.05f, "CAV_GetChannelVolume gave wrong volume: %f\n", vol);
hr = ISimpleAudioVolume_GetMasterVolume(sav, &vol); - ok(hr == S_OK, "SAV_GetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "SAV_GetMasterVolume failed: %08lx\n", hr); ok(fabsf(vol - 0.6f) < 0.05f, "SAV_GetMasterVolume gave wrong volume: %f\n", vol);
hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, @@ -898,28 +898,28 @@ static void test_volume_dependence(void)
hr = IAudioClient_Initialize(ac2, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST, 5000000, 0, fmt, &session); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr);
hr = IAudioClient_GetService(ac2, &IID_IChannelAudioVolume, (void**)&cav2); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr);
hr = IAudioClient_GetService(ac2, &IID_IAudioStreamVolume, (void**)&asv2); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr);
hr = IChannelAudioVolume_GetChannelVolume(cav2, 0, &vol); - ok(hr == S_OK, "CAV_GetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "CAV_GetChannelVolume failed: %08lx\n", hr); ok(fabsf(vol - 0.4f) < 0.05f, "CAV_GetChannelVolume gave wrong volume: %f\n", vol);
hr = IAudioStreamVolume_GetChannelVolume(asv2, 0, &vol); - ok(hr == S_OK, "ASV_GetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "ASV_GetChannelVolume failed: %08lx\n", hr); ok(vol == 1.f, "ASV_GetChannelVolume gave wrong volume: %f\n", vol);
hr = IChannelAudioVolume_GetChannelCount(cav2, &nch); - ok(hr == S_OK, "GetChannelCount failed: %08x\n", hr); + ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(nch == fmt->nChannels, "Got wrong channel count, expected %u: %u\n", fmt->nChannels, nch);
hr = IAudioStreamVolume_GetChannelCount(asv2, &nch); - ok(hr == S_OK, "GetChannelCount failed: %08x\n", hr); + ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(nch == fmt->nChannels, "Got wrong channel count, expected %u: %u\n", fmt->nChannels, nch);
IAudioStreamVolume_Release(asv2); @@ -929,10 +929,10 @@ static void test_volume_dependence(void) skip("Unable to open the same device twice. Skipping session volume control tests\n");
hr = IChannelAudioVolume_SetChannelVolume(cav, 0, 1.f, NULL); - ok(hr == S_OK, "CAV_SetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "CAV_SetChannelVolume failed: %08lx\n", hr);
hr = ISimpleAudioVolume_SetMasterVolume(sav, 1.f, NULL); - ok(hr == S_OK, "SAV_SetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "SAV_SetMasterVolume failed: %08lx\n", hr);
CoTaskMemFree(fmt); ISimpleAudioVolume_Release(sav); @@ -951,37 +951,37 @@ static void test_marshal(void)
hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return;
hr = IAudioClient_GetMixFormat(ac, &pwfx); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr);
hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr);
CoTaskMemFree(pwfx);
hr = IAudioClient_GetService(ac, &IID_IAudioCaptureClient, (void**)&cc); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); if(hr != S_OK) { IAudioClient_Release(ac); return; }
hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); - ok(hr == S_OK, "CreateStreamOnHGlobal failed 0x%08x\n", hr); + ok(hr == S_OK, "CreateStreamOnHGlobal failed 0x%08lx\n", hr);
/* marshal IAudioClient */
hr = CoMarshalInterface(pStream, &IID_IAudioClient, (IUnknown*)ac, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); - ok(hr == S_OK, "CoMarshalInterface IAudioClient failed 0x%08x\n", hr); + ok(hr == S_OK, "CoMarshalInterface IAudioClient failed 0x%08lx\n", hr);
IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); hr = CoUnmarshalInterface(pStream, &IID_IAudioClient, (void **)&acDest); - ok(hr == S_OK, "CoUnmarshalInterface IAudioClient failed 0x%08x\n", hr); + ok(hr == S_OK, "CoUnmarshalInterface IAudioClient failed 0x%08lx\n", hr); if (hr == S_OK) IAudioClient_Release(acDest);
@@ -989,11 +989,11 @@ static void test_marshal(void) /* marshal IAudioCaptureClient */
hr = CoMarshalInterface(pStream, &IID_IAudioCaptureClient, (IUnknown*)cc, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); - ok(hr == S_OK, "CoMarshalInterface IAudioCaptureClient failed 0x%08x\n", hr); + ok(hr == S_OK, "CoMarshalInterface IAudioCaptureClient failed 0x%08lx\n", hr);
IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); hr = CoUnmarshalInterface(pStream, &IID_IAudioCaptureClient, (void **)&ccDest); - ok(hr == S_OK, "CoUnmarshalInterface IAudioCaptureClient failed 0x%08x\n", hr); + ok(hr == S_OK, "CoUnmarshalInterface IAudioCaptureClient failed 0x%08lx\n", hr); if (hr == S_OK) IAudioCaptureClient_Release(ccDest);
@@ -1013,18 +1013,18 @@ START_TEST(capture) hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&mme); if (FAILED(hr)) { - skip("mmdevapi not available: 0x%08x\n", hr); + skip("mmdevapi not available: 0x%08lx\n", hr); goto cleanup; }
hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(mme, eCapture, eMultimedia, &dev); - ok(hr == S_OK || hr == E_NOTFOUND, "GetDefaultAudioEndpoint failed: 0x%08x\n", hr); + ok(hr == S_OK || hr == E_NOTFOUND, "GetDefaultAudioEndpoint failed: 0x%08lx\n", hr); if (hr != S_OK || !dev) { if (hr == E_NOTFOUND) skip("No sound card available\n"); else - skip("GetDefaultAudioEndpoint returns 0x%08x\n", hr); + skip("GetDefaultAudioEndpoint returns 0x%08lx\n", hr); goto cleanup; }
diff --git a/dlls/mmdevapi/tests/dependency.c b/dlls/mmdevapi/tests/dependency.c index 878056506a9..ef99d7bf239 100644 --- a/dlls/mmdevapi/tests/dependency.c +++ b/dlls/mmdevapi/tests/dependency.c @@ -42,25 +42,25 @@ START_TEST(dependency) hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&mme); if (FAILED(hr)) { - skip("mmdevapi not available: 0x%08x\n", hr); + skip("mmdevapi not available: 0x%08lx\n", hr); goto cleanup; }
hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(mme, eRender, eMultimedia, &dev); - ok(hr == S_OK || hr == E_NOTFOUND, "GetDefaultAudioEndpoint failed: 0x%08x\n", hr); + ok(hr == S_OK || hr == E_NOTFOUND, "GetDefaultAudioEndpoint failed: 0x%08lx\n", hr); if (hr != S_OK) { if (hr == E_NOTFOUND) skip("No sound card available\n"); else - skip("GetDefaultAudioEndpoint returns 0x%08x\n", hr); + skip("GetDefaultAudioEndpoint returns 0x%08lx\n", hr); goto cleanup; }
ok(!GetModuleHandleA("dsound.dll"), "dsound.dll was already loaded!\n");
hr = IMMDevice_Activate(dev, &IID_IDirectSound8, CLSCTX_INPROC_SERVER, NULL, (void**)&ds8); - ok(hr == S_OK, "Activating ds8 interface failed: 0x%08x\n", hr); + ok(hr == S_OK, "Activating ds8 interface failed: 0x%08lx\n", hr); if (hr == S_OK) { ok(GetModuleHandleA("dsound.dll") != NULL, "dsound.dll not loaded!\n"); @@ -71,7 +71,7 @@ START_TEST(dependency)
ok(!GetModuleHandleA("quartz.dll"), "quartz.dll was already loaded!\n"); hr = IMMDevice_Activate(dev, &IID_IBaseFilter, CLSCTX_INPROC_SERVER, NULL, (void**)&bf); - ok(hr == S_OK, "Activating bf failed: 0x%08x\n", hr); + ok(hr == S_OK, "Activating bf failed: 0x%08lx\n", hr); if (hr == S_OK) { ok(GetModuleHandleA("quartz.dll") != NULL, "quartz.dll not loaded!\n"); @@ -80,7 +80,7 @@ START_TEST(dependency) { CLSID clsid; hr = IBaseFilter_GetClassID(bf, &clsid); - ok(hr == S_OK, "GetClassId failed with 0x%08x\n", hr); + ok(hr == S_OK, "GetClassId failed with 0x%08lx\n", hr); if (hr == S_OK) ok(IsEqualCLSID(&clsid, &CLSID_DSoundRender), "Wrong class id %s\n", wine_dbgstr_guid(&clsid)); } diff --git a/dlls/mmdevapi/tests/mmdevenum.c b/dlls/mmdevapi/tests/mmdevenum.c index 1fd1c7d4aca..a5b692a53ee 100644 --- a/dlls/mmdevapi/tests/mmdevenum.c +++ b/dlls/mmdevapi/tests/mmdevenum.c @@ -51,17 +51,17 @@ static void test_collection(IMMDeviceEnumerator *mme, IMMDeviceCollection *col) /* collection doesn't keep a ref on parent */ IMMDeviceEnumerator_AddRef(mme); ref = IMMDeviceEnumerator_Release(mme); - ok(ref == 2, "Reference count on parent is %u\n", ref); + ok(ref == 2, "Reference count on parent is %lu\n", ref);
ref = IMMDeviceCollection_AddRef(col); IMMDeviceCollection_Release(col); - ok(ref == 2, "Invalid reference count %u on collection\n", ref); + ok(ref == 2, "Invalid reference count %lu on collection\n", ref);
hr = IMMDeviceCollection_QueryInterface(col, &IID_IUnknown, NULL); - ok(hr == E_POINTER, "Null ppv returns %08x\n", hr); + ok(hr == E_POINTER, "Null ppv returns %08lx\n", hr);
hr = IMMDeviceCollection_QueryInterface(col, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "Cannot query for IID_IUnknown: 0x%08x\n", hr); + ok(hr == S_OK, "Cannot query for IID_IUnknown: 0x%08lx\n", hr); if (hr == S_OK) { ok((IUnknown*)col == unk, "Pointers are not identical %p/%p/%p\n", col, unk, mme); @@ -69,24 +69,24 @@ static void test_collection(IMMDeviceEnumerator *mme, IMMDeviceCollection *col) }
hr = IMMDeviceCollection_QueryInterface(col, &IID_IMMDeviceCollection, (void**)&col2); - ok(hr == S_OK, "Cannot query for IID_IMMDeviceCollection: 0x%08x\n", hr); + ok(hr == S_OK, "Cannot query for IID_IMMDeviceCollection: 0x%08lx\n", hr); if (hr == S_OK) IMMDeviceCollection_Release(col2);
hr = IMMDeviceCollection_QueryInterface(col, &IID_IMMDeviceEnumerator, (void**)&mme2); - ok(hr == E_NOINTERFACE, "Query for IID_IMMDeviceEnumerator returned: 0x%08x\n", hr); + ok(hr == E_NOINTERFACE, "Query for IID_IMMDeviceEnumerator returned: 0x%08lx\n", hr); if (hr == S_OK) IMMDeviceEnumerator_Release(mme2);
hr = IMMDeviceCollection_GetCount(col, NULL); - ok(hr == E_POINTER, "GetCount returned 0x%08x\n", hr); + ok(hr == E_POINTER, "GetCount returned 0x%08lx\n", hr);
hr = IMMDeviceCollection_GetCount(col, &numdev); - ok(hr == S_OK, "GetCount returned 0x%08x\n", hr); + ok(hr == S_OK, "GetCount returned 0x%08lx\n", hr);
dev = (void*)(LONG_PTR)0x12345678; hr = IMMDeviceCollection_Item(col, numdev, &dev); - ok(hr == E_INVALIDARG, "Asking for too high device returned 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "Asking for too high device returned 0x%08lx\n", hr); ok(dev == NULL, "Returned non-null device\n");
g_num_mmdevs = numdev; @@ -94,10 +94,10 @@ static void test_collection(IMMDeviceEnumerator *mme, IMMDeviceCollection *col) if (numdev) { hr = IMMDeviceCollection_Item(col, 0, NULL); - ok(hr == E_POINTER, "Query with null pointer returned 0x%08x\n", hr); + ok(hr == E_POINTER, "Query with null pointer returned 0x%08lx\n", hr);
hr = IMMDeviceCollection_Item(col, 0, &dev); - ok(hr == S_OK, "Valid Item returned 0x%08x\n", hr); + ok(hr == S_OK, "Valid Item returned 0x%08lx\n", hr); ok(dev != NULL, "Device is null!\n"); if (dev != NULL) { @@ -113,7 +113,7 @@ static void test_collection(IMMDeviceEnumerator *mme, IMMDeviceCollection *col) trace("Device found: %s\n", temp);
hr = IMMDeviceEnumerator_GetDevice(mme, id, &dev2); - ok(hr == S_OK, "GetDevice failed: %08x\n", hr); + ok(hr == S_OK, "GetDevice failed: %08lx\n", hr);
IMMDevice_Release(dev2);
@@ -188,7 +188,7 @@ static HRESULT WINAPI async_activate_ActivateCompleted( hr = IActivateAudioInterfaceAsyncOperation_GetActivateResult(op, &async_activate_test.result_hr, &async_activate_test.result_iface); ok(hr == S_OK, - "%s: GetActivateResult failed: %08x\n", + "%s: GetActivateResult failed: %08lx\n", async_activate_test.msg_pfx, hr);
return S_OK; @@ -244,16 +244,16 @@ static void test_ActivateAudioInterfaceAsync(void)
EnterCriticalSection(&async_activate_test.lock); hr = pActivateAudioInterfaceAsync(L"winetest_bogus", &IID_IAudioClient3, NULL, &async_activate_done, &async_activate_test.op); - ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08x\n", hr); + ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08lx\n", hr); LeaveCriticalSection(&async_activate_test.lock);
IActivateAudioInterfaceAsyncOperation_Release(async_activate_test.op);
dr = WaitForSingleObject(async_activate_test.evt, 1000); /* wait for all refs other than our own to be released */ ok(dr == WAIT_OBJECT_0, "Timed out waiting for async activate to complete\n"); - ok(async_activate_test.ref == 1, "ActivateAudioInterfaceAsync leaked a handler ref: %u\n", async_activate_test.ref); + ok(async_activate_test.ref == 1, "ActivateAudioInterfaceAsync leaked a handler ref: %lu\n", async_activate_test.ref); ok(async_activate_test.result_hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), - "mmdevice activation gave wrong result: %08x\n", async_activate_test.result_hr); + "mmdevice activation gave wrong result: %08lx\n", async_activate_test.result_hr); ok(async_activate_test.result_iface == NULL, "Got non-NULL iface pointer: %p\n", async_activate_test.result_iface);
@@ -263,16 +263,16 @@ static void test_ActivateAudioInterfaceAsync(void)
EnterCriticalSection(&async_activate_test.lock); hr = pActivateAudioInterfaceAsync(g_device_path, &IID_IAudioClient3, NULL, &async_activate_done, &async_activate_test.op); - ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08x\n", hr); + ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08lx\n", hr); LeaveCriticalSection(&async_activate_test.lock);
IActivateAudioInterfaceAsyncOperation_Release(async_activate_test.op);
dr = WaitForSingleObject(async_activate_test.evt, 1000); ok(dr == WAIT_OBJECT_0, "Timed out waiting for async activate to complete\n"); - ok(async_activate_test.ref == 1, "ActivateAudioInterfaceAsync leaked a handler ref: %u\n", async_activate_test.ref); + ok(async_activate_test.ref == 1, "ActivateAudioInterfaceAsync leaked a handler ref: %lu\n", async_activate_test.ref); ok(async_activate_test.result_hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), - "mmdevice activation gave wrong result: %08x\n", async_activate_test.result_hr); + "mmdevice activation gave wrong result: %08lx\n", async_activate_test.result_hr); ok(async_activate_test.result_iface == NULL, "Got non-NULL iface pointer: %p\n", async_activate_test.result_iface); }
@@ -283,7 +283,7 @@ static void test_ActivateAudioInterfaceAsync(void)
EnterCriticalSection(&async_activate_test.lock); hr = pActivateAudioInterfaceAsync(path, &IID_IAudioClient3, NULL, &async_activate_done, &async_activate_test.op); - ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08x\n", hr); + ok(hr == S_OK, "ActivateAudioInterfaceAsync failed: %08lx\n", hr); LeaveCriticalSection(&async_activate_test.lock);
IActivateAudioInterfaceAsyncOperation_Release(async_activate_test.op); @@ -294,14 +294,14 @@ static void test_ActivateAudioInterfaceAsync(void) ok(async_activate_test.result_hr == S_OK || (g_num_mmdevs == 0 && async_activate_test.result_hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) || /* no devices */ broken(async_activate_test.result_hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)), /* win8 doesn't support DEVINTERFACE_AUDIO_RENDER */ - "mmdevice activation gave wrong result: %08x\n", async_activate_test.result_hr); + "mmdevice activation gave wrong result: %08lx\n", async_activate_test.result_hr);
if(async_activate_test.result_hr == S_OK){ ok(async_activate_test.result_iface != NULL, "Got NULL iface pointer on success?\n");
/* returned iface should be the IID we requested */ hr = IUnknown_QueryInterface(async_activate_test.result_iface, &IID_IAudioClient3, (void**)&ac3); - ok(hr == S_OK, "Failed to query IAudioClient3: %08x\n", hr); + ok(hr == S_OK, "Failed to query IAudioClient3: %08lx\n", hr); ok(async_activate_test.result_iface == (IUnknown*)ac3, "Activated interface other than IAudioClient3!\n"); IAudioClient3_Release(ac3); @@ -396,17 +396,17 @@ START_TEST(mmdevenum) hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&mme); if (FAILED(hr)) { - skip("mmdevapi not available: 0x%08x\n", hr); + skip("mmdevapi not available: 0x%08lx\n", hr); return; }
/* Odd behavior.. bug? */ ref = IMMDeviceEnumerator_AddRef(mme); - ok(ref == 3, "Invalid reference count after incrementing: %u\n", ref); + ok(ref == 3, "Invalid reference count after incrementing: %lu\n", ref); IMMDeviceEnumerator_Release(mme);
hr = IMMDeviceEnumerator_QueryInterface(mme, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "returned 0x%08x\n", hr); + ok(hr == S_OK, "returned 0x%08lx\n", hr); if (hr != S_OK) return;
ok( (LONG_PTR)mme == (LONG_PTR)unk, "Pointers are unequal %p/%p\n", unk, mme); @@ -414,39 +414,39 @@ START_TEST(mmdevenum)
/* Proving that it is static.. */ hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&mme2); - ok(hr == S_OK, "CoCreateInstance failed: 0x%08x\n", hr); + ok(hr == S_OK, "CoCreateInstance failed: 0x%08lx\n", hr); IMMDeviceEnumerator_Release(mme2); ok(mme == mme2, "Pointers are not equal!\n");
hr = IMMDeviceEnumerator_QueryInterface(mme, &IID_IUnknown, NULL); - ok(hr == E_POINTER, "Null pointer on QueryInterface returned %08x\n", hr); + ok(hr == E_POINTER, "Null pointer on QueryInterface returned %08lx\n", hr);
hr = IMMDeviceEnumerator_QueryInterface(mme, &GUID_NULL, (void**)&unk); ok(!unk, "Unk not reset to null after invalid QI\n"); - ok(hr == E_NOINTERFACE, "Invalid hr %08x returned on IID_NULL\n", hr); + ok(hr == E_NOINTERFACE, "Invalid hr %08lx returned on IID_NULL\n", hr);
hr = IMMDeviceEnumerator_GetDevice(mme, L"notadevice", NULL); - ok(hr == E_POINTER, "GetDevice gave wrong error: %08x\n", hr); + ok(hr == E_POINTER, "GetDevice gave wrong error: %08lx\n", hr);
hr = IMMDeviceEnumerator_GetDevice(mme, NULL, &dev); - ok(hr == E_POINTER, "GetDevice gave wrong error: %08x\n", hr); + ok(hr == E_POINTER, "GetDevice gave wrong error: %08lx\n", hr);
hr = IMMDeviceEnumerator_GetDevice(mme, L"notadevice", &dev); - ok(hr == E_INVALIDARG, "GetDevice gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "GetDevice gave wrong error: %08lx\n", hr);
col = (void*)(LONG_PTR)0x12345678; hr = IMMDeviceEnumerator_EnumAudioEndpoints(mme, 0xffff, DEVICE_STATEMASK_ALL, &col); - ok(hr == E_INVALIDARG, "Setting invalid data flow returned 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "Setting invalid data flow returned 0x%08lx\n", hr); ok(col == NULL, "Collection pointer non-null on failure\n");
hr = IMMDeviceEnumerator_EnumAudioEndpoints(mme, eAll, DEVICE_STATEMASK_ALL+1, &col); - ok(hr == E_INVALIDARG, "Setting invalid mask returned 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "Setting invalid mask returned 0x%08lx\n", hr);
hr = IMMDeviceEnumerator_EnumAudioEndpoints(mme, eAll, DEVICE_STATEMASK_ALL, NULL); - ok(hr == E_POINTER, "Invalid pointer returned: 0x%08x\n", hr); + ok(hr == E_POINTER, "Invalid pointer returned: 0x%08lx\n", hr);
hr = IMMDeviceEnumerator_EnumAudioEndpoints(mme, eAll, DEVICE_STATEMASK_ALL, &col); - ok(hr == S_OK, "Valid EnumAudioEndpoints returned 0x%08x\n", hr); + ok(hr == S_OK, "Valid EnumAudioEndpoints returned 0x%08lx\n", hr); if (hr == S_OK) { ok(!!col, "Returned null pointer\n"); @@ -455,28 +455,28 @@ START_TEST(mmdevenum) }
hr = IMMDeviceEnumerator_RegisterEndpointNotificationCallback(mme, NULL); - ok(hr == E_POINTER, "RegisterEndpointNotificationCallback failed: %08x\n", hr); + ok(hr == E_POINTER, "RegisterEndpointNotificationCallback failed: %08lx\n", hr);
hr = IMMDeviceEnumerator_RegisterEndpointNotificationCallback(mme, ¬if); - ok(hr == S_OK, "RegisterEndpointNotificationCallback failed: %08x\n", hr); + ok(hr == S_OK, "RegisterEndpointNotificationCallback failed: %08lx\n", hr);
hr = IMMDeviceEnumerator_RegisterEndpointNotificationCallback(mme, ¬if); - ok(hr == S_OK, "RegisterEndpointNotificationCallback failed: %08x\n", hr); + ok(hr == S_OK, "RegisterEndpointNotificationCallback failed: %08lx\n", hr);
hr = IMMDeviceEnumerator_UnregisterEndpointNotificationCallback(mme, NULL); - ok(hr == E_POINTER, "UnregisterEndpointNotificationCallback failed: %08x\n", hr); + ok(hr == E_POINTER, "UnregisterEndpointNotificationCallback failed: %08lx\n", hr);
hr = IMMDeviceEnumerator_UnregisterEndpointNotificationCallback(mme, (IMMNotificationClient*)0xdeadbeef); - ok(hr == E_NOTFOUND, "UnregisterEndpointNotificationCallback failed: %08x\n", hr); + ok(hr == E_NOTFOUND, "UnregisterEndpointNotificationCallback failed: %08lx\n", hr);
hr = IMMDeviceEnumerator_UnregisterEndpointNotificationCallback(mme, ¬if); - ok(hr == S_OK, "UnregisterEndpointNotificationCallback failed: %08x\n", hr); + ok(hr == S_OK, "UnregisterEndpointNotificationCallback failed: %08lx\n", hr);
hr = IMMDeviceEnumerator_UnregisterEndpointNotificationCallback(mme, ¬if); - ok(hr == S_OK, "UnregisterEndpointNotificationCallback failed: %08x\n", hr); + ok(hr == S_OK, "UnregisterEndpointNotificationCallback failed: %08lx\n", hr);
hr = IMMDeviceEnumerator_UnregisterEndpointNotificationCallback(mme, ¬if); - ok(hr == E_NOTFOUND, "UnregisterEndpointNotificationCallback failed: %08x\n", hr); + ok(hr == E_NOTFOUND, "UnregisterEndpointNotificationCallback failed: %08lx\n", hr);
IMMDeviceEnumerator_Release(mme);
diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index 8999699fe6b..89eaada5fd7 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -45,7 +45,7 @@ static void test_propertystore(IPropertyStore *store)
pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, &PKEY_AudioEndpoint_GUID, &pv); - ok(hr == S_OK, "Failed with %08x\n", hr); + ok(hr == S_OK, "Failed with %08lx\n", hr); ok(pv.vt == VT_LPWSTR, "Value should be %i, is %i\n", VT_LPWSTR, pv.vt); if (hr == S_OK && pv.vt == VT_LPWSTR) { @@ -56,19 +56,19 @@ static void test_propertystore(IPropertyStore *store)
pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_FriendlyName, &pv); - ok(hr == S_OK, "Failed with %08x\n", hr); + ok(hr == S_OK, "Failed with %08lx\n", hr); ok(pv.vt == VT_LPWSTR && pv.pwszVal, "FriendlyName value had wrong type: 0x%x or was NULL\n", pv.vt); PropVariantClear(&pv);
pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_Enabled, &pv); - ok(hr == S_OK, "Failed with %08x\n", hr); + ok(hr == S_OK, "Failed with %08lx\n", hr); ok(pv.vt == VT_EMPTY, "Key should not be found\n"); PropVariantClear(&pv);
pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_ClassGuid, &pv); - ok(hr == S_OK, "Failed with %08x\n", hr); + ok(hr == S_OK, "Failed with %08lx\n", hr); ok(pv.vt == VT_EMPTY, "Key should not be found\n"); PropVariantClear(&pv); } @@ -84,7 +84,7 @@ static void test_deviceinterface(IPropertyStore *store)
pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, &deviceinterface_key, &pv); - ok(hr == S_OK, "GetValue failed: %08x\n", hr); + ok(hr == S_OK, "GetValue failed: %08lx\n", hr); ok(pv.vt == VT_LPWSTR, "Got wrong variant type: 0x%x\n", pv.vt); trace("device interface: %s\n", wine_dbgstr_w(pv.pwszVal)); PropVariantClear(&pv); @@ -103,12 +103,12 @@ static void test_getat(IPropertyStore *store)
hr = IPropertyStore_GetCount(store, &propcount);
- ok(hr == S_OK, "Failed with %08x\n", hr); - ok(propcount > 0, "Propcount %d should be greater than zero\n", propcount); + ok(hr == S_OK, "Failed with %08lx\n", hr); + ok(propcount > 0, "Propcount %ld should be greater than zero\n", propcount);
for (prop = 0; prop < propcount; prop++) { hr = IPropertyStore_GetAt(store, prop, &pkey); - ok(hr == S_OK, "Failed with %08x\n", hr); + ok(hr == S_OK, "Failed with %08lx\n", hr); if (IsEqualPropertyKey(pkey, DEVPKEY_Device_FriendlyName)) found_name = TRUE; if (IsEqualPropertyKey(pkey, DEVPKEY_Device_DeviceDesc)) @@ -137,7 +137,7 @@ static void test_setvalue_on_wow64(IPropertyStore *store)
pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, &PKEY_AudioEndpoint_GUID, &pv); - ok(hr == S_OK, "Failed to get Endpoint GUID: %08x\n", hr); + ok(hr == S_OK, "Failed to get Endpoint GUID: %08lx\n", hr);
guidW = pv.pwszVal;
@@ -145,7 +145,7 @@ static void test_setvalue_on_wow64(IPropertyStore *store) pv.ulVal = 0xAB;
hr = IPropertyStore_SetValue(store, &PKEY_Bogus, &pv); - ok(hr == S_OK || hr == E_ACCESSDENIED, "SetValue failed: %08x\n", hr); + ok(hr == S_OK || hr == E_ACCESSDENIED, "SetValue failed: %08lx\n", hr); if (hr != S_OK) { win_skip("Missing permission to write to registry\n"); @@ -155,25 +155,25 @@ static void test_setvalue_on_wow64(IPropertyStore *store) pv.ulVal = 0x00;
hr = IPropertyStore_GetValue(store, &PKEY_Bogus, &pv); - ok(hr == S_OK, "GetValue failed: %08x\n", hr); - ok(pv.ulVal == 0xAB, "Got wrong value: 0x%x\n", pv.ulVal); + ok(hr == S_OK, "GetValue failed: %08lx\n", hr); + ok(pv.ulVal == 0xAB, "Got wrong value: 0x%lx\n", pv.ulVal);
/* should find the key in 64-bit view */ ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, software_renderW, 0, KEY_READ|KEY_WOW64_64KEY, &root); - ok(ret == ERROR_SUCCESS, "Couldn't open mmdevices Render key: %u\n", ret); + ok(ret == ERROR_SUCCESS, "Couldn't open mmdevices Render key: %lu\n", ret);
ret = RegOpenKeyExW(root, guidW, 0, KEY_READ|KEY_WOW64_64KEY, &devkey); - ok(ret == ERROR_SUCCESS, "Couldn't open mmdevice guid key: %u\n", ret); + ok(ret == ERROR_SUCCESS, "Couldn't open mmdevice guid key: %lu\n", ret);
ret = RegOpenKeyExW(devkey, L"Properties", 0, KEY_READ|KEY_WOW64_64KEY, &props); - ok(ret == ERROR_SUCCESS, "Couldn't open mmdevice property key: %u\n", ret); + ok(ret == ERROR_SUCCESS, "Couldn't open mmdevice property key: %lu\n", ret);
/* Note: the registry key exists even without calling IPropStore::Commit */ size = sizeof(regval); ret = RegQueryValueExW(props, bogusW, NULL, &type, (LPBYTE)®val, &size); - ok(ret == ERROR_SUCCESS, "Couldn't get bogus propertykey value: %u\n", ret); - ok(type == REG_DWORD, "Got wrong value type: %u\n", type); - ok(regval == 0xAB, "Got wrong value: 0x%x\n", regval); + ok(ret == ERROR_SUCCESS, "Couldn't get bogus propertykey value: %lu\n", ret); + ok(type == REG_DWORD, "Got wrong value type: %lu\n", type); + ok(regval == 0xAB, "Got wrong value: 0x%lx\n", regval);
RegCloseKey(props); RegCloseKey(devkey); @@ -183,7 +183,7 @@ static void test_setvalue_on_wow64(IPropertyStore *store)
/* should NOT find the key in 32-bit view */ ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, software_renderW, 0, KEY_READ, &root); - ok(ret == ERROR_FILE_NOT_FOUND, "Wrong error when opening mmdevices Render key: %u\n", ret); + ok(ret == ERROR_FILE_NOT_FOUND, "Wrong error when opening mmdevices Render key: %lu\n", ret); }
START_TEST(propstore) @@ -204,39 +204,39 @@ START_TEST(propstore) hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&mme); if (FAILED(hr)) { - skip("mmdevapi not available: 0x%08x\n", hr); + skip("mmdevapi not available: 0x%08lx\n", hr); goto cleanup; }
hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(mme, eRender, eMultimedia, &dev); - ok(hr == S_OK || hr == E_NOTFOUND, "GetDefaultAudioEndpoint failed: 0x%08x\n", hr); + ok(hr == S_OK || hr == E_NOTFOUND, "GetDefaultAudioEndpoint failed: 0x%08lx\n", hr); if (hr != S_OK) { if (hr == E_NOTFOUND) skip("No sound card available\n"); else - skip("GetDefaultAudioEndpoint returns 0x%08x\n", hr); + skip("GetDefaultAudioEndpoint returns 0x%08lx\n", hr); goto cleanup; } store = NULL; hr = IMMDevice_OpenPropertyStore(dev, 3, &store); - ok(hr == E_INVALIDARG, "Wrong hr returned: %08x\n", hr); + ok(hr == E_INVALIDARG, "Wrong hr returned: %08lx\n", hr); if (hr != S_OK) /* It seems on windows returning with E_INVALIDARG doesn't * set store to NULL, so just don't set store to non-null * before calling this function */ - ok(!store, "Store set to non-NULL on failure: %p/%08x\n", store, hr); + ok(!store, "Store set to non-NULL on failure: %p/%08lx\n", store, hr); else if (store) IPropertyStore_Release(store); hr = IMMDevice_OpenPropertyStore(dev, STGM_READ, NULL); - ok(hr == E_POINTER, "Wrong hr returned: %08x\n", hr); + ok(hr == E_POINTER, "Wrong hr returned: %08lx\n", hr);
store = NULL; hr = IMMDevice_OpenPropertyStore(dev, STGM_READWRITE, &store); if(hr == E_ACCESSDENIED) hr = IMMDevice_OpenPropertyStore(dev, STGM_READ, &store); - ok(hr == S_OK, "Opening valid store returned %08x\n", hr); + ok(hr == S_OK, "Opening valid store returned %08lx\n", hr); if (store) { test_propertystore(store); diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 6b77edc569e..4e19b91c5f5 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -104,28 +104,28 @@ static void test_uninitialized(IAudioClient *ac) IUnknown *unk;
hr = IAudioClient_GetBufferSize(ac, &num); - ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized GetBufferSize call returns %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized GetBufferSize call returns %08lx\n", hr);
hr = IAudioClient_GetStreamLatency(ac, &t1); - ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized GetStreamLatency call returns %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized GetStreamLatency call returns %08lx\n", hr);
hr = IAudioClient_GetCurrentPadding(ac, &num); - ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized GetCurrentPadding call returns %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized GetCurrentPadding call returns %08lx\n", hr);
hr = IAudioClient_Start(ac); - ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized Start call returns %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized Start call returns %08lx\n", hr);
hr = IAudioClient_Stop(ac); - ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized Stop call returns %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized Stop call returns %08lx\n", hr);
hr = IAudioClient_Reset(ac); - ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized Reset call returns %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized Reset call returns %08lx\n", hr);
hr = IAudioClient_SetEventHandle(ac, handle); - ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized SetEventHandle call returns %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized SetEventHandle call returns %08lx\n", hr);
hr = IAudioClient_GetService(ac, &IID_IAudioStreamVolume, (void**)&unk); - ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized GetService call returns %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Uninitialized GetService call returns %08lx\n", hr);
CloseHandle(handle); } @@ -148,7 +148,7 @@ static void test_audioclient(void) NULL, (void**)&ac3); ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* win8 */, - "IAudioClient3 Activation failed with %08x\n", hr); + "IAudioClient3 Activation failed with %08lx\n", hr); if(hr == S_OK) IAudioClient3_Release(ac3);
@@ -156,62 +156,62 @@ static void test_audioclient(void) NULL, (void**)&ac2); ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* win7 */, - "IAudioClient2 Activation failed with %08x\n", hr); + "IAudioClient2 Activation failed with %08lx\n", hr); if(hr == S_OK) IAudioClient2_Release(ac2);
hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return;
handle = CreateEventW(NULL, FALSE, FALSE, NULL);
hr = IAudioClient_QueryInterface(ac, &IID_IUnknown, NULL); - ok(hr == E_POINTER, "QueryInterface(NULL) returned %08x\n", hr); + ok(hr == E_POINTER, "QueryInterface(NULL) returned %08lx\n", hr);
unk = (void*)(LONG_PTR)0x12345678; hr = IAudioClient_QueryInterface(ac, &IID_NULL, (void**)&unk); - ok(hr == E_NOINTERFACE, "QueryInterface(IID_NULL) returned %08x\n", hr); + ok(hr == E_NOINTERFACE, "QueryInterface(IID_NULL) returned %08lx\n", hr); ok(!unk, "QueryInterface(IID_NULL) returned non-null pointer %p\n", unk);
hr = IAudioClient_QueryInterface(ac, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface(IID_IUnknown) returned %08x\n", hr); + ok(hr == S_OK, "QueryInterface(IID_IUnknown) returned %08lx\n", hr); if (unk) { ref = IUnknown_Release(unk); - ok(ref == 1, "Released count is %u\n", ref); + ok(ref == 1, "Released count is %lu\n", ref); }
hr = IAudioClient_QueryInterface(ac, &IID_IAudioClient, (void**)&unk); - ok(hr == S_OK, "QueryInterface(IID_IAudioClient) returned %08x\n", hr); + ok(hr == S_OK, "QueryInterface(IID_IAudioClient) returned %08lx\n", hr); if (unk) { ref = IUnknown_Release(unk); - ok(ref == 1, "Released count is %u\n", ref); + ok(ref == 1, "Released count is %lu\n", ref); }
hr = IAudioClient_GetDevicePeriod(ac, NULL, NULL); - ok(hr == E_POINTER, "Invalid GetDevicePeriod call returns %08x\n", hr); + ok(hr == E_POINTER, "Invalid GetDevicePeriod call returns %08lx\n", hr);
hr = IAudioClient_GetDevicePeriod(ac, &t1, NULL); - ok(hr == S_OK, "Valid GetDevicePeriod call returns %08x\n", hr); + ok(hr == S_OK, "Valid GetDevicePeriod call returns %08lx\n", hr);
hr = IAudioClient_GetDevicePeriod(ac, NULL, &t2); - ok(hr == S_OK, "Valid GetDevicePeriod call returns %08x\n", hr); + ok(hr == S_OK, "Valid GetDevicePeriod call returns %08lx\n", hr);
hr = IAudioClient_GetDevicePeriod(ac, &t1, &t2); - ok(hr == S_OK, "Valid GetDevicePeriod call returns %08x\n", hr); + ok(hr == S_OK, "Valid GetDevicePeriod call returns %08lx\n", hr); trace("Returned periods: %u.%04u ms %u.%04u ms\n", (UINT)(t1/10000), (UINT)(t1 % 10000), (UINT)(t2/10000), (UINT)(t2 % 10000));
hr = IAudioClient_GetMixFormat(ac, NULL); - ok(hr == E_POINTER, "GetMixFormat returns %08x\n", hr); + ok(hr == E_POINTER, "GetMixFormat returns %08lx\n", hr);
hr = IAudioClient_GetMixFormat(ac, &pwfx); - ok(hr == S_OK, "Valid GetMixFormat returns %08x\n", hr); + ok(hr == S_OK, "Valid GetMixFormat returns %08lx\n", hr);
if (hr == S_OK) { @@ -219,7 +219,7 @@ static void test_audioclient(void) trace("Tag: %04x\n", pwfx->wFormatTag); trace("bits: %u\n", pwfx->wBitsPerSample); trace("chan: %u\n", pwfx->nChannels); - trace("rate: %u\n", pwfx->nSamplesPerSec); + trace("rate: %lu\n", pwfx->nSamplesPerSec); trace("align: %u\n", pwfx->nBlockAlign); trace("extra: %u\n", pwfx->cbSize); ok(pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE, "wFormatTag is %x\n", pwfx->wFormatTag); @@ -227,7 +227,7 @@ static void test_audioclient(void) { WAVEFORMATEXTENSIBLE *pwfxe = (void*)pwfx; trace("Res: %u\n", pwfxe->Samples.wReserved); - trace("Mask: %x\n", pwfxe->dwChannelMask); + trace("Mask: %lx\n", pwfxe->dwChannelMask); trace("Alg: %s\n", IsEqualGUID(&pwfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM)?"PCM": (IsEqualGUID(&pwfxe->SubFormat, @@ -237,30 +237,30 @@ static void test_audioclient(void)
pwfxe->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &pwfx2); - ok(hr == S_OK, "Valid IsFormatSupported(Shared) call returns %08x\n", hr); + ok(hr == S_OK, "Valid IsFormatSupported(Shared) call returns %08lx\n", hr); ok(pwfx2 == NULL, "pwfx2 is non-null\n"); CoTaskMemFree(pwfx2); }
hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &pwfx2); - ok(hr == S_OK, "Valid IsFormatSupported(Shared) call returns %08x\n", hr); + ok(hr == S_OK, "Valid IsFormatSupported(Shared) call returns %08lx\n", hr); ok(pwfx2 == NULL, "pwfx2 is non-null\n"); CoTaskMemFree(pwfx2);
hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, NULL, NULL); - ok(hr == E_POINTER, "IsFormatSupported(NULL) call returns %08x\n", hr); + ok(hr == E_POINTER, "IsFormatSupported(NULL) call returns %08lx\n", hr);
hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, NULL); - ok(hr == E_POINTER, "IsFormatSupported(Shared,NULL) call returns %08x\n", hr); + ok(hr == E_POINTER, "IsFormatSupported(Shared,NULL) call returns %08lx\n", hr);
hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_EXCLUSIVE, pwfx, NULL); ok(hr == S_OK || hr == AUDCLNT_E_UNSUPPORTED_FORMAT || hr == AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED, - "IsFormatSupported(Exclusive) call returns %08x\n", hr); + "IsFormatSupported(Exclusive) call returns %08lx\n", hr); hexcl = hr;
pwfx2 = (WAVEFORMATEX*)0xDEADF00D; hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_EXCLUSIVE, pwfx, &pwfx2); - ok(hr == hexcl, "IsFormatSupported(Exclusive) call returns %08x\n", hr); + ok(hr == hexcl, "IsFormatSupported(Exclusive) call returns %08lx\n", hr); ok(pwfx2 == NULL, "pwfx2 non-null on exclusive IsFormatSupported\n");
if (hexcl != AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED) @@ -269,20 +269,20 @@ static void test_audioclient(void) hr = IAudioClient_IsFormatSupported(ac, 0xffffffff, pwfx, NULL); ok(hr == E_INVALIDARG/*w32*/ || broken(hr == AUDCLNT_E_UNSUPPORTED_FORMAT/*w64 response from exclusive mode driver */), - "IsFormatSupported(0xffffffff) call returns %08x\n", hr); + "IsFormatSupported(0xffffffff) call returns %08lx\n", hr); }
hr = IAudioClient_QueryInterface(ac, &IID_IAudioClient2, (void**)&ac2); if (hr == S_OK) { hr = IAudioClient2_IsOffloadCapable(ac2, AudioCategory_BackgroundCapableMedia, NULL); - ok(hr == E_INVALIDARG, "IsOffloadCapable gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "IsOffloadCapable gave wrong error: %08lx\n", hr);
hr = IAudioClient2_IsOffloadCapable(ac2, AudioCategory_BackgroundCapableMedia, &offload_capable); - ok(hr == S_OK, "IsOffloadCapable failed: %08x\n", hr); + ok(hr == S_OK, "IsOffloadCapable failed: %08lx\n", hr);
hr = IAudioClient2_SetClientProperties(ac2, NULL); - ok(hr == E_POINTER, "SetClientProperties with NULL props gave wrong error: %08x\n", hr); + ok(hr == E_POINTER, "SetClientProperties with NULL props gave wrong error: %08lx\n", hr);
/* invalid cbSize */ client_props.cbSize = 0; @@ -291,7 +291,7 @@ static void test_audioclient(void) client_props.Options = 0;
hr = IAudioClient2_SetClientProperties(ac2, &client_props); - ok(hr == E_INVALIDARG, "SetClientProperties with invalid cbSize gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetClientProperties with invalid cbSize gave wrong error: %08lx\n", hr);
/* offload consistency */ client_props.cbSize = sizeof(client_props) - sizeof(client_props.Options); @@ -299,21 +299,21 @@ static void test_audioclient(void)
hr = IAudioClient2_SetClientProperties(ac2, &client_props); if(!offload_capable) - ok(hr == AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE, "SetClientProperties(offload) gave wrong error: %08x\n", hr); + ok(hr == AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE, "SetClientProperties(offload) gave wrong error: %08lx\n", hr); else - ok(hr == S_OK, "SetClientProperties(offload) failed: %08x\n", hr); + ok(hr == S_OK, "SetClientProperties(offload) failed: %08lx\n", hr);
/* disable offload */ client_props.bIsOffload = FALSE; hr = IAudioClient2_SetClientProperties(ac2, &client_props); - ok(hr == S_OK, "SetClientProperties failed: %08x\n", hr); + ok(hr == S_OK, "SetClientProperties failed: %08lx\n", hr);
/* Options field added in Win 8.1 */ client_props.cbSize = sizeof(client_props); hr = IAudioClient2_SetClientProperties(ac2, &client_props); ok(hr == S_OK || broken(hr == E_INVALIDARG) /* <= win8 */, - "SetClientProperties failed: %08x\n", hr); + "SetClientProperties failed: %08lx\n", hr);
IAudioClient2_Release(ac2); } @@ -323,7 +323,7 @@ static void test_audioclient(void) hr = IAudioClient_QueryInterface(ac, &IID_IAudioClient3, (void**)&ac3); ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* win8 */, - "Failed to query IAudioClient3 interface: %08x\n", hr); + "Failed to query IAudioClient3 interface: %08lx\n", hr);
if(hr == S_OK) IAudioClient3_Release(ac3); @@ -332,42 +332,42 @@ static void test_audioclient(void)
hr = IAudioClient_Initialize(ac, 3, 0, 5000000, 0, pwfx, NULL); ok(broken(hr == AUDCLNT_E_NOT_INITIALIZED) || /* <= win8 */ - hr == E_INVALIDARG, "Initialize with invalid sharemode returns %08x\n", hr); + hr == E_INVALIDARG, "Initialize with invalid sharemode returns %08lx\n", hr);
hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0xffffffff, 5000000, 0, pwfx, NULL); ok(hr == E_INVALIDARG || - hr == AUDCLNT_E_INVALID_STREAM_FLAG, "Initialize with invalid flags returns %08x\n", hr); + hr == AUDCLNT_E_INVALID_STREAM_FLAG, "Initialize with invalid flags returns %08lx\n", hr);
/* A period != 0 is ignored and the call succeeds. * Since we can only initialize successfully once, skip those tests. */ hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, NULL, NULL); - ok(hr == E_POINTER, "Initialize with null format returns %08x\n", hr); + ok(hr == E_POINTER, "Initialize with null format returns %08lx\n", hr);
hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 0, 0, pwfx, NULL); - ok(hr == S_OK, "Initialize with 0 buffer size returns %08x\n", hr); + ok(hr == S_OK, "Initialize with 0 buffer size returns %08lx\n", hr); if(hr == S_OK){ UINT32 num;
hr = IAudioClient_GetBufferSize(ac, &num); - ok(hr == S_OK, "GetBufferSize from duration 0 returns %08x\n", hr); + ok(hr == S_OK, "GetBufferSize from duration 0 returns %08lx\n", hr); if(hr == S_OK) trace("Initialize(duration=0) GetBufferSize is %u\n", num); }
hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); - ok(hr == AUDCLNT_E_ALREADY_INITIALIZED, "Calling Initialize twice returns %08x\n", hr); + ok(hr == AUDCLNT_E_ALREADY_INITIALIZED, "Calling Initialize twice returns %08lx\n", hr);
hr = IAudioClient_Start(ac); ok(hr == S_OK || broken(hr == AUDCLNT_E_DEVICE_INVALIDATED), /* Win10 >= 1607 */ - "Start on a doubly initialized stream returns %08x\n", hr); + "Start on a doubly initialized stream returns %08lx\n", hr);
IAudioClient_Release(ac);
hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr);
if(pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)pwfx; @@ -379,83 +379,83 @@ static void test_audioclient(void)
hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); ok(hr == S_OK || - hr == AUDCLNT_E_UNSUPPORTED_FORMAT /* win10 */, "Initialize(dwChannelMask = 0xffff) returns %08x\n", hr); + hr == AUDCLNT_E_UNSUPPORTED_FORMAT /* win10 */, "Initialize(dwChannelMask = 0xffff) returns %08lx\n", hr);
IAudioClient_Release(ac);
hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr);
fmtex->dwChannelMask = 0;
hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &fmt2); ok(hr == S_OK || broken(hr == S_FALSE /* w7 Realtek HDA */), - "IsFormatSupported(dwChannelMask = 0) call returns %08x\n", hr); + "IsFormatSupported(dwChannelMask = 0) call returns %08lx\n", hr); ok(fmtex->dwChannelMask == 0, "Passed format was modified\n");
CoTaskMemFree(fmt2);
hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); - ok(hr == S_OK, "Initialize(dwChannelMask = 0) returns %08x\n", hr); + ok(hr == S_OK, "Initialize(dwChannelMask = 0) returns %08lx\n", hr);
IAudioClient_Release(ac);
hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr);
CoTaskMemFree(pwfx);
hr = IAudioClient_GetMixFormat(ac, &pwfx); - ok(hr == S_OK, "Valid GetMixFormat returns %08x\n", hr); + ok(hr == S_OK, "Valid GetMixFormat returns %08lx\n", hr); }else skip("Skipping dwChannelMask tests\n");
hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); - ok(hr == S_OK, "Valid Initialize returns %08x\n", hr); + ok(hr == S_OK, "Valid Initialize returns %08lx\n", hr); if (hr != S_OK) goto cleanup;
hr = IAudioClient_GetStreamLatency(ac, NULL); - ok(hr == E_POINTER, "GetStreamLatency(NULL) call returns %08x\n", hr); + ok(hr == E_POINTER, "GetStreamLatency(NULL) call returns %08lx\n", hr);
hr = IAudioClient_GetStreamLatency(ac, &t2); - ok(hr == S_OK, "Valid GetStreamLatency call returns %08x\n", hr); + ok(hr == S_OK, "Valid GetStreamLatency call returns %08lx\n", hr); trace("Returned latency: %u.%04u ms\n", (UINT)(t2/10000), (UINT)(t2 % 10000)); ok(t2 >= t1 || broken(t2 >= t1/2 && pwfx->nSamplesPerSec > 48000) || broken(t2 == 0) /* (!) win10 */, - "Latency < default period, delta %dus (%s vs %s)\n", + "Latency < default period, delta %ldus (%s vs %s)\n", (LONG)((t2-t1)/10), wine_dbgstr_longlong(t2), wine_dbgstr_longlong(t1)); /* Native appears to add the engine period to the HW latency in shared mode */ if(t2 == 0) win10 = TRUE;
hr = IAudioClient_SetEventHandle(ac, NULL); - ok(hr == E_INVALIDARG, "SetEventHandle(NULL) returns %08x\n", hr); + ok(hr == E_INVALIDARG, "SetEventHandle(NULL) returns %08lx\n", hr);
hr = IAudioClient_SetEventHandle(ac, handle); ok(hr == AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED || broken(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME)) || broken(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) /* Some 2k8 */ || broken(hr == HRESULT_FROM_WIN32(ERROR_BAD_PATHNAME)) /* Some Vista */ - , "SetEventHandle returns %08x\n", hr); + , "SetEventHandle returns %08lx\n", hr);
hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset on an initialized stream returns %08x\n", hr); + ok(hr == S_OK, "Reset on an initialized stream returns %08lx\n", hr);
hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset on an already reset stream returns %08x\n", hr); + ok(hr == S_OK, "Reset on an already reset stream returns %08lx\n", hr);
hr = IAudioClient_Stop(ac); - ok(hr == S_FALSE, "Stop on a stopped stream returns %08x\n", hr); + ok(hr == S_FALSE, "Stop on a stopped stream returns %08lx\n", hr);
hr = IAudioClient_Start(ac); - ok(hr == S_OK, "Start on a stopped stream returns %08x\n", hr); + ok(hr == S_OK, "Start on a stopped stream returns %08lx\n", hr);
hr = IAudioClient_Start(ac); - ok(hr == AUDCLNT_E_NOT_STOPPED, "Start twice returns %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_STOPPED, "Start twice returns %08lx\n", hr);
cleanup: IAudioClient_Release(ac); @@ -476,12 +476,12 @@ static void test_formats(AUDCLNT_SHAREMODE mode) for(i = 0; i < ARRAY_SIZE(win_formats); i++) { hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) continue;
hr = IAudioClient_GetMixFormat(ac, &pwfx); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr);
fmt.nSamplesPerSec = win_formats[i][0]; fmt.wBitsPerSample = win_formats[i][1]; @@ -498,10 +498,10 @@ static void test_formats(AUDCLNT_SHAREMODE mode) /* 5:1 card exception when asked for 1 channel at mixer rate */ pwfx->nChannels > 2 && fmt.nSamplesPerSec == pwfx->nSamplesPerSec) : (hr == AUDCLNT_E_UNSUPPORTED_FORMAT || hr == hexcl)), - "IsFormatSupported(%d, %ux%2ux%u) returns %08x\n", mode, + "IsFormatSupported(%d, %lux%2ux%u) returns %08lx\n", mode, fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr); if (hr == S_OK) - trace("IsSupported(%s, %ux%2ux%u)\n", + trace("IsSupported(%s, %lux%2ux%u)\n", mode == AUDCLNT_SHAREMODE_SHARED ? "shared " : "exclus.", fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels);
@@ -511,31 +511,31 @@ static void test_formats(AUDCLNT_SHAREMODE mode) && fmt.nChannels == pwfx->nChannels) ok(hr == S_OK, "Varying BitsPerSample %u\n", fmt.wBitsPerSample);
- ok((hr == S_FALSE)^(pwfx2 == NULL), "hr %x<->suggest %p\n", hr, pwfx2); + ok((hr == S_FALSE)^(pwfx2 == NULL), "hr %lx<->suggest %p\n", hr, pwfx2); if (pwfx2 == (WAVEFORMATEX*)0xDEADF00D) pwfx2 = NULL; /* broken in Wine < 1.3.28 */ if (pwfx2) { ok(pwfx2->nSamplesPerSec == pwfx->nSamplesPerSec && pwfx2->nChannels == pwfx->nChannels && pwfx2->wBitsPerSample == pwfx->wBitsPerSample, - "Suggestion %ux%2ux%u differs from GetMixFormat\n", + "Suggestion %lux%2ux%u differs from GetMixFormat\n", pwfx2->nSamplesPerSec, pwfx2->wBitsPerSample, pwfx2->nChannels); }
/* Vista returns E_INVALIDARG upon AUDCLNT_STREAMFLAGS_RATEADJUST */ hr = IAudioClient_Initialize(ac, mode, 0, 5000000, 0, &fmt, NULL); if ((hrs == S_OK) ^ (hr == S_OK)) - trace("Initialize (%s, %ux%2ux%u) returns %08x unlike IsFormatSupported\n", + trace("Initialize (%s, %lux%2ux%u) returns %08lx unlike IsFormatSupported\n", mode == AUDCLNT_SHAREMODE_SHARED ? "shared " : "exclus.", fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr); if (mode == AUDCLNT_SHAREMODE_SHARED) ok(hrs == S_OK ? hr == S_OK : hr == AUDCLNT_E_UNSUPPORTED_FORMAT, - "Initialize(shared, %ux%2ux%u) returns %08x\n", + "Initialize(shared, %lux%2ux%u) returns %08lx\n", fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr); else if (hrs == AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED) /* Unsupported format implies "create failed" and shadows "not allowed" */ ok(hrs == hexcl && (hr == AUDCLNT_E_ENDPOINT_CREATE_FAILED || hr == hrs), - "Initialize(noexcl., %ux%2ux%u) returns %08x(%08x)\n", + "Initialize(noexcl., %lux%2ux%u) returns %08lx(%08lx)\n", fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr, hrs); else /* On testbot 48000x16x1 claims support, but does not Initialize. @@ -546,7 +546,7 @@ static void test_formats(AUDCLNT_SHAREMODE mode) broken(hr == S_OK && ((fmt.nChannels == 1 && fmt.wBitsPerSample == 16) || (fmt.nSamplesPerSec == 12000 || fmt.nSamplesPerSec == 96000))), - "Initialize(exclus., %ux%2ux%u) returns %08x\n", + "Initialize(exclus., %lux%2ux%u) returns %08lx\n", fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr);
/* Bug in native (Vista/w2k8/w7): after Initialize failed, better @@ -576,21 +576,21 @@ static void test_references(void) /* IAudioRenderClient */ hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return;
hr = IAudioClient_GetMixFormat(ac, &pwfx); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr);
hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr);
CoTaskMemFree(pwfx);
hr = IAudioClient_GetService(ac, &IID_IAudioRenderClient, (void**)&rc); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); if(hr != S_OK) { IAudioClient_Release(ac); return; @@ -598,100 +598,100 @@ static void test_references(void)
IAudioRenderClient_AddRef(rc); ref = IAudioRenderClient_Release(rc); - ok(ref != 0, "RenderClient_Release gave wrong refcount: %u\n", ref); + ok(ref != 0, "RenderClient_Release gave wrong refcount: %lu\n", ref);
ref = IAudioClient_Release(ac); - ok(ref != 0, "Client_Release gave wrong refcount: %u\n", ref); + ok(ref != 0, "Client_Release gave wrong refcount: %lu\n", ref);
ref = IAudioRenderClient_Release(rc); - ok(ref == 0, "RenderClient_Release gave wrong refcount: %u\n", ref); + ok(ref == 0, "RenderClient_Release gave wrong refcount: %lu\n", ref);
/* ISimpleAudioVolume */ hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return;
hr = IAudioClient_GetMixFormat(ac, &pwfx); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr);
hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr);
CoTaskMemFree(pwfx);
hr = IAudioClient_GetService(ac, &IID_ISimpleAudioVolume, (void**)&sav); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr);
ISimpleAudioVolume_AddRef(sav); ref = ISimpleAudioVolume_Release(sav); - ok(ref != 0, "SimpleAudioVolume_Release gave wrong refcount: %u\n", ref); + ok(ref != 0, "SimpleAudioVolume_Release gave wrong refcount: %lu\n", ref);
ref = IAudioClient_Release(ac); - ok(ref != 0, "Client_Release gave wrong refcount: %u\n", ref); + ok(ref != 0, "Client_Release gave wrong refcount: %lu\n", ref);
ref = ISimpleAudioVolume_Release(sav); - ok(ref == 0, "SimpleAudioVolume_Release gave wrong refcount: %u\n", ref); + ok(ref == 0, "SimpleAudioVolume_Release gave wrong refcount: %lu\n", ref);
/* IAudioClock */ hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return;
hr = IAudioClient_GetMixFormat(ac, &pwfx); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr);
hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr);
CoTaskMemFree(pwfx);
hr = IAudioClient_GetService(ac, &IID_IAudioClock, (void**)&acl); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr);
IAudioClock_AddRef(acl); ref = IAudioClock_Release(acl); - ok(ref != 0, "AudioClock_Release gave wrong refcount: %u\n", ref); + ok(ref != 0, "AudioClock_Release gave wrong refcount: %lu\n", ref);
ref = IAudioClient_Release(ac); - ok(ref != 0, "Client_Release gave wrong refcount: %u\n", ref); + ok(ref != 0, "Client_Release gave wrong refcount: %lu\n", ref);
ref = IAudioClock_Release(acl); - ok(ref == 0, "AudioClock_Release gave wrong refcount: %u\n", ref); + ok(ref == 0, "AudioClock_Release gave wrong refcount: %lu\n", ref);
/* IAudioStreamVolume */ hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return;
hr = IAudioClient_GetMixFormat(ac, &pwfx); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr);
hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr);
CoTaskMemFree(pwfx);
hr = IAudioClient_GetService(ac, &IID_IAudioStreamVolume, (void**)&asv); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr);
IAudioStreamVolume_AddRef(asv); ref = IAudioStreamVolume_Release(asv); - ok(ref != 0, "AudioStreamVolume_Release gave wrong refcount: %u\n", ref); + ok(ref != 0, "AudioStreamVolume_Release gave wrong refcount: %lu\n", ref);
ref = IAudioClient_Release(ac); - ok(ref != 0, "Client_Release gave wrong refcount: %u\n", ref); + ok(ref != 0, "Client_Release gave wrong refcount: %lu\n", ref);
ref = IAudioStreamVolume_Release(asv); - ok(ref == 0, "AudioStreamVolume_Release gave wrong refcount: %u\n", ref); + ok(ref == 0, "AudioStreamVolume_Release gave wrong refcount: %lu\n", ref); }
static void test_event(void) @@ -704,17 +704,17 @@ static void test_event(void)
hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return;
hr = IAudioClient_GetMixFormat(ac, &pwfx); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr);
hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_EVENTCALLBACK, 5000000, 0, pwfx, NULL); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr);
CoTaskMemFree(pwfx);
@@ -723,50 +723,50 @@ static void test_event(void)
hr = IAudioClient_Start(ac); ok(hr == AUDCLNT_E_EVENTHANDLE_NOT_SET || - hr == D3D11_ERROR_4E /* win10 */, "Start failed: %08x\n", hr); + hr == D3D11_ERROR_4E /* win10 */, "Start failed: %08lx\n", hr);
hr = IAudioClient_SetEventHandle(ac, event); - ok(hr == S_OK, "SetEventHandle failed: %08x\n", hr); + ok(hr == S_OK, "SetEventHandle failed: %08lx\n", hr);
hr = IAudioClient_SetEventHandle(ac, event); ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME) || - hr == E_UNEXPECTED /* win10 */, "SetEventHandle returns %08x\n", hr); + hr == E_UNEXPECTED /* win10 */, "SetEventHandle returns %08lx\n", hr);
r = WaitForSingleObject(event, 40); - ok(r == WAIT_TIMEOUT, "Wait(event) before Start gave %x\n", r); + ok(r == WAIT_TIMEOUT, "Wait(event) before Start gave %lx\n", r);
hr = IAudioClient_Start(ac); - ok(hr == S_OK, "Start failed: %08x\n", hr); + ok(hr == S_OK, "Start failed: %08lx\n", hr);
r = WaitForSingleObject(event, 20); - ok(r == WAIT_OBJECT_0, "Wait(event) after Start gave %x\n", r); + ok(r == WAIT_OBJECT_0, "Wait(event) after Start gave %lx\n", r);
hr = IAudioClient_Stop(ac); - ok(hr == S_OK, "Stop failed: %08x\n", hr); + ok(hr == S_OK, "Stop failed: %08lx\n", hr);
ok(ResetEvent(event), "ResetEvent\n");
/* Still receiving events! */ r = WaitForSingleObject(event, 20); - ok(r == WAIT_OBJECT_0, "Wait(event) after Stop gave %x\n", r); + ok(r == WAIT_OBJECT_0, "Wait(event) after Stop gave %lx\n", r);
hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset failed: %08x\n", hr); + ok(hr == S_OK, "Reset failed: %08lx\n", hr);
ok(ResetEvent(event), "ResetEvent\n");
r = WaitForSingleObject(event, 120); - ok(r == WAIT_OBJECT_0, "Wait(event) after Reset gave %x\n", r); + ok(r == WAIT_OBJECT_0, "Wait(event) after Reset gave %lx\n", r);
hr = IAudioClient_SetEventHandle(ac, NULL); - ok(hr == E_INVALIDARG, "SetEventHandle(NULL) returns %08x\n", hr); + ok(hr == E_INVALIDARG, "SetEventHandle(NULL) returns %08lx\n", hr);
r = WaitForSingleObject(event, 70); - ok(r == WAIT_OBJECT_0, "Wait(NULL event) gave %x\n", r); + ok(r == WAIT_OBJECT_0, "Wait(NULL event) gave %lx\n", r);
/* test releasing a playing stream */ hr = IAudioClient_Start(ac); - ok(hr == S_OK, "Start failed: %08x\n", hr); + ok(hr == S_OK, "Start failed: %08lx\n", hr); IAudioClient_Release(ac);
CloseHandle(event); @@ -784,18 +784,18 @@ static void test_padding(void)
hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return;
hr = IAudioClient_GetMixFormat(ac, &pwfx); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr); if(hr != S_OK) return;
hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr); if(hr != S_OK) return;
@@ -810,25 +810,25 @@ static void test_padding(void) * e.g. 10.1587ms is 28 * 16 = 448 frames at 44100 with HDA. * 441 observed with Vista, 448 with w7 on the same HW! */ hr = IAudioClient_GetDevicePeriod(ac, &defp, &minp); - ok(hr == S_OK, "GetDevicePeriod failed: %08x\n", hr); + ok(hr == S_OK, "GetDevicePeriod failed: %08lx\n", hr); /* some wineXYZ.drv use 20ms, not seen on native */ ok(defp == 100000 || broken(defp == 101587) || defp == 200000, - "Expected 10ms default period: %u\n", (ULONG)defp); + "Expected 10ms default period: %lu\n", (ULONG)defp); ok(minp != 0, "Minimum period is 0\n"); ok(minp <= defp, "Minimum period is greater than default period\n");
hr = IAudioClient_GetService(ac, &IID_IAudioRenderClient, (void**)&arc); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr);
psize = MulDiv(defp, pwfx->nSamplesPerSec, 10000000) * 10;
written = 0; hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding failed: %08lx\n", hr); ok(pad == written, "GetCurrentPadding returned %u, should be %u\n", pad, written);
hr = IAudioRenderClient_GetBuffer(arc, psize, &buf); - ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); + ok(hr == S_OK, "GetBuffer failed: %08lx\n", hr); ok(buf != NULL, "NULL buffer returned\n"); if(!win10){ /* win10 appears not to clear the buffer */ @@ -841,35 +841,35 @@ static void test_padding(void) }
hr = IAudioRenderClient_GetBuffer(arc, 0, &buf); - ok(hr == AUDCLNT_E_OUT_OF_ORDER, "GetBuffer 0 size failed: %08x\n", hr); + ok(hr == AUDCLNT_E_OUT_OF_ORDER, "GetBuffer 0 size failed: %08lx\n", hr); ok(buf == NULL, "GetBuffer 0 gave %p\n", buf); /* MSDN instead documents buf remains untouched */
hr = IAudioClient_Reset(ac); - ok(hr == AUDCLNT_E_BUFFER_OPERATION_PENDING, "Reset failed: %08x\n", hr); + ok(hr == AUDCLNT_E_BUFFER_OPERATION_PENDING, "Reset failed: %08lx\n", hr);
hr = IAudioRenderClient_ReleaseBuffer(arc, psize, AUDCLNT_BUFFERFLAGS_SILENT); - ok(hr == S_OK, "ReleaseBuffer failed: %08x\n", hr); + ok(hr == S_OK, "ReleaseBuffer failed: %08lx\n", hr); if(hr == S_OK) written += psize;
hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding failed: %08lx\n", hr); ok(pad == written, "GetCurrentPadding returned %u, should be %u\n", pad, written);
psize = MulDiv(minp, pwfx->nSamplesPerSec, 10000000) * 10;
hr = IAudioRenderClient_GetBuffer(arc, psize, &buf); - ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); + ok(hr == S_OK, "GetBuffer failed: %08lx\n", hr); ok(buf != NULL, "NULL buffer returned\n");
hr = IAudioRenderClient_ReleaseBuffer(arc, psize, AUDCLNT_BUFFERFLAGS_SILENT); - ok(hr == S_OK, "ReleaseBuffer failed: %08x\n", hr); + ok(hr == S_OK, "ReleaseBuffer failed: %08lx\n", hr); written += psize;
hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding failed: %08lx\n", hr); ok(pad == written, "GetCurrentPadding returned %u, should be %u\n", pad, written);
/* overfull buffer. requested 1/2s buffer size, so try @@ -877,65 +877,65 @@ static void test_padding(void) psize = pwfx->nSamplesPerSec / 2; buf = (void*)0xDEADF00D; hr = IAudioRenderClient_GetBuffer(arc, psize, &buf); - ok(hr == AUDCLNT_E_BUFFER_TOO_LARGE, "GetBuffer gave wrong error: %08x\n", hr); + ok(hr == AUDCLNT_E_BUFFER_TOO_LARGE, "GetBuffer gave wrong error: %08lx\n", hr); ok(buf == NULL, "NULL expected %p\n", buf);
hr = IAudioRenderClient_ReleaseBuffer(arc, psize, 0); - ok(hr == AUDCLNT_E_OUT_OF_ORDER, "ReleaseBuffer gave wrong error: %08x\n", hr); + ok(hr == AUDCLNT_E_OUT_OF_ORDER, "ReleaseBuffer gave wrong error: %08lx\n", hr);
psize = MulDiv(minp, pwfx->nSamplesPerSec, 10000000) * 2;
hr = IAudioRenderClient_GetBuffer(arc, psize, &buf); - ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); + ok(hr == S_OK, "GetBuffer failed: %08lx\n", hr); ok(buf != NULL, "NULL buffer returned\n");
hr = IAudioRenderClient_ReleaseBuffer(arc, 0, 0); - ok(hr == S_OK, "ReleaseBuffer 0 gave wrong error: %08x\n", hr); + ok(hr == S_OK, "ReleaseBuffer 0 gave wrong error: %08lx\n", hr);
buf = (void*)0xDEADF00D; hr = IAudioRenderClient_GetBuffer(arc, 0, &buf); - ok(hr == S_OK, "GetBuffer 0 size failed: %08x\n", hr); + ok(hr == S_OK, "GetBuffer 0 size failed: %08lx\n", hr); ok(buf == NULL, "GetBuffer 0 gave %p\n", buf); /* MSDN instead documents buf remains untouched */
buf = (void*)0xDEADF00D; hr = IAudioRenderClient_GetBuffer(arc, 0, &buf); - ok(hr == S_OK, "GetBuffer 0 size #2 failed: %08x\n", hr); + ok(hr == S_OK, "GetBuffer 0 size #2 failed: %08lx\n", hr); ok(buf == NULL, "GetBuffer 0 #2 gave %p\n", buf);
hr = IAudioRenderClient_ReleaseBuffer(arc, psize, 0); - ok(hr == AUDCLNT_E_OUT_OF_ORDER, "ReleaseBuffer not size 0 gave %08x\n", hr); + ok(hr == AUDCLNT_E_OUT_OF_ORDER, "ReleaseBuffer not size 0 gave %08lx\n", hr);
hr = IAudioRenderClient_GetBuffer(arc, psize, &buf); - ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); + ok(hr == S_OK, "GetBuffer failed: %08lx\n", hr); ok(buf != NULL, "NULL buffer returned\n");
hr = IAudioRenderClient_ReleaseBuffer(arc, 0, 0); - ok(hr == S_OK, "ReleaseBuffer 0 gave wrong error: %08x\n", hr); + ok(hr == S_OK, "ReleaseBuffer 0 gave wrong error: %08lx\n", hr);
hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding failed: %08lx\n", hr); ok(pad == written, "GetCurrentPadding returned %u, should be %u\n", pad, written);
hr = IAudioRenderClient_GetBuffer(arc, psize, &buf); - ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); + ok(hr == S_OK, "GetBuffer failed: %08lx\n", hr); ok(buf != NULL, "NULL buffer returned\n");
hr = IAudioRenderClient_ReleaseBuffer(arc, psize+1, AUDCLNT_BUFFERFLAGS_SILENT); - ok(hr == AUDCLNT_E_INVALID_SIZE, "ReleaseBuffer too large error: %08x\n", hr); + ok(hr == AUDCLNT_E_INVALID_SIZE, "ReleaseBuffer too large error: %08lx\n", hr); /* todo_wine means Wine may overwrite memory */ if(hr == S_OK) written += psize+1;
/* Buffer still hold */ hr = IAudioRenderClient_ReleaseBuffer(arc, psize/2, AUDCLNT_BUFFERFLAGS_SILENT); - ok(hr == S_OK, "ReleaseBuffer after error: %08x\n", hr); + ok(hr == S_OK, "ReleaseBuffer after error: %08lx\n", hr); if(hr == S_OK) written += psize/2;
hr = IAudioRenderClient_ReleaseBuffer(arc, 0, 0); - ok(hr == S_OK, "ReleaseBuffer 0 gave wrong error: %08x\n", hr); + ok(hr == S_OK, "ReleaseBuffer 0 gave wrong error: %08lx\n", hr);
hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding failed: %08lx\n", hr); ok(pad == written, "GetCurrentPadding returned %u, should be %u\n", pad, written);
CoTaskMemFree(pwfx); @@ -963,18 +963,18 @@ static void test_clock(int share)
hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return;
hr = IAudioClient_GetMixFormat(ac, &pwfx); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr); if(hr != S_OK) return;
hr = IAudioClient_GetDevicePeriod(ac, &defp, &minp); - ok(hr == S_OK, "GetDevicePeriod failed: %08x\n", hr); - ok(minp <= period, "desired period %u too small for %u\n", (ULONG)period, (ULONG)minp); + ok(hr == S_OK, "GetDevicePeriod failed: %08lx\n", hr); + ok(minp <= period, "desired period %lu too small for %lu\n", (ULONG)period, (ULONG)minp);
if (share) { trace("Testing shared mode\n"); @@ -989,12 +989,12 @@ static void test_clock(int share) pwfx->wBitsPerSample = 16; /* no floating point */ pwfx->nBlockAlign = pwfx->nChannels * pwfx->wBitsPerSample / 8; pwfx->nAvgBytesPerSec = pwfx->nSamplesPerSec * pwfx->nBlockAlign; - trace("Testing exclusive mode at %u\n", pwfx->nSamplesPerSec); + trace("Testing exclusive mode at %lu\n", pwfx->nSamplesPerSec);
hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_EXCLUSIVE, 0, duration, period, pwfx, NULL); } - ok(share ? hr == S_OK : hr == hexcl || hr == AUDCLNT_E_DEVICE_IN_USE, "Initialize failed: %08x\n", hr); + ok(share ? hr == S_OK : hr == hexcl || hr == AUDCLNT_E_DEVICE_IN_USE, "Initialize failed: %08lx\n", hr); if (hr != S_OK) { CoTaskMemFree(pwfx); IAudioClient_Release(ac); @@ -1008,7 +1008,7 @@ static void test_clock(int share) * Exclusive mode: testbot returns 2x period + a little, but * some HDA drivers return 1x period, some + a little. */ hr = IAudioClient_GetStreamLatency(ac, &t2); - ok(hr == S_OK, "GetStreamLatency failed: %08x\n", hr); + ok(hr == S_OK, "GetStreamLatency failed: %08lx\n", hr); trace("Latency: %u.%04u ms\n", (UINT)(t2/10000), (UINT)(t2 % 10000)); ok(t2 >= period || broken(t2 >= period/2 && share && pwfx->nSamplesPerSec > 48000) || broken(t2 == 0) /* win10 */, @@ -1024,7 +1024,7 @@ static void test_clock(int share) * is either the rounded period or a fixed constant like 1024, * whatever the driver implements. */ hr = IAudioClient_GetBufferSize(ac, &gbsize); - ok(hr == S_OK, "GetBufferSize failed: %08x\n", hr); + ok(hr == S_OK, "GetBufferSize failed: %08lx\n", hr);
bufsize = MulDiv(duration, pwfx->nSamplesPerSec, 10000000); fragment = MulDiv(period, pwfx->nSamplesPerSec, 10000000); @@ -1035,10 +1035,10 @@ static void test_clock(int share) * but it is rounded down modulo fragment ! */ if (share) ok(gbsize == bufsize, - "BufferSize %u at rate %u\n", gbsize, pwfx->nSamplesPerSec); + "BufferSize %u at rate %lu\n", gbsize, pwfx->nSamplesPerSec); else ok(gbsize == parts * fragment || gbsize == MulDiv(bufsize, 1, 1024) * 1024, - "BufferSize %u misfits fragment size %u at rate %u\n", gbsize, fragment, pwfx->nSamplesPerSec); + "BufferSize %u misfits fragment size %u at rate %lu\n", gbsize, fragment, pwfx->nSamplesPerSec);
/* In shared mode, GetCurrentPadding decreases in multiples of * fragment size (i.e. updated only at period ticks), whereas @@ -1049,10 +1049,10 @@ static void test_clock(int share) * GetCurrentPadding = GetPosition - frames held in mmdevapi */
hr = IAudioClient_GetService(ac, &IID_IAudioClock, (void**)&acl); - ok(hr == S_OK, "GetService(IAudioClock) failed: %08x\n", hr); + ok(hr == S_OK, "GetService(IAudioClock) failed: %08lx\n", hr);
hr = IAudioClock_GetFrequency(acl, &freq); - ok(hr == S_OK, "GetFrequency failed: %08x\n", hr); + ok(hr == S_OK, "GetFrequency failed: %08lx\n", hr); trace("Clock Frequency %u\n", (UINT)freq);
/* MSDN says it's arbitrary units, but shared mode is unlikely to change */ @@ -1064,74 +1064,74 @@ static void test_clock(int share) "Clock Frequency %u\n", (UINT)freq);
hr = IAudioClock_GetPosition(acl, NULL, NULL); - ok(hr == E_POINTER, "GetPosition wrong error: %08x\n", hr); + ok(hr == E_POINTER, "GetPosition wrong error: %08lx\n", hr);
pcpos0 = 0; hr = IAudioClock_GetPosition(acl, &pos, &pcpos0); - ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(hr == S_OK, "GetPosition failed: %08lx\n", hr); ok(pos == 0, "GetPosition returned non-zero pos before being started\n"); ok(pcpos0 != 0, "GetPosition returned zero pcpos\n");
hr = IAudioClient_GetService(ac, &IID_IAudioRenderClient, (void**)&arc); - ok(hr == S_OK, "GetService(IAudioRenderClient) failed: %08x\n", hr); + ok(hr == S_OK, "GetService(IAudioRenderClient) failed: %08lx\n", hr);
hr = IAudioRenderClient_GetBuffer(arc, gbsize+1, &data); - ok(hr == AUDCLNT_E_BUFFER_TOO_LARGE, "GetBuffer too large failed: %08x\n", hr); + ok(hr == AUDCLNT_E_BUFFER_TOO_LARGE, "GetBuffer too large failed: %08lx\n", hr);
avail = gbsize; data = NULL; hr = IAudioRenderClient_GetBuffer(arc, avail, &data); - ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); + ok(hr == S_OK, "GetBuffer failed: %08lx\n", hr); trace("data at %p\n", data);
hr = IAudioRenderClient_ReleaseBuffer(arc, avail, winetest_debug>2 ? wave_generate_tone(pwfx, data, avail) : AUDCLNT_BUFFERFLAGS_SILENT); - ok(hr == S_OK, "ReleaseBuffer failed: %08x\n", hr); + ok(hr == S_OK, "ReleaseBuffer failed: %08lx\n", hr); if(hr == S_OK) sum += avail;
hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding failed: %08lx\n", hr); ok(pad == sum, "padding %u prior to start\n", pad);
hr = IAudioClock_GetPosition(acl, &pos, NULL); - ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(hr == S_OK, "GetPosition failed: %08lx\n", hr); ok(pos == 0, "GetPosition returned non-zero pos before being started\n");
hr = IAudioClient_Start(ac); /* #1 */ - ok(hr == S_OK, "Start failed: %08x\n", hr); + ok(hr == S_OK, "Start failed: %08lx\n", hr);
Sleep(100); slept += 100;
hr = IAudioClient_GetStreamLatency(ac, &t1); - ok(hr == S_OK, "GetStreamLatency failed: %08x\n", hr); + ok(hr == S_OK, "GetStreamLatency failed: %08lx\n", hr); ok(t1 == t2, "Latency not constant, delta %ld\n", (long)(t1-t2));
hr = IAudioClock_GetPosition(acl, &pos, NULL); - ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(hr == S_OK, "GetPosition failed: %08lx\n", hr); ok(pos > 0, "Position %u vs. last %u\n", (UINT)pos,0); /* in rare cases is slept*1.1 not enough with dmix */ ok(pos*1000/freq <= slept*1.4, "Position %u too far after playing %ums\n", (UINT)pos, slept); last = pos;
hr = IAudioClient_Stop(ac); - ok(hr == S_OK, "Stop failed: %08x\n", hr); + ok(hr == S_OK, "Stop failed: %08lx\n", hr);
hr = IAudioClock_GetPosition(acl, &pos, NULL); - ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(hr == S_OK, "GetPosition failed: %08lx\n", hr); ok(pos >= last, "Position %u vs. last %u\n", (UINT)pos,(UINT)last); last = pos; if(/*share &&*/ winetest_debug>1) ok(pos*1000/freq <= slept*1.1, "Position %u too far after stop %ums\n", (UINT)pos, slept);
hr = IAudioClient_Start(ac); /* #2 */ - ok(hr == S_OK, "Start failed: %08x\n", hr); + ok(hr == S_OK, "Start failed: %08lx\n", hr);
Sleep(100); slept += 100;
hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding failed: %08lx\n", hr); trace("padding %u past sleep #2\n", pad);
/** IAudioClient_Stop @@ -1144,13 +1144,13 @@ static void test_clock(int share) * padding 0 and bumping pos to sum minus 17 frames! */
hr = IAudioClient_Stop(ac); - ok(hr == S_OK, "Stop failed: %08x\n", hr); + ok(hr == S_OK, "Stop failed: %08lx\n", hr);
hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding failed: %08lx\n", hr);
hr = IAudioClock_GetPosition(acl, &pos, NULL); - ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(hr == S_OK, "GetPosition failed: %08lx\n", hr); trace("padding %u position %u past stop #2\n", pad, (UINT)pos); ok(pos * pwfx->nSamplesPerSec <= sum * freq, "Position %u > written %u\n", (UINT)pos, sum); /* Prove that Stop must not drop frames (in shared mode). */ @@ -1166,49 +1166,49 @@ static void test_clock(int share) Sleep(100);
hr = IAudioClock_GetPosition(acl, &pos, NULL); - ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(hr == S_OK, "GetPosition failed: %08lx\n", hr); ok(pos == last, "Position %u should stop.\n", (UINT)pos);
/* Restart from 0 */ hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset failed: %08x\n", hr); + ok(hr == S_OK, "Reset failed: %08lx\n", hr); slept = sum = 0;
hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset on an already reset stream returns %08x\n", hr); + ok(hr == S_OK, "Reset on an already reset stream returns %08lx\n", hr);
hr = IAudioClock_GetPosition(acl, &pos, &pcpos); - ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(hr == S_OK, "GetPosition failed: %08lx\n", hr); ok(pos == 0, "GetPosition returned non-zero pos after Reset\n"); ok(pcpos > pcpos0, "pcpos should increase\n");
avail = gbsize; /* implies GetCurrentPadding == 0 */ hr = IAudioRenderClient_GetBuffer(arc, avail, &data); - ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); + ok(hr == S_OK, "GetBuffer failed: %08lx\n", hr); trace("data at %p\n", data);
hr = IAudioRenderClient_ReleaseBuffer(arc, avail, winetest_debug>2 ? wave_generate_tone(pwfx, data, avail) : AUDCLNT_BUFFERFLAGS_SILENT); - ok(hr == S_OK, "ReleaseBuffer failed: %08x\n", hr); + ok(hr == S_OK, "ReleaseBuffer failed: %08lx\n", hr); if(hr == S_OK) sum += avail;
hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding failed: %08lx\n", hr); ok(pad == sum, "padding %u prior to start\n", pad);
hr = IAudioClock_GetPosition(acl, &pos, NULL); - ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(hr == S_OK, "GetPosition failed: %08lx\n", hr); ok(pos == 0, "GetPosition returned non-zero pos after Reset\n"); last = pos;
hr = IAudioClient_Start(ac); /* #3 */ - ok(hr == S_OK, "Start failed: %08x\n", hr); + ok(hr == S_OK, "Start failed: %08lx\n", hr);
Sleep(100); slept += 100;
hr = IAudioClock_GetPosition(acl, &pos, NULL); - ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(hr == S_OK, "GetPosition failed: %08lx\n", hr); trace("position %u past %ums sleep #3\n", (UINT)pos, slept); ok(pos > last, "Position %u vs. last %u\n", (UINT)pos,(UINT)last); ok(pos * pwfx->nSamplesPerSec <= sum * freq, "Position %u > written %u\n", (UINT)pos, sum); @@ -1219,16 +1219,16 @@ static void test_clock(int share) last = pos;
hr = IAudioClient_Reset(ac); - ok(hr == AUDCLNT_E_NOT_STOPPED, "Reset while playing: %08x\n", hr); + ok(hr == AUDCLNT_E_NOT_STOPPED, "Reset while playing: %08lx\n", hr);
hr = IAudioClient_Stop(ac); - ok(hr == S_OK, "Stop failed: %08x\n", hr); + ok(hr == S_OK, "Stop failed: %08lx\n", hr);
hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding failed: %08lx\n", hr);
hr = IAudioClock_GetPosition(acl, &pos, &pcpos); - ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(hr == S_OK, "GetPosition failed: %08lx\n", hr); trace("padding %u position %u past stop #3\n", pad, (UINT)pos); ok(pos >= last, "Position %u vs. last %u\n", (UINT)pos,(UINT)last); ok(pcpos > pcpos0, "pcpos should increase\n"); @@ -1242,42 +1242,42 @@ static void test_clock(int share)
/* Begin the big loop */ hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset failed: %08x\n", hr); + ok(hr == S_OK, "Reset failed: %08lx\n", hr); slept = last = sum = 0; pcpos0 = pcpos;
ok(QueryPerformanceCounter(&hpctime0), "PerfCounter unavailable\n");
hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset on an already reset stream returns %08x\n", hr); + ok(hr == S_OK, "Reset on an already reset stream returns %08lx\n", hr);
hr = IAudioClient_Start(ac); - ok(hr == S_OK, "Start failed: %08x\n", hr); + ok(hr == S_OK, "Start failed: %08lx\n", hr);
avail = pwfx->nSamplesPerSec * 15 / 16 / 2; data = NULL; hr = IAudioRenderClient_GetBuffer(arc, avail, &data); - ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); + ok(hr == S_OK, "GetBuffer failed: %08lx\n", hr); trace("data at %p for prefill %u\n", data, avail);
if (winetest_debug>2) { hr = IAudioClient_Stop(ac); - ok(hr == S_OK, "Stop failed: %08x\n", hr); + ok(hr == S_OK, "Stop failed: %08lx\n", hr);
Sleep(20); slept += 20;
hr = IAudioClient_Reset(ac); - ok(hr == AUDCLNT_E_BUFFER_OPERATION_PENDING, "Reset failed: %08x\n", hr); + ok(hr == AUDCLNT_E_BUFFER_OPERATION_PENDING, "Reset failed: %08lx\n", hr);
hr = IAudioClient_Start(ac); - ok(hr == S_OK, "Start failed: %08x\n", hr); + ok(hr == S_OK, "Start failed: %08lx\n", hr); }
/* Despite passed time, data must still point to valid memory... */ hr = IAudioRenderClient_ReleaseBuffer(arc, avail, wave_generate_tone(pwfx, data, avail)); - ok(hr == S_OK, "ReleaseBuffer after stop+start failed: %08x\n", hr); + ok(hr == S_OK, "ReleaseBuffer after stop+start failed: %08lx\n", hr); if(hr == S_OK) sum += avail;
/* GetCurrentPadding(GCP) == 0 does not mean an underrun happened, as the @@ -1290,11 +1290,11 @@ static void test_clock(int share) Sleep(350); slept += 350; ok(QueryPerformanceCounter(&hpctime), "PerfCounter failed\n"); - trace("hpctime %u after %ums\n", + trace("hpctime %lu after %ums\n", (ULONG)((hpctime.QuadPart-hpctime0.QuadPart)*1000/hpcfreq.QuadPart), slept);
hr = IAudioClock_GetPosition(acl, &pos, &pcpos); - ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(hr == S_OK, "GetPosition failed: %08lx\n", hr); ok(pos > last, "Position %u vs. last %u\n", (UINT)pos,(UINT)last); last = pos;
@@ -1303,13 +1303,13 @@ static void test_clock(int share) slept += 100;
hr = IAudioClock_GetPosition(acl, &pos, &pcpos); - ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(hr == S_OK, "GetPosition failed: %08lx\n", hr);
hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding failed: %08lx\n", hr);
ok(QueryPerformanceCounter(&hpctime), "PerfCounter failed\n"); - trace("hpctime %u pcpos %u\n", + trace("hpctime %lu pcpos %lu\n", (ULONG)((hpctime.QuadPart-hpctime0.QuadPart)*1000/hpcfreq.QuadPart), (ULONG)((pcpos-pcpos0)/10000));
@@ -1328,7 +1328,7 @@ static void test_clock(int share) last = pos;
hr = IAudioClient_GetStreamLatency(ac, &t1); - ok(hr == S_OK, "GetStreamLatency failed: %08x\n", hr); + ok(hr == S_OK, "GetStreamLatency failed: %08lx\n", hr); ok(t1 == t2, "Latency not constant, delta %ld\n", (long)(t1-t2));
avail = pwfx->nSamplesPerSec * 15 / 16 / 2; @@ -1336,7 +1336,7 @@ static void test_clock(int share) hr = IAudioRenderClient_GetBuffer(arc, avail, &data); /* ok(hr == AUDCLNT_E_BUFFER_TOO_LARGE || (hr == S_OK && i==0) without todo_wine */ ok(hr == S_OK || hr == AUDCLNT_E_BUFFER_TOO_LARGE, - "GetBuffer large (%u) failed: %08x\n", avail, hr); + "GetBuffer large (%u) failed: %08lx\n", avail, hr); if(hr == S_OK && i) ok(FALSE, "GetBuffer large (%u) at iteration %d\n", avail, i); /* Only the first iteration should allow that large a buffer * as prefill was drained during the first 350+100ms sleep. @@ -1347,7 +1347,7 @@ static void test_clock(int share) } else { avail = gbsize - pad; hr = IAudioRenderClient_GetBuffer(arc, avail, &data); - ok(hr == S_OK, "GetBuffer small %u failed: %08x\n", avail, hr); + ok(hr == S_OK, "GetBuffer small %u failed: %08lx\n", avail, hr); trace("data at %p (small %u)\n", data, avail); } ok(data != NULL, "NULL buffer returned\n"); @@ -1358,21 +1358,21 @@ static void test_clock(int share) hr = IAudioRenderClient_ReleaseBuffer(arc, avail, wave_generate_tone(pwfx, data, avail)); } - ok(hr == S_OK, "ReleaseBuffer failed: %08x\n", hr); + ok(hr == S_OK, "ReleaseBuffer failed: %08lx\n", hr); if(hr == S_OK) sum += avail; }
hr = IAudioClock_GetPosition(acl, &pos, NULL); - ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(hr == S_OK, "GetPosition failed: %08lx\n", hr); trace("position %u\n", (UINT)pos);
Sleep(1000); /* 500ms buffer underrun past full buffer */
hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding failed: %08lx\n", hr);
hr = IAudioClock_GetPosition(acl, &pos, NULL); - ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(hr == S_OK, "GetPosition failed: %08lx\n", hr); trace("position %u past underrun, %u padding left, %u frames written\n", (UINT)pos, pad, sum);
if (share) { @@ -1391,14 +1391,14 @@ static void test_clock(int share) }
hr = IAudioClient_GetStreamLatency(ac, &t1); - ok(hr == S_OK, "GetStreamLatency failed: %08x\n", hr); + ok(hr == S_OK, "GetStreamLatency failed: %08lx\n", hr); ok(t1 == t2, "Latency not constant, delta %ld\n", (long)(t1-t2));
ok(QueryPerformanceCounter(&hpctime), "PerfCounter failed\n"); - trace("hpctime %u after underrun\n", (ULONG)((hpctime.QuadPart-hpctime0.QuadPart)*1000/hpcfreq.QuadPart)); + trace("hpctime %lu after underrun\n", (ULONG)((hpctime.QuadPart-hpctime0.QuadPart)*1000/hpcfreq.QuadPart));
hr = IAudioClient_Stop(ac); - ok(hr == S_OK, "Stop failed: %08x\n", hr); + ok(hr == S_OK, "Stop failed: %08lx\n", hr);
CoTaskMemFree(pwfx);
@@ -1419,184 +1419,184 @@ static void test_session(void) HRESULT hr;
hr = CoCreateGuid(&ses1_guid); - ok(hr == S_OK, "CoCreateGuid failed: %08x\n", hr); + ok(hr == S_OK, "CoCreateGuid failed: %08lx\n", hr);
hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ses1_ac1); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if (FAILED(hr)) return;
hr = IAudioClient_GetMixFormat(ses1_ac1, &pwfx); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr);
hr = IAudioClient_Initialize(ses1_ac1, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, &ses1_guid); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr);
if(hr == S_OK){ hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ses1_ac2); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); } if(hr != S_OK){ skip("Unable to open the same device twice. Skipping session tests\n");
ref = IAudioClient_Release(ses1_ac1); - ok(ref == 0, "AudioClient wasn't released: %u\n", ref); + ok(ref == 0, "AudioClient wasn't released: %lu\n", ref); CoTaskMemFree(pwfx); return; }
hr = IAudioClient_Initialize(ses1_ac2, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, &ses1_guid); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr);
hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(mme, eCapture, eMultimedia, &cap_dev); if(hr == S_OK){ hr = IMMDevice_Activate(cap_dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&cap_ac); - ok((hr == S_OK)^(cap_ac == NULL), "Activate %08x &out pointer\n", hr); - ok(hr == S_OK, "Activate failed: %08x\n", hr); + ok((hr == S_OK)^(cap_ac == NULL), "Activate %08lx &out pointer\n", hr); + ok(hr == S_OK, "Activate failed: %08lx\n", hr); IMMDevice_Release(cap_dev); } if(hr == S_OK){ WAVEFORMATEX *cap_pwfx;
hr = IAudioClient_GetMixFormat(cap_ac, &cap_pwfx); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr);
hr = IAudioClient_Initialize(cap_ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, cap_pwfx, &ses1_guid); - ok(hr == S_OK, "Initialize failed for capture in rendering session: %08x\n", hr); + ok(hr == S_OK, "Initialize failed for capture in rendering session: %08lx\n", hr); CoTaskMemFree(cap_pwfx); } if(hr == S_OK){ hr = IAudioClient_GetService(cap_ac, &IID_IAudioSessionControl, (void**)&cap_ctl); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); if(FAILED(hr)) cap_ctl = NULL; }else - skip("No capture session: %08x; skipping capture device in render session tests\n", hr); + skip("No capture session: %08lx; skipping capture device in render session tests\n", hr);
hr = IAudioClient_GetService(ses1_ac1, &IID_IAudioSessionControl2, (void**)&ses1_ctl); - ok(hr == E_NOINTERFACE, "GetService gave wrong error: %08x\n", hr); + ok(hr == E_NOINTERFACE, "GetService gave wrong error: %08lx\n", hr);
hr = IAudioClient_GetService(ses1_ac1, &IID_IAudioSessionControl, (void**)&ses1_ctl); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr);
hr = IAudioClient_GetService(ses1_ac1, &IID_IAudioSessionControl, (void**)&ses1_ctl2); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); ok(ses1_ctl == ses1_ctl2, "Got different controls: %p %p\n", ses1_ctl, ses1_ctl2); ref = IAudioSessionControl2_Release(ses1_ctl2); ok(ref != 0, "AudioSessionControl was destroyed\n");
hr = IAudioClient_GetService(ses1_ac2, &IID_IAudioSessionControl, (void**)&ses1_ctl2); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr);
hr = IAudioSessionControl2_GetState(ses1_ctl, NULL); - ok(hr == NULL_PTR_ERR, "GetState gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "GetState gave wrong error: %08lx\n", hr);
hr = IAudioSessionControl2_GetState(ses1_ctl, &state); - ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(hr == S_OK, "GetState failed: %08lx\n", hr); ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state);
hr = IAudioSessionControl2_GetState(ses1_ctl2, &state); - ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(hr == S_OK, "GetState failed: %08lx\n", hr); ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state);
if(cap_ctl){ hr = IAudioSessionControl2_GetState(cap_ctl, &state); - ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(hr == S_OK, "GetState failed: %08lx\n", hr); ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); }
hr = IAudioClient_Start(ses1_ac1); - ok(hr == S_OK, "Start failed: %08x\n", hr); + ok(hr == S_OK, "Start failed: %08lx\n", hr);
hr = IAudioSessionControl2_GetState(ses1_ctl, &state); - ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(hr == S_OK, "GetState failed: %08lx\n", hr); ok(state == AudioSessionStateActive, "Got wrong state: %d\n", state);
hr = IAudioSessionControl2_GetState(ses1_ctl2, &state); - ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(hr == S_OK, "GetState failed: %08lx\n", hr); ok(state == AudioSessionStateActive, "Got wrong state: %d\n", state);
if(cap_ctl){ hr = IAudioSessionControl2_GetState(cap_ctl, &state); - ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(hr == S_OK, "GetState failed: %08lx\n", hr); ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); }
hr = IAudioClient_Stop(ses1_ac1); - ok(hr == S_OK, "Start failed: %08x\n", hr); + ok(hr == S_OK, "Start failed: %08lx\n", hr);
hr = IAudioSessionControl2_GetState(ses1_ctl, &state); - ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(hr == S_OK, "GetState failed: %08lx\n", hr); ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state);
hr = IAudioSessionControl2_GetState(ses1_ctl2, &state); - ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(hr == S_OK, "GetState failed: %08lx\n", hr); ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state);
if(cap_ctl){ hr = IAudioSessionControl2_GetState(cap_ctl, &state); - ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(hr == S_OK, "GetState failed: %08lx\n", hr); ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state);
hr = IAudioClient_Start(cap_ac); - ok(hr == S_OK, "Start failed: %08x\n", hr); + ok(hr == S_OK, "Start failed: %08lx\n", hr);
hr = IAudioSessionControl2_GetState(ses1_ctl, &state); - ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(hr == S_OK, "GetState failed: %08lx\n", hr); ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state);
hr = IAudioSessionControl2_GetState(ses1_ctl2, &state); - ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(hr == S_OK, "GetState failed: %08lx\n", hr); ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state);
hr = IAudioSessionControl2_GetState(cap_ctl, &state); - ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(hr == S_OK, "GetState failed: %08lx\n", hr); ok(state == AudioSessionStateActive, "Got wrong state: %d\n", state);
hr = IAudioClient_Stop(cap_ac); - ok(hr == S_OK, "Stop failed: %08x\n", hr); + ok(hr == S_OK, "Stop failed: %08lx\n", hr);
hr = IAudioSessionControl2_GetState(ses1_ctl, &state); - ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(hr == S_OK, "GetState failed: %08lx\n", hr); ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state);
hr = IAudioSessionControl2_GetState(ses1_ctl2, &state); - ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(hr == S_OK, "GetState failed: %08lx\n", hr); ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state);
hr = IAudioSessionControl2_GetState(cap_ctl, &state); - ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(hr == S_OK, "GetState failed: %08lx\n", hr); ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state);
ref = IAudioSessionControl2_Release(cap_ctl); - ok(ref == 0, "AudioSessionControl wasn't released: %u\n", ref); + ok(ref == 0, "AudioSessionControl wasn't released: %lu\n", ref);
ref = IAudioClient_Release(cap_ac); - ok(ref == 0, "AudioClient wasn't released: %u\n", ref); + ok(ref == 0, "AudioClient wasn't released: %lu\n", ref); }
ref = IAudioSessionControl2_Release(ses1_ctl); - ok(ref == 0, "AudioSessionControl wasn't released: %u\n", ref); + ok(ref == 0, "AudioSessionControl wasn't released: %lu\n", ref);
ref = IAudioClient_Release(ses1_ac1); - ok(ref == 0, "AudioClient wasn't released: %u\n", ref); + ok(ref == 0, "AudioClient wasn't released: %lu\n", ref);
ref = IAudioClient_Release(ses1_ac2); - ok(ref == 1, "AudioClient had wrong refcount: %u\n", ref); + ok(ref == 1, "AudioClient had wrong refcount: %lu\n", ref);
/* we've released all of our IAudioClient references, so check GetState */ hr = IAudioSessionControl2_GetState(ses1_ctl2, &state); - ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(hr == S_OK, "GetState failed: %08lx\n", hr); ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state);
ref = IAudioSessionControl2_Release(ses1_ctl2); - ok(ref == 0, "AudioSessionControl wasn't released: %u\n", ref); + ok(ref == 0, "AudioSessionControl wasn't released: %lu\n", ref);
CoTaskMemFree(pwfx); } @@ -1612,20 +1612,20 @@ static void test_streamvolume(void)
hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return;
hr = IAudioClient_GetMixFormat(ac, &fmt); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr);
hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, fmt, NULL); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr);
if(hr == S_OK){ hr = IAudioClient_GetService(ac, &IID_IAudioStreamVolume, (void**)&asv); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); } if(hr != S_OK){ IAudioClient_Release(ac); @@ -1634,70 +1634,70 @@ static void test_streamvolume(void) }
hr = IAudioStreamVolume_GetChannelCount(asv, NULL); - ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08x\n", hr); + ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08lx\n", hr);
hr = IAudioStreamVolume_GetChannelCount(asv, &chans); - ok(hr == S_OK, "GetChannelCount failed: %08x\n", hr); + ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(chans == fmt->nChannels, "GetChannelCount gave wrong number of channels: %d\n", chans);
hr = IAudioStreamVolume_GetChannelVolume(asv, fmt->nChannels, NULL); - ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08x\n", hr); + ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08lx\n", hr);
hr = IAudioStreamVolume_GetChannelVolume(asv, fmt->nChannels, &vol); - ok(hr == E_INVALIDARG, "GetChannelCount gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "GetChannelCount gave wrong error: %08lx\n", hr);
hr = IAudioStreamVolume_GetChannelVolume(asv, 0, NULL); - ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08x\n", hr); + ok(hr == E_POINTER, "GetChannelCount gave wrong error: %08lx\n", hr);
hr = IAudioStreamVolume_GetChannelVolume(asv, 0, &vol); - ok(hr == S_OK, "GetChannelCount failed: %08x\n", hr); + ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(vol == 1.f, "Channel volume was not 1: %f\n", vol);
hr = IAudioStreamVolume_SetChannelVolume(asv, fmt->nChannels, -1.f); - ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08lx\n", hr);
hr = IAudioStreamVolume_SetChannelVolume(asv, 0, -1.f); - ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08lx\n", hr);
hr = IAudioStreamVolume_SetChannelVolume(asv, 0, 2.f); - ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08lx\n", hr);
hr = IAudioStreamVolume_SetChannelVolume(asv, 0, 0.2f); - ok(hr == S_OK, "SetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "SetChannelVolume failed: %08lx\n", hr);
hr = IAudioStreamVolume_GetChannelVolume(asv, 0, &vol); - ok(hr == S_OK, "GetChannelCount failed: %08x\n", hr); + ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(fabsf(vol - 0.2f) < 0.05f, "Channel volume wasn't 0.2: %f\n", vol);
hr = IAudioStreamVolume_GetAllVolumes(asv, 0, NULL); - ok(hr == E_POINTER, "GetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == E_POINTER, "GetAllVolumes gave wrong error: %08lx\n", hr);
hr = IAudioStreamVolume_GetAllVolumes(asv, fmt->nChannels, NULL); - ok(hr == E_POINTER, "GetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == E_POINTER, "GetAllVolumes gave wrong error: %08lx\n", hr);
vols = HeapAlloc(GetProcessHeap(), 0, fmt->nChannels * sizeof(float)); ok(vols != NULL, "HeapAlloc failed\n");
hr = IAudioStreamVolume_GetAllVolumes(asv, fmt->nChannels - 1, vols); - ok(hr == E_INVALIDARG, "GetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "GetAllVolumes gave wrong error: %08lx\n", hr);
hr = IAudioStreamVolume_GetAllVolumes(asv, fmt->nChannels, vols); - ok(hr == S_OK, "GetAllVolumes failed: %08x\n", hr); + ok(hr == S_OK, "GetAllVolumes failed: %08lx\n", hr); ok(fabsf(vols[0] - 0.2f) < 0.05f, "Channel 0 volume wasn't 0.2: %f\n", vol); for(i = 1; i < fmt->nChannels; ++i) ok(vols[i] == 1.f, "Channel %d volume is not 1: %f\n", i, vols[i]);
hr = IAudioStreamVolume_SetAllVolumes(asv, 0, NULL); - ok(hr == E_POINTER, "SetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == E_POINTER, "SetAllVolumes gave wrong error: %08lx\n", hr);
hr = IAudioStreamVolume_SetAllVolumes(asv, fmt->nChannels, NULL); - ok(hr == E_POINTER, "SetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == E_POINTER, "SetAllVolumes gave wrong error: %08lx\n", hr);
hr = IAudioStreamVolume_SetAllVolumes(asv, fmt->nChannels - 1, vols); - ok(hr == E_INVALIDARG, "SetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetAllVolumes gave wrong error: %08lx\n", hr);
hr = IAudioStreamVolume_SetAllVolumes(asv, fmt->nChannels, vols); - ok(hr == S_OK, "SetAllVolumes failed: %08x\n", hr); + ok(hr == S_OK, "SetAllVolumes failed: %08lx\n", hr);
HeapFree(GetProcessHeap(), 0, vols); IAudioStreamVolume_Release(asv); @@ -1716,20 +1716,20 @@ static void test_channelvolume(void)
hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return;
hr = IAudioClient_GetMixFormat(ac, &fmt); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr);
hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST, 5000000, 0, fmt, NULL); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr);
if(hr == S_OK){ hr = IAudioClient_GetService(ac, &IID_IChannelAudioVolume, (void**)&acv); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); } if(hr != S_OK){ IAudioClient_Release(ac); @@ -1738,73 +1738,73 @@ static void test_channelvolume(void) }
hr = IChannelAudioVolume_GetChannelCount(acv, NULL); - ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08lx\n", hr);
hr = IChannelAudioVolume_GetChannelCount(acv, &chans); - ok(hr == S_OK, "GetChannelCount failed: %08x\n", hr); + ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(chans == fmt->nChannels, "GetChannelCount gave wrong number of channels: %d\n", chans);
hr = IChannelAudioVolume_GetChannelVolume(acv, fmt->nChannels, NULL); - ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08lx\n", hr);
hr = IChannelAudioVolume_GetChannelVolume(acv, fmt->nChannels, &vol); - ok(hr == E_INVALIDARG, "GetChannelCount gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "GetChannelCount gave wrong error: %08lx\n", hr);
hr = IChannelAudioVolume_GetChannelVolume(acv, 0, NULL); - ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "GetChannelCount gave wrong error: %08lx\n", hr);
hr = IChannelAudioVolume_GetChannelVolume(acv, 0, &vol); - ok(hr == S_OK, "GetChannelCount failed: %08x\n", hr); + ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(vol == 1.f, "Channel volume was not 1: %f\n", vol);
hr = IChannelAudioVolume_SetChannelVolume(acv, fmt->nChannels, -1.f, NULL); - ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08lx\n", hr);
hr = IChannelAudioVolume_SetChannelVolume(acv, 0, -1.f, NULL); - ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08lx\n", hr);
hr = IChannelAudioVolume_SetChannelVolume(acv, 0, 2.f, NULL); - ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetChannelVolume gave wrong error: %08lx\n", hr);
hr = IChannelAudioVolume_SetChannelVolume(acv, 0, 0.2f, NULL); - ok(hr == S_OK, "SetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "SetChannelVolume failed: %08lx\n", hr);
hr = IChannelAudioVolume_GetChannelVolume(acv, 0, &vol); - ok(hr == S_OK, "GetChannelCount failed: %08x\n", hr); + ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(fabsf(vol - 0.2f) < 0.05f, "Channel volume wasn't 0.2: %f\n", vol);
hr = IChannelAudioVolume_GetAllVolumes(acv, 0, NULL); - ok(hr == NULL_PTR_ERR, "GetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "GetAllVolumes gave wrong error: %08lx\n", hr);
hr = IChannelAudioVolume_GetAllVolumes(acv, fmt->nChannels, NULL); - ok(hr == NULL_PTR_ERR, "GetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "GetAllVolumes gave wrong error: %08lx\n", hr);
vols = HeapAlloc(GetProcessHeap(), 0, fmt->nChannels * sizeof(float)); ok(vols != NULL, "HeapAlloc failed\n");
hr = IChannelAudioVolume_GetAllVolumes(acv, fmt->nChannels - 1, vols); - ok(hr == E_INVALIDARG, "GetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "GetAllVolumes gave wrong error: %08lx\n", hr);
hr = IChannelAudioVolume_GetAllVolumes(acv, fmt->nChannels, vols); - ok(hr == S_OK, "GetAllVolumes failed: %08x\n", hr); + ok(hr == S_OK, "GetAllVolumes failed: %08lx\n", hr); ok(fabsf(vols[0] - 0.2f) < 0.05f, "Channel 0 volume wasn't 0.2: %f\n", vol); for(i = 1; i < fmt->nChannels; ++i) ok(vols[i] == 1.f, "Channel %d volume is not 1: %f\n", i, vols[i]);
hr = IChannelAudioVolume_SetAllVolumes(acv, 0, NULL, NULL); - ok(hr == NULL_PTR_ERR, "SetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "SetAllVolumes gave wrong error: %08lx\n", hr);
hr = IChannelAudioVolume_SetAllVolumes(acv, fmt->nChannels, NULL, NULL); - ok(hr == NULL_PTR_ERR, "SetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "SetAllVolumes gave wrong error: %08lx\n", hr);
hr = IChannelAudioVolume_SetAllVolumes(acv, fmt->nChannels - 1, vols, NULL); - ok(hr == E_INVALIDARG, "SetAllVolumes gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetAllVolumes gave wrong error: %08lx\n", hr);
hr = IChannelAudioVolume_SetAllVolumes(acv, fmt->nChannels, vols, NULL); - ok(hr == S_OK, "SetAllVolumes failed: %08x\n", hr); + ok(hr == S_OK, "SetAllVolumes failed: %08lx\n", hr);
hr = IChannelAudioVolume_SetChannelVolume(acv, 0, 1.0f, NULL); - ok(hr == S_OK, "SetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "SetChannelVolume failed: %08lx\n", hr);
HeapFree(GetProcessHeap(), 0, vols); IChannelAudioVolume_Release(acv); @@ -1823,20 +1823,20 @@ static void test_simplevolume(void)
hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return;
hr = IAudioClient_GetMixFormat(ac, &fmt); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr);
hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST, 5000000, 0, fmt, NULL); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr);
if(hr == S_OK){ hr = IAudioClient_GetService(ac, &IID_ISimpleAudioVolume, (void**)&sav); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); } if(hr != S_OK){ IAudioClient_Release(ac); @@ -1845,55 +1845,55 @@ static void test_simplevolume(void) }
hr = ISimpleAudioVolume_GetMasterVolume(sav, NULL); - ok(hr == NULL_PTR_ERR, "GetMasterVolume gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "GetMasterVolume gave wrong error: %08lx\n", hr);
hr = ISimpleAudioVolume_GetMasterVolume(sav, &vol); - ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "GetMasterVolume failed: %08lx\n", hr); ok(vol == 1.f, "Master volume wasn't 1: %f\n", vol);
hr = ISimpleAudioVolume_SetMasterVolume(sav, -1.f, NULL); - ok(hr == E_INVALIDARG, "SetMasterVolume gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetMasterVolume gave wrong error: %08lx\n", hr);
hr = ISimpleAudioVolume_SetMasterVolume(sav, 2.f, NULL); - ok(hr == E_INVALIDARG, "SetMasterVolume gave wrong error: %08x\n", hr); + ok(hr == E_INVALIDARG, "SetMasterVolume gave wrong error: %08lx\n", hr);
hr = ISimpleAudioVolume_SetMasterVolume(sav, 0.2f, NULL); - ok(hr == S_OK, "SetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "SetMasterVolume failed: %08lx\n", hr);
hr = ISimpleAudioVolume_GetMasterVolume(sav, &vol); - ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "GetMasterVolume failed: %08lx\n", hr); ok(fabsf(vol - 0.2f) < 0.05f, "Master volume wasn't 0.2: %f\n", vol);
hr = ISimpleAudioVolume_GetMute(sav, NULL); - ok(hr == NULL_PTR_ERR, "GetMute gave wrong error: %08x\n", hr); + ok(hr == NULL_PTR_ERR, "GetMute gave wrong error: %08lx\n", hr);
mute = TRUE; hr = ISimpleAudioVolume_GetMute(sav, &mute); - ok(hr == S_OK, "GetMute failed: %08x\n", hr); + ok(hr == S_OK, "GetMute failed: %08lx\n", hr); ok(mute == FALSE, "Session is already muted\n");
hr = ISimpleAudioVolume_SetMute(sav, TRUE, NULL); - ok(hr == S_OK, "SetMute failed: %08x\n", hr); + ok(hr == S_OK, "SetMute failed: %08lx\n", hr);
mute = FALSE; hr = ISimpleAudioVolume_GetMute(sav, &mute); - ok(hr == S_OK, "GetMute failed: %08x\n", hr); + ok(hr == S_OK, "GetMute failed: %08lx\n", hr); ok(mute == TRUE, "Session should have been muted\n");
hr = ISimpleAudioVolume_GetMasterVolume(sav, &vol); - ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "GetMasterVolume failed: %08lx\n", hr); ok(fabsf(vol - 0.2f) < 0.05f, "Master volume wasn't 0.2: %f\n", vol);
hr = ISimpleAudioVolume_SetMasterVolume(sav, 1.f, NULL); - ok(hr == S_OK, "SetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "SetMasterVolume failed: %08lx\n", hr);
mute = FALSE; hr = ISimpleAudioVolume_GetMute(sav, &mute); - ok(hr == S_OK, "GetMute failed: %08x\n", hr); + ok(hr == S_OK, "GetMute failed: %08lx\n", hr); ok(mute == TRUE, "Session should have been muted\n");
hr = ISimpleAudioVolume_SetMute(sav, FALSE, NULL); - ok(hr == S_OK, "SetMute failed: %08x\n", hr); + ok(hr == S_OK, "SetMute failed: %08lx\n", hr);
ISimpleAudioVolume_Release(sav); IAudioClient_Release(ac); @@ -1913,24 +1913,24 @@ static void test_volume_dependence(void) UINT32 nch;
hr = CoCreateGuid(&session); - ok(hr == S_OK, "CoCreateGuid failed: %08x\n", hr); + ok(hr == S_OK, "CoCreateGuid failed: %08lx\n", hr);
hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return;
hr = IAudioClient_GetMixFormat(ac, &fmt); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr);
hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST, 5000000, 0, fmt, &session); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr);
if(hr == S_OK){ hr = IAudioClient_GetService(ac, &IID_ISimpleAudioVolume, (void**)&sav); - ok(hr == S_OK, "GetService (SimpleAudioVolume) failed: %08x\n", hr); + ok(hr == S_OK, "GetService (SimpleAudioVolume) failed: %08lx\n", hr); } if(hr != S_OK){ IAudioClient_Release(ac); @@ -1939,40 +1939,40 @@ static void test_volume_dependence(void) }
hr = IAudioClient_GetService(ac, &IID_IChannelAudioVolume, (void**)&cav); - ok(hr == S_OK, "GetService (ChannelAudioVolume) failed: %08x\n", hr); + ok(hr == S_OK, "GetService (ChannelAudioVolume) failed: %08lx\n", hr);
hr = IAudioClient_GetService(ac, &IID_IAudioStreamVolume, (void**)&asv); - ok(hr == S_OK, "GetService (AudioStreamVolume) failed: %08x\n", hr); + ok(hr == S_OK, "GetService (AudioStreamVolume) failed: %08lx\n", hr);
hr = IAudioStreamVolume_SetChannelVolume(asv, 0, 0.2f); - ok(hr == S_OK, "ASV_SetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "ASV_SetChannelVolume failed: %08lx\n", hr);
hr = IChannelAudioVolume_SetChannelVolume(cav, 0, 0.4f, NULL); - ok(hr == S_OK, "CAV_SetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "CAV_SetChannelVolume failed: %08lx\n", hr);
hr = ISimpleAudioVolume_SetMasterVolume(sav, 0.6f, NULL); - ok(hr == S_OK, "SAV_SetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "SAV_SetMasterVolume failed: %08lx\n", hr);
hr = IAudioStreamVolume_GetChannelVolume(asv, 0, &vol); - ok(hr == S_OK, "ASV_GetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "ASV_GetChannelVolume failed: %08lx\n", hr); ok(fabsf(vol - 0.2f) < 0.05f, "ASV_GetChannelVolume gave wrong volume: %f\n", vol);
hr = IChannelAudioVolume_GetChannelVolume(cav, 0, &vol); - ok(hr == S_OK, "CAV_GetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "CAV_GetChannelVolume failed: %08lx\n", hr); ok(fabsf(vol - 0.4f) < 0.05f, "CAV_GetChannelVolume gave wrong volume: %f\n", vol);
hr = ISimpleAudioVolume_GetMasterVolume(sav, &vol); - ok(hr == S_OK, "SAV_GetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "SAV_GetMasterVolume failed: %08lx\n", hr); ok(fabsf(vol - 0.6f) < 0.05f, "SAV_GetMasterVolume gave wrong volume: %f\n", vol);
hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac2); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr);
if(hr == S_OK){ hr = IAudioClient_Initialize(ac2, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST, 5000000, 0, fmt, &session); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr); if(hr != S_OK) IAudioClient_Release(ac2); } @@ -1982,25 +1982,25 @@ static void test_volume_dependence(void) IAudioStreamVolume *asv2;
hr = IAudioClient_GetService(ac2, &IID_IChannelAudioVolume, (void**)&cav2); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr);
hr = IAudioClient_GetService(ac2, &IID_IAudioStreamVolume, (void**)&asv2); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr);
hr = IChannelAudioVolume_GetChannelVolume(cav2, 0, &vol); - ok(hr == S_OK, "CAV_GetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "CAV_GetChannelVolume failed: %08lx\n", hr); ok(fabsf(vol - 0.4f) < 0.05f, "CAV_GetChannelVolume gave wrong volume: %f\n", vol);
hr = IAudioStreamVolume_GetChannelVolume(asv2, 0, &vol); - ok(hr == S_OK, "ASV_GetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "ASV_GetChannelVolume failed: %08lx\n", hr); ok(vol == 1.f, "ASV_GetChannelVolume gave wrong volume: %f\n", vol);
hr = IChannelAudioVolume_GetChannelCount(cav2, &nch); - ok(hr == S_OK, "GetChannelCount failed: %08x\n", hr); + ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(nch == fmt->nChannels, "Got wrong channel count, expected %u: %u\n", fmt->nChannels, nch);
hr = IAudioStreamVolume_GetChannelCount(asv2, &nch); - ok(hr == S_OK, "GetChannelCount failed: %08x\n", hr); + ok(hr == S_OK, "GetChannelCount failed: %08lx\n", hr); ok(nch == fmt->nChannels, "Got wrong channel count, expected %u: %u\n", fmt->nChannels, nch);
IAudioStreamVolume_Release(asv2); @@ -2010,10 +2010,10 @@ static void test_volume_dependence(void) skip("Unable to open the same device twice. Skipping session volume control tests\n");
hr = IChannelAudioVolume_SetChannelVolume(cav, 0, 1.f, NULL); - ok(hr == S_OK, "CAV_SetChannelVolume failed: %08x\n", hr); + ok(hr == S_OK, "CAV_SetChannelVolume failed: %08lx\n", hr);
hr = ISimpleAudioVolume_SetMasterVolume(sav, 1.f, NULL); - ok(hr == S_OK, "SAV_SetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "SAV_SetMasterVolume failed: %08lx\n", hr);
CoTaskMemFree(fmt); ISimpleAudioVolume_Release(sav); @@ -2037,15 +2037,15 @@ static void test_session_creation(void)
hr = IMMDevice_Activate(dev, &IID_IAudioSessionManager, CLSCTX_INPROC_SERVER, NULL, (void**)&sesm); - ok((hr == S_OK)^(sesm == NULL), "Activate %08x &out pointer\n", hr); - ok(hr == S_OK, "Activate failed: %08x\n", hr); + ok((hr == S_OK)^(sesm == NULL), "Activate %08lx &out pointer\n", hr); + ok(hr == S_OK, "Activate failed: %08lx\n", hr);
hr = IAudioSessionManager_GetSimpleAudioVolume(sesm, &session_guid, FALSE, &sav); - ok(hr == S_OK, "GetSimpleAudioVolume failed: %08x\n", hr); + ok(hr == S_OK, "GetSimpleAudioVolume failed: %08lx\n", hr);
hr = ISimpleAudioVolume_SetMasterVolume(sav, 0.6f, NULL); - ok(hr == S_OK, "SetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "SetMasterVolume failed: %08lx\n", hr);
/* Release completely to show session persistence */ ISimpleAudioVolume_Release(sav); @@ -2063,44 +2063,44 @@ static void test_session_creation(void)
hr = IMMDevice_Activate(cap_dev, &IID_IAudioSessionManager, CLSCTX_INPROC_SERVER, NULL, (void**)&cap_sesm); - ok((hr == S_OK)^(cap_sesm == NULL), "Activate %08x &out pointer\n", hr); - ok(hr == S_OK, "Activate failed: %08x\n", hr); + ok((hr == S_OK)^(cap_sesm == NULL), "Activate %08lx &out pointer\n", hr); + ok(hr == S_OK, "Activate failed: %08lx\n", hr);
hr = IAudioSessionManager_GetSimpleAudioVolume(cap_sesm, &session_guid, FALSE, &cap_sav); - ok(hr == S_OK, "GetSimpleAudioVolume failed: %08x\n", hr); + ok(hr == S_OK, "GetSimpleAudioVolume failed: %08lx\n", hr);
vol = 0.5f; hr = ISimpleAudioVolume_GetMasterVolume(cap_sav, &vol); - ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "GetMasterVolume failed: %08lx\n", hr);
ISimpleAudioVolume_Release(cap_sav); IAudioSessionManager_Release(cap_sesm);
hr = IMMDevice_Activate(cap_dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&cap_ac); - ok(hr == S_OK, "Activate failed: %08x\n", hr); + ok(hr == S_OK, "Activate failed: %08lx\n", hr);
IMMDevice_Release(cap_dev);
hr = IAudioClient_GetMixFormat(cap_ac, &cap_pwfx); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr);
hr = IAudioClient_Initialize(cap_ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, cap_pwfx, &session_guid); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr);
CoTaskMemFree(cap_pwfx);
if(hr == S_OK){ hr = IAudioClient_GetService(cap_ac, &IID_ISimpleAudioVolume, (void**)&cap_sav); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); } if(hr == S_OK){ vol = 0.5f; hr = ISimpleAudioVolume_GetMasterVolume(cap_sav, &vol); - ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "GetMasterVolume failed: %08lx\n", hr);
ISimpleAudioVolume_Release(cap_sav); } @@ -2110,24 +2110,24 @@ static void test_session_creation(void)
hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok((hr == S_OK)^(ac == NULL), "Activate %08x &out pointer\n", hr); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok((hr == S_OK)^(ac == NULL), "Activate %08lx &out pointer\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return;
hr = IAudioClient_GetMixFormat(ac, &fmt); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr);
hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST, 5000000, 0, fmt, &session_guid); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr);
hr = IAudioClient_GetService(ac, &IID_ISimpleAudioVolume, (void**)&sav); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); if(hr == S_OK){ vol = 0.5f; hr = ISimpleAudioVolume_GetMasterVolume(sav, &vol); - ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); + ok(hr == S_OK, "GetMasterVolume failed: %08lx\n", hr); ok(fabs(vol - 0.6f) < 0.05f, "Got wrong volume: %f\n", vol);
ISimpleAudioVolume_Release(sav); @@ -2154,21 +2154,21 @@ static void test_worst_case(void)
hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return;
hr = IAudioClient_GetMixFormat(ac, &pwfx); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr);
hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_EVENTCALLBACK, 500000, 0, pwfx, NULL); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr); if(hr != S_OK) return;
hr = IAudioClient_GetDevicePeriod(ac, &defp, NULL); - ok(hr == S_OK, "GetDevicePeriod failed: %08x\n", hr); + ok(hr == S_OK, "GetDevicePeriod failed: %08lx\n", hr);
fragment = MulDiv(defp, pwfx->nSamplesPerSec, 10000000);
@@ -2176,74 +2176,74 @@ static void test_worst_case(void) ok(event != NULL, "CreateEvent failed\n");
hr = IAudioClient_SetEventHandle(ac, event); - ok(hr == S_OK, "SetEventHandle failed: %08x\n", hr); + ok(hr == S_OK, "SetEventHandle failed: %08lx\n", hr);
hr = IAudioClient_GetService(ac, &IID_IAudioRenderClient, (void**)&arc); - ok(hr == S_OK, "GetService(IAudioRenderClient) failed: %08x\n", hr); + ok(hr == S_OK, "GetService(IAudioRenderClient) failed: %08lx\n", hr);
hr = IAudioClient_GetService(ac, &IID_IAudioClock, (void**)&acl); - ok(hr == S_OK, "GetService(IAudioClock) failed: %08x\n", hr); + ok(hr == S_OK, "GetService(IAudioClock) failed: %08lx\n", hr);
hr = IAudioClock_GetFrequency(acl, &freq); - ok(hr == S_OK, "GetFrequency failed: %08x\n", hr); + ok(hr == S_OK, "GetFrequency failed: %08lx\n", hr);
for(j = 0; j <= (winetest_interactive ? 9 : 2); j++){ sum = 0; - trace("Should play %ums continuous tone with fragment size %u.\n", + trace("Should play %lums continuous tone with fragment size %u.\n", (ULONG)(defp/100), fragment);
hr = IAudioClock_GetPosition(acl, &pos, &pcpos0); - ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(hr == S_OK, "GetPosition failed: %08lx\n", hr);
/* XAudio2 prefills one period, play without it */ if(winetest_debug>2){ hr = IAudioRenderClient_GetBuffer(arc, fragment, &data); - ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); + ok(hr == S_OK, "GetBuffer failed: %08lx\n", hr);
hr = IAudioRenderClient_ReleaseBuffer(arc, fragment, AUDCLNT_BUFFERFLAGS_SILENT); - ok(hr == S_OK, "ReleaseBuffer failed: %08x\n", hr); + ok(hr == S_OK, "ReleaseBuffer failed: %08lx\n", hr); if(hr == S_OK) sum += fragment; }
hr = IAudioClient_Start(ac); - ok(hr == S_OK, "Start failed: %08x\n", hr); + ok(hr == S_OK, "Start failed: %08lx\n", hr);
for(i = 0; i <= 99; i++){ /* 100 x 10ms = 1 second */ r = WaitForSingleObject(event, 60 + defp / 10000); - ok(r == WAIT_OBJECT_0, "Wait iteration %d gave %x\n", i, r); + ok(r == WAIT_OBJECT_0, "Wait iteration %d gave %lx\n", i, r);
/* the app has nearly one period time to feed data */ Sleep((i % 10) * defp / 120000);
hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding failed: %08lx\n", hr);
/* XAudio2 writes only when there's little data left */ if(pad <= fragment){ hr = IAudioRenderClient_GetBuffer(arc, fragment, &data); - ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); + ok(hr == S_OK, "GetBuffer failed: %08lx\n", hr);
hr = IAudioRenderClient_ReleaseBuffer(arc, fragment, wave_generate_tone(pwfx, data, fragment)); - ok(hr == S_OK, "ReleaseBuffer failed: %08x\n", hr); + ok(hr == S_OK, "ReleaseBuffer failed: %08lx\n", hr); if(hr == S_OK) sum += fragment; } }
hr = IAudioClient_Stop(ac); - ok(hr == S_OK, "Stop failed: %08x\n", hr); + ok(hr == S_OK, "Stop failed: %08lx\n", hr);
hr = IAudioClient_GetCurrentPadding(ac, &pad); - ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + ok(hr == S_OK, "GetCurrentPadding failed: %08lx\n", hr);
hr = IAudioClock_GetPosition(acl, &pos, &pcpos); - ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(hr == S_OK, "GetPosition failed: %08lx\n", hr);
Sleep(100);
- trace("Released %u=%ux%u -%u frames at %u worth %ums in %ums\n", + trace("Released %u=%ux%u -%u frames at %lu worth %ums in %lums\n", sum, sum/fragment, fragment, pad, pwfx->nSamplesPerSec, MulDiv(sum-pad, 1000, pwfx->nSamplesPerSec), (ULONG)((pcpos-pcpos0)/10000)); @@ -2252,7 +2252,7 @@ static void test_worst_case(void) "Position %u at end vs. %u-%u submitted frames\n", (UINT)pos, sum, pad);
hr = IAudioClient_Reset(ac); - ok(hr == S_OK, "Reset failed: %08x\n", hr); + ok(hr == S_OK, "Reset failed: %08lx\n", hr);
Sleep(250); } @@ -2274,37 +2274,37 @@ static void test_marshal(void) /* IAudioRenderClient */ hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return;
hr = IAudioClient_GetMixFormat(ac, &pwfx); - ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + ok(hr == S_OK, "GetMixFormat failed: %08lx\n", hr);
hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); - ok(hr == S_OK, "Initialize failed: %08x\n", hr); + ok(hr == S_OK, "Initialize failed: %08lx\n", hr);
CoTaskMemFree(pwfx);
hr = IAudioClient_GetService(ac, &IID_IAudioRenderClient, (void**)&rc); - ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(hr == S_OK, "GetService failed: %08lx\n", hr); if(hr != S_OK) { IAudioClient_Release(ac); return; }
hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); - ok(hr == S_OK, "CreateStreamOnHGlobal failed 0x%08x\n", hr); + ok(hr == S_OK, "CreateStreamOnHGlobal failed 0x%08lx\n", hr);
/* marshal IAudioClient */
hr = CoMarshalInterface(pStream, &IID_IAudioClient, (IUnknown*)ac, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); - ok(hr == S_OK, "CoMarshalInterface IAudioClient failed 0x%08x\n", hr); + ok(hr == S_OK, "CoMarshalInterface IAudioClient failed 0x%08lx\n", hr);
IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); hr = CoUnmarshalInterface(pStream, &IID_IAudioClient, (void **)&acDest); - ok(hr == S_OK, "CoUnmarshalInterface IAudioClient failed 0x%08x\n", hr); + ok(hr == S_OK, "CoUnmarshalInterface IAudioClient failed 0x%08lx\n", hr); if (hr == S_OK) IAudioClient_Release(acDest);
@@ -2312,11 +2312,11 @@ static void test_marshal(void) /* marshal IAudioRenderClient */
hr = CoMarshalInterface(pStream, &IID_IAudioRenderClient, (IUnknown*)rc, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); - ok(hr == S_OK, "CoMarshalInterface IAudioRenderClient failed 0x%08x\n", hr); + ok(hr == S_OK, "CoMarshalInterface IAudioRenderClient failed 0x%08lx\n", hr);
IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); hr = CoUnmarshalInterface(pStream, &IID_IAudioRenderClient, (void **)&rcDest); - ok(hr == S_OK, "CoUnmarshalInterface IAudioRenderClient failed 0x%08x\n", hr); + ok(hr == S_OK, "CoUnmarshalInterface IAudioRenderClient failed 0x%08lx\n", hr); if (hr == S_OK) IAudioRenderClient_Release(rcDest);
@@ -2337,31 +2337,31 @@ static void test_endpointvolume(void)
hr = IMMDevice_Activate(dev, &IID_IAudioEndpointVolume, CLSCTX_INPROC_SERVER, NULL, (void**)&aev); - ok(hr == S_OK, "Activation failed with %08x\n", hr); + ok(hr == S_OK, "Activation failed with %08lx\n", hr); if(hr != S_OK) return;
hr = IAudioEndpointVolume_GetVolumeRange(aev, &mindb, NULL, NULL); - ok(hr == E_POINTER, "GetVolumeRange should have failed with E_POINTER: 0x%08x\n", hr); + ok(hr == E_POINTER, "GetVolumeRange should have failed with E_POINTER: 0x%08lx\n", hr);
hr = IAudioEndpointVolume_GetVolumeRange(aev, &mindb, &maxdb, &increment); - ok(hr == S_OK, "GetVolumeRange failed: 0x%08x\n", hr); + ok(hr == S_OK, "GetVolumeRange failed: 0x%08lx\n", hr); trace("got range: [%f,%f]/%f\n", mindb, maxdb, increment);
hr = IAudioEndpointVolume_SetMasterVolumeLevel(aev, mindb - increment, NULL); - ok(hr == E_INVALIDARG, "SetMasterVolumeLevel failed: 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "SetMasterVolumeLevel failed: 0x%08lx\n", hr);
hr = IAudioEndpointVolume_GetMasterVolumeLevel(aev, &volume); - ok(hr == S_OK, "GetMasterVolumeLevel failed: 0x%08x\n", hr); + ok(hr == S_OK, "GetMasterVolumeLevel failed: 0x%08lx\n", hr);
hr = IAudioEndpointVolume_SetMasterVolumeLevel(aev, volume, NULL); - ok(hr == S_OK, "SetMasterVolumeLevel failed: 0x%08x\n", hr); + ok(hr == S_OK, "SetMasterVolumeLevel failed: 0x%08lx\n", hr);
hr = IAudioEndpointVolume_GetMute(aev, &mute); - ok(hr == S_OK, "GetMute failed: %08x\n", hr); + ok(hr == S_OK, "GetMute failed: %08lx\n", hr);
hr = IAudioEndpointVolume_SetMute(aev, mute, NULL); - ok(hr == S_OK || hr == S_FALSE, "SetMute failed: %08x\n", hr); + ok(hr == S_OK || hr == S_FALSE, "SetMute failed: %08lx\n", hr);
IAudioEndpointVolume_Release(aev); } @@ -2375,18 +2375,18 @@ START_TEST(render) hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&mme); if (FAILED(hr)) { - skip("mmdevapi not available: 0x%08x\n", hr); + skip("mmdevapi not available: 0x%08lx\n", hr); goto cleanup; }
hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(mme, eRender, eMultimedia, &dev); - ok(hr == S_OK || hr == E_NOTFOUND, "GetDefaultAudioEndpoint failed: 0x%08x\n", hr); + ok(hr == S_OK || hr == E_NOTFOUND, "GetDefaultAudioEndpoint failed: 0x%08lx\n", hr); if (hr != S_OK || !dev) { if (hr == E_NOTFOUND) skip("No sound card available\n"); else - skip("GetDefaultAudioEndpoint returns 0x%08x\n", hr); + skip("GetDefaultAudioEndpoint returns 0x%08lx\n", hr); goto cleanup; }
diff --git a/dlls/mmdevapi/tests/spatialaudio.c b/dlls/mmdevapi/tests/spatialaudio.c index d9ccc429ce8..2f55b12f68e 100644 --- a/dlls/mmdevapi/tests/spatialaudio.c +++ b/dlls/mmdevapi/tests/spatialaudio.c @@ -46,22 +46,22 @@ static void test_formats(void) WAVEFORMATEX *fmt = NULL;
hr = ISpatialAudioClient_GetSupportedAudioObjectFormatEnumerator(sac, &afe); - ok(hr == S_OK, "Getting format enumerator failed: 0x%08x\n", hr); + ok(hr == S_OK, "Getting format enumerator failed: 0x%08lx\n", hr);
hr = IAudioFormatEnumerator_GetCount(afe, &format_count); - ok(hr == S_OK, "Getting format count failed: 0x%08x\n", hr); + ok(hr == S_OK, "Getting format count failed: 0x%08lx\n", hr); ok(format_count == 1, "Got wrong format count, expected 1 got %u\n", format_count);
hr = IAudioFormatEnumerator_GetFormat(afe, 0, &fmt); - ok(hr == S_OK, "Getting format failed: 0x%08x\n", hr); + ok(hr == S_OK, "Getting format failed: 0x%08lx\n", hr); ok(fmt != NULL, "Expected to get non-NULL format\n");
ok(fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT, "Wrong format, expected WAVE_FORMAT_IEEE_FLOAT got %hx\n", fmt->wFormatTag); ok(fmt->nChannels == 1, "Wrong number of channels, expected 1 got %hu\n", fmt->nChannels); - ok(fmt->nSamplesPerSec == 48000, "Wrong sample ret, expected 48000 got %u\n", fmt->nSamplesPerSec); + ok(fmt->nSamplesPerSec == 48000, "Wrong sample ret, expected 48000 got %lu\n", fmt->nSamplesPerSec); ok(fmt->wBitsPerSample == 32, "Wrong bits per sample, expected 32 got %hu\n", fmt->wBitsPerSample); ok(fmt->nBlockAlign == 4, "Wrong block align, expected 4 got %hu\n", fmt->nBlockAlign); - ok(fmt->nAvgBytesPerSec == 192000, "Wrong avg bytes per sec, expected 192000 got %u\n", fmt->nAvgBytesPerSec); + ok(fmt->nAvgBytesPerSec == 192000, "Wrong avg bytes per sec, expected 192000 got %lu\n", fmt->nAvgBytesPerSec); ok(fmt->cbSize == 0, "Wrong cbSize for simple format, expected 0, got %hu\n", fmt->cbSize);
memcpy(&format, fmt, sizeof(format)); @@ -160,19 +160,19 @@ static void test_stream_activation(void) /* correct params */ fill_activation_params(&activation_params); hr = ISpatialAudioClient_ActivateSpatialAudioStream(sac, &activation_params_prop, &IID_ISpatialAudioObjectRenderStream, (void**)&sas); - ok(hr == S_OK, "Failed to activate spatial audio stream: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to activate spatial audio stream: 0x%08lx\n", hr); ok(ISpatialAudioObjectRenderStream_Release(sas) == 0, "Expected to release the last reference\n");
/* event handle */ fill_activation_params(&activation_params); activation_params.EventHandle = NULL; hr = ISpatialAudioClient_ActivateSpatialAudioStream(sac, &activation_params_prop, &IID_ISpatialAudioObjectRenderStream, (void**)&sas); - ok(hr == E_INVALIDARG, "Expected lack of no EventHandle to be invalid: 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "Expected lack of no EventHandle to be invalid: 0x%08lx\n", hr); ok(sas == NULL, "Expected spatial audio stream to be set to NULL upon failed activation\n");
activation_params.EventHandle = INVALID_HANDLE_VALUE; hr = ISpatialAudioClient_ActivateSpatialAudioStream(sac, &activation_params_prop, &IID_ISpatialAudioObjectRenderStream, (void**)&sas); - ok(hr == E_INVALIDARG, "Expected INVALID_HANDLE_VALUE to be invalid: 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "Expected INVALID_HANDLE_VALUE to be invalid: 0x%08lx\n", hr); ok(sas == NULL, "Expected spatial audio stream to be set to NULL upon failed activation\n");
/* must use only queried sample rate */ @@ -182,7 +182,7 @@ static void test_stream_activation(void) wrong_format.nSamplesPerSec = 44100; wrong_format.nAvgBytesPerSec = wrong_format.nSamplesPerSec * wrong_format.nBlockAlign; hr = ISpatialAudioClient_ActivateSpatialAudioStream(sac, &activation_params_prop, &IID_ISpatialAudioObjectRenderStream, (void**)&sas); - ok(hr == AUDCLNT_E_UNSUPPORTED_FORMAT, "Expected format to be unsupported: 0x%08x\n", hr); + ok(hr == AUDCLNT_E_UNSUPPORTED_FORMAT, "Expected format to be unsupported: 0x%08lx\n", hr); ok(sas == NULL, "Expected spatial audio stream to be set to NULL upon failed activation\n");
/* dynamic objects are not supported */ @@ -191,7 +191,7 @@ static void test_stream_activation(void) fill_activation_params(&activation_params); activation_params.StaticObjectTypeMask |= AudioObjectType_Dynamic; hr = ISpatialAudioClient_ActivateSpatialAudioStream(sac, &activation_params_prop, &IID_ISpatialAudioObjectRenderStream, (void**)&sas); - ok(hr == E_INVALIDARG, "Expected dynamic objects type be invalid: 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "Expected dynamic objects type be invalid: 0x%08lx\n", hr); ok(sas == NULL, "Expected spatial audio stream to be set to NULL upon failed activation\n"); }
@@ -199,9 +199,9 @@ static void test_stream_activation(void) activation_params.MaxDynamicObjectCount = max_dyn_count + 1; hr = ISpatialAudioClient_ActivateSpatialAudioStream(sac, &activation_params_prop, &IID_ISpatialAudioObjectRenderStream, (void**)&sas); if (max_dyn_count) - ok(hr == AUDCLNT_E_UNSUPPORTED_FORMAT, "Expected dynamic object count exceeding max to be unsupported: 0x%08x\n", hr); + ok(hr == AUDCLNT_E_UNSUPPORTED_FORMAT, "Expected dynamic object count exceeding max to be unsupported: 0x%08lx\n", hr); else - ok(hr == E_INVALIDARG, "Expected setting dynamic object count to be invalid: 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "Expected setting dynamic object count to be invalid: 0x%08lx\n", hr);
/* ISpatialAudioObjectRenderStreamNotify */ fill_activation_params(&activation_params); @@ -209,7 +209,7 @@ static void test_stream_activation(void) notify_object.ref = 0; activation_params.NotifyObject = ¬ify_object.ISpatialAudioObjectRenderStreamNotify_iface; hr = ISpatialAudioClient_ActivateSpatialAudioStream(sac, &activation_params_prop, &IID_ISpatialAudioObjectRenderStream, (void**)&sas); - ok(hr == S_OK, "Failed to activate spatial audio stream: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to activate spatial audio stream: 0x%08lx\n", hr); ok(notify_object.ref == 1, "Expected to get increased NotifyObject's ref count\n"); ok(ISpatialAudioObjectRenderStream_Release(sas) == 0, "Expected to release the last reference\n"); ok(notify_object.ref == 0, "Expected to get lowered NotifyObject's ref count\n"); @@ -233,23 +233,23 @@ static void test_audio_object_activation(void) fill_activation_params(&activation_params); activation_params.StaticObjectTypeMask &= ~AudioObjectType_FrontRight; hr = ISpatialAudioClient_ActivateSpatialAudioStream(sac, &activation_params_prop, &IID_ISpatialAudioObjectRenderStream, (void**)&sas); - ok(hr == S_OK, "Failed to activate spatial audio stream: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to activate spatial audio stream: 0x%08lx\n", hr);
hr = ISpatialAudioObjectRenderStream_ActivateSpatialAudioObject(sas, AudioObjectType_FrontLeft, &sao1); - ok(hr == S_OK, "Failed to activate spatial audio object: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to activate spatial audio object: 0x%08lx\n", hr); hr = ISpatialAudioObject_IsActive(sao1, &is_active); - todo_wine ok(hr == S_OK, "Failed to check if spatial audio object is active: 0x%08x\n", hr); + todo_wine ok(hr == S_OK, "Failed to check if spatial audio object is active: 0x%08lx\n", hr); if (hr == S_OK) ok(is_active, "Expected spaital audio object to be active\n");
hr = ISpatialAudioObjectRenderStream_ActivateSpatialAudioObject(sas, AudioObjectType_FrontLeft, &sao2); - ok(hr == SPTLAUDCLNT_E_OBJECT_ALREADY_ACTIVE, "Expected audio object to be already active: 0x%08x\n", hr); + ok(hr == SPTLAUDCLNT_E_OBJECT_ALREADY_ACTIVE, "Expected audio object to be already active: 0x%08lx\n", hr);
hr = ISpatialAudioObjectRenderStream_ActivateSpatialAudioObject(sas, AudioObjectType_FrontRight, &sao2); - ok(hr == SPTLAUDCLNT_E_STATIC_OBJECT_NOT_AVAILABLE, "Expected static object to be not available: 0x%08x\n", hr); + ok(hr == SPTLAUDCLNT_E_STATIC_OBJECT_NOT_AVAILABLE, "Expected static object to be not available: 0x%08lx\n", hr);
hr = ISpatialAudioObjectRenderStream_ActivateSpatialAudioObject(sas, AudioObjectType_Dynamic, &sao2); - ok(hr == SPTLAUDCLNT_E_NO_MORE_OBJECTS, "Expected to not have no more dynamic objects: 0x%08x\n", hr); + ok(hr == SPTLAUDCLNT_E_NO_MORE_OBJECTS, "Expected to not have no more dynamic objects: 0x%08lx\n", hr);
ISpatialAudioObject_Release(sao1); ISpatialAudioObjectRenderStream_Release(sas); @@ -286,10 +286,10 @@ static void test_audio_object_buffers(void)
fill_activation_params(&activation_params); hr = ISpatialAudioClient_ActivateSpatialAudioStream(sac, &activation_params_prop, &IID_ISpatialAudioObjectRenderStream, (void**)&sas); - ok(hr == S_OK, "Failed to activate spatial audio stream: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to activate spatial audio stream: 0x%08lx\n", hr);
hr = ISpatialAudioClient_GetMaxFrameCount(sac, &format, &max_frame_count); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); frame_count = format.nSamplesPerSec / 100; /* 10ms */ /* Most of the time the frame count matches the 10ms interval exactly. * However (seen on some Testbot machines) it might be a bit higher for some reason. */ @@ -300,32 +300,32 @@ static void test_audio_object_buffers(void) max_frame_count = frame_count + frame_count / 4;
hr = ISpatialAudioObjectRenderStream_ActivateSpatialAudioObject(sas, AudioObjectType_FrontLeft, &sao[0]); - ok(hr == S_OK, "Failed to activate spatial audio object: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to activate spatial audio object: 0x%08lx\n", hr);
hr = ISpatialAudioObjectRenderStream_Start(sas); - ok(hr == S_OK, "Failed to activate spatial audio render stream: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to activate spatial audio render stream: 0x%08lx\n", hr);
hr = ISpatialAudioObjectRenderStream_ActivateSpatialAudioObject(sas, AudioObjectType_FrontRight, &sao[1]); - ok(hr == S_OK, "Failed to activate spatial audio object: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to activate spatial audio object: 0x%08lx\n", hr);
hr = WaitForSingleObject(event, 200); - ok(hr == WAIT_OBJECT_0, "Expected event to be flagged: 0x%08x\n", hr); + ok(hr == WAIT_OBJECT_0, "Expected event to be flagged: 0x%08lx\n", hr);
hr = ISpatialAudioObjectRenderStream_ActivateSpatialAudioObject(sas, AudioObjectType_SideLeft, &sao[2]); - ok(hr == S_OK, "Failed to activate spatial audio object: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to activate spatial audio object: 0x%08lx\n", hr);
hr = ISpatialAudioObjectRenderStream_BeginUpdatingAudioObjects(sas, &dyn_object_count, &frame_count); - ok(hr == S_OK, "Failed to beging updating audio objects: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to beging updating audio objects: 0x%08lx\n", hr); ok(dyn_object_count == 0, "Unexpected dynamic objects\n"); ok(frame_count <= max_frame_count, "Got unexpected frame count %u.\n", frame_count);
hr = ISpatialAudioObjectRenderStream_ActivateSpatialAudioObject(sas, AudioObjectType_SideRight, &sao[3]); - ok(hr == S_OK, "Failed to activate spatial audio object: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to activate spatial audio object: 0x%08lx\n", hr);
for (i = 0; i < ARRAYSIZE(sao); i++) { hr = ISpatialAudioObject_GetBuffer(sao[i], &buffer, &buffer_length); - ok(hr == S_OK, "Expected to be able to get buffers for audio object: 0x%08x\n", hr); + ok(hr == S_OK, "Expected to be able to get buffers for audio object: 0x%08lx\n", hr); ok(buffer != NULL, "Expected to get a non-NULL buffer\n"); ok(buffer_length == frame_count * format.wBitsPerSample / 8, "Expected buffer length to be sample_size * frame_count = %hu but got %u\n", frame_count * format.wBitsPerSample / 8, buffer_length); @@ -333,7 +333,7 @@ static void test_audio_object_buffers(void) }
hr = ISpatialAudioObjectRenderStream_EndUpdatingAudioObjects(sas); - ok(hr == S_OK, "Failed to end updating audio objects: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to end updating audio objects: 0x%08lx\n", hr);
/* Emulate underrun and test frame count approximate limit. */
@@ -342,10 +342,10 @@ static void test_audio_object_buffers(void) for (j = 0; j < 20; ++j) { hr = WaitForSingleObject(event, 200); - ok(hr == WAIT_OBJECT_0, "Expected event to be flagged: 0x%08x, j %u.\n", hr, j); + ok(hr == WAIT_OBJECT_0, "Expected event to be flagged: 0x%08lx, j %u.\n", hr, j);
hr = ISpatialAudioObjectRenderStream_BeginUpdatingAudioObjects(sas, &dyn_object_count, &frame_count); - ok(hr == S_OK, "Failed to beging updating audio objects: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to beging updating audio objects: 0x%08lx\n", hr); ok(dyn_object_count == 0, "Unexpected dynamic objects\n"); ok(frame_count <= max_frame_count, "Got unexpected frame_count %u.\n", frame_count);
@@ -358,7 +358,7 @@ static void test_audio_object_buffers(void) for (i = 0; i < ARRAYSIZE(sao); i++) { hr = ISpatialAudioObject_GetBuffer(sao[i], &buffer, &buffer_length); - ok(hr == S_OK, "Expected to be able to get buffers for audio object: 0x%08x, i %d\n", hr, i); + ok(hr == S_OK, "Expected to be able to get buffers for audio object: 0x%08lx, i %d\n", hr, i); ok(buffer != NULL, "Expected to get a non-NULL buffer\n"); ok(buffer_length == frame_count * format.wBitsPerSample / 8, "Expected buffer length to be sample_size * frame_count = %hu but got %u\n", @@ -380,22 +380,22 @@ static void test_audio_object_buffers(void) } } hr = ISpatialAudioObjectRenderStream_EndUpdatingAudioObjects(sas); - ok(hr == S_OK, "Failed to end updating audio objects: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to end updating audio objects: 0x%08lx\n", hr); } timeEndPeriod(1);
hr = WaitForSingleObject(event, 200); - ok(hr == WAIT_OBJECT_0, "Expected event to be flagged: 0x%08x\n", hr); + ok(hr == WAIT_OBJECT_0, "Expected event to be flagged: 0x%08lx\n", hr);
hr = ISpatialAudioObjectRenderStream_BeginUpdatingAudioObjects(sas, &dyn_object_count, &frame_count); - ok(hr == S_OK, "Failed to beging updating audio objects: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to beging updating audio objects: 0x%08lx\n", hr); ok(dyn_object_count == 0, "Unexpected dynamic objects\n");
/* one more iteration but not with every object */ for (i = 0; i < ARRAYSIZE(sao) - 1; i++) { hr = ISpatialAudioObject_GetBuffer(sao[i], &buffer, &buffer_length); - ok(hr == S_OK, "Expected to be able to get buffers for audio object: 0x%08x\n", hr); + ok(hr == S_OK, "Expected to be able to get buffers for audio object: 0x%08lx\n", hr); ok(buffer != NULL, "Expected to get a non-NULL buffer\n"); ok(buffer_length == frame_count * format.wBitsPerSample / 8, "Expected buffer length to be sample_size * frame_count = %hu but got %u\n", frame_count * format.wBitsPerSample / 8, buffer_length); @@ -403,40 +403,40 @@ static void test_audio_object_buffers(void) }
hr = ISpatialAudioObjectRenderStream_EndUpdatingAudioObjects(sas); - ok(hr == S_OK, "Failed to end updating audio objects: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to end updating audio objects: 0x%08lx\n", hr);
/* ending the stream */ hr = ISpatialAudioObject_SetEndOfStream(sao[0], 0); - todo_wine ok(hr == SPTLAUDCLNT_E_OUT_OF_ORDER, "Expected that ending the stream at this point won't be allowed: 0x%08x\n", hr); + todo_wine ok(hr == SPTLAUDCLNT_E_OUT_OF_ORDER, "Expected that ending the stream at this point won't be allowed: 0x%08lx\n", hr);
hr = WaitForSingleObject(event, 200); - ok(hr == WAIT_OBJECT_0, "Expected event to be flagged: 0x%08x\n", hr); + ok(hr == WAIT_OBJECT_0, "Expected event to be flagged: 0x%08lx\n", hr);
hr = ISpatialAudioObject_SetEndOfStream(sao[0], 0); - todo_wine ok(hr == SPTLAUDCLNT_E_OUT_OF_ORDER, "Expected that ending the stream at this point won't be allowed: 0x%08x\n", hr); + todo_wine ok(hr == SPTLAUDCLNT_E_OUT_OF_ORDER, "Expected that ending the stream at this point won't be allowed: 0x%08lx\n", hr);
hr = ISpatialAudioObjectRenderStream_BeginUpdatingAudioObjects(sas, &dyn_object_count, &frame_count); - ok(hr == S_OK, "Failed to beging updating audio objects: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to beging updating audio objects: 0x%08lx\n", hr); ok(dyn_object_count == 0, "Unexpected dynamic objects\n");
/* expect the object that was not updated last cycle to be invalidated */ hr = ISpatialAudioObject_GetBuffer(sao[ARRAYSIZE(sao) - 1], &buffer, &buffer_length); - todo_wine ok(hr == SPTLAUDCLNT_E_RESOURCES_INVALIDATED, "Expected audio object to be invalidated: 0x%08x\n", hr); + todo_wine ok(hr == SPTLAUDCLNT_E_RESOURCES_INVALIDATED, "Expected audio object to be invalidated: 0x%08lx\n", hr);
for (i = 0; i < ARRAYSIZE(sao) - 1; i++) { hr = ISpatialAudioObject_GetBuffer(sao[i], &buffer, &buffer_length); - ok(hr == S_OK, "Expected to be able to get buffers for audio object: 0x%08x\n", hr); + ok(hr == S_OK, "Expected to be able to get buffers for audio object: 0x%08lx\n", hr);
hr = ISpatialAudioObject_SetEndOfStream(sao[i], 0); - todo_wine ok(hr == S_OK, "Failed to end the stream: 0x%08x\n", hr); + todo_wine ok(hr == S_OK, "Failed to end the stream: 0x%08lx\n", hr);
hr = ISpatialAudioObject_GetBuffer(sao[i], &buffer, &buffer_length); - todo_wine ok(hr == SPTLAUDCLNT_E_RESOURCES_INVALIDATED, "Expected audio object to be invalidated: 0x%08x\n", hr); + todo_wine ok(hr == SPTLAUDCLNT_E_RESOURCES_INVALIDATED, "Expected audio object to be invalidated: 0x%08lx\n", hr); }
hr = ISpatialAudioObjectRenderStream_EndUpdatingAudioObjects(sas); - ok(hr == S_OK, "Failed to end updating audio objects: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to end updating audio objects: 0x%08lx\n", hr);
for (i = 0; i < ARRAYSIZE(sao); i++) { @@ -451,40 +451,40 @@ START_TEST(spatialaudio) HRESULT hr;
event = CreateEventA(NULL, FALSE, FALSE, "spatial-audio-test-prog-event"); - ok(event != NULL, "Failed to create event, last error: 0x%08x\n", GetLastError()); + ok(event != NULL, "Failed to create event, last error: 0x%08lx\n", GetLastError());
CoInitializeEx(NULL, COINIT_MULTITHREADED); hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&mme); if (FAILED(hr)) { - skip("mmdevapi not available: 0x%08x\n", hr); + skip("mmdevapi not available: 0x%08lx\n", hr); goto cleanup; }
hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(mme, eRender, eMultimedia, &dev); - ok(hr == S_OK || hr == E_NOTFOUND, "GetDefaultAudioEndpoint failed: 0x%08x\n", hr); + ok(hr == S_OK || hr == E_NOTFOUND, "GetDefaultAudioEndpoint failed: 0x%08lx\n", hr); if (hr != S_OK || !dev) { if (hr == E_NOTFOUND) skip("No sound card available\n"); else - skip("GetDefaultAudioEndpoint returns 0x%08x\n", hr); + skip("GetDefaultAudioEndpoint returns 0x%08lx\n", hr); goto cleanup; }
hr = IMMDevice_Activate(dev, &IID_ISpatialAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&sac); - ok(hr == S_OK || hr == E_NOINTERFACE, "ISpatialAudioClient Activation failed: 0x%08x\n", hr); + ok(hr == S_OK || hr == E_NOINTERFACE, "ISpatialAudioClient Activation failed: 0x%08lx\n", hr); if (hr != S_OK || !dev) { if (hr == E_NOINTERFACE) skip("ISpatialAudioClient interface not found\n"); else - skip("ISpatialAudioClient Activation returns 0x%08x\n", hr); + skip("ISpatialAudioClient Activation returns 0x%08lx\n", hr); goto cleanup; }
hr = ISpatialAudioClient_GetMaxDynamicObjectCount(sac, &max_dyn_count); - ok(hr == S_OK, "Failed to get max dynamic object count: 0x%08x\n", hr); + ok(hr == S_OK, "Failed to get max dynamic object count: 0x%08lx\n", hr);
/* that's the default, after manually enabling Windows Sonic it's possible to have max_dyn_count > 0 */ /* ok(max_dyn_count == 0, "expected max dynamic object count to be 0 got %u\n", max_dyn_count); */
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mp3dmod/tests/Makefile.in | 1 dlls/mp3dmod/tests/mp3dmod.c | 218 ++++++++++++++++++++-------------------- 2 files changed, 109 insertions(+), 110 deletions(-) diff --git a/dlls/mp3dmod/tests/Makefile.in b/dlls/mp3dmod/tests/Makefile.in index 701b2987c32..f5d54e48533 100644 --- a/dlls/mp3dmod/tests/Makefile.in +++ b/dlls/mp3dmod/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mp3dmod.dll IMPORTS = dmoguids msdmo ole32 strmiids uuid wmcodecdspuuid diff --git a/dlls/mp3dmod/tests/mp3dmod.c b/dlls/mp3dmod/tests/mp3dmod.c index 7bc691e2aa4..7d213fcd18a 100644 --- a/dlls/mp3dmod/tests/mp3dmod.c +++ b/dlls/mp3dmod/tests/mp3dmod.c @@ -125,7 +125,7 @@ static void test_convert(void) hr = CoCreateInstance(&CLSID_CMP3DecMediaObject, NULL, CLSCTX_INPROC_SERVER, &IID_IMediaObject, (void **)&dmo); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); mp3fmt.wfx.wFormatTag = WAVE_FORMAT_MPEGLAYER3; mp3fmt.wfx.nChannels = 2; @@ -137,7 +137,7 @@ static void test_convert(void) in.pbFormat = (BYTE *)&mp3fmt; hr = IMediaObject_SetInputType(dmo, 0, &in, 0); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); wavfmt.wFormatTag = WAVE_FORMAT_PCM; wavfmt.nChannels = 1; @@ -152,7 +152,7 @@ static void test_convert(void) out.pbFormat = (BYTE *)&wavfmt; hr = IMediaObject_SetOutputType(dmo, 0, &out, 0); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); outbuf.len = 0; outbuf.maxlen = sizeof(outbuf.data); @@ -161,9 +161,9 @@ static void test_convert(void) output.rtTimestamp = 0xdeadbeef; output.rtTimelength = 0xdeadbeef; hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); - ok(hr == S_FALSE, "got %#x\n", hr); - ok(outbuf.len == 0, "got %u\n", outbuf.len); - ok(output.dwStatus == 0, "got %#x\n", output.dwStatus); + ok(hr == S_FALSE, "got %#lx\n", hr); + ok(outbuf.len == 0, "got %lu\n", outbuf.len); + ok(output.dwStatus == 0, "got %#lx\n", output.dwStatus); ok(output.rtTimestamp == 0xdeadbeef, "got %s\n", wine_dbgstr_longlong(output.rtTimestamp)); ok(output.rtTimelength == 0xdeadbeef, "got %s\n", wine_dbgstr_longlong(output.rtTimelength)); @@ -172,18 +172,18 @@ static void test_convert(void) memcpy(inbuf.data + 96 * i, mp3hdr, 4); inbuf.len = 96 * 5; hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); - ok(hr == S_OK, "got %#x\n", hr); - ok(inbuf.refcount == 2, "Got refcount %d.\n", inbuf.refcount); + ok(hr == S_OK, "got %#lx\n", hr); + ok(inbuf.refcount == 2, "Got refcount %ld.\n", inbuf.refcount); hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); - ok(hr == DMO_E_NOTACCEPTING, "got %#x\n", hr); + ok(hr == DMO_E_NOTACCEPTING, "got %#lx\n", hr); outbuf.len = 0; outbuf.maxlen = 0; hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); - ok(hr == S_FALSE, "got %#x\n", hr); - ok(outbuf.len == 0, "got %u\n", outbuf.len); - ok(output.dwStatus == (O_SYNCPOINT | O_INCOMPLETE), "got %#x\n", output.dwStatus); + ok(hr == S_FALSE, "got %#lx\n", hr); + ok(outbuf.len == 0, "got %lu\n", outbuf.len); + ok(output.dwStatus == (O_SYNCPOINT | O_INCOMPLETE), "got %#lx\n", output.dwStatus); ok(output.rtTimestamp == 0xdeadbeef, "got %s\n", wine_dbgstr_longlong(output.rtTimestamp)); ok(output.rtTimelength == 0xdeadbeef, "got %s\n", wine_dbgstr_longlong(output.rtTimelength)); @@ -191,132 +191,132 @@ static void test_convert(void) outbuf.len = 0; outbuf.maxlen = 5000; hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); written = outbuf.len; - ok(written > 1152 && written <= 5000, "got %u\n", written); + ok(written > 1152 && written <= 5000, "got %lu\n", written); ok(output.dwStatus == (O_SYNCPOINT | O_TIME | O_TIMELENGTH | O_INCOMPLETE), - "got %#x\n", output.dwStatus); + "got %#lx\n", output.dwStatus); ok(output.rtTimestamp == 0, "got %s\n", wine_dbgstr_longlong(output.rtTimestamp)); ok(output.rtTimelength == samplelen(written, 48000), "got %s\n", wine_dbgstr_longlong(output.rtTimelength)); - ok(inbuf.refcount == 2, "Got refcount %d.\n", inbuf.refcount); - ok(outbuf.refcount == 1, "Got refcount %d.\n", inbuf.refcount); + ok(inbuf.refcount == 2, "Got refcount %ld.\n", inbuf.refcount); + ok(outbuf.refcount == 1, "Got refcount %ld.\n", inbuf.refcount); hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); - ok(hr == S_FALSE, "got %#x\n", hr); - ok(outbuf.len == written, "expected %u, got %u\n", written, outbuf.len); - ok(output.dwStatus == (O_SYNCPOINT | O_INCOMPLETE), "got %#x\n", output.dwStatus); + ok(hr == S_FALSE, "got %#lx\n", hr); + ok(outbuf.len == written, "expected %lu, got %lu\n", written, outbuf.len); + ok(output.dwStatus == (O_SYNCPOINT | O_INCOMPLETE), "got %#lx\n", output.dwStatus); ok(output.rtTimestamp == 0, "got %s\n", wine_dbgstr_longlong(output.rtTimestamp)); ok(output.rtTimelength == samplelen(written, 48000), "got %s\n", wine_dbgstr_longlong(output.rtTimelength)); hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); - ok(hr == DMO_E_NOTACCEPTING, "got %#x\n", hr); - ok(inbuf.refcount == 2, "Got refcount %d.\n", inbuf.refcount); - ok(outbuf.refcount == 1, "Got refcount %d.\n", inbuf.refcount); + ok(hr == DMO_E_NOTACCEPTING, "got %#lx\n", hr); + ok(inbuf.refcount == 2, "Got refcount %ld.\n", inbuf.refcount); + ok(outbuf.refcount == 1, "Got refcount %ld.\n", inbuf.refcount); /* write the rest */ outbuf.len = 0; outbuf.maxlen = 5000; hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(written + outbuf.len == (1152 * 5) || broken(written + outbuf.len == (1152 * 5) - 528), /* Win10 */ - "got %u, total %u\n", outbuf.len, written + outbuf.len); - ok(output.dwStatus == (O_SYNCPOINT | O_TIME | O_TIMELENGTH), "got %#x\n", output.dwStatus); + "got %lu, total %lu\n", outbuf.len, written + outbuf.len); + ok(output.dwStatus == (O_SYNCPOINT | O_TIME | O_TIMELENGTH), "got %#lx\n", output.dwStatus); ok(output.rtTimestamp == samplelen(written, 48000), "got %s\n", wine_dbgstr_longlong(output.rtTimestamp)); ok(output.rtTimelength == samplelen(outbuf.len, 48000), "got %s\n", wine_dbgstr_longlong(output.rtTimelength)); - ok(inbuf.refcount == 1, "Got refcount %d.\n", inbuf.refcount); - ok(outbuf.refcount == 1, "Got refcount %d.\n", inbuf.refcount); + ok(inbuf.refcount == 1, "Got refcount %ld.\n", inbuf.refcount); + ok(outbuf.refcount == 1, "Got refcount %ld.\n", inbuf.refcount); written += outbuf.len; hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); - ok(hr == S_FALSE, "got %#x\n", hr); - ok(output.dwStatus == 0, "got %#x\n", output.dwStatus); + ok(hr == S_FALSE, "got %#lx\n", hr); + ok(output.dwStatus == 0, "got %#lx\n", output.dwStatus); output.pBuffer = NULL; output.dwStatus = 0xdeadbeef; output.rtTimestamp = 0xdeadbeef; output.rtTimelength = 0xdeadbeef; hr = IMediaObject_ProcessOutput(dmo, DMO_PROCESS_OUTPUT_DISCARD_WHEN_NO_BUFFER, 1, &output, &status); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(!output.pBuffer, "Got buffer %p.\n", output.pBuffer); - ok(!output.dwStatus, "Got status %#x.\n", output.dwStatus); + ok(!output.dwStatus, "Got status %#lx.\n", output.dwStatus); ok(output.rtTimestamp == 0xdeadbeef, "Got timestamp %s.\n", wine_dbgstr_longlong(output.rtTimestamp)); ok(output.rtTimelength == 0xdeadbeef, "Got length %s.\n", wine_dbgstr_longlong(output.rtTimelength)); hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); - ok(hr == DMO_E_NOTACCEPTING, "Got hr %#x.\n", hr); + ok(hr == DMO_E_NOTACCEPTING, "Got hr %#lx.\n", hr); output.pBuffer = NULL; output.dwStatus = 0xdeadbeef; output.rtTimestamp = 0xdeadbeef; output.rtTimelength = 0xdeadbeef; hr = IMediaObject_ProcessOutput(dmo, DMO_PROCESS_OUTPUT_DISCARD_WHEN_NO_BUFFER, 1, &output, &status); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(!output.pBuffer, "Got buffer %p.\n", output.pBuffer); - ok(output.dwStatus == O_INCOMPLETE, "Got status %#x.\n", output.dwStatus); + ok(output.dwStatus == O_INCOMPLETE, "Got status %#lx.\n", output.dwStatus); ok(output.rtTimestamp == 0xdeadbeef, "Got timestamp %s.\n", wine_dbgstr_longlong(output.rtTimestamp)); ok(output.rtTimelength == 0xdeadbeef, "Got length %s.\n", wine_dbgstr_longlong(output.rtTimelength)); - ok(inbuf.refcount == 2, "Got refcount %d.\n", inbuf.refcount); + ok(inbuf.refcount == 2, "Got refcount %ld.\n", inbuf.refcount); hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(!output.pBuffer, "Got buffer %p.\n", output.pBuffer); - ok(output.dwStatus == O_INCOMPLETE, "Got status %#x.\n", output.dwStatus); + ok(output.dwStatus == O_INCOMPLETE, "Got status %#lx.\n", output.dwStatus); ok(output.rtTimestamp == 0xdeadbeef, "Got timestamp %s.\n", wine_dbgstr_longlong(output.rtTimestamp)); ok(output.rtTimelength == 0xdeadbeef, "Got length %s.\n", wine_dbgstr_longlong(output.rtTimelength)); - ok(inbuf.refcount == 2, "Got refcount %d.\n", inbuf.refcount); + ok(inbuf.refcount == 2, "Got refcount %ld.\n", inbuf.refcount); output.pBuffer = &outbuf.IMediaBuffer_iface; outbuf.len = 0; outbuf.maxlen = 5000; hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(outbuf.len > 1152 && outbuf.len <= 5000, "Got length %u.\n", outbuf.len); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(outbuf.len > 1152 && outbuf.len <= 5000, "Got length %lu.\n", outbuf.len); ok(output.dwStatus == (O_SYNCPOINT | O_TIME | O_TIMELENGTH | O_INCOMPLETE), - "Got status %#x.\n", output.dwStatus); + "Got status %#lx.\n", output.dwStatus); ok(output.rtTimestamp == samplelen(written, 48000), "Got timestamp %s.\n", wine_dbgstr_longlong(output.rtTimestamp)); ok(output.rtTimelength == samplelen(outbuf.len, 48000), "Got length %s.\n", wine_dbgstr_longlong(output.rtTimelength)); - ok(inbuf.refcount == 2, "Got refcount %d.\n", inbuf.refcount); - ok(outbuf.refcount == 1, "Got refcount %d.\n", inbuf.refcount); + ok(inbuf.refcount == 2, "Got refcount %ld.\n", inbuf.refcount); + ok(outbuf.refcount == 1, "Got refcount %ld.\n", inbuf.refcount); hr = IMediaObject_Flush(dmo); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(inbuf.refcount == 1, "Got refcount %d.\n", inbuf.refcount); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(inbuf.refcount == 1, "Got refcount %ld.\n", inbuf.refcount); outbuf.len = 0; outbuf.maxlen = 5000; hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); - ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); hr = IMediaObject_Flush(dmo); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(outbuf.len > 1152 && outbuf.len <= 5000, "Got length %u.\n", outbuf.len); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(outbuf.len > 1152 && outbuf.len <= 5000, "Got length %lu.\n", outbuf.len); ok(output.dwStatus == (O_SYNCPOINT | O_TIME | O_TIMELENGTH | O_INCOMPLETE), - "Got status %#x.\n", output.dwStatus); + "Got status %#lx.\n", output.dwStatus); ok(!output.rtTimestamp, "Got timestamp %s.\n", wine_dbgstr_longlong(output.rtTimestamp)); ok(output.rtTimelength == samplelen(outbuf.len, 48000), "Got length %s.\n", wine_dbgstr_longlong(output.rtTimelength)); - ok(inbuf.refcount == 2, "Got refcount %d.\n", inbuf.refcount); - ok(outbuf.refcount == 1, "Got refcount %d.\n", inbuf.refcount); + ok(inbuf.refcount == 2, "Got refcount %ld.\n", inbuf.refcount); + ok(outbuf.refcount == 1, "Got refcount %ld.\n", inbuf.refcount); IMediaObject_Release(dmo); - ok(inbuf.refcount == 1, "Got outstanding refcount %d.\n", inbuf.refcount); - ok(outbuf.refcount == 1, "Got outstanding refcount %d.\n", outbuf.refcount); + ok(inbuf.refcount == 1, "Got outstanding refcount %ld.\n", inbuf.refcount); + ok(outbuf.refcount == 1, "Got outstanding refcount %ld.\n", outbuf.refcount); } static const GUID IID_test_outer = {0xdeadbeef,0,0,{0,0,0,0,0,0,0,0x66}}; @@ -358,13 +358,13 @@ static void test_aggregation(void) hr = CoCreateInstance(&CLSID_CMP3DecMediaObject, &Outer, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = IUnknown_QueryInterface(unk, &IID_IMediaObject, (void **)&dmo); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = IMediaObject_QueryInterface(dmo, &IID_test_outer, (void **)&unk2); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(unk2 == (IUnknown *)0xdeadbeef, "got unk %p\n", unk2); IUnknown_Release(dmo); @@ -372,7 +372,7 @@ static void test_aggregation(void) hr = CoCreateInstance(&CLSID_CMP3DecMediaObject, &Outer, CLSCTX_INPROC_SERVER, &IID_IMediaObject, (void **)&unk); - ok(hr == E_NOINTERFACE, "got %#x\n", hr); + ok(hr == E_NOINTERFACE, "got %#lx\n", hr); } static void test_stream_info(void) @@ -408,27 +408,27 @@ static void test_stream_info(void) hr = CoCreateInstance(&CLSID_CMP3DecMediaObject, NULL, CLSCTX_INPROC_SERVER, &IID_IMediaObject, (void **)&dmo); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IMediaObject_GetStreamCount(dmo, &input_count, &output_count); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(input_count == 1, "Got input count %u.\n", input_count); - ok(output_count == 1, "Got output count %u.\n", output_count); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(input_count == 1, "Got input count %lu.\n", input_count); + ok(output_count == 1, "Got output count %lu.\n", output_count); flags = 0xdeadbeef; hr = IMediaObject_GetInputStreamInfo(dmo, 0, &flags); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!flags, "Got flags %#x.\n", flags); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(!flags, "Got flags %#lx.\n", flags); flags = 0xdeadbeef; hr = IMediaObject_GetOutputStreamInfo(dmo, 0, &flags); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!flags, "Got flags %#x.\n", flags); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(!flags, "Got flags %#lx.\n", flags); hr = IMediaObject_GetInputSizeInfo(dmo, 0, &size, &lookahead, &alignment); - ok(hr == DMO_E_TYPE_NOT_SET, "Got hr %#x.\n", hr); + ok(hr == DMO_E_TYPE_NOT_SET, "Got hr %#lx.\n", hr); hr = IMediaObject_GetOutputSizeInfo(dmo, 0, &size, &alignment); - ok(hr == DMO_E_TYPE_NOT_SET, "Got hr %#x.\n", hr); + ok(hr == DMO_E_TYPE_NOT_SET, "Got hr %#lx.\n", hr); for (channels = 1; channels <= 2; ++channels) { @@ -436,12 +436,12 @@ static void test_stream_info(void) output_format.nChannels = channels; hr = IMediaObject_SetInputType(dmo, 0, &input_mt, 0); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IMediaObject_GetInputSizeInfo(dmo, 0, &size, &lookahead, &alignment); - ok(hr == DMO_E_TYPE_NOT_SET, "Got hr %#x.\n", hr); + ok(hr == DMO_E_TYPE_NOT_SET, "Got hr %#lx.\n", hr); hr = IMediaObject_GetOutputSizeInfo(dmo, 0, &size, &alignment); - ok(hr == DMO_E_TYPE_NOT_SET, "Got hr %#x.\n", hr); + ok(hr == DMO_E_TYPE_NOT_SET, "Got hr %#lx.\n", hr); for (depth = 8; depth <= 16; depth += 8) { @@ -450,28 +450,28 @@ static void test_stream_info(void) output_format.nAvgBytesPerSec = 48000 * output_format.nBlockAlign; hr = IMediaObject_SetOutputType(dmo, 0, &output_mt, 0); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); size = lookahead = alignment = 0xdeadbeef; hr = IMediaObject_GetInputSizeInfo(dmo, 0, &size, &lookahead, &alignment); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(!size || broken(size == output_format.nBlockAlign) /* Vista */, - "Got size %u for %u channels, depth %u.\n", size, channels, depth); - ok(lookahead == 0xdeadbeef, "Got lookahead %u.\n", lookahead); - ok(alignment == 1, "Got alignment %u.\n", alignment); + "Got size %lu for %u channels, depth %u.\n", size, channels, depth); + ok(lookahead == 0xdeadbeef, "Got lookahead %lu.\n", lookahead); + ok(alignment == 1, "Got alignment %lu.\n", alignment); size = alignment = 0xdeadbeef; hr = IMediaObject_GetOutputSizeInfo(dmo, 0, &size, &alignment); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); /* Vista returns the expected size; all later versions act as if * channels == 2 for some reason. */ ok(size >= channels * 1152 * depth / 8, - "Got size %u for %u channels, depth %u.\n", size, channels, depth); - ok(alignment == 1, "Got alignment %u.\n", alignment); + "Got size %lu for %u channels, depth %u.\n", size, channels, depth); + ok(alignment == 1, "Got alignment %lu.\n", alignment); } hr = IMediaObject_SetOutputType(dmo, 0, &output_mt, DMO_SET_TYPEF_CLEAR); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); } IMediaObject_Release(dmo); @@ -521,73 +521,73 @@ static void test_media_types(void) hr = CoCreateInstance(&CLSID_CMP3DecMediaObject, NULL, CLSCTX_INPROC_SERVER, &IID_IMediaObject, (void **)&dmo); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); memset(&mt, 0xcc, sizeof(DMO_MEDIA_TYPE)); hr = IMediaObject_GetInputType(dmo, 0, 0, &mt); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(IsEqualGUID(&mt.majortype, &MEDIATYPE_Audio), "Got major type %s.\n", wine_dbgstr_guid(&mt.majortype)); ok(IsEqualGUID(&mt.subtype, &WMMEDIASUBTYPE_MP3), "Got subtype %s.\n", wine_dbgstr_guid(&mt.subtype)); ok(mt.bFixedSizeSamples == 0xcccccccc, "Got fixed size %d.\n", mt.bFixedSizeSamples); ok(mt.bTemporalCompression == 0xcccccccc, "Got temporal compression %d.\n", mt.bTemporalCompression); - ok(mt.lSampleSize == 0xcccccccc, "Got sample size %u.\n", mt.lSampleSize); + ok(mt.lSampleSize == 0xcccccccc, "Got sample size %lu.\n", mt.lSampleSize); ok(IsEqualGUID(&mt.formattype, &GUID_NULL), "Got format type %s.\n", wine_dbgstr_guid(&mt.formattype)); ok(!mt.pUnk, "Got pUnk %p.\n", mt.pUnk); - ok(!mt.cbFormat, "Got format size %u.\n", mt.cbFormat); + ok(!mt.cbFormat, "Got format size %lu.\n", mt.cbFormat); ok(!mt.pbFormat, "Got format block %p.\n", mt.pbFormat); hr = IMediaObject_GetInputType(dmo, 0, 1, &mt); - ok(hr == DMO_E_NO_MORE_ITEMS, "Got hr %#x.\n", hr); + ok(hr == DMO_E_NO_MORE_ITEMS, "Got hr %#lx.\n", hr); memset(&mt, 0xcc, sizeof(DMO_MEDIA_TYPE)); hr = IMediaObject_GetOutputType(dmo, 0, 0, &mt); - ok(hr == DMO_E_TYPE_NOT_SET, "Got hr %#x.\n", hr); + ok(hr == DMO_E_TYPE_NOT_SET, "Got hr %#lx.\n", hr); hr = IMediaObject_SetInputType(dmo, 0, &input_mt, DMO_SET_TYPEF_TEST_ONLY); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); input_mt.majortype = GUID_NULL; hr = IMediaObject_SetInputType(dmo, 0, &input_mt, DMO_SET_TYPEF_TEST_ONLY); - ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#lx.\n", hr); input_mt.majortype = MEDIATYPE_Stream; hr = IMediaObject_SetInputType(dmo, 0, &input_mt, DMO_SET_TYPEF_TEST_ONLY); - ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#lx.\n", hr); input_mt.majortype = MEDIATYPE_Audio; input_mt.subtype = GUID_NULL; hr = IMediaObject_SetInputType(dmo, 0, &input_mt, DMO_SET_TYPEF_TEST_ONLY); - ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#lx.\n", hr); input_mt.subtype = MEDIASUBTYPE_PCM; hr = IMediaObject_SetInputType(dmo, 0, &input_mt, DMO_SET_TYPEF_TEST_ONLY); - ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#lx.\n", hr); input_mt.subtype = WMMEDIASUBTYPE_MP3; input_mt.formattype = GUID_NULL; hr = IMediaObject_SetInputType(dmo, 0, &input_mt, DMO_SET_TYPEF_TEST_ONLY); - ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#lx.\n", hr); input_mt.formattype = FORMAT_None; hr = IMediaObject_SetInputType(dmo, 0, &input_mt, DMO_SET_TYPEF_TEST_ONLY); - ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#lx.\n", hr); input_mt.formattype = FORMAT_WaveFormatEx; hr = IMediaObject_SetInputType(dmo, 0, &input_mt, 0); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); for (i = 0; i < 4; ++i) { memset(&mt, 0xcc, sizeof(DMO_MEDIA_TYPE)); hr = IMediaObject_GetOutputType(dmo, 0, i, &mt); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(IsEqualGUID(&mt.majortype, &MEDIATYPE_Audio), "Got major type %s.\n", wine_dbgstr_guid(&mt.majortype)); ok(IsEqualGUID(&mt.subtype, &MEDIASUBTYPE_PCM), "Got subtype %s.\n", wine_dbgstr_guid(&mt.subtype)); ok(mt.bFixedSizeSamples == 0xcccccccc, "Got fixed size %d.\n", mt.bFixedSizeSamples); ok(mt.bTemporalCompression == 0xcccccccc, "Got temporal compression %d.\n", mt.bTemporalCompression); - ok(mt.lSampleSize == 0xcccccccc, "Got sample size %u.\n", mt.lSampleSize); + ok(mt.lSampleSize == 0xcccccccc, "Got sample size %lu.\n", mt.lSampleSize); ok(IsEqualGUID(&mt.formattype, &FORMAT_WaveFormatEx), "Got format type %s.\n", wine_dbgstr_guid(&mt.formattype)); ok(!mt.pUnk, "Got pUnk %p.\n", mt.pUnk); - ok(mt.cbFormat >= sizeof(WAVEFORMATEX), "Got format size %u.\n", mt.cbFormat); + ok(mt.cbFormat >= sizeof(WAVEFORMATEX), "Got format size %lu.\n", mt.cbFormat); ok(!!mt.pbFormat, "Got format block %p.\n", mt.pbFormat); expect_wfx.nChannels = (i / 2) ? 1 : 2; @@ -600,26 +600,26 @@ static void test_media_types(void) } hr = IMediaObject_GetOutputType(dmo, 0, 4, &mt); - ok(hr == DMO_E_NO_MORE_ITEMS, "Got hr %#x.\n", hr); + ok(hr == DMO_E_NO_MORE_ITEMS, "Got hr %#lx.\n", hr); mp3fmt.wfx.nChannels = 1; hr = IMediaObject_SetInputType(dmo, 0, &input_mt, 0); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); for (i = 0; i < 2; ++i) { memset(&mt, 0xcc, sizeof(DMO_MEDIA_TYPE)); hr = IMediaObject_GetOutputType(dmo, 0, i, &mt); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(IsEqualGUID(&mt.majortype, &MEDIATYPE_Audio), "Got major type %s.\n", wine_dbgstr_guid(&mt.majortype)); ok(IsEqualGUID(&mt.subtype, &MEDIASUBTYPE_PCM), "Got subtype %s.\n", wine_dbgstr_guid(&mt.subtype)); ok(mt.bFixedSizeSamples == 0xcccccccc, "Got fixed size %d.\n", mt.bFixedSizeSamples); ok(mt.bTemporalCompression == 0xcccccccc, "Got temporal compression %d.\n", mt.bTemporalCompression); - ok(mt.lSampleSize == 0xcccccccc, "Got sample size %u.\n", mt.lSampleSize); + ok(mt.lSampleSize == 0xcccccccc, "Got sample size %lu.\n", mt.lSampleSize); ok(IsEqualGUID(&mt.formattype, &FORMAT_WaveFormatEx), "Got format type %s.\n", wine_dbgstr_guid(&mt.formattype)); ok(!mt.pUnk, "Got pUnk %p.\n", mt.pUnk); - ok(mt.cbFormat >= sizeof(WAVEFORMATEX), "Got format size %u.\n", mt.cbFormat); + ok(mt.cbFormat >= sizeof(WAVEFORMATEX), "Got format size %lu.\n", mt.cbFormat); ok(!!mt.pbFormat, "Got format block %p.\n", mt.pbFormat); expect_wfx.nChannels = 1; @@ -632,17 +632,17 @@ static void test_media_types(void) } hr = IMediaObject_GetOutputType(dmo, 0, 2, &mt); - ok(hr == DMO_E_NO_MORE_ITEMS, "Got hr %#x.\n", hr); + ok(hr == DMO_E_NO_MORE_ITEMS, "Got hr %#lx.\n", hr); hr = IMediaObject_SetOutputType(dmo, 0, &output_mt, DMO_SET_TYPEF_TEST_ONLY); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); output_mt.formattype = GUID_NULL; hr = IMediaObject_SetOutputType(dmo, 0, &output_mt, DMO_SET_TYPEF_TEST_ONLY); - ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#lx.\n", hr); output_mt.formattype = FORMAT_None; hr = IMediaObject_SetOutputType(dmo, 0, &output_mt, DMO_SET_TYPEF_TEST_ONLY); - ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "Got hr %#lx.\n", hr); output_mt.formattype = FORMAT_WaveFormatEx; IMediaObject_Release(dmo);
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mpr/tests/Makefile.in | 1 - dlls/mpr/tests/mpr.c | 74 ++++++++++++++++++++++---------------------- 2 files changed, 37 insertions(+), 38 deletions(-) diff --git a/dlls/mpr/tests/Makefile.in b/dlls/mpr/tests/Makefile.in index 47107b49d1b..c3282546e84 100644 --- a/dlls/mpr/tests/Makefile.in +++ b/dlls/mpr/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mpr.dll IMPORTS = mpr diff --git a/dlls/mpr/tests/mpr.c b/dlls/mpr/tests/mpr.c index 578853eb12a..ab5c47c0490 100644 --- a/dlls/mpr/tests/mpr.c +++ b/dlls/mpr/tests/mpr.c @@ -41,51 +41,51 @@ static void test_WNetGetUniversalName(void) buffer, &info_size); if(drive_type == DRIVE_REMOTE) - ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08x\n", ret); + ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08lx\n", ret); else /* WN_NO_NET_OR_BAD_PATH (DRIVE_FIXED) returned from the virtual drive (usual Q:) created by the microsoft application virtualization client */ ok((ret == WN_NOT_CONNECTED) || (ret == WN_NO_NET_OR_BAD_PATH), - "WNetGetUniversalNameA(%s, ...) returned %u (drive_type: %u)\n", + "WNetGetUniversalNameA(%s, ...) returned %lu (drive_type: %lu)\n", driveA, ret, drive_type); - ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); + ok(info_size == sizeof(buffer), "Got wrong size: %lu\n", info_size); fail_size = 1; ret = WNetGetUniversalNameA(driveA, UNIVERSAL_NAME_INFO_LEVEL, buffer, &fail_size); if(drive_type == DRIVE_REMOTE) { - todo_wine ok(ret == WN_BAD_VALUE || ret == WN_MORE_DATA, "WNetGetUniversalNameA failed: %08x\n", ret); - ok(fail_size > 1, "Got %d\n", fail_size); + todo_wine ok(ret == WN_BAD_VALUE || ret == WN_MORE_DATA, "WNetGetUniversalNameA failed: %08lx\n", ret); + ok(fail_size > 1, "Got %ld\n", fail_size); } else ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, - "(%s) WNetGetUniversalNameW gave wrong error: %u\n", driveA, ret); + "(%s) WNetGetUniversalNameW gave wrong error: %lu\n", driveA, ret); fail_size = ARRAY_SIZE(driveA) - 1; ret = WNetGetUniversalNameA(driveA, UNIVERSAL_NAME_INFO_LEVEL, buffer, &fail_size); if(drive_type == DRIVE_REMOTE) - ok(ret == WN_MORE_DATA, "WNetGetUniversalNameA failed: %08x\n", ret); + ok(ret == WN_MORE_DATA, "WNetGetUniversalNameA failed: %08lx\n", ret); ret = WNetGetUniversalNameA(driveandpathA, UNIVERSAL_NAME_INFO_LEVEL, buffer, &info_size); if(drive_type == DRIVE_REMOTE) - todo_wine ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08x\n", ret); + todo_wine ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08lx\n", ret); info_size = sizeof(buffer); ret = WNetGetUniversalNameW(driveW, UNIVERSAL_NAME_INFO_LEVEL, buffer, &info_size); if(drive_type == DRIVE_REMOTE) - ok(ret == WN_NO_ERROR, "WNetGetUniversalNameW failed: %08x\n", ret); + ok(ret == WN_NO_ERROR, "WNetGetUniversalNameW failed: %08lx\n", ret); else ok((ret == WN_NOT_CONNECTED) || (ret == WN_NO_NET_OR_BAD_PATH), - "WNetGetUniversalNameW(%s, ...) returned %u (drive_type: %u)\n", + "WNetGetUniversalNameW(%s, ...) returned %lu (drive_type: %lu)\n", wine_dbgstr_w(driveW), ret, drive_type); if(drive_type != DRIVE_REMOTE) - ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); + ok(info_size == sizeof(buffer), "Got wrong size: %lu\n", info_size); } } @@ -106,57 +106,57 @@ static void test_WNetGetRemoteName(void) buffer, &info_size); if(drive_type == DRIVE_REMOTE) todo_wine - ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08x\n", ret); + ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08lx\n", ret); else ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, - "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); - ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); + "(%s) WNetGetUniversalNameA gave wrong error: %lu\n", driveA, ret); + ok(info_size == sizeof(buffer), "Got wrong size: %lu\n", info_size); fail_size = 0; ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, buffer, &fail_size); if(drive_type == DRIVE_REMOTE) todo_wine - ok(ret == WN_BAD_VALUE || ret == WN_MORE_DATA, "WNetGetUniversalNameA failed: %08x\n", ret); + ok(ret == WN_BAD_VALUE || ret == WN_MORE_DATA, "WNetGetUniversalNameA failed: %08lx\n", ret); else ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, - "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); + "(%s) WNetGetUniversalNameA gave wrong error: %lu\n", driveA, ret); ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, buffer, NULL); - todo_wine ok(ret == WN_BAD_POINTER, "WNetGetUniversalNameA failed: %08x\n", ret); + todo_wine ok(ret == WN_BAD_POINTER, "WNetGetUniversalNameA failed: %08lx\n", ret); ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, NULL, &info_size); if(drive_type == DRIVE_REMOTE) todo_wine - ok(ret == WN_BAD_POINTER || ret == WN_BAD_VALUE, "WNetGetUniversalNameA failed: %08x\n", ret); + ok(ret == WN_BAD_POINTER || ret == WN_BAD_VALUE, "WNetGetUniversalNameA failed: %08lx\n", ret); else ok(ret == WN_NOT_CONNECTED || ret == WN_BAD_VALUE, - "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); + "(%s) WNetGetUniversalNameA gave wrong error: %lu\n", driveA, ret); fail_size = ARRAY_SIZE(driveA) - 1; ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, buffer, &fail_size); if(drive_type == DRIVE_REMOTE) - todo_wine ok(ret == WN_MORE_DATA, "WNetGetUniversalNameA failed: %08x\n", ret); + todo_wine ok(ret == WN_MORE_DATA, "WNetGetUniversalNameA failed: %08lx\n", ret); ret = WNetGetUniversalNameA(driveandpathA, REMOTE_NAME_INFO_LEVEL, buffer, &info_size); if(drive_type == DRIVE_REMOTE) - todo_wine ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08x\n", ret); + todo_wine ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08lx\n", ret); info_size = sizeof(buffer); ret = WNetGetUniversalNameW(driveW, REMOTE_NAME_INFO_LEVEL, buffer, &info_size); todo_wine{ if(drive_type == DRIVE_REMOTE) - ok(ret == WN_NO_ERROR, "WNetGetUniversalNameW failed: %08x\n", ret); + ok(ret == WN_NO_ERROR, "WNetGetUniversalNameW failed: %08lx\n", ret); else ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, - "(%s) WNetGetUniversalNameW gave wrong error: %u\n", driveA, ret); + "(%s) WNetGetUniversalNameW gave wrong error: %lu\n", driveA, ret); } - ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); + ok(info_size == sizeof(buffer), "Got wrong size: %lu\n", info_size); } } @@ -191,7 +191,7 @@ static BOOL CALLBACK enum_password_proc(PASSWORD_CACHE_ENTRY* pce, DWORD param) WORD size = 0; char* buf; - ok(param == m_param, "param, got %d, got %d\n", param, m_param); + ok(param == m_param, "param, got %ld, got %ld\n", param, m_param); size = offsetof( PASSWORD_CACHE_ENTRY, abResource[pce->cbResource + pce->cbPassword] ); ok(pce->cbEntry == size, "cbEntry, got %d, expected %d\n", pce->cbEntry, size); @@ -232,14 +232,14 @@ static void test_WNetCachePassword(void) strcpy(password_buf, m_password); password_len = strlen(m_password); ret = pWNetCachePassword(resource_buf, resource_len, password_buf, password_len, m_type, 0); - ok(ret == WN_SUCCESS, "WNetCachePassword failed: got %d, expected %d\n", ret, WN_SUCCESS); + ok(ret == WN_SUCCESS, "WNetCachePassword failed: got %ld, expected %d\n", ret, WN_SUCCESS); strcpy(resource_buf, m_resource); resource_len = strlen(m_resource); strcpy(password_buf, "------"); password_len = sizeof(password_buf); ret = pWNetGetCachedPassword(resource_buf, resource_len, password_buf, &password_len, m_type); - ok(ret == WN_SUCCESS, "WNetGetCachedPassword failed: got %d, expected %d\n", ret, WN_SUCCESS); + ok(ret == WN_SUCCESS, "WNetGetCachedPassword failed: got %ld, expected %d\n", ret, WN_SUCCESS); ok(password_len == strlen(m_password), "password length different, got %d\n", password_len); ok(strncmp(password_buf, m_password, password_len)==0, "passwords different, got %.*s, expected %s\n", password_len, password_buf, m_password); @@ -247,13 +247,13 @@ static void test_WNetCachePassword(void) strcpy(prefix_buf, m_resource); prefix_buf[prefix_len] = '0'; ret = pWNetEnumCachedPasswords(prefix_buf, prefix_len, m_type, enum_password_proc, m_param); - ok(ret == WN_SUCCESS, "WNetEnumCachedPasswords failed: got %d, expected %d\n", ret, WN_SUCCESS); + ok(ret == WN_SUCCESS, "WNetEnumCachedPasswords failed: got %ld, expected %d\n", ret, WN_SUCCESS); ok(m_callback_reached == 1, "callback was not reached\n"); strcpy(resource_buf, m_resource); resource_len = strlen(m_resource); ret = pWNetRemoveCachedPassword(resource_buf, resource_len, m_type); - ok(ret == WN_SUCCESS, "WNetRemoveCachedPassword failed: got %d, expected %d\n", ret, WN_SUCCESS); + ok(ret == WN_SUCCESS, "WNetRemoveCachedPassword failed: got %ld, expected %d\n", ret, WN_SUCCESS); } else { win_skip("WNetCachePassword() is not supported.\n"); } @@ -287,28 +287,28 @@ static void test_WNetUseConnection(void) if (ret != ERROR_ALREADY_ASSIGNED) break; } if (ret == ERROR_ALREADY_ASSIGNED) goto end; /* no drives available */ - todo_wine ok(ret == WN_SUCCESS, "Unexpected return: %u\n", ret); - ok(bufSize == 0, "Unexpected buffer size: %u\n", bufSize); + todo_wine ok(ret == WN_SUCCESS, "Unexpected return: %lu\n", ret); + ok(bufSize == 0, "Unexpected buffer size: %lu\n", bufSize); if (ret == WN_SUCCESS) WNetCancelConnectionA(drive, TRUE); bufSize = 0; ret = pWNetUseConnectionA(NULL, netRes, NULL, NULL, 0, outBuf, &bufSize, &outRes); - todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return: %u\n", ret); - ok(bufSize == 0, "Unexpected buffer size: %u\n", bufSize); + todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return: %lu\n", ret); + ok(bufSize == 0, "Unexpected buffer size: %lu\n", bufSize); if (ret == WN_SUCCESS) WNetCancelConnectionA(drive, TRUE); todo_wine { bufSize = 1; ret = pWNetUseConnectionA(NULL, netRes, NULL, NULL, 0, outBuf, &bufSize, &outRes); - ok(ret == ERROR_MORE_DATA, "Unexpected return: %u\n", ret); - ok(bufSize == 3, "Unexpected buffer size: %u\n", bufSize); + ok(ret == ERROR_MORE_DATA, "Unexpected return: %lu\n", ret); + ok(bufSize == 3, "Unexpected buffer size: %lu\n", bufSize); if (ret == WN_SUCCESS) WNetCancelConnectionA(drive, TRUE); bufSize = 4; ret = pWNetUseConnectionA(NULL, netRes, NULL, NULL, 0, outBuf, &bufSize, &outRes); - ok(ret == WN_SUCCESS, "Unexpected return: %u\n", ret); + ok(ret == WN_SUCCESS, "Unexpected return: %lu\n", ret); } - ok(bufSize == 4, "Unexpected buffer size: %u\n", bufSize); + ok(bufSize == 4, "Unexpected buffer size: %lu\n", bufSize); if (ret == WN_SUCCESS) WNetCancelConnectionA(drive, TRUE); end:
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msacm32/tests/Makefile.in | 1 - dlls/msacm32/tests/msacm.c | 76 ++++++++++++++++++++-------------------- 2 files changed, 38 insertions(+), 39 deletions(-) diff --git a/dlls/msacm32/tests/Makefile.in b/dlls/msacm32/tests/Makefile.in index d4fff0512b3..dba7cfee3da 100644 --- a/dlls/msacm32/tests/Makefile.in +++ b/dlls/msacm32/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msacm32.dll IMPORTS = msacm32 winmm diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 35158e7fcfd..5980ac78640 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -42,7 +42,7 @@ static BOOL CALLBACK FormatTagEnumProc(HACMDRIVERID hadid, HACMDRIVER had; if (winetest_interactive) - trace(" Format 0x%04x: %s\n", paftd->dwFormatTag, paftd->szFormatTag); + trace(" Format 0x%04lx: %s\n", paftd->dwFormatTag, paftd->szFormatTag); rc = acmDriverOpen(&had, hadid, 0); ok(rc == MMSYSERR_NOERROR || rc == MMSYSERR_NODRIVER, @@ -243,7 +243,7 @@ static BOOL CALLBACK FormatEnumProc(HACMDRIVERID hadid, acmMetrics((HACMOBJ)hadid, ACM_METRIC_DRIVER_SUPPORT, &fdwSupport); if (winetest_interactive) - trace(" 0x%04x, %s\n", pafd->dwFormatTag, pafd->szFormat); + trace(" 0x%04lx, %s\n", pafd->dwFormatTag, pafd->szFormat); acmDriverOpen(&had, hadid, 0); dwSize = pafd->cbwfx; @@ -278,7 +278,7 @@ static BOOL CALLBACK FormatEnumProc(HACMDRIVERID hadid, "expected %d, got %d\n", pafd->pwfx->nChannels, dst->nChannels); if (pafd->dwFormatTag != 0x42) /* codec 0x0042 returns a different sample rate */ ok(dst->nSamplesPerSec == pafd->pwfx->nSamplesPerSec, - "expected %d, got %d\n", pafd->pwfx->nSamplesPerSec, dst->nSamplesPerSec); + "expected %ld, got %ld\n", pafd->pwfx->nSamplesPerSec, dst->nSamplesPerSec); ok(dst->wBitsPerSample == 16, "expected %d, got %d\n", 16, dst->wBitsPerSample); ok(dst->nBlockAlign == 2*pafd->pwfx->nChannels, @@ -402,7 +402,7 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, }; ok(dd.cbStruct == sizeof(dd), - "acmDriverDetailsA(): cbStruct = %08x\n", dd.cbStruct); + "acmDriverDetailsA(): cbStruct = %08lx\n", dd.cbStruct); for (iter = expected_ids; iter->shortname; ++iter) { if (!strcmp(iter->shortname, dd.szShortName)) { @@ -427,8 +427,8 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, trace(" Copyright: %s\n", dd.szCopyright); trace(" Licensing: %s\n", dd.szLicensing); trace(" Features: %s\n", dd.szFeatures); - trace(" Supports %u formats\n", dd.cFormatTags); - trace(" Supports %u filter formats\n", dd.cFilterTags); + trace(" Supports %lu formats\n", dd.cFormatTags); + trace(" Supports %lu filter formats\n", dd.cFilterTags); trace(" Mid: 0x%x\n", dd.wMid); trace(" Pid: 0x%x\n", dd.wPid); } @@ -802,7 +802,7 @@ static void check_count(UINT uMetric) ok(rc == MMSYSERR_NOERROR, "acmMetrics() failed: rc = 0x%08x\n", rc); if (rc == MMSYSERR_NOERROR && winetest_interactive) - trace("%s: %u\n", get_metric(uMetric), dwMetric); + trace("%s: %lu\n", get_metric(uMetric), dwMetric); } static void driver_tests(void) @@ -896,11 +896,11 @@ static void test_prepareheader(void) mr = acmStreamPrepareHeader(has, &hdr, 0); ok(mr == MMSYSERR_NOERROR, "prepare failed: 0x%x\n", mr); - ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_PREPARED, "header wasn't prepared: 0x%x\n", hdr.fdwStatus); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_PREPARED, "header wasn't prepared: 0x%lx\n", hdr.fdwStatus); mr = acmStreamUnprepareHeader(has, &hdr, 0); ok(mr == MMSYSERR_NOERROR, "unprepare failed: 0x%x\n", mr); - ok(hdr.fdwStatus == 0, "header wasn't unprepared: 0x%x\n", hdr.fdwStatus); + ok(hdr.fdwStatus == 0, "header wasn't unprepared: 0x%lx\n", hdr.fdwStatus); memset(&hdr, 0, sizeof(hdr)); hdr.cbStruct = sizeof(hdr); @@ -943,21 +943,21 @@ static void test_prepareheader(void) mr = acmStreamPrepareHeader(has, &hdr, 0); ok(mr == MMSYSERR_NOERROR, "prepare failed: 0x%x\n", mr); - ok(hdr.fdwStatus == (ACMSTREAMHEADER_STATUSF_PREPARED | ACMSTREAMHEADER_STATUSF_DONE), "header wasn't prepared: 0x%x\n", hdr.fdwStatus); + ok(hdr.fdwStatus == (ACMSTREAMHEADER_STATUSF_PREPARED | ACMSTREAMHEADER_STATUSF_DONE), "header wasn't prepared: 0x%lx\n", hdr.fdwStatus); hdr.cbSrcLengthUsed = 12345; hdr.cbDstLengthUsed = 12345; hdr.fdwStatus &= ~ACMSTREAMHEADER_STATUSF_DONE; mr = acmStreamConvert(has, &hdr, ACM_STREAMCONVERTF_BLOCKALIGN); ok(mr == MMSYSERR_NOERROR, "convert failed: 0x%x\n", mr); - ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "conversion was not done: 0x%x\n", hdr.fdwStatus); - ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "expected %d, got %d\n", hdr.cbSrcLength, hdr.cbSrcLengthUsed); + ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "conversion was not done: 0x%lx\n", hdr.fdwStatus); + ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "expected %ld, got %ld\n", hdr.cbSrcLength, hdr.cbSrcLengthUsed); todo_wine - ok(hdr.cbDstLengthUsed == 1010, "expected 1010, got %d\n", hdr.cbDstLengthUsed); + ok(hdr.cbDstLengthUsed == 1010, "expected 1010, got %ld\n", hdr.cbDstLengthUsed); mr = acmStreamUnprepareHeader(has, &hdr, 0); ok(mr == MMSYSERR_NOERROR, "unprepare failed: 0x%x\n", mr); - ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_DONE, "header wasn't unprepared: 0x%x\n", hdr.fdwStatus); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_DONE, "header wasn't unprepared: 0x%lx\n", hdr.fdwStatus); /* The 2 next tests are related to Lost Horizon (bug 24723) */ memset(&hdr, 0, sizeof(hdr)); @@ -971,21 +971,21 @@ static void test_prepareheader(void) if (sizeof(void *) == 4) /* 64 bit fails on this test */ { ok(mr == MMSYSERR_NOERROR, "prepare failed: 0x%x\n", mr); - ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_PREPARED, "header wasn't prepared: 0x%x\n", hdr.fdwStatus); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_PREPARED, "header wasn't prepared: 0x%lx\n", hdr.fdwStatus); hdr.cbSrcLengthUsed = 12345; hdr.cbDstLengthUsed = 12345; hdr.fdwStatus &= ~ACMSTREAMHEADER_STATUSF_DONE; mr = acmStreamConvert(has, &hdr, ACM_STREAMCONVERTF_BLOCKALIGN); ok(mr == MMSYSERR_NOERROR, "convert failed: 0x%x\n", mr); - ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "conversion was not done: 0x%x\n", hdr.fdwStatus); - ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "expected %d, got %d\n", hdr.cbSrcLength, hdr.cbSrcLengthUsed); + ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "conversion was not done: 0x%lx\n", hdr.fdwStatus); + ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "expected %ld, got %ld\n", hdr.cbSrcLength, hdr.cbSrcLengthUsed); todo_wine - ok(hdr.cbDstLengthUsed == 1010, "expected 1010, got %d\n", hdr.cbDstLengthUsed); + ok(hdr.cbDstLengthUsed == 1010, "expected 1010, got %ld\n", hdr.cbDstLengthUsed); mr = acmStreamUnprepareHeader(has, &hdr, 0); ok(mr == MMSYSERR_NOERROR, "unprepare failed: 0x%x\n", mr); - ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_DONE, "header wasn't unprepared: 0x%x\n", hdr.fdwStatus); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_DONE, "header wasn't unprepared: 0x%lx\n", hdr.fdwStatus); } else todo_wine @@ -999,14 +999,14 @@ static void test_prepareheader(void) hdr.cbDstLength = -4; mr = acmStreamPrepareHeader(has, &hdr, 0); ok(mr == ACMERR_NOTPOSSIBLE, "expected 0x200, got 0x%x\n", mr); - ok(hdr.fdwStatus == 0, "expected 0, got 0x%x\n", hdr.fdwStatus); + ok(hdr.fdwStatus == 0, "expected 0, got 0x%lx\n", hdr.fdwStatus); hdr.cbSrcLengthUsed = 12345; hdr.cbDstLengthUsed = 12345; mr = acmStreamConvert(has, &hdr, ACM_STREAMCONVERTF_BLOCKALIGN); ok(mr == ACMERR_UNPREPARED, "expected 0x202, got 0x%x\n", mr); - ok(hdr.cbSrcLengthUsed == 12345, "expected 12345, got %d\n", hdr.cbSrcLengthUsed); - ok(hdr.cbDstLengthUsed == 12345, "expected 12345, got %d\n", hdr.cbDstLengthUsed); + ok(hdr.cbSrcLengthUsed == 12345, "expected 12345, got %ld\n", hdr.cbSrcLengthUsed); + ok(hdr.cbDstLengthUsed == 12345, "expected 12345, got %ld\n", hdr.cbDstLengthUsed); mr = acmStreamUnprepareHeader(has, &hdr, 0); ok(mr == ACMERR_UNPREPARED, "expected 0x202, got 0x%x\n", mr); @@ -1021,22 +1021,22 @@ static void test_prepareheader(void) mr = acmStreamPrepareHeader(has, &hdr, 0); ok(mr == MMSYSERR_NOERROR, "prepare failed: 0x%x\n", mr); - ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_PREPARED, "header wasn't prepared: 0x%x\n", hdr.fdwStatus); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_PREPARED, "header wasn't prepared: 0x%lx\n", hdr.fdwStatus); hdr.cbSrcLengthUsed = 12345; hdr.cbDstLengthUsed = 12345; hdr.fdwStatus &= ~ACMSTREAMHEADER_STATUSF_DONE; mr = acmStreamConvert(has, &hdr, ACM_STREAMCONVERTF_BLOCKALIGN); ok(mr == MMSYSERR_NOERROR, "convert failed: 0x%x\n", mr); - ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "conversion was not done: 0x%x\n", hdr.fdwStatus); + ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "conversion was not done: 0x%lx\n", hdr.fdwStatus); todo_wine - ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "expected %d, got %d\n", hdr.cbSrcLength, hdr.cbSrcLengthUsed); + ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "expected %ld, got %ld\n", hdr.cbSrcLength, hdr.cbSrcLengthUsed); todo_wine - ok(hdr.cbDstLengthUsed == hdr.cbDstLength, "expected %d, got %d\n", hdr.cbDstLength, hdr.cbDstLengthUsed); + ok(hdr.cbDstLengthUsed == hdr.cbDstLength, "expected %ld, got %ld\n", hdr.cbDstLength, hdr.cbDstLengthUsed); mr = acmStreamUnprepareHeader(has, &hdr, 0); ok(mr == MMSYSERR_NOERROR, "unprepare failed: 0x%x\n", mr); - ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_DONE, "header wasn't unprepared: 0x%x\n", hdr.fdwStatus); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_DONE, "header wasn't unprepared: 0x%lx\n", hdr.fdwStatus); mr = acmStreamClose(has, 0); ok(mr == MMSYSERR_NOERROR, "close failed: 0x%x\n", mr); @@ -1121,20 +1121,20 @@ static void test_convert(void) mmr = acmStreamPrepareHeader(has, &hdr, 0); ok(mmr == MMSYSERR_NOERROR, "#%d: prepare failed: 0x%x\n", i, mmr); - ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_PREPARED, "#%d: header wasn't prepared: 0x%x\n", i, hdr.fdwStatus); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_PREPARED, "#%d: header wasn't prepared: 0x%lx\n", i, hdr.fdwStatus); memset(&output, 0, sizeof(output)); mmr = acmStreamConvert(has, &hdr, ACM_STREAMCONVERTF_BLOCKALIGN); ok(mmr == MMSYSERR_NOERROR, "#%d: convert failed: 0x%x\n", i, mmr); - ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "#%d: conversion was not done: 0x%x\n", i, hdr.fdwStatus); - ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "#%d: expected %d, got %d\n", i, hdr.cbSrcLength, hdr.cbSrcLengthUsed); - ok(hdr.cbDstLengthUsed == expected_output[i].dst_used, "#%d: expected %d, got %d\n", i, expected_output[i].dst_used, hdr.cbDstLengthUsed); + ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "#%d: conversion was not done: 0x%lx\n", i, hdr.fdwStatus); + ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "#%d: expected %ld, got %ld\n", i, hdr.cbSrcLength, hdr.cbSrcLengthUsed); + ok(hdr.cbDstLengthUsed == expected_output[i].dst_used, "#%d: expected %ld, got %ld\n", i, expected_output[i].dst_used, hdr.cbDstLengthUsed); todo_wine_if(expected_output[i].todo) ok(!memcmp(expected_output[i].output, output, hdr.cbDstLengthUsed), "#%d: output does not match\n", i); mmr = acmStreamUnprepareHeader(has, &hdr, 0); ok(mmr == MMSYSERR_NOERROR, "#%d: unprepare failed: 0x%x\n", i, mmr); - ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_DONE, "#%d: header wasn't unprepared: 0x%x\n", i, hdr.fdwStatus); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_DONE, "#%d: header wasn't unprepared: 0x%lx\n", i, hdr.fdwStatus); mmr = acmStreamClose(has, 0); ok(mmr == MMSYSERR_NOERROR, "#%d: close failed: 0x%x\n", i, mmr); @@ -1164,8 +1164,8 @@ static void test_acmFormatSuggest(void) ok(rc == MMSYSERR_NOERROR, "failed with error 0x%x\n", rc); ok(src.wFormatTag == dst.wFormatTag, "expected %d, got %d\n", src.wFormatTag, dst.wFormatTag); ok(src.nChannels == dst.nChannels, "expected %d, got %d\n", src.nChannels, dst.nChannels); - ok(src.nSamplesPerSec == dst.nSamplesPerSec, "expected %d, got %d\n", src.nSamplesPerSec, dst.nSamplesPerSec); - ok(src.nAvgBytesPerSec == dst.nAvgBytesPerSec, "expected %d, got %d\n", src.nAvgBytesPerSec, dst.nAvgBytesPerSec); + ok(src.nSamplesPerSec == dst.nSamplesPerSec, "expected %ld, got %ld\n", src.nSamplesPerSec, dst.nSamplesPerSec); + ok(src.nAvgBytesPerSec == dst.nAvgBytesPerSec, "expected %ld, got %ld\n", src.nAvgBytesPerSec, dst.nAvgBytesPerSec); ok(src.nBlockAlign == dst.nBlockAlign, "expected %d, got %d\n", src.nBlockAlign, dst.nBlockAlign); ok(src.wBitsPerSample == dst.wBitsPerSample, "expected %d, got %d\n", src.wBitsPerSample, dst.wBitsPerSample); @@ -1179,8 +1179,8 @@ static void test_acmFormatSuggest(void) ok(rc == MMSYSERR_NOERROR, "failed with error 0x%x\n", rc); ok(src.wFormatTag == dst.wFormatTag, "expected %d, got %d\n", src.wFormatTag, dst.wFormatTag); ok(src.nChannels == dst.nChannels, "expected %d, got %d\n", src.nChannels, dst.nChannels); - ok(src.nSamplesPerSec == dst.nSamplesPerSec, "expected %d, got %d\n", src.nSamplesPerSec, dst.nSamplesPerSec); - ok(src.nAvgBytesPerSec == dst.nAvgBytesPerSec, "expected %d, got %d\n", src.nAvgBytesPerSec, dst.nAvgBytesPerSec); + ok(src.nSamplesPerSec == dst.nSamplesPerSec, "expected %ld, got %ld\n", src.nSamplesPerSec, dst.nSamplesPerSec); + ok(src.nAvgBytesPerSec == dst.nAvgBytesPerSec, "expected %ld, got %ld\n", src.nAvgBytesPerSec, dst.nAvgBytesPerSec); ok(src.nBlockAlign == dst.nBlockAlign, "expected %d, got %d\n", src.nBlockAlign, dst.nBlockAlign); ok(src.wBitsPerSample == dst.wBitsPerSample, "expected %d, got %d\n", src.wBitsPerSample, dst.wBitsPerSample); @@ -1192,7 +1192,7 @@ static void test_acmFormatSuggest(void) todo_wine { ok(rc == MMSYSERR_NOERROR, "failed with error 0x%x\n", rc); ok(dst.wFormatTag == WAVE_FORMAT_PCM, "expected %d, got %d\n", WAVE_FORMAT_PCM, dst.wFormatTag); - ok(dst.nSamplesPerSec == 0xdeadbeef, "expected %d, got %d\n", 0xdeadbeef, dst.nSamplesPerSec); + ok(dst.nSamplesPerSec == 0xdeadbeef, "expected %d, got %ld\n", 0xdeadbeef, dst.nSamplesPerSec); } src.nSamplesPerSec = 8000; @@ -1247,7 +1247,7 @@ static void test_acmFormatTagDetails(void) aftd.dwFormatTag = WAVE_FORMAT_MPEGLAYER3; rc = acmFormatTagDetailsW(NULL, &aftd, ACM_FORMATTAGDETAILSF_FORMATTAG); if (rc == MMSYSERR_NOERROR) - ok(aftd.cbFormatSize == sizeof(MPEGLAYER3WAVEFORMAT), "got %d\n", aftd.cbFormatSize); + ok(aftd.cbFormatSize == sizeof(MPEGLAYER3WAVEFORMAT), "got %ld\n", aftd.cbFormatSize); } static void test_acmFormatChoose(void)
Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> On Tue, Mar 01, 2022 at 08:33:25AM +0100, Eric Pouech wrote:
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
--- dlls/msacm32/tests/Makefile.in | 1 - dlls/msacm32/tests/msacm.c | 76 ++++++++++++++++++++-------------------- 2 files changed, 38 insertions(+), 39 deletions(-)
diff --git a/dlls/msacm32/tests/Makefile.in b/dlls/msacm32/tests/Makefile.in index d4fff0512b3..dba7cfee3da 100644 --- a/dlls/msacm32/tests/Makefile.in +++ b/dlls/msacm32/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msacm32.dll IMPORTS = msacm32 winmm
diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 35158e7fcfd..5980ac78640 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -42,7 +42,7 @@ static BOOL CALLBACK FormatTagEnumProc(HACMDRIVERID hadid, HACMDRIVER had;
if (winetest_interactive) - trace(" Format 0x%04x: %s\n", paftd->dwFormatTag, paftd->szFormatTag); + trace(" Format 0x%04lx: %s\n", paftd->dwFormatTag, paftd->szFormatTag);
rc = acmDriverOpen(&had, hadid, 0); ok(rc == MMSYSERR_NOERROR || rc == MMSYSERR_NODRIVER, @@ -243,7 +243,7 @@ static BOOL CALLBACK FormatEnumProc(HACMDRIVERID hadid, acmMetrics((HACMOBJ)hadid, ACM_METRIC_DRIVER_SUPPORT, &fdwSupport);
if (winetest_interactive) - trace(" 0x%04x, %s\n", pafd->dwFormatTag, pafd->szFormat); + trace(" 0x%04lx, %s\n", pafd->dwFormatTag, pafd->szFormat);
acmDriverOpen(&had, hadid, 0); dwSize = pafd->cbwfx; @@ -278,7 +278,7 @@ static BOOL CALLBACK FormatEnumProc(HACMDRIVERID hadid, "expected %d, got %d\n", pafd->pwfx->nChannels, dst->nChannels); if (pafd->dwFormatTag != 0x42) /* codec 0x0042 returns a different sample rate */ ok(dst->nSamplesPerSec == pafd->pwfx->nSamplesPerSec, - "expected %d, got %d\n", pafd->pwfx->nSamplesPerSec, dst->nSamplesPerSec); + "expected %ld, got %ld\n", pafd->pwfx->nSamplesPerSec, dst->nSamplesPerSec); ok(dst->wBitsPerSample == 16, "expected %d, got %d\n", 16, dst->wBitsPerSample); ok(dst->nBlockAlign == 2*pafd->pwfx->nChannels, @@ -402,7 +402,7 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, };
ok(dd.cbStruct == sizeof(dd), - "acmDriverDetailsA(): cbStruct = %08x\n", dd.cbStruct); + "acmDriverDetailsA(): cbStruct = %08lx\n", dd.cbStruct);
for (iter = expected_ids; iter->shortname; ++iter) { if (!strcmp(iter->shortname, dd.szShortName)) { @@ -427,8 +427,8 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, trace(" Copyright: %s\n", dd.szCopyright); trace(" Licensing: %s\n", dd.szLicensing); trace(" Features: %s\n", dd.szFeatures); - trace(" Supports %u formats\n", dd.cFormatTags); - trace(" Supports %u filter formats\n", dd.cFilterTags); + trace(" Supports %lu formats\n", dd.cFormatTags); + trace(" Supports %lu filter formats\n", dd.cFilterTags); trace(" Mid: 0x%x\n", dd.wMid); trace(" Pid: 0x%x\n", dd.wPid); } @@ -802,7 +802,7 @@ static void check_count(UINT uMetric) ok(rc == MMSYSERR_NOERROR, "acmMetrics() failed: rc = 0x%08x\n", rc);
if (rc == MMSYSERR_NOERROR && winetest_interactive) - trace("%s: %u\n", get_metric(uMetric), dwMetric); + trace("%s: %lu\n", get_metric(uMetric), dwMetric); }
static void driver_tests(void) @@ -896,11 +896,11 @@ static void test_prepareheader(void)
mr = acmStreamPrepareHeader(has, &hdr, 0); ok(mr == MMSYSERR_NOERROR, "prepare failed: 0x%x\n", mr); - ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_PREPARED, "header wasn't prepared: 0x%x\n", hdr.fdwStatus); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_PREPARED, "header wasn't prepared: 0x%lx\n", hdr.fdwStatus);
mr = acmStreamUnprepareHeader(has, &hdr, 0); ok(mr == MMSYSERR_NOERROR, "unprepare failed: 0x%x\n", mr); - ok(hdr.fdwStatus == 0, "header wasn't unprepared: 0x%x\n", hdr.fdwStatus); + ok(hdr.fdwStatus == 0, "header wasn't unprepared: 0x%lx\n", hdr.fdwStatus);
memset(&hdr, 0, sizeof(hdr)); hdr.cbStruct = sizeof(hdr); @@ -943,21 +943,21 @@ static void test_prepareheader(void)
mr = acmStreamPrepareHeader(has, &hdr, 0); ok(mr == MMSYSERR_NOERROR, "prepare failed: 0x%x\n", mr); - ok(hdr.fdwStatus == (ACMSTREAMHEADER_STATUSF_PREPARED | ACMSTREAMHEADER_STATUSF_DONE), "header wasn't prepared: 0x%x\n", hdr.fdwStatus); + ok(hdr.fdwStatus == (ACMSTREAMHEADER_STATUSF_PREPARED | ACMSTREAMHEADER_STATUSF_DONE), "header wasn't prepared: 0x%lx\n", hdr.fdwStatus);
hdr.cbSrcLengthUsed = 12345; hdr.cbDstLengthUsed = 12345; hdr.fdwStatus &= ~ACMSTREAMHEADER_STATUSF_DONE; mr = acmStreamConvert(has, &hdr, ACM_STREAMCONVERTF_BLOCKALIGN); ok(mr == MMSYSERR_NOERROR, "convert failed: 0x%x\n", mr); - ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "conversion was not done: 0x%x\n", hdr.fdwStatus); - ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "expected %d, got %d\n", hdr.cbSrcLength, hdr.cbSrcLengthUsed); + ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "conversion was not done: 0x%lx\n", hdr.fdwStatus); + ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "expected %ld, got %ld\n", hdr.cbSrcLength, hdr.cbSrcLengthUsed); todo_wine - ok(hdr.cbDstLengthUsed == 1010, "expected 1010, got %d\n", hdr.cbDstLengthUsed); + ok(hdr.cbDstLengthUsed == 1010, "expected 1010, got %ld\n", hdr.cbDstLengthUsed);
mr = acmStreamUnprepareHeader(has, &hdr, 0); ok(mr == MMSYSERR_NOERROR, "unprepare failed: 0x%x\n", mr); - ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_DONE, "header wasn't unprepared: 0x%x\n", hdr.fdwStatus); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_DONE, "header wasn't unprepared: 0x%lx\n", hdr.fdwStatus);
/* The 2 next tests are related to Lost Horizon (bug 24723) */ memset(&hdr, 0, sizeof(hdr)); @@ -971,21 +971,21 @@ static void test_prepareheader(void) if (sizeof(void *) == 4) /* 64 bit fails on this test */ { ok(mr == MMSYSERR_NOERROR, "prepare failed: 0x%x\n", mr); - ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_PREPARED, "header wasn't prepared: 0x%x\n", hdr.fdwStatus); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_PREPARED, "header wasn't prepared: 0x%lx\n", hdr.fdwStatus);
hdr.cbSrcLengthUsed = 12345; hdr.cbDstLengthUsed = 12345; hdr.fdwStatus &= ~ACMSTREAMHEADER_STATUSF_DONE; mr = acmStreamConvert(has, &hdr, ACM_STREAMCONVERTF_BLOCKALIGN); ok(mr == MMSYSERR_NOERROR, "convert failed: 0x%x\n", mr); - ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "conversion was not done: 0x%x\n", hdr.fdwStatus); - ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "expected %d, got %d\n", hdr.cbSrcLength, hdr.cbSrcLengthUsed); + ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "conversion was not done: 0x%lx\n", hdr.fdwStatus); + ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "expected %ld, got %ld\n", hdr.cbSrcLength, hdr.cbSrcLengthUsed); todo_wine - ok(hdr.cbDstLengthUsed == 1010, "expected 1010, got %d\n", hdr.cbDstLengthUsed); + ok(hdr.cbDstLengthUsed == 1010, "expected 1010, got %ld\n", hdr.cbDstLengthUsed);
mr = acmStreamUnprepareHeader(has, &hdr, 0); ok(mr == MMSYSERR_NOERROR, "unprepare failed: 0x%x\n", mr); - ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_DONE, "header wasn't unprepared: 0x%x\n", hdr.fdwStatus); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_DONE, "header wasn't unprepared: 0x%lx\n", hdr.fdwStatus); } else todo_wine @@ -999,14 +999,14 @@ static void test_prepareheader(void) hdr.cbDstLength = -4; mr = acmStreamPrepareHeader(has, &hdr, 0); ok(mr == ACMERR_NOTPOSSIBLE, "expected 0x200, got 0x%x\n", mr); - ok(hdr.fdwStatus == 0, "expected 0, got 0x%x\n", hdr.fdwStatus); + ok(hdr.fdwStatus == 0, "expected 0, got 0x%lx\n", hdr.fdwStatus);
hdr.cbSrcLengthUsed = 12345; hdr.cbDstLengthUsed = 12345; mr = acmStreamConvert(has, &hdr, ACM_STREAMCONVERTF_BLOCKALIGN); ok(mr == ACMERR_UNPREPARED, "expected 0x202, got 0x%x\n", mr); - ok(hdr.cbSrcLengthUsed == 12345, "expected 12345, got %d\n", hdr.cbSrcLengthUsed); - ok(hdr.cbDstLengthUsed == 12345, "expected 12345, got %d\n", hdr.cbDstLengthUsed); + ok(hdr.cbSrcLengthUsed == 12345, "expected 12345, got %ld\n", hdr.cbSrcLengthUsed); + ok(hdr.cbDstLengthUsed == 12345, "expected 12345, got %ld\n", hdr.cbDstLengthUsed);
mr = acmStreamUnprepareHeader(has, &hdr, 0); ok(mr == ACMERR_UNPREPARED, "expected 0x202, got 0x%x\n", mr); @@ -1021,22 +1021,22 @@ static void test_prepareheader(void)
mr = acmStreamPrepareHeader(has, &hdr, 0); ok(mr == MMSYSERR_NOERROR, "prepare failed: 0x%x\n", mr); - ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_PREPARED, "header wasn't prepared: 0x%x\n", hdr.fdwStatus); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_PREPARED, "header wasn't prepared: 0x%lx\n", hdr.fdwStatus);
hdr.cbSrcLengthUsed = 12345; hdr.cbDstLengthUsed = 12345; hdr.fdwStatus &= ~ACMSTREAMHEADER_STATUSF_DONE; mr = acmStreamConvert(has, &hdr, ACM_STREAMCONVERTF_BLOCKALIGN); ok(mr == MMSYSERR_NOERROR, "convert failed: 0x%x\n", mr); - ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "conversion was not done: 0x%x\n", hdr.fdwStatus); + ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "conversion was not done: 0x%lx\n", hdr.fdwStatus); todo_wine - ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "expected %d, got %d\n", hdr.cbSrcLength, hdr.cbSrcLengthUsed); + ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "expected %ld, got %ld\n", hdr.cbSrcLength, hdr.cbSrcLengthUsed); todo_wine - ok(hdr.cbDstLengthUsed == hdr.cbDstLength, "expected %d, got %d\n", hdr.cbDstLength, hdr.cbDstLengthUsed); + ok(hdr.cbDstLengthUsed == hdr.cbDstLength, "expected %ld, got %ld\n", hdr.cbDstLength, hdr.cbDstLengthUsed);
mr = acmStreamUnprepareHeader(has, &hdr, 0); ok(mr == MMSYSERR_NOERROR, "unprepare failed: 0x%x\n", mr); - ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_DONE, "header wasn't unprepared: 0x%x\n", hdr.fdwStatus); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_DONE, "header wasn't unprepared: 0x%lx\n", hdr.fdwStatus);
mr = acmStreamClose(has, 0); ok(mr == MMSYSERR_NOERROR, "close failed: 0x%x\n", mr); @@ -1121,20 +1121,20 @@ static void test_convert(void)
mmr = acmStreamPrepareHeader(has, &hdr, 0); ok(mmr == MMSYSERR_NOERROR, "#%d: prepare failed: 0x%x\n", i, mmr); - ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_PREPARED, "#%d: header wasn't prepared: 0x%x\n", i, hdr.fdwStatus); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_PREPARED, "#%d: header wasn't prepared: 0x%lx\n", i, hdr.fdwStatus);
memset(&output, 0, sizeof(output)); mmr = acmStreamConvert(has, &hdr, ACM_STREAMCONVERTF_BLOCKALIGN); ok(mmr == MMSYSERR_NOERROR, "#%d: convert failed: 0x%x\n", i, mmr); - ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "#%d: conversion was not done: 0x%x\n", i, hdr.fdwStatus); - ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "#%d: expected %d, got %d\n", i, hdr.cbSrcLength, hdr.cbSrcLengthUsed); - ok(hdr.cbDstLengthUsed == expected_output[i].dst_used, "#%d: expected %d, got %d\n", i, expected_output[i].dst_used, hdr.cbDstLengthUsed); + ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "#%d: conversion was not done: 0x%lx\n", i, hdr.fdwStatus); + ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "#%d: expected %ld, got %ld\n", i, hdr.cbSrcLength, hdr.cbSrcLengthUsed); + ok(hdr.cbDstLengthUsed == expected_output[i].dst_used, "#%d: expected %ld, got %ld\n", i, expected_output[i].dst_used, hdr.cbDstLengthUsed); todo_wine_if(expected_output[i].todo) ok(!memcmp(expected_output[i].output, output, hdr.cbDstLengthUsed), "#%d: output does not match\n", i);
mmr = acmStreamUnprepareHeader(has, &hdr, 0); ok(mmr == MMSYSERR_NOERROR, "#%d: unprepare failed: 0x%x\n", i, mmr); - ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_DONE, "#%d: header wasn't unprepared: 0x%x\n", i, hdr.fdwStatus); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_DONE, "#%d: header wasn't unprepared: 0x%lx\n", i, hdr.fdwStatus);
mmr = acmStreamClose(has, 0); ok(mmr == MMSYSERR_NOERROR, "#%d: close failed: 0x%x\n", i, mmr); @@ -1164,8 +1164,8 @@ static void test_acmFormatSuggest(void) ok(rc == MMSYSERR_NOERROR, "failed with error 0x%x\n", rc); ok(src.wFormatTag == dst.wFormatTag, "expected %d, got %d\n", src.wFormatTag, dst.wFormatTag); ok(src.nChannels == dst.nChannels, "expected %d, got %d\n", src.nChannels, dst.nChannels); - ok(src.nSamplesPerSec == dst.nSamplesPerSec, "expected %d, got %d\n", src.nSamplesPerSec, dst.nSamplesPerSec); - ok(src.nAvgBytesPerSec == dst.nAvgBytesPerSec, "expected %d, got %d\n", src.nAvgBytesPerSec, dst.nAvgBytesPerSec); + ok(src.nSamplesPerSec == dst.nSamplesPerSec, "expected %ld, got %ld\n", src.nSamplesPerSec, dst.nSamplesPerSec); + ok(src.nAvgBytesPerSec == dst.nAvgBytesPerSec, "expected %ld, got %ld\n", src.nAvgBytesPerSec, dst.nAvgBytesPerSec); ok(src.nBlockAlign == dst.nBlockAlign, "expected %d, got %d\n", src.nBlockAlign, dst.nBlockAlign); ok(src.wBitsPerSample == dst.wBitsPerSample, "expected %d, got %d\n", src.wBitsPerSample, dst.wBitsPerSample);
@@ -1179,8 +1179,8 @@ static void test_acmFormatSuggest(void) ok(rc == MMSYSERR_NOERROR, "failed with error 0x%x\n", rc); ok(src.wFormatTag == dst.wFormatTag, "expected %d, got %d\n", src.wFormatTag, dst.wFormatTag); ok(src.nChannels == dst.nChannels, "expected %d, got %d\n", src.nChannels, dst.nChannels); - ok(src.nSamplesPerSec == dst.nSamplesPerSec, "expected %d, got %d\n", src.nSamplesPerSec, dst.nSamplesPerSec); - ok(src.nAvgBytesPerSec == dst.nAvgBytesPerSec, "expected %d, got %d\n", src.nAvgBytesPerSec, dst.nAvgBytesPerSec); + ok(src.nSamplesPerSec == dst.nSamplesPerSec, "expected %ld, got %ld\n", src.nSamplesPerSec, dst.nSamplesPerSec); + ok(src.nAvgBytesPerSec == dst.nAvgBytesPerSec, "expected %ld, got %ld\n", src.nAvgBytesPerSec, dst.nAvgBytesPerSec); ok(src.nBlockAlign == dst.nBlockAlign, "expected %d, got %d\n", src.nBlockAlign, dst.nBlockAlign); ok(src.wBitsPerSample == dst.wBitsPerSample, "expected %d, got %d\n", src.wBitsPerSample, dst.wBitsPerSample);
@@ -1192,7 +1192,7 @@ static void test_acmFormatSuggest(void) todo_wine { ok(rc == MMSYSERR_NOERROR, "failed with error 0x%x\n", rc); ok(dst.wFormatTag == WAVE_FORMAT_PCM, "expected %d, got %d\n", WAVE_FORMAT_PCM, dst.wFormatTag); - ok(dst.nSamplesPerSec == 0xdeadbeef, "expected %d, got %d\n", 0xdeadbeef, dst.nSamplesPerSec); + ok(dst.nSamplesPerSec == 0xdeadbeef, "expected %d, got %ld\n", 0xdeadbeef, dst.nSamplesPerSec); } src.nSamplesPerSec = 8000;
@@ -1247,7 +1247,7 @@ static void test_acmFormatTagDetails(void) aftd.dwFormatTag = WAVE_FORMAT_MPEGLAYER3; rc = acmFormatTagDetailsW(NULL, &aftd, ACM_FORMATTAGDETAILSF_FORMATTAG); if (rc == MMSYSERR_NOERROR) - ok(aftd.cbFormatSize == sizeof(MPEGLAYER3WAVEFORMAT), "got %d\n", aftd.cbFormatSize); + ok(aftd.cbFormatSize == sizeof(MPEGLAYER3WAVEFORMAT), "got %ld\n", aftd.cbFormatSize); }
static void test_acmFormatChoose(void)
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msado15/tests/msado15.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index f5473c72cfb..9ccba929993 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -676,7 +676,7 @@ static void test_Fields(void) LONG count; ADO_LONGPTR size; DataTypeEnum type; - FieldAttributeEnum attrs; + LONG attrs; HRESULT hr; hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset );
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msado15/tests/Makefile.in | 1 dlls/msado15/tests/msado15.c | 468 ++++++++++++++++++++-------------------- 2 files changed, 234 insertions(+), 235 deletions(-) diff --git a/dlls/msado15/tests/Makefile.in b/dlls/msado15/tests/Makefile.in index 3a27f0cbd89..a97f3dd4339 100644 --- a/dlls/msado15/tests/Makefile.in +++ b/dlls/msado15/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msado15.dll IMPORTS = oleaut32 ole32 diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 9ccba929993..94e9ae4fa09 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -62,7 +62,7 @@ static void test_Recordset(void) VARIANT bookmark; hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); hr = _Recordset_QueryInterface( recordset, &IID_IRunnableObject, (void**)&runtime); ok(hr == E_NOINTERFACE, "Unexpected IRunnableObject interface\n"); @@ -71,252 +71,252 @@ static void test_Recordset(void) /* _Recordset object supports ISupportErrorInfo */ errorinfo = NULL; hr = _Recordset_QueryInterface( recordset, &IID_ISupportErrorInfo, (void **)&errorinfo ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); if (errorinfo) ISupportErrorInfo_Release( errorinfo ); hr = _Recordset_get_Fields( recordset, &fields ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); /* calling get_Fields again returns the same object */ hr = _Recordset_get_Fields( recordset, &fields2 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( fields2 == fields, "expected same object\n" ); count = -1; hr = Fields_get_Count( fields2, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !count, "got %d\n", count ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( !count, "got %ld\n", count ); hr = _Recordset_Close( recordset ); - ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08lx\n", hr ); Fields_Release( fields2 ); hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); state = -1; hr = _Recordset_get_State( recordset, &state ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( state == adStateClosed, "got %d\n", state ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( state == adStateClosed, "got %ld\n", state ); location = -1; hr = _Recordset_get_CursorLocation( recordset, &location ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( location == adUseServer, "got %d\n", location ); cursor = adOpenUnspecified; hr = _Recordset_get_CursorType( recordset, &cursor ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( cursor == adOpenForwardOnly, "got %d\n", cursor ); VariantInit( &bookmark ); hr = _Recordset_get_Bookmark( recordset, &bookmark ); - ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08lx\n", hr ); VariantInit( &bookmark ); hr = _Recordset_put_Bookmark( recordset, bookmark ); - ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08lx\n", hr ); VariantInit( &missing ); hr = _Recordset_AddNew( recordset, missing, missing ); - ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08lx\n", hr ); V_VT( &missing ) = VT_ERROR; V_ERROR( &missing ) = DISP_E_PARAMNOTFOUND; hr = _Recordset_Open( recordset, missing, missing, adOpenStatic, adLockBatchOptimistic, adCmdUnspecified ); - ok( hr == MAKE_ADO_HRESULT( adErrInvalidConnection ), "got %08x\n", hr ); + ok( hr == MAKE_ADO_HRESULT( adErrInvalidConnection ), "got %08lx\n", hr ); hr = _Recordset_get_Fields( recordset, &fields ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); name = SysAllocString( L"field" ); hr = Fields__Append( fields, name, adInteger, 4, adFldUnspecified ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); V_VT( &index ) = VT_I4; V_I4( &index ) = 1000; hr = Fields_get_Item( fields, index, &field ); - ok( hr == MAKE_ADO_HRESULT(adErrItemNotFound), "got %08x\n", hr ); + ok( hr == MAKE_ADO_HRESULT(adErrItemNotFound), "got %08lx\n", hr ); V_VT( &index ) = VT_I4; V_I4( &index ) = 0; hr = Fields_get_Item( fields, index, &field ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); Field_Release(field); V_VT( &index ) = VT_I2; V_I4( &index ) = 0; hr = Fields_get_Item( fields, index, &field ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); Field_Release(field); V_VT( &index ) = VT_I1; V_I1( &index ) = 0; hr = Fields_get_Item( fields, index, &field ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); Field_Release(field); V_VT( &index ) = VT_R8; V_R8( &index ) = 0.1; hr = Fields_get_Item( fields, index, &field ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); Field_Release(field); V_VT( &index ) = VT_UNKNOWN; V_UNKNOWN( &index ) = NULL; hr = Fields_get_Item( fields, index, &field ); - ok( hr == MAKE_ADO_HRESULT(adErrItemNotFound), "got %08x\n", hr ); + ok( hr == MAKE_ADO_HRESULT(adErrItemNotFound), "got %08lx\n", hr ); V_VT( &index ) = VT_BSTR; V_BSTR( &index ) = name; hr = Fields_get_Item( fields, index, &field ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); SysFreeString( name ); hr = Field_QueryInterface(field, &IID_Properties, (void**)&props); - ok( hr == E_NOINTERFACE, "got %08x\n", hr ); + ok( hr == E_NOINTERFACE, "got %08lx\n", hr ); hr = Field_get_Properties(field, &props); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); count = -1; hr = Properties_get_Count(props, &count); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !count, "got %d\n", count ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( !count, "got %ld\n", count ); V_VT( &index ) = VT_I4; V_I4( &index ) = 1000; hr = Properties_get_Item(props, index, &prop); - ok( hr == MAKE_ADO_HRESULT(adErrItemNotFound), "got %08x\n", hr ); + ok( hr == MAKE_ADO_HRESULT(adErrItemNotFound), "got %08lx\n", hr ); Properties_Release(props); hr = _Recordset_Open( recordset, missing, missing, adOpenStatic, adLockBatchOptimistic, adCmdUnspecified ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( is_eof( recordset ), "not eof\n" ); ok( is_bof( recordset ), "not bof\n" ); hr = _Recordset_Open( recordset, missing, missing, adOpenStatic, adLockBatchOptimistic, adCmdUnspecified ); - ok( hr == MAKE_ADO_HRESULT( adErrObjectOpen ), "got %08x\n", hr ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectOpen ), "got %08lx\n", hr ); state = -1; hr = _Recordset_get_State( recordset, &state ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( state == adStateOpen, "got %d\n", state ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( state == adStateOpen, "got %ld\n", state ); VariantInit( &bookmark ); hr = _Recordset_get_Bookmark( recordset, &bookmark ); - ok( hr == MAKE_ADO_HRESULT( adErrNoCurrentRecord ), "got %08x\n", hr ); + ok( hr == MAKE_ADO_HRESULT( adErrNoCurrentRecord ), "got %08lx\n", hr ); VariantInit( &bookmark ); hr = _Recordset_put_Bookmark( recordset, bookmark ); - ok( hr == MAKE_ADO_HRESULT( adErrInvalidArgument ), "got %08x\n", hr ); + ok( hr == MAKE_ADO_HRESULT( adErrInvalidArgument ), "got %08lx\n", hr ); rec_count = -1; hr = _Recordset_get_RecordCount( recordset, &rec_count ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !rec_count, "got %ld\n", rec_count ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( !rec_count, "got %Id\n", rec_count ); hr = _Recordset_AddNew( recordset, missing, missing ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( !is_eof( recordset ), "eof\n" ); ok( !is_bof( recordset ), "bof\n" ); rec_count = -1; hr = _Recordset_get_RecordCount( recordset, &rec_count ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( rec_count == 1, "got %ld\n", rec_count ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( rec_count == 1, "got %Id\n", rec_count ); /* get_Fields still returns the same object */ hr = _Recordset_get_Fields( recordset, &fields2 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( fields2 == fields, "expected same object\n" ); Fields_Release( fields2 ); count = -1; hr = Fields_get_Count( fields2, &count ); - ok( count == 1, "got %d\n", count ); + ok( count == 1, "got %ld\n", count ); hr = Field_get_Value( field, &val ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( V_VT( &val ) == VT_EMPTY, "got %u\n", V_VT( &val ) ); V_VT( &val ) = VT_I4; V_I4( &val ) = -1; hr = Field_put_Value( field, val ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); V_VT( &val ) = VT_ERROR; V_ERROR( &val ) = DISP_E_PARAMNOTFOUND; hr = Field_get_Value( field, &val ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( V_VT( &val ) == VT_I4, "got %u\n", V_VT( &val ) ); - ok( V_I4( &val ) == -1, "got %d\n", V_I4( &val ) ); + ok( V_I4( &val ) == -1, "got %ld\n", V_I4( &val ) ); hr = _Recordset_AddNew( recordset, missing, missing ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); /* field object returns different value after AddNew */ V_VT( &val ) = VT_ERROR; V_ERROR( &val ) = DISP_E_PARAMNOTFOUND; hr = Field_get_Value( field, &val ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( V_VT( &val ) == VT_EMPTY, "got %u\n", V_VT( &val ) ); ok( !is_eof( recordset ), "eof\n" ); ok( !is_bof( recordset ), "bof\n" ); hr = _Recordset_MoveFirst( recordset ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( !is_eof( recordset ), "eof\n" ); ok( !is_bof( recordset ), "bof\n" ); V_VT( &val ) = VT_ERROR; V_ERROR( &val ) = DISP_E_PARAMNOTFOUND; hr = Field_get_Value( field, &val ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( V_VT( &val ) == VT_I4, "got %u\n", V_VT( &val ) ); - ok( V_I4( &val ) == -1, "got %d\n", V_I4( &val ) ); + ok( V_I4( &val ) == -1, "got %ld\n", V_I4( &val ) ); hr = _Recordset_MoveNext( recordset ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( !is_eof( recordset ), "eof\n" ); ok( !is_bof( recordset ), "not bof\n" ); hr = _Recordset_MoveNext( recordset ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( is_eof( recordset ), "not eof\n" ); ok( !is_bof( recordset ), "bof\n" ); hr = _Recordset_MoveFirst( recordset ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( !is_eof( recordset ), "eof\n" ); ok( !is_bof( recordset ), "bof\n" ); hr = _Recordset_MovePrevious( recordset ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( !is_eof( recordset ), "eof\n" ); ok( is_bof( recordset ), "not bof\n" ); /* try get value at BOF */ VariantInit( &val ); hr = Field_get_Value( field, &val ); - ok( hr == MAKE_ADO_HRESULT( adErrNoCurrentRecord ), "got %08x\n", hr ); + ok( hr == MAKE_ADO_HRESULT( adErrNoCurrentRecord ), "got %08lx\n", hr ); hr = _Recordset_Close( recordset ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); count = -1; hr = Fields_get_Count( fields, &count ); - ok( !count, "got %d\n", count ); + ok( !count, "got %ld\n", count ); hr = Field_get_Name(field, &name); - todo_wine ok( hr == MAKE_ADO_HRESULT( adErrObjectNotSet ), "got %08x\n", hr ); + todo_wine ok( hr == MAKE_ADO_HRESULT( adErrObjectNotSet ), "got %08lx\n", hr ); state = -1; hr = _Recordset_get_State( recordset, &state ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( state == adStateClosed, "got %d\n", state ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( state == adStateClosed, "got %ld\n", state ); Field_Release( field ); Fields_Release( fields ); @@ -370,13 +370,13 @@ static ULONG WINAPI rowset_info_Release(IRowsetInfo *iface) static HRESULT WINAPI rowset_info_GetProperties(IRowsetInfo *iface, const ULONG count, const DBPROPIDSET propertyidsets[], ULONG *out_count, DBPROPSET **propertysets1) { - ok( count == 2, "got %d\n", count ); + ok( count == 2, "got %ld\n", count ); ok( IsEqualIID(&DBPROPSET_ROWSET, &propertyidsets[0].guidPropertySet), "got %s\n", wine_dbgstr_guid(&propertyidsets[0].guidPropertySet)); - ok( propertyidsets[0].cPropertyIDs == 17, "got %d\n", propertyidsets[0].cPropertyIDs ); + ok( propertyidsets[0].cPropertyIDs == 17, "got %ld\n", propertyidsets[0].cPropertyIDs ); ok( IsEqualIID(&DBPROPSET_PROVIDERROWSET, &propertyidsets[1].guidPropertySet), "got %s\n", wine_dbgstr_guid(&propertyidsets[1].guidPropertySet)); - ok( propertyidsets[1].cPropertyIDs == 1, "got %d\n", propertyidsets[1].cPropertyIDs ); + ok( propertyidsets[1].cPropertyIDs == 1, "got %ld\n", propertyidsets[1].cPropertyIDs ); return E_NOTIMPL; } @@ -595,10 +595,10 @@ static void test_ADORecordsetConstruction(void) LONG ref, count; hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); hr = _Recordset_QueryInterface( recordset, &IID_ADORecordsetConstruction, (void**)&construct ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); if (FAILED(hr)) { goto done; @@ -612,23 +612,23 @@ static void test_ADORecordsetConstruction(void) rowset = &testrowset.IRowset_iface; ref = get_refcount( rowset ); - ok( ref == 1, "got %d\n", ref ); + ok( ref == 1, "got %ld\n", ref ); hr = ADORecordsetConstruction_put_Rowset( construct, (IUnknown*)rowset ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ref = get_refcount( rowset ); - ok( ref == 2, "got %d\n", ref ); + ok( ref == 2, "got %ld\n", ref ); hr = _Recordset_get_Fields( recordset, &fields ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( fields != NULL, "NULL value\n"); ref = get_refcount( rowset ); - ok( ref == 2, "got %d\n", ref ); + ok( ref == 2, "got %ld\n", ref ); count = -1; hr = Fields_get_Count( fields, &count ); - ok( count == 1, "got %d\n", count ); + ok( count == 1, "got %ld\n", count ); if (count > 0) { VARIANT index; @@ -639,15 +639,15 @@ static void test_ADORecordsetConstruction(void) V_BSTR( &index ) = SysAllocString( L"Column1" ); hr = Fields_get_Item( fields, index, &field ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); hr = Field_get_Type( field, &type ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( type == adInteger, "got %d\n", type ); size = -1; hr = Field_get_DefinedSize( field, &size ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( size == 5, "got %ld\n", size ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( size == 5, "got %Id\n", size ); VariantClear(&index); @@ -655,7 +655,7 @@ static void test_ADORecordsetConstruction(void) } ref = get_refcount(rowset); - ok( ref == 2, "got %d\n", ref ); + ok( ref == 2, "got %ld\n", ref ); Fields_Release(fields); @@ -680,43 +680,43 @@ static void test_Fields(void) HRESULT hr; hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); hr = _Recordset_QueryInterface( recordset, &IID_Fields, (void **)&fields ); - ok( hr == E_NOINTERFACE, "got %08x\n", hr ); + ok( hr == E_NOINTERFACE, "got %08lx\n", hr ); hr = _Recordset_get_Fields( recordset, &fields ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); /* Fields object supports ISupportErrorInfo */ errorinfo = NULL; hr = Fields_QueryInterface( fields, &IID_ISupportErrorInfo, (void **)&errorinfo ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); if (errorinfo) ISupportErrorInfo_Release( errorinfo ); count = -1; hr = Fields_get_Count( fields, &count ); - ok( !count, "got %d\n", count ); + ok( !count, "got %ld\n", count ); name = SysAllocString( L"field" ); V_VT( &val ) = VT_ERROR; V_ERROR( &val ) = DISP_E_PARAMNOTFOUND; hr = Fields_Append( fields, name, adInteger, 4, adFldUnspecified, val ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); SysFreeString( name ); count = -1; hr = Fields_get_Count( fields, &count ); - ok( count == 1, "got %d\n", count ); + ok( count == 1, "got %ld\n", count ); name = SysAllocString( L"field2" ); hr = Fields__Append( fields, name, adInteger, 4, adFldUnspecified ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); SysFreeString( name ); count = -1; hr = Fields_get_Count( fields, &count ); - ok( count == 2, "got %d\n", count ); + ok( count == 2, "got %ld\n", count ); /* handing out field object doesn't add reference to fields or recordset object */ name = SysAllocString( L"field" ); @@ -726,7 +726,7 @@ static void test_Fields(void) /* calling get_Item again returns the same object and adds reference */ hr = Fields_get_Item( fields, index, &field2 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( field2 == field, "expected same object\n" ); Field_Release( field2 ); SysFreeString( name ); @@ -734,26 +734,26 @@ static void test_Fields(void) /* Field object supports ISupportErrorInfo */ errorinfo = NULL; hr = Field_QueryInterface( field, &IID_ISupportErrorInfo, (void **)&errorinfo ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); if (errorinfo) ISupportErrorInfo_Release( errorinfo ); /* verify values set with _Append */ hr = Field_get_Name( field, &name ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( !lstrcmpW( name, L"field" ), "got %s\n", wine_dbgstr_w(name) ); SysFreeString( name ); type = 0xdead; hr = Field_get_Type( field, &type ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( type == adInteger, "got %d\n", type ); size = -1; hr = Field_get_DefinedSize( field, &size ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( size == 4, "got %ld\n", size ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( size == 4, "got %Id\n", size ); attrs = 0xdead; hr = Field_get_Attributes( field, &attrs ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !attrs, "got %d\n", attrs ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( !attrs, "got %ld\n", attrs ); Field_Release( field ); Fields_Release( fields ); @@ -796,237 +796,237 @@ static void test_Stream(void) HRESULT hr; hr = CoCreateInstance( &CLSID_Stream, NULL, CLSCTX_INPROC_SERVER, &IID__Stream, (void **)&stream ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); hr = _Stream_get_Size( stream, &size ); - ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08lx\n", hr ); hr = _Stream_get_EOS( stream, &eos ); - ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08lx\n", hr ); hr = _Stream_get_Position( stream, &pos ); - ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08lx\n", hr ); hr = _Stream_put_Position( stream, 0 ); - ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08lx\n", hr ); /* check default type */ type = 0; hr = _Stream_get_Type( stream, &type ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( type == adTypeText, "got %u\n", type ); hr = _Stream_put_Type( stream, adTypeBinary ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); type = 0; hr = _Stream_get_Type( stream, &type ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( type == adTypeBinary, "got %u\n", type ); /* revert */ hr = _Stream_put_Type( stream, adTypeText ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); sep = 0; hr = _Stream_get_LineSeparator( stream, &sep ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( sep == adCRLF, "got %d\n", sep ); hr = _Stream_put_LineSeparator( stream, adLF ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); state = 0xdeadbeef; hr = _Stream_get_State( stream, &state ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( state == adStateClosed, "got %u\n", state ); mode = 0xdeadbeef; hr = _Stream_get_Mode( stream, &mode ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( mode == adModeUnknown, "got %u\n", mode ); hr = _Stream_put_Mode( stream, adModeReadWrite ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); hr = _Stream_get_Charset( stream, &charset ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( !lstrcmpW( charset, L"Unicode" ), "got %s\n", wine_dbgstr_w(charset) ); SysFreeString( charset ); str = SysAllocString( L"Unicode" ); hr = _Stream_put_Charset( stream, str ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); SysFreeString( str ); hr = _Stream_Read( stream, 2, &val ); - ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08lx\n", hr ); V_VT( &missing ) = VT_ERROR; V_ERROR( &missing ) = DISP_E_PARAMNOTFOUND; hr = _Stream_Open( stream, missing, adModeUnknown, adOpenStreamUnspecified, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); hr = _Stream_Open( stream, missing, adModeUnknown, adOpenStreamUnspecified, NULL, NULL ); - ok( hr == MAKE_ADO_HRESULT( adErrObjectOpen ), "got %08x\n", hr ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectOpen ), "got %08lx\n", hr ); state = 0xdeadbeef; hr = _Stream_get_State( stream, &state ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( state == adStateOpen, "got %u\n", state ); size = -1; hr = _Stream_get_Size( stream, &size ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !size, "got %ld\n", size ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( !size, "got %Id\n", size ); eos = VARIANT_FALSE; hr = _Stream_get_EOS( stream, &eos ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( eos == VARIANT_TRUE, "got %04x\n", eos ); pos = -1; hr = _Stream_get_Position( stream, &pos ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !pos, "got %ld\n", pos ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( !pos, "got %Id\n", pos ); size = -1; hr = _Stream_get_Size( stream, &size ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !size, "got %ld\n", size ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( !size, "got %Id\n", size ); hr = _Stream_Read( stream, 2, &val ); - ok( hr == MAKE_ADO_HRESULT( adErrIllegalOperation ), "got %08x\n", hr ); + ok( hr == MAKE_ADO_HRESULT( adErrIllegalOperation ), "got %08lx\n", hr ); hr = _Stream_ReadText( stream, 2, &str ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( !str[0], "got %s\n", wine_dbgstr_w(str) ); SysFreeString( str ); pos = -1; hr = _Stream_get_Position( stream, &pos ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !pos, "got %ld\n", pos ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( !pos, "got %Id\n", pos ); str = SysAllocString( L"test" ); hr = _Stream_WriteText( stream, str, adWriteChar ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); SysFreeString( str ); hr = _Stream_ReadText( stream, adReadAll, &str ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( !str[0], "got %s\n", wine_dbgstr_w(str) ); SysFreeString( str ); hr = _Stream_put_Position( stream, 0 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); hr = _Stream_ReadText( stream, adReadAll, &str ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( !lstrcmpW( str, L"test" ), "got %s\n", wine_dbgstr_w(str) ); SysFreeString( str ); pos = -1; hr = _Stream_get_Position( stream, &pos ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( pos == 10, "got %ld\n", pos ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( pos == 10, "got %Id\n", pos ); eos = VARIANT_FALSE; hr = _Stream_get_EOS( stream, &eos ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( eos == VARIANT_TRUE, "got %04x\n", eos ); hr = _Stream_put_Position( stream, 6 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); size = -1; hr = _Stream_get_Size( stream, &size ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( size == 10, "got %ld\n", size ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( size == 10, "got %Id\n", size ); hr = _Stream_put_Position( stream, 2 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); hr = _Stream_SetEOS( stream ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); pos = -1; hr = _Stream_get_Position( stream, &pos ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( pos == 2, "got %ld\n", pos ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( pos == 2, "got %Id\n", pos ); size = -1; hr = _Stream_get_Size( stream, &size ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( size == 2, "got %ld\n", size ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( size == 2, "got %Id\n", size ); hr = _Stream_Close( stream ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); state = 0xdeadbeef; hr = _Stream_get_State( stream, &state ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( state == adStateClosed, "got %u\n", state ); hr = _Stream_Close( stream ); - ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08lx\n", hr ); refs = _Stream_Release( stream ); - ok( !refs, "got %d\n", refs ); + ok( !refs, "got %ld\n", refs ); /* binary type */ hr = CoCreateInstance( &CLSID_Stream, NULL, CLSCTX_INPROC_SERVER, &IID__Stream, (void **)&stream ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); hr = _Stream_put_Type( stream, adTypeBinary ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); hr = _Stream_Open( stream, missing, adModeUnknown, adOpenStreamUnspecified, NULL, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); hr = _Stream_ReadText( stream, adReadAll, &str ); - ok( hr == MAKE_ADO_HRESULT( adErrIllegalOperation ), "got %08x\n", hr ); + ok( hr == MAKE_ADO_HRESULT( adErrIllegalOperation ), "got %08lx\n", hr ); str = SysAllocString( L"test" ); hr = _Stream_WriteText( stream, str, adWriteChar ); - ok( hr == MAKE_ADO_HRESULT( adErrIllegalOperation ), "got %08x\n", hr ); + ok( hr == MAKE_ADO_HRESULT( adErrIllegalOperation ), "got %08lx\n", hr ); SysFreeString( str ); VariantInit( &val ); hr = _Stream_Read( stream, 1, &val ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( V_VT( &val ) == VT_NULL, "got %u\n", V_VT( &val ) ); VariantInit( &val ); hr = _Stream_Write( stream, val ); - ok( hr == MAKE_ADO_HRESULT( adErrInvalidArgument ), "got %08x\n", hr ); + ok( hr == MAKE_ADO_HRESULT( adErrInvalidArgument ), "got %08lx\n", hr ); hr = str_to_byte_array( "data", &val ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); hr = _Stream_Write( stream, val ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); VariantClear( &val ); pos = -1; hr = _Stream_get_Position( stream, &pos ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( pos == 4, "got %ld\n", pos ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( pos == 4, "got %Id\n", pos ); hr = _Stream_put_Position( stream, 0 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); VariantInit( &val ); hr = _Stream_Read( stream, adReadAll, &val ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( V_VT( &val ) == (VT_ARRAY | VT_UI1), "got %04x\n", V_VT( &val ) ); VariantClear( &val ); pos = -1; hr = _Stream_get_Position( stream, &pos ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( pos == 4, "got %ld\n", pos ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( pos == 4, "got %Id\n", pos ); refs = _Stream_Release( stream ); - ok( !refs, "got %d\n", refs ); + ok( !refs, "got %ld\n", refs ); } static void test_Connection(void) @@ -1043,7 +1043,7 @@ static void test_Connection(void) CursorLocationEnum location; hr = CoCreateInstance(&CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, &IID__Connection, (void**)&connection); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); hr = _Connection_QueryInterface(connection, &IID_IRunnableObject, (void**)&runtime); ok(hr == E_NOINTERFACE, "Unexpected IRunnableObject interface\n"); @@ -1054,113 +1054,113 @@ static void test_Connection(void) ISupportErrorInfo_Release(errorinfo); hr = _Connection_QueryInterface(connection, &IID_IConnectionPointContainer, (void**)&pointcontainer); - ok(hr == S_OK, "Failed to get IConnectionPointContainer interface %08x\n", hr); + ok(hr == S_OK, "Failed to get IConnectionPointContainer interface %08lx\n", hr); IConnectionPointContainer_Release(pointcontainer); hr = _Connection_QueryInterface(connection, &IID_ADOConnectionConstruction15, (void**)&construct); - ok(hr == S_OK, "Failed to get ADOConnectionConstruction15 interface %08x\n", hr); + ok(hr == S_OK, "Failed to get ADOConnectionConstruction15 interface %08lx\n", hr); if (hr == S_OK) ADOConnectionConstruction15_Release(construct); if (0) /* Crashes on windows */ { hr = _Connection_get_State(connection, NULL); - ok(hr == E_INVALIDARG, "Unexpected hr 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr 0x%08lx\n", hr); } state = -1; hr = _Connection_get_State(connection, &state); - ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); - ok(state == adStateClosed, "Unexpected state value 0x%08x\n", state); + ok(hr == S_OK, "Failed to get state, hr 0x%08lx\n", hr); + ok(state == adStateClosed, "Unexpected state value 0x%08lx\n", state); hr = _Connection_Close(connection); - ok(hr == MAKE_ADO_HRESULT(adErrObjectClosed), "got %08x\n", hr); + ok(hr == MAKE_ADO_HRESULT(adErrObjectClosed), "got %08lx\n", hr); timeout = 0; hr = _Connection_get_CommandTimeout(connection, &timeout); - ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); - ok(timeout == 30, "Unexpected timeout value %d\n", timeout); + ok(hr == S_OK, "Failed to get state, hr 0x%08lx\n", hr); + ok(timeout == 30, "Unexpected timeout value %ld\n", timeout); hr = _Connection_put_CommandTimeout(connection, 300); - ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + ok(hr == S_OK, "Failed to get state, hr 0x%08lx\n", hr); timeout = 0; hr = _Connection_get_CommandTimeout(connection, &timeout); - ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); - ok(timeout == 300, "Unexpected timeout value %d\n", timeout); + ok(hr == S_OK, "Failed to get state, hr 0x%08lx\n", hr); + ok(timeout == 300, "Unexpected timeout value %ld\n", timeout); location = 0; hr = _Connection_get_CursorLocation(connection, &location); - ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(hr == S_OK, "Failed, hr 0x%08lx\n", hr); ok(location == adUseServer, "Unexpected location value %d\n", location); hr = _Connection_put_CursorLocation(connection, adUseClient); - ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(hr == S_OK, "Failed, hr 0x%08lx\n", hr); location = 0; hr = _Connection_get_CursorLocation(connection, &location); - ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(hr == S_OK, "Failed, hr 0x%08lx\n", hr); ok(location == adUseClient, "Unexpected location value %d\n", location); hr = _Connection_put_CursorLocation(connection, adUseServer); - ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(hr == S_OK, "Failed, hr 0x%08lx\n", hr); mode = 0xdeadbeef; hr = _Connection_get_Mode(connection, &mode); - ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + ok(hr == S_OK, "Failed to get state, hr 0x%08lx\n", hr); ok(mode == adModeUnknown, "Unexpected mode value %d\n", mode); hr = _Connection_put_Mode(connection, adModeShareDenyNone); - ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + ok(hr == S_OK, "Failed to get state, hr 0x%08lx\n", hr); mode = adModeUnknown; hr = _Connection_get_Mode(connection, &mode); - ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + ok(hr == S_OK, "Failed to get state, hr 0x%08lx\n", hr); ok(mode == adModeShareDenyNone, "Unexpected mode value %d\n", mode); hr = _Connection_put_Mode(connection, adModeUnknown); - ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + ok(hr == S_OK, "Failed to get state, hr 0x%08lx\n", hr); /* Default */ str = (BSTR)0xdeadbeef; hr = _Connection_get_Provider(connection, &str); - ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(hr == S_OK, "Failed, hr 0x%08lx\n", hr); ok(!wcscmp(str, L"MSDASQL"), "wrong string %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = SysAllocString(L"MSDASQL.1"); hr = _Connection_put_Provider(connection, str); - ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(hr == S_OK, "Failed, hr 0x%08lx\n", hr); SysFreeString(str); str = (BSTR)0xdeadbeef; hr = _Connection_get_Provider(connection, &str); - ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(hr == S_OK, "Failed, hr 0x%08lx\n", hr); ok(!wcscmp(str, L"MSDASQL.1"), "wrong string %s\n", wine_dbgstr_w(str)); /* Restore default */ str = SysAllocString(L"MSDASQL"); hr = _Connection_put_Provider(connection, str); - ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(hr == S_OK, "Failed, hr 0x%08lx\n", hr); SysFreeString(str); hr = _Connection_put_Provider(connection, NULL); - ok(hr == MAKE_ADO_HRESULT(adErrInvalidArgument), "got 0x%08x\n", hr); + ok(hr == MAKE_ADO_HRESULT(adErrInvalidArgument), "got 0x%08lx\n", hr); SysFreeString(str); str = (BSTR)0xdeadbeef; hr = _Connection_get_ConnectionString(connection, &str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(str == NULL, "got %p\n", str); str = SysAllocString(L"Provider=MSDASQL.1;Persist Security Info=False;Data Source=wine_test"); hr = _Connection_put_ConnectionString(connection, str); - ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(hr == S_OK, "Failed, hr 0x%08lx\n", hr); /* Show put_ConnectionString effects Provider */ str3 = (BSTR)0xdeadbeef; hr = _Connection_get_Provider(connection, &str3); - ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(hr == S_OK, "Failed, hr 0x%08lx\n", hr); ok(str3 != NULL, "Expected value got NULL\n"); todo_wine ok(!wcscmp(str3, L"MSDASQL.1"), "wrong string %s\n", wine_dbgstr_w(str3)); SysFreeString(str3); @@ -1168,44 +1168,44 @@ if (0) /* Crashes on windows */ if (0) /* Crashes on windows */ { hr = _Connection_get_ConnectionString(connection, NULL); - ok(hr == E_POINTER, "Failed, hr 0x%08x\n", hr); + ok(hr == E_POINTER, "Failed, hr 0x%08lx\n", hr); } str2 = NULL; hr = _Connection_get_ConnectionString(connection, &str2); - ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(hr == S_OK, "Failed, hr 0x%08lx\n", hr); ok(!wcscmp(str, str2), "wrong string %s\n", wine_dbgstr_w(str2)); hr = _Connection_Open(connection, NULL, NULL, NULL, 0); - ok(hr == E_FAIL, "Failed, hr 0x%08x\n", hr); + ok(hr == E_FAIL, "Failed, hr 0x%08lx\n", hr); /* Open adds trailing ; if it's missing */ str3 = SysAllocString(L"Provider=MSDASQL.1;Persist Security Info=False;Data Source=wine_test;"); hr = _Connection_Open(connection, NULL, NULL, NULL, adConnectUnspecified); - ok(hr == E_FAIL, "Failed, hr 0x%08x\n", hr); + ok(hr == E_FAIL, "Failed, hr 0x%08lx\n", hr); str2 = NULL; hr = _Connection_get_ConnectionString(connection, &str2); - ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(hr == S_OK, "Failed, hr 0x%08lx\n", hr); todo_wine ok(!wcscmp(str3, str2) || broken(!wcscmp(str, str2)) /* XP */, "wrong string %s\n", wine_dbgstr_w(str2)); hr = _Connection_Open(connection, str, NULL, NULL, adConnectUnspecified); - ok(hr == E_FAIL, "Failed, hr 0x%08x\n", hr); + ok(hr == E_FAIL, "Failed, hr 0x%08lx\n", hr); SysFreeString(str); str2 = NULL; hr = _Connection_get_ConnectionString(connection, &str2); - ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(hr == S_OK, "Failed, hr 0x%08lx\n", hr); todo_wine ok(!wcscmp(str3, str2) || broken(!wcscmp(str, str2)) /* XP */, "wrong string %s\n", wine_dbgstr_w(str2)); SysFreeString(str2); SysFreeString(str3); hr = _Connection_put_ConnectionString(connection, NULL); - ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(hr == S_OK, "Failed, hr 0x%08lx\n", hr); str = (BSTR)0xdeadbeef; hr = _Connection_get_ConnectionString(connection, &str); - ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(hr == S_OK, "Failed, hr 0x%08lx\n", hr); ok(str == NULL, "got %p\n", str); _Connection_Release(connection); } @@ -1222,64 +1222,64 @@ static void test_Command(void) _Connection *connection; hr = CoCreateInstance( &CLSID_Command, NULL, CLSCTX_INPROC_SERVER, &IID__Command, (void **)&command ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); hr = _Command_QueryInterface( command, &IID__ADO, (void **)&ado ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); _ADO_Release( ado ); hr = _Command_QueryInterface( command, &IID_Command15, (void **)&command15 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); Command15_Release( command15 ); hr = _Command_QueryInterface( command, &IID_Command25, (void **)&command25 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); Command25_Release( command25 ); hr = _Command_get_CommandType( command, &cmd_type ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( cmd_type == adCmdUnknown, "got %08x\n", cmd_type ); _Command_put_CommandType( command, adCmdText ); hr = _Command_get_CommandType( command, &cmd_type ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( cmd_type == adCmdText, "got %08x\n", cmd_type ); hr = _Command_put_CommandType( command, 0xdeadbeef ); - ok( hr == MAKE_ADO_HRESULT( adErrInvalidArgument ), "got %08x\n", hr ); + ok( hr == MAKE_ADO_HRESULT( adErrInvalidArgument ), "got %08lx\n", hr ); hr = _Command_get_CommandText( command, &cmd_text ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( !cmd_text, "got %s\n", wine_dbgstr_w( cmd_text )); hr = _Command_put_CommandText( command, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); cmd_text = SysAllocString( L"" ); hr = _Command_put_CommandText( command, cmd_text ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); SysFreeString( cmd_text ); hr = _Command_get_CommandText( command, &cmd_text ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( cmd_text && !*cmd_text, "got %p\n", cmd_text ); cmd_text = SysAllocString( L"test" ); hr = _Command_put_CommandText( command, cmd_text ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); SysFreeString( cmd_text ); hr = _Command_get_CommandText( command, &cmd_text ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( !wcscmp( L"test", cmd_text ), "got %p\n", wine_dbgstr_w( cmd_text ) ); connection = (_Connection*)0xdeadbeef; hr = _Command_get_ActiveConnection( command, &connection ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( connection == NULL, "got %p\n", connection ); hr = _Command_putref_ActiveConnection( command, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); _Command_Release( command ); } @@ -1435,64 +1435,64 @@ static void test_ConnectionPoint(void) &IID_IConnectionPointContainer, (void**)&pointcontainer ); hr = IConnectionPointContainer_FindConnectionPoint( pointcontainer, &DIID_ConnectionEvents, NULL ); - ok( hr == E_POINTER, "got %08x\n", hr ); + ok( hr == E_POINTER, "got %08lx\n", hr ); hr = IConnectionPointContainer_FindConnectionPoint( pointcontainer, &DIID_RecordsetEvents, &point ); - ok( hr == CONNECT_E_NOCONNECTION, "got %08x\n", hr ); + ok( hr == CONNECT_E_NOCONNECTION, "got %08lx\n", hr ); hr = IConnectionPointContainer_FindConnectionPoint( pointcontainer, &DIID_ConnectionEvents, &point ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); /* nothing advised yet */ hr = IConnectionPoint_Unadvise( point, 3 ); - ok( hr == E_FAIL, "got %08x\n", hr ); + ok( hr == E_FAIL, "got %08lx\n", hr ); hr = IConnectionPoint_Advise( point, NULL, NULL ); - ok( hr == E_FAIL, "got %08x\n", hr ); + ok( hr == E_FAIL, "got %08lx\n", hr ); hr = IConnectionPoint_Advise( point, (void*)&conn_event.conn_event_sink, NULL ); - ok( hr == E_FAIL, "got %08x\n", hr ); + ok( hr == E_FAIL, "got %08lx\n", hr ); cookie = 0xdeadbeef; hr = IConnectionPoint_Advise( point, NULL, &cookie ); - ok( hr == E_FAIL, "got %08x\n", hr ); - ok( cookie == 0xdeadbeef, "got %08x\n", cookie ); + ok( hr == E_FAIL, "got %08lx\n", hr ); + ok( cookie == 0xdeadbeef, "got %08lx\n", cookie ); /* unsupported sink */ cookie = 0xdeadbeef; hr = IConnectionPoint_Advise( point, (void*)&support_err_sink, &cookie ); - ok( hr == E_FAIL, "got %08x\n", hr ); - ok( !cookie, "got %08x\n", cookie ); + ok( hr == E_FAIL, "got %08lx\n", hr ); + ok( !cookie, "got %08lx\n", cookie ); cookie = 0; hr = IConnectionPoint_Advise( point, (void*)&conn_event.conn_event_sink, &cookie ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( cookie, "got %08x\n", cookie ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( cookie, "got %08lx\n", cookie ); /* invalid cookie */ hr = IConnectionPoint_Unadvise( point, 0 ); - ok( hr == E_FAIL, "got %08x\n", hr ); + ok( hr == E_FAIL, "got %08lx\n", hr ); /* wrong cookie */ hr = IConnectionPoint_Unadvise( point, cookie + 1 ); - ok( hr == E_FAIL, "got %08x\n", hr ); + ok( hr == E_FAIL, "got %08lx\n", hr ); hr = IConnectionPoint_Unadvise( point, cookie ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); /* sinks are released when the connection is destroyed */ cookie = 0; hr = IConnectionPoint_Advise( point, (void*)&conn_event.conn_event_sink, &cookie ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( cookie, "got %08x\n", cookie ); - ok( conn_event.refs == 1, "got %d\n", conn_event.refs ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( cookie, "got %08lx\n", cookie ); + ok( conn_event.refs == 1, "got %ld\n", conn_event.refs ); refs = IConnectionPoint_Release( point ); - ok( refs == 1, "got %u", refs ); + ok( refs == 1, "got %lu", refs ); IConnectionPointContainer_Release( pointcontainer ); - ok( !conn_event.refs, "got %d\n", conn_event.refs ); + ok( !conn_event.refs, "got %ld\n", conn_event.refs ); } START_TEST(msado15)
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msasn1/tests/Makefile.in | 1 dlls/msasn1/tests/asn1.c | 190 +++++++++++++++++++++-------------------- 2 files changed, 95 insertions(+), 96 deletions(-) diff --git a/dlls/msasn1/tests/Makefile.in b/dlls/msasn1/tests/Makefile.in index bbab55b525b..395ef933c0d 100644 --- a/dlls/msasn1/tests/Makefile.in +++ b/dlls/msasn1/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msasn1.dll IMPORTS = msasn1 diff --git a/dlls/msasn1/tests/asn1.c b/dlls/msasn1/tests/asn1.c index 6bd95352edf..798a4a3727e 100644 --- a/dlls/msasn1/tests/asn1.c +++ b/dlls/msasn1/tests/asn1.c @@ -47,10 +47,10 @@ static void test_CreateModule(void) mod = ASN1_CreateModule(0, 0, 0, 0, encfn, decfn, freefn, size, 0); ok(!!mod, "Failed to create module.\n"); - ok(mod->nModuleName==0, "Got Module name = %d.\n",mod->nModuleName); + ok(mod->nModuleName==0, "Got Module name = %ld.\n",mod->nModuleName); ok(mod->eRule==0, "Got eRule = %08x.\n",mod->eRule); - ok(mod->dwFlags==0, "Got Flags = %08x.\n",mod->dwFlags); - ok(mod->cPDUs==0, "Got PDUs = %08x.\n",mod->cPDUs); + ok(mod->dwFlags==0, "Got Flags = %08lx.\n",mod->dwFlags); + ok(mod->cPDUs==0, "Got PDUs = %08lx.\n",mod->cPDUs); ok(mod->apfnFreeMemory==freefn, "Free function = %p.\n",mod->apfnFreeMemory); ok(mod->acbStructSize==size, "Struct size = %p.\n",mod->acbStructSize); ok(!mod->PER.apfnEncoder, "Encoder function should not be set.\n"); @@ -59,10 +59,10 @@ static void test_CreateModule(void) mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_BER_RULE_DER, ASN1FLAGS_NOASSERT, 1, encfn, decfn, freefn, size, name); ok(!!mod, "Failed to create module.\n"); - ok(mod->nModuleName==name, "Got Module name = %d.\n",mod->nModuleName); + ok(mod->nModuleName==name, "Got Module name = %ld.\n",mod->nModuleName); ok(mod->eRule==ASN1_BER_RULE_DER, "Got eRule = %08x.\n",mod->eRule); - ok(mod->cPDUs==1, "Got PDUs = %08x.\n",mod->cPDUs); - ok(mod->dwFlags==ASN1FLAGS_NOASSERT, "Got Flags = %08x.\n",mod->dwFlags); + ok(mod->cPDUs==1, "Got PDUs = %08lx.\n",mod->cPDUs); + ok(mod->dwFlags==ASN1FLAGS_NOASSERT, "Got Flags = %08lx.\n",mod->dwFlags); ok(mod->apfnFreeMemory==freefn, "Free function = %p.\n",mod->apfnFreeMemory); ok(mod->acbStructSize==size, "Struct size = %p.\n",mod->acbStructSize); ok(mod->BER.apfnEncoder==(ASN1BerEncFun_t *)encfn, "Encoder function = %p.\n",mod->BER.apfnEncoder); @@ -71,10 +71,10 @@ static void test_CreateModule(void) mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_PER_RULE_ALIGNED, ASN1FLAGS_NOASSERT, 1, encfn, decfn, freefn, size, name); ok(!!mod, "Failed to create module.\n"); - ok(mod->nModuleName==name, "Got Module name = %d.\n",mod->nModuleName); + ok(mod->nModuleName==name, "Got Module name = %ld.\n",mod->nModuleName); ok(mod->eRule==ASN1_PER_RULE_ALIGNED, "Got eRule = %08x.\n",mod->eRule); - ok(mod->cPDUs==1, "Got PDUs = %08x.\n",mod->cPDUs); - ok(mod->dwFlags==ASN1FLAGS_NOASSERT, "Got Flags = %08x.\n",mod->dwFlags); + ok(mod->cPDUs==1, "Got PDUs = %08lx.\n",mod->cPDUs); + ok(mod->dwFlags==ASN1FLAGS_NOASSERT, "Got Flags = %08lx.\n",mod->dwFlags); ok(mod->apfnFreeMemory==freefn, "Free function = %p.\n",mod->apfnFreeMemory); ok(mod->acbStructSize==size, "Struct size = %p.\n",mod->acbStructSize); ok(mod->PER.apfnEncoder==(ASN1PerEncFun_t *)encfn /* WINXP & WIN2008 */ || @@ -106,79 +106,79 @@ static void test_CreateEncoder(void) ret = ASN1_CreateEncoder(mod, &encoder, NULL, 0, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); ok(!!encoder,"Encoder creation failed.\n"); - ok(encoder->magic==0x44434e45,"Got invalid magic = %08x.\n",encoder->magic); - ok(!encoder->version,"Got incorrect version = %08x.\n",encoder->version); + ok(encoder->magic==0x44434e45,"Got invalid magic = %08lx.\n",encoder->magic); + ok(!encoder->version,"Got incorrect version = %08lx.\n",encoder->version); ok(encoder->module==mod,"Got incorrect module = %p.\n",encoder->module); ok(!encoder->buf,"Got incorrect buf = %p.\n",encoder->buf); - ok(!encoder->size,"Got incorrect size = %u.\n",encoder->size); - ok(!encoder->len,"Got incorrect length = %u.\n",encoder->len); + ok(!encoder->size,"Got incorrect size = %lu.\n",encoder->size); + ok(!encoder->len,"Got incorrect length = %lu.\n",encoder->len); ok(encoder->err==ASN1_SUCCESS,"Got incorrect err = %d.\n",encoder->err); - ok(!encoder->bit,"Got incorrect bit = %u.\n",encoder->bit); + ok(!encoder->bit,"Got incorrect bit = %lu.\n",encoder->bit); ok(!encoder->pos,"Got incorrect pos = %p.\n",encoder->pos); - ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %u.\n",encoder->cbExtraHeader); + ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %lu.\n",encoder->cbExtraHeader); ok(encoder->eRule == ASN1_BER_RULE_DER,"Got incorrect eRule = %08x.\n",encoder->eRule); - ok(encoder->dwFlags == ASN1ENCODE_NOASSERT,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ok(encoder->dwFlags == ASN1ENCODE_NOASSERT,"Got incorrect dwFlags = %08lx.\n",encoder->dwFlags); ASN1_CloseEncoder(encoder); ret = ASN1_CreateEncoder(mod, &encoder, buf, 0, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); ok(!!encoder,"Encoder creation failed.\n"); - ok(encoder->magic==0x44434e45,"Got invalid magic = %08x.\n",encoder->magic); - ok(!encoder->version,"Got incorrect version = %08x.\n",encoder->version); + ok(encoder->magic==0x44434e45,"Got invalid magic = %08lx.\n",encoder->magic); + ok(!encoder->version,"Got incorrect version = %08lx.\n",encoder->version); ok(encoder->module==mod,"Got incorrect module = %p.\n",encoder->module); ok(!encoder->buf,"Got incorrect buf = %p.\n",encoder->buf); - ok(!encoder->size,"Got incorrect size = %u.\n",encoder->size); - ok(!encoder->len,"Got incorrect length = %u.\n",encoder->len); + ok(!encoder->size,"Got incorrect size = %lu.\n",encoder->size); + ok(!encoder->len,"Got incorrect length = %lu.\n",encoder->len); ok(encoder->err==ASN1_SUCCESS,"Got incorrect err = %d.\n",encoder->err); - ok(!encoder->bit,"Got incorrect bit = %u.\n",encoder->bit); + ok(!encoder->bit,"Got incorrect bit = %lu.\n",encoder->bit); ok(!encoder->pos,"Got incorrect pos = %p.\n",encoder->pos); - ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %u.\n",encoder->cbExtraHeader); + ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %lu.\n",encoder->cbExtraHeader); ok(encoder->eRule == ASN1_BER_RULE_DER,"Got incorrect eRule = %08x.\n",encoder->eRule); - ok(encoder->dwFlags == ASN1ENCODE_NOASSERT,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ok(encoder->dwFlags == ASN1ENCODE_NOASSERT,"Got incorrect dwFlags = %08lx.\n",encoder->dwFlags); ASN1_CloseEncoder(encoder); ret = ASN1_CreateEncoder(mod, &encoder, buf, 2, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); ok(!!encoder,"Encoder creation failed.\n"); - ok(encoder->magic==0x44434e45,"Got invalid magic = %08x.\n",encoder->magic); - ok(!encoder->version,"Got incorrect version = %08x.\n",encoder->version); + ok(encoder->magic==0x44434e45,"Got invalid magic = %08lx.\n",encoder->magic); + ok(!encoder->version,"Got incorrect version = %08lx.\n",encoder->version); ok(encoder->module==mod,"Got incorrect module = %p.\n",encoder->module); ok(encoder->buf==buf,"Got incorrect buf = %p.\n",encoder->buf); - ok(encoder->size==2,"Got incorrect size = %u.\n",encoder->size); - ok(!encoder->len,"Got incorrect length = %u.\n",encoder->len); + ok(encoder->size==2,"Got incorrect size = %lu.\n",encoder->size); + ok(!encoder->len,"Got incorrect length = %lu.\n",encoder->len); ok(encoder->err==ASN1_SUCCESS,"Got incorrect err = %d.\n",encoder->err); - ok(!encoder->bit,"Got incorrect bit = %u.\n",encoder->bit); + ok(!encoder->bit,"Got incorrect bit = %lu.\n",encoder->bit); ok(encoder->pos==buf,"Got incorrect pos = %p.\n",encoder->pos); - ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %u.\n",encoder->cbExtraHeader); + ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %lu.\n",encoder->cbExtraHeader); ok(encoder->eRule == ASN1_BER_RULE_DER,"Got incorrect eRule = %08x.\n",encoder->eRule); - ok(encoder->dwFlags == (ASN1ENCODE_NOASSERT|ASN1ENCODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ok(encoder->dwFlags == (ASN1ENCODE_NOASSERT|ASN1ENCODE_SETBUFFER),"Got incorrect dwFlags = %08lx.\n",encoder->dwFlags); ASN1_CloseEncoder(encoder); ret = ASN1_CreateEncoder(mod, &encoder, buf, 4, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); ok(!!encoder,"Encoder creation failed.\n"); - ok(encoder->magic==0x44434e45,"Got invalid magic = %08x.\n",encoder->magic); - ok(!encoder->version,"Got incorrect version = %08x.\n",encoder->version); + ok(encoder->magic==0x44434e45,"Got invalid magic = %08lx.\n",encoder->magic); + ok(!encoder->version,"Got incorrect version = %08lx.\n",encoder->version); ok(encoder->module==mod,"Got incorrect module = %p.\n",encoder->module); ok(encoder->buf==buf,"Got incorrect buf = %p.\n",encoder->buf); - ok(encoder->size==4,"Got incorrect size = %u.\n",encoder->size); - ok(!encoder->len,"Got incorrect length = %u.\n",encoder->len); + ok(encoder->size==4,"Got incorrect size = %lu.\n",encoder->size); + ok(!encoder->len,"Got incorrect length = %lu.\n",encoder->len); ok(encoder->err==ASN1_SUCCESS,"Got incorrect err = %d.\n",encoder->err); - ok(!encoder->bit,"Got incorrect bit = %u.\n",encoder->bit); + ok(!encoder->bit,"Got incorrect bit = %lu.\n",encoder->bit); ok(encoder->pos==buf,"Got incorrect pos = %p.\n",encoder->pos); - ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %u.\n",encoder->cbExtraHeader); + ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %lu.\n",encoder->cbExtraHeader); ok(encoder->eRule == ASN1_BER_RULE_DER,"Got incorrect rule = %08x.\n",encoder->eRule); - ok(encoder->dwFlags == (ASN1ENCODE_NOASSERT|ASN1ENCODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ok(encoder->dwFlags == (ASN1ENCODE_NOASSERT|ASN1ENCODE_SETBUFFER),"Got incorrect dwFlags = %08lx.\n",encoder->dwFlags); ASN1_CloseEncoder(encoder); ASN1_CloseModule(mod); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_BER_RULE_DER, ASN1FLAGS_NONE, 1, encfn, decfn, freefn, size, name); ret = ASN1_CreateEncoder(mod, &encoder, buf, 0, NULL); - ok(encoder->dwFlags == 0,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ok(encoder->dwFlags == 0,"Got incorrect dwFlags = %08lx.\n",encoder->dwFlags); ASN1_CloseEncoder(encoder); ret = ASN1_CreateEncoder(mod, &encoder, buf, 4, NULL); - ok(encoder->dwFlags == ASN1ENCODE_SETBUFFER,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ok(encoder->dwFlags == ASN1ENCODE_SETBUFFER,"Got incorrect dwFlags = %08lx.\n",encoder->dwFlags); ASN1_CloseEncoder(encoder); ASN1_CloseModule(mod); @@ -186,44 +186,44 @@ static void test_CreateEncoder(void) ret = ASN1_CreateEncoder(mod, &encoder, buf, 0, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); ok(!!encoder,"Encoder creation failed.\n"); - ok(encoder->magic==0x44434e45,"Got invalid magic = %08x.\n",encoder->magic); - ok(!encoder->version,"Got incorrect version = %08x.\n",encoder->version); + ok(encoder->magic==0x44434e45,"Got invalid magic = %08lx.\n",encoder->magic); + ok(!encoder->version,"Got incorrect version = %08lx.\n",encoder->version); ok(encoder->module==mod,"Got incorrect module = %p.\n",encoder->module); ok(!encoder->buf,"Got incorrect buf = %p.\n",encoder->buf); - ok(!encoder->size,"Got incorrect size = %u.\n",encoder->size); - ok(!encoder->len,"Got incorrect length = %u.\n",encoder->len); + ok(!encoder->size,"Got incorrect size = %lu.\n",encoder->size); + ok(!encoder->len,"Got incorrect length = %lu.\n",encoder->len); ok(encoder->err==ASN1_SUCCESS,"Got incorrect err = %d.\n",encoder->err); - ok(!encoder->bit,"Got incorrect bit = %u.\n",encoder->bit); + ok(!encoder->bit,"Got incorrect bit = %lu.\n",encoder->bit); ok(!encoder->pos,"Got incorrect pos = %p.\n",encoder->pos); - ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %u.\n",encoder->cbExtraHeader); + ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %lu.\n",encoder->cbExtraHeader); ok(encoder->eRule == ASN1_PER_RULE_ALIGNED,"Got incorrect eRule = %08x.\n",encoder->eRule); - ok(encoder->dwFlags == ASN1ENCODE_NOASSERT,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ok(encoder->dwFlags == ASN1ENCODE_NOASSERT,"Got incorrect dwFlags = %08lx.\n",encoder->dwFlags); ASN1_CloseEncoder(encoder); ret = ASN1_CreateEncoder(mod, &encoder, buf, 4, NULL); ok(!!encoder,"Encoder creation failed.\n"); - ok(encoder->magic==0x44434e45,"Got invalid magic = %08x.\n",encoder->magic); - ok(!encoder->version,"Got incorrect version = %08x.\n",encoder->version); + ok(encoder->magic==0x44434e45,"Got invalid magic = %08lx.\n",encoder->magic); + ok(!encoder->version,"Got incorrect version = %08lx.\n",encoder->version); ok(encoder->module==mod,"Got incorrect module = %p.\n",encoder->module); ok(encoder->buf==buf,"Got incorrect buf = %p.\n",encoder->buf); - ok(encoder->size==4,"Got incorrect size = %u.\n",encoder->size); - ok(!encoder->len,"Got incorrect length = %u.\n",encoder->len); + ok(encoder->size==4,"Got incorrect size = %lu.\n",encoder->size); + ok(!encoder->len,"Got incorrect length = %lu.\n",encoder->len); ok(encoder->err==ASN1_SUCCESS,"Got incorrect err = %d.\n",encoder->err); - ok(!encoder->bit,"Got incorrect bit = %u.\n",encoder->bit); + ok(!encoder->bit,"Got incorrect bit = %lu.\n",encoder->bit); ok(encoder->pos==buf,"Got incorrect pos = %p.\n",encoder->pos); - ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %u.\n",encoder->cbExtraHeader); + ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %lu.\n",encoder->cbExtraHeader); ok(encoder->eRule == ASN1_PER_RULE_ALIGNED,"Got incorrect rule = %08x.\n",encoder->eRule); - ok(encoder->dwFlags == (ASN1FLAGS_NOASSERT|ASN1ENCODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ok(encoder->dwFlags == (ASN1FLAGS_NOASSERT|ASN1ENCODE_SETBUFFER),"Got incorrect dwFlags = %08lx.\n",encoder->dwFlags); ASN1_CloseEncoder(encoder); ASN1_CloseModule(mod); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_PER_RULE_ALIGNED, ASN1FLAGS_NONE, 1, encfn, decfn, freefn, size, name); ret = ASN1_CreateEncoder(mod, &encoder, buf, 0, NULL); - ok(encoder->dwFlags == 0,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ok(encoder->dwFlags == 0,"Got incorrect dwFlags = %08lx.\n",encoder->dwFlags); ASN1_CloseEncoder(encoder); ret = ASN1_CreateEncoder(mod, &encoder, buf, 4, NULL); - ok(encoder->dwFlags == ASN1ENCODE_SETBUFFER,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ok(encoder->dwFlags == ASN1ENCODE_SETBUFFER,"Got incorrect dwFlags = %08lx.\n",encoder->dwFlags); ASN1_CloseEncoder(encoder); ASN1_CloseModule(mod); } @@ -250,75 +250,75 @@ static void test_CreateDecoder(void) ret = ASN1_CreateDecoder(mod, &decoder, NULL, 0, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); ok(!!decoder,"Decoder creation failed.\n"); - ok(decoder->magic==0x44434544,"Got invalid magic = %08x.\n",decoder->magic); - ok(!decoder->version,"Got incorrect version = %08x.\n",decoder->version); + ok(decoder->magic==0x44434544,"Got invalid magic = %08lx.\n",decoder->magic); + ok(!decoder->version,"Got incorrect version = %08lx.\n",decoder->version); ok(decoder->module==mod,"Got incorrect module = %p.\n",decoder->module); ok(!decoder->buf,"Got incorrect buf = %p.\n",decoder->buf); - ok(!decoder->size,"Got incorrect size = %u.\n",decoder->size); - ok(!decoder->len,"Got incorrect length = %u.\n",decoder->len); + ok(!decoder->size,"Got incorrect size = %lu.\n",decoder->size); + ok(!decoder->len,"Got incorrect length = %lu.\n",decoder->len); ok(decoder->err==ASN1_SUCCESS,"Got incorrect err = %d.\n",decoder->err); - ok(!decoder->bit,"Got incorrect bit = %u.\n",decoder->bit); + ok(!decoder->bit,"Got incorrect bit = %lu.\n",decoder->bit); ok(!decoder->pos,"Got incorrect pos = %p.\n",decoder->pos); ok(decoder->eRule == ASN1_BER_RULE_DER,"Got incorrect eRule = %08x.\n",decoder->eRule); - ok(decoder->dwFlags == ASN1DECODE_NOASSERT,"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ok(decoder->dwFlags == ASN1DECODE_NOASSERT,"Got incorrect dwFlags = %08lx.\n",decoder->dwFlags); ASN1_CloseDecoder(decoder); ret = ASN1_CreateDecoder(mod, &decoder, buf, 0, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); ok(!!decoder,"Decoder creation failed.\n"); - ok(decoder->magic==0x44434544,"Got invalid magic = %08x.\n",decoder->magic); - ok(!decoder->version,"Got incorrect version = %08x.\n",decoder->version); + ok(decoder->magic==0x44434544,"Got invalid magic = %08lx.\n",decoder->magic); + ok(!decoder->version,"Got incorrect version = %08lx.\n",decoder->version); ok(decoder->module==mod,"Got incorrect module = %p.\n",decoder->module); ok(decoder->buf==buf,"Got incorrect buf = %s.\n",decoder->buf); - ok(!decoder->size,"Got incorrect size = %u.\n",decoder->size); - ok(!decoder->len,"Got incorrect length = %u.\n",decoder->len); + ok(!decoder->size,"Got incorrect size = %lu.\n",decoder->size); + ok(!decoder->len,"Got incorrect length = %lu.\n",decoder->len); ok(decoder->err==ASN1_SUCCESS,"Got incorrect err = %d.\n",decoder->err); - ok(!decoder->bit,"Got incorrect bit = %u.\n",decoder->bit); + ok(!decoder->bit,"Got incorrect bit = %lu.\n",decoder->bit); ok(decoder->pos==buf,"Got incorrect pos = %s.\n",decoder->pos); ok(decoder->eRule == ASN1_BER_RULE_DER,"Got incorrect eRule = %08x.\n",decoder->eRule); - ok(decoder->dwFlags == (ASN1DECODE_NOASSERT|ASN1DECODE_SETBUFFER), "Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ok(decoder->dwFlags == (ASN1DECODE_NOASSERT|ASN1DECODE_SETBUFFER), "Got incorrect dwFlags = %08lx.\n",decoder->dwFlags); ASN1_CloseDecoder(decoder); ret = ASN1_CreateDecoder(mod, &decoder, buf, 2, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); ok(!!decoder,"Decoder creation failed.\n"); - ok(decoder->magic==0x44434544,"Got invalid magic = %08x.\n",decoder->magic); - ok(!decoder->version,"Got incorrect version = %08x.\n",decoder->version); + ok(decoder->magic==0x44434544,"Got invalid magic = %08lx.\n",decoder->magic); + ok(!decoder->version,"Got incorrect version = %08lx.\n",decoder->version); ok(decoder->module==mod,"Got incorrect module = %p.\n",decoder->module); ok(decoder->buf==buf,"Got incorrect buf = %p.\n",decoder->buf); - ok(decoder->size==2,"Got incorrect size = %u.\n",decoder->size); - ok(!decoder->len,"Got incorrect length = %u.\n",decoder->len); + ok(decoder->size==2,"Got incorrect size = %lu.\n",decoder->size); + ok(!decoder->len,"Got incorrect length = %lu.\n",decoder->len); ok(decoder->err==ASN1_SUCCESS,"Got incorrect err = %d.\n",decoder->err); - ok(!decoder->bit,"Got incorrect bit = %u.\n",decoder->bit); + ok(!decoder->bit,"Got incorrect bit = %lu.\n",decoder->bit); ok(decoder->pos==buf,"Got incorrect pos = %p.\n",decoder->pos); ok(decoder->eRule == ASN1_BER_RULE_DER,"Got incorrect eRule = %08x.\n",decoder->eRule); - ok(decoder->dwFlags == (ASN1DECODE_NOASSERT|ASN1DECODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ok(decoder->dwFlags == (ASN1DECODE_NOASSERT|ASN1DECODE_SETBUFFER),"Got incorrect dwFlags = %08lx.\n",decoder->dwFlags); ASN1_CloseDecoder(decoder); ret = ASN1_CreateDecoder(mod, &decoder, buf, 4, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); ok(!!decoder,"Decoder creation failed.\n"); - ok(decoder->magic==0x44434544,"Got invalid magic = %08x.\n",decoder->magic); - ok(!decoder->version,"Got incorrect version = %08x.\n",decoder->version); + ok(decoder->magic==0x44434544,"Got invalid magic = %08lx.\n",decoder->magic); + ok(!decoder->version,"Got incorrect version = %08lx.\n",decoder->version); ok(decoder->module==mod,"Got incorrect module = %p.\n",decoder->module); ok(decoder->buf==buf,"Got incorrect buf = %p.\n",decoder->buf); - ok(decoder->size==4,"Got incorrect size = %u.\n",decoder->size); - ok(!decoder->len,"Got incorrect length = %u.\n",decoder->len); + ok(decoder->size==4,"Got incorrect size = %lu.\n",decoder->size); + ok(!decoder->len,"Got incorrect length = %lu.\n",decoder->len); ok(decoder->err==ASN1_SUCCESS,"Got incorrect err = %d.\n",decoder->err); - ok(!decoder->bit,"Got incorrect bit = %u.\n",decoder->bit); + ok(!decoder->bit,"Got incorrect bit = %lu.\n",decoder->bit); ok(decoder->pos==buf,"Got incorrect pos = %p.\n",decoder->pos); ok(decoder->eRule == ASN1_BER_RULE_DER,"Got incorrect rule = %08x.\n",decoder->eRule); - ok(decoder->dwFlags == (ASN1DECODE_NOASSERT|ASN1DECODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ok(decoder->dwFlags == (ASN1DECODE_NOASSERT|ASN1DECODE_SETBUFFER),"Got incorrect dwFlags = %08lx.\n",decoder->dwFlags); ASN1_CloseDecoder(decoder); ASN1_CloseModule(mod); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_BER_RULE_DER, ASN1FLAGS_NONE, 1, encfn, decfn, freefn, size, name); ret = ASN1_CreateDecoder(mod, &decoder, buf, 0, NULL); - ok(decoder->dwFlags == ASN1DECODE_SETBUFFER,"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ok(decoder->dwFlags == ASN1DECODE_SETBUFFER,"Got incorrect dwFlags = %08lx.\n",decoder->dwFlags); ASN1_CloseDecoder(decoder); ret = ASN1_CreateDecoder(mod, &decoder, buf, 4, NULL); - ok(decoder->dwFlags == ASN1DECODE_SETBUFFER,"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ok(decoder->dwFlags == ASN1DECODE_SETBUFFER,"Got incorrect dwFlags = %08lx.\n",decoder->dwFlags); ASN1_CloseDecoder(decoder); ASN1_CloseModule(mod); @@ -326,42 +326,42 @@ static void test_CreateDecoder(void) ret = ASN1_CreateDecoder(mod, &decoder, buf, 0, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); ok(!!decoder,"Decoder creation failed.\n"); - ok(decoder->magic==0x44434544,"Got invalid magic = %08x.\n",decoder->magic); - ok(!decoder->version,"Got incorrect version = %08x.\n",decoder->version); + ok(decoder->magic==0x44434544,"Got invalid magic = %08lx.\n",decoder->magic); + ok(!decoder->version,"Got incorrect version = %08lx.\n",decoder->version); ok(decoder->module==mod,"Got incorrect module = %p.\n",decoder->module); ok(decoder->buf==buf,"Got incorrect buf = %s.\n",decoder->buf); - ok(!decoder->size,"Got incorrect size = %u.\n",decoder->size); - ok(!decoder->len,"Got incorrect length = %u.\n",decoder->len); + ok(!decoder->size,"Got incorrect size = %lu.\n",decoder->size); + ok(!decoder->len,"Got incorrect length = %lu.\n",decoder->len); ok(decoder->err==ASN1_SUCCESS,"Got incorrect err = %d.\n",decoder->err); - ok(!decoder->bit,"Got incorrect bit = %u.\n",decoder->bit); + ok(!decoder->bit,"Got incorrect bit = %lu.\n",decoder->bit); ok(decoder->pos==buf,"Got incorrect pos = %s.\n",decoder->pos); ok(decoder->eRule == ASN1_PER_RULE_ALIGNED,"Got incorrect eRule = %08x.\n",decoder->eRule); - ok(decoder->dwFlags == (ASN1DECODE_NOASSERT|ASN1DECODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ok(decoder->dwFlags == (ASN1DECODE_NOASSERT|ASN1DECODE_SETBUFFER),"Got incorrect dwFlags = %08lx.\n",decoder->dwFlags); ASN1_CloseDecoder(decoder); ret = ASN1_CreateDecoder(mod, &decoder, buf, 4, NULL); ok(!!decoder,"Decoder creation failed.\n"); - ok(decoder->magic==0x44434544,"Got invalid magic = %08x.\n",decoder->magic); - ok(!decoder->version,"Got incorrect version = %08x.\n",decoder->version); + ok(decoder->magic==0x44434544,"Got invalid magic = %08lx.\n",decoder->magic); + ok(!decoder->version,"Got incorrect version = %08lx.\n",decoder->version); ok(decoder->module==mod,"Got incorrect module = %p.\n",decoder->module); ok(decoder->buf==buf,"Got incorrect buf = %p.\n",decoder->buf); - ok(decoder->size==4,"Got incorrect size = %u.\n",decoder->size); - ok(!decoder->len,"Got incorrect length = %u.\n",decoder->len); + ok(decoder->size==4,"Got incorrect size = %lu.\n",decoder->size); + ok(!decoder->len,"Got incorrect length = %lu.\n",decoder->len); ok(decoder->err==ASN1_SUCCESS,"Got incorrect err = %d.\n",decoder->err); - ok(!decoder->bit,"Got incorrect bit = %u.\n",decoder->bit); + ok(!decoder->bit,"Got incorrect bit = %lu.\n",decoder->bit); ok(decoder->pos==buf,"Got incorrect pos = %p.\n",decoder->pos); ok(decoder->eRule == ASN1_PER_RULE_ALIGNED,"Got incorrect rule = %08x.\n",decoder->eRule); - ok(decoder->dwFlags == (ASN1FLAGS_NOASSERT|ASN1DECODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ok(decoder->dwFlags == (ASN1FLAGS_NOASSERT|ASN1DECODE_SETBUFFER),"Got incorrect dwFlags = %08lx.\n",decoder->dwFlags); ASN1_CloseDecoder(decoder); ASN1_CloseModule(mod); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_PER_RULE_ALIGNED, ASN1FLAGS_NONE, 1, encfn, decfn, freefn, size, name); ret = ASN1_CreateDecoder(mod, &decoder, buf, 0, NULL); - ok(decoder->dwFlags == ASN1DECODE_SETBUFFER,"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ok(decoder->dwFlags == ASN1DECODE_SETBUFFER,"Got incorrect dwFlags = %08lx.\n",decoder->dwFlags); ASN1_CloseDecoder(decoder); ret = ASN1_CreateDecoder(mod, &decoder, buf, 4, NULL); - ok(decoder->dwFlags == ASN1DECODE_SETBUFFER,"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ok(decoder->dwFlags == ASN1DECODE_SETBUFFER,"Got incorrect dwFlags = %08lx.\n",decoder->dwFlags); ASN1_CloseDecoder(decoder); ASN1_CloseModule(mod); }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mscoree/tests/Makefile.in | 1 dlls/mscoree/tests/comtest.c | 44 +++++------ dlls/mscoree/tests/debugging.c | 26 +++--- dlls/mscoree/tests/metahost.c | 46 ++++++----- dlls/mscoree/tests/mscoree.c | 162 ++++++++++++++++++++-------------------- 5 files changed, 139 insertions(+), 140 deletions(-) diff --git a/dlls/mscoree/tests/Makefile.in b/dlls/mscoree/tests/Makefile.in index cb4ef4421b2..7dcd5b64113 100644 --- a/dlls/mscoree/tests/Makefile.in +++ b/dlls/mscoree/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mscoree.dll IMPORTS = ole32 shlwapi uuid shell32 advapi32 diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c index f6dc93c1070..aa23032f18f 100644 --- a/dlls/mscoree/tests/comtest.c +++ b/dlls/mscoree/tests/comtest.c @@ -92,7 +92,7 @@ static BOOL compile_cs_to_dll(char *source_path, char *dest_path) si.cb = sizeof(si); ret = CreateProcessA(path_csc, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); - ok(ret, "Could not create process: %u\n", GetLastError()); + ok(ret, "Could not create process: %lu\n", GetLastError()); WaitForSingleObject(pi.hProcess, 5000); CloseHandle(pi.hThread); @@ -117,13 +117,13 @@ static void run_test(BOOL expect_success) hr = CoCreateInstance(&CLSID_Test, NULL, CLSCTX_INPROC_SERVER, &IID_ITest, (void**)&test); todo_wine_if(!expect_success) - ok(hr == result_expected, "Expected %x, got %x\n", result_expected, hr); + ok(hr == result_expected, "Expected %lx, got %lx\n", result_expected, hr); if (hr == S_OK) { int i = 0; hr = ITest_Func(test, &i); - ok(hr == S_OK, "Got %x\n", hr); + ok(hr == S_OK, "Got %lx\n", hr); ok(i == 42, "Expected 42, got %d\n", i); ITest_Release(test); } @@ -131,20 +131,20 @@ static void run_test(BOOL expect_success) getClassObject = (_DllGetClassObject)GetProcAddress(hmscoree, "DllGetClassObject"); hr = getClassObject(&CLSID_Test, &IID_IClassFactory, (void **)&classFactory); todo_wine_if(!expect_success) - ok(hr == result_expected, "Expected %x, got %x\n", result_expected, hr); + ok(hr == result_expected, "Expected %lx, got %lx\n", result_expected, hr); if (hr == S_OK) { ITest *test2 = NULL; hr = IClassFactory_CreateInstance(classFactory, NULL, &IID_ITest, (void **)&test2); todo_wine_if(!expect_success) - ok(hr == S_OK, "Got %x\n", hr); + ok(hr == S_OK, "Got %lx\n", hr); if (hr == S_OK) { int i = 0; hr = ITest_Func(test2, &i); - ok(hr == S_OK, "Got %x\n", hr); + ok(hr == S_OK, "Got %lx\n", hr); ok(i == 42, "Expected 42, got %d\n", i); ITest_Release(test2); } @@ -174,28 +174,28 @@ static void run_registry_test(run_type run) RegCloseKey(hkey); return; } - ok(ret == ERROR_SUCCESS, "RegCreateKeyA returned %x\n", ret); + ok(ret == ERROR_SUCCESS, "RegCreateKeyA returned %lx\n", ret); ret = RegSetKeyValueA(hkey, "InprocServer32", NULL, REG_SZ, "mscoree.dll", 11); - ok(ret == ERROR_SUCCESS, "RegSetKeyValueA returned %x\n", ret); + ok(ret == ERROR_SUCCESS, "RegSetKeyValueA returned %lx\n", ret); ret = RegSetKeyValueA(hkey, "InprocServer32", "Assembly", REG_SZ, "comtest, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", 74); - ok(ret == ERROR_SUCCESS, "RegSetKeyValueA returned %x\n", ret); + ok(ret == ERROR_SUCCESS, "RegSetKeyValueA returned %lx\n", ret); ret = RegSetKeyValueA(hkey, "InprocServer32", "Class", REG_SZ, "DLL.Test", 8); - ok(ret == ERROR_SUCCESS, "RegSetKeyValueA returned %x\n", ret); + ok(ret == ERROR_SUCCESS, "RegSetKeyValueA returned %lx\n", ret); ret = RegSetKeyValueA(hkey, "InprocServer32", "CodeBase", REG_SZ, "file:///U:/invalid/path/to/comtest.dll", 41); - ok(ret == ERROR_SUCCESS, "RegSetKeyValueA returned %x\n", ret); + ok(ret == ERROR_SUCCESS, "RegSetKeyValueA returned %lx\n", ret); hr = CoCreateInstance(&CLSID_Test, NULL, CLSCTX_INPROC_SERVER, &IID_ITest, (void**)&test); todo_wine_if(result_expected != S_OK) - ok(hr == result_expected, "Expected %x, got %x\n", result_expected, hr); + ok(hr == result_expected, "Expected %lx, got %lx\n", result_expected, hr); if (hr == S_OK) { hr = ITest_Func(test, &i); - ok(hr == S_OK, "Got %x\n", hr); + ok(hr == S_OK, "Got %lx\n", hr); ok(i == 42, "Expected 42, got %d\n", i); hr = ITest_QueryInterface(test, &IID_ITest2, (void**)&unk); - ok(hr == S_OK, "ITest_QueryInterface returned %x\n", hr); + ok(hr == S_OK, "ITest_QueryInterface returned %lx\n", hr); if (hr == S_OK) IUnknown_Release(unk); ITest_Release(test); } @@ -290,7 +290,7 @@ static void prepare_and_run_test(const char *dll_source, run_type run) context.dwFlags = ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID; handle_context = CreateActCtxA(&context); - ok(handle_context != NULL && handle_context != INVALID_HANDLE_VALUE, "run: %d, CreateActCtxA failed: %d\n", run, GetLastError()); + ok(handle_context != NULL && handle_context != INVALID_HANDLE_VALUE, "run: %d, CreateActCtxA failed: %ld\n", run, GetLastError()); if (handle_context == NULL || handle_context == INVALID_HANDLE_VALUE) { @@ -299,7 +299,7 @@ static void prepare_and_run_test(const char *dll_source, run_type run) } success = ActivateActCtx(handle_context, &cookie); - ok(success, "run: %d, ActivateActCtx failed: %d\n", run, GetLastError()); + ok(success, "run: %d, ActivateActCtx failed: %ld\n", run, GetLastError()); if (run == run_type_current_working_directory) SetCurrentDirectoryA(path_tmp); @@ -311,23 +311,23 @@ cleanup: if (handle_context != NULL && handle_context != INVALID_HANDLE_VALUE) { success = DeactivateActCtx(0, cookie); - ok(success, "run: %d, DeactivateActCtx failed: %d\n", run, GetLastError()); + ok(success, "run: %d, DeactivateActCtx failed: %ld\n", run, GetLastError()); ReleaseActCtx(handle_context); } if (*path_manifest_exe) { success = DeleteFileA(path_manifest_exe); - ok(success, "run: %d, DeleteFileA failed: %d\n", run, GetLastError()); + ok(success, "run: %d, DeleteFileA failed: %ld\n", run, GetLastError()); } if(*path_manifest_dll) { success = DeleteFileA(path_manifest_dll); - ok(success, "run: %d, DeleteFileA failed: %d\n", run, GetLastError()); + ok(success, "run: %d, DeleteFileA failed: %ld\n", run, GetLastError()); } if(*path_dll_source) { success = DeleteFileA(path_dll_source); - ok(success, "run: %d, DeleteFileA failed: %d\n", run, GetLastError()); + ok(success, "run: %d, DeleteFileA failed: %ld\n", run, GetLastError()); } RemoveDirectoryA(path_tmp_manifest); /* dll cleanup is handled by the parent, because it might still be used by the child */ @@ -350,7 +350,7 @@ static void cleanup_test(run_type run) Sleep(500); success = DeleteFileA(path_dll); } - ok(success, "DeleteFileA failed: %d\n", GetLastError()); + ok(success, "DeleteFileA failed: %ld\n", GetLastError()); } static void run_child_process(const char *dll_source, run_type run) @@ -372,7 +372,7 @@ static void run_child_process(const char *dll_source, run_type run) si.cb = sizeof(si); ret = CreateProcessA(exe, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); - ok(ret, "Could not create process: %u\n", GetLastError()); + ok(ret, "Could not create process: %lu\n", GetLastError()); wait_child_process(pi.hProcess); diff --git a/dlls/mscoree/tests/debugging.c b/dlls/mscoree/tests/debugging.c index 251579396a9..5c17c27712c 100644 --- a/dlls/mscoree/tests/debugging.c +++ b/dlls/mscoree/tests/debugging.c @@ -410,17 +410,17 @@ static void _check_process_enum(unsigned line, ICorDebug *pCorDebug, ULONG nExpe ICorDebugProcessEnum *pProcessEnum = NULL; hr = ICorDebug_EnumerateProcesses(pCorDebug, NULL); - ok_(__FILE__,line) (hr == E_INVALIDARG, "expected E_INVALIDARG got %08x\n", hr); + ok_(__FILE__,line) (hr == E_INVALIDARG, "expected E_INVALIDARG got %08lx\n", hr); hr = ICorDebug_EnumerateProcesses(pCorDebug, &pProcessEnum); - ok_(__FILE__,line) (hr == S_OK, "expected S_OK got %08x\n", hr); + ok_(__FILE__,line) (hr == S_OK, "expected S_OK got %08lx\n", hr); if(hr == S_OK) { ULONG cnt; hr = ICorDebugProcessEnum_GetCount(pProcessEnum, &cnt); - ok_(__FILE__,line) (hr == S_OK, "expected S_OK got %08x\n", hr); - ok_(__FILE__,line) (cnt == nExpected, "expected %d got %d\n", nExpected, cnt); + ok_(__FILE__,line) (hr == S_OK, "expected S_OK got %08lx\n", hr); + ok_(__FILE__,line) (cnt == nExpected, "expected %ld got %ld\n", nExpected, cnt); ICorDebugProcessEnum_Release(pProcessEnum); } @@ -433,36 +433,36 @@ static void test_createDebugger(void) ICorDebug *pCorDebug; hr = pCreateDebuggingInterfaceFromVersion(0, v2_0, &pUnk); - ok(hr == E_INVALIDARG, "CreateDebuggingInterfaceFromVersion returned %08x\n", hr); + ok(hr == E_INVALIDARG, "CreateDebuggingInterfaceFromVersion returned %08lx\n", hr); hr = pCreateDebuggingInterfaceFromVersion(1, v2_0, &pUnk); - ok(hr == E_INVALIDARG, "CreateDebuggingInterfaceFromVersion returned %08x\n", hr); + ok(hr == E_INVALIDARG, "CreateDebuggingInterfaceFromVersion returned %08lx\n", hr); hr = pCreateDebuggingInterfaceFromVersion(2, v2_0, &pUnk); - ok(hr == E_INVALIDARG, "CreateDebuggingInterfaceFromVersion returned %08x\n", hr); + ok(hr == E_INVALIDARG, "CreateDebuggingInterfaceFromVersion returned %08lx\n", hr); hr = pCreateDebuggingInterfaceFromVersion(4, v2_0, &pUnk); - ok(hr == E_INVALIDARG, "CreateDebuggingInterfaceFromVersion returned %08x\n", hr); + ok(hr == E_INVALIDARG, "CreateDebuggingInterfaceFromVersion returned %08lx\n", hr); hr = pCreateDebuggingInterfaceFromVersion(3, v2_0, NULL); - ok(hr == E_INVALIDARG, "CreateDebuggingInterfaceFromVersion returned %08x\n", hr); + ok(hr == E_INVALIDARG, "CreateDebuggingInterfaceFromVersion returned %08lx\n", hr); hr = pCreateDebuggingInterfaceFromVersion(3, v2_0, &pUnk); if(hr == S_OK) { hr = IUnknown_QueryInterface(pUnk, &IID_ICorDebug, (void**)&pCorDebug); - ok(hr == S_OK, "expected S_OK got %08x\n", hr); + ok(hr == S_OK, "expected S_OK got %08lx\n", hr); if(hr == S_OK) { hr = ICorDebug_Initialize(pCorDebug); - ok(hr == S_OK, "expected S_OK got %08x\n", hr); + ok(hr == S_OK, "expected S_OK got %08lx\n", hr); if(hr == S_OK) { hr = ICorDebug_SetManagedHandler(pCorDebug, NULL); - ok(hr == E_INVALIDARG, "expected E_INVALIDARG got %08x\n", hr); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG got %08lx\n", hr); hr = ICorDebug_SetManagedHandler(pCorDebug, &ManagedCallback); - ok(hr == S_OK, "expected S_OK got %08x\n", hr); + ok(hr == S_OK, "expected S_OK got %08lx\n", hr); /* We should have no processes */ check_process_enum(pCorDebug, 0); diff --git a/dlls/mscoree/tests/metahost.c b/dlls/mscoree/tests/metahost.c index b6b0608e9d4..1c96f8c4fb0 100644 --- a/dlls/mscoree/tests/metahost.c +++ b/dlls/mscoree/tests/metahost.c @@ -84,16 +84,16 @@ static void test_getruntime(WCHAR *version) WCHAR buf[MAX_PATH]; hr = ICLRMetaHost_GetRuntime(metahost, NULL, &IID_ICLRRuntimeInfo, (void**)&info); - ok(hr == E_POINTER, "GetVersion failed, hr=%x\n", hr); + ok(hr == E_POINTER, "GetVersion failed, hr=%lx\n", hr); hr = ICLRMetaHost_GetRuntime(metahost, version, &IID_ICLRRuntimeInfo, (void**)&info); - ok(hr == S_OK, "GetVersion failed, hr=%x\n", hr); + ok(hr == S_OK, "GetVersion failed, hr=%lx\n", hr); if (hr != S_OK) return; count = MAX_PATH; hr = ICLRRuntimeInfo_GetVersionString(info, buf, &count); - ok(hr == S_OK, "GetVersionString returned %x\n", hr); - ok(count == lstrlenW(buf)+1, "GetVersionString returned count %u but string of length %u\n", count, lstrlenW(buf)+1); + ok(hr == S_OK, "GetVersionString returned %lx\n", hr); + ok(count == lstrlenW(buf)+1, "GetVersionString returned count %lu but string of length %u\n", count, lstrlenW(buf)+1); ok(lstrcmpW(buf, version) == 0, "got unexpected version %s\n", wine_dbgstr_w(buf)); ICLRRuntimeInfo_Release(info); @@ -102,7 +102,7 @@ static void test_getruntime(WCHAR *version) dot = wcsrchr(version, '.'); lstrcpyW(dot, dotzero); hr = ICLRMetaHost_GetRuntime(metahost, version, &IID_ICLRRuntimeInfo, (void**)&info); - ok(hr == CLR_E_SHIM_RUNTIME, "GetVersion failed, hr=%x\n", hr); + ok(hr == CLR_E_SHIM_RUNTIME, "GetVersion failed, hr=%lx\n", hr); } static void test_enumruntimes(void) @@ -115,28 +115,28 @@ static void test_enumruntimes(void) WCHAR buf[MAX_PATH]; hr = ICLRMetaHost_EnumerateInstalledRuntimes(metahost, &runtime_enum); - ok(hr == S_OK, "EnumerateInstalledRuntimes returned %x\n", hr); + ok(hr == S_OK, "EnumerateInstalledRuntimes returned %lx\n", hr); if (FAILED(hr)) return; while ((hr = IEnumUnknown_Next(runtime_enum, 1, &unk, &count)) == S_OK) { hr = IUnknown_QueryInterface(unk, &IID_ICLRRuntimeInfo, (void**)&runtime_info); - ok(hr == S_OK, "QueryInterface returned %x\n", hr); + ok(hr == S_OK, "QueryInterface returned %lx\n", hr); count = 1; hr = ICLRRuntimeInfo_GetVersionString(runtime_info, buf, &count); - ok(hr == E_NOT_SUFFICIENT_BUFFER, "GetVersionString returned %x\n", hr); - ok(count > 1, "GetVersionString returned count %u\n", count); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "GetVersionString returned %lx\n", hr); + ok(count > 1, "GetVersionString returned count %lu\n", count); count = 0xdeadbeef; hr = ICLRRuntimeInfo_GetVersionString(runtime_info, NULL, &count); - ok(hr == S_OK, "GetVersionString returned %x\n", hr); - ok(count > 1 && count != 0xdeadbeef, "GetVersionString returned count %u\n", count); + ok(hr == S_OK, "GetVersionString returned %lx\n", hr); + ok(count > 1 && count != 0xdeadbeef, "GetVersionString returned count %lu\n", count); count = MAX_PATH; hr = ICLRRuntimeInfo_GetVersionString(runtime_info, buf, &count); - ok(hr == S_OK, "GetVersionString returned %x\n", hr); - ok(count > 1, "GetVersionString returned count %u\n", count); + ok(hr == S_OK, "GetVersionString returned %lx\n", hr); + ok(count > 1, "GetVersionString returned count %lu\n", count); trace("runtime found: %s\n", wine_dbgstr_w(buf)); @@ -146,7 +146,7 @@ static void test_enumruntimes(void) test_getruntime(buf); } - ok(hr == S_FALSE, "IEnumUnknown_Next returned %x\n", hr); + ok(hr == S_FALSE, "IEnumUnknown_Next returned %lx\n", hr); IEnumUnknown_Release(runtime_enum); } @@ -169,19 +169,19 @@ static void WINAPI notification_callback(ICLRRuntimeInfo *pRuntimeInfo, Callback if (expect_runtime_tid != 0) { ok(GetCurrentThreadId() == expect_runtime_tid, - "expected call on thread %04x, got thread %04x\n", expect_runtime_tid, GetCurrentThreadId()); + "expected call on thread %04lx, got thread %04lx\n", expect_runtime_tid, GetCurrentThreadId()); expect_runtime_tid = 0; } hr = ICLRRuntimeInfo_GetVersionString(pRuntimeInfo, buf, &buf_size); - ok(hr == S_OK, "GetVersion returned %x\n", hr); + ok(hr == S_OK, "GetVersion returned %lx\n", hr); ok(lstrcmpW(buf, v4_0) == 0, "GetVersion returned %s\n", wine_dbgstr_w(buf)); hr = pfnCallbackThreadSet(); - ok(hr == S_OK, "pfnCallbackThreadSet returned %x\n", hr); + ok(hr == S_OK, "pfnCallbackThreadSet returned %lx\n", hr); hr = pfnCallbackThreadUnset(); - ok(hr == S_OK, "pfnCallbackThreadUnset returned %x\n", hr); + ok(hr == S_OK, "pfnCallbackThreadUnset returned %lx\n", hr); } static void test_notification(void) @@ -189,13 +189,13 @@ static void test_notification(void) HRESULT hr; hr = ICLRMetaHost_RequestRuntimeLoadedNotification(metahost, NULL); - ok(hr == E_POINTER, "RequestRuntimeLoadedNotification returned %x\n", hr); + ok(hr == E_POINTER, "RequestRuntimeLoadedNotification returned %lx\n", hr); hr = ICLRMetaHost_RequestRuntimeLoadedNotification(metahost,notification_callback); - ok(hr == S_OK, "RequestRuntimeLoadedNotification failed, hr=%x\n", hr); + ok(hr == S_OK, "RequestRuntimeLoadedNotification failed, hr=%lx\n", hr); hr = ICLRMetaHost_RequestRuntimeLoadedNotification(metahost,notification_dummy_callback); - ok(hr == HOST_E_INVALIDOPERATION, "RequestRuntimeLoadedNotification returned %x\n", hr); + ok(hr == HOST_E_INVALIDOPERATION, "RequestRuntimeLoadedNotification returned %lx\n", hr); } static void test_notification_cb(void) @@ -205,12 +205,12 @@ static void test_notification_cb(void) ICLRRuntimeHost *host; hr = ICLRMetaHost_GetRuntime(metahost, v4_0, &IID_ICLRRuntimeInfo, (void**)&info); - ok(hr == S_OK, "GetRuntime returned %x\n", hr); + ok(hr == S_OK, "GetRuntime returned %lx\n", hr); expect_runtime_tid = GetCurrentThreadId(); hr = ICLRRuntimeInfo_GetInterface(info, &CLSID_CLRRuntimeHost, &IID_ICLRRuntimeHost, (void**)&host); - todo_wine_if(!has_mono) ok(hr == S_OK, "GetInterface returned %x\n", hr); + todo_wine_if(!has_mono) ok(hr == S_OK, "GetInterface returned %lx\n", hr); todo_wine if(!has_mono) ok(expect_runtime_tid == 0, "notification_callback was not called\n"); if(has_mono) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 92126339ef0..b49465fb16f 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -101,23 +101,23 @@ static int check_runtime(void) win_skip("CLRCreateInstance not implemented\n"); return 1; } - ok(SUCCEEDED(hr), "CLRCreateInstance failed, hr=%#.8x\n", hr); + ok(SUCCEEDED(hr), "CLRCreateInstance failed, hr=%#.8lx\n", hr); if (FAILED(hr)) return 1; hr = ICLRMetaHost_GetRuntime(metahost, v4_0, &IID_ICLRRuntimeInfo, (void **)&runtimeinfo); - ok(SUCCEEDED(hr), "ICLRMetaHost::GetRuntime failed, hr=%#.8x\n", hr); + ok(SUCCEEDED(hr), "ICLRMetaHost::GetRuntime failed, hr=%#.8lx\n", hr); if (FAILED(hr)) return 1; hr = ICLRRuntimeInfo_GetInterface(runtimeinfo, &CLSID_CorRuntimeHost, &IID_ICorRuntimeHost, (void **)&runtimehost); - todo_wine_if(!has_mono) ok(SUCCEEDED(hr), "ICLRRuntimeInfo::GetInterface failed, hr=%#.8x\n", hr); + todo_wine_if(!has_mono) ok(SUCCEEDED(hr), "ICLRRuntimeInfo::GetInterface failed, hr=%#.8lx\n", hr); if (FAILED(hr)) return 1; hr = ICorRuntimeHost_Start(runtimehost); - ok(SUCCEEDED(hr), "ICorRuntimeHost::Start failed, hr=%#.8x\n", hr); + ok(SUCCEEDED(hr), "ICorRuntimeHost::Start failed, hr=%#.8lx\n", hr); if (FAILED(hr)) return 1; @@ -187,7 +187,7 @@ static void test_versioninfo(void) if (0) /* crashes on <= w2k3 */ { hr = pGetCORVersion(NULL, MAX_PATH, &size); - ok(hr == E_POINTER,"GetCORVersion returned %08x\n", hr); + ok(hr == E_POINTER,"GetCORVersion returned %08lx\n", hr); } hr = pGetCORVersion(version, 1, &size); @@ -198,31 +198,31 @@ static void test_versioninfo(void) return; } - ok(hr == E_NOT_SUFFICIENT_BUFFER, "GetCORVersion returned %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "GetCORVersion returned %08lx\n", hr); hr = pGetCORVersion(version, MAX_PATH, &size); - ok(hr == S_OK,"GetCORVersion returned %08x\n", hr); + ok(hr == S_OK,"GetCORVersion returned %08lx\n", hr); trace("latest installed .net runtime: %s\n", wine_dbgstr_w(version)); hr = pGetCORSystemDirectory(path, MAX_PATH , &size); - todo_wine_if(!has_mono) ok(hr == S_OK, "GetCORSystemDirectory returned %08x\n", hr); + todo_wine_if(!has_mono) ok(hr == S_OK, "GetCORSystemDirectory returned %08lx\n", hr); /* size includes terminating null-character */ - todo_wine_if(!has_mono) ok(size == (lstrlenW(path) + 1),"size is %d instead of %d\n", size, (lstrlenW(path) + 1)); + todo_wine_if(!has_mono) ok(size == (lstrlenW(path) + 1),"size is %ld instead of %d\n", size, (lstrlenW(path) + 1)); path_len = size; hr = pGetCORSystemDirectory(path, path_len-1 , &size); - todo_wine_if(!has_mono) ok(hr == E_NOT_SUFFICIENT_BUFFER, "GetCORSystemDirectory returned %08x\n", hr); + todo_wine_if(!has_mono) ok(hr == E_NOT_SUFFICIENT_BUFFER, "GetCORSystemDirectory returned %08lx\n", hr); if (0) /* crashes on <= w2k3 */ { hr = pGetCORSystemDirectory(NULL, MAX_PATH , &size); - ok(hr == E_NOT_SUFFICIENT_BUFFER, "GetCORSystemDirectory returned %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "GetCORSystemDirectory returned %08lx\n", hr); } hr = pGetCORSystemDirectory(path, MAX_PATH , NULL); - ok(hr == E_POINTER,"GetCORSystemDirectory returned %08x\n", hr); + ok(hr == E_POINTER,"GetCORSystemDirectory returned %08lx\n", hr); trace("latest installed .net installed in directory: %s\n", wine_dbgstr_w(path)); @@ -231,43 +231,43 @@ static void test_versioninfo(void) if(hr == CLR_E_SHIM_RUNTIME) return; /* skipping rest of tests on win2k as .net 2.0 not installed */ - todo_wine_if(!has_mono) ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); + todo_wine_if(!has_mono) ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08lx\n", hr); trace(" installed in directory %s is .net version %s\n", wine_dbgstr_w(path), wine_dbgstr_w(version)); hr = pGetRequestedRuntimeInfo( NULL, v1_1, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, &size); - todo_wine_if(!has_mono) ok(hr == S_OK || hr == CLR_E_SHIM_RUNTIME /*v1_1 not installed*/, "GetRequestedRuntimeInfo returned %08x\n", hr); + todo_wine_if(!has_mono) ok(hr == S_OK || hr == CLR_E_SHIM_RUNTIME /*v1_1 not installed*/, "GetRequestedRuntimeInfo returned %08lx\n", hr); if(hr == S_OK) trace(" installed in directory %s is .net version %s\n", wine_dbgstr_w(path), wine_dbgstr_w(version)); /* version number NULL not allowed without RUNTIME_INFO_UPGRADE_VERSION flag */ hr = pGetRequestedRuntimeInfo( NULL, NULL, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, &size); - ok(hr == CLR_E_SHIM_RUNTIME, "GetRequestedRuntimeInfo returned %08x\n", hr); + ok(hr == CLR_E_SHIM_RUNTIME, "GetRequestedRuntimeInfo returned %08lx\n", hr); /* with RUNTIME_INFO_UPGRADE_VERSION flag and version number NULL, latest installed version is returned */ hr = pGetRequestedRuntimeInfo( NULL, NULL, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, &size); - todo_wine_if(!has_mono) ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); + todo_wine_if(!has_mono) ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08lx\n", hr); hr = pGetRequestedRuntimeInfo( NULL, v2_0, NULL, 0, 0, path, 1, &path_len, version, MAX_PATH, &size); - todo_wine_if(!has_mono) ok(hr == E_NOT_SUFFICIENT_BUFFER, "GetRequestedRuntimeInfo returned %08x\n", hr); + todo_wine_if(!has_mono) ok(hr == E_NOT_SUFFICIENT_BUFFER, "GetRequestedRuntimeInfo returned %08lx\n", hr); /* if one of the buffers is NULL, the other one is still happily filled */ memset(version, 0, sizeof(version)); hr = pGetRequestedRuntimeInfo( NULL, v2_0, NULL, 0, 0, NULL, MAX_PATH, &path_len, version, MAX_PATH, &size); - todo_wine_if(!has_mono) ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); + todo_wine_if(!has_mono) ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08lx\n", hr); ok(!wcscmp(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); /* With NULL-pointer for bufferlength, the buffer itself still gets filled with correct string */ memset(version, 0, sizeof(version)); hr = pGetRequestedRuntimeInfo( NULL, v2_0, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); - todo_wine_if(!has_mono) ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); + todo_wine_if(!has_mono) ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08lx\n", hr); ok(!wcscmp(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); memset(version, 0, sizeof(version)); hr = pGetRequestedRuntimeInfo( NULL, v2_0cap, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); - todo_wine_if(!has_mono) ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); + todo_wine_if(!has_mono) ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08lx\n", hr); ok(!wcscmp(version, v2_0cap), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0cap)); /* Invalid Version and RUNTIME_INFO_UPGRADE_VERSION flag*/ memset(version, 0, sizeof(version)); hr = pGetRequestedRuntimeInfo( NULL, v1_1, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); - todo_wine_if(!has_mono) ok(hr == S_OK || hr == CLR_E_SHIM_RUNTIME , "GetRequestedRuntimeInfo returned %08x\n", hr); + todo_wine_if(!has_mono) ok(hr == S_OK || hr == CLR_E_SHIM_RUNTIME , "GetRequestedRuntimeInfo returned %08lx\n", hr); if(hr == S_OK) { /* .NET 1.1 may not be installed. */ @@ -278,28 +278,28 @@ static void test_versioninfo(void) memset(version, 0, sizeof(version)); hr = pGetRequestedRuntimeInfo( NULL, v9_0, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); - ok(hr == CLR_E_SHIM_RUNTIME, "GetRequestedRuntimeInfo returned %08x\n", hr); + ok(hr == CLR_E_SHIM_RUNTIME, "GetRequestedRuntimeInfo returned %08lx\n", hr); memset(version, 0, sizeof(version)); hr = pGetRequestedRuntimeInfo( NULL, v1_1_0, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); - ok(hr == CLR_E_SHIM_RUNTIME, "GetRequestedRuntimeInfo returned %08x\n", hr); + ok(hr == CLR_E_SHIM_RUNTIME, "GetRequestedRuntimeInfo returned %08lx\n", hr); memset(version, 0, sizeof(version)); hr = pGetRequestedRuntimeInfo( NULL, v1_1_0, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); - todo_wine_if(!has_mono) ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); + todo_wine_if(!has_mono) ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08lx\n", hr); ok(!wcscmp(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); memset(version, 0, sizeof(version)); hr = pGetRequestedRuntimeInfo( NULL, v2_0_0, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); - ok(hr == CLR_E_SHIM_RUNTIME, "GetRequestedRuntimeInfo returned %08x\n", hr); + ok(hr == CLR_E_SHIM_RUNTIME, "GetRequestedRuntimeInfo returned %08lx\n", hr); memset(version, 0, sizeof(version)); hr = pGetRequestedRuntimeInfo( NULL, v2_0_0, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); - todo_wine_if(!has_mono) ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); + todo_wine_if(!has_mono) ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08lx\n", hr); ok(!wcscmp(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); hr = pCorIsLatestSvc(NULL, NULL); - ok(hr == E_POINTER, "CorIsLatestSvc returned %08x\n", hr); + ok(hr == E_POINTER, "CorIsLatestSvc returned %08lx\n", hr); } static void test_loadlibraryshim(void) @@ -324,7 +324,7 @@ static void test_loadlibraryshim(void) } hr = pLoadLibraryShim(fusion, v1_1, NULL, &hdll); - ok(hr == S_OK || hr == E_HANDLE, "LoadLibraryShim failed, hr=%x\n", hr); + ok(hr == S_OK || hr == E_HANDLE, "LoadLibraryShim failed, hr=%lx\n", hr); if (SUCCEEDED(hr)) { latest = v1_1; @@ -338,7 +338,7 @@ static void test_loadlibraryshim(void) } hr = pLoadLibraryShim(fusion, v2_0, NULL, &hdll); - ok(hr == S_OK || hr == E_HANDLE, "LoadLibraryShim failed, hr=%x\n", hr); + ok(hr == S_OK || hr == E_HANDLE, "LoadLibraryShim failed, hr=%lx\n", hr); if (SUCCEEDED(hr)) { latest = v2_0; @@ -352,7 +352,7 @@ static void test_loadlibraryshim(void) } hr = pLoadLibraryShim(fusion, v4_0, NULL, &hdll); - ok(hr == S_OK || hr == E_HANDLE, "LoadLibraryShim failed, hr=%x\n", hr); + ok(hr == S_OK || hr == E_HANDLE, "LoadLibraryShim failed, hr=%lx\n", hr); if (SUCCEEDED(hr)) { /* LoadLibraryShim with a NULL version prefers 2.0 and earlier */ @@ -368,14 +368,14 @@ static void test_loadlibraryshim(void) } hr = pLoadLibraryShim(fusion, vbogus, NULL, &hdll); - ok(hr == E_HANDLE, "LoadLibraryShim failed, hr=%x\n", hr); + ok(hr == E_HANDLE, "LoadLibraryShim failed, hr=%lx\n", hr); if (SUCCEEDED(hr)) FreeLibrary(hdll); WideCharToMultiByte(CP_ACP, 0, latest, -1, latestA, MAX_PATH, NULL, NULL); hr = pLoadLibraryShim(fusion, NULL, NULL, &hdll); - ok(hr == S_OK, "LoadLibraryShim failed, hr=%x\n", hr); + ok(hr == S_OK, "LoadLibraryShim failed, hr=%lx\n", hr); if (SUCCEEDED(hr)) { GetModuleFileNameA(hdll, dllpath, MAX_PATH); @@ -388,7 +388,7 @@ static void test_loadlibraryshim(void) } hr = pLoadLibraryShim(fusiondll, NULL, NULL, &hdll); - ok(hr == S_OK, "LoadLibraryShim failed, hr=%x\n", hr); + ok(hr == S_OK, "LoadLibraryShim failed, hr=%lx\n", hr); if (SUCCEEDED(hr)) { GetModuleFileNameA(hdll, dllpath, MAX_PATH); @@ -401,12 +401,12 @@ static void test_loadlibraryshim(void) } hr = pLoadLibraryShim(nosuchdll, latest, NULL, &hdll); - ok(hr == E_HANDLE, "LoadLibraryShim failed, hr=%x\n", hr); + ok(hr == E_HANDLE, "LoadLibraryShim failed, hr=%lx\n", hr); if (SUCCEEDED(hr)) FreeLibrary(hdll); hr = pLoadLibraryShim(gdidll, latest, NULL, &hdll); - ok(hr == E_HANDLE, "LoadLibraryShim failed, hr=%x\n", hr); + ok(hr == E_HANDLE, "LoadLibraryShim failed, hr=%lx\n", hr); if (SUCCEEDED(hr)) FreeLibrary(hdll); } @@ -451,20 +451,20 @@ static void test_createconfigstream(void) ok(hr == E_FAIL || broken(hr == HRESULT_FROM_WIN32(ERROR_PROC_NOT_FOUND)) || /* some WinXP, Win2K3 and Win7 */ broken(hr == S_OK && !stream), /* some Win2K3 */ - "CreateConfigStream returned %x\n", hr); + "CreateConfigStream returned %lx\n", hr); hr = pCreateConfigStream(path, NULL); - ok(hr == COR_E_NULLREFERENCE, "CreateConfigStream returned %x\n", hr); + ok(hr == COR_E_NULLREFERENCE, "CreateConfigStream returned %lx\n", hr); hr = pCreateConfigStream(NULL, NULL); - ok(hr == COR_E_NULLREFERENCE, "CreateConfigStream returned %x\n", hr); + ok(hr == COR_E_NULLREFERENCE, "CreateConfigStream returned %lx\n", hr); hr = pCreateConfigStream(nonexistent, &stream); - ok(hr == COR_E_FILENOTFOUND, "CreateConfigStream returned %x\n", hr); + ok(hr == COR_E_FILENOTFOUND, "CreateConfigStream returned %lx\n", hr); ok(stream == NULL, "Expected stream to be NULL\n"); hr = pCreateConfigStream(path, &stream); - ok(hr == S_OK, "CreateConfigStream failed, hr=%x\n", hr); + ok(hr == S_OK, "CreateConfigStream failed, hr=%lx\n", hr); ok(stream != NULL, "Expected non-NULL stream\n"); if (stream) @@ -476,36 +476,36 @@ static void test_createconfigstream(void) ULONG ref; hr = IStream_Read(stream, buffer, strlen(xmldata), &count); - ok(hr == S_OK, "IStream_Read failed, hr=%x\n", hr); - ok(count == strlen(xmldata), "wrong count: %u\n", count); + ok(hr == S_OK, "IStream_Read failed, hr=%lx\n", hr); + ok(count == strlen(xmldata), "wrong count: %lu\n", count); ok(!strcmp(buffer, xmldata), "Strings do not match\n"); hr = IStream_Read(stream, buffer, sizeof(buffer), &count); - ok(hr == S_OK, "IStream_Read failed, hr=%x\n", hr); - ok(!count, "wrong count: %u\n", count); + ok(hr == S_OK, "IStream_Read failed, hr=%lx\n", hr); + ok(!count, "wrong count: %lu\n", count); hr = IStream_Write(stream, xmldata, strlen(xmldata), &count); - ok(hr == E_FAIL, "IStream_Write returned hr=%x\n", hr); + ok(hr == E_FAIL, "IStream_Write returned hr=%lx\n", hr); pos.QuadPart = strlen(xmldata); hr = IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); - ok(hr == E_NOTIMPL, "IStream_Seek returned hr=%x\n", hr); + ok(hr == E_NOTIMPL, "IStream_Seek returned hr=%lx\n", hr); size.QuadPart = strlen(xmldata); hr = IStream_SetSize(stream, size); - ok(hr == E_NOTIMPL, "IStream_SetSize returned hr=%x\n", hr); + ok(hr == E_NOTIMPL, "IStream_SetSize returned hr=%lx\n", hr); hr = IStream_Clone(stream, &stream2); - ok(hr == E_NOTIMPL, "IStream_Clone returned hr=%x\n", hr); + ok(hr == E_NOTIMPL, "IStream_Clone returned hr=%lx\n", hr); hr = IStream_Commit(stream, STGC_DEFAULT); - ok(hr == E_NOTIMPL, "IStream_Commit returned hr=%x\n", hr); + ok(hr == E_NOTIMPL, "IStream_Commit returned hr=%lx\n", hr); hr = IStream_Revert(stream); - ok(hr == E_NOTIMPL, "IStream_Revert returned hr=%x\n", hr); + ok(hr == E_NOTIMPL, "IStream_Revert returned hr=%lx\n", hr); ref = IStream_Release(stream); - ok(!ref, "IStream_Release returned %u\n", ref); + ok(!ref, "IStream_Release returned %lu\n", ref); } DeleteFileW(file); } @@ -581,7 +581,7 @@ static BOOL compile_cs(const WCHAR *source, const WCHAR *target, const WCHAR *ty si.cb = sizeof(si); ret = CreateProcessW(csc, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); - ok(ret, "Could not create process: %u\n", GetLastError()); + ok(ret, "Could not create process: %lu\n", GetLastError()); wait_child_process(pi.hProcess); CloseHandle(pi.hThread); @@ -606,24 +606,24 @@ static void test_loadpaths_execute(const WCHAR *exe_name, const WCHAR *dll_name, GetTempPathW(MAX_PATH, tmp); ret = AllocateLocallyUniqueId(&id); - ok(ret, "AllocateLocallyUniqueId failed: %u\n", GetLastError()); + ok(ret, "AllocateLocallyUniqueId failed: %lu\n", GetLastError()); ret = GetTempFileNameW(tmp, L"loadpaths", id.LowPart, tmpdir); - ok(ret, "GetTempFileNameW failed: %u\n", GetLastError()); + ok(ret, "GetTempFileNameW failed: %lu\n", GetLastError()); ret = CreateDirectoryW(tmpdir, NULL); - ok(ret, "CreateDirectoryW(%s) failed: %u\n", debugstr_w(tmpdir), GetLastError()); + ok(ret, "CreateDirectoryW(%s) failed: %lu\n", debugstr_w(tmpdir), GetLastError()); wcscpy(tmpexe, tmpdir); PathAppendW(tmpexe, exe_name); ret = CopyFileW(exe_name, tmpexe, FALSE); - ok(ret, "CopyFileW(%s) failed: %u\n", debugstr_w(tmpexe), GetLastError()); + ok(ret, "CopyFileW(%s) failed: %lu\n", debugstr_w(tmpexe), GetLastError()); if (cfg_name) { wcscpy(tmpcfg, tmpdir); PathAppendW(tmpcfg, cfg_name); ret = CopyFileW(cfg_name, tmpcfg, FALSE); - ok(ret, "CopyFileW(%s) failed: %u\n", debugstr_w(tmpcfg), GetLastError()); + ok(ret, "CopyFileW(%s) failed: %lu\n", debugstr_w(tmpcfg), GetLastError()); } ptr = tmpdir + wcslen(tmpdir); @@ -632,7 +632,7 @@ static void test_loadpaths_execute(const WCHAR *exe_name, const WCHAR *dll_name, { *ptr = '\0'; ret = CreateDirectoryW(tmpdir, NULL); - ok(ret, "CreateDirectoryW(%s) failed: %u\n", debugstr_w(tmpdir), GetLastError()); + ok(ret, "CreateDirectoryW(%s) failed: %lu\n", debugstr_w(tmpdir), GetLastError()); *ptr = '\\'; } @@ -640,17 +640,17 @@ static void test_loadpaths_execute(const WCHAR *exe_name, const WCHAR *dll_name, if ((ptr = wcsrchr(tmpdir, '\\'))) *ptr = '\0'; ret = CopyFileW(dll_name, tmpdll, FALSE); - ok(ret, "CopyFileW(%s) failed: %u\n", debugstr_w(tmpdll), GetLastError()); + ok(ret, "CopyFileW(%s) failed: %lu\n", debugstr_w(tmpdll), GetLastError()); si.cb = sizeof(si); ret = CreateProcessW(tmpexe, tmpexe, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); - ok(ret, "CreateProcessW(%s) failed: %u\n", debugstr_w(tmpexe), GetLastError()); + ok(ret, "CreateProcessW(%s) failed: %lu\n", debugstr_w(tmpexe), GetLastError()); if (expect_failure) ret = WaitForSingleObject(pi.hProcess, 2000); else { ret = WaitForSingleObject(pi.hProcess, 5000); - ok(ret == WAIT_OBJECT_0, "%s: WaitForSingleObject returned %d: %u\n", debugstr_w(dll_dest), ret, GetLastError()); + ok(ret == WAIT_OBJECT_0, "%s: WaitForSingleObject returned %d: %lu\n", debugstr_w(dll_dest), ret, GetLastError()); } GetExitCodeProcess(pi.hProcess, &exit_code); @@ -667,19 +667,19 @@ static void test_loadpaths_execute(const WCHAR *exe_name, const WCHAR *dll_name, if (cfg_name) { ret = DeleteFileW(tmpcfg); - ok(ret, "DeleteFileW(%s) failed: %u\n", debugstr_w(tmpcfg), GetLastError()); + ok(ret, "DeleteFileW(%s) failed: %lu\n", debugstr_w(tmpcfg), GetLastError()); } ret = DeleteFileW(tmpdll); - ok(ret, "DeleteFileW(%s) failed: %u\n", debugstr_w(tmpdll), GetLastError()); + ok(ret, "DeleteFileW(%s) failed: %lu\n", debugstr_w(tmpdll), GetLastError()); ret = DeleteFileW(tmpexe); - ok(ret, "DeleteFileW(%s) failed: %u\n", debugstr_w(tmpexe), GetLastError()); + ok(ret, "DeleteFileW(%s) failed: %lu\n", debugstr_w(tmpexe), GetLastError()); end = tmpdir + wcslen(tmp); ptr = tmpdir + wcslen(tmpdir) - 1; while (ptr > end && (ptr = wcsrchr(tmpdir, '\\'))) { ret = RemoveDirectoryW(tmpdir); - ok(ret, "RemoveDirectoryW(%s) failed: %u\n", debugstr_w(tmpdir), GetLastError()); + ok(ret, "RemoveDirectoryW(%s) failed: %lu\n", debugstr_w(tmpdir), GetLastError()); *ptr = '\0'; } } @@ -698,25 +698,25 @@ static void test_loadpaths(BOOL neutral) DeleteFileW(dll_source); ret = write_resource(dll_source, dll_source); - ok(ret, "Could not write resource: %u\n", GetLastError()); + ok(ret, "Could not write resource: %lu\n", GetLastError()); DeleteFileW(dll_name); ret = compile_cs(dll_source, dll_name, L"library", neutral ? L"-define:NEUTRAL" : L""); if (!ret) return; ret = DeleteFileW(dll_source); - ok(ret, "DeleteFileW failed: %u\n", GetLastError()); + ok(ret, "DeleteFileW failed: %lu\n", GetLastError()); DeleteFileW(exe_source); ret = write_resource(exe_source, exe_source); - ok(ret, "Could not write resource: %u\n", GetLastError()); + ok(ret, "Could not write resource: %lu\n", GetLastError()); DeleteFileW(exe_name); ret = compile_cs(exe_source, exe_name, L"exe", L"/reference:libloadpaths.dll"); if (!ret) return; ret = DeleteFileW(exe_source); - ok(ret, "DeleteFileW failed: %u\n", GetLastError()); + ok(ret, "DeleteFileW failed: %lu\n", GetLastError()); DeleteFileW(cfg_name); ret = write_resource(cfg_name, cfg_name); - ok(ret, "Could not write resource: %u\n", GetLastError()); + ok(ret, "Could not write resource: %lu\n", GetLastError()); for (i = 0; i < ARRAY_SIZE(loadpaths); ++i) { @@ -754,11 +754,11 @@ static void test_loadpaths(BOOL neutral) } ret = DeleteFileW(cfg_name); - ok(ret, "DeleteFileW failed: %u\n", GetLastError()); + ok(ret, "DeleteFileW failed: %lu\n", GetLastError()); ret = DeleteFileW(exe_name); - ok(ret, "DeleteFileW failed: %u\n", GetLastError()); + ok(ret, "DeleteFileW failed: %lu\n", GetLastError()); ret = DeleteFileW(dll_name); - ok(ret, "DeleteFileW failed: %u\n", GetLastError()); + ok(ret, "DeleteFileW failed: %lu\n", GetLastError()); } static void test_createdomain(void) @@ -779,20 +779,20 @@ static void test_createdomain(void) } hr = pCLRCreateInstance(&CLSID_CLRMetaHost, &IID_ICLRMetaHost, (void **)&metahost); - ok(SUCCEEDED(hr), "CLRCreateInstance failed, hr=%#.8x\n", hr); + ok(SUCCEEDED(hr), "CLRCreateInstance failed, hr=%#.8lx\n", hr); hr = ICLRMetaHost_GetRuntime(metahost, v4_0, &IID_ICLRRuntimeInfo, (void **)&runtimeinfo); - ok(SUCCEEDED(hr), "ICLRMetaHost::GetRuntime failed, hr=%#.8x\n", hr); + ok(SUCCEEDED(hr), "ICLRMetaHost::GetRuntime failed, hr=%#.8lx\n", hr); hr = ICLRRuntimeInfo_GetInterface(runtimeinfo, &CLSID_CorRuntimeHost, &IID_ICorRuntimeHost, (void **)&runtimehost); - ok(SUCCEEDED(hr), "ICLRRuntimeInfo::GetInterface failed, hr=%#.8x\n", hr); + ok(SUCCEEDED(hr), "ICLRRuntimeInfo::GetInterface failed, hr=%#.8lx\n", hr); hr = ICorRuntimeHost_Start(runtimehost); - ok(SUCCEEDED(hr), "ICorRuntimeHost::Start failed, hr=%#.8x\n", hr); + ok(SUCCEEDED(hr), "ICorRuntimeHost::Start failed, hr=%#.8lx\n", hr); hr = ICorRuntimeHost_GetDefaultDomain(runtimehost, &domain); - ok(SUCCEEDED(hr), "ICorRuntimeHost::GetDefaultDomain failed, hr=%#.8x\n", hr); + ok(SUCCEEDED(hr), "ICorRuntimeHost::GetDefaultDomain failed, hr=%#.8lx\n", hr); hr = IUnknown_QueryInterface(domain, &IID_IUnknown, (void **)&defaultdomain_unk); ok(SUCCEEDED(hr), "COM object doesn't support IUnknown?!\n"); @@ -803,7 +803,7 @@ static void test_createdomain(void) IUnknown_Release(domain); hr = ICorRuntimeHost_CreateDomain(runtimehost, test_name, NULL, &domain); - ok(SUCCEEDED(hr), "ICorRuntimeHost::CreateDomain failed, hr=%#.8x\n", hr); + ok(SUCCEEDED(hr), "ICorRuntimeHost::CreateDomain failed, hr=%#.8lx\n", hr); hr = IUnknown_QueryInterface(domain, &IID_IUnknown, (void **)&newdomain_unk); ok(SUCCEEDED(hr), "COM object doesn't support IUnknown?!\n"); @@ -816,10 +816,10 @@ static void test_createdomain(void) ok(defaultdomain_unk != newdomain_unk, "New and default domain objects are the same\n"); hr = ICorRuntimeHost_CreateDomainSetup(runtimehost, &domainsetup); - ok(SUCCEEDED(hr), "ICorRuntimeHost::CreateDomainSetup failed, hr=%#.8x\n", hr); + ok(SUCCEEDED(hr), "ICorRuntimeHost::CreateDomainSetup failed, hr=%#.8lx\n", hr); hr = ICorRuntimeHost_CreateDomainEx(runtimehost, test2_name, domainsetup, NULL, &domain); - ok(SUCCEEDED(hr), "ICorRuntimeHost::CreateDomainEx failed, hr=%#.8x\n", hr); + ok(SUCCEEDED(hr), "ICorRuntimeHost::CreateDomainEx failed, hr=%#.8lx\n", hr); hr = IUnknown_QueryInterface(domain, &IID_IUnknown, (void **)&newdomain2_unk); ok(SUCCEEDED(hr), "COM object doesn't support IUnknown?!\n");
Signed-off-by: Esme Povirk <esme(a)codeweavers.com>
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msctf/tests/Makefile.in | 1 dlls/msctf/tests/inputprocessor.c | 112 +++++++++++++++++++------------------ 2 files changed, 56 insertions(+), 57 deletions(-) diff --git a/dlls/msctf/tests/Makefile.in b/dlls/msctf/tests/Makefile.in index 8c946a93527..4f699af8e27 100644 --- a/dlls/msctf/tests/Makefile.in +++ b/dlls/msctf/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msctf.dll IMPORTS = ole32 user32 advapi32 diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 67d1db1dbfb..5038b733b55 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -232,7 +232,7 @@ static HRESULT WINAPI TextStoreACP_AdviseSink(ITextStoreACP *iface, ITfContext *context; HRESULT hr; - if (winetest_debug > 1) trace("ITextStoreACP::AdviseSink(iid %s, mask %#x)\n", + if (winetest_debug > 1) trace("ITextStoreACP::AdviseSink(iid %s, mask %#lx)\n", wine_dbgstr_guid(riid), dwMask); sink_fire_ok(&test_ACP_AdviseSink,"TextStoreACP_AdviseSink"); @@ -244,14 +244,14 @@ static HRESULT WINAPI TextStoreACP_AdviseSink(ITextStoreACP *iface, ok(SUCCEEDED(hr),"Unable to QueryInterface on sink\n"); hr = ITextStoreACPSink_QueryInterface(ACPSink, &IID_ITextStoreACPServices, (void**)&services); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); range = NULL; hr = ITextStoreACPServices_CreateRange(services, 0, 1, &range); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = ITfRangeACP_GetContext(range, &context); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ITfContext_Release(context); ITfRangeACP_Release(range); @@ -271,7 +271,7 @@ static HRESULT WINAPI TextStoreACP_UnadviseSink(ITextStoreACP *iface, static HRESULT WINAPI TextStoreACP_RequestLock(ITextStoreACP *iface, DWORD flags, HRESULT *session_hr) { - if (winetest_debug > 1) trace("ITextStoreACP::RequestLock(flags %#x)\n", flags); + if (winetest_debug > 1) trace("ITextStoreACP::RequestLock(flags %#lx)\n", flags); sink_fire_ok(&test_ACP_RequestLock,"TextStoreACP_RequestLock"); *session_hr = ITextStoreACPSink_OnLockGranted(ACPSink, flags); return S_OK; @@ -286,13 +286,13 @@ static HRESULT WINAPI TextStoreACP_GetStatus(ITextStoreACP *iface, static HRESULT WINAPI TextStoreACP_QueryInsert(ITextStoreACP *iface, LONG start, LONG end, ULONG len, LONG *ret_start, LONG *ret_end) { - if (winetest_debug > 1) trace("ITextStoreACP::QueryInsert(start %d, end %d, len %d)\n", start, end, len); + if (winetest_debug > 1) trace("ITextStoreACP::QueryInsert(start %ld, end %ld, len %ld)\n", start, end, len); return S_OK; } static HRESULT WINAPI TextStoreACP_GetSelection(ITextStoreACP *iface, ULONG index, ULONG count, TS_SELECTION_ACP *pSelection, ULONG *pcFetched) { - if (winetest_debug > 1) trace("ITextStoreACP::GetSelection(index %d)\n", index); + if (winetest_debug > 1) trace("ITextStoreACP::GetSelection(index %ld)\n", index); sink_fire_ok(&test_ACP_GetSelection,"TextStoreACP_GetSelection"); pSelection->acpStart = 10; @@ -314,26 +314,26 @@ static HRESULT WINAPI TextStoreACP_GetText(ITextStoreACP *iface, LONG start, LON WCHAR *plain, ULONG plain_len, ULONG *plain_ret_len, TS_RUNINFO *runinfo, ULONG runinfo_count, ULONG *runinfo_ret_count, LONG *next) { - if (winetest_debug > 1) trace("ITextStoreACP::GetText(start %d, end %d)\n", start, end); + if (winetest_debug > 1) trace("ITextStoreACP::GetText(start %ld, end %ld)\n", start, end); return S_OK; } static HRESULT WINAPI TextStoreACP_SetText(ITextStoreACP *iface, DWORD flags, LONG start, LONG end, const WCHAR *text, ULONG len, TS_TEXTCHANGE *textchange) { - if (winetest_debug > 1) trace("ITextStoreACP::SetText(flags %#x, start %d, end %d, text %s)\n", + if (winetest_debug > 1) trace("ITextStoreACP::SetText(flags %#lx, start %ld, end %ld, text %s)\n", flags, start, end, wine_dbgstr_wn(text, len)); return S_OK; } static HRESULT WINAPI TextStoreACP_GetFormattedText(ITextStoreACP *iface, LONG start, LONG end, IDataObject **out) { - if (winetest_debug > 1) trace("ITextStoreACP::GetFormattedText(start %d, end %d)\n", start, end); + if (winetest_debug > 1) trace("ITextStoreACP::GetFormattedText(start %ld, end %ld)\n", start, end); return S_OK; } static HRESULT WINAPI TextStoreACP_GetEmbedded(ITextStoreACP *iface, LONG pos, REFGUID format, REFIID iid, IUnknown **out) { - if (winetest_debug > 1) trace("ITextStoreACP::GetEmbedded(pos %d, format %s, iid %s)\n", + if (winetest_debug > 1) trace("ITextStoreACP::GetEmbedded(pos %ld, format %s, iid %s)\n", pos, wine_dbgstr_guid(format), wine_dbgstr_guid(iid)); return S_OK; } @@ -346,13 +346,13 @@ static HRESULT WINAPI TextStoreACP_QueryInsertEmbedded(ITextStoreACP *iface, static HRESULT WINAPI TextStoreACP_InsertEmbedded(ITextStoreACP *iface, DWORD flags, LONG start, LONG end, IDataObject *object, TS_TEXTCHANGE *textchange) { - if (winetest_debug > 1) trace("ITextStoreACP::InsertEmbedded(flags %#x, start %d, end %d)\n", flags, start, end); + if (winetest_debug > 1) trace("ITextStoreACP::InsertEmbedded(flags %#lx, start %ld, end %ld)\n", flags, start, end); return S_OK; } static HRESULT WINAPI TextStoreACP_InsertTextAtSelection(ITextStoreACP *iface, DWORD flags, const WCHAR *text, ULONG len, LONG *start, LONG *end, TS_TEXTCHANGE *textchange) { - if (winetest_debug > 1) trace("ITextStoreACP::InsertTextAtSelection(flags %#x, text %s)\n", + if (winetest_debug > 1) trace("ITextStoreACP::InsertTextAtSelection(flags %#lx, text %s)\n", flags, wine_dbgstr_wn(text, len)); sink_fire_ok(&test_ACP_InsertTextAtSelection,"TextStoreACP_InsertTextAtSelection"); return S_OK; @@ -360,39 +360,39 @@ static HRESULT WINAPI TextStoreACP_InsertTextAtSelection(ITextStoreACP *iface, D static HRESULT WINAPI TextStoreACP_InsertEmbeddedAtSelection(ITextStoreACP *iface, DWORD flags, IDataObject *object, LONG *start, LONG *end, TS_TEXTCHANGE *textchange) { - if (winetest_debug > 1) trace("ITextStoreACP::InsertEmbeddedAtSelection(flags %#x)\n", flags); + if (winetest_debug > 1) trace("ITextStoreACP::InsertEmbeddedAtSelection(flags %#lx)\n", flags); return S_OK; } static HRESULT WINAPI TextStoreACP_RequestSupportedAttrs(ITextStoreACP *iface, DWORD flags, ULONG count, const TS_ATTRID *attrs) { - if (winetest_debug > 1) trace("ITextStoreACP::RequestSupportedAttrs(flags %#x)\n", flags); + if (winetest_debug > 1) trace("ITextStoreACP::RequestSupportedAttrs(flags %#lx)\n", flags); return S_OK; } static HRESULT WINAPI TextStoreACP_RequestAttrsAtPosition(ITextStoreACP *iface, LONG pos, ULONG count, const TS_ATTRID *attrs, DWORD flags) { - if (winetest_debug > 1) trace("ITextStoreACP::RequestAttrsAtPosition(pos %d, flags %#x)\n", pos, flags); + if (winetest_debug > 1) trace("ITextStoreACP::RequestAttrsAtPosition(pos %ld, flags %#lx)\n", pos, flags); return S_OK; } static HRESULT WINAPI TextStoreACP_RequestAttrsTransitioningAtPosition(ITextStoreACP *iface, LONG pos, ULONG count, const TS_ATTRID *attrs, DWORD flags) { - if (winetest_debug > 1) trace("ITextStoreACP::RequestAttrsTransitioningAtPosition(pos %d, flags %#x)\n", pos, flags); + if (winetest_debug > 1) trace("ITextStoreACP::RequestAttrsTransitioningAtPosition(pos %ld, flags %#lx)\n", pos, flags); return S_OK; } static HRESULT WINAPI TextStoreACP_FindNextAttrTransition(ITextStoreACP *iface, LONG start, LONG end, ULONG count, const TS_ATTRID *attrs, DWORD flags, LONG *next, BOOL *found, LONG *offset) { - if (winetest_debug > 1) trace("ITextStoreACP::FindNextAttrTransition(start %d, end %d, flags %#x)\n", + if (winetest_debug > 1) trace("ITextStoreACP::FindNextAttrTransition(start %ld, end %ld, flags %#lx)\n", start, end, flags); return S_OK; } static HRESULT WINAPI TextStoreACP_RetrieveRequestedAttrs(ITextStoreACP *iface, ULONG count, TS_ATTRVAL *values, ULONG *ret_count) { - if (winetest_debug > 1) trace("ITextStoreACP::RetrieveRequestedAttrs(count %d)\n", count); + if (winetest_debug > 1) trace("ITextStoreACP::RetrieveRequestedAttrs(count %ld)\n", count); return S_OK; } static HRESULT WINAPI TextStoreACP_GetEndACP(ITextStoreACP *iface, @@ -410,25 +410,25 @@ static HRESULT WINAPI TextStoreACP_GetActiveView(ITextStoreACP *iface, TsViewCoo static HRESULT WINAPI TextStoreACP_GetACPFromPoint(ITextStoreACP *iface, TsViewCookie view, const POINT *pt, DWORD flags, LONG *pos) { - if (winetest_debug > 1) trace("ITextStoreACP::GetACPFromPoint(view %#x, pt (%d,%d), flags %#x)\n", + if (winetest_debug > 1) trace("ITextStoreACP::GetACPFromPoint(view %#lx, pt (%ld,%ld), flags %#lx)\n", view, pt->x, pt->y, flags); return S_OK; } static HRESULT WINAPI TextStoreACP_GetTextExt(ITextStoreACP *iface, TsViewCookie view, LONG start, LONG end, RECT *rect, BOOL *clipped) { - if (winetest_debug > 1) trace("ITextStoreACP::GetTextExt(view %#x, start %d, end %d)\n", view, start, end); + if (winetest_debug > 1) trace("ITextStoreACP::GetTextExt(view %#lx, start %ld, end %ld)\n", view, start, end); return S_OK; } static HRESULT WINAPI TextStoreACP_GetScreenExt(ITextStoreACP *iface, TsViewCookie view, RECT *rect) { - if (winetest_debug > 1) trace("ITextStoreACP::GetScreenExt(view %#x)\n", view); + if (winetest_debug > 1) trace("ITextStoreACP::GetScreenExt(view %#lx)\n", view); return S_OK; } static HRESULT WINAPI TextStoreACP_GetWnd(ITextStoreACP *iface, TsViewCookie view, HWND *window) { - if (winetest_debug > 1) trace("ITextStoreACP::GetWnd(view %#x)\n", view); + if (winetest_debug > 1) trace("ITextStoreACP::GetWnd(view %#lx)\n", view); return S_OK; } @@ -747,12 +747,12 @@ static HRESULT WINAPI ProfileActivationSink_OnActivated(ITfInputProcessorProfile DWORD dwProfileType, LANGID langid, REFCLSID clsid, REFGUID catid, REFGUID guidProfile, HKL hkl, DWORD dwFlags) { - trace("Got OnActivated: {dwProfileType %08x, langid %08x, clsid %s, catid %s, guidProfile %s, %p, dwFlags %08x}\n", + trace("Got OnActivated: {dwProfileType %08lx, langid %08x, clsid %s, catid %s, guidProfile %s, %p, dwFlags %08lx}\n", dwProfileType, langid, wine_dbgstr_guid(clsid), wine_dbgstr_guid(catid), wine_dbgstr_guid(guidProfile), hkl, dwFlags); ok(dwProfileType == TF_PROFILETYPE_INPUTPROCESSOR || dwProfileType == TF_PROFILETYPE_KEYBOARDLAYOUT, - "unexpected dwProfileType: 0x%x\n", dwProfileType); + "unexpected dwProfileType: 0x%lx\n", dwProfileType); if(dwProfileType == TF_PROFILETYPE_INPUTPROCESSOR && IsEqualGUID(&CLSID_FakeService, clsid)){ if(dwFlags & TF_IPSINK_FLAG_ACTIVE){ @@ -1131,18 +1131,18 @@ static void test_Register(void) hr = RegisterTextService(&CLSID_FakeService); ok(SUCCEEDED(hr),"Unable to register COM for TextService\n"); hr = ITfInputProcessorProfiles_Register(g_ipp, &CLSID_FakeService); - ok(SUCCEEDED(hr),"Unable to register text service(%x)\n",hr); + ok(SUCCEEDED(hr),"Unable to register text service(%lx)\n",hr); hr = ITfInputProcessorProfiles_AddLanguageProfile(g_ipp, &CLSID_FakeService, gLangid, &CLSID_FakeService, L"Fake Wine Service", ARRAY_SIZE(L"Fake Wine Service"), L"Fake Wine Service File", ARRAY_SIZE(L"Fake Wine Service File"), 1); - ok(SUCCEEDED(hr),"Unable to add Language Profile (%x)\n",hr); + ok(SUCCEEDED(hr),"Unable to add Language Profile (%lx)\n",hr); } static void test_Unregister(void) { HRESULT hr; hr = ITfInputProcessorProfiles_Unregister(g_ipp, &CLSID_FakeService); - ok(SUCCEEDED(hr),"Unable to unregister text service(%x)\n",hr); + ok(SUCCEEDED(hr),"Unable to unregister text service(%lx)\n",hr); UnregisterTextService(); } @@ -1172,7 +1172,7 @@ static void test_EnumLanguageProfiles(void) HRESULT hr; hr = ITfInputProcessorProfiles_EnumLanguageProfiles(g_ipp, gLangid, NULL); - ok(hr == E_INVALIDARG, "EnumLanguageProfiles failed: %x\n", hr); + ok(hr == E_INVALIDARG, "EnumLanguageProfiles failed: %lx\n", hr); if (SUCCEEDED(ITfInputProcessorProfiles_EnumLanguageProfiles(g_ipp,gLangid,&ppEnum))) { @@ -1218,15 +1218,15 @@ static void test_FindClosestCategory(void) const GUID *list[3] = {&GUID_TFCAT_TIP_SPEECH, &GUID_TFCAT_TIP_KEYBOARD, &GUID_TFCAT_TIP_HANDWRITING}; hr = ITfCategoryMgr_FindClosestCategory(g_cm, &CLSID_FakeService, &output, NULL, 0); - ok(SUCCEEDED(hr),"ITfCategoryMgr_FindClosestCategory failed (%x)\n",hr); + ok(SUCCEEDED(hr),"ITfCategoryMgr_FindClosestCategory failed (%lx)\n",hr); ok(IsEqualGUID(&output,&GUID_TFCAT_DISPLAYATTRIBUTEPROVIDER),"Wrong GUID\n"); hr = ITfCategoryMgr_FindClosestCategory(g_cm, &CLSID_FakeService, &output, list, 1); - ok(SUCCEEDED(hr),"ITfCategoryMgr_FindClosestCategory failed (%x)\n",hr); + ok(SUCCEEDED(hr),"ITfCategoryMgr_FindClosestCategory failed (%lx)\n",hr); ok(IsEqualGUID(&output,&GUID_NULL),"Wrong GUID\n"); hr = ITfCategoryMgr_FindClosestCategory(g_cm, &CLSID_FakeService, &output, list, 3); - ok(SUCCEEDED(hr),"ITfCategoryMgr_FindClosestCategory failed (%x)\n",hr); + ok(SUCCEEDED(hr),"ITfCategoryMgr_FindClosestCategory failed (%lx)\n",hr); ok(IsEqualGUID(&output,&GUID_TFCAT_TIP_KEYBOARD),"Wrong GUID\n"); } @@ -1266,7 +1266,7 @@ static void test_ThreadMgrAdviseSinks(void) (IUnknown *)&thread_mgr_event_sink.ITfThreadMgrEventSink_iface, &tmSinkCookie); ok(hr == S_OK, "Failed to Advise ITfThreadMgrEventSink\n"); ok(tmSinkCookie!=0,"Failed to get sink cookie\n"); - ok(thread_mgr_event_sink.refCount == 2, "Got %d references.\n", thread_mgr_event_sink.refCount); + ok(thread_mgr_event_sink.refCount == 2, "Got %ld references.\n", thread_mgr_event_sink.refCount); hr = ITfSource_AdviseSink(source, &IID_ITfKeyTraceEventSink, (IUnknown*)&TfKeyTraceEventSink, &key_trace_sink_cookie); @@ -1297,10 +1297,10 @@ static void test_ThreadMgrUnadviseSinks(void) if (!source) return; - ok(thread_mgr_event_sink.refCount == 2, "Got %d references.\n", thread_mgr_event_sink.refCount); + ok(thread_mgr_event_sink.refCount == 2, "Got %ld references.\n", thread_mgr_event_sink.refCount); hr = ITfSource_UnadviseSink(source, tmSinkCookie); ok(hr == S_OK, "Failed to unadvise ITfThreadMgrEventSink\n"); - ok(thread_mgr_event_sink.refCount == 1, "Got %d references.\n", thread_mgr_event_sink.refCount); + ok(thread_mgr_event_sink.refCount == 1, "Got %ld references.\n", thread_mgr_event_sink.refCount); hr = ITfSource_UnadviseSink(source, key_trace_sink_cookie); ok(hr == S_OK, "Failed to unadvise ITfKeyTraceEventSink\n"); @@ -1753,7 +1753,7 @@ static void test_startSession(void) ok(initial_ctx != NULL, "Expected initial context\n"); initial_ctx_cnt = check_context_refcount(initial_ctx); hr = ITfContext_GetDocumentMgr(initial_ctx,&dmtest); - ok(hr == S_OK, "ITfContext_GetDocumentMgr failed with %x\n",hr); + ok(hr == S_OK, "ITfContext_GetDocumentMgr failed with %lx\n",hr); ok(dmtest == g_dm, "Wrong documentmgr\n"); ITfDocumentMgr_Release(dmtest); @@ -1805,7 +1805,7 @@ static void test_startSession(void) test_EnumContexts(g_dm, NULL); hr = ITfContext_GetDocumentMgr(cxt,&dmtest); - ok(hr == S_OK, "ITfContext_GetDocumentMgr failed with %x\n",hr); + ok(hr == S_OK, "ITfContext_GetDocumentMgr failed with %lx\n",hr); ok(dmtest == g_dm, "Wrong documentmgr\n"); ITfDocumentMgr_Release(dmtest); @@ -1886,7 +1886,7 @@ static void test_startSession(void) dmtest = (void *)0xfeedface; hr = ITfContext_GetDocumentMgr(cxt2,&dmtest); - ok(hr == S_FALSE, "ITfContext_GetDocumentMgr wrong rc %x\n",hr); + ok(hr == S_FALSE, "ITfContext_GetDocumentMgr wrong rc %lx\n",hr); ok(dmtest == NULL,"returned documentmgr should be null\n"); ITfContext_Release(cxt2); @@ -2086,7 +2086,7 @@ static void test_InsertAtSelection(TfEditCookie ec, ITfContext *cxt) ok(SUCCEEDED(hr),"Failed to get ITfInsertAtSelection interface\n"); test_ACP_InsertTextAtSelection = SINK_EXPECTED; hr = ITfInsertAtSelection_InsertTextAtSelection(iis, ec, 0, L"Hello World", 11, &range); - ok(SUCCEEDED(hr),"ITfInsertAtSelection_InsertTextAtSelection failed %x\n",hr); + ok(SUCCEEDED(hr),"ITfInsertAtSelection_InsertTextAtSelection failed %lx\n",hr); sink_check_ok(&test_ACP_InsertTextAtSelection,"InsertTextAtSelection"); ok(range != NULL,"No range returned\n"); ITfRange_Release(range); @@ -2111,39 +2111,39 @@ TfEditCookie ec) ITfDocumentMgr_GetTop(dm,&cxt); hr = ITfContext_GetStart(cxt,ec,NULL); - ok(hr == E_INVALIDARG,"Unexpected return code %x\n",hr); + ok(hr == E_INVALIDARG,"Unexpected return code %lx\n",hr); range = (ITfRange*)0xdeaddead; hr = ITfContext_GetStart(cxt,0xdeadcafe,&range); - ok(hr == TF_E_NOLOCK,"Unexpected return code %x\n",hr); + ok(hr == TF_E_NOLOCK,"Unexpected return code %lx\n",hr); ok(range == NULL,"Range not set to NULL\n"); hr = ITfContext_GetStart(cxt,ec,&range); - ok(SUCCEEDED(hr),"Unexpected return code %x\n",hr); + ok(SUCCEEDED(hr),"Unexpected return code %lx\n",hr); ok(range != NULL,"Range set to NULL\n"); hr = ITfRange_GetContext(range, &context2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(context2 == cxt, "Unexpected context pointer.\n"); ITfContext_Release(context2); hr = ITfRange_QueryInterface(range, &IID_ITfRangeACP, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IUnknown_Release(unk); ITfRange_Release(range); hr = ITfContext_GetEnd(cxt,ec,NULL); - ok(hr == E_INVALIDARG,"Unexpected return code %x\n",hr); + ok(hr == E_INVALIDARG,"Unexpected return code %lx\n",hr); range = (ITfRange*)0xdeaddead; hr = ITfContext_GetEnd(cxt,0xdeadcafe,&range); - ok(hr == TF_E_NOLOCK,"Unexpected return code %x\n",hr); + ok(hr == TF_E_NOLOCK,"Unexpected return code %lx\n",hr); ok(range == NULL,"Range not set to NULL\n"); test_ACP_GetEndACP = SINK_EXPECTED; hr = ITfContext_GetEnd(cxt,ec,&range); - ok(SUCCEEDED(hr),"Unexpected return code %x\n",hr); + ok(SUCCEEDED(hr),"Unexpected return code %lx\n",hr); ok(range != NULL,"Range set to NULL\n"); sink_check_ok(&test_ACP_GetEndACP,"GetEndACP"); @@ -2162,7 +2162,7 @@ TfEditCookie ec) test_ACP_GetEndACP = SINK_EXPECTED; hr = ITfContext_GetEnd(cxt,ec,&range); - ok(SUCCEEDED(hr),"Unexpected return code %x\n",hr); + ok(SUCCEEDED(hr),"Unexpected return code %lx\n",hr); ok(range != NULL,"Range set to NULL\n"); sink_check_ok(&test_ACP_GetEndACP,"GetEndACP"); @@ -2232,14 +2232,14 @@ static void test_TStoApplicationText(void) hrSession = 0xfeedface; /* Test no permissions flags */ hr = ITfContext_RequestEditSession(cxt, tid, es, TF_ES_SYNC, &hrSession); - ok(hr == E_INVALIDARG,"RequestEditSession should have failed with %x not %x\n",E_INVALIDARG,hr); - ok(hrSession == E_FAIL,"hrSession should be %x not %x\n",E_FAIL,hrSession); + ok(hr == E_INVALIDARG,"RequestEditSession should have failed with %lx not %lx\n",E_INVALIDARG,hr); + ok(hrSession == E_FAIL,"hrSession should be %lx not %lx\n",E_FAIL,hrSession); documentStatus = TS_SD_READONLY; hrSession = 0xfeedface; hr = ITfContext_RequestEditSession(cxt, tid, es, TF_ES_SYNC|TF_ES_READWRITE, &hrSession); ok(SUCCEEDED(hr),"ITfContext_RequestEditSession failed\n"); - ok(hrSession == TS_E_READONLY,"Unexpected hrSession (%x)\n",hrSession); + ok(hrSession == TS_E_READONLY,"Unexpected hrSession (%lx)\n",hrSession); /* signal a change to allow readwrite sessions */ documentStatus = 0; @@ -2255,7 +2255,7 @@ static void test_TStoApplicationText(void) ok(SUCCEEDED(hr),"ITfContext_RequestEditSession failed\n"); sink_check_ok(&test_OnEndEdit,"OnEndEdit"); sink_check_ok(&test_DoEditSession,"DoEditSession"); - ok(hrSession == 0xdeadcafe,"Unexpected hrSession (%x)\n",hrSession); + ok(hrSession == 0xdeadcafe,"Unexpected hrSession (%lx)\n",hrSession); if (source) { @@ -2526,7 +2526,7 @@ static void test_AssociateFocus(void) /* Vista doesn't return NULL */ if (olddm) ITfDocumentMgr_Release(olddm); ref = ITfDocumentMgr_Release(dm2); - ok(ref == 0, "incorrect DocumentMgr ref %d\n", ref); + ok(ref == 0, "incorrect DocumentMgr ref %ld\n", ref); hr = ITfThreadMgr_AssociateFocus(g_tm,wnd2,NULL,&olddm); ok(SUCCEEDED(hr),"AssociateFocus failed\n"); @@ -2570,10 +2570,10 @@ static void test_profile_mgr(void) win_skip("ITfInputProcessorProfileMgr is not supported.\n"); return; } - ok(hres == S_OK, "Could not get ITfInputProcessorProfileMgr iface: %08x\n", hres); + ok(hres == S_OK, "Could not get ITfInputProcessorProfileMgr iface: %08lx\n", hres); hres = ITfInputProcessorProfileMgr_EnumProfiles(ipp_mgr, 0, &enum_profiles); - ok(hres == S_OK, "EnumProfiles failed: %08x\n", hres); + ok(hres == S_OK, "EnumProfiles failed: %08lx\n", hres); IEnumTfInputProcessorProfiles_Release(enum_profiles); @@ -2597,7 +2597,7 @@ static DWORD WINAPI test_MultiThreadApartment_Thread(void *param) { hr = ITfSource_AdviseSink(source, &IID_ITfUIElementSink, (IUnknown*)&TfUIElementSink, &cookie); ok(hr == REGDB_E_IIDNOTREG /* native */ || hr == E_NOINTERFACE /* wine */, - "Advise ITfUIElementSink should return marshalling failure: %08x\n", hr); + "Advise ITfUIElementSink should return marshalling failure: %08lx\n", hr); hr = ITfSource_Release(source); ok(SUCCEEDED(hr), "Failed to Release source\n");
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=109501 Your paranoid android. === w10pro64_ar (64 bit report) === msctf: inputprocessor.c:532: Test failed: Unexpected ThreadMgrEventSink_OnInitDocumentMgr sink inputprocessor.c:583: Test failed: Unexpected ThreadMgrEventSink_OnPushContext sink inputprocessor.c:606: Test failed: Unexpected ThreadMgrEventSink_OnPopContext sink
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msdmo/tests/Makefile.in | 1 - dlls/msdmo/tests/msdmo.c | 76 +++++++++++++++++++++--------------------- 2 files changed, 38 insertions(+), 39 deletions(-) diff --git a/dlls/msdmo/tests/Makefile.in b/dlls/msdmo/tests/Makefile.in index 2a9a1d779c6..22a8e359643 100644 --- a/dlls/msdmo/tests/Makefile.in +++ b/dlls/msdmo/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msdmo.dll IMPORTS = advapi32 dmoguids msdmo uuid diff --git a/dlls/msdmo/tests/msdmo.c b/dlls/msdmo/tests/msdmo.c index 9b261d369fc..d84617fc657 100644 --- a/dlls/msdmo/tests/msdmo.c +++ b/dlls/msdmo/tests/msdmo.c @@ -44,14 +44,14 @@ static void test_DMOUnregister(void) HRESULT hr; hr = DMOUnregister(&GUID_unknowndmo, &GUID_unknowncategory); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE, "got 0x%08lx\n", hr); hr = DMOUnregister(&GUID_unknowndmo, &GUID_NULL); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE, "got 0x%08lx\n", hr); /* can't register for all categories */ hr = DMORegister(L"testdmo", &GUID_unknowndmo, &GUID_NULL, 0, 0, NULL, 0, NULL); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "got 0x%08lx\n", hr); hr = DMORegister(L"testdmo", &GUID_unknowndmo, &GUID_unknowncategory, 0, 0, NULL, 0, NULL); if (hr != S_OK) { @@ -60,10 +60,10 @@ static void test_DMOUnregister(void) } hr = DMOUnregister(&GUID_unknowndmo, &GUID_NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = DMOUnregister(&GUID_unknowndmo, &GUID_NULL); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE, "got 0x%08lx\n", hr); /* clean up category since Windows doesn't */ sprintf(buffer, "DirectShow\\MediaObjects\\Categories\\%s", guid_to_string(&GUID_unknowncategory)); @@ -76,12 +76,12 @@ static void test_DMOGetName(void) HRESULT hr; hr = DMOGetName(&GUID_unknowndmo, NULL); - ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(hr == E_FAIL, "got 0x%08lx\n", hr); /* no such DMO */ name[0] = 'a'; hr = DMOGetName(&GUID_wmp1, name); - ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(hr == E_FAIL, "got 0x%08lx\n", hr); ok(name[0] == 'a', "got %x\n", name[0]); } @@ -97,24 +97,24 @@ static void test_DMOEnum(void) DWORD count; hr = DMOEnum(&GUID_unknowncategory, 0, 0, NULL, 0, NULL, &enum_dmo); - ok(hr == S_OK, "DMOEnum() failed with %#x\n", hr); + ok(hr == S_OK, "DMOEnum() failed with %#lx\n", hr); hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); - ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); + ok(hr == S_FALSE, "expected S_FALSE, got %#lx\n", hr); hr = IEnumDMO_Next(enum_dmo, 2, &clsid, &name, NULL); - ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#lx\n", hr); hr = IEnumDMO_Next(enum_dmo, 2, &clsid, &name, &count); - ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); - ok(count == 0, "expected 0, got %d\n", count); + ok(hr == S_FALSE, "expected S_FALSE, got %#lx\n", hr); + ok(count == 0, "expected 0, got %ld\n", count); hr = IEnumDMO_Next(enum_dmo, 2, NULL, &name, &count); - ok(hr == E_POINTER, "expected S_FALSE, got %#x\n", hr); + ok(hr == E_POINTER, "expected S_FALSE, got %#lx\n", hr); hr = IEnumDMO_Next(enum_dmo, 2, &clsid, NULL, &count); - ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); - ok(count == 0, "expected 0, got %d\n", count); + ok(hr == S_FALSE, "expected S_FALSE, got %#lx\n", hr); + ok(count == 0, "expected 0, got %ld\n", count); IEnumDMO_Release(enum_dmo); @@ -123,41 +123,41 @@ static void test_DMOEnum(void) return; hr = DMOEnum(&GUID_unknowncategory, 0, 0, NULL, 0, NULL, &enum_dmo); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(IsEqualGUID(&clsid, &GUID_unknowndmo), "Got clsid %s.\n", debugstr_guid(&clsid)); ok(!wcscmp(name, L"testdmo"), "Got name %s.\n", debugstr_w(name)); hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); - ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); IEnumDMO_Release(enum_dmo); hr = DMOEnum(&GUID_unknowncategory, 0, 1, &input_type, 0, NULL, &enum_dmo); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(IsEqualGUID(&clsid, &GUID_unknowndmo), "Got clsid %s.\n", debugstr_guid(&clsid)); ok(!wcscmp(name, L"testdmo"), "Got name %s.\n", debugstr_w(name)); hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); - ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); IEnumDMO_Release(enum_dmo); hr = DMOEnum(&GUID_unknowncategory, 0, 1, &wrong_type, 0, NULL, &enum_dmo); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); - ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); IEnumDMO_Release(enum_dmo); hr = DMOUnregister(&GUID_unknowndmo, &GUID_unknowncategory); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); } static void test_DMOGetTypes(void) @@ -172,7 +172,7 @@ static void test_DMOGetTypes(void) HRESULT hr; hr = DMOGetTypes(&GUID_unknowndmo, 0, &input_count, types, 0, &output_count, NULL); - ok(hr == E_FAIL, "Got hr %#x.\n", hr); + ok(hr == E_FAIL, "Got hr %#lx.\n", hr); hr = DMORegister(L"testdmo", &GUID_unknowndmo, &GUID_unknowncategory, 0, ARRAY_SIZE(input_types), input_types, 0, NULL); @@ -180,33 +180,33 @@ static void test_DMOGetTypes(void) return; hr = DMOGetTypes(&GUID_unknowndmo, 0, &input_count, types, 0, &output_count, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!input_count, "Got input count %u.\n", input_count); - ok(!output_count, "Got output count %u.\n", output_count); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(!input_count, "Got input count %lu.\n", input_count); + ok(!output_count, "Got output count %lu.\n", output_count); memset(types, 0, sizeof(types)); hr = DMOGetTypes(&GUID_unknowndmo, 1, &input_count, types, 0, &output_count, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(input_count == 1, "Got input count %u.\n", input_count); - ok(!output_count, "Got output count %u.\n", output_count); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(input_count == 1, "Got input count %lu.\n", input_count); + ok(!output_count, "Got output count %lu.\n", output_count); todo_wine ok(!memcmp(types, input_types, sizeof(DMO_PARTIAL_MEDIATYPE)), "Types didn't match.\n"); memset(types, 0, sizeof(types)); hr = DMOGetTypes(&GUID_unknowndmo, 2, &input_count, types, 0, &output_count, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(input_count == 2, "Got input count %u.\n", input_count); - ok(!output_count, "Got output count %u.\n", output_count); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(input_count == 2, "Got input count %lu.\n", input_count); + ok(!output_count, "Got output count %lu.\n", output_count); ok(!memcmp(types, input_types, 2 * sizeof(DMO_PARTIAL_MEDIATYPE)), "Types didn't match.\n"); memset(types, 0, sizeof(types)); hr = DMOGetTypes(&GUID_unknowndmo, 2, &input_count, types, 0, &output_count, NULL); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(input_count == 2, "Got input count %u.\n", input_count); - ok(!output_count, "Got output count %u.\n", output_count); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(input_count == 2, "Got input count %lu.\n", input_count); + ok(!output_count, "Got output count %lu.\n", output_count); ok(!memcmp(types, input_types, 2 * sizeof(DMO_PARTIAL_MEDIATYPE)), "Types didn't match.\n"); hr = DMOUnregister(&GUID_unknowndmo, &GUID_unknowncategory); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); } START_TEST(msdmo)
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msftedit/tests/Makefile.in | 1 - dlls/msftedit/tests/richole.c | 30 +++++++++++++++--------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/msftedit/tests/Makefile.in b/dlls/msftedit/tests/Makefile.in index 6609c363f22..99cc46a0076 100644 --- a/dlls/msftedit/tests/Makefile.in +++ b/dlls/msftedit/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msftedit.dll IMPORTS = ole32 oleaut32 user32 diff --git a/dlls/msftedit/tests/richole.c b/dlls/msftedit/tests/richole.c index f7347a22348..a7fbb4d103d 100644 --- a/dlls/msftedit/tests/richole.c +++ b/dlls/msftedit/tests/richole.c @@ -40,7 +40,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 %ld.\n", ref, rc); } static HWND new_window(LPCWSTR classname, DWORD dwstyle, HWND parent) @@ -83,22 +83,22 @@ static void test_Interfaces(void) EXPECT_REF(reole, 3); hres = IRichEditOle_QueryInterface(reole, &IID_ITextDocument, (void **)&txtdoc); - ok(hres == S_OK, "IRichEditOle_QueryInterface failed: 0x%08x.\n", hres); + ok(hres == S_OK, "IRichEditOle_QueryInterface failed: 0x%08lx.\n", hres); ok(txtdoc != NULL, "IRichEditOle_QueryInterface\n"); hres = ITextDocument_GetSelection(txtdoc, NULL); - ok(hres == E_INVALIDARG, "ITextDocument_GetSelection: 0x%08x.\n", hres); + ok(hres == E_INVALIDARG, "ITextDocument_GetSelection: 0x%08lx.\n", hres); EXPECT_REF(txtdoc, 4); hres = ITextDocument_GetSelection(txtdoc, &txtsel); - ok(hres == S_OK, "ITextDocument_GetSelection failed 0x%08x.\n", hres); + ok(hres == S_OK, "ITextDocument_GetSelection failed 0x%08lx.\n", hres); EXPECT_REF(txtdoc, 4); EXPECT_REF(txtsel, 2); hres = ITextDocument_GetSelection(txtdoc, &txtsel2); - ok(hres == S_OK, "ITextDocument_GetSelection failed: 0x%08x.\n", hres); + ok(hres == S_OK, "ITextDocument_GetSelection failed: 0x%08lx.\n", hres); ok(txtsel2 == txtsel, "got %p, %p\n", txtsel, txtsel2); EXPECT_REF(txtdoc, 4); @@ -108,38 +108,38 @@ static void test_Interfaces(void) punk = NULL; hres = ITextSelection_QueryInterface(txtsel, &IID_ITextSelection, (void **)&punk); - ok(hres == S_OK, "ITextSelection_QueryInterface failed: 0x%08x.\n", hres); + ok(hres == S_OK, "ITextSelection_QueryInterface failed: 0x%08lx.\n", hres); ok(punk != NULL, "ITextSelection_QueryInterface\n"); IUnknown_Release(punk); punk = NULL; hres = ITextSelection_QueryInterface(txtsel, &IID_ITextRange, (void **)&punk); - ok(hres == S_OK, "ITextSelection_QueryInterface failed: 0x%08x.\n", hres); + ok(hres == S_OK, "ITextSelection_QueryInterface failed: 0x%08lx.\n", hres); ok(punk != NULL, "ITextSelection_QueryInterface\n"); IUnknown_Release(punk); punk = NULL; hres = ITextSelection_QueryInterface(txtsel, &IID_IDispatch, (void **)&punk); - ok(hres == S_OK, "ITextSelection_QueryInterface failed: 0x%08x.\n", hres); + ok(hres == S_OK, "ITextSelection_QueryInterface failed: 0x%08lx.\n", hres); ok(punk != NULL, "ITextSelection_QueryInterface\n"); IUnknown_Release(punk); punk = NULL; hres = IRichEditOle_QueryInterface(reole, &IID_IOleClientSite, (void **)&punk); - ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface: 0x%08x.\n", hres); + ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface: 0x%08lx.\n", hres); punk = NULL; hres = IRichEditOle_QueryInterface(reole, &IID_IOleWindow, (void **)&punk); - ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface: 0x%08x.\n", hres); + ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface: 0x%08lx.\n", hres); punk = NULL; hres = IRichEditOle_QueryInterface(reole, &IID_IOleInPlaceSite, (void **)&punk); - ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface: 0x%08x.\n", hres); + ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface: 0x%08lx.\n", hres); /* ITextDocument2 is implemented on msftedit after win8 for superseding ITextDocument2Old */ hres = IRichEditOle_QueryInterface(reole, &IID_ITextDocument2, (void **)&txtdoc2); ok(hres == S_OK || - hres == E_NOINTERFACE /* before win8 */, "IRichEditOle_QueryInterface: 0x%08x.\n", hres); + hres == E_NOINTERFACE /* before win8 */, "IRichEditOle_QueryInterface: 0x%08lx.\n", hres); if (hres != E_NOINTERFACE) { ok(txtdoc2 != NULL, "IRichEditOle_QueryInterface\n"); @@ -148,7 +148,7 @@ static void test_Interfaces(void) EXPECT_REF(reole, 5); hres = ITextDocument2_QueryInterface(txtdoc2, &IID_ITextDocument2Old, (void **)&txtdoc2old); - ok(hres == S_OK, "ITextDocument2_QueryInterface failed: 0x%08x.\n", hres); + ok(hres == S_OK, "ITextDocument2_QueryInterface failed: 0x%08lx.\n", hres); ok((ITextDocument *)txtdoc2old != txtdoc, "Interface pointer is equal.\n"); EXPECT_REF(txtdoc2, 5); EXPECT_REF(reole, 5); @@ -159,7 +159,7 @@ static void test_Interfaces(void) else { hres = IRichEditOle_QueryInterface(reole, &IID_ITextDocument2Old, (void **)&txtdoc2old); - ok(hres == S_OK, "IRichEditOle_QueryInterface failed: 0x%08x.\n", hres); + ok(hres == S_OK, "IRichEditOle_QueryInterface failed: 0x%08lx.\n", hres); ok(txtdoc2old != NULL, "IRichEditOle_QueryInterface\n"); ok((ITextDocument *)txtdoc2old == txtdoc, "Interface pointer is equal.\n"); EXPECT_REF(txtdoc2old, 5); @@ -170,7 +170,7 @@ static void test_Interfaces(void) ITextDocument_Release(txtdoc); IRichEditOle_Release(reole); refcount = IRichEditOle_Release(reole); - ok(refcount == 1, "Got wrong ref count: %d.\n", refcount); + ok(refcount == 1, "Got wrong ref count: %ld.\n", refcount); DestroyWindow(hwnd); /* Methods should return CO_E_RELEASED if the backing document has
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mshtml/tests/Makefile.in | 1 dlls/mshtml/tests/activex.c | 216 ++-- dlls/mshtml/tests/dom.c | 1880 ++++++++++++++++++------------------ dlls/mshtml/tests/events.c | 450 ++++----- dlls/mshtml/tests/htmldoc.c | 852 ++++++++-------- dlls/mshtml/tests/htmllocation.c | 48 - dlls/mshtml/tests/misc.c | 40 - dlls/mshtml/tests/protocol.c | 304 +++--- dlls/mshtml/tests/script.c | 336 +++--- dlls/mshtml/tests/style.c | 1302 ++++++++++++------------- dlls/mshtml/tests/xmlhttprequest.c | 216 ++-- 11 files changed, 2822 insertions(+), 2823 deletions(-) diff --git a/dlls/mshtml/tests/Makefile.in b/dlls/mshtml/tests/Makefile.in index 395a484118f..fac78316986 100644 --- a/dlls/mshtml/tests/Makefile.in +++ b/dlls/mshtml/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mshtml.dll IMPORTS = ole32 oleaut32 wininet user32 urlmon gdi32 advapi32 C_SRCS = \ diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 23e4b00cac0..df4038d655c 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -189,7 +189,7 @@ static void _test_ifaces(unsigned line, IUnknown *iface, REFIID *iids) for(piid = iids; *piid; piid++) { hres = IUnknown_QueryInterface(iface, *piid, (void**)&unk); - ok_(__FILE__,line) (hres == S_OK, "Could not get %s interface: %08x\n", wine_dbgstr_guid(*piid), hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get %s interface: %08lx\n", wine_dbgstr_guid(*piid), hres); if(SUCCEEDED(hres)) IUnknown_Release(unk); } @@ -208,10 +208,10 @@ static void set_plugin_readystate(READYSTATE state) plugin_readystate = state; hres = IOleClientSite_QueryInterface(client_site, &IID_IPropertyNotifySink, (void**)&prop_notif); - ok(hres == S_OK, "Could not get IPropertyNotifySink iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IPropertyNotifySink iface: %08lx\n", hres); hres = IPropertyNotifySink_OnChanged(prop_notif, DISPID_READYSTATE); - ok(hres == S_OK, "OnChanged(DISPID_READYSTATE) failed: %08x\n", hres); + ok(hres == S_OK, "OnChanged(DISPID_READYSTATE) failed: %08lx\n", hres); IPropertyNotifySink_Release(prop_notif); } @@ -223,14 +223,14 @@ static void test_mon_displayname(IMoniker *mon, const WCHAR *exname, const WCHAR HRESULT hres; hres = IMoniker_GetDisplayName(mon, NULL, NULL, &display_name); - ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres); + ok(hres == S_OK, "GetDisplayName failed: %08lx\n", hres); ok(!lstrcmpW(display_name, exname) || broken(broken_name && !lstrcmpW(display_name, broken_name)), "display_name = %s\n", wine_dbgstr_w(display_name)); CoTaskMemFree(display_name); hres = IMoniker_IsSystemMoniker(mon, &mksys); - ok(hres == S_OK, "IsSystemMoniker failed: %08x\n", hres); - ok(mksys == MKSYS_URLMONIKER, "mksys = %d\n", mksys); + ok(hres == S_OK, "IsSystemMoniker failed: %08lx\n", hres); + ok(mksys == MKSYS_URLMONIKER, "mksys = %ld\n", mksys); } static LRESULT WINAPI plugin_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) @@ -314,13 +314,13 @@ static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown * CHECK_EXPECT(Advise); hres = IUnknown_QueryInterface(pUnkSink, &IID_IDispatch, (void**)&sink_disp); - ok(hres == S_OK, "Could not get IDispatch iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IDispatch iface: %08lx\n", hres); hres = IUnknown_QueryInterface(pUnkSink, &IID_IDispatchEx, (void**)&dispex); - ok(hres == E_NOINTERFACE, "QueryInterface(IID_IDispatchEx) returned: %08x\n", hres); + ok(hres == E_NOINTERFACE, "QueryInterface(IID_IDispatchEx) returned: %08lx\n", hres); hres = IUnknown_QueryInterface(pUnkSink, &DIID_DispActiveXTest, (void**)&ax_test); - ok(hres == S_OK, "Could not get DispActiveXTest iface: %08x\n", hres); + ok(hres == S_OK, "Could not get DispActiveXTest iface: %08lx\n", hres); DispActiveXTest_Release(ax_test); *pdwCookie = 0xdeadbeef; @@ -331,7 +331,7 @@ static HRESULT WINAPI ConnectionPoint_Unadvise(IConnectionPoint *iface, DWORD dw { CHECK_EXPECT(Unadvise); - ok(dwCookie == 0xdeadbeef, "dwCookie = %x\n", dwCookie); + ok(dwCookie == 0xdeadbeef, "dwCookie = %lx\n", dwCookie); if(sink_disp) { IDispatch_Release(sink_disp); @@ -396,7 +396,7 @@ static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DIS CHECK_EXPECT2(OnAmbientPropertyChange_UNKNOWN); break; default: - ok(0, "unexpected call %d\n", dispID); + ok(0, "unexpected call %ld\n", dispID); } return S_OK; @@ -443,15 +443,15 @@ static HRESULT WINAPI QuickActivate_QuickActivate(IQuickActivate *iface, QACONTA CHECK_EXPECT(QuickActivate); ok(container != NULL, "container == NULL\n"); - ok(container->cbSize == sizeof(*container), "container->cbSize = %d\n", container->cbSize); + ok(container->cbSize == sizeof(*container), "container->cbSize = %ld\n", container->cbSize); ok(container->pClientSite != NULL, "container->pClientSite == NULL\n"); ok(container->pAdviseSink != NULL, "container->pAdviseSink == NULL\n"); ok(container->pPropertyNotifySink != NULL, "container->pPropertyNotifySink == NULL\n"); ok(!container->pUnkEventSink, "container->pUnkEventSink != NULL\n"); ok(container->dwAmbientFlags == (QACONTAINER_SUPPORTSMNEMONICS|QACONTAINER_MESSAGEREFLECT|QACONTAINER_USERMODE), - "container->dwAmbientFlags = %x\n", container->dwAmbientFlags); + "container->dwAmbientFlags = %lx\n", container->dwAmbientFlags); if(have_container) - ok(!container->colorFore, "container->colorFore = %d\n", container->colorFore); /* FIXME */ + ok(!container->colorFore, "container->colorFore = %ld\n", container->colorFore); /* FIXME */ todo_wine ok(container->colorBack, "container->colorBack == 0\n"); /* FIXME */ if(have_container) @@ -460,20 +460,20 @@ static HRESULT WINAPI QuickActivate_QuickActivate(IQuickActivate *iface, QACONTA ok(!container->pFont, "container->pFont = %p\n", container->pFont); todo_wine ok(container->pUndoMgr != NULL, "container->pUndoMgr == NULL\n"); - ok(!container->dwAppearance, "container->dwAppearance = %x\n", container->dwAppearance); + ok(!container->dwAppearance, "container->dwAppearance = %lx\n", container->dwAppearance); if(have_container) - ok(!container->lcid, "container->lcid = %x\n", container->lcid); + ok(!container->lcid, "container->lcid = %lx\n", container->lcid); ok(!container->hpal, "container->hpal = %p\n", container->hpal); ok(!container->pBindHost, "container->pBindHost != NULL\n"); ok(!container->pOleControlSite, "container->pOleControlSite != NULL\n"); ok(!container->pServiceProvider, "container->pServiceProvider != NULL\n"); - ok(control->cbSize == sizeof(*control), "control->cbSize = %d\n", control->cbSize); - ok(!control->dwMiscStatus, "control->dwMiscStatus = %x\n", control->dwMiscStatus); - ok(!control->dwViewStatus, "control->dwViewStatus = %x\n", control->dwViewStatus); - ok(!control->dwEventCookie, "control->dwEventCookie = %x\n", control->dwEventCookie); - ok(!control->dwPropNotifyCookie, "control->dwPropNotifyCookie = %x\n", control->dwPropNotifyCookie); - ok(!control->dwPointerActivationPolicy, "control->dwPointerActivationPolicy = %x\n", control->dwPointerActivationPolicy); + ok(control->cbSize == sizeof(*control), "control->cbSize = %ld\n", control->cbSize); + ok(!control->dwMiscStatus, "control->dwMiscStatus = %lx\n", control->dwMiscStatus); + ok(!control->dwViewStatus, "control->dwViewStatus = %lx\n", control->dwViewStatus); + ok(!control->dwEventCookie, "control->dwEventCookie = %lx\n", control->dwEventCookie); + ok(!control->dwPropNotifyCookie, "control->dwPropNotifyCookie = %lx\n", control->dwPropNotifyCookie); + ok(!control->dwPointerActivationPolicy, "control->dwPointerActivationPolicy = %lx\n", control->dwPointerActivationPolicy); ok(iface_cmp((IUnknown*)container->pClientSite, (IUnknown*)container->pAdviseSink), "container->pClientSite != container->pAdviseSink\n"); @@ -570,20 +570,20 @@ static HRESULT WINAPI PersistPropertyBag_Load(IPersistPropertyBag *face, IProper V_VT(&v) = VT_BSTR; hres = IPropertyBag_Read(pPropBag, param_nameW, &v, NULL); - ok(hres == S_OK, "Read failed: %08x\n", hres); + ok(hres == S_OK, "Read failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(&v) = %d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"param_value"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); V_VT(&v) = VT_I4; V_I4(&v) = 0xdeadbeef; hres = IPropertyBag_Read(pPropBag, param_nameW, &v, NULL); - ok(hres == DISP_E_TYPEMISMATCH, "Read failed: %08x, expected DISP_E_TYPEMISMATCH\n", hres); + ok(hres == DISP_E_TYPEMISMATCH, "Read failed: %08lx, expected DISP_E_TYPEMISMATCH\n", hres); ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); - ok(V_I4(&v) == 0xdeadbeef, "V_I4(v) = %x\n", V_I4(&v)); + ok(V_I4(&v) == 0xdeadbeef, "V_I4(v) = %lx\n", V_I4(&v)); V_VT(&v) = VT_BSTR; hres = IPropertyBag_Read(pPropBag, num_paramW, &v, NULL); - ok(hres == S_OK, "Read failed: %08x\n", hres); + ok(hres == S_OK, "Read failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(&v) = %d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"3"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); SysFreeString(V_BSTR(&v)); @@ -591,27 +591,27 @@ static HRESULT WINAPI PersistPropertyBag_Load(IPersistPropertyBag *face, IProper V_VT(&v) = VT_I4; V_I4(&v) = 0xdeadbeef; hres = IPropertyBag_Read(pPropBag, num_paramW, &v, NULL); - ok(hres == S_OK, "Read failed: %08x\n", hres); + ok(hres == S_OK, "Read failed: %08lx\n", hres); ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); - ok(V_I4(&v) == 3, "V_I4(v) = %x\n", V_I4(&v)); + ok(V_I4(&v) == 3, "V_I4(v) = %lx\n", V_I4(&v)); V_VT(&v) = VT_BSTR; V_BSTR(&v) = (BSTR)0xdeadbeef; hres = IPropertyBag_Read(pPropBag, no_paramW, &v, NULL); - ok(hres == E_INVALIDARG, "Read failed: %08x\n", hres); + ok(hres == E_INVALIDARG, "Read failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(&v) = %d\n", V_VT(&v)); ok(V_BSTR(&v) == (BSTR)0xdeadbeef, "V_BSTR(v) = %p\n", V_BSTR(&v)); set_plugin_readystate(READYSTATE_INTERACTIVE); hres = IOleClientSite_QueryInterface(client_site, &IID_IBindHost, (void**)&bind_host); - ok(hres == S_OK, "Could not get IBindHost iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IBindHost iface: %08lx\n", hres); hres = IOleClientSite_QueryInterface(client_site, &IID_IServiceProvider, (void**)&sp); - ok(hres == S_OK, "Could not get IServiceProvider iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IServiceProvider iface: %08lx\n", hres); hres = IServiceProvider_QueryService(sp, &SID_SBindHost, &IID_IBindHost, (void**)&bind_host2); - ok(hres == S_OK, "QueryService(SID_SBindHost) failed: %08x\n", hres); + ok(hres == S_OK, "QueryService(SID_SBindHost) failed: %08lx\n", hres); IServiceProvider_Release(sp); ok(iface_cmp((IUnknown*)bind_host, (IUnknown*)bind_host2), "bind_host != bind_host2\n"); @@ -619,7 +619,7 @@ static HRESULT WINAPI PersistPropertyBag_Load(IPersistPropertyBag *face, IProper mon = NULL; hres = IBindHost_CreateMoniker(bind_host, test_swfW, NULL, &mon, 0); - ok(hres == S_OK, "CreateMoniker failed: %08x\n", hres); + ok(hres == S_OK, "CreateMoniker failed: %08lx\n", hres); ok(mon != NULL, "mon == NULL\n"); test_mon_displayname(mon, L"about:test.swf", L"about:blanktest.swf"); IMoniker_Release(mon); @@ -628,7 +628,7 @@ static HRESULT WINAPI PersistPropertyBag_Load(IPersistPropertyBag *face, IProper mon = NULL; hres = IOleClientSite_GetMoniker(client_site, OLEGETMONIKER_ONLYIFTHERE, OLEWHICHMK_CONTAINER, &mon); - ok(hres == S_OK, "GetMoniker failed: %08x\n", hres); + ok(hres == S_OK, "GetMoniker failed: %08lx\n", hres); ok(mon != NULL, "mon == NULL\n"); test_mon_displayname(mon, L"about:blank", NULL); IMoniker_Release(mon); @@ -782,7 +782,7 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF */ return S_OK; default: - ok(0, "unexpected call %d\n", dispIdMember); + ok(0, "unexpected call %ld\n", dispIdMember); } return E_NOTIMPL; @@ -927,8 +927,8 @@ static HRESULT WINAPI ViewObjectEx_SetAdvise(IViewObjectEx *iface, DWORD aspects { CHECK_EXPECT(SetAdvise); - ok(aspects == DVASPECT_CONTENT, "aspects = %x\n", aspects); - ok(!advf, "advf = %x\n", advf); + ok(aspects == DVASPECT_CONTENT, "aspects = %lx\n", aspects); + ok(!advf, "advf = %lx\n", advf); ok(pAdvSink != NULL, "pAdvSink = NULL\n"); return S_OK; @@ -1046,7 +1046,7 @@ static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) { CHECK_EXPECT(Close); - ok(dwSaveOption == OLECLOSE_NOSAVE, "dwSaveOption = %d\n", dwSaveOption); + ok(dwSaveOption == OLECLOSE_NOSAVE, "dwSaveOption = %ld\n", dwSaveOption); return S_OK; } @@ -1089,34 +1089,34 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, LPMSG lpms CHECK_EXPECT(DoVerb); - ok(iVerb == OLEIVERB_INPLACEACTIVATE, "iVerb = %d\n", iVerb); + ok(iVerb == OLEIVERB_INPLACEACTIVATE, "iVerb = %ld\n", iVerb); ok(!lpmsg, "lpmsg != NULL\n"); ok(pActiveSite != NULL, "pActiveSite == NULL\n"); - ok(!lindex, "lindex = %d\n", lindex); + ok(!lindex, "lindex = %ld\n", lindex); ok(hwndParent != NULL, "hwndParent == NULL\n"); ok(lprcPosRect != NULL, "lprcPosRect == NULL\n"); hres = IOleClientSite_QueryInterface(pActiveSite, &IID_IOleInPlaceSiteEx, (void**)&ip_site); - ok(hres == S_OK, "Could not get IOleInPlaceSiteEx iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IOleInPlaceSiteEx iface: %08lx\n", hres); hres = IOleInPlaceSiteEx_CanInPlaceActivate(ip_site); - ok(hres == S_OK, "CanInPlaceActivate failed: %08x\n", hres); + ok(hres == S_OK, "CanInPlaceActivate failed: %08lx\n", hres); SET_EXPECT(InPlaceObject_GetWindow); no_redraw = 0xdeadbeef; hres = IOleInPlaceSiteEx_OnInPlaceActivateEx(ip_site, &no_redraw, 0); - ok(hres == S_OK, "InPlaceActivateEx failed: %08x\n", hres); + ok(hres == S_OK, "InPlaceActivateEx failed: %08lx\n", hres); ok(!no_redraw, "no_redraw = %x\n", no_redraw); CHECK_CALLED(InPlaceObject_GetWindow); no_redraw = 0xdeadbeef; hres = IOleInPlaceSiteEx_OnInPlaceActivateEx(ip_site, &no_redraw, 0); - ok(hres == S_OK, "InPlaceActivateEx failed: %08x\n", hres); + ok(hres == S_OK, "InPlaceActivateEx failed: %08lx\n", hres); ok(no_redraw == 0xdeadbeef, "no_redraw = %x\n", no_redraw); hwnd = NULL; hres = IOleInPlaceSiteEx_GetWindow(ip_site, &hwnd); - ok(hres == S_OK, "GetWindow failed: %08x\n", hres); + ok(hres == S_OK, "GetWindow failed: %08lx\n", hres); ok(hwnd != NULL, "hwnd == NULL\n"); ok(hwnd == hwndParent, "hwnd != hwndParent\n"); @@ -1126,7 +1126,7 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, LPMSG lpms ip_uiwindow = NULL; frame_info.cb = sizeof(OLEINPLACEFRAMEINFO); hres = IOleInPlaceSiteEx_GetWindowContext(ip_site, &ip_frame, &ip_uiwindow, &pos_rect, &clip_rect, &frame_info); - ok(hres == S_OK, "GetWindowContext failed: %08x\n", hres); + ok(hres == S_OK, "GetWindowContext failed: %08lx\n", hres); ok(ip_frame != NULL, "ip_frame == NULL\n"); ok(ip_uiwindow != NULL, "ip_uiwindow == NULL\n"); ok((IOleInPlaceUIWindow*)ip_frame != ip_uiwindow, "ip_frame == ip_uiwindow\n"); @@ -1146,7 +1146,7 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, LPMSG lpms IOleInPlaceSiteEx_Release(ip_site); hres = IOleClientSite_ShowObject(client_site); - ok(hres == S_OK, "ShowObject failed: %08x\n", hres); + ok(hres == S_OK, "ShowObject failed: %08lx\n", hres); SET_EXPECT(InPlaceObject_GetWindow); SET_EXPECT(SetObjectRects); @@ -1217,7 +1217,7 @@ static HRESULT WINAPI OleObject_EnumAdvise(IOleObject *iface, IEnumSTATDATA **pp static HRESULT WINAPI OleObject_GetMiscStatus(IOleObject *iface, DWORD dwAspect, DWORD *pdwStatus) { CHECK_EXPECT(GetMiscStatus); - ok(dwAspect == DVASPECT_CONTENT, "dwAspect = %d\n", dwAspect); + ok(dwAspect == DVASPECT_CONTENT, "dwAspect = %ld\n", dwAspect); ok(pdwStatus != NULL, "pdwStatus == NULL\n"); *pdwStatus = OLEMISC_SETCLIENTSITEFIRST|OLEMISC_ACTIVATEWHENVISIBLE |OLEMISC_INSIDEOUT|OLEMISC_CANTLINKINSIDE|OLEMISC_RECOMPOSEONRESIZE; @@ -1301,10 +1301,10 @@ static HRESULT WINAPI OleInPlaceObject_InPlaceDeactivate(IOleInPlaceObjectWindow CHECK_EXPECT(InPlaceDeactivate); hres = IOleClientSite_QueryInterface(client_site, &IID_IOleInPlaceSite, (void**)&ip_site); - ok(hres == S_OK, "Could not get IOleInPlaceSite iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IOleInPlaceSite iface: %08lx\n", hres); hres = IOleInPlaceSite_OnInPlaceDeactivate(ip_site); - ok(hres == S_OK, "OnInPlaceDeactivate failed: %08x\n", hres); + ok(hres == S_OK, "OnInPlaceDeactivate failed: %08lx\n", hres); IOleInPlaceSite_Release(ip_site); return S_OK; @@ -1520,9 +1520,9 @@ static void test_elem_dispex(IDispatchEx *dispex) hres = IDispatchEx_GetDispID(dispex, str, 0, &id); CHECK_CALLED(GetIDsOfNames_scriptprop); SysFreeString(str); - ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + ok(hres == S_OK, "GetDispID failed: %08lx\n", hres); todo_wine - ok(id == DISPID_SCRIPTPROP, "id = %d\n", id); + ok(id == DISPID_SCRIPTPROP, "id = %ld\n", id); SET_EXPECT(Invoke_SECURITYCTX); SET_EXPECT(Invoke_SCRIPTPROP); @@ -1530,9 +1530,9 @@ static void test_elem_dispex(IDispatchEx *dispex) memset(&ei, 0, sizeof(ei)); V_VT(&v) = VT_EMPTY; hres = IDispatchEx_InvokeEx(dispex, id, LOCALE_NEUTRAL, DISPATCH_PROPERTYGET, &dp, &v, &ei, NULL); - ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); - ok(V_I4(&v) == 4, "V_I4(v) = %d\n", V_I4(&v)); + ok(V_I4(&v) == 4, "V_I4(v) = %ld\n", V_I4(&v)); CHECK_CALLED(Invoke_SECURITYCTX); CHECK_CALLED(Invoke_SCRIPTPROP); } @@ -1550,7 +1550,7 @@ static void test_iface_wrapping(IHTMLObjectElement *elem) SET_EXPECT(wrapped_Release); unk = (void*)0xdeadbeef; hres = IHTMLObjectElement_QueryInterface(elem, &IID_ITestActiveX, (void**)&unk); - ok(hres == S_OK, "QueryInterface(IID_ITestActiveX failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_ITestActiveX failed: %08lx\n", hres); CHECK_CALLED(QI_ITestActiveX); CHECK_CALLED(wrapped_AddRef); CHECK_CALLED(wrapped_Release); @@ -1568,17 +1568,17 @@ static void test_iface_wrapping(IHTMLObjectElement *elem) SET_EXPECT(wrapped_func); hres = ((HRESULT (WINAPI*)(IUnknown*,int,double))vtbl[63])(unk, 10, 32.0); - ok(hres == S_OK, "wrapped_func returned %08x\n", hres); + ok(hres == S_OK, "wrapped_func returned %08lx\n", hres); CHECK_CALLED(wrapped_func); hres = IUnknown_QueryInterface(unk, &IID_IHTMLObjectElement, (void**)&elem2); - ok(hres == S_OK, "Could not get IHTMLObjectElement from wrapped iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLObjectElement from wrapped iface: %08lx\n", hres); ok(iface_cmp((IUnknown*)elem2, (IUnknown*)elem), "elem2 != elem\n"); IHTMLObjectElement_Release(elem2); SET_EXPECT(wrapped_Release); ref = IUnknown_Release(unk); - ok(!ref, "ref=%d\n", ref); + ok(!ref, "ref=%ld\n", ref); CHECK_CALLED(wrapped_Release); SET_EXPECT(QI_ITestActiveX); @@ -1586,7 +1586,7 @@ static void test_iface_wrapping(IHTMLObjectElement *elem) SET_EXPECT(wrapped_Release); unk = (void*)0xdeadbeef; hres = IHTMLObjectElement_QueryInterface(elem, &IID_ITestActiveX, (void**)&unk2); - ok(hres == S_OK, "QueryInterface(IID_ITestActiveX failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_ITestActiveX failed: %08lx\n", hres); CHECK_CALLED(QI_ITestActiveX); CHECK_CALLED(wrapped_AddRef); CHECK_CALLED(wrapped_Release); @@ -1595,7 +1595,7 @@ static void test_iface_wrapping(IHTMLObjectElement *elem) SET_EXPECT(wrapped_Release); ref = IUnknown_Release(unk2); - ok(!ref, "ref=%d\n", ref); + ok(!ref, "ref=%ld\n", ref); CHECK_CALLED(wrapped_Release); } @@ -1611,41 +1611,41 @@ static void test_object_elem(IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); - ok(hres == S_OK, "Could not get IHTMLDocument3 iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLDocument3 iface: %08lx\n", hres); str = SysAllocString(L"objid"); elem = (void*)0xdeadbeef; hres = IHTMLDocument3_getElementById(doc3, str, &elem); IHTMLDocument3_Release(doc3); SysFreeString(str); - ok(hres == S_OK, "getElementById failed: %08x\n", hres); + ok(hres == S_OK, "getElementById failed: %08lx\n", hres); ok(elem != NULL, "elem == NULL\n"); hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLObjectElement, (void**)&objelem); IHTMLElement_Release(elem); - ok(hres == S_OK, "Could not get IHTMLObjectElement iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLObjectElement iface: %08lx\n", hres); SET_EXPECT(Invoke_SECURITYCTX); hres = IHTMLObjectElement_get_object(objelem, &disp); - ok(hres == S_OK, "get_object failed: %08x\n", hres); + ok(hres == S_OK, "get_object failed: %08lx\n", hres); ok(disp == &Dispatch, "disp != Dispatch\n"); CHECK_CALLED(Invoke_SECURITYCTX); hres = IHTMLObjectElement_QueryInterface(objelem, &IID_IDispatchEx, (void**)&dispex); - ok(hres == S_OK, "QueryInterface failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface failed: %08lx\n", hres); test_elem_dispex(dispex); IDispatchEx_Release(dispex); test_iface_wrapping(objelem); hres = IHTMLObjectElement_get_width(objelem, &v); - ok(hres == S_OK, "get_width failed: %08x\n", hres); + ok(hres == S_OK, "get_width failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(width) = %d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"300"), "V_BSTR(width) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); hres = IHTMLObjectElement_get_height(objelem, &v); - ok(hres == S_OK, "get_height failed: %08x\n", hres); + ok(hres == S_OK, "get_height failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(height) = %d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"200"), "V_BSTR(height) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -1655,12 +1655,12 @@ static void test_object_elem(IHTMLDocument2 *doc) SET_EXPECT(OnAmbientPropertyChange_UNKNOWN); SET_EXPECT(Invoke_ENABLED); hres = IHTMLObjectElement_put_width(objelem, v); - ok(hres == S_OK, "put_width failed: %08x\n", hres); + ok(hres == S_OK, "put_width failed: %08lx\n", hres); CHECK_CALLED(OnAmbientPropertyChange_UNKNOWN); CLEAR_CALLED(Invoke_ENABLED); /* Not called on IE10 */ hres = IHTMLObjectElement_get_width(objelem, &v); - ok(hres == S_OK, "get_width failed: %08x\n", hres); + ok(hres == S_OK, "get_width failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(width) = %d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"400"), "V_BSTR(width) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -1670,12 +1670,12 @@ static void test_object_elem(IHTMLDocument2 *doc) SET_EXPECT(OnAmbientPropertyChange_UNKNOWN); SET_EXPECT(Invoke_ENABLED); hres = IHTMLObjectElement_put_height(objelem, v); - ok(hres == S_OK, "put_height failed: %08x\n", hres); + ok(hres == S_OK, "put_height failed: %08lx\n", hres); CHECK_CALLED(OnAmbientPropertyChange_UNKNOWN); CLEAR_CALLED(Invoke_ENABLED); /* Not called on IE10 */ hres = IHTMLObjectElement_get_height(objelem, &v); - ok(hres == S_OK, "get_height failed: %08x\n", hres); + ok(hres == S_OK, "get_height failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(height) = %d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"250"), "V_BSTR(height) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -1694,31 +1694,31 @@ static void test_container(IHTMLDocument2 *doc_obj) container = NULL; hres = IOleClientSite_GetContainer(client_site, &container); - ok(hres == S_OK, "GetContainer failed: %08x\n", hres); + ok(hres == S_OK, "GetContainer failed: %08lx\n", hres); ok(container != NULL, "container == NULL\n"); hres = IHTMLDocument2_get_parentWindow(doc_obj, &parent_window); - ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + ok(hres == S_OK, "get_parentWindow failed: %08lx\n", hres); ok(parent_window != NULL, "parentWindow == NULL\n"); hres = IHTMLWindow2_get_document(parent_window, &doc); - ok(hres == S_OK, "get_document failed: %08x\n", hres); + ok(hres == S_OK, "get_document failed: %08lx\n", hres); ok(doc != NULL, "doc == NULL\n"); ok(iface_cmp((IUnknown*)doc, (IUnknown*)container), "container != doc\n"); IHTMLDocument2_Release(doc); hres = IOleClientSite_QueryInterface(client_site, &IID_IServiceProvider, (void**)&serv_prov); - ok(hres == S_OK, "Could not get IServiceProvider iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IServiceProvider iface: %08lx\n", hres); hres = IServiceProvider_QueryService(serv_prov, &IID_IHTMLWindow2, &IID_IHTMLWindow2, (void**)&html_window); - ok(hres == S_OK, "Could not get IHTMLWindow2 service: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLWindow2 service: %08lx\n", hres); todo_wine ok(!iface_cmp((IUnknown*)html_window, (IUnknown*)parent_window), "html_window != parent_window\n"); IHTMLWindow2_Release(html_window); SET_EXPECT(QueryService_TestActiveX); hres = IServiceProvider_QueryService(serv_prov, &CLSID_TestActiveX, &IID_IUnknown, (void**)&unk); - ok(hres == S_OK, "QueryService(CLSID_TestActiveX) failed: %08x\n", hres); + ok(hres == S_OK, "QueryService(CLSID_TestActiveX) failed: %08lx\n", hres); ok(unk == (IUnknown*)&OleObject, "unexpected unk %p\n", unk); CHECK_CALLED(QueryService_TestActiveX); IUnknown_Release(unk); @@ -1735,11 +1735,11 @@ static void test_ui_activate(void) HRESULT hres; hres = IOleClientSite_QueryInterface(client_site, &IID_IOleInPlaceSite, (void**)&ip_site); - ok(hres == S_OK, "Could not get IOleInPlaceSite iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IOleInPlaceSite iface: %08lx\n", hres); SET_EXPECT(Invoke_ENABLED); hres = IOleInPlaceSite_OnUIActivate(ip_site); - ok(hres == S_OK, "OnUIActivate failed: %08x\n", hres); + ok(hres == S_OK, "OnUIActivate failed: %08lx\n", hres); CLEAR_CALLED(Invoke_ENABLED); /* Not called on IE10 */ IOleInPlaceSite_Release(ip_site); @@ -2075,23 +2075,23 @@ static HRESULT WINAPI DocumentSite_ActivateMe(IOleDocumentSite *iface, IOleDocum HRESULT hres; hres = IOleDocumentView_QueryInterface(pViewToActivate, &IID_IOleDocument, (void**)&document); - ok(hres == S_OK, "could not get IOleDocument: %08x\n", hres); + ok(hres == S_OK, "could not get IOleDocument: %08lx\n", hres); hres = IOleDocument_CreateView(document, &InPlaceSite, NULL, 0, &view); IOleDocument_Release(document); - ok(hres == S_OK, "CreateView failed: %08x\n", hres); + ok(hres == S_OK, "CreateView failed: %08lx\n", hres); hres = IOleDocumentView_SetInPlaceSite(view, &InPlaceSite); - ok(hres == S_OK, "SetInPlaceSite failed: %08x\n", hres); + ok(hres == S_OK, "SetInPlaceSite failed: %08lx\n", hres); hres = IOleDocumentView_UIActivate(view, TRUE); - ok(hres == S_OK, "UIActivate failed: %08x\n", hres); + ok(hres == S_OK, "UIActivate failed: %08lx\n", hres); hres = IOleDocumentView_SetRect(view, &rect); - ok(hres == S_OK, "SetRect failed: %08x\n", hres); + ok(hres == S_OK, "SetRect failed: %08lx\n", hres); hres = IOleDocumentView_Show(view, TRUE); - ok(hres == S_OK, "Show failed: %08x\n", hres); + ok(hres == S_OK, "Show failed: %08lx\n", hres); return S_OK; } @@ -2194,7 +2194,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D static const WCHAR completeW[] = {'c','o','m','p','l','e','t','e',0}; hres = IHTMLDocument2_get_readyState(notif_doc, &state); - ok(hres == S_OK, "get_readyState failed: %08x\n", hres); + ok(hres == S_OK, "get_readyState failed: %08lx\n", hres); if(!lstrcmpW(state, completeW)) doc_complete = TRUE; @@ -2236,10 +2236,10 @@ static void doc_load_string(IHTMLDocument2 *doc, const char *str) mem = GlobalAlloc(0, len); memcpy(mem, str, len); hr = CreateStreamOnHGlobal(mem, TRUE, &stream); - ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create a stream, hr %#lx.\n", hr); hr = IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); - ok(hr == S_OK, "Failed to get IPersistStreamInit, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get IPersistStreamInit, hr %#lx.\n", hr); IPersistStreamInit_Load(init, stream); IPersistStreamInit_Release(init); @@ -2254,15 +2254,15 @@ static void do_advise(IUnknown *unk, REFIID riid, IUnknown *unk_advise) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IConnectionPointContainer, (void**)&container); - ok(hres == S_OK, "QueryInterface(IID_IConnectionPointContainer) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IConnectionPointContainer) failed: %08lx\n", hres); hres = IConnectionPointContainer_FindConnectionPoint(container, riid, &cp); IConnectionPointContainer_Release(container); - ok(hres == S_OK, "FindConnectionPoint failed: %08x\n", hres); + ok(hres == S_OK, "FindConnectionPoint failed: %08lx\n", hres); hres = IConnectionPoint_Advise(cp, unk_advise, &cookie); IConnectionPoint_Release(cp); - ok(hres == S_OK, "Advise failed: %08x\n", hres); + ok(hres == S_OK, "Advise failed: %08lx\n", hres); } static void set_client_site(IHTMLDocument2 *doc, BOOL set) @@ -2279,19 +2279,19 @@ static void set_client_site(IHTMLDocument2 *doc, BOOL set) } hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); - ok(hres == S_OK, "Could not et IOleObject: %08x\n", hres); + ok(hres == S_OK, "Could not et IOleObject: %08lx\n", hres); hres = IOleObject_SetClientSite(oleobj, set ? &ClientSite : NULL); - ok(hres == S_OK, "SetClientSite failed: %08x\n", hres); + ok(hres == S_OK, "SetClientSite failed: %08lx\n", hres); if(set) { IHlinkTarget *hlink; hres = IOleObject_QueryInterface(oleobj, &IID_IHlinkTarget, (void**)&hlink); - ok(hres == S_OK, "Could not get IHlinkTarget iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHlinkTarget iface: %08lx\n", hres); hres = IHlinkTarget_Navigate(hlink, 0, NULL); - ok(hres == S_OK, "Navgate failed: %08x\n", hres); + ok(hres == S_OK, "Navgate failed: %08lx\n", hres); IHlinkTarget_Release(hlink); } @@ -2305,7 +2305,7 @@ static IHTMLDocument2 *create_document(void) hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IHTMLDocument2, (void**)&doc); - ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); + ok(hres == S_OK, "CoCreateInstance failed: %08lx\n", hres); return doc; } @@ -2334,7 +2334,7 @@ static void release_doc(IHTMLDocument2 *doc) set_client_site(doc, FALSE); ref = IHTMLDocument2_Release(doc); - ok(!ref || broken(ref == 1) /* Vista */, "ref = %d\n", ref); + ok(!ref || broken(ref == 1) /* Vista */, "ref = %ld\n", ref); if(client_site) { IOleClientSite_Release(client_site); @@ -2346,7 +2346,7 @@ static void release_doc(IHTMLDocument2 *doc) plugin_hwnd = NULL; } - ok(!activex_refcnt, "activex_refcnt = %d\n", activex_refcnt); + ok(!activex_refcnt, "activex_refcnt = %ld\n", activex_refcnt); } static void init_test(int behavior) @@ -2367,7 +2367,7 @@ static void test_event_call(void) V_VT(&res) = VT_EMPTY; hres = IDispatch_Invoke(sink_disp, 1, &IID_NULL, 0, DISPATCH_METHOD, &dp, &res, &ei, NULL); - ok(hres == S_OK, "Invoke failed: %08x\n", hres); + ok(hres == S_OK, "Invoke failed: %08lx\n", hres); ok(V_VT(&res) == VT_I4 && V_I4(&res) == 6, "unexpected result\n"); V_VT(args) = VT_I4; @@ -2377,12 +2377,12 @@ static void test_event_call(void) dp.cArgs = 2; V_VT(&res) = VT_EMPTY; hres = IDispatch_Invoke(sink_disp, 2, &IID_NULL, 0, DISPATCH_METHOD, &dp, &res, &ei, NULL); - ok(hres == S_OK, "Invoke failed: %08x\n", hres); - ok(V_VT(&res) == VT_I4 && V_I4(&res) == 7, "unexpected result: %d\n", V_I4(&res)); + ok(hres == S_OK, "Invoke failed: %08lx\n", hres); + ok(V_VT(&res) == VT_I4 && V_I4(&res) == 7, "unexpected result: %ld\n", V_I4(&res)); V_VT(&res) = VT_ERROR; hres = IDispatch_Invoke(sink_disp, 10, &IID_NULL, 0, DISPATCH_METHOD, &dp, &res, &ei, NULL); - ok(hres == S_OK, "Invoke failed: %08x\n", hres); + ok(hres == S_OK, "Invoke failed: %08lx\n", hres); ok(V_VT(&res) == VT_EMPTY, "V_VT(res) = %d\n", V_VT(&res)); } @@ -2592,13 +2592,13 @@ static void test_exec_script(IHTMLDocument2 *doc, const WCHAR *codew, const WCHA HRESULT hres; hres = IHTMLDocument2_get_parentWindow(doc, &window); - ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + ok(hres == S_OK, "get_parentWindow failed: %08lx\n", hres); code = SysAllocString(codew); lang = SysAllocString(langw); hres = IHTMLWindow2_execScript(window, code, lang, &v); - ok(hres == S_OK, "execScript failed: %08x\n", hres); + ok(hres == S_OK, "execScript failed: %08lx\n", hres); SysFreeString(lang); VariantClear(&v); @@ -2684,13 +2684,13 @@ static void load_typelib(void) GetModuleFileNameW(NULL, path, MAX_PATH); hres = LoadTypeLib(path, &typelib); - ok(hres == S_OK, "LoadTypeLib failed: %08x\n", hres); + ok(hres == S_OK, "LoadTypeLib failed: %08lx\n", hres); hres = ITypeLib_GetTypeInfoOfGuid(typelib, &DIID_DispActiveXTest, &actxtest_typeinfo); - ok(hres == S_OK, "GetTypeInfoOfGuid(DIID_DispActiveXTest) failed: %08x\n", hres); + ok(hres == S_OK, "GetTypeInfoOfGuid(DIID_DispActiveXTest) failed: %08lx\n", hres); hres = ITypeLib_GetTypeInfoOfGuid(typelib, &CLSID_ActiveXTest, &class_typeinfo); - ok(hres == S_OK, "GetTypeInfoOfGuid(CLSID_ActiveXTest) failed: %08x\n", hres); + ok(hres == S_OK, "GetTypeInfoOfGuid(CLSID_ActiveXTest) failed: %08lx\n", hres); ITypeLib_Release(typelib); } @@ -2738,7 +2738,7 @@ static BOOL register_activex(void) hres = CoRegisterClassObject(&CLSID_TestActiveX, (IUnknown*)&activex_cf, CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, ®id); - ok(hres == S_OK, "Could not register control: %08x\n", hres); + ok(hres == S_OK, "Could not register control: %08lx\n", hres); return TRUE; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 0c065a2da7e..b66073f632a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -592,7 +592,7 @@ static IHTMLDocument2 *create_document(void) hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IHTMLDocument2, (void**)&doc); - ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); + ok(hres == S_OK, "CoCreateInstance failed: %08lx\n", hres); if(FAILED(hres)) return NULL; @@ -614,7 +614,7 @@ static IDispatchEx *_get_dispex_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IDispatchEx, (void**)&dispex); - ok_(__FILE__,line) (hres == S_OK, "Could not get IDispatchEx: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IDispatchEx: %08lx\n", hres); return dispex; } @@ -627,7 +627,7 @@ static void _test_ifaces(unsigned line, IUnknown *iface, REFIID *iids) for(piid = iids; *piid; piid++) { hres = IUnknown_QueryInterface(iface, *piid, (void**)&unk); - ok_(__FILE__,line) (hres == S_OK, "Could not get %s interface: %08x\n", wine_dbgstr_guid(*piid), hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get %s interface: %08lx\n", wine_dbgstr_guid(*piid), hres); if(SUCCEEDED(hres)) IUnknown_Release(unk); } @@ -641,7 +641,7 @@ static void _test_no_iface(unsigned line, IUnknown *iface, REFIID iid) unk = (void*)0xdeadbeef; hres = IUnknown_QueryInterface(iface, iid, (void**)&unk); - ok_(__FILE__,line)(hres == E_NOINTERFACE, "hres = %08x, expected E_NOINTERFACE\n", hres); + ok_(__FILE__,line)(hres == E_NOINTERFACE, "hres = %08lx, expected E_NOINTERFACE\n", hres); ok_(__FILE__,line)(!unk, "unk = %p\n", unk); } @@ -656,17 +656,17 @@ static BOOL _test_get_dispid(unsigned line, IUnknown *unk, IID *iid) ticnt = 0xdeadbeef; hres = IDispatchEx_GetTypeInfoCount(dispex, &ticnt); - ok_(__FILE__,line) (hres == S_OK, "GetTypeInfoCount failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "GetTypeInfoCount failed: %08lx\n", hres); ok_(__FILE__,line) (ticnt == 1, "ticnt=%u\n", ticnt); hres = IDispatchEx_GetTypeInfo(dispex, 0, 0, &typeinfo); - ok_(__FILE__,line) (hres == S_OK, "GetTypeInfo failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "GetTypeInfo failed: %08lx\n", hres); if(SUCCEEDED(hres)) { TYPEATTR *type_attr; hres = ITypeInfo_GetTypeAttr(typeinfo, &type_attr); - ok_(__FILE__,line) (hres == S_OK, "GetTypeAttr failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "GetTypeAttr failed: %08lx\n", hres); if(hres == S_OK) { *iid = type_attr->guid; ret = TRUE; @@ -691,7 +691,7 @@ static void _test_disp_value(unsigned line, IUnknown *unk, const WCHAR *val) hres = IDispatchEx_InvokeEx(dispex, DISPID_VALUE, 0, DISPATCH_PROPERTYGET, &dp, &var, &ei, NULL); IDispatchEx_Release(dispex); - ok_(__FILE__,line)(hres == S_OK, "InvokeEx(DISPID_VALUE) returned: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "InvokeEx(DISPID_VALUE) returned: %08lx\n", hres); ok_(__FILE__,line)(V_VT(&var) == VT_BSTR, "V_VT(value) = %d\n", V_VT(&var)); ok_(__FILE__,line)(!lstrcmpW(V_BSTR(&var), val), "value = %s, expected %s\n", wine_dbgstr_w(V_BSTR(&var)), wine_dbgstr_w(val)); @@ -709,12 +709,12 @@ static void _test_class_info(unsigned line, IUnknown *unk, const CLSID *clsid) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IProvideClassInfo2, (void**)&classinfo); - ok_(__FILE__,line)(hres == S_OK, "Could not get IProvideClassInfo2 interface: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "Could not get IProvideClassInfo2 interface: %08lx\n", hres); if(FAILED(hres)) return; hres = IProvideClassInfo2_GetClassInfo(classinfo, &typeinfo); - ok_(__FILE__,line)(hres == S_OK, "Could not get ITypeInfo interface: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "Could not get ITypeInfo interface: %08lx\n", hres); if(FAILED(hres)) { IProvideClassInfo2_Release(classinfo); @@ -722,7 +722,7 @@ static void _test_class_info(unsigned line, IUnknown *unk, const CLSID *clsid) } hres = ITypeInfo_GetTypeAttr(typeinfo, &type_attr); - ok_(__FILE__,line)(hres == S_OK, "GetTypeAttr failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "GetTypeAttr failed: %08lx\n", hres); if(SUCCEEDED(hres)) { ok_(__FILE__,line)(IsEqualGUID(&type_attr->guid, clsid), @@ -737,13 +737,13 @@ static void _test_class_info(unsigned line, IUnknown *unk, const CLSID *clsid) hres = IUnknown_QueryInterface(unk, &IID_IProvideMultipleClassInfo, (void**)&multiple_classinfo); if(IsEqualGUID(clsid, &CLSID_HTMLXMLHttpRequest)) { - ok_(__FILE__,line)(hres == E_NOINTERFACE, "Could not get IProvideClassInfo2 interface: %08x\n", hres); + ok_(__FILE__,line)(hres == E_NOINTERFACE, "Could not get IProvideClassInfo2 interface: %08lx\n", hres); }else { - ok_(__FILE__,line)(hres == S_OK, "Could not get IProvideClassInfo2 interface: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "Could not get IProvideClassInfo2 interface: %08lx\n", hres); hres = IProvideMultipleClassInfo_GetMultiTypeInfoCount(multiple_classinfo, &count); - ok_(__FILE__,line)(hres == S_OK, "GetMultiTypeInfoCount failed: %08x\n", hres); - ok_(__FILE__,line)(count > 0, "count = %u\n", count); + ok_(__FILE__,line)(hres == S_OK, "GetMultiTypeInfoCount failed: %08lx\n", hres); + ok_(__FILE__,line)(count > 0, "count = %lu\n", count); IProvideMultipleClassInfo_Release(multiple_classinfo); } @@ -804,11 +804,11 @@ static void _set_dispex_value(unsigned line, IUnknown *unk, const WCHAR *name, V str = SysAllocString(name); hres = IDispatchEx_GetDispID(dispex, str, fdexNameEnsure|fdexNameCaseInsensitive, &id); SysFreeString(str); - ok_(__FILE__,line)(hres == S_OK, "GetDispID failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "GetDispID failed: %08lx\n", hres); memset(&ei, 0, sizeof(ei)); hres = IDispatchEx_InvokeEx(dispex, id, LOCALE_NEUTRAL, INVOKE_PROPERTYPUT, &dp, NULL, &ei, NULL); - ok_(__FILE__,line)(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "InvokeEx failed: %08lx\n", hres); } @@ -819,7 +819,7 @@ static IHTMLElement *_get_elem_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLElement, (void**)&elem); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElement: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElement: %08lx\n", hres); return elem; } @@ -830,7 +830,7 @@ static IHTMLElement2 *_get_elem2_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLElement2, (void**)&elem); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElement2: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElement2: %08lx\n", hres); return elem; } @@ -841,7 +841,7 @@ static IHTMLElement3 *_get_elem3_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLElement3, (void**)&elem); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElement3: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElement3: %08lx\n", hres); return elem; } @@ -852,7 +852,7 @@ static IHTMLElement4 *_get_elem4_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLElement4, (void**)&elem); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElement4: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElement4: %08lx\n", hres); return elem; } @@ -863,7 +863,7 @@ static IHTMLDocument3 *_get_doc3_iface(unsigned line, IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDocument3 interface: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDocument3 interface: %08lx\n", hres); return doc3; } @@ -875,7 +875,7 @@ static IHTMLDOMNode *_get_node_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLDOMNode, (void**)&node); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDOMNode: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDOMNode: %08lx\n", hres); return node; } @@ -886,7 +886,7 @@ static IHTMLDOMNode2 *_get_node2_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLDOMNode2, (void**)&node); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDOMNode2: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDOMNode2: %08lx\n", hres); return node; } @@ -897,7 +897,7 @@ static IHTMLDocument5 *_get_htmldoc5_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLDocument5, (void**)&doc); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDocument5: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDocument5: %08lx\n", hres); return doc; } @@ -908,7 +908,7 @@ static IHTMLImgElement *_get_img_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLImgElement, (void**)&img); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLImgElement: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLImgElement: %08lx\n", hres); return img; } @@ -919,7 +919,7 @@ static IHTMLAnchorElement *_get_anchor_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLAnchorElement, (void**)&anchor); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLAnchorElement: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLAnchorElement: %08lx\n", hres); return anchor; } @@ -930,7 +930,7 @@ static IHTMLAreaElement *_get_area_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLAreaElement, (void**)&area); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLAreaElement: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLAreaElement: %08lx\n", hres); return area; } @@ -941,7 +941,7 @@ static IHTMLTextAreaElement *_get_textarea_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLTextAreaElement, (void**)&textarea); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLTextAreaElement: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLTextAreaElement: %08lx\n", hres); return textarea; } @@ -952,7 +952,7 @@ static IHTMLSelectElement *_get_select_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLSelectElement, (void**)&select); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLSelectElement: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLSelectElement: %08lx\n", hres); return select; } @@ -963,7 +963,7 @@ static IHTMLOptionElement *_get_option_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLOptionElement, (void**)&option); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLOptionElement: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLOptionElement: %08lx\n", hres); return option; } @@ -974,7 +974,7 @@ static IHTMLFormElement *_get_form_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLFormElement, (void**)&form); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLFormElement: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLFormElement: %08lx\n", hres); return form; } @@ -985,7 +985,7 @@ static IHTMLDOMTextNode *_get_text_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLDOMTextNode, (void**)&text); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDOMTextNode: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDOMTextNode: %08lx\n", hres); return text; } @@ -996,7 +996,7 @@ static IHTMLDOMTextNode2 *_get_text2_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLDOMTextNode2, (void**)&text2); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDOMTextNode2: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDOMTextNode2: %08lx\n", hres); return text2; } @@ -1007,7 +1007,7 @@ static IHTMLCommentElement *_get_comment_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLCommentElement, (void**)&comment); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLCommentElement: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLCommentElement: %08lx\n", hres); return comment; } @@ -1018,7 +1018,7 @@ static IHTMLObjectElement *_get_object_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLObjectElement, (void**)&obj); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLObjectElement: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLObjectElement: %08lx\n", hres); return obj; } @@ -1029,7 +1029,7 @@ static IHTMLStyleElement *_get_style_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLStyleElement, (void**)&obj); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLStyleElement: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLStyleElement: %08lx\n", hres); return obj; } @@ -1040,7 +1040,7 @@ static IHTMLMetaElement *_get_metaelem_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLMetaElement, (void**)&ret); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLMetaElement: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLMetaElement: %08lx\n", hres); return ret; } @@ -1051,7 +1051,7 @@ static IHTMLLinkElement *_get_link_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLLinkElement, (void**)&ret); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLLinkElement: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLLinkElement: %08lx\n", hres); return ret; } @@ -1062,7 +1062,7 @@ static IHTMLIFrameElement2 *_get_iframe2_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLIFrameElement2, (void**)&ret); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLIFrameElement: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLIFrameElement: %08lx\n", hres); return ret; } @@ -1073,7 +1073,7 @@ static IHTMLButtonElement *_get_button_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLButtonElement, (void**)&ret); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLButtonElement: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLButtonElement: %08lx\n", hres); return ret; } @@ -1084,7 +1084,7 @@ static IHTMLLabelElement *_get_label_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLLabelElement, (void**)&ret); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLLabelElement: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLLabelElement: %08lx\n", hres); return ret; } @@ -1095,7 +1095,7 @@ static IHTMLDOMAttribute2 *_get_attr2_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLDOMAttribute2, (void**)&ret); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDOMAttribute2: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDOMAttribute2: %08lx\n", hres); return ret; } @@ -1108,14 +1108,14 @@ static void _test_node_name(unsigned line, IUnknown *unk, const WCHAR *exname) HRESULT hres; hres = IHTMLDOMNode_get_nodeName(node, &name); - ok_(__FILE__, line) (hres == S_OK, "get_nodeName failed: %08x\n", hres); + ok_(__FILE__, line) (hres == S_OK, "get_nodeName failed: %08lx\n", hres); ok_(__FILE__, line) (!lstrcmpW(name, exname), "got name: %s, expected %s\n", wine_dbgstr_w(name), wine_dbgstr_w(exname)); SysFreeString(name); hres = IHTMLDOMNode_QueryInterface(node, &IID_IHTMLElement6, (void**)&elem); if(SUCCEEDED(hres)) { hres = IHTMLElement6_get_nodeName(elem, &name); - ok_(__FILE__, line) (hres == S_OK, "(elem) get_nodeName failed: %08x\n", hres); + ok_(__FILE__, line) (hres == S_OK, "(elem) get_nodeName failed: %08lx\n", hres); ok_(__FILE__, line) (!lstrcmpW(name, exname), "(elem) got name: %s, expected %s\n", wine_dbgstr_w(name), wine_dbgstr_w(exname)); SysFreeString(name); @@ -1135,12 +1135,12 @@ static IHTMLDocument2 *_get_owner_doc(unsigned line, IUnknown *unk) hres = IHTMLDOMNode2_get_ownerDocument(node, &disp); IHTMLDOMNode2_Release(node); - ok_(__FILE__,line)(hres == S_OK, "get_ownerDocument failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_ownerDocument failed: %08lx\n", hres); if(disp) { hres = IDispatch_QueryInterface(disp, &IID_IHTMLDocument2, (void**)&doc); IDispatch_Release(disp); - ok_(__FILE__,line)(hres == S_OK, "Could not get IHTMLDocument2 iface: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "Could not get IHTMLDocument2 iface: %08lx\n", hres); } return doc; @@ -1154,7 +1154,7 @@ static IHTMLWindow2 *_get_doc_window(unsigned line, IHTMLDocument2 *doc) window = NULL; hres = IHTMLDocument2_get_parentWindow(doc, &window); - ok_(__FILE__,line)(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_parentWindow failed: %08lx\n", hres); ok_(__FILE__,line)(window != NULL, "window == NULL\n"); return window; @@ -1169,7 +1169,7 @@ static IHTMLDOMNode *_clone_node(unsigned line, IUnknown *unk, VARIANT_BOOL deep hres = IHTMLDOMNode_cloneNode(node, deep, &ret); IHTMLDOMNode_Release(node); - ok_(__FILE__,line)(hres == S_OK, "cloneNode failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "cloneNode failed: %08lx\n", hres); ok_(__FILE__,line)(ret != NULL, "ret == NULL\n"); return ret; @@ -1185,14 +1185,14 @@ static void _test_elem_tag(unsigned line, IUnknown *unk, const WCHAR *extag) HRESULT hres; hres = IHTMLElement_get_tagName(elem, &tag); - ok_(__FILE__, line) (hres == S_OK, "get_tagName failed: %08x\n", hres); + ok_(__FILE__, line) (hres == S_OK, "get_tagName failed: %08lx\n", hres); ok_(__FILE__, line) (!lstrcmpW(tag, extag), "got tag: %s, expected %s\n", wine_dbgstr_w(tag), wine_dbgstr_w(extag)); SysFreeString(tag); hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLElement6, (void**)&elem6); if(SUCCEEDED(hres)) { hres = IHTMLElement6_get_tagName(elem6, &tag); - ok_(__FILE__, line)(hres == S_OK, "(elem6) get_tagName failed: %08x\n", hres); + ok_(__FILE__, line)(hres == S_OK, "(elem6) get_tagName failed: %08lx\n", hres); ok_(__FILE__, line)(!lstrcmpW(tag, extag), "(elem6) got tag: %s, expected %s\n", wine_dbgstr_w(tag), wine_dbgstr_w(extag)); SysFreeString(tag); @@ -1225,7 +1225,7 @@ static LONG _get_node_type(unsigned line, IUnknown *unk) HRESULT hres; hres = IHTMLDOMNode_get_nodeType(node, &type); - ok(hres == S_OK, "get_nodeType failed: %08x\n", hres); + ok(hres == S_OK, "get_nodeType failed: %08lx\n", hres); IHTMLDOMNode_Release(node); @@ -1242,13 +1242,13 @@ static IHTMLDOMChildrenCollection *_get_child_nodes(unsigned line, IUnknown *unk hres = IHTMLDOMNode_get_childNodes(node, &disp); IHTMLDOMNode_Release(node); - ok_(__FILE__,line) (hres == S_OK, "get_childNodes failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_childNodes failed: %08lx\n", hres); if(FAILED(hres)) return NULL; hres = IDispatch_QueryInterface(disp, &IID_IHTMLDOMChildrenCollection, (void**)&col); IDispatch_Release(disp); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDOMChildrenCollection: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDOMChildrenCollection: %08lx\n", hres); return col; } @@ -1261,7 +1261,7 @@ static IHTMLDOMNode *_get_child_item(unsigned line, IHTMLDOMChildrenCollection * HRESULT hres; hres = IHTMLDOMChildrenCollection_item(col, idx, &disp); - ok(hres == S_OK, "item failed: %08x\n", hres); + ok(hres == S_OK, "item failed: %08lx\n", hres); node = _get_node_iface(line, (IUnknown*)disp); IDispatch_Release(disp); @@ -1281,7 +1281,7 @@ static void _test_elem_attr(unsigned line, IHTMLElement *elem, const WCHAR *name tmp = SysAllocString(name); hres = IHTMLElement_getAttribute(elem, tmp, 0, &value); SysFreeString(tmp); - ok_(__FILE__,line) (hres == S_OK, "getAttribute failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "getAttribute failed: %08lx\n", hres); if(exval) { ok_(__FILE__,line) (V_VT(&value) == VT_BSTR, "vt=%d\n", V_VT(&value)); @@ -1302,19 +1302,19 @@ static void _test_elem_offset(unsigned line, IUnknown *unk, const WCHAR *parent_ HRESULT hres; hres = IHTMLElement_get_offsetTop(elem, &l); - ok_(__FILE__,line) (hres == S_OK, "get_offsetTop failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_offsetTop failed: %08lx\n", hres); hres = IHTMLElement_get_offsetHeight(elem, &l); - ok_(__FILE__,line) (hres == S_OK, "get_offsetHeight failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_offsetHeight failed: %08lx\n", hres); hres = IHTMLElement_get_offsetWidth(elem, &l); - ok_(__FILE__,line) (hres == S_OK, "get_offsetWidth failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_offsetWidth failed: %08lx\n", hres); hres = IHTMLElement_get_offsetLeft(elem, &l); - ok_(__FILE__,line) (hres == S_OK, "get_offsetLeft failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_offsetLeft failed: %08lx\n", hres); hres = IHTMLElement_get_offsetParent(elem, &off_parent); - ok_(__FILE__,line) (hres == S_OK, "get_offsetParent failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_offsetParent failed: %08lx\n", hres); IHTMLElement_Release(elem); if(off_parent) { @@ -1332,8 +1332,8 @@ static void _test_elem_source_index(unsigned line, IHTMLElement *elem, int index HRESULT hres; hres = IHTMLElement_get_sourceIndex(elem, &l); - ok_(__FILE__,line)(hres == S_OK, "get_sourceIndex failed: %08x\n", hres); - ok_(__FILE__,line)(l == index, "sourceIndex = %d, expected %d\n", l, index); + ok_(__FILE__,line)(hres == S_OK, "get_sourceIndex failed: %08lx\n", hres); + ok_(__FILE__,line)(l == index, "sourceIndex = %ld, expected %d\n", l, index); } #define get_doc_node(d) _get_doc_node(__LINE__,d) @@ -1344,10 +1344,10 @@ static IHTMLDocument2 *_get_doc_node(unsigned line, IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLDocument2_get_parentWindow(doc, &window); - ok_(__FILE__,line)(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_parentWindow failed: %08lx\n", hres); hres = IHTMLWindow2_get_document(window, &ret); - ok_(__FILE__,line)(hres == S_OK, "get_document failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_document failed: %08lx\n", hres); ok_(__FILE__,line)(ret != NULL, "document = NULL\n"); return ret; @@ -1360,7 +1360,7 @@ static void _test_window_name(unsigned line, IHTMLWindow2 *window, const WCHAR * HRESULT hres; hres = IHTMLWindow2_get_name(window, &name); - ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08lx\n", hres); if(exname) ok_(__FILE__,line)(!lstrcmpW(name, exname), "name = %s\n", wine_dbgstr_w(name)); else @@ -1377,7 +1377,7 @@ static void _set_window_name(unsigned line, IHTMLWindow2 *window, const WCHAR *n str = SysAllocString(name); hres = IHTMLWindow2_put_name(window, str); SysFreeString(str); - ok_(__FILE__,line)(hres == S_OK, "put_name failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_name failed: %08lx\n", hres); _test_window_name(line, window, name); } @@ -1390,7 +1390,7 @@ static void _test_window_status(unsigned line, IHTMLWindow2 *window) status = (void*)0xdeadbeef; hres = IHTMLWindow2_get_status(window, &status); - ok_(__FILE__,line)(hres == S_OK, "get_status failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_status failed: %08lx\n", hres); ok_(__FILE__,line)(!status, "status = %s\n", wine_dbgstr_w(status)); SysFreeString(status); } @@ -1404,7 +1404,7 @@ static void _set_window_status(unsigned line, IHTMLWindow2 *window, const WCHAR str = SysAllocString(status); hres = IHTMLWindow2_put_status(window, str); SysFreeString(str); - ok_(__FILE__,line)(hres == S_OK, "put_status failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_status failed: %08lx\n", hres); } #define test_window_length(w,l) _test_window_length(__LINE__,w,l) @@ -1414,8 +1414,8 @@ static void _test_window_length(unsigned line, IHTMLWindow2 *window, LONG exlen) HRESULT hres; hres = IHTMLWindow2_get_length(window, &length); - ok_(__FILE__,line)(hres == S_OK, "get_length failed: %08x\n", hres); - ok_(__FILE__,line)(length == exlen, "length = %d, expected %d\n", length, exlen); + ok_(__FILE__,line)(hres == S_OK, "get_length failed: %08lx\n", hres); + ok_(__FILE__,line)(length == exlen, "length = %ld, expected %ld\n", length, exlen); } #define get_frame_content_window(e) _get_frame_content_window(__LINE__,e) @@ -1426,12 +1426,12 @@ static IHTMLWindow2 *_get_frame_content_window(unsigned line, IUnknown *elem) HRESULT hres; hres = IUnknown_QueryInterface(elem, &IID_IHTMLFrameBase2, (void**)&base2); - ok(hres == S_OK, "Could not get IHTMFrameBase2 iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMFrameBase2 iface: %08lx\n", hres); window = NULL; hres = IHTMLFrameBase2_get_contentWindow(base2, &window); IHTMLFrameBase2_Release(base2); - ok(hres == S_OK, "get_contentWindow failed: %08x\n", hres); + ok(hres == S_OK, "get_contentWindow failed: %08lx\n", hres); ok(window != NULL, "contentWindow = NULL\n"); return window; @@ -1447,16 +1447,16 @@ static void test_get_set_attr(IHTMLDocument2 *doc) /* grab an element to test with */ hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); - ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument3) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument3) failed: %08lx\n", hres); hres = IHTMLDocument3_get_documentElement(doc3, &elem); IHTMLDocument3_Release(doc3); - ok(hres == S_OK, "get_documentElement failed: %08x\n", hres); + ok(hres == S_OK, "get_documentElement failed: %08lx\n", hres); /* get a non-present attribute */ bstr = SysAllocString(L"notAnAttribute"); hres = IHTMLElement_getAttribute(elem, bstr, 0, &val); - ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + ok(hres == S_OK, "getAttribute failed: %08lx\n", hres); ok(V_VT(&val) == VT_NULL, "variant type should have been VT_NULL (0x%x), was: 0x%x\n", VT_NULL, V_VT(&val)); VariantClear(&val); SysFreeString(bstr); @@ -1464,7 +1464,7 @@ static void test_get_set_attr(IHTMLDocument2 *doc) /* get a present attribute */ bstr = SysAllocString(L"scrollHeight"); hres = IHTMLElement_getAttribute(elem, bstr, 0, &val); - ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + ok(hres == S_OK, "getAttribute failed: %08lx\n", hres); ok(V_VT(&val) == VT_I4, "variant type should have been VT_I4 (0x%x), was: 0x%x\n", VT_I4, V_VT(&val)); VariantClear(&val); SysFreeString(bstr); @@ -1475,11 +1475,11 @@ static void test_get_set_attr(IHTMLDocument2 *doc) V_VT(&val) = VT_BSTR; V_BSTR(&val) = SysAllocString(L"the value"); hres = IHTMLElement_setAttribute(elem, bstr, val, 0); - ok(hres == S_OK, "setAttribute failed: %08x\n", hres); + ok(hres == S_OK, "setAttribute failed: %08lx\n", hres); VariantClear(&val); hres = IHTMLElement_getAttribute(elem, bstr, 0, &val); - ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + ok(hres == S_OK, "getAttribute failed: %08lx\n", hres); ok(V_VT(&val) == VT_BSTR, "variant type should have been VT_BSTR (0x%x), was: 0x%x\n", VT_BSTR, V_VT(&val)); ok(lstrcmpW(V_BSTR(&val), L"the value") == 0, "variant value should have been L\"the value\", was %s\n", wine_dbgstr_w(V_BSTR(&val))); VariantClear(&val); @@ -1488,11 +1488,11 @@ static void test_get_set_attr(IHTMLDocument2 *doc) V_VT(&val) = VT_BOOL; V_BOOL(&val) = VARIANT_TRUE; hres = IHTMLElement_setAttribute(elem, bstr, val, 0); - ok(hres == S_OK, "setAttribute failed: %08x\n", hres); + ok(hres == S_OK, "setAttribute failed: %08lx\n", hres); VariantClear(&val); hres = IHTMLElement_getAttribute(elem, bstr, 0, &val); - ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + ok(hres == S_OK, "getAttribute failed: %08lx\n", hres); ok(V_VT(&val) == VT_BOOL, "variant type should have been VT_BOOL (0x%x), was: 0x%x\n", VT_BOOL, V_VT(&val)); ok(V_BOOL(&val) == VARIANT_TRUE, "variant value should have been VARIANT_TRUE (0x%x), was %d\n", VARIANT_TRUE, V_BOOL(&val)); VariantClear(&val); @@ -1502,7 +1502,7 @@ static void test_get_set_attr(IHTMLDocument2 *doc) /* case-insensitive */ bstr = SysAllocString(L"newattribute"); hres = IHTMLElement_getAttribute(elem, bstr, 0, &val); - ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + ok(hres == S_OK, "getAttribute failed: %08lx\n", hres); ok(V_VT(&val) == VT_BOOL, "variant type should have been VT_BOOL (0x%x), was: 0x%x\n", VT_BOOL, V_VT(&val)); ok(V_BOOL(&val) == VARIANT_TRUE, "variant value should have been VARIANT_TRUE (0x%x), was %d\n", VARIANT_TRUE, V_BOOL(&val)); VariantClear(&val); @@ -1510,10 +1510,10 @@ static void test_get_set_attr(IHTMLDocument2 *doc) /* overwrite the attribute with null */ V_VT(&val) = VT_NULL; hres = IHTMLElement_setAttribute(elem, bstr, val, 0); - ok(hres == S_OK, "setAttribute failed: %08x\n", hres); + ok(hres == S_OK, "setAttribute failed: %08lx\n", hres); hres = IHTMLElement_getAttribute(elem, bstr, 2, &val); - ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + ok(hres == S_OK, "getAttribute failed: %08lx\n", hres); ok(V_VT(&val) == VT_BSTR, "V_VT(val) = %u, expected VT_BSTR\n", V_VT(&val)); ok(!lstrcmpW(V_BSTR(&val), L"null"), "V_BSTR(val) = %s, expected \"null\"\n", wine_dbgstr_w(V_BSTR(&val))); VariantClear(&val); @@ -1530,9 +1530,9 @@ static IHTMLElement *_get_doc_elem(unsigned line, IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDocument3 interface: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDocument3 interface: %08lx\n", hres); hres = IHTMLDocument3_get_documentElement(doc3, &elem); - ok_(__FILE__,line) (hres == S_OK, "get_documentElement failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_documentElement failed: %08lx\n", hres); IHTMLDocument3_Release(doc3); return elem; @@ -1546,7 +1546,7 @@ static void _test_anchor_href(unsigned line, IUnknown *unk, const WCHAR *exhref) HRESULT hres; hres = IHTMLAnchorElement_get_href(anchor, &str); - ok_(__FILE__,line)(hres == S_OK, "get_href failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_href failed: %08lx\n", hres); ok_(__FILE__,line)(!lstrcmpW(str, exhref), "href = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(exhref)); SysFreeString(str); @@ -1562,7 +1562,7 @@ static void _test_anchor_put_href(unsigned line, IUnknown *unk, const WCHAR *exh str = SysAllocString(exhref); hres = IHTMLAnchorElement_put_href(anchor, str); - ok_(__FILE__,line)(hres == S_OK, "get_href failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_href failed: %08lx\n", hres); SysFreeString(str); _test_disp_value(line, unk, exhref); @@ -1576,7 +1576,7 @@ static void _test_anchor_rel(unsigned line, IUnknown *unk, const WCHAR *exrel) HRESULT hres; hres = IHTMLAnchorElement_get_rel(anchor, &str); - ok_(__FILE__,line)(hres == S_OK, "get_rel failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_rel failed: %08lx\n", hres); if(exrel) ok_(__FILE__,line)(!lstrcmpW(str, exrel), "rel = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(exrel)); else @@ -1593,7 +1593,7 @@ static void _test_anchor_put_rel(unsigned line, IUnknown *unk, const WCHAR *exre str = SysAllocString(exrel); hres = IHTMLAnchorElement_put_rel(anchor, str); - ok_(__FILE__,line)(hres == S_OK, "get_rel failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_rel failed: %08lx\n", hres); SysFreeString(str); } @@ -1605,7 +1605,7 @@ static void _test_anchor_get_target(unsigned line, IUnknown *unk, const WCHAR *t HRESULT hres; hres = IHTMLAnchorElement_get_target(anchor, &str); - ok_(__FILE__,line)(hres == S_OK, "get_target failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_target failed: %08lx\n", hres); if(target) ok_(__FILE__,line)(!lstrcmpW(str, target), "target = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(target)); else @@ -1622,7 +1622,7 @@ static void _test_anchor_put_target(unsigned line, IUnknown *unk, const WCHAR *t str = target ? SysAllocString(target) : NULL; hres = IHTMLAnchorElement_put_target(anchor, str); - ok_(__FILE__,line)(hres == S_OK, "put_target failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_target failed: %08lx\n", hres); SysFreeString(str); } @@ -1634,7 +1634,7 @@ static void _test_anchor_name(unsigned line, IUnknown *unk, const WCHAR *name) HRESULT hres; hres = IHTMLAnchorElement_get_name(anchor, &str); - ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08lx\n", hres); if(name) ok_(__FILE__,line)(!lstrcmpW(str, name), "name = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(name)); else @@ -1651,7 +1651,7 @@ static void _test_anchor_put_name(unsigned line, IUnknown *unk, const WCHAR *nam str = name ? SysAllocString(name) : NULL; hres = IHTMLAnchorElement_put_name(anchor, str); - ok_(__FILE__,line)(hres == S_OK, "put_name failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_name failed: %08lx\n", hres); SysFreeString(str); _test_anchor_name(line, unk, name); @@ -1665,7 +1665,7 @@ static void _test_anchor_hostname(unsigned line, IUnknown *unk, const WCHAR *hos HRESULT hres; hres = IHTMLAnchorElement_get_hostname(anchor, &str); - ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08lx\n", hres); if(hostname) ok_(__FILE__,line)(!lstrcmpW(str, hostname), "hostname = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(hostname)); else @@ -1681,7 +1681,7 @@ static void _test_anchor_port(unsigned line, IUnknown *unk, const WCHAR *port) HRESULT hres; hres = IHTMLAnchorElement_get_port(anchor, &str); - ok_(__FILE__,line)(hres == S_OK, "get_port failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_port failed: %08lx\n", hres); if(port) ok_(__FILE__,line)(!lstrcmpW(str, port), "port = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(port)); else @@ -1697,7 +1697,7 @@ static void _test_anchor_search(unsigned line, IUnknown *elem, const WCHAR *sear HRESULT hres; hres = IHTMLAnchorElement_get_search(anchor, &str); - ok_(__FILE__,line)(hres == S_OK, "get_search failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_search failed: %08lx\n", hres); if ( ! str && allowbroken) win_skip("skip ie6 incorrect behavior\n"); else if(search) @@ -1716,7 +1716,7 @@ static void _test_anchor_put_search(unsigned line, IUnknown *unk, const WCHAR *s str = search ? SysAllocString(search) : NULL; hres = IHTMLAnchorElement_put_search(anchor, str); - ok_(__FILE__,line)(hres == S_OK, "put_search failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_search failed: %08lx\n", hres); SysFreeString(str); } @@ -1728,7 +1728,7 @@ static void _test_anchor_hash(unsigned line, IHTMLElement *elem, const WCHAR *ex HRESULT hres; hres = IHTMLAnchorElement_get_hash(anchor, &str); - ok_(__FILE__,line)(hres == S_OK, "get_hash failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_hash failed: %08lx\n", hres); if(exhash) ok_(__FILE__,line)(!lstrcmpW(str, exhash), "hash = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(exhash)); else @@ -1744,7 +1744,7 @@ static void _test_area_href(unsigned line, IUnknown *unk, const WCHAR *exhref) HRESULT hres; hres = IHTMLAreaElement_get_href(area, &str); - ok_(__FILE__,line)(hres == S_OK, "get_href failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_href failed: %08lx\n", hres); ok_(__FILE__,line)(!lstrcmpW(str, exhref), "href = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(exhref)); SysFreeString(str); @@ -1760,7 +1760,7 @@ static void _test_area_put_href(unsigned line, IUnknown *unk, const WCHAR *exhre str = SysAllocString(exhref); hres = IHTMLAreaElement_put_href(area, str); - ok_(__FILE__,line)(hres == S_OK, "get_href failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_href failed: %08lx\n", hres); SysFreeString(str); _test_disp_value(line, unk, exhref); @@ -1773,7 +1773,7 @@ static void _test_option_text(unsigned line, IHTMLOptionElement *option, const W HRESULT hres; hres = IHTMLOptionElement_get_text(option, &bstr); - ok_(__FILE__,line) (hres == S_OK, "get_text failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_text failed: %08lx\n", hres); ok_(__FILE__,line) (!lstrcmpW(bstr, text), "text=%s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); } @@ -1787,7 +1787,7 @@ static void _test_option_put_text(unsigned line, IHTMLOptionElement *option, con bstr = SysAllocString(text); hres = IHTMLOptionElement_put_text(option, bstr); SysFreeString(bstr); - ok(hres == S_OK, "put_text failed: %08x\n", hres); + ok(hres == S_OK, "put_text failed: %08lx\n", hres); _test_option_text(line, option, text); } @@ -1799,7 +1799,7 @@ static void _test_option_value(unsigned line, IHTMLOptionElement *option, const HRESULT hres; hres = IHTMLOptionElement_get_value(option, &bstr); - ok_(__FILE__,line) (hres == S_OK, "get_value failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_value failed: %08lx\n", hres); ok_(__FILE__,line) (!lstrcmpW(bstr, value), "value=%s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); } @@ -1813,7 +1813,7 @@ static void _test_option_put_value(unsigned line, IHTMLOptionElement *option, co bstr = SysAllocString(value); hres = IHTMLOptionElement_put_value(option, bstr); SysFreeString(bstr); - ok(hres == S_OK, "put_value failed: %08x\n", hres); + ok(hres == S_OK, "put_value failed: %08lx\n", hres); _test_option_value(line, option, value); } @@ -1825,7 +1825,7 @@ static void _test_option_selected(unsigned line, IHTMLOptionElement *option, VAR HRESULT hres; hres = IHTMLOptionElement_get_selected(option, &b); - ok_(__FILE__,line)(hres == S_OK, "get_selected failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_selected failed: %08lx\n", hres); ok_(__FILE__,line)(b == ex, "selected = %x, expected %x\n", b, ex); } @@ -1835,7 +1835,7 @@ static void _test_option_put_selected(unsigned line, IHTMLOptionElement *option, HRESULT hres; hres = IHTMLOptionElement_put_selected(option, b); - ok_(__FILE__,line)(hres == S_OK, "put_selected failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_selected failed: %08lx\n", hres); _test_option_selected(line, option, b); } @@ -1846,13 +1846,13 @@ static void _test_option_get_index(unsigned line, IHTMLOptionElement *option, LO LONG val; hres = IHTMLOptionElement_get_index(option, NULL); - ok_(__FILE__,line)(hres == E_INVALIDARG, "Expect E_INVALIDARG, got %08x\n", hres); + ok_(__FILE__,line)(hres == E_INVALIDARG, "Expect E_INVALIDARG, got %08lx\n", hres); val = 12345678; hres = IHTMLOptionElement_get_index(option, &val); - ok_(__FILE__,line)(hres == S_OK, "get_index failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_index failed: %08lx\n", hres); ok_(__FILE__,line)(val == exval || broken(val == 12345678), /* Win2k doesn't touch it*/ - "value = %d, expected = %d\n", val, exval); + "value = %ld, expected = %ld\n", val, exval); } #define test_option_put_defaultSelected(o,d) _test_option_put_defaultSelected(__LINE__,o,d) @@ -1861,7 +1861,7 @@ static void _test_option_put_defaultSelected(unsigned line, IHTMLOptionElement * HRESULT hres; hres = IHTMLOptionElement_put_defaultSelected(option, b); - ok_(__FILE__,line)(hres == S_OK, "put_defaultSelected %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_defaultSelected %08lx\n", hres); } #define test_option_defaultSelected(o,e) _test_option_defaultSelected(__LINE__,o,e) @@ -1871,11 +1871,11 @@ static void _test_option_defaultSelected(unsigned line, IHTMLOptionElement *opti VARIANT_BOOL b; hres = IHTMLOptionElement_get_defaultSelected(option, NULL); - ok_(__FILE__,line)(hres == E_POINTER, "Expect E_POINTER, got %08x\n", hres); + ok_(__FILE__,line)(hres == E_POINTER, "Expect E_POINTER, got %08lx\n", hres); b = 0x100; hres = IHTMLOptionElement_get_defaultSelected(option, &b); - ok_(__FILE__,line)(hres == S_OK, "get_defaultSelected failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_defaultSelected failed: %08lx\n", hres); ok_(__FILE__,line)(b == ex, "b = %x, expected = %x\n", b, ex); } @@ -1918,7 +1918,7 @@ static void _test_textarea_value(unsigned line, IUnknown *unk, const WCHAR *exva hres = IHTMLTextAreaElement_get_value(textarea, &value); IHTMLTextAreaElement_Release(textarea); - ok_(__FILE__,line)(hres == S_OK, "get_value failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_value failed: %08lx\n", hres); if(exval) ok_(__FILE__,line)(!lstrcmpW(value, exval), "value = %s, expected %s\n", wine_dbgstr_w(value), wine_dbgstr_w(exval)); else @@ -1935,7 +1935,7 @@ static void _test_textarea_put_value(unsigned line, IUnknown *unk, const WCHAR * hres = IHTMLTextAreaElement_put_value(textarea, tmp); IHTMLTextAreaElement_Release(textarea); - ok_(__FILE__,line)(hres == S_OK, "put_value failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_value failed: %08lx\n", hres); SysFreeString(tmp); _test_textarea_value(line, unk, value); @@ -1950,7 +1950,7 @@ static void _test_textarea_defaultvalue(unsigned line, IUnknown *unk, const WCHA hres = IHTMLTextAreaElement_get_defaultValue(textarea, &value); IHTMLTextAreaElement_Release(textarea); - ok_(__FILE__,line)(hres == S_OK, "get_defaultValue failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_defaultValue failed: %08lx\n", hres); if(exval) ok_(__FILE__,line)(!lstrcmpW(value, exval), "defaultValue = %s, expected %s\n", wine_dbgstr_w(value), wine_dbgstr_w(exval)); else @@ -1967,7 +1967,7 @@ static void _test_textarea_put_defaultvalue(unsigned line, IUnknown *unk, const hres = IHTMLTextAreaElement_put_defaultValue(textarea, tmp); IHTMLTextAreaElement_Release(textarea); - ok_(__FILE__,line)(hres == S_OK, "put_defaultValue failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_defaultValue failed: %08lx\n", hres); SysFreeString(tmp); _test_textarea_defaultvalue(line, unk, value); @@ -1982,7 +1982,7 @@ static void _test_textarea_readonly(unsigned line, IUnknown *unk, VARIANT_BOOL e hres = IHTMLTextAreaElement_get_readOnly(textarea, &b); IHTMLTextAreaElement_Release(textarea); - ok_(__FILE__,line)(hres == S_OK, "get_readOnly failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_readOnly failed: %08lx\n", hres); ok_(__FILE__,line)(b == ex, "readOnly = %x, expected %x\n", b, ex); } @@ -1994,7 +1994,7 @@ static void _test_textarea_put_readonly(unsigned line, IUnknown *unk, VARIANT_BO hres = IHTMLTextAreaElement_put_readOnly(textarea, b); IHTMLTextAreaElement_Release(textarea); - ok_(__FILE__,line)(hres == S_OK, "put_readOnly failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_readOnly failed: %08lx\n", hres); _test_textarea_readonly(line, unk, b); } @@ -2008,7 +2008,7 @@ static void _test_textarea_type(unsigned line, IUnknown *unk) hres = IHTMLTextAreaElement_get_type(textarea, &type); IHTMLTextAreaElement_Release(textarea); - ok_(__FILE__,line)(hres == S_OK, "get_type failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_type failed: %08lx\n", hres); ok_(__FILE__,line)(!lstrcmpW(type, L"textarea"), "type = %s, expected textarea\n", wine_dbgstr_w(type)); SysFreeString(type); } @@ -2022,7 +2022,7 @@ static IHTMLFormElement *_get_textarea_form(unsigned line, IUnknown *unk) hres = IHTMLTextAreaElement_get_form(textarea, &form); IHTMLTextAreaElement_Release(textarea); - ok_(__FILE__,line)(hres == S_OK, "get_type failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_type failed: %08lx\n", hres); return form; } @@ -2036,7 +2036,7 @@ static void _test_comment_text(unsigned line, IUnknown *unk, const WCHAR *extext HRESULT hres; hres = IHTMLCommentElement_get_text(comment, &text); - ok_(__FILE__,line)(hres == S_OK, "get_text failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_text failed: %08lx\n", hres); if((p = wcsstr(extext, L"-->")) && SysStringLen(text) == p - extext) /* Some IEs drop comment ending */ ok_(__FILE__,line)(!wcsncmp(text, extext, p - extext), "text = \"%s\", expected \"%s\"\n", wine_dbgstr_w(text), wine_dbgstr_w(extext)); else @@ -2055,7 +2055,7 @@ static IHTMLDOMAttribute *_create_attr(unsigned line, IUnknown *unk, const char HRESULT hres; hres = IHTMLDocument5_createAttribute(doc, str, &attr); - ok_(__FILE__,line)(hres == S_OK, "createAttribute failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "createAttribute failed: %08lx\n", hres); SysFreeString(str); IHTMLDocument5_Release(doc); @@ -2069,7 +2069,7 @@ static void _test_attr_specified(unsigned line, IHTMLDOMAttribute *attr, VARIANT HRESULT hres; hres = IHTMLDOMAttribute_get_specified(attr, &specified); - ok_(__FILE__,line)(hres == S_OK, "get_specified failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_specified failed: %08lx\n", hres); ok_(__FILE__,line)(specified == expected, "specified = %x, expected %x\n", specified, expected); } @@ -2081,7 +2081,7 @@ static void _test_attr_expando(unsigned line, IHTMLDOMAttribute *attr, VARIANT_B HRESULT hres; hres = IHTMLDOMAttribute2_get_expando(attr2, &expando); - ok_(__FILE__,line)(hres == S_OK, "get_expando failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_expando failed: %08lx\n", hres); ok_(__FILE__,line)(expando == expected, "expando = %x, expected %x\n", expando, expected); IHTMLDOMAttribute2_Release(attr2); @@ -2095,7 +2095,7 @@ static void _test_attr_value(unsigned line, IHTMLDOMAttribute *attr, const WCHAR HRESULT hres; hres = IHTMLDOMAttribute2_get_value(attr2, &val); - ok_(__FILE__,line)(hres == S_OK, "get_value failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_value failed: %08lx\n", hres); if(exval) ok_(__FILE__,line)(!lstrcmpW(val, exval), "value = %s, expected %s\n", wine_dbgstr_w(val), wine_dbgstr_w(exval)); else @@ -2117,16 +2117,16 @@ static void _test_comment_attrs(unsigned line, IUnknown *unk) HRESULT hres; hres = IHTMLElement4_getAttributeNode(elem4, name, &attr); - ok(hres == S_OK, "getAttributeNode failed: %08x\n", hres); + ok(hres == S_OK, "getAttributeNode failed: %08lx\n", hres); ok(attr == NULL, "attr != NULL\n"); V_VT(&val) = VT_I4; V_I4(&val) = 1234; hres = IHTMLElement_setAttribute(elem, name, val, 0); - ok(hres == S_OK, "setAttribute failed: %08x\n", hres); + ok(hres == S_OK, "setAttribute failed: %08lx\n", hres); hres = IHTMLElement4_getAttributeNode(elem4, name, &attr); - ok(hres == S_OK, "getAttributeNode failed: %08x\n", hres); + ok(hres == S_OK, "getAttributeNode failed: %08lx\n", hres); ok(attr != NULL, "attr == NULL\n"); test_attr_expando(attr, VARIANT_TRUE); @@ -2147,8 +2147,8 @@ static void _test_object_vspace(unsigned line, IUnknown *unk, LONG exl) l = 0xdeadbeef; hres = IHTMLObjectElement_get_vspace(object, &l); - ok_(__FILE__,line)(hres == S_OK, "get_vspace failed: %08x\n", hres); - ok_(__FILE__,line)(l == exl, "vspace=%d, expected %d\n", l, exl); + ok_(__FILE__,line)(hres == S_OK, "get_vspace failed: %08lx\n", hres); + ok_(__FILE__,line)(l == exl, "vspace=%ld, expected %ld\n", l, exl); IHTMLObjectElement_Release(object); } @@ -2161,7 +2161,7 @@ static void _test_object_name(unsigned line, IHTMLElement *elem, const WCHAR *ex str = (void*)0xdeadbeef; hres = IHTMLObjectElement_get_name(object, &str); - ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08lx\n", hres); if(exname) ok_(__FILE__,line)(!lstrcmpW(str, exname), "name=%s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(exname)); else @@ -2179,7 +2179,7 @@ static void _set_object_name(unsigned line, IHTMLElement *elem, const WCHAR *nam str = SysAllocString(name); hres = IHTMLObjectElement_put_name(object, str); - ok_(__FILE__,line)(hres == S_OK, "put_name failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_name failed: %08lx\n", hres); SysFreeString(str); IHTMLObjectElement_Release(object); @@ -2199,11 +2199,11 @@ static IHTMLOptionElement *_create_option_elem(unsigned line, IHTMLDocument2 *do HRESULT hres; hres = IHTMLDocument2_get_parentWindow(doc, &window); - ok_(__FILE__,line) (hres == S_OK, "get_parentElement failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_parentElement failed: %08lx\n", hres); hres = IHTMLWindow2_get_Option(window, &factory); IHTMLWindow2_Release(window); - ok_(__FILE__,line) (hres == S_OK, "get_Option failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_Option failed: %08lx\n", hres); test_disp((IUnknown*)factory, &IID_IHTMLOptionElementFactory, NULL, L"[object]"); @@ -2214,16 +2214,16 @@ static IHTMLOptionElement *_create_option_elem(unsigned line, IHTMLDocument2 *do V_VT(&empty) = VT_EMPTY; hres = IHTMLOptionElementFactory_QueryInterface(factory, &IID_IDispatch, (void**)&disp); - ok_(__FILE__,line)(hres == S_OK, "Could not get IDispatch: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "Could not get IDispatch: %08lx\n", hres); args[1] = text; args[0] = value; hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_CONSTRUCT, &dp, &option_var, NULL, NULL); IDispatch_Release(disp); - ok_(__FILE__,line)(hres == S_OK, "Invoke(DISPID_VALUE) returned: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "Invoke(DISPID_VALUE) returned: %08lx\n", hres); ok_(__FILE__,line)(V_VT(&option_var) == VT_DISPATCH, "VT(option_var) = %d\n", V_VT(&option_var)); hres = IDispatch_QueryInterface(V_DISPATCH(&option_var), &IID_IHTMLOptionElement, (void**)&option); - ok_(__FILE__,line)(hres == S_OK, "Could not get IHTMLOptionElement: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "Could not get IHTMLOptionElement: %08lx\n", hres); VariantClear(&option_var); _test_option_text(line, option, txt); @@ -2232,7 +2232,7 @@ static IHTMLOptionElement *_create_option_elem(unsigned line, IHTMLDocument2 *do IHTMLOptionElement_Release(option); hres = IHTMLOptionElementFactory_create(factory, text, value, empty, empty, &option); - ok_(__FILE__,line) (hres == S_OK, "create failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "create failed: %08lx\n", hres); IHTMLOptionElementFactory_Release(factory); VariantClear(&text); @@ -2252,8 +2252,8 @@ static void _test_img_width(unsigned line, IHTMLImgElement *img, const LONG exp) HRESULT hres; hres = IHTMLImgElement_get_width(img, &found); - ok_(__FILE__,line) (hres == S_OK, "get_width failed: %08x\n", hres); - ok_(__FILE__,line) (found == exp, "width=%d\n", found); + ok_(__FILE__,line) (hres == S_OK, "get_width failed: %08lx\n", hres); + ok_(__FILE__,line) (found == exp, "width=%ld\n", found); } #define test_img_put_width(o,w) _test_img_put_width(__LINE__,o,w) @@ -2262,7 +2262,7 @@ static void _test_img_put_width(unsigned line, IHTMLImgElement *img, const LONG HRESULT hres; hres = IHTMLImgElement_put_width(img, width); - ok(hres == S_OK, "put_width failed: %08x\n", hres); + ok(hres == S_OK, "put_width failed: %08lx\n", hres); _test_img_width(line, img, width); } @@ -2274,8 +2274,8 @@ static void _test_img_height(unsigned line, IHTMLImgElement *img, const LONG exp HRESULT hres; hres = IHTMLImgElement_get_height(img, &found); - ok_(__FILE__,line) (hres == S_OK, "get_height failed: %08x\n", hres); - ok_(__FILE__,line) (found == exp, "height=%d\n", found); + ok_(__FILE__,line) (hres == S_OK, "get_height failed: %08lx\n", hres); + ok_(__FILE__,line) (found == exp, "height=%ld\n", found); } #define test_img_put_height(o,w) _test_img_put_height(__LINE__,o,w) @@ -2284,7 +2284,7 @@ static void _test_img_put_height(unsigned line, IHTMLImgElement *img, const LONG HRESULT hres; hres = IHTMLImgElement_put_height(img, height); - ok(hres == S_OK, "put_height failed: %08x\n", hres); + ok(hres == S_OK, "put_height failed: %08lx\n", hres); _test_img_height(line, img, height); } @@ -2301,11 +2301,11 @@ static IHTMLImgElement *_create_img_elem(unsigned line, IHTMLDocument2 *doc, HRESULT hres; hres = IHTMLDocument2_get_parentWindow(doc, &window); - ok_(__FILE__,line) (hres == S_OK, "get_parentElement failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_parentElement failed: %08lx\n", hres); hres = IHTMLWindow2_get_Image(window, &factory); IHTMLWindow2_Release(window); - ok_(__FILE__,line) (hres == S_OK, "get_Image failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_Image failed: %08lx\n", hres); test_ifaces((IUnknown*)factory, img_factory_iids); test_disp((IUnknown*)factory, &IID_IHTMLImageElementFactory, NULL, L"[object]"); @@ -2329,7 +2329,7 @@ static IHTMLImgElement *_create_img_elem(unsigned line, IHTMLDocument2 *doc, } hres = IHTMLImageElementFactory_create(factory, width, height, &img); - ok_(__FILE__,line) (hres == S_OK, "create failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "create failed: %08lx\n", hres); IHTMLImageElementFactory_Release(factory); VariantClear(&width); @@ -2351,8 +2351,8 @@ static void _test_select_length(unsigned line, IHTMLSelectElement *select, LONG HRESULT hres; hres = IHTMLSelectElement_get_length(select, &len); - ok_(__FILE__,line) (hres == S_OK, "get_length failed: %08x\n", hres); - ok_(__FILE__,line) (len == length, "len=%d, expected %d\n", len, length); + ok_(__FILE__,line) (hres == S_OK, "get_length failed: %08lx\n", hres); + ok_(__FILE__,line) (len == length, "len=%ld, expected %ld\n", len, length); } #define test_select_put_length(s,l) _test_select_put_length(__LINE__,s,l) @@ -2362,7 +2362,7 @@ static void _test_select_put_length(unsigned line, IUnknown *unk, LONG length) HRESULT hres; hres = IHTMLSelectElement_put_length(select, length); - ok_(__FILE__,line) (hres == S_OK, "put_length failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "put_length failed: %08lx\n", hres); _test_select_length(line, select, length); IHTMLSelectElement_Release(select); } @@ -2374,8 +2374,8 @@ static void _test_select_selidx(unsigned line, IHTMLSelectElement *select, LONG HRESULT hres; hres = IHTMLSelectElement_get_selectedIndex(select, &idx); - ok_(__FILE__,line) (hres == S_OK, "get_selectedIndex failed: %08x\n", hres); - ok_(__FILE__,line) (idx == index, "idx=%d, expected %d\n", idx, index); + ok_(__FILE__,line) (hres == S_OK, "get_selectedIndex failed: %08lx\n", hres); + ok_(__FILE__,line) (idx == index, "idx=%ld, expected %ld\n", idx, index); } #define test_select_put_selidx(s,i) _test_select_put_selidx(__LINE__,s,i) @@ -2384,7 +2384,7 @@ static void _test_select_put_selidx(unsigned line, IHTMLSelectElement *select, L HRESULT hres; hres = IHTMLSelectElement_put_selectedIndex(select, index); - ok_(__FILE__,line) (hres == S_OK, "get_selectedIndex failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_selectedIndex failed: %08lx\n", hres); _test_select_selidx(line, select, index); } @@ -2395,7 +2395,7 @@ static void _test_select_value(unsigned line, IHTMLSelectElement *select, const HRESULT hres; hres = IHTMLSelectElement_get_value(select, &val); - ok_(__FILE__,line) (hres == S_OK, "get_value failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_value failed: %08lx\n", hres); if(exval) ok_(__FILE__,line) (!lstrcmpW(val, exval), "unexpected value %s\n", wine_dbgstr_w(val)); else @@ -2412,7 +2412,7 @@ static void _test_select_set_value(unsigned line, IHTMLSelectElement *select, co bstr = SysAllocString(val); hres = IHTMLSelectElement_put_value(select, bstr); SysFreeString(bstr); - ok_(__FILE__,line) (hres == S_OK, "put_value failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "put_value failed: %08lx\n", hres); } #define test_select_type(s,t) _test_select_type(__LINE__,s,t) @@ -2422,7 +2422,7 @@ static void _test_select_type(unsigned line, IHTMLSelectElement *select, const W HRESULT hres; hres = IHTMLSelectElement_get_type(select, &type); - ok_(__FILE__,line) (hres == S_OK, "get_type failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_type failed: %08lx\n", hres); ok_(__FILE__,line) (!lstrcmpW(type, extype), "type=%s, expected %s\n", wine_dbgstr_w(type), wine_dbgstr_w(extype)); SysFreeString(type); } @@ -2434,7 +2434,7 @@ static void _test_select_multiple(unsigned line, IHTMLSelectElement *select, VAR HRESULT hres; hres = IHTMLSelectElement_get_multiple(select, &b); - ok_(__FILE__,line) (hres == S_OK, "get_multiple failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_multiple failed: %08lx\n", hres); ok_(__FILE__,line) (b == exmultiple, "multiple=%x, expected %x\n", b, exmultiple); } @@ -2444,7 +2444,7 @@ static void _test_select_set_multiple(unsigned line, IHTMLSelectElement *select, HRESULT hres; hres = IHTMLSelectElement_put_multiple(select, val); - ok_(__FILE__,line) (hres == S_OK, "put_multiple failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "put_multiple failed: %08lx\n", hres); _test_select_multiple(line, select, val); } @@ -2456,12 +2456,12 @@ static void _test_select_size(unsigned line, IHTMLSelectElement *select, LONG ex LONG val; hres = IHTMLSelectElement_get_size(select, NULL); - ok_(__FILE__,line) (hres == E_INVALIDARG, "got %08x, expected E_INVALIDARG\n", hres); + ok_(__FILE__,line) (hres == E_INVALIDARG, "got %08lx, expected E_INVALIDARG\n", hres); val = 0xdeadbeef; hres = IHTMLSelectElement_get_size(select, &val); - ok_(__FILE__,line) (hres == S_OK, "get_size failed: %08x\n", hres); - ok_(__FILE__,line) (val == exval, "size = %d, expected %d\n", val, exval); + ok_(__FILE__,line) (hres == S_OK, "get_size failed: %08lx\n", hres); + ok_(__FILE__,line) (val == exval, "size = %ld, expected %ld\n", val, exval); } #define test_select_set_size(s,v,e) _test_select_set_size(__LINE__,s,v,e) @@ -2470,7 +2470,7 @@ static void _test_select_set_size(unsigned line, IHTMLSelectElement *select, LON HRESULT hres; hres = IHTMLSelectElement_put_size(select, val); - ok_(__FILE__,line) (hres == exhres, "put_size(%d) got %08x, expect %08x\n", val, hres, exhres); + ok_(__FILE__,line) (hres == exhres, "put_size(%ld) got %08lx, expect %08lx\n", val, hres, exhres); } #define test_select_name(s,v) _test_select_name(__LINE__,s,v) @@ -2481,7 +2481,7 @@ static void _test_select_name(unsigned line, IHTMLSelectElement *select, const W text = NULL; hres = IHTMLSelectElement_get_name(select, &text); - ok_(__FILE__,line) (hres == S_OK, "get_name failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_name failed: %08lx\n", hres); if(extext) { ok_(__FILE__,line) (text != NULL, "text == NULL\n"); ok_(__FILE__,line) (!lstrcmpW(text, extext), "name = %s, expected %s\n", @@ -2500,7 +2500,7 @@ static void _test_select_set_name(unsigned line, IHTMLSelectElement *select, con bstr = SysAllocString(text); hres = IHTMLSelectElement_put_name(select, bstr); - ok_(__FILE__,line) (hres == S_OK, "put_name(%s) failed: %08x\n", wine_dbgstr_w(bstr), hres); + ok_(__FILE__,line) (hres == S_OK, "put_name(%s) failed: %08lx\n", wine_dbgstr_w(bstr), hres); SysFreeString(bstr); } @@ -2511,7 +2511,7 @@ static void _test_range_text(unsigned line, IHTMLTxtRange *range, const WCHAR *e HRESULT hres; hres = IHTMLTxtRange_get_text(range, &text); - ok_(__FILE__, line) (hres == S_OK, "get_text failed: %08x\n", hres); + ok_(__FILE__, line) (hres == S_OK, "get_text failed: %08lx\n", hres); if(extext) { ok_(__FILE__, line) (text != NULL, "text == NULL\n"); @@ -2530,7 +2530,7 @@ static void _test_range_collapse(unsigned line, IHTMLTxtRange *range, BOOL b) HRESULT hres; hres = IHTMLTxtRange_collapse(range, b); - ok_(__FILE__, line) (hres == S_OK, "collapse failed: %08x\n", hres); + ok_(__FILE__, line) (hres == S_OK, "collapse failed: %08lx\n", hres); _test_range_text(line, range, NULL); } @@ -2542,7 +2542,7 @@ static void _test_range_expand(unsigned line, IHTMLTxtRange *range, LPWSTR unit, HRESULT hres; hres = IHTMLTxtRange_expand(range, unit, &b); - ok_(__FILE__,line) (hres == S_OK, "expand failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "expand failed: %08lx\n", hres); ok_(__FILE__,line) (b == exb, "b=%x, expected %x\n", b, exb); _test_range_text(line, range, extext); } @@ -2554,8 +2554,8 @@ static void _test_range_move(unsigned line, IHTMLTxtRange *range, LPWSTR unit, L HRESULT hres; hres = IHTMLTxtRange_move(range, unit, cnt, &c); - ok_(__FILE__,line) (hres == S_OK, "move failed: %08x\n", hres); - ok_(__FILE__,line) (c == excnt, "count=%d, expected %d\n", c, excnt); + ok_(__FILE__,line) (hres == S_OK, "move failed: %08lx\n", hres); + ok_(__FILE__,line) (c == excnt, "count=%ld, expected %ld\n", c, excnt); _test_range_text(line, range, NULL); } @@ -2567,8 +2567,8 @@ static void _test_range_movestart(unsigned line, IHTMLTxtRange *range, HRESULT hres; hres = IHTMLTxtRange_moveStart(range, unit, cnt, &c); - ok_(__FILE__,line) (hres == S_OK, "move failed: %08x\n", hres); - ok_(__FILE__,line) (c == excnt, "count=%d, expected %d\n", c, excnt); + ok_(__FILE__,line) (hres == S_OK, "move failed: %08lx\n", hres); + ok_(__FILE__,line) (c == excnt, "count=%ld, expected %ld\n", c, excnt); } #define test_range_moveend(r,u,c,e) _test_range_moveend(__LINE__,r,u,c,e) @@ -2578,8 +2578,8 @@ static void _test_range_moveend(unsigned line, IHTMLTxtRange *range, LPWSTR unit HRESULT hres; hres = IHTMLTxtRange_moveEnd(range, unit, cnt, &c); - ok_(__FILE__,line) (hres == S_OK, "move failed: %08x\n", hres); - ok_(__FILE__,line) (c == excnt, "count=%d, expected %d\n", c, excnt); + ok_(__FILE__,line) (hres == S_OK, "move failed: %08lx\n", hres); + ok_(__FILE__,line) (c == excnt, "count=%ld, expected %ld\n", c, excnt); } #define test_range_put_text(r,t) _test_range_put_text(__LINE__,r,t) @@ -2589,7 +2589,7 @@ static void _test_range_put_text(unsigned line, IHTMLTxtRange *range, const WCHA BSTR bstr = SysAllocString(text); hres = IHTMLTxtRange_put_text(range, bstr); - ok_(__FILE__,line) (hres == S_OK, "put_text failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "put_text failed: %08lx\n", hres); SysFreeString(bstr); _test_range_text(line, range, NULL); } @@ -2602,7 +2602,7 @@ static void _test_range_inrange(unsigned line, IHTMLTxtRange *range1, IHTMLTxtRa b = 0xe0e0; hres = IHTMLTxtRange_inRange(range1, range2, &b); - ok_(__FILE__,line) (hres == S_OK, "(1->2) isEqual failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "(1->2) isEqual failed: %08lx\n", hres); ok_(__FILE__,line) (b == exb, "(1->2) b=%x, expected %x\n", b, exb); } @@ -2614,12 +2614,12 @@ static void _test_range_isequal(unsigned line, IHTMLTxtRange *range1, IHTMLTxtRa b = 0xe0e0; hres = IHTMLTxtRange_isEqual(range1, range2, &b); - ok_(__FILE__,line) (hres == S_OK, "(1->2) isEqual failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "(1->2) isEqual failed: %08lx\n", hres); ok_(__FILE__,line) (b == exb, "(1->2) b=%x, expected %x\n", b, exb); b = 0xe0e0; hres = IHTMLTxtRange_isEqual(range2, range1, &b); - ok_(__FILE__,line) (hres == S_OK, "(2->1) isEqual failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "(2->1) isEqual failed: %08lx\n", hres); ok_(__FILE__,line) (b == exb, "(2->1) b=%x, expected %x\n", b, exb); if(exb) { @@ -2635,7 +2635,7 @@ static void _test_range_paste_html(unsigned line, IHTMLTxtRange *range, const WC HRESULT hres; hres = IHTMLTxtRange_pasteHTML(range, str); - ok_(__FILE__,line)(hres == S_OK, "pasteHTML failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "pasteHTML failed: %08lx\n", hres); SysFreeString(str); } @@ -2646,7 +2646,7 @@ static void _test_range_parent(unsigned line, IHTMLTxtRange *range, elem_type_t HRESULT hres; hres = IHTMLTxtRange_parentElement(range, &elem); - ok_(__FILE__,line) (hres == S_OK, "parentElement failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "parentElement failed: %08lx\n", hres); _test_elem_type(line, (IUnknown*)elem, type); @@ -2665,7 +2665,7 @@ static IHTMLElement *_get_elem_col_item_idx(unsigned line, IHTMLElementCollectio V_VT(&name) = VT_I4; V_I4(&name) = i; hres = IHTMLElementCollection_item(col, name, index, &disp); - ok_(__FILE__,line)(hres == S_OK, "item failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "item failed: %08lx\n", hres); ok_(__FILE__,line)(disp != NULL, "disp == NULL\n"); elem = _get_elem_iface(line, (IUnknown*)disp); @@ -2688,13 +2688,13 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLElementCollection, (void**)&col); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElementCollection: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElementCollection: %08lx\n", hres); test_disp((IUnknown*)col, &DIID_DispHTMLElementCollection, NULL, L"[object]"); hres = IHTMLElementCollection_get_length(col, &len); - ok_(__FILE__,line) (hres == S_OK, "get_length failed: %08x\n", hres); - ok_(__FILE__,line) (len == exlen, "len=%d, expected %d\n", len, exlen); + ok_(__FILE__,line) (hres == S_OK, "get_length failed: %08lx\n", hres); + ok_(__FILE__,line) (len == exlen, "len=%ld, expected %ld\n", len, exlen); if(len > exlen) len = exlen; @@ -2702,18 +2702,18 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, V_VT(&index) = VT_EMPTY; hres = IHTMLElementCollection_get__newEnum(col, &enum_unk); - ok_(__FILE__,line)(hres == S_OK, "_newEnum failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "_newEnum failed: %08lx\n", hres); hres = IUnknown_QueryInterface(enum_unk, &IID_IEnumVARIANT, (void**)&enum_var); IUnknown_Release(enum_unk); - ok_(__FILE__,line)(hres == S_OK, "Could not get IEnumVARIANT iface: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "Could not get IEnumVARIANT iface: %08lx\n", hres); for(i=0; i<len; i++) { V_VT(&name) = VT_I4; V_I4(&name) = i; disp = (void*)0xdeadbeef; hres = IHTMLElementCollection_item(col, name, index, &disp); - ok_(__FILE__,line) (hres == S_OK, "item(%d) failed: %08x\n", i, hres); + ok_(__FILE__,line) (hres == S_OK, "item(%ld) failed: %08lx\n", i, hres); ok_(__FILE__,line) (disp != NULL, "item returned NULL\n"); if(FAILED(hres) || !disp) continue; @@ -2725,7 +2725,7 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, V_I4(&name) = 0; disp2 = (void*)0xdeadbeef; hres = IHTMLElementCollection_item(col, name, index, &disp2); - ok_(__FILE__,line) (hres == S_OK, "item(%d) failed: %08x\n", i, hres); + ok_(__FILE__,line) (hres == S_OK, "item(%ld) failed: %08lx\n", i, hres); ok_(__FILE__,line) (iface_cmp((IUnknown*)disp, (IUnknown*)disp2), "disp != disp2\n"); if(disp2) IDispatch_Release(disp2); @@ -2734,9 +2734,9 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, fetched = 0; V_VT(&v) = VT_ERROR; hres = IEnumVARIANT_Next(enum_var, 1, &v, i ? &fetched : NULL); - ok_(__FILE__,line)(hres == S_OK, "Next failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "Next failed: %08lx\n", hres); if(i) - ok_(__FILE__,line)(fetched == 1, "fetched = %d\n", fetched); + ok_(__FILE__,line)(fetched == 1, "fetched = %ld\n", fetched); ok_(__FILE__,line)(V_VT(&v) == VT_DISPATCH && V_DISPATCH(&v), "V_VT(v) = %d\n", V_VT(&v)); ok_(__FILE__,line)(iface_cmp((IUnknown*)disp, (IUnknown*)V_DISPATCH(&v)), "disp != V_DISPATCH(v)\n"); IDispatch_Release(V_DISPATCH(&v)); @@ -2747,28 +2747,28 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, fetched = 0xdeadbeef; V_VT(&v) = VT_BOOL; hres = IEnumVARIANT_Next(enum_var, 1, &v, &fetched); - ok_(__FILE__,line)(hres == S_FALSE, "Next returned %08x, expected S_FALSE\n", hres); - ok_(__FILE__,line)(fetched == 0, "fetched = %d\n", fetched); + ok_(__FILE__,line)(hres == S_FALSE, "Next returned %08lx, expected S_FALSE\n", hres); + ok_(__FILE__,line)(fetched == 0, "fetched = %ld\n", fetched); ok_(__FILE__,line)(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); hres = IEnumVARIANT_Reset(enum_var); - ok_(__FILE__,line)(hres == S_OK, "Reset failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "Reset failed: %08lx\n", hres); fetched = 0xdeadbeef; V_VT(&v) = VT_BOOL; hres = IEnumVARIANT_Next(enum_var, 0, &v, &fetched); - ok_(__FILE__,line)(hres == S_OK, "Next returned %08x, expected S_FALSE\n", hres); - ok_(__FILE__,line)(fetched == 0, "fetched = %d\n", fetched); + ok_(__FILE__,line)(hres == S_OK, "Next returned %08lx, expected S_FALSE\n", hres); + ok_(__FILE__,line)(fetched == 0, "fetched = %ld\n", fetched); ok_(__FILE__,line)(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); hres = IEnumVARIANT_Skip(enum_var, len > 2 ? len-2 : 0); - ok_(__FILE__,line)(hres == S_OK, "Skip failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "Skip failed: %08lx\n", hres); memset(vs, 0, sizeof(vs)); fetched = 0; hres = IEnumVARIANT_Next(enum_var, ARRAY_SIZE(vs), vs, &fetched); - ok_(__FILE__,line)(hres == S_FALSE, "Next failed: %08x\n", hres); - ok_(__FILE__,line)(fetched == (len > 2 ? 2 : len), "fetched = %d\n", fetched); + ok_(__FILE__,line)(hres == S_FALSE, "Next failed: %08lx\n", hres); + ok_(__FILE__,line)(fetched == (len > 2 ? 2 : len), "fetched = %ld\n", fetched); if(len) { ok_(__FILE__,line)(V_VT(vs) == VT_DISPATCH && V_DISPATCH(vs), "V_VT(vs[0]) = %d\n", V_VT(vs)); IDispatch_Release(V_DISPATCH(vs)); @@ -2779,10 +2779,10 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, } hres = IEnumVARIANT_Reset(enum_var); - ok_(__FILE__,line)(hres == S_OK, "Reset failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "Reset failed: %08lx\n", hres); hres = IEnumVARIANT_Skip(enum_var, len+1); - ok_(__FILE__,line)(hres == S_FALSE, "Skip failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_FALSE, "Skip failed: %08lx\n", hres); IEnumVARIANT_Release(enum_var); @@ -2790,28 +2790,28 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, V_I4(&name) = len; disp = (void*)0xdeadbeef; hres = IHTMLElementCollection_item(col, name, index, &disp); - ok_(__FILE__,line) (hres == S_OK, "item failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "item failed: %08lx\n", hres); ok_(__FILE__,line) (disp == NULL, "disp != NULL\n"); V_VT(&name) = VT_UI4; V_I4(&name) = len; disp = (void*)0xdeadbeef; hres = IHTMLElementCollection_item(col, name, index, &disp); - ok_(__FILE__,line) (hres == S_OK, "item failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "item failed: %08lx\n", hres); ok_(__FILE__,line) (disp == NULL, "disp != NULL\n"); V_VT(&name) = VT_INT; V_I4(&name) = len; disp = (void*)0xdeadbeef; hres = IHTMLElementCollection_item(col, name, index, &disp); - ok_(__FILE__,line) (hres == S_OK, "item failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "item failed: %08lx\n", hres); ok_(__FILE__,line) (disp == NULL, "disp != NULL\n"); V_VT(&name) = VT_UINT; V_I4(&name) = len; disp = (void*)0xdeadbeef; hres = IHTMLElementCollection_item(col, name, index, &disp); - ok_(__FILE__,line) (hres == S_OK, "item failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "item failed: %08lx\n", hres); ok_(__FILE__,line) (disp == NULL, "disp != NULL\n"); V_VT(&name) = VT_I4; @@ -2819,9 +2819,9 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, disp = (void*)0xdeadbeef; hres = IHTMLElementCollection_item(col, name, index, &disp); if(compat_mode < COMPAT_IE9) - ok_(__FILE__,line) (hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); + ok_(__FILE__,line) (hres == E_INVALIDARG, "item failed: %08lx, expected E_INVALIDARG\n", hres); else - ok_(__FILE__,line) (hres == S_OK, "item failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "item failed: %08lx\n", hres); ok_(__FILE__,line) (disp == NULL, "disp != NULL\n"); IHTMLElementCollection_Release(col); @@ -2836,7 +2836,7 @@ static void _test_elem_all(unsigned line, IUnknown *unk, const elem_type_t *elem hres = IHTMLElement_get_all(elem, &disp); IHTMLElement_Release(elem); - ok_(__FILE__,line)(hres == S_OK, "get_all failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_all failed: %08lx\n", hres); _test_elem_collection(line, (IUnknown*)disp, elem_types, exlen); IDispatch_Release(disp); @@ -2849,7 +2849,7 @@ static void _test_doc_all(unsigned line, IHTMLDocument2 *doc, const elem_type_t HRESULT hres; hres = IHTMLDocument2_get_all(doc, &col); - ok_(__FILE__,line)(hres == S_OK, "get_all failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_all failed: %08lx\n", hres); _test_elem_collection(line, (IUnknown*)col, elem_types, exlen); IHTMLElementCollection_Release(col); @@ -2862,9 +2862,9 @@ static LONG _test_children_collection_length(unsigned line, IHTMLDOMChildrenColl HRESULT hres; hres = IHTMLDOMChildrenCollection_get_length(collection, &length); - ok_(__FILE__,line)(hres == S_OK, "get_length failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_length failed: %08lx\n", hres); if(exlen != -1) - ok_(__FILE__,line)(length == exlen, "length = %d, expected %d\n", length, exlen); + ok_(__FILE__,line)(length == exlen, "length = %ld, expected %ld\n", length, exlen); return length; } @@ -2883,7 +2883,7 @@ static void _test_elem_getelembytag(unsigned line, IUnknown *unk, elem_type_t ty hres = IHTMLElement2_getElementsByTagName(elem, tmp, &col); SysFreeString(tmp); IHTMLElement2_Release(elem); - ok_(__FILE__,line) (hres == S_OK, "getElementByTagName failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "getElementByTagName failed: %08lx\n", hres); ok_(__FILE__,line) (col != NULL, "col == NULL\n"); if(exlen) { @@ -2914,7 +2914,7 @@ static void _test_doc_getelembytag(unsigned line, IHTMLDocument2 *unk, const cha tmp = SysAllocString(elem_type_infos[type].tag); hres = IHTMLDocument3_getElementsByTagName(doc, tmp, &col); SysFreeString(tmp); - ok_(__FILE__,line) (hres == S_OK, "getElementByTagName failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "getElementByTagName failed: %08lx\n", hres); ok_(__FILE__,line) (col != NULL, "col == NULL\n"); if(exlen) { @@ -2937,7 +2937,7 @@ static void _test_elem_innertext(unsigned line, IHTMLElement *elem, const WCHAR HRESULT hres; hres = IHTMLElement_get_innerText(elem, &text); - ok_(__FILE__,line) (hres == S_OK, "get_innerText failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_innerText failed: %08lx\n", hres); if(extext) ok_(__FILE__,line) (!lstrcmpW(text, extext), "get_innerText returned %s expected %s\n", wine_dbgstr_w(text), wine_dbgstr_w(extext)); @@ -2955,7 +2955,7 @@ static void _test_elem_set_innertext(unsigned line, IHTMLElement *elem, const WC str = SysAllocString(text); hres = IHTMLElement_put_innerText(elem, str); - ok_(__FILE__,line) (hres == S_OK, "put_innerText failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "put_innerText failed: %08lx\n", hres); SysFreeString(str); _test_elem_innertext(line, elem, text); @@ -2973,7 +2973,7 @@ static void _test_elem_set_innertext(unsigned line, IHTMLElement *elem, const WC ok(node != NULL, "node == NULL\n"); if(node) { type = _get_node_type(line, (IUnknown*)node); - ok(type == 3, "type=%d\n", type); + ok(type == 3, "type=%ld\n", type); IHTMLDOMNode_Release(node); } @@ -2989,7 +2989,7 @@ static void _test_elem_outertext(unsigned line, IHTMLElement *elem, const WCHAR HRESULT hres; hres = IHTMLElement_get_outerText(elem, &text); - ok_(__FILE__,line) (hres == S_OK, "get_outerText failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_outerText failed: %08lx\n", hres); if(extext) ok_(__FILE__,line) (!lstrcmpW(text, extext), "get_outerText returned %s expected %s\n", wine_dbgstr_w(text), wine_dbgstr_w(extext)); @@ -3005,7 +3005,7 @@ static void _test_elem_set_outertext(unsigned line, IHTMLElement *elem, const WC HRESULT hres; hres = IHTMLElement_put_outerText(elem, str); - ok_(__FILE__,line) (hres == S_OK, "put_outerText failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "put_outerText failed: %08lx\n", hres); SysFreeString(str); } @@ -3016,7 +3016,7 @@ static void _test_elem_set_outertext_fail(unsigned line, IHTMLElement *elem) HRESULT hres; hres = IHTMLElement_put_outerText(elem, str); - ok_(__FILE__,line) (hres == 0x800a0258, "put_outerText failed: %08x\n", hres); + ok_(__FILE__,line) (hres == 0x800a0258, "put_outerText failed: %08lx\n", hres); SysFreeString(str); } @@ -3028,7 +3028,7 @@ static void _test_elem_innerhtml(unsigned line, IUnknown *unk, const WCHAR *inne HRESULT hres; hres = IHTMLElement_get_innerHTML(elem, &html); - ok_(__FILE__,line)(hres == S_OK, "get_innerHTML failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_innerHTML failed: %08lx\n", hres); if(inner_html) ok_(__FILE__,line)(!lstrcmpW(html, inner_html), "unexpected innerHTML: %s\n", wine_dbgstr_w(html)); else @@ -3047,7 +3047,7 @@ static void _test_elem_set_innerhtml(unsigned line, IUnknown *unk, const WCHAR * html = SysAllocString(inner_html); hres = IHTMLElement_put_innerHTML(elem, html); - ok_(__FILE__,line)(hres == S_OK, "put_innerHTML failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_innerHTML failed: %08lx\n", hres); IHTMLElement_Release(elem); SysFreeString(html); @@ -3062,7 +3062,7 @@ static void _test_elem_set_outerhtml(unsigned line, IUnknown *unk, const WCHAR * html = SysAllocString(outer_html); hres = IHTMLElement_put_outerHTML(elem, html); - ok_(__FILE__,line)(hres == S_OK, "put_outerHTML failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_outerHTML failed: %08lx\n", hres); IHTMLElement_Release(elem); SysFreeString(html); @@ -3077,7 +3077,7 @@ static void _test_elem_outerhtml(unsigned line, IUnknown *unk, const WCHAR *oute HRESULT hres; hres = IHTMLElement_get_outerHTML(elem, &html); - ok_(__FILE__,line)(hres == S_OK, "get_outerHTML failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_outerHTML failed: %08lx\n", hres); if((p = wcsstr(outer_html, L"-->")) && !p[3] && SysStringLen(html) == p - outer_html) /* Some IEs drop comment ending */ ok_(__FILE__,line)(!wcsncmp(html, outer_html, p - outer_html), "text = \"%s\", expected \"%s\"\n", wine_dbgstr_w(html), wine_dbgstr_w(outer_html)); @@ -3096,7 +3096,7 @@ static void _test_elem_contains(unsigned line, IHTMLElement *elem, IHTMLElement b = 100; hres = IHTMLElement_contains(elem, elem2, &b); - ok_(__FILE__,line)(hres == S_OK, "contains failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "contains failed: %08lx\n", hres); ok_(__FILE__,line)(b == exval, "contains returned %x, expected %x\n", b, exval); } @@ -3108,7 +3108,7 @@ static void _test_elem_istextedit(unsigned line, IHTMLElement *elem, VARIANT_BOO b = 100; hres = IHTMLElement_get_isTextEdit(elem, &b); - ok_(__FILE__,line)(hres == S_OK, "isTextEdit failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "isTextEdit failed: %08lx\n", hres); ok_(__FILE__,line)(b == exval, "isTextEdit = %x\n", b); } @@ -3121,7 +3121,7 @@ static IHTMLDOMNode *_get_first_child(unsigned line, IUnknown *unk) hres = IHTMLDOMNode_get_firstChild(node, &child); IHTMLDOMNode_Release(node); - ok_(__FILE__,line) (hres == S_OK, "get_firstChild failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_firstChild failed: %08lx\n", hres); return child; } @@ -3134,7 +3134,7 @@ static void _test_node_has_child(unsigned line, IUnknown *unk, VARIANT_BOOL exb) HRESULT hres; hres = IHTMLDOMNode_hasChildNodes(node, &b); - ok_(__FILE__,line) (hres == S_OK, "hasChildNodes failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "hasChildNodes failed: %08lx\n", hres); ok_(__FILE__,line) (b == exb, "hasChildNodes=%x, expected %x\n", b, exb); IHTMLDOMNode_Release(node); @@ -3149,7 +3149,7 @@ static IHTMLDOMNode *_test_node_get_parent(unsigned line, IUnknown *unk) hres = IHTMLDOMNode_get_parentNode(node, &parent); IHTMLDOMNode_Release(node); - ok_(__FILE__,line) (hres == S_OK, "get_parentNode failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_parentNode failed: %08lx\n", hres); return parent; } @@ -3163,7 +3163,7 @@ static IHTMLDOMNode *_node_get_next(unsigned line, IUnknown *unk) hres = IHTMLDOMNode_get_nextSibling(node, &next); IHTMLDOMNode_Release(node); - ok_(__FILE__,line) (hres == S_OK, "get_nextSiblibg failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_nextSiblibg failed: %08lx\n", hres); return next; } @@ -3177,7 +3177,7 @@ static IHTMLDOMNode *_node_get_prev(unsigned line, IUnknown *unk) hres = IHTMLDOMNode_get_previousSibling(node, &prev); IHTMLDOMNode_Release(node); - ok_(__FILE__,line) (hres == S_OK, "get_previousSibling failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_previousSibling failed: %08lx\n", hres); return prev; } @@ -3191,7 +3191,7 @@ static IHTMLElement *_test_elem_get_parent(unsigned line, IUnknown *unk) hres = IHTMLElement_get_parentElement(elem, &parent); IHTMLElement_Release(elem); - ok_(__FILE__,line) (hres == S_OK, "get_parentElement failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_parentElement failed: %08lx\n", hres); return parent; } @@ -3205,7 +3205,7 @@ static void _test_elem3_get_disabled(unsigned line, IUnknown *unk, VARIANT_BOOL if (!elem3) return; hres = IHTMLElement3_get_disabled(elem3, &disabled); - ok_(__FILE__,line) (hres == S_OK, "get_disabled failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_disabled failed: %08lx\n", hres); ok_(__FILE__,line) (disabled == exb, "disabled=%x, expected %x\n", disabled, exb); IHTMLElement3_Release(elem3); } @@ -3218,7 +3218,7 @@ static void _test_elem3_set_disabled(unsigned line, IUnknown *unk, VARIANT_BOOL if (!elem3) return; hres = IHTMLElement3_put_disabled(elem3, b); - ok_(__FILE__,line) (hres == S_OK, "get_disabled failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_disabled failed: %08lx\n", hres); IHTMLElement3_Release(elem3); _test_elem3_get_disabled(line, unk, b); @@ -3231,7 +3231,7 @@ static void _test_select_get_disabled(unsigned line, IHTMLSelectElement *select, HRESULT hres; hres = IHTMLSelectElement_get_disabled(select, &disabled); - ok_(__FILE__,line) (hres == S_OK, "get_disabled failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_disabled failed: %08lx\n", hres); ok_(__FILE__,line) (disabled == exb, "disabled=%x, expected %x\n", disabled, exb); _test_elem3_get_disabled(line, (IUnknown*)select, exb); @@ -3242,15 +3242,15 @@ static void test_select_remove(IHTMLSelectElement *select) HRESULT hres; hres = IHTMLSelectElement_remove(select, 3); - ok(hres == S_OK, "remove failed: %08x, expected S_OK\n", hres); + ok(hres == S_OK, "remove failed: %08lx, expected S_OK\n", hres); test_select_length(select, 2); hres = IHTMLSelectElement_remove(select, -1); - ok(hres == E_INVALIDARG, "remove failed: %08x, expected E_INVALIDARG\n", hres); + ok(hres == E_INVALIDARG, "remove failed: %08lx, expected E_INVALIDARG\n", hres); test_select_length(select, 2); hres = IHTMLSelectElement_remove(select, 0); - ok(hres == S_OK, "remove failed:%08x\n", hres); + ok(hres == S_OK, "remove failed:%08lx\n", hres); test_select_length(select, 1); } @@ -3262,8 +3262,8 @@ static void _test_text_length(unsigned line, IUnknown *unk, LONG l) HRESULT hres; hres = IHTMLDOMTextNode_get_length(text, &length); - ok_(__FILE__,line)(hres == S_OK, "get_length failed: %08x\n", hres); - ok_(__FILE__,line)(length == l, "length = %d, expected %d\n", length, l); + ok_(__FILE__,line)(hres == S_OK, "get_length failed: %08lx\n", hres); + ok_(__FILE__,line)(length == l, "length = %ld, expected %ld\n", length, l); IHTMLDOMTextNode_Release(text); } @@ -3275,7 +3275,7 @@ static void _test_text_data(unsigned line, IUnknown *unk, const WCHAR *exdata) HRESULT hres; hres = IHTMLDOMTextNode_get_data(text, &str); - ok_(__FILE__,line)(hres == S_OK, "get_data failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_data failed: %08lx\n", hres); ok_(__FILE__,line)(!lstrcmpW(str, exdata), "data = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(exdata)); IHTMLDOMTextNode_Release(text); SysFreeString(str); @@ -3289,7 +3289,7 @@ static void _set_text_data(unsigned line, IUnknown *unk, const WCHAR *data) HRESULT hres; hres = IHTMLDOMTextNode_put_data(text, str); - ok_(__FILE__,line)(hres == S_OK, "get_data failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_data failed: %08lx\n", hres); IHTMLDOMTextNode_Release(text); SysFreeString(str); } @@ -3302,7 +3302,7 @@ static void _text_append_data(unsigned line, IUnknown *unk, const WCHAR *data) HRESULT hres; hres = IHTMLDOMTextNode2_appendData(text, str); - ok_(__FILE__,line)(hres == S_OK, "appendData failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "appendData failed: %08lx\n", hres); IHTMLDOMTextNode2_Release(text); SysFreeString(str); } @@ -3313,7 +3313,7 @@ static void _test_select_set_disabled(unsigned line, IHTMLSelectElement *select, HRESULT hres; hres = IHTMLSelectElement_put_disabled(select, b); - ok_(__FILE__,line) (hres == S_OK, "get_disabled failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_disabled failed: %08lx\n", hres); _test_select_get_disabled(line, select, b); } @@ -3327,7 +3327,7 @@ static void _test_elem_dir(unsigned line, IUnknown *unk, const WCHAR *exdir) hres = IHTMLElement2_get_dir(elem, &dir); IHTMLElement2_Release(elem); - ok_(__FILE__, line) (hres == S_OK, "get_dir failed: %08x\n", hres); + ok_(__FILE__, line) (hres == S_OK, "get_dir failed: %08lx\n", hres); if(exdir) ok_(__FILE__, line) (!lstrcmpW(dir, exdir), "got dir: %s, expected %s\n", wine_dbgstr_w(dir), wine_dbgstr_w(exdir)); else @@ -3345,7 +3345,7 @@ static void _set_elem_dir(unsigned line, IUnknown *unk, const WCHAR *d) hres = IHTMLElement2_put_dir(elem, dir); IHTMLElement2_Release(elem); - ok_(__FILE__, line) (hres == S_OK, "put_dir failed: %08x\n", hres); + ok_(__FILE__, line) (hres == S_OK, "put_dir failed: %08lx\n", hres); SysFreeString(dir); _test_elem_dir(line, unk, d); @@ -3360,16 +3360,16 @@ static LONG _elem_get_scroll_height(unsigned line, IUnknown *unk) HRESULT hres; hres = IHTMLElement2_get_scrollHeight(elem, &l); - ok_(__FILE__,line) (hres == S_OK, "get_scrollHeight failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_scrollHeight failed: %08lx\n", hres); IHTMLElement2_Release(elem); hres = IUnknown_QueryInterface(unk, &IID_IHTMLTextContainer, (void**)&txtcont); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLTextContainer: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLTextContainer: %08lx\n", hres); hres = IHTMLTextContainer_get_scrollHeight(txtcont, &l2); IHTMLTextContainer_Release(txtcont); - ok_(__FILE__,line) (hres == S_OK, "IHTMLTextContainer::get_scrollHeight failed: %d\n", l2); - ok_(__FILE__,line) (l == l2, "unexpected height %d, expected %d\n", l2, l); + ok_(__FILE__,line) (hres == S_OK, "IHTMLTextContainer::get_scrollHeight failed: %ld\n", l2); + ok_(__FILE__,line) (l == l2, "unexpected height %ld, expected %ld\n", l2, l); return l; } @@ -3383,16 +3383,16 @@ static LONG _elem_get_scroll_width(unsigned line, IUnknown *unk) HRESULT hres; hres = IHTMLElement2_get_scrollWidth(elem, &l); - ok_(__FILE__,line) (hres == S_OK, "get_scrollWidth failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_scrollWidth failed: %08lx\n", hres); IHTMLElement2_Release(elem); hres = IUnknown_QueryInterface(unk, &IID_IHTMLTextContainer, (void**)&txtcont); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLTextContainer: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLTextContainer: %08lx\n", hres); hres = IHTMLTextContainer_get_scrollWidth(txtcont, &l2); IHTMLTextContainer_Release(txtcont); - ok_(__FILE__,line) (hres == S_OK, "IHTMLTextContainer::get_scrollWidth failed: %d\n", l2); - ok_(__FILE__,line) (l == l2, "unexpected width %d, expected %d\n", l2, l); + ok_(__FILE__,line) (hres == S_OK, "IHTMLTextContainer::get_scrollWidth failed: %ld\n", l2); + ok_(__FILE__,line) (l == l2, "unexpected width %ld, expected %ld\n", l2, l); return l; } @@ -3406,16 +3406,16 @@ static LONG _elem_get_scroll_top(unsigned line, IUnknown *unk) HRESULT hres; hres = IHTMLElement2_get_scrollTop(elem, &l); - ok_(__FILE__,line) (hres == S_OK, "get_scrollTop failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_scrollTop failed: %08lx\n", hres); IHTMLElement2_Release(elem); hres = IUnknown_QueryInterface(unk, &IID_IHTMLTextContainer, (void**)&txtcont); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLTextContainer: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLTextContainer: %08lx\n", hres); hres = IHTMLTextContainer_get_scrollTop(txtcont, &l2); IHTMLTextContainer_Release(txtcont); - ok_(__FILE__,line) (hres == S_OK, "IHTMLTextContainer::get_scrollTop failed: %d\n", l2); - ok_(__FILE__,line) (l == l2, "unexpected top %d, expected %d\n", l2, l); + ok_(__FILE__,line) (hres == S_OK, "IHTMLTextContainer::get_scrollTop failed: %ld\n", l2); + ok_(__FILE__,line) (l == l2, "unexpected top %ld, expected %ld\n", l2, l); return l; } @@ -3429,19 +3429,19 @@ static void _elem_get_scroll_left(unsigned line, IUnknown *unk) HRESULT hres; hres = IHTMLElement2_get_scrollLeft(elem, NULL); - ok(hres == E_INVALIDARG, "expect E_INVALIDARG got 0x%08x\n", hres); + ok(hres == E_INVALIDARG, "expect E_INVALIDARG got 0x%08lx\n", hres); hres = IHTMLElement2_get_scrollLeft(elem, &l); - ok(hres == S_OK, "get_scrollTop failed: %08x\n", hres); + ok(hres == S_OK, "get_scrollTop failed: %08lx\n", hres); IHTMLElement2_Release(elem); hres = IUnknown_QueryInterface(unk, &IID_IHTMLTextContainer, (void**)&txtcont); - ok(hres == S_OK, "Could not get IHTMLTextContainer: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLTextContainer: %08lx\n", hres); hres = IHTMLTextContainer_get_scrollLeft(txtcont, &l2); IHTMLTextContainer_Release(txtcont); - ok(hres == S_OK, "IHTMLTextContainer::get_scrollLeft failed: %d\n", l2); - ok(l == l2, "unexpected left %d, expected %d\n", l2, l); + ok(hres == S_OK, "IHTMLTextContainer::get_scrollLeft failed: %ld\n", l2); + ok(l == l2, "unexpected left %ld, expected %ld\n", l2, l); } #define test_img_src(a,b,c) _test_img_src(__LINE__,a,b,c) @@ -3453,7 +3453,7 @@ static void _test_img_src(unsigned line, IUnknown *unk, const WCHAR *exsrc, cons hres = IHTMLImgElement_get_src(img, &src); IHTMLImgElement_Release(img); - ok_(__FILE__,line) (hres == S_OK, "get_src failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_src failed: %08lx\n", hres); ok_(__FILE__,line) (!lstrcmpW(src, exsrc) || (broken_src && broken(!lstrcmpW(src, broken_src))), "get_src returned %s expected %s\n", wine_dbgstr_w(src), wine_dbgstr_w(exsrc)); SysFreeString(src); @@ -3470,7 +3470,7 @@ static void _test_img_set_src(unsigned line, IUnknown *unk, const WCHAR *src) hres = IHTMLImgElement_put_src(img, tmp); IHTMLImgElement_Release(img); SysFreeString(tmp); - ok_(__FILE__,line) (hres == S_OK, "put_src failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "put_src failed: %08lx\n", hres); } #define test_img_alt(u,a) _test_img_alt(__LINE__,u,a) @@ -3481,7 +3481,7 @@ static void _test_img_alt(unsigned line, IUnknown *unk, const WCHAR *exalt) HRESULT hres; hres = IHTMLImgElement_get_alt(img, &alt); - ok_(__FILE__,line) (hres == S_OK, "get_alt failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_alt failed: %08lx\n", hres); if(exalt) ok_(__FILE__,line) (!lstrcmpW(alt, exalt), "unexpected alt %s\n", wine_dbgstr_w(alt)); else @@ -3498,7 +3498,7 @@ static void _test_img_set_alt(unsigned line, IUnknown *unk, const WCHAR *alt) tmp = SysAllocString(alt); hres = IHTMLImgElement_put_alt(img, tmp); - ok_(__FILE__,line) (hres == S_OK, "get_alt failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_alt failed: %08lx\n", hres); SysFreeString(tmp); _test_img_alt(line, unk, alt); @@ -3513,11 +3513,11 @@ static void _test_img_align(unsigned line, IUnknown *unk, const WCHAR *align) tmp = SysAllocString(align); hres = IHTMLImgElement_put_align(img, tmp); - ok_(__FILE__,line) (hres == S_OK, "put_align failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "put_align failed: %08lx\n", hres); SysFreeString(tmp); hres = IHTMLImgElement_get_align(img, &tmp); - ok_(__FILE__,line) (hres == S_OK, "put_align failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "put_align failed: %08lx\n", hres); ok_(__FILE__,line) (!lstrcmpW(tmp, align), "Expect %s, got %s\n", wine_dbgstr_w(align), wine_dbgstr_w(tmp)); SysFreeString(tmp); } @@ -3530,7 +3530,7 @@ static void _test_img_name(unsigned line, IUnknown *unk, const WCHAR *pValue) HRESULT hres; hres = IHTMLImgElement_get_name(img, &sName); - ok_(__FILE__,line) (hres == S_OK, "get_Name failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_Name failed: %08lx\n", hres); ok_(__FILE__,line) (!lstrcmpW (sName, pValue), "expected %s got %s\n", wine_dbgstr_w(pValue), wine_dbgstr_w(sName)); IHTMLImgElement_Release(img); SysFreeString(sName); @@ -3544,7 +3544,7 @@ static void _test_img_complete(unsigned line, IHTMLElement *elem, VARIANT_BOOL e HRESULT hres; hres = IHTMLImgElement_get_complete(img, &b); - ok_(__FILE__,line) (hres == S_OK, "get_complete failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_complete failed: %08lx\n", hres); ok_(__FILE__,line) (b == exb, "complete = %x, expected %x\n", b, exb); IHTMLImgElement_Release(img); } @@ -3557,14 +3557,14 @@ static void _test_img_isMap(unsigned line, IUnknown *unk, VARIANT_BOOL v) HRESULT hres; hres = IHTMLImgElement_put_isMap(img, v); - ok_(__FILE__,line) (hres == S_OK, "put_isMap failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "put_isMap failed: %08lx\n", hres); hres = IHTMLImgElement_get_isMap(img, &b); - ok_(__FILE__,line) (hres == S_OK, "get_isMap failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_isMap failed: %08lx\n", hres); ok_(__FILE__,line) (b == v, "isMap = %x, expected %x\n", b, v); hres = IHTMLImgElement_get_isMap(img, NULL); - ok_(__FILE__,line) (hres == E_INVALIDARG, "ret = %08x, expected E_INVALIDARG\n", hres); + ok_(__FILE__,line) (hres == E_INVALIDARG, "ret = %08lx, expected E_INVALIDARG\n", hres); IHTMLImgElement_Release(img); } @@ -3580,20 +3580,20 @@ static void test_dynamic_properties(IHTMLElement *elem) HRESULT hres; hres = IHTMLElement_QueryInterface(elem, &IID_IDispatchEx, (void**)&dispex); - ok(hres == S_OK, "QueryInterface failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface failed: %08lx\n", hres); hres = IHTMLElement_removeAttribute(elem, attr1, 0, &succ); - ok(hres == S_OK, "removeAttribute failed: %08x\n", hres); + ok(hres == S_OK, "removeAttribute failed: %08lx\n", hres); ok(succ, "removeAttribute set succ to FALSE\n"); while(1) { hres = IDispatchEx_GetNextDispID(dispex, fdexEnumAll, id, &id); - ok(hres==S_OK || hres==S_FALSE, "GetNextDispID failed: %08x\n", hres); + ok(hres==S_OK || hres==S_FALSE, "GetNextDispID failed: %08lx\n", hres); if(hres != S_OK) break; hres = IDispatchEx_GetMemberName(dispex, id, &name); - ok(hres == S_OK, "GetMemberName failed: %08x\n", hres); + ok(hres == S_OK, "GetMemberName failed: %08lx\n", hres); if(!lstrcmpW(name, L"attr1")) ok(0, "attr1 should be removed\n"); @@ -3607,7 +3607,7 @@ static void test_dynamic_properties(IHTMLElement *elem) V_VT(&val) = VT_BSTR; V_BSTR(&val) = attr1; hres = IHTMLElement_setAttribute(elem, attr1, val, 0); - ok(hres == S_OK, "setAttribute failed: %08x\n", hres); + ok(hres == S_OK, "setAttribute failed: %08lx\n", hres); SysFreeString(attr1); } @@ -3618,7 +3618,7 @@ static void _test_attr_node_name(unsigned line, IHTMLDOMAttribute *attr, const W HRESULT hres; hres = IHTMLDOMAttribute_get_nodeName(attr, &str); - ok_(__FILE__,line)(hres == S_OK, "get_nodeName failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_nodeName failed: %08lx\n", hres); ok_(__FILE__,line)(!lstrcmpW(str, exname), "node name is %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(exname)); SysFreeString(str); } @@ -3631,7 +3631,7 @@ static void _test_attr_parent(unsigned line, IHTMLDOMAttribute *attr) HRESULT hres; hres = IHTMLDOMAttribute2_get_parentNode(attr2, &parent); - ok_(__FILE__,line)(hres == S_OK, "get_parentNode failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_parentNode failed: %08lx\n", hres); ok_(__FILE__,line)(!parent, "parent != NULL\n"); IHTMLDOMAttribute2_Release(attr2); } @@ -3648,32 +3648,32 @@ static void test_attr_collection_disp(IDispatch *disp) HRESULT hres; hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); - ok(hres == S_OK, "QueryInterface failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface failed: %08lx\n", hres); bstr = SysAllocString(L"0"); hres = IDispatchEx_GetDispID(dispex, bstr, fdexNameCaseSensitive, &id); - ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + ok(hres == S_OK, "GetDispID failed: %08lx\n", hres); SysFreeString(bstr); VariantInit(&var); hres = IDispatchEx_InvokeEx(dispex, id, LOCALE_NEUTRAL, INVOKE_PROPERTYGET, &dp, &var, &ei, NULL); - ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); ok(V_VT(&var) == VT_DISPATCH, "V_VT(var)=%d\n", V_VT(&var)); ok(V_DISPATCH(&var) != NULL, "V_DISPATCH(var) == NULL\n"); VariantClear(&var); bstr = SysAllocString(L"attr1"); hres = IDispatchEx_GetDispID(dispex, bstr, fdexNameCaseSensitive, &id); - ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + ok(hres == S_OK, "GetDispID failed: %08lx\n", hres); SysFreeString(bstr); VariantInit(&var); hres = IDispatchEx_InvokeEx(dispex, id, LOCALE_NEUTRAL, INVOKE_PROPERTYGET, &dp, &var, &ei, NULL); - ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); ok(V_VT(&var) == VT_DISPATCH, "V_VT(var)=%d\n", V_VT(&var)); ok(V_DISPATCH(&var) != NULL, "V_DISPATCH(var) == NULL\n"); hres = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IHTMLDOMAttribute, (void**)&attr); - ok(hres == S_OK, "QueryInterface failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface failed: %08lx\n", hres); test_attr_node_name(attr, L"attr1"); @@ -3697,51 +3697,51 @@ static void test_attr_collection(IHTMLElement *elem) HRESULT hres; hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLDOMNode, (void**)&node); - ok(hres == S_OK, "QueryInterface failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface failed: %08lx\n", hres); hres = IHTMLDOMNode_get_attributes(node, &disp); - ok(hres == S_OK, "get_attributes failed: %08x\n", hres); + ok(hres == S_OK, "get_attributes failed: %08lx\n", hres); hres = IHTMLDOMNode_get_attributes(node, &attr); - ok(hres == S_OK, "get_attributes failed: %08x\n", hres); + ok(hres == S_OK, "get_attributes failed: %08lx\n", hres); ok(iface_cmp((IUnknown*)disp, (IUnknown*)attr), "disp != attr\n"); IDispatch_Release(attr); IHTMLDOMNode_Release(node); hres = IDispatch_QueryInterface(disp, &IID_IHTMLAttributeCollection, (void**)&attr_col); - ok(hres == S_OK, "QueryInterface failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface failed: %08lx\n", hres); hres = IHTMLAttributeCollection_get_length(attr_col, &i); - ok(hres == S_OK, "get_length failed: %08x\n", hres); + ok(hres == S_OK, "get_length failed: %08lx\n", hres); V_VT(&val) = VT_I4; V_I4(&val) = 1; hres = IHTMLElement_setAttribute(elem, name, val, 0); - ok(hres == S_OK, "setAttribute failed: %08x\n", hres); + ok(hres == S_OK, "setAttribute failed: %08lx\n", hres); SysFreeString(name); hres = IHTMLAttributeCollection_get_length(attr_col, &len); - ok(hres == S_OK, "get_length failed: %08x\n", hres); - ok(len == i+1, "get_length returned %d, expected %d\n", len, i+1); + ok(hres == S_OK, "get_length failed: %08lx\n", hres); + ok(len == i+1, "get_length returned %ld, expected %ld\n", len, i+1); checked = 0; for(i=0; i<len; i++) { V_VT(&id) = VT_I4; V_I4(&id) = i; hres = IHTMLAttributeCollection_item(attr_col, &id, &attr); - ok(hres == S_OK, "%d) item failed: %08x\n", i, hres); + ok(hres == S_OK, "%ld) item failed: %08lx\n", i, hres); hres = IDispatch_QueryInterface(attr, &IID_IHTMLDOMAttribute, (void**)&dom_attr); - ok(hres == S_OK, "%d) QueryInterface failed: %08x\n", i, hres); + ok(hres == S_OK, "%ld) QueryInterface failed: %08lx\n", i, hres); IDispatch_Release(attr); hres = IHTMLDOMAttribute_get_nodeName(dom_attr, &name); - ok(hres == S_OK, "%d) get_nodeName failed: %08x\n", i, hres); + ok(hres == S_OK, "%ld) get_nodeName failed: %08lx\n", i, hres); if(!lstrcmpW(name, L"id")) { checked++; hres = IHTMLDOMAttribute_get_nodeValue(dom_attr, &val); - ok(hres == S_OK, "%d) get_nodeValue failed: %08x\n", i, hres); + ok(hres == S_OK, "%ld) get_nodeValue failed: %08lx\n", i, hres); ok(V_VT(&val) == VT_BSTR, "id: V_VT(&val) = %d\n", V_VT(&val)); ok(!lstrcmpW(V_BSTR(&val), L"attr"), "id: V_BSTR(&val) = %s\n", wine_dbgstr_w(V_BSTR(&val))); test_attr_expando(dom_attr, VARIANT_FALSE); @@ -3749,7 +3749,7 @@ static void test_attr_collection(IHTMLElement *elem) } else if(!lstrcmpW(name, L"attr1")) { checked++; hres = IHTMLDOMAttribute_get_nodeValue(dom_attr, &val); - ok(hres == S_OK, "%d) get_nodeValue failed: %08x\n", i, hres); + ok(hres == S_OK, "%ld) get_nodeValue failed: %08lx\n", i, hres); ok(V_VT(&val) == VT_BSTR, "attr1: V_VT(&val) = %d\n", V_VT(&val)); ok(!lstrcmpW(V_BSTR(&val), L"attr1"), "attr1: V_BSTR(&val) = %s\n", wine_dbgstr_w(V_BSTR(&val))); test_attr_expando(dom_attr, VARIANT_TRUE); @@ -3757,23 +3757,23 @@ static void test_attr_collection(IHTMLElement *elem) } else if(!lstrcmpW(name, L"attr2")) { checked++; hres = IHTMLDOMAttribute_get_nodeValue(dom_attr, &val); - ok(hres == S_OK, "%d) get_nodeValue failed: %08x\n", i, hres); + ok(hres == S_OK, "%ld) get_nodeValue failed: %08lx\n", i, hres); ok(V_VT(&val) == VT_BSTR, "attr2: V_VT(&val) = %d\n", V_VT(&val)); ok(!V_BSTR(&val), "attr2: V_BSTR(&val) != NULL\n"); test_attr_value(dom_attr, L""); } else if(!lstrcmpW(name, L"attr3")) { checked++; hres = IHTMLDOMAttribute_get_nodeValue(dom_attr, &val); - ok(hres == S_OK, "%d) get_nodeValue failed: %08x\n", i, hres); + ok(hres == S_OK, "%ld) get_nodeValue failed: %08lx\n", i, hres); ok(V_VT(&val) == VT_BSTR, "attr3: V_VT(&val) = %d\n", V_VT(&val)); ok(!lstrcmpW(V_BSTR(&val), L"attr3"), "attr3: V_BSTR(&val) = %s\n", wine_dbgstr_w(V_BSTR(&val))); test_attr_value(dom_attr, L"attr3"); } else if(!lstrcmpW(name, L"test")) { checked++; hres = IHTMLDOMAttribute_get_nodeValue(dom_attr, &val); - ok(hres == S_OK, "%d) get_nodeValue failed: %08x\n", i, hres); + ok(hres == S_OK, "%ld) get_nodeValue failed: %08lx\n", i, hres); ok(V_VT(&val) == VT_I4, "test: V_VT(&val) = %d\n", V_VT(&val)); - ok(V_I4(&val) == 1, "test: V_I4(&val) = %d\n", V_I4(&val)); + ok(V_I4(&val) == 1, "test: V_I4(&val) = %ld\n", V_I4(&val)); test_attr_value(dom_attr, L"1"); } @@ -3781,16 +3781,16 @@ static void test_attr_collection(IHTMLElement *elem) SysFreeString(name); VariantClear(&val); } - ok(checked==5, "invalid number of specified attributes (%d)\n", checked); + ok(checked==5, "invalid number of specified attributes (%ld)\n", checked); V_I4(&id) = len; hres = IHTMLAttributeCollection_item(attr_col, &id, &attr); - ok(hres == E_INVALIDARG, "item failed: %08x\n", hres); + ok(hres == E_INVALIDARG, "item failed: %08lx\n", hres); V_VT(&id) = VT_BSTR; V_BSTR(&id) = SysAllocString(L"nonexisting"); hres = IHTMLAttributeCollection_item(attr_col, &id, &attr); - ok(hres == E_INVALIDARG, "item failed: %08x\n", hres); + ok(hres == E_INVALIDARG, "item failed: %08lx\n", hres); VariantClear(&id); test_attr_collection_disp(disp); @@ -3808,7 +3808,7 @@ static void _test_elem_id(unsigned line, IUnknown *unk, const WCHAR *exid) hres = IHTMLElement_get_id(elem, &id); IHTMLElement_Release(elem); - ok_(__FILE__,line) (hres == S_OK, "get_id failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_id failed: %08lx\n", hres); if(exid) ok_(__FILE__,line) (!lstrcmpW(id, exid), "unexpected id %s\n", wine_dbgstr_w(id)); @@ -3825,7 +3825,7 @@ static void _test_elem_language(unsigned line, IHTMLElement *elem, const WCHAR * HRESULT hres; hres = IHTMLElement_get_language(elem, &lang); - ok_(__FILE__,line) (hres == S_OK, "get_language failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_language failed: %08lx\n", hres); if(exlang) ok_(__FILE__,line) (!lstrcmpW(lang, exlang), "unexpected language %s\n", wine_dbgstr_w(lang)); @@ -3842,7 +3842,7 @@ static void _set_elem_language(unsigned line, IHTMLElement *elem, const WCHAR *l HRESULT hres; hres = IHTMLElement_put_language(elem, str); - ok_(__FILE__,line) (hres == S_OK, "get_language failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_language failed: %08lx\n", hres); SysFreeString(str); _test_elem_language(line, elem, lang); @@ -3855,7 +3855,7 @@ static void _test_elem_lang(unsigned line, IHTMLElement *elem, const WCHAR *exla HRESULT hres; hres = IHTMLElement_get_lang(elem, &lang); - ok_(__FILE__,line) (hres == S_OK, "get_lang failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_lang failed: %08lx\n", hres); if(exlang) ok_(__FILE__,line) (!lstrcmpW(lang, exlang), "unexpected lang %s\n", wine_dbgstr_w(lang)); @@ -3872,7 +3872,7 @@ static void _set_elem_lang(unsigned line, IHTMLElement *elem, const WCHAR *lang) HRESULT hres; hres = IHTMLElement_put_lang(elem, str); - ok_(__FILE__,line) (hres == S_OK, "get_lang failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_lang failed: %08lx\n", hres); SysFreeString(str); _test_elem_lang(line, elem, lang); @@ -3888,7 +3888,7 @@ static void _test_elem_put_id(unsigned line, IUnknown *unk, const WCHAR *new_id) hres = IHTMLElement_put_id(elem, tmp); IHTMLElement_Release(elem); SysFreeString(tmp); - ok_(__FILE__,line) (hres == S_OK, "put_id failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "put_id failed: %08lx\n", hres); _test_elem_id(line, unk, new_id); } @@ -3900,20 +3900,20 @@ static void test_contenteditable(IUnknown *unk) BSTR str, strDefault; hres = IHTMLElement3_get_contentEditable(elem3, &strDefault); - ok(hres == S_OK, "get_contentEditable failed: 0x%08x\n", hres); + ok(hres == S_OK, "get_contentEditable failed: 0x%08lx\n", hres); str = SysAllocString(L"true"); hres = IHTMLElement3_put_contentEditable(elem3, str); - ok(hres == S_OK, "put_contentEditable(%s) failed: 0x%08x\n", wine_dbgstr_w(str), hres); + ok(hres == S_OK, "put_contentEditable(%s) failed: 0x%08lx\n", wine_dbgstr_w(str), hres); SysFreeString(str); hres = IHTMLElement3_get_contentEditable(elem3, &str); - ok(hres == S_OK, "get_contentEditable failed: 0x%08x\n", hres); + ok(hres == S_OK, "get_contentEditable failed: 0x%08lx\n", hres); ok(!lstrcmpW(str, L"true"), "Got %s, expected %s\n", wine_dbgstr_w(str), "true"); SysFreeString(str); /* Restore origin contentEditable */ hres = IHTMLElement3_put_contentEditable(elem3, strDefault); - ok(hres == S_OK, "put_contentEditable(%s) failed: 0x%08x\n", wine_dbgstr_w(strDefault), hres); + ok(hres == S_OK, "put_contentEditable(%s) failed: 0x%08lx\n", wine_dbgstr_w(strDefault), hres); SysFreeString(strDefault); IHTMLElement3_Release(elem3); @@ -3926,7 +3926,7 @@ static void _test_input_type(unsigned line, IHTMLInputElement *input, const WCHA HRESULT hres; hres = IHTMLInputElement_get_type(input, &type); - ok_(__FILE__,line) (hres == S_OK, "get_type failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_type failed: %08lx\n", hres); ok_(__FILE__,line) (!lstrcmpW(type, extype), "type=%s, expected %s\n", wine_dbgstr_w(type), wine_dbgstr_w(extype)); SysFreeString(type); } @@ -3938,7 +3938,7 @@ static void _test_input_name(unsigned line, IHTMLInputElement *input, const WCHA HRESULT hres; hres = IHTMLInputElement_get_name(input, &name); - ok_(__FILE__,line) (hres == S_OK, "get_name failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_name failed: %08lx\n", hres); if(exname) ok_(__FILE__,line) (!lstrcmpW(name, exname), "name=%s, expected %s\n", wine_dbgstr_w(name), wine_dbgstr_w(exname)); else @@ -3953,7 +3953,7 @@ static void _test_input_set_name(unsigned line, IHTMLInputElement *input, const HRESULT hres; hres = IHTMLInputElement_put_name(input, tmp); - ok_(__FILE__,line) (hres == S_OK, "put_name failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "put_name failed: %08lx\n", hres); SysFreeString(tmp); _test_input_name(line, input, name); @@ -3966,7 +3966,7 @@ static void _test_input_get_disabled(unsigned line, IHTMLInputElement *input, VA HRESULT hres; hres = IHTMLInputElement_get_disabled(input, &disabled); - ok_(__FILE__,line) (hres == S_OK, "get_disabled failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_disabled failed: %08lx\n", hres); ok_(__FILE__,line) (disabled == exb, "disabled=%x, expected %x\n", disabled, exb); _test_elem3_get_disabled(line, (IUnknown*)input, exb); @@ -3978,7 +3978,7 @@ static void _test_input_set_disabled(unsigned line, IHTMLInputElement *input, VA HRESULT hres; hres = IHTMLInputElement_put_disabled(input, b); - ok_(__FILE__,line) (hres == S_OK, "get_disabled failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_disabled failed: %08lx\n", hres); _test_input_get_disabled(line, input, b); } @@ -3990,7 +3990,7 @@ static void _test_input_get_defaultchecked(unsigned line, IHTMLInputElement *inp HRESULT hres; hres = IHTMLInputElement_get_defaultChecked(input, &checked); - ok_(__FILE__,line) (hres == S_OK, "get_defaultChecked failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_defaultChecked failed: %08lx\n", hres); ok_(__FILE__,line) (checked == exb, "checked=%x, expected %x\n", checked, exb); } @@ -4000,7 +4000,7 @@ static void _test_input_set_defaultchecked(unsigned line, IHTMLInputElement *inp HRESULT hres; hres = IHTMLInputElement_put_defaultChecked(input, b); - ok_(__FILE__,line) (hres == S_OK, "get_defaultChecked failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_defaultChecked failed: %08lx\n", hres); _test_input_get_defaultchecked(line, input, b); } @@ -4012,7 +4012,7 @@ static void _test_input_get_checked(unsigned line, IHTMLInputElement *input, VAR HRESULT hres; hres = IHTMLInputElement_get_checked(input, &checked); - ok_(__FILE__,line) (hres == S_OK, "get_checked failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_checked failed: %08lx\n", hres); ok_(__FILE__,line) (checked == exb, "checked=%x, expected %x\n", checked, exb); } @@ -4022,7 +4022,7 @@ static void _test_input_set_checked(unsigned line, IHTMLInputElement *input, VAR HRESULT hres; hres = IHTMLInputElement_put_checked(input, b); - ok_(__FILE__,line) (hres == S_OK, "put_checked failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "put_checked failed: %08lx\n", hres); _test_input_get_checked(line, input, b); } @@ -4034,8 +4034,8 @@ static void _test_input_maxlength(unsigned line, IHTMLInputElement *input, LONG HRESULT hres; hres = IHTMLInputElement_get_maxLength(input, &maxlength); - ok_(__FILE__,line) (hres == S_OK, "get_maxLength failed: %08x\n", hres); - ok_(__FILE__,line) (maxlength == exl, "maxLength=%x, expected %d\n", maxlength, exl); + ok_(__FILE__,line) (hres == S_OK, "get_maxLength failed: %08lx\n", hres); + ok_(__FILE__,line) (maxlength == exl, "maxLength=%lx, expected %ld\n", maxlength, exl); } #define test_input_set_maxlength(i,b) _test_input_set_maxlength(__LINE__,i,b) @@ -4044,7 +4044,7 @@ static void _test_input_set_maxlength(unsigned line, IHTMLInputElement *input, L HRESULT hres; hres = IHTMLInputElement_put_maxLength(input, l); - ok_(__FILE__,line) (hres == S_OK, "put_maxLength failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "put_maxLength failed: %08lx\n", hres); _test_input_maxlength(line, input, l); } @@ -4057,12 +4057,12 @@ static void _test_input_value(unsigned line, IUnknown *unk, const WCHAR *exval) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLInputElement, (void**)&input); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLInputElement: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLInputElement: %08lx\n", hres); if(FAILED(hres)) return; hres = IHTMLInputElement_get_value(input, &bstr); - ok_(__FILE__,line) (hres == S_OK, "get_value failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_value failed: %08lx\n", hres); if(exval) ok_(__FILE__,line) (!lstrcmpW(bstr, exval), "value=%s\n", wine_dbgstr_w(bstr)); else @@ -4081,13 +4081,13 @@ static void _test_input_get_form(unsigned line, IUnknown *unk, const WCHAR *id) ok_(__FILE__,line) (unk != NULL, "unk is NULL!\n"); hres = IUnknown_QueryInterface(unk, &IID_IHTMLInputElement, (void**)&input); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLInputElement: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLInputElement: %08lx\n", hres); ok_(__FILE__,line) (input != NULL, "input == NULL\n"); if(FAILED(hres) || input == NULL) return; hres = IHTMLInputElement_get_form(input, &form); - ok_(__FILE__, line) (hres == S_OK, "get_form failed: %08x\n", hres); + ok_(__FILE__, line) (hres == S_OK, "get_form failed: %08lx\n", hres); ok_(__FILE__, line) (form != NULL, "form == NULL\n"); if(FAILED(hres) || form == NULL){ IHTMLInputElement_Release(input); @@ -4095,7 +4095,7 @@ static void _test_input_get_form(unsigned line, IUnknown *unk, const WCHAR *id) } hres = IHTMLFormElement_QueryInterface(form, &IID_IHTMLElement, (void **)&elem); - ok_(__FILE__, line) (hres == S_OK, "QueryInterface(IID_IHTMLElement) failed: %08x\n", hres); + ok_(__FILE__, line) (hres == S_OK, "QueryInterface(IID_IHTMLElement) failed: %08lx\n", hres); ok_(__FILE__, line) (elem != NULL, "elem == NULL\n"); if(FAILED(hres) || elem == NULL){ IHTMLInputElement_Release(input); @@ -4118,13 +4118,13 @@ static void _test_input_put_value(unsigned line, IUnknown *unk, const WCHAR *val HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLInputElement, (void**)&input); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLInputElement: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLInputElement: %08lx\n", hres); if(FAILED(hres)) return; bstr = SysAllocString(val); hres = IHTMLInputElement_put_value(input, bstr); - ok_(__FILE__,line) (hres == S_OK, "get_value failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_value failed: %08lx\n", hres); SysFreeString(bstr); IHTMLInputElement_Release(input); @@ -4139,12 +4139,12 @@ static void _test_input_defaultValue(unsigned line, IUnknown *unk, const WCHAR * HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLInputElement, (void**)&input); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLInputElement: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLInputElement: %08lx\n", hres); if(FAILED(hres)) return; hres = IHTMLInputElement_get_defaultValue(input, &str); - ok_(__FILE__,line) (hres == S_OK, "get_defaultValue failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_defaultValue failed: %08lx\n", hres); if(exval) ok_(__FILE__,line) (!lstrcmpW(str, exval), "defaultValue=%s\n", wine_dbgstr_w(str)); else @@ -4161,13 +4161,13 @@ static void _test_input_put_defaultValue(unsigned line, IUnknown *unk, const WCH HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLInputElement, (void**)&input); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLInputElement: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLInputElement: %08lx\n", hres); if(FAILED(hres)) return; str = SysAllocString(val); hres = IHTMLInputElement_put_defaultValue(input, str); - ok_(__FILE__,line) (hres == S_OK, "get_defaultValue failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_defaultValue failed: %08lx\n", hres); SysFreeString(str); IHTMLInputElement_Release(input); @@ -4181,7 +4181,7 @@ static void _test_input_src(unsigned line, IHTMLInputElement *input, const WCHAR HRESULT hres; hres = IHTMLInputElement_get_src(input, &src); - ok_(__FILE__,line) (hres == S_OK, "get_src failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_src failed: %08lx\n", hres); if(exsrc) ok_(__FILE__,line) (!lstrcmpW(src, exsrc), "get_src returned %s expected %s\n", wine_dbgstr_w(src), wine_dbgstr_w(exsrc)); else @@ -4198,7 +4198,7 @@ static void _test_input_set_src(unsigned line, IHTMLInputElement *input, const W tmp = SysAllocString(src); hres = IHTMLInputElement_put_src(input, tmp); SysFreeString(tmp); - ok_(__FILE__,line) (hres == S_OK, "put_src failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "put_src failed: %08lx\n", hres); _test_input_src(line, input, src); } @@ -4209,7 +4209,7 @@ static void _test_input_set_size(unsigned line, IHTMLInputElement *input, LONG s HRESULT hres; hres = IHTMLInputElement_put_size(input, size); - ok_(__FILE__,line) (hres == exret, "Expect ret = %08x, got: %08x\n", exret, hres); + ok_(__FILE__,line) (hres == exret, "Expect ret = %08lx, got: %08lx\n", exret, hres); } #define test_input_get_size(u,s) _test_input_get_size(__LINE__,u,s) @@ -4219,11 +4219,11 @@ static void _test_input_get_size(unsigned line, IHTMLInputElement *input, LONG e LONG size; hres = IHTMLInputElement_get_size(input, &size); - ok_(__FILE__,line) (hres == S_OK, "get_size failed: %08x\n", hres); - ok_(__FILE__,line) (size == exsize, "Expect %d, got %d\n", exsize, size); + ok_(__FILE__,line) (hres == S_OK, "get_size failed: %08lx\n", hres); + ok_(__FILE__,line) (size == exsize, "Expect %ld, got %ld\n", exsize, size); hres = IHTMLInputElement_get_size(input, NULL); - ok_(__FILE__,line) (hres == E_INVALIDARG, "Expect ret E_INVALIDARG, got: %08x\n", hres); + ok_(__FILE__,line) (hres == E_INVALIDARG, "Expect ret E_INVALIDARG, got: %08lx\n", hres); } #define test_input_readOnly(u,b) _test_input_readOnly(__LINE__,u,b) @@ -4233,10 +4233,10 @@ static void _test_input_readOnly(unsigned line, IHTMLInputElement *input, VARIAN VARIANT_BOOL b = 100; hres = IHTMLInputElement_put_readOnly(input, v); - ok_(__FILE__,line)(hres == S_OK, "put readOnly failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put readOnly failed: %08lx\n", hres); hres = IHTMLInputElement_get_readOnly(input, &b); - ok_(__FILE__,line)(hres == S_OK, "get readOnly failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get readOnly failed: %08lx\n", hres); ok_(__FILE__,line)(v == b, "Expect %x, got %x\n", v, b); } @@ -4249,7 +4249,7 @@ static void _test_elem_class(unsigned line, IUnknown *unk, const WCHAR *exclass) hres = IHTMLElement_get_className(elem, &class); IHTMLElement_Release(elem); - ok_(__FILE__,line) (hres == S_OK, "get_className failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_className failed: %08lx\n", hres); if(exclass) ok_(__FILE__,line) (!lstrcmpW(class, exclass), "unexpected className %s\n", wine_dbgstr_w(class)); else @@ -4266,7 +4266,7 @@ static void _test_elem_tabindex(unsigned line, IUnknown *unk, short exindex) hres = IHTMLElement2_get_tabIndex(elem2, &index); IHTMLElement2_Release(elem2); - ok_(__FILE__,line) (hres == S_OK, "get_tabIndex failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_tabIndex failed: %08lx\n", hres); ok_(__FILE__,line) (index == exindex, "unexpected index %d\n", index); } @@ -4278,7 +4278,7 @@ static void _test_elem_set_tabindex(unsigned line, IUnknown *unk, short index) hres = IHTMLElement2_put_tabIndex(elem2, index); IHTMLElement2_Release(elem2); - ok_(__FILE__,line) (hres == S_OK, "get_tabIndex failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_tabIndex failed: %08lx\n", hres); _test_elem_tabindex(line, unk, index); } @@ -4291,7 +4291,7 @@ static void _test_style_media(unsigned line, IUnknown *unk, const WCHAR *exmedia HRESULT hres; hres = IHTMLStyleElement_get_media(style, &media); - ok_(__FILE__,line)(hres == S_OK, "get_media failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_media failed: %08lx\n", hres); if(exmedia) ok_(__FILE__,line)(!lstrcmpW(media, exmedia), "media = %s, expected %s\n", wine_dbgstr_w(media), wine_dbgstr_w(exmedia)); else @@ -4310,7 +4310,7 @@ static void _test_style_put_media(unsigned line, IUnknown *unk, const WCHAR *med str = SysAllocString(media); hres = IHTMLStyleElement_put_media(style, str); - ok_(__FILE__,line)(hres == S_OK, "put_media failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_media failed: %08lx\n", hres); IHTMLStyleElement_Release(style); SysFreeString(str); @@ -4325,7 +4325,7 @@ static void _test_style_type(unsigned line, IUnknown *unk, const WCHAR *extype) HRESULT hres; hres = IHTMLStyleElement_get_type(style, &type); - ok_(__FILE__,line)(hres == S_OK, "get_type failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_type failed: %08lx\n", hres); if(extype) ok_(__FILE__,line)(!lstrcmpW(type, extype), "type = %s, expected %s\n", wine_dbgstr_w(type), wine_dbgstr_w(extype)); else @@ -4344,7 +4344,7 @@ static void _test_style_put_type(unsigned line, IUnknown *unk, const WCHAR *type str = SysAllocString(type); hres = IHTMLStyleElement_put_type(style, str); - ok_(__FILE__,line)(hres == S_OK, "put_type failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_type failed: %08lx\n", hres); IHTMLStyleElement_Release(style); SysFreeString(str); @@ -4360,19 +4360,19 @@ static void _test_elem_filters(unsigned line, IUnknown *unk) hres = IHTMLElement_get_filters(elem, &filters); ok_(__FILE__,line) (hres == S_OK || broken(hres == REGDB_E_CLASSNOTREG) /* NT4 */, - "get_filters failed: %08x\n", hres); + "get_filters failed: %08lx\n", hres); if(hres == S_OK) { LONG len; IDispatchEx *dispex; hres = IHTMLFiltersCollection_get_length(filters, &len); - ok_(__FILE__,line) (hres == S_OK, "get_length failed: %08x\n", hres); - ok_(__FILE__,line) (len == 0, "expect 0 got %d\n", len); + ok_(__FILE__,line) (hres == S_OK, "get_length failed: %08lx\n", hres); + ok_(__FILE__,line) (len == 0, "expect 0 got %ld\n", len); hres = IHTMLFiltersCollection_QueryInterface(filters, &IID_IDispatchEx, (void**)&dispex); ok_(__FILE__,line) (hres == S_OK || broken(hres == E_NOINTERFACE), - "Could not get IDispatchEx interface: %08x\n", hres); + "Could not get IDispatchEx interface: %08lx\n", hres); if(SUCCEEDED(hres)) { test_disp((IUnknown*)filters, &IID_IHTMLFiltersCollection, NULL, L"[object]"); IDispatchEx_Release(dispex); @@ -4394,7 +4394,7 @@ static void _test_elem_set_class(unsigned line, IUnknown *unk, const WCHAR *clas tmp = class ? SysAllocString(class) : NULL; hres = IHTMLElement_put_className(elem, tmp); IHTMLElement_Release(elem); - ok_(__FILE__,line) (hres == S_OK, "put_className failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "put_className failed: %08lx\n", hres); SysFreeString(tmp); _test_elem_class(line, unk, class); @@ -4409,7 +4409,7 @@ static void _test_elem_title(unsigned line, IUnknown *unk, const WCHAR *extitle) hres = IHTMLElement_get_title(elem, &title); IHTMLElement_Release(elem); - ok_(__FILE__,line) (hres == S_OK, "get_title failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_title failed: %08lx\n", hres); if(extitle) ok_(__FILE__,line) (!lstrcmpW(title, extitle), "unexpected title %s\n", wine_dbgstr_w(title)); else @@ -4427,7 +4427,7 @@ static void _test_elem_set_title(unsigned line, IUnknown *unk, const WCHAR *titl tmp = SysAllocString(title); hres = IHTMLElement_put_title(elem, tmp); - ok_(__FILE__,line) (hres == S_OK, "get_title failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_title failed: %08lx\n", hres); IHTMLElement_Release(elem); SysFreeString(tmp); @@ -4442,7 +4442,7 @@ static void _test_node_get_value_str(unsigned line, IUnknown *unk, const WCHAR * hres = IHTMLDOMNode_get_nodeValue(node, &var); IHTMLDOMNode_Release(node); - ok_(__FILE__,line) (hres == S_OK, "get_nodeValue failed: %08x, expected VT_BSTR\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_nodeValue failed: %08lx, expected VT_BSTR\n", hres); if(exval) { ok_(__FILE__,line) (V_VT(&var) == VT_BSTR, "vt=%d\n", V_VT(&var)); @@ -4465,7 +4465,7 @@ static void _test_node_put_value_str(unsigned line, IUnknown *unk, const WCHAR * V_BSTR(&var) = SysAllocString(val); hres = IHTMLDOMNode_put_nodeValue(node, var); - ok_(__FILE__,line) (hres == S_OK, "get_nodeValue failed: %08x, expected VT_BSTR\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_nodeValue failed: %08lx, expected VT_BSTR\n", hres); IHTMLDOMNode_Release(node); VariantClear(&var); } @@ -4478,9 +4478,9 @@ static void _test_elem_client_size(unsigned line, IUnknown *unk) HRESULT hres; hres = IHTMLElement2_get_clientWidth(elem, &l); - ok_(__FILE__,line) (hres == S_OK, "get_clientWidth failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_clientWidth failed: %08lx\n", hres); hres = IHTMLElement2_get_clientHeight(elem, &l); - ok_(__FILE__,line) (hres == S_OK, "get_clientHeight failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_clientHeight failed: %08lx\n", hres); IHTMLElement2_Release(elem); } @@ -4493,12 +4493,12 @@ static void _test_elem_client_rect(unsigned line, IUnknown *unk) HRESULT hres; hres = IHTMLElement2_get_clientLeft(elem, &l); - ok_(__FILE__,line) (hres == S_OK, "get_clientLeft failed: %08x\n", hres); - ok_(__FILE__,line) (!l, "clientLeft = %d\n", l); + ok_(__FILE__,line) (hres == S_OK, "get_clientLeft failed: %08lx\n", hres); + ok_(__FILE__,line) (!l, "clientLeft = %ld\n", l); hres = IHTMLElement2_get_clientTop(elem, &l); - ok_(__FILE__,line) (hres == S_OK, "get_clientTop failed: %08x\n", hres); - ok_(__FILE__,line) (!l, "clientTop = %d\n", l); + ok_(__FILE__,line) (hres == S_OK, "get_clientTop failed: %08lx\n", hres); + ok_(__FILE__,line) (!l, "clientTop = %ld\n", l); IHTMLElement2_Release(elem); } @@ -4511,8 +4511,8 @@ static void _test_form_length(unsigned line, IUnknown *unk, LONG exlen) HRESULT hres; hres = IHTMLFormElement_get_length(form, &len); - ok_(__FILE__,line)(hres == S_OK, "get_length failed: %08x\n", hres); - ok_(__FILE__,line)(len == exlen, "length=%d, expected %d\n", len, exlen); + ok_(__FILE__,line)(hres == S_OK, "get_length failed: %08lx\n", hres); + ok_(__FILE__,line)(len == exlen, "length=%ld, expected %ld\n", len, exlen); IHTMLFormElement_Release(form); } @@ -4525,7 +4525,7 @@ static void _test_form_action(unsigned line, IUnknown *unk, const WCHAR *ex) HRESULT hres; hres = IHTMLFormElement_get_action(form, &action); - ok_(__FILE__,line)(hres == S_OK, "get_action failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_action failed: %08lx\n", hres); if(ex) ok_(__FILE__,line)(!lstrcmpW(action, ex), "action=%s, expected %s\n", wine_dbgstr_w(action), wine_dbgstr_w(ex)); else @@ -4543,7 +4543,7 @@ static void _test_form_put_action(unsigned line, IUnknown *unk, const WCHAR *act HRESULT hres; hres = IHTMLFormElement_put_action(form, tmp); - ok_(__FILE__,line)(hres == S_OK, "put_action failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_action failed: %08lx\n", hres); SysFreeString(tmp); IHTMLFormElement_Release(form); @@ -4558,7 +4558,7 @@ static void _test_form_method(unsigned line, IUnknown *unk, const WCHAR *ex) HRESULT hres; hres = IHTMLFormElement_get_method(form, &method); - ok_(__FILE__,line)(hres == S_OK, "get_method failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_method failed: %08lx\n", hres); if(ex) ok_(__FILE__,line)(!lstrcmpW(method, ex), "method=%s, expected %s\n", wine_dbgstr_w(method), wine_dbgstr_w(ex)); else @@ -4576,7 +4576,7 @@ static void _test_form_put_method(unsigned line, IUnknown *unk, HRESULT exp_hres HRESULT hres; hres = IHTMLFormElement_put_method(form, tmp); - ok_(__FILE__,line)(hres == exp_hres, "put_method returned: %08x, expected %08x\n", hres, exp_hres); + ok_(__FILE__,line)(hres == exp_hres, "put_method returned: %08lx, expected %08lx\n", hres, exp_hres); SysFreeString(tmp); IHTMLFormElement_Release(form); @@ -4592,7 +4592,7 @@ static void _test_form_name(unsigned line, IUnknown *unk, const WCHAR *ex) HRESULT hres; hres = IHTMLFormElement_get_name(form, &name); - ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08lx\n", hres); if(ex) ok_(__FILE__,line)(!lstrcmpW(name, ex), "name=%s, expected %s\n", wine_dbgstr_w(name), wine_dbgstr_w(ex)); else @@ -4610,7 +4610,7 @@ static void _test_form_put_name(unsigned line, IUnknown *unk, const WCHAR *name) HRESULT hres; hres = IHTMLFormElement_put_name(form, tmp); - ok_(__FILE__,line)(hres == S_OK, "put_name failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_name failed: %08lx\n", hres); SysFreeString(tmp); IHTMLFormElement_Release(form); @@ -4625,7 +4625,7 @@ static void _test_form_encoding(unsigned line, IUnknown *unk, const WCHAR *ex) HRESULT hres; hres = IHTMLFormElement_get_encoding(form, &encoding); - ok_(__FILE__,line)(hres == S_OK, "get_encoding failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_encoding failed: %08lx\n", hres); if(ex) ok_(__FILE__,line)(!lstrcmpW(encoding, ex), "encoding=%s, expected %s\n", wine_dbgstr_w(encoding), wine_dbgstr_w(ex)); else @@ -4643,7 +4643,7 @@ static void _test_form_put_encoding(unsigned line, IUnknown *unk, HRESULT exp_hr HRESULT hres; hres = IHTMLFormElement_put_encoding(form, tmp); - ok_(__FILE__,line)(hres == exp_hres, "put_encoding returned: %08x, expected %08x\n", hres, exp_hres); + ok_(__FILE__,line)(hres == exp_hres, "put_encoding returned: %08lx, expected %08lx\n", hres, exp_hres); SysFreeString(tmp); IHTMLFormElement_Release(form); @@ -4661,7 +4661,7 @@ static void _test_form_elements(unsigned line, IUnknown *unk, const elem_type_t disp = NULL; hres = IHTMLFormElement_get_elements(form, &disp); - ok_(__FILE__,line)(hres == S_OK, "get_elements failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_elements failed: %08lx\n", hres); ok_(__FILE__,line)(disp != NULL, "disp = NULL\n"); if(compat_mode < COMPAT_IE9) ok_(__FILE__,line)(iface_cmp((IUnknown*)form, (IUnknown*)disp), "disp != form\n"); @@ -4679,7 +4679,7 @@ static void _test_form_reset(unsigned line, IUnknown *unk) HRESULT hres; hres = IHTMLFormElement_reset(form); - ok_(__FILE__,line)(hres == S_OK, "reset failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "reset failed: %08lx\n", hres); IHTMLFormElement_Release(form); } @@ -4692,11 +4692,11 @@ static void test_form_target(IUnknown *unk) str = SysAllocString(L"_blank"); hres = IHTMLFormElement_put_target(form, str); - ok(hres == S_OK, "put_target failed: %08x\n", hres); + ok(hres == S_OK, "put_target failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLFormElement_get_target(form, &str); - ok(hres == S_OK, "get_target failed: %08x\n", hres); + ok(hres == S_OK, "get_target failed: %08lx\n", hres); ok(!lstrcmpW(str, L"_blank"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -4710,10 +4710,10 @@ static void test_select_form(IUnknown *uselect, IUnknown *uform) HRESULT hres; hres = IHTMLSelectElement_get_form(select, NULL); - ok(hres == E_POINTER, "got %08x\n, expected E_POINTER\n", hres); + ok(hres == E_POINTER, "got %08lx\n, expected E_POINTER\n", hres); hres = IHTMLSelectElement_get_form(select, &form); - ok(hres == S_OK, "get_form failed: %08x\n", hres); + ok(hres == S_OK, "get_form failed: %08lx\n", hres); ok(form != NULL, "form == NULL\n"); test_form_length((IUnknown*)form, 2); @@ -4733,7 +4733,7 @@ static void test_select_form_notfound(IHTMLSelectElement *select) form = (IHTMLFormElement*)0xdeadbeef; hres = IHTMLSelectElement_get_form(select, &form); - ok(hres == S_OK, "get_form failed: %08x\n", hres); + ok(hres == S_OK, "get_form failed: %08lx\n", hres); ok(form == NULL, "got %p\n", form); } @@ -4746,7 +4746,7 @@ static void _test_meta_name(unsigned line, IUnknown *unk, const WCHAR *exname) meta = _get_metaelem_iface(line, unk); hres = IHTMLMetaElement_get_name(meta, &name); - ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08lx\n", hres); ok_(__FILE__,line)(!lstrcmpW(name, exname), "name = %s, expected %s\n", wine_dbgstr_w(name), wine_dbgstr_w(exname)); SysFreeString(name); IHTMLMetaElement_Release(meta); @@ -4761,7 +4761,7 @@ static void _test_meta_content(unsigned line, IUnknown *unk, const WCHAR *excont meta = _get_metaelem_iface(line, unk); hres = IHTMLMetaElement_get_content(meta, &content); - ok_(__FILE__,line)(hres == S_OK, "get_content failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_content failed: %08lx\n", hres); ok_(__FILE__,line)(!lstrcmpW(content, excontent), "content = %s, expected %s\n", wine_dbgstr_w(content), wine_dbgstr_w(excontent)); SysFreeString(content); IHTMLMetaElement_Release(meta); @@ -4776,7 +4776,7 @@ static void _test_meta_httpequiv(unsigned line, IUnknown *unk, const WCHAR *exva meta = _get_metaelem_iface(line, unk); hres = IHTMLMetaElement_get_httpEquiv(meta, &val); - ok_(__FILE__,line)(hres == S_OK, "get_httpEquiv failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_httpEquiv failed: %08lx\n", hres); ok_(__FILE__,line)(!lstrcmpW(val, exval), "httpEquiv = %s, expected %s\n", wine_dbgstr_w(val), wine_dbgstr_w(exval)); SysFreeString(val); IHTMLMetaElement_Release(meta); @@ -4791,7 +4791,7 @@ static void _test_meta_charset(unsigned line, IUnknown *unk, const WCHAR *exval) meta = _get_metaelem_iface(line, unk); hres = IHTMLMetaElement_get_charset(meta, &val); - ok_(__FILE__,line)(hres == S_OK, "get_charset failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_charset failed: %08lx\n", hres); if(exval) ok_(__FILE__,line)(!lstrcmpW(val, exval), "charset = %s, expected %s\n", wine_dbgstr_w(val), wine_dbgstr_w(exval)); else @@ -4809,7 +4809,7 @@ static void _set_meta_charset(unsigned line, IUnknown *unk, const WCHAR *v) meta = _get_metaelem_iface(line, unk); hres = IHTMLMetaElement_put_charset(meta, val); - ok_(__FILE__,line)(hres == S_OK, "put_charset failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_charset failed: %08lx\n", hres); SysFreeString(val); IHTMLMetaElement_Release(meta); @@ -4825,11 +4825,11 @@ static void _test_link_media(unsigned line, IHTMLElement *elem, const WCHAR *exv str = SysAllocString(exval); hres = IHTMLLinkElement_put_media(link, str); - ok_(__FILE__,line)(hres == S_OK, "put_media failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_media failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLLinkElement_get_media(link, &str); - ok_(__FILE__,line)(hres == S_OK, "get_media failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_media failed: %08lx\n", hres); ok_(__FILE__,line)(!lstrcmpW(str, exval), "got %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(exval)); SysFreeString(str); IHTMLLinkElement_Release(link); @@ -4843,7 +4843,7 @@ static void _test_link_disabled(unsigned line, IHTMLElement *elem, VARIANT_BOOL HRESULT hres; hres = IHTMLLinkElement_get_disabled(link, &b); - ok_(__FILE__,line)(hres == S_OK, "get_disabled failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_disabled failed: %08lx\n", hres); ok_(__FILE__,line)(b == v, "disabled = %x, expected %x\n", b, v); IHTMLLinkElement_Release(link); @@ -4856,7 +4856,7 @@ static void _link_put_disabled(unsigned line, IHTMLElement *elem, VARIANT_BOOL v HRESULT hres; hres = IHTMLLinkElement_put_disabled(link, v); - ok_(__FILE__,line)(hres == S_OK, "put_disabled failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_disabled failed: %08lx\n", hres); IHTMLLinkElement_Release(link); _test_link_disabled(line, elem, v); } @@ -4869,7 +4869,7 @@ static void _test_link_rel(unsigned line, IHTMLElement *elem, const WCHAR *v) HRESULT hres; hres = IHTMLLinkElement_get_rel(link, &rel); - ok_(__FILE__,line)(hres == S_OK, "get_rel failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_rel failed: %08lx\n", hres); if(v) ok_(__FILE__,line)(!lstrcmpW(rel, v), "rel = %s\n", wine_dbgstr_w(rel)); else @@ -4887,7 +4887,7 @@ static void _link_put_rel(unsigned line, IHTMLElement *elem, const WCHAR *v) HRESULT hres; hres = IHTMLLinkElement_put_rel(link, str); - ok_(__FILE__,line)(hres == S_OK, "put_disabled failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_disabled failed: %08lx\n", hres); SysFreeString(str); IHTMLLinkElement_Release(link); _test_link_rel(line, elem, v); @@ -4901,7 +4901,7 @@ static void _test_link_rev(unsigned line, IHTMLElement *elem, const WCHAR *v) HRESULT hres; hres = IHTMLLinkElement_get_rev(link, &rev); - ok_(__FILE__,line)(hres == S_OK, "get_rev failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_rev failed: %08lx\n", hres); if(v) ok_(__FILE__,line)(!lstrcmpW(rev, v), "rev = %s\n", wine_dbgstr_w(rev)); else @@ -4919,7 +4919,7 @@ static void _link_put_rev(unsigned line, IHTMLElement *elem, const WCHAR *v) HRESULT hres; hres = IHTMLLinkElement_put_rev(link, str); - ok_(__FILE__,line)(hres == S_OK, "put_disabled failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_disabled failed: %08lx\n", hres); SysFreeString(str); IHTMLLinkElement_Release(link); _test_link_rev(line, elem, v); @@ -4933,7 +4933,7 @@ static void _test_link_type(unsigned line, IHTMLElement *elem, const WCHAR *v) HRESULT hres; hres = IHTMLLinkElement_get_type(link, &type); - ok_(__FILE__,line)(hres == S_OK, "get_type failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_type failed: %08lx\n", hres); if(v) ok_(__FILE__,line)(!lstrcmpW(type, v), "type = %s, expected %s\n", wine_dbgstr_w(type), wine_dbgstr_w(v)); else @@ -4951,7 +4951,7 @@ static void _test_script_text(unsigned line, IHTMLScriptElement *script, const W str = (void*)0xdeadbeef; hres = IHTMLScriptElement_get_text(script, &str); - ok_(__FILE__,line)(hres == S_OK, "get_text failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_text failed: %08lx\n", hres); ok(!lstrcmpW(str, extext), "text = %s, expected \"%s\"\n", wine_dbgstr_w(str), wine_dbgstr_w(extext)); SysFreeString(str); } @@ -4964,7 +4964,7 @@ static void _link_put_type(unsigned line, IHTMLElement *elem, const WCHAR *v) HRESULT hres; hres = IHTMLLinkElement_put_type(link, str); - ok_(__FILE__,line)(hres == S_OK, "put_disabled failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_disabled failed: %08lx\n", hres); SysFreeString(str); IHTMLLinkElement_Release(link); _test_link_type(line, elem, v); @@ -4978,7 +4978,7 @@ static void _test_link_href(unsigned line, IHTMLElement *elem, const WCHAR *v) HRESULT hres; hres = IHTMLLinkElement_get_href(link, &href); - ok_(__FILE__,line)(hres == S_OK, "get_href failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_href failed: %08lx\n", hres); if(v) ok_(__FILE__,line)(!lstrcmpW(href, v), "href = %s, expected %s\n", wine_dbgstr_w(href), wine_dbgstr_w(v)); else @@ -4996,7 +4996,7 @@ static void _link_put_href(unsigned line, IHTMLElement *elem, const WCHAR *v) HRESULT hres; hres = IHTMLLinkElement_put_href(link, str); - ok_(__FILE__,line)(hres == S_OK, "put_disabled failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_disabled failed: %08lx\n", hres); SysFreeString(str); IHTMLLinkElement_Release(link); _test_link_href(line, elem, v); @@ -5012,12 +5012,12 @@ static IHTMLDocument2 *_get_elem_doc(unsigned line, IUnknown *unk) disp = NULL; hres = IHTMLElement_get_document(elem, &disp); - ok(hres == S_OK, "get_document failed: %08x\n", hres); + ok(hres == S_OK, "get_document failed: %08lx\n", hres); ok(disp != NULL, "disp == NULL\n"); hres = IDispatch_QueryInterface(disp, &IID_IHTMLDocument2, (void**)&doc); IDispatch_Release(disp); - ok(hres == S_OK, "Could not get IHTMLDocument2 iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLDocument2 iface: %08lx\n", hres); return doc; } @@ -5032,7 +5032,7 @@ static IHTMLDOMAttribute *_get_elem_attr_node(unsigned line, IUnknown *unk, cons attr = (void*)0xdeadbeef; hres = IHTMLElement4_getAttributeNode(elem, str, &attr); - ok_(__FILE__,line)(hres == S_OK, "getAttributeNode failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "getAttributeNode failed: %08lx\n", hres); if(expect_success) ok_(__FILE__,line)(attr != NULL, "attr = NULL\n"); else @@ -5050,7 +5050,7 @@ static void _get_attr_node_value(unsigned line, IHTMLDOMAttribute *attr, VARIANT V_VT(v) = VT_EMPTY; hres = IHTMLDOMAttribute_get_nodeValue(attr, v); - ok_(__FILE__,line) (hres == S_OK, "get_nodeValue failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_nodeValue failed: %08lx\n", hres); ok_(__FILE__,line) (V_VT(v) == vt, "vt=%d, expected %d\n", V_VT(v), vt); } @@ -5060,7 +5060,7 @@ static void _put_attr_node_value(unsigned line, IHTMLDOMAttribute *attr, VARIANT HRESULT hres; hres = IHTMLDOMAttribute_put_nodeValue(attr, v); - ok_(__FILE__,line) (hres == S_OK, "put_nodeValue failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "put_nodeValue failed: %08lx\n", hres); } #define put_attr_value(a,b) _put_attr_value(__LINE__,a,b) @@ -5071,7 +5071,7 @@ static void _put_attr_value(unsigned line, IHTMLDOMAttribute *attr, const WCHAR HRESULT hres; hres = IHTMLDOMAttribute2_put_value(attr2, str); - ok_(__FILE__,line) (hres == S_OK, "put_nodeValue failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "put_nodeValue failed: %08lx\n", hres); IHTMLDOMAttribute2_Release(attr2); SysFreeString(str); @@ -5085,7 +5085,7 @@ static IHTMLDocument2 *_get_window_doc(unsigned line, IHTMLWindow2 *window) doc = NULL; hres = IHTMLWindow2_get_document(window, &doc); - ok(hres == S_OK, "get_document failed: %08x\n", hres); + ok(hres == S_OK, "get_document failed: %08lx\n", hres); ok(doc != NULL, "disp == NULL\n"); return doc; @@ -5098,7 +5098,7 @@ static IHTMLElement *_doc_get_body(unsigned line, IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLDocument2_get_body(doc, &elem); - ok_(__FILE__,line)(hres == S_OK, "get_body failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_body failed: %08lx\n", hres); ok_(__FILE__,line)(elem != NULL, "body == NULL\n"); return elem; @@ -5121,7 +5121,7 @@ static IHTMLElement *_test_create_elem(unsigned line, IHTMLDocument2 *doc, const tmp = SysAllocString(tag); hres = IHTMLDocument2_createElement(doc, tmp, &elem); - ok_(__FILE__,line) (hres == S_OK, "createElement failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "createElement failed: %08lx\n", hres); ok_(__FILE__,line) (elem != NULL, "elem == NULL\n"); SysFreeString(tmp); @@ -5137,13 +5137,13 @@ static IHTMLDOMNode *_test_create_text(unsigned line, IHTMLDocument2 *doc, const HRESULT hres; hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDocument3: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDocument3: %08lx\n", hres); tmp = SysAllocString(text); hres = IHTMLDocument3_createTextNode(doc3, tmp, &node); IHTMLDocument3_Release(doc3); SysFreeString(tmp); - ok_(__FILE__,line) (hres == S_OK, "createElement failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "createElement failed: %08lx\n", hres); ok_(__FILE__,line) (node != NULL, "node == NULL\n"); return node; @@ -5158,7 +5158,7 @@ static IHTMLDOMNode *_test_node_append_child(unsigned line, IUnknown *node_unk, HRESULT hres; hres = IHTMLDOMNode_appendChild(node, child, &new_child); - ok_(__FILE__,line) (hres == S_OK, "appendChild failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "appendChild failed: %08lx\n", hres); ok_(__FILE__,line) (new_child != NULL, "new_child == NULL\n"); /* TODO ok_(__FILE__,line) (new_child != child, "new_child == child\n"); */ @@ -5176,7 +5176,7 @@ static IHTMLDOMNode *_test_node_insertbefore(unsigned line, IUnknown *node_unk, HRESULT hres; hres = IHTMLDOMNode_insertBefore(node, child, *var, &new_child); - ok_(__FILE__,line) (hres == S_OK, "insertBefore failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "insertBefore failed: %08lx\n", hres); ok_(__FILE__,line) (new_child != NULL, "new_child == NULL\n"); /* TODO ok_(__FILE__,line) (new_child != child, "new_child == child\n"); */ @@ -5193,7 +5193,7 @@ static void _test_node_remove_child(unsigned line, IUnknown *unk, IHTMLDOMNode * HRESULT hres; hres = IHTMLDOMNode_removeChild(node, child, &new_node); - ok_(__FILE__,line) (hres == S_OK, "removeChild failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "removeChild failed: %08lx\n", hres); ok_(__FILE__,line) (new_node != NULL, "new_node == NULL\n"); /* TODO ok_(__FILE__,line) (new_node != child, "new_node == child\n"); */ @@ -5208,7 +5208,7 @@ static void _test_doc_title(unsigned line, IHTMLDocument2 *doc, const WCHAR *ext HRESULT hres; hres = IHTMLDocument2_get_title(doc, &title); - ok_(__FILE__,line) (hres == S_OK, "get_title failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_title failed: %08lx\n", hres); ok_(__FILE__,line) (!lstrcmpW(title, extitle), "unexpected title %s\n", wine_dbgstr_w(title)); SysFreeString(title); } @@ -5221,7 +5221,7 @@ static void _test_doc_set_title(unsigned line, IHTMLDocument2 *doc, const WCHAR tmp = SysAllocString(title); hres = IHTMLDocument2_put_title(doc, tmp); - ok_(__FILE__,line) (hres == S_OK, "get_title failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_title failed: %08lx\n", hres); SysFreeString(tmp); } @@ -5236,9 +5236,9 @@ static void test_elem_bounding_client_rect(IUnknown *unk) elem2 = get_elem2_iface(unk); hres = IHTMLElement2_getBoundingClientRect(elem2, &rect); - ok(hres == S_OK, "getBoundingClientRect failed: %08x\n", hres); + ok(hres == S_OK, "getBoundingClientRect failed: %08lx\n", hres); hres = IHTMLElement2_getBoundingClientRect(elem2, &rect2); - ok(hres == S_OK, "getBoundingClientRect failed: %08x\n", hres); + ok(hres == S_OK, "getBoundingClientRect failed: %08lx\n", hres); ok(rect != NULL, "rect == NULL\n"); ok(rect != rect2, "rect == rect2\n"); IHTMLRect_Release(rect2); @@ -5247,40 +5247,40 @@ static void test_elem_bounding_client_rect(IUnknown *unk) l = 0xdeadbeef; hres = IHTMLRect_get_top(rect, &l); - ok(hres == S_OK, "get_top failed: %08x\n", hres); + ok(hres == S_OK, "get_top failed: %08lx\n", hres); ok(l != 0xdeadbeef, "l = 0xdeadbeef\n"); l = 0xdeadbeef; hres = IHTMLRect_get_left(rect, &l); - ok(hres == S_OK, "get_left failed: %08x\n", hres); + ok(hres == S_OK, "get_left failed: %08lx\n", hres); ok(l != 0xdeadbeef, "l = 0xdeadbeef\n"); l = 0xdeadbeef; hres = IHTMLRect_get_bottom(rect, &l); - ok(hres == S_OK, "get_bottom failed: %08x\n", hres); + ok(hres == S_OK, "get_bottom failed: %08lx\n", hres); ok(l != 0xdeadbeef, "l = 0xdeadbeef\n"); l = 0xdeadbeef; hres = IHTMLRect_get_right(rect, &l); - ok(hres == S_OK, "get_right failed: %08x\n", hres); + ok(hres == S_OK, "get_right failed: %08lx\n", hres); ok(l != 0xdeadbeef, "l = 0xdeadbeef\n"); IHTMLRect_Release(rect); hres = IHTMLElement2_getClientRects(elem2, &rects); - ok(hres == S_OK, "getClientRects failed: %08x\n", hres); + ok(hres == S_OK, "getClientRects failed: %08lx\n", hres); test_disp((IUnknown*)rects, &IID_IHTMLRectCollection, NULL, L"[object]"); hres = IHTMLRectCollection_get_length(rects, &l); - ok(hres == S_OK, "get_length failed: %08x\n", hres); - ok(l == 1, "length = %u\n", l); + ok(hres == S_OK, "get_length failed: %08lx\n", hres); + ok(l == 1, "length = %lu\n", l); V_VT(&index) = VT_I4; V_I4(&index) = 0; V_VT(&v) = VT_ERROR; hres = IHTMLRectCollection_item(rects, &index, &v); - ok(hres == S_OK, "item failed: %08x\n", hres); + ok(hres == S_OK, "item failed: %08lx\n", hres); ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); test_disp((IUnknown*)V_DISPATCH(&v), &IID_IHTMLRect, NULL, L"[object]"); VariantClear(&v); @@ -5302,7 +5302,7 @@ static void test_elem_col_item(IHTMLElementCollection *col, const WCHAR *n, V_BSTR(&name) = SysAllocString(n); hres = IHTMLElementCollection_item(col, name, index, &disp); - ok(hres == S_OK, "item failed: %08x\n", hres); + ok(hres == S_OK, "item failed: %08lx\n", hres); test_elem_collection((IUnknown*)disp, elem_types, len); IDispatch_Release(disp); @@ -5313,7 +5313,7 @@ static void test_elem_col_item(IHTMLElementCollection *col, const WCHAR *n, V_I4(&index) = i; disp = (void*)0xdeadbeef; hres = IHTMLElementCollection_item(col, name, index, &disp); - ok(hres == S_OK, "item failed: %08x\n", hres); + ok(hres == S_OK, "item failed: %08lx\n", hres); ok(disp != NULL, "disp == NULL\n"); if(FAILED(hres) || !disp) continue; @@ -5326,13 +5326,13 @@ static void test_elem_col_item(IHTMLElementCollection *col, const WCHAR *n, V_I4(&index) = len; disp = (void*)0xdeadbeef; hres = IHTMLElementCollection_item(col, name, index, &disp); - ok(hres == S_OK, "item failed: %08x\n", hres); + ok(hres == S_OK, "item failed: %08lx\n", hres); ok(disp == NULL, "disp != NULL\n"); V_I4(&index) = -1; disp = (void*)0xdeadbeef; hres = IHTMLElementCollection_item(col, name, index, &disp); - ok(hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); + ok(hres == E_INVALIDARG, "item failed: %08lx, expected E_INVALIDARG\n", hres); ok(disp == NULL, "disp != NULL\n"); SysFreeString(V_BSTR(&name)); @@ -5347,7 +5347,7 @@ static IHTMLElement *get_elem_by_id(IHTMLDocument2 *doc, const WCHAR *id, BOOL e HRESULT hres; hres = IHTMLDocument2_get_all(doc, &col); - ok(hres == S_OK, "get_all failed: %08x\n", hres); + ok(hres == S_OK, "get_all failed: %08lx\n", hres); ok(col != NULL, "col == NULL\n"); if(FAILED(hres) || !col) return NULL; @@ -5359,7 +5359,7 @@ static IHTMLElement *get_elem_by_id(IHTMLDocument2 *doc, const WCHAR *id, BOOL e hres = IHTMLElementCollection_item(col, name, index, &disp); IHTMLElementCollection_Release(col); SysFreeString(V_BSTR(&name)); - ok(hres == S_OK, "item failed: %08x\n", hres); + ok(hres == S_OK, "item failed: %08lx\n", hres); if(!expect_success) { ok(disp == NULL, "disp != NULL\n"); return NULL; @@ -5383,12 +5383,12 @@ static IHTMLElement *get_doc_elem_by_id(IHTMLDocument2 *doc, const WCHAR *id) HRESULT hres; hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); - ok(hres == S_OK, "Could not get IHTMLDocument3 iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLDocument3 iface: %08lx\n", hres); tmp = SysAllocString(id); hres = IHTMLDocument3_getElementById(doc3, tmp, &elem); SysFreeString(tmp); - ok(hres == S_OK, "getElementById(%s) failed: %08x\n", wine_dbgstr_w(id), hres); + ok(hres == S_OK, "getElementById(%s) failed: %08lx\n", wine_dbgstr_w(id), hres); IHTMLDocument3_Release(doc3); @@ -5429,7 +5429,7 @@ static void test_select_elem(IHTMLSelectElement *select) disp = NULL; hres = IHTMLSelectElement_get_options(select, &disp); - ok(hres == S_OK, "get_options failed: %08x\n", hres); + ok(hres == S_OK, "get_options failed: %08lx\n", hres); ok(disp != NULL, "options == NULL\n"); ok(iface_cmp((IUnknown*)disp, (IUnknown*)select), "disp != select\n"); IDispatch_Release(disp); @@ -5439,22 +5439,22 @@ static void test_select_elem(IHTMLSelectElement *select) V_I4(&name) = -1; disp = (void*)0xdeadbeef; hres = IHTMLSelectElement_item(select, name, index, &disp); - ok(hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); + ok(hres == E_INVALIDARG, "item failed: %08lx, expected E_INVALIDARG\n", hres); ok(!disp, "disp = %p\n", disp); V_I4(&name) = 2; disp = (void*)0xdeadbeef; hres = IHTMLSelectElement_item(select, name, index, &disp); - ok(hres == S_OK, "item failed: %08x\n", hres); + ok(hres == S_OK, "item failed: %08lx\n", hres); ok(!disp, "disp = %p\n", disp); V_I4(&name) = 1; hres = IHTMLSelectElement_item(select, name, index, NULL); - ok(hres == E_POINTER || broken(hres == E_INVALIDARG), "item failed: %08x, expected E_POINTER\n", hres); + ok(hres == E_POINTER || broken(hres == E_INVALIDARG), "item failed: %08lx, expected E_POINTER\n", hres); disp = NULL; hres = IHTMLSelectElement_item(select, name, index, &disp); - ok(hres == S_OK, "item failed: %08x\n", hres); + ok(hres == S_OK, "item failed: %08lx\n", hres); ok(disp != NULL, "disp = NULL\n"); test_disp((IUnknown*)disp, &DIID_DispHTMLOptionElement, &CLSID_HTMLOptionElement, NULL); @@ -5462,7 +5462,7 @@ static void test_select_elem(IHTMLSelectElement *select) V_I4(&index) = 1; disp2 = NULL; hres = IHTMLSelectElement_item(select, name, index, &disp2); - ok(hres == S_OK, "item failed: %08x\n", hres); + ok(hres == S_OK, "item failed: %08lx\n", hres); ok(disp2 != NULL, "disp = NULL\n"); ok(iface_cmp((IUnknown*)disp, (IUnknown*)disp2), "disp != disp2\n"); IDispatch_Release(disp2); @@ -5486,24 +5486,24 @@ static void test_form_item(IHTMLElement *elem) disp = (void*)0xdeadbeef; hres = IHTMLFormElement_item(form, name, index, &disp); if(compat_mode < COMPAT_IE9) - ok(hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); + ok(hres == E_INVALIDARG, "item failed: %08lx, expected E_INVALIDARG\n", hres); else - ok(hres == S_OK, "item failed: %08x\n", hres); + ok(hres == S_OK, "item failed: %08lx\n", hres); ok(!disp, "disp = %p\n", disp); V_I4(&name) = 2; disp = (void*)0xdeadbeef; hres = IHTMLFormElement_item(form, name, index, &disp); - ok(hres == S_OK, "item failed: %08x\n", hres); + ok(hres == S_OK, "item failed: %08lx\n", hres); ok(!disp, "disp = %p\n", disp); V_I4(&name) = 1; hres = IHTMLFormElement_item(form, name, index, NULL); - ok(hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); + ok(hres == E_INVALIDARG, "item failed: %08lx, expected E_INVALIDARG\n", hres); disp = NULL; hres = IHTMLFormElement_item(form, name, index, &disp); - ok(hres == S_OK, "item failed: %08x\n", hres); + ok(hres == S_OK, "item failed: %08lx\n", hres); ok(disp != NULL, "disp = NULL\n"); test_disp((IUnknown*)disp, &DIID_DispHTMLInputElement, &CLSID_HTMLInputElement, NULL); @@ -5511,7 +5511,7 @@ static void test_form_item(IHTMLElement *elem) V_I4(&index) = 1; disp2 = NULL; hres = IHTMLFormElement_item(form, name, index, &disp2); - ok(hres == S_OK, "item failed: %08x\n", hres); + ok(hres == S_OK, "item failed: %08lx\n", hres); ok(disp2 != NULL, "disp = NULL\n"); ok(iface_cmp((IUnknown*)disp, (IUnknown*)disp2), "disp != disp2\n"); IDispatch_Release(disp2); @@ -5541,10 +5541,10 @@ static void test_option_form(IUnknown *uoption, IUnknown *uform) HRESULT hres; hres = IHTMLOptionElement_get_form(option, NULL); - ok(hres == E_POINTER, "got %08x\n, expected E_POINTER\n", hres); + ok(hres == E_POINTER, "got %08lx\n, expected E_POINTER\n", hres); hres = IHTMLOptionElement_get_form(option, &form); - ok(hres == S_OK, "get_form failed: %08x\n", hres); + ok(hres == S_OK, "get_form failed: %08lx\n", hres); ok(form != NULL, "form == NULL\n"); ok(iface_cmp(uform, (IUnknown*)form), "Expected %p, got %p\n", uform, form); @@ -5586,20 +5586,20 @@ static void _test_doc_selection_type(unsigned line, IHTMLDocument2 *doc, const W HRESULT hres; hres = IHTMLDocument2_get_selection(doc, &selection); - ok_(__FILE__,line)(hres == S_OK, "get_selection failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_selection failed: %08lx\n", hres); hres = IHTMLSelectionObject_get_type(selection, &str); - ok_(__FILE__,line)(hres == S_OK, "get_type failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_type failed: %08lx\n", hres); ok_(__FILE__,line)(!lstrcmpW(str, type), "type = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(type)); SysFreeString(str); hres = IHTMLSelectionObject_QueryInterface(selection, &IID_IHTMLSelectionObject2, (void**)&selection2); - ok_(__FILE__,line)(hres == S_OK, "Could not get IHTMLSelectionObject2 iface: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "Could not get IHTMLSelectionObject2 iface: %08lx\n", hres); IHTMLSelectionObject_Release(selection); hres = IHTMLSelectionObject2_get_typeDetail(selection2, &str); - ok_(__FILE__,line)(hres == S_OK, "get_typeDetail failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_typeDetail failed: %08lx\n", hres); ok_(__FILE__,line)(!lstrcmpW(str, L"undefined"), "typeDetail = %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -5617,7 +5617,7 @@ static void _insert_adjacent_elem(unsigned line, IHTMLElement *parent, const WCH hres = IHTMLElement2_insertAdjacentElement(elem2, str, elem, &ret_elem); IHTMLElement2_Release(elem2); SysFreeString(str); - ok_(__FILE__,line)(hres == S_OK, "insertAdjacentElement failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "insertAdjacentElement failed: %08lx\n", hres); ok_(__FILE__,line)(ret_elem == elem, "ret_elem != elem\n"); IHTMLElement_Release(ret_elem); } @@ -5659,12 +5659,12 @@ static IHTMLTxtRange *test_create_body_range(IHTMLDocument2 *doc) elem = doc_get_body(doc); hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLBodyElement, (void**)&body); - ok(hres == S_OK, "QueryInterface failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface failed: %08lx\n", hres); IHTMLElement_Release(elem); hres = IHTMLBodyElement_createTextRange(body, &range); IHTMLBodyElement_Release(body); - ok(hres == S_OK, "createTextRange failed: %08x\n", hres); + ok(hres == S_OK, "createTextRange failed: %08lx\n", hres); return range; } @@ -5676,7 +5676,7 @@ static IHTMLTxtRange *_range_duplicate(unsigned line, IHTMLTxtRange *range) HRESULT hres; hres = IHTMLTxtRange_duplicate(range, &ret); - ok_(__FILE__,line)(hres == S_OK, "duplicate failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "duplicate failed: %08lx\n", hres); return ret; } @@ -5689,7 +5689,7 @@ static void _test_range_set_end_point(unsigned line, IHTMLTxtRange *range, const HRESULT hres; hres = IHTMLTxtRange_setEndPoint(range, str, ref_range); - ok_(__FILE__,line)(hres == exhres, "setEndPoint failed: %08x, expected %08x\n", hres, exhres); + ok_(__FILE__,line)(hres == exhres, "setEndPoint failed: %08lx, expected %08lx\n", hres, exhres); SysFreeString(str); } @@ -5844,17 +5844,17 @@ static void test_txtrange(IHTMLDocument2 *doc) IHTMLTxtRange_Release(range); hres = IHTMLDocument2_get_selection(doc, &selection); - ok(hres == S_OK, "IHTMLDocument2_get_selection failed: %08x\n", hres); + ok(hres == S_OK, "IHTMLDocument2_get_selection failed: %08lx\n", hres); test_disp((IUnknown*)selection, &IID_IHTMLSelectionObject, NULL, L"[object]"); test_ifaces((IUnknown*)selection, selection_iids); hres = IHTMLSelectionObject_createRange(selection, &disp_range); - ok(hres == S_OK, "IHTMLSelectionObject_createRange failed: %08x\n", hres); + ok(hres == S_OK, "IHTMLSelectionObject_createRange failed: %08lx\n", hres); IHTMLSelectionObject_Release(selection); hres = IDispatch_QueryInterface(disp_range, &IID_IHTMLTxtRange, (void **)&range); - ok(hres == S_OK, "Could not get IID_IHTMLTxtRange interface: 0x%08x\n", hres); + ok(hres == S_OK, "Could not get IID_IHTMLTxtRange interface: 0x%08lx\n", hres); IDispatch_Release(disp_range); test_range_text(range, NULL); @@ -5883,7 +5883,7 @@ static void test_txtrange(IHTMLDocument2 *doc) body = doc_get_body(doc); hres = IHTMLTxtRange_moveToElementText(range, body); - ok(hres == S_OK, "moveToElementText failed: %08x\n", hres); + ok(hres == S_OK, "moveToElementText failed: %08lx\n", hres); test_range_text(range, L"abc xyz abc 123\r\nit's text"); test_range_parent(range, ET_BODY); @@ -5900,7 +5900,7 @@ static void test_txtrange(IHTMLDocument2 *doc) test_range_text(range, L"xyz"); hres = IHTMLTxtRange_moveToElementText(range, body); - ok(hres == S_OK, "moveToElementText failed: %08x\n", hres); + ok(hres == S_OK, "moveToElementText failed: %08lx\n", hres); test_range_text(range, L"abc \r\npaste\r\nxyz abc 123\r\nit's text"); @@ -5933,7 +5933,7 @@ static void test_txtrange(IHTMLDocument2 *doc) test_range_set_end_point(range, L"xxx", body_range, E_INVALIDARG); hres = IHTMLTxtRange_select(range); - ok(hres == S_OK, "select failed: %08x\n", hres); + ok(hres == S_OK, "select failed: %08lx\n", hres); test_doc_selection_type(doc, L"Text"); @@ -5976,13 +5976,13 @@ static void test_markup_services(IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLDocument2_QueryInterface(doc, &IID_IMarkupServices, (void**)&markup_services); - ok(hres == S_OK, "Could not get IMarkupServices iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IMarkupServices iface: %08lx\n", hres); hres = IMarkupServices_CreateMarkupPointer(markup_services, &markup_pointer); - ok(hres == S_OK, "CreateMarkupPointer failed: %08x\n", hres); + ok(hres == S_OK, "CreateMarkupPointer failed: %08lx\n", hres); hres = IMarkupPointer_QueryInterface(markup_pointer, &IID_IMarkupPointer2, (void**)&markup_pointer2); - ok(hres == S_OK, "Could not get IMarkupPointer2 iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IMarkupPointer2 iface: %08lx\n", hres); IMarkupPointer_Release(markup_pointer); IMarkupPointer2_Release(markup_pointer2); @@ -5997,12 +5997,12 @@ static void test_range(IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLDocument2_QueryInterface(doc, &IID_IDocumentRange, (void **)&doc_range); - ok(hres == S_OK, "Failed to get IDocumentRange: %08x\n", hres); + ok(hres == S_OK, "Failed to get IDocumentRange: %08lx\n", hres); if (FAILED(hres)) return; hres = IDocumentRange_createRange(doc_range, &range); - ok(hres == S_OK, "Failed to create range, %08x\n", hres); + ok(hres == S_OK, "Failed to create range, %08lx\n", hres); test_disp((IUnknown *)range, &DIID_DispHTMLDOMRange, NULL, NULL); @@ -6023,7 +6023,7 @@ static void _test_compatmode(unsigned line, IHTMLDocument2 *doc2, const WCHAR * HRESULT hres; hres = IHTMLDocument5_get_compatMode(doc, &str); - ok_(__FILE__,line)(hres == S_OK, "get_compatMode failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_compatMode failed: %08lx\n", hres); ok_(__FILE__,line)(!lstrcmpW(str, excompat), "compatMode = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(excompat)); SysFreeString(str); @@ -6038,19 +6038,19 @@ static void test_location(IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLDocument2_get_location(doc, &location); - ok(hres == S_OK, "get_location failed: %08x\n", hres); + ok(hres == S_OK, "get_location failed: %08lx\n", hres); hres = IHTMLDocument2_get_location(doc, &location2); - ok(hres == S_OK, "get_location failed: %08x\n", hres); + ok(hres == S_OK, "get_location failed: %08lx\n", hres); ok(location == location2, "location != location2\n"); IHTMLLocation_Release(location2); hres = IHTMLDocument2_get_parentWindow(doc, &window); - ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + ok(hres == S_OK, "get_parentWindow failed: %08lx\n", hres); hres = IHTMLWindow2_get_location(window, &location2); - ok(hres == S_OK, "get_location failed: %08x\n", hres); + ok(hres == S_OK, "get_location failed: %08lx\n", hres); ok(location == location2, "location != location2\n"); IHTMLLocation_Release(location2); @@ -6058,15 +6058,15 @@ static void test_location(IHTMLDocument2 *doc) test_disp2((IUnknown*)location, &DIID_DispHTMLLocation, &IID_IHTMLLocation, NULL, L"about:blank"); hres = IHTMLLocation_get_pathname(location, &str); - ok(hres == S_OK, "get_pathname failed: %08x\n", hres); + ok(hres == S_OK, "get_pathname failed: %08lx\n", hres); ok(!lstrcmpW(str, L"blank"), "unexpected pathname %s\n", wine_dbgstr_w(str)); SysFreeString(str); hres = IHTMLLocation_get_href(location, NULL); - ok(hres == E_POINTER, "get_href passed: %08x\n", hres); + ok(hres == E_POINTER, "get_href passed: %08lx\n", hres); hres = IHTMLLocation_get_href(location, &str); - ok(hres == S_OK, "get_href failed: %08x\n", hres); + ok(hres == S_OK, "get_href failed: %08lx\n", hres); ok(!lstrcmpW(str, L"about:blank"), "unexpected href %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -6084,14 +6084,14 @@ static void test_plugins_col(IHTMLDocument2 *doc) window = get_doc_window(doc); hres = IHTMLWindow2_get_navigator(window, &nav); - ok(hres == S_OK, "get_navigator failed: %08x\n", hres); + ok(hres == S_OK, "get_navigator failed: %08lx\n", hres); IHTMLWindow2_Release(window); hres = IOmNavigator_get_plugins(nav, &col); - ok(hres == S_OK, "get_plugins failed: %08x\n", hres); + ok(hres == S_OK, "get_plugins failed: %08lx\n", hres); hres = IOmNavigator_get_plugins(nav, &col2); - ok(hres == S_OK, "get_plugins failed: %08x\n", hres); + ok(hres == S_OK, "get_plugins failed: %08lx\n", hres); ok(iface_cmp((IUnknown*)col, (IUnknown*)col2), "col != col2\n"); IHTMLPluginsCollection_Release(col2); @@ -6099,17 +6099,17 @@ static void test_plugins_col(IHTMLDocument2 *doc) len = 0xdeadbeef; hres = IHTMLPluginsCollection_get_length(col, &len); - ok(hres == S_OK, "get_length failed: %08x\n", hres); - ok(!len, "length = %d\n", len); + ok(hres == S_OK, "get_length failed: %08lx\n", hres); + ok(!len, "length = %ld\n", len); hres = IHTMLPluginsCollection_refresh(col, VARIANT_FALSE); - ok(hres == S_OK, "refresh failed: %08x\n", hres); + ok(hres == S_OK, "refresh failed: %08lx\n", hres); hres = IHTMLPluginsCollection_refresh(col, VARIANT_TRUE); - ok(hres == S_OK, "refresh failed: %08x\n", hres); + ok(hres == S_OK, "refresh failed: %08lx\n", hres); ref = IHTMLPluginsCollection_Release(col); - ok(!ref, "ref=%d\n", ref); + ok(!ref, "ref=%ld\n", ref); IOmNavigator_Release(nav); } @@ -6122,10 +6122,10 @@ static void test_mime_types_col(IOmNavigator *nav) HRESULT hres; hres = IOmNavigator_get_mimeTypes(nav, &col); - ok(hres == S_OK, "get_mimeTypes failed: %08x\n", hres); + ok(hres == S_OK, "get_mimeTypes failed: %08lx\n", hres); hres = IOmNavigator_get_mimeTypes(nav, &col2); - ok(hres == S_OK, "get_mimeTypes failed: %08x\n", hres); + ok(hres == S_OK, "get_mimeTypes failed: %08lx\n", hres); ok(iface_cmp((IUnknown*)col, (IUnknown*)col2), "col != col2\n"); IHTMLMimeTypesCollection_Release(col2); @@ -6133,11 +6133,11 @@ static void test_mime_types_col(IOmNavigator *nav) length = 0xdeadbeef; hres = IHTMLMimeTypesCollection_get_length(col, &length); - ok(hres == S_OK, "get_length failed: %08x\n", hres); - ok(!length, "length = %d\n", length); + ok(hres == S_OK, "get_length failed: %08lx\n", hres); + ok(!length, "length = %ld\n", length); ref = IHTMLMimeTypesCollection_Release(col); - ok(!ref, "ref=%d\n", ref); + ok(!ref, "ref=%ld\n", ref); } #define test_framebase_name(a,b) _test_framebase_name(__LINE__,a,b) @@ -6148,10 +6148,10 @@ static void _test_framebase_name(unsigned line, IHTMLElement *elem, const WCHAR HRESULT hres; hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLFrameBase, (void**)&fbase); - ok(hres == S_OK, "Could not get IHTMLFrameBase interface: 0x%08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLFrameBase interface: 0x%08lx\n", hres); hres = IHTMLFrameBase_get_name(fbase, &str); - ok_(__FILE__,line)(hres == S_OK, "IHTMLFrameBase_get_name failed: 0x%08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "IHTMLFrameBase_get_name failed: 0x%08lx\n", hres); if(name) ok_(__FILE__,line)(!lstrcmpW(str, name), "name = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(name)); else @@ -6169,11 +6169,11 @@ static void _test_framebase_put_name(unsigned line, IHTMLElement *elem, const WC BSTR str; hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLFrameBase, (void**)&fbase); - ok(hres == S_OK, "Could not get IHTMLFrameBase interface: 0x%08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLFrameBase interface: 0x%08lx\n", hres); str = name ? SysAllocString(name) : NULL; hres = IHTMLFrameBase_put_name(fbase, str); - ok_(__FILE__,line)(hres == S_OK, "put_name failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_name failed: %08lx\n", hres); SysFreeString(str); _test_framebase_name(line, elem, name); @@ -6188,10 +6188,10 @@ static void _test_framebase_src(unsigned line, IHTMLElement *elem, const WCHAR * HRESULT hres; hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLFrameBase, (void**)&fbase); - ok(hres == S_OK, "Could not get IHTMLFrameBase interface: 0x%08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLFrameBase interface: 0x%08lx\n", hres); hres = IHTMLFrameBase_get_src(fbase, &str); - ok_(__FILE__,line)(hres == S_OK, "IHTMLFrameBase_get_src failed: 0x%08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "IHTMLFrameBase_get_src failed: 0x%08lx\n", hres); if(src) ok_(__FILE__,line)(!lstrcmpW(str, src), "src = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(src)); else @@ -6208,7 +6208,7 @@ static void _test_framebase_marginheight(unsigned line, IHTMLFrameBase *framebas HRESULT hres; hres = IHTMLFrameBase_get_marginHeight(framebase, &v); - ok_(__FILE__,line)(hres == S_OK, "get_marginHeight failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_marginHeight failed: %08lx\n", hres); ok_(__FILE__,line)(V_VT(&v) == VT_BSTR, "V_VT(marginHeight) = %d\n", V_VT(&v)); if(exval) ok_(__FILE__,line)(!lstrcmpW(V_BSTR(&v), exval), "marginHeight = %s\n", wine_dbgstr_w(V_BSTR(&v))); @@ -6226,7 +6226,7 @@ static void _set_framebase_marginheight(unsigned line, IHTMLFrameBase *framebase V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(val); hres = IHTMLFrameBase_put_marginHeight(framebase, v); - ok_(__FILE__,line)(hres == S_OK, "put_marginHeight failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_marginHeight failed: %08lx\n", hres); VariantClear(&v); } @@ -6237,7 +6237,7 @@ static void _test_framebase_marginwidth(unsigned line, IHTMLFrameBase *framebase HRESULT hres; hres = IHTMLFrameBase_get_marginWidth(framebase, &v); - ok_(__FILE__,line)(hres == S_OK, "get_marginWidth failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_marginWidth failed: %08lx\n", hres); ok_(__FILE__,line)(V_VT(&v) == VT_BSTR, "V_VT(marginWidth) = %d\n", V_VT(&v)); if(exval) ok_(__FILE__,line)(!lstrcmpW(V_BSTR(&v), exval), "marginWidth = %s\n", wine_dbgstr_w(V_BSTR(&v))); @@ -6255,7 +6255,7 @@ static void _set_framebase_marginwidth(unsigned line, IHTMLFrameBase *framebase, V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(val); hres = IHTMLFrameBase_put_marginWidth(framebase, v); - ok_(__FILE__,line)(hres == S_OK, "put_marginWidth failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_marginWidth failed: %08lx\n", hres); VariantClear(&v); } @@ -6267,45 +6267,45 @@ static void test_framebase(IUnknown *unk) /* get/put scrolling */ hres = IUnknown_QueryInterface(unk, &IID_IHTMLFrameBase, (void**)&fbase); - ok(hres == S_OK, "Could not get IHTMLFrameBase interface: 0x%08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLFrameBase interface: 0x%08lx\n", hres); hres = IHTMLFrameBase_get_scrolling(fbase, &str); - ok(hres == S_OK, "IHTMLFrameBase_get_scrolling failed: 0x%08x\n", hres); + ok(hres == S_OK, "IHTMLFrameBase_get_scrolling failed: 0x%08lx\n", hres); ok(!lstrcmpW(str, L"auto"), "get_scrolling should have given 'auto', gave: %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = SysAllocString(L"no"); hres = IHTMLFrameBase_put_scrolling(fbase, str); - ok(hres == S_OK, "IHTMLFrameBase_put_scrolling failed: 0x%08x\n", hres); + ok(hres == S_OK, "IHTMLFrameBase_put_scrolling failed: 0x%08lx\n", hres); SysFreeString(str); hres = IHTMLFrameBase_get_scrolling(fbase, &str); - ok(hres == S_OK, "IHTMLFrameBase_get_scrolling failed: 0x%08x\n", hres); + ok(hres == S_OK, "IHTMLFrameBase_get_scrolling failed: 0x%08lx\n", hres); ok(!lstrcmpW(str, L"no"), "get_scrolling should have given 'no', gave: %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = SysAllocString(L"junk"); hres = IHTMLFrameBase_put_scrolling(fbase, str); ok(hres == E_INVALIDARG, "IHTMLFrameBase_put_scrolling should have failed " - "with E_INVALIDARG, instead: 0x%08x\n", hres); + "with E_INVALIDARG, instead: 0x%08lx\n", hres); SysFreeString(str); hres = IHTMLFrameBase_get_scrolling(fbase, &str); - ok(hres == S_OK, "IHTMLFrameBase_get_scrolling failed: 0x%08x\n", hres); + ok(hres == S_OK, "IHTMLFrameBase_get_scrolling failed: 0x%08lx\n", hres); ok(!lstrcmpW(str, L"no"), "get_scrolling should have given 'no', gave: %s\n", wine_dbgstr_w(str)); SysFreeString(str); hres = IHTMLFrameBase_get_frameBorder(fbase, &str); - ok(hres == S_OK, "get_frameBorder failed: %08x\n", hres); + ok(hres == S_OK, "get_frameBorder failed: %08lx\n", hres); ok(!str, "frameBorder = %s\n", wine_dbgstr_w(str)); str = SysAllocString(L"1"); hres = IHTMLFrameBase_put_frameBorder(fbase, str); - ok(hres == S_OK, "put_frameBorder failed: %08x\n", hres); + ok(hres == S_OK, "put_frameBorder failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLFrameBase_get_frameBorder(fbase, &str); - ok(hres == S_OK, "get_frameBorder failed: %08x\n", hres); + ok(hres == S_OK, "get_frameBorder failed: %08lx\n", hres); ok(!lstrcmpW(str, L"1"), "frameBorder = %s, expected \"1\"\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -6328,7 +6328,7 @@ static void _test_language_string(unsigned line, const WCHAR *lang, LCID lcid) if(pLCIDToLocaleName) { res = pLCIDToLocaleName(lcid, buf, ARRAY_SIZE(buf), 0); - ok_(__FILE__,line)(res, "LCIDToLocaleName failed: %u\n", GetLastError()); + ok_(__FILE__,line)(res, "LCIDToLocaleName failed: %lu\n", GetLastError()); ok_(__FILE__,line)(!lstrcmpW(lang, buf), "lang = %s, expected %s\n", wine_dbgstr_w(lang), wine_dbgstr_w(buf)); }else { win_skip("LCIDToLocaleName not available, unable to test language string\n"); @@ -6344,13 +6344,13 @@ static void _test_table_length(unsigned line, IHTMLTable *table, LONG expect) LONG len; hres = IHTMLTable_get_rows(table, &col); - ok_(__FILE__,line)(hres == S_OK, "get_rows failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_rows failed: %08lx\n", hres); ok_(__FILE__,line)(col != NULL, "col = NULL\n"); if (hres != S_OK || col == NULL) return; hres = IHTMLElementCollection_get_length(col, &len); - ok_(__FILE__,line)(hres == S_OK, "get_length failed: %08x\n", hres); - ok_(__FILE__,line)(len == expect, "Expect %d, got %d\n", expect, len); + ok_(__FILE__,line)(hres == S_OK, "get_length failed: %08lx\n", hres); + ok_(__FILE__,line)(len == expect, "Expect %ld, got %ld\n", expect, len); IHTMLElementCollection_Release(col); } @@ -6371,59 +6371,59 @@ static void test_navigator(IHTMLDocument2 *doc) static char ua[] = "1234567890xxxABC"; hres = IHTMLDocument2_get_parentWindow(doc, &window); - ok(hres == S_OK, "parentWidnow failed: %08x\n", hres); + ok(hres == S_OK, "parentWidnow failed: %08lx\n", hres); hres = IHTMLWindow2_get_navigator(window, &navigator); - ok(hres == S_OK, "get_navigator failed: %08x\n", hres); + ok(hres == S_OK, "get_navigator failed: %08lx\n", hres); ok(navigator != NULL, "navigator == NULL\n"); test_disp2((IUnknown*)navigator, &DIID_DispHTMLNavigator, &IID_IOmNavigator, NULL, L"[object]"); hres = IHTMLWindow2_get_navigator(window, &navigator2); - ok(hres == S_OK, "get_navigator failed: %08x\n", hres); + ok(hres == S_OK, "get_navigator failed: %08lx\n", hres); todo_wine ok(navigator != navigator2, "navigator2 != navigator\n"); IOmNavigator_Release(navigator2); hres = IHTMLWindow2_get_clientInformation(window, &navigator2); - ok(hres == S_OK, "get_clientInformation failed: %08x\n", hres); + ok(hres == S_OK, "get_clientInformation failed: %08lx\n", hres); ok(iface_cmp((IUnknown*)navigator, (IUnknown*)navigator2), "navigator2 != navigator\n"); IOmNavigator_Release(navigator2); IHTMLWindow2_Release(window); hres = IOmNavigator_get_appCodeName(navigator, &bstr); - ok(hres == S_OK, "get_appCodeName failed: %08x\n", hres); + ok(hres == S_OK, "get_appCodeName failed: %08lx\n", hres); ok(!lstrcmpW(bstr, L"Mozilla"), "Unexpected appCodeName %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); bstr = NULL; hres = IOmNavigator_get_appName(navigator, &bstr); - ok(hres == S_OK, "get_appName failed: %08x\n", hres); + ok(hres == S_OK, "get_appName failed: %08lx\n", hres); ok(!lstrcmpW(bstr, L"Microsoft Internet Explorer"), "Unexpected appCodeName %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); bstr = NULL; hres = IOmNavigator_get_platform(navigator, &bstr); - ok(hres == S_OK, "get_platform failed: %08x\n", hres); + ok(hres == S_OK, "get_platform failed: %08lx\n", hres); ok(!lstrcmpW(bstr, sizeof(void*) == 8 ? L"Win64" : L"Win32") || (sizeof(void*) == 8 && broken(!lstrcmpW(bstr, L"Win32") /* IE6 */)), "unexpected platform %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); bstr = NULL; hres = IOmNavigator_get_cpuClass(navigator, &bstr); - ok(hres == S_OK, "get_cpuClass failed: %08x\n", hres); + ok(hres == S_OK, "get_cpuClass failed: %08lx\n", hres); ok(!lstrcmpW(bstr, sizeof(void*) == 8 ? L"x64" : L"x86"), "unexpected cpuClass %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); bstr = NULL; hres = IOmNavigator_get_appVersion(navigator, &bstr); - ok(hres == S_OK, "get_appVersion failed: %08x\n", hres); + ok(hres == S_OK, "get_appVersion failed: %08lx\n", hres); ok(!memcmp(bstr, v40, sizeof(v40)), "appVersion is %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); bstr = NULL; hres = IOmNavigator_get_systemLanguage(navigator, &bstr); - ok(hres == S_OK, "get_systemLanguage failed: %08x\n", hres); + ok(hres == S_OK, "get_systemLanguage failed: %08lx\n", hres); test_language_string(bstr, LOCALE_SYSTEM_DEFAULT); SysFreeString(bstr); @@ -6431,7 +6431,7 @@ static void test_navigator(IHTMLDocument2 *doc) { bstr = NULL; hres = IOmNavigator_get_browserLanguage(navigator, &bstr); - ok(hres == S_OK, "get_browserLanguage failed: %08x\n", hres); + ok(hres == S_OK, "get_browserLanguage failed: %08lx\n", hres); test_language_string(bstr, pGetUserDefaultUILanguage()); SysFreeString(bstr); } @@ -6440,51 +6440,51 @@ static void test_navigator(IHTMLDocument2 *doc) bstr = NULL; hres = IOmNavigator_get_userLanguage(navigator, &bstr); - ok(hres == S_OK, "get_userLanguage failed: %08x\n", hres); + ok(hres == S_OK, "get_userLanguage failed: %08lx\n", hres); test_language_string(bstr, LOCALE_USER_DEFAULT); SysFreeString(bstr); hres = IOmNavigator_toString(navigator, NULL); - ok(hres == E_INVALIDARG, "toString failed: %08x\n", hres); + ok(hres == E_INVALIDARG, "toString failed: %08lx\n", hres); bstr = NULL; hres = IOmNavigator_toString(navigator, &bstr); - ok(hres == S_OK, "toString failed: %08x\n", hres); + ok(hres == S_OK, "toString failed: %08lx\n", hres); ok(!lstrcmpW(bstr, L"[object]"), "toString returned %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); b = 100; hres = IOmNavigator_get_onLine(navigator, &b); - ok(hres == S_OK, "get_onLine failed: %08x\n", hres); + ok(hres == S_OK, "get_onLine failed: %08lx\n", hres); ok(b == VARIANT_TRUE, "onLine = %x\n", b); size = sizeof(buf); hres = ObtainUserAgentString(0, bufa, &size); - ok(hres == S_OK, "ObtainUserAgentString failed: %08x\n", hres); + ok(hres == S_OK, "ObtainUserAgentString failed: %08lx\n", hres); MultiByteToWideChar(CP_ACP, 0, bufa, size, buf, ARRAY_SIZE(buf)); bstr = NULL; hres = IOmNavigator_get_userAgent(navigator, &bstr); - ok(hres == S_OK, "get_userAgent failed: %08x\n", hres); + ok(hres == S_OK, "get_userAgent failed: %08lx\n", hres); ok(!lstrcmpW(bstr, buf), "userAgent returned %s, expected \"%s\"\n", wine_dbgstr_w(bstr), wine_dbgstr_w(buf)); SysFreeString(bstr); hres = UrlMkSetSessionOption(URLMON_OPTION_USERAGENT, ua, sizeof(ua), 0); - ok(hres == S_OK, "UrlMkSetSessionOption failed: %08x\n", hres); + ok(hres == S_OK, "UrlMkSetSessionOption failed: %08lx\n", hres); MultiByteToWideChar(CP_ACP, 0, ua, -1, buf, ARRAY_SIZE(buf)); hres = IOmNavigator_get_appVersion(navigator, &bstr); - ok(hres == S_OK, "get_appVersion failed: %08x\n", hres); + ok(hres == S_OK, "get_appVersion failed: %08lx\n", hres); ok(!lstrcmpW(bstr, buf+8), "appVersion returned %s, expected \"%s\"\n", wine_dbgstr_w(bstr), wine_dbgstr_w(buf+8)); SysFreeString(bstr); hres = UrlMkSetSessionOption(URLMON_OPTION_USERAGENT, buf, lstrlenW(buf), 0); - ok(hres == S_OK, "UrlMkSetSessionOption failed: %08x\n", hres); + ok(hres == S_OK, "UrlMkSetSessionOption failed: %08lx\n", hres); bstr = NULL; hres = IOmNavigator_get_appMinorVersion(navigator, &bstr); - ok(hres == S_OK, "get_appMonorVersion failed: %08x\n", hres); + ok(hres == S_OK, "get_appMonorVersion failed: %08lx\n", hres); ok(bstr != NULL, "appMinorVersion returned NULL\n"); SysFreeString(bstr); @@ -6506,18 +6506,18 @@ static void test_screen(IHTMLWindow2 *window) screen = NULL; hres = IHTMLWindow2_get_screen(window, &screen); - ok(hres == S_OK, "get_screen failed: %08x\n", hres); + ok(hres == S_OK, "get_screen failed: %08lx\n", hres); ok(screen != NULL, "screen == NULL\n"); screen2 = NULL; hres = IHTMLWindow2_get_screen(window, &screen2); - ok(hres == S_OK, "get_screen failed: %08x\n", hres); + ok(hres == S_OK, "get_screen failed: %08lx\n", hres); ok(screen2 != NULL, "screen == NULL\n"); ok(iface_cmp((IUnknown*)screen2, (IUnknown*)screen), "screen2 != screen\n"); IHTMLScreen_Release(screen2); hres = IHTMLScreen_QueryInterface(screen, &IID_IDispatchEx, (void**)&dispex); - ok(hres == S_OK || broken(hres == E_NOINTERFACE), "Could not get IDispatchEx interface: %08x\n", hres); + ok(hres == S_OK || broken(hres == E_NOINTERFACE), "Could not get IDispatchEx interface: %08lx\n", hres); if(SUCCEEDED(hres)) { test_disp((IUnknown*)screen, &DIID_DispHTMLScreen, NULL, L"[object]"); IDispatchEx_Release(dispex); @@ -6528,20 +6528,20 @@ static void test_screen(IHTMLWindow2 *window) exl = GetDeviceCaps(hdc, HORZRES); l = 0xdeadbeef; hres = IHTMLScreen_get_width(screen, &l); - ok(hres == S_OK, "get_width failed: %08x\n", hres); - ok(l == exl, "width = %d, expected %d\n", l, exl); + ok(hres == S_OK, "get_width failed: %08lx\n", hres); + ok(l == exl, "width = %ld, expected %ld\n", l, exl); exl = GetDeviceCaps(hdc, VERTRES); l = 0xdeadbeef; hres = IHTMLScreen_get_height(screen, &l); - ok(hres == S_OK, "get_height failed: %08x\n", hres); - ok(l == exl, "height = %d, expected %d\n", l, exl); + ok(hres == S_OK, "get_height failed: %08lx\n", hres); + ok(l == exl, "height = %ld, expected %ld\n", l, exl); exl = GetDeviceCaps(hdc, BITSPIXEL); l = 0xdeadbeef; hres = IHTMLScreen_get_colorDepth(screen, &l); - ok(hres == S_OK, "get_height failed: %08x\n", hres); - ok(l == exl, "height = %d, expected %d\n", l, exl); + ok(hres == S_OK, "get_height failed: %08lx\n", hres); + ok(l == exl, "height = %ld, expected %ld\n", l, exl); DeleteObject(hdc); @@ -6549,13 +6549,13 @@ static void test_screen(IHTMLWindow2 *window) l = 0xdeadbeef; hres = IHTMLScreen_get_availHeight(screen, &l); - ok(hres == S_OK, "get_availHeight failed: %08x\n", hres); - ok(l == work_area.bottom-work_area.top, "availHeight = %d, expected %d\n", l, work_area.bottom-work_area.top); + ok(hres == S_OK, "get_availHeight failed: %08lx\n", hres); + ok(l == work_area.bottom-work_area.top, "availHeight = %ld, expected %ld\n", l, work_area.bottom-work_area.top); l = 0xdeadbeef; hres = IHTMLScreen_get_availWidth(screen, &l); - ok(hres == S_OK, "get_availWidth failed: %08x\n", hres); - ok(l == work_area.right-work_area.left, "availWidth = %d, expected %d\n", l, work_area.right-work_area.left); + ok(hres == S_OK, "get_availWidth failed: %08lx\n", hres); + ok(l == work_area.right-work_area.left, "availWidth = %ld, expected %ld\n", l, work_area.right-work_area.left); IHTMLScreen_Release(screen); } @@ -6570,15 +6570,15 @@ static void test_default_selection(IHTMLDocument2 *doc) test_doc_selection_type(doc, L"None"); hres = IHTMLDocument2_get_selection(doc, &selection); - ok(hres == S_OK, "get_selection failed: %08x\n", hres); + ok(hres == S_OK, "get_selection failed: %08lx\n", hres); hres = IHTMLSelectionObject_createRange(selection, &disp); IHTMLSelectionObject_Release(selection); - ok(hres == S_OK, "createRange failed: %08x\n", hres); + ok(hres == S_OK, "createRange failed: %08lx\n", hres); hres = IDispatch_QueryInterface(disp, &IID_IHTMLTxtRange, (void**)&range); IDispatch_Release(disp); - ok(hres == S_OK, "Could not get IHTMLTxtRange interface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLTxtRange interface: %08lx\n", hres); test_range_text(range, NULL); IHTMLTxtRange_Release(range); @@ -6592,28 +6592,28 @@ static void test_doc_dir(IHTMLDocument2 *doc2) dir = (BSTR)0xdeadbeef; hres = IHTMLDocument3_get_dir(doc, &dir); - ok(hres == S_OK, "get_dir failed: %08x\n", hres); + ok(hres == S_OK, "get_dir failed: %08lx\n", hres); ok(!dir, "dir = %s\n", wine_dbgstr_w(dir)); dir = SysAllocString(L"rtl"); hres = IHTMLDocument3_put_dir(doc, dir); - ok(hres == S_OK, "put_dir failed: %08x\n", hres); + ok(hres == S_OK, "put_dir failed: %08lx\n", hres); SysFreeString(dir); dir = NULL; hres = IHTMLDocument3_get_dir(doc, &dir); - ok(hres == S_OK, "get_dir failed: %08x\n", hres); + ok(hres == S_OK, "get_dir failed: %08lx\n", hres); ok(!lstrcmpW(dir, L"rtl"), "dir = %s\n", wine_dbgstr_w(dir)); SysFreeString(dir); dir = SysAllocString(L"ltr"); hres = IHTMLDocument3_put_dir(doc, dir); - ok(hres == S_OK, "put_dir failed: %08x\n", hres); + ok(hres == S_OK, "put_dir failed: %08lx\n", hres); SysFreeString(dir); dir = NULL; hres = IHTMLDocument3_get_dir(doc, &dir); - ok(hres == S_OK, "get_dir failed: %08x\n", hres); + ok(hres == S_OK, "get_dir failed: %08lx\n", hres); ok(!lstrcmpW(dir, L"ltr"), "dir = %s\n", wine_dbgstr_w(dir)); SysFreeString(dir); @@ -6632,11 +6632,11 @@ static void test_unique_id(IHTMLDocument2 *doc, IHTMLElement *elem) static const WCHAR prefixW[] = {'m','s','_','_','i','d',0}; hres = IHTMLDocument3_get_uniqueID(doc3, &id); - ok(hres == S_OK, "get_uniqueID failed: %08x\n", hres); + ok(hres == S_OK, "get_uniqueID failed: %08lx\n", hres); ok(SysStringLen(id) >= ARRAY_SIZE(prefixW), "id %s too short\n", wine_dbgstr_w(id)); hres = IHTMLDocument3_get_uniqueID(doc3, &id2); - ok(hres == S_OK, "get_uniqueID failed: %08x\n", hres); + ok(hres == S_OK, "get_uniqueID failed: %08lx\n", hres); ok(SysStringLen(id2) >= ARRAY_SIZE(prefixW), "id %s too short\n", wine_dbgstr_w(id2)); ok(lstrcmpW(id, id2), "same unique ids %s\n", wine_dbgstr_w(id)); @@ -6650,17 +6650,17 @@ static void test_unique_id(IHTMLDocument2 *doc, IHTMLElement *elem) SysFreeString(id2); hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLUniqueName, (void**)&unique_name); - ok(hres == S_OK, "Could not get IHTMLUniqueName iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLUniqueName iface: %08lx\n", hres); hres = IHTMLUniqueName_get_uniqueID(unique_name, &id); - ok(hres == S_OK, "get_uniqueName failed: %08x\n", hres); + ok(hres == S_OK, "get_uniqueName failed: %08lx\n", hres); hres = IHTMLUniqueName_get_uniqueID(unique_name, &id2); - ok(hres == S_OK, "get_uniqueName failed: %08x\n", hres); + ok(hres == S_OK, "get_uniqueName failed: %08lx\n", hres); ok(!lstrcmpW(id, id2), "unique names differ\n"); hres = IHTMLUniqueName_get_uniqueNumber(unique_name, &num); - ok(hres == S_OK, "get_uniqueName failed: %08x\n", hres); + ok(hres == S_OK, "get_uniqueName failed: %08lx\n", hres); ok(num, "num = 0\n"); swprintf(buf, ARRAY_SIZE(buf), L"ms__id%u", num); @@ -6686,17 +6686,17 @@ static void test_doc_elem(IHTMLDocument2 *doc) BSTR bstr; hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); - ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument3) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument3) failed: %08lx\n", hres); hres = IHTMLDocument2_toString(doc, &bstr); - ok(hres == S_OK, "toString failed: %08x\n", hres); + ok(hres == S_OK, "toString failed: %08lx\n", hres); ok(!lstrcmpW(bstr, L"[object]"), "toString returned %s, expected [object]\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); hres = IHTMLDocument3_get_documentElement(doc3, &elem); IHTMLDocument3_Release(doc3); - ok(hres == S_OK, "get_documentElement failed: %08x\n", hres); + ok(hres == S_OK, "get_documentElement failed: %08lx\n", hres); test_node_name((IUnknown*)elem, L"HTML"); test_elem_tag((IUnknown*)elem, L"HTML"); @@ -6718,19 +6718,19 @@ static void test_doc_elem(IHTMLDocument2 *doc) IHTMLElement_Release(elem); hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument4, (void**)&doc4); - ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument4) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument4) failed: %08lx\n", hres); hres = IHTMLDocument4_get_namespaces(doc4, &disp); - ok(hres == S_OK, "get_namespaces failed: %08x\n", hres); + ok(hres == S_OK, "get_namespaces failed: %08lx\n", hres); test_disp((IUnknown*)disp, &DIID_DispHTMLNamespaceCollection, NULL, L"[object]"); hres = IDispatch_QueryInterface(disp, &IID_IHTMLNamespaceCollection, (void**)&namespaces); - ok(hres == S_OK, "Could not get IHTMLNamespaceCollection iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLNamespaceCollection iface: %08lx\n", hres); hres = IHTMLNamespaceCollection_get_length(namespaces, &l); - ok(hres == S_OK, "get_length failed: %08x\n", hres); - ok(l == 0, "length = %d\n", l); + ok(hres == S_OK, "get_length failed: %08lx\n", hres); + ok(l == 0, "length = %ld\n", l); IHTMLNamespaceCollection_Release(namespaces); IDispatch_Release(disp); @@ -6746,7 +6746,7 @@ static void test_default_body(IHTMLBodyElement *body) bstr = (void*)0xdeadbeef; hres = IHTMLBodyElement_get_background(body, &bstr); - ok(hres == S_OK, "get_background failed: %08x\n", hres); + ok(hres == S_OK, "get_background failed: %08lx\n", hres); ok(bstr == NULL, "bstr != NULL\n"); l = elem_get_scroll_height((IUnknown*)body); @@ -6754,7 +6754,7 @@ static void test_default_body(IHTMLBodyElement *body) l = elem_get_scroll_width((IUnknown*)body); ok(l != -1, "scrollWidth == -1\n"); l = elem_get_scroll_top((IUnknown*)body); - ok(!l, "scrollTop = %d\n", l); + ok(!l, "scrollTop = %ld\n", l); elem_get_scroll_left((IUnknown*)body); test_elem_dir((IUnknown*)body, NULL); @@ -6762,7 +6762,7 @@ static void test_default_body(IHTMLBodyElement *body) /* get_text tests */ hres = IHTMLBodyElement_get_text(body, &v); - ok(hres == S_OK, "expect S_OK got 0x%08d\n", hres); + ok(hres == S_OK, "expect S_OK got 0x%08ld\n", hres); ok(V_VT(&v) == VT_BSTR, "Expected VT_BSTR got %d\n", V_VT(&v)); ok(V_BSTR(&v) == NULL, "bstr != NULL\n"); @@ -6770,12 +6770,12 @@ static void test_default_body(IHTMLBodyElement *body) V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"Invalid"); hres = IHTMLBodyElement_put_text(body, v); - ok(hres == S_OK, "expect S_OK got 0x%08d\n", hres); + ok(hres == S_OK, "expect S_OK got 0x%08ld\n", hres); VariantClear(&v); V_VT(&v) = VT_NULL; hres = IHTMLBodyElement_get_text(body, &v); - ok(hres == S_OK, "expect S_OK got 0x%08d\n", hres); + ok(hres == S_OK, "expect S_OK got 0x%08ld\n", hres); ok(V_VT(&v) == VT_BSTR, "Expected VT_BSTR got %d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"#00a0d0"), "v = %s, expected '#00a0d0'\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -6784,12 +6784,12 @@ static void test_default_body(IHTMLBodyElement *body) V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"#FF0000"); hres = IHTMLBodyElement_put_text(body, v); - ok(hres == S_OK, "expect S_OK got 0x%08d\n", hres); + ok(hres == S_OK, "expect S_OK got 0x%08ld\n", hres); VariantClear(&v); V_VT(&v) = VT_NULL; hres = IHTMLBodyElement_get_text(body, &v); - ok(hres == S_OK, "expect S_OK got 0x%08d\n", hres); + ok(hres == S_OK, "expect S_OK got 0x%08ld\n", hres); ok(V_VT(&v) == VT_BSTR, "Expected VT_BSTR got %d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"#ff0000"), "v = %s, expected '#ff0000'\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -6802,7 +6802,7 @@ static void _test_body_scroll(unsigned line, IHTMLBodyElement *body, const WCHAR HRESULT hres; hres = IHTMLBodyElement_get_scroll(body, &str); - ok_(__FILE__,line)(hres == S_OK, "get_scroll failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_scroll failed: %08lx\n", hres); ok_(__FILE__,line)(ex ? !lstrcmpW(str, ex) : !str, "scroll = %s\n", wine_dbgstr_w(str)); SysFreeString(str); } @@ -6814,7 +6814,7 @@ static void _set_body_scroll(unsigned line, IHTMLBodyElement *body, const WCHAR HRESULT hres; hres = IHTMLBodyElement_put_scroll(body, str); - ok_(__FILE__,line)(hres == S_OK, "put_scroll failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_scroll failed: %08lx\n", hres); SysFreeString(str); _test_body_scroll(line, body, val); @@ -6826,63 +6826,63 @@ static void test_body_funs(IHTMLBodyElement *body, IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLBodyElement_get_bgColor(body, &vDefaultbg); - ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(hres == S_OK, "get_bgColor failed: %08lx\n", hres); ok(V_VT(&vDefaultbg) == VT_BSTR, "bstr != NULL\n"); ok(!V_BSTR(&vDefaultbg), "V_BSTR(bgColor) = %s\n", wine_dbgstr_w(V_BSTR(&vDefaultbg))); hres = IHTMLDocument2_get_bgColor(doc, &vbg); - ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(hres == S_OK, "get_bgColor failed: %08lx\n", hres); ok(V_VT(&vbg) == VT_BSTR && V_BSTR(&vbg) && !wcscmp(V_BSTR(&vbg), L"#ffffff"), "bgColor = %s\n", wine_dbgstr_variant(&vbg)); V_VT(&vbg) = VT_BSTR; V_BSTR(&vbg) = SysAllocString(L"red"); hres = IHTMLBodyElement_put_bgColor(body, vbg); - ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); + ok(hres == S_OK, "put_bgColor failed: %08lx\n", hres); VariantClear(&vbg); hres = IHTMLBodyElement_get_bgColor(body, &vbg); - ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(hres == S_OK, "get_bgColor failed: %08lx\n", hres); ok(V_VT(&vbg) == VT_BSTR, "V_VT(&vbg) != VT_BSTR\n"); ok(!lstrcmpW(V_BSTR(&vbg), L"#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); VariantClear(&vbg); hres = IHTMLDocument2_get_bgColor(doc, &vbg); - ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(hres == S_OK, "get_bgColor failed: %08lx\n", hres); ok(V_VT(&vbg) == VT_BSTR && V_BSTR(&vbg) && !wcscmp(V_BSTR(&vbg), L"#ff0000"), "bgColor = %s\n", wine_dbgstr_variant(&vbg)); hres = IHTMLDocument2_get_bgColor(doc, &vbg); - ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(hres == S_OK, "get_bgColor failed: %08lx\n", hres); ok(V_VT(&vbg) == VT_BSTR, "V_VT(&vbg) != VT_BSTR\n"); ok(!lstrcmpW(V_BSTR(&vbg), L"#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); VariantClear(&vbg); /* Restore Original */ hres = IHTMLBodyElement_put_bgColor(body, vDefaultbg); - ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); + ok(hres == S_OK, "put_bgColor failed: %08lx\n", hres); VariantClear(&vDefaultbg); /* Set via IHTMLDocument2 */ V_VT(&vbg) = VT_BSTR; V_BSTR(&vbg) = SysAllocString(L"red"); hres = IHTMLDocument2_put_bgColor(doc, vbg); - ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); + ok(hres == S_OK, "put_bgColor failed: %08lx\n", hres); VariantClear(&vbg); hres = IHTMLBodyElement_get_bgColor(body, &vbg); - ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(hres == S_OK, "get_bgColor failed: %08lx\n", hres); ok(V_VT(&vbg) == VT_BSTR, "V_VT(&vbg) != VT_BSTR\n"); ok(!lstrcmpW(V_BSTR(&vbg), L"#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); VariantClear(&vbg); hres = IHTMLDocument2_get_bgColor(doc, &vbg); - ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(hres == S_OK, "get_bgColor failed: %08lx\n", hres); ok(V_VT(&vbg) == VT_BSTR, "V_VT(&vbg) != VT_BSTR\n"); ok(!lstrcmpW(V_BSTR(&vbg), L"#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); VariantClear(&vbg); /* Restore Original */ hres = IHTMLBodyElement_put_bgColor(body, vDefaultbg); - ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); + ok(hres == S_OK, "put_bgColor failed: %08lx\n", hres); VariantClear(&vDefaultbg); test_body_scroll(body, NULL); @@ -6898,14 +6898,14 @@ static void test_history(IHTMLWindow2 *window) history = NULL; hres = IHTMLWindow2_get_history(window, &history); - ok(hres == S_OK, "get_history failed: %08x\n", hres); + ok(hres == S_OK, "get_history failed: %08lx\n", hres); ok(history != NULL, "history = NULL\n"); test_disp2((IUnknown*)history, &DIID_DispHTMLHistory, &IID_IOmHistory, NULL, L"[object]"); history2 = NULL; hres = IHTMLWindow2_get_history(window, &history2); - ok(hres == S_OK, "get_history failed: %08x\n", hres); + ok(hres == S_OK, "get_history failed: %08lx\n", hres); ok(history2 != NULL, "history2 = NULL\n"); ok(iface_cmp((IUnknown*)history, (IUnknown*)history2), "history != history2\n"); @@ -6921,7 +6921,7 @@ static void test_xmlhttprequest(IHTMLWindow5 *window) IHTMLXMLHttpRequest *xml; hres = IHTMLWindow5_get_XMLHttpRequest(window, &var); - ok(hres == S_OK, "get_XMLHttpRequest failed: %08x\n", hres); + ok(hres == S_OK, "get_XMLHttpRequest failed: %08lx\n", hres); ok(V_VT(&var) == VT_DISPATCH || broken(V_VT(&var) == VT_EMPTY), "expect VT_DISPATCH, got %s\n", debugstr_variant(&var)); if (V_VT(&var) == VT_EMPTY) { @@ -6931,12 +6931,12 @@ static void test_xmlhttprequest(IHTMLWindow5 *window) factory = NULL; hres = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IHTMLXMLHttpRequestFactory, (void**)&factory); - ok(hres == S_OK, "QueryInterface(&IID_IHTMLXMLHttpRequestFactory) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(&IID_IHTMLXMLHttpRequestFactory) failed: %08lx\n", hres); ok(factory != NULL, "factory == NULL\n"); xml = NULL; hres = IHTMLXMLHttpRequestFactory_create(factory, &xml); - ok(hres == S_OK, "create failed: %08x\n", hres); + ok(hres == S_OK, "create failed: %08lx\n", hres); ok(xml != NULL, "xml == NULL\n"); if(is_ie9plus) test_disp((IUnknown*)xml, &DIID_DispHTMLXMLHttpRequest, &CLSID_HTMLXMLHttpRequest, L"[object]"); @@ -6953,15 +6953,15 @@ static void test_read_only_style(IHTMLCSSStyleDeclaration *style) HRESULT hres; hres = IHTMLCSSStyleDeclaration_put_display(style, none); - ok(hres == 0x80700007, "put_display failed: %08x\n", hres); + ok(hres == 0x80700007, "put_display failed: %08lx\n", hres); hres = IHTMLCSSStyleDeclaration_removeProperty(style, display, &str); - ok(hres == 0x80700007, "removeProperty failed: %08x\n", hres); + ok(hres == 0x80700007, "removeProperty failed: %08lx\n", hres); V_VT(&v) = VT_BSTR; V_BSTR(&v) = none; hres = IHTMLCSSStyleDeclaration_setProperty(style, display, &v, NULL); - ok(hres == 0x80700007, "setProperty returned: %08x\n", hres); + ok(hres == 0x80700007, "setProperty returned: %08lx\n", hres); SysFreeString(none); SysFreeString(display); @@ -6980,7 +6980,7 @@ static void test_window(IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLDocument2_get_parentWindow(doc, &window); - ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + ok(hres == S_OK, "get_parentWindow failed: %08lx\n", hres); test_ifaces((IUnknown*)window, window_iids); hres = IHTMLWindow2_QueryInterface(window, &IID_ITravelLogClient, (void**)&unk); if(hres == S_OK) @@ -6991,7 +6991,7 @@ static void test_window(IHTMLDocument2 *doc) test_disp((IUnknown*)window, &DIID_DispHTMLWindow2, &CLSID_HTMLWindow2, L"[object]"); hres = IHTMLWindow2_get_document(window, &doc2); - ok(hres == S_OK, "get_document failed: %08x\n", hres); + ok(hres == S_OK, "get_document failed: %08lx\n", hres); ok(doc2 != NULL, "doc2 == NULL\n"); if(is_ie9plus) @@ -7004,17 +7004,17 @@ static void test_window(IHTMLDocument2 *doc) unk = (void*)0xdeadbeef; hres = IHTMLDocument2_QueryInterface(doc2, &IID_ICustomDoc, (void**)&unk); - ok(hres == E_NOINTERFACE, "QueryInterface(IID_ICustomDoc) returned: %08x\n", hres); + ok(hres == E_NOINTERFACE, "QueryInterface(IID_ICustomDoc) returned: %08lx\n", hres); ok(!unk, "unk = %p\n", unk); IHTMLDocument2_Release(doc2); hres = IHTMLWindow2_get_window(window, &window2); - ok(hres == S_OK, "get_window failed: %08x\n", hres); + ok(hres == S_OK, "get_window failed: %08lx\n", hres); ok(window2 != NULL, "window2 == NULL\n"); hres = IHTMLWindow2_get_self(window, &self); - ok(hres == S_OK, "get_self failed: %08x\n", hres); + ok(hres == S_OK, "get_self failed: %08lx\n", hres); ok(window2 != NULL, "self == NULL\n"); ok(self == window2, "self != window2\n"); @@ -7023,28 +7023,28 @@ static void test_window(IHTMLDocument2 *doc) disp = NULL; hres = IHTMLDocument2_get_Script(doc, &disp); - ok(hres == S_OK, "get_Script failed: %08x\n", hres); + ok(hres == S_OK, "get_Script failed: %08lx\n", hres); ok(disp == (void*)window, "disp != window\n"); IDispatch_Release(disp); hres = IHTMLWindow2_toString(window, NULL); - ok(hres == E_INVALIDARG, "toString failed: %08x\n", hres); + ok(hres == E_INVALIDARG, "toString failed: %08lx\n", hres); str = NULL; hres = IHTMLWindow2_toString(window, &str); - ok(hres == S_OK, "toString failed: %08x\n", hres); + ok(hres == S_OK, "toString failed: %08lx\n", hres); ok(!lstrcmpW(str, L"[object]") || !lstrcmpW(str, L"[object Window]") /* win7 ie9 */, "toString returned %s\n", wine_dbgstr_w(str)); SysFreeString(str); V_VT(&v) = VT_ERROR; hres = IHTMLWindow2_get_opener(window, &v); - ok(hres == S_OK, "get_opener failed: %08x\n", hres); + ok(hres == S_OK, "get_opener failed: %08lx\n", hres); ok(V_VT(&v) == VT_EMPTY, "V_VT(opener) = %d\n", V_VT(&v)); parent = NULL; hres = IHTMLWindow2_get_parent(window, &parent); - ok(hres == S_OK, "get_parent failed: %08x\n", hres); + ok(hres == S_OK, "get_parent failed: %08lx\n", hres); ok(parent != NULL, "parent == NULL\n"); ok(parent == self, "parent != window\n"); IHTMLWindow2_Release(parent); @@ -7059,10 +7059,10 @@ static void test_window(IHTMLDocument2 *doc) test_history(window); hres = IHTMLWindow2_moveBy(window, 0, 0); - ok(hres == S_FALSE, "moveBy failed: %08x\n", hres); + ok(hres == S_FALSE, "moveBy failed: %08lx\n", hres); hres = IHTMLWindow2_resizeBy(window, 0, 0); - ok(hres == S_FALSE, "resizeBy failed: %08x\n", hres); + ok(hres == S_FALSE, "resizeBy failed: %08lx\n", hres); hres = IHTMLWindow2_QueryInterface(window, &IID_IHTMLWindow5, (void**)&window5); if(SUCCEEDED(hres)) { @@ -7084,44 +7084,44 @@ static void test_window(IHTMLDocument2 *doc) ok(window7 != NULL, "window7 == NULL\n"); hres = IHTMLWindow7_get_performance(window7, &v); - ok(hres == S_OK, "get_performance failed: %08x\n", hres); + ok(hres == S_OK, "get_performance failed: %08lx\n", hres); if(SUCCEEDED(hres)) { ok(V_VT(&v) == VT_DISPATCH, "V_VT(performance) = %u\n", V_VT(&v)); hres = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IHTMLPerformance, (void**)&performance); - ok(hres == S_OK, "Could not get IHTMLPerformance iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLPerformance iface: %08lx\n", hres); IHTMLPerformance_Release(performance); V_VT(&v) = VT_I2; V_I2(&v) = 2; hres = IHTMLWindow7_put_performance(window7, v); - ok(hres == S_OK, "put_performance failed: %08x\n", hres); + ok(hres == S_OK, "put_performance failed: %08lx\n", hres); V_VT(&v) = VT_ERROR; hres = IHTMLWindow7_get_performance(window7, &v); - ok(hres == S_OK, "get_performance failed: %08x\n", hres); + ok(hres == S_OK, "get_performance failed: %08lx\n", hres); ok(V_VT(&v) == VT_I2, "V_VT(performance) = %u\n", V_VT(&v)); ok(V_I2(&v) == 2, "V_I2(performance) = %d\n", V_I2(&v)); } hres = IHTMLWindow7_get_pageXOffset(window7, &offset); - ok(hres == S_OK, "get_pageXOffset failed: %08x\n", hres); - ok(!offset, "Unexpected offset %d.\n", offset); + ok(hres == S_OK, "get_pageXOffset failed: %08lx\n", hres); + ok(!offset, "Unexpected offset %ld.\n", offset); hres = IHTMLWindow7_get_pageYOffset(window7, &offset); - ok(hres == S_OK, "get_pageYOffset failed: %08x\n", hres); - ok(!offset, "Unexpected offset %d.\n", offset); + ok(hres == S_OK, "get_pageYOffset failed: %08lx\n", hres); + ok(!offset, "Unexpected offset %ld.\n", offset); hres = IHTMLDocument2_get_body(doc, &elem); - ok(hres == S_OK, "get_body failed: %08x\n", hres); + ok(hres == S_OK, "get_body failed: %08lx\n", hres); hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLDOMNode, (void**)&node); - ok(hres == S_OK, "Could not get IHTMLDOMNode iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLDOMNode iface: %08lx\n", hres); hres = IHTMLWindow7_getComputedStyle(window7, node, NULL, &computed_style); - ok(hres == S_OK, "getComputedStyle failed: %08x\n", hres); + ok(hres == S_OK, "getComputedStyle failed: %08lx\n", hres); test_disp((IUnknown*)computed_style, &DIID_DispHTMLW3CComputedStyle, NULL, L"[object]"); test_ifaces((IUnknown*)computed_style, computed_style_iids); @@ -7153,7 +7153,7 @@ static void test_dom_implementation(IHTMLDocument2 *doc) hres = IHTMLDocument5_get_implementation(doc5, &dom_implementation); IHTMLDocument5_Release(doc5); - ok(hres == S_OK, "get_implementation failed: %08x\n", hres); + ok(hres == S_OK, "get_implementation failed: %08lx\n", hres); ok(dom_implementation != NULL, "dom_implementation == NULL\n"); str = SysAllocString(L"test"); @@ -7163,7 +7163,7 @@ static void test_dom_implementation(IHTMLDocument2 *doc) hres = IHTMLDOMImplementation_hasFeature(dom_implementation, str, v, &b); SysFreeString(str); VariantClear(&v); - ok(hres == S_OK, "hasFeature failed: %08x\n", hres); + ok(hres == S_OK, "hasFeature failed: %08lx\n", hres); ok(!b, "hasFeature returned %x\n", b); hres = IHTMLDOMImplementation_QueryInterface(dom_implementation, &IID_IHTMLDOMImplementation2, @@ -7180,34 +7180,34 @@ static void test_dom_implementation(IHTMLDocument2 *doc) str = SysAllocString(L"test"); hres = IHTMLDOMImplementation2_createHTMLDocument(dom_implementation2, str, &new_document); - ok(hres == S_OK, "createHTMLDocument failed: %08x\n", hres); + ok(hres == S_OK, "createHTMLDocument failed: %08lx\n", hres); test_disp((IUnknown*)new_document, &DIID_DispHTMLDocument, &CLSID_HTMLDocument, L"[object]"); test_ifaces((IUnknown*)new_document, doc_node_iids); hres = IHTMLDocument7_get_defaultView(new_document, &window); - ok(hres == S_OK, "get_defaultView returned: %08x\n", hres); + ok(hres == S_OK, "get_defaultView returned: %08lx\n", hres); ok(!window, "window = %p\n", window); hres = IHTMLDocument7_get_parentWindow(new_document, &window); - ok(hres == S_OK, "get_parentWindow returned: %08x\n", hres); + ok(hres == S_OK, "get_parentWindow returned: %08lx\n", hres); ok(!window, "window = %p\n", window); hres = IHTMLDocument7_QueryInterface(new_document, &IID_IHTMLDocument2, (void**)&new_document2); - ok(hres == S_OK, "Could not get IHTMLDocument2 iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLDocument2 iface: %08lx\n", hres); hres = IHTMLDocument2_get_parentWindow(new_document2, &window); - ok(hres == E_FAIL, "get_parentWindow returned: %08x\n", hres); + ok(hres == E_FAIL, "get_parentWindow returned: %08lx\n", hres); hres = IHTMLDocument2_get_Script(new_document2, &disp); - ok(hres == E_PENDING, "get_Script returned: %08x\n", hres); + ok(hres == E_PENDING, "get_Script returned: %08lx\n", hres); hres = IHTMLDocument2_get_location(new_document2, &location); - ok(hres == E_UNEXPECTED, "get_location returned: %08x\n", hres); + ok(hres == E_UNEXPECTED, "get_location returned: %08lx\n", hres); memset(&v, 0xcc, sizeof(v)); hres = IHTMLDocument7_get_onmsthumbnailclick(new_document, &v); - ok(hres == S_OK, "get_onmsthumbnailclick returned: %08x\n", hres); + ok(hres == S_OK, "get_onmsthumbnailclick returned: %08lx\n", hres); ok(V_VT(&v) == VT_NULL, "got %u\n", V_VT(&v)); ok((DWORD)(DWORD_PTR)V_DISPATCH(&v) == 0xcccccccc, "got %p\n", V_DISPATCH(&v)); @@ -7230,14 +7230,14 @@ static void test_xhr(IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLDocument2_get_parentWindow(doc, &window); - ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + ok(hres == S_OK, "get_parentWindow failed: %08lx\n", hres); hres = IHTMLWindow2_QueryInterface(window, &IID_IDispatchEx, (void**)&dispex); - ok(hres == S_OK, "Could not get IDispatchEx iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08lx\n", hres); str = SysAllocString(L"XMLHttpRequest"); hres = IDispatchEx_GetDispID(dispex, str, 0, &id); - ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + ok(hres == S_OK, "GetDispID failed: %08lx\n", hres); SysFreeString(str); IHTMLWindow2_Release(window); @@ -7261,10 +7261,10 @@ static void test_defaults(IHTMLDocument2 *doc) elem = doc_get_body(doc); hres = IHTMLDocument2_get_images(doc, NULL); - ok(hres == E_INVALIDARG, "hres %08x\n", hres); + ok(hres == E_INVALIDARG, "hres %08lx\n", hres); hres = IHTMLDocument2_get_images(doc, &collection); - ok(hres == S_OK, "get_images failed: %08x\n", hres); + ok(hres == S_OK, "get_images failed: %08lx\n", hres); if(hres == S_OK) { test_elem_collection((IUnknown*)collection, NULL, 0); @@ -7272,10 +7272,10 @@ static void test_defaults(IHTMLDocument2 *doc) } hres = IHTMLDocument2_get_applets(doc, NULL); - ok(hres == E_INVALIDARG, "hres %08x\n", hres); + ok(hres == E_INVALIDARG, "hres %08lx\n", hres); hres = IHTMLDocument2_get_applets(doc, &collection); - ok(hres == S_OK, "get_applets failed: %08x\n", hres); + ok(hres == S_OK, "get_applets failed: %08lx\n", hres); if(hres == S_OK) { test_elem_collection((IUnknown*)collection, NULL, 0); @@ -7283,10 +7283,10 @@ static void test_defaults(IHTMLDocument2 *doc) } hres = IHTMLDocument2_get_links(doc, NULL); - ok(hres == E_INVALIDARG, "hres %08x\n", hres); + ok(hres == E_INVALIDARG, "hres %08lx\n", hres); hres = IHTMLDocument2_get_links(doc, &collection); - ok(hres == S_OK, "get_links failed: %08x\n", hres); + ok(hres == S_OK, "get_links failed: %08lx\n", hres); if(hres == S_OK) { test_elem_collection((IUnknown*)collection, NULL, 0); @@ -7294,10 +7294,10 @@ static void test_defaults(IHTMLDocument2 *doc) } hres = IHTMLDocument2_get_forms(doc, NULL); - ok(hres == E_INVALIDARG, "hres %08x\n", hres); + ok(hres == E_INVALIDARG, "hres %08lx\n", hres); hres = IHTMLDocument2_get_forms(doc, &collection); - ok(hres == S_OK, "get_forms failed: %08x\n", hres); + ok(hres == S_OK, "get_forms failed: %08lx\n", hres); if(hres == S_OK) { test_elem_collection((IUnknown*)collection, NULL, 0); @@ -7305,10 +7305,10 @@ static void test_defaults(IHTMLDocument2 *doc) } hres = IHTMLDocument2_get_anchors(doc, NULL); - ok(hres == E_INVALIDARG, "hres %08x\n", hres); + ok(hres == E_INVALIDARG, "hres %08lx\n", hres); hres = IHTMLDocument2_get_anchors(doc, &collection); - ok(hres == S_OK, "get_anchors failed: %08x\n", hres); + ok(hres == S_OK, "get_anchors failed: %08lx\n", hres); if(hres == S_OK) { test_elem_collection((IUnknown*)collection, NULL, 0); @@ -7318,7 +7318,7 @@ static void test_defaults(IHTMLDocument2 *doc) test_xhr(doc); hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLBodyElement, (void**)&body); - ok(hres == S_OK, "Could not get IHTMBodyElement: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMBodyElement: %08lx\n", hres); test_default_body(body); test_body_funs(body, doc); IHTMLBodyElement_Release(body); @@ -7328,7 +7328,7 @@ static void test_defaults(IHTMLDocument2 *doc) test_elem_istextedit(elem, VARIANT_TRUE); hres = IHTMLElement_get_style(elem, &style); - ok(hres == S_OK, "get_style failed: %08x\n", hres); + ok(hres == S_OK, "get_style failed: %08lx\n", hres); test_disp((IUnknown*)style, &DIID_DispHTMLStyle, NULL, L"[object]"); test_ifaces((IUnknown*)style, style_iids); @@ -7336,7 +7336,7 @@ static void test_defaults(IHTMLDocument2 *doc) str = NULL; hres = IHTMLDocument2_get_charset(doc, &str); - ok(hres == S_OK, "get_charset failed: %08x\n", hres); + ok(hres == S_OK, "get_charset failed: %08lx\n", hres); ok(str && *str, "charset is empty\n"); /* FIXME: better tests */ SysFreeString(str); @@ -7348,7 +7348,7 @@ static void test_defaults(IHTMLDocument2 *doc) elem2 = get_elem2_iface((IUnknown*)elem); hres = IHTMLElement2_get_currentStyle(elem2, &cstyle); - ok(hres == S_OK, "get_currentStyle failed: %08x\n", hres); + ok(hres == S_OK, "get_currentStyle failed: %08lx\n", hres); if(SUCCEEDED(hres)) { IUnknown *unk; @@ -7380,12 +7380,12 @@ static void test_defaults(IHTMLDocument2 *doc) IHTMLElement_Release(elem); hres = IHTMLDocument2_get_styleSheets(doc, &stylesheetcol); - ok(hres == S_OK, "get_styleSheets failed: %08x\n", hres); + ok(hres == S_OK, "get_styleSheets failed: %08lx\n", hres); l = 0xdeadbeef; hres = IHTMLStyleSheetsCollection_get_length(stylesheetcol, &l); - ok(hres == S_OK, "get_length failed: %08x\n", hres); - ok(l == 0, "length = %d\n", l); + ok(hres == S_OK, "get_length failed: %08lx\n", hres); + ok(l == 0, "length = %ld\n", l); IHTMLStyleSheetsCollection_Release(stylesheetcol); @@ -7397,7 +7397,7 @@ static void test_defaults(IHTMLDocument2 *doc) V_VT(&v) = VT_EMPTY; hres = IHTMLDocument2_execCommand(doc, str, FALSE, v, &b); ok(hres == OLECMDERR_E_NOTSUPPORTED || hres == E_INVALIDARG, - "execCommand failed: %08x, expected OLECMDERR_E_NOTSUPPORTED or E_INVALIDARG\n", hres); + "execCommand failed: %08lx, expected OLECMDERR_E_NOTSUPPORTED or E_INVALIDARG\n", hres); SysFreeString(str); str = SysAllocString(L"respectvisibilityindesign"); @@ -7405,7 +7405,7 @@ static void test_defaults(IHTMLDocument2 *doc) V_VT(&v) = VT_BOOL; V_BOOL(&v) = VARIANT_TRUE; hres = IHTMLDocument2_execCommand(doc, str, FALSE, v, &b); - ok(hres == S_OK, "execCommand failed: %08x, expected DRAGDROP_E_NOTREGISTERED\n", hres); + ok(hres == S_OK, "execCommand failed: %08lx, expected DRAGDROP_E_NOTREGISTERED\n", hres); SysFreeString(str); test_default_selection(doc); @@ -7414,7 +7414,7 @@ static void test_defaults(IHTMLDocument2 *doc) str = (BSTR)0xdeadbeef; hres = IHTMLDocument2_get_cookie(doc, &str); - ok(hres == S_OK, "get_cookie failed: %08x\n", hres); + ok(hres == S_OK, "get_cookie failed: %08lx\n", hres); ok(!str, "cookie = %s\n", wine_dbgstr_w(str)); } @@ -7427,7 +7427,7 @@ static void _test_button_name(unsigned line, IHTMLElement *elem, const WCHAR *ex str = (void*)0xdeadbeef; hres = IHTMLButtonElement_get_name(button, &str); - ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08lx\n", hres); if(exname) ok_(__FILE__,line)(!lstrcmpW(str, exname), "name = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(exname)); else @@ -7444,7 +7444,7 @@ static void _set_button_name(unsigned line, IHTMLElement *elem, const WCHAR *nam HRESULT hres; hres = IHTMLButtonElement_put_name(button, str); - ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08lx\n", hres); SysFreeString(str); IHTMLButtonElement_Release(button); @@ -7459,7 +7459,7 @@ static void _test_button_get_disabled(unsigned line, IHTMLElement *elem, VARIANT HRESULT hres; hres = IHTMLButtonElement_get_disabled(button, &disabled); - ok_(__FILE__,line) (hres == S_OK, "get_disabled failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_disabled failed: %08lx\n", hres); ok_(__FILE__,line) (disabled == exb, "disabled=%x, expected %x\n", disabled, exb); IHTMLButtonElement_Release(button); @@ -7473,7 +7473,7 @@ static void _test_button_set_disabled(unsigned line, IHTMLElement *elem, VARIANT HRESULT hres; hres = IHTMLButtonElement_put_disabled(button, b); - ok_(__FILE__,line) (hres == S_OK, "put_disabled failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "put_disabled failed: %08lx\n", hres); IHTMLButtonElement_Release(button); _test_button_get_disabled(line, elem, b); @@ -7487,7 +7487,7 @@ static void _test_button_type(unsigned line, IHTMLElement *elem, const WCHAR *ex HRESULT hres; hres = IHTMLButtonElement_get_type(button, &str); - ok_(__FILE__,line)(hres == S_OK, "get_type failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_type failed: %08lx\n", hres); ok_(__FILE__,line)(!lstrcmpW(str, extype), "type = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(extype)); SysFreeString(str); @@ -7502,7 +7502,7 @@ static void _test_button_value(unsigned line, IHTMLElement *elem, const WCHAR *e HRESULT hres; hres = IHTMLButtonElement_get_value(button, &str); - ok_(__FILE__,line)(hres == S_OK, "get_value failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_value failed: %08lx\n", hres); if(exvalue) ok_(__FILE__,line)(!lstrcmpW(str, exvalue), "value = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(exvalue)); else @@ -7520,7 +7520,7 @@ static void _set_button_value(unsigned line, IHTMLElement *elem, const WCHAR *va HRESULT hres; hres = IHTMLButtonElement_put_value(button, str); - ok_(__FILE__,line)(hres == S_OK, "put_value failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_value failed: %08lx\n", hres); IHTMLButtonElement_Release(button); SysFreeString(str); @@ -7535,7 +7535,7 @@ static IHTMLFormElement *_get_button_form(unsigned line, IHTMLElement *elem) HRESULT hres; hres = IHTMLButtonElement_get_form(button, &form); - ok_(__FILE__,line)(hres == S_OK, "get_form failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_form failed: %08lx\n", hres); IHTMLButtonElement_Release(button); return form; @@ -7568,17 +7568,17 @@ static void _test_tr_possess(unsigned line, IHTMLElement *elem, VARIANT var; hres = IHTMLTableRow_get_cells(row, &col); - ok_(__FILE__, line)(hres == S_OK, "get_cells failed: %08x\n", hres); + ok_(__FILE__, line)(hres == S_OK, "get_cells failed: %08lx\n", hres); ok_(__FILE__, line)(col != NULL, "get_cells returned NULL\n"); hres = IHTMLElementCollection_get_length(col, &lval); - ok_(__FILE__, line)(hres == S_OK, "get length failed: %08x\n", hres); - ok_(__FILE__, line)(lval == len, "expected len = %d, got %d\n", len, lval); + ok_(__FILE__, line)(hres == S_OK, "get length failed: %08lx\n", hres); + ok_(__FILE__, line)(lval == len, "expected len = %ld, got %ld\n", len, lval); V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(id); hres = IHTMLElementCollection_tags(col, var, &disp); - ok_(__FILE__, line)(hres == S_OK, "search by tags(%s) failed: %08x\n", wine_dbgstr_w(id), hres); + ok_(__FILE__, line)(hres == S_OK, "search by tags(%s) failed: %08lx\n", wine_dbgstr_w(id), hres); ok_(__FILE__, line)(disp != NULL, "disp == NULL\n"); VariantClear(&var); @@ -7593,14 +7593,14 @@ static void test_tr_modify(IHTMLElement *elem, IHTMLTableRow *row) IHTMLTableCell *cell; hres = IHTMLTableRow_deleteCell(row, 0); - ok(hres == S_OK, "deleteCell failed: %08x\n", hres); + ok(hres == S_OK, "deleteCell failed: %08lx\n", hres); test_tr_possess(elem, row, 1, L"td2"); hres = IHTMLTableRow_insertCell(row, 0, &disp); - ok(hres == S_OK, "insertCell failed: %08x\n", hres); + ok(hres == S_OK, "insertCell failed: %08lx\n", hres); ok(disp != NULL, "disp == NULL\n"); hres = IDispatch_QueryInterface(disp, &IID_IHTMLTableCell, (void **)&cell); - ok(hres == S_OK, "Could not get IID_IHTMLTableCell interface: %08x\n", hres); + ok(hres == S_OK, "Could not get IID_IHTMLTableCell interface: %08lx\n", hres); ok(cell != NULL, "cell == NULL\n"); if (SUCCEEDED(hres)) IHTMLTableCell_Release(cell); @@ -7620,13 +7620,13 @@ static void test_tr_elem(IHTMLElement *elem) static const elem_type_t cell_types[] = {ET_TD,ET_TD}; hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLTableRow, (void**)&row); - ok(hres == S_OK, "Could not get IHTMLTableRow iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLTableRow iface: %08lx\n", hres); if(FAILED(hres)) return; col = NULL; hres = IHTMLTableRow_get_cells(row, &col); - ok(hres == S_OK, "get_cells failed: %08x\n", hres); + ok(hres == S_OK, "get_cells failed: %08lx\n", hres); ok(col != NULL, "get_cells returned NULL\n"); test_elem_collection((IUnknown*)col, cell_types, ARRAY_SIZE(cell_types)); @@ -7634,51 +7634,51 @@ static void test_tr_elem(IHTMLElement *elem) bstr = SysAllocString(L"left"); hres = IHTMLTableRow_put_align(row, bstr); - ok(hres == S_OK, "set_align failed: %08x\n", hres); + ok(hres == S_OK, "set_align failed: %08lx\n", hres); SysFreeString(bstr); bstr = NULL; hres = IHTMLTableRow_get_align(row, &bstr); - ok(hres == S_OK, "get_align failed: %08x\n", hres); + ok(hres == S_OK, "get_align failed: %08lx\n", hres); ok(bstr != NULL, "get_align returned NULL\n"); ok(!lstrcmpW(bstr, L"left"), "get_align returned %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); bstr = SysAllocString(L"top"); hres = IHTMLTableRow_put_vAlign(row, bstr); - ok(hres == S_OK, "set_valign failed: %08x\n", hres); + ok(hres == S_OK, "set_valign failed: %08lx\n", hres); SysFreeString(bstr); bstr = NULL; hres = IHTMLTableRow_get_vAlign(row, &bstr); - ok(hres == S_OK, "get_valign failed: %08x\n", hres); + ok(hres == S_OK, "get_valign failed: %08lx\n", hres); ok(bstr != NULL, "get_valign returned NULL\n"); ok(!lstrcmpW(bstr, L"top"), "get_valign returned %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); lval = 0xdeadbeef; hres = IHTMLTableRow_get_rowIndex(row, &lval); - ok(hres == S_OK, "get_rowIndex failed: %08x\n", hres); - ok(lval == 1, "get_rowIndex returned %d\n", lval); + ok(hres == S_OK, "get_rowIndex failed: %08lx\n", hres); + ok(lval == 1, "get_rowIndex returned %ld\n", lval); lval = 0xdeadbeef; hres = IHTMLTableRow_get_sectionRowIndex(row, &lval); - ok(hres == S_OK, "get_sectionRowIndex failed: %08x\n", hres); - ok(lval == 1, "get_sectionRowIndex returned %d\n", lval); + ok(hres == S_OK, "get_sectionRowIndex failed: %08lx\n", hres); + ok(lval == 1, "get_sectionRowIndex returned %ld\n", lval); hres = IHTMLTableRow_get_bgColor(row, &vDefaultbg); - ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(hres == S_OK, "get_bgColor failed: %08lx\n", hres); ok(V_VT(&vDefaultbg) == VT_BSTR, "bstr != NULL\n"); ok(!V_BSTR(&vDefaultbg), "V_BSTR(bgColor) = %s\n", wine_dbgstr_w(V_BSTR(&vDefaultbg))); V_VT(&vbg) = VT_BSTR; V_BSTR(&vbg) = SysAllocString(L"red"); hres = IHTMLTableRow_put_bgColor(row, vbg); - ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); + ok(hres == S_OK, "put_bgColor failed: %08lx\n", hres); VariantClear(&vbg); hres = IHTMLTableRow_get_bgColor(row, &vbg); - ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(hres == S_OK, "get_bgColor failed: %08lx\n", hres); ok(V_VT(&vbg) == VT_BSTR, "V_VT(&vbg) != VT_BSTR\n"); ok(!lstrcmpW(V_BSTR(&vbg), L"#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); VariantClear(&vbg); @@ -7686,18 +7686,18 @@ static void test_tr_elem(IHTMLElement *elem) V_VT(&vbg) = VT_I4; V_I4(&vbg) = 0xff0000; hres = IHTMLTableRow_put_bgColor(row, vbg); - ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); + ok(hres == S_OK, "put_bgColor failed: %08lx\n", hres); VariantClear(&vbg); hres = IHTMLTableRow_get_bgColor(row, &vbg); - ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(hres == S_OK, "get_bgColor failed: %08lx\n", hres); ok(V_VT(&vbg) == VT_BSTR, "V_VT(&vbg) != VT_BSTR\n"); ok(!lstrcmpW(V_BSTR(&vbg), L"#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); VariantClear(&vbg); /* Restore Original */ hres = IHTMLTableRow_put_bgColor(row, vDefaultbg); - ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); + ok(hres == S_OK, "put_bgColor failed: %08lx\n", hres); VariantClear(&vDefaultbg); test_tr_modify(elem, row); @@ -7723,22 +7723,22 @@ static void test_td_elem(IHTMLDocument2 *doc, IHTMLElement *div) elem = get_doc_elem_by_id(doc, L"td1"); hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLTableCell, (void**)&cell); - ok(hres == S_OK, "Could not get IHTMLTableRow iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLTableRow iface: %08lx\n", hres); IHTMLElement_Release(elem); lval = 0xdeadbeef; hres = IHTMLTableCell_get_cellIndex(cell, &lval); - ok(hres == S_OK, "get cellIndex failed: %08x\n", hres); - ok(!lval, "Expected 0, got %d\n", lval); + ok(hres == S_OK, "get cellIndex failed: %08lx\n", hres); + ok(!lval, "Expected 0, got %ld\n", lval); str = SysAllocString(L"left"); hres = IHTMLTableCell_put_align(cell, str); - ok(hres == S_OK, "put_align failed: %08x\n", hres); + ok(hres == S_OK, "put_align failed: %08lx\n", hres); SysFreeString(str); str = NULL; hres = IHTMLTableCell_get_align(cell, &str); - ok(hres == S_OK, "get_align failed: %08x\n", hres); + ok(hres == S_OK, "get_align failed: %08lx\n", hres); ok(str != NULL, "str is NULL\n"); if (str != NULL && hres == S_OK) { ok(!lstrcmpW(str, L"left"), "got %s\n", wine_dbgstr_w(str)); @@ -7746,18 +7746,18 @@ static void test_td_elem(IHTMLDocument2 *doc, IHTMLElement *div) } hres = IHTMLTableCell_get_bgColor(cell, &vDefaultbg); - ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(hres == S_OK, "get_bgColor failed: %08lx\n", hres); ok(V_VT(&vDefaultbg) == VT_BSTR, "bstr != NULL\n"); ok(!V_BSTR(&vDefaultbg), "V_BSTR(bgColor) = %s\n", wine_dbgstr_w(V_BSTR(&vDefaultbg))); V_VT(&vbg) = VT_BSTR; V_BSTR(&vbg) = SysAllocString(L"red"); hres = IHTMLTableCell_put_bgColor(cell, vbg); - ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); + ok(hres == S_OK, "put_bgColor failed: %08lx\n", hres); VariantClear(&vbg); hres = IHTMLTableCell_get_bgColor(cell, &vbg); - ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(hres == S_OK, "get_bgColor failed: %08lx\n", hres); ok(V_VT(&vbg) == VT_BSTR, "V_VT(&vbg) != VT_BSTR\n"); ok(!lstrcmpW(V_BSTR(&vbg), L"#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); VariantClear(&vbg); @@ -7765,11 +7765,11 @@ static void test_td_elem(IHTMLDocument2 *doc, IHTMLElement *div) V_VT(&vbg) = VT_I4; V_I4(&vbg) = 0xff0000; hres = IHTMLTableCell_put_bgColor(cell, vbg); - ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); + ok(hres == S_OK, "put_bgColor failed: %08lx\n", hres); VariantClear(&vbg); hres = IHTMLTableCell_get_bgColor(cell, &vbg); - ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(hres == S_OK, "get_bgColor failed: %08lx\n", hres); ok(V_VT(&vbg) == VT_BSTR, "V_VT(&vbg) != VT_BSTR\n"); ok(!lstrcmpW(V_BSTR(&vbg), L"#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); VariantClear(&vbg); @@ -7777,87 +7777,87 @@ static void test_td_elem(IHTMLDocument2 *doc, IHTMLElement *div) V_VT(&v) = VT_I4; V_I4(&v) = 100; hres = IHTMLTableCell_put_height(cell, v); - ok(hres == S_OK, "put_height failed: %08x\n", hres); + ok(hres == S_OK, "put_height failed: %08lx\n", hres); V_VT(&v) = VT_EMPTY; hres = IHTMLTableCell_get_height(cell, &v); - ok(hres == S_OK, "get_height failed: %08x\n", hres); + ok(hres == S_OK, "get_height failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR && !lstrcmpW(V_BSTR(&v), L"100"), "height = %s\n", wine_dbgstr_variant(&v)); VariantClear(&v); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"110px"); hres = IHTMLTableCell_put_height(cell, v); - ok(hres == S_OK, "put_height failed: %08x\n", hres); + ok(hres == S_OK, "put_height failed: %08lx\n", hres); SysFreeString(V_BSTR(&v)); V_VT(&v) = VT_EMPTY; hres = IHTMLTableCell_get_height(cell, &v); - ok(hres == S_OK, "get_height failed: %08x\n", hres); + ok(hres == S_OK, "get_height failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR && !lstrcmpW(V_BSTR(&v), L"110"), "height = %s\n", wine_dbgstr_variant(&v)); VariantClear(&v); V_VT(&v) = VT_I4; V_I4(&v) = 200; hres = IHTMLTableCell_put_width(cell, v); - ok(hres == S_OK, "put_width failed: %08x\n", hres); + ok(hres == S_OK, "put_width failed: %08lx\n", hres); V_VT(&v) = VT_EMPTY; hres = IHTMLTableCell_get_width(cell, &v); - ok(hres == S_OK, "get_width failed: %08x\n", hres); + ok(hres == S_OK, "get_width failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR && !lstrcmpW(V_BSTR(&v), L"200"), "width = %s\n", wine_dbgstr_variant(&v)); VariantClear(&v); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"210px"); hres = IHTMLTableCell_put_width(cell, v); - ok(hres == S_OK, "put_width failed: %08x\n", hres); + ok(hres == S_OK, "put_width failed: %08lx\n", hres); SysFreeString(V_BSTR(&v)); V_VT(&v) = VT_EMPTY; hres = IHTMLTableCell_get_width(cell, &v); - ok(hres == S_OK, "get_width failed: %08x\n", hres); + ok(hres == S_OK, "get_width failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR && !lstrcmpW(V_BSTR(&v), L"210"), "width = %s\n", wine_dbgstr_variant(&v)); VariantClear(&v); /* Restore Original */ hres = IHTMLTableCell_put_bgColor(cell, vDefaultbg); - ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); + ok(hres == S_OK, "put_bgColor failed: %08lx\n", hres); VariantClear(&vDefaultbg); hres = IHTMLTableCell_get_rowSpan(cell, &lval); - ok(hres == S_OK, "get_rowSpan failed: %08x\n", hres); - ok(lval == 1, "rowSpan = %d\n", lval); + ok(hres == S_OK, "get_rowSpan failed: %08lx\n", hres); + ok(lval == 1, "rowSpan = %ld\n", lval); hres = IHTMLTableCell_put_rowSpan(cell, -1); - ok(hres == E_INVALIDARG, "put_rowSpan failed: %08x\n", hres); + ok(hres == E_INVALIDARG, "put_rowSpan failed: %08lx\n", hres); hres = IHTMLTableCell_put_rowSpan(cell, 0); - ok(hres == E_INVALIDARG, "put_rowSpan failed: %08x\n", hres); + ok(hres == E_INVALIDARG, "put_rowSpan failed: %08lx\n", hres); hres = IHTMLTableCell_put_rowSpan(cell, 2); - ok(hres == S_OK, "put_rowSpan failed: %08x\n", hres); + ok(hres == S_OK, "put_rowSpan failed: %08lx\n", hres); hres = IHTMLTableCell_get_rowSpan(cell, &lval); - ok(hres == S_OK, "get_rowSpan failed: %08x\n", hres); - ok(lval == 2, "rowSpan = %d\n", lval); + ok(hres == S_OK, "get_rowSpan failed: %08lx\n", hres); + ok(lval == 2, "rowSpan = %ld\n", lval); hres = IHTMLTableCell_get_colSpan(cell, &lval); - ok(hres == S_OK, "get_rowSpan failed: %08x\n", hres); - ok(lval == 1, "rowSpan = %d\n", lval); + ok(hres == S_OK, "get_rowSpan failed: %08lx\n", hres); + ok(lval == 1, "rowSpan = %ld\n", lval); hres = IHTMLTableCell_put_colSpan(cell, -1); - ok(hres == E_INVALIDARG, "put_rowSpan failed: %08x\n", hres); + ok(hres == E_INVALIDARG, "put_rowSpan failed: %08lx\n", hres); hres = IHTMLTableCell_put_colSpan(cell, 0); - ok(hres == E_INVALIDARG, "put_rowSpan failed: %08x\n", hres); + ok(hres == E_INVALIDARG, "put_rowSpan failed: %08lx\n", hres); hres = IHTMLTableCell_put_colSpan(cell, 2); - ok(hres == S_OK, "put_rowSpan failed: %08x\n", hres); + ok(hres == S_OK, "put_rowSpan failed: %08lx\n", hres); hres = IHTMLTableCell_get_colSpan(cell, &lval); - ok(hres == S_OK, "get_rowSpan failed: %08x\n", hres); - ok(lval == 2, "rowSpan = %d\n", lval); + ok(hres == S_OK, "get_rowSpan failed: %08lx\n", hres); + ok(lval == 2, "rowSpan = %ld\n", lval); IHTMLTableCell_Release(cell); } @@ -7872,29 +7872,29 @@ static void test_label_elem(IHTMLElement *elem) str = NULL; hres = IHTMLLabelElement_get_htmlFor(label, &str); - ok(hres == S_OK, "get_htmlFor failed: %08x\n", hres); + ok(hres == S_OK, "get_htmlFor failed: %08lx\n", hres); ok(!lstrcmpW(str, L"in"), "htmlFor = %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = SysAllocString(L""); hres = IHTMLLabelElement_put_htmlFor(label, str); - ok(hres == S_OK, "put_htmlFor failed: %08x\n", hres); + ok(hres == S_OK, "put_htmlFor failed: %08lx\n", hres); SysFreeString(str); str = (void*)0xdeadbeef; hres = IHTMLLabelElement_get_htmlFor(label, &str); - ok(hres == S_OK, "get_htmlFor failed: %08x\n", hres); + ok(hres == S_OK, "get_htmlFor failed: %08lx\n", hres); ok(!lstrcmpW(str, L""), "htmlFor = %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = SysAllocString(L"abc"); hres = IHTMLLabelElement_put_htmlFor(label, str); - ok(hres == S_OK, "put_htmlFor failed: %08x\n", hres); + ok(hres == S_OK, "put_htmlFor failed: %08lx\n", hres); SysFreeString(str); str = NULL; hres = IHTMLLabelElement_get_htmlFor(label, &str); - ok(hres == S_OK, "get_htmlFor failed: %08x\n", hres); + ok(hres == S_OK, "get_htmlFor failed: %08lx\n", hres); ok(!lstrcmpW(str, L"abc"), "htmlFor = %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -7909,7 +7909,7 @@ static void _test_table_cell_spacing(unsigned line, IHTMLTable *table, const WCH V_VT(&v) = VT_ERROR; hres = IHTMLTable_get_cellSpacing(table, &v); - ok_(__FILE__,line)(hres == S_OK, "get_cellSpacing failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_cellSpacing failed: %08lx\n", hres); ok_(__FILE__,line)(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); if(exstr) ok_(__FILE__,line)(!lstrcmpW(V_BSTR(&v), exstr), "cellSpacing = %s, expected %s\n", wine_dbgstr_w(V_BSTR(&v)), wine_dbgstr_w(exstr)); @@ -7926,7 +7926,7 @@ static void _test_table_cell_padding(unsigned line, IHTMLTable *table, const WCH V_VT(&v) = VT_ERROR; hres = IHTMLTable_get_cellPadding(table, &v); - ok_(__FILE__,line)(hres == S_OK, "get_cellPadding failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_cellPadding failed: %08lx\n", hres); ok_(__FILE__,line)(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); if(exstr) ok_(__FILE__,line)(!lstrcmpW(V_BSTR(&v), exstr), "cellPadding = %s, expected %s\n", wine_dbgstr_w(V_BSTR(&v)), wine_dbgstr_w(exstr)); @@ -7945,7 +7945,7 @@ static void test_table_modify(IHTMLTable *table) test_table_length(table, 2); hres = IHTMLTable_insertRow(table, 0, &disp); - ok(hres == S_OK, "insertRow failed: %08x\n", hres); + ok(hres == S_OK, "insertRow failed: %08lx\n", hres); ok(disp != NULL, "disp == NULL\n"); test_table_length(table, 3); if (hres != S_OK || disp == NULL) @@ -7954,18 +7954,18 @@ static void test_table_modify(IHTMLTable *table) hres = IDispatch_QueryInterface(disp, &IID_IHTMLTableRow, (void**)&row); IDispatch_Release(disp); - ok(hres == S_OK, "QueryInterface failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface failed: %08lx\n", hres); ok(row != NULL, "row == NULL\n"); index = 0xdeadbeef; hres = IHTMLTableRow_get_rowIndex(row, &index); - ok(hres == S_OK, "get_rowIndex failed: %08x\n", hres); - ok(index == 0, "index = %d, expected 0\n", index); + ok(hres == S_OK, "get_rowIndex failed: %08lx\n", hres); + ok(index == 0, "index = %ld, expected 0\n", index); IHTMLTableRow_Release(row); hres = IHTMLTable_deleteRow(table, 0); - ok(hres == S_OK, "deleteRow failed: %08x\n", hres); + ok(hres == S_OK, "deleteRow failed: %08lx\n", hres); test_table_length(table, 2); } @@ -7985,18 +7985,18 @@ static void test_table_elem(IHTMLElement *elem) static const elem_type_t tbodies_types[] = {ET_TBODY}; hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLTable, (void**)&table); - ok(hres == S_OK, "Could not get IHTMLTable iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLTable iface: %08lx\n", hres); if(FAILED(hres)) return; hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLTable3, (void**)&table3); - ok(hres == S_OK, "Could not get IHTMLTable3 iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLTable3 iface: %08lx\n", hres); if(FAILED(hres)) return; col = NULL; hres = IHTMLTable_get_rows(table, &col); - ok(hres == S_OK, "get_rows failed: %08x\n", hres); + ok(hres == S_OK, "get_rows failed: %08lx\n", hres); ok(col != NULL, "get_rows returned NULL\n"); test_elem_collection((IUnknown*)col, row_types, ARRAY_SIZE(row_types)); @@ -8016,7 +8016,7 @@ static void test_table_elem(IHTMLElement *elem) col = NULL; hres = IHTMLTable_get_tBodies(table, &col); - ok(hres == S_OK, "get_tBodies failed: %08x\n", hres); + ok(hres == S_OK, "get_tBodies failed: %08lx\n", hres); ok(col != NULL, "get_tBodies returned NULL\n"); test_elem_collection((IUnknown*)col, tbodies_types, ARRAY_SIZE(tbodies_types)); @@ -8027,13 +8027,13 @@ static void test_table_elem(IHTMLElement *elem) V_VT(&v) = VT_I4; V_I4(&v) = 10; hres = IHTMLTable_put_cellSpacing(table, v); - ok(hres == S_OK, "put_cellSpacing = %08x\n", hres); + ok(hres == S_OK, "put_cellSpacing = %08lx\n", hres); test_table_cell_spacing(table, L"10"); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"11"); hres = IHTMLTable_put_cellSpacing(table, v); - ok(hres == S_OK, "put_cellSpacing = %08x\n", hres); + ok(hres == S_OK, "put_cellSpacing = %08lx\n", hres); test_table_cell_spacing(table, L"11"); VariantClear(&v); @@ -8042,47 +8042,47 @@ static void test_table_elem(IHTMLElement *elem) V_VT(&v) = VT_I4; V_I4(&v) = 10; hres = IHTMLTable_put_cellPadding(table, v); - ok(hres == S_OK, "put_cellPadding = %08x\n", hres); + ok(hres == S_OK, "put_cellPadding = %08lx\n", hres); test_table_cell_padding(table, L"10"); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"11"); hres = IHTMLTable_put_cellPadding(table, v); - ok(hres == S_OK, "put_cellPadding = %08x\n", hres); + ok(hres == S_OK, "put_cellPadding = %08lx\n", hres); test_table_cell_padding(table, L"11"); VariantClear(&v); V_VT(&v) = VT_R8; V_R8(&v) = 5; hres = IHTMLTable_put_cellPadding(table, v); - ok(hres == S_OK, "put_cellPadding = %08x\n", hres); + ok(hres == S_OK, "put_cellPadding = %08lx\n", hres); test_table_cell_padding(table, L"5"); bstr = SysAllocString(L"left"); hres = IHTMLTable_put_align(table, bstr); - ok(hres == S_OK, "set_align failed: %08x\n", hres); + ok(hres == S_OK, "set_align failed: %08lx\n", hres); SysFreeString(bstr); bstr = NULL; hres = IHTMLTable_get_align(table, &bstr); - ok(hres == S_OK, "get_align failed: %08x\n", hres); + ok(hres == S_OK, "get_align failed: %08lx\n", hres); ok(bstr != NULL, "get_align returned NULL\n"); ok(!lstrcmpW(bstr, L"left"), "get_align returned %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); hres = IHTMLTable_get_bgColor(table, &vDefaultbg); - ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(hres == S_OK, "get_bgColor failed: %08lx\n", hres); ok(V_VT(&vDefaultbg) == VT_BSTR, "bstr != NULL\n"); ok(!V_BSTR(&vDefaultbg), "V_BSTR(bgColor) = %s\n", wine_dbgstr_w(V_BSTR(&vDefaultbg))); V_VT(&vbg) = VT_BSTR; V_BSTR(&vbg) = SysAllocString(L"red"); hres = IHTMLTable_put_bgColor(table, vbg); - ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); + ok(hres == S_OK, "put_bgColor failed: %08lx\n", hres); VariantClear(&vbg); hres = IHTMLTable_get_bgColor(table, &vbg); - ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(hres == S_OK, "get_bgColor failed: %08lx\n", hres); ok(V_VT(&vbg) == VT_BSTR, "V_VT(&vbg) != VT_BSTR\n"); ok(!lstrcmpW(V_BSTR(&vbg), L"#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); VariantClear(&vbg); @@ -8090,95 +8090,95 @@ static void test_table_elem(IHTMLElement *elem) V_VT(&vbg) = VT_I4; V_I4(&vbg) = 0xff0000; hres = IHTMLTable_put_bgColor(table, vbg); - ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); + ok(hres == S_OK, "put_bgColor failed: %08lx\n", hres); VariantClear(&vbg); hres = IHTMLTable_get_bgColor(table, &vbg); - ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(hres == S_OK, "get_bgColor failed: %08lx\n", hres); ok(V_VT(&vbg) == VT_BSTR, "V_VT(&vbg) != VT_BSTR\n"); ok(!lstrcmpW(V_BSTR(&vbg), L"#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); VariantClear(&vbg); /* Restore Original */ hres = IHTMLTable_put_bgColor(table, vDefaultbg); - ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); + ok(hres == S_OK, "put_bgColor failed: %08lx\n", hres); VariantClear(&vDefaultbg); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"12px"); hres = IHTMLTable_put_width(table, v); - ok(hres == S_OK, "put_width = %08x\n", hres); + ok(hres == S_OK, "put_width = %08lx\n", hres); VariantClear(&v); hres = IHTMLTable_get_width(table, &v); - ok(hres == S_OK, "get_width = %08x\n", hres); + ok(hres == S_OK, "get_width = %08lx\n", hres); ok(!lstrcmpW(V_BSTR(&v), L"12"), "Expected 12, got %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"11"); hres = IHTMLTable_put_width(table, v); - ok(hres == S_OK, "put_width = %08x\n", hres); + ok(hres == S_OK, "put_width = %08lx\n", hres); VariantClear(&v); hres = IHTMLTable_get_width(table, &v); - ok(hres == S_OK, "get_width = %08x\n", hres); + ok(hres == S_OK, "get_width = %08lx\n", hres); ok(!lstrcmpW(V_BSTR(&v), L"11"), "Expected 11, got %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"11.9"); hres = IHTMLTable_put_width(table, v); - ok(hres == S_OK, "put_width = %08x\n", hres); + ok(hres == S_OK, "put_width = %08lx\n", hres); VariantClear(&v); hres = IHTMLTable_get_width(table, &v); - ok(hres == S_OK, "get_width = %08x\n", hres); + ok(hres == S_OK, "get_width = %08lx\n", hres); ok(!lstrcmpW(V_BSTR(&v), L"11"), "Expected 11, got %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"40.2%"); hres = IHTMLTable_put_width(table, v); - ok(hres == S_OK, "put_width = %08x\n", hres); + ok(hres == S_OK, "put_width = %08lx\n", hres); VariantClear(&v); hres = IHTMLTable_get_width(table, &v); - ok(hres == S_OK, "get_width = %08x\n", hres); + ok(hres == S_OK, "get_width = %08lx\n", hres); ok(!lstrcmpW(V_BSTR(&v), L"40.2%"), "Expected 40.2%%, got %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); V_VT(&v) = VT_I4; V_I4(&v) = 11; hres = IHTMLTable_put_width(table, v); - ok(hres == S_OK, "put_width = %08x\n", hres); + ok(hres == S_OK, "put_width = %08lx\n", hres); hres = IHTMLTable_get_width(table, &v); - ok(hres == S_OK, "get_width = %08x\n", hres); + ok(hres == S_OK, "get_width = %08lx\n", hres); ok(!lstrcmpW(V_BSTR(&v), L"11"), "Expected 11, got %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); V_VT(&v) = VT_R8; V_R8(&v) = 11.9; hres = IHTMLTable_put_width(table, v); - ok(hres == S_OK, "put_width = %08x\n", hres); + ok(hres == S_OK, "put_width = %08lx\n", hres); hres = IHTMLTable_get_width(table, &v); - ok(hres == S_OK, "get_width = %08x\n", hres); + ok(hres == S_OK, "get_width = %08lx\n", hres); ok(!lstrcmpW(V_BSTR(&v), L"11"), "Expected 11, got %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); bstr = SysAllocString(L"box"); hres = IHTMLTable_put_frame(table, bstr); - ok(hres == S_OK, "put_frame = %08x\n", hres); + ok(hres == S_OK, "put_frame = %08lx\n", hres); SysFreeString(bstr); hres = IHTMLTable_get_frame(table, &bstr); - ok(hres == S_OK, "get_frame = %08x\n", hres); + ok(hres == S_OK, "get_frame = %08lx\n", hres); ok(!lstrcmpW(bstr, L"box"), "Expected box, got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); test_table_modify(table); bstr = SysAllocString(L"summary"); hres = IHTMLTable3_put_summary(table3, bstr); - ok(hres == S_OK, "put_summary = %08x\n", hres); + ok(hres == S_OK, "put_summary = %08lx\n", hres); SysFreeString(bstr); hres = IHTMLTable3_get_summary(table3, &bstr); - ok(hres == S_OK, "get_summary = %08x\n", hres); + ok(hres == S_OK, "get_summary = %08lx\n", hres); ok(!lstrcmpW(bstr, L"summary"), "Expected summary, got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); @@ -8197,7 +8197,7 @@ static void doc_write(IHTMLDocument2 *doc, BOOL ln, const WCHAR *text) dim.cElements = 1; sa = SafeArrayCreate(VT_VARIANT, 1, &dim); hres = SafeArrayAccessData(sa, (void**)&var); - ok(hres == S_OK, "Failed to access array data: %08x\n", hres); + ok(hres == S_OK, "Failed to access array data: %08lx\n", hres); V_VT(var) = VT_BSTR; V_BSTR(var) = SysAllocString(text); SafeArrayUnaccessData(sa); @@ -8206,7 +8206,7 @@ static void doc_write(IHTMLDocument2 *doc, BOOL ln, const WCHAR *text) hres = IHTMLDocument2_writeln(doc, sa); else hres = IHTMLDocument2_write(doc, sa); - ok(hres == S_OK, "write failed: %08x\n", hres); + ok(hres == S_OK, "write failed: %08lx\n", hres); SafeArrayDestroy(sa); } @@ -8220,7 +8220,7 @@ static void doc_complex_write(IHTMLDocument2 *doc) sa = SafeArrayCreate(VT_VARIANT, 1, &dim); hres = SafeArrayAccessData(sa, (void**)&args); - ok(hres == S_OK, "Failed to access array data: %08x\n", hres); + ok(hres == S_OK, "Failed to access array data: %08lx\n", hres); V_VT(args) = VT_BSTR; V_BSTR(args) = SysAllocString(L"<body i4val=\""); @@ -8235,7 +8235,7 @@ static void doc_complex_write(IHTMLDocument2 *doc) SafeArrayUnaccessData(sa); hres = IHTMLDocument2_write(doc, sa); - ok(hres == S_OK, "write failed: %08x\n", hres); + ok(hres == S_OK, "write failed: %08lx\n", hres); SafeArrayDestroy(sa); } @@ -8261,7 +8261,7 @@ static void test_frame_doc(IUnknown *frame_elem, BOOL iframe) IDispatch *disp = NULL; hres = IHTMLFrameElement3_get_contentDocument(frame_elem3, &disp); - ok(hres == S_OK, "get_contentDocument failed: %08x\n", hres); + ok(hres == S_OK, "get_contentDocument failed: %08lx\n", hres); ok(disp != NULL, "contentDocument == NULL\n"); ok(iface_cmp((IUnknown*)disp, (IUnknown*)window_doc), "contentDocument != contentWindow.document\n"); @@ -8284,7 +8284,7 @@ static void _test_iframe_height(unsigned line, IHTMLElement *elem, const WCHAR * HRESULT hres; hres = IHTMLIFrameElement2_get_height(iframe, &v); - ok_(__FILE__,line)(hres == S_OK, "get_height failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_height failed: %08lx\n", hres); ok_(__FILE__,line)(V_VT(&v) == VT_BSTR, "V_VT(height) = %d\n", V_VT(&v)); if(exval) ok_(__FILE__,line)(!lstrcmpW(V_BSTR(&v), exval), "height = %s\n", wine_dbgstr_w(V_BSTR(&v))); @@ -8304,7 +8304,7 @@ static void _set_iframe_height(unsigned line, IHTMLElement *elem, const WCHAR *v V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(val); hres = IHTMLIFrameElement2_put_height(iframe, v); - ok_(__FILE__,line)(hres == S_OK, "put_height failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_height failed: %08lx\n", hres); VariantClear(&v); IHTMLIFrameElement2_Release(iframe); } @@ -8317,7 +8317,7 @@ static void _test_iframe_width(unsigned line, IHTMLElement *elem, const WCHAR *e HRESULT hres; hres = IHTMLIFrameElement2_get_width(iframe, &v); - ok_(__FILE__,line)(hres == S_OK, "get_width failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_width failed: %08lx\n", hres); ok_(__FILE__,line)(V_VT(&v) == VT_BSTR, "V_VT(width) = %d\n", V_VT(&v)); if(exval) ok_(__FILE__,line)(!lstrcmpW(V_BSTR(&v), exval), "width = %s\n", wine_dbgstr_w(V_BSTR(&v))); @@ -8337,7 +8337,7 @@ static void _set_iframe_width(unsigned line, IHTMLElement *elem, const WCHAR *va V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(val); hres = IHTMLIFrameElement2_put_width(iframe, v); - ok_(__FILE__,line)(hres == S_OK, "put_width failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_width failed: %08lx\n", hres); VariantClear(&v); IHTMLIFrameElement2_Release(iframe); } @@ -8376,7 +8376,7 @@ static void test_iframe_elem(IHTMLElement *elem) hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLIFrameElement3, (void**)&iframe3); if(SUCCEEDED(hres)) { hres = IHTMLIFrameElement3_get_contentDocument(iframe3, &disp); - ok(hres == S_OK, "get_contentDocument failed: %08x\n", hres); + ok(hres == S_OK, "get_contentDocument failed: %08lx\n", hres); ok(iface_cmp((IUnknown*)content_doc, (IUnknown*)disp), "content_doc != disp\n"); IDispatch_Release(disp); @@ -8395,7 +8395,7 @@ static void test_iframe_elem(IHTMLElement *elem) V_VT(&v) = VT_I4; V_I4(&v) = 100; hres = IHTMLIFrameElement2_put_height(iframe2, v); - ok(hres == S_OK, "put_height failed: %08x\n", hres); + ok(hres == S_OK, "put_height failed: %08lx\n", hres); test_iframe_height(elem, L"100"); test_iframe_width(elem, NULL); @@ -8407,7 +8407,7 @@ static void test_iframe_elem(IHTMLElement *elem) V_VT(&v) = VT_I4; V_I4(&v) = 110; hres = IHTMLIFrameElement2_put_width(iframe2, v); - ok(hres == S_OK, "put_height failed: %08x\n", hres); + ok(hres == S_OK, "put_height failed: %08lx\n", hres); test_iframe_width(elem, L"110"); str = SysAllocString(L"text/html"); @@ -8415,7 +8415,7 @@ static void test_iframe_elem(IHTMLElement *elem) disp = NULL; hres = IHTMLDocument2_open(content_doc, str, errv, errv, errv, &disp); SysFreeString(str); - ok(hres == S_OK, "open failed: %08x\n", hres); + ok(hres == S_OK, "open failed: %08lx\n", hres); ok(disp != NULL, "disp == NULL\n"); ok(iface_cmp((IUnknown*)disp, (IUnknown*)content_window), "disp != content_window\n"); IDispatch_Release(disp); @@ -8426,7 +8426,7 @@ static void test_iframe_elem(IHTMLElement *elem) doc_write(content_doc, TRUE, L"</html>"); hres = IHTMLDocument2_get_all(content_doc, &col); - ok(hres == S_OK, "get_all failed: %08x\n", hres); + ok(hres == S_OK, "get_all failed: %08lx\n", hres); test_elem_collection((IUnknown*)col, all_types, ARRAY_SIZE(all_types)); IHTMLElementCollection_Release(col); @@ -8437,7 +8437,7 @@ static void test_iframe_elem(IHTMLElement *elem) IHTMLIFrameElement2_Release(iframe2); hres = IHTMLDocument2_close(content_doc); - ok(hres == S_OK, "close failed: %08x\n", hres); + ok(hres == S_OK, "close failed: %08lx\n", hres); owner_doc = get_owner_doc((IUnknown*)content_doc); ok(!owner_doc, "owner_doc = %p\n", owner_doc); @@ -8456,32 +8456,32 @@ static void test_elem_spellcheck(IHTMLElement *iface) win_skip("IHTMLElement7 not supported\n"); return; } - ok(hres == S_OK, "Could not get IHTMLElement7 interface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLElement7 interface: %08lx\n", hres); V_VT(&v) = VT_ERROR; hres = IHTMLElement7_get_spellcheck(elem, &v); - ok(hres == S_OK, "get_spellcheck failed: %08x\n", hres); + ok(hres == S_OK, "get_spellcheck failed: %08lx\n", hres); ok(V_VT(&v) == VT_BOOL && !V_BOOL(&v), "spellcheck = %s\n", wine_dbgstr_variant(&v)); V_VT(&v) = VT_BOOL; V_BOOL(&v) = VARIANT_TRUE; hres = IHTMLElement7_put_spellcheck(elem, v); - ok(hres == S_OK, "put_spellcheck failed: %08x\n", hres); + ok(hres == S_OK, "put_spellcheck failed: %08lx\n", hres); V_VT(&v) = VT_ERROR; hres = IHTMLElement7_get_spellcheck(elem, &v); - ok(hres == S_OK, "get_spellcheck failed: %08x\n", hres); + ok(hres == S_OK, "get_spellcheck failed: %08lx\n", hres); ok(V_VT(&v) == VT_BOOL && V_BOOL(&v) == VARIANT_TRUE, "spellcheck = %s\n", wine_dbgstr_variant(&v)); V_VT(&v) = VT_BOOL; V_BOOL(&v) = VARIANT_FALSE; hres = IHTMLElement7_put_spellcheck(elem, v); - ok(hres == S_OK, "put_spellcheck failed: %08x\n", hres); + ok(hres == S_OK, "put_spellcheck failed: %08lx\n", hres); V_VT(&v) = VT_ERROR; hres = IHTMLElement7_get_spellcheck(elem, &v); - ok(hres == S_OK, "get_spellcheck failed: %08x\n", hres); + ok(hres == S_OK, "get_spellcheck failed: %08lx\n", hres); ok(V_VT(&v) == VT_BOOL && !V_BOOL(&v), "spellcheck = %s\n", wine_dbgstr_variant(&v)); IHTMLElement7_Release(elem); @@ -8494,7 +8494,7 @@ static void _test_stylesheet_csstext(unsigned line, IHTMLStyleSheet *stylesheet, HRESULT hres; hres = IHTMLStyleSheet_get_cssText(stylesheet, &str); - ok_(__FILE__,line)(hres == S_OK, "get_cssText failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_cssText failed: %08lx\n", hres); todo_wine_if(is_todo) { if(exstr) ok_(__FILE__,line)(str && !wcsncmp(str, exstr, lstrlenW(exstr)), "cssText = %s\n", wine_dbgstr_w(str)); @@ -8513,7 +8513,7 @@ static void _set_stylesheet_csstext(unsigned line, IHTMLStyleSheet *stylesheet, hres = IHTMLStyleSheet_put_cssText(stylesheet, str); todo_wine_if(is_todo) - ok_(__FILE__,line)(hres == S_OK, "put_cssText failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_cssText failed: %08lx\n", hres); SysFreeString(str); } @@ -8528,10 +8528,10 @@ static void test_stylesheet(IDispatch *disp) test_disp2((IUnknown*)disp, &DIID_DispHTMLStyleSheet, &IID_IHTMLStyleSheet, NULL, L"[object]"); hres = IDispatch_QueryInterface(disp, &IID_IHTMLStyleSheet, (void**)&stylesheet); - ok(hres == S_OK, "Could not get IHTMLStyleSheet: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLStyleSheet: %08lx\n", hres); hres = IHTMLStyleSheet_get_rules(stylesheet, &col); - ok(hres == S_OK, "get_rules failed: %08x\n", hres); + ok(hres == S_OK, "get_rules failed: %08lx\n", hres); ok(col != NULL, "col == NULL\n"); test_disp2((IUnknown*)col, &DIID_DispHTMLStyleSheetRulesCollection, &IID_IHTMLStyleSheetRulesCollection, NULL, L"[object]"); @@ -8539,7 +8539,7 @@ static void test_stylesheet(IDispatch *disp) href = (void*)0xdeadbeef; hres = IHTMLStyleSheet_get_href(stylesheet, &href); - ok(hres == S_OK, "get_href failed: %08x\n", hres); + ok(hres == S_OK, "get_href failed: %08lx\n", hres); ok(href == NULL, "got href != NULL\n"); SysFreeString(href); @@ -8552,17 +8552,17 @@ static void test_stylesheet(IDispatch *disp) test_stylesheet_csstext(stylesheet, L".div {", FALSE); hres = IHTMLStyleSheet_get_rules(stylesheet, &col); - ok(hres == S_OK, "get_rules failed: %08x\n", hres); + ok(hres == S_OK, "get_rules failed: %08lx\n", hres); ok(col != NULL, "col == NULL\n"); hres = IHTMLStyleSheetRulesCollection_item(col, 0, &rule); - ok(hres == S_OK, "IHTMLStyleSheetRulesCollection_item failed: %08x\n", hres); + ok(hres == S_OK, "IHTMLStyleSheetRulesCollection_item failed: %08lx\n", hres); ok(rule != NULL, "rule = NULL\n"); test_disp((IUnknown*)rule, &DIID_DispHTMLStyleSheetRule, NULL, L"[object]"); IHTMLStyleSheetRule_Release(rule); hres = IHTMLStyleSheetRulesCollection_item(col, 1, &rule); - ok(hres == E_INVALIDARG, "IHTMLStyleSheetRulesCollection_item failed: %08x\n", hres); + ok(hres == E_INVALIDARG, "IHTMLStyleSheetRulesCollection_item failed: %08lx\n", hres); IHTMLStyleSheetRulesCollection_Release(col); @@ -8577,21 +8577,21 @@ static void test_stylesheets(IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLDocument2_get_styleSheets(doc, &col); - ok(hres == S_OK, "get_styleSheets failed: %08x\n", hres); + ok(hres == S_OK, "get_styleSheets failed: %08lx\n", hres); ok(col != NULL, "col == NULL\n"); test_disp2((IUnknown*)col, &DIID_DispHTMLStyleSheetsCollection, &IID_IHTMLStyleSheetsCollection, NULL, L"[object]"); hres = IHTMLStyleSheetsCollection_get_length(col, &len); - ok(hres == S_OK, "get_length failed: %08x\n", hres); - ok(len == 1, "len=%d\n", len); + ok(hres == S_OK, "get_length failed: %08lx\n", hres); + ok(len == 1, "len=%ld\n", len); VariantInit(&res); V_VT(&idx) = VT_I4; V_I4(&idx) = 0; hres = IHTMLStyleSheetsCollection_item(col, &idx, &res); - ok(hres == S_OK, "item failed: %08x\n", hres); + ok(hres == S_OK, "item failed: %08lx\n", hres); ok(V_VT(&res) == VT_DISPATCH, "V_VT(res) = %d\n", V_VT(&res)); ok(V_DISPATCH(&res) != NULL, "V_DISPATCH(&res) == NULL\n"); test_stylesheet(V_DISPATCH(&res)); @@ -8602,7 +8602,7 @@ static void test_stylesheets(IHTMLDocument2 *doc) V_I4(&idx) = 1; hres = IHTMLStyleSheetsCollection_item(col, &idx, &res); - ok(hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); + ok(hres == E_INVALIDARG, "item failed: %08lx, expected E_INVALIDARG\n", hres); ok(V_VT(&res) == VT_EMPTY, "V_VT(res) = %d\n", V_VT(&res)); VariantClear(&res); @@ -8625,27 +8625,27 @@ static void test_child_col_disp(IHTMLDOMChildrenCollection *col) static const WCHAR w100[] = {'1','0','0',0}; hres = IHTMLDOMChildrenCollection_QueryInterface(col, &IID_IDispatchEx, (void**)&dispex); - ok(hres == S_OK, "Could not get IDispatchEx: %08x\n", hres); + ok(hres == S_OK, "Could not get IDispatchEx: %08lx\n", hres); bstr = SysAllocString(w0); hres = IDispatchEx_GetDispID(dispex, bstr, fdexNameCaseSensitive, &id); - ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + ok(hres == S_OK, "GetDispID failed: %08lx\n", hres); SysFreeString(bstr); VariantInit(&var); hres = IDispatchEx_InvokeEx(dispex, id, LOCALE_NEUTRAL, INVOKE_PROPERTYGET, &dp, &var, &ei, NULL); - ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); ok(V_VT(&var) == VT_DISPATCH, "V_VT(var)=%d\n", V_VT(&var)); ok(V_DISPATCH(&var) != NULL, "V_DISPATCH(var) == NULL\n"); node = get_node_iface((IUnknown*)V_DISPATCH(&var)); type = get_node_type((IUnknown*)node); - ok(type == 3, "type=%d\n", type); + ok(type == 3, "type=%ld\n", type); IHTMLDOMNode_Release(node); VariantClear(&var); bstr = SysAllocString(w100); hres = IDispatchEx_GetDispID(dispex, bstr, fdexNameCaseSensitive, &id); - ok(hres == DISP_E_UNKNOWNNAME, "GetDispID failed: %08x, expected DISP_E_UNKNOWNNAME\n", hres); + ok(hres == DISP_E_UNKNOWNNAME, "GetDispID failed: %08lx, expected DISP_E_UNKNOWNNAME\n", hres); SysFreeString(bstr); IDispatchEx_Release(dispex); @@ -8659,15 +8659,15 @@ static void test_enum_children(IUnknown *unk, unsigned len) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IEnumVARIANT, (void**)&enum_var); - ok(hres == S_OK, "Could not get IEnumVARIANT iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IEnumVARIANT iface: %08lx\n", hres); for(i=0; i<len; i++) { fetched = 0; V_VT(&v) = VT_ERROR; hres = IEnumVARIANT_Next(enum_var, 1, &v, i ? &fetched : NULL); - ok(hres == S_OK, "Next failed: %08x\n", hres); + ok(hres == S_OK, "Next failed: %08lx\n", hres); if(i) - ok(fetched == 1, "fetched = %d\n", fetched); + ok(fetched == 1, "fetched = %ld\n", fetched); ok(V_VT(&v) == VT_DISPATCH && V_DISPATCH(&v), "V_VT(v) = %d\n", V_VT(&v)); IDispatch_Release(V_DISPATCH(&v)); } @@ -8675,28 +8675,28 @@ static void test_enum_children(IUnknown *unk, unsigned len) fetched = 0xdeadbeef; V_VT(&v) = VT_BOOL; hres = IEnumVARIANT_Next(enum_var, 1, &v, &fetched); - ok(hres == S_FALSE, "Next returned %08x, expected S_FALSE\n", hres); - ok(fetched == 0, "fetched = %d\n", fetched); + ok(hres == S_FALSE, "Next returned %08lx, expected S_FALSE\n", hres); + ok(fetched == 0, "fetched = %ld\n", fetched); ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); hres = IEnumVARIANT_Reset(enum_var); - ok(hres == S_OK, "Reset failed: %08x\n", hres); + ok(hres == S_OK, "Reset failed: %08lx\n", hres); fetched = 0xdeadbeef; V_VT(&v) = VT_BOOL; hres = IEnumVARIANT_Next(enum_var, 0, &v, &fetched); - ok(hres == S_OK, "Next returned %08x, expected S_FALSE\n", hres); - ok(fetched == 0, "fetched = %d\n", fetched); + ok(hres == S_OK, "Next returned %08lx, expected S_FALSE\n", hres); + ok(fetched == 0, "fetched = %ld\n", fetched); ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); hres = IEnumVARIANT_Skip(enum_var, len > 2 ? len-2 : 0); - ok(hres == S_OK, "Skip failed: %08x\n", hres); + ok(hres == S_OK, "Skip failed: %08lx\n", hres); hres = IEnumVARIANT_Reset(enum_var); - ok(hres == S_OK, "Reset failed: %08x\n", hres); + ok(hres == S_OK, "Reset failed: %08lx\n", hres); hres = IEnumVARIANT_Skip(enum_var, len+1); - ok(hres == S_FALSE, "Skip failed: %08x\n", hres); + ok(hres == S_FALSE, "Skip failed: %08lx\n", hres); IEnumVARIANT_Release(enum_var); } @@ -8712,7 +8712,7 @@ static void test_selectors(IHTMLDocument2 *doc, IHTMLElement *div) test_elem_set_innerhtml((IUnknown*)div, L"<div class=\"cl1\"><form class=\"cl1\"></form></div><div class=\"cl2\"></div>"); hres = IHTMLDocument2_QueryInterface(doc, &IID_IDocumentSelector, (void**)&doc_selector); - ok(hres == S_OK || broken(hres == E_NOINTERFACE), "Could not get IDocumentSelector iface: %08x\n", hres); + ok(hres == S_OK || broken(hres == E_NOINTERFACE), "Could not get IDocumentSelector iface: %08lx\n", hres); if(FAILED(hres)) { win_skip("IDocumentSelector tests skipped.\n"); return; @@ -8721,7 +8721,7 @@ static void test_selectors(IHTMLDocument2 *doc, IHTMLElement *div) collection = NULL; str = SysAllocString(L"nomatch"); hres = IDocumentSelector_querySelectorAll(doc_selector, str, &collection); - ok(hres == S_OK, "querySelectorAll failed: %08x\n", hres); + ok(hres == S_OK, "querySelectorAll failed: %08lx\n", hres); ok(collection != NULL, "collection == NULL\n"); test_children_collection_length(collection, 0); IHTMLDOMChildrenCollection_Release(collection); @@ -8730,7 +8730,7 @@ static void test_selectors(IHTMLDocument2 *doc, IHTMLElement *div) collection = NULL; str = SysAllocString(L".cl1"); hres = IDocumentSelector_querySelectorAll(doc_selector, str, &collection); - ok(hres == S_OK, "querySelectorAll failed: %08x\n", hres); + ok(hres == S_OK, "querySelectorAll failed: %08lx\n", hres); ok(collection != NULL, "collection == NULL\n"); test_children_collection_length(collection, 2); IHTMLDOMChildrenCollection_Release(collection); @@ -8739,12 +8739,12 @@ static void test_selectors(IHTMLDocument2 *doc, IHTMLElement *div) IDocumentSelector_Release(doc_selector); hres = IHTMLElement_QueryInterface(div, &IID_IElementSelector, (void**)&elem_selector); - ok(hres == S_OK, "Could not get IElementSelector iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IElementSelector iface: %08lx\n", hres); collection = NULL; str = SysAllocString(L"nomatch"); hres = IElementSelector_querySelectorAll(elem_selector, str, &collection); - ok(hres == S_OK, "querySelectorAll failed: %08x\n", hres); + ok(hres == S_OK, "querySelectorAll failed: %08lx\n", hres); ok(collection != NULL, "collection == NULL\n"); test_children_collection_length(collection, 0); IHTMLDOMChildrenCollection_Release(collection); @@ -8753,7 +8753,7 @@ static void test_selectors(IHTMLDocument2 *doc, IHTMLElement *div) collection = NULL; str = SysAllocString(L".cl1"); hres = IElementSelector_querySelectorAll(elem_selector, str, &collection); - ok(hres == S_OK, "querySelectorAll failed: %08x\n", hres); + ok(hres == S_OK, "querySelectorAll failed: %08lx\n", hres); ok(collection != NULL, "collection == NULL\n"); test_children_collection_length(collection, 2); IHTMLDOMChildrenCollection_Release(collection); @@ -8774,7 +8774,7 @@ static void test_elemsbyclass(IHTMLElement *div) test_elem_set_innerhtml((IUnknown*)div, L"<div class=\"cl1\"><form class=\"cl1\"></form></div><div class=\"cl2\"></div>"); hres = IHTMLElement_QueryInterface(div, &IID_IHTMLElement6, (void**)&elem); - ok(hres == S_OK || broken(hres == E_NOINTERFACE), "Could not get IHTMLElement6 iface: %08x\n", hres); + ok(hres == S_OK || broken(hres == E_NOINTERFACE), "Could not get IHTMLElement6 iface: %08lx\n", hres); if(FAILED(hres)) { win_skip("IHTMLElement6 tests skipped.\n"); return; @@ -8783,7 +8783,7 @@ static void test_elemsbyclass(IHTMLElement *div) collection = NULL; str = SysAllocString(L"nomatch"); hres = IHTMLElement6_getElementsByClassName(elem, str, &collection); - ok(hres == S_OK, "getElementsByClassName failed: %08x\n", hres); + ok(hres == S_OK, "getElementsByClassName failed: %08lx\n", hres); ok(collection != NULL, "collection == NULL\n"); test_elem_collection((IUnknown*)collection, NULL, 0); IHTMLElementCollection_Release(collection); @@ -8792,7 +8792,7 @@ static void test_elemsbyclass(IHTMLElement *div) collection = NULL; str = SysAllocString(L"cl1"); hres = IHTMLElement6_getElementsByClassName(elem, str, &collection); - ok(hres == S_OK, "getElementsByClassName failed: %08x\n", hres); + ok(hres == S_OK, "getElementsByClassName failed: %08lx\n", hres); ok(collection != NULL, "collection == NULL\n"); test_elem_collection((IUnknown*)collection, types, ARRAY_SIZE(types)); IHTMLElementCollection_Release(collection); @@ -8856,7 +8856,7 @@ static void test_elems(IHTMLDocument2 *doc) }; hres = IHTMLDocument2_get_all(doc, &col); - ok(hres == S_OK, "get_all failed: %08x\n", hres); + ok(hres == S_OK, "get_all failed: %08lx\n", hres); test_elem_collection((IUnknown*)col, all_types, ARRAY_SIZE(all_types)); test_elem_col_item(col, L"x", item_types, ARRAY_SIZE(item_types)); @@ -8871,7 +8871,7 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElementCollection_Release(col); hres = IHTMLDocument2_get_images(doc, &collection); - ok(hres == S_OK, "get_images failed: %08x\n", hres); + ok(hres == S_OK, "get_images failed: %08lx\n", hres); if(hres == S_OK) { static const elem_type_t images_types[] = {ET_IMG}; @@ -8881,7 +8881,7 @@ static void test_elems(IHTMLDocument2 *doc) } hres = IHTMLDocument2_get_links(doc, &collection); - ok(hres == S_OK, "get_links failed: %08x\n", hres); + ok(hres == S_OK, "get_links failed: %08lx\n", hres); if(hres == S_OK) { static const elem_type_t link_types[] = {ET_A,ET_AREA}; @@ -8891,7 +8891,7 @@ static void test_elems(IHTMLDocument2 *doc) } hres = IHTMLDocument2_get_anchors(doc, &collection); - ok(hres == S_OK, "get_anchors failed: %08x\n", hres); + ok(hres == S_OK, "get_anchors failed: %08lx\n", hres); if(hres == S_OK) { static const elem_type_t anchor_types[] = {ET_A}; @@ -8901,7 +8901,7 @@ static void test_elems(IHTMLDocument2 *doc) } hres = IHTMLDocument2_get_scripts(doc, &collection); - ok(hres == S_OK, "get_scripts failed: %08x\n", hres); + ok(hres == S_OK, "get_scripts failed: %08lx\n", hres); if(hres == S_OK) { static const elem_type_t script_types[] = {ET_SCRIPT}; test_elem_collection((IUnknown*)collection, script_types, 1); @@ -8947,7 +8947,7 @@ static void test_elems(IHTMLDocument2 *doc) { test_node_name((IUnknown*)node, L"#document"); type = get_node_type((IUnknown*)node); - ok(type == 9, "type=%d, expected 9\n", type); + ok(type == 9, "type=%ld, expected 9\n", type); node2 = test_node_get_parent((IUnknown*)node); IHTMLDOMNode_Release(node); ok(node2 == NULL, "node != NULL\n"); @@ -9007,7 +9007,7 @@ static void test_elems(IHTMLDocument2 *doc) } type = get_node_type((IUnknown*)select); - ok(type == 1, "type=%d\n", type); + ok(type == 1, "type=%ld\n", type); IHTMLSelectElement_Release(select); @@ -9031,7 +9031,7 @@ static void test_elems(IHTMLDocument2 *doc) BSTR type; hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLScriptElement, (void**)&script); - ok(hres == S_OK, "Could not get IHTMLScriptElement interface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLScriptElement interface: %08lx\n", hres); test_elem_language(elem, NULL); test_elem_istextedit(elem, VARIANT_FALSE); @@ -9041,17 +9041,17 @@ static void test_elems(IHTMLDocument2 *doc) VARIANT_BOOL vb; hres = IHTMLScriptElement_put_type (script, NULL); - ok(hres == S_OK, "put_type failed: %08x\n", hres); + ok(hres == S_OK, "put_type failed: %08lx\n", hres); hres = IHTMLScriptElement_get_type(script, &type); - ok(hres == S_OK, "get_type failed: %08x\n", hres); + ok(hres == S_OK, "get_type failed: %08lx\n", hres); ok(type == NULL, "Unexpected type %s\n", wine_dbgstr_w(type)); type = SysAllocString(L"text/javascript"); hres = IHTMLScriptElement_put_type (script, type); - ok(hres == S_OK, "put_type failed: %08x\n", hres); + ok(hres == S_OK, "put_type failed: %08lx\n", hres); SysFreeString(type); hres = IHTMLScriptElement_get_type(script, &type); - ok(hres == S_OK, "get_type failed: %08x\n", hres); + ok(hres == S_OK, "get_type failed: %08lx\n", hres); ok(!lstrcmpW(type, L"text/javascript"), "Unexpected type %s\n", wine_dbgstr_w(type)); SysFreeString(type); @@ -9059,23 +9059,23 @@ static void test_elems(IHTMLDocument2 *doc) /* test defer */ hres = IHTMLScriptElement_put_defer(script, VARIANT_TRUE); - ok(hres == S_OK, "put_defer failed: %08x\n", hres); + ok(hres == S_OK, "put_defer failed: %08lx\n", hres); hres = IHTMLScriptElement_get_defer(script, &vb); - ok(hres == S_OK, "get_defer failed: %08x\n", hres); - ok(vb == VARIANT_TRUE, "get_defer result is %08x\n", hres); + ok(hres == S_OK, "get_defer failed: %08lx\n", hres); + ok(vb == VARIANT_TRUE, "get_defer result is %08lx\n", hres); hres = IHTMLScriptElement_put_defer(script, VARIANT_FALSE); - ok(hres == S_OK, "put_defer failed: %08x\n", hres); + ok(hres == S_OK, "put_defer failed: %08lx\n", hres); str = (BSTR)0xdeadbeef; hres = IHTMLScriptElement_get_src(script, &str); - ok(hres == S_OK, "get_src failed: %08x\n", hres); + ok(hres == S_OK, "get_src failed: %08lx\n", hres); ok(!str, "src = %s\n", wine_dbgstr_w(str)); str = (BSTR)0xdeadbeef; hres = IHTMLScriptElement_get_htmlFor(script, &str); - ok(hres == S_OK, "get_htmlFor failed: %08x\n", hres); + ok(hres == S_OK, "get_htmlFor failed: %08lx\n", hres); ok(!str, "htmlFor = %s\n", wine_dbgstr_w(str)); } @@ -9090,7 +9090,7 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLInputElement *input; hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLInputElement, (void**)&input); - ok(hres == S_OK, "Could not get IHTMLInputElement: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLInputElement: %08lx\n", hres); test_elem_id((IUnknown*)elem, L"in"); test_elem_put_id((IUnknown*)elem, L"newin"); @@ -9331,14 +9331,14 @@ static void test_elems(IHTMLDocument2 *doc) ok(!node2, "node2 != NULL\n"); type = get_node_type((IUnknown*)node); - ok(type == 3, "type=%d\n", type); + ok(type == 3, "type=%ld\n", type); test_node_get_value_str((IUnknown*)node, L"text test"); test_node_put_value_str((IUnknown*)elem, L"test text"); test_node_get_value_str((IUnknown*)node, L"text test"); hres = IHTMLDOMNode_get_attributes(node, &disp); - ok(hres == S_OK, "get_attributes failed: %08x\n", hres); + ok(hres == S_OK, "get_attributes failed: %08lx\n", hres); ok(!disp, "disp != NULL\n"); IHTMLDOMNode_Release(node); @@ -9360,7 +9360,7 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLDOMNode *prev; type = get_node_type((IUnknown*)node); - ok(type == 3, "type=%d\n", type); + ok(type == 3, "type=%ld\n", type); node2 = node_get_next((IUnknown*)node); prev = node_get_prev((IUnknown*)node2); @@ -9374,7 +9374,7 @@ static void test_elems(IHTMLDocument2 *doc) ok(node != NULL, "node == NULL\n"); if(node) { type = get_node_type((IUnknown*)node); - ok(type == 8, "type=%d\n", type); + ok(type == 8, "type=%ld\n", type); test_elem_id((IUnknown*)node, NULL); ok(iface_cmp((IUnknown*)node2, (IUnknown*)node), "node2 != node\n"); @@ -9383,21 +9383,21 @@ static void test_elems(IHTMLDocument2 *doc) } hres = IHTMLDOMChildrenCollection_item(child_col, length - 1, NULL); - ok(hres == E_POINTER, "item failed: %08x, expected E_POINTER\n", hres); + ok(hres == E_POINTER, "item failed: %08lx, expected E_POINTER\n", hres); hres = IHTMLDOMChildrenCollection_item(child_col, length, NULL); - ok(hres == E_POINTER, "item failed: %08x, expected E_POINTER\n", hres); + ok(hres == E_POINTER, "item failed: %08lx, expected E_POINTER\n", hres); hres = IHTMLDOMChildrenCollection_item(child_col, 6000, &disp); - ok(hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); + ok(hres == E_INVALIDARG, "item failed: %08lx, expected E_INVALIDARG\n", hres); hres = IHTMLDOMChildrenCollection_item(child_col, length, &disp); - ok(hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); + ok(hres == E_INVALIDARG, "item failed: %08lx, expected E_INVALIDARG\n", hres); test_child_col_disp(child_col); hres = IHTMLDOMChildrenCollection_get__newEnum(child_col, &enum_unk); - ok(hres == S_OK, "get__newEnum failed: %08x\n", hres); + ok(hres == S_OK, "get__newEnum failed: %08lx\n", hres); test_enum_children(enum_unk, length); @@ -9435,18 +9435,18 @@ static void test_elems(IHTMLDocument2 *doc) disp = NULL; hres = IHTMLDocument2_get_Script(doc, &disp); - ok(hres == S_OK, "get_Script failed: %08x\n", hres); + ok(hres == S_OK, "get_Script failed: %08lx\n", hres); if(hres == S_OK) { IDispatchEx *dispex; hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); - ok(hres == S_OK, "IDispatch_QueryInterface failed: %08x\n", hres); + ok(hres == S_OK, "IDispatch_QueryInterface failed: %08lx\n", hres); if(hres == S_OK) { DISPID pid = -1; BSTR str = SysAllocString(L"Testing"); hres = IDispatchEx_GetDispID(dispex, str, 1, &pid); - ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + ok(hres == S_OK, "GetDispID failed: %08lx\n", hres); ok(pid != -1, "pid == -1\n"); SysFreeString(str); IDispatchEx_Release(dispex); @@ -9472,10 +9472,10 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); - ok(hres == S_OK, "Could not get IHTMLDocument3 iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLDocument3 iface: %08lx\n", hres); hres = IHTMLDocument3_recalc(doc3, VARIANT_TRUE); - ok(hres == S_OK, "recalc failed: %08x\n", hres); + ok(hres == S_OK, "recalc failed: %08lx\n", hres); IHTMLDocument3_Release(doc3); @@ -9562,7 +9562,7 @@ static void test_attr(IHTMLDocument2 *doc, IHTMLElement *elem) set_dispex_value((IUnknown*)elem, L"dispprop", &v); attr = get_elem_attr_node((IUnknown*)elem, L"dispprop", TRUE); get_attr_node_value(attr, &v, VT_I4); - ok(V_I4(&v) == 100, "V_I4(v) = %d\n", V_I4(&v)); + ok(V_I4(&v) == 100, "V_I4(v) = %ld\n", V_I4(&v)); test_attr_specified(attr, VARIANT_TRUE); V_VT(&v) = VT_I4; @@ -9570,7 +9570,7 @@ static void test_attr(IHTMLDocument2 *doc, IHTMLElement *elem) put_attr_node_value(attr, v); get_attr_node_value(attr, &v, VT_I4); - ok(V_I4(&v) == 150, "V_I4(v) = %d\n", V_I4(&v)); + ok(V_I4(&v) == 150, "V_I4(v) = %ld\n", V_I4(&v)); put_attr_value(attr, L"160"); get_attr_node_value(attr, &v, VT_BSTR); @@ -9601,7 +9601,7 @@ static void test_attr(IHTMLDocument2 *doc, IHTMLElement *elem) put_attr_node_value(attr, v); get_attr_node_value(attr, &v, VT_I4); - ok(V_I4(&v) == 1, "nodeValue = %d\n", V_I4(&v)); + ok(V_I4(&v) == 1, "nodeValue = %ld\n", V_I4(&v)); test_attr_value(attr, L"1"); V_VT(&v) = VT_EMPTY; @@ -9617,7 +9617,7 @@ static void test_attr(IHTMLDocument2 *doc, IHTMLElement *elem) elem4 = get_elem4_iface((IUnknown*)elem); hres = IHTMLElement4_setAttributeNode(elem4, attr, &attr2); - ok(hres == S_OK, "setAttributeNode failed: %08x\n", hres); + ok(hres == S_OK, "setAttributeNode failed: %08lx\n", hres); ok(!attr2, "attr2 != NULL\n"); test_elem_attr(elem, L"Test", L"testing"); @@ -9632,7 +9632,7 @@ static void test_attr(IHTMLDocument2 *doc, IHTMLElement *elem) put_attr_value(attr3, L"replace test"); hres = IHTMLElement4_setAttributeNode(elem4, attr3, &attr2); - ok(hres == S_OK, "setAttributeNode failed: %08x\n", hres); + ok(hres == S_OK, "setAttributeNode failed: %08lx\n", hres); ok(iface_cmp((IUnknown*)attr2, (IUnknown*)attr), "attr2 != attr\n"); IHTMLDOMAttribute_Release(attr2); @@ -9656,12 +9656,12 @@ static void test_attr(IHTMLDocument2 *doc, IHTMLElement *elem) /* Attached attributes cause errors. */ hres = IHTMLElement4_setAttributeNode(elem4, attr3, &attr2); - ok(hres == E_INVALIDARG, "setAttributeNode failed: %08x, expected E_INVALIDARG\n", hres); + ok(hres == E_INVALIDARG, "setAttributeNode failed: %08lx, expected E_INVALIDARG\n", hres); IHTMLDOMAttribute_Release(attr3); attr2 = get_elem_attr_node((IUnknown*)elem, L"id", TRUE); hres = IHTMLElement4_setAttributeNode(elem4, attr2, &attr3); - ok(hres == E_INVALIDARG, "setAttributeNode failed: %08x, expected E_INVALIDARG\n", hres); + ok(hres == E_INVALIDARG, "setAttributeNode failed: %08lx, expected E_INVALIDARG\n", hres); IHTMLDOMAttribute_Release(attr2); IHTMLElement4_Release(elem4); @@ -9702,7 +9702,7 @@ static IHTMLElementCollection *_doc_get_elems_by_name(unsigned line, IHTMLDocume HRESULT hres; hres = IHTMLDocument3_getElementsByName(doc3, str, &col); - ok_(__FILE__,line)(hres == S_OK, "getElementsByName failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "getElementsByName failed: %08lx\n", hres); ok_(__FILE__,line)(col != NULL, "col = NULL\n"); IHTMLDocument3_Release(doc3); @@ -9730,8 +9730,8 @@ static void test_elem_names(IHTMLDocument2 *doc) /* case insensivity test */ col = doc_get_elems_by_name(doc, L"Xxx"); hres = IHTMLElementCollection_get_length(col, &len); - ok(hres == S_OK, "get_length failed: %08x\n", hres); - todo_wine ok(len == 1, "len = %d\n", len); + ok(hres == S_OK, "get_length failed: %08lx\n", hres); + todo_wine ok(len == 1, "len = %ld\n", len); IHTMLElementCollection_Release(col); } @@ -9996,7 +9996,7 @@ static void test_create_elems(IHTMLDocument2 *doc) elem = test_create_elem(doc, L"TEST"); test_elem_tag((IUnknown*)elem, L"TEST"); type = get_node_type((IUnknown*)elem); - ok(type == 1, "type=%d\n", type); + ok(type == 1, "type=%ld\n", type); test_ifaces((IUnknown*)elem, elem_iids); test_disp((IUnknown*)elem, &DIID_DispHTMLGenericElement, &CLSID_HTMLGenericElement, L"[object]"); test_elem_source_index(elem, -1); @@ -10010,14 +10010,14 @@ static void test_create_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem2); hres = IHTMLElement_get_all(body, &disp); - ok(hres == S_OK, "get_all failed: %08x\n", hres); + ok(hres == S_OK, "get_all failed: %08lx\n", hres); test_elem_collection((IUnknown*)disp, types1, ARRAY_SIZE(types1)); IDispatch_Release(disp); test_node_remove_child((IUnknown*)body, node); hres = IHTMLElement_get_all(body, &disp); - ok(hres == S_OK, "get_all failed: %08x\n", hres); + ok(hres == S_OK, "get_all failed: %08lx\n", hres); test_elem_collection((IUnknown*)disp, NULL, 0); IDispatch_Release(disp); test_node_has_child((IUnknown*)body, VARIANT_FALSE); @@ -10066,11 +10066,11 @@ static void test_create_elems(IHTMLDocument2 *doc) str = SysAllocString(L"testing"); hres = IHTMLDocument5_createComment(doc5, str, &comment); SysFreeString(str); - ok(hres == S_OK, "createComment failed: %08x\n", hres); + ok(hres == S_OK, "createComment failed: %08lx\n", hres); if(hres == S_OK) { type = get_node_type((IUnknown*)comment); - ok(type == 8, "type=%d, expected 8\n", type); + ok(type == 8, "type=%ld, expected 8\n", type); test_node_get_value_str((IUnknown*)comment, L"testing"); test_elem_title((IUnknown*)comment, NULL); @@ -10119,7 +10119,7 @@ static void test_replacechild_elems(IHTMLDocument2 *doc) nodeBody = _get_node_iface(__LINE__, (IUnknown *)body); hres = IHTMLDOMNode_replaceChild(nodeBody, node3, node2, &nodeNew); - ok(hres == S_OK, "Expected S_OK, got 0x%08x\n", hres); + ok(hres == S_OK, "Expected S_OK, got 0x%08lx\n", hres); test_elem_innertext(body, L"replaced"); @@ -10151,7 +10151,7 @@ static void test_noscript(IHTMLDocument2 *doc) }; hres = IHTMLDocument2_get_all(doc, &col); - ok(hres == S_OK, "get_all failed: %08x\n", hres); + ok(hres == S_OK, "get_all failed: %08lx\n", hres); test_elem_collection((IUnknown*)col, all_types, ARRAY_SIZE(all_types)); IHTMLElementCollection_Release(col); @@ -10188,11 +10188,11 @@ static void test_null_write(IHTMLDocument2 *doc) hres = IHTMLDocument2_write(doc, NULL); ok(hres == S_OK, - "Expected IHTMLDocument2::write to return S_OK, got 0x%08x\n", hres); + "Expected IHTMLDocument2::write to return S_OK, got 0x%08lx\n", hres); hres = IHTMLDocument2_writeln(doc, NULL); ok(hres == S_OK, - "Expected IHTMLDocument2::writeln to return S_OK, got 0x%08x\n", hres); + "Expected IHTMLDocument2::writeln to return S_OK, got 0x%08lx\n", hres); } static void test_create_stylesheet(IHTMLDocument2 *doc) @@ -10223,7 +10223,7 @@ static void test_create_stylesheet(IHTMLDocument2 *doc) test_doc_all(doc, all_types, ARRAY_SIZE(all_types)); hres = IHTMLDocument2_createStyleSheet(doc, NULL, -1, &stylesheet); - ok(hres == S_OK, "createStyleSheet failed: %08x\n", hres); + ok(hres == S_OK, "createStyleSheet failed: %08lx\n", hres); test_doc_all(doc, all_types2, ARRAY_SIZE(all_types2)); @@ -10234,20 +10234,20 @@ static void test_create_stylesheet(IHTMLDocument2 *doc) hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLStyleElement, (void**)&style_elem); IHTMLElement_Release(elem); - ok(hres == S_OK, "Could not get IHTMLStyleElement iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLStyleElement iface: %08lx\n", hres); stylesheet2 = NULL; hres = IHTMLStyleElement_get_styleSheet(style_elem, &stylesheet2); - ok(hres == S_OK, "get_styleSheet failed: %08x\n", hres); + ok(hres == S_OK, "get_styleSheet failed: %08lx\n", hres); ok(stylesheet2 != NULL, "stylesheet2 == NULL\n"); ok(iface_cmp((IUnknown*)stylesheet, (IUnknown*)stylesheet2), "stylesheet != stylesheet2\n"); IHTMLStyleSheet_Release(stylesheet2); hres = IHTMLStyleElement_QueryInterface(style_elem, &IID_IHTMLStyleElement2, (void**)&style_elem2); - ok(hres == S_OK, "Could not get IHTMLStyleElement2: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLStyleElement2: %08lx\n", hres); hres = IHTMLStyleElement2_get_sheet(style_elem2, &stylesheet2); - ok(hres == S_OK, "get_styleSheet failed: %08x\n", hres); + ok(hres == S_OK, "get_styleSheet failed: %08lx\n", hres); ok(stylesheet2 != NULL, "stylesheet2 == NULL\n"); ok(iface_cmp((IUnknown*)stylesheet, (IUnknown*)stylesheet2), "stylesheet != stylesheet2\n"); IHTMLStyleSheet_Release(stylesheet2); @@ -10264,10 +10264,10 @@ static void test_exec(IUnknown *unk, const GUID *grpid, DWORD cmdid, VARIANT *in HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IOleCommandTarget, (void**)&cmdtrg); - ok(hres == S_OK, "Could not get IOleCommandTarget interface: %08x\n", hres); + ok(hres == S_OK, "Could not get IOleCommandTarget interface: %08lx\n", hres); hres = IOleCommandTarget_Exec(cmdtrg, grpid, cmdid, 0, in, out); - ok(hres == S_OK, "Exec failed: %08x\n", hres); + ok(hres == S_OK, "Exec failed: %08lx\n", hres); IOleCommandTarget_Release(cmdtrg); } @@ -10299,7 +10299,7 @@ static void test_indent(IHTMLDocument2 *doc) }; hres = IHTMLDocument2_get_all(doc, &col); - ok(hres == S_OK, "get_all failed: %08x\n", hres); + ok(hres == S_OK, "get_all failed: %08lx\n", hres); test_elem_collection((IUnknown*)col, all_types, ARRAY_SIZE(all_types)); IHTMLElementCollection_Release(col); @@ -10308,7 +10308,7 @@ static void test_indent(IHTMLDocument2 *doc) IHTMLTxtRange_Release(range); hres = IHTMLDocument2_get_all(doc, &col); - ok(hres == S_OK, "get_all failed: %08x\n", hres); + ok(hres == S_OK, "get_all failed: %08lx\n", hres); test_elem_collection((IUnknown*)col, indent_types, ARRAY_SIZE(indent_types)); IHTMLElementCollection_Release(col); } @@ -10327,7 +10327,7 @@ static void test_cond_comment(IHTMLDocument2 *doc) }; hres = IHTMLDocument2_get_all(doc, &col); - ok(hres == S_OK, "get_all failed: %08x\n", hres); + ok(hres == S_OK, "get_all failed: %08lx\n", hres); test_elem_collection((IUnknown*)col, all_types, ARRAY_SIZE(all_types)); IHTMLElementCollection_Release(col); } @@ -10366,12 +10366,12 @@ static void test_frame(IDispatch *disp, const WCHAR *exp_id) HRESULT hres; hres = IDispatch_QueryInterface(disp, &IID_IHTMLWindow4, (void**)&frame); - ok(hres == S_OK, "Could not get IHTMLWindow4 interface: 0x%08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLWindow4 interface: 0x%08lx\n", hres); if(FAILED(hres)) return; hres = IHTMLWindow4_get_frameElement(frame, &frame_elem); - ok(hres == S_OK, "IHTMLWindow4_get_frameElement failed: 0x%08x\n", hres); + ok(hres == S_OK, "IHTMLWindow4_get_frameElement failed: 0x%08lx\n", hres); IHTMLWindow4_Release(frame); if(FAILED(hres)) return; @@ -10382,42 +10382,42 @@ static void test_frame(IDispatch *disp, const WCHAR *exp_id) IHTMLFrameBase_Release(frame_elem); hres = IDispatch_QueryInterface(disp, &IID_IHTMLWindow2, (void**)&frame2); - ok(hres == S_OK, "Could not get IHTMLWindow2 interface: 0x%08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLWindow2 interface: 0x%08lx\n", hres); if(FAILED(hres)) return; hres = IHTMLWindow2_get_parent(frame2, &parent); - ok(hres == S_OK, "IHTMLWindow2_get_parent failed: 0x%08x\n", hres); + ok(hres == S_OK, "IHTMLWindow2_get_parent failed: 0x%08lx\n", hres); if(FAILED(hres)){ IHTMLWindow2_Release(frame2); return; } hres = IHTMLWindow2_QueryInterface(frame2, &IID_IObjectIdentity, (void**)&obj_ident); - ok(hres == S_OK, "Could not get IObjectIdentity interface: %08x\n", hres); + ok(hres == S_OK, "Could not get IObjectIdentity interface: %08lx\n", hres); hres = IHTMLWindow2_QueryInterface(frame2, &IID_ITravelLogClient, (void**)&tlc); if(hres == E_NOINTERFACE) { win_skip("IID_ITravelLogClient not available\n"); tlc = NULL; }else { - ok(hres == S_OK, "Could not get ITravelLogClient interface: %08x\n", hres); + ok(hres == S_OK, "Could not get ITravelLogClient interface: %08lx\n", hres); hres = IObjectIdentity_IsEqualObject(obj_ident, (IUnknown*)tlc); - ok(hres == S_OK, "IsEqualObject returned: 0x%08x\n", hres); + ok(hres == S_OK, "IsEqualObject returned: 0x%08lx\n", hres); ITravelLogClient_Release(tlc); } hres = IObjectIdentity_IsEqualObject(obj_ident, (IUnknown*)obj_ident); - ok(hres == S_OK, "IsEqualObject returned: 0x%08x\n", hres); + ok(hres == S_OK, "IsEqualObject returned: 0x%08lx\n", hres); hres = IObjectIdentity_IsEqualObject(obj_ident, (IUnknown*)parent); - ok(hres == S_FALSE, "IsEqualObject returned: 0x%08x\n", hres); + ok(hres == S_FALSE, "IsEqualObject returned: 0x%08lx\n", hres); hres = IObjectIdentity_IsEqualObject(obj_ident, &obj_ident_test); - ok(hres == E_NOINTERFACE, "IsEqualObject returned: 0x%08x\n", hres); + ok(hres == E_NOINTERFACE, "IsEqualObject returned: 0x%08lx\n", hres); IObjectIdentity_Release(obj_ident); hres = IHTMLWindow2_get_document(parent, &parent_doc); - ok(hres == S_OK, "IHTMLWindow2_get_document failed: 0x%08x\n", hres); + ok(hres == S_OK, "IHTMLWindow2_get_document failed: 0x%08lx\n", hres); IHTMLWindow2_Release(parent); if(FAILED(hres)){ IHTMLWindow2_Release(frame2); @@ -10429,13 +10429,13 @@ static void test_frame(IDispatch *disp, const WCHAR *exp_id) /* test get_top */ hres = IHTMLWindow2_get_top(frame2, &top); - ok(hres == S_OK, "IHTMLWindow2_get_top failed: 0x%08x\n", hres); + ok(hres == S_OK, "IHTMLWindow2_get_top failed: 0x%08lx\n", hres); IHTMLWindow2_Release(frame2); if(FAILED(hres)) return; hres = IHTMLWindow2_get_document(top, &top_doc); - ok(hres == S_OK, "IHTMLWindow2_get_document failed: 0x%08x\n", hres); + ok(hres == S_OK, "IHTMLWindow2_get_document failed: 0x%08lx\n", hres); IHTMLWindow2_Release(top); if(FAILED(hres)) return; @@ -10452,14 +10452,14 @@ static void test_frames_collection(IHTMLFramesCollection2 *frames, const WCHAR * /* test result length */ hres = IHTMLFramesCollection2_get_length(frames, &length); - ok(hres == S_OK, "IHTMLFramesCollection2_get_length failed: 0x%08x\n", hres); - ok(length == 3, "IHTMLFramesCollection2_get_length should have been 3, was: %d\n", length); + ok(hres == S_OK, "IHTMLFramesCollection2_get_length failed: 0x%08lx\n", hres); + ok(length == 3, "IHTMLFramesCollection2_get_length should have been 3, was: %ld\n", length); /* test first frame */ V_VT(&index_var) = VT_I4; V_I4(&index_var) = 0; hres = IHTMLFramesCollection2_item(frames, &index_var, &result_var); - ok(hres == S_OK, "IHTMLFramesCollection2_item failed: 0x%08x\n", hres); + ok(hres == S_OK, "IHTMLFramesCollection2_item failed: 0x%08lx\n", hres); if(SUCCEEDED(hres)) { ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x\n", V_VT(&result_var)); test_frame((IDispatch*)V_DISPATCH(&result_var), L"fr1"); @@ -10469,7 +10469,7 @@ static void test_frames_collection(IHTMLFramesCollection2 *frames, const WCHAR * /* test second frame */ V_I4(&index_var) = 1; hres = IHTMLFramesCollection2_item(frames, &index_var, &result_var); - ok(hres == S_OK, "IHTMLFramesCollection2_item failed: 0x%08x\n", hres); + ok(hres == S_OK, "IHTMLFramesCollection2_item failed: 0x%08lx\n", hres); if(SUCCEEDED(hres)) { ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x\n", V_VT(&result_var)); test_frame((IDispatch*)V_DISPATCH(&result_var), L"fr2"); @@ -10480,14 +10480,14 @@ static void test_frames_collection(IHTMLFramesCollection2 *frames, const WCHAR * V_I4(&index_var) = 3; hres = IHTMLFramesCollection2_item(frames, &index_var, &result_var); ok(hres == DISP_E_MEMBERNOTFOUND, "IHTMLFramesCollection2_item should have" - "failed with DISP_E_MEMBERNOTFOUND, instead: 0x%08x\n", hres); + "failed with DISP_E_MEMBERNOTFOUND, instead: 0x%08lx\n", hres); VariantClear(&result_var); /* string argument (element id lookup) */ V_VT(&index_var) = VT_BSTR; V_BSTR(&index_var) = SysAllocString(frid); hres = IHTMLFramesCollection2_item(frames, &index_var, &result_var); - ok(hres == S_OK, "IHTMLFramesCollection2_item failed: 0x%08x\n", hres); + ok(hres == S_OK, "IHTMLFramesCollection2_item failed: 0x%08lx\n", hres); if(SUCCEEDED(hres)) { ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x\n", V_VT(&result_var)); test_frame(V_DISPATCH(&result_var), frid); @@ -10500,7 +10500,7 @@ static void test_frames_collection(IHTMLFramesCollection2 *frames, const WCHAR * V_BOOL(&index_var) = VARIANT_TRUE; hres = IHTMLFramesCollection2_item(frames, &index_var, &result_var); ok(hres == E_INVALIDARG, "IHTMLFramesCollection2_item should have" - "failed with E_INVALIDARG, instead: 0x%08x\n", hres); + "failed with E_INVALIDARG, instead: 0x%08lx\n", hres); VariantClear(&result_var); } @@ -10517,7 +10517,7 @@ static void test_frameset(IHTMLDocument2 *doc) /* test using IHTMLFramesCollection object */ hres = IHTMLWindow2_get_frames(window, &frames); - ok(hres == S_OK, "IHTMLWindow2_get_frames failed: 0x%08x\n", hres); + ok(hres == S_OK, "IHTMLWindow2_get_frames failed: 0x%08lx\n", hres); if(FAILED(hres)) return; @@ -10525,7 +10525,7 @@ static void test_frameset(IHTMLDocument2 *doc) IHTMLFramesCollection2_Release(frames); hres = IHTMLDocument2_get_frames(doc, &frames); - ok(hres == S_OK, "IHTMLDocument2_get_frames failed: 0x%08x\n", hres); + ok(hres == S_OK, "IHTMLDocument2_get_frames failed: 0x%08lx\n", hres); if(FAILED(hres)) return; @@ -10546,13 +10546,13 @@ static void test_frameset(IHTMLDocument2 *doc) str = SysAllocString(L"nm1"); hres = IHTMLDocument6_getElementById(doc6, str, &elem2); - ok(hres == S_OK, "getElementById failed: %08x\n", hres); + ok(hres == S_OK, "getElementById failed: %08lx\n", hres); ok(!elem2, "elem = %p\n", elem2); SysFreeString(str); str = SysAllocString(L"fr1"); hres = IHTMLDocument6_getElementById(doc6, str, &elem2); - ok(hres == S_OK, "getElementById failed: %08x\n", hres); + ok(hres == S_OK, "getElementById failed: %08lx\n", hres); ok(elem2 != NULL, "elem2 is NULL\n"); test_elem_id((IUnknown*)elem2, L"fr1"); SysFreeString(str); @@ -10587,11 +10587,11 @@ static IHTMLDocument2 *create_docfrag(IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); - ok(hres == S_OK, "Could not get IHTMLDocument3 iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLDocument3 iface: %08lx\n", hres); hres = IHTMLDocument3_createDocumentFragment(doc3, &frag); IHTMLDocument3_Release(doc3); - ok(hres == S_OK, "createDocumentFragment failed: %08x\n", hres); + ok(hres == S_OK, "createDocumentFragment failed: %08lx\n", hres); ok(frag != NULL, "frag == NULL\n"); return frag; @@ -10620,12 +10620,12 @@ static void test_docfrag(IHTMLDocument2 *doc) body = (void*)0xdeadbeef; hres = IHTMLDocument2_get_body(frag, &body); - ok(hres == S_OK, "get_body failed: %08x\n", hres); + ok(hres == S_OK, "get_body failed: %08lx\n", hres); ok(!body, "body != NULL\n"); location = (void*)0xdeadbeef; hres = IHTMLDocument2_get_location(frag, &location); - ok(hres == E_UNEXPECTED, "get_location failed: %08x\n", hres); + ok(hres == E_UNEXPECTED, "get_location failed: %08lx\n", hres); ok(location == (void*)0xdeadbeef, "location changed\n"); br = test_create_elem(doc, L"BR"); @@ -10642,7 +10642,7 @@ static void test_docfrag(IHTMLDocument2 *doc) IHTMLElement_Release(div); hres = IHTMLDocument2_get_all(doc, &col); - ok(hres == S_OK, "get_all failed: %08x\n", hres); + ok(hres == S_OK, "get_all failed: %08lx\n", hres); test_elem_collection((IUnknown*)col, all_types, ARRAY_SIZE(all_types)); IHTMLElementCollection_Release(col); @@ -10674,12 +10674,12 @@ static void test_quirks_mode_offsetHeight(IHTMLDocument2 *doc) LONG oh; hres = IHTMLDocument2_get_body(doc, &elem); - ok(hres == S_OK, "get_body fauled: %08x\n", hres); + ok(hres == S_OK, "get_body fauled: %08lx\n", hres); /* body.offsetHeight value depends on window size in quirks mode */ hres = IHTMLElement_get_offsetHeight(elem, &oh); - ok(hres == S_OK, "get_offsetHeight failed: %08x\n", hres); - todo_wine ok(oh == 500, "offsetHeight = %d\n", oh); + ok(hres == S_OK, "get_offsetHeight failed: %08lx\n", hres); + todo_wine ok(oh == 500, "offsetHeight = %ld\n", oh); IHTMLElement_Release(elem); } @@ -10715,7 +10715,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D HRESULT hres; hres = IHTMLDocument2_get_readyState(notif_doc, &state); - ok(hres == S_OK, "get_readyState failed: %08x\n", hres); + ok(hres == S_OK, "get_readyState failed: %08lx\n", hres); if(!lstrcmpW(state, L"complete")) doc_complete = TRUE; @@ -11053,23 +11053,23 @@ static HRESULT WINAPI DocumentSite_ActivateMe(IOleDocumentSite *iface, IOleDocum HRESULT hres; hres = IOleDocumentView_QueryInterface(pViewToActivate, &IID_IOleDocument, (void**)&document); - ok(hres == S_OK, "could not get IOleDocument: %08x\n", hres); + ok(hres == S_OK, "could not get IOleDocument: %08lx\n", hres); hres = IOleDocument_CreateView(document, &InPlaceSite, NULL, 0, &view); IOleDocument_Release(document); - ok(hres == S_OK, "CreateView failed: %08x\n", hres); + ok(hres == S_OK, "CreateView failed: %08lx\n", hres); hres = IOleDocumentView_SetInPlaceSite(view, &InPlaceSite); - ok(hres == S_OK, "SetInPlaceSite failed: %08x\n", hres); + ok(hres == S_OK, "SetInPlaceSite failed: %08lx\n", hres); hres = IOleDocumentView_UIActivate(view, TRUE); - ok(hres == S_OK, "UIActivate failed: %08x\n", hres); + ok(hres == S_OK, "UIActivate failed: %08lx\n", hres); hres = IOleDocumentView_SetRect(view, &rect); - ok(hres == S_OK, "SetRect failed: %08x\n", hres); + ok(hres == S_OK, "SetRect failed: %08lx\n", hres); hres = IOleDocumentView_Show(view, TRUE); - ok(hres == S_OK, "Show failed: %08x\n", hres); + ok(hres == S_OK, "Show failed: %08lx\n", hres); return S_OK; } @@ -11111,19 +11111,19 @@ static void set_client_site(IHTMLDocument2 *doc, BOOL set) } hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); - ok(hres == S_OK, "Could not et IOleObject: %08x\n", hres); + ok(hres == S_OK, "Could not et IOleObject: %08lx\n", hres); hres = IOleObject_SetClientSite(oleobj, set ? &ClientSite : NULL); - ok(hres == S_OK, "SetClientSite failed: %08x\n", hres); + ok(hres == S_OK, "SetClientSite failed: %08lx\n", hres); if(set) { IHlinkTarget *hlink; hres = IOleObject_QueryInterface(oleobj, &IID_IHlinkTarget, (void**)&hlink); - ok(hres == S_OK, "Could not get IHlinkTarget iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHlinkTarget iface: %08lx\n", hres); hres = IHlinkTarget_Navigate(hlink, 0, NULL); - ok(hres == S_OK, "Navgate failed: %08x\n", hres); + ok(hres == S_OK, "Navgate failed: %08lx\n", hres); IHlinkTarget_Release(hlink); } @@ -11149,10 +11149,10 @@ static IHTMLDocument2 *create_doc_with_string(const char *str) mem = GlobalAlloc(0, len); memcpy(mem, str, len); hr = CreateStreamOnHGlobal(mem, TRUE, &stream); - ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create a stream, hr %#lx.\n", hr); hr = IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); - ok(hr == S_OK, "Failed to get IPersistStreamInit, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get IPersistStreamInit, hr %#lx.\n", hr); IPersistStreamInit_Load(init, stream); IPersistStreamInit_Release(init); @@ -11169,15 +11169,15 @@ static void do_advise(IUnknown *unk, REFIID riid, IUnknown *unk_advise) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IConnectionPointContainer, (void**)&container); - ok(hres == S_OK, "QueryInterface(IID_IConnectionPointContainer) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IConnectionPointContainer) failed: %08lx\n", hres); hres = IConnectionPointContainer_FindConnectionPoint(container, riid, &cp); IConnectionPointContainer_Release(container); - ok(hres == S_OK, "FindConnectionPoint failed: %08x\n", hres); + ok(hres == S_OK, "FindConnectionPoint failed: %08lx\n", hres); hres = IConnectionPoint_Advise(cp, unk_advise, &cookie); IConnectionPoint_Release(cp); - ok(hres == S_OK, "Advise failed: %08x\n", hres); + ok(hres == S_OK, "Advise failed: %08lx\n", hres); } typedef void (*domtest_t)(IHTMLDocument2*); @@ -11205,7 +11205,7 @@ static void run_domtest(const char *str, domtest_t test) set_client_site(doc, FALSE); ref = IHTMLDocument2_Release(doc); ok(!ref || broken(ref == 1), /* Vista */ - "ref = %d\n", ref); + "ref = %ld\n", ref); } static float expected_document_mode; @@ -11224,11 +11224,11 @@ static void test_document_mode(IHTMLDocument2 *doc2) win_skip("IHTMLDocument6 not supported\n"); return; } - ok(hres == S_OK, "Could not get IHTMLDocument6 interface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLDocument6 interface: %08lx\n", hres); V_VT(&v) = VT_EMPTY; hres = IHTMLDocument6_get_documentMode(doc, &v); - ok(hres == S_OK, "get_documentMode failed: %08x\n", hres); + ok(hres == S_OK, "get_documentMode failed: %08lx\n", hres); ok(V_VT(&v) == VT_R4, "V_VT(documentMode) = %u\n", V_VT(&v)); ok(V_R4(&v) == expected_document_mode, "documentMode = %f\n", V_R4(&v)); IHTMLDocument6_Release(doc); @@ -11237,10 +11237,10 @@ static void test_document_mode(IHTMLDocument2 *doc2) hres = IHTMLDocument2_QueryInterface(doc_node, &IID_IEventTarget, (void**)&event_target); if(expected_document_mode >= 9) { - ok(hres == S_OK, "Could not get IEventTarget interface: %08x\n", hres); + ok(hres == S_OK, "Could not get IEventTarget interface: %08lx\n", hres); IEventTarget_Release(event_target); }else { - ok(hres == E_NOINTERFACE, "QI(IEventTarget) returned %08x\n", hres); + ok(hres == E_NOINTERFACE, "QI(IEventTarget) returned %08lx\n", hres); } IHTMLDocument2_Release(doc_node); @@ -11250,10 +11250,10 @@ static void test_document_mode(IHTMLDocument2 *doc2) hres = IHTMLElement_QueryInterface(body, &IID_IEventTarget, (void**)&event_target); if(expected_document_mode >= 9) { - ok(hres == S_OK, "Could not get IEventTarget interface: %08x\n", hres); + ok(hres == S_OK, "Could not get IEventTarget interface: %08lx\n", hres); IEventTarget_Release(event_target); }else { - ok(hres == E_NOINTERFACE, "QI(IEventTarget) returned %08x\n", hres); + ok(hres == E_NOINTERFACE, "QI(IEventTarget) returned %08lx\n", hres); } IHTMLElement_Release(body); diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index cf6018687eb..4ceee799dd4 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -159,23 +159,23 @@ static void _test_disp(unsigned line, IUnknown *unk, const IID *diid) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IDispatchEx, (void**)&dispex); - ok_(__FILE__,line) (hres == S_OK, "Could not get IDispatch: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IDispatch: %08lx\n", hres); if(FAILED(hres)) return; ticnt = 0xdeadbeef; hres = IDispatchEx_GetTypeInfoCount(dispex, &ticnt); - ok_(__FILE__,line) (hres == S_OK, "GetTypeInfoCount failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "GetTypeInfoCount failed: %08lx\n", hres); ok_(__FILE__,line) (ticnt == 1, "ticnt=%u\n", ticnt); hres = IDispatchEx_GetTypeInfo(dispex, 0, 0, &typeinfo); - ok_(__FILE__,line) (hres == S_OK, "GetTypeInfo failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "GetTypeInfo failed: %08lx\n", hres); if(SUCCEEDED(hres)) { TYPEATTR *type_attr; hres = ITypeInfo_GetTypeAttr(typeinfo, &type_attr); - ok_(__FILE__,line) (hres == S_OK, "GetTypeAttr failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "GetTypeAttr failed: %08lx\n", hres); if(diid) ok_(__FILE__,line) (IsEqualGUID(&type_attr->guid, diid), "unexpected guid %s\n", wine_dbgstr_guid(&type_attr->guid)); @@ -194,7 +194,7 @@ static IHTMLDocument3 *_get_doc3_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLDocument3, (void**)&doc3); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDocument3 iface: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDocument3 iface: %08lx\n", hres); return doc3; } @@ -206,7 +206,7 @@ static IHTMLElement *_get_elem_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLElement, (void**)&elem); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElement iface: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElement iface: %08lx\n", hres); return elem; } @@ -218,7 +218,7 @@ static IHTMLElement2 *_get_elem2_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLElement2, (void**)&elem2); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElement2 iface: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElement2 iface: %08lx\n", hres); return elem2; } @@ -230,7 +230,7 @@ static IHTMLElement3 *_get_elem3_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLElement3, (void**)&elem3); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElement3 iface: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElement3 iface: %08lx\n", hres); return elem3; } @@ -242,7 +242,7 @@ static IHTMLElement4 *_get_elem4_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLElement4, (void**)&elem4); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElement4 iface: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElement4 iface: %08lx\n", hres); return elem4; } @@ -254,7 +254,7 @@ static IHTMLIFrameElement *_get_iframe_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLIFrameElement, (void**)&iframe); - ok_(__FILE__,line)(hres == S_OK, "QueryInterface(IID_IHTMLIFrameElement) failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "QueryInterface(IID_IHTMLIFrameElement) failed: %08lx\n", hres); return iframe; } @@ -266,7 +266,7 @@ static IHTMLElement *_doc_get_body(unsigned line, IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLDocument2_get_body(doc, &body); - ok_(__FILE__,line) (hres == S_OK, "get_body failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_body failed: %08lx\n", hres); ok_(__FILE__,line) (body != NULL, "body == NULL\n"); return body; @@ -284,7 +284,7 @@ static IHTMLElement *_get_elem_id(unsigned line, IHTMLDocument2 *doc, const WCHA hres = IHTMLDocument3_getElementById(doc3, str, &elem); SysFreeString(str); IHTMLDocument3_Release(doc3); - ok_(__FILE__,line) (hres == S_OK, "getElementById failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "getElementById failed: %08lx\n", hres); ok_(__FILE__,line) (elem != NULL, "elem == NULL\n"); return elem; @@ -299,7 +299,7 @@ static void _test_elem_tag(unsigned line, IUnknown *unk, const WCHAR *extag) hres = IHTMLElement_get_tagName(elem, &tag); IHTMLElement_Release(elem); - ok_(__FILE__, line) (hres == S_OK, "get_tagName failed: %08x\n", hres); + ok_(__FILE__, line) (hres == S_OK, "get_tagName failed: %08lx\n", hres); ok_(__FILE__, line) (!lstrcmpW(tag, extag), "got tag: %s, expected %s\n", wine_dbgstr_w(tag), wine_dbgstr_w(extag)); SysFreeString(tag); @@ -312,7 +312,7 @@ static IHTMLEventObj *_get_event_obj(unsigned line) HRESULT hres; hres = IHTMLWindow2_get_event(window, &event); - ok_(__FILE__,line) (hres == S_OK, "get_event failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_event failed: %08lx\n", hres); ok_(__FILE__,line) (event != NULL, "event = NULL\n"); /* Native IE uses an undocumented DIID in IE9+ mode */ @@ -329,7 +329,7 @@ static void _set_elem_innerhtml(unsigned line, IHTMLElement *elem, const WCHAR * html = SysAllocString(inner_html); hres = IHTMLElement_put_innerHTML(elem, html); - ok_(__FILE__,line)(hres == S_OK, "put_innerHTML failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_innerHTML failed: %08lx\n", hres); SysFreeString(html); } @@ -347,7 +347,7 @@ static void _elem_fire_event(unsigned line, IUnknown *unk, const WCHAR *event, V hres = IHTMLElement3_fireEvent(elem3, str, evobj, &b); in_fire_event--; SysFreeString(str); - ok_(__FILE__,line)(hres == S_OK, "fireEvent failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "fireEvent failed: %08lx\n", hres); ok_(__FILE__,line)(b == VARIANT_TRUE, "fireEvent returned %x\n", b); } @@ -355,12 +355,12 @@ static void _elem_fire_event(unsigned line, IUnknown *unk, const WCHAR *event, V static void _test_event_args(unsigned line, const IID *dispiid, DISPID id, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { - ok_(__FILE__,line) (id == DISPID_VALUE, "id = %d\n", id); + ok_(__FILE__,line) (id == DISPID_VALUE, "id = %ld\n", id); ok_(__FILE__,line) (wFlags == DISPATCH_METHOD, "wFlags = %x\n", wFlags); ok_(__FILE__,line) (pdp != NULL, "pdp == NULL\n"); ok_(__FILE__,line) (pdp->cArgs == (document_mode < 9 ? 1 : 2), "pdp->cArgs = %d\n", pdp->cArgs); ok_(__FILE__,line) (pdp->cNamedArgs == 1, "pdp->cNamedArgs = %d\n", pdp->cNamedArgs); - ok_(__FILE__,line) (pdp->rgdispidNamedArgs[0] == DISPID_THIS, "pdp->rgdispidNamedArgs[0] = %d\n", + ok_(__FILE__,line) (pdp->rgdispidNamedArgs[0] == DISPID_THIS, "pdp->rgdispidNamedArgs[0] = %ld\n", pdp->rgdispidNamedArgs[0]); ok_(__FILE__,line) (V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(rgvarg) = %d\n", V_VT(pdp->rgvarg)); if(pdp->cArgs > 1) @@ -379,15 +379,15 @@ static void _test_event_args(unsigned line, const IID *dispiid, DISPID id, WORD hres = IDispatch_QueryInterface(V_DISPATCH(pdp->rgvarg+1), &IID_IDOMEvent, (void**)&event); if(in_fire_event) - ok(hres == E_NOINTERFACE, "QI(IID_IDOMEvent) returned %08x\n", hres); + ok(hres == E_NOINTERFACE, "QI(IID_IDOMEvent) returned %08lx\n", hres); else - ok(hres == S_OK, "Could not get IDOMEvent iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IDOMEvent iface: %08lx\n", hres); hres = IDispatch_QueryInterface(V_DISPATCH(pdp->rgvarg+1), &IID_IHTMLEventObj, (void**)&event_obj); if(in_fire_event) - ok(hres == S_OK, "Could not get IDOMEventObj iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IDOMEventObj iface: %08lx\n", hres); else - ok(hres == E_NOINTERFACE, "QI(IID_IHTMLEventObj) returned %08x\n", hres); + ok(hres == E_NOINTERFACE, "QI(IID_IHTMLEventObj) returned %08lx\n", hres); if(event) IDOMEvent_Release(event); @@ -395,7 +395,7 @@ static void _test_event_args(unsigned line, const IID *dispiid, DISPID id, WORD IHTMLEventObj_Release(event_obj); hres = IHTMLWindow2_get_event(window, &window_event); - ok(hres == S_OK, "get_event failed: %08x\n", hres); + ok(hres == S_OK, "get_event failed: %08lx\n", hres); if(window_event) { todo_wine_if(in_fire_event) ok(!iface_cmp((IUnknown*)V_DISPATCH(pdp->rgvarg+1), (IUnknown*)window_event), @@ -411,7 +411,7 @@ static void _test_attached_event_args(unsigned line, DISPID id, WORD wFlags, DIS { IHTMLEventObj *event; - ok(id == DISPID_VALUE, "id = %d\n", id); + ok(id == DISPID_VALUE, "id = %ld\n", id); ok(wFlags == DISPATCH_METHOD, "wFlags = %x\n", wFlags); ok(pdp != NULL, "pDispParams == NULL\n"); ok(pdp->cArgs == 1, "pdp->cArgs = %d\n", pdp->cArgs); @@ -439,7 +439,7 @@ static IHTMLElement *_get_event_src(unsigned line) hres = IHTMLEventObj_get_srcElement(event, &src_elem); IHTMLEventObj_Release(event); - ok_(__FILE__,line) (hres == S_OK, "get_srcElement failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_srcElement failed: %08lx\n", hres); return src_elem; } @@ -464,7 +464,7 @@ static void _test_event_altkey(unsigned line, IHTMLEventObj *event, VARIANT_BOOL HRESULT hres; hres = IHTMLEventObj_get_altKey(event, &b); - ok_(__FILE__,line)(hres == S_OK, "get_altKey failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_altKey failed: %08lx\n", hres); ok_(__FILE__,line)(b == exval, "altKey = %x, expected %x\n", b, exval); } @@ -474,7 +474,7 @@ static void _test_event_ctrlkey(unsigned line, IHTMLEventObj *event, VARIANT_BOO HRESULT hres; hres = IHTMLEventObj_get_ctrlKey(event, &b); - ok_(__FILE__,line)(hres == S_OK, "get_ctrlKey failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_ctrlKey failed: %08lx\n", hres); ok_(__FILE__,line)(b == exval, "ctrlKey = %x, expected %x\n", b, exval); } @@ -484,7 +484,7 @@ static void _test_event_shiftkey(unsigned line, IHTMLEventObj *event, VARIANT_BO HRESULT hres; hres = IHTMLEventObj_get_shiftKey(event, &b); - ok_(__FILE__,line)(hres == S_OK, "get_shiftKey failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_shiftKey failed: %08lx\n", hres); ok_(__FILE__,line)(b == exval, "shiftKey = %x, expected %x\n", b, exval); } @@ -495,7 +495,7 @@ static void _test_event_cancelbubble(unsigned line, IHTMLEventObj *event, VARIAN HRESULT hres; hres = IHTMLEventObj_get_cancelBubble(event, &b); - ok_(__FILE__,line)(hres == S_OK, "get_cancelBubble failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_cancelBubble failed: %08lx\n", hres); ok_(__FILE__,line)(b == exval, "cancelBubble = %x, expected %x\n", b, exval); } @@ -505,7 +505,7 @@ static void _test_event_fromelem(unsigned line, IHTMLEventObj *event, const WCHA HRESULT hres; hres = IHTMLEventObj_get_fromElement(event, &elem); - ok_(__FILE__,line)(hres == S_OK, "get_fromElement failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_fromElement failed: %08lx\n", hres); if(from_tag) _test_elem_tag(line, (IUnknown*)elem, from_tag); else @@ -520,7 +520,7 @@ static void _test_event_toelem(unsigned line, IHTMLEventObj *event, const WCHAR HRESULT hres; hres = IHTMLEventObj_get_toElement(event, &elem); - ok_(__FILE__,line)(hres == S_OK, "get_toElement failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_toElement failed: %08lx\n", hres); if(to_tag) _test_elem_tag(line, (IUnknown*)elem, to_tag); else @@ -535,8 +535,8 @@ static void _test_event_keycode(unsigned line, IHTMLEventObj *event, LONG exl) HRESULT hres; hres = IHTMLEventObj_get_keyCode(event, &l); - ok_(__FILE__,line)(hres == S_OK, "get_keyCode failed: %08x\n", hres); - ok_(__FILE__,line)(l == exl, "keyCode = %x, expected %x\n", l, exl); + ok_(__FILE__,line)(hres == S_OK, "get_keyCode failed: %08lx\n", hres); + ok_(__FILE__,line)(l == exl, "keyCode = %lx, expected %lx\n", l, exl); } static void _test_event_button(unsigned line, IHTMLEventObj *event, LONG exl) @@ -545,8 +545,8 @@ static void _test_event_button(unsigned line, IHTMLEventObj *event, LONG exl) HRESULT hres; hres = IHTMLEventObj_get_button(event, &l); - ok_(__FILE__,line)(hres == S_OK, "get_button failed: %08x\n", hres); - ok_(__FILE__,line)(l == exl, "button = %x, expected %x\n", l, exl); + ok_(__FILE__,line)(hres == S_OK, "get_button failed: %08lx\n", hres); + ok_(__FILE__,line)(l == exl, "button = %lx, expected %lx\n", l, exl); } static void _test_event_reason(unsigned line, IHTMLEventObj *event, LONG exl) @@ -555,8 +555,8 @@ static void _test_event_reason(unsigned line, IHTMLEventObj *event, LONG exl) HRESULT hres; hres = IHTMLEventObj_get_reason(event, &l); - ok_(__FILE__,line)(hres == S_OK, "get_reason failed: %08x\n", hres); - ok_(__FILE__,line)(l == exl, "reason = %x, expected %x\n", l, exl); + ok_(__FILE__,line)(hres == S_OK, "get_reason failed: %08lx\n", hres); + ok_(__FILE__,line)(l == exl, "reason = %lx, expected %lx\n", l, exl); } static void _test_event_x(unsigned line, IHTMLEventObj *event, LONG exl) @@ -565,9 +565,9 @@ static void _test_event_x(unsigned line, IHTMLEventObj *event, LONG exl) HRESULT hres; hres = IHTMLEventObj_get_x(event, &l); - ok_(__FILE__,line)(hres == S_OK, "get_x failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_x failed: %08lx\n", hres); if(exl != -10) /* don't test the exact value */ - ok_(__FILE__,line)(l == exl, "x = %d, expected %d\n", l, exl); + ok_(__FILE__,line)(l == exl, "x = %ld, expected %ld\n", l, exl); } static void _test_event_y(unsigned line, IHTMLEventObj *event, LONG exl) @@ -576,9 +576,9 @@ static void _test_event_y(unsigned line, IHTMLEventObj *event, LONG exl) HRESULT hres; hres = IHTMLEventObj_get_y(event, &l); - ok_(__FILE__,line)(hres == S_OK, "get_y failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_y failed: %08lx\n", hres); if(exl != -10) /* don't test the exact value */ - ok_(__FILE__,line)(l == exl, "y = %d, expected %d\n", l, exl); + ok_(__FILE__,line)(l == exl, "y = %ld, expected %ld\n", l, exl); } static void _test_event_clientx(unsigned line, IHTMLEventObj *event, LONG exl) @@ -587,9 +587,9 @@ static void _test_event_clientx(unsigned line, IHTMLEventObj *event, LONG exl) HRESULT hres; hres = IHTMLEventObj_get_clientX(event, &l); - ok_(__FILE__,line)(hres == S_OK, "get_clientX failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_clientX failed: %08lx\n", hres); if(exl != -10) /* don't test the exact value */ - ok_(__FILE__,line)(l == exl, "clientX = %d, expected %d\n", l, exl); + ok_(__FILE__,line)(l == exl, "clientX = %ld, expected %ld\n", l, exl); } static void _test_event_clienty(unsigned line, IHTMLEventObj *event, LONG exl) @@ -598,9 +598,9 @@ static void _test_event_clienty(unsigned line, IHTMLEventObj *event, LONG exl) HRESULT hres; hres = IHTMLEventObj_get_clientY(event, &l); - ok_(__FILE__,line)(hres == S_OK, "get_clientY failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_clientY failed: %08lx\n", hres); if(exl != -10) /* don't test the exact value */ - ok_(__FILE__,line)(l == exl, "clientY = %d, expected %d\n", l, exl); + ok_(__FILE__,line)(l == exl, "clientY = %ld, expected %ld\n", l, exl); } static void _test_event_offsetx(unsigned line, IHTMLEventObj *event, LONG exl) @@ -609,9 +609,9 @@ static void _test_event_offsetx(unsigned line, IHTMLEventObj *event, LONG exl) HRESULT hres; hres = IHTMLEventObj_get_offsetX(event, &l); - ok_(__FILE__,line)(hres == S_OK, "get_offsetX failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_offsetX failed: %08lx\n", hres); if(exl != -10) /* don't test the exact value */ - ok_(__FILE__,line)(l == exl, "offsetX = %d, expected %d\n", l, exl); + ok_(__FILE__,line)(l == exl, "offsetX = %ld, expected %ld\n", l, exl); } static void _test_event_offsety(unsigned line, IHTMLEventObj *event, LONG exl) @@ -620,9 +620,9 @@ static void _test_event_offsety(unsigned line, IHTMLEventObj *event, LONG exl) HRESULT hres; hres = IHTMLEventObj_get_offsetY(event, &l); - ok_(__FILE__,line)(hres == S_OK, "get_offsetY failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_offsetY failed: %08lx\n", hres); if(exl != -10) /* don't test the exact value */ - ok_(__FILE__,line)(l == exl, "offsetY = %d, expected %d\n", l, exl); + ok_(__FILE__,line)(l == exl, "offsetY = %ld, expected %ld\n", l, exl); } static void _test_event_screenx(unsigned line, IHTMLEventObj *event, LONG exl) @@ -631,9 +631,9 @@ static void _test_event_screenx(unsigned line, IHTMLEventObj *event, LONG exl) HRESULT hres; hres = IHTMLEventObj_get_screenX(event, &l); - ok_(__FILE__,line)(hres == S_OK, "get_screenX failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_screenX failed: %08lx\n", hres); if(exl != -10) /* don't test the exact value */ - ok_(__FILE__,line)(l == exl, "screenX = %d, expected %d\n", l, exl); + ok_(__FILE__,line)(l == exl, "screenX = %ld, expected %ld\n", l, exl); } static void _test_event_screeny(unsigned line, IHTMLEventObj *event, LONG exl) @@ -642,9 +642,9 @@ static void _test_event_screeny(unsigned line, IHTMLEventObj *event, LONG exl) HRESULT hres; hres = IHTMLEventObj_get_screenY(event, &l); - ok_(__FILE__,line)(hres == S_OK, "get_screenY failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_screenY failed: %08lx\n", hres); if(exl != -10) /* don't test the exact value for -10 */ - ok_(__FILE__,line)(l == exl, "screenY = %d, expected %d\n", l, exl); + ok_(__FILE__,line)(l == exl, "screenY = %ld, expected %ld\n", l, exl); } static void _test_event_type(unsigned line, IHTMLEventObj *event, const WCHAR *exstr) @@ -653,7 +653,7 @@ static void _test_event_type(unsigned line, IHTMLEventObj *event, const WCHAR *e HRESULT hres; hres = IHTMLEventObj_get_type(event, &str); - ok_(__FILE__,line)(hres == S_OK, "get_type failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_type failed: %08lx\n", hres); ok_(__FILE__,line)(!lstrcmpW(str, exstr), "type = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(exstr)); } @@ -663,7 +663,7 @@ static void _test_event_qualifier(unsigned line, IHTMLEventObj *event, const WCH HRESULT hres; hres = IHTMLEventObj_get_qualifier(event, &str); - ok_(__FILE__,line)(hres == S_OK, "get_qualifier failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_qualifier failed: %08lx\n", hres); if(exstr) ok_(__FILE__,line)(!lstrcmpW(str, exstr), "qualifier = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(exstr)); @@ -677,7 +677,7 @@ static void _test_event_srcfilter(unsigned line, IHTMLEventObj *event) HRESULT hres; hres = IHTMLEventObj_get_srcFilter(event, &disp); - ok_(__FILE__,line)(hres == S_OK, "get_srcFilter failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_srcFilter failed: %08lx\n", hres); ok_(__FILE__,line)(!disp, "srcFilter != NULL\n"); } @@ -712,7 +712,7 @@ static void _test_event_obj(unsigned line, const WCHAR *type, const xy_test_t *x V_VT(&v) = VT_NULL; hres = IHTMLEventObj_get_returnValue(event, &v); - ok_(__FILE__,line)(hres == S_OK, "get_returnValue failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_returnValue failed: %08lx\n", hres); /* Depending on source of event, returnValue may be true bool in IE9+ mode */ ok_(__FILE__,line)(V_VT(&v) == VT_EMPTY || (document_mode >= 9 && V_VT(&v) == VT_BOOL), "V_VT(returnValue) = %d\n", V_VT(&v)); @@ -720,7 +720,7 @@ static void _test_event_obj(unsigned line, const WCHAR *type, const xy_test_t *x ok_(__FILE__,line)(V_BOOL(&v) == VARIANT_TRUE, "V_BOOL(returnValue) = %x\n", V_BOOL(&v)); hres = IHTMLEventObj_QueryInterface(event, &IID_IDOMEvent, (void**)&dom_event); - ok(hres == E_NOINTERFACE, "Could not get IDOMEvent iface: %08x\n", hres); + ok(hres == E_NOINTERFACE, "Could not get IDOMEvent iface: %08lx\n", hres); IHTMLEventObj_Release(event); } @@ -737,7 +737,7 @@ static void _elem_attach_event(unsigned line, IUnknown *unk, const WCHAR *namew, hres = IHTMLElement2_attachEvent(elem, name, disp, &res); IHTMLElement2_Release(elem); SysFreeString(name); - ok_(__FILE__,line)(hres == S_OK, "attachEvent failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "attachEvent failed: %08lx\n", hres); ok_(__FILE__,line)(res == VARIANT_TRUE, "attachEvent returned %x\n", res); } @@ -749,12 +749,12 @@ static void _add_event_listener(unsigned line, IUnknown *unk, const WCHAR *type, HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IEventTarget, (void**)&event_target); - ok_(__FILE__,line)(hres == S_OK, "Could not get IEventTarget iface: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "Could not get IEventTarget iface: %08lx\n", hres); str = SysAllocString(type); hres = IEventTarget_addEventListener(event_target, str, listener, use_capture); SysFreeString(str); - ok_(__FILE__,line)(hres == S_OK, "addEventListener failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "addEventListener failed: %08lx\n", hres); IEventTarget_Release(event_target); } @@ -767,12 +767,12 @@ static void _remove_event_listener(unsigned line, IUnknown *unk, const WCHAR *ty HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IEventTarget, (void**)&event_target); - ok_(__FILE__,line)(hres == S_OK, "Could not get IEventTarget iface: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "Could not get IEventTarget iface: %08lx\n", hres); str = SysAllocString(type); hres = IEventTarget_removeEventListener(event_target, str, listener, use_capture); SysFreeString(str); - ok_(__FILE__,line)(hres == S_OK, "removeEventListener failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "removeEventListener failed: %08lx\n", hres); IEventTarget_Release(event_target); } @@ -788,7 +788,7 @@ static void _elem_detach_event(unsigned line, IUnknown *unk, const WCHAR *namew, hres = IHTMLElement2_detachEvent(elem, name, disp); IHTMLElement2_Release(elem); SysFreeString(name); - ok_(__FILE__,line)(hres == S_OK, "detachEvent failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "detachEvent failed: %08lx\n", hres); } #define doc_attach_event(a,b,c) _doc_attach_event(__LINE__,a,b,c) @@ -803,7 +803,7 @@ static void _doc_attach_event(unsigned line, IHTMLDocument2 *doc, const WCHAR *n hres = IHTMLDocument3_attachEvent(doc3, name, disp, &res); IHTMLDocument3_Release(doc3); SysFreeString(name); - ok_(__FILE__,line)(hres == S_OK, "attachEvent failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "attachEvent failed: %08lx\n", hres); ok_(__FILE__,line)(res == VARIANT_TRUE, "attachEvent returned %x\n", res); } @@ -818,7 +818,7 @@ static void _doc_detach_event(unsigned line, IHTMLDocument2 *doc, const WCHAR *n hres = IHTMLDocument3_detachEvent(doc3, name, disp); IHTMLDocument3_Release(doc3); SysFreeString(name); - ok_(__FILE__,line)(hres == S_OK, "detachEvent failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "detachEvent failed: %08lx\n", hres); } static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) @@ -902,7 +902,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) { - ok(0, "unexpected call %s %x\n", wine_dbgstr_w(bstrName), grfdex); + ok(0, "unexpected call %s %lx\n", wine_dbgstr_w(bstrName), grfdex); return E_NOTIMPL; } @@ -1214,7 +1214,7 @@ static HRESULT WINAPI submit_onclick_attached_check_cancel(IDispatchEx *iface, D event = NULL; hres = IHTMLWindow2_get_event(window, &event); - ok(hres == S_OK, "get_event failed: %08x\n", hres); + ok(hres == S_OK, "get_event failed: %08lx\n", hres); ok(event != NULL, "event == NULL\n"); test_event_cancelbubble(event, VARIANT_TRUE); @@ -1238,12 +1238,12 @@ static HRESULT WINAPI submit_onclick_setret(IDispatchEx *iface, DISPID id, LCID event = NULL; hres = IHTMLWindow2_get_event(window, &event); - ok(hres == S_OK, "get_event failed: %08x\n", hres); + ok(hres == S_OK, "get_event failed: %08lx\n", hres); ok(event != NULL, "event == NULL\n"); V_VT(&v) = VT_ERROR; hres = IHTMLEventObj_get_returnValue(event, &v); - ok(hres == S_OK, "get_returnValue failed: %08x\n", hres); + ok(hres == S_OK, "get_returnValue failed: %08lx\n", hres); if(document_mode < 9) { ok(V_VT(&v) == VT_EMPTY, "V_VT(returnValue) = %d\n", V_VT(&v)); }else todo_wine { @@ -1252,11 +1252,11 @@ static HRESULT WINAPI submit_onclick_setret(IDispatchEx *iface, DISPID id, LCID } hres = IHTMLEventObj_put_returnValue(event, onclick_event_retval); - ok(hres == S_OK, "put_returnValue failed: %08x\n", hres); + ok(hres == S_OK, "put_returnValue failed: %08lx\n", hres); V_VT(&v) = VT_ERROR; hres = IHTMLEventObj_get_returnValue(event, &v); - ok(hres == S_OK, "get_returnValue failed: %08x\n", hres); + ok(hres == S_OK, "get_returnValue failed: %08lx\n", hres); ok(VarCmp(&v, &onclick_event_retval, 0, 0) == VARCMP_EQ, "unexpected returnValue\n"); IHTMLEventObj_Release(event); @@ -1278,13 +1278,13 @@ static HRESULT WINAPI submit_onclick_cancel(IDispatchEx *iface, DISPID id, LCID event = NULL; hres = IHTMLWindow2_get_event(window, &event); - ok(hres == S_OK, "get_event failed: %08x\n", hres); + ok(hres == S_OK, "get_event failed: %08lx\n", hres); ok(event != NULL, "event == NULL\n"); test_event_cancelbubble(event, VARIANT_FALSE); hres = IHTMLEventObj_put_cancelBubble(event, VARIANT_TRUE); - ok(hres == S_OK, "put_returnValue failed: %08x\n", hres); + ok(hres == S_OK, "put_returnValue failed: %08lx\n", hres); test_event_cancelbubble(event, VARIANT_TRUE); IHTMLEventObj_Release(event); @@ -1304,7 +1304,7 @@ static HRESULT WINAPI iframedoc_onreadystatechange(IDispatchEx *iface, DISPID id event = (void*)0xdeadbeef; hres = IHTMLWindow2_get_event(window, &event); - ok(hres == S_OK, "get_event failed: %08x\n", hres); + ok(hres == S_OK, "get_event failed: %08lx\n", hres); ok(!event, "event = %p\n", event); return S_OK; @@ -1333,29 +1333,29 @@ static HRESULT WINAPI iframe_onreadystatechange(IDispatchEx *iface, DISPID id, L V_VT(&v) = VT_EMPTY; hres = IHTMLElement2_get_readyState(elem2, &v); - ok(hres == S_OK, "get_readyState failed: %08x\n", hres); + ok(hres == S_OK, "get_readyState failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(readyState) = %d\n", V_VT(&v)); hres = IHTMLElement2_QueryInterface(elem2, &IID_IHTMLFrameBase2, (void**)&iframe); IHTMLElement2_Release(elem2); - ok(hres == S_OK, "Could not get IHTMLFrameBase2 iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLFrameBase2 iface: %08lx\n", hres); str = NULL; hres = IHTMLFrameBase2_get_readyState(iframe, &str); - ok(hres == S_OK, "get_readyState failed: %08x\n", hres); + ok(hres == S_OK, "get_readyState failed: %08lx\n", hres); ok(str != NULL, "readyState == NULL\n"); ok(!lstrcmpW(str, V_BSTR(&v)), "ready states differ\n"); VariantClear(&v); hres = IHTMLFrameBase2_get_contentWindow(iframe, &iframe_window); - ok(hres == S_OK, "get_contentDocument failed: %08x\n", hres); + ok(hres == S_OK, "get_contentDocument failed: %08lx\n", hres); hres = IHTMLWindow2_get_document(iframe_window, &iframe_doc); IHTMLWindow2_Release(iframe_window); - ok(hres == S_OK, "get_document failed: %08x\n", hres); + ok(hres == S_OK, "get_document failed: %08lx\n", hres); hres = IHTMLDocument2_get_readyState(iframe_doc, &str2); - ok(hres == S_OK, "get_document failed: %08x\n", hres); + ok(hres == S_OK, "get_document failed: %08lx\n", hres); ok(!lstrcmpW(str, str2), "unexpected document readyState %s\n", wine_dbgstr_w(str2)); SysFreeString(str2); @@ -1365,7 +1365,7 @@ static HRESULT WINAPI iframe_onreadystatechange(IDispatchEx *iface, DISPID id, L V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = (IDispatch*)&iframedoc_onreadystatechange_obj; hres = IHTMLDocument2_put_onreadystatechange(iframe_doc, v); - ok(hres == S_OK, "put_onreadystatechange: %08x\n", hres); + ok(hres == S_OK, "put_onreadystatechange: %08lx\n", hres); }else if(!lstrcmpW(str, L"interactive")) CHECK_EXPECT(iframe_onreadystatechange_interactive); else if(!lstrcmpW(str, L"complete")) @@ -1437,7 +1437,7 @@ static void _test_cp_args(unsigned line, REFIID riid, WORD flags, DISPPARAMS *dp ok_(__FILE__,line)(dp->rgvarg != NULL, "dp->rgvarg = %p\n", dp->rgvarg); ok_(__FILE__,line)(V_VT(&dp->rgvarg[0]) == VT_DISPATCH, "vt = %d\n", V_VT(&dp->rgvarg[0])); hr = IDispatch_QueryInterface(V_DISPATCH(&dp->rgvarg[0]), &IID_IHTMLEventObj, (void **)&event); - ok_(__FILE__,line)(hr == S_OK, "Could not get IHTMLEventObj iface: %08x\n", hr); + ok_(__FILE__,line)(hr == S_OK, "Could not get IHTMLEventObj iface: %08lx\n", hr); IHTMLEventObj_Release(event); } else @@ -1489,7 +1489,7 @@ static HRESULT WINAPI doccp(IDispatchEx *iface, DISPID dispIdMember, test_cp_args(riid, wFlags, pdp, pVarResult, pei, puArgErr, FALSE); break; default: - ok(0, "unexpected call %d\n", dispIdMember); + ok(0, "unexpected call %ld\n", dispIdMember); return E_NOTIMPL; } @@ -1508,7 +1508,7 @@ static HRESULT WINAPI doccp2(IDispatchEx *iface, DISPID dispIdMember, test_cp_args(riid, wFlags, pdp, pVarResult, pei, puArgErr, TRUE); break; default: - ok(0, "unexpected call %d\n", dispIdMember); + ok(0, "unexpected call %ld\n", dispIdMember); return E_NOTIMPL; } @@ -1528,7 +1528,7 @@ static HRESULT WINAPI doccp_onclick_cancel(IDispatchEx *iface, DISPID dispIdMemb V_BOOL(pVarResult) = VARIANT_FALSE; break; default: - ok(0, "unexpected call %d\n", dispIdMember); + ok(0, "unexpected call %ld\n", dispIdMember); return E_NOTIMPL; } @@ -1546,7 +1546,7 @@ static HRESULT WINAPI elem2_cp(IDispatchEx *iface, DISPID dispIdMember, REFIID r test_cp_eventarg(riid, wFlags, pdp, pVarResult, pei, puArgErr); break; default: - ok(0, "unexpected call %d\n", dispIdMember); + ok(0, "unexpected call %ld\n", dispIdMember); return E_NOTIMPL; } @@ -1561,10 +1561,10 @@ static HRESULT WINAPI timeoutFunc_Invoke(IDispatchEx *iface, DISPID dispIdMember { CHECK_EXPECT(timeout); - ok(dispIdMember == DISPID_VALUE, "dispIdMember = %d\n", dispIdMember); + ok(dispIdMember == DISPID_VALUE, "dispIdMember = %ld\n", dispIdMember); ok(IsEqualGUID(&IID_NULL, riid), "riid = %s\n", wine_dbgstr_guid(riid)); ok(wFlags == DISPATCH_METHOD, "wFlags = %x\n", wFlags); - ok(!lcid, "lcid = %x\n", lcid); + ok(!lcid, "lcid = %lx\n", lcid); ok(pDispParams != NULL, "pDispParams == NULL\n"); ok(!pDispParams->cArgs, "pdp->cArgs = %d\n", pDispParams->cArgs); ok(!pDispParams->cNamedArgs, "pdp->cNamedArgs = %d\n", pDispParams->cNamedArgs); @@ -1676,11 +1676,11 @@ static IConnectionPoint *get_cp(IUnknown *unk, REFIID riid) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IConnectionPointContainer, (void**)&cp_container); - ok(hres == S_OK, "Could not get IConnectionPointContainer: %08x\n", hres); + ok(hres == S_OK, "Could not get IConnectionPointContainer: %08lx\n", hres); hres = IConnectionPointContainer_FindConnectionPoint(cp_container, riid, &cp); IConnectionPointContainer_Release(cp_container); - ok(hres == S_OK, "FindConnectionPoint failed: %08x\n", hres); + ok(hres == S_OK, "FindConnectionPoint failed: %08lx\n", hres); return cp; } @@ -1694,7 +1694,7 @@ static DWORD register_cp(IUnknown *unk, REFIID riid, IUnknown *sink) cp = get_cp(unk, riid); hres = IConnectionPoint_Advise(cp, sink, &cookie); IConnectionPoint_Release(cp); - ok(hres == S_OK, "Advise failed: %08x\n", hres); + ok(hres == S_OK, "Advise failed: %08lx\n", hres); return cookie; } @@ -1707,7 +1707,7 @@ static void unregister_cp(IUnknown *unk, REFIID riid, DWORD cookie) cp = get_cp(unk, riid); hres = IConnectionPoint_Unadvise(cp, cookie); IConnectionPoint_Release(cp); - ok(hres == S_OK, "Unadvise failed: %08x\n", hres); + ok(hres == S_OK, "Unadvise failed: %08lx\n", hres); } static HRESULT WINAPI EventDispatch_QueryInterface(IDispatch *iface, REFIID riid, void **ppv) @@ -1777,7 +1777,7 @@ static HRESULT WINAPI EventDispatch_Invoke(IDispatch *iface, DISPID dispIdMember case 1049: break; /* TODO */ default: - ok(0, "Unexpected call: %d\n", dispIdMember); + ok(0, "Unexpected call: %ld\n", dispIdMember); } return S_OK; @@ -1825,27 +1825,27 @@ static void test_onclick(IHTMLDocument2 *doc) V_VT(&v) = VT_EMPTY; hres = IHTMLElement_get_onclick(div, &v); - ok(hres == S_OK, "get_onclick failed: %08x\n", hres); + ok(hres == S_OK, "get_onclick failed: %08lx\n", hres); ok(V_VT(&v) == VT_NULL, "V_VT(onclick) = %d\n", V_VT(&v)); V_VT(&v) = VT_EMPTY; hres = IHTMLElement_put_onclick(div, v); - ok(hres == (document_mode < 9 ? E_NOTIMPL : S_OK), "put_onclick failed: %08x\n", hres); + ok(hres == (document_mode < 9 ? E_NOTIMPL : S_OK), "put_onclick failed: %08lx\n", hres); V_VT(&v) = VT_EMPTY; hres = IHTMLElement_get_onclick(div, &v); - ok(hres == S_OK, "get_onclick failed: %08x\n", hres); + ok(hres == S_OK, "get_onclick failed: %08lx\n", hres); ok(V_VT(&v) == VT_NULL, "V_VT(onclick) = %d\n", V_VT(&v)); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"function();"); hres = IHTMLElement_put_onclick(div, v); - ok(hres == S_OK, "put_onclick failed: %08x\n", hres); + ok(hres == S_OK, "put_onclick failed: %08lx\n", hres); SysFreeString(V_BSTR(&v)); V_VT(&v) = VT_EMPTY; hres = IHTMLElement_get_onclick(div, &v); - ok(hres == S_OK, "get_onclick failed: %08x\n", hres); + ok(hres == S_OK, "get_onclick failed: %08lx\n", hres); if(document_mode < 9) { ok(V_VT(&v) == VT_BSTR, "V_VT(onclick) = %d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"function();"), "V_BSTR(onclick) = %s\n", wine_dbgstr_w(V_BSTR(&v))); @@ -1858,32 +1858,32 @@ static void test_onclick(IHTMLDocument2 *doc) V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = (IDispatch*)&div_onclick_obj; hres = IHTMLElement_put_onclick(div, v); - ok(hres == S_OK, "put_onclick failed: %08x\n", hres); + ok(hres == S_OK, "put_onclick failed: %08lx\n", hres); V_VT(&v) = VT_NULL; hres = IHTMLElement_put_ondblclick(div, v); - ok(hres == S_OK, "put_ondblclick failed: %08x\n", hres); + ok(hres == S_OK, "put_ondblclick failed: %08lx\n", hres); V_VT(&v) = VT_EMPTY; hres = IHTMLElement_get_onclick(div, &v); - ok(hres == S_OK, "get_onclick failed: %08x\n", hres); + ok(hres == S_OK, "get_onclick failed: %08lx\n", hres); ok(V_VT(&v) == VT_DISPATCH, "V_VT(onclick) = %d\n", V_VT(&v)); ok(V_DISPATCH(&v) == (IDispatch*)&div_onclick_obj, "V_DISPATCH(onclick) != onclickFunc\n"); VariantClear(&v); V_VT(&v) = VT_EMPTY; hres = IHTMLDocument2_get_onclick(doc, &v); - ok(hres == S_OK, "get_onclick failed: %08x\n", hres); + ok(hres == S_OK, "get_onclick failed: %08lx\n", hres); ok(V_VT(&v) == VT_NULL, "V_VT(onclick) = %d\n", V_VT(&v)); V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = (IDispatch*)&document_onclick_obj; hres = IHTMLDocument2_put_onclick(doc, v); - ok(hres == S_OK, "put_onclick failed: %08x\n", hres); + ok(hres == S_OK, "put_onclick failed: %08lx\n", hres); V_VT(&v) = VT_EMPTY; hres = IHTMLDocument2_get_onclick(doc, &v); - ok(hres == S_OK, "get_onclick failed: %08x\n", hres); + ok(hres == S_OK, "get_onclick failed: %08lx\n", hres); ok(V_VT(&v) == VT_DISPATCH, "V_VT(onclick) = %d\n", V_VT(&v)); ok(V_DISPATCH(&v) == (IDispatch*)&document_onclick_obj, "V_DISPATCH(onclick) != onclickFunc\n"); VariantClear(&v); @@ -1898,7 +1898,7 @@ static void test_onclick(IHTMLDocument2 *doc) V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = (IDispatch*)&body_onclick_obj; hres = IHTMLElement_put_onclick(body, v); - ok(hres == S_OK, "put_onclick failed: %08x\n", hres); + ok(hres == S_OK, "put_onclick failed: %08lx\n", hres); if(winetest_interactive && document_mode < 9) { SET_EXPECT(div_onclick); @@ -1925,7 +1925,7 @@ static void test_onclick(IHTMLDocument2 *doc) SET_EXPECT(invoke_onclick); hres = IHTMLElement_click(div); - ok(hres == S_OK, "click failed: %08x\n", hres); + ok(hres == S_OK, "click failed: %08lx\n", hres); CHECK_CALLED(div_onclick); CHECK_CALLED(div_onclick_attached); @@ -1972,7 +1972,7 @@ static void test_onclick(IHTMLDocument2 *doc) SET_EXPECT(invoke_onclick); hres = IHTMLElement_click(div); - ok(hres == S_OK, "click failed: %08x\n", hres); + ok(hres == S_OK, "click failed: %08lx\n", hres); CHECK_CALLED(div_onclick); CHECK_CALLED(div_onclick_disp); @@ -2007,7 +2007,7 @@ static void test_onclick(IHTMLDocument2 *doc) trace("click >>>\n"); hres = IHTMLElement_click(div); - ok(hres == S_OK, "click failed: %08x\n", hres); + ok(hres == S_OK, "click failed: %08lx\n", hres); trace("click <<<\n"); CHECK_CALLED(div_onclick); @@ -2031,10 +2031,10 @@ static void test_onclick(IHTMLDocument2 *doc) V_VT(&v) = VT_NULL; hres = IHTMLElement_put_onclick(div, v); - ok(hres == S_OK, "put_onclick failed: %08x\n", hres); + ok(hres == S_OK, "put_onclick failed: %08lx\n", hres); hres = IHTMLElement_get_onclick(div, &v); - ok(hres == S_OK, "get_onclick failed: %08x\n", hres); + ok(hres == S_OK, "get_onclick failed: %08lx\n", hres); ok(V_VT(&v) == VT_NULL, "get_onclick returned vt %d\n", V_VT(&v)); elem_detach_event((IUnknown*)div, L"onclick", (IDispatch*)&div_onclick_disp); @@ -2053,7 +2053,7 @@ static void test_onclick(IHTMLDocument2 *doc) SET_EXPECT(invoke_onclick); hres = IHTMLElement_click(div); - ok(hres == S_OK, "click failed: %08x\n", hres); + ok(hres == S_OK, "click failed: %08lx\n", hres); CHECK_CALLED(div_onclick_attached); CHECK_CALLED(body_onclick); @@ -2079,27 +2079,27 @@ static void test_onreadystatechange(IHTMLDocument2 *doc) V_VT(&v) = VT_EMPTY; hres = IHTMLElement2_get_onreadystatechange(elem2, &v); - ok(hres == S_OK, "get_onreadystatechange failed: %08x\n", hres); + ok(hres == S_OK, "get_onreadystatechange failed: %08lx\n", hres); ok(V_VT(&v) == VT_NULL, "V_VT(onreadystatechange) = %d\n", V_VT(&v)); V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = (IDispatch*)&iframe_onreadystatechange_obj; hres = IHTMLElement2_put_onreadystatechange(elem2, v); - ok(hres == S_OK, "put_onreadystatechange failed: %08x\n", hres); + ok(hres == S_OK, "put_onreadystatechange failed: %08lx\n", hres); V_VT(&v) = VT_EMPTY; hres = IHTMLElement2_get_onreadystatechange(elem2, &v); - ok(hres == S_OK, "get_onreadystatechange failed: %08x\n", hres); + ok(hres == S_OK, "get_onreadystatechange failed: %08lx\n", hres); ok(V_VT(&v) == VT_DISPATCH, "V_VT(onreadystatechange) = %d\n", V_VT(&v)); ok(V_DISPATCH(&v) == (IDispatch*)&iframe_onreadystatechange_obj, "unexpected onreadystatechange value\n"); hres = IHTMLElement2_QueryInterface(elem2, &IID_IHTMLFrameBase, (void**)&iframe); IHTMLElement2_Release(elem2); - ok(hres == S_OK, "Could not get IHTMLFrameBase iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLFrameBase iface: %08lx\n", hres); hres = IHTMLFrameBase_put_src(iframe, (str = SysAllocString(L"about:blank"))); SysFreeString(str); - ok(hres == S_OK, "put_src failed: %08x\n", hres); + ok(hres == S_OK, "put_src failed: %08lx\n", hres); SET_EXPECT(iframe_onreadystatechange_loading); SET_EXPECT(iframedoc_onreadystatechange); @@ -2125,21 +2125,21 @@ static void test_imgload(IHTMLDocument2 *doc) elem = get_elem_id(doc, L"imgid"); hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLImgElement, (void**)&img); IHTMLElement_Release(elem); - ok(hres == S_OK, "Could not get IHTMLImgElement iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLImgElement iface: %08lx\n", hres); V_VT(&v) = VT_EMPTY; hres = IHTMLImgElement_get_onload(img, &v); - ok(hres == S_OK, "get_onload failed: %08x\n", hres); + ok(hres == S_OK, "get_onload failed: %08lx\n", hres); ok(V_VT(&v) == VT_NULL, "V_VT(onload) = %d\n", V_VT(&v)); V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = (IDispatch*)&img_onload_obj; hres = IHTMLImgElement_put_onload(img, v); - ok(hres == S_OK, "put_onload failed: %08x\n", hres); + ok(hres == S_OK, "put_onload failed: %08lx\n", hres); V_VT(&v) = VT_EMPTY; hres = IHTMLImgElement_get_onload(img, &v); - ok(hres == S_OK, "get_onload failed: %08x\n", hres); + ok(hres == S_OK, "get_onload failed: %08lx\n", hres); ok(V_VT(&v) == VT_DISPATCH, "V_VT(onload) = %d\n", V_VT(&v)); ok(V_DISPATCH(&v) == (IDispatch*)&img_onload_obj, "V_DISPATCH(onload) != onloadkFunc\n"); VariantClear(&v); @@ -2147,18 +2147,18 @@ static void test_imgload(IHTMLDocument2 *doc) V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = (IDispatch*)&img_onerror_obj; hres = IHTMLImgElement_put_onerror(img, v); - ok(hres == S_OK, "put_onerror failed: %08x\n", hres); + ok(hres == S_OK, "put_onerror failed: %08lx\n", hres); V_VT(&v) = VT_EMPTY; hres = IHTMLImgElement_get_onerror(img, &v); - ok(hres == S_OK, "get_onerror failed: %08x\n", hres); + ok(hres == S_OK, "get_onerror failed: %08lx\n", hres); ok(V_VT(&v) == VT_DISPATCH, "V_VT(onerror) = %d\n", V_VT(&v)); ok(V_DISPATCH(&v) == (IDispatch*)&img_onerror_obj, "V_DISPATCH(onerror) != onerrorFunc\n"); VariantClear(&v); str = SysAllocString(L"http://test.winehq.org/tests/winehq_snapshot/index_files/winehq_logo_text.pn..."); hres = IHTMLImgElement_put_src(img, str); - ok(hres == S_OK, "put_src failed: %08x\n", hres); + ok(hres == S_OK, "put_src failed: %08lx\n", hres); SysFreeString(str); SET_EXPECT(img_onload); @@ -2169,7 +2169,7 @@ static void test_imgload(IHTMLDocument2 *doc) str = SysAllocString(L"about:blank"); hres = IHTMLImgElement_put_src(img, str); - ok(hres == S_OK, "put_src failed: %08x\n", hres); + ok(hres == S_OK, "put_src failed: %08lx\n", hres); SysFreeString(str); pump_msgs(&called_img_onerror); /* FIXME: should not be needed */ @@ -2181,32 +2181,32 @@ static void test_imgload(IHTMLDocument2 *doc) /* test onload on unattached image */ hres = IHTMLDocument2_createElement(doc, (str = SysAllocString(L"img")), &elem); SysFreeString(str); - ok(hres == S_OK, "createElement(img) failed: %08x\n", hres); + ok(hres == S_OK, "createElement(img) failed: %08lx\n", hres); hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLImgElement, (void**)&img); IHTMLElement_Release(elem); - ok(hres == S_OK, "Could not get IHTMLImgElement iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLImgElement iface: %08lx\n", hres); V_VT(&v) = VT_EMPTY; hres = IHTMLImgElement_get_onload(img, &v); - ok(hres == S_OK, "get_onload failed: %08x\n", hres); + ok(hres == S_OK, "get_onload failed: %08lx\n", hres); ok(V_VT(&v) == VT_NULL, "V_VT(onload) = %d\n", V_VT(&v)); V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = (IDispatch*)&unattached_img_onload_obj; hres = IHTMLImgElement_put_onload(img, v); - ok(hres == S_OK, "put_onload failed: %08x\n", hres); + ok(hres == S_OK, "put_onload failed: %08lx\n", hres); V_VT(&v) = VT_EMPTY; hres = IHTMLImgElement_get_onload(img, &v); - ok(hres == S_OK, "get_onload failed: %08x\n", hres); + ok(hres == S_OK, "get_onload failed: %08lx\n", hres); ok(V_VT(&v) == VT_DISPATCH, "V_VT(onload) = %d\n", V_VT(&v)); ok(V_DISPATCH(&v) == (IDispatch*)&unattached_img_onload_obj, "incorrect V_DISPATCH(onload)\n"); VariantClear(&v); str = SysAllocString(L"http://test.winehq.org/tests/winehq_snapshot/index_files/winehq_logo_text.pn..."); hres = IHTMLImgElement_put_src(img, str); - ok(hres == S_OK, "put_src failed: %08x\n", hres); + ok(hres == S_OK, "put_src failed: %08lx\n", hres); SysFreeString(str); SET_EXPECT(img_onload); @@ -2227,28 +2227,28 @@ static void test_link_load(IHTMLDocument2 *doc) elem = get_elem_id(doc, L"linkid"); hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLLinkElement, (void**)&link); IHTMLElement_Release(elem); - ok(hres == S_OK, "Could not get IHTMLLinkElement iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLLinkElement iface: %08lx\n", hres); V_VT(&v) = VT_EMPTY; hres = IHTMLLinkElement_get_onload(link, &v); - ok(hres == S_OK, "get_onload failed: %08x\n", hres); + ok(hres == S_OK, "get_onload failed: %08lx\n", hres); ok(V_VT(&v) == VT_NULL, "V_VT(onload) = %d\n", V_VT(&v)); V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = (IDispatch*)&link_onload_obj; hres = IHTMLLinkElement_put_onload(link, v); - ok(hres == S_OK, "put_onload failed: %08x\n", hres); + ok(hres == S_OK, "put_onload failed: %08lx\n", hres); V_VT(&v) = VT_EMPTY; hres = IHTMLLinkElement_get_onload(link, &v); - ok(hres == S_OK, "get_onload failed: %08x\n", hres); + ok(hres == S_OK, "get_onload failed: %08lx\n", hres); ok(V_VT(&v) == VT_DISPATCH, "V_VT(onload) = %d\n", V_VT(&v)); ok(V_DISPATCH(&v) == (IDispatch*)&link_onload_obj, "V_DISPATCH(onload) != onloadkFunc\n"); VariantClear(&v); str = SysAllocString(L"http://test.winehq.org/tests/winehq_snapshot/index_files/styles.css"); hres = IHTMLLinkElement_put_href(link, str); - ok(hres == S_OK, "put_src failed: %08x\n", hres); + ok(hres == S_OK, "put_src failed: %08lx\n", hres); SysFreeString(str); SET_EXPECT(link_onload); @@ -2276,17 +2276,17 @@ static void test_focus(IHTMLDocument2 *doc) V_VT(&v) = VT_EMPTY; hres = IHTMLElement2_get_onfocus(elem2, &v); - ok(hres == S_OK, "get_onfocus failed: %08x\n", hres); + ok(hres == S_OK, "get_onfocus failed: %08lx\n", hres); ok(V_VT(&v) == VT_NULL, "V_VT(onfocus) = %d\n", V_VT(&v)); V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = (IDispatch*)&input_onfocus_obj; hres = IHTMLElement2_put_onfocus(elem2, v); - ok(hres == S_OK, "put_onfocus failed: %08x\n", hres); + ok(hres == S_OK, "put_onfocus failed: %08lx\n", hres); V_VT(&v) = VT_EMPTY; hres = IHTMLElement2_get_onfocus(elem2, &v); - ok(hres == S_OK, "get_onfocus failed: %08x\n", hres); + ok(hres == S_OK, "get_onfocus failed: %08lx\n", hres); ok(V_VT(&v) == VT_DISPATCH, "V_VT(onfocus) = %d\n", V_VT(&v)); ok(V_DISPATCH(&v) == (IDispatch*)&input_onfocus_obj, "V_DISPATCH(onfocus) != onfocusFunc\n"); VariantClear(&v); @@ -2294,18 +2294,18 @@ static void test_focus(IHTMLDocument2 *doc) V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = (IDispatch*)&div_onfocusin_obj; hres = IHTMLElement4_put_onfocusin(div, v); - ok(hres == S_OK, "put_onfocusin failed: %08x\n", hres); + ok(hres == S_OK, "put_onfocusin failed: %08lx\n", hres); V_VT(&v) = VT_EMPTY; hres = IHTMLElement4_get_onfocusin(div, &v); - ok(hres == S_OK, "get_onfocusin failed: %08x\n", hres); + ok(hres == S_OK, "get_onfocusin failed: %08lx\n", hres); ok(V_VT(&v) == VT_DISPATCH, "V_VT(onfocusin) = %d\n", V_VT(&v)); ok(V_DISPATCH(&v) == (IDispatch*)&div_onfocusin_obj, "V_DISPATCH(onfocus) != onfocusFunc\n"); VariantClear(&v); V_VT(&v) = VT_EMPTY; hres = IHTMLElement2_get_onfocus(elem2, &v); - ok(hres == S_OK, "get_onfocus failed: %08x\n", hres); + ok(hres == S_OK, "get_onfocus failed: %08lx\n", hres); ok(V_VT(&v) == VT_DISPATCH, "V_VT(onfocus) = %d\n", V_VT(&v)); ok(V_DISPATCH(&v) == (IDispatch*)&input_onfocus_obj, "V_DISPATCH(onfocus) != onfocusFunc\n"); VariantClear(&v); @@ -2317,7 +2317,7 @@ static void test_focus(IHTMLDocument2 *doc) ok(!IsChild(container_hwnd, GetFocus()), "focus belongs to document window\n"); hres = IHTMLWindow2_focus(window); - ok(hres == S_OK, "focus failed: %08x\n", hres); + ok(hres == S_OK, "focus failed: %08lx\n", hres); ok(IsChild(container_hwnd, GetFocus()), "focus does not belong to document window\n"); pump_msgs(NULL); @@ -2325,7 +2325,7 @@ static void test_focus(IHTMLDocument2 *doc) SET_EXPECT(div_onfocusin); SET_EXPECT(input_onfocus); hres = IHTMLElement2_focus(elem2); - ok(hres == S_OK, "focus failed: %08x\n", hres); + ok(hres == S_OK, "focus failed: %08lx\n", hres); pump_msgs(NULL); CHECK_CALLED(div_onfocusin); CHECK_CALLED(input_onfocus); @@ -2338,12 +2338,12 @@ static void test_focus(IHTMLDocument2 *doc) V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = (IDispatch*)&input_onblur_obj; hres = IHTMLElement2_put_onblur(elem2, v); - ok(hres == S_OK, "put_onblur failed: %08x\n", hres); + ok(hres == S_OK, "put_onblur failed: %08lx\n", hres); V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = (IDispatch*)&div_onfocusout_obj; hres = IHTMLElement4_put_onfocusout(div, v); - ok(hres == S_OK, "put_onfocusout failed: %08x\n", hres); + ok(hres == S_OK, "put_onfocusout failed: %08lx\n", hres); SET_EXPECT(div_onfocusout); SET_EXPECT(input_onblur); @@ -2351,7 +2351,7 @@ static void test_focus(IHTMLDocument2 *doc) pump_msgs(NULL); CHECK_CALLED(input_onblur); CHECK_CALLED(div_onfocusout); - ok(hres == S_OK, "blur failed: %08x\n", hres); + ok(hres == S_OK, "blur failed: %08lx\n", hres); if(!winetest_interactive) ShowWindow(container_hwnd, SW_HIDE); @@ -2379,16 +2379,16 @@ static void test_submit(IHTMLDocument2 *doc) V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = (IDispatch*)&form_onclick_obj; hres = IHTMLElement_put_onclick(elem, v); - ok(hres == S_OK, "put_onclick failed: %08x\n", hres); + ok(hres == S_OK, "put_onclick failed: %08lx\n", hres); hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLFormElement, (void**)&form); IHTMLElement_Release(elem); - ok(hres == S_OK, "Could not get IHTMLFormElement iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLFormElement iface: %08lx\n", hres); V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = (IDispatch*)&form_onsubmit_obj; hres = IHTMLFormElement_put_onsubmit(form, v); - ok(hres == S_OK, "put_onsubmit failed: %08x\n", hres); + ok(hres == S_OK, "put_onsubmit failed: %08lx\n", hres); IHTMLFormElement_Release(form); @@ -2397,19 +2397,19 @@ static void test_submit(IHTMLDocument2 *doc) SET_EXPECT(form_onclick); SET_EXPECT(form_onsubmit); hres = IHTMLElement_click(submit); - ok(hres == S_OK, "click failed: %08x\n", hres); + ok(hres == S_OK, "click failed: %08lx\n", hres); CHECK_CALLED(form_onclick); CHECK_CALLED(form_onsubmit); V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = (IDispatch*)&submit_onclick_obj; hres = IHTMLElement_put_onclick(submit, v); - ok(hres == S_OK, "put_onclick failed: %08x\n", hres); + ok(hres == S_OK, "put_onclick failed: %08lx\n", hres); SET_EXPECT(form_onclick); SET_EXPECT(submit_onclick); hres = IHTMLElement_click(submit); - ok(hres == S_OK, "click failed: %08x\n", hres); + ok(hres == S_OK, "click failed: %08lx\n", hres); CHECK_CALLED(form_onclick); CHECK_CALLED(submit_onclick); @@ -2419,19 +2419,19 @@ static void test_submit(IHTMLDocument2 *doc) SET_EXPECT(submit_onclick); SET_EXPECT(submit_onclick_attached); hres = IHTMLElement_click(submit); - ok(hres == S_OK, "click failed: %08x\n", hres); + ok(hres == S_OK, "click failed: %08lx\n", hres); CHECK_CALLED(form_onclick); CHECK_CALLED(submit_onclick); CHECK_CALLED(submit_onclick_attached); V_VT(&v) = VT_NULL; hres = IHTMLElement_put_onclick(submit, v); - ok(hres == S_OK, "put_onclick failed: %08x\n", hres); + ok(hres == S_OK, "put_onclick failed: %08lx\n", hres); SET_EXPECT(form_onclick); SET_EXPECT(submit_onclick_attached); hres = IHTMLElement_click(submit); - ok(hres == S_OK, "click failed: %08x\n", hres); + ok(hres == S_OK, "click failed: %08lx\n", hres); CHECK_CALLED(form_onclick); CHECK_CALLED(submit_onclick_attached); @@ -2442,7 +2442,7 @@ static void test_submit(IHTMLDocument2 *doc) SET_EXPECT(form_onclick); SET_EXPECT(doccp_onclick_cancel); hres = IHTMLElement_click(submit); - ok(hres == S_OK, "click failed: %08x\n", hres); + ok(hres == S_OK, "click failed: %08lx\n", hres); CHECK_CALLED(form_onclick); CHECK_CALLED(doccp_onclick_cancel); @@ -2451,7 +2451,7 @@ static void test_submit(IHTMLDocument2 *doc) V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = (IDispatch*)&submit_onclick_setret_obj; hres = IHTMLElement_put_onclick(submit, v); - ok(hres == S_OK, "put_onclick failed: %08x\n", hres); + ok(hres == S_OK, "put_onclick failed: %08lx\n", hres); V_VT(&onclick_retval) = VT_BOOL; V_BOOL(&onclick_retval) = VARIANT_TRUE; @@ -2462,7 +2462,7 @@ static void test_submit(IHTMLDocument2 *doc) SET_EXPECT(form_onclick); SET_EXPECT(form_onsubmit); hres = IHTMLElement_click(submit); - ok(hres == S_OK, "click failed: %08x\n", hres); + ok(hres == S_OK, "click failed: %08lx\n", hres); CHECK_CALLED(submit_onclick_setret); CHECK_CALLED(form_onclick); CHECK_CALLED(form_onsubmit); @@ -2473,7 +2473,7 @@ static void test_submit(IHTMLDocument2 *doc) SET_EXPECT(submit_onclick_setret); SET_EXPECT(form_onclick); hres = IHTMLElement_click(submit); - ok(hres == S_OK, "click failed: %08x\n", hres); + ok(hres == S_OK, "click failed: %08lx\n", hres); CHECK_CALLED(submit_onclick_setret); CHECK_CALLED(form_onclick); @@ -2485,7 +2485,7 @@ static void test_submit(IHTMLDocument2 *doc) SET_EXPECT(submit_onclick_setret); SET_EXPECT(form_onclick); hres = IHTMLElement_click(submit); - ok(hres == S_OK, "click failed: %08x\n", hres); + ok(hres == S_OK, "click failed: %08lx\n", hres); CHECK_CALLED(submit_onclick_setret); CHECK_CALLED(form_onclick); @@ -2495,7 +2495,7 @@ static void test_submit(IHTMLDocument2 *doc) SET_EXPECT(submit_onclick_setret); SET_EXPECT(form_onclick); hres = IHTMLElement_click(submit); - ok(hres == S_OK, "click failed: %08x\n", hres); + ok(hres == S_OK, "click failed: %08lx\n", hres); CHECK_CALLED(submit_onclick_setret); CHECK_CALLED(form_onclick); @@ -2505,13 +2505,13 @@ static void test_submit(IHTMLDocument2 *doc) V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = (IDispatch*)&submit_onclick_cancel_obj; hres = IHTMLElement_put_onclick(submit, v); - ok(hres == S_OK, "put_onclick failed: %08x\n", hres); + ok(hres == S_OK, "put_onclick failed: %08lx\n", hres); SET_EXPECT(submit_onclick_cancel); SET_EXPECT(submit_onclick_attached_check_cancel); SET_EXPECT(submit_onclick_attached); hres = IHTMLElement_click(submit); - ok(hres == S_OK, "click failed: %08x\n", hres); + ok(hres == S_OK, "click failed: %08lx\n", hres); CHECK_CALLED(submit_onclick_cancel); CHECK_CALLED(submit_onclick_attached_check_cancel); CHECK_CALLED(submit_onclick_attached); @@ -2529,25 +2529,25 @@ static void test_timeout(IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLWindow2_QueryInterface(window, &IID_IHTMLWindow3, (void**)&win3); - ok(hres == S_OK, "Could not get IHTMLWindow3 iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLWindow3 iface: %08lx\n", hres); V_VT(&expr) = VT_DISPATCH; V_DISPATCH(&expr) = (IDispatch*)&timeoutFunc2; V_VT(&var) = VT_EMPTY; id = 0; hres = IHTMLWindow3_setInterval(win3, &expr, 1, &var, &id); - ok(hres == S_OK, "setInterval failed: %08x\n", hres); + ok(hres == S_OK, "setInterval failed: %08lx\n", hres); ok(id, "id = 0\n"); hres = IHTMLWindow2_clearTimeout(window, id); - ok(hres == S_OK, "clearTimeout failer: %08x\n", hres); + ok(hres == S_OK, "clearTimeout failer: %08lx\n", hres); V_VT(&expr) = VT_DISPATCH; V_DISPATCH(&expr) = (IDispatch*)&timeoutFunc; V_VT(&var) = VT_EMPTY; id = 0; hres = IHTMLWindow3_setTimeout(win3, &expr, 0, &var, &id); - ok(hres == S_OK, "setTimeout failed: %08x\n", hres); + ok(hres == S_OK, "setTimeout failed: %08lx\n", hres); ok(id, "id = 0\n"); SET_EXPECT(timeout); @@ -2559,18 +2559,18 @@ static void test_timeout(IHTMLDocument2 *doc) V_VT(&var) = VT_EMPTY; id = 0; hres = IHTMLWindow3_setTimeout(win3, &expr, 0, &var, &id); - ok(hres == S_OK, "setTimeout failed: %08x\n", hres); + ok(hres == S_OK, "setTimeout failed: %08lx\n", hres); ok(id, "id = 0\n"); hres = IHTMLWindow2_clearTimeout(window, id); - ok(hres == S_OK, "clearTimeout failed: %08x\n", hres); + ok(hres == S_OK, "clearTimeout failed: %08lx\n", hres); V_VT(&expr) = VT_DISPATCH; V_DISPATCH(&expr) = (IDispatch*)&timeoutFunc; V_VT(&var) = VT_EMPTY; id = 0; hres = IHTMLWindow3_setInterval(win3, &expr, 1, &var, &id); - ok(hres == S_OK, "setInterval failed: %08x\n", hres); + ok(hres == S_OK, "setInterval failed: %08lx\n", hres); ok(id, "id = 0\n"); SET_EXPECT(timeout); @@ -2582,7 +2582,7 @@ static void test_timeout(IHTMLDocument2 *doc) CHECK_CALLED(timeout); hres = IHTMLWindow2_clearInterval(window, id); - ok(hres == S_OK, "clearTimeout failer: %08x\n", hres); + ok(hres == S_OK, "clearTimeout failer: %08lx\n", hres); IHTMLWindow3_Release(win3); } @@ -2594,10 +2594,10 @@ static IHTMLWindow2 *get_iframe_window(IHTMLIFrameElement *iframe) HRESULT hres; hres = IHTMLIFrameElement_QueryInterface(iframe, &IID_IHTMLFrameBase2, (void**)&base); - ok(hres == S_OK, "QueryInterface(IID_IHTMLFrameBase2) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IHTMLFrameBase2) failed: %08lx\n", hres); hres = IHTMLFrameBase2_get_contentWindow(base, &window); - ok(hres == S_OK, "get_contentWindow failed: %08x\n", hres); + ok(hres == S_OK, "get_contentWindow failed: %08lx\n", hres); ok(window != NULL, "window == NULL\n"); IHTMLFrameBase2_Release(base); @@ -2613,7 +2613,7 @@ static IHTMLDocument2 *get_iframe_doc(IHTMLIFrameElement *iframe) window = get_iframe_window(iframe); hres = IHTMLWindow2_get_document(window, &result); - ok(hres == S_OK, "get_document failed: %08x\n", hres); + ok(hres == S_OK, "get_document failed: %08lx\n", hres); ok(result != NULL, "result == NULL\n"); IHTMLWindow2_Release(window); @@ -2644,7 +2644,7 @@ static void test_iframe_connections(IHTMLDocument2 *doc) cp = get_cp((IUnknown*)doc, &IID_IDispatch); hres = IConnectionPoint_Unadvise(cp, cookie); IConnectionPoint_Release(cp); - ok(hres == CONNECT_E_NOCONNECTION, "Unadvise returned %08x, expected CONNECT_E_NOCONNECTION\n", hres); + ok(hres == CONNECT_E_NOCONNECTION, "Unadvise returned %08lx, expected CONNECT_E_NOCONNECTION\n", hres); unregister_cp((IUnknown*)iframes_doc, &IID_IDispatch, cookie); @@ -2653,18 +2653,18 @@ static void test_iframe_connections(IHTMLDocument2 *doc) VARIANT v; hres = IHTMLIFrameElement_QueryInterface(iframe, &IID_IHTMLFrameBase2, (void**)&frame_base2); - ok(hres == S_OK, "Could not get IHTMLFrameBase2 iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLFrameBase2 iface: %08lx\n", hres); V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = (IDispatch*)&iframe_onload_obj; hres = IHTMLFrameBase2_put_onload(frame_base2, v); - ok(hres == S_OK, "put_onload failed: %08x\n", hres); + ok(hres == S_OK, "put_onload failed: %08lx\n", hres); IHTMLFrameBase2_Release(frame_base2); str = SysAllocString(L"about:blank"); hres = IHTMLDocument2_put_URL(iframes_doc, str); - ok(hres == S_OK, "put_URL failed: %08x\n", hres); + ok(hres == S_OK, "put_URL failed: %08lx\n", hres); SysFreeString(str); SET_EXPECT(iframe_onload); @@ -2673,7 +2673,7 @@ static void test_iframe_connections(IHTMLDocument2 *doc) str = SysAllocString(L"about:test"); hres = IHTMLDocument2_put_URL(iframes_doc, str); - ok(hres == S_OK, "put_URL failed: %08x\n", hres); + ok(hres == S_OK, "put_URL failed: %08lx\n", hres); SysFreeString(str); SET_EXPECT(iframe_onload); @@ -2704,37 +2704,37 @@ static void test_create_event(IHTMLDocument2 *doc) trace("createEvent tests...\n"); hres = IHTMLDocument2_QueryInterface(doc, &IID_IDocumentEvent, (void**)&doc_event); - ok(hres == S_OK, "Could not get IDocumentEvent iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IDocumentEvent iface: %08lx\n", hres); str = SysAllocString(L"Event"); hres = IDocumentEvent_createEvent(doc_event, str, &event); SysFreeString(str); - ok(hres == S_OK, "createEvent failed: %08x\n", hres); + ok(hres == S_OK, "createEvent failed: %08lx\n", hres); phase = 0xdead; hres = IDOMEvent_get_eventPhase(event, &phase); - ok(hres == S_OK, "get_eventPhase failed: %08x\n", hres); + ok(hres == S_OK, "get_eventPhase failed: %08lx\n", hres); ok(!phase, "phase = %u\n", phase); hres = IDOMEvent_preventDefault(event); - ok(hres == S_OK, "preventDefault failed: %08x\n", hres); + ok(hres == S_OK, "preventDefault failed: %08lx\n", hres); hres = IDOMEvent_stopPropagation(event); - ok(hres == S_OK, "stopPropagation failed: %08x\n", hres); + ok(hres == S_OK, "stopPropagation failed: %08lx\n", hres); str = (void*)0xdeadbeef; hres = IDOMEvent_get_type(event, &str); - ok(hres == S_OK, "get_type failed: %08x\n", hres); + ok(hres == S_OK, "get_type failed: %08lx\n", hres); ok(!str, "type = %s\n", wine_dbgstr_w(str)); b = 0xdead; hres = IDOMEvent_get_bubbles(event, &b); - ok(hres == S_OK, "get_bubbles failed: %08x\n", hres); + ok(hres == S_OK, "get_bubbles failed: %08lx\n", hres); ok(!b, "bubbles = %x\n", b); b = 0xdead; hres = IDOMEvent_get_cancelable(event, &b); - ok(hres == S_OK, "get_cancelable failed: %08x\n", hres); + ok(hres == S_OK, "get_cancelable failed: %08lx\n", hres); ok(!b, "cancelable = %x\n", b); elem = doc_get_body(doc); @@ -2742,27 +2742,27 @@ static void test_create_event(IHTMLDocument2 *doc) IHTMLElement_Release(elem); hres = IEventTarget_dispatchEvent(event_target, NULL, &b); - ok(hres == E_INVALIDARG, "dispatchEvent failed: %08x\n", hres); + ok(hres == E_INVALIDARG, "dispatchEvent failed: %08lx\n", hres); IEventTarget_Release(event_target); hres = IDOMEvent_QueryInterface(event, &IID_IDOMUIEvent, (void**)&ui_event); - ok(hres == E_NOINTERFACE, "QueryInterface(IID_IDOMUIEvent returned %08x\n", hres); + ok(hres == E_NOINTERFACE, "QueryInterface(IID_IDOMUIEvent returned %08lx\n", hres); hres = IDOMEvent_QueryInterface(event, &IID_IDOMMouseEvent, (void**)&mouse_event); - ok(hres == E_NOINTERFACE, "QueryInterface(IID_IDOMMouseEvent returned %08x\n", hres); + ok(hres == E_NOINTERFACE, "QueryInterface(IID_IDOMMouseEvent returned %08lx\n", hres); IDOMEvent_Release(event); str = SysAllocString(L"MouseEvent"); hres = IDocumentEvent_createEvent(doc_event, str, &event); SysFreeString(str); - ok(hres == S_OK, "createEvent failed: %08x\n", hres); + ok(hres == S_OK, "createEvent failed: %08lx\n", hres); hres = IDOMEvent_QueryInterface(event, &IID_IDOMUIEvent, (void**)&ui_event); - ok(hres == S_OK, "QueryInterface(IID_IDOMUIEvent returned %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IDOMUIEvent returned %08lx\n", hres); IDOMUIEvent_Release(ui_event); hres = IDOMEvent_QueryInterface(event, &IID_IDOMMouseEvent, (void**)&mouse_event); - ok(hres == S_OK, "QueryInterface(IID_IDOMMouseEvent returned %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IDOMMouseEvent returned %08lx\n", hres); IDOMMouseEvent_Release(mouse_event); IDOMEvent_Release(event); @@ -2770,26 +2770,26 @@ static void test_create_event(IHTMLDocument2 *doc) str = SysAllocString(L"UIEvent"); hres = IDocumentEvent_createEvent(doc_event, str, &event); SysFreeString(str); - ok(hres == S_OK, "createEvent failed: %08x\n", hres); + ok(hres == S_OK, "createEvent failed: %08lx\n", hres); hres = IDOMEvent_QueryInterface(event, &IID_IDOMUIEvent, (void**)&ui_event); - ok(hres == S_OK, "QueryInterface(IID_IDOMUIEvent returned %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IDOMUIEvent returned %08lx\n", hres); IDOMUIEvent_Release(ui_event); hres = IDOMEvent_QueryInterface(event, &IID_IDOMMouseEvent, (void**)&mouse_event); - ok(hres == E_NOINTERFACE, "QueryInterface(IID_IDOMMouseEvent returned %08x\n", hres); + ok(hres == E_NOINTERFACE, "QueryInterface(IID_IDOMMouseEvent returned %08lx\n", hres); IDOMEvent_Release(event); str = SysAllocString(L"KeyboardEvent"); hres = IDocumentEvent_createEvent(doc_event, str, &event); SysFreeString(str); - ok(hres == S_OK, "createEvent failed: %08x\n", hres); + ok(hres == S_OK, "createEvent failed: %08lx\n", hres); hres = IDOMEvent_QueryInterface(event, &IID_IDOMUIEvent, (void**)&ui_event); - ok(hres == S_OK, "QueryInterface(IID_IDOMUIEvent returned %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IDOMUIEvent returned %08lx\n", hres); IDOMUIEvent_Release(ui_event); hres = IDOMEvent_QueryInterface(event, &IID_IDOMKeyboardEvent, (void**)&keyboard_event); - ok(hres == S_OK, "QueryInterface(IID_IDOMKeyboardEvent returned %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IDOMKeyboardEvent returned %08lx\n", hres); IDOMKeyboardEvent_Release(keyboard_event); IDOMEvent_Release(event); @@ -2797,10 +2797,10 @@ static void test_create_event(IHTMLDocument2 *doc) str = SysAllocString(L"CustomEvent"); hres = IDocumentEvent_createEvent(doc_event, str, &event); SysFreeString(str); - ok(hres == S_OK, "createEvent failed: %08x\n", hres); + ok(hres == S_OK, "createEvent failed: %08lx\n", hres); hres = IDOMEvent_QueryInterface(event, &IID_IDOMCustomEvent, (void**)&custom_event); - ok(hres == S_OK, "QueryInterface(IID_IDOMCustomEvent returned %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IDOMCustomEvent returned %08lx\n", hres); IDOMCustomEvent_Release(custom_event); IDOMEvent_Release(event); @@ -3132,23 +3132,23 @@ static HRESULT WINAPI DocumentSite_ActivateMe(IOleDocumentSite *iface, IOleDocum HRESULT hres; hres = IOleDocumentView_QueryInterface(pViewToActivate, &IID_IOleDocument, (void**)&document); - ok(hres == S_OK, "could not get IOleDocument: %08x\n", hres); + ok(hres == S_OK, "could not get IOleDocument: %08lx\n", hres); hres = IOleDocument_CreateView(document, &InPlaceSite, NULL, 0, &view); IOleDocument_Release(document); - ok(hres == S_OK, "CreateView failed: %08x\n", hres); + ok(hres == S_OK, "CreateView failed: %08lx\n", hres); hres = IOleDocumentView_SetInPlaceSite(view, &InPlaceSite); - ok(hres == S_OK, "SetInPlaceSite failed: %08x\n", hres); + ok(hres == S_OK, "SetInPlaceSite failed: %08lx\n", hres); hres = IOleDocumentView_UIActivate(view, TRUE); - ok(hres == S_OK, "UIActivate failed: %08x\n", hres); + ok(hres == S_OK, "UIActivate failed: %08lx\n", hres); hres = IOleDocumentView_SetRect(view, &rect); - ok(hres == S_OK, "SetRect failed: %08x\n", hres); + ok(hres == S_OK, "SetRect failed: %08lx\n", hres); hres = IOleDocumentView_Show(view, TRUE); - ok(hres == S_OK, "Show failed: %08x\n", hres); + ok(hres == S_OK, "Show failed: %08lx\n", hres); return S_OK; } @@ -3208,7 +3208,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D HRESULT hres; hres = IHTMLDocument2_get_readyState(notif_doc, &state); - ok(hres == S_OK, "get_readyState failed: %08x\n", hres); + ok(hres == S_OK, "get_readyState failed: %08lx\n", hres); if(!lstrcmpW(state, L"complete")) doc_complete = TRUE; @@ -3250,10 +3250,10 @@ static void doc_load_string(IHTMLDocument2 *doc, const char *str) mem = GlobalAlloc(0, len); memcpy(mem, str, len); hres = CreateStreamOnHGlobal(mem, TRUE, &stream); - ok(hres == S_OK, "Failed to create a stream, hr %#x.\n", hres); + ok(hres == S_OK, "Failed to create a stream, hr %#lx.\n", hres); hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); - ok(hres == S_OK, "Failed to get IPersistStreamInit, hr %#x.\n", hres); + ok(hres == S_OK, "Failed to get IPersistStreamInit, hr %#lx.\n", hres); IPersistStreamInit_Load(init, stream); IPersistStreamInit_Release(init); @@ -3268,15 +3268,15 @@ static void do_advise(IUnknown *unk, REFIID riid, IUnknown *unk_advise) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IConnectionPointContainer, (void**)&container); - ok(hres == S_OK, "QueryInterface(IID_IConnectionPointContainer) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IConnectionPointContainer) failed: %08lx\n", hres); hres = IConnectionPointContainer_FindConnectionPoint(container, riid, &cp); IConnectionPointContainer_Release(container); - ok(hres == S_OK, "FindConnectionPoint failed: %08x\n", hres); + ok(hres == S_OK, "FindConnectionPoint failed: %08lx\n", hres); hres = IConnectionPoint_Advise(cp, unk_advise, &cookie); IConnectionPoint_Release(cp); - ok(hres == S_OK, "Advise failed: %08x\n", hres); + ok(hres == S_OK, "Advise failed: %08lx\n", hres); } static void set_client_site(IHTMLDocument2 *doc, BOOL set) @@ -3293,19 +3293,19 @@ static void set_client_site(IHTMLDocument2 *doc, BOOL set) } hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); - ok(hres == S_OK, "Could not et IOleObject: %08x\n", hres); + ok(hres == S_OK, "Could not et IOleObject: %08lx\n", hres); hres = IOleObject_SetClientSite(oleobj, set ? &ClientSite : NULL); - ok(hres == S_OK, "SetClientSite failed: %08x\n", hres); + ok(hres == S_OK, "SetClientSite failed: %08lx\n", hres); if(set) { IHlinkTarget *hlink; hres = IOleObject_QueryInterface(oleobj, &IID_IHlinkTarget, (void**)&hlink); - ok(hres == S_OK, "Could not get IHlinkTarget iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHlinkTarget iface: %08lx\n", hres); hres = IHlinkTarget_Navigate(hlink, 0, NULL); - ok(hres == S_OK, "Navgate failed: %08x\n", hres); + ok(hres == S_OK, "Navgate failed: %08lx\n", hres); IHlinkTarget_Release(hlink); } @@ -3322,7 +3322,7 @@ static IHTMLDocument2 *create_document(void) #if !defined(__i386__) && !defined(__x86_64__) todo_wine #endif - ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); + ok(hres == S_OK, "CoCreateInstance failed: %08lx\n", hres); return SUCCEEDED(hres) ? doc : NULL; } @@ -3349,7 +3349,7 @@ static void run_test(const char *str, testfunc_t test) } hres = IHTMLDocument2_get_body(doc, &body); - ok(hres == S_OK, "get_body failed: %08x\n", hres); + ok(hres == S_OK, "get_body failed: %08lx\n", hres); if(body) { IHTMLDocument6 *doc6; @@ -3360,7 +3360,7 @@ static void run_test(const char *str, testfunc_t test) if(SUCCEEDED(hres)) { VARIANT v; hres = IHTMLDocument6_get_documentMode(doc6, &v); - ok(hres == S_OK, "get_documentMode failed: %08x\n", hres); + ok(hres == S_OK, "get_documentMode failed: %08lx\n", hres); ok(V_VT(&v) == VT_R4, "V_VT(documentMode) = %u\n", V_VT(&v)); document_mode = V_R4(&v); IHTMLDocument6_Release(doc6); @@ -3369,7 +3369,7 @@ static void run_test(const char *str, testfunc_t test) } hres = IHTMLDocument2_get_parentWindow(doc, &window); - ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + ok(hres == S_OK, "get_parentWindow failed: %08lx\n", hres); ok(window != NULL, "window == NULL\n"); test(doc); @@ -3420,18 +3420,18 @@ static void test_empty_document(void) return; hres = IHTMLDocument2_get_parentWindow(doc, &window); - ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + ok(hres == S_OK, "get_parentWindow failed: %08lx\n", hres); hres = IHTMLWindow2_get_document(window, &windows_doc); IHTMLWindow2_Release(window); - ok(hres == S_OK, "get_document failed: %08x\n", hres); + ok(hres == S_OK, "get_document failed: %08lx\n", hres); cookie = register_cp((IUnknown*)windows_doc, &IID_IDispatch, (IUnknown*)&div_onclick_disp); cp = get_cp((IUnknown*)doc, &IID_IDispatch); hres = IConnectionPoint_Unadvise(cp, cookie); IConnectionPoint_Release(cp); - ok(hres == S_OK, "Unadvise failed: %08x\n", hres); + ok(hres == S_OK, "Unadvise failed: %08lx\n", hres); IHTMLDocument2_Release(windows_doc); IHTMLDocument2_Release(doc); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 89311c5d8c8..ff050863b6f 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -366,15 +366,15 @@ static void _test_GetCurMoniker(unsigned line, IUnknown *unk, IMoniker *exmon, c return; /* FIXME */ hres = IUnknown_QueryInterface(unk, &IID_IPersistMoniker, (void**)&permon); - ok(hres == S_OK, "QueryInterface(IID_IPersistMoniker) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IPersistMoniker) failed: %08lx\n", hres); if(FAILED(hres)) return; hres = IUnknown_QueryInterface(unk, &IID_IHTMLDocument2, (void**)&doc); - ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument2) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument2) failed: %08lx\n", hres); hres = IHTMLDocument2_get_URL(doc, &doc_url); - ok(hres == S_OK, "get_URL failed: %08x\n", hres); + ok(hres == S_OK, "get_URL failed: %08lx\n", hres); for(ptr = doc_url; *ptr && *ptr != '#'; ptr++); hres = IPersistMoniker_GetCurMoniker(permon, &mon); @@ -385,13 +385,13 @@ static void _test_GetCurMoniker(unsigned line, IUnknown *unk, IMoniker *exmon, c BOOL exb = expect_GetDisplayName; BOOL clb = called_GetDisplayName; - ok_(__FILE__,line)(hres == S_OK, "GetCurrentMoniker failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "GetCurrentMoniker failed: %08lx\n", hres); ok_(__FILE__,line)(mon == exmon, "mon(%p) != exmon(%p)\n", mon, exmon); if(mon == &Moniker) SET_EXPECT(GetDisplayName); hres = IMoniker_GetDisplayName(mon, NULL, NULL, &url); - ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres); + ok(hres == S_OK, "GetDisplayName failed: %08lx\n", hres); if(mon == &Moniker) CHECK_CALLED(GetDisplayName); expect_GetDisplayName = exb; @@ -406,10 +406,10 @@ static void _test_GetCurMoniker(unsigned line, IUnknown *unk, IMoniker *exmon, c }else if(exurl) { LPOLESTR url; - ok_(__FILE__,line)(hres == S_OK, "GetCurrentMoniker failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "GetCurrentMoniker failed: %08lx\n", hres); hres = IMoniker_GetDisplayName(mon, NULL, NULL, &url); - ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres); + ok(hres == S_OK, "GetDisplayName failed: %08lx\n", hres); todo_wine_if(is_todo) ok_(__FILE__,line)(!lstrcmpW(url, exurl), "unexpected url %s\n", wine_dbgstr_w(url)); @@ -419,7 +419,7 @@ static void _test_GetCurMoniker(unsigned line, IUnknown *unk, IMoniker *exmon, c CoTaskMemFree(url); }else { ok_(__FILE__,line)(hres == E_UNEXPECTED, - "GetCurrentMoniker failed: %08x, expected E_UNEXPECTED\n", hres); + "GetCurrentMoniker failed: %08lx, expected E_UNEXPECTED\n", hres); ok_(__FILE__,line)(mon == (IMoniker*)0xdeadbeef, "mon=%p\n", mon); ok_(__FILE__,line)(!lstrcmpW(doc_url, L"about:blank"), "doc_url is not about:blank\n"); } @@ -438,10 +438,10 @@ static void _test_current_url(unsigned line, IUnknown *unk, const WCHAR *exurl) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLDocument2, (void**)&doc); - ok_(__FILE__,line)(hres == S_OK, "QueryInterface(IID_IHTMLDocument2) failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "QueryInterface(IID_IHTMLDocument2) failed: %08lx\n", hres); hres = IHTMLDocument2_get_URL(doc, &url); - ok_(__FILE__,line)(hres == S_OK, "get_URL failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_URL failed: %08lx\n", hres); ok_(__FILE__,line)(!lstrcmpW(url, exurl), "Unexpected URL %s, expected %s\n", wine_dbgstr_w(url), wine_dbgstr_w(exurl)); SysFreeString(url); @@ -558,68 +558,68 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, ok(pOIProtSink != NULL, "pOIProtSink == NULL\n"); ok(pOIBindInfo != NULL, "pOIBindInfo == NULL\n"); - ok(!grfPI, "grfPI = %x\n", grfPI); - ok(!dwReserved, "dwReserved = %lx\n", dwReserved); + ok(!grfPI, "grfPI = %lx\n", grfPI); + ok(!dwReserved, "dwReserved = %Ix\n", dwReserved); if(is_mhtml) ok(!lstrcmpW(szUrl, L"winetest:doc"), "unexpected URL %s\n", wine_dbgstr_w(szUrl)); memset(&bindinfo, 0, sizeof(bindinfo)); bindinfo.cbSize = sizeof(bindinfo); hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &bindf, &bindinfo); - ok(hres == S_OK, "GetBindInfo failed: %08x\n", hres); + ok(hres == S_OK, "GetBindInfo failed: %08lx\n", hres); if(!testing_submit) todo_wine_if(is_mhtml) ok(bindf == (BINDF_FROMURLMON|BINDF_PULLDATA|BINDF_NEEDFILE|BINDF_ASYNCSTORAGE|BINDF_ASYNCHRONOUS), - "bindf = %x\n", bindf); + "bindf = %lx\n", bindf); else ok(bindf == (BINDF_FROMURLMON|BINDF_FORMS_SUBMIT|BINDF_PRAGMA_NO_CACHE|BINDF_HYPERLINK |BINDF_PULLDATA|BINDF_NEEDFILE|BINDF_GETNEWESTVERSION|BINDF_ASYNCSTORAGE|BINDF_ASYNCHRONOUS), - "bindf = %x\n", bindf); + "bindf = %lx\n", bindf); - ok(bindinfo.cbSize == sizeof(bindinfo), "bindinfo.cbSize=%d\n", bindinfo.cbSize); + ok(bindinfo.cbSize == sizeof(bindinfo), "bindinfo.cbSize=%ld\n", bindinfo.cbSize); ok(bindinfo.szExtraInfo == NULL, "bindinfo.szExtraInfo=%p\n", bindinfo.szExtraInfo); /* TODO: test stgmedData */ - ok(bindinfo.grfBindInfoF == 0, "bindinfo.grfBinfInfoF=%08x\n", bindinfo.grfBindInfoF); + ok(bindinfo.grfBindInfoF == 0, "bindinfo.grfBinfInfoF=%08lx\n", bindinfo.grfBindInfoF); if(!testing_submit) { - ok(bindinfo.dwBindVerb == BINDVERB_GET, "bindinfo.dwBindVerb=%d\n", bindinfo.dwBindVerb); - ok(bindinfo.cbstgmedData == 0, "bindinfo.cbstgmedData=%d\n", bindinfo.cbstgmedData); - ok(bindinfo.stgmedData.tymed == TYMED_NULL, "bindinfo.stgmedData.tymed=%d\n", bindinfo.stgmedData.tymed); + ok(bindinfo.dwBindVerb == BINDVERB_GET, "bindinfo.dwBindVerb=%ld\n", bindinfo.dwBindVerb); + ok(bindinfo.cbstgmedData == 0, "bindinfo.cbstgmedData=%ld\n", bindinfo.cbstgmedData); + ok(bindinfo.stgmedData.tymed == TYMED_NULL, "bindinfo.stgmedData.tymed=%ld\n", bindinfo.stgmedData.tymed); }else { - ok(bindinfo.dwBindVerb == BINDVERB_POST, "bindinfo.dwBindVerb=%d\n", bindinfo.dwBindVerb); - ok(bindinfo.cbstgmedData == 8, "bindinfo.cbstgmedData=%d\n", bindinfo.cbstgmedData); - ok(bindinfo.stgmedData.tymed == TYMED_HGLOBAL, "bindinfo.stgmedData.tymed=%d\n", bindinfo.stgmedData.tymed); + ok(bindinfo.dwBindVerb == BINDVERB_POST, "bindinfo.dwBindVerb=%ld\n", bindinfo.dwBindVerb); + ok(bindinfo.cbstgmedData == 8, "bindinfo.cbstgmedData=%ld\n", bindinfo.cbstgmedData); + ok(bindinfo.stgmedData.tymed == TYMED_HGLOBAL, "bindinfo.stgmedData.tymed=%ld\n", bindinfo.stgmedData.tymed); ok(!memcmp(U(bindinfo.stgmedData).hGlobal, "cmd=TEST", 8), "unexpected hGlobal\n"); } ok(bindinfo.szCustomVerb == 0, "bindinfo.szCustomVerb=%p\n", bindinfo.szCustomVerb); if(is_mhtml) - ok(!bindinfo.dwOptions, "bindinfo.dwOptions=%x\n", bindinfo.dwOptions); + ok(!bindinfo.dwOptions, "bindinfo.dwOptions=%lx\n", bindinfo.dwOptions); else ok(bindinfo.dwOptions == 0x80000 || bindinfo.dwOptions == 0x4080000, /* win2k3 */ - "bindinfo.dwOptions=%x\n", bindinfo.dwOptions); - ok(bindinfo.dwOptionsFlags == 0, "bindinfo.dwOptionsFlags=%d\n", bindinfo.dwOptionsFlags); + "bindinfo.dwOptions=%lx\n", bindinfo.dwOptions); + ok(bindinfo.dwOptionsFlags == 0, "bindinfo.dwOptionsFlags=%ld\n", bindinfo.dwOptionsFlags); /* TODO: test dwCodePage */ /* TODO: test securityAttributes */ ok(IsEqualGUID(&IID_NULL, &bindinfo.iid), "unexpected bindinfo.iid\n"); ok(bindinfo.pUnk == NULL, "bindinfo.pUnk=%p\n", bindinfo.pUnk); - ok(bindinfo.dwReserved == 0, "bindinfo.dwReserved=%d\n", bindinfo.dwReserved); + ok(bindinfo.dwReserved == 0, "bindinfo.dwReserved=%ld\n", bindinfo.dwReserved); hres = IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_CACHEFILENAMEAVAILABLE, &empty_str); - ok(hres == S_OK, "ReportProgress(BINDSTATUS_CACHEFILENAMEAVAILABLE) failed: %08x\n", hres); + ok(hres == S_OK, "ReportProgress(BINDSTATUS_CACHEFILENAMEAVAILABLE) failed: %08lx\n", hres); if(report_mime) { hres = IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE, wszTextCss); ok(hres == S_OK, - "ReportProgress(BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE) failed: %08x\n", hres); + "ReportProgress(BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE) failed: %08lx\n", hres); } hres = IInternetProtocolSink_ReportData(pOIProtSink, BSCF_FIRSTDATANOTIFICATION | BSCF_LASTDATANOTIFICATION, 13, 13); - ok(hres == S_OK, "ReportData failed: %08x\n", hres); + ok(hres == S_OK, "ReportData failed: %08lx\n", hres); hres = IInternetProtocolSink_ReportResult(pOIProtSink, S_OK, 0, NULL); - ok(hres == S_OK, "ReportResult failed: %08x\n", hres); + ok(hres == S_OK, "ReportResult failed: %08lx\n", hres); return S_OK; } @@ -667,7 +667,7 @@ static HRESULT WINAPI Protocol_Read(IInternetProtocol *iface, void *pv, ok(pv != NULL, "pv == NULL\n"); ok(cb > data_len, "cb < data_len\n"); ok(pcbRead != NULL, "pcbRead == NULL\n"); - ok(!*pcbRead || *pcbRead == data_len, "*pcbRead=%d\n", *pcbRead); + ok(!*pcbRead || *pcbRead == data_len, "*pcbRead=%ld\n", *pcbRead); if(protocol_read) { *pcbRead = 0; @@ -800,7 +800,7 @@ static HRESULT WINAPI HlinkFrame_Navigate(IHlinkFrame *iface, DWORD grfHLNF, LPB CHECK_EXPECT(Navigate); - ok(grfHLNF == 0, "grfHLNF=%d, expected 0\n", grfHLNF); + ok(grfHLNF == 0, "grfHLNF=%ld, expected 0\n", grfHLNF); ok(pbc != NULL, "pbc == NULL\n"); ok(pibsc != NULL, "pubsc == NULL\n"); ok(pihlNavigate != NULL, "puhlNavigate == NULL\n"); @@ -813,25 +813,25 @@ static HRESULT WINAPI HlinkFrame_Navigate(IHlinkFrame *iface, DWORD grfHLNF, LPB DWORD site_data = 0xdeadbeef; hres = IHlink_GetTargetFrameName(pihlNavigate, &frame_name); - ok(hres == S_FALSE, "GetTargetFrameName failed: %08x\n", hres); + ok(hres == S_FALSE, "GetTargetFrameName failed: %08lx\n", hres); ok(frame_name == NULL, "frame_name = %p\n", frame_name); hres = IHlink_GetMonikerReference(pihlNavigate, 1, &mon, &location); - ok(hres == S_OK, "GetMonikerReference failed: %08x\n", hres); + ok(hres == S_OK, "GetMonikerReference failed: %08lx\n", hres); ok(location == NULL, "location = %p\n", location); ok(mon != NULL, "mon == NULL\n"); hres = IMoniker_GetDisplayName(mon, NULL, NULL, &location); - ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres); + ok(hres == S_OK, "GetDisplayName failed: %08lx\n", hres); ok(!lstrcmpW(location, nav_url), "unexpected display name %s, expected %s\n", wine_dbgstr_w(location), wine_dbgstr_w(nav_url)); CoTaskMemFree(location); IMoniker_Release(mon); hres = IHlink_GetHlinkSite(pihlNavigate, &site, &site_data); - ok(hres == S_OK, "GetHlinkSite failed: %08x\n", hres); + ok(hres == S_OK, "GetHlinkSite failed: %08lx\n", hres); ok(site == NULL, "site = %p\n, expected NULL\n", site); - ok(site_data == 0xdeadbeef, "site_data = %x\n", site_data); + ok(site_data == 0xdeadbeef, "site_data = %lx\n", site_data); } return S_OK; @@ -897,8 +897,8 @@ static HRESULT WINAPI NewWindowManager_EvaluateNewWindow(INewWindowManager *ifac ok(!lstrcmpW(pszUrlContext, prev_url), "pszUrlContext = %s\n", wine_dbgstr_w(pszUrlContext)); ok(!pszFeatures, "pszFeatures = %s\n", wine_dbgstr_w(pszFeatures)); ok(!fReplace, "fReplace = %x\n", fReplace); - ok(dwFlags == (allow_new_window ? 0 : NWMF_FIRST), "dwFlags = %x\n", dwFlags); - ok(!dwUserActionTime, "dwUserActionime = %d\n", dwUserActionTime); + ok(dwFlags == (allow_new_window ? 0 : NWMF_FIRST), "dwFlags = %lx\n", dwFlags); + ok(!dwUserActionTime, "dwUserActionime = %ld\n", dwUserActionTime); return allow_new_window ? S_OK : E_FAIL; } @@ -984,7 +984,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D return S_OK; } - ok(0, "unexpected id %d\n", dispID); + ok(0, "unexpected id %ld\n", dispID); return E_NOTIMPL; } @@ -1031,9 +1031,9 @@ static HRESULT WINAPI Stream_Read(IStream *iface, void *pv, { CHECK_EXPECT2(Read); ok(pv != NULL, "pv == NULL\n"); - ok(cb > sizeof(html_page), "cb = %d\n", cb); + ok(cb > sizeof(html_page), "cb = %ld\n", cb); ok(pcbRead != NULL, "pcbRead == NULL\n"); - ok(!*pcbRead, "*pcbRead = %d\n", *pcbRead); + ok(!*pcbRead, "*pcbRead = %ld\n", *pcbRead); if(stream_read) return S_FALSE; @@ -1175,7 +1175,7 @@ static HRESULT WINAPI WinInetHttpInfo_QueryInfo( if(dwOption == (HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER)) { ok(pBuffer != NULL, "pBuffer == NULL\n"); - ok(*pcbBuf == sizeof(DWORD), "*pcbBuf = %d\n", *pcbBuf); + ok(*pcbBuf == sizeof(DWORD), "*pcbBuf = %ld\n", *pcbBuf); ok(pdwFlags == NULL, "*pdwFlags != NULL\n"); *((DWORD*)pBuffer) = status_code; return S_OK; @@ -1353,28 +1353,28 @@ static void test_binding_ui(IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IServiceProvider, (void**)&serv_prov); - ok(hres == S_OK, "Could not get IServiceProvider: %08x\n", hres); + ok(hres == S_OK, "Could not get IServiceProvider: %08lx\n", hres); hres = IServiceProvider_QueryService(serv_prov, &IID_IWindowForBindingUI, &IID_IWindowForBindingUI, (void**)&binding_ui); - ok(hres == S_OK, "Could not get IWindowForBindingUI: %08x\n", hres); + ok(hres == S_OK, "Could not get IWindowForBindingUI: %08lx\n", hres); hres = IWindowForBindingUI_GetWindow(binding_ui, &IID_IHttpSecurity, &binding_hwnd); - ok(hres == S_OK, "GetWindow(IID_IHttpSecurity) failed: %08x\n", hres); + ok(hres == S_OK, "GetWindow(IID_IHttpSecurity) failed: %08lx\n", hres); if(doc_hwnd) ok(binding_hwnd == doc_hwnd, "binding_hwnd != doc_hwnd\n"); else todo_wine ok(binding_hwnd != NULL, "binding_hwnd == NULL\n"); hres = IWindowForBindingUI_GetWindow(binding_ui, &IID_IAuthenticate, &binding_hwnd); - ok(hres == S_OK, "GetWindow(IID_IHttpSecurity) failed: %08x\n", hres); + ok(hres == S_OK, "GetWindow(IID_IHttpSecurity) failed: %08lx\n", hres); if(doc_hwnd) ok(binding_hwnd == doc_hwnd, "binding_hwnd != doc_hwnd\n"); else todo_wine ok(binding_hwnd != NULL, "binding_hwnd == NULL\n"); hres = IWindowForBindingUI_GetWindow(binding_ui, &IID_IWindowForBindingUI, &binding_hwnd); - ok(hres == S_OK, "GetWindow(IID_IHttpSecurity) failed: %08x\n", hres); + ok(hres == S_OK, "GetWindow(IID_IHttpSecurity) failed: %08lx\n", hres); if(doc_hwnd) ok(binding_hwnd == doc_hwnd, "binding_hwnd != doc_hwnd\n"); else @@ -1397,12 +1397,12 @@ static void continue_binding(IBindStatusCallback *callback) if(report_mime) { hres = IBindStatusCallback_OnProgress(callback, 0, 0, BINDSTATUS_MIMETYPEAVAILABLE, wszTextHtml); - ok(hres == S_OK, "OnProgress(BINDSTATUS_MIMETYPEAVAILABLE) failed: %08x\n", hres); + ok(hres == S_OK, "OnProgress(BINDSTATUS_MIMETYPEAVAILABLE) failed: %08lx\n", hres); } hres = IBindStatusCallback_OnProgress(callback, sizeof(html_page)-1, sizeof(html_page)-1, BINDSTATUS_BEGINDOWNLOADDATA, doc_url); - ok(hres == S_OK, "OnProgress(BINDSTATUS_BEGINDOWNLOADDATA) failed: %08x\n", hres); + ok(hres == S_OK, "OnProgress(BINDSTATUS_BEGINDOWNLOADDATA) failed: %08lx\n", hres); if(status_code != HTTP_STATUS_OK) { CHECK_CALLED_BROKEN(IsErrorUrl); SET_EXPECT(IsErrorUrl); @@ -1415,16 +1415,16 @@ static void continue_binding(IBindStatusCallback *callback) hres = IBindStatusCallback_OnDataAvailable(callback, BSCF_FIRSTDATANOTIFICATION|BSCF_LASTDATANOTIFICATION, sizeof(html_page)-1, &formatetc, &stgmedium); - ok(hres == S_OK, "OnDataAvailable failed: %08x\n", hres); + ok(hres == S_OK, "OnDataAvailable failed: %08lx\n", hres); CHECK_CALLED(Read); hres = IBindStatusCallback_OnProgress(callback, sizeof(html_page)-1, sizeof(html_page)-1, BINDSTATUS_ENDDOWNLOADDATA, NULL); - ok(hres == S_OK, "OnProgress(BINDSTATUS_ENDDOWNLOADDATA) failed: %08x\n", hres); + ok(hres == S_OK, "OnProgress(BINDSTATUS_ENDDOWNLOADDATA) failed: %08lx\n", hres); SET_EXPECT(GetBindResult); hres = IBindStatusCallback_OnStopBinding(callback, S_OK, NULL); - ok(hres == S_OK, "OnStopBinding failed: %08x\n", hres); + ok(hres == S_OK, "OnStopBinding failed: %08lx\n", hres); CLEAR_CALLED(GetBindResult); /* IE7 */ IBindStatusCallback_Release(callback); @@ -1453,42 +1453,42 @@ static HRESULT WINAPI Moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc, IMon ok(*ppv == NULL, "*ppv=%p\n", *ppv); hres = IBindCtx_GetObjectParam(pbc, BSCBHolder, (IUnknown**)&callback); - ok(hres == S_OK, "GetObjectParam failed: %08x\n", hres); + ok(hres == S_OK, "GetObjectParam failed: %08lx\n", hres); ok(callback != NULL, "callback == NULL\n"); memset(&bindinfo, 0xf0, sizeof(bindinfo)); bindinfo.cbSize = sizeof(bindinfo); hres = IBindStatusCallback_GetBindInfo(callback, &bindf, &bindinfo); - ok(hres == S_OK, "GetBindInfo failed: %08x\n", hres); - ok((bindf & ~BINDF_HYPERLINK /* IE9 */) == (BINDF_PULLDATA|BINDF_ASYNCSTORAGE|BINDF_ASYNCHRONOUS), "bindf = %08x\n", bindf); - ok(bindinfo.cbSize == sizeof(bindinfo), "bindinfo.cbSize=%d\n", bindinfo.cbSize); + ok(hres == S_OK, "GetBindInfo failed: %08lx\n", hres); + ok((bindf & ~BINDF_HYPERLINK /* IE9 */) == (BINDF_PULLDATA|BINDF_ASYNCSTORAGE|BINDF_ASYNCHRONOUS), "bindf = %08lx\n", bindf); + ok(bindinfo.cbSize == sizeof(bindinfo), "bindinfo.cbSize=%ld\n", bindinfo.cbSize); ok(bindinfo.szExtraInfo == NULL, "bindinfo.szExtraInfo=%p\n", bindinfo.szExtraInfo); /* TODO: test stgmedData */ - ok(bindinfo.grfBindInfoF == 0, "bindinfo.grfBinfInfoF=%08x\n", bindinfo.grfBindInfoF); - ok(bindinfo.dwBindVerb == 0, "bindinfo.dwBindVerb=%d\n", bindinfo.dwBindVerb); + ok(bindinfo.grfBindInfoF == 0, "bindinfo.grfBinfInfoF=%08lx\n", bindinfo.grfBindInfoF); + ok(bindinfo.dwBindVerb == 0, "bindinfo.dwBindVerb=%ld\n", bindinfo.dwBindVerb); ok(bindinfo.szCustomVerb == 0, "bindinfo.szCustomVerb=%p\n", bindinfo.szCustomVerb); - ok(bindinfo.cbstgmedData == 0, "bindinfo.cbstgmedData=%d\n", bindinfo.cbstgmedData); + ok(bindinfo.cbstgmedData == 0, "bindinfo.cbstgmedData=%ld\n", bindinfo.cbstgmedData); ok(bindinfo.dwOptions == 0x80000 || bindinfo.dwOptions == 0x4080000, - "bindinfo.dwOptions=%x\n", bindinfo.dwOptions); - ok(bindinfo.dwOptionsFlags == 0, "bindinfo.dwOptionsFlags=%d\n", bindinfo.dwOptionsFlags); + "bindinfo.dwOptions=%lx\n", bindinfo.dwOptions); + ok(bindinfo.dwOptionsFlags == 0, "bindinfo.dwOptionsFlags=%ld\n", bindinfo.dwOptionsFlags); /* TODO: test dwCodePage */ /* TODO: test securityAttributes */ ok(IsEqualGUID(&IID_NULL, &bindinfo.iid), "unexpected bindinfo.iid\n"); ok(bindinfo.pUnk == NULL, "bindinfo.pUnk=%p\n", bindinfo.pUnk); - ok(bindinfo.dwReserved == 0, "bindinfo.dwReserved=%d\n", bindinfo.dwReserved); + ok(bindinfo.dwReserved == 0, "bindinfo.dwReserved=%ld\n", bindinfo.dwReserved); hres = IBindStatusCallback_QueryInterface(callback, &IID_IServiceProvider, (void**)&service_provider); - ok(hres == S_OK, "Could not get IServiceProvider iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IServiceProvider iface: %08lx\n", hres); hres = IServiceProvider_QueryService(service_provider, &IID_IBindCallbackRedirect, &IID_IBindCallbackRedirect, (void**)&redirect_callback); - ok(hres == S_OK, "QueryService(IID_IBindCallbackRedirect) returned %08x\n", hres); + ok(hres == S_OK, "QueryService(IID_IBindCallbackRedirect) returned %08lx\n", hres); IBindCallbackRedirect_Release(redirect_callback); IServiceProvider_Release(service_provider); hres = IBindStatusCallback_OnStartBinding(callback, 0, &Binding); - ok(hres == S_OK, "OnStartBinding failed: %08x\n", hres); + ok(hres == S_OK, "OnStartBinding failed: %08lx\n", hres); if(asynchronous_binding) { PostMessageW(container_hwnd, WM_CONTINUE_BINDING, (WPARAM)callback, 0); @@ -1936,11 +1936,11 @@ static HRESULT WINAPI InPlaceSiteWindowless_GetWindow( *phwnd = container_hwnd; hres = IUnknown_QueryInterface(doc_unk, &IID_IOleObject, (void**)&ole_obj); - ok(hres == S_OK, "Could not get IOleObject: %08x\n", hres); + ok(hres == S_OK, "Could not get IOleObject: %08lx\n", hres); hres = IOleObject_GetClientSite(ole_obj, &client_site); IOleObject_Release(ole_obj); - ok(hres == S_OK, "GetClientSite failed: %08x\n", hres); + ok(hres == S_OK, "GetClientSite failed: %08lx\n", hres); ok(client_site == &ClientSite, "client_site != ClientSite\n"); IOleClientSite_Release(client_site); @@ -2060,7 +2060,7 @@ static HRESULT WINAPI InPlaceSiteWindowless_OnInPlaceActivateEx( ok(pfNoRedraw != NULL, "pfNoRedraw == NULL\n"); ok(!*pfNoRedraw, "*pfNoRedraw == TRUE\n"); - ok(dwFlags == 0, "dwFlags = %08x\n", dwFlags); + ok(dwFlags == 0, "dwFlags = %08lx\n", dwFlags); return S_OK; } @@ -2236,11 +2236,11 @@ static HRESULT WINAPI DocumentSite_ActivateMe(IOleDocumentSite *iface, IOleDocum ok(pViewToActivate != NULL, "pViewToActivate = NULL\n"); hres = IOleDocumentView_QueryInterface(pViewToActivate, &IID_IOleDocument, (void**)&document); - ok(hres == S_OK, "could not get IOleDocument: %08x\n", hres); + ok(hres == S_OK, "could not get IOleDocument: %08lx\n", hres); if(SUCCEEDED(hres)) { hres = IOleDocument_CreateView(document, (IOleInPlaceSite*)&InPlaceSiteWindowless, NULL, 0, &view); - ok(hres == S_OK, "CreateView failed: %08x\n", hres); + ok(hres == S_OK, "CreateView failed: %08lx\n", hres); if(SUCCEEDED(hres)) { IOleInPlaceActiveObject *activeobj = NULL; @@ -2249,25 +2249,25 @@ static HRESULT WINAPI DocumentSite_ActivateMe(IOleDocumentSite *iface, IOleDocum static RECT rect = {0,0,400,500}; hres = IOleDocumentView_GetInPlaceSite(view, &inplacesite); - ok(hres == S_OK, "GetInPlaceSite failed: %08x\n", hres); + ok(hres == S_OK, "GetInPlaceSite failed: %08lx\n", hres); ok(inplacesite == (IOleInPlaceSite*)&InPlaceSiteWindowless, "inplacesite=%p, expected %p\n", inplacesite, &InPlaceSiteWindowless); hres = IOleDocumentView_SetInPlaceSite(view, (IOleInPlaceSite*)&InPlaceSiteWindowless); - ok(hres == S_OK, "SetInPlaceSite failed: %08x\n", hres); + ok(hres == S_OK, "SetInPlaceSite failed: %08lx\n", hres); hres = IOleDocumentView_GetInPlaceSite(view, &inplacesite); - ok(hres == S_OK, "GetInPlaceSite failed: %08x\n", hres); + ok(hres == S_OK, "GetInPlaceSite failed: %08lx\n", hres); ok(inplacesite == (IOleInPlaceSite*)&InPlaceSiteWindowless, "inplacesite=%p, expected %p\n", inplacesite, &InPlaceSiteWindowless); hres = IOleDocumentView_QueryInterface(view, &IID_IOleInPlaceActiveObject, (void**)&activeobj); - ok(hres == S_OK, "Could not get IOleInPlaceActiveObject: %08x\n", hres); + ok(hres == S_OK, "Could not get IOleInPlaceActiveObject: %08lx\n", hres); if(activeobj) { HWND hwnd = (void*)0xdeadbeef; hres = IOleInPlaceActiveObject_GetWindow(activeobj, &hwnd); - ok(hres == E_FAIL, "GetWindow returned %08x, expected E_FAIL\n", hres); + ok(hres == E_FAIL, "GetWindow returned %08lx, expected E_FAIL\n", hres); ok(hwnd == NULL, "hwnd=%p, expected NULL\n", hwnd); } @@ -2288,7 +2288,7 @@ static HRESULT WINAPI DocumentSite_ActivateMe(IOleDocumentSite *iface, IOleDocum expect_status_text = NULL; hres = IOleDocumentView_UIActivate(view, TRUE); - ok(hres == S_OK, "UIActivate failed: %08x\n", hres); + ok(hres == S_OK, "UIActivate failed: %08lx\n", hres); CHECK_CALLED(CanInPlaceActivate); CHECK_CALLED(GetWindowContext); @@ -2306,28 +2306,28 @@ static HRESULT WINAPI DocumentSite_ActivateMe(IOleDocumentSite *iface, IOleDocum if(activeobj) { hres = IOleInPlaceActiveObject_GetWindow(activeobj, &doc_hwnd); - ok(hres == S_OK, "GetWindow failed: %08x\n", hres); + ok(hres == S_OK, "GetWindow failed: %08lx\n", hres); ok(doc_hwnd != NULL, "hwnd == NULL\n"); if(last_hwnd) ok(doc_hwnd == last_hwnd, "hwnd != last_hwnd\n"); } hres = IOleDocumentView_UIActivate(view, TRUE); - ok(hres == S_OK, "UIActivate failed: %08x\n", hres); + ok(hres == S_OK, "UIActivate failed: %08lx\n", hres); if(activeobj) { hres = IOleInPlaceActiveObject_GetWindow(activeobj, &tmp_hwnd); - ok(hres == S_OK, "GetWindow failed: %08x\n", hres); + ok(hres == S_OK, "GetWindow failed: %08lx\n", hres); ok(tmp_hwnd == doc_hwnd, "tmp_hwnd=%p, expected %p\n", tmp_hwnd, doc_hwnd); } } hres = IOleDocumentView_SetRect(view, &rect); - ok(hres == S_OK, "SetRect failed: %08x\n", hres); + ok(hres == S_OK, "SetRect failed: %08lx\n", hres); if(call_UIActivate == CallUIActivate_ActivateMe) { hres = IOleDocumentView_Show(view, TRUE); - ok(hres == S_OK, "Show failed: %08x\n", hres); + ok(hres == S_OK, "Show failed: %08lx\n", hres); }else { SET_EXPECT(CanInPlaceActivate); SET_EXPECT(GetWindowContext); @@ -2343,7 +2343,7 @@ static HRESULT WINAPI DocumentSite_ActivateMe(IOleDocumentSite *iface, IOleDocum expect_status_text = (load_state == LD_COMPLETE ? (LPCOLESTR)0xdeadbeef : NULL); hres = IOleDocumentView_Show(view, TRUE); - ok(hres == S_OK, "Show failed: %08x\n", hres); + ok(hres == S_OK, "Show failed: %08lx\n", hres); CHECK_CALLED(CanInPlaceActivate); CHECK_CALLED(GetWindowContext); @@ -2358,7 +2358,7 @@ static HRESULT WINAPI DocumentSite_ActivateMe(IOleDocumentSite *iface, IOleDocum if(activeobj) { hres = IOleInPlaceActiveObject_GetWindow(activeobj, &doc_hwnd); - ok(hres == S_OK, "GetWindow failed: %08x\n", hres); + ok(hres == S_OK, "GetWindow failed: %08lx\n", hres); ok(doc_hwnd != NULL, "doc_hwnd == NULL\n"); if(last_hwnd) ok(doc_hwnd == last_hwnd, "doc_hwnd != last_hwnd\n"); @@ -2495,12 +2495,12 @@ static HRESULT WINAPI DocHostUIHandler_GetHostInfo(IDocHostUIHandler2 *iface, DO ok(iface == expect_uihandler_iface, "called on unexpected iface\n"); ok(pInfo != NULL, "pInfo=NULL\n"); if(pInfo) { - ok(pInfo->cbSize == sizeof(DOCHOSTUIINFO), "pInfo->cbSize=%u\n", pInfo->cbSize); - ok(!pInfo->dwFlags, "pInfo->dwFlags=%08x, expected 0\n", pInfo->dwFlags); + ok(pInfo->cbSize == sizeof(DOCHOSTUIINFO), "pInfo->cbSize=%lu\n", pInfo->cbSize); + ok(!pInfo->dwFlags, "pInfo->dwFlags=%08lx, expected 0\n", pInfo->dwFlags); pInfo->dwFlags = DOCHOSTUIFLAG_DISABLE_HELP_MENU | DOCHOSTUIFLAG_DISABLE_SCRIPT_INACTIVE | DOCHOSTUIFLAG_ACTIVATE_CLIENTHIT_ONLY | DOCHOSTUIFLAG_ENABLE_INPLACE_NAVIGATION | DOCHOSTUIFLAG_IME_ENABLE_RECONVERSION; - ok(!pInfo->dwDoubleClick, "pInfo->dwDoubleClick=%08x, expected 0\n", pInfo->dwDoubleClick); + ok(!pInfo->dwDoubleClick, "pInfo->dwDoubleClick=%08lx, expected 0\n", pInfo->dwDoubleClick); ok(!pInfo->pchHostCss, "pInfo->pchHostCss=%p, expected NULL\n", pInfo->pchHostCss); ok(!pInfo->pchHostNS, "pInfo->pchhostNS=%p, expected NULL\n", pInfo->pchHostNS); } @@ -2515,9 +2515,9 @@ static HRESULT WINAPI DocHostUIHandler_ShowUI(IDocHostUIHandler2 *iface, DWORD d ok(iface == expect_uihandler_iface, "called on unexpected iface\n"); if (editmode) - ok(dwID == DOCHOSTUITYPE_AUTHOR, "dwID=%d, expected DOCHOSTUITYPE_AUTHOR\n", dwID); + ok(dwID == DOCHOSTUITYPE_AUTHOR, "dwID=%ld, expected DOCHOSTUITYPE_AUTHOR\n", dwID); else - ok(dwID == DOCHOSTUITYPE_BROWSE, "dwID=%d, expected DOCHOSTUITYPE_BROWSE\n", dwID); + ok(dwID == DOCHOSTUITYPE_BROWSE, "dwID=%ld, expected DOCHOSTUITYPE_BROWSE\n", dwID); ok(pActiveObject != NULL, "pActiveObject = NULL\n"); ok(pCommandTarget != NULL, "pCommandTarget = NULL\n"); ok(pFrame == &InPlaceFrame, "pFrame=%p, expected %p\n", pFrame, &InPlaceFrame); @@ -2590,7 +2590,7 @@ static HRESULT WINAPI DocHostUIHandler_GetOptionKeyPath(IDocHostUIHandler2 *ifac CHECK_EXPECT(GetOptionKeyPath); ok(iface == expect_uihandler_iface, "called on unexpected iface\n"); ok(pchKey != NULL, "pchKey = NULL\n"); - ok(!dw, "dw=%d, expected 0\n", dw); + ok(!dw, "dw=%ld, expected 0\n", dw); if(pchKey) ok(!*pchKey, "*pchKey=%p, expected NULL\n", *pchKey); return S_OK; @@ -2618,7 +2618,7 @@ static HRESULT WINAPI DocHostUIHandler_TranslateUrl(IDocHostUIHandler2 *iface, D { CHECK_EXPECT(TranslateUrl); ok(iface == expect_uihandler_iface, "called on unexpected iface\n"); - ok(!dwTranslate, "dwTranslate = %x\n", dwTranslate); + ok(!dwTranslate, "dwTranslate = %lx\n", dwTranslate); todo_wine_if(loading_hash) ok(!lstrcmpW(pchURLIn, nav_serv_url), "pchURLIn = %s, expected %s\n", wine_dbgstr_w(pchURLIn), wine_dbgstr_w(nav_serv_url)); @@ -2650,7 +2650,7 @@ static HRESULT WINAPI DocHostUIHandler_GetOverrideKeyPath(IDocHostUIHandler2 *if ok(pchKey != NULL, "pchKey = NULL\n"); if(pchKey) ok(!*pchKey, "*pchKey=%p, expected NULL\n", *pchKey); - ok(!dw, "dw=%d, expected 0\n", dw); + ok(!dw, "dw=%ld, expected 0\n", dw); return S_OK; } @@ -2741,7 +2741,7 @@ static HRESULT WINAPI OleCommandTarget_QueryStatus(IOleCommandTarget *iface, con ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText) { ok(!pguidCmdGroup, "pguidCmdGroup != MULL\n"); - ok(cCmds == 1, "cCmds=%d, expected 1\n", cCmds); + ok(cCmds == 1, "cCmds=%ld, expected 1\n", cCmds); ok(!pCmdText, "pCmdText != NULL\n"); switch(prgCmds[0].cmdID) { @@ -2758,7 +2758,7 @@ static HRESULT WINAPI OleCommandTarget_QueryStatus(IOleCommandTarget *iface, con prgCmds[0].cmdf = 0; return S_OK; default: - ok(0, "unexpected command %d\n", prgCmds[0].cmdID); + ok(0, "unexpected command %ld\n", prgCmds[0].cmdID); }; return E_FAIL; @@ -2772,18 +2772,18 @@ static void test_save_history(IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IPersistHistory, (void**)&per_hist); - ok(hres == S_OK, "Could not get IPersistHistory iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IPersistHistory iface: %08lx\n", hres); hres = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hres == S_OK, "CreateStreamOnHGlobal failed: %08x\n", hres); + ok(hres == S_OK, "CreateStreamOnHGlobal failed: %08lx\n", hres); hres = IPersistHistory_SaveHistory(per_hist, stream); - ok(hres == S_OK, "SaveHistory failed: %08x\n", hres); + ok(hres == S_OK, "SaveHistory failed: %08lx\n", hres); IPersistHistory_Release(per_hist); li.QuadPart = 0; hres = IStream_Seek(stream, li, STREAM_SEEK_SET, NULL); - ok(hres == S_OK, "Stat failed: %08x\n", hres); + ok(hres == S_OK, "Stat failed: %08lx\n", hres); history_stream = stream; } @@ -2799,29 +2799,29 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID switch(nCmdID) { case OLECMDID_SETPROGRESSMAX: CHECK_EXPECT2(Exec_SETPROGRESSMAX); - ok(nCmdexecopt == OLECMDEXECOPT_DONTPROMPTUSER, "nCmdexecopts=%08x\n", nCmdexecopt); + ok(nCmdexecopt == OLECMDEXECOPT_DONTPROMPTUSER, "nCmdexecopts=%08lx\n", nCmdexecopt); ok(pvaIn != NULL, "pvaIn == NULL\n"); if(pvaIn) { ok(V_VT(pvaIn) == VT_I4, "V_VT(pvaIn)=%d, expected VT_I4\n", V_VT(pvaIn)); if(load_state == LD_NO) - ok(V_I4(pvaIn) == 0, "V_I4(pvaIn)=%d, expected 0\n", V_I4(pvaIn)); + ok(V_I4(pvaIn) == 0, "V_I4(pvaIn)=%ld, expected 0\n", V_I4(pvaIn)); } ok(pvaOut == NULL, "pvaOut=%p, expected NULL\n", pvaOut); return S_OK; case OLECMDID_SETPROGRESSPOS: CHECK_EXPECT2(Exec_SETPROGRESSPOS); - ok(nCmdexecopt == OLECMDEXECOPT_DONTPROMPTUSER, "nCmdexecopts=%08x\n", nCmdexecopt); + ok(nCmdexecopt == OLECMDEXECOPT_DONTPROMPTUSER, "nCmdexecopts=%08lx\n", nCmdexecopt); ok(pvaIn != NULL, "pvaIn == NULL\n"); if(pvaIn) { ok(V_VT(pvaIn) == VT_I4, "V_VT(pvaIn)=%d, expected VT_I4\n", V_VT(pvaIn)); if(load_state == LD_NO) - ok(V_I4(pvaIn) == 0, "V_I4(pvaIn)=%d, expected 0\n", V_I4(pvaIn)); + ok(V_I4(pvaIn) == 0, "V_I4(pvaIn)=%ld, expected 0\n", V_I4(pvaIn)); } ok(pvaOut == NULL, "pvaOut=%p, expected NULL\n", pvaOut); return S_OK; case OLECMDID_HTTPEQUIV_DONE: CHECK_EXPECT(Exec_HTTPEQUIV_DONE); - ok(nCmdexecopt == 0, "nCmdexecopts=%08x\n", nCmdexecopt); + ok(nCmdexecopt == 0, "nCmdexecopts=%08lx\n", nCmdexecopt); ok(pvaOut == NULL, "pvaOut=%p\n", pvaOut); ok(pvaIn == NULL, "pvaIn=%p\n", pvaIn); readystate_set_loading = FALSE; @@ -2829,7 +2829,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID load_state = LD_COMPLETE; return S_OK; case OLECMDID_SETDOWNLOADSTATE: - ok(nCmdexecopt == OLECMDEXECOPT_DONTPROMPTUSER, "nCmdexecopts=%08x\n", nCmdexecopt); + ok(nCmdexecopt == OLECMDEXECOPT_DONTPROMPTUSER, "nCmdexecopts=%08lx\n", nCmdexecopt); ok(pvaOut == NULL, "pvaOut=%p\n", pvaOut); ok(pvaIn != NULL, "pvaIn == NULL\n"); ok(V_VT(pvaIn) == VT_I4, "V_VT(pvaIn)=%d\n", V_VT(pvaIn)); @@ -2845,19 +2845,19 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID readystate_set_interactive = (load_state != LD_INTERACTIVE); break; default: - ok(0, "unexpected V_I4(pvaIn)=%d\n", V_I4(pvaIn)); + ok(0, "unexpected V_I4(pvaIn)=%ld\n", V_I4(pvaIn)); } return S_OK; case OLECMDID_UPDATECOMMANDS: CHECK_EXPECT(Exec_UPDATECOMMANDS); - ok(nCmdexecopt == OLECMDEXECOPT_DONTPROMPTUSER, "nCmdexecopts=%08x\n", nCmdexecopt); + ok(nCmdexecopt == OLECMDEXECOPT_DONTPROMPTUSER, "nCmdexecopts=%08lx\n", nCmdexecopt); ok(pvaIn == NULL, "pvaIn=%p\n", pvaIn); ok(pvaOut == NULL, "pvaOut=%p\n", pvaOut); return S_OK; case OLECMDID_SETTITLE: CHECK_EXPECT2(Exec_SETTITLE); - ok(nCmdexecopt == OLECMDEXECOPT_DONTPROMPTUSER, "nCmdexecopts=%08x\n", nCmdexecopt); + ok(nCmdexecopt == OLECMDEXECOPT_DONTPROMPTUSER, "nCmdexecopts=%08lx\n", nCmdexecopt); ok(pvaIn != NULL, "pvaIn == NULL\n"); ok(pvaOut == NULL, "pvaOut=%p\n", pvaOut); ok(V_VT(pvaIn) == VT_BSTR, "V_VT(pvaIn)=%d\n", V_VT(pvaIn)); @@ -2865,7 +2865,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID return S_OK; case OLECMDID_HTTPEQUIV: CHECK_EXPECT2(Exec_HTTPEQUIV); - ok(!nCmdexecopt, "nCmdexecopts=%08x\n", nCmdexecopt); + ok(!nCmdexecopt, "nCmdexecopts=%08lx\n", nCmdexecopt); ok(pvaIn != NULL, "pvaIn == NULL\n"); ok(pvaOut == NULL, "pvaOut=%p\n", pvaOut); ok(V_VT(pvaIn) == VT_BSTR, "V_VT(pvaIn)=%d\n", V_VT(pvaIn)); @@ -2877,13 +2877,13 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case 6058: return E_FAIL; /* FIXME */ default: - ok(0, "unexpected command %d\n", nCmdID); + ok(0, "unexpected command %ld\n", nCmdID); return E_FAIL; }; } if(IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup)) { - ok(nCmdexecopt == 0, "nCmdexecopts=%08x\n", nCmdexecopt); + ok(nCmdexecopt == 0, "nCmdexecopts=%08lx\n", nCmdexecopt); switch(nCmdID) { case 37: @@ -2910,7 +2910,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID ok(pvaIn != NULL, "pvaIn == NULL\n"); if(pvaIn) { ok(V_VT(pvaIn) == VT_I4, "V_VT(pvaIn)=%d, expected VT_I4\n", V_VT(pvaIn)); - ok(V_I4(pvaIn) == 0, "V_I4(pvaIn)=%d, expected 0\n", V_I4(pvaIn)); + ok(V_I4(pvaIn) == 0, "V_I4(pvaIn)=%ld, expected 0\n", V_I4(pvaIn)); } return S_OK; @@ -2932,7 +2932,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID ok(V_VT(pvaOut) == VT_EMPTY, "V_VT(pvaOut) = %d\n", V_VT(pvaOut)); hres = IUnknown_QueryInterface(V_UNKNOWN(pvaIn), &IID_IHTMLPrivateWindow, (void**)&priv_window); - ok(hres == S_OK, "Could not get IHTMLPrivateWindow: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLPrivateWindow: %08lx\n", hres); if(SUCCEEDED(hres)) IHTMLPrivateWindow_Release(priv_window); @@ -3019,14 +3019,14 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID return E_NOTIMPL; default: - ok(0, "unexpected command %d\n", nCmdID); + ok(0, "unexpected command %ld\n", nCmdID); return E_FAIL; }; } if(IsEqualGUID(&CGID_MSHTML, pguidCmdGroup)) { test_readyState(NULL); - ok(nCmdexecopt == 0, "nCmdexecopts=%08x\n", nCmdexecopt); + ok(nCmdexecopt == 0, "nCmdexecopts=%08lx\n", nCmdexecopt); switch(nCmdID) { case IDM_PARSECOMPLETE: @@ -3035,7 +3035,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID ok(pvaOut == NULL, "pvaOut != NULL\n"); return S_OK; default: - ok(0, "unexpected command %d\n", nCmdID); + ok(0, "unexpected command %ld\n", nCmdID); }; } @@ -3072,16 +3072,16 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID dim = SafeArrayGetDim(sa); ok(dim == 1, "dim = %d\n", dim); hres = SafeArrayGetLBound(sa, 1, &ind); - ok(hres == S_OK, "SafeArrayGetLBound failed: %x\n", hres); - ok(ind == 0, "Lower bound = %d\n", ind); + ok(hres == S_OK, "SafeArrayGetLBound failed: %lx\n", hres); + ok(ind == 0, "Lower bound = %ld\n", ind); hres = SafeArrayGetUBound(sa, 1, &ind); - ok(hres == S_OK, "SafeArrayGetUBound failed: %x\n", hres); - ok(ind == 7 || ind == 8 /* IE11 */ ||broken(ind == 5), "Upper bound = %d\n", ind); + ok(hres == S_OK, "SafeArrayGetUBound failed: %lx\n", hres); + ok(ind == 7 || ind == 8 /* IE11 */ ||broken(ind == 5), "Upper bound = %ld\n", ind); ind = 0; SafeArrayGetElement(sa, &ind, &var); ok(V_VT(&var) == VT_I4, "Incorrect data type: %d\n", V_VT(&var)); - ok(V_I4(&var) == status_code, "Incorrect error code: %d\n", V_I4(&var)); + ok(V_I4(&var) == status_code, "Incorrect error code: %ld\n", V_I4(&var)); VariantClear(&var); ind = 1; SafeArrayGetElement(sa, &ind, &var); @@ -3114,14 +3114,14 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID if(IsEqualGUID(&CGID_Explorer, pguidCmdGroup)) { test_readyState(NULL); - ok(nCmdexecopt == 0, "nCmdexecopts=%08x\n", nCmdexecopt); + ok(nCmdexecopt == 0, "nCmdexecopts=%08lx\n", nCmdexecopt); switch(nCmdID) { case 38: CHECK_EXPECT2(Exec_Explorer_38); ok(pvaIn != NULL, "pvaIn == NULL\n"); ok(V_VT(pvaIn) == VT_I4 , "V_VT(pvaIn) = %d\n", V_VT(pvaIn)); - ok(!V_I4(pvaIn), "V_I4(pvaIn) = %d\n", V_I4(pvaIn)); + ok(!V_I4(pvaIn), "V_I4(pvaIn) = %ld\n", V_I4(pvaIn)); ok(!pvaOut, "pvaOut != NULL\n"); test_current_url(doc_unk, prev_url); @@ -3137,7 +3137,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case 109: /* TODO */ return E_NOTIMPL; default: - ok(0, "unexpected cmd %d of CGID_Explorer\n", nCmdID); + ok(0, "unexpected cmd %ld of CGID_Explorer\n", nCmdID); } return E_NOTIMPL; } @@ -3158,7 +3158,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID CHECK_EXPECT(Exec_DocHostCommandHandler_2300); return E_NOTIMPL; default: - ok(0, "unexpected command %d\n", nCmdID); + ok(0, "unexpected command %ld\n", nCmdID); return E_FAIL; } } @@ -3224,7 +3224,7 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF return E_FAIL; }; - ok(0, "unexpected dispid %d\n", dispIdMember); + ok(0, "unexpected dispid %ld\n", dispIdMember); return E_FAIL; } @@ -3270,12 +3270,12 @@ static HRESULT WINAPI EventDispatch_Invoke(IDispatch *iface, DISPID dispIdMember ok(wFlags == DISPATCH_METHOD, "wFlags = %d, expected DISPATCH_METHOD\n", wFlags); hres = IUnknown_QueryInterface(doc_unk, &IID_IHTMLDocument2, (void**)&doc); - ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument2) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument2) failed: %08lx\n", hres); switch(dispIdMember) { case DISPID_HTMLDOCUMENTEVENTS2_ONREADYSTATECHANGE: hres = IHTMLDocument2_get_readyState(doc, &state); - ok(hres == S_OK, "get_readyState failed: %08x\n", hres); + ok(hres == S_OK, "get_readyState failed: %08lx\n", hres); if(!lstrcmpW(state, L"interactive")) CHECK_EXPECT(Invoke_OnReadyStateChange_Interactive); @@ -3302,7 +3302,7 @@ static HRESULT WINAPI EventDispatch_Invoke(IDispatch *iface, DISPID dispIdMember case 1049: break; /* FIXME: Handle these events. */ default: - ok(0, "Unexpected DISPID: %d\n", dispIdMember); + ok(0, "Unexpected DISPID: %ld\n", dispIdMember); } IHTMLDocument2_Release(doc); @@ -3467,15 +3467,15 @@ static HRESULT WINAPI DocObjectService_FireBeforeNavigate2(IDocObjectService *i ok(!pDispatch, "pDispatch = %p\n", pDispatch); ok(!lstrcmpW(lpszUrl, nav_url), "lpszUrl = %s, expected %s\n", wine_dbgstr_w(lpszUrl), wine_dbgstr_w(nav_url)); - ok(dwFlags == 0x140 /* IE11*/ || dwFlags == 0x40 || !dwFlags || dwFlags == 0x50, "dwFlags = %x\n", dwFlags); + ok(dwFlags == 0x140 /* IE11*/ || dwFlags == 0x40 || !dwFlags || dwFlags == 0x50, "dwFlags = %lx\n", dwFlags); ok(!lpszFrameName, "lpszFrameName = %s\n", wine_dbgstr_w(lpszFrameName)); if(!testing_submit) { ok(!pPostData, "pPostData = %p\n", pPostData); - ok(!cbPostData, "cbPostData = %d\n", cbPostData); + ok(!cbPostData, "cbPostData = %ld\n", cbPostData); ok(!lpszHeaders || !lstrcmpW(lpszHeaders, L"Referer: http://test.winehq.org/tests/winehq_snapshot/\r\n"), "lpszHeaders = %s\n", wine_dbgstr_w(lpszHeaders)); }else { - ok(cbPostData == 9, "cbPostData = %d\n", cbPostData); + ok(cbPostData == 9, "cbPostData = %ld\n", cbPostData); ok(!memcmp(pPostData, "cmd=TEST", cbPostData), "pPostData = %p\n", pPostData); ok(wcsstr(lpszHeaders, L"Content-Type: application/x-www-form-urlencoded\r\n") != NULL, "lpszHeaders = %s\n", wine_dbgstr_w(lpszHeaders)); @@ -3497,9 +3497,9 @@ static HRESULT WINAPI DocObjectService_FireNavigateComplete2( test_readyState(NULL); if(loading_hash) - ok(dwFlags == 0x10 || broken(!dwFlags), "dwFlags = %x, expected 0x10\n", dwFlags); + ok(dwFlags == 0x10 || broken(!dwFlags), "dwFlags = %lx, expected 0x10\n", dwFlags); else - ok(!(dwFlags &~1), "dwFlags = %x\n", dwFlags); + ok(!(dwFlags &~1), "dwFlags = %lx\n", dwFlags); ok(pHTMLWindow2 != NULL, "pHTMLWindow2 = NULL\n"); @@ -3528,7 +3528,7 @@ static HRESULT WINAPI DocObjectService_FireDocumentComplete( CHECK_EXPECT(FireDocumentComplete); ok(pHTMLWindow != NULL, "pHTMLWindow == NULL\n"); - ok(!dwFlags, "dwFlags = %x\n", dwFlags); + ok(!dwFlags, "dwFlags = %lx\n", dwFlags); return S_OK; } @@ -4108,7 +4108,7 @@ static HRESULT WINAPI WBE2Sink_Invoke(IDispatch *iface, DISPID dispIdMember, REF return S_OK; } default: - ok(0, "unexpected id %d\n", dispIdMember); + ok(0, "unexpected id %ld\n", dispIdMember); } return E_NOTIMPL; @@ -4148,7 +4148,7 @@ static HRESULT WINAPI EnumConnections_Next(IEnumConnections *iface, ULONG cConne { CHECK_EXPECT2(EnumConnections_Next); - ok(cConnections == 1, "cConnections = %d\n", cConnections); + ok(cConnections == 1, "cConnections = %ld\n", cConnections); ok(pcFetched != NULL, "pcFetched == NULL\n"); if(next_called) { @@ -4310,7 +4310,7 @@ static void test_NavigateWithBindCtx(BSTR uri, VARIANT *flags, VARIANT *target_f { ok(!lstrcmpW(uri, nav_url), "uri = %s\n", wine_dbgstr_w(uri)); ok(V_VT(flags) == VT_I4, "V_VT(flags) = %d\n", V_VT(flags)); - ok(V_I4(flags) == navHyperlink, "V_I4(flags) = %x\n", V_I4(flags)); + ok(V_I4(flags) == navHyperlink, "V_I4(flags) = %lx\n", V_I4(flags)); ok(!target_frame, "target_frame != NULL\n"); ok(!post_data, "post_data != NULL\n"); ok(!headers, "headers != NULL\n"); @@ -4389,7 +4389,7 @@ static HRESULT WINAPI WebBrowserPriv2IE8_NavigateWithBindCtx2(IWebBrowserPriv2IE CHECK_EXPECT(NavigateWithBindCtx); hres = IUri_GetDisplayUri(uri, &str); - ok(hres == S_OK, "GetDisplayUri failed: %08x\n", hres); + ok(hres == S_OK, "GetDisplayUri failed: %08lx\n", hres); test_NavigateWithBindCtx(str, flags, target_frame, post_data, headers, bind_ctx, url_fragment); SysFreeString(str); return S_OK; @@ -4486,7 +4486,7 @@ static HRESULT WINAPI WebBrowserPriv2IE9_NavigateWithBindCtx2(IWebBrowserPriv2IE CHECK_EXPECT(NavigateWithBindCtx); hres = IUri_GetDisplayUri(uri, &str); - ok(hres == S_OK, "GetDisplayUri failed: %08x\n", hres); + ok(hres == S_OK, "GetDisplayUri failed: %08lx\n", hres); test_NavigateWithBindCtx(str, flags, target_frame, post_data, headers, bind_ctx, url_fragment); SysFreeString(str); return S_OK; @@ -5227,8 +5227,8 @@ static void WINAPI ViewAdviseSink_OnViewChange(IAdviseSinkEx *iface, { CHECK_EXPECT2(OnViewChange); - ok(dwAspect == DVASPECT_CONTENT, "dwAspect = %d\n", dwAspect); - ok(lindex == -1, "lindex = %d\n", lindex); + ok(dwAspect == DVASPECT_CONTENT, "dwAspect = %ld\n", dwAspect); + ok(lindex == -1, "lindex = %ld\n", lindex); } static const IAdviseSinkExVtbl ViewAdviseSinkVtbl = { @@ -5321,13 +5321,13 @@ static void test_doscroll(IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLDocument3, (void**)&doc); - ok(hres == S_OK, "Could not get IHTMLDocument3 iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLDocument3 iface: %08lx\n", hres); if(FAILED(hres)) return; hres = IHTMLDocument3_get_documentElement(doc, &elem); IHTMLDocument3_Release(doc); - ok(hres == S_OK, "get_documentElement failed: %08x\n", hres); + ok(hres == S_OK, "get_documentElement failed: %08lx\n", hres); switch(load_state) { case LD_DOLOAD: case LD_NO: @@ -5344,7 +5344,7 @@ static void test_doscroll(IUnknown *unk) hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLElement2, (void**)&elem2); IHTMLElement_Release(elem); - ok(hres == S_OK, "Could not get IHTMLElement2 iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLElement2 iface: %08lx\n", hres); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"left"); @@ -5353,11 +5353,11 @@ static void test_doscroll(IUnknown *unk) IHTMLElement2_Release(elem2); if(inplace_deactivated) - ok(hres == E_PENDING, "doScroll failed: %08x\n", hres); + ok(hres == E_PENDING, "doScroll failed: %08lx\n", hres); else if(load_state == LD_COMPLETE) - ok(hres == S_OK, "doScroll failed: %08x\n", hres); + ok(hres == S_OK, "doScroll failed: %08lx\n", hres); else - ok(hres == E_PENDING || hres == S_OK, "doScroll failed: %08x\n", hres); + ok(hres == E_PENDING || hres == S_OK, "doScroll failed: %08lx\n", hres); } static void _test_readyState(unsigned line, IUnknown *unk) @@ -5385,15 +5385,15 @@ static void _test_readyState(unsigned line, IUnknown *unk) unk = doc_unk; hres = IUnknown_QueryInterface(unk, &IID_IHTMLDocument2, (void**)&htmldoc); - ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument2) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument2) failed: %08lx\n", hres); if(FAILED(hres)) return; hres = IHTMLDocument2_get_readyState(htmldoc, NULL); - ok(hres == E_POINTER, "get_readyState failed: %08x, expected\n", hres); + ok(hres == E_POINTER, "get_readyState failed: %08lx, expected\n", hres); hres = IHTMLDocument2_get_readyState(htmldoc, &state); - ok(hres == S_OK, "get_ReadyState failed: %08x\n", hres); + ok(hres == S_OK, "get_ReadyState failed: %08lx\n", hres); if(!lstrcmpW(state, L"interactive") && load_state == LD_LOADING) load_state = LD_INTERACTIVE; @@ -5404,18 +5404,18 @@ static void _test_readyState(unsigned line, IUnknown *unk) SysFreeString(state); hres = IHTMLDocument2_get_body(htmldoc, &elem); - ok_(__FILE__,line)(hres == S_OK, "get_body failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_body failed: %08lx\n", hres); if(elem) { IHTMLElement2 *elem2; VARIANT var; hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLElement2, (void**)&elem2); IHTMLElement_Release(elem); - ok(hres == S_OK, "Could not get IHTMLElement2 iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLElement2 iface: %08lx\n", hres); hres = IHTMLElement2_get_readyState(elem2, &var); IHTMLElement2_Release(elem2); - ok(hres == S_OK, "get_readyState failed: %08x\n", hres); + ok(hres == S_OK, "get_readyState failed: %08lx\n", hres); ok(V_VT(&var) == VT_BSTR, "V_VT(state) = %d\n", V_VT(&var)); ok(!lstrcmpW(V_BSTR(&var), L"complete"), "unexpected body state %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); @@ -5432,10 +5432,10 @@ static void _test_readyState(unsigned line, IUnknown *unk) hres = IHTMLDocument2_Invoke(htmldoc, DISPID_READYSTATE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dispparams, &out, NULL, NULL); - ok(hres == S_OK, "Invoke(DISPID_READYSTATE) failed: %08x\n", hres); + ok(hres == S_OK, "Invoke(DISPID_READYSTATE) failed: %08lx\n", hres); ok_(__FILE__,line) (V_VT(&out) == VT_I4, "V_VT(out)=%d\n", V_VT(&out)); - ok_(__FILE__,line) (V_I4(&out) == load_state%5, "VT_I4(out)=%d, expected %d\n", V_I4(&out), load_state%5); + ok_(__FILE__,line) (V_I4(&out) == load_state%5, "VT_I4(out)=%ld, expected %d\n", V_I4(&out), load_state%5); test_doscroll((IUnknown*)htmldoc); @@ -5448,10 +5448,10 @@ static void test_ViewAdviseSink(IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLDocument2_QueryInterface(doc, &IID_IViewObject, (void**)&view); - ok(hres == S_OK, "QueryInterface(IID_IViewObject) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IViewObject) failed: %08lx\n", hres); hres = IViewObject_SetAdvise(view, DVASPECT_CONTENT, ADVF_PRIMEFIRST, (IAdviseSink*)&ViewAdviseSink); - ok(hres == S_OK, "SetAdvise failed: %08x\n", hres); + ok(hres == S_OK, "SetAdvise failed: %08lx\n", hres); IViewObject_Release(view); } @@ -5465,55 +5465,55 @@ static void test_ConnectionPoint(IConnectionPointContainer *container, REFIID ri DWORD cookie; hres = IConnectionPointContainer_FindConnectionPoint(container, riid, &cp); - ok(hres == S_OK, "FindConnectionPoint failed: %08x\n", hres); + ok(hres == S_OK, "FindConnectionPoint failed: %08lx\n", hres); if(FAILED(hres)) return; hres = IConnectionPoint_GetConnectionInterface(cp, &iid); - ok(hres == S_OK, "GetConnectionInterface failed: %08x\n", hres); + ok(hres == S_OK, "GetConnectionInterface failed: %08lx\n", hres); ok(IsEqualGUID(riid, &iid), "wrong iid\n"); hres = IConnectionPoint_GetConnectionInterface(cp, NULL); - ok(hres == E_POINTER, "GetConnectionInterface failed: %08x, expected E_POINTER\n", hres); + ok(hres == E_POINTER, "GetConnectionInterface failed: %08lx, expected E_POINTER\n", hres); hres = IConnectionPoint_GetConnectionPointContainer(cp, &tmp_container); - ok(hres == S_OK, "GetConnectionPointContainer failed: %08x\n", hres); + ok(hres == S_OK, "GetConnectionPointContainer failed: %08lx\n", hres); ok(tmp_container == container, "container != tmp_container\n"); if(SUCCEEDED(hres)) IConnectionPointContainer_Release(tmp_container); hres = IConnectionPoint_GetConnectionPointContainer(cp, NULL); - ok(hres == E_POINTER, "GetConnectionPointContainer failed: %08x, expected E_POINTER\n", hres); + ok(hres == E_POINTER, "GetConnectionPointContainer failed: %08lx, expected E_POINTER\n", hres); if(IsEqualGUID(&IID_IPropertyNotifySink, riid)) { hres = IConnectionPoint_Advise(cp, (IUnknown*)&PropertyNotifySink, &cookie); - ok(hres == S_OK, "Advise failed: %08x\n", hres); + ok(hres == S_OK, "Advise failed: %08lx\n", hres); hres = IConnectionPoint_Unadvise(cp, cookie); - ok(hres == S_OK, "Unadvise failed: %08x\n", hres); + ok(hres == S_OK, "Unadvise failed: %08lx\n", hres); hres = IConnectionPoint_Advise(cp, (IUnknown*)&PropertyNotifySink, NULL); - ok(hres == S_OK, "Advise failed: %08x\n", hres); + ok(hres == S_OK, "Advise failed: %08lx\n", hres); } else if(IsEqualGUID(&IID_IDispatch, riid)) { IEnumConnections *enum_conn; CONNECTDATA conn_data; ULONG fetched; hres = IConnectionPoint_Advise(cp, (IUnknown*)&EventDispatch, &cookie); - ok(hres == S_OK, "Advise failed: %08x\n", hres); + ok(hres == S_OK, "Advise failed: %08lx\n", hres); hres = IConnectionPoint_EnumConnections(cp, &enum_conn); - ok(hres == S_OK, "EnumConnections failed: %08x\n", hres); + ok(hres == S_OK, "EnumConnections failed: %08lx\n", hres); fetched = 0; hres = IEnumConnections_Next(enum_conn, 1, &conn_data, &fetched); - ok(hres == S_OK, "Next failed: %08x\n", hres); + ok(hres == S_OK, "Next failed: %08lx\n", hres); ok(conn_data.pUnk == (IUnknown*)&EventDispatch, "conn_data.pUnk == EventDispatch\n"); ok(conn_data.dwCookie == cookie, "conn_data.dwCookie != cookie\n"); IUnknown_Release(conn_data.pUnk); fetched = 0xdeadbeef; hres = IEnumConnections_Next(enum_conn, 1, &conn_data, &fetched); - ok(hres == S_FALSE, "Next failed: %08x\n", hres); - ok(!fetched, "fetched = %d\n", fetched); + ok(hres == S_FALSE, "Next failed: %08lx\n", hres); + ok(!fetched, "fetched = %ld\n", fetched); IEnumConnections_Release(enum_conn); } @@ -5527,7 +5527,7 @@ static void test_ConnectionPointContainer(IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLDocument2_QueryInterface(doc, &IID_IConnectionPointContainer, (void**)&container); - ok(hres == S_OK, "QueryInterface(IID_IConnectionPointContainer) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IConnectionPointContainer) failed: %08lx\n", hres); if(FAILED(hres)) return; @@ -5545,13 +5545,13 @@ static void set_custom_uihandler(IHTMLDocument2 *doc, IDocHostUIHandler2 *uihand HRESULT hres; hres = IHTMLDocument2_QueryInterface(doc, &IID_ICustomDoc, (void**)&custom_doc); - ok(hres == S_OK, "Could not get ICustomDoc iface: %08x\n", hres); + ok(hres == S_OK, "Could not get ICustomDoc iface: %08lx\n", hres); expect_uihandler_iface = uihandler; hres = ICustomDoc_SetUIHandler(custom_doc, (IDocHostUIHandler*)uihandler); ICustomDoc_Release(custom_doc); - ok(hres == S_OK, "SetUIHandler failed: %08x\n", hres); + ok(hres == S_OK, "SetUIHandler failed: %08lx\n", hres); } static void test_Load(IPersistMoniker *persist, IMoniker *mon) @@ -5622,7 +5622,7 @@ static void test_Load(IPersistMoniker *persist, IMoniker *mon) readystate_set_loading = TRUE; hres = IPersistMoniker_Load(persist, FALSE, mon, bind, 0x12); - ok(hres == S_OK, "Load failed: %08x\n", hres); + ok(hres == S_OK, "Load failed: %08lx\n", hres); if(mon == &Moniker) CHECK_CALLED(GetDisplayName); @@ -5932,26 +5932,26 @@ static void test_Persist(IHTMLDocument2 *doc, IMoniker *mon) HRESULT hres; hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistFile, (void**)&persist_file); - ok(hres == S_OK, "QueryInterface(IID_IPersist) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IPersist) failed: %08lx\n", hres); if(SUCCEEDED(hres)) { hres = IPersistFile_GetClassID(persist_file, NULL); - ok(hres == E_INVALIDARG, "GetClassID returned: %08x, expected E_INVALIDARG\n", hres); + ok(hres == E_INVALIDARG, "GetClassID returned: %08lx, expected E_INVALIDARG\n", hres); hres = IPersistFile_GetClassID(persist_file, &guid); - ok(hres == S_OK, "GetClassID failed: %08x\n", hres); + ok(hres == S_OK, "GetClassID failed: %08lx\n", hres); ok(IsEqualGUID(&CLSID_HTMLDocument, &guid), "guid != CLSID_HTMLDocument\n"); IPersistFile_Release(persist_file); } hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistMoniker, (void**)&persist_mon); - ok(hres == S_OK, "QueryInterface(IID_IPersistMoniker) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IPersistMoniker) failed: %08lx\n", hres); if(SUCCEEDED(hres)) { hres = IPersistMoniker_GetClassID(persist_mon, NULL); - ok(hres == E_INVALIDARG, "GetClassID returned: %08x, expected E_INVALIDARG\n", hres); + ok(hres == E_INVALIDARG, "GetClassID returned: %08lx, expected E_INVALIDARG\n", hres); hres = IPersistMoniker_GetClassID(persist_mon, &guid); - ok(hres == S_OK, "GetClassID failed: %08x\n", hres); + ok(hres == S_OK, "GetClassID failed: %08lx\n", hres); ok(IsEqualGUID(&CLSID_HTMLDocument, &guid), "guid != CLSID_HTMLDocument\n"); if(load_state == LD_DOLOAD) @@ -5980,7 +5980,7 @@ static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace, const WCHAR *hr location = NULL; hres = IHTMLDocument2_get_location(doc, &location); - ok(hres == S_OK, "get_location failed: %08x\n", hres); + ok(hres == S_OK, "get_location failed: %08lx\n", hres); ok(location != NULL, "location == NULL\n"); prev_url = prev_nav_url = nav_url; @@ -6009,13 +6009,13 @@ static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace, const WCHAR *hr } if(use_replace) { hres = IHTMLLocation_replace(location, str); - ok(hres == S_OK, "put_href failed: %08x\n", hres); + ok(hres == S_OK, "put_href failed: %08lx\n", hres); }else { hres = IHTMLLocation_put_href(location, str); if(is_js && hres == E_ACCESSDENIED) win_skip("put_href: got E_ACCESSDENIED\n"); else - ok(hres == S_OK, "put_href failed: %08x\n", hres); + ok(hres == S_OK, "put_href failed: %08lx\n", hres); } SysFreeString(str); if(hres == S_OK) { @@ -6062,11 +6062,11 @@ static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace, const WCHAR *hr } hres = IHTMLDocument2_get_parentWindow(doc, &window); - ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + ok(hres == S_OK, "get_parentWindow failed: %08lx\n", hres); hres = IHTMLWindow2_QueryInterface(window, &IID_IHTMLPrivateWindow, (void**)&priv_window); IHTMLWindow2_Release(window); - ok(hres == S_OK, "QueryInterface(IID_IHTMLPrivateWindow) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IHTMLPrivateWindow) failed: %08lx\n", hres); if(!support_wbapp) { VARIANT vempty; @@ -6085,7 +6085,7 @@ static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace, const WCHAR *hr hres = IHTMLPrivateWindow_SuperNavigate(priv_window, str, str2, NULL, NULL, &vempty, &vempty, 0); SysFreeString(str); SysFreeString(str2); - ok(hres == S_OK, "SuperNavigate failed: %08x\n", hres); + ok(hres == S_OK, "SuperNavigate failed: %08lx\n", hres); CHECK_CALLED(TranslateUrl); CLEAR_CALLED(Exec_ShellDocView_67); /* Not called by IE11 */ @@ -6102,7 +6102,7 @@ static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace, const WCHAR *hr if(!is_hash) { hres = IHTMLPrivateWindow_GetAddressBarUrl(priv_window, &str2); - ok(hres == S_OK, "GetAddressBarUrl failed: %08x\n", hres); + ok(hres == S_OK, "GetAddressBarUrl failed: %08lx\n", hres); ok(!lstrcmpW(str2, prev_nav_url), "unexpected address bar url: %s, expected %s\n", wine_dbgstr_w(str2), wine_dbgstr_w(prev_nav_url)); SysFreeString(str2); @@ -6122,7 +6122,7 @@ static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace, const WCHAR *hr } hres = IHTMLPrivateWindow_GetAddressBarUrl(priv_window, &str2); - ok(hres == S_OK, "GetAddressBarUrl failed: %08x\n", hres); + ok(hres == S_OK, "GetAddressBarUrl failed: %08lx\n", hres); if(is_js) ok(!lstrcmpW(str2, prev_nav_url), "unexpected address bar url: %s\n", wine_dbgstr_w(str2)); else if (dwl_flags & DWL_EXTERNAL) @@ -6145,7 +6145,7 @@ static void test_load_history(IHTMLDocument2 *doc) trace("LoadHistory...\n"); hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistHistory, (void**)&per_hist); - ok(hres == S_OK, "Could not get IPersistHistory iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IPersistHistory iface: %08lx\n", hres); prev_url = nav_url; nav_url = L"http://test.winehq.org/tests/winehq_snapshot/#test"; @@ -6158,7 +6158,7 @@ static void test_load_history(IHTMLDocument2 *doc) SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); hres = IPersistHistory_LoadHistory(per_hist, history_stream, NULL); - ok(hres == S_OK, "LoadHistory failed: %08x\n", hres); + ok(hres == S_OK, "LoadHistory failed: %08lx\n", hres); CLEAR_CALLED(Exec_ShellDocView_138); /* Not called by IE11 */ CLEAR_CALLED(Exec_ShellDocView_67); /* Not called by IE11 */ @@ -6184,16 +6184,16 @@ static void test_OmHistory(IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLDocument2_get_parentWindow(doc, &win); - ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + ok(hres == S_OK, "get_parentWindow failed: %08lx\n", hres); hres = IHTMLWindow2_get_history(win, &hist); - ok(hres == S_OK, "get_history failed: %08x\n", hres); + ok(hres == S_OK, "get_history failed: %08lx\n", hres); IHTMLWindow2_Release(win); SET_EXPECT(CountEntries); hres = IOmHistory_get_length(hist, &len); CHECK_CALLED(CountEntries); - ok(hres == S_OK, "get_length failed: %08x\n", hres); + ok(hres == S_OK, "get_length failed: %08lx\n", hres); ok(len == 0, "len = %d\n", len); IOmHistory_Release(hist); @@ -6208,13 +6208,13 @@ static void test_refresh(IHTMLDocument2 *doc) trace("Refresh...\n"); hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleCommandTarget, (void**)&cmdtrg); - ok(hres == S_OK, "Could not get IOleCommandTarget iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IOleCommandTarget iface: %08lx\n", hres); V_VT(&vin) = VT_EMPTY; V_VT(&vout) = VT_EMPTY; SET_EXPECT(Exec_DocHostCommandHandler_2300); hres = IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_REFRESH, OLECMDEXECOPT_PROMPTUSER, &vin, &vout); - ok(hres == S_OK, "Exec failed: %08x\n", hres); + ok(hres == S_OK, "Exec failed: %08lx\n", hres); ok(V_VT(&vout) == VT_EMPTY, "V_VT(vout) = %d\n", V_VT(&vout)); CHECK_CALLED(Exec_DocHostCommandHandler_2300); @@ -6232,7 +6232,7 @@ static void test_open_window(IHTMLDocument2 *doc, BOOL do_block) allow_new_window = !do_block; hres = IHTMLDocument2_get_parentWindow(doc, &window); - ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + ok(hres == S_OK, "get_parentWindow failed: %08lx\n", hres); url = SysAllocString(nav_serv_url = nav_url = L"about:blank"); name = SysAllocString(L"test"); @@ -6267,7 +6267,7 @@ static void test_open_window(IHTMLDocument2 *doc, BOOL do_block) } CHECK_CALLED(EvaluateNewWindow); - ok(hres == S_OK, "open failed: %08x\n", hres); + ok(hres == S_OK, "open failed: %08lx\n", hres); if (hres != S_OK) { IHTMLWindow2_Release(window); return; @@ -6279,7 +6279,7 @@ static void test_open_window(IHTMLDocument2 *doc, BOOL do_block) ok(new_window != NULL, "new_window == NULL\n"); hres = IHTMLWindow2_close(new_window); - ok(hres == S_OK, "close failed: %08x\n", hres); + ok(hres == S_OK, "close failed: %08lx\n", hres); IHTMLWindow2_Release(new_window); } @@ -6292,7 +6292,7 @@ static void test_window_close(IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLDocument2_get_parentWindow(doc, &window); - ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + ok(hres == S_OK, "get_parentWindow failed: %08lx\n", hres); SET_EXPECT(FindConnectionPoint); SET_EXPECT(EnumConnections); @@ -6300,7 +6300,7 @@ static void test_window_close(IHTMLDocument2 *doc) SET_EXPECT(WindowClosing); hres = IHTMLWindow2_close(window); - ok(hres == S_OK, "close failed: %08x\n", hres); + ok(hres == S_OK, "close failed: %08lx\n", hres); CHECK_CALLED(FindConnectionPoint); CHECK_CALLED(EnumConnections); @@ -6318,12 +6318,12 @@ static void test_elem_from_point(IHTMLDocument2 *doc) elem = NULL; hres = IHTMLDocument2_elementFromPoint(doc, 3, 3, &elem); - ok(hres == S_OK, "elementFromPoint failed: %08x\n", hres); + ok(hres == S_OK, "elementFromPoint failed: %08lx\n", hres); ok(elem != NULL, "elem == NULL\n"); hres = IHTMLElement_get_tagName(elem, &tag); IHTMLElement_Release(elem); - ok(hres == S_OK, "get_tagName failed: %08x\n", hres); + ok(hres == S_OK, "get_tagName failed: %08lx\n", hres); ok(!lstrcmpW(tag, L"DIV"), "tag = %s\n", wine_dbgstr_w(tag)); } @@ -6332,7 +6332,7 @@ static void test_clear(IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLDocument2_clear(doc); - ok(hres == S_OK, "clear failed: %08x\n", hres); + ok(hres == S_OK, "clear failed: %08lx\n", hres); } static const OLECMDF expect_cmds[] = { @@ -6385,17 +6385,17 @@ static void _test_QueryStatus(unsigned line, IUnknown *unk, REFIID cgid, ULONG c HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IOleCommandTarget, (void**)&cmdtrg); - ok_(__FILE__,line) (hres == S_OK, "QueryInterface(IID_IOleCommandTarget failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "QueryInterface(IID_IOleCommandTarget failed: %08lx\n", hres); if(FAILED(hres)) return; hres = IOleCommandTarget_QueryStatus(cmdtrg, cgid, 1, &olecmd, NULL); - ok(hres == (cmdf ? S_OK : OLECMDERR_E_NOTSUPPORTED), "QueryStatus(%u) failed: %08x\n", cmdid, hres); + ok(hres == (cmdf ? S_OK : OLECMDERR_E_NOTSUPPORTED), "QueryStatus(%lu) failed: %08lx\n", cmdid, hres); IOleCommandTarget_Release(cmdtrg); ok_(__FILE__,line) (olecmd.cmdID == cmdid, "cmdID changed\n"); - ok_(__FILE__,line) (olecmd.cmdf == cmdf, "(%u) cmdf=%08x, expected %08x\n", cmdid, olecmd.cmdf, cmdf); + ok_(__FILE__,line) (olecmd.cmdf == cmdf, "(%lu) cmdf=%08lx, expected %08lx\n", cmdid, olecmd.cmdf, cmdf); } static void test_MSHTML_QueryStatus(IHTMLDocument2 *doc, DWORD cmdf) @@ -6428,7 +6428,7 @@ static void test_OleCommandTarget(IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleCommandTarget, (void**)&cmdtrg); - ok(hres == S_OK, "QueryInterface(IID_IOleCommandTarget failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IOleCommandTarget failed: %08lx\n", hres); if(FAILED(hres)) return; @@ -6440,20 +6440,20 @@ static void test_OleCommandTarget(IHTMLDocument2 *doc) SET_EXPECT(QueryStatus_OPEN); SET_EXPECT(QueryStatus_NEW); hres = IOleCommandTarget_QueryStatus(cmdtrg, NULL, ARRAY_SIZE(cmds), cmds, NULL); - ok(hres == S_OK, "QueryStatus failed: %08x\n", hres); + ok(hres == S_OK, "QueryStatus failed: %08lx\n", hres); CHECK_CALLED(QueryStatus_OPEN); CHECK_CALLED(QueryStatus_NEW); for(i=0; i < ARRAY_SIZE(cmds); i++) { - ok(cmds[i].cmdID == i+1, "cmds[%d].cmdID canged to %x\n", i, cmds[i].cmdID); + ok(cmds[i].cmdID == i+1, "cmds[%d].cmdID canged to %lx\n", i, cmds[i].cmdID); if(i+1 == OLECMDID_FIND) continue; - ok(cmds[i].cmdf == expect_cmds[i+1], "cmds[%d].cmdf=%x, expected %x\n", + ok(cmds[i].cmdf == expect_cmds[i+1], "cmds[%d].cmdf=%lx, expected %x\n", i+1, cmds[i].cmdf, expect_cmds[i+1]); } ok(!cmds[OLECMDID_FIND-1].cmdf || cmds[OLECMDID_FIND-1].cmdf == (OLECMDF_SUPPORTED|OLECMDF_ENABLED), - "cmds[OLECMDID_FIND].cmdf=%x\n", cmds[OLECMDID_FIND-1].cmdf); + "cmds[OLECMDID_FIND].cmdf=%lx\n", cmds[OLECMDID_FIND-1].cmdf); IOleCommandTarget_Release(cmdtrg); } @@ -6470,42 +6470,42 @@ static void test_OleCommandTarget_fail(IHTMLDocument2 *doc) }; hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleCommandTarget, (void**)&cmdtrg); - ok(hres == S_OK, "QueryInterface(IIDIOleCommandTarget failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IIDIOleCommandTarget failed: %08lx\n", hres); if(FAILED(hres)) return; hres = IOleCommandTarget_QueryStatus(cmdtrg, NULL, 0, NULL, NULL); - ok(hres == S_OK, "QueryStatus failed: %08x\n", hres); + ok(hres == S_OK, "QueryStatus failed: %08lx\n", hres); SET_EXPECT(QueryStatus_OPEN); hres = IOleCommandTarget_QueryStatus(cmdtrg, NULL, 2, cmd, NULL); CHECK_CALLED(QueryStatus_OPEN); ok(hres == OLECMDERR_E_NOTSUPPORTED, - "QueryStatus failed: %08x, expected OLECMDERR_E_NOTSUPPORTED\n", hres); + "QueryStatus failed: %08lx, expected OLECMDERR_E_NOTSUPPORTED\n", hres); ok(cmd[1].cmdID == OLECMDID_GETPRINTTEMPLATE+1, - "cmd[0].cmdID=%d, expected OLECMDID_GETPRINTTEMPLATE+1\n", cmd[0].cmdID); - ok(cmd[1].cmdf == 0, "cmd[0].cmdf=%x, expected 0\n", cmd[0].cmdf); + "cmd[0].cmdID=%ld, expected OLECMDID_GETPRINTTEMPLATE+1\n", cmd[0].cmdID); + ok(cmd[1].cmdf == 0, "cmd[0].cmdf=%lx, expected 0\n", cmd[0].cmdf); ok(cmd[0].cmdf == OLECMDF_SUPPORTED, - "cmd[1].cmdf=%x, expected OLECMDF_SUPPORTED\n", cmd[1].cmdf); + "cmd[1].cmdf=%lx, expected OLECMDF_SUPPORTED\n", cmd[1].cmdf); hres = IOleCommandTarget_QueryStatus(cmdtrg, &IID_IHTMLDocument2, 2, cmd, NULL); ok(hres == OLECMDERR_E_UNKNOWNGROUP, - "QueryStatus failed: %08x, expected OLECMDERR_E_UNKNOWNGROUP\n", hres); + "QueryStatus failed: %08lx, expected OLECMDERR_E_UNKNOWNGROUP\n", hres); for(i=0; i<OLECMDID_GETPRINTTEMPLATE; i++) { if(!expect_cmds[i]) { hres = IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_UPDATECOMMANDS, OLECMDEXECOPT_DODEFAULT, NULL, NULL); ok(hres == OLECMDERR_E_NOTSUPPORTED, - "Exec failed: %08x, expected OLECMDERR_E_NOTSUPPORTED\n", hres); + "Exec failed: %08lx, expected OLECMDERR_E_NOTSUPPORTED\n", hres); } } hres = IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_GETPRINTTEMPLATE+1, OLECMDEXECOPT_DODEFAULT, NULL, NULL); ok(hres == OLECMDERR_E_NOTSUPPORTED, - "Exec failed: %08x, expected OLECMDERR_E_NOTSUPPORTED\n", hres); + "Exec failed: %08lx, expected OLECMDERR_E_NOTSUPPORTED\n", hres); IOleCommandTarget_Release(cmdtrg); } @@ -6517,20 +6517,20 @@ static void test_exec_onunload(IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleCommandTarget, (void**)&cmdtrg); - ok(hres == S_OK, "QueryInterface(IID_IOleCommandTarget) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IOleCommandTarget) failed: %08lx\n", hres); if(FAILED(hres)) return; memset(&var, 0x0a, sizeof(var)); hres = IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_ONUNLOAD, OLECMDEXECOPT_DODEFAULT, NULL, &var); - ok(hres == S_OK, "Exec(..., OLECMDID_ONUNLOAD, ...) failed: %08x\n", hres); + ok(hres == S_OK, "Exec(..., OLECMDID_ONUNLOAD, ...) failed: %08lx\n", hres); ok(V_VT(&var) == VT_BOOL, "V_VT(var)=%d, expected VT_BOOL\n", V_VT(&var)); ok(V_BOOL(&var) == VARIANT_TRUE, "V_BOOL(var)=%x, expected VARIANT_TRUE\n", V_BOOL(&var)); hres = IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_ONUNLOAD, OLECMDEXECOPT_DODEFAULT, NULL, NULL); - ok(hres == S_OK, "Exec(..., OLECMDID_ONUNLOAD, ...) failed: %08x\n", hres); + ok(hres == S_OK, "Exec(..., OLECMDID_ONUNLOAD, ...) failed: %08lx\n", hres); IOleCommandTarget_Release(cmdtrg); } @@ -6541,7 +6541,7 @@ static void test_exec_editmode(IUnknown *unk, BOOL loaded) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IOleCommandTarget, (void**)&cmdtrg); - ok(hres == S_OK, "QueryInterface(IID_IOleCommandTarget) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IOleCommandTarget) failed: %08lx\n", hres); if(FAILED(hres)) return; @@ -6574,7 +6574,7 @@ static void test_exec_editmode(IUnknown *unk, BOOL loaded) hres = IOleCommandTarget_Exec(cmdtrg, &CGID_MSHTML, IDM_EDITMODE, OLECMDEXECOPT_DODEFAULT, NULL, NULL); - ok(hres == S_OK, "Exec failed: %08x\n", hres); + ok(hres == S_OK, "Exec failed: %08lx\n", hres); if(loaded) CHECK_CALLED(GetClassID); @@ -6602,7 +6602,7 @@ static void test_exec_editmode(IUnknown *unk, BOOL loaded) hres = IOleCommandTarget_Exec(cmdtrg, &CGID_MSHTML, IDM_EDITMODE, OLECMDEXECOPT_DODEFAULT, NULL, NULL); - ok(hres == S_OK, "Exec failed: %08x\n", hres); + ok(hres == S_OK, "Exec failed: %08lx\n", hres); } static void test_exec_fontname(IUnknown *unk, LPCWSTR name, LPCWSTR exname) @@ -6612,7 +6612,7 @@ static void test_exec_fontname(IUnknown *unk, LPCWSTR name, LPCWSTR exname) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IOleCommandTarget, (void**)&cmdtrg); - ok(hres == S_OK, "QueryInterface(IIDIOleM=CommandTarget failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IIDIOleM=CommandTarget failed: %08lx\n", hres); if(FAILED(hres)) return; @@ -6629,7 +6629,7 @@ static void test_exec_fontname(IUnknown *unk, LPCWSTR name, LPCWSTR exname) } hres = IOleCommandTarget_Exec(cmdtrg, &CGID_MSHTML, IDM_FONTNAME, 0, in, out); - ok(hres == S_OK, "Exec(IDM_FONTNAME) failed: %08x\n", hres); + ok(hres == S_OK, "Exec(IDM_FONTNAME) failed: %08lx\n", hres); if(in) VariantClear(in); @@ -6655,13 +6655,13 @@ static void test_exec_noargs(IUnknown *unk, DWORD cmdid) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IOleCommandTarget, (void**)&cmdtrg); - ok(hres == S_OK, "QueryInterface(IID_IOleCommandTarget) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IOleCommandTarget) failed: %08lx\n", hres); if(FAILED(hres)) return; hres = IOleCommandTarget_Exec(cmdtrg, &CGID_MSHTML, cmdid, OLECMDEXECOPT_DODEFAULT, NULL, NULL); - ok(hres == S_OK, "Exec failed: %08x\n", hres); + ok(hres == S_OK, "Exec failed: %08lx\n", hres); IOleCommandTarget_Release(cmdtrg); } @@ -6673,7 +6673,7 @@ static void test_exec_optical_zoom(IHTMLDocument2 *doc, int factor) HRESULT hres; hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleCommandTarget, (void**)&cmdtrg); - ok(hres == S_OK, "QueryInterface(IID_IOleCommandTarget) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IOleCommandTarget) failed: %08lx\n", hres); if(FAILED(hres)) return; @@ -6683,19 +6683,19 @@ static void test_exec_optical_zoom(IHTMLDocument2 *doc, int factor) SET_EXPECT(GetOverrideKeyPath); hres = IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_OPTICAL_ZOOM, OLECMDEXECOPT_DODEFAULT, &v, &out); - ok(hres == S_OK || broken(hres == OLECMDERR_E_NOTSUPPORTED) /* IE6 */, "Exec failed: %08x\n", hres); + ok(hres == S_OK || broken(hres == OLECMDERR_E_NOTSUPPORTED) /* IE6 */, "Exec failed: %08lx\n", hres); CLEAR_CALLED(GetOverrideKeyPath); if(hres != OLECMDERR_E_NOTSUPPORTED) { ok(V_VT(&out) == VT_I4, "V_VT(&out) = %d\n", V_VT(&out)); - ok(V_I4(&out) == factor, "V_I4(&out) = %d, expected %d\n", V_I4(&out), factor); + ok(V_I4(&out) == factor, "V_I4(&out) = %ld, expected %d\n", V_I4(&out), factor); SET_EXPECT(GetOverrideKeyPath); hres = IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_OPTICAL_ZOOM, OLECMDEXECOPT_DODEFAULT, NULL, &out); - ok(hres == S_OK, "Exec failed: %08x\n", hres); + ok(hres == S_OK, "Exec failed: %08lx\n", hres); ok(V_VT(&out) == VT_I4, "V_VT(&out) = %d\n", V_VT(&out)); - ok(V_I4(&out) == factor, "V_I4(&out) = %d, expected %d\n", V_I4(&out), factor); + ok(V_I4(&out) == factor, "V_I4(&out) = %ld, expected %d\n", V_I4(&out), factor); CLEAR_CALLED(GetOverrideKeyPath); } @@ -6712,26 +6712,26 @@ static void test_IsDirty(IHTMLDocument2 *doc, HRESULT exhres) HRESULT hres; hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&perinit); - ok(hres == S_OK, "QueryInterface(IID_IPersistStreamInit failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IPersistStreamInit failed: %08lx\n", hres); if(SUCCEEDED(hres)) { hres = IPersistStreamInit_IsDirty(perinit); - ok(hres == exhres, "IsDirty() = %08x, expected %08x\n", hres, exhres); + ok(hres == exhres, "IsDirty() = %08lx, expected %08lx\n", hres, exhres); IPersistStreamInit_Release(perinit); } hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistMoniker, (void**)&permon); - ok(hres == S_OK, "QueryInterface(IID_IPersistMoniker failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IPersistMoniker failed: %08lx\n", hres); if(SUCCEEDED(hres)) { hres = IPersistMoniker_IsDirty(permon); - ok(hres == exhres, "IsDirty() = %08x, expected %08x\n", hres, exhres); + ok(hres == exhres, "IsDirty() = %08lx, expected %08lx\n", hres, exhres); IPersistMoniker_Release(permon); } hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistFile, (void**)&perfile); - ok(hres == S_OK, "QueryInterface(IID_IPersistFile failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IPersistFile failed: %08lx\n", hres); if(SUCCEEDED(hres)) { hres = IPersistFile_IsDirty(perfile); - ok(hres == exhres, "IsDirty() = %08x, expected %08x\n", hres, exhres); + ok(hres == exhres, "IsDirty() = %08lx, expected %08lx\n", hres, exhres); IPersistFile_Release(perfile); } } @@ -6768,7 +6768,7 @@ static void test_DoVerb(IOleObject *oleobj) expect_LockContainer_fLock = TRUE; hres = IOleObject_DoVerb(oleobj, OLEIVERB_SHOW, NULL, &ClientSite, -1, container_hwnd, &rect); - ok(hres == S_OK, "DoVerb failed: %08x\n", hres); + ok(hres == S_OK, "DoVerb failed: %08lx\n", hres); if(!container_locked) { CHECK_CALLED(GetContainer); @@ -6789,7 +6789,7 @@ static void test_ClientSite(IOleObject *oleobj, DWORD flags) if(flags & CLIENTSITE_SETNULL) { hres = IOleObject_GetClientSite(oleobj, &clientsite); - ok(hres == S_OK, "SetClientSite failed: %08x\n", hres); + ok(hres == S_OK, "SetClientSite failed: %08lx\n", hres); if(set_clientsite) ok(clientsite == &ClientSite, "clientsite=%p, expected %p\n", clientsite, &ClientSite); else @@ -6797,7 +6797,7 @@ static void test_ClientSite(IOleObject *oleobj, DWORD flags) SET_EXPECT(GetOverrideKeyPath); hres = IOleObject_SetClientSite(oleobj, NULL); - ok(hres == S_OK, "SetClientSite failed: %08x\n", hres); + ok(hres == S_OK, "SetClientSite failed: %08lx\n", hres); CLEAR_CALLED(GetOverrideKeyPath); /* IE9 sometimes calls it */ set_clientsite = FALSE; @@ -6810,7 +6810,7 @@ static void test_ClientSite(IOleObject *oleobj, DWORD flags) expect_uihandler_iface = &DocHostUIHandler; hres = IOleObject_GetClientSite(oleobj, &clientsite); - ok(hres == S_OK, "GetClientSite failed: %08x\n", hres); + ok(hres == S_OK, "GetClientSite failed: %08lx\n", hres); ok(clientsite == (set_clientsite ? &ClientSite : NULL), "GetClientSite() = %p, expected %p\n", clientsite, set_clientsite ? &ClientSite : NULL); @@ -6838,7 +6838,7 @@ static void test_ClientSite(IOleObject *oleobj, DWORD flags) SET_EXPECT(Exec_ShellDocView_84); hres = IOleObject_SetClientSite(oleobj, &ClientSite); - ok(hres == S_OK, "SetClientSite failed: %08x\n", hres); + ok(hres == S_OK, "SetClientSite failed: %08lx\n", hres); if(expect_uihandler_iface) CHECK_CALLED(GetHostInfo); @@ -6866,10 +6866,10 @@ static void test_ClientSite(IOleObject *oleobj, DWORD flags) } hres = IOleObject_SetClientSite(oleobj, &ClientSite); - ok(hres == S_OK, "SetClientSite failed: %08x\n", hres); + ok(hres == S_OK, "SetClientSite failed: %08lx\n", hres); hres = IOleObject_GetClientSite(oleobj, &clientsite); - ok(hres == S_OK, "GetClientSite failed: %08x\n", hres); + ok(hres == S_OK, "GetClientSite failed: %08lx\n", hres); ok(clientsite == &ClientSite, "GetClientSite() = %p, expected %p\n", clientsite, &ClientSite); } @@ -6879,42 +6879,42 @@ static void test_OnAmbientPropertyChange(IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleControl, (void**)&control); - ok(hres == S_OK, "QueryInterface(IID_IOleControl failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IOleControl failed: %08lx\n", hres); if(FAILED(hres)) return; SET_EXPECT(Invoke_AMBIENT_USERMODE); hres = IOleControl_OnAmbientPropertyChange(control, DISPID_AMBIENT_USERMODE); - ok(hres == S_OK, "OnAmbientChange failed: %08x\n", hres); + ok(hres == S_OK, "OnAmbientChange failed: %08lx\n", hres); CHECK_CALLED(Invoke_AMBIENT_USERMODE); SET_EXPECT(Invoke_AMBIENT_DLCONTROL); hres = IOleControl_OnAmbientPropertyChange(control, DISPID_AMBIENT_DLCONTROL); - ok(hres == S_OK, "OnAmbientChange failed: %08x\n", hres); + ok(hres == S_OK, "OnAmbientChange failed: %08lx\n", hres); CHECK_CALLED(Invoke_AMBIENT_DLCONTROL); SET_EXPECT(Invoke_AMBIENT_DLCONTROL); SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); hres = IOleControl_OnAmbientPropertyChange(control, DISPID_AMBIENT_OFFLINEIFNOTCONNECTED); - ok(hres == S_OK, "OnAmbientChange failed: %08x\n", hres); + ok(hres == S_OK, "OnAmbientChange failed: %08lx\n", hres); CHECK_CALLED(Invoke_AMBIENT_DLCONTROL); CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); SET_EXPECT(Invoke_AMBIENT_DLCONTROL); SET_EXPECT(Invoke_AMBIENT_SILENT); hres = IOleControl_OnAmbientPropertyChange(control, DISPID_AMBIENT_SILENT); - ok(hres == S_OK, "OnAmbientChange failed: %08x\n", hres); + ok(hres == S_OK, "OnAmbientChange failed: %08lx\n", hres); CHECK_CALLED(Invoke_AMBIENT_DLCONTROL); CHECK_CALLED(Invoke_AMBIENT_SILENT); SET_EXPECT(Invoke_AMBIENT_USERAGENT); hres = IOleControl_OnAmbientPropertyChange(control, DISPID_AMBIENT_USERAGENT); - ok(hres == S_OK, "OnAmbientChange failed: %08x\n", hres); + ok(hres == S_OK, "OnAmbientChange failed: %08lx\n", hres); CHECK_CALLED(Invoke_AMBIENT_USERAGENT); SET_EXPECT(Invoke_AMBIENT_PALETTE); hres = IOleControl_OnAmbientPropertyChange(control, DISPID_AMBIENT_PALETTE); - ok(hres == S_OK, "OnAmbientChange failed: %08x\n", hres); + ok(hres == S_OK, "OnAmbientChange failed: %08lx\n", hres); CLEAR_CALLED(Invoke_AMBIENT_PALETTE); /* not called on IE9 */ IOleControl_Release(control); @@ -6929,93 +6929,93 @@ static void test_GetSetExtent(IHTMLDocument2 *doc) SIZE extent; hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); - ok(hres == S_OK, "QueryInterface(IID_IOleObject) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IOleObject) failed: %08lx\n", hres); if(FAILED(hres)) return; extent.cx = extent.cy = 0xdeadbeef; hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &extent); - ok(hres == S_OK, "GetExtent failed: %08x\n", hres); - ok(extent.cx == 1 && extent.cy == 1, "size = {%d %d} (expected {1 1})\n", + ok(hres == S_OK, "GetExtent failed: %08lx\n", hres); + ok(extent.cx == 1 && extent.cy == 1, "size = {%ld %ld} (expected {1 1})\n", extent.cx, extent.cy); extent.cx = extent.cy = 0xdeadbeef; hres = IOleObject_GetExtent(oleobj, 0, &extent); - ok(hres == E_INVALIDARG, "GetExtent failed: %08x\n", hres); - ok(extent.cx == 0xdeadbeef && extent.cy == 0xdeadbeef, "size = {%d %d}\n", extent.cx, extent.cy); + ok(hres == E_INVALIDARG, "GetExtent failed: %08lx\n", hres); + ok(extent.cx == 0xdeadbeef && extent.cy == 0xdeadbeef, "size = {%ld %ld}\n", extent.cx, extent.cy); extent.cx = extent.cy = 0xdeadbeef; hres = IOleObject_GetExtent(oleobj, 7, &extent); - ok(hres == E_INVALIDARG, "GetExtent failed: %08x\n", hres); - ok(extent.cx == 0xdeadbeef && extent.cy == 0xdeadbeef, "size = {%d %d}\n", extent.cx, extent.cy); + ok(hres == E_INVALIDARG, "GetExtent failed: %08lx\n", hres); + ok(extent.cx == 0xdeadbeef && extent.cy == 0xdeadbeef, "size = {%ld %ld}\n", extent.cx, extent.cy); extent.cx = 800; extent.cy = 700; hres = IOleObject_SetExtent(oleobj, 0, &extent); - ok(hres == E_INVALIDARG, "SetExtent failed: %08x\n", hres); + ok(hres == E_INVALIDARG, "SetExtent failed: %08lx\n", hres); extent.cx = extent.cy = 0xdeadbeef; hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &extent); - ok(hres == S_OK, "GetExtent failed: %08x\n", hres); - ok(extent.cx == 1 && extent.cy == 1, "size = {%d %d} (expected {1 1})\n", + ok(hres == S_OK, "GetExtent failed: %08lx\n", hres); + ok(extent.cx == 1 && extent.cy == 1, "size = {%ld %ld} (expected {1 1})\n", extent.cx, extent.cy); extent.cx = 800; extent.cy = 700; hres = IOleObject_SetExtent(oleobj, 7, &extent); - ok(hres == E_INVALIDARG, "SetExtent failed: %08x\n", hres); + ok(hres == E_INVALIDARG, "SetExtent failed: %08lx\n", hres); extent.cx = extent.cy = 0xdeadbeef; hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &extent); - ok(hres == S_OK, "GetExtent failed: %08x\n", hres); - ok(extent.cx == 1 && extent.cy == 1, "size = {%d %d} (expected {1 1})\n", + ok(hres == S_OK, "GetExtent failed: %08lx\n", hres); + ok(extent.cx == 1 && extent.cy == 1, "size = {%ld %ld} (expected {1 1})\n", extent.cx, extent.cy); extent.cx = extent.cy = 0xdeadbeef; hres = IOleObject_SetExtent(oleobj, 0, &extent); - todo_wine ok(hres == E_FAIL, "SetExtent failed: %08x\n", hres); + todo_wine ok(hres == E_FAIL, "SetExtent failed: %08lx\n", hres); extent.cx = extent.cy = 0xdeadbeef; hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &extent); - ok(hres == S_OK, "GetExtent failed: %08x\n", hres); - ok(extent.cx == 1 && extent.cy == 1, "size = {%d %d} (expected {1 1})\n", + ok(hres == S_OK, "GetExtent failed: %08lx\n", hres); + ok(extent.cx == 1 && extent.cy == 1, "size = {%ld %ld} (expected {1 1})\n", extent.cx, extent.cy); extent.cx = extent.cy = 0xdeadbeef; hres = IOleObject_SetExtent(oleobj, 7, &extent); - todo_wine ok(hres == E_FAIL, "SetExtent failed: %08x\n", hres); + todo_wine ok(hres == E_FAIL, "SetExtent failed: %08lx\n", hres); extent.cx = extent.cy = 0xdeadbeef; hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &extent); - ok(hres == S_OK, "GetExtent failed: %08x\n", hres); - ok(extent.cx == 1 && extent.cy == 1, "size = {%d %d} (expected {1 1})\n", + ok(hres == S_OK, "GetExtent failed: %08lx\n", hres); + ok(extent.cx == 1 && extent.cy == 1, "size = {%ld %ld} (expected {1 1})\n", extent.cx, extent.cy); extent.cx = extent.cy = 0xdeadbeef; hres = IOleObject_SetExtent(oleobj, DVASPECT_CONTENT, &extent); - todo_wine ok(hres == E_FAIL, "SetExtent failed: %08x\n", hres); + todo_wine ok(hres == E_FAIL, "SetExtent failed: %08lx\n", hres); extent.cx = extent.cy = 0xdeadbeef; hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &extent); - ok(hres == S_OK, "GetExtent failed: %08x\n", hres); - todo_wine ok(extent.cx == 1 && extent.cy == 1, "size = {%d %d} (expected {1 1})\n", + ok(hres == S_OK, "GetExtent failed: %08lx\n", hres); + todo_wine ok(extent.cx == 1 && extent.cy == 1, "size = {%ld %ld} (expected {1 1})\n", extent.cx, extent.cy); extent.cx = 800; extent.cy = 700; hres = IOleObject_SetExtent(oleobj, DVASPECT_CONTENT, &extent); - ok(hres == S_OK, "SetExtent failed: %08x\n", hres); + ok(hres == S_OK, "SetExtent failed: %08lx\n", hres); extent.cx = extent.cy = 0xdeadbeef; hres = IOleObject_GetExtent(oleobj, DVASPECT_CONTENT, &extent); - ok(hres == S_OK, "GetExtent failed: %08x\n", hres); - ok(extent.cx == 800 && extent.cy == 700, "size = {%d %d} (expected {800 700})\n", + ok(hres == S_OK, "GetExtent failed: %08lx\n", hres); + ok(extent.cx == 800 && extent.cy == 700, "size = {%ld %ld} (expected {800 700})\n", extent.cx, extent.cy ); extent.cx = 1; extent.cy = 1; hres = IOleObject_SetExtent(oleobj, DVASPECT_CONTENT, &extent); - ok(hres == S_OK, "SetExtent failed: %08x\n", hres); + ok(hres == S_OK, "SetExtent failed: %08lx\n", hres); IOleObject_Release(oleobj); } @@ -7026,12 +7026,12 @@ static void test_OnAmbientPropertyChange2(IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleControl, (void**)&control); - ok(hres == S_OK, "QueryInterface(IID_IOleControl failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IOleControl failed: %08lx\n", hres); if(FAILED(hres)) return; hres = IOleControl_OnAmbientPropertyChange(control, DISPID_AMBIENT_PALETTE); - ok(hres == S_OK, "OnAmbientPropertyChange failed: %08x\n", hres); + ok(hres == S_OK, "OnAmbientPropertyChange failed: %08lx\n", hres); IOleControl_Release(control); } @@ -7042,7 +7042,7 @@ static void test_Close(IHTMLDocument2 *doc, BOOL set_client) HRESULT hres; hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); - ok(hres == S_OK, "QueryInterface(IID_IOleObject) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IOleObject) failed: %08lx\n", hres); if(FAILED(hres)) return; @@ -7050,7 +7050,7 @@ static void test_Close(IHTMLDocument2 *doc, BOOL set_client) SET_EXPECT(LockContainer); expect_LockContainer_fLock = FALSE; hres = IOleObject_Close(oleobj, OLECLOSE_NOSAVE); - ok(hres == S_OK, "Close failed: %08x\n", hres); + ok(hres == S_OK, "Close failed: %08lx\n", hres); CHECK_CALLED(GetContainer); CHECK_CALLED(LockContainer); container_locked = FALSE; @@ -7069,42 +7069,42 @@ static void test_Advise(IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); - ok(hres == S_OK, "QueryInterface(IID_IOleObject) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IOleObject) failed: %08lx\n", hres); if(FAILED(hres)) return; hres = IOleObject_Unadvise(oleobj, 0); - ok(hres == OLE_E_NOCONNECTION, "Unadvise returned: %08x\n", hres); + ok(hres == OLE_E_NOCONNECTION, "Unadvise returned: %08lx\n", hres); hres = IOleObject_EnumAdvise(oleobj, &enum_advise); - ok(hres == S_OK, "EnumAdvise returned: %08x\n", hres); + ok(hres == S_OK, "EnumAdvise returned: %08lx\n", hres); ok(enum_advise == NULL, "enum_advise != NULL\n"); conn = -1; hres = IOleObject_Advise(oleobj, NULL, &conn); /* Old IE returns S_OK and sets conn to 1 */ - ok(hres == E_INVALIDARG || hres == S_OK, "Advise returned: %08x\n", hres); - ok(conn == 0 || conn == 1, "conn = %d\n", conn); + ok(hres == E_INVALIDARG || hres == S_OK, "Advise returned: %08lx\n", hres); + ok(conn == 0 || conn == 1, "conn = %ld\n", conn); hres = IOleObject_Advise(oleobj, (IAdviseSink*)&AdviseSink, NULL); - ok(hres == E_INVALIDARG, "Advise returned: %08x\n", hres); + ok(hres == E_INVALIDARG, "Advise returned: %08lx\n", hres); hres = IOleObject_Advise(oleobj, (IAdviseSink*)&AdviseSink, &conn); - ok(hres == S_OK, "Advise returned: %08x\n", hres); - ok(conn == 1, "conn = %d\n", conn); + ok(hres == S_OK, "Advise returned: %08lx\n", hres); + ok(conn == 1, "conn = %ld\n", conn); hres = IOleObject_Advise(oleobj, (IAdviseSink*)&AdviseSink, &conn); - ok(hres == S_OK, "Advise returned: %08x\n", hres); - ok(conn == 2, "conn = %d\n", conn); + ok(hres == S_OK, "Advise returned: %08lx\n", hres); + ok(conn == 2, "conn = %ld\n", conn); hres = IOleObject_Unadvise(oleobj, 1); - ok(hres == S_OK, "Unadvise returned: %08x\n", hres); + ok(hres == S_OK, "Unadvise returned: %08lx\n", hres); hres = IOleObject_Unadvise(oleobj, 1); - ok(hres == OLE_E_NOCONNECTION, "Unadvise returned: %08x\n", hres); + ok(hres == OLE_E_NOCONNECTION, "Unadvise returned: %08lx\n", hres); hres = IOleObject_Unadvise(oleobj, 2); - ok(hres == S_OK, "Unadvise returned: %08x\n", hres); + ok(hres == S_OK, "Unadvise returned: %08lx\n", hres); IOleObject_Release(oleobj); } @@ -7115,7 +7115,7 @@ static void test_OnFrameWindowActivate(IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IOleInPlaceActiveObject, (void**)&inplaceact); - ok(hres == S_OK, "QueryInterface(IID_IOleInPlaceActiveObject) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IOleInPlaceActiveObject) failed: %08lx\n", hres); if(FAILED(hres)) return; @@ -7123,31 +7123,31 @@ static void test_OnFrameWindowActivate(IUnknown *unk) expect_OnFrameWindowActivate_fActivate = TRUE; SET_EXPECT(OnFrameWindowActivate); hres = IOleInPlaceActiveObject_OnFrameWindowActivate(inplaceact, TRUE); - ok(hres == S_OK, "OnFrameWindowActivate failed: %08x\n", hres); + ok(hres == S_OK, "OnFrameWindowActivate failed: %08lx\n", hres); CHECK_CALLED(OnFrameWindowActivate); SET_EXPECT(OnFrameWindowActivate); hres = IOleInPlaceActiveObject_OnFrameWindowActivate(inplaceact, TRUE); - ok(hres == S_OK, "OnFrameWindowActivate failed: %08x\n", hres); + ok(hres == S_OK, "OnFrameWindowActivate failed: %08lx\n", hres); CHECK_CALLED(OnFrameWindowActivate); expect_OnFrameWindowActivate_fActivate = FALSE; SET_EXPECT(OnFrameWindowActivate); hres = IOleInPlaceActiveObject_OnFrameWindowActivate(inplaceact, FALSE); - ok(hres == S_OK, "OnFrameWindowActivate failed: %08x\n", hres); + ok(hres == S_OK, "OnFrameWindowActivate failed: %08lx\n", hres); CHECK_CALLED(OnFrameWindowActivate); expect_OnFrameWindowActivate_fActivate = TRUE; SET_EXPECT(OnFrameWindowActivate); hres = IOleInPlaceActiveObject_OnFrameWindowActivate(inplaceact, TRUE); - ok(hres == S_OK, "OnFrameWindowActivate failed: %08x\n", hres); + ok(hres == S_OK, "OnFrameWindowActivate failed: %08lx\n", hres); CHECK_CALLED(OnFrameWindowActivate); }else { hres = IOleInPlaceActiveObject_OnFrameWindowActivate(inplaceact, FALSE); - ok(hres == S_OK, "OnFrameWindowActivate failed: %08x\n", hres); + ok(hres == S_OK, "OnFrameWindowActivate failed: %08lx\n", hres); hres = IOleInPlaceActiveObject_OnFrameWindowActivate(inplaceact, TRUE); - ok(hres == S_OK, "OnFrameWindowActivate failed: %08x\n", hres); + ok(hres == S_OK, "OnFrameWindowActivate failed: %08lx\n", hres); } IOleInPlaceActiveObject_Release(inplaceact); @@ -7162,18 +7162,18 @@ static void test_object_rects(IHTMLDocument2 *doc) hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleInPlaceObjectWindowless, (void**)&windowlessobj); - ok(hres == S_OK, "QueryInterface(IID_IOleInPlaceObjectWindowless) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IOleInPlaceObjectWindowless) failed: %08lx\n", hres); hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleDocumentView, (void**)&view); - ok(hres == S_OK, "QueryInterface(IID_IOleDocumentView) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IOleDocumentView) failed: %08lx\n", hres); r.top = 1; r.left = 2; r.bottom = 200; r.right = 201; hres = IOleInPlaceObjectWindowless_SetObjectRects(windowlessobj, &r, NULL); - ok(hres == S_OK, "SetObjectRects failed: %08x\n", hres); + ok(hres == S_OK, "SetObjectRects failed: %08lx\n", hres); GetWindowRect(doc_hwnd, &doc_rect); MapWindowPoints(HWND_DESKTOP, container_hwnd, (POINT*)&doc_rect, 2); @@ -7182,7 +7182,7 @@ static void test_object_rects(IHTMLDocument2 *doc) memset(&doc_rect, 0xc0, sizeof(doc_rect)); hres = IOleDocumentView_GetRect(view, &doc_rect); - ok(hres == S_OK, "GetRect failed: %08x\n", hres); + ok(hres == S_OK, "GetRect failed: %08lx\n", hres); ok(EqualRect(&r, &doc_rect), "unexpected doc rect %s expected %s\n", wine_dbgstr_rect(&doc_rect), wine_dbgstr_rect(&r)); @@ -7191,7 +7191,7 @@ static void test_object_rects(IHTMLDocument2 *doc) r.bottom = 205; r.right = 206; hres = IOleDocumentView_SetRect(view, &r); - ok(hres == S_OK, "SetObjectRects failed: %08x\n", hres); + ok(hres == S_OK, "SetObjectRects failed: %08lx\n", hres); GetWindowRect(doc_hwnd, &doc_rect); MapWindowPoints(HWND_DESKTOP, container_hwnd, (POINT*)&doc_rect, 2); @@ -7200,7 +7200,7 @@ static void test_object_rects(IHTMLDocument2 *doc) memset(&doc_rect, 0xc0, sizeof(doc_rect)); hres = IOleDocumentView_GetRect(view, &doc_rect); - ok(hres == S_OK, "GetRect failed: %08x\n", hres); + ok(hres == S_OK, "GetRect failed: %08lx\n", hres); ok(EqualRect(&r, &doc_rect), "unexpected doc rect %s expected %s\n", wine_dbgstr_rect(&doc_rect), wine_dbgstr_rect(&r)); @@ -7215,7 +7215,7 @@ static void test_InPlaceDeactivate(IHTMLDocument2 *doc, BOOL expect_call) hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleInPlaceObjectWindowless, (void**)&windowlessobj); - ok(hres == S_OK, "QueryInterface(IID_IOleInPlaceObjectWindowless) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IOleInPlaceObjectWindowless) failed: %08lx\n", hres); if(FAILED(hres)) return; @@ -7228,7 +7228,7 @@ static void test_InPlaceDeactivate(IHTMLDocument2 *doc, BOOL expect_call) SET_EXPECT(OnInPlaceDeactivate); } hres = IOleInPlaceObjectWindowless_InPlaceDeactivate(windowlessobj); - ok(hres == S_OK, "InPlaceDeactivate failed: %08x\n", hres); + ok(hres == S_OK, "InPlaceDeactivate failed: %08lx\n", hres); if(expect_call) { CLEAR_CALLED(SetStatusText); /* Called by IE9 */ CHECK_CALLED(OnFocus_FALSE); @@ -7255,13 +7255,13 @@ static void test_Activate(IHTMLDocument2 *doc, DWORD flags) view = NULL; hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); - ok(hres == S_OK, "QueryInterface(IID_IOleObject) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IOleObject) failed: %08lx\n", hres); hres = IOleObject_GetUserClassID(oleobj, NULL); - ok(hres == E_INVALIDARG, "GetUserClassID returned: %08x, expected E_INVALIDARG\n", hres); + ok(hres == E_INVALIDARG, "GetUserClassID returned: %08lx, expected E_INVALIDARG\n", hres); hres = IOleObject_GetUserClassID(oleobj, &guid); - ok(hres == S_OK, "GetUserClassID failed: %08x\n", hres); + ok(hres == S_OK, "GetUserClassID failed: %08lx\n", hres); ok(IsEqualGUID(&guid, &CLSID_HTMLDocument), "guid != CLSID_HTMLDocument\n"); test_OnFrameWindowActivate((IUnknown*)doc); @@ -7272,7 +7272,7 @@ static void test_Activate(IHTMLDocument2 *doc, DWORD flags) if(call_UIActivate == CallUIActivate_AfterShow) { hres = IOleObject_QueryInterface(oleobj, &IID_IOleDocumentView, (void **)&docview); - ok(hres == S_OK, "IOleObject_QueryInterface failed with error 0x%08x\n", hres); + ok(hres == S_OK, "IOleObject_QueryInterface failed with error 0x%08lx\n", hres); SET_EXPECT(OnFocus_TRUE); SET_EXPECT(SetActiveObject); @@ -7282,7 +7282,7 @@ static void test_Activate(IHTMLDocument2 *doc, DWORD flags) expect_status_text = NULL; hres = IOleDocumentView_UIActivate(docview, TRUE); - ok(hres == S_OK, "IOleDocumentView_UIActivate failed with error 0x%08x\n", hres); + ok(hres == S_OK, "IOleDocumentView_UIActivate failed with error 0x%08lx\n", hres); CHECK_CALLED(OnFocus_TRUE); CHECK_CALLED(SetActiveObject); @@ -7305,17 +7305,17 @@ static void test_Window(IHTMLDocument2 *doc, BOOL expect_success) HRESULT hres; hres = IOleDocumentView_QueryInterface(view, &IID_IOleInPlaceActiveObject, (void**)&activeobject); - ok(hres == S_OK, "Could not get IOleInPlaceActiveObject interface: %08x\n", hres); + ok(hres == S_OK, "Could not get IOleInPlaceActiveObject interface: %08lx\n", hres); if(FAILED(hres)) return; hres = IOleInPlaceActiveObject_GetWindow(activeobject, &tmp_hwnd); if(expect_success) { - ok(hres == S_OK, "GetWindow failed: %08x\n", hres); + ok(hres == S_OK, "GetWindow failed: %08lx\n", hres); ok(tmp_hwnd == doc_hwnd, "tmp_hwnd=%p, expected %p\n", tmp_hwnd, doc_hwnd); }else { - ok(hres == E_FAIL, "GetWindow returned %08x, expected E_FAIL\n", hres); + ok(hres == E_FAIL, "GetWindow returned %08lx, expected E_FAIL\n", hres); ok(IsWindow(doc_hwnd), "hwnd is destroyed\n"); } @@ -7331,16 +7331,16 @@ static void test_CloseView(void) return; hres = IOleDocumentView_Show(view, FALSE); - ok(hres == S_OK, "Show failed: %08x\n", hres); + ok(hres == S_OK, "Show failed: %08lx\n", hres); hres = IOleDocumentView_CloseView(view, 0); - ok(hres == S_OK, "CloseView failed: %08x\n", hres); + ok(hres == S_OK, "CloseView failed: %08lx\n", hres); hres = IOleDocumentView_SetInPlaceSite(view, NULL); - ok(hres == S_OK, "SetInPlaceSite failed: %08x\n", hres); + ok(hres == S_OK, "SetInPlaceSite failed: %08lx\n", hres); hres = IOleDocumentView_GetInPlaceSite(view, &inplacesite); - ok(hres == S_OK, "SetInPlaceSite failed: %08x\n", hres); + ok(hres == S_OK, "SetInPlaceSite failed: %08lx\n", hres); ok(inplacesite == NULL, "inplacesite=%p, expected NULL\n", inplacesite); } @@ -7358,7 +7358,7 @@ static void test_UIDeactivate(void) } hres = IOleDocumentView_UIActivate(view, FALSE); - ok(hres == S_OK, "UIActivate failed: %08x\n", hres); + ok(hres == S_OK, "UIActivate failed: %08lx\n", hres); if(call_UIActivate != CallUIActivate_None) { CHECK_CALLED(SetActiveObject_null); @@ -7378,7 +7378,7 @@ static void test_Hide(void) return; hres = IOleDocumentView_Show(view, FALSE); - ok(hres == S_OK, "Show failed: %08x\n", hres); + ok(hres == S_OK, "Show failed: %08lx\n", hres); } static IHTMLDocument2 *create_document(void) @@ -7391,7 +7391,7 @@ static IHTMLDocument2 *create_document(void) #if !defined(__i386__) && !defined(__x86_64__) todo_wine #endif - ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); + ok(hres == S_OK, "CoCreateInstance failed: %08lx\n", hres); if(FAILED(hres)) return NULL; @@ -7407,11 +7407,11 @@ static void release_document(IHTMLDocument2 *doc) /* Some broken IEs don't like if the last released reference is IHTMLDocument2 iface. * To workaround it, we release it via IUnknown iface */ hres = IHTMLDocument2_QueryInterface(doc, &IID_IUnknown, (void**)&unk); - ok(hres == S_OK, "Could not get IUnknown iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IUnknown iface: %08lx\n", hres); IHTMLDocument2_Release(doc); ref = IUnknown_Release(unk); - ok(!ref, "ref = %d\n", ref); + ok(!ref, "ref = %ld\n", ref); } static void test_Navigate(IHTMLDocument2 *doc) @@ -7420,11 +7420,11 @@ static void test_Navigate(IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLDocument2_QueryInterface(doc, &IID_IHlinkTarget, (void**)&hlink); - ok(hres == S_OK, "QueryInterface(IID_IHlinkTarget) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IHlinkTarget) failed: %08lx\n", hres); SET_EXPECT(ActivateMe); hres = IHlinkTarget_Navigate(hlink, 0, NULL); - ok(hres == S_OK, "Navigate failed: %08x\n", hres); + ok(hres == S_OK, "Navigate failed: %08lx\n", hres); CHECK_CALLED(ActivateMe); IHlinkTarget_Release(hlink); @@ -7437,18 +7437,18 @@ static void test_external(IHTMLDocument2 *doc, BOOL initialized) HRESULT hres; hres = IHTMLDocument2_get_parentWindow(doc, &htmlwin); - ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + ok(hres == S_OK, "get_parentWindow failed: %08lx\n", hres); if(initialized) SET_EXPECT(GetExternal); external = (void*)0xdeadbeef; hres = IHTMLWindow2_get_external(htmlwin, &external); if(initialized) { - ok(hres == S_FALSE || hres == S_OK, "get_external failed: %08x\n", hres); + ok(hres == S_FALSE || hres == S_OK, "get_external failed: %08lx\n", hres); CHECK_CALLED(GetExternal); ok(external != NULL, "external == NULL\n"); }else { - ok(hres == S_OK, "get_external failed: %08x\n", hres); + ok(hres == S_OK, "get_external failed: %08lx\n", hres); ok(external == NULL, "external != NULL\n"); } @@ -7464,22 +7464,22 @@ static void test_enum_objects(IOleContainer *container) enum_unknown = NULL; hres = IOleContainer_EnumObjects(container, OLECONTF_EMBEDDINGS, &enum_unknown); - ok(hres == S_OK, "EnumObjects failed: %08x\n", hres); + ok(hres == S_OK, "EnumObjects failed: %08lx\n", hres); ok(enum_unknown != NULL, "enum_unknown == NULL\n"); fetched = 0xdeadbeef; hres = IEnumUnknown_Next(enum_unknown, ARRAY_SIZE(buf), buf, &fetched); - ok(hres == S_FALSE, "Next returned %08x\n", hres); - ok(!fetched, "fetched = %d\n", fetched); + ok(hres == S_FALSE, "Next returned %08lx\n", hres); + ok(!fetched, "fetched = %ld\n", fetched); ok(buf[0] == (void*)0xdeadbeef, "buf[0] = %p\n", buf[0]); fetched = 0xdeadbeef; hres = IEnumUnknown_Next(enum_unknown, 1, buf, &fetched); - ok(hres == S_FALSE, "Next returned %08x\n", hres); - ok(!fetched, "fetched = %d\n", fetched); + ok(hres == S_FALSE, "Next returned %08lx\n", hres); + ok(!fetched, "fetched = %ld\n", fetched); hres = IEnumUnknown_Next(enum_unknown, 1, buf, NULL); - ok(hres == S_FALSE, "Next returned %08x\n", hres); + ok(hres == S_FALSE, "Next returned %08lx\n", hres); IEnumUnknown_Release(enum_unknown); } @@ -7491,14 +7491,14 @@ static void test_target_container(IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLDocument2_QueryInterface(doc, &IID_ITargetContainer, (void**)&target_container); - ok(hres == S_OK, "Could not get ITargetContainer iface: %08x\n", hres); + ok(hres == S_OK, "Could not get ITargetContainer iface: %08lx\n", hres); hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleContainer, (void**)&doc_ole_container); - ok(hres == S_OK, "Could not get ITargetContainer iface: %08x\n", hres); + ok(hres == S_OK, "Could not get ITargetContainer iface: %08lx\n", hres); ole_container = (void*)0xdeadbeef; hres = ITargetContainer_GetFramesContainer(target_container, &ole_container); - ok(hres == S_OK, "GetFramesContainer failed: %08x\n", hres); + ok(hres == S_OK, "GetFramesContainer failed: %08lx\n", hres); ok(ole_container != NULL, "ole_container == NULL\n"); ok(iface_cmp((IUnknown*)ole_container, (IUnknown*)doc_ole_container), "ole_container != doc_ole_container\n"); test_enum_objects(ole_container); @@ -7517,12 +7517,12 @@ static void test_travellog(IHTMLDocument2 *doc) window = NULL; hres = IHTMLDocument2_get_parentWindow(doc, &window); - ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + ok(hres == S_OK, "get_parentWindow failed: %08lx\n", hres); ok(window != NULL, "window = NULL\n"); hres = IHTMLWindow2_get_top(window, &top_window); IHTMLWindow2_Release(window); - ok(hres == S_OK, "get_top failed: %08x\n", hres); + ok(hres == S_OK, "get_top failed: %08lx\n", hres); hres = IHTMLWindow2_QueryInterface(top_window, &IID_ITravelLogClient, (void**)&travellog_client); IHTMLWindow2_Release(top_window); @@ -7531,11 +7531,11 @@ static void test_travellog(IHTMLDocument2 *doc) no_travellog = TRUE; return; } - ok(hres == S_OK, "Could not get ITraveLogClient iface: %08x\n", hres); + ok(hres == S_OK, "Could not get ITraveLogClient iface: %08lx\n", hres); unk = (void*)0xdeadbeef; hres = ITravelLogClient_FindWindowByIndex(travellog_client, 0, &unk); - ok(hres == E_FAIL, "FindWindowByIndex failed: %08x\n", hres); + ok(hres == E_FAIL, "FindWindowByIndex failed: %08lx\n", hres); ok(!unk, "unk != NULL\n"); ITravelLogClient_Release(travellog_client); @@ -7547,7 +7547,7 @@ static void test_StreamLoad(IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); - ok(hres == S_OK, "QueryInterface(IID_IPersistStreamInit) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IPersistStreamInit) failed: %08lx\n", hres); if(FAILED(hres)) return; @@ -7561,7 +7561,7 @@ static void test_StreamLoad(IHTMLDocument2 *doc) readystate_set_loading = TRUE; hres = IPersistStreamInit_Load(init, &Stream); - ok(hres == S_OK, "Load failed: %08x\n", hres); + ok(hres == S_OK, "Load failed: %08lx\n", hres); CHECK_CALLED(Invoke_AMBIENT_SILENT); CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); @@ -7583,7 +7583,7 @@ static void test_StreamInitNew(IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); - ok(hres == S_OK, "QueryInterface(IID_IPersistStreamInit) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IPersistStreamInit) failed: %08lx\n", hres); if(FAILED(hres)) return; @@ -7596,7 +7596,7 @@ static void test_StreamInitNew(IHTMLDocument2 *doc) readystate_set_loading = TRUE; hres = IPersistStreamInit_InitNew(init); - ok(hres == S_OK, "Load failed: %08x\n", hres); + ok(hres == S_OK, "Load failed: %08lx\n", hres); CHECK_CALLED(Invoke_AMBIENT_SILENT); CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); @@ -7621,51 +7621,51 @@ static void test_QueryInterface(IHTMLDocument2 *htmldoc) qi = (void*)0xdeadbeef; hres = IUnknown_QueryInterface(doc, &IID_IRunnableObject, (void**)&qi); - ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); + ok(hres == E_NOINTERFACE, "QueryInterface returned %08lx, expected E_NOINTERFACE\n", hres); ok(qi == NULL, "qirunnable=%p, expected NULL\n", qi); qi = (void*)0xdeadbeef; hres = IUnknown_QueryInterface(doc, &IID_IHTMLDOMNode, (void**)&qi); - ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); + ok(hres == E_NOINTERFACE, "QueryInterface returned %08lx, expected E_NOINTERFACE\n", hres); ok(qi == NULL, "qi=%p, expected NULL\n", qi); qi = (void*)0xdeadbeef; hres = IUnknown_QueryInterface(doc, &IID_IHTMLDOMNode2, (void**)&qi); - ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); + ok(hres == E_NOINTERFACE, "QueryInterface returned %08lx, expected E_NOINTERFACE\n", hres); ok(qi == NULL, "qi=%p, expected NULL\n", qi); qi = (void*)0xdeadbeef; hres = IUnknown_QueryInterface(doc, &IID_IPersistPropertyBag, (void**)&qi); - ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); + ok(hres == E_NOINTERFACE, "QueryInterface returned %08lx, expected E_NOINTERFACE\n", hres); ok(qi == NULL, "qi=%p, expected NULL\n", qi); qi = (void*)0xdeadbeef; hres = IUnknown_QueryInterface(doc, &IID_UndocumentedScriptIface, (void**)&qi); - ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); + ok(hres == E_NOINTERFACE, "QueryInterface returned %08lx, expected E_NOINTERFACE\n", hres); ok(qi == NULL, "qi=%p, expected NULL\n", qi); qi = (void*)0xdeadbeef; hres = IUnknown_QueryInterface(doc, &IID_IMarshal, (void**)&qi); - ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); + ok(hres == E_NOINTERFACE, "QueryInterface returned %08lx, expected E_NOINTERFACE\n", hres); ok(qi == NULL, "qi=%p, expected NULL\n", qi); qi = (void*)0xdeadbeef; hres = IUnknown_QueryInterface(doc, &IID_IExternalConnection, (void**)&qi); - ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); + ok(hres == E_NOINTERFACE, "QueryInterface returned %08lx, expected E_NOINTERFACE\n", hres); ok(qi == NULL, "qi=%p, expected NULL\n", qi); qi = (void*)0xdeadbeef; hres = IUnknown_QueryInterface(doc, &IID_IStdMarshalInfo, (void**)&qi); - ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); + ok(hres == E_NOINTERFACE, "QueryInterface returned %08lx, expected E_NOINTERFACE\n", hres); ok(qi == NULL, "qi=%p, expected NULL\n", qi); qi = (void*)0xdeadbeef; hres = IUnknown_QueryInterface(doc, &IID_ITargetFrame, (void**)&qi); - ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); + ok(hres == E_NOINTERFACE, "QueryInterface returned %08lx, expected E_NOINTERFACE\n", hres); ok(qi == NULL, "qi=%p, expected NULL\n", qi); hres = IUnknown_QueryInterface(doc, &IID_IDispatch, (void**)&qi); - ok(hres == S_OK, "Could not get IDispatch interface: %08x\n", hres); + ok(hres == S_OK, "Could not get IDispatch interface: %08lx\n", hres); ok(qi != doc, "disp == doc\n"); IUnknown_Release(qi); } @@ -7814,7 +7814,7 @@ static void test_MHTMLDocument(void) hres = CoCreateInstance(&CLSID_MHTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IHTMLDocument2, (void**)&doc); - ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); + ok(hres == S_OK, "CoCreateInstance failed: %08lx\n", hres); doc_unk = (IUnknown*)doc; @@ -7824,7 +7824,7 @@ static void test_MHTMLDocument(void) test_ConnectionPointContainer(doc); hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); - ok(hres == S_OK, "Could not get IOleObject iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IOleObject iface: %08lx\n", hres); test_ClientSite(oleobj, CLIENTSITE_EXPECTPATH); test_DoVerb(oleobj); IOleObject_Release(oleobj); @@ -7900,26 +7900,26 @@ static void test_cookies(IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLDocument2_get_cookie(doc, &str); - ok(hres == S_OK, "get_cookie failed: %08x\n", hres); + ok(hres == S_OK, "get_cookie failed: %08lx\n", hres); if(str) { size = ARRAY_SIZE(buf); b = InternetGetCookieW(http_urlW, NULL, buf, &size); - ok(b, "InternetGetCookieW failed: %08x\n", GetLastError()); + ok(b, "InternetGetCookieW failed: %08lx\n", GetLastError()); ok(!lstrcmpW(buf, str), "cookie = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buf)); SysFreeString(str); } str = SysAllocString(L"test=testval"); hres = IHTMLDocument2_put_cookie(doc, str); - ok(hres == S_OK, "put_cookie failed: %08x\n", hres); + ok(hres == S_OK, "put_cookie failed: %08lx\n", hres); str2 = NULL; hres = IHTMLDocument2_get_cookie(doc, &str2); - ok(hres == S_OK, "get_cookie failed: %08x\n", hres); + ok(hres == S_OK, "get_cookie failed: %08lx\n", hres); ok(str2 != NULL, "cookie = NULL\n"); size = ARRAY_SIZE(buf); b = InternetGetCookieW(http_urlW, NULL, buf, &size); - ok(b, "InternetGetCookieW failed: %08x\n", GetLastError()); + ok(b, "InternetGetCookieW failed: %08lx\n", GetLastError()); ok(!lstrcmpW(buf, str2), "cookie = %s, expected %s\n", wine_dbgstr_w(str2), wine_dbgstr_w(buf)); if(str2) ok(wcsstr(str2, str) != NULL, "could not find %s in %s\n", wine_dbgstr_w(str), wine_dbgstr_w(str2)); @@ -7928,15 +7928,15 @@ static void test_cookies(IHTMLDocument2 *doc) str = SysAllocString(L"test=testval2"); hres = IHTMLDocument2_put_cookie(doc, str); - ok(hres == S_OK, "put_cookie failed: %08x\n", hres); + ok(hres == S_OK, "put_cookie failed: %08lx\n", hres); str2 = NULL; hres = IHTMLDocument2_get_cookie(doc, &str2); - ok(hres == S_OK, "get_cookie failed: %08x\n", hres); + ok(hres == S_OK, "get_cookie failed: %08lx\n", hres); ok(str2 != NULL, "cookie = NULL\n"); size = ARRAY_SIZE(buf); b = InternetGetCookieW(http_urlW, NULL, buf, &size); - ok(b, "InternetGetCookieW failed: %08x\n", GetLastError()); + ok(b, "InternetGetCookieW failed: %08lx\n", GetLastError()); ok(!lstrcmpW(buf, str2), "cookie = %s, expected %s\n", wine_dbgstr_w(str2), wine_dbgstr_w(buf)); if(str2) ok(wcsstr(str2, str) != NULL, "could not find %s in %s\n", wine_dbgstr_w(str), wine_dbgstr_w(str2)); @@ -7950,27 +7950,27 @@ static void test_doc_domain(IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLDocument2_get_domain(doc, &str); - ok(hres == S_OK, "get_domain failed: %08x\n", hres); + ok(hres == S_OK, "get_domain failed: %08lx\n", hres); ok(!lstrcmpW(str, L"test.winehq.org"), "domain = %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = SysAllocString(L"winehq.org"); hres = IHTMLDocument2_put_domain(doc, str); - ok(hres == S_OK, "put_domain failed: %08x\n", hres); + ok(hres == S_OK, "put_domain failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLDocument2_get_domain(doc, &str); - ok(hres == S_OK, "get_domain failed: %08x\n", hres); + ok(hres == S_OK, "get_domain failed: %08lx\n", hres); ok(!lstrcmpW(str, L"winehq.org"), "domain = %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = SysAllocString(L"winehq.com"); hres = IHTMLDocument2_put_domain(doc, str); - ok(hres == E_INVALIDARG, "put_domain failed: %08x, expected E_INVALIDARG\n", hres); + ok(hres == E_INVALIDARG, "put_domain failed: %08lx, expected E_INVALIDARG\n", hres); SysFreeString(str); hres = IHTMLDocument2_get_domain(doc, &str); - ok(hres == S_OK, "get_domain failed: %08x\n", hres); + ok(hres == S_OK, "get_domain failed: %08lx\n", hres); ok(!lstrcmpW(str, L"winehq.org"), "domain = %s\n", wine_dbgstr_w(str)); SysFreeString(str); } @@ -7998,7 +7998,7 @@ static void test_HTMLDocument_http(BOOL with_wbapp) doc_unk = (IUnknown*)doc; hres = CreateURLMoniker(NULL, http_urlW, &http_mon); - ok(hres == S_OK, "CreateURLMoniker failed: %08x\n", hres); + ok(hres == S_OK, "CreateURLMoniker failed: %08lx\n", hres); test_ViewAdviseSink(doc); test_ConnectionPointContainer(doc); @@ -8050,7 +8050,7 @@ static void test_HTMLDocument_http(BOOL with_wbapp) release_document(doc); ref = IMoniker_Release(http_mon); - ok(!ref, "ref=%d, expected 0\n", ref); + ok(!ref, "ref=%ld, expected 0\n", ref); } static void put_inner_html(IHTMLElement *elem, const WCHAR *html) @@ -8059,7 +8059,7 @@ static void put_inner_html(IHTMLElement *elem, const WCHAR *html) HRESULT hres; hres = IHTMLElement_put_innerHTML(elem, str); - ok(hres == S_OK, "put_innerHTML failed: %08x\n", hres); + ok(hres == S_OK, "put_innerHTML failed: %08lx\n", hres); SysFreeString(str); } @@ -8072,10 +8072,10 @@ static IHTMLElement *get_elem_by_id(IHTMLDocument2 *doc, const WCHAR *id) HRESULT hres; hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); - ok(hres == S_OK, "Could not get IHTMLDocument3 iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLDocument3 iface: %08lx\n", hres); hres = IHTMLDocument3_getElementById(doc3, str, &ret); - ok(hres == S_OK, "getElementById failed: %08x\n", hres); + ok(hres == S_OK, "getElementById failed: %08lx\n", hres); IHTMLDocument3_Release(doc3); return ret; @@ -8087,14 +8087,14 @@ static void reset_document(IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); - ok(hres == S_OK, "QueryInterface(IID_IPersistStreamInit) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IPersistStreamInit) failed: %08lx\n", hres); if(FAILED(hres)) return; resetting_document = TRUE; hres = IPersistStreamInit_InitNew(init); - ok(hres == S_OK, "Load failed: %08x\n", hres); + ok(hres == S_OK, "Load failed: %08lx\n", hres); resetting_document = FALSE; @@ -8135,7 +8135,7 @@ static void test_submit(void) test_download(DWL_CSS|DWL_TRYCSS); hres = IHTMLDocument2_get_body(doc, &body); - ok(hres == S_OK, "get_body failed: %08x\n", hres); + ok(hres == S_OK, "get_body failed: %08lx\n", hres); ok(body != NULL, "body = NULL\n"); put_inner_html(body, L"<form action='test_submit' method='post' id='fid'><input type='hidden' name='cmd' value='TEST'></form>"); @@ -8145,7 +8145,7 @@ static void test_submit(void) ok(form_elem != NULL, "form = NULL\n"); hres = IHTMLElement_QueryInterface(form_elem, &IID_IHTMLFormElement, (void**)&form); - ok(hres == S_OK, "Could not get IHTMLFormElement: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLFormElement: %08lx\n", hres); IHTMLElement_Release(form_elem); nav_url = nav_serv_url = L"winetest:test_submit"; @@ -8170,7 +8170,7 @@ static void test_submit(void) SET_EXPECT(Terminate); hres = IHTMLFormElement_submit(form); - ok(hres == S_OK, "submit failed: %08x\n", hres); + ok(hres == S_OK, "submit failed: %08lx\n", hres); CHECK_CALLED(TranslateUrl); CHECK_CALLED(FireBeforeNavigate2); @@ -8216,34 +8216,34 @@ static void test_QueryService(IHTMLDocument2 *doc, BOOL success) HRESULT hres; hres = IHTMLDocument2_QueryInterface(doc, &IID_IServiceProvider, (void**)&sp); - ok(hres == S_OK, "QueryService returned %08x\n", hres); + ok(hres == S_OK, "QueryService returned %08lx\n", hres); hres = IServiceProvider_QueryService(sp, &IID_IHlinkFrame, &IID_IHlinkFrame, (void**)&hf); if(!success) { - ok(hres == E_NOINTERFACE, "QueryService returned %08x, expected E_NOINTERFACE\n", hres); + ok(hres == E_NOINTERFACE, "QueryService returned %08lx, expected E_NOINTERFACE\n", hres); IServiceProvider_Release(sp); return; } - ok(hres == S_OK, "QueryService(IID_IHlinkFrame) failed: %08x\n", hres); + ok(hres == S_OK, "QueryService(IID_IHlinkFrame) failed: %08lx\n", hres); ok(hf == &HlinkFrame, "hf != HlinkFrame\n"); IHlinkFrame_Release(hf); IServiceProvider_Release(sp); hres = IHTMLDocument2_get_parentWindow(doc, &window); - ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + ok(hres == S_OK, "get_parentWindow failed: %08lx\n", hres); hres = IHTMLWindow2_QueryInterface(window, &IID_IServiceProvider, (void**)&sp); - ok(hres == S_OK, "Could not get IServiceProvider iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IServiceProvider iface: %08lx\n", hres); hres = IServiceProvider_QueryService(sp, &IID_IHTMLWindow2, &IID_IHTMLWindow2, (void**)&sp_window); - ok(hres == S_OK, "QueryService(IID_IHTMLWindow2) failed: %08x\n", hres); + ok(hres == S_OK, "QueryService(IID_IHTMLWindow2) failed: %08lx\n", hres); /* FIXME: test returned window */ IHTMLWindow2_Release(sp_window); hres = IServiceProvider_QueryService(sp, &IID_IHlinkFrame, &IID_IHlinkFrame, (void**)&hf); - ok(hres == S_OK, "QueryService(IID_IHlinkFrame) failed: %08x\n", hres); + ok(hres == S_OK, "QueryService(IID_IHlinkFrame) failed: %08lx\n", hres); ok(hf == &HlinkFrame, "hf != HlinkFrame\n"); IHlinkFrame_Release(hf); @@ -8267,10 +8267,10 @@ static void test_HTMLDocument_StreamLoad(void) doc_unk = (IUnknown*)doc; hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); - ok(hres == S_OK, "Could not get IOleObject: %08x\n", hres); + ok(hres == S_OK, "Could not get IOleObject: %08lx\n", hres); hres = IOleObject_Advise(oleobj, (IAdviseSink*)&AdviseSink, &conn); - ok(hres == S_OK, "Advise failed: %08x\n", hres); + ok(hres == S_OK, "Advise failed: %08lx\n", hres); test_readyState((IUnknown*)doc); test_IsDirty(doc, S_FALSE); @@ -8328,10 +8328,10 @@ static void test_HTMLDocument_StreamInitNew(void) doc_unk = (IUnknown*)doc; hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); - ok(hres == S_OK, "Could not get IOleObject: %08x\n", hres); + ok(hres == S_OK, "Could not get IOleObject: %08lx\n", hres); hres = IOleObject_Advise(oleobj, (IAdviseSink*)&AdviseSink, &conn); - ok(hres == S_OK, "Advise failed: %08x\n", hres); + ok(hres == S_OK, "Advise failed: %08lx\n", hres); test_readyState((IUnknown*)doc); test_IsDirty(doc, S_FALSE); @@ -8373,7 +8373,7 @@ static void test_edit_uiactivate(IOleObject *oleobj) HRESULT hres; hres = IOleObject_QueryInterface(oleobj, &IID_IOleDocumentView, (void **)&docview); - ok(hres == S_OK, "IOleObject_QueryInterface failed with error 0x%08x\n", hres); + ok(hres == S_OK, "IOleObject_QueryInterface failed with error 0x%08lx\n", hres); SET_EXPECT(OnFocus_TRUE); SET_EXPECT(SetActiveObject); @@ -8383,7 +8383,7 @@ static void test_edit_uiactivate(IOleObject *oleobj) expect_status_text = NULL; hres = IOleDocumentView_UIActivate(docview, TRUE); - ok(hres == S_OK, "IOleDocumentView_UIActivate failed with error 0x%08x\n", hres); + ok(hres == S_OK, "IOleDocumentView_UIActivate failed with error 0x%08lx\n", hres); CHECK_CALLED(OnFocus_TRUE); CHECK_CALLED(SetActiveObject); @@ -8411,10 +8411,10 @@ static void test_editing_mode(BOOL do_load, BOOL use_design_mode) unk = doc_unk = (IUnknown*)doc; hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); - ok(hres == S_OK, "Could not get IOleObject: %08x\n", hres); + ok(hres == S_OK, "Could not get IOleObject: %08lx\n", hres); hres = IOleObject_Advise(oleobj, (IAdviseSink*)&AdviseSink, &conn); - ok(hres == S_OK, "Advise failed: %08x\n", hres); + ok(hres == S_OK, "Advise failed: %08lx\n", hres); test_readyState((IUnknown*)doc); test_ViewAdviseSink(doc); @@ -8466,7 +8466,7 @@ static void test_editing_mode(BOOL do_load, BOOL use_design_mode) on = SysAllocString(L"On"); hres = IHTMLDocument2_put_designMode(doc, on); SysFreeString(on); - ok(hres == S_OK, "put_designMode failed: %08x\n", hres); + ok(hres == S_OK, "put_designMode failed: %08lx\n", hres); todo_wine CHECK_CALLED(OnChanged_1005); todo_wine CHECK_CALLED(ActiveElementChanged); @@ -8557,10 +8557,10 @@ static void test_UIActivate(BOOL do_load, BOOL use_ipsex, BOOL use_ipsw) ipsw = use_ipsw; hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); - ok(hres == S_OK, "QueryInterface(IID_IOleObject) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IOleObject) failed: %08lx\n", hres); hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleDocumentView, (void**)&view); - ok(hres == S_OK, "QueryInterface(IID_IOleDocumentView) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IOleDocumentView) failed: %08lx\n", hres); SET_EXPECT(Invoke_AMBIENT_USERMODE); SET_EXPECT(GetHostInfo); @@ -8580,7 +8580,7 @@ static void test_UIActivate(BOOL do_load, BOOL use_ipsex, BOOL use_ipsw) SET_EXPECT(Exec_ShellDocView_84); hres = IOleObject_SetClientSite(oleobj, &ClientSite); - ok(hres == S_OK, "SetClientSite failed: %08x\n", hres); + ok(hres == S_OK, "SetClientSite failed: %08lx\n", hres); set_clientsite = TRUE; CHECK_CALLED(Invoke_AMBIENT_USERMODE); @@ -8601,7 +8601,7 @@ static void test_UIActivate(BOOL do_load, BOOL use_ipsex, BOOL use_ipsw) CHECK_CALLED_BROKEN(Exec_ShellDocView_84); hres = IOleDocumentView_GetInPlaceSite(view, &inplacesite); - ok(hres == S_OK, "GetInPlaceSite failed: %08x\n", hres); + ok(hres == S_OK, "GetInPlaceSite failed: %08lx\n", hres); ok(inplacesite == NULL, "inplacesite = %p, expected NULL\n", inplacesite); SET_EXPECT(GetContainer); @@ -8627,7 +8627,7 @@ static void test_UIActivate(BOOL do_load, BOOL use_ipsex, BOOL use_ipsw) expect_LockContainer_fLock = TRUE; hres = IOleDocumentView_UIActivate(view, TRUE); - ok(hres == S_OK, "UIActivate failed: %08x\n", hres); + ok(hres == S_OK, "UIActivate failed: %08lx\n", hres); CHECK_CALLED(GetContainer); CHECK_CALLED(LockContainer); @@ -8657,7 +8657,7 @@ static void test_UIActivate(BOOL do_load, BOOL use_ipsex, BOOL use_ipsw) SET_EXPECT(OnUIDeactivate); hres = IOleDocumentView_UIActivate(view, FALSE); - ok(hres == S_OK, "UIActivate failed: %08x\n", hres); + ok(hres == S_OK, "UIActivate failed: %08lx\n", hres); CHECK_CALLED(SetActiveObject_null); CHECK_CALLED(InPlaceUIWindow_SetActiveObject); @@ -8665,7 +8665,7 @@ static void test_UIActivate(BOOL do_load, BOOL use_ipsex, BOOL use_ipsw) CHECK_CALLED(OnUIDeactivate); hres = IOleDocumentView_GetInPlaceSite(view, &inplacesite); - ok(hres == S_OK, "GetInPlaceSite failed: %08x\n", hres); + ok(hres == S_OK, "GetInPlaceSite failed: %08lx\n", hres); ok(inplacesite != NULL, "inplacesite = NULL\n"); IOleInPlaceSite_Release(inplacesite); @@ -8702,11 +8702,11 @@ static void register_protocol(void) static const WCHAR wsz_winetest[] = {'w','i','n','e','t','e','s','t',0}; hres = CoInternetGetSession(0, &session, 0); - ok(hres == S_OK, "CoInternetGetSession failed: %08x\n", hres); + ok(hres == S_OK, "CoInternetGetSession failed: %08lx\n", hres); hres = IInternetSession_RegisterNameSpace(session, &ClassFactory, &IID_NULL, wsz_winetest, 0, NULL, 0); - ok(hres == S_OK, "RegisterNameSpace failed: %08x\n", hres); + ok(hres == S_OK, "RegisterNameSpace failed: %08lx\n", hres); IInternetSession_Release(session); } @@ -8720,12 +8720,12 @@ static void test_HTMLDoc_ISupportErrorInfo(void) doc = create_document(); hres = IHTMLDocument2_QueryInterface(doc, &IID_ISupportErrorInfo, (void**)&sinfo); - ok(hres == S_OK, "got %x\n", hres); + ok(hres == S_OK, "got %lx\n", hres); ok(sinfo != NULL, "got %p\n", sinfo); if(sinfo) { hres = ISupportErrorInfo_InterfaceSupportsErrorInfo(sinfo, &IID_IErrorInfo); - ok(hres == S_FALSE, "Expected S_OK, got %x\n", hres); + ok(hres == S_FALSE, "Expected S_OK, got %lx\n", hres); ISupportErrorInfo_Release(sinfo); } @@ -8772,31 +8772,31 @@ static void test_ServiceProvider(void) return; hres = IHTMLDocument2_QueryInterface(doc, &IID_IServiceProvider, (void**)&provider); - ok(hres == S_OK, "got 0x%08x\n", hres); + ok(hres == S_OK, "got 0x%08lx\n", hres); hres = IServiceProvider_QueryService(provider, &SID_SContainerDispatch, &IID_IHTMLDocument2, (void**)&doc2); - ok(hres == S_OK, "got 0x%08x\n", hres); + ok(hres == S_OK, "got 0x%08lx\n", hres); ok(iface_cmp((IUnknown*)doc2, (IUnknown*)doc), "got wrong pointer\n"); IHTMLDocument2_Release(doc2); hres = IServiceProvider_QueryService(provider, &SID_SContainerDispatch, &IID_IHTMLDocument3, (void**)&doc3); - ok(hres == S_OK, "got 0x%08x\n", hres); + ok(hres == S_OK, "got 0x%08lx\n", hres); ok(iface_cmp((IUnknown*)doc3, (IUnknown*)doc), "got wrong pointer\n"); hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3_2); - ok(hres == S_OK, "got 0x%08x\n", hres); + ok(hres == S_OK, "got 0x%08lx\n", hres); ok(iface_cmp((IUnknown*)doc3_2, (IUnknown*)doc), "got wrong pointer\n"); ok(iface_cmp((IUnknown*)doc3_2, (IUnknown*)doc3), "got wrong pointer\n"); IHTMLDocument3_Release(doc3); IHTMLDocument3_Release(doc3_2); hres = IServiceProvider_QueryService(provider, &SID_SContainerDispatch, &IID_IUnknown, (void**)&unk); - ok(hres == S_OK, "got 0x%08x\n", hres); + ok(hres == S_OK, "got 0x%08lx\n", hres); ok(iface_cmp((IUnknown*)doc, unk), "got wrong pointer\n"); IUnknown_Release(unk); hres = IServiceProvider_QueryService(provider, &SID_SHTMLEditServices, &IID_IHTMLEditServices, (void**)&unk); - ok(hres == S_OK, "QueryService(HTMLEditServices) failed: %08x\n", hres); + ok(hres == S_OK, "QueryService(HTMLEditServices) failed: %08lx\n", hres); IUnknown_Release(unk); IServiceProvider_Release(provider); @@ -8843,20 +8843,20 @@ static void test_com_aggregation(const CLSID *clsid) HRESULT hres; hres = CoGetClassObject(clsid, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void**)&class_factory); - ok(hres == S_OK, "CoGetClassObject failed: %08x\n", hres); + ok(hres == S_OK, "CoGetClassObject failed: %08lx\n", hres); SET_EXPECT(outer_QI_IPersistMoniker); /* Some IE version QI for that. */ hres = IClassFactory_CreateInstance(class_factory, &outer, &IID_IUnknown, (void**)&unk); - ok(hres == S_OK, "CreateInstance returned: %08x\n", hres); + ok(hres == S_OK, "CreateInstance returned: %08lx\n", hres); SET_CALLED(outer_QI_IPersistMoniker); hres = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)&unk2); - ok(hres == S_OK, "Could not get IDispatch iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IDispatch iface: %08lx\n", hres); SET_EXPECT(outer_QI_test); hres = IUnknown_QueryInterface(unk2, &outer_test_iid, (void**)&unk3); CHECK_CALLED(outer_QI_test); - ok(hres == S_OK, "Could not get IInternetProtocol iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IInternetProtocol iface: %08lx\n", hres); ok(unk3 == (IUnknown*)0xdeadbeef, "unexpected unk2\n"); IUnknown_Release(unk2); @@ -8864,7 +8864,7 @@ static void test_com_aggregation(const CLSID *clsid) unk = (void*)0xdeadbeef; hres = IClassFactory_CreateInstance(class_factory, &outer, &IID_IDispatch, (void**)&unk); - ok(hres == E_INVALIDARG, "CreateInstance returned: %08x\n", hres); + ok(hres == E_INVALIDARG, "CreateInstance returned: %08lx\n", hres); ok(!unk, "unk = %p\n", unk); IClassFactory_Release(class_factory); diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c index cec69e44142..0b241085af2 100644 --- a/dlls/mshtml/tests/htmllocation.c +++ b/dlls/mshtml/tests/htmllocation.c @@ -107,11 +107,11 @@ static void test_href(IHTMLLocation *loc, const struct location_test *test) hres = IHTMLLocation_get_href(loc, NULL); ok(hres == E_POINTER, - "%s: get_href should have failed with E_POINTER (0x%08x), was: 0x%08x\n", + "%s: get_href should have failed with E_POINTER (0x%08lx), was: 0x%08lx\n", test->name, E_POINTER, hres); hres = IHTMLLocation_get_href(loc, &str); - ok(hres == S_OK, "%s: get_href failed: 0x%08x\n", test->name, hres); + ok(hres == S_OK, "%s: get_href failed: 0x%08lx\n", test->name, hres); if(hres == S_OK) ok(str_eq_wa(str, test->href), "%s: expected retrieved href to be L\"%s\", was: %s\n", @@ -119,7 +119,7 @@ static void test_href(IHTMLLocation *loc, const struct location_test *test) SysFreeString(str); hres = IHTMLLocation_toString(loc, &str); - ok(hres == S_OK, "%s: toString failed: 0x%08x\n", test->name, hres); + ok(hres == S_OK, "%s: toString failed: 0x%08lx\n", test->name, hres); ok(str_eq_wa(str, test->href), "%s: toString returned %s, expected %s\n", test->name, wine_dbgstr_w(str), test->href); SysFreeString(str); @@ -132,11 +132,11 @@ static void test_protocol(IHTMLLocation *loc, const struct location_test *test) hres = IHTMLLocation_get_protocol(loc, NULL); ok(hres == E_POINTER, - "%s: get_protocol should have failed with E_POINTER (0x%08x), was: 0x%08x\n", + "%s: get_protocol should have failed with E_POINTER (0x%08lx), was: 0x%08lx\n", test->name, E_POINTER, hres); hres = IHTMLLocation_get_protocol(loc, &str); - ok(hres == S_OK, "%s: get_protocol failed: 0x%08x\n", test->name, hres); + ok(hres == S_OK, "%s: get_protocol failed: 0x%08lx\n", test->name, hres); if(hres == S_OK) ok(str_eq_wa(str, test->protocol), "%s: expected retrieved protocol to be L\"%s\", was: %s\n", @@ -151,11 +151,11 @@ static void test_host(IHTMLLocation *loc, const struct location_test *test) hres = IHTMLLocation_get_host(loc, NULL); ok(hres == E_POINTER, - "%s: get_host should have failed with E_POINTER (0x%08x), was: 0x%08x\n", + "%s: get_host should have failed with E_POINTER (0x%08lx), was: 0x%08lx\n", test->name, E_POINTER, hres); hres = IHTMLLocation_get_host(loc, &str); - ok(hres == S_OK, "%s: get_host failed: 0x%08x\n", test->name, hres); + ok(hres == S_OK, "%s: get_host failed: 0x%08lx\n", test->name, hres); if(hres == S_OK){ int len = test->host ? strlen(test->host) : 0; ok(str_eq_wa(str, test->host), @@ -175,11 +175,11 @@ static void test_hostname(IHTMLLocation *loc, IHTMLDocument2 *doc, const struct hres = IHTMLLocation_get_hostname(loc, NULL); ok(hres == E_POINTER, - "%s: get_hostname should have failed with E_POINTER (0x%08x), was: 0x%08x\n", + "%s: get_hostname should have failed with E_POINTER (0x%08lx), was: 0x%08lx\n", test->name, E_POINTER, hres); hres = IHTMLLocation_get_hostname(loc, &str); - ok(hres == S_OK, "%s: get_hostname failed: 0x%08x\n", test->name, hres); + ok(hres == S_OK, "%s: get_hostname failed: 0x%08lx\n", test->name, hres); if(hres == S_OK) ok(str_eq_wa(str, test->hostname), "%s: expected retrieved hostname to be L\"%s\", was: %s\n", @@ -187,7 +187,7 @@ static void test_hostname(IHTMLLocation *loc, IHTMLDocument2 *doc, const struct SysFreeString(str); hres = IHTMLDocument2_get_domain(doc, &str); - ok(hres == S_OK, "%s: get_domain failed: 0x%08x\n", test->name, hres); + ok(hres == S_OK, "%s: get_domain failed: 0x%08lx\n", test->name, hres); if(hres == S_OK) ok(str_eq_wa(str, test->hostname ? test->hostname : ""), "%s: expected retrieved domain to be L\"%s\", was: %s\n", @@ -202,11 +202,11 @@ static void test_port(IHTMLLocation *loc, const struct location_test *test) hres = IHTMLLocation_get_port(loc, NULL); ok(hres == E_POINTER, - "%s: get_port should have failed with E_POINTER (0x%08x), was: 0x%08x\n", + "%s: get_port should have failed with E_POINTER (0x%08lx), was: 0x%08lx\n", test->name, E_POINTER, hres); hres = IHTMLLocation_get_port(loc, &str); - ok(hres == S_OK, "%s: get_port failed: 0x%08x\n", test->name, hres); + ok(hres == S_OK, "%s: get_port failed: 0x%08lx\n", test->name, hres); if(hres == S_OK) ok(str_eq_wa(str, test->port) || (!str && !*test->port), /* IE11 */ @@ -222,11 +222,11 @@ static void test_pathname(IHTMLLocation *loc, const struct location_test *test) hres = IHTMLLocation_get_pathname(loc, NULL); ok(hres == E_POINTER, - "%s: get_pathname should have failed with E_POINTER (0x%08x), was: 0x%08x\n", + "%s: get_pathname should have failed with E_POINTER (0x%08lx), was: 0x%08lx\n", test->name, E_POINTER, hres); hres = IHTMLLocation_get_pathname(loc, &str); - ok(hres == S_OK, "%s: get_pathname failed: 0x%08x\n", test->name, hres); + ok(hres == S_OK, "%s: get_pathname failed: 0x%08lx\n", test->name, hres); if(hres == S_OK) /* FIXME: We seem to be testing location in a buggy state. Path names do not * include leading slash, while other tests confirm that it should be there */ @@ -244,11 +244,11 @@ static void test_search(IHTMLLocation *loc, const struct location_test *test) hres = IHTMLLocation_get_search(loc, NULL); ok(hres == E_POINTER, - "%s: get_search should have failed with E_POINTER (0x%08x), was: 0x%08x\n", + "%s: get_search should have failed with E_POINTER (0x%08lx), was: 0x%08lx\n", test->name, E_POINTER, hres); hres = IHTMLLocation_get_search(loc, &str); - ok(hres == S_OK, "%s: get_search failed: 0x%08x\n", test->name, hres); + ok(hres == S_OK, "%s: get_search failed: 0x%08lx\n", test->name, hres); if(hres == S_OK) ok(str_eq_wa(str, test->search), "%s: expected retrieved search to be L\"%s\", was: %s\n", @@ -263,11 +263,11 @@ static void test_hash(IHTMLLocation *loc, const struct location_test *test) hres = IHTMLLocation_get_hash(loc, NULL); ok(hres == E_POINTER, - "%s: get_hash should have failed with E_POINTER (0x%08x), was: 0x%08x\n", + "%s: get_hash should have failed with E_POINTER (0x%08lx), was: 0x%08lx\n", test->name, E_POINTER, hres); hres = IHTMLLocation_get_hash(loc, &str); - ok(hres == S_OK, "%s: get_hash failed: 0x%08x\n", test->name, hres); + ok(hres == S_OK, "%s: get_hash failed: 0x%08lx\n", test->name, hres); if(hres == S_OK) ok(str_eq_wa(str, test->hash), "%s: expected retrieved hash to be L\"%s\", was: %s\n", @@ -287,13 +287,13 @@ static void perform_test(const struct location_test* test) IHTMLLocation *location; hres = CreateBindCtx(0, &bc); - ok(hres == S_OK, "%s: CreateBindCtx failed: 0x%08x\n", test->name, hres); + ok(hres == S_OK, "%s: CreateBindCtx failed: 0x%08lx\n", test->name, hres); if(FAILED(hres)) return; MultiByteToWideChar(CP_ACP, 0, test->url, -1, url, ARRAY_SIZE(url)); hres = CreateURLMoniker(NULL, url, &url_mon); - ok(hres == S_OK, "%s: CreateURLMoniker failed: 0x%08x\n", test->name, hres); + ok(hres == S_OK, "%s: CreateURLMoniker failed: 0x%08lx\n", test->name, hres); if(FAILED(hres)){ IBindCtx_Release(bc); return; @@ -305,7 +305,7 @@ static void perform_test(const struct location_test* test) #if !defined(__i386__) && !defined(__x86_64__) todo_wine #endif - ok(hres == S_OK, "%s: CoCreateInstance failed: 0x%08x\n", test->name, hres); + ok(hres == S_OK, "%s: CoCreateInstance failed: 0x%08lx\n", test->name, hres); if(FAILED(hres)){ IMoniker_Release(url_mon); IBindCtx_Release(bc); @@ -324,7 +324,7 @@ static void perform_test(const struct location_test* test) hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistMoniker, (void**)&persist_mon); - ok(hres == S_OK, "%s: IHTMlDocument2_QueryInterface failed: 0x%08x\n", test->name, hres); + ok(hres == S_OK, "%s: IHTMlDocument2_QueryInterface failed: 0x%08lx\n", test->name, hres); if(FAILED(hres)){ IHTMLDocument2_Release(doc); IMoniker_Release(url_mon); @@ -334,7 +334,7 @@ static void perform_test(const struct location_test* test) hres = IPersistMoniker_Load(persist_mon, FALSE, url_mon, bc, STGM_SHARE_EXCLUSIVE | STGM_READWRITE); - ok(hres == S_OK, "%s: IPersistMoniker_Load failed: 0x%08x\n", test->name, hres); + ok(hres == S_OK, "%s: IPersistMoniker_Load failed: 0x%08lx\n", test->name, hres); if(FAILED(hres)){ IPersistMoniker_Release(persist_mon); IHTMLDocument2_Release(doc); @@ -344,7 +344,7 @@ static void perform_test(const struct location_test* test) } hres = IHTMLDocument2_get_location(doc, &location); - ok(hres == S_OK, "%s: IHTMLDocument2_get_location failed: 0x%08x\n", test->name, hres); + ok(hres == S_OK, "%s: IHTMLDocument2_get_location failed: 0x%08lx\n", test->name, hres); if(FAILED(hres)){ IPersistMoniker_Release(persist_mon); IHTMLDocument2_Release(doc); diff --git a/dlls/mshtml/tests/misc.c b/dlls/mshtml/tests/misc.c index ed8de36b9a3..1702a24c804 100644 --- a/dlls/mshtml/tests/misc.c +++ b/dlls/mshtml/tests/misc.c @@ -36,7 +36,7 @@ static void test_HTMLLoadOptions(void) hres = CoCreateInstance(&CLSID_HTMLLoadOptions, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IHtmlLoadOptions, (void**)&loadopts); - ok(hres == S_OK, "creating HTMLLoadOptions failed: %08x\n", hres); + ok(hres == S_OK, "creating HTMLLoadOptions failed: %08lx\n", hres); if(FAILED(hres)) return; @@ -44,64 +44,64 @@ static void test_HTMLLoadOptions(void) size = 0xdeadbeef; memset(buf, 0xdd, sizeof(buf)); hres = IHtmlLoadOptions_QueryOption(loadopts, i, NULL, &size); - ok(hres == S_OK, "QueryOption failed: %08x\n", hres); - ok(size == 0, "size = %d\n", size); + ok(hres == S_OK, "QueryOption failed: %08lx\n", hres); + ok(size == 0, "size = %ld\n", size); ok(buf[0] == 0xdd, "buf changed\n"); } size = 0xdeadbeef; hres = IHtmlLoadOptions_QueryOption(loadopts, HTMLLOADOPTION_CODEPAGE, NULL, &size); - ok(hres == S_OK, "QueryOption failed: %08x\n", hres); - ok(size == 0, "size = %d\n", size); + ok(hres == S_OK, "QueryOption failed: %08lx\n", hres); + ok(size == 0, "size = %ld\n", size); hres = IHtmlLoadOptions_SetOption(loadopts, HTMLLOADOPTION_CODEPAGE, &data, sizeof(data)); - ok(hres == S_OK, "SetOption failed: %08x\n", hres); + ok(hres == S_OK, "SetOption failed: %08lx\n", hres); size = sizeof(data); memset(buf, 0xdd, sizeof(buf)); hres = IHtmlLoadOptions_QueryOption(loadopts, HTMLLOADOPTION_CODEPAGE, buf, &size); - ok(hres == S_OK, "QueryOption failed: %08x\n", hres); - ok(size == sizeof(data), "size = %d\n", size); + ok(hres == S_OK, "QueryOption failed: %08lx\n", hres); + ok(size == sizeof(data), "size = %ld\n", size); ok(*(DWORD*)buf == data, "unexpected buf\n"); size = sizeof(data)-1; memset(buf, 0xdd, sizeof(buf)); hres = IHtmlLoadOptions_QueryOption(loadopts, HTMLLOADOPTION_CODEPAGE, buf, &size); - ok(hres == E_FAIL, "QueryOption failed: %08x\n", hres); - ok(size == sizeof(data) || !size, "size = %d\n", size); + ok(hres == E_FAIL, "QueryOption failed: %08lx\n", hres); + ok(size == sizeof(data) || !size, "size = %ld\n", size); ok(buf[0] == 0xdd, "buf changed\n"); data = 100; hres = IHtmlLoadOptions_SetOption(loadopts, HTMLLOADOPTION_CODEPAGE, &data, 0); - ok(hres == S_OK, "SetOption failed: %08x\n", hres); + ok(hres == S_OK, "SetOption failed: %08lx\n", hres); size = 0xdeadbeef; memset(buf, 0xdd, sizeof(buf)); hres = IHtmlLoadOptions_QueryOption(loadopts, HTMLLOADOPTION_CODEPAGE, buf, &size); - ok(hres == S_OK, "QueryOption failed: %08x\n", hres); - ok(size == 0, "size = %d\n", size); + ok(hres == S_OK, "QueryOption failed: %08lx\n", hres); + ok(size == 0, "size = %ld\n", size); ok(buf[0] == 0xdd, "buf changed\n"); hres = IHtmlLoadOptions_SetOption(loadopts, HTMLLOADOPTION_CODEPAGE, NULL, 0); - ok(hres == S_OK, "SetOption failed: %08x\n", hres); + ok(hres == S_OK, "SetOption failed: %08lx\n", hres); hres = IHtmlLoadOptions_SetOption(loadopts, 1000, &data, sizeof(data)); - ok(hres == S_OK, "SetOption failed: %08x\n", hres); + ok(hres == S_OK, "SetOption failed: %08lx\n", hres); size = sizeof(data); memset(buf, 0xdd, sizeof(buf)); hres = IHtmlLoadOptions_QueryOption(loadopts, 1000, buf, &size); - ok(hres == S_OK, "QueryOption failed: %08x\n", hres); - ok(size == sizeof(data), "size = %d\n", size); + ok(hres == S_OK, "QueryOption failed: %08lx\n", hres); + ok(size == sizeof(data), "size = %ld\n", size); ok(*(DWORD*)buf == data, "unexpected buf\n"); hres = IHtmlLoadOptions_SetOption(loadopts, 1000, buf, sizeof(buf)); - ok(hres == S_OK, "SetOption failed: %08x\n", hres); + ok(hres == S_OK, "SetOption failed: %08lx\n", hres); size = 0xdeadbeef; hres = IHtmlLoadOptions_QueryOption(loadopts, 1000, buf, &size); - ok(hres == S_OK, "QueryOption failed: %08x\n", hres); - ok(size == sizeof(buf), "size = %d\n", size); + ok(hres == S_OK, "QueryOption failed: %08lx\n", hres); + ok(size == sizeof(buf), "size = %ld\n", size); IHtmlLoadOptions_Release(loadopts); } diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 600ec72e16f..fe437765bfb 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -115,7 +115,7 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, ok(ulStatusCode == BINDSTATUS_MIMETYPEAVAILABLE || ulStatusCode == BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE, - "ulStatusCode=%d\n", ulStatusCode); + "ulStatusCode=%ld\n", ulStatusCode); ok(!lstrcmpW(szStatusText, text_html), "szStatusText != text/html\n"); return S_OK; @@ -128,7 +128,7 @@ static HRESULT WINAPI ProtocolSink_ReportData(IInternetProtocolSink *iface, DWOR ok(ulProgress == ulProgressMax, "ulProgress != ulProgressMax\n"); ok(grfBSCF == (BSCF_FIRSTDATANOTIFICATION | BSCF_LASTDATANOTIFICATION | BSCF_DATAFULLYAVAILABLE), - "grcf = %08x\n", grfBSCF); + "grcf = %08lx\n", grfBSCF); return S_OK; } @@ -140,15 +140,15 @@ static HRESULT WINAPI ProtocolSink_ReportResult(IInternetProtocolSink *iface, HR if(expect_hr_win32err) { ok((hrResult&0xffff0000) == ((FACILITY_WIN32 << 16)|0x80000000) || hrResult == expect_hrResult, - "expected win32 err or %08x got: %08x\n", expect_hrResult, hrResult); + "expected win32 err or %08lx got: %08lx\n", expect_hrResult, hrResult); }else { ok(hrResult == expect_hrResult || (expect_hrResult == E_INVALIDARG && hrResult == MK_E_SYNTAX) || (expect_hrResult == HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND) && (hrResult == MK_E_SYNTAX || hrResult == HRESULT_FROM_WIN32(ERROR_DLL_NOT_FOUND))), - "expected: %08x got: %08x\n", expect_hrResult, hrResult); + "expected: %08lx got: %08lx\n", expect_hrResult, hrResult); expect_hrResult = hrResult; } - ok(dwError == 0, "dwError = %d\n", dwError); + ok(dwError == 0, "dwError = %ld\n", dwError); ok(!szResult, "szResult != NULL\n"); return S_OK; @@ -196,7 +196,7 @@ static HRESULT WINAPI BindInfo_GetBindInfo(IInternetBindInfo *iface, DWORD *grfB ok(grfBINDF != NULL, "grfBINDF == NULL\n"); ok(pbindinfo != NULL, "pbindinfo == NULL\n"); - ok(pbindinfo->cbSize == sizeof(BINDINFO), "wrong size of pbindinfo: %d\n", pbindinfo->cbSize); + ok(pbindinfo->cbSize == sizeof(BINDINFO), "wrong size of pbindinfo: %ld\n", pbindinfo->cbSize); *grfBINDF = bindf; return S_OK; @@ -234,9 +234,9 @@ static void test_protocol_fail(IInternetProtocol *protocol, LPCWSTR url, HRESULT hres = IInternetProtocol_Start(protocol, url, &protocol_sink, &bind_info, 0, 0); if(expect_win32err) ok((hres&0xffff0000) == ((FACILITY_WIN32 << 16)|0x80000000) || hres == expect_hrResult, - "expected win32 err or %08x got: %08x\n", expected_hres, hres); + "expected win32 err or %08lx got: %08lx\n", expected_hres, hres); else - ok(hres == expect_hrResult, "expected: %08x got: %08x\n", expect_hrResult, hres); + ok(hres == expect_hrResult, "expected: %08lx got: %08lx\n", expect_hrResult, hres); CHECK_CALLED(GetBindInfo); CHECK_CALLED(ReportResult); @@ -254,7 +254,7 @@ static void protocol_start(IInternetProtocol *protocol, const WCHAR *url) expect_hr_win32err = FALSE; hres = IInternetProtocol_Start(protocol, url, &protocol_sink, &bind_info, 0, 0); - ok(hres == S_OK, "Start failed: %08x\n", hres); + ok(hres == S_OK, "Start failed: %08lx\n", hres); CHECK_CALLED(GetBindInfo); CHECK_CALLED(ReportProgress); @@ -272,14 +272,14 @@ static void test_res_url_fail(const WCHAR *url_suffix) wcscat(url, url_suffix); hres = CoCreateInstance(&CLSID_ResProtocol, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocol, (void**)&protocol); - ok(hres == S_OK, "Could not create ResProtocol instance: %08x\n", hres); + ok(hres == S_OK, "Could not create ResProtocol instance: %08lx\n", hres); SET_EXPECT(GetBindInfo); SET_EXPECT(ReportResult); expect_hr_win32err = TRUE; hres = IInternetProtocol_Start(protocol, url, &protocol_sink, &bind_info, 0, 0); ok(HRESULT_FACILITY(hres) == FACILITY_WIN32, - "%s: expected win32 error, got: %08x\n", debugstr_w(url_suffix), hres); + "%s: expected win32 error, got: %08lx\n", debugstr_w(url_suffix), hres); CHECK_CALLED(GetBindInfo); CHECK_CALLED(ReportResult); @@ -298,19 +298,19 @@ static void test_res_url(const char *url_suffix) MultiByteToWideChar(CP_ACP, 0, url_suffix, -1, url+res_url_base_len, ARRAY_SIZE(url)-res_url_base_len); hres = CoCreateInstance(&CLSID_ResProtocol, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocol, (void**)&protocol); - ok(hres == S_OK, "Could not create ResProtocol instance: %08x\n", hres); + ok(hres == S_OK, "Could not create ResProtocol instance: %08lx\n", hres); protocol_start(protocol, url); hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &size); - ok(hres == S_OK, "Read failed: %08x\n", hres); + ok(hres == S_OK, "Read failed: %08lx\n", hres); hres = IInternetProtocol_Terminate(protocol, 0); - ok(hres == S_OK, "Terminate failed: %08x\n", hres); + ok(hres == S_OK, "Terminate failed: %08lx\n", hres); ref = IInternetProtocol_Release(protocol); - ok(!ref, "ref=%u\n", ref); + ok(!ref, "ref=%lu\n", ref); } static void res_sec_url_cmp(LPCWSTR url, DWORD size, LPCWSTR file) @@ -331,12 +331,12 @@ static void res_sec_url_cmp(LPCWSTR url, DWORD size, LPCWSTR file) if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) win_skip("SearchPathW is not implemented\n"); else - ok(0, "SearchPath failed: %u\n", GetLastError()); + ok(0, "SearchPath failed: %lu\n", GetLastError()); return; } len += ARRAY_SIZE(fileW)+1; - ok(len == size, "wrong size %u, expected %u\n", size, len); + ok(len == size, "wrong size %lu, expected %lu\n", size, len); ok(!lstrcmpW(url + ARRAY_SIZE(fileW), buf), "wrong file part %s\n", wine_dbgstr_w(url)); } @@ -365,12 +365,12 @@ static void test_res_protocol(void) static const WCHAR mshtml_dllW[] = {'m','s','h','t','m','l','.','d','l','l',0}; hres = CoGetClassObject(&CLSID_ResProtocol, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&unk); - ok(hres == S_OK, "CoGetClassObject failed: %08x\n", hres); + ok(hres == S_OK, "CoGetClassObject failed: %08lx\n", hres); if(FAILED(hres)) return; hres = IUnknown_QueryInterface(unk, &IID_IInternetProtocolInfo, (void**)&protocol_info); - ok(hres == S_OK, "Could not get IInternetProtocolInfo interface: %08x\n", hres); + ok(hres == S_OK, "Could not get IInternetProtocolInfo interface: %08lx\n", hres); if(SUCCEEDED(hres)) { WCHAR buf[128]; DWORD size, expected_size; @@ -381,56 +381,56 @@ static void test_res_protocol(void) hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, i, 0, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == INET_E_DEFAULT_ACTION, - "[%d] failed: %08x, expected INET_E_DEFAULT_ACTION\n", i, hres); + "[%d] failed: %08lx, expected INET_E_DEFAULT_ACTION\n", i, hres); } } hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_SECURITY_URL, 0, buf, ARRAY_SIZE(buf), &size, 0); - ok(hres == S_OK, "ParseUrl failed: %08x\n", hres); + ok(hres == S_OK, "ParseUrl failed: %08lx\n", hres); res_sec_url_cmp(buf, size, mshtml_dllW); - ok(size == lstrlenW(buf)+1, "size = %d\n", size); + ok(size == lstrlenW(buf)+1, "size = %ld\n", size); expected_size = size; hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_SECURITY_URL, 0, buf, expected_size, &size, 0); - ok(hres == S_OK, "ParseUrl failed: %08x\n", hres); + ok(hres == S_OK, "ParseUrl failed: %08lx\n", hres); res_sec_url_cmp(buf, size, mshtml_dllW); - ok(size == expected_size, "size = %d\n", size); + ok(size == expected_size, "size = %ld\n", size); size = 0; hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_SECURITY_URL, 0, buf, 3, &size, 0); - ok(hres == S_FALSE, "ParseUrl failed: %08x, expected S_FALSE\n", hres); - ok(size == expected_size, "size = %d\n", size); + ok(hres == S_FALSE, "ParseUrl failed: %08lx, expected S_FALSE\n", hres); + ok(size == expected_size, "size = %ld\n", size); hres = IInternetProtocolInfo_ParseUrl(protocol_info, wrong_url1, PARSE_SECURITY_URL, 0, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == MK_E_SYNTAX || hres == E_INVALIDARG, - "ParseUrl failed: %08x, expected MK_E_SYNTAX\n", hres); + "ParseUrl failed: %08lx, expected MK_E_SYNTAX\n", hres); hres = IInternetProtocolInfo_ParseUrl(protocol_info, wrong_url5, PARSE_SECURITY_URL, 0, buf, ARRAY_SIZE(buf), &size, 0); - ok(hres == MK_E_SYNTAX, "ParseUrl failed: %08x, expected MK_E_SYNTAX\n", hres); + ok(hres == MK_E_SYNTAX, "ParseUrl failed: %08lx, expected MK_E_SYNTAX\n", hres); hres = IInternetProtocolInfo_ParseUrl(protocol_info, wrong_url6, PARSE_SECURITY_URL, 0, buf, ARRAY_SIZE(buf), &size, 0); - ok(hres == MK_E_SYNTAX, "ParseUrl failed: %08x, expected MK_E_SYNTAX\n", hres); + ok(hres == MK_E_SYNTAX, "ParseUrl failed: %08lx, expected MK_E_SYNTAX\n", hres); size = 0xdeadbeef; buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_DOMAIN, 0, buf, ARRAY_SIZE(buf), &size, 0); - ok(hres == S_OK || hres == E_FAIL, "ParseUrl failed: %08x\n", hres); + ok(hres == S_OK || hres == E_FAIL, "ParseUrl failed: %08lx\n", hres); ok(buf[0] == '?', "buf changed\n"); - ok(size == ARRAY_SIZE(blank_url) || size == ARRAY_SIZE(buf), /* IE8 */ "size=%d\n", size); + ok(size == ARRAY_SIZE(blank_url) || size == ARRAY_SIZE(buf), /* IE8 */ "size=%ld\n", size); size = 0xdeadbeef; hres = IInternetProtocolInfo_ParseUrl(protocol_info, wrong_url1, PARSE_DOMAIN, 0, buf, ARRAY_SIZE(buf), &size, 0); - ok(hres == S_OK || hres == E_FAIL, "ParseUrl failed: %08x\n", hres); + ok(hres == S_OK || hres == E_FAIL, "ParseUrl failed: %08lx\n", hres); ok(buf[0] == '?', "buf changed\n"); - ok(size == ARRAY_SIZE(wrong_url1) || size == ARRAY_SIZE(buf), /* IE8 */ "size=%d\n", size); + ok(size == ARRAY_SIZE(wrong_url1) || size == ARRAY_SIZE(buf), /* IE8 */ "size=%ld\n", size); if (0) { @@ -439,20 +439,20 @@ static void test_res_protocol(void) buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, NULL, PARSE_DOMAIN, 0, buf, ARRAY_SIZE(buf), &size, 0); - ok(hres == E_FAIL, "ParseUrl failed: %08x\n", hres); + ok(hres == E_FAIL, "ParseUrl failed: %08lx\n", hres); ok(buf[0] == '?', "buf changed\n"); - ok(size == 1, "size=%u, expected 1\n", size); + ok(size == 1, "size=%lu, expected 1\n", size); buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_DOMAIN, 0, buf, ARRAY_SIZE(buf), NULL, 0); - ok(hres == E_POINTER, "ParseUrl failed: %08x\n", hres); + ok(hres == E_POINTER, "ParseUrl failed: %08lx\n", hres); ok(buf[0] == '?', "buf changed\n"); buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, NULL, PARSE_DOMAIN, 0, buf, ARRAY_SIZE(buf), NULL, 0); - ok(hres == E_POINTER, "ParseUrl failed: %08x\n", hres); + ok(hres == E_POINTER, "ParseUrl failed: %08lx\n", hres); ok(buf[0] == '?', "buf changed\n"); } @@ -460,32 +460,32 @@ static void test_res_protocol(void) hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_UNESCAPE+1, 0, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == INET_E_DEFAULT_ACTION, - "ParseUrl failed: %08x, expected INET_E_DEFAULT_ACTION\n", hres); + "ParseUrl failed: %08lx, expected INET_E_DEFAULT_ACTION\n", hres); ok(buf[0] == '?', "buf changed\n"); size = 0xdeadbeef; hres = IInternetProtocolInfo_CombineUrl(protocol_info, blank_url, test_part_url, 0, buf, ARRAY_SIZE(buf), &size, 0); - ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08x\n", hres); - ok(size == 0xdeadbeef, "size=%d\n", size); + ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08lx\n", hres); + ok(size == 0xdeadbeef, "size=%ld\n", size); size = 0xdeadbeef; hres = IInternetProtocolInfo_CombineUrl(protocol_info, blank_url, test_part_url, URL_FILE_USE_PATHURL, buf, ARRAY_SIZE(buf), &size, 0); - ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08x\n", hres); - ok(size == 0xdeadbeef, "size=%d\n", size); + ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08lx\n", hres); + ok(size == 0xdeadbeef, "size=%ld\n", size); size = 0xdeadbeef; hres = IInternetProtocolInfo_CombineUrl(protocol_info, NULL, NULL, URL_FILE_USE_PATHURL, NULL, 0xdeadbeef, NULL, 0); - ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08x\n", hres); - ok(size == 0xdeadbeef, "size=%d\n", size); + ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08lx\n", hres); + ok(size == 0xdeadbeef, "size=%ld\n", size); hres = IInternetProtocolInfo_CompareUrl(protocol_info, blank_url, blank_url, 0); - ok(hres == E_NOTIMPL, "CompareUrl failed: %08x\n", hres); + ok(hres == E_NOTIMPL, "CompareUrl failed: %08lx\n", hres); hres = IInternetProtocolInfo_CompareUrl(protocol_info, NULL, NULL, 0xdeadbeef); - ok(hres == E_NOTIMPL, "CompareUrl failed: %08x\n", hres); + ok(hres == E_NOTIMPL, "CompareUrl failed: %08lx\n", hres); for(i=0; i<30; i++) { if(i == QUERY_USES_NETWORK || i == QUERY_IS_SECURE || i == QUERY_IS_SAFE) @@ -494,43 +494,43 @@ static void test_res_protocol(void) hres = IInternetProtocolInfo_QueryInfo(protocol_info, blank_url, i, 0, buf, sizeof(buf), &size, 0); ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, - "QueryInfo(%d) returned: %08x, expected INET_E_USE_DEFAULT_PROTOCOLHANDLER\n", i, hres); + "QueryInfo(%d) returned: %08lx, expected INET_E_USE_DEFAULT_PROTOCOLHANDLER\n", i, hres); } size = 0xdeadbeef; memset(buf, '?', sizeof(buf)); hres = IInternetProtocolInfo_QueryInfo(protocol_info, blank_url, QUERY_USES_NETWORK, 0, buf, sizeof(buf), &size, 0); - ok(hres == S_OK, "QueryInfo(QUERY_USES_NETWORK) failed: %08x\n", hres); - ok(size == sizeof(DWORD), "size=%d\n", size); - ok(!*(DWORD*)buf, "buf=%d\n", *(DWORD*)buf); + ok(hres == S_OK, "QueryInfo(QUERY_USES_NETWORK) failed: %08lx\n", hres); + ok(size == sizeof(DWORD), "size=%ld\n", size); + ok(!*(DWORD*)buf, "buf=%ld\n", *(DWORD*)buf); memset(buf, '?', sizeof(buf)); hres = IInternetProtocolInfo_QueryInfo(protocol_info, blank_url, QUERY_USES_NETWORK, 0, buf, sizeof(buf), NULL, 0); - ok(hres == S_OK, "QueryInfo(QUERY_USES_NETWORK) failed: %08x\n", hres); - ok(!*(DWORD*)buf, "buf=%d\n", *(DWORD*)buf); + ok(hres == S_OK, "QueryInfo(QUERY_USES_NETWORK) failed: %08lx\n", hres); + ok(!*(DWORD*)buf, "buf=%ld\n", *(DWORD*)buf); hres = IInternetProtocolInfo_QueryInfo(protocol_info, blank_url, QUERY_USES_NETWORK, 0, buf, 3, &size, 0); - ok(hres == E_FAIL, "QueryInfo(QUERY_USES_NETWORK) failed: %08x, expected E_FAIL\n", hres); + ok(hres == E_FAIL, "QueryInfo(QUERY_USES_NETWORK) failed: %08lx, expected E_FAIL\n", hres); size = 0xdeadbeef; memset(buf, '?', sizeof(buf)); hres = IInternetProtocolInfo_QueryInfo(protocol_info, NULL, QUERY_USES_NETWORK, 0, buf, sizeof(buf), &size, 0); - ok(hres == S_OK, "QueryInfo(QUERY_USES_NETWORK) failed: %08x\n", hres); - ok(size == sizeof(DWORD), "size=%d\n", size); - ok(!*(DWORD*)buf, "buf=%d\n", *(DWORD*)buf); + ok(hres == S_OK, "QueryInfo(QUERY_USES_NETWORK) failed: %08lx\n", hres); + ok(size == sizeof(DWORD), "size=%ld\n", size); + ok(!*(DWORD*)buf, "buf=%ld\n", *(DWORD*)buf); hres = IInternetProtocolInfo_QueryInfo(protocol_info, blank_url, QUERY_USES_NETWORK, 0, NULL, sizeof(buf), &size, 0); - ok(hres == E_FAIL, "QueryInfo(QUERY_USES_NETWORK) failed: %08x, expected E_FAIL\n", hres); + ok(hres == E_FAIL, "QueryInfo(QUERY_USES_NETWORK) failed: %08lx, expected E_FAIL\n", hres); hres = IInternetProtocolInfo_QueryInfo(protocol_info, blank_url, 60, 0, NULL, sizeof(buf), &size, 0); ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, - "QueryInfo failed: %08x, expected INET_E_USE_DEFAULT_PROTOCOLHANDLER\n", hres); + "QueryInfo failed: %08lx, expected INET_E_USE_DEFAULT_PROTOCOLHANDLER\n", hres); IInternetProtocolInfo_Release(protocol_info); } @@ -542,14 +542,14 @@ static void test_res_protocol(void) BYTE buf[512]; ULONG cb; hres = IClassFactory_CreateInstance(factory, NULL, &IID_IInternetProtocol, (void**)&protocol); - ok(hres == S_OK, "Could not get IInternetProtocol: %08x\n", hres); + ok(hres == S_OK, "Could not get IInternetProtocol: %08lx\n", hres); if(SUCCEEDED(hres)) { IInternetPriority *priority; hres = IInternetProtocol_QueryInterface(protocol, &IID_IInternetPriority, (void**)&priority); ok(hres == E_NOINTERFACE, - "QueryInterface(IInternetPriority) returned %08x, expected E_NOINTEFACE\n", hres); + "QueryInterface(IInternetPriority) returned %08lx, expected E_NOINTEFACE\n", hres); test_protocol_fail(protocol, wrong_url1, E_INVALIDARG, FALSE); test_protocol_fail(protocol, wrong_url2, @@ -559,58 +559,58 @@ static void test_res_protocol(void) cb = 0xdeadbeef; hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &cb); - ok(hres == E_FAIL, "Read returned %08x expected E_FAIL\n", hres); - ok(cb == 0xdeadbeef, "cb=%u expected 0xdeadbeef\n", cb); + ok(hres == E_FAIL, "Read returned %08lx expected E_FAIL\n", hres); + ok(cb == 0xdeadbeef, "cb=%lu expected 0xdeadbeef\n", cb); protocol_start(protocol, blank_url); hres = IInternetProtocol_Read(protocol, buf, 2, &cb); - ok(hres == S_OK, "Read failed: %08x\n", hres); - ok(cb == 2, "cb=%u expected 2\n", cb); + ok(hres == S_OK, "Read failed: %08lx\n", hres); + ok(cb == 2, "cb=%lu expected 2\n", cb); hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &cb); - ok(hres == S_OK, "Read failed: %08x\n", hres); + ok(hres == S_OK, "Read failed: %08lx\n", hres); hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &cb); - ok(hres == S_FALSE, "Read failed: %08x expected S_FALSE\n", hres); - ok(cb == 0, "cb=%u expected 0\n", cb); + ok(hres == S_FALSE, "Read failed: %08lx expected S_FALSE\n", hres); + ok(cb == 0, "cb=%lu expected 0\n", cb); hres = IInternetProtocol_UnlockRequest(protocol); - ok(hres == S_OK, "UnlockRequest failed: %08x\n", hres); + ok(hres == S_OK, "UnlockRequest failed: %08lx\n", hres); protocol_start(protocol, blank_url); hres = IInternetProtocol_Read(protocol, buf, 2, &cb); - ok(hres == S_OK, "Read failed: %08x\n", hres); + ok(hres == S_OK, "Read failed: %08lx\n", hres); hres = IInternetProtocol_LockRequest(protocol, 0); - ok(hres == S_OK, "LockRequest failed: %08x\n", hres); + ok(hres == S_OK, "LockRequest failed: %08lx\n", hres); hres = IInternetProtocol_UnlockRequest(protocol); - ok(hres == S_OK, "UnlockRequest failed: %08x\n", hres); + ok(hres == S_OK, "UnlockRequest failed: %08lx\n", hres); hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &cb); - ok(hres == S_OK, "Read failed: %08x\n", hres); + ok(hres == S_OK, "Read failed: %08lx\n", hres); protocol_start(protocol, blank_url); hres = IInternetProtocol_LockRequest(protocol, 0); - ok(hres == S_OK, "LockRequest failed: %08x\n", hres); + ok(hres == S_OK, "LockRequest failed: %08lx\n", hres); hres = IInternetProtocol_Terminate(protocol, 0); - ok(hres == S_OK, "Terminate failed: %08x\n", hres); + ok(hres == S_OK, "Terminate failed: %08lx\n", hres); hres = IInternetProtocol_Read(protocol, buf, 2, &cb); - ok(hres == S_OK, "Read failed: %08x\n\n", hres); + ok(hres == S_OK, "Read failed: %08lx\n\n", hres); hres = IInternetProtocol_UnlockRequest(protocol); - ok(hres == S_OK, "UnlockRequest failed: %08x\n", hres); + ok(hres == S_OK, "UnlockRequest failed: %08lx\n", hres); hres = IInternetProtocol_Read(protocol, buf, 2, &cb); - ok(hres == S_OK, "Read failed: %08x\n", hres); + ok(hres == S_OK, "Read failed: %08lx\n", hres); hres = IInternetProtocol_Terminate(protocol, 0); - ok(hres == S_OK, "Terminate failed: %08x\n", hres); + ok(hres == S_OK, "Terminate failed: %08lx\n", hres); hres = IInternetProtocol_Read(protocol, buf, 2, &cb); - ok(hres == S_OK, "Read failed: %08x\n", hres); - ok(cb == 2, "cb=%u expected 2\n", cb); + ok(hres == S_OK, "Read failed: %08lx\n", hres); + ok(cb == 2, "cb=%lu expected 2\n", cb); protocol_start(protocol, blank_url); hres = IInternetProtocol_LockRequest(protocol, 0); - ok(hres == S_OK, "LockRequest failed: %08x\n", hres); + ok(hres == S_OK, "LockRequest failed: %08lx\n", hres); hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &cb); - ok(hres == S_OK, "Read failed: %08x\n", hres); + ok(hres == S_OK, "Read failed: %08lx\n", hres); protocol_start(protocol, blank_url); hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &cb); - ok(hres == S_OK, "Read failed: %08x\n", hres); + ok(hres == S_OK, "Read failed: %08lx\n", hres); hres = IInternetProtocol_Terminate(protocol, 0); - ok(hres == S_OK, "Terminate failed: %08x\n", hres); + ok(hres == S_OK, "Terminate failed: %08lx\n", hres); IInternetProtocol_Release(protocol); } @@ -665,43 +665,43 @@ static void do_test_about_protocol(IClassFactory *factory, DWORD bf) bindf = bf; hres = IClassFactory_CreateInstance(factory, NULL, &IID_IInternetProtocol, (void**)&protocol); - ok(hres == S_OK, "Could not get IInternetProtocol: %08x\n", hres); + ok(hres == S_OK, "Could not get IInternetProtocol: %08lx\n", hres); if(FAILED(hres)) return; hres = IInternetProtocol_QueryInterface(protocol, &IID_IInternetPriority, (void**)&priority); ok(hres == E_NOINTERFACE, - "QueryInterface(IInternetPriority) returned %08x, expected E_NOINTEFACE\n", hres); + "QueryInterface(IInternetPriority) returned %08lx, expected E_NOINTEFACE\n", hres); protocol_start(protocol, about_blank_url); hres = IInternetProtocol_LockRequest(protocol, 0); - ok(hres == S_OK, "LockRequest failed: %08x\n", hres); + ok(hres == S_OK, "LockRequest failed: %08lx\n", hres); hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &cb); - ok(hres == S_OK, "Read failed: %08x\n", hres); - ok(cb == sizeof(blank_html), "cb=%d\n", cb); + ok(hres == S_OK, "Read failed: %08lx\n", hres); + ok(cb == sizeof(blank_html), "cb=%ld\n", cb); ok(!memcmp(buf, blank_html, cb), "Read wrong data\n"); hres = IInternetProtocol_UnlockRequest(protocol); - ok(hres == S_OK, "UnlockRequest failed: %08x\n", hres); + ok(hres == S_OK, "UnlockRequest failed: %08lx\n", hres); protocol_start(protocol, about_test_url); hres = IInternetProtocol_LockRequest(protocol, 0); - ok(hres == S_OK, "LockRequest failed: %08x\n", hres); + ok(hres == S_OK, "LockRequest failed: %08lx\n", hres); hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &cb); - ok(hres == S_OK, "Read failed: %08x\n", hres); - ok(cb == sizeof(test_html), "cb=%d\n", cb); + ok(hres == S_OK, "Read failed: %08lx\n", hres); + ok(cb == sizeof(test_html), "cb=%ld\n", cb); ok(!memcmp(buf, test_html, cb), "Read wrong data\n"); hres = IInternetProtocol_UnlockRequest(protocol); - ok(hres == S_OK, "UnlockRequest failed: %08x\n", hres); + ok(hres == S_OK, "UnlockRequest failed: %08lx\n", hres); protocol_start(protocol, about_res_url); hres = IInternetProtocol_LockRequest(protocol, 0); - ok(hres == S_OK, "LockRequest failed: %08x\n", hres); + ok(hres == S_OK, "LockRequest failed: %08lx\n", hres); hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &cb); - ok(hres == S_OK, "Read failed: %08x\n", hres); - ok(cb == sizeof(blank_html), "cb=%d\n", cb); + ok(hres == S_OK, "Read failed: %08lx\n", hres); + ok(cb == sizeof(blank_html), "cb=%ld\n", cb); ok(!memcmp(buf, blank_html, cb), "Read wrong data\n"); hres = IInternetProtocol_UnlockRequest(protocol); - ok(hres == S_OK, "UnlockRequest failed: %08x\n", hres); + ok(hres == S_OK, "UnlockRequest failed: %08lx\n", hres); IInternetProtocol_Release(protocol); } @@ -714,12 +714,12 @@ static void test_about_protocol(void) HRESULT hres; hres = CoGetClassObject(&CLSID_AboutProtocol, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&unk); - ok(hres == S_OK, "CoGetClassObject failed: %08x\n", hres); + ok(hres == S_OK, "CoGetClassObject failed: %08lx\n", hres); if(FAILED(hres)) return; hres = IUnknown_QueryInterface(unk, &IID_IInternetProtocolInfo, (void**)&protocol_info); - ok(hres == S_OK, "Could not get IInternetProtocolInfo interface: %08x\n", hres); + ok(hres == S_OK, "Could not get IInternetProtocolInfo interface: %08lx\n", hres); if(SUCCEEDED(hres)) { WCHAR buf[128]; DWORD size; @@ -730,37 +730,37 @@ static void test_about_protocol(void) hres = IInternetProtocolInfo_ParseUrl(protocol_info, about_blank_url, i, 0, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == INET_E_DEFAULT_ACTION, - "[%d] failed: %08x, expected INET_E_DEFAULT_ACTION\n", i, hres); + "[%d] failed: %08lx, expected INET_E_DEFAULT_ACTION\n", i, hres); } } hres = IInternetProtocolInfo_ParseUrl(protocol_info, about_blank_url, PARSE_SECURITY_URL, 0, buf, ARRAY_SIZE(buf), &size, 0); - ok(hres == S_OK, "ParseUrl failed: %08x\n", hres); + ok(hres == S_OK, "ParseUrl failed: %08lx\n", hres); ok(!lstrcmpW(about_blank_url, buf), "buf != blank_url\n"); size = 0xdeadbeef; hres = IInternetProtocolInfo_ParseUrl(protocol_info, about_blank_url, PARSE_SECURITY_URL, 0, buf, 3, &size, 0); - ok(hres == S_FALSE, "ParseUrl failed: %08x, expected S_FALSE\n", hres); - ok(size == 12, "size = %d\n", size); + ok(hres == S_FALSE, "ParseUrl failed: %08lx, expected S_FALSE\n", hres); + ok(size == 12, "size = %ld\n", size); hres = IInternetProtocolInfo_ParseUrl(protocol_info, about_test_url, PARSE_SECURITY_URL, 0, buf, ARRAY_SIZE(buf), &size, 0); - ok(hres == S_OK, "ParseUrl failed: %08x\n", hres); + ok(hres == S_OK, "ParseUrl failed: %08lx\n", hres); ok(!lstrcmpW(about_test_url, buf), "buf != test_url\n"); - ok(size == 11, "size = %d\n", size); + ok(size == 11, "size = %ld\n", size); size = 0xdeadbeef; buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, about_blank_url, PARSE_DOMAIN, 0, buf, ARRAY_SIZE(buf), &size, 0); - ok(hres == S_OK || hres == E_FAIL, "ParseUrl failed: %08x\n", hres); + ok(hres == S_OK || hres == E_FAIL, "ParseUrl failed: %08lx\n", hres); ok(buf[0] == '?' || buf[0] == '\0' /* Win10 */, "Expected buf to be unchanged or empty, got %s\n", wine_dbgstr_w(buf)); ok(size == ARRAY_SIZE(about_blank_url) || size == ARRAY_SIZE(buf), /* IE8 */ - "size=%d\n", size); + "size=%ld\n", size); if (0) { @@ -769,51 +769,51 @@ static void test_about_protocol(void) buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, NULL, PARSE_DOMAIN, 0, buf, ARRAY_SIZE(buf), &size, 0); - ok(hres == E_FAIL, "ParseUrl failed: %08x\n", hres); + ok(hres == E_FAIL, "ParseUrl failed: %08lx\n", hres); ok(buf[0] == '?', "buf changed\n"); - ok(size == 1, "size=%u, expected 1\n", size); + ok(size == 1, "size=%lu, expected 1\n", size); buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, about_blank_url, PARSE_DOMAIN, 0, buf, ARRAY_SIZE(buf), NULL, 0); - ok(hres == E_POINTER, "ParseUrl failed: %08x\n", hres); + ok(hres == E_POINTER, "ParseUrl failed: %08lx\n", hres); ok(buf[0] == '?', "buf changed\n"); buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, NULL, PARSE_DOMAIN, 0, buf, ARRAY_SIZE(buf), NULL, 0); - ok(hres == E_POINTER, "ParseUrl failed: %08x\n", hres); + ok(hres == E_POINTER, "ParseUrl failed: %08lx\n", hres); ok(buf[0] == '?', "buf changed\n"); } hres = IInternetProtocolInfo_ParseUrl(protocol_info, about_blank_url, PARSE_UNESCAPE+1, 0, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == INET_E_DEFAULT_ACTION, - "ParseUrl failed: %08x, expected INET_E_DEFAULT_ACTION\n", hres); + "ParseUrl failed: %08lx, expected INET_E_DEFAULT_ACTION\n", hres); size = 0xdeadbeef; hres = IInternetProtocolInfo_CombineUrl(protocol_info, about_blank_url, about_test_url, 0, buf, ARRAY_SIZE(buf), &size, 0); - ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08x\n", hres); - ok(size == 0xdeadbeef, "size=%d\n", size); + ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08lx\n", hres); + ok(size == 0xdeadbeef, "size=%ld\n", size); size = 0xdeadbeef; hres = IInternetProtocolInfo_CombineUrl(protocol_info, about_blank_url, about_test_url, URL_FILE_USE_PATHURL, buf, ARRAY_SIZE(buf), &size, 0); - ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08x\n", hres); - ok(size == 0xdeadbeef, "size=%d\n", size); + ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08lx\n", hres); + ok(size == 0xdeadbeef, "size=%ld\n", size); size = 0xdeadbeef; hres = IInternetProtocolInfo_CombineUrl(protocol_info, NULL, NULL, URL_FILE_USE_PATHURL, buf, ARRAY_SIZE(buf), &size, 0); - ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08x\n", hres); - ok(size == 0xdeadbeef, "size=%d\n", size); + ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08lx\n", hres); + ok(size == 0xdeadbeef, "size=%ld\n", size); hres = IInternetProtocolInfo_CompareUrl(protocol_info, about_blank_url, about_blank_url, 0); - ok(hres == E_NOTIMPL, "CompareUrl failed: %08x\n", hres); + ok(hres == E_NOTIMPL, "CompareUrl failed: %08lx\n", hres); hres = IInternetProtocolInfo_CompareUrl(protocol_info, NULL, NULL, 0xdeadbeef); - ok(hres == E_NOTIMPL, "CompareUrl failed: %08x\n", hres); + ok(hres == E_NOTIMPL, "CompareUrl failed: %08lx\n", hres); for(i=0; i<30; i++) { switch(i) { @@ -830,7 +830,7 @@ static void test_about_protocol(void) default: hres = IInternetProtocolInfo_QueryInfo(protocol_info, about_blank_url, i, 0, buf, sizeof(buf), &size, 0); - ok(hres == E_FAIL, "QueryInfo(%d) returned: %08x, expected E_FAIL\n", i, hres); + ok(hres == E_FAIL, "QueryInfo(%d) returned: %08lx, expected E_FAIL\n", i, hres); } } @@ -838,33 +838,33 @@ static void test_about_protocol(void) buf, sizeof(buf), &size, 0); ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER || hres == E_FAIL, /* win2k */ - "QueryInfo returned: %08x, expected INET_E_USE_DEFAULT_PROTOCOLHANDLER or E_FAIL\n", hres); + "QueryInfo returned: %08lx, expected INET_E_USE_DEFAULT_PROTOCOLHANDLER or E_FAIL\n", hres); size = 0xdeadbeef; memset(buf, '?', sizeof(buf)); hres = IInternetProtocolInfo_QueryInfo(protocol_info, about_blank_url, QUERY_USES_NETWORK, 0, buf, sizeof(buf), &size, 0); - ok(hres == S_OK, "QueryInfo(QUERY_USES_NETWORK) failed: %08x\n", hres); - ok(size == sizeof(DWORD), "size=%d\n", size); - ok(!*(DWORD*)buf, "buf=%d\n", *(DWORD*)buf); + ok(hres == S_OK, "QueryInfo(QUERY_USES_NETWORK) failed: %08lx\n", hres); + ok(size == sizeof(DWORD), "size=%ld\n", size); + ok(!*(DWORD*)buf, "buf=%ld\n", *(DWORD*)buf); memset(buf, '?', sizeof(buf)); hres = IInternetProtocolInfo_QueryInfo(protocol_info, about_blank_url, QUERY_USES_NETWORK, 0, buf, sizeof(buf), NULL, 0); - ok(hres == S_OK, "QueryInfo(QUERY_USES_NETWORK) failed: %08x\n", hres); - ok(!*(DWORD*)buf, "buf=%d\n", *(DWORD*)buf); + ok(hres == S_OK, "QueryInfo(QUERY_USES_NETWORK) failed: %08lx\n", hres); + ok(!*(DWORD*)buf, "buf=%ld\n", *(DWORD*)buf); hres = IInternetProtocolInfo_QueryInfo(protocol_info, about_blank_url, QUERY_USES_NETWORK, 0, buf, 3, &size, 0); - ok(hres == E_FAIL, "QueryInfo(QUERY_USES_NETWORK) failed: %08x, expected E_FAIL\n", hres); + ok(hres == E_FAIL, "QueryInfo(QUERY_USES_NETWORK) failed: %08lx, expected E_FAIL\n", hres); hres = IInternetProtocolInfo_QueryInfo(protocol_info, about_blank_url, QUERY_USES_NETWORK, 0, NULL, sizeof(buf), &size, 0); - ok(hres == E_FAIL, "QueryInfo(QUERY_USES_NETWORK) failed: %08x, expected E_FAIL\n", hres); + ok(hres == E_FAIL, "QueryInfo(QUERY_USES_NETWORK) failed: %08lx, expected E_FAIL\n", hres); hres = IInternetProtocolInfo_QueryInfo(protocol_info, about_blank_url, 60, 0, NULL, sizeof(buf), &size, 0); - ok(hres == E_FAIL, "QueryInfo failed: %08x, expected E_FAIL\n", hres); + ok(hres == E_FAIL, "QueryInfo failed: %08lx, expected E_FAIL\n", hres); IInternetProtocolInfo_Release(protocol_info); } @@ -890,12 +890,12 @@ static void test_javascript_protocol(void) HRESULT hres; hres = CoGetClassObject(&CLSID_JSProtocol, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&unk); - ok(hres == S_OK, "CoGetClassObject failed: %08x\n", hres); + ok(hres == S_OK, "CoGetClassObject failed: %08lx\n", hres); if(FAILED(hres)) return; hres = IUnknown_QueryInterface(unk, &IID_IInternetProtocolInfo, (void**)&protocol_info); - ok(hres == S_OK, "Could not get IInternetProtocolInfo interface: %08x\n", hres); + ok(hres == S_OK, "Could not get IInternetProtocolInfo interface: %08lx\n", hres); if(SUCCEEDED(hres)) { WCHAR buf[128]; DWORD size; @@ -906,23 +906,23 @@ static void test_javascript_protocol(void) hres = IInternetProtocolInfo_ParseUrl(protocol_info, javascript_test_url, i, 0, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == INET_E_DEFAULT_ACTION, - "[%d] failed: %08x, expected INET_E_DEFAULT_ACTION\n", i, hres); + "[%d] failed: %08lx, expected INET_E_DEFAULT_ACTION\n", i, hres); } } hres = IInternetProtocolInfo_ParseUrl(protocol_info, javascript_test_url, PARSE_UNESCAPE+1, 0, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == INET_E_DEFAULT_ACTION, - "ParseUrl failed: %08x, expected INET_E_DEFAULT_ACTION\n", hres); + "ParseUrl failed: %08lx, expected INET_E_DEFAULT_ACTION\n", hres); size = 0xdeadbeef; hres = IInternetProtocolInfo_CombineUrl(protocol_info, javascript_test_url, javascript_test_url, 0, buf, ARRAY_SIZE(buf), &size, 0); - ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08x\n", hres); - ok(size == 0xdeadbeef, "size=%d\n", size); + ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08lx\n", hres); + ok(size == 0xdeadbeef, "size=%ld\n", size); hres = IInternetProtocolInfo_CompareUrl(protocol_info, javascript_test_url, javascript_test_url, 0); - ok(hres == E_NOTIMPL, "CompareUrl failed: %08x\n", hres); + ok(hres == E_NOTIMPL, "CompareUrl failed: %08lx\n", hres); for(i=0; i<30; i++) { switch(i) { @@ -933,7 +933,7 @@ static void test_javascript_protocol(void) hres = IInternetProtocolInfo_QueryInfo(protocol_info, javascript_test_url, i, 0, buf, sizeof(buf), &size, 0); ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, - "QueryInfo(%d) returned: %08x, expected INET_E_USE_DEFAULT_PROTOCOLHANDLER\n", i, hres); + "QueryInfo(%d) returned: %08lx, expected INET_E_USE_DEFAULT_PROTOCOLHANDLER\n", i, hres); } } @@ -941,28 +941,28 @@ static void test_javascript_protocol(void) memset(buf, '?', sizeof(buf)); hres = IInternetProtocolInfo_QueryInfo(protocol_info, javascript_test_url, QUERY_USES_NETWORK, 0, buf, sizeof(buf), &size, 0); - ok(hres == S_OK, "QueryInfo(QUERY_USES_NETWORK) failed: %08x\n", hres); - ok(size == sizeof(DWORD), "size=%d\n", size); - ok(!*(DWORD*)buf, "buf=%d\n", *(DWORD*)buf); + ok(hres == S_OK, "QueryInfo(QUERY_USES_NETWORK) failed: %08lx\n", hres); + ok(size == sizeof(DWORD), "size=%ld\n", size); + ok(!*(DWORD*)buf, "buf=%ld\n", *(DWORD*)buf); memset(buf, '?', sizeof(buf)); hres = IInternetProtocolInfo_QueryInfo(protocol_info, javascript_test_url, QUERY_USES_NETWORK, 0, buf, sizeof(buf), NULL, 0); - ok(hres == S_OK, "QueryInfo(QUERY_USES_NETWORK) failed: %08x\n", hres); - ok(!*(DWORD*)buf, "buf=%d\n", *(DWORD*)buf); + ok(hres == S_OK, "QueryInfo(QUERY_USES_NETWORK) failed: %08lx\n", hres); + ok(!*(DWORD*)buf, "buf=%ld\n", *(DWORD*)buf); hres = IInternetProtocolInfo_QueryInfo(protocol_info, javascript_test_url, QUERY_USES_NETWORK, 0, buf, 3, &size, 0); - ok(hres == E_FAIL, "QueryInfo(QUERY_USES_NETWORK) failed: %08x, expected E_FAIL\n", hres); + ok(hres == E_FAIL, "QueryInfo(QUERY_USES_NETWORK) failed: %08lx, expected E_FAIL\n", hres); hres = IInternetProtocolInfo_QueryInfo(protocol_info, javascript_test_url, QUERY_USES_NETWORK, 0, NULL, sizeof(buf), &size, 0); - ok(hres == E_FAIL, "QueryInfo(QUERY_USES_NETWORK) failed: %08x, expected E_FAIL\n", hres); + ok(hres == E_FAIL, "QueryInfo(QUERY_USES_NETWORK) failed: %08lx, expected E_FAIL\n", hres); hres = IInternetProtocolInfo_QueryInfo(protocol_info, javascript_test_url, 60, 0, NULL, sizeof(buf), &size, 0); ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, - "QueryInfo failed: %08x, expected INET_E_USE_DEFAULT_PROTOCOLHANDLER\n", hres); + "QueryInfo failed: %08lx, expected INET_E_USE_DEFAULT_PROTOCOLHANDLER\n", hres); /* FIXME: test QUERY_IS_SECURE */ @@ -1014,18 +1014,18 @@ static void test_com_aggregation(const CLSID *clsid) HRESULT hres; hres = CoGetClassObject(clsid, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void**)&class_factory); - ok(hres == S_OK, "CoGetClassObject failed: %08x\n", hres); + ok(hres == S_OK, "CoGetClassObject failed: %08lx\n", hres); hres = IClassFactory_CreateInstance(class_factory, &outer, &IID_IUnknown, (void**)&unk); - ok(hres == S_OK, "CreateInstance returned: %08x\n", hres); + ok(hres == S_OK, "CreateInstance returned: %08lx\n", hres); hres = IUnknown_QueryInterface(unk, &IID_IInternetProtocol, (void**)&unk2); - ok(hres == S_OK, "Could not get IDispatch iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IDispatch iface: %08lx\n", hres); SET_EXPECT(outer_QI_test); hres = IUnknown_QueryInterface(unk2, &outer_test_iid, (void**)&unk3); CHECK_CALLED(outer_QI_test); - ok(hres == S_OK, "Could not get IInternetProtocol iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IInternetProtocol iface: %08lx\n", hres); ok(unk3 == (IUnknown*)0xdeadbeef, "unexpected unk2\n"); IUnknown_Release(unk2); @@ -1033,7 +1033,7 @@ static void test_com_aggregation(const CLSID *clsid) unk = (void*)0xdeadbeef; hres = IClassFactory_CreateInstance(class_factory, &outer, &IID_IInternetProtocol, (void**)&unk); - ok(hres == E_INVALIDARG, "CreateInstance returned: %08x\n", hres); + ok(hres == E_INVALIDARG, "CreateInstance returned: %08lx\n", hres); ok(!unk, "unk = %p\n", unk); IClassFactory_Release(class_factory); diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index e95cea4307c..de42e899635 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -224,7 +224,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D static const WCHAR completeW[] = {'c','o','m','p','l','e','t','e',0}; hres = IHTMLDocument2_get_readyState(notif_doc, &state); - ok(hres == S_OK, "get_readyState failed: %08x\n", hres); + ok(hres == S_OK, "get_readyState failed: %08lx\n", hres); if(!lstrcmpW(state, completeW)) doc_complete = TRUE; @@ -276,8 +276,8 @@ static HRESULT WINAPI VariantChangeType_ChangeType(IVariantChangeType *iface, VA ok(V_VT(dst) == VT_EMPTY, "V_VT(dst) = %d\n", V_VT(dst)); ok(src != NULL, "src = NULL\n"); ok(V_VT(src) == VT_I4, "V_VT(src) = %d\n", V_VT(src)); - ok(V_I4(src) == 0xf0f0f0, "V_I4(src) = %x\n", V_I4(src)); - ok(lcid == LOCALE_NEUTRAL, "lcid = %d\n", lcid); + ok(V_I4(src) == 0xf0f0f0, "V_I4(src) = %lx\n", V_I4(src)); + ok(lcid == LOCALE_NEUTRAL, "lcid = %ld\n", lcid); ok(vt == VT_BSTR, "vt = %d\n", vt); V_VT(dst) = VT_BSTR; @@ -401,7 +401,7 @@ static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) { - ok(0, "unexpected call %s %x\n", wine_dbgstr_w(bstrName), grfdex); + ok(0, "unexpected call %s %lx\n", wine_dbgstr_w(bstrName), grfdex); return E_NOTIMPL; } @@ -446,13 +446,13 @@ static HRESULT WINAPI funcDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid { CHECK_EXPECT(funcDisp); - ok(id == DISPID_VALUE, "id = %d\n", id); - ok(lcid == 0, "lcid = %x\n", lcid); + ok(id == DISPID_VALUE, "id = %ld\n", id); + ok(lcid == 0, "lcid = %lx\n", lcid); ok(wFlags == DISPATCH_METHOD, "wFlags = %x\n", wFlags); ok(pdp != NULL, "pdp == NULL\n"); ok(pdp->cArgs == 2, "pdp->cArgs = %d\n", pdp->cArgs); ok(pdp->cNamedArgs == 1, "pdp->cNamedArgs = %d\n", pdp->cNamedArgs); - ok(pdp->rgdispidNamedArgs[0] == DISPID_THIS, "pdp->rgdispidNamedArgs[0] = %d\n", pdp->rgdispidNamedArgs[0]); + ok(pdp->rgdispidNamedArgs[0] == DISPID_THIS, "pdp->rgdispidNamedArgs[0] = %ld\n", pdp->rgdispidNamedArgs[0]); ok(V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(rgvarg) = %d\n", V_VT(pdp->rgvarg)); ok(V_VT(pdp->rgvarg+1) == VT_BOOL, "V_VT(rgvarg[1]) = %d\n", V_VT(pdp->rgvarg)); ok(V_BOOL(pdp->rgvarg+1) == VARIANT_TRUE, "V_BOOL(rgvarg[1]) = %x\n", V_BOOL(pdp->rgvarg)); @@ -489,21 +489,21 @@ static HRESULT WINAPI scriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DW { if(!lstrcmpW(bstrName, L"testProp")) { CHECK_EXPECT(script_testprop_d); - ok(grfdex == fdexNameCaseSensitive, "grfdex = %x\n", grfdex); + ok(grfdex == fdexNameCaseSensitive, "grfdex = %lx\n", grfdex); *pid = DISPID_SCRIPT_TESTPROP; return S_OK; } if(!lstrcmpW(bstrName, L"testProp2")) { CHECK_EXPECT(script_testprop2_d); - ok(grfdex == fdexNameCaseSensitive, "grfdex = %x\n", grfdex); + ok(grfdex == fdexNameCaseSensitive, "grfdex = %lx\n", grfdex); *pid = DISPID_SCRIPT_TESTPROP2; return S_OK; } if(!lstrcmpW(bstrName, L"divid")) { CHECK_EXPECT(script_divid_d); - ok(grfdex == fdexNameCaseSensitive, "grfdex = %x\n", grfdex); + ok(grfdex == fdexNameCaseSensitive, "grfdex = %lx\n", grfdex); return E_FAIL; } @@ -518,7 +518,7 @@ static HRESULT WINAPI scriptDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc case DISPID_SCRIPT_TESTPROP: CHECK_EXPECT(script_testprop_i); - ok(lcid == 0, "lcid = %x\n", lcid); + ok(lcid == 0, "lcid = %lx\n", lcid); ok(wFlags == DISPATCH_PROPERTYGET, "wFlags = %x\n", wFlags); ok(pdp != NULL, "pdp == NULL\n"); ok(pdp->cArgs == 0, "pdp->cArgs = %d\n", pdp->cArgs); @@ -1178,23 +1178,23 @@ static HRESULT WINAPI DocumentSite_ActivateMe(IOleDocumentSite *iface, IOleDocum HRESULT hres; hres = IOleDocumentView_QueryInterface(pViewToActivate, &IID_IOleDocument, (void**)&document); - ok(hres == S_OK, "could not get IOleDocument: %08x\n", hres); + ok(hres == S_OK, "could not get IOleDocument: %08lx\n", hres); hres = IOleDocument_CreateView(document, &InPlaceSite, NULL, 0, &view); IOleDocument_Release(document); - ok(hres == S_OK, "CreateView failed: %08x\n", hres); + ok(hres == S_OK, "CreateView failed: %08lx\n", hres); hres = IOleDocumentView_SetInPlaceSite(view, &InPlaceSite); - ok(hres == S_OK, "SetInPlaceSite failed: %08x\n", hres); + ok(hres == S_OK, "SetInPlaceSite failed: %08lx\n", hres); hres = IOleDocumentView_UIActivate(view, TRUE); - ok(hres == S_OK, "UIActivate failed: %08x\n", hres); + ok(hres == S_OK, "UIActivate failed: %08lx\n", hres); hres = IOleDocumentView_SetRect(view, &rect); - ok(hres == S_OK, "SetRect failed: %08x\n", hres); + ok(hres == S_OK, "SetRect failed: %08lx\n", hres); hres = IOleDocumentView_Show(view, TRUE); - ok(hres == S_OK, "Show failed: %08x\n", hres); + ok(hres == S_OK, "Show failed: %08lx\n", hres); return S_OK; } @@ -1234,7 +1234,7 @@ static IHTMLDocument2 *create_document(void) #if !defined(__i386__) && !defined(__x86_64__) todo_wine #endif - ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); + ok(hres == S_OK, "CoCreateInstance failed: %08lx\n", hres); return SUCCEEDED(hres) ? doc : NULL; } @@ -1251,10 +1251,10 @@ static void load_string(IHTMLDocument2 *doc, const char *str) mem = GlobalAlloc(0, len); memcpy(mem, str, len); hres = CreateStreamOnHGlobal(mem, TRUE, &stream); - ok(hres == S_OK, "Failed to create a stream, hr %#x.\n", hres); + ok(hres == S_OK, "Failed to create a stream, hr %#lx.\n", hres); hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); - ok(hres == S_OK, "Failed to get IPersistStreamInit, hr %#x.\n", hres); + ok(hres == S_OK, "Failed to get IPersistStreamInit, hr %#lx.\n", hres); IPersistStreamInit_Load(init, stream); IPersistStreamInit_Release(init); @@ -1269,17 +1269,17 @@ static void do_advise(IHTMLDocument2 *doc, REFIID riid, IUnknown *unk_advise) HRESULT hres; hres = IHTMLDocument2_QueryInterface(doc, &IID_IConnectionPointContainer, (void**)&container); - ok(hres == S_OK, "QueryInterface(IID_IConnectionPointContainer) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IConnectionPointContainer) failed: %08lx\n", hres); hres = IConnectionPointContainer_FindConnectionPoint(container, riid, &cp); IConnectionPointContainer_Release(container); - ok(hres == S_OK, "FindConnectionPoint failed: %08x\n", hres); + ok(hres == S_OK, "FindConnectionPoint failed: %08lx\n", hres); notif_doc = doc; hres = IConnectionPoint_Advise(cp, unk_advise, &cookie); IConnectionPoint_Release(cp); - ok(hres == S_OK, "Advise failed: %08x\n", hres); + ok(hres == S_OK, "Advise failed: %08lx\n", hres); } static void set_client_site(IHTMLDocument2 *doc, BOOL set) @@ -1296,19 +1296,19 @@ static void set_client_site(IHTMLDocument2 *doc, BOOL set) } hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); - ok(hres == S_OK, "Could not et IOleObject: %08x\n", hres); + ok(hres == S_OK, "Could not et IOleObject: %08lx\n", hres); hres = IOleObject_SetClientSite(oleobj, set ? &ClientSite : NULL); - ok(hres == S_OK, "SetClientSite failed: %08x\n", hres); + ok(hres == S_OK, "SetClientSite failed: %08lx\n", hres); if(set) { IHlinkTarget *hlink; hres = IOleObject_QueryInterface(oleobj, &IID_IHlinkTarget, (void**)&hlink); - ok(hres == S_OK, "Could not get IHlinkTarget iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHlinkTarget iface: %08lx\n", hres); hres = IHlinkTarget_Navigate(hlink, 0, NULL); - ok(hres == S_OK, "Navgate failed: %08x\n", hres); + ok(hres == S_OK, "Navgate failed: %08lx\n", hres); IHlinkTarget_Release(hlink); } @@ -1336,13 +1336,13 @@ static void load_doc(IHTMLDocument2 *doc, const char *str) } hres = IHTMLDocument2_get_body(doc, &body); - ok(hres == S_OK, "get_body failed: %08x\n", hres); + ok(hres == S_OK, "get_body failed: %08lx\n", hres); /* Check we can query for function on the IHTMLElementBody interface */ name = (WCHAR*)ucPtr; hres = IHTMLElement_GetIDsOfNames(body, &IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &dispID); - ok(hres == S_OK, "GetIDsOfNames(background) failed %08x\n", hres); - ok(dispID == DISPID_IHTMLBODYELEMENT_BACKGROUND, "Incorrect dispID got (%d)\n", dispID); + ok(hres == S_OK, "GetIDsOfNames(background) failed %08lx\n", hres); + ok(dispID == DISPID_IHTMLBODYELEMENT_BACKGROUND, "Incorrect dispID got (%ld)\n", dispID); IHTMLElement_Release(body); } @@ -1387,9 +1387,9 @@ static HRESULT WINAPI ObjectSafety_SetInterfaceSafetyOptions(IObjectSafety *ifac ok(IsEqualGUID(&IID_IActiveScriptParse, riid), "unexpected riid %s\n", wine_dbgstr_guid(riid)); ok(dwOptionSetMask == (INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER), - "dwOptionSetMask=%x\n", dwOptionSetMask); + "dwOptionSetMask=%lx\n", dwOptionSetMask); ok(dwEnabledOptions == (INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER), - "dwEnabledOptions=%x\n", dwOptionSetMask); + "dwEnabledOptions=%lx\n", dwOptionSetMask); return S_OK; } @@ -1454,10 +1454,10 @@ static HRESULT WINAPI AXObjectSafety_SetInterfaceSafetyOptions(IObjectSafety *if CHECK_EXPECT(AXSetInterfaceSafetyOptions_IDispatchEx_caller); break; default: - ok(0, "unexpected dwEnabledOptions %x\n", dwEnabledOptions); + ok(0, "unexpected dwEnabledOptions %lx\n", dwEnabledOptions); } - ok(dwOptionSetMask == dwEnabledOptions, "dwOptionSetMask=%x, expected %x\n", dwOptionSetMask, dwEnabledOptions); + ok(dwOptionSetMask == dwEnabledOptions, "dwOptionSetMask=%lx, expected %lx\n", dwOptionSetMask, dwEnabledOptions); return ax_setopt_dispex_hres; } @@ -1474,10 +1474,10 @@ static HRESULT WINAPI AXObjectSafety_SetInterfaceSafetyOptions(IObjectSafety *if hres = ax_setopt_disp_data_hres; break; default: - ok(0, "unexpected dwEnabledOptions %x\n", dwEnabledOptions); + ok(0, "unexpected dwEnabledOptions %lx\n", dwEnabledOptions); hres = E_FAIL; } - ok(dwOptionSetMask == dwEnabledOptions, "dwOptionSetMask=%x, expected %x\n", dwOptionSetMask, dwEnabledOptions); + ok(dwOptionSetMask == dwEnabledOptions, "dwOptionSetMask=%lx, expected %lx\n", dwOptionSetMask, dwEnabledOptions); return hres; } @@ -1506,9 +1506,9 @@ static BOOL set_safe_reg(BOOL safe_call, BOOL safe_data) #define check_custom_policy(a,b,c,d) _check_custom_policy(__LINE__,a,b,c,d) static void _check_custom_policy(unsigned line, HRESULT hres, BYTE *ppolicy, DWORD policy_size, DWORD expolicy) { - ok_(__FILE__,line)(hres == S_OK, "QueryCusromPolicy failed: %08x\n", hres); - ok_(__FILE__,line)(policy_size == sizeof(DWORD), "policy_size = %d\n", policy_size); - ok_(__FILE__,line)(*(DWORD*)ppolicy == expolicy, "policy = %x, expected %x\n", *(DWORD*)ppolicy, expolicy); + ok_(__FILE__,line)(hres == S_OK, "QueryCusromPolicy failed: %08lx\n", hres); + ok_(__FILE__,line)(policy_size == sizeof(DWORD), "policy_size = %ld\n", policy_size); + ok_(__FILE__,line)(*(DWORD*)ppolicy == expolicy, "policy = %lx, expected %lx\n", *(DWORD*)ppolicy, expolicy); CoTaskMemFree(ppolicy); } @@ -1584,17 +1584,17 @@ static void test_security(void) HRESULT hres; hres = IActiveScriptSite_QueryInterface(site, &IID_IServiceProvider, (void**)&sp); - ok(hres == S_OK, "Could not get IServiceProvider iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IServiceProvider iface: %08lx\n", hres); hres = IServiceProvider_QueryService(sp, &SID_SInternetHostSecurityManager, &IID_IInternetHostSecurityManager, (void**)&sec_mgr); IServiceProvider_Release(sp); - ok(hres == S_OK, "QueryService failed: %08x\n", hres); + ok(hres == S_OK, "QueryService failed: %08lx\n", hres); hres = IInternetHostSecurityManager_ProcessUrlAction(sec_mgr, URLACTION_ACTIVEX_RUN, (BYTE*)&policy, sizeof(policy), (BYTE*)&CLSID_TestActiveX, sizeof(CLSID), 0, 0); - ok(hres == S_OK, "ProcessUrlAction failed: %08x\n", hres); - ok(policy == URLPOLICY_ALLOW, "policy = %x\n", policy); + ok(hres == S_OK, "ProcessUrlAction failed: %08lx\n", hres); + ok(policy == URLPOLICY_ALLOW, "policy = %lx\n", policy); cs.clsid = CLSID_TestActiveX; cs.pUnk = (IUnknown*)&AXObjectSafety; @@ -1803,7 +1803,7 @@ static HRESULT WINAPI ActiveScriptProperty_SetProperty(IActiveScriptProperty *if case SCRIPTPROP_INVOKEVERSIONING: CHECK_EXPECT(SetProperty_INVOKEVERSIONING); ok(V_VT(pvarValue) == VT_I4, "V_VT(pvarValue)=%d\n", V_VT(pvarValue)); - ok(V_I4(pvarValue) == 1, "V_I4(pvarValue)=%d\n", V_I4(pvarValue)); + ok(V_I4(pvarValue) == 1, "V_I4(pvarValue)=%ld\n", V_I4(pvarValue)); break; case SCRIPTPROP_ABBREVIATE_GLOBALNAME_RESOLUTION: if(V_BOOL(pvarValue)) @@ -1815,7 +1815,7 @@ static HRESULT WINAPI ActiveScriptProperty_SetProperty(IActiveScriptProperty *if case 0x70000003: /* Undocumented property set by IE10 */ return E_NOTIMPL; default: - ok(0, "unexpected property %x\n", dwProperty); + ok(0, "unexpected property %lx\n", dwProperty); return E_NOTIMPL; } @@ -1934,21 +1934,21 @@ static void test_func(IDispatchEx *obj) str = SysAllocString(L"toString"); hres = IDispatchEx_GetDispID(obj, str, fdexNameCaseSensitive, &id); SysFreeString(str); - ok(hres == S_OK, "GetDispID failed: %08x\n", hres); - ok(id == DISPID_IOMNAVIGATOR_TOSTRING, "id = %x\n", id); + ok(hres == S_OK, "GetDispID failed: %08lx\n", hres); + ok(id == DISPID_IOMNAVIGATOR_TOSTRING, "id = %lx\n", id); memset(&dp, 0, sizeof(dp)); memset(&ei, 0, sizeof(ei)); VariantInit(&var); hres = IDispatchEx_InvokeEx(obj, id, LOCALE_NEUTRAL, DISPATCH_PROPERTYGET, &dp, &var, &ei, NULL); - ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); ok(V_VT(&var) == VT_DISPATCH, "V_VT(var)=%d\n", V_VT(&var)); ok(V_DISPATCH(&var) != NULL, "V_DISPATCH(var) == NULL\n"); disp = V_DISPATCH(&var); hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); IDispatch_Release(disp); - ok(hres == S_OK, "Could not get IDispatchEx iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08lx\n", hres); /* FIXME: Test InvokeEx(DISPATCH_METHOD) */ @@ -1956,7 +1956,7 @@ static void test_func(IDispatchEx *obj) memset(&ei, 0, sizeof(ei)); VariantInit(&var); hres = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dp, &var, &ei, NULL); - ok(hres == S_OK || broken(hres == E_ACCESSDENIED), "InvokeEx failed: %08x\n", hres); + ok(hres == S_OK || broken(hres == E_ACCESSDENIED), "InvokeEx failed: %08lx\n", hres); if(SUCCEEDED(hres)) { DISPID named_args[2] = { DISPID_THIS, 0xdeadbeef }; VARIANT args[2]; @@ -1974,7 +1974,7 @@ static void test_func(IDispatchEx *obj) V_VT(args+1) = VT_I4; V_I4(args+1) = 3; hres = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dp, &var, &ei, NULL); - ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); ok(V_VT(&var) == VT_BSTR, "V_VT(var)=%d\n", V_VT(&var)); ok(!lstrcmpW(V_BSTR(&var), L"[object]"), "V_BSTR(var) = %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); @@ -1983,17 +1983,17 @@ static void test_func(IDispatchEx *obj) V_VT(&var) = VT_I4; V_I4(&var) = 100; hres = dispex_propput(obj, id, 0, &var, NULL); - todo_wine ok(hres == E_NOTIMPL, "InvokeEx failed: %08x\n", hres); + todo_wine ok(hres == E_NOTIMPL, "InvokeEx failed: %08lx\n", hres); hres = dispex_propget(dispex, DISPID_VALUE, &var, NULL); - ok(hres == E_ACCESSDENIED, "InvokeEx returned: %08x, expected E_ACCESSDENIED\n", hres); + ok(hres == E_ACCESSDENIED, "InvokeEx returned: %08lx, expected E_ACCESSDENIED\n", hres); if(SUCCEEDED(hres)) VariantClear(&var); SET_EXPECT(QS_IActiveScriptSite); SET_EXPECT(QS_GetCaller); hres = dispex_propget(dispex, DISPID_VALUE, &var, &caller_sp); - ok(hres == S_OK, "InvokeEx returned: %08x, expected S_OK\n", hres); + ok(hres == S_OK, "InvokeEx returned: %08lx, expected S_OK\n", hres); ok(V_VT(&var) == VT_BSTR, "V_VT(var) = %d\n", V_VT(&var)); ok(!lstrcmpW(V_BSTR(&var), L"\nfunction toString() {\n [native code]\n}\n"), "V_BSTR(var) = %s\n", wine_dbgstr_w(V_BSTR(&var))); @@ -2013,21 +2013,21 @@ static void test_nextdispid(IDispatchEx *dispex) name = SysAllocString(L"dynVal"); hres = IDispatchEx_GetDispID(dispex, name, fdexNameCaseSensitive|fdexNameEnsure, &dyn_id); - ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + ok(hres == S_OK, "GetDispID failed: %08lx\n", hres); SysFreeString(name); V_VT(&var) = VT_EMPTY; hres = dispex_propput(dispex, dyn_id, 0, &var, NULL); - ok(hres == S_OK, "dispex_propput failed: %08x\n", hres); + ok(hres == S_OK, "dispex_propput failed: %08lx\n", hres); while(last_id != dyn_id) { hres = IDispatchEx_GetNextDispID(dispex, fdexEnumAll, last_id, &id); - ok(hres == S_OK, "GetNextDispID returned: %08x\n", hres); + ok(hres == S_OK, "GetNextDispID returned: %08lx\n", hres); ok(id != DISPID_STARTENUM, "id == DISPID_STARTENUM\n"); ok(id != DISPID_IOMNAVIGATOR_TOSTRING, "id == DISPID_IOMNAVIGATOR_TOSTRING\n"); hres = IDispatchEx_GetMemberName(dispex, id, &name); - ok(hres == S_OK, "GetMemberName failed: %08x\n", hres); + ok(hres == S_OK, "GetMemberName failed: %08lx\n", hres); if(id == dyn_id) ok(!lstrcmpW(name, L"dynVal"), "name = %s\n", wine_dbgstr_w(name)); @@ -2039,7 +2039,7 @@ static void test_nextdispid(IDispatchEx *dispex) } hres = IDispatchEx_GetNextDispID(dispex, 0, id, &id); - ok(hres == S_FALSE, "GetNextDispID returned: %08x\n", hres); + ok(hres == S_FALSE, "GetNextDispID returned: %08lx\n", hres); ok(id == DISPID_STARTENUM, "id != DISPID_STARTENUM\n"); } @@ -2056,7 +2056,7 @@ static void test_global_id(void) SET_EXPECT(script_divid_d); tmp = SysAllocString(L"divid"); hres = IDispatchEx_GetDispID(window_dispex, tmp, fdexNameCaseSensitive, &id); - ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + ok(hres == S_OK, "GetDispID failed: %08lx\n", hres); SysFreeString(tmp); CHECK_CALLED(GetScriptDispatch); CHECK_CALLED(script_divid_d); @@ -2065,7 +2065,7 @@ static void test_global_id(void) memset(&ei, 0, sizeof(ei)); memset(&dp, 0, sizeof(dp)); hres = IDispatchEx_InvokeEx(window_dispex, id, 0, DISPATCH_PROPERTYGET, &dp, &var, &ei, NULL); - ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); ok(V_VT(&var) == VT_DISPATCH, "V_VT(var) = %d\n", V_VT(&var)); VariantClear(&var); } @@ -2079,28 +2079,28 @@ static void test_arg_conv(IHTMLWindow2 *window) HRESULT hres; hres = IHTMLWindow2_get_document(window, &doc); - ok(hres == S_OK, "get_document failed: %08x\n", hres); + ok(hres == S_OK, "get_document failed: %08lx\n", hres); hres = IHTMLDocument2_get_body(doc, &elem); IHTMLDocument2_Release(doc); - ok(hres == S_OK, "get_body failed: %08x\n", hres); + ok(hres == S_OK, "get_body failed: %08lx\n", hres); hres = IHTMLElement_QueryInterface(elem, &IID_IDispatchEx, (void**)&dispex); IHTMLElement_Release(elem); - ok(hres == S_OK, "Could not get IDispatchEx iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08lx\n", hres); SET_EXPECT(QS_VariantConversion); SET_EXPECT(ChangeType); V_VT(&v) = VT_I4; V_I4(&v) = 0xf0f0f0; hres = dispex_propput(dispex, DISPID_IHTMLBODYELEMENT_BACKGROUND, 0, &v, &caller_sp); - ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); CHECK_CALLED(QS_VariantConversion); CHECK_CALLED(ChangeType); V_VT(&v) = VT_EMPTY; hres = dispex_propget(dispex, DISPID_IHTMLBODYELEMENT_BGCOLOR, &v, &caller_sp); - ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(var)=%d\n", V_VT(&v)); ok(!V_BSTR(&v), "V_BSTR(&var) = %s\n", wine_dbgstr_w(V_BSTR(&v))); @@ -2115,10 +2115,10 @@ static void _test_elem_disabled(unsigned line, IHTMLElement *elem, VARIANT_BOOL HRESULT hres; hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLElement3, (void**)&elem3); - ok_(__FILE__,line)(hres == S_OK, "Could not get IHTMLElement3 iface: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "Could not get IHTMLElement3 iface: %08lx\n", hres); hres = IHTMLElement3_get_disabled(elem3, &b); - ok_(__FILE__,line)(hres == S_OK, "get_disabled failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_disabled failed: %08lx\n", hres); ok_(__FILE__,line)(b == exb, "disabled = %x, expected %x\n", b, exb); IHTMLElement3_Release(elem3); @@ -2133,21 +2133,21 @@ static void test_default_arg_conv(IHTMLWindow2 *window) HRESULT hres; hres = IHTMLWindow2_get_document(window, &doc); - ok(hres == S_OK, "get_document failed: %08x\n", hres); + ok(hres == S_OK, "get_document failed: %08lx\n", hres); hres = IHTMLDocument2_get_body(doc, &elem); IHTMLDocument2_Release(doc); - ok(hres == S_OK, "get_body failed: %08x\n", hres); + ok(hres == S_OK, "get_body failed: %08lx\n", hres); hres = IHTMLElement_QueryInterface(elem, &IID_IDispatchEx, (void**)&dispex); - ok(hres == S_OK, "Could not get IDispatchEx iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08lx\n", hres); test_elem_disabled(elem, VARIANT_FALSE); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"test"); hres = dispex_propput(dispex, DISPID_IHTMLELEMENT3_DISABLED, 0, &v, NULL); - ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); SysFreeString(V_BSTR(&v)); test_elem_disabled(elem, VARIANT_TRUE); @@ -2155,14 +2155,14 @@ static void test_default_arg_conv(IHTMLWindow2 *window) V_VT(&v) = VT_I4; V_I4(&v) = 0; hres = dispex_propput(dispex, DISPID_IHTMLELEMENT3_DISABLED, 0, &v, NULL); - ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); test_elem_disabled(elem, VARIANT_FALSE); V_VT(&v) = VT_I4; V_I4(&v) = 1; hres = dispex_propput(dispex, DISPID_IHTMLELEMENT3_DISABLED, DISPATCH_PROPERTYPUTREF, &v, NULL); - ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); test_elem_disabled(elem, VARIANT_TRUE); @@ -2184,16 +2184,16 @@ static void test_named_args(IHTMLWindow2 *window) BSTR bstr; hres = IHTMLWindow2_get_document(window, &doc); - ok(hres == S_OK, "get_document failed: %08x\n", hres); + ok(hres == S_OK, "get_document failed: %08lx\n", hres); bstr = SysAllocString(L"div"); hres = IHTMLDocument2_createElement(doc, bstr, &elem); IHTMLDocument2_Release(doc); SysFreeString(bstr); - ok(hres == S_OK, "createElement failed: %08x\n", hres); + ok(hres == S_OK, "createElement failed: %08lx\n", hres); hres = IHTMLElement_QueryInterface(elem, &IID_IDispatchEx, (void**)&dispex); - ok(hres == S_OK, "Could not get IDispatchEx iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08lx\n", hres); bstr = SysAllocString(L"setAttribute"); hres = IDispatchEx_GetDispID(dispex, bstr, fdexNameCaseSensitive, &id); @@ -2208,16 +2208,16 @@ static void test_named_args(IHTMLWindow2 *window) V_VT(&args[1]) = VT_I4; V_I4(&args[1]) = 0; hres = IDispatchEx_InvokeEx(dispex, id, LOCALE_NEUTRAL, DISPATCH_METHOD, &dp, NULL, NULL, NULL); - ok(hres == S_OK, "InvokeEx returned: %08x\n", hres); + ok(hres == S_OK, "InvokeEx returned: %08lx\n", hres); hres = IHTMLElement_getAttribute(elem, V_BSTR(&args[0]), 0, &var); - ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + ok(hres == S_OK, "getAttribute failed: %08lx\n", hres); ok(V_VT(&var) == VT_NULL, "V_VT(var)=%d\n", V_VT(&var)); bstr = SysAllocString(L"0"); hres = IHTMLElement_getAttribute(elem, bstr, 0, &var); SysFreeString(bstr); - ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + ok(hres == S_OK, "getAttribute failed: %08lx\n", hres); ok(V_VT(&var) == VT_BSTR, "V_VT(var)=%d\n", V_VT(&var)); ok(!lstrcmpW(V_BSTR(&var), L"testattr"), "V_BSTR(&var) = %s\n", debugstr_w(V_BSTR(&var))); VariantClear(&var); @@ -2227,12 +2227,12 @@ static void test_named_args(IHTMLWindow2 *window) V_BSTR(&args[2]) = SysAllocString(L"testval"); hres = IDispatchEx_InvokeEx(dispex, id, LOCALE_NEUTRAL, DISPATCH_METHOD, &dp, NULL, NULL, NULL); VariantClear(&args[2]); - ok(hres == DISP_E_TYPEMISMATCH, "InvokeEx returned: %08x\n", hres); + ok(hres == DISP_E_TYPEMISMATCH, "InvokeEx returned: %08lx\n", hres); V_VT(&args[2]) = VT_I4; V_I4(&args[2]) = 0; hres = IDispatchEx_InvokeEx(dispex, id, LOCALE_NEUTRAL, DISPATCH_METHOD, &dp, NULL, NULL, NULL); - ok(hres == DISP_E_TYPEMISMATCH, "InvokeEx returned: %08x\n", hres); + ok(hres == DISP_E_TYPEMISMATCH, "InvokeEx returned: %08lx\n", hres); args[2] = args[0]; V_VT(&args[1]) = VT_BSTR; @@ -2240,11 +2240,11 @@ static void test_named_args(IHTMLWindow2 *window) V_VT(&args[0]) = VT_I4; V_I4(&args[0]) = 0; hres = IDispatchEx_InvokeEx(dispex, id, LOCALE_NEUTRAL, DISPATCH_METHOD, &dp, NULL, NULL, NULL); - ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); VariantClear(&args[1]); hres = IHTMLElement_getAttribute(elem, V_BSTR(&args[2]), 0, &var); - ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + ok(hres == S_OK, "getAttribute failed: %08lx\n", hres); ok(V_VT(&var) == VT_BSTR, "V_VT(var)=%d\n", V_VT(&var)); ok(!lstrcmpW(V_BSTR(&var), L"testval"), "V_BSTR(&var) = %s\n", debugstr_w(V_BSTR(&var))); VariantClear(&var); @@ -2255,11 +2255,11 @@ static void test_named_args(IHTMLWindow2 *window) V_VT(&args[0]) = VT_BSTR; V_BSTR(&args[0]) = SysAllocString(L"newValue"); hres = IDispatchEx_InvokeEx(dispex, id, LOCALE_NEUTRAL, DISPATCH_METHOD, &dp, NULL, NULL, NULL); - ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); VariantClear(&args[0]); hres = IHTMLElement_getAttribute(elem, V_BSTR(&args[1]), 0, &var); - ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + ok(hres == S_OK, "getAttribute failed: %08lx\n", hres); ok(V_VT(&var) == VT_BSTR, "V_VT(var)=%d\n", V_VT(&var)); ok(!lstrcmpW(V_BSTR(&var), L"newValue"), "V_BSTR(&var) = %s\n", debugstr_w(V_BSTR(&var))); VariantClear(&var); @@ -2274,12 +2274,12 @@ static void test_named_args(IHTMLWindow2 *window) V_VT(&args[0]) = VT_BSTR; V_BSTR(&args[0]) = SysAllocString(L"extra"); hres = IDispatchEx_InvokeEx(dispex, id, LOCALE_NEUTRAL, DISPATCH_METHOD, &dp, NULL, NULL, NULL); - ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); VariantClear(&args[2]); VariantClear(&args[0]); hres = IHTMLElement_getAttribute(elem, V_BSTR(&args[3]), 0, &var); - ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + ok(hres == S_OK, "getAttribute failed: %08lx\n", hres); ok(V_VT(&var) == VT_BSTR, "V_VT(var)=%d\n", V_VT(&var)); ok(!lstrcmpW(V_BSTR(&var), L"foobar"), "V_BSTR(&var) = %s\n", debugstr_w(V_BSTR(&var))); VariantClear(&var); @@ -2291,11 +2291,11 @@ static void test_named_args(IHTMLWindow2 *window) V_VT(&args[2]) = VT_BSTR; V_BSTR(&args[2]) = SysAllocString(L"withThis"); hres = IDispatchEx_InvokeEx(dispex, id, LOCALE_NEUTRAL, DISPATCH_METHOD, &dp, NULL, NULL, NULL); - ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); VariantClear(&args[2]); hres = IHTMLElement_getAttribute(elem, V_BSTR(&args[3]), 0, &var); - ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + ok(hres == S_OK, "getAttribute failed: %08lx\n", hres); ok(V_VT(&var) == VT_BSTR, "V_VT(var)=%d\n", V_VT(&var)); ok(!lstrcmpW(V_BSTR(&var), L"withThis"), "V_BSTR(&var) = %s\n", debugstr_w(V_BSTR(&var))); VariantClear(&args[3]); @@ -2316,10 +2316,10 @@ static void test_ui(void) win_skip("IActiveScriptSiteUIControl not supported\n"); return; } - ok(hres == S_OK, "Could not get IActiveScriptSiteUIControl: %08x\n", hres); + ok(hres == S_OK, "Could not get IActiveScriptSiteUIControl: %08lx\n", hres); hres = IActiveScriptSiteUIControl_GetUIBehavior(ui_control, SCRIPTUICITEM_MSGBOX, &uic_handling); - ok(hres == S_OK, "GetUIBehavior failed: %08x\n", hres); + ok(hres == S_OK, "GetUIBehavior failed: %08lx\n", hres); ok(uic_handling == SCRIPTUICHANDLING_ALLOW, "uic_handling = %d\n", uic_handling); IActiveScriptSiteUIControl_Release(ui_control); @@ -2332,10 +2332,10 @@ static void test_sp(void) HRESULT hres; hres = IActiveScriptSite_QueryInterface(site, &IID_IServiceProvider, (void**)&sp); - ok(hres == S_OK, "Could not get IServiceProvider iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IServiceProvider iface: %08lx\n", hres); hres = IServiceProvider_QueryService(sp, &SID_SContainerDispatch, &IID_IHTMLDocument, (void**)&unk); - ok(hres == S_OK, "Could not get SID_SContainerDispatch service: %08x\n", hres); + ok(hres == S_OK, "Could not get SID_SContainerDispatch service: %08lx\n", hres); IUnknown_Release(unk); IServiceProvider_Release(sp); @@ -2363,8 +2363,8 @@ static void test_script_run(void) tmp = SysAllocString(documentW); hres = IDispatchEx_GetDispID(window_dispex, tmp, fdexNameCaseSensitive, &id); SysFreeString(tmp); - ok(hres == S_OK, "GetDispID(document) failed: %08x\n", hres); - ok(id == DISPID_IHTMLWINDOW2_DOCUMENT, "id=%x\n", id); + ok(hres == S_OK, "GetDispID(document) failed: %08lx\n", hres); + ok(id == DISPID_IHTMLWINDOW2_DOCUMENT, "id=%lx\n", id); CHECK_CALLED(GetScriptDispatch); @@ -2373,61 +2373,61 @@ static void test_script_run(void) memset(&ei, 0, sizeof(ei)); hres = IDispatchEx_InvokeEx(window_dispex, id, LOCALE_NEUTRAL, INVOKE_PROPERTYGET, &dp, &var, &ei, NULL); - ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); ok(V_VT(&var) == VT_DISPATCH, "V_VT(var)=%d\n", V_VT(&var)); ok(V_DISPATCH(&var) != NULL, "V_DISPATCH(&var) == NULL\n"); hres = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IDispatchEx, (void**)&document); VariantClear(&var); - ok(hres == S_OK, "Could not get DispatchEx: %08x\n", hres); + ok(hres == S_OK, "Could not get DispatchEx: %08lx\n", hres); tmp = SysAllocString(testW); hres = IDispatchEx_GetDispID(document, tmp, fdexNameCaseSensitive, &id); - ok(hres == DISP_E_UNKNOWNNAME, "GetDispID(document) failed: %08x, expected DISP_E_UNKNOWNNAME\n", hres); + ok(hres == DISP_E_UNKNOWNNAME, "GetDispID(document) failed: %08lx, expected DISP_E_UNKNOWNNAME\n", hres); hres = IDispatchEx_GetDispID(document, tmp, fdexNameCaseSensitive | fdexNameImplicit, &id); - ok(hres == DISP_E_UNKNOWNNAME, "GetDispID(document) failed: %08x, expected DISP_E_UNKNOWNNAME\n", hres); + ok(hres == DISP_E_UNKNOWNNAME, "GetDispID(document) failed: %08lx, expected DISP_E_UNKNOWNNAME\n", hres); SysFreeString(tmp); id = 0; tmp = SysAllocString(testW); hres = IDispatchEx_GetDispID(document, tmp, fdexNameCaseSensitive|fdexNameEnsure, &id); SysFreeString(tmp); - ok(hres == S_OK, "GetDispID(document) failed: %08x\n", hres); + ok(hres == S_OK, "GetDispID(document) failed: %08lx\n", hres); ok(id, "id == 0\n"); V_VT(&var) = VT_I4; V_I4(&var) = 100; hres = dispex_propput(document, id, 0, &var, NULL); - ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); tmp = SysAllocString(testW); hres = IDispatchEx_GetDispID(document, tmp, fdexNameCaseSensitive, &id); SysFreeString(tmp); - ok(hres == S_OK, "GetDispID(document) failed: %08x\n", hres); + ok(hres == S_OK, "GetDispID(document) failed: %08lx\n", hres); hres = IDispatchEx_DeleteMemberByDispID(document, id); - ok(hres == E_NOTIMPL, "DeleteMemberByDispID failed = %08x\n", hres); + ok(hres == E_NOTIMPL, "DeleteMemberByDispID failed = %08lx\n", hres); VariantInit(&var); memset(&dp, 0, sizeof(dp)); memset(&ei, 0, sizeof(ei)); hres = IDispatchEx_InvokeEx(document, id, LOCALE_NEUTRAL, INVOKE_PROPERTYGET, &dp, &var, &ei, NULL); - ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); ok(V_VT(&var) == VT_I4, "V_VT(var)=%d\n", V_VT(&var)); - ok(V_I4(&var) == 100, "V_I4(&var) = %d\n", V_I4(&var)); + ok(V_I4(&var) == 100, "V_I4(&var) = %ld\n", V_I4(&var)); V_VT(&var) = VT_I4; V_I4(&var) = 200; hres = dispex_propput(document, id, DISPATCH_PROPERTYPUTREF, &var, NULL); - ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); VariantInit(&var); memset(&dp, 0, sizeof(dp)); memset(&ei, 0, sizeof(ei)); hres = IDispatchEx_InvokeEx(document, id, LOCALE_NEUTRAL, INVOKE_PROPERTYGET, &dp, &var, &ei, NULL); - ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); ok(V_VT(&var) == VT_I4, "V_VT(var)=%d\n", V_VT(&var)); - ok(V_I4(&var) == 200, "V_I4(&var) = %d\n", V_I4(&var)); + ok(V_I4(&var) == 200, "V_I4(&var) = %ld\n", V_I4(&var)); memset(&dp, 0, sizeof(dp)); memset(&ei, 0, sizeof(ei)); @@ -2436,39 +2436,39 @@ static void test_script_run(void) dp.cArgs = 1; dp.rgvarg = &var; hres = IDispatchEx_InvokeEx(document, id, LOCALE_NEUTRAL, INVOKE_PROPERTYPUT, &dp, NULL, &ei, NULL); - ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); VariantInit(&var); memset(&dp, 0, sizeof(dp)); memset(&ei, 0, sizeof(ei)); hres = IDispatchEx_InvokeEx(document, id, LOCALE_NEUTRAL, INVOKE_PROPERTYGET, &dp, &var, &ei, NULL); - ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); ok(V_VT(&var) == VT_I4, "V_VT(var)=%d\n", V_VT(&var)); - ok(V_I4(&var) == 300, "V_I4(&var) = %d\n", V_I4(&var)); + ok(V_I4(&var) == 300, "V_I4(&var) = %ld\n", V_I4(&var)); V_VT(&var) = VT_BSTR; V_BSTR(&var) = NULL; hres = dispex_propput(document, id, 0, &var, NULL); - ok(hres == S_OK, "dispex_propput failed: %08x\n", hres); + ok(hres == S_OK, "dispex_propput failed: %08lx\n", hres); VariantInit(&var); memset(&dp, 0, sizeof(dp)); memset(&ei, 0, sizeof(ei)); hres = IDispatchEx_InvokeEx(document, id, LOCALE_NEUTRAL, INVOKE_PROPERTYGET, &dp, &var, &ei, NULL); - ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); ok(V_VT(&var) == VT_BSTR, "V_VT(var)=%d\n", V_VT(&var)); ok(!V_BSTR(&var), "V_BSTR(&var) = %s\n", wine_dbgstr_w(V_BSTR(&var))); unk = (void*)0xdeadbeef; hres = IDispatchEx_GetNameSpaceParent(window_dispex, &unk); - ok(hres == S_OK, "GetNameSpaceParent failed: %08x\n", hres); + ok(hres == S_OK, "GetNameSpaceParent failed: %08lx\n", hres); ok(!unk, "unk=%p, expected NULL\n", unk); id = 0; tmp = SysAllocString(funcW); hres = IDispatchEx_GetDispID(document, tmp, fdexNameCaseSensitive|fdexNameEnsure, &id); SysFreeString(tmp); - ok(hres == S_OK, "GetDispID(func) failed: %08x\n", hres); + ok(hres == S_OK, "GetDispID(func) failed: %08lx\n", hres); ok(id, "id == 0\n"); dp.cArgs = 1; @@ -2478,7 +2478,7 @@ static void test_script_run(void) V_VT(&var) = VT_DISPATCH; V_DISPATCH(&var) = (IDispatch*)&funcDisp; hres = IDispatchEx_InvokeEx(document, id, LOCALE_NEUTRAL, INVOKE_PROPERTYPUT, &dp, NULL, &ei, NULL); - ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); VariantInit(&var); memset(&dp, 0, sizeof(dp)); @@ -2495,21 +2495,21 @@ static void test_script_run(void) CHECK_CALLED_BROKEN(SetProperty_ABBREVIATE_GLOBALNAME_RESOLUTION_FALSE); /* IE11 */ CHECK_CALLED(funcDisp); - ok(hres == S_OK, "InvokeEx(INVOKE_FUNC) failed: %08x\n", hres); + ok(hres == S_OK, "InvokeEx(INVOKE_FUNC) failed: %08lx\n", hres); ok(V_VT(&var) == VT_I4, "V_VT(var)=%d\n", V_VT(&var)); ok(V_I4(&var) == 100, "V_I4(&var) == NULL\n"); IDispatchEx_Release(document); hres = IDispatchEx_QueryInterface(window_dispex, &IID_IHTMLWindow2, (void**)&window); - ok(hres == S_OK, "Could not get IHTMLWindow2 iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLWindow2 iface: %08lx\n", hres); hres = IHTMLWindow2_get_navigator(window, &navigator); - ok(hres == S_OK, "get_navigator failed: %08x\n", hres); + ok(hres == S_OK, "get_navigator failed: %08lx\n", hres); hres = IOmNavigator_QueryInterface(navigator, &IID_IDispatchEx, (void**)&dispex); IOmNavigator_Release(navigator); - ok(hres == S_OK, "Could not get IDispatchEx iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08lx\n", hres); test_func(dispex); test_nextdispid(dispex); @@ -2521,7 +2521,7 @@ static void test_script_run(void) tmp = SysAllocString(L"test"); hres = IDispatchEx_DeleteMemberByName(dispex, tmp, fdexNameCaseSensitive); - ok(hres == E_NOTIMPL, "DeleteMemberByName failed: %08x\n", hres); + ok(hres == E_NOTIMPL, "DeleteMemberByName failed: %08lx\n", hres); IDispatchEx_Release(dispex); @@ -2531,7 +2531,7 @@ static void test_script_run(void) SET_EXPECT(script_testprop_d); tmp = SysAllocString(L"testProp"); hres = IDispatchEx_GetDispID(window_dispex, tmp, fdexNameCaseSensitive, &id); - ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + ok(hres == S_OK, "GetDispID failed: %08lx\n", hres); ok(id != DISPID_SCRIPT_TESTPROP, "id == DISPID_SCRIPT_TESTPROP\n"); CHECK_CALLED(GetScriptDispatch); CHECK_CALLED(script_testprop_d); @@ -2539,7 +2539,7 @@ static void test_script_run(void) tmp = SysAllocString(L"testProp"); hres = IDispatchEx_GetDispID(window_dispex, tmp, fdexNameCaseSensitive, &id); - ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + ok(hres == S_OK, "GetDispID failed: %08lx\n", hres); ok(id != DISPID_SCRIPT_TESTPROP, "id == DISPID_SCRIPT_TESTPROP\n"); SysFreeString(tmp); @@ -2548,7 +2548,7 @@ static void test_script_run(void) memset(&ei, 0, sizeof(ei)); memset(&dp, 0, sizeof(dp)); hres = IDispatchEx_InvokeEx(window_dispex, id, 0, DISPATCH_PROPERTYGET, &dp, &var, &ei, NULL); - ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); ok(V_VT(&var) == VT_NULL, "V_VT(var) = %d\n", V_VT(&var)); CHECK_CALLED(GetScriptDispatch); CHECK_CALLED(script_testprop_i); @@ -2557,7 +2557,7 @@ static void test_script_run(void) SET_EXPECT(script_testprop2_d); tmp = SysAllocString(L"testProp2"); hres = IDispatchEx_GetDispID(window_dispex, tmp, fdexNameCaseSensitive|fdexNameEnsure, &id); - ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + ok(hres == S_OK, "GetDispID failed: %08lx\n", hres); ok(id != DISPID_SCRIPT_TESTPROP2, "id == DISPID_SCRIPT_TESTPROP2\n"); CHECK_CALLED(GetScriptDispatch); CHECK_CALLED(script_testprop2_d); @@ -2565,7 +2565,7 @@ static void test_script_run(void) tmp = SysAllocString(L"test"); hres = IDispatchEx_DeleteMemberByName(window_dispex, tmp, fdexNameCaseSensitive); - ok(hres == E_NOTIMPL, "DeleteMemberByName failed: %08x\n", hres); + ok(hres == E_NOTIMPL, "DeleteMemberByName failed: %08lx\n", hres); test_global_id(); @@ -2586,7 +2586,7 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac CHECK_EXPECT(ParseScriptText_execScript); ok(!pstrItemName, "pstrItemName = %s\n", wine_dbgstr_w(pstrItemName)); ok(!lstrcmpW(pstrDelimiter, L"\""), "pstrDelimiter = %s\n", wine_dbgstr_w(pstrDelimiter)); - ok(dwFlags == SCRIPTTEXT_ISVISIBLE, "dwFlags = %x\n", dwFlags); + ok(dwFlags == SCRIPTTEXT_ISVISIBLE, "dwFlags = %lx\n", dwFlags); V_VT(pvarResult) = VT_I4; V_I4(pvarResult) = 10; @@ -2595,7 +2595,7 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac CHECK_EXPECT(ParseScriptText_script); ok(!lstrcmpW(pstrItemName, L"window"), "pstrItemName = %s\n", wine_dbgstr_w(pstrItemName)); ok(!lstrcmpW(pstrDelimiter, L"</SCRIPT>"), "pstrDelimiter = %s\n", wine_dbgstr_w(pstrDelimiter)); - ok(dwFlags == (SCRIPTTEXT_ISVISIBLE|SCRIPTTEXT_HOSTMANAGESSOURCE), "dwFlags = %x\n", dwFlags); + ok(dwFlags == (SCRIPTTEXT_ISVISIBLE|SCRIPTTEXT_HOSTMANAGESSOURCE), "dwFlags = %lx\n", dwFlags); test_script_run(); return S_OK; @@ -2676,26 +2676,26 @@ static HRESULT WINAPI ActiveScript_SetScriptSite(IActiveScript *iface, IActiveSc ok(pass != NULL, "pass == NULL\n"); hres = IActiveScriptSite_QueryInterface(pass, &IID_IActiveScriptSiteInterruptPoll, (void**)&poll); - ok(hres == S_OK, "Could not get IActiveScriptSiteInterruptPoll interface: %08x\n", hres); + ok(hres == S_OK, "Could not get IActiveScriptSiteInterruptPoll interface: %08lx\n", hres); if(SUCCEEDED(hres)) IActiveScriptSiteInterruptPoll_Release(poll); hres = IActiveScriptSite_GetLCID(pass, &lcid); - ok(hres == S_OK, "GetLCID failed: %08x\n", hres); + ok(hres == S_OK, "GetLCID failed: %08lx\n", hres); hres = IActiveScriptSite_OnStateChange(pass, (state = SCRIPTSTATE_INITIALIZED)); - ok(hres == S_OK, "OnStateChange failed: %08x\n", hres); + ok(hres == S_OK, "OnStateChange failed: %08lx\n", hres); hres = IActiveScriptSite_QueryInterface(pass, &IID_IActiveScriptSiteDebug, (void**)&debug); - ok(hres == S_OK, "Could not get IActiveScriptSiteDebug interface: %08x\n", hres); + ok(hres == S_OK, "Could not get IActiveScriptSiteDebug interface: %08lx\n", hres); if(SUCCEEDED(hres)) IActiveScriptSiteDebug_Release(debug); hres = IActiveScriptSite_QueryInterface(pass, &IID_ICanHandleException, (void**)&canexception); - ok(hres == E_NOINTERFACE, "Could not get IID_ICanHandleException interface: %08x\n", hres); + ok(hres == E_NOINTERFACE, "Could not get IID_ICanHandleException interface: %08lx\n", hres); hres = IActiveScriptSite_QueryInterface(pass, &IID_IServiceProvider, (void**)&service); - ok(hres == S_OK, "Could not get IServiceProvider interface: %08x\n", hres); + ok(hres == S_OK, "Could not get IServiceProvider interface: %08lx\n", hres); if(SUCCEEDED(hres)) IServiceProvider_Release(service); @@ -2731,7 +2731,7 @@ static HRESULT WINAPI ActiveScript_SetScriptState(IActiveScript *iface, SCRIPTST } hres = IActiveScriptSite_OnStateChange(site, (state = ss)); - ok(hres == S_OK, "OnStateChange failed: %08x\n", hres); + ok(hres == S_OK, "OnStateChange failed: %08lx\n", hres); return S_OK; } @@ -2764,14 +2764,14 @@ static HRESULT WINAPI ActiveScript_AddNamedItem(IActiveScript *iface, CHECK_EXPECT(AddNamedItem); ok(!lstrcmpW(pstrName, windowW), "pstrName=%s\n", wine_dbgstr_w(pstrName)); - ok(dwFlags == (SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS), "dwFlags=%x\n", dwFlags); + ok(dwFlags == (SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS), "dwFlags=%lx\n", dwFlags); hres = IActiveScriptSite_GetItemInfo(site, windowW, SCRIPTINFO_IUNKNOWN, &unk, NULL); - ok(hres == S_OK, "GetItemInfo failed: %08x\n", hres); + ok(hres == S_OK, "GetItemInfo failed: %08lx\n", hres); ok(unk != NULL, "unk == NULL\n"); hres = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)&disp); - ok(hres == S_OK, "Could not get IDispatch interface: %08x\n", hres); + ok(hres == S_OK, "Could not get IDispatch interface: %08lx\n", hres); if(SUCCEEDED(hres)) IDispatch_Release(disp); @@ -2781,7 +2781,7 @@ static HRESULT WINAPI ActiveScript_AddNamedItem(IActiveScript *iface, IUnknown_Release(unk2); hres = IUnknown_QueryInterface(unk, &IID_IDispatchEx, (void**)&window_dispex); - ok(hres == S_OK, "Could not get IDispatchEx interface: %08x\n", hres); + ok(hres == S_OK, "Could not get IDispatchEx interface: %08lx\n", hres); IUnknown_Release(unk); return S_OK; @@ -2945,33 +2945,33 @@ static void report_data(ProtocolHandler *This) static const WCHAR emptyW[] = {0}; hres = IInternetProtocolSink_QueryInterface(This->sink, &IID_IServiceProvider, (void**)&service_provider); - ok(hres == S_OK, "Could not get IServiceProvider iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IServiceProvider iface: %08lx\n", hres); hres = IServiceProvider_QueryService(service_provider, &IID_IHttpNegotiate, &IID_IHttpNegotiate, (void**)&http_negotiate); IServiceProvider_Release(service_provider); - ok(hres == S_OK, "Could not get IHttpNegotiate interface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHttpNegotiate interface: %08lx\n", hres); hres = IUri_GetDisplayUri(This->uri, &url); - ok(hres == S_OK, "Failed to get display uri: %08x\n", hres); + ok(hres == S_OK, "Failed to get display uri: %08lx\n", hres); hres = IHttpNegotiate_BeginningTransaction(http_negotiate, url, emptyW, 0, &addl_headers); - ok(hres == S_OK, "BeginningTransaction failed: %08x\n", hres); + ok(hres == S_OK, "BeginningTransaction failed: %08lx\n", hres); SysFreeString(url); CoTaskMemFree(addl_headers); headers = SysAllocString(L"HTTP/1.1 200 OK\r\n\r\n"); hres = IHttpNegotiate_OnResponse(http_negotiate, 200, headers, NULL, NULL); - ok(hres == S_OK, "OnResponse failed: %08x\n", hres); + ok(hres == S_OK, "OnResponse failed: %08lx\n", hres); SysFreeString(headers); IHttpNegotiate_Release(http_negotiate); hres = IInternetProtocolSink_ReportData(This->sink, BSCF_FIRSTDATANOTIFICATION | BSCF_LASTDATANOTIFICATION, This->size, This->size); - ok(hres == S_OK, "ReportData failed: %08x\n", hres); + ok(hres == S_OK, "ReportData failed: %08lx\n", hres); hres = IInternetProtocolSink_ReportResult(This->sink, S_OK, 0, NULL); - ok(hres == S_OK, "ReportResult failed: %08x\n", hres); + ok(hres == S_OK, "ReportResult failed: %08lx\n", hres); } typedef struct js_stream_t { @@ -3051,17 +3051,17 @@ static void stream_write(const WCHAR *name, const WCHAR *data) stream->protocol_handler = NULL; hres = CreateStreamOnHGlobal(NULL, TRUE, &protocol_handler->stream); - ok(hres == S_OK, "CreateStreamOnHGlobal failed: %08x\n", hres); + ok(hres == S_OK, "CreateStreamOnHGlobal failed: %08lx\n", hres); hres = IStream_Write(protocol_handler->stream, bom_utf16, sizeof(bom_utf16), NULL); - ok(hres == S_OK, "Write failed: %08x\n", hres); + ok(hres == S_OK, "Write failed: %08lx\n", hres); hres = IStream_Write(protocol_handler->stream, data, lstrlenW(data)*sizeof(WCHAR), NULL); - ok(hres == S_OK, "Write failed: %08x\n", hres); + ok(hres == S_OK, "Write failed: %08lx\n", hres); U(large_zero).QuadPart = 0; hres = IStream_Seek(protocol_handler->stream, large_zero, STREAM_SEEK_SET, NULL); - ok(hres == S_OK, "Seek failed: %08x\n", hres); + ok(hres == S_OK, "Seek failed: %08lx\n", hres); async_switch(protocol_handler); IInternetProtocolEx_Release(&protocol_handler->IInternetProtocolEx_iface); @@ -3133,7 +3133,7 @@ static HRESULT WINAPI Protocol_Continue(IInternetProtocolEx *iface, PROTOCOLDATA static HRESULT WINAPI Protocol_Abort(IInternetProtocolEx *iface, HRESULT hrReason, DWORD dwOptions) { - trace("Abort(%08x %x)\n", hrReason, dwOptions); + trace("Abort(%08lx %lx)\n", hrReason, dwOptions); return E_NOTIMPL; } @@ -3162,7 +3162,7 @@ static HRESULT WINAPI Protocol_Read(IInternetProtocolEx *iface, void *pv, ULONG if(This->stream) { hres = IStream_Read(This->stream, pv, cb, &read); - ok(SUCCEEDED(hres), "Read failed: %08x\n", hres); + ok(SUCCEEDED(hres), "Read failed: %08lx\n", hres); if(FAILED(hres)) return hres; if(pcbRead) @@ -3213,7 +3213,7 @@ static HRESULT WINAPI ProtocolEx_StartEx(IInternetProtocolEx *iface, IUri *uri, static const WCHAR empty_prefixW[] = {'/','e','m','p','t','y'}; hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &bindf, &This->bind_info); - ok(hres == S_OK, "GetBindInfo failed: %08x\n", hres); + ok(hres == S_OK, "GetBindInfo failed: %08lx\n", hres); hres = IUri_GetPath(uri, &path); if(FAILED(hres)) @@ -3224,7 +3224,7 @@ static HRESULT WINAPI ProtocolEx_StartEx(IInternetProtocolEx *iface, IUri *uri, This->size = strlen(This->data); }else if(!lstrcmpW(path, L"/echo.php")) { ok(This->bind_info.dwBindVerb == BINDVERB_POST, "unexpected bind verb %d\n", This->bind_info.dwBindVerb == BINDVERB_POST); - todo_wine ok(This->bind_info.stgmedData.tymed == TYMED_ISTREAM, "tymed = %x\n", This->bind_info.stgmedData.tymed); + todo_wine ok(This->bind_info.stgmedData.tymed == TYMED_ISTREAM, "tymed = %lx\n", This->bind_info.stgmedData.tymed); switch(This->bind_info.stgmedData.tymed) { case TYMED_HGLOBAL: This->size = This->bind_info.cbstgmedData; @@ -3235,13 +3235,13 @@ static HRESULT WINAPI ProtocolEx_StartEx(IInternetProtocolEx *iface, IUri *uri, IStream_AddRef(This->stream); break; default: - ok(0, "unexpected tymed %d\n", This->bind_info.stgmedData.tymed); + ok(0, "unexpected tymed %ld\n", This->bind_info.stgmedData.tymed); } }else if(!lstrcmpW(path, L"/jsstream.php")) { BSTR query; hres = IUri_GetQuery(uri, &query); - ok(hres == S_OK, "GetQuery failed: %08x\n", hres); + ok(hres == S_OK, "GetQuery failed: %08lx\n", hres); ok(SysStringLen(query) > 1 && *query == '?', "unexpected query %s\n", wine_dbgstr_w(query)); register_stream(This, query+1); SysFreeString(query); @@ -3394,23 +3394,23 @@ static void test_exec_script(IHTMLDocument2 *doc, const WCHAR *codew, const WCHA HRESULT hres; hres = IHTMLDocument2_get_parentWindow(doc, &window); - ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + ok(hres == S_OK, "get_parentWindow failed: %08lx\n", hres); code = SysAllocString(codew); lang = SysAllocString(langw); SET_EXPECT(ParseScriptText_execScript); hres = IHTMLWindow2_execScript(window, code, lang, &v); - ok(hres == S_OK, "execScript failed: %08x\n", hres); + ok(hres == S_OK, "execScript failed: %08lx\n", hres); ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); - ok(V_I4(&v) == 10, "V_I4(v) = %d\n", V_I4(&v)); + ok(V_I4(&v) == 10, "V_I4(v) = %ld\n", V_I4(&v)); CHECK_CALLED(ParseScriptText_execScript); SysFreeString(lang); lang = SysAllocString(L"invalid"); V_VT(&v) = 100; hres = IHTMLWindow2_execScript(window, code, lang, &v); - ok(hres == CO_E_CLASSSTRING, "execScript failed: %08x, expected CO_E_CLASSSTRING\n", hres); + ok(hres == CO_E_CLASSSTRING, "execScript failed: %08lx, expected CO_E_CLASSSTRING\n", hres); ok(V_VT(&v) == 100, "V_VT(v) = %d\n", V_VT(&v)); SysFreeString(lang); SysFreeString(code); @@ -3487,10 +3487,10 @@ static void run_from_moniker(IMoniker *mon) do_advise(doc, &IID_IPropertyNotifySink, (IUnknown*)&PropertyNotifySink); hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistMoniker, (void**)&persist); - ok(hres == S_OK, "Could not get IPersistMoniker iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IPersistMoniker iface: %08lx\n", hres); hres = IPersistMoniker_Load(persist, FALSE, mon, NULL, 0); - ok(hres == S_OK, "Load failed: %08x\n", hres); + ok(hres == S_OK, "Load failed: %08lx\n", hres); IPersistMoniker_Release(persist); @@ -3522,7 +3522,7 @@ static void run_js_script(const char *test_name) MultiByteToWideChar(CP_ACP, 0, test_name, -1, ptr, url + ARRAY_SIZE(url) - ptr); hres = CreateURLMoniker(NULL, url, &mon); - ok(hres == S_OK, "CreateURLMoniker failed: %08x\n", hres); + ok(hres == S_OK, "CreateURLMoniker failed: %08lx\n", hres); run_from_moniker(mon); IMoniker_Release(mon); @@ -3541,7 +3541,7 @@ static void run_from_path(const WCHAR *path, const char *opt) url = SysAllocString(buf); hres = CreateURLMoniker(NULL, url, &mon); SysFreeString(url); - ok(hres == S_OK, "CreateUrlMoniker failed: %08x\n", hres); + ok(hres == S_OK, "CreateUrlMoniker failed: %08lx\n", hres); run_from_moniker(mon); @@ -3580,10 +3580,10 @@ static void init_protocol_handler(void) static const WCHAR httpW[] = {'h','t','t','p',0}; hres = CoInternetGetSession(0, &internet_session, 0); - ok(hres == S_OK, "CoInternetGetSession failed: %08x\n", hres); + ok(hres == S_OK, "CoInternetGetSession failed: %08lx\n", hres); hres = IInternetSession_RegisterNameSpace(internet_session, &protocol_cf, &CLSID_HttpProtocol, httpW, 0, NULL, 0); - ok(hres == S_OK, "RegisterNameSpace failed: %08x\n", hres); + ok(hres == S_OK, "RegisterNameSpace failed: %08lx\n", hres); IInternetSession_Release(internet_session); } @@ -3647,7 +3647,7 @@ static BOOL register_script_engine(void) hres = CoRegisterClassObject(&CLSID_TestScript, (IUnknown *)&script_cf, CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, ®id); - ok(hres == S_OK, "Could not register script engine: %08x\n", hres); + ok(hres == S_OK, "Could not register script engine: %08lx\n", hres); return TRUE; } diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 255dc7f7900..bc9afda7617 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -67,7 +67,7 @@ static IHTMLElement2 *_get_elem2_iface(unsigned line, IUnknown *unk) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLElement2, (void**)&elem); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElement2: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElement2: %08lx\n", hres); return elem; } @@ -78,7 +78,7 @@ static IHTMLCurrentStyle2 *_get_current_style2_iface(unsigned line, IUnknown *un HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLCurrentStyle2, (void**)¤t_style2); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElement2: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElement2: %08lx\n", hres); return current_style2; } @@ -90,7 +90,7 @@ static void _elem_set_innerhtml(unsigned line, IHTMLElement *elem, const WCHAR * html = SysAllocString(inner_html); hres = IHTMLElement_put_innerHTML(elem, html); - ok_(__FILE__,line)(hres == S_OK, "put_innerHTML failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_innerHTML failed: %08lx\n", hres); SysFreeString(html); } @@ -102,11 +102,11 @@ static IHTMLElement *get_element_by_id(IHTMLDocument2 *doc, const WCHAR *id) BSTR str; hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); - ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument3) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument3) failed: %08lx\n", hres); str = SysAllocString(id); hres = IHTMLDocument3_getElementById(doc3, str, &result); - ok(hres == S_OK, "getElementById failed: %08x\n", hres); + ok(hres == S_OK, "getElementById failed: %08lx\n", hres); ok(result != NULL, "result == NULL\n"); SysFreeString(str); @@ -122,11 +122,11 @@ static IHTMLCurrentStyle *_get_current_style(unsigned line, IHTMLElement *elem) HRESULT hres; hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLElement2, (void**)&elem2); - ok(hres == S_OK, "Could not get IHTMLElement2 iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLElement2 iface: %08lx\n", hres); cstyle = NULL; hres = IHTMLElement2_get_currentStyle(elem2, &cstyle); - ok(hres == S_OK, "get_currentStyle failed: %08x\n", hres); + ok(hres == S_OK, "get_currentStyle failed: %08lx\n", hres); ok(cstyle != NULL, "cstyle = %p\n", cstyle); IHTMLElement2_Release(elem2); @@ -141,7 +141,7 @@ static void _test_border_styles(unsigned line, IHTMLStyle *pStyle, BSTR Name) hres = IHTMLStyle_GetIDsOfNames(pStyle, &IID_NULL, &Name, 1, LOCALE_USER_DEFAULT, &dispid); - ok_(__FILE__,line) (hres == S_OK, "GetIDsOfNames: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "GetIDsOfNames: %08lx\n", hres); if(hres == S_OK) { DISPPARAMS params = {NULL,NULL,0,0}; @@ -152,7 +152,7 @@ static void _test_border_styles(unsigned line, IHTMLStyle *pStyle, BSTR Name) hres = IHTMLStyle_Invoke(pStyle, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYGET, ¶ms, &vDefault, NULL, NULL); - ok_(__FILE__,line) (hres == S_OK, "get_default. ret: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "get_default. ret: %08lx\n", hres); params.cArgs = 1; params.cNamedArgs = 1; @@ -162,63 +162,63 @@ static void _test_border_styles(unsigned line, IHTMLStyle *pStyle, BSTR Name) params.rgvarg = &arg; hres = IHTMLStyle_Invoke(pStyle, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYPUT, ¶ms, &ret, NULL, NULL); - ok_(__FILE__,line) (hres == S_OK, "none. ret: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "none. ret: %08lx\n", hres); VariantClear(&arg); V_VT(&arg) = VT_BSTR; V_BSTR(&arg) = SysAllocString(L"dotted"); hres = IHTMLStyle_Invoke(pStyle, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYPUT, ¶ms, &ret, NULL, NULL); - ok_(__FILE__,line) (hres == S_OK, "dotted. ret: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "dotted. ret: %08lx\n", hres); VariantClear(&arg); V_VT(&arg) = VT_BSTR; V_BSTR(&arg) = SysAllocString(L"dashed"); hres = IHTMLStyle_Invoke(pStyle, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYPUT, ¶ms, &ret, NULL, NULL); - ok_(__FILE__,line) (hres == S_OK, "dashed. ret: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "dashed. ret: %08lx\n", hres); VariantClear(&arg); V_VT(&arg) = VT_BSTR; V_BSTR(&arg) = SysAllocString(L"solid"); hres = IHTMLStyle_Invoke(pStyle, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYPUT, ¶ms, &ret, NULL, NULL); - ok_(__FILE__,line) (hres == S_OK, "solid. ret: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "solid. ret: %08lx\n", hres); VariantClear(&arg); V_VT(&arg) = VT_BSTR; V_BSTR(&arg) = SysAllocString(L"double"); hres = IHTMLStyle_Invoke(pStyle, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYPUT, ¶ms, &ret, NULL, NULL); - ok_(__FILE__,line) (hres == S_OK, "double. ret: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "double. ret: %08lx\n", hres); VariantClear(&arg); V_VT(&arg) = VT_BSTR; V_BSTR(&arg) = SysAllocString(L"groove"); hres = IHTMLStyle_Invoke(pStyle, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYPUT, ¶ms, &ret, NULL, NULL); - ok_(__FILE__,line) (hres == S_OK, "groove. ret: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "groove. ret: %08lx\n", hres); VariantClear(&arg); V_VT(&arg) = VT_BSTR; V_BSTR(&arg) = SysAllocString(L"ridge"); hres = IHTMLStyle_Invoke(pStyle, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYPUT, ¶ms, &ret, NULL, NULL); - ok_(__FILE__,line) (hres == S_OK, "ridge. ret: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "ridge. ret: %08lx\n", hres); VariantClear(&arg); V_VT(&arg) = VT_BSTR; V_BSTR(&arg) = SysAllocString(L"inset"); hres = IHTMLStyle_Invoke(pStyle, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYPUT, ¶ms, &ret, NULL, NULL); - ok_(__FILE__,line) (hres == S_OK, "inset. ret: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "inset. ret: %08lx\n", hres); VariantClear(&arg); V_VT(&arg) = VT_BSTR; V_BSTR(&arg) = SysAllocString(L"outset"); hres = IHTMLStyle_Invoke(pStyle, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYPUT, ¶ms, &ret, NULL, NULL); - ok_(__FILE__,line) (hres == S_OK, "outset. ret: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "outset. ret: %08lx\n", hres); VariantClear(&arg); V_VT(&arg) = VT_BSTR; @@ -228,13 +228,13 @@ static void _test_border_styles(unsigned line, IHTMLStyle *pStyle, BSTR Name) if(compat_mode < COMPAT_IE9) ok_(__FILE__,line) (FAILED(hres), "invalid value passed.\n"); else - ok_(__FILE__,line) (hres == S_OK, "invalid value returned: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "invalid value returned: %08lx\n", hres); VariantClear(&arg); params.rgvarg = &vDefault; hres = IHTMLStyle_Invoke(pStyle, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYPUT, ¶ms, &ret, NULL, NULL); - ok_(__FILE__,line) (hres == S_OK, "default. ret: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "default. ret: %08lx\n", hres); VariantClear(&vDefault); } } @@ -246,7 +246,7 @@ static void _test_style_csstext(unsigned line, IHTMLStyle *style, const WCHAR *e HRESULT hres; hres = IHTMLStyle_get_cssText(style, &text); - ok_(__FILE__,line)(hres == S_OK, "get_cssText failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_cssText failed: %08lx\n", hres); if(extext) ok_(__FILE__,line)(!lstrcmpW(text, extext), "cssText = %s\n", wine_dbgstr_w(text)); else @@ -263,7 +263,7 @@ static void _test_style_set_csstext(unsigned line, IHTMLStyle *style, const WCHA str = SysAllocString(text); hres = IHTMLStyle_put_cssText(style, str); - ok_(__FILE__,line)(hres == S_OK, "put_cssText failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_cssText failed: %08lx\n", hres); SysFreeString(str); } @@ -277,7 +277,7 @@ static void _test_style_remove_attribute(unsigned line, IHTMLStyle *style, const str = SysAllocString(attr); hres = IHTMLStyle_removeAttribute(style, str, 1, &b); SysFreeString(str); - ok_(__FILE__,line)(hres == S_OK, "removeAttribute failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "removeAttribute failed: %08lx\n", hres); ok_(__FILE__,line)(b == exb, "removeAttribute returned %x, expected %x\n", b, exb); } @@ -289,7 +289,7 @@ static void _set_text_decoration(unsigned line, IHTMLStyle *style, const WCHAR * str = SysAllocString(v); hres = IHTMLStyle_put_textDecoration(style, str); - ok_(__FILE__,line)(hres == S_OK, "put_textDecoration failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_textDecoration failed: %08lx\n", hres); SysFreeString(str); } @@ -300,7 +300,7 @@ static void _test_text_decoration(unsigned line, IHTMLStyle *style, const WCHAR HRESULT hres; hres = IHTMLStyle_get_textDecoration(style, &str); - ok_(__FILE__,line)(hres == S_OK, "get_textDecoration failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_textDecoration failed: %08lx\n", hres); if(exdec) ok_(__FILE__,line)(!lstrcmpW(str, exdec), "textDecoration = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(exdec)); else @@ -318,36 +318,36 @@ static void test_set_csstext(IHTMLStyle *style) test_style_set_csstext(style, L"background-color: black;"); hres = IHTMLStyle_get_backgroundColor(style, &v); - ok(hres == S_OK, "get_backgroundColor: %08x\n", hres); + ok(hres == S_OK, "get_backgroundColor: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "type failed: %d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"black"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLCSSStyleDeclaration, (void**)&css_style); ok(hres == S_OK || broken(!is_ie9plus && hres == E_NOINTERFACE), - "Could not get IHTMLCSSStyleDeclaration interface: %08x\n", hres); + "Could not get IHTMLCSSStyleDeclaration interface: %08lx\n", hres); if(FAILED(hres)) return; str = SysAllocString(L"float: left;"); hres = IHTMLCSSStyleDeclaration_put_cssText(css_style, str); - ok(hres == S_OK, "put_cssText failed: %08x\n", hres); + ok(hres == S_OK, "put_cssText failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLCSSStyleDeclaration_get_cssFloat(css_style, &str); - ok(hres == S_OK, "get_cssFloat failed: %08x\n", hres); + ok(hres == S_OK, "get_cssFloat failed: %08lx\n", hres); ok(!lstrcmpW(str, L"left"), "cssFloat = %s\n", wine_dbgstr_w(str)); SysFreeString(str); hres = IHTMLCSSStyleDeclaration_get_cssText(css_style, &str); - ok(hres == S_OK, "get_cssText failed: %08x\n", hres); + ok(hres == S_OK, "get_cssText failed: %08lx\n", hres); todo_wine_if(compat_mode < COMPAT_IE9) ok(!lstrcmpW(str, compat_mode >= COMPAT_IE9 ? L"float: left;" : L"FLOAT: left"), "cssFloat = %s\n", wine_dbgstr_w(str)); SysFreeString(str); hres = IHTMLCSSStyleDeclaration_put_cssText(css_style, NULL); - ok(hres == S_OK, "put_cssText failed: %08x\n", hres); + ok(hres == S_OK, "put_cssText failed: %08lx\n", hres); IHTMLCSSStyleDeclaration_Release(css_style); } @@ -360,24 +360,24 @@ static void test_style2(IHTMLStyle2 *style2) str = (void*)0xdeadbeef; hres = IHTMLStyle2_get_position(style2, &str); - ok(hres == S_OK, "get_position failed: %08x\n", hres); + ok(hres == S_OK, "get_position failed: %08lx\n", hres); ok(!str, "str != NULL\n"); str = SysAllocString(L"absolute"); hres = IHTMLStyle2_put_position(style2, str); - ok(hres == S_OK, "put_position failed: %08x\n", hres); + ok(hres == S_OK, "put_position failed: %08lx\n", hres); SysFreeString(str); str = NULL; hres = IHTMLStyle2_get_position(style2, &str); - ok(hres == S_OK, "get_position failed: %08x\n", hres); + ok(hres == S_OK, "get_position failed: %08lx\n", hres); ok(!lstrcmpW(str, L"absolute"), "get_position returned %s\n", wine_dbgstr_w(str)); SysFreeString(str); /* Test right */ V_VT(&v) = VT_EMPTY; hres = IHTMLStyle2_get_right(style2, &v); - ok(hres == S_OK, "get_top failed: %08x\n", hres); + ok(hres == S_OK, "get_top failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(right)=%d\n", V_VT(&v)); ok(!V_BSTR(&v), "V_BSTR(right) != NULL\n"); VariantClear(&v); @@ -385,12 +385,12 @@ static void test_style2(IHTMLStyle2 *style2) V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"3px"); hres = IHTMLStyle2_put_right(style2, v); - ok(hres == S_OK, "put_right failed: %08x\n", hres); + ok(hres == S_OK, "put_right failed: %08lx\n", hres); VariantClear(&v); V_VT(&v) = VT_EMPTY; hres = IHTMLStyle2_get_right(style2, &v); - ok(hres == S_OK, "get_right failed: %08x\n", hres); + ok(hres == S_OK, "get_right failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"3px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -398,93 +398,93 @@ static void test_style2(IHTMLStyle2 *style2) /* direction */ str = (void*)0xdeadbeef; hres = IHTMLStyle2_get_direction(style2, &str); - ok(hres == S_OK, "get_direction failed: %08x\n", hres); + ok(hres == S_OK, "get_direction failed: %08lx\n", hres); ok(!str, "str = %s\n", wine_dbgstr_w(str)); str = SysAllocString(L"ltr"); hres = IHTMLStyle2_put_direction(style2, str); - ok(hres == S_OK, "put_direction failed: %08x\n", hres); + ok(hres == S_OK, "put_direction failed: %08lx\n", hres); SysFreeString(str); str = NULL; hres = IHTMLStyle2_get_direction(style2, &str); - ok(hres == S_OK, "get_direction failed: %08x\n", hres); + ok(hres == S_OK, "get_direction failed: %08lx\n", hres); ok(!lstrcmpW(str, L"ltr"), "str = %s\n", wine_dbgstr_w(str)); SysFreeString(str); /* bottom */ V_VT(&v) = VT_EMPTY; hres = IHTMLStyle2_get_bottom(style2, &v); - ok(hres == S_OK, "get_bottom failed: %08x\n", hres); + ok(hres == S_OK, "get_bottom failed: %08lx\n", hres); test_var_bstr(&v, NULL); V_VT(&v) = VT_I4; V_I4(&v) = 4; hres = IHTMLStyle2_put_bottom(style2, v); - ok(hres == S_OK, "put_bottom failed: %08x\n", hres); + ok(hres == S_OK, "put_bottom failed: %08lx\n", hres); V_VT(&v) = VT_EMPTY; hres = IHTMLStyle2_get_bottom(style2, &v); - ok(hres == S_OK, "get_bottom failed: %08x\n", hres); + ok(hres == S_OK, "get_bottom failed: %08lx\n", hres); test_var_bstr(&v, compat_mode < COMPAT_IE9 ? L"4px" : NULL); /* overflowX */ str = (void*)0xdeadbeef; hres = IHTMLStyle2_get_overflowX(style2, &str); - ok(hres == S_OK, "get_overflowX failed: %08x\n", hres); + ok(hres == S_OK, "get_overflowX failed: %08lx\n", hres); ok(!str, "overflowX = %s\n", wine_dbgstr_w(str)); str = SysAllocString(L"hidden"); hres = IHTMLStyle2_put_overflowX(style2, str); - ok(hres == S_OK, "put_overflowX failed: %08x\n", hres); + ok(hres == S_OK, "put_overflowX failed: %08lx\n", hres); SysFreeString(str); str = NULL; hres = IHTMLStyle2_get_overflowX(style2, &str); - ok(hres == S_OK, "get_overflowX failed: %08x\n", hres); + ok(hres == S_OK, "get_overflowX failed: %08lx\n", hres); ok(!lstrcmpW(str, L"hidden"), "overflowX = %s\n", wine_dbgstr_w(str)); /* overflowY */ str = (void*)0xdeadbeef; hres = IHTMLStyle2_get_overflowY(style2, &str); - ok(hres == S_OK, "get_overflowY failed: %08x\n", hres); + ok(hres == S_OK, "get_overflowY failed: %08lx\n", hres); ok(!str, "overflowY = %s\n", wine_dbgstr_w(str)); str = SysAllocString(L"hidden"); hres = IHTMLStyle2_put_overflowY(style2, str); - ok(hres == S_OK, "put_overflowY failed: %08x\n", hres); + ok(hres == S_OK, "put_overflowY failed: %08lx\n", hres); SysFreeString(str); str = NULL; hres = IHTMLStyle2_get_overflowY(style2, &str); - ok(hres == S_OK, "get_overflowY failed: %08x\n", hres); + ok(hres == S_OK, "get_overflowY failed: %08lx\n", hres); ok(!lstrcmpW(str, L"hidden"), "overflowX = %s\n", wine_dbgstr_w(str)); /* tableLayout */ str = SysAllocString(L"fixed"); hres = IHTMLStyle2_put_tableLayout(style2, str); - ok(hres == S_OK, "put_tableLayout failed: %08x\n", hres); + ok(hres == S_OK, "put_tableLayout failed: %08lx\n", hres); SysFreeString(str); str = (void*)0xdeadbeef; hres = IHTMLStyle2_get_tableLayout(style2, &str); - ok(hres == S_OK, "get_tableLayout failed: %08x\n", hres); + ok(hres == S_OK, "get_tableLayout failed: %08lx\n", hres); ok(!lstrcmpW(str, L"fixed"), "tableLayout = %s\n", wine_dbgstr_w(str)); SysFreeString(str); /* borderCollapse */ str = (void*)0xdeadbeef; hres = IHTMLStyle2_get_borderCollapse(style2, &str); - ok(hres == S_OK, "get_borderCollapse failed: %08x\n", hres); + ok(hres == S_OK, "get_borderCollapse failed: %08lx\n", hres); ok(!str, "borderCollapse = %s\n", wine_dbgstr_w(str)); str = SysAllocString(L"separate"); hres = IHTMLStyle2_put_borderCollapse(style2, str); - ok(hres == S_OK, "put_borderCollapse failed: %08x\n", hres); + ok(hres == S_OK, "put_borderCollapse failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLStyle2_get_borderCollapse(style2, &str); - ok(hres == S_OK, "get_borderCollapse failed: %08x\n", hres); + ok(hres == S_OK, "get_borderCollapse failed: %08lx\n", hres); ok(!lstrcmpW(str, L"separate"), "borderCollapse = %s\n", wine_dbgstr_w(str)); SysFreeString(str); } @@ -497,23 +497,23 @@ static void test_style3(IHTMLStyle3 *style3, IHTMLCSSStyleDeclaration *css_style str = (void*)0xdeadbeef; hres = IHTMLStyle3_get_wordWrap(style3, &str); - ok(hres == S_OK, "get_wordWrap failed: %08x\n", hres); + ok(hres == S_OK, "get_wordWrap failed: %08lx\n", hres); ok(!str, "str != NULL\n"); str = SysAllocString(L"break-word"); hres = IHTMLStyle3_put_wordWrap(style3, str); - ok(hres == S_OK, "put_wordWrap failed: %08x\n", hres); + ok(hres == S_OK, "put_wordWrap failed: %08lx\n", hres); SysFreeString(str); str = NULL; hres = IHTMLStyle3_get_wordWrap(style3, &str); - ok(hres == S_OK, "get_wordWrap failed: %08x\n", hres); + ok(hres == S_OK, "get_wordWrap failed: %08lx\n", hres); ok(!lstrcmpW(str, L"break-word"), "get_wordWrap returned %s\n", wine_dbgstr_w(str)); SysFreeString(str); V_VT(&v) = VT_ERROR; hres = IHTMLStyle3_get_zoom(style3, &v); - ok(hres == S_OK, "get_zoom failed: %08x\n", hres); + ok(hres == S_OK, "get_zoom failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(zoom) = %d\n", V_VT(&v)); ok(!V_BSTR(&v), "V_BSTR(zoom) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -521,19 +521,19 @@ static void test_style3(IHTMLStyle3 *style3, IHTMLCSSStyleDeclaration *css_style V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"100%"); hres = IHTMLStyle3_put_zoom(style3, v); - ok(hres == S_OK, "put_zoom failed: %08x\n", hres); + ok(hres == S_OK, "put_zoom failed: %08lx\n", hres); VariantClear(&v); V_VT(&v) = VT_ERROR; hres = IHTMLStyle3_get_zoom(style3, &v); - ok(hres == S_OK, "get_zoom failed: %08x\n", hres); + ok(hres == S_OK, "get_zoom failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(zoom) = %d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"100%"), "V_BSTR(zoom) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); if(css_style) { hres = IHTMLCSSStyleDeclaration_get_zoom(css_style, &v); - ok(hres == S_OK, "get_zoom failed: %08x\n", hres); + ok(hres == S_OK, "get_zoom failed: %08lx\n", hres); test_var_bstr(&v, L"100%"); VariantClear(&v); } @@ -541,11 +541,11 @@ static void test_style3(IHTMLStyle3 *style3, IHTMLCSSStyleDeclaration *css_style V_VT(&v) = VT_I4; V_I4(&v) = 1; hres = IHTMLStyle3_put_zoom(style3, v); - ok(hres == S_OK, "put_zoom failed: %08x\n", hres); + ok(hres == S_OK, "put_zoom failed: %08lx\n", hres); V_VT(&v) = VT_ERROR; hres = IHTMLStyle3_get_zoom(style3, &v); - ok(hres == S_OK, "get_zoom failed: %08x\n", hres); + ok(hres == S_OK, "get_zoom failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(zoom) = %d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"1"), "V_BSTR(zoom) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -554,11 +554,11 @@ static void test_style3(IHTMLStyle3 *style3, IHTMLCSSStyleDeclaration *css_style V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"100%"); hres = IHTMLCSSStyleDeclaration_put_zoom(css_style, v); - ok(hres == S_OK, "put_zoom failed: %08x\n", hres); + ok(hres == S_OK, "put_zoom failed: %08lx\n", hres); VariantClear(&v); hres = IHTMLCSSStyleDeclaration_get_zoom(css_style, &v); - ok(hres == S_OK, "get_zoom failed: %08x\n", hres); + ok(hres == S_OK, "get_zoom failed: %08lx\n", hres); test_var_bstr(&v, L"100%"); VariantClear(&v); } @@ -571,22 +571,22 @@ static void test_style4(IHTMLStyle4 *style4) VARIANT vdefault; hres = IHTMLStyle4_get_minHeight(style4, &vdefault); - ok(hres == S_OK, "get_minHeight failed: %08x\n", hres); + ok(hres == S_OK, "get_minHeight failed: %08lx\n", hres); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"10px"); hres = IHTMLStyle4_put_minHeight(style4, v); - ok(hres == S_OK, "put_minHeight failed: %08x\n", hres); + ok(hres == S_OK, "put_minHeight failed: %08lx\n", hres); VariantClear(&v); hres = IHTMLStyle4_get_minHeight(style4, &v); - ok(hres == S_OK, "get_minHeight failed: %08x\n", hres); + ok(hres == S_OK, "get_minHeight failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); ok( !lstrcmpW(V_BSTR(&v), L"10px"), "expect 10px got (%s)\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); hres = IHTMLStyle4_put_minHeight(style4, vdefault); - ok(hres == S_OK, "put_minHeight failed: %08x\n", hres); + ok(hres == S_OK, "put_minHeight failed: %08lx\n", hres); VariantClear(&vdefault); } @@ -598,16 +598,16 @@ static void test_style5(IHTMLStyle5 *style5) /* minWidth */ hres = IHTMLStyle5_get_minWidth(style5, &vdefault); - ok(hres == S_OK, "get_minWidth failed: %08x\n", hres); + ok(hres == S_OK, "get_minWidth failed: %08lx\n", hres); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"12px"); hres = IHTMLStyle5_put_minWidth(style5, v); - ok(hres == S_OK, "put_minWidth failed: %08x\n", hres); + ok(hres == S_OK, "put_minWidth failed: %08lx\n", hres); VariantClear(&v); hres = IHTMLStyle5_get_minWidth(style5, &v); - ok(hres == S_OK, "get_minWidth failed: %08x\n", hres); + ok(hres == S_OK, "get_minWidth failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"12px"), "expect 12px got (%s)\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -615,11 +615,11 @@ static void test_style5(IHTMLStyle5 *style5) V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"10%"); hres = IHTMLStyle5_put_minWidth(style5, v); - ok(hres == S_OK, "put_minWidth failed: %08x\n", hres); + ok(hres == S_OK, "put_minWidth failed: %08lx\n", hres); VariantClear(&v); hres = IHTMLStyle5_get_minWidth(style5, &v); - ok(hres == S_OK, "get_minWidth failed: %08x\n", hres); + ok(hres == S_OK, "get_minWidth failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"10%"), "expect 10%% got (%s)\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -627,30 +627,30 @@ static void test_style5(IHTMLStyle5 *style5) V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"10"); hres = IHTMLStyle5_put_minWidth(style5, v); - ok(hres == S_OK, "put_minWidth failed: %08x\n", hres); + ok(hres == S_OK, "put_minWidth failed: %08lx\n", hres); VariantClear(&v); hres = IHTMLStyle5_get_minWidth(style5, &v); - ok(hres == S_OK, "get_minWidth failed: %08x\n", hres); + ok(hres == S_OK, "get_minWidth failed: %08lx\n", hres); test_var_bstr(&v, compat_mode < COMPAT_IE9 ? L"10px" : L"10%"); VariantClear(&v); hres = IHTMLStyle5_put_minWidth(style5, vdefault); - ok(hres == S_OK, "put_minWidth failed: %08x\n", hres); + ok(hres == S_OK, "put_minWidth failed: %08lx\n", hres); VariantClear(&vdefault); /* maxWidth */ hres = IHTMLStyle5_get_maxWidth(style5, &vdefault); - ok(hres == S_OK, "get_maxWidth failed: %08x\n", hres); + ok(hres == S_OK, "get_maxWidth failed: %08lx\n", hres); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"200px"); hres = IHTMLStyle5_put_maxWidth(style5, v); - ok(hres == S_OK, "put_maxWidth failed: %08x\n", hres); + ok(hres == S_OK, "put_maxWidth failed: %08lx\n", hres); VariantClear(&v); hres = IHTMLStyle5_get_maxWidth(style5, &v); - ok(hres == S_OK, "get_maxWidth failed: %08x\n", hres); + ok(hres == S_OK, "get_maxWidth failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n",V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"200px"), "expect 200px got (%s)\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -658,31 +658,31 @@ static void test_style5(IHTMLStyle5 *style5) V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"70%"); hres = IHTMLStyle5_put_maxWidth(style5, v); - ok(hres == S_OK, "put_maxWidth failed: %08x\n", hres); + ok(hres == S_OK, "put_maxWidth failed: %08lx\n", hres); VariantClear(&v); hres = IHTMLStyle5_get_maxWidth(style5, &v); - ok(hres == S_OK, "get maxWidth failed: %08x\n", hres); + ok(hres == S_OK, "get maxWidth failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"70%"), "expect 70%% got (%s)\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); hres = IHTMLStyle5_put_maxWidth(style5,vdefault); - ok(hres == S_OK, "put_maxWidth failed: %08x\n", hres); + ok(hres == S_OK, "put_maxWidth failed: %08lx\n", hres); VariantClear(&vdefault); /* maxHeight */ hres = IHTMLStyle5_get_maxHeight(style5, &vdefault); - ok(hres == S_OK, "get maxHeight failed: %08x\n", hres); + ok(hres == S_OK, "get maxHeight failed: %08lx\n", hres); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"200px"); hres = IHTMLStyle5_put_maxHeight(style5, v); - ok(hres == S_OK, "put maxHeight failed: %08x\n", hres); + ok(hres == S_OK, "put maxHeight failed: %08lx\n", hres); VariantClear(&v); hres = IHTMLStyle5_get_maxHeight(style5, &v); - ok(hres == S_OK, "get maxHeight failed: %08x\n", hres); + ok(hres == S_OK, "get maxHeight failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"200px"), "expect 200px got (%s)\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -690,11 +690,11 @@ static void test_style5(IHTMLStyle5 *style5) V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"70%"); hres = IHTMLStyle5_put_maxHeight(style5, v); - ok(hres == S_OK, "put maxHeight failed: %08x\n", hres); + ok(hres == S_OK, "put maxHeight failed: %08lx\n", hres); VariantClear(&v); hres = IHTMLStyle5_get_maxHeight(style5, &v); - ok(hres == S_OK, "get_maxHeight failed: %08x\n", hres); + ok(hres == S_OK, "get_maxHeight failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"70%"), "expect 70%% got (%s)\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -702,16 +702,16 @@ static void test_style5(IHTMLStyle5 *style5) V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"100"); hres = IHTMLStyle5_put_maxHeight(style5, v); - ok(hres == S_OK, "put maxHeight failed: %08x\n", hres); + ok(hres == S_OK, "put maxHeight failed: %08lx\n", hres); VariantClear(&v); hres = IHTMLStyle5_get_maxHeight(style5, &v); - ok(hres == S_OK, "get_maxHeight failed: %08x\n", hres); + ok(hres == S_OK, "get_maxHeight failed: %08lx\n", hres); test_var_bstr(&v, compat_mode < COMPAT_IE9 ? L"100px" : L"70%"); VariantClear(&v); hres = IHTMLStyle5_put_maxHeight(style5, vdefault); - ok(hres == S_OK, "put maxHeight failed:%08x\n", hres); + ok(hres == S_OK, "put maxHeight failed:%08lx\n", hres); VariantClear(&vdefault); } @@ -722,7 +722,7 @@ static void test_style6(IHTMLStyle6 *style) str = (void*)0xdeadbeef; hres = IHTMLStyle6_get_outline(style, &str); - ok(hres == S_OK, "get_outline failed: %08x\n", hres); + ok(hres == S_OK, "get_outline failed: %08lx\n", hres); if(compat_mode < COMPAT_IE9) ok(str && !*str, "outline = %s\n", wine_dbgstr_w(str)); else @@ -731,44 +731,44 @@ static void test_style6(IHTMLStyle6 *style) str = SysAllocString(L"1px"); hres = IHTMLStyle6_put_outline(style, str); - ok(hres == S_OK, "put_outline failed: %08x\n", hres); + ok(hres == S_OK, "put_outline failed: %08lx\n", hres); SysFreeString(str); str = (void*)0xdeadbeef; hres = IHTMLStyle6_get_outline(style, &str); - ok(hres == S_OK, "get_outline failed: %08x\n", hres); + ok(hres == S_OK, "get_outline failed: %08lx\n", hres); ok(wcsstr(str, L"1px") != NULL, "outline = %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = (void*)0xdeadbeef; hres = IHTMLStyle6_get_boxSizing(style, &str); - ok(hres == S_OK, "get_boxSizing failed: %08x\n", hres); + ok(hres == S_OK, "get_boxSizing failed: %08lx\n", hres); ok(!str, "boxSizing = %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = SysAllocString(L"border-box"); hres = IHTMLStyle6_put_boxSizing(style, str); - ok(hres == S_OK, "put_boxSizing failed: %08x\n", hres); + ok(hres == S_OK, "put_boxSizing failed: %08lx\n", hres); SysFreeString(str); str = NULL; hres = IHTMLStyle6_get_boxSizing(style, &str); - ok(hres == S_OK, "get_boxSizing failed: %08x\n", hres); + ok(hres == S_OK, "get_boxSizing failed: %08lx\n", hres); ok(!lstrcmpW(str, L"border-box"), "boxSizing = %s\n", wine_dbgstr_w(str)); SysFreeString(str); hres = IHTMLStyle6_get_borderSpacing(style, &str); - ok(hres == S_OK, "get_borderSpacing failed: %08x\n", hres); + ok(hres == S_OK, "get_borderSpacing failed: %08lx\n", hres); ok(!str, "borderSpacing = %s\n", wine_dbgstr_w(str)); str = SysAllocString(L"10px"); hres = IHTMLStyle6_put_borderSpacing(style, str); - ok(hres == S_OK, "put_borderSpacing failed: %08x\n", hres); + ok(hres == S_OK, "put_borderSpacing failed: %08lx\n", hres); SysFreeString(str); str = NULL; hres = IHTMLStyle6_get_borderSpacing(style, &str); - ok(hres == S_OK, "get_borderSpacing failed: %08x\n", hres); + ok(hres == S_OK, "get_borderSpacing failed: %08lx\n", hres); ok(!lstrcmpW(str, L"10px"), "borderSpacing = %s\n", wine_dbgstr_w(str)); SysFreeString(str); } @@ -780,51 +780,51 @@ static void test_css_style_declaration(IHTMLCSSStyleDeclaration *css_style) HRESULT hres; hres = IHTMLCSSStyleDeclaration_get_backgroundClip(css_style, &str); - ok(hres == S_OK, "get_backgroundClip failed: %08x\n", hres); + ok(hres == S_OK, "get_backgroundClip failed: %08lx\n", hres); ok(!str, "backgroundClip = %s\n", wine_dbgstr_w(str)); str = SysAllocString(L"border-box"); hres = IHTMLCSSStyleDeclaration_put_backgroundClip(css_style, str); - ok(hres == S_OK, "put_backgroundClip failed: %08x\n", hres); + ok(hres == S_OK, "put_backgroundClip failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLCSSStyleDeclaration_get_backgroundClip(css_style, &str); - ok(hres == S_OK, "get_backgroundClip failed: %08x\n", hres); + ok(hres == S_OK, "get_backgroundClip failed: %08lx\n", hres); ok(!lstrcmpW(str, L"border-box"), "backgroundClip = %s\n", wine_dbgstr_w(str)); SysFreeString(str); hres = IHTMLCSSStyleDeclaration_get_opacity(css_style, &v); - ok(hres == S_OK, "get_opacity failed: %08x\n", hres); + ok(hres == S_OK, "get_opacity failed: %08lx\n", hres); test_var_bstr(&v, NULL); V_VT(&v) = VT_I4; V_I4(&v) = 0; hres = IHTMLCSSStyleDeclaration_put_opacity(css_style, v); - ok(hres == S_OK, "put_opacity failed: %08x\n", hres); + ok(hres == S_OK, "put_opacity failed: %08lx\n", hres); hres = IHTMLCSSStyleDeclaration_get_opacity(css_style, &v); - ok(hres == S_OK, "get_opacity failed: %08x\n", hres); + ok(hres == S_OK, "get_opacity failed: %08lx\n", hres); test_var_bstr(&v, L"0"); VariantClear(&v); V_VT(&v) = VT_R8; V_R8(&v) = 0.5; hres = IHTMLCSSStyleDeclaration_put_opacity(css_style, v); - ok(hres == S_OK, "put_opacity failed: %08x\n", hres); + ok(hres == S_OK, "put_opacity failed: %08lx\n", hres); hres = IHTMLCSSStyleDeclaration_get_opacity(css_style, &v); - ok(hres == S_OK, "get_opacity failed: %08x\n", hres); + ok(hres == S_OK, "get_opacity failed: %08lx\n", hres); test_var_bstr(&v, L"0.5"); VariantClear(&v); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"1"); hres = IHTMLCSSStyleDeclaration_put_opacity(css_style, v); - ok(hres == S_OK, "put_opacity failed: %08x\n", hres); + ok(hres == S_OK, "put_opacity failed: %08lx\n", hres); VariantClear(&v); hres = IHTMLCSSStyleDeclaration_get_opacity(css_style, &v); - ok(hres == S_OK, "get_opacity failed: %08x\n", hres); + ok(hres == S_OK, "get_opacity failed: %08lx\n", hres); test_var_bstr(&v, L"1"); VariantClear(&v); } @@ -837,74 +837,74 @@ static void test_css_style_declaration2(IHTMLCSSStyleDeclaration2 *css_style) str = SysAllocString(L"translate(30px, 20px)"); hres = IHTMLCSSStyleDeclaration2_put_transform(css_style, str); - ok(hres == S_OK, "put_transform failed: %08x\n", hres); + ok(hres == S_OK, "put_transform failed: %08lx\n", hres); SysFreeString(str); str = NULL; hres = IHTMLCSSStyleDeclaration2_get_transform(css_style, &str); - ok(hres == S_OK, "get_transform failed: %08x\n", hres); + ok(hres == S_OK, "get_transform failed: %08lx\n", hres); ok(!lstrcmpW(str, L"translate(30px, 20px)"), "transform = %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = SysAllocString(L"none"); hres = IHTMLCSSStyleDeclaration2_put_transform(css_style, str); - ok(hres == S_OK, "put_transform failed: %08x\n", hres); + ok(hres == S_OK, "put_transform failed: %08lx\n", hres); SysFreeString(str); str = NULL; hres = IHTMLCSSStyleDeclaration2_get_transform(css_style, &str); - ok(hres == S_OK, "get_transform failed: %08x\n", hres); + ok(hres == S_OK, "get_transform failed: %08lx\n", hres); ok(!lstrcmpW(str, L"none"), "transform = %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = NULL; hres = IHTMLCSSStyleDeclaration2_get_animationName(css_style, &str); - ok(hres == S_OK, "get_animationName failed: %08x\n", hres); + ok(hres == S_OK, "get_animationName failed: %08lx\n", hres); ok(!str, "animationName = %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = SysAllocString(L"none"); hres = IHTMLCSSStyleDeclaration2_put_animationName(css_style, str); - ok(hres == S_OK, "put_animationName failed: %08x\n", hres); + ok(hres == S_OK, "put_animationName failed: %08lx\n", hres); SysFreeString(str); str = NULL; hres = IHTMLCSSStyleDeclaration2_get_animationName(css_style, &str); - ok(hres == S_OK, "get_animationName failed: %08x\n", hres); + ok(hres == S_OK, "get_animationName failed: %08lx\n", hres); ok(!lstrcmpW(str, L"none"), "animationName = %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = NULL; hres = IHTMLCSSStyleDeclaration2_get_transition(css_style, &str); - ok(hres == S_OK, "get_transition failed: %08x\n", hres); + ok(hres == S_OK, "get_transition failed: %08lx\n", hres); ok(!str, "transition = %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = SysAllocString(L"marigin-right 1s ease-out"); hres = IHTMLCSSStyleDeclaration2_put_transition(css_style, str); - ok(hres == S_OK, "put_transition failed: %08x\n", hres); + ok(hres == S_OK, "put_transition failed: %08lx\n", hres); SysFreeString(str); str = NULL; hres = IHTMLCSSStyleDeclaration2_get_transition(css_style, &str); - ok(hres == S_OK, "get_transition failed: %08x\n", hres); + ok(hres == S_OK, "get_transition failed: %08lx\n", hres); ok(!wcsncmp(str, L"marigin-right 1s", wcslen(L"marigin-right 1s")), "transition = %s\n", wine_dbgstr_w(str)); SysFreeString(str); V_VT(&v) = VT_ERROR; hres = IHTMLCSSStyleDeclaration2_get_columnCount(css_style, &v); - ok(hres == S_OK, "get_columnCount failed: %08x\n", hres); + ok(hres == S_OK, "get_columnCount failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR && !V_BSTR(&v), "columnCount = %s\n", wine_dbgstr_variant(&v)); VariantClear(&v); V_VT(&v) = VT_I4; V_I4(&v) = 2; hres = IHTMLCSSStyleDeclaration2_put_columnCount(css_style, v); - ok(hres == S_OK, "put_columnCount failed: %08x\n", hres); + ok(hres == S_OK, "put_columnCount failed: %08lx\n", hres); V_VT(&v) = VT_ERROR; hres = IHTMLCSSStyleDeclaration2_get_columnCount(css_style, &v); - ok(hres == S_OK, "get_columnCount failed: %08x\n", hres); + ok(hres == S_OK, "get_columnCount failed: %08lx\n", hres); todo_wine ok(V_VT(&v) == VT_BSTR && V_BSTR(&v) && !lstrcmpW(V_BSTR(&v), L"2"), "columnCount = %s\n", wine_dbgstr_variant(&v)); VariantClear(&v); @@ -912,229 +912,229 @@ static void test_css_style_declaration2(IHTMLCSSStyleDeclaration2 *css_style) V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"auto"); hres = IHTMLCSSStyleDeclaration2_put_columnCount(css_style, v); - ok(hres == S_OK, "put_columnCount failed: %08x\n", hres); + ok(hres == S_OK, "put_columnCount failed: %08lx\n", hres); VariantClear(&v); V_VT(&v) = VT_ERROR; hres = IHTMLCSSStyleDeclaration2_get_columnCount(css_style, &v); - ok(hres == S_OK, "get_columnCount failed: %08x\n", hres); + ok(hres == S_OK, "get_columnCount failed: %08lx\n", hres); todo_wine ok(V_VT(&v) == VT_BSTR && V_BSTR(&v) && !lstrcmpW(V_BSTR(&v), L"auto"), "columnCount = %s\n", wine_dbgstr_variant(&v)); VariantClear(&v); V_VT(&v) = VT_ERROR; hres = IHTMLCSSStyleDeclaration2_get_columnWidth(css_style, &v); - ok(hres == S_OK, "get_columnWidth failed: %08x\n", hres); + ok(hres == S_OK, "get_columnWidth failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR && !V_BSTR(&v), "columnWidth = %s\n", wine_dbgstr_variant(&v)); VariantClear(&v); V_VT(&v) = VT_I4; V_I4(&v) = 20; hres = IHTMLCSSStyleDeclaration2_put_columnWidth(css_style, v); - ok(hres == S_OK, "put_columnWidth failed: %08x\n", hres); + ok(hres == S_OK, "put_columnWidth failed: %08lx\n", hres); V_VT(&v) = VT_ERROR; hres = IHTMLCSSStyleDeclaration2_get_columnWidth(css_style, &v); - ok(hres == S_OK, "get_columnWidth failed: %08x\n", hres); + ok(hres == S_OK, "get_columnWidth failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR && !V_BSTR(&v), "columnWidth = %s\n", wine_dbgstr_variant(&v)); VariantClear(&v); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"20px"); hres = IHTMLCSSStyleDeclaration2_put_columnWidth(css_style, v); - ok(hres == S_OK, "put_columnWidth failed: %08x\n", hres); + ok(hres == S_OK, "put_columnWidth failed: %08lx\n", hres); VariantClear(&v); V_VT(&v) = VT_ERROR; hres = IHTMLCSSStyleDeclaration2_get_columnWidth(css_style, &v); - ok(hres == S_OK, "get_columnWidth failed: %08x\n", hres); + ok(hres == S_OK, "get_columnWidth failed: %08lx\n", hres); todo_wine ok(V_VT(&v) == VT_BSTR && V_BSTR(&v) && !lstrcmpW(V_BSTR(&v), L"20px"), "columnWidth = %s\n", wine_dbgstr_variant(&v)); VariantClear(&v); V_VT(&v) = VT_ERROR; hres = IHTMLCSSStyleDeclaration2_get_columnGap(css_style, &v); - ok(hres == S_OK, "get_columnGap failed: %08x\n", hres); + ok(hres == S_OK, "get_columnGap failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR && !V_BSTR(&v), "columnGap = %s\n", wine_dbgstr_variant(&v)); VariantClear(&v); V_VT(&v) = VT_I4; V_I4(&v) = 20; hres = IHTMLCSSStyleDeclaration2_put_columnGap(css_style, v); - ok(hres == S_OK, "put_columnGap failed: %08x\n", hres); + ok(hres == S_OK, "put_columnGap failed: %08lx\n", hres); V_VT(&v) = VT_ERROR; hres = IHTMLCSSStyleDeclaration2_get_columnGap(css_style, &v); - ok(hres == S_OK, "get_columnGap failed: %08x\n", hres); + ok(hres == S_OK, "get_columnGap failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR && !V_BSTR(&v), "columnGap = %s\n", wine_dbgstr_variant(&v)); VariantClear(&v); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"20px"); hres = IHTMLCSSStyleDeclaration2_put_columnGap(css_style, v); - ok(hres == S_OK, "put_columnGap failed: %08x\n", hres); + ok(hres == S_OK, "put_columnGap failed: %08lx\n", hres); VariantClear(&v); V_VT(&v) = VT_ERROR; hres = IHTMLCSSStyleDeclaration2_get_columnGap(css_style, &v); - ok(hres == S_OK, "get_columnGap failed: %08x\n", hres); + ok(hres == S_OK, "get_columnGap failed: %08lx\n", hres); todo_wine ok(V_VT(&v) == VT_BSTR && V_BSTR(&v) && !lstrcmpW(V_BSTR(&v), L"20px"), "columnGap = %s\n", wine_dbgstr_variant(&v)); VariantClear(&v); str = NULL; hres = IHTMLCSSStyleDeclaration2_get_columnFill(css_style, &str); - ok(hres == S_OK, "get_columnFill failed: %08x\n", hres); + ok(hres == S_OK, "get_columnFill failed: %08lx\n", hres); ok(!str, "columnFill = %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = SysAllocString(L"auto"); hres = IHTMLCSSStyleDeclaration2_put_columnFill(css_style, str); - ok(hres == S_OK, "put_columnFill failed: %08x\n", hres); + ok(hres == S_OK, "put_columnFill failed: %08lx\n", hres); SysFreeString(str); str = NULL; hres = IHTMLCSSStyleDeclaration2_get_columnFill(css_style, &str); - ok(hres == S_OK, "get_columnFill failed: %08x\n", hres); + ok(hres == S_OK, "get_columnFill failed: %08lx\n", hres); todo_wine ok(str && !lstrcmpW(str, L"auto"), "columnFill = %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = NULL; hres = IHTMLCSSStyleDeclaration2_get_columnSpan(css_style, &str); - ok(hres == S_OK, "get_columnSpan failed: %08x\n", hres); + ok(hres == S_OK, "get_columnSpan failed: %08lx\n", hres); ok(!str, "columnSpan = %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = SysAllocString(L"all"); hres = IHTMLCSSStyleDeclaration2_put_columnSpan(css_style, str); - ok(hres == S_OK, "put_columnSpan failed: %08x\n", hres); + ok(hres == S_OK, "put_columnSpan failed: %08lx\n", hres); SysFreeString(str); str = NULL; hres = IHTMLCSSStyleDeclaration2_get_columnSpan(css_style, &str); - ok(hres == S_OK, "get_columnSpan failed: %08x\n", hres); + ok(hres == S_OK, "get_columnSpan failed: %08lx\n", hres); todo_wine ok(str && !lstrcmpW(str, L"all"), "columnSpan = %s\n", wine_dbgstr_w(str)); SysFreeString(str); V_VT(&v) = VT_ERROR; hres = IHTMLCSSStyleDeclaration2_get_columnRuleColor(css_style, &v); - ok(hres == S_OK, "get_columnRuleColor failed: %08x\n", hres); + ok(hres == S_OK, "get_columnRuleColor failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR && !V_BSTR(&v), "columnRuleColor = %s\n", wine_dbgstr_variant(&v)); VariantClear(&v); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"red"); hres = IHTMLCSSStyleDeclaration2_put_columnRuleColor(css_style, v); - ok(hres == S_OK, "put_columnRuleColor failed: %08x\n", hres); + ok(hres == S_OK, "put_columnRuleColor failed: %08lx\n", hres); VariantClear(&v); V_VT(&v) = VT_ERROR; hres = IHTMLCSSStyleDeclaration2_get_columnRuleColor(css_style, &v); - ok(hres == S_OK, "get_columnRuleColor failed: %08x\n", hres); + ok(hres == S_OK, "get_columnRuleColor failed: %08lx\n", hres); todo_wine ok(V_VT(&v) == VT_BSTR && V_BSTR(&v) && !lstrcmpW(V_BSTR(&v), L"red"), "columnRuleColor = %s\n", wine_dbgstr_variant(&v)); VariantClear(&v); str = NULL; hres = IHTMLCSSStyleDeclaration2_get_columnRuleStyle(css_style, &str); - ok(hres == S_OK, "get_columnRuleStyle failed: %08x\n", hres); + ok(hres == S_OK, "get_columnRuleStyle failed: %08lx\n", hres); ok(!str, "columnRuleStyle = %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = SysAllocString(L"solid"); hres = IHTMLCSSStyleDeclaration2_put_columnRuleStyle(css_style, str); - ok(hres == S_OK, "put_columnRuleStyle failed: %08x\n", hres); + ok(hres == S_OK, "put_columnRuleStyle failed: %08lx\n", hres); SysFreeString(str); str = NULL; hres = IHTMLCSSStyleDeclaration2_get_columnRuleStyle(css_style, &str); - ok(hres == S_OK, "get_columnRuleStyle failed: %08x\n", hres); + ok(hres == S_OK, "get_columnRuleStyle failed: %08lx\n", hres); todo_wine ok(str && !lstrcmpW(str, L"solid"), "columnRuleStyle = %s\n", wine_dbgstr_w(str)); SysFreeString(str); V_VT(&v) = VT_ERROR; hres = IHTMLCSSStyleDeclaration2_get_columnRuleWidth(css_style, &v); - ok(hres == S_OK, "get_columnRuleWidth failed: %08x\n", hres); + ok(hres == S_OK, "get_columnRuleWidth failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR && !V_BSTR(&v), "columnRuleWidth = %s\n", wine_dbgstr_variant(&v)); VariantClear(&v); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"10px"); hres = IHTMLCSSStyleDeclaration2_put_columnRuleWidth(css_style, v); - ok(hres == S_OK, "put_columnRuleWidth failed: %08x\n", hres); + ok(hres == S_OK, "put_columnRuleWidth failed: %08lx\n", hres); VariantClear(&v); V_VT(&v) = VT_ERROR; hres = IHTMLCSSStyleDeclaration2_get_columnRuleWidth(css_style, &v); - ok(hres == S_OK, "get_columnRuleWidth failed: %08x\n", hres); + ok(hres == S_OK, "get_columnRuleWidth failed: %08lx\n", hres); todo_wine ok(V_VT(&v) == VT_BSTR && V_BSTR(&v) && !lstrcmpW(V_BSTR(&v), L"10px"), "columnRuleWidth = %s\n", wine_dbgstr_variant(&v)); VariantClear(&v); str = NULL; hres = IHTMLCSSStyleDeclaration2_get_columnRule(css_style, &str); - ok(hres == S_OK, "get_columnRule failed: %08x\n", hres); + ok(hres == S_OK, "get_columnRule failed: %08lx\n", hres); todo_wine ok(str && !lstrcmpW(str, L"10px solid red"), "columnRule = %s\n", wine_dbgstr_w(str)); SysFreeString(str); hres = IHTMLCSSStyleDeclaration2_put_columnRule(css_style, NULL); - ok(hres == S_OK, "put_columnRule failed: %08x\n", hres); + ok(hres == S_OK, "put_columnRule failed: %08lx\n", hres); str = (void*)0xdeadbeef; hres = IHTMLCSSStyleDeclaration2_get_columnRule(css_style, &str); - ok(hres == S_OK, "get_columnRule failed: %08x\n", hres); + ok(hres == S_OK, "get_columnRule failed: %08lx\n", hres); ok(!str, "columnRule = %s\n", wine_dbgstr_w(str)); V_VT(&v) = VT_ERROR; hres = IHTMLCSSStyleDeclaration2_get_perspective(css_style, &v); - ok(hres == S_OK, "get_perspective failed: %08x\n", hres); + ok(hres == S_OK, "get_perspective failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR && !V_BSTR(&v), "perspective = %s\n", wine_dbgstr_variant(&v)); VariantClear(&v); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"100px"); hres = IHTMLCSSStyleDeclaration2_put_perspective(css_style, v); - ok(hres == S_OK, "put_perspective failed: %08x\n", hres); + ok(hres == S_OK, "put_perspective failed: %08lx\n", hres); VariantClear(&v); V_VT(&v) = VT_ERROR; hres = IHTMLCSSStyleDeclaration2_get_perspective(css_style, &v); - ok(hres == S_OK, "get_perspective failed: %08x\n", hres); + ok(hres == S_OK, "get_perspective failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR && V_BSTR(&v) && !lstrcmpW(V_BSTR(&v), L"100px"), "perspective = %s\n", wine_dbgstr_variant(&v)); VariantClear(&v); /* animation property */ hres = IHTMLCSSStyleDeclaration2_put_animation(css_style, NULL); - ok(hres == S_OK, "put_animation failed: %08x\n", hres); + ok(hres == S_OK, "put_animation failed: %08lx\n", hres); str = (void*)0xdeadbeef; hres = IHTMLCSSStyleDeclaration2_get_animation(css_style, &str); - ok(hres == S_OK, "get_animation failed: %08x\n", hres); + ok(hres == S_OK, "get_animation failed: %08lx\n", hres); ok(!str, "animation = %s\n", wine_dbgstr_w(str)); str = SysAllocString(L"test"); hres = IHTMLCSSStyleDeclaration2_put_animation(css_style, str); - ok(hres == S_OK, "put_animation failed: %08x\n", hres); + ok(hres == S_OK, "put_animation failed: %08lx\n", hres); SysFreeString(str); str = (void*)0xdeadbeef; hres = IHTMLCSSStyleDeclaration2_get_animation(css_style, &str); - ok(hres == S_OK, "get_animation failed: %08x\n", hres); + ok(hres == S_OK, "get_animation failed: %08lx\n", hres); todo_wine ok(!lstrcmpW(str, L"test"), "animation = %s\n", wine_dbgstr_w(str)); str = (void*)0xdeadbeef; hres = IHTMLCSSStyleDeclaration2_get_animationName(css_style, &str); - ok(hres == S_OK, "get_animationName failed: %08x\n", hres); + ok(hres == S_OK, "get_animationName failed: %08lx\n", hres); ok(!lstrcmpW(str, L"test"), "animationName = %s\n", wine_dbgstr_w(str)); str = SysAllocString(L"test"); hres = IHTMLCSSStyleDeclaration2_put_animation(css_style, NULL); - ok(hres == S_OK, "put_animation failed: %08x\n", hres); + ok(hres == S_OK, "put_animation failed: %08lx\n", hres); SysFreeString(str); } @@ -1159,34 +1159,34 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLCSSStyleDeclaration, (void**)&css_style); ok(hres == S_OK || broken(!is_ie9plus && hres == E_NOINTERFACE), - "Could not get IHTMLCSSStyleDeclaration interface: %08x\n", hres); + "Could not get IHTMLCSSStyleDeclaration interface: %08lx\n", hres); if(css_style) { hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLCSSStyleDeclaration2, (void**)&css_style2); ok(hres == S_OK || broken(hres == E_NOINTERFACE), - "Could not get IHTMLCSSStyleDeclaration2 interface: %08x\n", hres); + "Could not get IHTMLCSSStyleDeclaration2 interface: %08lx\n", hres); } test_style_csstext(style, NULL); hres = IHTMLStyle_get_position(style, &str); - ok(hres == S_OK, "get_position failed: %08x\n", hres); + ok(hres == S_OK, "get_position failed: %08lx\n", hres); ok(!str, "str=%s\n", wine_dbgstr_w(str)); V_VT(&v) = VT_NULL; hres = IHTMLStyle_get_marginRight(style, &v); - ok(hres == S_OK, "get_marginRight failed: %08x\n", hres); + ok(hres == S_OK, "get_marginRight failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(marginRight) = %d\n", V_VT(&v)); ok(!V_BSTR(&v), "V_BSTR(marginRight) = %s\n", wine_dbgstr_w(V_BSTR(&v))); V_VT(&v) = VT_I4; V_I4(&v) = 6; hres = IHTMLStyle_put_marginRight(style, v); - ok(hres == S_OK, "put_marginRight failed: %08x\n", hres); + ok(hres == S_OK, "put_marginRight failed: %08lx\n", hres); V_VT(&v) = VT_NULL; hres = IHTMLStyle_get_marginRight(style, &v); - ok(hres == S_OK, "get_marginRight failed: %08x\n", hres); + ok(hres == S_OK, "get_marginRight failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(marginRight) = %d\n", V_VT(&v)); if(compat_mode < COMPAT_IE9) ok(!lstrcmpW(V_BSTR(&v), L"6px"), "V_BSTR(marginRight) = %s\n", wine_dbgstr_w(V_BSTR(&v))); @@ -1197,11 +1197,11 @@ static void test_body_style(IHTMLStyle *style) V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"5"); hres = IHTMLStyle_put_marginRight(style, v); - ok(hres == S_OK, "put_marginRight failed: %08x\n", hres); + ok(hres == S_OK, "put_marginRight failed: %08lx\n", hres); V_VT(&v) = VT_NULL; hres = IHTMLStyle_get_marginRight(style, &v); - ok(hres == S_OK, "get_marginRight failed: %08x\n", hres); + ok(hres == S_OK, "get_marginRight failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(marginRight) = %d\n", V_VT(&v)); if(compat_mode < COMPAT_IE9) ok(!lstrcmpW(V_BSTR(&v), L"5px"), "V_BSTR(marginRight) = %s\n", wine_dbgstr_w(V_BSTR(&v))); @@ -1212,7 +1212,7 @@ static void test_body_style(IHTMLStyle *style) if(css_style) { V_VT(&v) = VT_NULL; hres = IHTMLCSSStyleDeclaration_get_marginRight(css_style, &v); - ok(hres == S_OK, "get_marginRight failed: %08x\n", hres); + ok(hres == S_OK, "get_marginRight failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(marginRight) = %d\n", V_VT(&v)); if(compat_mode < COMPAT_IE9) ok(!lstrcmpW(V_BSTR(&v), L"5px"), "V_BSTR(marginRight) = %s\n", @@ -1223,11 +1223,11 @@ static void test_body_style(IHTMLStyle *style) V_VT(&v) = VT_I4; V_I4(&v) = 7; hres = IHTMLCSSStyleDeclaration_put_marginRight(css_style, v); - ok(hres == S_OK, "put_marginRight failed: %08x\n", hres); + ok(hres == S_OK, "put_marginRight failed: %08lx\n", hres); V_VT(&v) = VT_NULL; hres = IHTMLCSSStyleDeclaration_get_marginRight(css_style, &v); - ok(hres == S_OK, "get_marginRight failed: %08x\n", hres); + ok(hres == S_OK, "get_marginRight failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(marginRight) = %d\n", V_VT(&v)); if(compat_mode < COMPAT_IE9) ok(!lstrcmpW(V_BSTR(&v), L"7px"), "V_BSTR(marginRight) = %s\n", @@ -1238,12 +1238,12 @@ static void test_body_style(IHTMLStyle *style) V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"8"); hres = IHTMLCSSStyleDeclaration_put_marginRight(css_style, v); - ok(hres == S_OK, "put_marginRight failed: %08x\n", hres); + ok(hres == S_OK, "put_marginRight failed: %08lx\n", hres); SysFreeString(V_BSTR(&v)); V_VT(&v) = VT_NULL; hres = IHTMLCSSStyleDeclaration_get_marginRight(css_style, &v); - ok(hres == S_OK, "get_marginRight failed: %08x\n", hres); + ok(hres == S_OK, "get_marginRight failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(marginRight) = %d\n", V_VT(&v)); if(compat_mode < COMPAT_IE9) ok(!lstrcmpW(V_BSTR(&v), L"8px"), "V_BSTR(marginRight) = %s\n", @@ -1254,12 +1254,12 @@ static void test_body_style(IHTMLStyle *style) V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"9px"); hres = IHTMLCSSStyleDeclaration_put_marginRight(css_style, v); - ok(hres == S_OK, "put_marginRight failed: %08x\n", hres); + ok(hres == S_OK, "put_marginRight failed: %08lx\n", hres); SysFreeString(V_BSTR(&v)); V_VT(&v) = VT_NULL; hres = IHTMLCSSStyleDeclaration_get_marginRight(css_style, &v); - ok(hres == S_OK, "get_marginRight failed: %08x\n", hres); + ok(hres == S_OK, "get_marginRight failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(marginRight) = %d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"9px"), "V_BSTR(marginRight) = %s\n", wine_dbgstr_w(V_BSTR(&v))); @@ -1268,18 +1268,18 @@ static void test_body_style(IHTMLStyle *style) V_VT(&v) = VT_NULL; hres = IHTMLStyle_get_marginBottom(style, &v); - ok(hres == S_OK, "get_marginBottom failed: %08x\n", hres); + ok(hres == S_OK, "get_marginBottom failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(marginBottom) = %d\n", V_VT(&v)); ok(!V_BSTR(&v), "V_BSTR(marginBottom) = %s\n", wine_dbgstr_w(V_BSTR(&v))); V_VT(&v) = VT_I4; V_I4(&v) = 6; hres = IHTMLStyle_put_marginBottom(style, v); - ok(hres == S_OK, "put_marginBottom failed: %08x\n", hres); + ok(hres == S_OK, "put_marginBottom failed: %08lx\n", hres); V_VT(&v) = VT_NULL; hres = IHTMLStyle_get_marginBottom(style, &v); - ok(hres == S_OK, "get_marginBottom failed: %08x\n", hres); + ok(hres == S_OK, "get_marginBottom failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(marginBottom) = %d\n", V_VT(&v)); if(compat_mode < COMPAT_IE9) ok(!lstrcmpW(V_BSTR(&v), L"6px"), "V_BSTR(marginBottom) = %s\n", wine_dbgstr_w(V_BSTR(&v))); @@ -1288,18 +1288,18 @@ static void test_body_style(IHTMLStyle *style) V_VT(&v) = VT_NULL; hres = IHTMLStyle_get_marginLeft(style, &v); - ok(hres == S_OK, "get_marginLeft failed: %08x\n", hres); + ok(hres == S_OK, "get_marginLeft failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(marginLeft) = %d\n", V_VT(&v)); ok(!V_BSTR(&v), "V_BSTR(marginLeft) = %s\n", wine_dbgstr_w(V_BSTR(&v))); V_VT(&v) = VT_I4; V_I4(&v) = 6; hres = IHTMLStyle_put_marginLeft(style, v); - ok(hres == S_OK, "put_marginLeft failed: %08x\n", hres); + ok(hres == S_OK, "put_marginLeft failed: %08lx\n", hres); V_VT(&v) = VT_NULL; hres = IHTMLStyle_get_marginLeft(style, &v); - ok(hres == S_OK, "get_marginLeft failed: %08x\n", hres); + ok(hres == S_OK, "get_marginLeft failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(marginLeft) = %d\n", V_VT(&v)); if(compat_mode < COMPAT_IE9) ok(!lstrcmpW(V_BSTR(&v), L"6px"), "V_BSTR(marginLeft) = %s\n", wine_dbgstr_w(V_BSTR(&v))); @@ -1308,158 +1308,158 @@ static void test_body_style(IHTMLStyle *style) str = (void*)0xdeadbeef; hres = IHTMLStyle_get_fontFamily(style, &str); - ok(hres == S_OK, "get_fontFamily failed: %08x\n", hres); + ok(hres == S_OK, "get_fontFamily failed: %08lx\n", hres); ok(!str, "fontFamily = %s\n", wine_dbgstr_w(str)); str = (void*)0xdeadbeef; hres = IHTMLStyle_get_fontWeight(style, &str); - ok(hres == S_OK, "get_fontWeight failed: %08x\n", hres); + ok(hres == S_OK, "get_fontWeight failed: %08lx\n", hres); ok(!str, "fontWeight = %s\n", wine_dbgstr_w(str)); hres = IHTMLStyle_get_fontWeight(style, &sDefault); - ok(hres == S_OK, "get_fontWeight failed: %08x\n", hres); + ok(hres == S_OK, "get_fontWeight failed: %08lx\n", hres); str = SysAllocString(L"test"); hres = IHTMLStyle_put_fontWeight(style, str); ok(hres == (compat_mode < COMPAT_IE9 ? E_INVALIDARG : S_OK), - "put_fontWeight failed: %08x\n", hres); + "put_fontWeight failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLStyle_get_fontWeight(style, &str); - ok(hres == S_OK, "get_fontWeight failed: %08x\n", hres); + ok(hres == S_OK, "get_fontWeight failed: %08lx\n", hres); ok(!str, "fontWeight = %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = SysAllocString(L"bold"); hres = IHTMLStyle_put_fontWeight(style, str); - ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + ok(hres == S_OK, "put_fontWeight failed: %08lx\n", hres); SysFreeString(str); str = SysAllocString(L"bolder"); hres = IHTMLStyle_put_fontWeight(style, str); - ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + ok(hres == S_OK, "put_fontWeight failed: %08lx\n", hres); SysFreeString(str); str = SysAllocString(L"lighter"); hres = IHTMLStyle_put_fontWeight(style, str); - ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + ok(hres == S_OK, "put_fontWeight failed: %08lx\n", hres); SysFreeString(str); str = SysAllocString(L"100"); hres = IHTMLStyle_put_fontWeight(style, str); - ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + ok(hres == S_OK, "put_fontWeight failed: %08lx\n", hres); SysFreeString(str); str = SysAllocString(L"200"); hres = IHTMLStyle_put_fontWeight(style, str); - ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + ok(hres == S_OK, "put_fontWeight failed: %08lx\n", hres); SysFreeString(str); str = SysAllocString(L"300"); hres = IHTMLStyle_put_fontWeight(style, str); - ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + ok(hres == S_OK, "put_fontWeight failed: %08lx\n", hres); SysFreeString(str); str = SysAllocString(L"400"); hres = IHTMLStyle_put_fontWeight(style, str); - ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + ok(hres == S_OK, "put_fontWeight failed: %08lx\n", hres); SysFreeString(str); str = SysAllocString(L"500"); hres = IHTMLStyle_put_fontWeight(style, str); - ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + ok(hres == S_OK, "put_fontWeight failed: %08lx\n", hres); SysFreeString(str); str = SysAllocString(L"600"); hres = IHTMLStyle_put_fontWeight(style, str); - ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + ok(hres == S_OK, "put_fontWeight failed: %08lx\n", hres); SysFreeString(str); str = SysAllocString(L"700"); hres = IHTMLStyle_put_fontWeight(style, str); - ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + ok(hres == S_OK, "put_fontWeight failed: %08lx\n", hres); SysFreeString(str); str = SysAllocString(L"800"); hres = IHTMLStyle_put_fontWeight(style, str); - ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + ok(hres == S_OK, "put_fontWeight failed: %08lx\n", hres); SysFreeString(str); str = SysAllocString(L"900"); hres = IHTMLStyle_put_fontWeight(style, str); - ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + ok(hres == S_OK, "put_fontWeight failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLStyle_get_fontWeight(style, &str); - ok(hres == S_OK, "get_fontWeight failed: %08x\n", hres); + ok(hres == S_OK, "get_fontWeight failed: %08lx\n", hres); ok(!lstrcmpW(str, L"900"), "str != style900\n"); SysFreeString(str); str = SysAllocString(L""); hres = IHTMLStyle_put_fontWeight(style, str); - ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + ok(hres == S_OK, "put_fontWeight failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLStyle_get_fontWeight(style, &str); - ok(hres == S_OK, "get_fontWeight failed: %08x\n", hres); + ok(hres == S_OK, "get_fontWeight failed: %08lx\n", hres); ok(!str, "str != NULL\n"); SysFreeString(str); hres = IHTMLStyle_put_fontWeight(style, sDefault); - ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + ok(hres == S_OK, "put_fontWeight failed: %08lx\n", hres); SysFreeString(sDefault); /* font Variant */ hres = IHTMLStyle_get_fontVariant(style, NULL); - ok(hres == E_INVALIDARG, "get_fontVariant failed: %08x\n", hres); + ok(hres == E_INVALIDARG, "get_fontVariant failed: %08lx\n", hres); hres = IHTMLStyle_get_fontVariant(style, &sDefault); - ok(hres == S_OK, "get_fontVariant failed: %08x\n", hres); + ok(hres == S_OK, "get_fontVariant failed: %08lx\n", hres); str = SysAllocString(L"test"); hres = IHTMLStyle_put_fontVariant(style, str); ok(hres == (compat_mode < COMPAT_IE9 ? E_INVALIDARG : S_OK), - "fontVariant failed: %08x\n", hres); + "fontVariant failed: %08lx\n", hres); SysFreeString(str); str = SysAllocString(L"small-caps"); hres = IHTMLStyle_put_fontVariant(style, str); - ok(hres == S_OK, "fontVariant failed: %08x\n", hres); + ok(hres == S_OK, "fontVariant failed: %08lx\n", hres); SysFreeString(str); str = SysAllocString(L"normal"); hres = IHTMLStyle_put_fontVariant(style, str); - ok(hres == S_OK, "fontVariant failed: %08x\n", hres); + ok(hres == S_OK, "fontVariant failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLStyle_put_fontVariant(style, sDefault); - ok(hres == S_OK, "fontVariant failed: %08x\n", hres); + ok(hres == S_OK, "fontVariant failed: %08lx\n", hres); SysFreeString(sDefault); str = (void*)0xdeadbeef; hres = IHTMLStyle_get_display(style, &str); - ok(hres == S_OK, "get_display failed: %08x\n", hres); + ok(hres == S_OK, "get_display failed: %08lx\n", hres); ok(!str, "display = %s\n", wine_dbgstr_w(str)); str = (void*)0xdeadbeef; hres = IHTMLStyle_get_visibility(style, &str); - ok(hres == S_OK, "get_visibility failed: %08x\n", hres); + ok(hres == S_OK, "get_visibility failed: %08lx\n", hres); ok(!str, "visibility = %s\n", wine_dbgstr_w(str)); V_VT(&v) = VT_NULL; hres = IHTMLStyle_get_fontSize(style, &v); - ok(hres == S_OK, "get_fontSize failed: %08x\n", hres); + ok(hres == S_OK, "get_fontSize failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(fontSize) = %d\n", V_VT(&v)); ok(!V_BSTR(&v), "V_BSTR(fontSize) = %s\n", wine_dbgstr_w(V_BSTR(&v))); V_VT(&v) = VT_I4; V_I4(&v) = 12; hres = IHTMLStyle_put_fontSize(style, v); - ok(hres == S_OK, "put_fontSize failed: %08x\n", hres); + ok(hres == S_OK, "put_fontSize failed: %08lx\n", hres); V_VT(&v) = VT_NULL; hres = IHTMLStyle_get_fontSize(style, &v); - ok(hres == S_OK, "get_fontSize failed: %08x\n", hres); + ok(hres == S_OK, "get_fontSize failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(fontSize) = %d\n", V_VT(&v)); if(compat_mode < COMPAT_IE9) ok(!lstrcmpW(V_BSTR(&v), L"12px"), "fontSize = %s\n", wine_dbgstr_w(V_BSTR(&v))); @@ -1468,18 +1468,18 @@ static void test_body_style(IHTMLStyle *style) V_VT(&v) = VT_NULL; hres = IHTMLStyle_get_color(style, &v); - ok(hres == S_OK, "get_color failed: %08x\n", hres); + ok(hres == S_OK, "get_color failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(color) = %d\n", V_VT(&v)); ok(!V_BSTR(&v), "V_BSTR(color) = %s\n", wine_dbgstr_w(V_BSTR(&v))); V_VT(&v) = VT_I4; V_I4(&v) = 0xfdfd; hres = IHTMLStyle_put_color(style, v); - ok(hres == S_OK, "put_color failed: %08x\n", hres); + ok(hres == S_OK, "put_color failed: %08lx\n", hres); V_VT(&v) = VT_NULL; hres = IHTMLStyle_get_color(style, &v); - ok(hres == S_OK, "get_color failed: %08x\n", hres); + ok(hres == S_OK, "get_color failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(color) = %d\n", V_VT(&v)); todo_wine ok(!lstrcmpW(V_BSTR(&v), L"#00fdfd"), "V_BSTR(color) = %s\n", wine_dbgstr_w(V_BSTR(&v))); @@ -1487,107 +1487,107 @@ static void test_body_style(IHTMLStyle *style) V_VT(&v) = VT_I4; V_I4(&v) = 3; hres = IHTMLStyle_put_lineHeight(style, v); - ok(hres == S_OK, "put_lineHeight failed: %08x\n", hres); + ok(hres == S_OK, "put_lineHeight failed: %08lx\n", hres); hres = IHTMLStyle_get_lineHeight(style, &v); - ok(hres == S_OK, "get_lineHeight failed: %08x\n", hres); + ok(hres == S_OK, "get_lineHeight failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(lineHeight) = %d, expect VT_BSTR\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"3"), "V_BSTR(lineHeight) = %s\n", wine_dbgstr_w(V_BSTR(&v))); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"300%"); hres = IHTMLStyle_put_lineHeight(style, v); - ok(hres == S_OK, "put_lineHeight failed: %08x\n", hres); + ok(hres == S_OK, "put_lineHeight failed: %08lx\n", hres); VariantClear(&v); hres = IHTMLStyle_get_lineHeight(style, &v); - ok(hres == S_OK, "get_lineHeight failed: %08x\n", hres); + ok(hres == S_OK, "get_lineHeight failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(lineHeight) = %d, expect VT_BSTR\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"300%"), "V_BSTR(lineHeight) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); b = 0xfefe; hres = IHTMLStyle_get_textDecorationUnderline(style, &b); - ok(hres == S_OK, "get_textDecorationUnderline failed: %08x\n", hres); + ok(hres == S_OK, "get_textDecorationUnderline failed: %08lx\n", hres); ok(b == VARIANT_FALSE, "textDecorationUnderline = %x\n", b); hres = IHTMLStyle_put_textDecorationUnderline(style, VARIANT_TRUE); - ok(hres == S_OK, "put_textDecorationUnderline failed: %08x\n", hres); + ok(hres == S_OK, "put_textDecorationUnderline failed: %08lx\n", hres); hres = IHTMLStyle_get_textDecorationUnderline(style, &b); - ok(hres == S_OK, "get_textDecorationUnderline failed: %08x\n", hres); + ok(hres == S_OK, "get_textDecorationUnderline failed: %08lx\n", hres); ok(b == VARIANT_TRUE, "textDecorationUnderline = %x\n", b); hres = IHTMLStyle_put_textDecorationUnderline(style, VARIANT_FALSE); - ok(hres == S_OK, "put_textDecorationUnderline failed: %08x\n", hres); + ok(hres == S_OK, "put_textDecorationUnderline failed: %08lx\n", hres); b = 0xfefe; hres = IHTMLStyle_get_textDecorationLineThrough(style, &b); - ok(hres == S_OK, "get_textDecorationLineThrough failed: %08x\n", hres); + ok(hres == S_OK, "get_textDecorationLineThrough failed: %08lx\n", hres); ok(b == VARIANT_FALSE, "textDecorationLineThrough = %x\n", b); hres = IHTMLStyle_put_textDecorationLineThrough(style, VARIANT_TRUE); - ok(hres == S_OK, "put_textDecorationLineThrough failed: %08x\n", hres); + ok(hres == S_OK, "put_textDecorationLineThrough failed: %08lx\n", hres); hres = IHTMLStyle_get_textDecorationLineThrough(style, &b); - ok(hres == S_OK, "get_textDecorationLineThrough failed: %08x\n", hres); + ok(hres == S_OK, "get_textDecorationLineThrough failed: %08lx\n", hres); ok(b == VARIANT_TRUE, "textDecorationLineThrough = %x\n", b); hres = IHTMLStyle_put_textDecorationLineThrough(style, VARIANT_FALSE); - ok(hres == S_OK, "put_textDecorationLineThrough failed: %08x\n", hres); + ok(hres == S_OK, "put_textDecorationLineThrough failed: %08lx\n", hres); b = 0xfefe; hres = IHTMLStyle_get_textDecorationNone(style, &b); - ok(hres == S_OK, "get_textDecorationNone failed: %08x\n", hres); + ok(hres == S_OK, "get_textDecorationNone failed: %08lx\n", hres); ok(b == VARIANT_FALSE, "textDecorationNone = %x\n", b); hres = IHTMLStyle_put_textDecorationNone(style, VARIANT_TRUE); - ok(hres == S_OK, "put_textDecorationNone failed: %08x\n", hres); + ok(hres == S_OK, "put_textDecorationNone failed: %08lx\n", hres); hres = IHTMLStyle_get_textDecorationNone(style, &b); - ok(hres == S_OK, "get_textDecorationNone failed: %08x\n", hres); + ok(hres == S_OK, "get_textDecorationNone failed: %08lx\n", hres); ok(b == VARIANT_TRUE, "textDecorationNone = %x\n", b); hres = IHTMLStyle_put_textDecorationNone(style, VARIANT_FALSE); - ok(hres == S_OK, "put_textDecorationNone failed: %08x\n", hres); + ok(hres == S_OK, "put_textDecorationNone failed: %08lx\n", hres); b = 0xfefe; hres = IHTMLStyle_get_textDecorationOverline(style, &b); - ok(hres == S_OK, "get_textDecorationOverline failed: %08x\n", hres); + ok(hres == S_OK, "get_textDecorationOverline failed: %08lx\n", hres); ok(b == VARIANT_FALSE, "textDecorationOverline = %x\n", b); hres = IHTMLStyle_put_textDecorationOverline(style, VARIANT_TRUE); - ok(hres == S_OK, "put_textDecorationOverline failed: %08x\n", hres); + ok(hres == S_OK, "put_textDecorationOverline failed: %08lx\n", hres); hres = IHTMLStyle_get_textDecorationOverline(style, &b); - ok(hres == S_OK, "get_textDecorationOverline failed: %08x\n", hres); + ok(hres == S_OK, "get_textDecorationOverline failed: %08lx\n", hres); ok(b == VARIANT_TRUE, "textDecorationOverline = %x\n", b); hres = IHTMLStyle_put_textDecorationOverline(style, VARIANT_FALSE); - ok(hres == S_OK, "put_textDecorationOverline failed: %08x\n", hres); + ok(hres == S_OK, "put_textDecorationOverline failed: %08lx\n", hres); b = 0xfefe; hres = IHTMLStyle_get_textDecorationBlink(style, &b); - ok(hres == S_OK, "get_textDecorationBlink failed: %08x\n", hres); + ok(hres == S_OK, "get_textDecorationBlink failed: %08lx\n", hres); ok(b == VARIANT_FALSE, "textDecorationBlink = %x\n", b); hres = IHTMLStyle_put_textDecorationBlink(style, VARIANT_TRUE); - ok(hres == S_OK, "put_textDecorationBlink failed: %08x\n", hres); + ok(hres == S_OK, "put_textDecorationBlink failed: %08lx\n", hres); hres = IHTMLStyle_get_textDecorationBlink(style, &b); - ok(hres == S_OK, "get_textDecorationBlink failed: %08x\n", hres); + ok(hres == S_OK, "get_textDecorationBlink failed: %08lx\n", hres); ok(b == VARIANT_TRUE, "textDecorationBlink = %x\n", b); hres = IHTMLStyle_put_textDecorationBlink(style, VARIANT_FALSE); - ok(hres == S_OK, "textDecorationBlink failed: %08x\n", hres); + ok(hres == S_OK, "textDecorationBlink failed: %08lx\n", hres); hres = IHTMLStyle_get_textDecoration(style, &sDefault); - ok(hres == S_OK, "get_textDecoration failed: %08x\n", hres); + ok(hres == S_OK, "get_textDecoration failed: %08lx\n", hres); str = SysAllocString(L"invalid"); hres = IHTMLStyle_put_textDecoration(style, str); ok(hres == (compat_mode < COMPAT_IE9 ? E_INVALIDARG : S_OK), - "put_textDecoration failed: %08x\n", hres); + "put_textDecoration failed: %08lx\n", hres); SysFreeString(str); set_text_decoration(style, L"none"); @@ -1603,96 +1603,96 @@ static void test_body_style(IHTMLStyle *style) str = SysAllocString(L"invalid"); hres = IHTMLStyle_put_textDecoration(style, str); ok(hres == (compat_mode < COMPAT_IE9 ? E_INVALIDARG : S_OK), - "put_textDecoration failed: %08x\n", hres); + "put_textDecoration failed: %08lx\n", hres); SysFreeString(str); test_text_decoration(style, compat_mode < COMPAT_IE9 ? NULL : L"blink"); hres = IHTMLStyle_put_textDecoration(style, sDefault); - ok(hres == S_OK, "put_textDecoration failed: %08x\n", hres); + ok(hres == S_OK, "put_textDecoration failed: %08lx\n", hres); SysFreeString(sDefault); hres = IHTMLStyle_get_posWidth(style, NULL); - ok(hres == E_POINTER, "get_posWidth failed: %08x\n", hres); + ok(hres == E_POINTER, "get_posWidth failed: %08lx\n", hres); hres = IHTMLStyle_get_posWidth(style, &f); - ok(hres == S_OK, "get_posWidth failed: %08x\n", hres); + ok(hres == S_OK, "get_posWidth failed: %08lx\n", hres); ok(f == 0.0f, "f = %f\n", f); V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_width(style, &v); - ok(hres == S_OK, "get_width failed: %08x\n", hres); + ok(hres == S_OK, "get_width failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); ok(!V_BSTR(&v), "V_BSTR(v)=%p\n", V_BSTR(&v)); hres = IHTMLStyle_put_posWidth(style, 2.2); - ok(hres == S_OK, "put_posWidth failed: %08x\n", hres); + ok(hres == S_OK, "put_posWidth failed: %08lx\n", hres); hres = IHTMLStyle_get_posWidth(style, &f); - ok(hres == S_OK, "get_posWidth failed: %08x\n", hres); + ok(hres == S_OK, "get_posWidth failed: %08lx\n", hres); ok(f == 2.0f || f == 2.2f, /* IE8 */ "f = %f\n", f); l = 0xdeadbeef; hres = IHTMLStyle_get_pixelWidth(style, &l); - ok(hres == S_OK, "get_pixelWidth failed: %08x\n", hres); - ok(l == 2, "pixelWidth = %d\n", l); + ok(hres == S_OK, "get_pixelWidth failed: %08lx\n", hres); + ok(l == 2, "pixelWidth = %ld\n", l); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"auto"); hres = IHTMLStyle_put_width(style, v); - ok(hres == S_OK, "put_width failed: %08x\n", hres); + ok(hres == S_OK, "put_width failed: %08lx\n", hres); VariantClear(&v); V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_width(style, &v); - ok(hres == S_OK, "get_width failed: %08x\n", hres); + ok(hres == S_OK, "get_width failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"auto"), "V_BSTR(v)=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); l = 0xdeadbeef; hres = IHTMLStyle_get_pixelWidth(style, &l); - ok(hres == S_OK, "get_pixelWidth failed: %08x\n", hres); - ok(!l, "pixelWidth = %d\n", l); + ok(hres == S_OK, "get_pixelWidth failed: %08lx\n", hres); + ok(!l, "pixelWidth = %ld\n", l); V_VT(&v) = VT_I4; V_I4(&v) = 100; hres = IHTMLStyle_put_width(style, v); - ok(hres == S_OK, "put_width failed: %08x\n", hres); + ok(hres == S_OK, "put_width failed: %08lx\n", hres); hres = IHTMLStyle_get_width(style, &v); - ok(hres == S_OK, "get_width failed: %08x\n", hres); + ok(hres == S_OK, "get_width failed: %08lx\n", hres); test_var_bstr(&v, compat_mode < COMPAT_IE9 ? L"100px" : L"auto"); VariantClear(&v); l = 0xdeadbeef; hres = IHTMLStyle_get_pixelWidth(style, &l); - ok(hres == S_OK, "get_pixelWidth failed: %08x\n", hres); - ok(l == (compat_mode < COMPAT_IE9 ? 100 : 0), "pixelWidth = %d\n", l); + ok(hres == S_OK, "get_pixelWidth failed: %08lx\n", hres); + ok(l == (compat_mode < COMPAT_IE9 ? 100 : 0), "pixelWidth = %ld\n", l); V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_width(style, &v); - ok(hres == S_OK, "get_width failed: %08x\n", hres); + ok(hres == S_OK, "get_width failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), compat_mode < COMPAT_IE9 ? L"100px" : L"auto"), "V_BSTR(v)=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); hres = IHTMLStyle_put_pixelWidth(style, 50); - ok(hres == S_OK, "put_pixelWidth failed: %08x\n", hres); + ok(hres == S_OK, "put_pixelWidth failed: %08lx\n", hres); l = 0xdeadbeef; hres = IHTMLStyle_get_pixelWidth(style, &l); - ok(hres == S_OK, "get_pixelWidth failed: %08x\n", hres); - ok(l == 50, "pixelWidth = %d\n", l); + ok(hres == S_OK, "get_pixelWidth failed: %08lx\n", hres); + ok(l == 50, "pixelWidth = %ld\n", l); hres = IHTMLStyle_get_pixelWidth(style, NULL); - ok(hres == E_POINTER, "get_pixelWidth failed: %08x\n", hres); + ok(hres == E_POINTER, "get_pixelWidth failed: %08lx\n", hres); V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_width(style, &v); - ok(hres == S_OK, "get_width failed: %08x\n", hres); + ok(hres == S_OK, "get_width failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"50px"), "V_BSTR(v)=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -1700,16 +1700,16 @@ static void test_body_style(IHTMLStyle *style) /* margin tests */ str = (void*)0xdeadbeef; hres = IHTMLStyle_get_margin(style, &str); - ok(hres == S_OK, "get_margin failed: %08x\n", hres); + ok(hres == S_OK, "get_margin failed: %08lx\n", hres); ok(!str, "margin = %s\n", wine_dbgstr_w(str)); str = SysAllocString(L"1"); hres = IHTMLStyle_put_margin(style, str); - ok(hres == S_OK, "put_margin failed: %08x\n", hres); + ok(hres == S_OK, "put_margin failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLStyle_get_margin(style, &str); - ok(hres == S_OK, "get_margin failed: %08x\n", hres); + ok(hres == S_OK, "get_margin failed: %08lx\n", hres); if(compat_mode < COMPAT_IE9) ok(!lstrcmpW(str, L"1px"), "margin = %s\n", wine_dbgstr_w(str)); else @@ -1718,20 +1718,20 @@ static void test_body_style(IHTMLStyle *style) str = SysAllocString(L"2px"); hres = IHTMLStyle_put_margin(style, str); - ok(hres == S_OK, "put_margin failed: %08x\n", hres); + ok(hres == S_OK, "put_margin failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLStyle_get_margin(style, &str); - ok(hres == S_OK, "get_margin failed: %08x\n", hres); + ok(hres == S_OK, "get_margin failed: %08lx\n", hres); ok(!lstrcmpW(str, L"2px"), "margin = %s\n", wine_dbgstr_w(str)); SysFreeString(str); hres = IHTMLStyle_put_margin(style, NULL); - ok(hres == S_OK, "put_margin failed: %08x\n", hres); + ok(hres == S_OK, "put_margin failed: %08lx\n", hres); str = (void*)0xdeadbeef; hres = IHTMLStyle_get_marginTop(style, &v); - ok(hres == S_OK, "get_marginTop failed: %08x\n", hres); + ok(hres == S_OK, "get_marginTop failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(marginTop) = %d\n", V_VT(&v)); ok(!V_BSTR(&v), "V_BSTR(marginTop) = %s\n", wine_dbgstr_w(V_BSTR(&v))); @@ -1739,11 +1739,11 @@ static void test_body_style(IHTMLStyle *style) V_BSTR(&v) = SysAllocString(L"6px"); hres = IHTMLStyle_put_marginTop(style, v); SysFreeString(V_BSTR(&v)); - ok(hres == S_OK, "put_marginTop failed: %08x\n", hres); + ok(hres == S_OK, "put_marginTop failed: %08lx\n", hres); str = (void*)0xdeadbeef; hres = IHTMLStyle_get_marginTop(style, &v); - ok(hres == S_OK, "get_marginTop failed: %08x\n", hres); + ok(hres == S_OK, "get_marginTop failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(marginTop) = %d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"6px"), "V_BSTR(marginTop) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -1751,11 +1751,11 @@ static void test_body_style(IHTMLStyle *style) V_VT(&v) = VT_I4; V_I4(&v) = 5; hres = IHTMLStyle_put_marginTop(style, v); - ok(hres == S_OK, "put_marginTop failed: %08x\n", hres); + ok(hres == S_OK, "put_marginTop failed: %08lx\n", hres); str = (void*)0xdeadbeef; hres = IHTMLStyle_get_marginTop(style, &v); - ok(hres == S_OK, "get_marginTop failed: %08x\n", hres); + ok(hres == S_OK, "get_marginTop failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(marginTop) = %d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), compat_mode < COMPAT_IE9 ? L"5px" : L"6px"), "V_BSTR(marginTop) = %s\n", wine_dbgstr_w(V_BSTR(&v))); @@ -1763,41 +1763,41 @@ static void test_body_style(IHTMLStyle *style) str = NULL; hres = IHTMLStyle_get_border(style, &str); - ok(hres == S_OK, "get_border failed: %08x\n", hres); + ok(hres == S_OK, "get_border failed: %08lx\n", hres); ok(!str || !*str, "str is not empty\n"); SysFreeString(str); str = SysAllocString(L"1px"); hres = IHTMLStyle_put_border(style, str); - ok(hres == S_OK, "put_border failed: %08x\n", hres); + ok(hres == S_OK, "put_border failed: %08lx\n", hres); SysFreeString(str); V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_left(style, &v); - ok(hres == S_OK, "get_left failed: %08x\n", hres); + ok(hres == S_OK, "get_left failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); ok(!V_BSTR(&v), "V_BSTR(v) != NULL\n"); VariantClear(&v); l = 0xdeadbeef; hres = IHTMLStyle_get_pixelLeft(style, &l); - ok(hres == S_OK, "get_pixelLeft failed: %08x\n", hres); - ok(!l, "pixelLeft = %d\n", l); + ok(hres == S_OK, "get_pixelLeft failed: %08lx\n", hres); + ok(!l, "pixelLeft = %ld\n", l); /* Test posLeft */ hres = IHTMLStyle_get_posLeft(style, NULL); - ok(hres == E_POINTER, "get_posLeft failed: %08x\n", hres); + ok(hres == E_POINTER, "get_posLeft failed: %08lx\n", hres); f = 1.0f; hres = IHTMLStyle_get_posLeft(style, &f); - ok(hres == S_OK, "get_posLeft failed: %08x\n", hres); + ok(hres == S_OK, "get_posLeft failed: %08lx\n", hres); ok(f == 0.0, "expected 0.0 got %f\n", f); hres = IHTMLStyle_put_posLeft(style, 4.9f); - ok(hres == S_OK, "put_posLeft failed: %08x\n", hres); + ok(hres == S_OK, "put_posLeft failed: %08lx\n", hres); hres = IHTMLStyle_get_posLeft(style, &f); - ok(hres == S_OK, "get_posLeft failed: %08x\n", hres); + ok(hres == S_OK, "get_posLeft failed: %08lx\n", hres); ok(f == 4.0 || f == 4.9f, /* IE8 */ "expected 4.0 or 4.9 (IE8) got %f\n", f); @@ -1805,7 +1805,7 @@ static void test_body_style(IHTMLStyle *style) /* Ensure left is updated correctly. */ V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_left(style, &v); - ok(hres == S_OK, "get_left failed: %08x\n", hres); + ok(hres == S_OK, "get_left failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"4px") || !lstrcmpW(V_BSTR(&v), L"4.9px"), /* IE8 */ @@ -1816,21 +1816,21 @@ static void test_body_style(IHTMLStyle *style) V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"3px"); hres = IHTMLStyle_put_left(style, v); - ok(hres == S_OK, "put_left failed: %08x\n", hres); + ok(hres == S_OK, "put_left failed: %08lx\n", hres); VariantClear(&v); hres = IHTMLStyle_get_posLeft(style, &f); - ok(hres == S_OK, "get_posLeft failed: %08x\n", hres); + ok(hres == S_OK, "get_posLeft failed: %08lx\n", hres); ok(f == 3.0, "expected 3.0 got %f\n", f); l = 0xdeadbeef; hres = IHTMLStyle_get_pixelLeft(style, &l); - ok(hres == S_OK, "get_pixelLeft failed: %08x\n", hres); - ok(l == 3, "pixelLeft = %d\n", l); + ok(hres == S_OK, "get_pixelLeft failed: %08lx\n", hres); + ok(l == 3, "pixelLeft = %ld\n", l); V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_left(style, &v); - ok(hres == S_OK, "get_left failed: %08x\n", hres); + ok(hres == S_OK, "get_left failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"3px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -1838,270 +1838,270 @@ static void test_body_style(IHTMLStyle *style) V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"4.99"); hres = IHTMLStyle_put_left(style, v); - ok(hres == S_OK, "put_left failed: %08x\n", hres); + ok(hres == S_OK, "put_left failed: %08lx\n", hres); VariantClear(&v); l = 0xdeadbeef; hres = IHTMLStyle_get_pixelLeft(style, &l); - ok(hres == S_OK, "get_pixelLeft failed: %08x\n", hres); - ok(l == (compat_mode < COMPAT_IE9 ? 4 : 3), "pixelLeft = %d\n", l); + ok(hres == S_OK, "get_pixelLeft failed: %08lx\n", hres); + ok(l == (compat_mode < COMPAT_IE9 ? 4 : 3), "pixelLeft = %ld\n", l); V_VT(&v) = VT_NULL; hres = IHTMLStyle_put_left(style, v); - ok(hres == S_OK, "put_left failed: %08x\n", hres); + ok(hres == S_OK, "put_left failed: %08lx\n", hres); V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_left(style, &v); - ok(hres == S_OK, "get_left failed: %08x\n", hres); + ok(hres == S_OK, "get_left failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); ok(!V_BSTR(&v), "V_BSTR(v) != NULL\n"); VariantClear(&v); V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_top(style, &v); - ok(hres == S_OK, "get_top failed: %08x\n", hres); + ok(hres == S_OK, "get_top failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); ok(!V_BSTR(&v), "V_BSTR(v) != NULL\n"); VariantClear(&v); l = 0xdeadbeef; hres = IHTMLStyle_get_pixelLeft(style, &l); - ok(hres == S_OK, "get_pixelLeft failed: %08x\n", hres); - ok(!l, "pixelLeft = %d\n", l); + ok(hres == S_OK, "get_pixelLeft failed: %08lx\n", hres); + ok(!l, "pixelLeft = %ld\n", l); hres = IHTMLStyle_put_pixelLeft(style, 6); - ok(hres == S_OK, "put_pixelLeft failed: %08x\n", hres); + ok(hres == S_OK, "put_pixelLeft failed: %08lx\n", hres); l = 0xdeadbeef; hres = IHTMLStyle_get_pixelLeft(style, &l); - ok(hres == S_OK, "get_pixelLeft failed: %08x\n", hres); - ok(l == 6, "pixelLeft = %d\n", l); + ok(hres == S_OK, "get_pixelLeft failed: %08lx\n", hres); + ok(l == 6, "pixelLeft = %ld\n", l); hres = IHTMLStyle_get_pixelLeft(style, NULL); - ok(hres == E_POINTER, "get_pixelLeft failed: %08x\n", hres); + ok(hres == E_POINTER, "get_pixelLeft failed: %08lx\n", hres); V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_left(style, &v); - ok(hres == S_OK, "get_left failed: %08x\n", hres); + ok(hres == S_OK, "get_left failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"6px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); /* Test posTop */ hres = IHTMLStyle_get_posTop(style, NULL); - ok(hres == E_POINTER, "get_posTop failed: %08x\n", hres); + ok(hres == E_POINTER, "get_posTop failed: %08lx\n", hres); f = 1.0f; hres = IHTMLStyle_get_posTop(style, &f); - ok(hres == S_OK, "get_posTop failed: %08x\n", hres); + ok(hres == S_OK, "get_posTop failed: %08lx\n", hres); ok(f == 0.0, "expected 0.0 got %f\n", f); hres = IHTMLStyle_put_posTop(style, 4.9f); - ok(hres == S_OK, "put_posTop failed: %08x\n", hres); + ok(hres == S_OK, "put_posTop failed: %08lx\n", hres); hres = IHTMLStyle_get_posTop(style, &f); - ok(hres == S_OK, "get_posTop failed: %08x\n", hres); + ok(hres == S_OK, "get_posTop failed: %08lx\n", hres); ok(f == 4.0 || f == 4.9f, /* IE8 */ "expected 4.0 or 4.9 (IE8) got %f\n", f); hres = IHTMLStyle_put_pixelTop(style, 6); - ok(hres == S_OK, "put_pixelTop failed: %08x\n", hres); + ok(hres == S_OK, "put_pixelTop failed: %08lx\n", hres); l = 0xdeadbeef; hres = IHTMLStyle_get_pixelTop(style, &l); - ok(hres == S_OK, "get_pixelTop failed: %08x\n", hres); - ok(l == 6, "pixelTop = %d\n", l); + ok(hres == S_OK, "get_pixelTop failed: %08lx\n", hres); + ok(l == 6, "pixelTop = %ld\n", l); hres = IHTMLStyle_get_pixelTop(style, NULL); - ok(hres == E_POINTER, "get_pixelTop failed: %08x\n", hres); + ok(hres == E_POINTER, "get_pixelTop failed: %08lx\n", hres); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"3px"); hres = IHTMLStyle_put_top(style, v); - ok(hres == S_OK, "put_top failed: %08x\n", hres); + ok(hres == S_OK, "put_top failed: %08lx\n", hres); VariantClear(&v); V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_top(style, &v); - ok(hres == S_OK, "get_top failed: %08x\n", hres); + ok(hres == S_OK, "get_top failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"3px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); hres = IHTMLStyle_get_posTop(style, &f); - ok(hres == S_OK, "get_posTop failed: %08x\n", hres); + ok(hres == S_OK, "get_posTop failed: %08lx\n", hres); ok(f == 3.0, "expected 3.0 got %f\n", f); l = 0xdeadbeef; hres = IHTMLStyle_get_pixelTop(style, &l); - ok(hres == S_OK, "get_pixelTop failed: %08x\n", hres); - ok(l == 3, "pixelTop = %d\n", l); + ok(hres == S_OK, "get_pixelTop failed: %08lx\n", hres); + ok(l == 3, "pixelTop = %ld\n", l); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"100%"); hres = IHTMLStyle_put_top(style, v); - ok(hres == S_OK, "put_top failed: %08x\n", hres); + ok(hres == S_OK, "put_top failed: %08lx\n", hres); VariantClear(&v); l = 0xdeadbeef; hres = IHTMLStyle_get_pixelTop(style, &l); - ok(hres == S_OK, "get_pixelTop failed: %08x\n", hres); - ok(!l, "pixelTop = %d\n", l); + ok(hres == S_OK, "get_pixelTop failed: %08lx\n", hres); + ok(!l, "pixelTop = %ld\n", l); V_VT(&v) = VT_NULL; hres = IHTMLStyle_put_top(style, v); - ok(hres == S_OK, "put_top failed: %08x\n", hres); + ok(hres == S_OK, "put_top failed: %08lx\n", hres); V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_top(style, &v); - ok(hres == S_OK, "get_top failed: %08x\n", hres); + ok(hres == S_OK, "get_top failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); ok(!V_BSTR(&v), "V_BSTR(v) != NULL\n"); VariantClear(&v); l = 0xdeadbeef; hres = IHTMLStyle_get_pixelTop(style, &l); - ok(hres == S_OK, "get_pixelTop failed: %08x\n", hres); - ok(!l, "pixelTop = %d\n", l); + ok(hres == S_OK, "get_pixelTop failed: %08lx\n", hres); + ok(!l, "pixelTop = %ld\n", l); /* Test posHeight */ hres = IHTMLStyle_get_posHeight(style, NULL); - ok(hres == E_POINTER, "get_posHeight failed: %08x\n", hres); + ok(hres == E_POINTER, "get_posHeight failed: %08lx\n", hres); V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_height(style, &v); - ok(hres == S_OK, "get_height failed: %08x\n", hres); + ok(hres == S_OK, "get_height failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); ok(!V_BSTR(&v), "V_BSTR(v) != NULL\n"); VariantClear(&v); f = 1.0f; hres = IHTMLStyle_get_posHeight(style, &f); - ok(hres == S_OK, "get_posHeight failed: %08x\n", hres); + ok(hres == S_OK, "get_posHeight failed: %08lx\n", hres); ok(f == 0.0, "expected 0.0 got %f\n", f); l = 0xdeadbeef; hres = IHTMLStyle_get_pixelHeight(style, &l); - ok(hres == S_OK, "get_pixelHeight failed: %08x\n", hres); - ok(!l, "pixelHeight = %d\n", l); + ok(hres == S_OK, "get_pixelHeight failed: %08lx\n", hres); + ok(!l, "pixelHeight = %ld\n", l); hres = IHTMLStyle_put_posHeight(style, 4.9f); - ok(hres == S_OK, "put_posHeight failed: %08x\n", hres); + ok(hres == S_OK, "put_posHeight failed: %08lx\n", hres); hres = IHTMLStyle_get_posHeight(style, &f); - ok(hres == S_OK, "get_posHeight failed: %08x\n", hres); + ok(hres == S_OK, "get_posHeight failed: %08lx\n", hres); ok(f == 4.0 || f == 4.9f, /* IE8 */ "expected 4.0 or 4.9 (IE8) got %f\n", f); l = 0xdeadbeef; hres = IHTMLStyle_get_pixelHeight(style, &l); - ok(hres == S_OK, "get_pixelHeight failed: %08x\n", hres); + ok(hres == S_OK, "get_pixelHeight failed: %08lx\n", hres); ok(l == 4 || l == 5, /* IE8 */ - "pixelHeight = %d\n", l); + "pixelHeight = %ld\n", l); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"70px"); hres = IHTMLStyle_put_height(style, v); - ok(hres == S_OK, "put_height failed: %08x\n", hres); + ok(hres == S_OK, "put_height failed: %08lx\n", hres); VariantClear(&v); V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_height(style, &v); - ok(hres == S_OK, "get_height failed: %08x\n", hres); + ok(hres == S_OK, "get_height failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"70px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); l = 0xdeadbeef; hres = IHTMLStyle_get_pixelHeight(style, &l); - ok(hres == S_OK, "get_pixelHeight failed: %08x\n", hres); - ok(l == 70, "pixelHeight = %d\n", l); + ok(hres == S_OK, "get_pixelHeight failed: %08lx\n", hres); + ok(l == 70, "pixelHeight = %ld\n", l); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"50%"); hres = IHTMLStyle_put_height(style, v); - ok(hres == S_OK, "put_height failed: %08x\n", hres); + ok(hres == S_OK, "put_height failed: %08lx\n", hres); VariantClear(&v); l = 0xdeadbeef; hres = IHTMLStyle_get_pixelHeight(style, &l); - ok(hres == S_OK, "get_pixelHeight failed: %08x\n", hres); - ok(!l, "pixelHeight = %d\n", l); + ok(hres == S_OK, "get_pixelHeight failed: %08lx\n", hres); + ok(!l, "pixelHeight = %ld\n", l); V_VT(&v) = VT_BSTR; V_BSTR(&v) = NULL; hres = IHTMLStyle_put_height(style, v); - ok(hres == S_OK, "put_height failed: %08x\n", hres); + ok(hres == S_OK, "put_height failed: %08lx\n", hres); VariantClear(&v); V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_height(style, &v); - ok(hres == S_OK, "get_height failed: %08x\n", hres); + ok(hres == S_OK, "get_height failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); ok(!V_BSTR(&v), "V_BSTR(v) = %s, expected NULL\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); l = 0xdeadbeef; hres = IHTMLStyle_get_pixelHeight(style, &l); - ok(hres == S_OK, "get_pixelHeight failed: %08x\n", hres); - ok(!l, "pixelHeight = %d\n", l); + ok(hres == S_OK, "get_pixelHeight failed: %08lx\n", hres); + ok(!l, "pixelHeight = %ld\n", l); hres = IHTMLStyle_put_pixelHeight(style, 50); - ok(hres == S_OK, "put_pixelHeight failed: %08x\n", hres); + ok(hres == S_OK, "put_pixelHeight failed: %08lx\n", hres); l = 0xdeadbeef; hres = IHTMLStyle_get_pixelHeight(style, &l); - ok(hres == S_OK, "get_pixelHeight failed: %08x\n", hres); - ok(l == 50, "pixelHeight = %d\n", l); + ok(hres == S_OK, "get_pixelHeight failed: %08lx\n", hres); + ok(l == 50, "pixelHeight = %ld\n", l); hres = IHTMLStyle_get_pixelHeight(style, NULL); - ok(hres == E_POINTER, "get_pixelHeight failed: %08x\n", hres); + ok(hres == E_POINTER, "get_pixelHeight failed: %08lx\n", hres); V_VT(&v) = VT_I4; V_I4(&v) = 64; hres = IHTMLStyle_put_height(style, v); - ok(hres == S_OK, "put_height failed: %08x\n", hres); + ok(hres == S_OK, "put_height failed: %08lx\n", hres); V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_height(style, &v); - ok(hres == S_OK, "get_height failed: %08x\n", hres); + ok(hres == S_OK, "get_height failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), compat_mode < COMPAT_IE9 ? L"64px" : L"50px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); hres = IHTMLStyle_get_posHeight(style, &f); - ok(hres == S_OK, "get_posHeight failed: %08x\n", hres); + ok(hres == S_OK, "get_posHeight failed: %08lx\n", hres); ok(f == (compat_mode < COMPAT_IE9 ? 64.0 : 50), "expected 64.0 got %f\n", f); l = 0xdeadbeef; hres = IHTMLStyle_get_pixelHeight(style, &l); - ok(hres == S_OK, "get_pixelHeight failed: %08x\n", hres); - ok(l == (compat_mode < COMPAT_IE9 ? 64 : 50), "pixelHeight = %d\n", l); + ok(hres == S_OK, "get_pixelHeight failed: %08lx\n", hres); + ok(l == (compat_mode < COMPAT_IE9 ? 64 : 50), "pixelHeight = %ld\n", l); str = (void*)0xdeadbeef; hres = IHTMLStyle_get_cursor(style, &str); - ok(hres == S_OK, "get_cursor failed: %08x\n", hres); + ok(hres == S_OK, "get_cursor failed: %08lx\n", hres); ok(!str, "get_cursor != NULL\n"); SysFreeString(str); str = SysAllocString(L"default"); hres = IHTMLStyle_put_cursor(style, str); - ok(hres == S_OK, "put_cursor failed: %08x\n", hres); + ok(hres == S_OK, "put_cursor failed: %08lx\n", hres); SysFreeString(str); str = NULL; hres = IHTMLStyle_get_cursor(style, &str); - ok(hres == S_OK, "get_cursor failed: %08x\n", hres); + ok(hres == S_OK, "get_cursor failed: %08lx\n", hres); ok(!lstrcmpW(str, L"default"), "get_cursor returned %s\n", wine_dbgstr_w(str)); SysFreeString(str); V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_verticalAlign(style, &v); - ok(hres == S_OK, "get_vertivalAlign failed: %08x\n", hres); + ok(hres == S_OK, "get_vertivalAlign failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); ok(!V_BSTR(&v), "V_BSTR(v) != NULL\n"); VariantClear(&v); @@ -2109,12 +2109,12 @@ static void test_body_style(IHTMLStyle *style) V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"middle"); hres = IHTMLStyle_put_verticalAlign(style, v); - ok(hres == S_OK, "put_vertivalAlign failed: %08x\n", hres); + ok(hres == S_OK, "put_vertivalAlign failed: %08lx\n", hres); VariantClear(&v); V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_verticalAlign(style, &v); - ok(hres == S_OK, "get_verticalAlign failed: %08x\n", hres); + ok(hres == S_OK, "get_verticalAlign failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"middle"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -2122,12 +2122,12 @@ static void test_body_style(IHTMLStyle *style) V_VT(&v) = VT_I4; V_I4(&v) = 100; hres = IHTMLStyle_put_verticalAlign(style, v); - ok(hres == S_OK, "put_vertivalAlign failed: %08x\n", hres); + ok(hres == S_OK, "put_vertivalAlign failed: %08lx\n", hres); VariantClear(&v); V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_verticalAlign(style, &v); - ok(hres == S_OK, "get_verticalAlign failed: %08x\n", hres); + ok(hres == S_OK, "get_verticalAlign failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), compat_mode < COMPAT_IE9 ? L"100px" : L"middle"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); @@ -2135,34 +2135,34 @@ static void test_body_style(IHTMLStyle *style) str = (void*)0xdeadbeef; hres = IHTMLStyle_get_textAlign(style, &str); - ok(hres == S_OK, "get_textAlign failed: %08x\n", hres); + ok(hres == S_OK, "get_textAlign failed: %08lx\n", hres); ok(!str, "textAlign != NULL\n"); str = SysAllocString(L"center"); hres = IHTMLStyle_put_textAlign(style, str); - ok(hres == S_OK, "put_textAlign failed: %08x\n", hres); + ok(hres == S_OK, "put_textAlign failed: %08lx\n", hres); SysFreeString(str); str = NULL; hres = IHTMLStyle_get_textAlign(style, &str); - ok(hres == S_OK, "get_textAlign failed: %08x\n", hres); + ok(hres == S_OK, "get_textAlign failed: %08lx\n", hres); ok(!lstrcmpW(str, L"center"), "textAlign = %s\n", wine_dbgstr_w(V_BSTR(&v))); SysFreeString(str); V_VT(&v) = VT_NULL; hres = IHTMLStyle_get_textIndent(style, &v); - ok(hres == S_OK, "get_textIndent failed: %08x\n", hres); + ok(hres == S_OK, "get_textIndent failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(textIndent) = %d\n", V_VT(&v)); ok(!V_BSTR(&v), "V_BSTR(textIndent) = %s\n", wine_dbgstr_w(V_BSTR(&v))); V_VT(&v) = VT_I4; V_I4(&v) = 6; hres = IHTMLStyle_put_textIndent(style, v); - ok(hres == S_OK, "put_textIndent failed: %08x\n", hres); + ok(hres == S_OK, "put_textIndent failed: %08lx\n", hres); V_VT(&v) = VT_NULL; hres = IHTMLStyle_get_textIndent(style, &v); - ok(hres == S_OK, "get_textIndent failed: %08x\n", hres); + ok(hres == S_OK, "get_textIndent failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(textIndent) = %d\n", V_VT(&v)); if(compat_mode < COMPAT_IE9) ok(!lstrcmpW(V_BSTR(&v), L"6px"), "textIndent = %s\n", wine_dbgstr_w(V_BSTR(&v))); @@ -2171,41 +2171,41 @@ static void test_body_style(IHTMLStyle *style) str = (void*)0xdeadbeef; hres = IHTMLStyle_get_textTransform(style, &str); - ok(hres == S_OK, "get_textTransform failed: %08x\n", hres); + ok(hres == S_OK, "get_textTransform failed: %08lx\n", hres); ok(!str, "textTransform != NULL\n"); str = SysAllocString(L"lowercase"); hres = IHTMLStyle_put_textTransform(style, str); - ok(hres == S_OK, "put_textTransform failed: %08x\n", hres); + ok(hres == S_OK, "put_textTransform failed: %08lx\n", hres); SysFreeString(str); str = NULL; hres = IHTMLStyle_get_textTransform(style, &str); - ok(hres == S_OK, "get_textTransform failed: %08x\n", hres); + ok(hres == S_OK, "get_textTransform failed: %08lx\n", hres); ok(!lstrcmpW(str, L"lowercase"), "textTransform = %s\n", wine_dbgstr_w(V_BSTR(&v))); SysFreeString(str); str = (void*)0xdeadbeef; hres = IHTMLStyle_get_filter(style, &str); - ok(hres == S_OK, "get_filter failed: %08x\n", hres); + ok(hres == S_OK, "get_filter failed: %08lx\n", hres); ok(!str, "filter != NULL\n"); str = SysAllocString(L"alpha(opacity=100)"); hres = IHTMLStyle_put_filter(style, str); - ok(hres == S_OK, "put_filter failed: %08x\n", hres); + ok(hres == S_OK, "put_filter failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLStyle_put_filter(style, NULL); - ok(hres == S_OK, "put_filter failed: %08x\n", hres); + ok(hres == S_OK, "put_filter failed: %08lx\n", hres); str = (void*)0xdeadbeef; hres = IHTMLStyle_get_filter(style, &str); - ok(hres == S_OK, "get_filter failed: %08x\n", hres); + ok(hres == S_OK, "get_filter failed: %08lx\n", hres); ok(!str, "filter != NULL\n"); V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_zIndex(style, &v); - ok(hres == S_OK, "get_zIndex failed: %08x\n", hres); + ok(hres == S_OK, "get_zIndex failed: %08lx\n", hres); if(compat_mode < COMPAT_IE9) { ok(V_VT(&v) == VT_I4, "V_VT(v)=%d\n", V_VT(&v)); ok(!V_I4(&v), "V_I4(v) != 0\n"); @@ -2217,7 +2217,7 @@ static void test_body_style(IHTMLStyle *style) if(css_style) { hres = IHTMLCSSStyleDeclaration_get_zIndex(css_style, &v); - ok(hres == S_OK, "get_zIndex failed: %08x\n", hres); + ok(hres == S_OK, "get_zIndex failed: %08lx\n", hres); if(compat_mode < COMPAT_IE9) { ok(V_VT(&v) == VT_I4, "V_VT(v)=%d\n", V_VT(&v)); ok(!V_I4(&v), "V_I4(v) != 0\n"); @@ -2230,122 +2230,122 @@ static void test_body_style(IHTMLStyle *style) V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"1"); hres = IHTMLStyle_put_zIndex(style, v); - ok(hres == S_OK, "put_zIndex failed: %08x\n", hres); + ok(hres == S_OK, "put_zIndex failed: %08lx\n", hres); VariantClear(&v); V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_zIndex(style, &v); - ok(hres == S_OK, "get_zIndex failed: %08x\n", hres); + ok(hres == S_OK, "get_zIndex failed: %08lx\n", hres); ok(V_VT(&v) == VT_I4, "V_VT(v)=%d\n", V_VT(&v)); - ok(V_I4(&v) == 1, "V_I4(v) = %d\n", V_I4(&v)); + ok(V_I4(&v) == 1, "V_I4(v) = %ld\n", V_I4(&v)); VariantClear(&v); /* fontStyle */ hres = IHTMLStyle_get_fontStyle(style, &sDefault); - ok(hres == S_OK, "get_fontStyle failed: %08x\n", hres); + ok(hres == S_OK, "get_fontStyle failed: %08lx\n", hres); str = SysAllocString(L"test"); hres = IHTMLStyle_put_fontStyle(style, str); ok(hres == (compat_mode < COMPAT_IE9 ? E_INVALIDARG : S_OK), - "put_fontStyle failed: %08x\n", hres); + "put_fontStyle failed: %08lx\n", hres); SysFreeString(str); str = SysAllocString(L"italic"); hres = IHTMLStyle_put_fontStyle(style, str); - ok(hres == S_OK, "put_fontStyle failed: %08x\n", hres); + ok(hres == S_OK, "put_fontStyle failed: %08lx\n", hres); SysFreeString(str); str = SysAllocString(L"oblique"); hres = IHTMLStyle_put_fontStyle(style, str); - ok(hres == S_OK, "put_fontStyle failed: %08x\n", hres); + ok(hres == S_OK, "put_fontStyle failed: %08lx\n", hres); SysFreeString(str); str = SysAllocString(L"normal"); hres = IHTMLStyle_put_fontStyle(style, str); - ok(hres == S_OK, "put_fontStyle failed: %08x\n", hres); + ok(hres == S_OK, "put_fontStyle failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLStyle_put_fontStyle(style, sDefault); - ok(hres == S_OK, "put_fontStyle failed: %08x\n", hres); + ok(hres == S_OK, "put_fontStyle failed: %08lx\n", hres); SysFreeString(sDefault); /* overflow */ hres = IHTMLStyle_get_overflow(style, NULL); - ok(hres == E_INVALIDARG, "get_overflow failed: %08x\n", hres); + ok(hres == E_INVALIDARG, "get_overflow failed: %08lx\n", hres); hres = IHTMLStyle_get_overflow(style, &sOverflowDefault); - ok(hres == S_OK, "get_overflow failed: %08x\n", hres); + ok(hres == S_OK, "get_overflow failed: %08lx\n", hres); str = SysAllocString(L"test"); hres = IHTMLStyle_put_overflow(style, str); ok(hres == (compat_mode < COMPAT_IE9 ? E_INVALIDARG : S_OK), - "put_overflow failed: %08x\n", hres); + "put_overflow failed: %08lx\n", hres); SysFreeString(str); str = SysAllocString(L"visible"); hres = IHTMLStyle_put_overflow(style, str); - ok(hres == S_OK, "put_overflow failed: %08x\n", hres); + ok(hres == S_OK, "put_overflow failed: %08lx\n", hres); SysFreeString(str); str = SysAllocString(L"scroll"); hres = IHTMLStyle_put_overflow(style, str); - ok(hres == S_OK, "put_overflow failed: %08x\n", hres); + ok(hres == S_OK, "put_overflow failed: %08lx\n", hres); SysFreeString(str); str = SysAllocString(L"hidden"); hres = IHTMLStyle_put_overflow(style, str); - ok(hres == S_OK, "put_overflow failed: %08x\n", hres); + ok(hres == S_OK, "put_overflow failed: %08lx\n", hres); SysFreeString(str); str = SysAllocString(L"auto"); hres = IHTMLStyle_put_overflow(style, str); - ok(hres == S_OK, "put_overflow failed: %08x\n", hres); + ok(hres == S_OK, "put_overflow failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLStyle_get_overflow(style, &str); - ok(hres == S_OK, "get_overflow failed: %08x\n", hres); + ok(hres == S_OK, "get_overflow failed: %08lx\n", hres); ok(!lstrcmpW(str, L"auto"), "str=%s\n", wine_dbgstr_w(str)); SysFreeString(str); str = SysAllocString(L""); hres = IHTMLStyle_put_overflow(style, str); - ok(hres == S_OK, "put_overflow failed: %08x\n", hres); + ok(hres == S_OK, "put_overflow failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLStyle_get_overflow(style, &str); - ok(hres == S_OK, "get_overflow failed: %08x\n", hres); + ok(hres == S_OK, "get_overflow failed: %08lx\n", hres); ok(!str, "str=%s\n", wine_dbgstr_w(str)); SysFreeString(str); /* restore overflow default */ hres = IHTMLStyle_put_overflow(style, sOverflowDefault); - ok(hres == S_OK, "put_overflow failed: %08x\n", hres); + ok(hres == S_OK, "put_overflow failed: %08lx\n", hres); SysFreeString(sOverflowDefault); /* Attribute Tests*/ hres = IHTMLStyle_getAttribute(style, NULL, 1, &v); - ok(hres == E_INVALIDARG, "getAttribute failed: %08x\n", hres); + ok(hres == E_INVALIDARG, "getAttribute failed: %08lx\n", hres); str = SysAllocString(L"position"); hres = IHTMLStyle_getAttribute(style, str, 1, NULL); - ok(hres == E_INVALIDARG, "getAttribute failed: %08x\n", hres); + ok(hres == E_INVALIDARG, "getAttribute failed: %08lx\n", hres); hres = IHTMLStyle_getAttribute(style, str, 1, &v); - ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + ok(hres == S_OK, "getAttribute failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "type failed: %d\n", V_VT(&v)); VariantClear(&v); hres = IHTMLStyle_setAttribute(style, NULL, v, 1); - ok(hres == E_INVALIDARG, "setAttribute failed: %08x\n", hres); + ok(hres == E_INVALIDARG, "setAttribute failed: %08lx\n", hres); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"absolute"); hres = IHTMLStyle_setAttribute(style, str, v, 1); - ok(hres == S_OK, "setAttribute failed: %08x\n", hres); + ok(hres == S_OK, "setAttribute failed: %08lx\n", hres); VariantClear(&v); hres = IHTMLStyle_getAttribute(style, str, 1, &v); - ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + ok(hres == S_OK, "getAttribute failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "type failed: %d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"absolute"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -2353,7 +2353,7 @@ static void test_body_style(IHTMLStyle *style) V_VT(&v) = VT_BSTR; V_BSTR(&v) = NULL; hres = IHTMLStyle_setAttribute(style, str, v, 1); - ok(hres == S_OK, "setAttribute failed: %08x\n", hres); + ok(hres == S_OK, "setAttribute failed: %08lx\n", hres); VariantClear(&v); SysFreeString(str); @@ -2375,61 +2375,61 @@ static void test_body_style(IHTMLStyle *style) SysFreeString(str); hres = IHTMLStyle_get_borderStyle(style, &sDefault); - ok(hres == S_OK, "get_borderStyle failed: %08x\n", hres); + ok(hres == S_OK, "get_borderStyle failed: %08lx\n", hres); str = SysAllocString(L"none dotted dashed solid"); hres = IHTMLStyle_put_borderStyle(style, str); - ok(hres == S_OK, "put_borderStyle failed: %08x\n", hres); + ok(hres == S_OK, "put_borderStyle failed: %08lx\n", hres); SysFreeString(str); str = SysAllocString(L"none dotted dashed solid"); hres = IHTMLStyle_get_borderStyle(style, &str); - ok(hres == S_OK, "get_borderStyle failed: %08x\n", hres); + ok(hres == S_OK, "get_borderStyle failed: %08lx\n", hres); ok(!lstrcmpW(str, L"none dotted dashed solid"), "expected (none dotted dashed solid) = (%s)\n", wine_dbgstr_w(V_BSTR(&v))); SysFreeString(str); str = SysAllocString(L"double groove ridge inset"); hres = IHTMLStyle_put_borderStyle(style, str); - ok(hres == S_OK, "put_borderStyle failed: %08x\n", hres); + ok(hres == S_OK, "put_borderStyle failed: %08lx\n", hres); SysFreeString(str); str = SysAllocString(L"window-inset outset ridge inset"); hres = IHTMLStyle_put_borderStyle(style, str); - ok(hres == S_OK, "put_borderStyle failed: %08x\n", hres); + ok(hres == S_OK, "put_borderStyle failed: %08lx\n", hres); SysFreeString(str); str = SysAllocString(L"window-inset"); hres = IHTMLStyle_put_borderStyle(style, str); - ok(hres == S_OK, "put_borderStyle failed: %08x\n", hres); + ok(hres == S_OK, "put_borderStyle failed: %08lx\n", hres); SysFreeString(str); str = SysAllocString(L"none none none none none"); hres = IHTMLStyle_put_borderStyle(style, str); - ok(hres == S_OK, "put_borderStyle failed: %08x\n", hres); + ok(hres == S_OK, "put_borderStyle failed: %08lx\n", hres); SysFreeString(str); str = SysAllocString(L"invalid none none none"); hres = IHTMLStyle_put_borderStyle(style, str); todo_wine_if(compat_mode >= COMPAT_IE9) ok(hres == (compat_mode < COMPAT_IE9 ? E_INVALIDARG : S_OK), - "put_borderStyle failed: %08x\n", hres); + "put_borderStyle failed: %08lx\n", hres); SysFreeString(str); str = SysAllocString(L"none invalid none none"); hres = IHTMLStyle_put_borderStyle(style, str); todo_wine_if(compat_mode >= COMPAT_IE9) ok(hres == (compat_mode < COMPAT_IE9 ? E_INVALIDARG : S_OK), - "put_borderStyle failed: %08x\n", hres); + "put_borderStyle failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLStyle_put_borderStyle(style, sDefault); - ok(hres == S_OK, "put_borderStyle failed: %08x\n", hres); + ok(hres == S_OK, "put_borderStyle failed: %08lx\n", hres); SysFreeString(sDefault); /* backgroundColor */ hres = IHTMLStyle_get_backgroundColor(style, &v); - ok(hres == S_OK, "get_backgroundColor: %08x\n", hres); + ok(hres == S_OK, "get_backgroundColor: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "type failed: %d\n", V_VT(&v)); ok(!V_BSTR(&v), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -2437,43 +2437,43 @@ static void test_body_style(IHTMLStyle *style) V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"red"); hres = IHTMLStyle_put_backgroundColor(style, v); - ok(hres == S_OK, "put_backgroundColor failed: %08x\n", hres); + ok(hres == S_OK, "put_backgroundColor failed: %08lx\n", hres); VariantClear(&v); hres = IHTMLStyle_get_backgroundColor(style, &v); - ok(hres == S_OK, "get_backgroundColor: %08x\n", hres); + ok(hres == S_OK, "get_backgroundColor: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "type failed: %d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"red"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); str = SysAllocString(L"fixed"); hres = IHTMLStyle_put_backgroundAttachment(style, str); - ok(hres == S_OK, "put_backgroundAttachment failed: %08x\n", hres); + ok(hres == S_OK, "put_backgroundAttachment failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLStyle_get_backgroundAttachment(style, &str); - ok(hres == S_OK, "get_backgroundAttachment failed: %08x\n", hres); + ok(hres == S_OK, "get_backgroundAttachment failed: %08lx\n", hres); ok(!lstrcmpW(str, L"fixed"), "ret = %s\n", wine_dbgstr_w(str)); SysFreeString(str); /* padding */ hres = IHTMLStyle_get_padding(style, &str); - ok(hres == S_OK, "get_padding failed: %08x\n", hres); + ok(hres == S_OK, "get_padding failed: %08lx\n", hres); ok(!str, "padding = %s\n", wine_dbgstr_w(str)); SysFreeString(str); hres = IHTMLStyle_get_paddingTop(style, &v); - ok(hres == S_OK, "get_paddingTop: %08x\n", hres); + ok(hres == S_OK, "get_paddingTop: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); ok(!V_BSTR(&v), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); V_VT(&v) = VT_I4; V_I4(&v) = 6; hres = IHTMLStyle_put_paddingTop(style, v); - ok(hres == S_OK, "put_paddingTop failed: %08x\n", hres); + ok(hres == S_OK, "put_paddingTop failed: %08lx\n", hres); hres = IHTMLStyle_get_paddingTop(style, &v); - ok(hres == S_OK, "get_paddingTop: %08x\n", hres); + ok(hres == S_OK, "get_paddingTop: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); if(compat_mode < COMPAT_IE9) ok(!lstrcmpW(V_BSTR(&v), L"6px"), "paddingTop = %s\n", wine_dbgstr_w(V_BSTR(&v))); @@ -2482,17 +2482,17 @@ static void test_body_style(IHTMLStyle *style) VariantClear(&v); hres = IHTMLStyle_get_paddingRight(style, &v); - ok(hres == S_OK, "get_paddingRight: %08x\n", hres); + ok(hres == S_OK, "get_paddingRight: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); ok(!V_BSTR(&v), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); V_VT(&v) = VT_I4; V_I4(&v) = 6; hres = IHTMLStyle_put_paddingRight(style, v); - ok(hres == S_OK, "put_paddingRight failed: %08x\n", hres); + ok(hres == S_OK, "put_paddingRight failed: %08lx\n", hres); hres = IHTMLStyle_get_paddingRight(style, &v); - ok(hres == S_OK, "get_paddingRight: %08x\n", hres); + ok(hres == S_OK, "get_paddingRight: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); if(compat_mode < COMPAT_IE9) ok(!lstrcmpW(V_BSTR(&v), L"6px"), "paddingRight = %s\n", wine_dbgstr_w(V_BSTR(&v))); @@ -2501,17 +2501,17 @@ static void test_body_style(IHTMLStyle *style) VariantClear(&v); hres = IHTMLStyle_get_paddingBottom(style, &v); - ok(hres == S_OK, "get_paddingBottom: %08x\n", hres); + ok(hres == S_OK, "get_paddingBottom: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); ok(!V_BSTR(&v), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); V_VT(&v) = VT_I4; V_I4(&v) = 6; hres = IHTMLStyle_put_paddingBottom(style, v); - ok(hres == S_OK, "put_paddingBottom failed: %08x\n", hres); + ok(hres == S_OK, "put_paddingBottom failed: %08lx\n", hres); hres = IHTMLStyle_get_paddingBottom(style, &v); - ok(hres == S_OK, "get_paddingBottom: %08x\n", hres); + ok(hres == S_OK, "get_paddingBottom: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); if(compat_mode < COMPAT_IE9) ok(!lstrcmpW(V_BSTR(&v), L"6px"), "paddingBottom = %s\n", wine_dbgstr_w(V_BSTR(&v))); @@ -2521,11 +2521,11 @@ static void test_body_style(IHTMLStyle *style) str = SysAllocString(L"1"); hres = IHTMLStyle_put_padding(style, str); - ok(hres == S_OK, "put_padding failed: %08x\n", hres); + ok(hres == S_OK, "put_padding failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLStyle_get_padding(style, &str); - ok(hres == S_OK, "get_padding failed: %08x\n", hres); + ok(hres == S_OK, "get_padding failed: %08lx\n", hres); if(compat_mode < COMPAT_IE9) ok(!lstrcmpW(str, L"1px"), "padding = %s\n", wine_dbgstr_w(str)); else @@ -2534,7 +2534,7 @@ static void test_body_style(IHTMLStyle *style) /* PaddingLeft */ hres = IHTMLStyle_get_paddingLeft(style, &vDefault); - ok(hres == S_OK, "get_paddingLeft: %08x\n", hres); + ok(hres == S_OK, "get_paddingLeft: %08lx\n", hres); ok(V_VT(&vDefault) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&vDefault)); if(compat_mode < COMPAT_IE9) ok(!lstrcmpW(V_BSTR(&vDefault), L"1px"), "paddingLeft = %s\n", @@ -2545,11 +2545,11 @@ static void test_body_style(IHTMLStyle *style) V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"10"); hres = IHTMLStyle_put_paddingLeft(style, v); - ok(hres == S_OK, "put_paddingLeft: %08x\n", hres); + ok(hres == S_OK, "put_paddingLeft: %08lx\n", hres); VariantClear(&v); hres = IHTMLStyle_get_paddingLeft(style, &v); - ok(hres == S_OK, "get_paddingLeft: %08x\n", hres); + ok(hres == S_OK, "get_paddingLeft: %08lx\n", hres); if(compat_mode < COMPAT_IE9) ok(!lstrcmpW(V_BSTR(&v), L"10px"), "paddingLeft = %s\n", wine_dbgstr_w(V_BSTR(&v))); else @@ -2557,72 +2557,72 @@ static void test_body_style(IHTMLStyle *style) VariantClear(&v); hres = IHTMLStyle_put_paddingLeft(style, vDefault); - ok(hres == S_OK, "put_paddingLeft: %08x\n", hres); + ok(hres == S_OK, "put_paddingLeft: %08lx\n", hres); /* BackgroundRepeat */ hres = IHTMLStyle_get_backgroundRepeat(style, &sDefault); - ok(hres == S_OK, "get_backgroundRepeat failed: %08x\n", hres); + ok(hres == S_OK, "get_backgroundRepeat failed: %08lx\n", hres); str = SysAllocString(L"invalid"); hres = IHTMLStyle_put_backgroundRepeat(style, str); ok(hres == (compat_mode < COMPAT_IE9 ? E_INVALIDARG : S_OK), - "put_backgroundRepeat failed: %08x\n", hres); + "put_backgroundRepeat failed: %08lx\n", hres); SysFreeString(str); str = SysAllocString(L"repeat"); hres = IHTMLStyle_put_backgroundRepeat(style, str); - ok(hres == S_OK, "put_backgroundRepeat failed: %08x\n", hres); + ok(hres == S_OK, "put_backgroundRepeat failed: %08lx\n", hres); SysFreeString(str); str = SysAllocString(L"no-repeat"); hres = IHTMLStyle_put_backgroundRepeat(style, str); - ok(hres == S_OK, "put_backgroundRepeat failed: %08x\n", hres); + ok(hres == S_OK, "put_backgroundRepeat failed: %08lx\n", hres); SysFreeString(str); str = SysAllocString(L"repeat-x"); hres = IHTMLStyle_put_backgroundRepeat(style, str); - ok(hres == S_OK, "put_backgroundRepeat failed: %08x\n", hres); + ok(hres == S_OK, "put_backgroundRepeat failed: %08lx\n", hres); SysFreeString(str); str = SysAllocString(L"repeat-y"); hres = IHTMLStyle_put_backgroundRepeat(style, str); - ok(hres == S_OK, "put_backgroundRepeat failed: %08x\n", hres); + ok(hres == S_OK, "put_backgroundRepeat failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLStyle_get_backgroundRepeat(style, &str); - ok(hres == S_OK, "get_backgroundRepeat failed: %08x\n", hres); + ok(hres == S_OK, "get_backgroundRepeat failed: %08lx\n", hres); ok(!lstrcmpW(str, L"repeat-y"), "str=%s\n", wine_dbgstr_w(str)); SysFreeString(str); hres = IHTMLStyle_put_backgroundRepeat(style, sDefault); - ok(hres == S_OK, "put_backgroundRepeat failed: %08x\n", hres); + ok(hres == S_OK, "put_backgroundRepeat failed: %08lx\n", hres); SysFreeString(sDefault); /* BorderColor */ hres = IHTMLStyle_get_borderColor(style, &sDefault); - ok(hres == S_OK, "get_borderColor failed: %08x\n", hres); + ok(hres == S_OK, "get_borderColor failed: %08lx\n", hres); str = SysAllocString(L"red green red blue"); hres = IHTMLStyle_put_borderColor(style, str); - ok(hres == S_OK, "put_borderColor failed: %08x\n", hres); + ok(hres == S_OK, "put_borderColor failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLStyle_get_borderColor(style, &str); - ok(hres == S_OK, "get_borderColor failed: %08x\n", hres); + ok(hres == S_OK, "get_borderColor failed: %08lx\n", hres); ok(!lstrcmpW(str, L"red green red blue"), "str=%s\n", wine_dbgstr_w(str)); SysFreeString(str); hres = IHTMLStyle_put_borderColor(style, sDefault); - ok(hres == S_OK, "put_borderColor failed: %08x\n", hres); + ok(hres == S_OK, "put_borderColor failed: %08lx\n", hres); SysFreeString(sDefault); /* BorderRight */ hres = IHTMLStyle_get_borderRight(style, &sDefault); - ok(hres == S_OK, "get_borderRight failed: %08x\n", hres); + ok(hres == S_OK, "get_borderRight failed: %08lx\n", hres); str = SysAllocString(L"thick dotted red"); hres = IHTMLStyle_put_borderRight(style, str); - ok(hres == S_OK, "put_borderRight failed: %08x\n", hres); + ok(hres == S_OK, "put_borderRight failed: %08lx\n", hres); SysFreeString(str); /* IHTMLStyle_get_borderRight appears to have a bug where @@ -2631,32 +2631,32 @@ static void test_body_style(IHTMLStyle *style) */ V_BSTR(&v) = NULL; hres = IHTMLStyle_get_borderRightColor(style, &v); - ok(hres == S_OK, "get_borderRightColor failed: %08x\n", hres); + ok(hres == S_OK, "get_borderRightColor failed: %08lx\n", hres); ok(!lstrcmpW(V_BSTR(&v), L"red"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); V_BSTR(&v) = NULL; hres = IHTMLStyle_get_borderRightWidth(style, &v); - ok(hres == S_OK, "get_borderRightWidth failed: %08x\n", hres); + ok(hres == S_OK, "get_borderRightWidth failed: %08lx\n", hres); ok(!lstrcmpW(V_BSTR(&v), L"thick"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); hres = IHTMLStyle_get_borderRightStyle(style, &str); - ok(hres == S_OK, "get_borderRightStyle failed: %08x\n", hres); + ok(hres == S_OK, "get_borderRightStyle failed: %08lx\n", hres); ok(!lstrcmpW(str, L"dotted"), "str=%s\n", wine_dbgstr_w(str)); SysFreeString(str); hres = IHTMLStyle_put_borderRight(style, sDefault); - ok(hres == S_OK, "put_borderRight failed: %08x\n", hres); + ok(hres == S_OK, "put_borderRight failed: %08lx\n", hres); SysFreeString(sDefault); /* BorderTop */ hres = IHTMLStyle_get_borderTop(style, &sDefault); - ok(hres == S_OK, "get_borderTop failed: %08x\n", hres); + ok(hres == S_OK, "get_borderTop failed: %08lx\n", hres); str = SysAllocString(L"thick dotted red"); hres = IHTMLStyle_put_borderTop(style, str); - ok(hres == S_OK, "put_borderTop failed: %08x\n", hres); + ok(hres == S_OK, "put_borderTop failed: %08lx\n", hres); SysFreeString(str); /* IHTMLStyle_get_borderTop appears to have a bug where @@ -2665,32 +2665,32 @@ static void test_body_style(IHTMLStyle *style) */ V_BSTR(&v) = NULL; hres = IHTMLStyle_get_borderTopColor(style, &v); - ok(hres == S_OK, "get_borderTopColor failed: %08x\n", hres); + ok(hres == S_OK, "get_borderTopColor failed: %08lx\n", hres); ok(!lstrcmpW(V_BSTR(&v), L"red"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); V_BSTR(&v) = NULL; hres = IHTMLStyle_get_borderTopWidth(style, &v); - ok(hres == S_OK, "get_borderTopWidth failed: %08x\n", hres); + ok(hres == S_OK, "get_borderTopWidth failed: %08lx\n", hres); ok(!lstrcmpW(V_BSTR(&v), L"thick"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); hres = IHTMLStyle_get_borderTopStyle(style, &str); - ok(hres == S_OK, "get_borderTopStyle failed: %08x\n", hres); + ok(hres == S_OK, "get_borderTopStyle failed: %08lx\n", hres); ok(!lstrcmpW(str, L"dotted"), "str=%s\n", wine_dbgstr_w(str)); SysFreeString(str); hres = IHTMLStyle_put_borderTop(style, sDefault); - ok(hres == S_OK, "put_borderTop failed: %08x\n", hres); + ok(hres == S_OK, "put_borderTop failed: %08lx\n", hres); SysFreeString(sDefault); /* BorderBottom */ hres = IHTMLStyle_get_borderBottom(style, &sDefault); - ok(hres == S_OK, "get_borderBottom failed: %08x\n", hres); + ok(hres == S_OK, "get_borderBottom failed: %08lx\n", hres); str = SysAllocString(L"thick dotted red"); hres = IHTMLStyle_put_borderBottom(style, str); - ok(hres == S_OK, "put_borderBottom failed: %08x\n", hres); + ok(hres == S_OK, "put_borderBottom failed: %08lx\n", hres); SysFreeString(str); /* IHTMLStyle_get_borderBottom appears to have a bug where @@ -2699,32 +2699,32 @@ static void test_body_style(IHTMLStyle *style) */ V_BSTR(&v) = NULL; hres = IHTMLStyle_get_borderBottomColor(style, &v); - ok(hres == S_OK, "get_borderBottomColor failed: %08x\n", hres); + ok(hres == S_OK, "get_borderBottomColor failed: %08lx\n", hres); ok(!lstrcmpW(V_BSTR(&v), L"red"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); V_BSTR(&v) = NULL; hres = IHTMLStyle_get_borderBottomWidth(style, &v); - ok(hres == S_OK, "get_borderBottomWidth failed: %08x\n", hres); + ok(hres == S_OK, "get_borderBottomWidth failed: %08lx\n", hres); ok(!lstrcmpW(V_BSTR(&v), L"thick"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); hres = IHTMLStyle_get_borderBottomStyle(style, &str); - ok(hres == S_OK, "get_borderBottomStyle failed: %08x\n", hres); + ok(hres == S_OK, "get_borderBottomStyle failed: %08lx\n", hres); ok(!lstrcmpW(str, L"dotted"), "str=%s\n", wine_dbgstr_w(str)); SysFreeString(str); hres = IHTMLStyle_put_borderBottom(style, sDefault); - ok(hres == S_OK, "put_borderBottom failed: %08x\n", hres); + ok(hres == S_OK, "put_borderBottom failed: %08lx\n", hres); SysFreeString(sDefault); /* BorderLeft */ hres = IHTMLStyle_get_borderLeft(style, &sDefault); - ok(hres == S_OK, "get_borderLeft failed: %08x\n", hres); + ok(hres == S_OK, "get_borderLeft failed: %08lx\n", hres); str = SysAllocString(L"thick dotted red"); hres = IHTMLStyle_put_borderLeft(style, str); - ok(hres == S_OK, "put_borderLeft failed: %08x\n", hres); + ok(hres == S_OK, "put_borderLeft failed: %08lx\n", hres); SysFreeString(str); /* IHTMLStyle_get_borderLeft appears to have a bug where @@ -2733,28 +2733,28 @@ static void test_body_style(IHTMLStyle *style) */ V_BSTR(&v) = NULL; hres = IHTMLStyle_get_borderLeftColor(style, &v); - ok(hres == S_OK, "get_borderLeftColor failed: %08x\n", hres); + ok(hres == S_OK, "get_borderLeftColor failed: %08lx\n", hres); ok(!lstrcmpW(V_BSTR(&v), L"red"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); V_BSTR(&v) = NULL; hres = IHTMLStyle_get_borderLeftWidth(style, &v); - ok(hres == S_OK, "get_borderLeftWidth failed: %08x\n", hres); + ok(hres == S_OK, "get_borderLeftWidth failed: %08lx\n", hres); ok(!lstrcmpW(V_BSTR(&v), L"thick"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); hres = IHTMLStyle_get_borderLeftStyle(style, &str); - ok(hres == S_OK, "get_borderLeftStyle failed: %08x\n", hres); + ok(hres == S_OK, "get_borderLeftStyle failed: %08lx\n", hres); ok(!lstrcmpW(str, L"dotted"), "str=%s\n", wine_dbgstr_w(str)); SysFreeString(str); hres = IHTMLStyle_put_borderLeft(style, sDefault); - ok(hres == S_OK, "put_borderLeft failed: %08x\n", hres); + ok(hres == S_OK, "put_borderLeft failed: %08lx\n", hres); SysFreeString(sDefault); /* backgroundPositionX */ hres = IHTMLStyle_get_backgroundPositionX(style, &v); - ok(hres == S_OK, "get_backgroundPositionX failed: %08x\n", hres); + ok(hres == S_OK, "get_backgroundPositionX failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); ok(!V_BSTR(&v), "backgroundPositionX = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -2763,11 +2763,11 @@ static void test_body_style(IHTMLStyle *style) V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"11px"); hres = IHTMLCSSStyleDeclaration_put_backgroundPositionX(css_style, v); - ok(hres == S_OK, "put_backgroundPositionX failed: %08x\n", hres); + ok(hres == S_OK, "put_backgroundPositionX failed: %08lx\n", hres); VariantClear(&v); hres = IHTMLCSSStyleDeclaration_get_backgroundPositionX(css_style, &v); - ok(hres == S_OK, "get_backgroundPositionX failed: %08x\n", hres); + ok(hres == S_OK, "get_backgroundPositionX failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"11px"), "backgroundPositionX = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -2776,29 +2776,29 @@ static void test_body_style(IHTMLStyle *style) V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"10px"); hres = IHTMLStyle_put_backgroundPositionX(style, v); - ok(hres == S_OK, "put_backgroundPositionX failed: %08x\n", hres); + ok(hres == S_OK, "put_backgroundPositionX failed: %08lx\n", hres); VariantClear(&v); hres = IHTMLStyle_get_backgroundPositionX(style, &v); - ok(hres == S_OK, "get_backgroundPositionX failed: %08x\n", hres); + ok(hres == S_OK, "get_backgroundPositionX failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"10px"), "backgroundPositionX = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); /* backgroundPositionY */ hres = IHTMLStyle_get_backgroundPositionY(style, &v); - ok(hres == S_OK, "get_backgroundPositionY failed: %08x\n", hres); + ok(hres == S_OK, "get_backgroundPositionY failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); VariantClear(&v); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"15px"); hres = IHTMLStyle_put_backgroundPositionY(style, v); - ok(hres == S_OK, "put_backgroundPositionY failed: %08x\n", hres); + ok(hres == S_OK, "put_backgroundPositionY failed: %08lx\n", hres); VariantClear(&v); hres = IHTMLStyle_get_backgroundPositionY(style, &v); - ok(hres == S_OK, "get_backgroundPositionY failed: %08x\n", hres); + ok(hres == S_OK, "get_backgroundPositionY failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"15px"), "backgroundPositionY = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -2806,29 +2806,29 @@ static void test_body_style(IHTMLStyle *style) /* backgroundPosition */ str = NULL; hres = IHTMLStyle_get_backgroundPosition(style, &str); - ok(hres == S_OK, "get_backgroundPosition failed: %08x\n", hres); + ok(hres == S_OK, "get_backgroundPosition failed: %08lx\n", hres); ok(!lstrcmpW(str, L"10px 15px"), "backgroundPosition = %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = SysAllocString(L"center 20%"); hres = IHTMLStyle_put_backgroundPosition(style, str); - ok(hres == S_OK, "put_backgroundPosition failed: %08x\n", hres); + ok(hres == S_OK, "put_backgroundPosition failed: %08lx\n", hres); SysFreeString(str); str = NULL; hres = IHTMLStyle_get_backgroundPosition(style, &str); - ok(hres == S_OK, "get_backgroundPosition failed: %08x\n", hres); + ok(hres == S_OK, "get_backgroundPosition failed: %08lx\n", hres); ok(!lstrcmpW(str, L"center 20%"), "backgroundPosition = %s\n", wine_dbgstr_w(str)); SysFreeString(str); hres = IHTMLStyle_get_backgroundPositionX(style, &v); - ok(hres == S_OK, "get_backgroundPositionX failed: %08x\n", hres); + ok(hres == S_OK, "get_backgroundPositionX failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"center"), "backgroundPositionX = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); hres = IHTMLStyle_get_backgroundPositionY(style, &v); - ok(hres == S_OK, "get_backgroundPositionY failed: %08x\n", hres); + ok(hres == S_OK, "get_backgroundPositionY failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), L"20%"), "backgroundPositionY = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); @@ -2836,107 +2836,107 @@ static void test_body_style(IHTMLStyle *style) if(css_style) { str = SysAllocString(L"left 21%"); hres = IHTMLCSSStyleDeclaration_put_backgroundPosition(css_style, str); - ok(hres == S_OK, "put_backgroundPosition failed: %08x\n", hres); + ok(hres == S_OK, "put_backgroundPosition failed: %08lx\n", hres); SysFreeString(str); str = NULL; hres = IHTMLCSSStyleDeclaration_get_backgroundPosition(css_style, &str); - ok(hres == S_OK, "get_backgroundPosition failed: %08x\n", hres); + ok(hres == S_OK, "get_backgroundPosition failed: %08lx\n", hres); ok(!lstrcmpW(str, L"left 21%"), "backgroundPosition = %s\n", wine_dbgstr_w(str)); SysFreeString(str); } /* borderTopWidth */ hres = IHTMLStyle_get_borderTopWidth(style, &vDefault); - ok(hres == S_OK, "get_borderTopWidth: %08x\n", hres); + ok(hres == S_OK, "get_borderTopWidth: %08lx\n", hres); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"10px"); hres = IHTMLStyle_put_borderTopWidth(style, v); - ok(hres == S_OK, "put_borderTopWidth: %08x\n", hres); + ok(hres == S_OK, "put_borderTopWidth: %08lx\n", hres); VariantClear(&v); hres = IHTMLStyle_get_borderTopWidth(style, &v); - ok(hres == S_OK, "get_borderTopWidth: %08x\n", hres); + ok(hres == S_OK, "get_borderTopWidth: %08lx\n", hres); ok(!lstrcmpW(V_BSTR(&v), L"10px"), "expected 10px = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); hres = IHTMLStyle_put_borderTopWidth(style, vDefault); - ok(hres == S_OK, "put_borderTopWidth: %08x\n", hres); + ok(hres == S_OK, "put_borderTopWidth: %08lx\n", hres); VariantClear(&vDefault); /* borderRightWidth */ hres = IHTMLStyle_get_borderRightWidth(style, &vDefault); - ok(hres == S_OK, "get_borderRightWidth: %08x\n", hres); + ok(hres == S_OK, "get_borderRightWidth: %08lx\n", hres); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"10"); hres = IHTMLStyle_put_borderRightWidth(style, v); - ok(hres == S_OK, "put_borderRightWidth: %08x\n", hres); + ok(hres == S_OK, "put_borderRightWidth: %08lx\n", hres); VariantClear(&v); hres = IHTMLStyle_get_borderRightWidth(style, &v); - ok(hres == S_OK, "get_borderRightWidth: %08x\n", hres); + ok(hres == S_OK, "get_borderRightWidth: %08lx\n", hres); ok(!lstrcmpW(V_BSTR(&v), compat_mode < COMPAT_IE9 ? L"10px" : L"1px"), "borderRightWidth = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); hres = IHTMLStyle_put_borderRightWidth(style, vDefault); - ok(hres == S_OK, "put_borderRightWidth: %08x\n", hres); + ok(hres == S_OK, "put_borderRightWidth: %08lx\n", hres); VariantClear(&vDefault); /* borderBottomWidth */ hres = IHTMLStyle_get_borderBottomWidth(style, &vDefault); - ok(hres == S_OK, "get_borderBottomWidth: %08x\n", hres); + ok(hres == S_OK, "get_borderBottomWidth: %08lx\n", hres); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"10"); hres = IHTMLStyle_put_borderBottomWidth(style, v); - ok(hres == S_OK, "put_borderBottomWidth: %08x\n", hres); + ok(hres == S_OK, "put_borderBottomWidth: %08lx\n", hres); VariantClear(&v); hres = IHTMLStyle_get_borderBottomWidth(style, &v); - ok(hres == S_OK, "get_borderBottomWidth: %08x\n", hres); + ok(hres == S_OK, "get_borderBottomWidth: %08lx\n", hres); ok(!lstrcmpW(V_BSTR(&v), compat_mode < COMPAT_IE9 ? L"10px" : L"1px"), "borderBottomWidth = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); hres = IHTMLStyle_put_borderBottomWidth(style, vDefault); - ok(hres == S_OK, "put_borderBottomWidth: %08x\n", hres); + ok(hres == S_OK, "put_borderBottomWidth: %08lx\n", hres); VariantClear(&vDefault); /* borderLeftWidth */ hres = IHTMLStyle_get_borderLeftWidth(style, &vDefault); - ok(hres == S_OK, "get_borderLeftWidth: %08x\n", hres); + ok(hres == S_OK, "get_borderLeftWidth: %08lx\n", hres); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"10"); hres = IHTMLStyle_put_borderLeftWidth(style, v); - ok(hres == S_OK, "put_borderLeftWidth: %08x\n", hres); + ok(hres == S_OK, "put_borderLeftWidth: %08lx\n", hres); VariantClear(&v); hres = IHTMLStyle_get_borderLeftWidth(style, &v); - ok(hres == S_OK, "get_borderLeftWidth: %08x\n", hres); + ok(hres == S_OK, "get_borderLeftWidth: %08lx\n", hres); ok(!lstrcmpW(V_BSTR(&v), compat_mode < COMPAT_IE9 ? L"10px" : L"1px"), "expected 10px = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); hres = IHTMLStyle_put_borderLeftWidth(style, vDefault); - ok(hres == S_OK, "put_borderLeftWidth: %08x\n", hres); + ok(hres == S_OK, "put_borderLeftWidth: %08lx\n", hres); VariantClear(&vDefault); /* wordSpacing */ hres = IHTMLStyle_get_wordSpacing(style, &vDefault); - ok(hres == S_OK, "get_wordSpacing: %08x\n", hres); + ok(hres == S_OK, "get_wordSpacing: %08lx\n", hres); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"10"); hres = IHTMLStyle_put_wordSpacing(style, v); - ok(hres == S_OK, "put_wordSpacing: %08x\n", hres); + ok(hres == S_OK, "put_wordSpacing: %08lx\n", hres); VariantClear(&v); hres = IHTMLStyle_get_wordSpacing(style, &v); - ok(hres == S_OK, "get_wordSpacing: %08x\n", hres); + ok(hres == S_OK, "get_wordSpacing: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); if(compat_mode < COMPAT_IE9) ok(!lstrcmpW(V_BSTR(&v), L"10px"), "expected 10px = %s\n", wine_dbgstr_w(V_BSTR(&v))); @@ -2945,21 +2945,21 @@ static void test_body_style(IHTMLStyle *style) VariantClear(&v); hres = IHTMLStyle_put_wordSpacing(style, vDefault); - ok(hres == S_OK, "put_wordSpacing: %08x\n", hres); + ok(hres == S_OK, "put_wordSpacing: %08lx\n", hres); VariantClear(&vDefault); /* letterSpacing */ hres = IHTMLStyle_get_letterSpacing(style, &vDefault); - ok(hres == S_OK, "get_letterSpacing: %08x\n", hres); + ok(hres == S_OK, "get_letterSpacing: %08lx\n", hres); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"11"); hres = IHTMLStyle_put_letterSpacing(style, v); - ok(hres == S_OK, "put_letterSpacing: %08x\n", hres); + ok(hres == S_OK, "put_letterSpacing: %08lx\n", hres); VariantClear(&v); hres = IHTMLStyle_get_letterSpacing(style, &v); - ok(hres == S_OK, "get_letterSpacing: %08x\n", hres); + ok(hres == S_OK, "get_letterSpacing: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); if(compat_mode < COMPAT_IE9) ok(!lstrcmpW(V_BSTR(&v), L"11px"), "letterSpacing = %s\n", wine_dbgstr_w(V_BSTR(&v))); @@ -2968,151 +2968,151 @@ static void test_body_style(IHTMLStyle *style) VariantClear(&v); hres = IHTMLStyle_put_letterSpacing(style, vDefault); - ok(hres == S_OK, "put_letterSpacing: %08x\n", hres); + ok(hres == S_OK, "put_letterSpacing: %08lx\n", hres); VariantClear(&vDefault); /* borderTopColor */ hres = IHTMLStyle_get_borderTopColor(style, &vDefault); - ok(hres == S_OK, "get_borderTopColor: %08x\n", hres); + ok(hres == S_OK, "get_borderTopColor: %08lx\n", hres); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"red"); hres = IHTMLStyle_put_borderTopColor(style, v); - ok(hres == S_OK, "put_borderTopColor: %08x\n", hres); + ok(hres == S_OK, "put_borderTopColor: %08lx\n", hres); VariantClear(&v); hres = IHTMLStyle_get_borderTopColor(style, &v); - ok(hres == S_OK, "get_borderTopColor: %08x\n", hres); + ok(hres == S_OK, "get_borderTopColor: %08lx\n", hres); ok(!lstrcmpW(V_BSTR(&v), L"red"), "expected red = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); hres = IHTMLStyle_put_borderTopColor(style, vDefault); - ok(hres == S_OK, "put_borderTopColor: %08x\n", hres); + ok(hres == S_OK, "put_borderTopColor: %08lx\n", hres); /* borderRightColor */ hres = IHTMLStyle_get_borderRightColor(style, &vDefault); - ok(hres == S_OK, "get_borderRightColor: %08x\n", hres); + ok(hres == S_OK, "get_borderRightColor: %08lx\n", hres); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"blue"); hres = IHTMLStyle_put_borderRightColor(style, v); - ok(hres == S_OK, "put_borderRightColor: %08x\n", hres); + ok(hres == S_OK, "put_borderRightColor: %08lx\n", hres); VariantClear(&v); hres = IHTMLStyle_get_borderRightColor(style, &v); - ok(hres == S_OK, "get_borderRightColor: %08x\n", hres); + ok(hres == S_OK, "get_borderRightColor: %08lx\n", hres); ok(!lstrcmpW(V_BSTR(&v), L"blue"), "expected blue = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); hres = IHTMLStyle_put_borderRightColor(style, vDefault); - ok(hres == S_OK, "putborderRightColorr: %08x\n", hres); + ok(hres == S_OK, "putborderRightColorr: %08lx\n", hres); /* borderBottomColor */ hres = IHTMLStyle_get_borderBottomColor(style, &vDefault); - ok(hres == S_OK, "get_borderBottomColor: %08x\n", hres); + ok(hres == S_OK, "get_borderBottomColor: %08lx\n", hres); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"cyan"); hres = IHTMLStyle_put_borderBottomColor(style, v); - ok(hres == S_OK, "put_borderBottomColor: %08x\n", hres); + ok(hres == S_OK, "put_borderBottomColor: %08lx\n", hres); VariantClear(&v); hres = IHTMLStyle_get_borderBottomColor(style, &v); - ok(hres == S_OK, "get_borderBottomColor: %08x\n", hres); + ok(hres == S_OK, "get_borderBottomColor: %08lx\n", hres); ok(!lstrcmpW(V_BSTR(&v), L"cyan"), "expected cyan = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); hres = IHTMLStyle_put_borderBottomColor(style, vDefault); - ok(hres == S_OK, "put_borderBottomColor: %08x\n", hres); + ok(hres == S_OK, "put_borderBottomColor: %08lx\n", hres); /* borderLeftColor */ hres = IHTMLStyle_get_borderLeftColor(style, &vDefault); - ok(hres == S_OK, "get_borderLeftColor: %08x\n", hres); + ok(hres == S_OK, "get_borderLeftColor: %08lx\n", hres); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"cyan"); hres = IHTMLStyle_put_borderLeftColor(style, v); - ok(hres == S_OK, "put_borderLeftColor: %08x\n", hres); + ok(hres == S_OK, "put_borderLeftColor: %08lx\n", hres); VariantClear(&v); hres = IHTMLStyle_get_borderLeftColor(style, &v); - ok(hres == S_OK, "get_borderLeftColor: %08x\n", hres); + ok(hres == S_OK, "get_borderLeftColor: %08lx\n", hres); ok(!lstrcmpW(V_BSTR(&v), L"cyan"), "expected cyan = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); hres = IHTMLStyle_put_borderLeftColor(style, vDefault); - ok(hres == S_OK, "put_borderLeftColor: %08x\n", hres); + ok(hres == S_OK, "put_borderLeftColor: %08lx\n", hres); /* clip */ hres = IHTMLStyle_get_clip(style, &str); - ok(hres == S_OK, "get_clip failed: %08x\n", hres); + ok(hres == S_OK, "get_clip failed: %08lx\n", hres); ok(!str, "clip = %s\n", wine_dbgstr_w(str)); str = SysAllocString(L"rect(0px 1px 500px 505px)"); hres = IHTMLStyle_put_clip(style, str); - ok(hres == S_OK, "put_clip failed: %08x\n", hres); + ok(hres == S_OK, "put_clip failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLStyle_get_clip(style, &str); - ok(hres == S_OK, "get_clip failed: %08x\n", hres); + ok(hres == S_OK, "get_clip failed: %08lx\n", hres); ok(!lstrcmpW(str, compat_mode < COMPAT_IE9 ? L"rect(0px 1px 500px 505px)" : L"rect(0px, 1px, 500px, 505px)"), "clip = %s\n", wine_dbgstr_w(str)); SysFreeString(str); /* clear */ hres = IHTMLStyle_get_clear(style, &str); - ok(hres == S_OK, "get_clear failed: %08x\n", hres); + ok(hres == S_OK, "get_clear failed: %08lx\n", hres); ok(!str, "clear = %s\n", wine_dbgstr_w(str)); str = SysAllocString(L"both"); hres = IHTMLStyle_put_clear(style, str); - ok(hres == S_OK, "put_clear failed: %08x\n", hres); + ok(hres == S_OK, "put_clear failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLStyle_get_clear(style, &str); - ok(hres == S_OK, "get_clear failed: %08x\n", hres); + ok(hres == S_OK, "get_clear failed: %08lx\n", hres); ok(!lstrcmpW(str, L"both"), "clear = %s\n", wine_dbgstr_w(str)); SysFreeString(str); /* pageBreakAfter */ hres = IHTMLStyle_get_pageBreakAfter(style, &str); - ok(hres == S_OK, "get_pageBreakAfter failed: %08x\n", hres); + ok(hres == S_OK, "get_pageBreakAfter failed: %08lx\n", hres); ok(!str, "pageBreakAfter = %s\n", wine_dbgstr_w(str)); if(css_style) { str = SysAllocString(L"right"); hres = IHTMLCSSStyleDeclaration_put_pageBreakAfter(css_style, str); - ok(hres == S_OK, "put_pageBreakAfter failed: %08x\n", hres); + ok(hres == S_OK, "put_pageBreakAfter failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLCSSStyleDeclaration_get_pageBreakAfter(css_style, &str); - ok(hres == S_OK, "get_pageBreakAfter failed: %08x\n", hres); + ok(hres == S_OK, "get_pageBreakAfter failed: %08lx\n", hres); ok(!lstrcmpW(str, L"right"), "pageBreakAfter = %s\n", wine_dbgstr_w(str)); SysFreeString(str); } str = SysAllocString(L"always"); hres = IHTMLStyle_put_pageBreakAfter(style, str); - ok(hres == S_OK, "put_pageBreakAfter failed: %08x\n", hres); + ok(hres == S_OK, "put_pageBreakAfter failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLStyle_get_pageBreakAfter(style, &str); - ok(hres == S_OK, "get_pageBreakAfter failed: %08x\n", hres); + ok(hres == S_OK, "get_pageBreakAfter failed: %08lx\n", hres); ok(!lstrcmpW(str, L"always"), "pageBreakAfter = %s\n", wine_dbgstr_w(str)); SysFreeString(str); /* pageBreakBefore */ hres = IHTMLStyle_get_pageBreakBefore(style, &str); - ok(hres == S_OK, "get_pageBreakBefore failed: %08x\n", hres); + ok(hres == S_OK, "get_pageBreakBefore failed: %08lx\n", hres); ok(!str, "pageBreakBefore = %s\n", wine_dbgstr_w(str)); str = SysAllocString(L"always"); hres = IHTMLStyle_put_pageBreakBefore(style, str); - ok(hres == S_OK, "put_pageBreakBefore failed: %08x\n", hres); + ok(hres == S_OK, "put_pageBreakBefore failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLStyle_get_pageBreakBefore(style, &str); - ok(hres == S_OK, "get_pageBreakBefore failed: %08x\n", hres); + ok(hres == S_OK, "get_pageBreakBefore failed: %08lx\n", hres); ok(!lstrcmpW(str, L"always"), "pageBreakBefore = %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -3120,70 +3120,70 @@ static void test_body_style(IHTMLStyle *style) test_style_remove_attribute(style, L"pageBreakBefore", VARIANT_FALSE); hres = IHTMLStyle_get_pageBreakBefore(style, &str); - ok(hres == S_OK, "get_pageBreakBefore failed: %08x\n", hres); + ok(hres == S_OK, "get_pageBreakBefore failed: %08lx\n", hres); ok(!str, "pageBreakBefore = %s\n", wine_dbgstr_w(str)); str = (void*)0xdeadbeef; hres = IHTMLStyle_get_whiteSpace(style, &str); - ok(hres == S_OK, "get_whiteSpace failed: %08x\n", hres); + ok(hres == S_OK, "get_whiteSpace failed: %08lx\n", hres); ok(!str, "whiteSpace = %s\n", wine_dbgstr_w(str)); str = SysAllocString(L"nowrap"); hres = IHTMLStyle_put_whiteSpace(style, str); SysFreeString(str); - ok(hres == S_OK, "put_whiteSpace failed: %08x\n", hres); + ok(hres == S_OK, "put_whiteSpace failed: %08lx\n", hres); str = NULL; hres = IHTMLStyle_get_whiteSpace(style, &str); - ok(hres == S_OK, "get_whiteSpace failed: %08x\n", hres); + ok(hres == S_OK, "get_whiteSpace failed: %08lx\n", hres); ok(!lstrcmpW(str, L"nowrap"), "whiteSpace = %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = SysAllocString(L"normal"); hres = IHTMLStyle_put_whiteSpace(style, str); SysFreeString(str); - ok(hres == S_OK, "put_whiteSpace failed: %08x\n", hres); + ok(hres == S_OK, "put_whiteSpace failed: %08lx\n", hres); str = NULL; hres = IHTMLStyle_get_whiteSpace(style, &str); - ok(hres == S_OK, "get_whiteSpace failed: %08x\n", hres); + ok(hres == S_OK, "get_whiteSpace failed: %08lx\n", hres); ok(!lstrcmpW(str, L"normal"), "whiteSpace = %s\n", wine_dbgstr_w(str)); SysFreeString(str); /* listStyleType */ hres = IHTMLStyle_get_listStyleType(style, &str); - ok(hres == S_OK, "get_listStyleType failed: %08x\n", hres); + ok(hres == S_OK, "get_listStyleType failed: %08lx\n", hres); ok(!str, "listStyleType = %s\n", wine_dbgstr_w(str)); str = SysAllocString(L"square"); hres = IHTMLStyle_put_listStyleType(style, str); - ok(hres == S_OK, "put_listStyleType failed: %08x\n", hres); + ok(hres == S_OK, "put_listStyleType failed: %08lx\n", hres); SysFreeString(str); str = NULL; hres = IHTMLStyle_get_listStyleType(style, &str); - ok(hres == S_OK, "get_listStyleType failed: %08x\n", hres); + ok(hres == S_OK, "get_listStyleType failed: %08lx\n", hres); ok(!lstrcmpW(str, L"square"), "listStyleType = %s\n", wine_dbgstr_w(str)); str = SysAllocString(L"inside"); hres = IHTMLStyle_put_listStylePosition(style, str); - ok(hres == S_OK, "put_listStylePosition failed: %08x\n", hres); + ok(hres == S_OK, "put_listStylePosition failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLStyle_get_listStylePosition(style, &str); - ok(hres == S_OK, "get_listStylePosition failed: %08x\n", hres); + ok(hres == S_OK, "get_listStylePosition failed: %08lx\n", hres); ok(!lstrcmpW(str, L"inside"), "listStyleType = %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = SysAllocString(L"decimal-leading-zero none inside"); hres = IHTMLStyle_put_listStyle(style, str); ok(hres == S_OK || broken(hres == E_INVALIDARG), /* win 2000 */ - "put_listStyle(%s) failed: %08x\n", wine_dbgstr_w(str), hres); + "put_listStyle(%s) failed: %08lx\n", wine_dbgstr_w(str), hres); SysFreeString(str); if (hres != E_INVALIDARG) { hres = IHTMLStyle_get_listStyle(style, &str); - ok(hres == S_OK, "get_listStyle failed: %08x\n", hres); + ok(hres == S_OK, "get_listStyle failed: %08lx\n", hres); ok(wcsstr(str, L"decimal-leading-zero") && wcsstr(str, L"inside"), "listStyle = %s\n", wine_dbgstr_w(str)); if(compat_mode < COMPAT_IE9) @@ -3199,72 +3199,72 @@ static void test_body_style(IHTMLStyle *style) str = (void*)0xdeadbeef; hres = IHTMLStyle_get_styleFloat(style, &str); - ok(hres == S_OK, "get_styleFloat failed: %08x\n", hres); + ok(hres == S_OK, "get_styleFloat failed: %08lx\n", hres); ok(!str, "styleFloat = %s\n", wine_dbgstr_w(str)); str = SysAllocString(L"left"); hres = IHTMLStyle_put_styleFloat(style, str); - ok(hres == S_OK, "put_styleFloat failed: %08x\n", hres); + ok(hres == S_OK, "put_styleFloat failed: %08lx\n", hres); SysFreeString(str); str = NULL; hres = IHTMLStyle_get_styleFloat(style, &str); - ok(hres == S_OK, "get_styleFloat failed: %08x\n", hres); + ok(hres == S_OK, "get_styleFloat failed: %08lx\n", hres); ok(!lstrcmpW(str, L"left"), "styleFloat = %s\n", wine_dbgstr_w(str)); SysFreeString(str); if(css_style) { str = NULL; hres = IHTMLCSSStyleDeclaration_get_cssFloat(css_style, &str); - ok(hres == S_OK, "get_cssFloat failed: %08x\n", hres); + ok(hres == S_OK, "get_cssFloat failed: %08lx\n", hres); ok(!lstrcmpW(str, L"left"), "cssFloat = %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = NULL; hres = IHTMLCSSStyleDeclaration_get_styleFloat(css_style, &str); - ok(hres == S_OK, "get_styleFloat failed: %08x\n", hres); + ok(hres == S_OK, "get_styleFloat failed: %08lx\n", hres); ok(!lstrcmpW(str, L"left"), "styleFloat = %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = SysAllocString(L"right"); hres = IHTMLCSSStyleDeclaration_put_cssFloat(css_style, str); - ok(hres == S_OK, "put_styleFloat failed: %08x\n", hres); + ok(hres == S_OK, "put_styleFloat failed: %08lx\n", hres); SysFreeString(str); str = NULL; hres = IHTMLCSSStyleDeclaration_get_cssFloat(css_style, &str); - ok(hres == S_OK, "get_cssFloat failed: %08x\n", hres); + ok(hres == S_OK, "get_cssFloat failed: %08lx\n", hres); ok(!lstrcmpW(str, L"right"), "styleFloat = %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = SysAllocString(L"left"); hres = IHTMLCSSStyleDeclaration_put_styleFloat(css_style, str); - ok(hres == S_OK, "put_styleFloat failed: %08x\n", hres); + ok(hres == S_OK, "put_styleFloat failed: %08lx\n", hres); SysFreeString(str); str = NULL; hres = IHTMLCSSStyleDeclaration_get_cssFloat(css_style, &str); - ok(hres == S_OK, "get_cssFloat failed: %08x\n", hres); + ok(hres == S_OK, "get_cssFloat failed: %08lx\n", hres); ok(!lstrcmpW(str, L"left"), "styleFloat = %s\n", wine_dbgstr_w(str)); SysFreeString(str); } hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); - ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08lx\n", hres); if(SUCCEEDED(hres)) { test_style2(style2); IHTMLStyle2_Release(style2); } hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle3, (void**)&style3); - ok(hres == S_OK, "Could not get IHTMLStyle3 iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLStyle3 iface: %08lx\n", hres); if(SUCCEEDED(hres)) { test_style3(style3, css_style); IHTMLStyle3_Release(style3); } hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle4, (void**)&style4); - ok(hres == S_OK, "Could not get IHTMLStyle4 iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLStyle4 iface: %08lx\n", hres); if(SUCCEEDED(hres)) { test_style4(style4); IHTMLStyle4_Release(style4); @@ -3306,7 +3306,7 @@ static void _test_style_filter(unsigned line, IHTMLStyle *style, const WCHAR *ex str = (void*)0xdeadbeef; hres = IHTMLStyle_get_filter(style, &str); - ok_(__FILE__,line)(hres == S_OK, "get_filter failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_filter failed: %08lx\n", hres); if(exval) ok_(__FILE__,line)(str && !wcscmp(str, exval), "filter = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(exval)); else @@ -3323,7 +3323,7 @@ static void _test_current_style_filter(unsigned line, IHTMLCurrentStyle2 *style, str = (void*)0xdeadbeef; hres = IHTMLCurrentStyle2_get_filter(style, &str); - ok_(__FILE__,line)(hres == S_OK, "get_filter failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "get_filter failed: %08lx\n", hres); if(exval) ok_(__FILE__,line)(str && !lstrcmpW(str, exval), "filter = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(exval)); else @@ -3340,7 +3340,7 @@ static void _set_style_filter(unsigned line, IHTMLStyle *style, const WCHAR *val str = SysAllocString(val); hres = IHTMLStyle_put_filter(style, str); - ok_(__FILE__,line)(hres == S_OK, "put_filter failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "put_filter failed: %08lx\n", hres); SysFreeString(str); _test_style_filter(line, style, val); @@ -3355,10 +3355,10 @@ static void test_style_filters(IHTMLElement *elem) HRESULT hres; hres = IHTMLElement_get_style(elem, &style); - ok(hres == S_OK, "get_style failed: %08x\n", hres); + ok(hres == S_OK, "get_style failed: %08lx\n", hres); hres = IHTMLElement2_get_currentStyle(elem2, ¤t_style); - ok(hres == S_OK, "get_style failed: %08x\n", hres); + ok(hres == S_OK, "get_style failed: %08lx\n", hres); current_style2 = get_current_style2_iface((IUnknown*)current_style); @@ -3371,7 +3371,7 @@ static void test_style_filters(IHTMLElement *elem) IHTMLStyle_Release(style); hres = IHTMLElement_get_style(elem, &style); - ok(hres == S_OK, "get_style failed: %08x\n", hres); + ok(hres == S_OK, "get_style failed: %08lx\n", hres); test_style_filter(style, L"alpha(opacity=100)"); set_style_filter(style, L"xxx(a,b,c) alpha(opacity=100)"); @@ -3398,281 +3398,281 @@ static void test_current_style(IHTMLCurrentStyle *current_style) VARIANT v; hres = IHTMLCurrentStyle_get_display(current_style, &str); - ok(hres == S_OK, "get_display failed: %08x\n", hres); + ok(hres == S_OK, "get_display failed: %08lx\n", hres); ok(!lstrcmpW(str, L"block"), "get_display returned %s\n", wine_dbgstr_w(str)); SysFreeString(str); hres = IHTMLCurrentStyle_get_position(current_style, &str); - ok(hres == S_OK, "get_position failed: %08x\n", hres); + ok(hres == S_OK, "get_position failed: %08lx\n", hres); ok(!lstrcmpW(str, L"absolute"), "get_position returned %s\n", wine_dbgstr_w(str)); SysFreeString(str); hres = IHTMLCurrentStyle_get_fontFamily(current_style, &str); - ok(hres == S_OK, "get_fontFamily failed: %08x\n", hres); + ok(hres == S_OK, "get_fontFamily failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLCurrentStyle_get_fontStyle(current_style, &str); - ok(hres == S_OK, "get_fontStyle failed: %08x\n", hres); + ok(hres == S_OK, "get_fontStyle failed: %08lx\n", hres); ok(!lstrcmpW(str, L"normal"), "get_fontStyle returned %s\n", wine_dbgstr_w(str)); SysFreeString(str); hres = IHTMLCurrentStyle_get_backgroundImage(current_style, &str); - ok(hres == S_OK, "get_backgroundImage failed: %08x\n", hres); + ok(hres == S_OK, "get_backgroundImage failed: %08lx\n", hres); ok(!lstrcmpW(str, L"none"), "get_backgroundImage returned %s\n", wine_dbgstr_w(str)); SysFreeString(str); hres = IHTMLCurrentStyle_get_fontVariant(current_style, &str); - ok(hres == S_OK, "get_fontVariant failed: %08x\n", hres); + ok(hres == S_OK, "get_fontVariant failed: %08lx\n", hres); ok(!lstrcmpW(str, L"normal"), "get_fontVariant returned %s\n", wine_dbgstr_w(str)); SysFreeString(str); hres = IHTMLCurrentStyle_get_borderTopStyle(current_style, &str); - ok(hres == S_OK, "get_borderTopStyle failed: %08x\n", hres); + ok(hres == S_OK, "get_borderTopStyle failed: %08lx\n", hres); ok(!lstrcmpW(str, L"none"), "get_borderTopStyle returned %s\n", wine_dbgstr_w(str)); SysFreeString(str); hres = IHTMLCurrentStyle_get_borderRightStyle(current_style, &str); - ok(hres == S_OK, "get_borderRightStyle failed: %08x\n", hres); + ok(hres == S_OK, "get_borderRightStyle failed: %08lx\n", hres); ok(!lstrcmpW(str, L"none"), "get_borderRightStyle returned %s\n", wine_dbgstr_w(str)); SysFreeString(str); hres = IHTMLCurrentStyle_get_borderBottomStyle(current_style, &str); - ok(hres == S_OK, "get_borderBottomStyle failed: %08x\n", hres); + ok(hres == S_OK, "get_borderBottomStyle failed: %08lx\n", hres); ok(!lstrcmpW(str, L"none"), "get_borderBottomStyle returned %s\n", wine_dbgstr_w(str)); SysFreeString(str); hres = IHTMLCurrentStyle_get_borderLeftStyle(current_style, &str); - ok(hres == S_OK, "get_borderLeftStyle failed: %08x\n", hres); + ok(hres == S_OK, "get_borderLeftStyle failed: %08lx\n", hres); ok(!lstrcmpW(str, L"none"), "get_borderLeftStyle returned %s\n", wine_dbgstr_w(str)); SysFreeString(str); hres = IHTMLCurrentStyle_get_textAlign(current_style, &str); - ok(hres == S_OK, "get_textAlign failed: %08x\n", hres); + ok(hres == S_OK, "get_textAlign failed: %08lx\n", hres); ok(!lstrcmpW(str, L"center"), "get_textAlign returned %s\n", wine_dbgstr_w(str)); SysFreeString(str); hres = IHTMLCurrentStyle_get_textDecoration(current_style, &str); - ok(hres == S_OK, "get_textDecoration failed: %08x\n", hres); + ok(hres == S_OK, "get_textDecoration failed: %08lx\n", hres); ok(!lstrcmpW(str, L"none"), "get_textDecoration returned %s\n", wine_dbgstr_w(str)); SysFreeString(str); hres = IHTMLCurrentStyle_get_cursor(current_style, &str); - ok(hres == S_OK, "get_cursor failed: %08x\n", hres); + ok(hres == S_OK, "get_cursor failed: %08lx\n", hres); ok(!lstrcmpW(str, L"default"), "get_cursor returned %s\n", wine_dbgstr_w(str)); SysFreeString(str); hres = IHTMLCurrentStyle_get_backgroundRepeat(current_style, &str); - ok(hres == S_OK, "get_backgroundRepeat failed: %08x\n", hres); + ok(hres == S_OK, "get_backgroundRepeat failed: %08lx\n", hres); ok(!lstrcmpW(str, L"repeat"), "get_backgroundRepeat returned %s\n", wine_dbgstr_w(str)); SysFreeString(str); hres = IHTMLCurrentStyle_get_borderColor(current_style, &str); - ok(hres == S_OK, "get_borderColor failed: %08x\n", hres); + ok(hres == S_OK, "get_borderColor failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLCurrentStyle_get_borderStyle(current_style, &str); - ok(hres == S_OK, "get_borderStyle failed: %08x\n", hres); + ok(hres == S_OK, "get_borderStyle failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLCurrentStyle_get_visibility(current_style, &str); - ok(hres == S_OK, "get_visibility failed: %08x\n", hres); + ok(hres == S_OK, "get_visibility failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLCurrentStyle_get_overflow(current_style, &str); - ok(hres == S_OK, "get_overflow failed: %08x\n", hres); + ok(hres == S_OK, "get_overflow failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLCurrentStyle_get_borderWidth(current_style, &str); - ok(hres == S_OK, "get_borderWidth failed: %08x\n", hres); + ok(hres == S_OK, "get_borderWidth failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLCurrentStyle_get_margin(current_style, &str); - ok(hres == S_OK, "get_margin failed: %08x\n", hres); + ok(hres == S_OK, "get_margin failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLCurrentStyle_get_padding(current_style, &str); - ok(hres == S_OK, "get_padding failed: %08x\n", hres); + ok(hres == S_OK, "get_padding failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLCurrentStyle_get_fontWeight(current_style, &v); - ok(hres == S_OK, "get_fontWeight failed: %08x\n", hres); + ok(hres == S_OK, "get_fontWeight failed: %08lx\n", hres); ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); - ok( V_I4(&v) == 400, "expect 400 got (%d)\n", V_I4(&v)); + ok( V_I4(&v) == 400, "expect 400 got (%ld)\n", V_I4(&v)); VariantClear(&v); hres = IHTMLCurrentStyle_get_fontSize(current_style, &v); - ok(hres == S_OK, "get_fontSize failed: %08x\n", hres); + ok(hres == S_OK, "get_fontSize failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); hres = IHTMLCurrentStyle_get_left(current_style, &v); - ok(hres == S_OK, "get_left failed: %08x\n", hres); + ok(hres == S_OK, "get_left failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); hres = IHTMLCurrentStyle_get_top(current_style, &v); - ok(hres == S_OK, "get_top failed: %08x\n", hres); + ok(hres == S_OK, "get_top failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); hres = IHTMLCurrentStyle_get_width(current_style, &v); - ok(hres == S_OK, "get_width failed: %08x\n", hres); + ok(hres == S_OK, "get_width failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); hres = IHTMLCurrentStyle_get_height(current_style, &v); - ok(hres == S_OK, "get_height failed: %08x\n", hres); + ok(hres == S_OK, "get_height failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); hres = IHTMLCurrentStyle_get_paddingLeft(current_style, &v); - ok(hres == S_OK, "get_paddingLeft failed: %08x\n", hres); + ok(hres == S_OK, "get_paddingLeft failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); hres = IHTMLCurrentStyle_get_zIndex(current_style, &v); - ok(hres == S_OK, "get_zIndex failed: %08x\n", hres); + ok(hres == S_OK, "get_zIndex failed: %08lx\n", hres); ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); - ok( V_I4(&v) == 1, "expect 1 got (%d)\n", V_I4(&v)); + ok( V_I4(&v) == 1, "expect 1 got (%ld)\n", V_I4(&v)); VariantClear(&v); hres = IHTMLCurrentStyle_get_verticalAlign(current_style, &v); - ok(hres == S_OK, "get_verticalAlign failed: %08x\n", hres); + ok(hres == S_OK, "get_verticalAlign failed: %08lx\n", hres); test_var_bstr(&v, compat_mode < COMPAT_IE9 ? L"100px" : L"middle"); VariantClear(&v); hres = IHTMLCurrentStyle_get_marginRight(current_style, &v); - ok(hres == S_OK, "get_marginRight failed: %08x\n", hres); + ok(hres == S_OK, "get_marginRight failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); hres = IHTMLCurrentStyle_get_marginLeft(current_style, &v); - ok(hres == S_OK, "get_marginLeft failed: %08x\n", hres); + ok(hres == S_OK, "get_marginLeft failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); hres = IHTMLCurrentStyle_get_borderLeftWidth(current_style, &v); - ok(hres == S_OK, "get_borderLeftWidth failed: %08x\n", hres); + ok(hres == S_OK, "get_borderLeftWidth failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); V_BSTR(&v) = NULL; hres = IHTMLCurrentStyle_get_borderRightWidth(current_style, &v); - ok(hres == S_OK, "get_borderRightWidth failed: %08x\n", hres); + ok(hres == S_OK, "get_borderRightWidth failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); hres = IHTMLCurrentStyle_get_borderBottomWidth(current_style, &v); - ok(hres == S_OK, "get_borderBottomWidth failed: %08x\n", hres); + ok(hres == S_OK, "get_borderBottomWidth failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); hres = IHTMLCurrentStyle_get_borderTopWidth(current_style, &v); - ok(hres == S_OK, "get_borderTopWidth failed: %08x\n", hres); + ok(hres == S_OK, "get_borderTopWidth failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); hres = IHTMLCurrentStyle_get_color(current_style, &v); - ok(hres == S_OK, "get_color failed: %08x\n", hres); + ok(hres == S_OK, "get_color failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); hres = IHTMLCurrentStyle_get_backgroundColor(current_style, &v); - ok(hres == S_OK, "get_backgroundColor failed: %08x\n", hres); + ok(hres == S_OK, "get_backgroundColor failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); hres = IHTMLCurrentStyle_get_borderLeftColor(current_style, &v); - ok(hres == S_OK, "get_borderLeftColor failed: %08x\n", hres); + ok(hres == S_OK, "get_borderLeftColor failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); hres = IHTMLCurrentStyle_get_borderTopColor(current_style, &v); - ok(hres == S_OK, "get_borderTopColor failed: %08x\n", hres); + ok(hres == S_OK, "get_borderTopColor failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); hres = IHTMLCurrentStyle_get_borderRightColor(current_style, &v); - ok(hres == S_OK, "get_borderRightColor failed: %08x\n", hres); + ok(hres == S_OK, "get_borderRightColor failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); hres = IHTMLCurrentStyle_get_borderBottomColor(current_style, &v); - ok(hres == S_OK, "get_borderBottomColor failed: %08x\n", hres); + ok(hres == S_OK, "get_borderBottomColor failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); hres = IHTMLCurrentStyle_get_paddingTop(current_style, &v); - ok(hres == S_OK, "get_paddingTop failed: %08x\n", hres); + ok(hres == S_OK, "get_paddingTop failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); hres = IHTMLCurrentStyle_get_paddingRight(current_style, &v); - ok(hres == S_OK, "get_paddingRight failed: %08x\n", hres); + ok(hres == S_OK, "get_paddingRight failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); hres = IHTMLCurrentStyle_get_paddingBottom(current_style, &v); - ok(hres == S_OK, "get_paddingRight failed: %08x\n", hres); + ok(hres == S_OK, "get_paddingRight failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); hres = IHTMLCurrentStyle_get_letterSpacing(current_style, &v); - ok(hres == S_OK, "get_letterSpacing failed: %08x\n", hres); + ok(hres == S_OK, "get_letterSpacing failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); hres = IHTMLCurrentStyle_get_marginTop(current_style, &v); - ok(hres == S_OK, "get_marginTop failed: %08x\n", hres); + ok(hres == S_OK, "get_marginTop failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); hres = IHTMLCurrentStyle_get_marginBottom(current_style, &v); - ok(hres == S_OK, "get_marginBottom failed: %08x\n", hres); + ok(hres == S_OK, "get_marginBottom failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); hres = IHTMLCurrentStyle_get_right(current_style, &v); - ok(hres == S_OK, "get_Right failed: %08x\n", hres); + ok(hres == S_OK, "get_Right failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); hres = IHTMLCurrentStyle_get_bottom(current_style, &v); - ok(hres == S_OK, "get_bottom failed: %08x\n", hres); + ok(hres == S_OK, "get_bottom failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); hres = IHTMLCurrentStyle_get_lineHeight(current_style, &v); - ok(hres == S_OK, "get_lineHeight failed: %08x\n", hres); + ok(hres == S_OK, "get_lineHeight failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); hres = IHTMLCurrentStyle_get_textIndent(current_style, &v); - ok(hres == S_OK, "get_textIndent failed: %08x\n", hres); + ok(hres == S_OK, "get_textIndent failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); hres = IHTMLCurrentStyle_get_textTransform(current_style, &str); - ok(hres == S_OK, "get_textTransform failed: %08x\n", hres); + ok(hres == S_OK, "get_textTransform failed: %08lx\n", hres); SysFreeString(str); hres = IHTMLCurrentStyle_get_styleFloat(current_style, &str); - ok(hres == S_OK, "get_styleFloat failed: %08x\n", hres); + ok(hres == S_OK, "get_styleFloat failed: %08lx\n", hres); ok(!lstrcmpW(str, L"none"), "styleFloat = %s\n", wine_dbgstr_w(str)); SysFreeString(str); hres = IHTMLCurrentStyle_get_overflowX(current_style, &str); - ok(hres == S_OK, "get_overflowX failed: %08x\n", hres); + ok(hres == S_OK, "get_overflowX failed: %08lx\n", hres); ok(!lstrcmpW(str, L"hidden"), "overflowX = %s\n", wine_dbgstr_w(str)); SysFreeString(str); hres = IHTMLCurrentStyle_get_overflowY(current_style, &str); - ok(hres == S_OK, "get_overflowY failed: %08x\n", hres); + ok(hres == S_OK, "get_overflowY failed: %08lx\n", hres); ok(!lstrcmpW(str, L"hidden"), "overflowY = %s\n", wine_dbgstr_w(str)); SysFreeString(str); hres = IHTMLCurrentStyle_get_direction(current_style, &str); - ok(hres == S_OK, "get_direction failed: %08x\n", hres); + ok(hres == S_OK, "get_direction failed: %08lx\n", hres); ok(!lstrcmpW(str, L"ltr"), "direction = %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -3680,26 +3680,26 @@ static void test_current_style(IHTMLCurrentStyle *current_style) b = 100; hres = IHTMLCurrentStyle2_get_hasLayout(current_style2, &b); - ok(hres == S_OK, "get_hasLayout failed: %08x\n", hres); + ok(hres == S_OK, "get_hasLayout failed: %08lx\n", hres); ok(b == VARIANT_TRUE, "hasLayout = %x\n", b); IHTMLCurrentStyle2_Release(current_style2); hres = IHTMLCurrentStyle_QueryInterface(current_style, &IID_IHTMLCurrentStyle3, (void**)¤t_style3); - ok(hres == S_OK, "Could not get IHTMLCurrentStyle3 iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IHTMLCurrentStyle3 iface: %08lx\n", hres); hres = IHTMLCurrentStyle3_get_whiteSpace(current_style3, &str); - ok(hres == S_OK, "get_whiteSpace failed: %08x\n", hres); + ok(hres == S_OK, "get_whiteSpace failed: %08lx\n", hres); ok(!lstrcmpW(str, L"normal"), "whiteSpace = %s\n", wine_dbgstr_w(str)); SysFreeString(str); IHTMLCurrentStyle3_Release(current_style3); hres = IHTMLCurrentStyle_QueryInterface(current_style, &IID_IHTMLCurrentStyle4, (void**)¤t_style4); - ok(hres == S_OK || broken(hres == E_NOINTERFACE), "Could not get IHTMLCurrentStyle4 iface: %08x\n", hres); + ok(hres == S_OK || broken(hres == E_NOINTERFACE), "Could not get IHTMLCurrentStyle4 iface: %08lx\n", hres); if(SUCCEEDED(hres)) { hres = IHTMLCurrentStyle4_get_minWidth(current_style4, &v); - ok(hres == S_OK, "get_minWidth failed: %08x\n", hres); + ok(hres == S_OK, "get_minWidth failed: %08lx\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(minWidth) = %d\n", V_VT(&v)); VariantClear(&v); @@ -3717,12 +3717,12 @@ static void basic_style_test(IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLDocument2_get_body(doc, &elem); - ok(hres == S_OK, "get_body failed: %08x\n", hres); + ok(hres == S_OK, "get_body failed: %08lx\n", hres); elem_set_innerhtml(elem, L"<div id=\"divid\"></div>"); hres = IHTMLElement_get_style(elem, &style); - ok(hres == S_OK, "get_style failed: %08x\n", hres); + ok(hres == S_OK, "get_style failed: %08lx\n", hres); test_body_style(style); @@ -3762,15 +3762,15 @@ static void runtimestyle_test(IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLDocument2_get_body(doc, &elem); - ok(hres == S_OK, "get_body failed: %08x\n", hres); + ok(hres == S_OK, "get_body failed: %08lx\n", hres); elem2 = get_elem2_iface((IUnknown*)elem); hres = IHTMLElement2_get_runtimeStyle(elem2, &runtime_style); - ok(hres == S_OK, "get_runtimeStyle failed: %08x\n", hres); + ok(hres == S_OK, "get_runtimeStyle failed: %08lx\n", hres); hres = IHTMLElement_get_style(elem, &style); - ok(hres == S_OK, "get_style failed: %08x\n", hres); + ok(hres == S_OK, "get_style failed: %08lx\n", hres); test_text_decoration(style, NULL); test_text_decoration(runtime_style, NULL); @@ -3778,7 +3778,7 @@ static void runtimestyle_test(IHTMLDocument2 *doc) test_text_decoration(style, L"underline"); hres = IHTMLStyle_get_textDecoration(style, &str); - ok(hres == S_OK, "get_textDecoration failed: %08x\n", hres); + ok(hres == S_OK, "get_textDecoration failed: %08lx\n", hres); ok(broken(!str) || !lstrcmpW(str, L"underline"), "textDecoration = %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -3786,7 +3786,7 @@ static void runtimestyle_test(IHTMLDocument2 *doc) test_text_decoration(runtime_style, L"blink"); hres = IHTMLStyle_get_textDecoration(style, &str); - ok(hres == S_OK, "get_textDecoration failed: %08x\n", hres); + ok(hres == S_OK, "get_textDecoration failed: %08lx\n", hres); todo_wine ok(!lstrcmpW(str, L"underline"), "textDecoration = %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -3811,7 +3811,7 @@ static IHTMLDocument2 *create_document(void) #if !defined(__i386__) && !defined(__x86_64__) todo_wine #endif - ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); + ok(hres == S_OK, "CoCreateInstance failed: %08lx\n", hres); if(FAILED(hres)) return NULL; @@ -3855,7 +3855,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D HRESULT hres; hres = IHTMLDocument2_get_readyState(notif_doc, &state); - ok(hres == S_OK, "get_readyState failed: %08x\n", hres); + ok(hres == S_OK, "get_readyState failed: %08lx\n", hres); if(!lstrcmpW(state, L"complete")) doc_complete = TRUE; @@ -3900,10 +3900,10 @@ static IHTMLDocument2 *create_doc_with_string(const char *str) mem = GlobalAlloc(0, len); memcpy(mem, str, len); hres = CreateStreamOnHGlobal(mem, TRUE, &stream); - ok(hres == S_OK, "Failed to create a stream, hr %#x.\n", hres); + ok(hres == S_OK, "Failed to create a stream, hr %#lx.\n", hres); hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); - ok(hres == S_OK, "Failed to get IPersistStreamInit, hr %#x.\n", hres); + ok(hres == S_OK, "Failed to get IPersistStreamInit, hr %#lx.\n", hres); IPersistStreamInit_Load(init, stream); IPersistStreamInit_Release(init); @@ -3920,15 +3920,15 @@ static void do_advise(IUnknown *unk, REFIID riid, IUnknown *unk_advise) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IConnectionPointContainer, (void**)&container); - ok(hres == S_OK, "QueryInterface(IID_IConnectionPointContainer) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IConnectionPointContainer) failed: %08lx\n", hres); hres = IConnectionPointContainer_FindConnectionPoint(container, riid, &cp); IConnectionPointContainer_Release(container); - ok(hres == S_OK, "FindConnectionPoint failed: %08x\n", hres); + ok(hres == S_OK, "FindConnectionPoint failed: %08lx\n", hres); hres = IConnectionPoint_Advise(cp, unk_advise, &cookie); IConnectionPoint_Release(cp); - ok(hres == S_OK, "Advise failed: %08x\n", hres); + ok(hres == S_OK, "Advise failed: %08lx\n", hres); } typedef void (*style_test_t)(IHTMLDocument2*); @@ -3954,7 +3954,7 @@ static void run_test(const char *str, style_test_t test) ref = IHTMLDocument2_Release(doc); ok(!ref || broken(ref == 1), /* Vista */ - "ref = %d\n", ref); + "ref = %ld\n", ref); } static BOOL check_ie(void) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index 9fafb7afc68..0db5cb9717b 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -72,23 +72,23 @@ static void _test_disp(unsigned line, IUnknown *unk, const IID *diid, const IID HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IDispatchEx, (void**)&dispex); - ok_(__FILE__,line) (hres == S_OK, "Could not get IDispatch: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IDispatch: %08lx\n", hres); if(FAILED(hres)) return; ticnt = 0xdeadbeef; hres = IDispatchEx_GetTypeInfoCount(dispex, &ticnt); - ok_(__FILE__,line) (hres == S_OK, "GetTypeInfoCount failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "GetTypeInfoCount failed: %08lx\n", hres); ok_(__FILE__,line) (ticnt == 1, "ticnt=%u\n", ticnt); hres = IDispatchEx_GetTypeInfo(dispex, 0, 0, &typeinfo); - ok_(__FILE__,line) (hres == S_OK, "GetTypeInfo failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "GetTypeInfo failed: %08lx\n", hres); if(SUCCEEDED(hres)) { TYPEATTR *type_attr; hres = ITypeInfo_GetTypeAttr(typeinfo, &type_attr); - ok_(__FILE__,line) (hres == S_OK, "GetTypeAttr failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "GetTypeAttr failed: %08lx\n", hres); ok_(__FILE__,line) (IsEqualGUID(&type_attr->guid, diid) || broken(broken_diid && IsEqualGUID(&type_attr->guid, broken_diid)), "unexpected guid %s\n", wine_dbgstr_guid(&type_attr->guid)); @@ -104,12 +104,12 @@ static void _test_disp(unsigned line, IUnknown *unk, const IID *diid, const IID static void _test_event_args(unsigned line, const IID *dispiid, const IID *broken_dispiid, DISPID id, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { - ok_(__FILE__,line) (id == DISPID_VALUE, "id = %d\n", id); + ok_(__FILE__,line) (id == DISPID_VALUE, "id = %ld\n", id); ok_(__FILE__,line) (wFlags == DISPATCH_METHOD, "wFlags = %x\n", wFlags); ok_(__FILE__,line) (pdp != NULL, "pdp == NULL\n"); ok_(__FILE__,line) (pdp->cArgs == 1, "pdp->cArgs = %d\n", pdp->cArgs); ok_(__FILE__,line) (pdp->cNamedArgs == 1, "pdp->cNamedArgs = %d\n", pdp->cNamedArgs); - ok_(__FILE__,line) (pdp->rgdispidNamedArgs[0] == DISPID_THIS, "pdp->rgdispidNamedArgs[0] = %d\n", + ok_(__FILE__,line) (pdp->rgdispidNamedArgs[0] == DISPID_THIS, "pdp->rgdispidNamedArgs[0] = %ld\n", pdp->rgdispidNamedArgs[0]); ok_(__FILE__,line) (V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(rgvarg) = %d\n", V_VT(pdp->rgvarg)); ok_(__FILE__,line) (pvarRes != NULL, "pvarRes == NULL\n"); @@ -180,7 +180,7 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) { - ok(0, "unexpected call %s %x\n", wine_dbgstr_w(bstrName), grfdex); + ok(0, "unexpected call %s %lx\n", wine_dbgstr_w(bstrName), grfdex); return E_NOTIMPL; } @@ -223,7 +223,7 @@ static HRESULT WINAPI xmlhttprequest_onreadystatechange(IDispatchEx *iface, DISP test_event_args(&DIID_DispHTMLXMLHttpRequest, &IID_IHTMLXMLHttpRequest, id, wFlags, pdp, pvarRes, pei, pspCaller); hres = IHTMLXMLHttpRequest_get_readyState(xhr, &val); - ok(hres == S_OK, "get_readyState failed: %08x\n", hres); + ok(hres == S_OK, "get_readyState failed: %08lx\n", hres); readystatechange_cnt++; switch(val) { @@ -241,7 +241,7 @@ static HRESULT WINAPI xmlhttprequest_onreadystatechange(IDispatchEx *iface, DISP CHECK_EXPECT(xmlhttprequest_onreadystatechange_done); break; default: - ok(0, "unexpected readyState: %d\n", val); + ok(0, "unexpected readyState: %ld\n", val); } return S_OK; } @@ -297,7 +297,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D HRESULT hres; hres = IHTMLDocument2_get_readyState(notif_doc, &state); - ok(hres == S_OK, "get_readyState failed: %08x\n", hres); + ok(hres == S_OK, "get_readyState failed: %08lx\n", hres); if(!lstrcmpW(state, L"complete")) doc_complete = TRUE; @@ -332,15 +332,15 @@ static void do_advise(IUnknown *unk, REFIID riid, IUnknown *unk_advise) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IConnectionPointContainer, (void**)&container); - ok(hres == S_OK, "QueryInterface(IID_IConnectionPointContainer) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IConnectionPointContainer) failed: %08lx\n", hres); hres = IConnectionPointContainer_FindConnectionPoint(container, riid, &cp); IConnectionPointContainer_Release(container); - ok(hres == S_OK, "FindConnectionPoint failed: %08x\n", hres); + ok(hres == S_OK, "FindConnectionPoint failed: %08lx\n", hres); hres = IConnectionPoint_Advise(cp, unk_advise, &cookie); IConnectionPoint_Release(cp); - ok(hres == S_OK, "Advise failed: %08x\n", hres); + ok(hres == S_OK, "Advise failed: %08lx\n", hres); } static void pump_msgs(BOOL *b) @@ -375,7 +375,7 @@ static void create_xmlhttprequest(IHTMLDocument2 *doc) HRESULT hres; hres = IHTMLDocument2_get_parentWindow(doc, &window); - ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + ok(hres == S_OK, "get_parentWindow failed: %08lx\n", hres); ok(window != NULL, "window == NULL\n"); hres = IHTMLWindow2_QueryInterface(window, &IID_IHTMLWindow5, (void**)&window5); @@ -388,17 +388,17 @@ static void create_xmlhttprequest(IHTMLDocument2 *doc) VariantInit(&var); hres = IHTMLWindow5_get_XMLHttpRequest(window5, &var); IHTMLWindow5_Release(window5); - ok(hres == S_OK, "get_XMLHttpRequest failed: %08x\n", hres); + ok(hres == S_OK, "get_XMLHttpRequest failed: %08lx\n", hres); ok(V_VT(&var) == VT_DISPATCH, "V_VT(&var) is %08x, expected VT_DISPATCH\n", V_VT(&var)); hres = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IHTMLXMLHttpRequestFactory, (void**)&factory); VariantClear(&var); - ok(hres == S_OK, "QueryInterface(IID_IHTMLXMLHttpRequestFactory) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IHTMLXMLHttpRequestFactory) failed: %08lx\n", hres); ok(factory != NULL, "factory == NULL\n"); hres = IHTMLXMLHttpRequestFactory_create(factory, &xhr); IHTMLXMLHttpRequestFactory_Release(factory); - ok(hres == S_OK, "create failed: %08x\n", hres); + ok(hres == S_OK, "create failed: %08lx\n", hres); ok(xhr != NULL, "xhr == NULL\n"); } @@ -411,14 +411,14 @@ static void test_header(const struct HEADER_TYPE expect[], int num) all = NULL; hres = IHTMLXMLHttpRequest_getAllResponseHeaders(xhr, &all); - ok(hres == S_OK, "getAllResponseHeader failed: %08x\n", hres); + ok(hres == S_OK, "getAllResponseHeader failed: %08lx\n", hres); ok(all != NULL, "all == NULL\n"); for(i = 0; i < num; ++i) { text = NULL; key = SysAllocString(expect[i].key); hres = IHTMLXMLHttpRequest_getResponseHeader(xhr, key, &text); - ok(hres == S_OK, "getResponseHeader failed, got %08x\n", hres); + ok(hres == S_OK, "getResponseHeader failed, got %08lx\n", hres); ok(text != NULL, "text == NULL\n"); ok(!lstrcmpW(text, expect[i].value), "Expect %s: %s, got %s\n", wine_dbgstr_w(expect[i].key), wine_dbgstr_w(expect[i].value), @@ -442,16 +442,16 @@ static void test_illegal_xml(IXMLDOMDocument *xmldom) BSTR bstr; hres = IXMLDOMDocument_get_baseName(xmldom, NULL); - ok(hres == E_INVALIDARG, "Expect E_INVALIDARG, got %08x\n", hres); + ok(hres == E_INVALIDARG, "Expect E_INVALIDARG, got %08lx\n", hres); hres = IXMLDOMDocument_get_baseName(xmldom, &bstr); - ok(hres == S_FALSE, "get_baseName failed: %08x\n", hres); + ok(hres == S_FALSE, "get_baseName failed: %08lx\n", hres); ok(bstr == NULL, "bstr(%p): %s\n", bstr, wine_dbgstr_w(bstr)); SysFreeString(bstr); hres = IXMLDOMDocument_get_dataType(xmldom, NULL); - ok(hres == E_INVALIDARG, "Expect E_INVALIDARG, got %08x\n", hres); + ok(hres == E_INVALIDARG, "Expect E_INVALIDARG, got %08lx\n", hres); hres = IXMLDOMDocument_get_dataType(xmldom, &variant); - ok(hres == S_FALSE, "get_dataType failed: %08x\n", hres); + ok(hres == S_FALSE, "get_dataType failed: %08lx\n", hres); ok(V_VT(&variant) == VT_NULL, "got %s\n", wine_dbgstr_variant(&variant)); VariantClear(&variant); @@ -460,16 +460,16 @@ static void test_illegal_xml(IXMLDOMDocument *xmldom) SysFreeString(bstr); hres = IXMLDOMDocument_get_firstChild(xmldom, NULL); - ok(hres == E_INVALIDARG, "Expect E_INVALIDARG, got %08x\n", hres); + ok(hres == E_INVALIDARG, "Expect E_INVALIDARG, got %08lx\n", hres); first = (void*)0xdeadbeef; hres = IXMLDOMDocument_get_firstChild(xmldom, &first); - ok(hres == S_FALSE, "get_firstChild failed: %08x\n", hres); + ok(hres == S_FALSE, "get_firstChild failed: %08lx\n", hres); ok(first == NULL, "first != NULL\n"); last = (void*)0xdeadbeef; hres = IXMLDOMDocument_get_lastChild(xmldom, &last); - ok(hres == S_FALSE, "get_lastChild failed: %08x\n", hres); + ok(hres == S_FALSE, "get_lastChild failed: %08lx\n", hres); ok(last == NULL, "last != NULL\n"); } @@ -480,7 +480,7 @@ static void _set_request_header(unsigned line, IHTMLXMLHttpRequest *xhr, const W HRESULT hres; hres = IHTMLXMLHttpRequest_setRequestHeader(xhr, header, value); - ok_(__FILE__,line)(hres == S_OK, "setRequestHeader failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "setRequestHeader failed: %08lx\n", hres); SysFreeString(header); SysFreeString(value); @@ -496,23 +496,23 @@ static void test_responseXML(const WCHAR *expect_text) disp = NULL; hres = IHTMLXMLHttpRequest_get_responseXML(xhr, &disp); - ok(hres == S_OK, "get_responseXML failed: %08x\n", hres); + ok(hres == S_OK, "get_responseXML failed: %08lx\n", hres); ok(disp != NULL, "disp == NULL\n"); xmldom = NULL; hres = IDispatch_QueryInterface(disp, &IID_IXMLDOMDocument, (void**)&xmldom); - ok(hres == S_OK, "QueryInterface(IXMLDOMDocument) failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IXMLDOMDocument) failed: %08lx\n", hres); ok(xmldom != NULL, "xmldom == NULL\n"); hres = IXMLDOMDocument_QueryInterface(xmldom, &IID_IObjectSafety, (void**)&safety); - ok(hres == S_OK, "QueryInterface IObjectSafety failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface IObjectSafety failed: %08lx\n", hres); hres = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, &enabled); - ok(hres == S_OK, "GetInterfaceSafetyOptions failed: %08x\n", hres); + ok(hres == S_OK, "GetInterfaceSafetyOptions failed: %08lx\n", hres); ok(broken(supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA)) || supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER) /* msxml3 SP8+ */, - "Expected supported: (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), got %08x\n", supported); + "Expected supported: (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), got %08lx\n", supported); ok(enabled == ((INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER) & supported), - "Expected enabled: (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), got 0x%08x\n", enabled); + "Expected enabled: (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), got 0x%08lx\n", enabled); IObjectSafety_Release(safety); if(!expect_text) @@ -535,7 +535,7 @@ static HRESULT _xhr_open(unsigned line, const WCHAR *url_w, const WCHAR *method_ V_VT(&empty) = VT_EMPTY; hres = IHTMLXMLHttpRequest_open(xhr, method, url, async, empty, empty); - ok_(__FILE__,line)(hres == S_OK, "open failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "open failed: %08lx\n", hres); SysFreeString(method); SysFreeString(url); @@ -549,7 +549,7 @@ static void _test_response_text(unsigned line, const WCHAR *expect_text) HRESULT hres; hres = IHTMLXMLHttpRequest_get_responseText(xhr, &text); - ok(hres == S_OK, "get_responseText failed: %08x\n", hres); + ok(hres == S_OK, "get_responseText failed: %08lx\n", hres); ok(text != NULL, "test == NULL\n"); if(expect_text) { unsigned len; @@ -583,51 +583,51 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const WCHAR *xml_url, const WCHAR V_VT(&var) = VT_EMPTY; hres = IHTMLXMLHttpRequest_get_onreadystatechange(xhr, &var); - ok(hres == S_OK, "get_onreadystatechange failed: %08x\n", hres); + ok(hres == S_OK, "get_onreadystatechange failed: %08lx\n", hres); ok(V_VT(&var) == VT_NULL, "V_VT(onreadystatechange) = %d\n", V_VT(&var)); V_VT(&var) = VT_DISPATCH; V_DISPATCH(&var) = (IDispatch*)&xmlhttprequest_onreadystatechange_obj; hres = IHTMLXMLHttpRequest_put_onreadystatechange(xhr, var); - ok(hres == S_OK, "put_onreadystatechange failed: %08x\n", hres); + ok(hres == S_OK, "put_onreadystatechange failed: %08lx\n", hres); V_VT(&var) = VT_EMPTY; hres = IHTMLXMLHttpRequest_get_onreadystatechange(xhr, &var); - ok(hres == S_OK, "get_onreadystatechange failed: %08x\n", hres); + ok(hres == S_OK, "get_onreadystatechange failed: %08lx\n", hres); ok(V_VT(&var) == VT_DISPATCH, "V_VT(onreadystatechange) = %d\n", V_VT(&var)); ok(V_DISPATCH(&var) == (IDispatch*)&xmlhttprequest_onreadystatechange_obj, "unexpected onreadystatechange value\n"); hres = IHTMLXMLHttpRequest_get_readyState(xhr, NULL); - ok(hres == E_POINTER, "Expect E_POINTER, got %08x\n", hres); + ok(hres == E_POINTER, "Expect E_POINTER, got %08lx\n", hres); val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_readyState(xhr, &val); - ok(hres == S_OK, "get_readyState failed: %08x\n", hres); - ok(val == 0, "Expect UNSENT, got %d\n", val); + ok(hres == S_OK, "get_readyState failed: %08lx\n", hres); + ok(val == 0, "Expect UNSENT, got %ld\n", val); hres = IHTMLXMLHttpRequest_get_status(xhr, NULL); - ok(hres == E_POINTER, "Expect E_POINTER, got %08x\n", hres); + ok(hres == E_POINTER, "Expect E_POINTER, got %08lx\n", hres); val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_status(xhr, &val); - ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); - ok(val == 0, "Expect 0, got %d\n", val); + ok(hres == E_FAIL, "Expect E_FAIL, got: %08lx\n", hres); + ok(val == 0, "Expect 0, got %ld\n", val); hres = IHTMLXMLHttpRequest_get_statusText(xhr, NULL); - ok(hres == E_POINTER, "Expect E_POINTER, got %08x\n", hres); + ok(hres == E_POINTER, "Expect E_POINTER, got %08lx\n", hres); hres = IHTMLXMLHttpRequest_get_statusText(xhr, &text); - ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); + ok(hres == E_FAIL, "Expect E_FAIL, got: %08lx\n", hres); ok(text == NULL, "Expect NULL, got %p\n", text); text = (BSTR)0xdeadbeef; hres = IHTMLXMLHttpRequest_getAllResponseHeaders(xhr, &text); - ok(hres == E_FAIL, "got %08x\n", hres); + ok(hres == E_FAIL, "got %08lx\n", hres); ok(text == NULL, "text = %p\n", text); text = (BSTR)0xdeadbeef; hres = IHTMLXMLHttpRequest_getResponseHeader(xhr, content_type, &text); - ok(hres == E_FAIL, "got %08x\n", hres); + ok(hres == E_FAIL, "got %08lx\n", hres); ok(text == NULL, "text = %p\n", text); method = SysAllocString(L"GET"); @@ -638,7 +638,7 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const WCHAR *xml_url, const WCHAR SET_EXPECT(xmlhttprequest_onreadystatechange_opened); hres = IHTMLXMLHttpRequest_open(xhr, method, url, vbool, vempty, vempty); - todo_wine ok(hres == S_OK, "open failed: %08x\n", hres); /* Gecko 30+ only supports async */ + todo_wine ok(hres == S_OK, "open failed: %08lx\n", hres); /* Gecko 30+ only supports async */ todo_wine CHECK_CALLED(xmlhttprequest_onreadystatechange_opened); SysFreeString(method); @@ -652,27 +652,27 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const WCHAR *xml_url, const WCHAR text = (BSTR)0xdeadbeef; hres = IHTMLXMLHttpRequest_getAllResponseHeaders(xhr, &text); - ok(hres == E_FAIL, "got %08x\n", hres); + ok(hres == E_FAIL, "got %08lx\n", hres); ok(text == NULL, "text = %p\n", text); text = (BSTR)0xdeadbeef; hres = IHTMLXMLHttpRequest_getResponseHeader(xhr, content_type, &text); - ok(hres == E_FAIL, "got %08x\n", hres); + ok(hres == E_FAIL, "got %08lx\n", hres); ok(text == NULL, "text = %p\n", text); val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_status(xhr, &val); - ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); - ok(val == 0, "Expect 0, got %d\n", val); + ok(hres == E_FAIL, "Expect E_FAIL, got: %08lx\n", hres); + ok(val == 0, "Expect 0, got %ld\n", val); hres = IHTMLXMLHttpRequest_get_statusText(xhr, &text); - ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); + ok(hres == E_FAIL, "Expect E_FAIL, got: %08lx\n", hres); ok(text == NULL, "Expect NULL, got %p\n", text); val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_readyState(xhr, &val); - ok(hres == S_OK, "get_readyState failed: %08x\n", hres); - ok(val == 1, "Expect OPENED, got %d\n", val); + ok(hres == S_OK, "get_readyState failed: %08lx\n", hres); + ok(val == 1, "Expect OPENED, got %ld\n", val); set_request_header(xhr, L"x-wine-test", L"sync-test"); @@ -682,7 +682,7 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const WCHAR *xml_url, const WCHAR SET_EXPECT(xmlhttprequest_onreadystatechange_done); loading_cnt = 0; hres = IHTMLXMLHttpRequest_send(xhr, vempty); - ok(hres == S_OK, "send failed: %08x\n", hres); + ok(hres == S_OK, "send failed: %08lx\n", hres); CHECK_CALLED(xmlhttprequest_onreadystatechange_opened); CHECK_CALLED(xmlhttprequest_onreadystatechange_headers_received); CHECK_CALLED(xmlhttprequest_onreadystatechange_loading); @@ -691,7 +691,7 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const WCHAR *xml_url, const WCHAR text = NULL; hres = IHTMLXMLHttpRequest_getResponseHeader(xhr, content_type, &text); - ok(hres == S_OK, "getResponseHeader failed, got %08x\n", hres); + ok(hres == S_OK, "getResponseHeader failed, got %08lx\n", hres); ok(text != NULL, "text == NULL\n"); SysFreeString(text); @@ -700,11 +700,11 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const WCHAR *xml_url, const WCHAR val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_status(xhr, &val); - ok(hres == S_OK, "get_status failed: %08x\n", hres); - ok(val == 200, "Expect 200, got %d\n", val); + ok(hres == S_OK, "get_status failed: %08lx\n", hres); + ok(val == 200, "Expect 200, got %ld\n", val); hres = IHTMLXMLHttpRequest_get_statusText(xhr, &text); - ok(hres == S_OK, "get_statusText failed: %08x\n", hres); + ok(hres == S_OK, "get_statusText failed: %08lx\n", hres); ok(text != NULL, "text == NULL\n"); ok(!lstrcmpW(text, L"OK"), "Expected \"OK\", got %s\n", wine_dbgstr_w(text)); @@ -712,8 +712,8 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const WCHAR *xml_url, const WCHAR val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_readyState(xhr, &val); - ok(hres == S_OK, "get_readyState failed: %08x\n", hres); - ok(val == 4, "Expect DONE, got %d\n", val); + ok(hres == S_OK, "get_readyState failed: %08lx\n", hres); + ok(val == 4, "Expect DONE, got %ld\n", val); test_response_text(expect_text); test_responseXML(expect_text); @@ -740,51 +740,51 @@ static void test_async_xhr(IHTMLDocument2 *doc, const WCHAR *xml_url, const WCHA V_VT(&var) = VT_DISPATCH; V_DISPATCH(&var) = (IDispatch*)&xmlhttprequest_onreadystatechange_obj; hres = IHTMLXMLHttpRequest_put_onreadystatechange(xhr, var); - ok(hres == S_OK, "put_onreadystatechange failed: %08x\n", hres); + ok(hres == S_OK, "put_onreadystatechange failed: %08lx\n", hres); V_VT(&var) = VT_EMPTY; hres = IHTMLXMLHttpRequest_get_onreadystatechange(xhr, &var); - ok(hres == S_OK, "get_onreadystatechange failed: %08x\n", hres); + ok(hres == S_OK, "get_onreadystatechange failed: %08lx\n", hres); ok(V_VT(&var) == VT_DISPATCH, "V_VT(onreadystatechange) = %d\n", V_VT(&var)); ok(V_DISPATCH(&var) == (IDispatch*)&xmlhttprequest_onreadystatechange_obj, "unexpected onreadystatechange value\n"); hres = IHTMLXMLHttpRequest_getResponseHeader(xhr, NULL, &text); - ok(hres == E_INVALIDARG, "Expect E_INVALIDARG, got %08x\n", hres); + ok(hres == E_INVALIDARG, "Expect E_INVALIDARG, got %08lx\n", hres); hres = IHTMLXMLHttpRequest_getResponseHeader(xhr, content_type, NULL); - ok(hres == E_POINTER, "Expect E_POINTER, got %08x\n", hres); + ok(hres == E_POINTER, "Expect E_POINTER, got %08lx\n", hres); hres = IHTMLXMLHttpRequest_getResponseHeader(xhr, NULL, NULL); ok(hres == E_POINTER || broken(hres == E_INVALIDARG), /* Vista and before */ - "Expect E_POINTER, got %08x\n", hres); + "Expect E_POINTER, got %08lx\n", hres); text = (BSTR)0xdeadbeef; hres = IHTMLXMLHttpRequest_getResponseHeader(xhr, content_type, &text); - ok(hres == E_FAIL, "got %08x\n", hres); + ok(hres == E_FAIL, "got %08lx\n", hres); ok(text == NULL, "text = %p\n", text); hres = IHTMLXMLHttpRequest_getAllResponseHeaders(xhr, NULL); - ok(hres == E_POINTER, "Expect E_POINTER, got %08x\n", hres); + ok(hres == E_POINTER, "Expect E_POINTER, got %08lx\n", hres); text = (BSTR)0xdeadbeef; hres = IHTMLXMLHttpRequest_getAllResponseHeaders(xhr, &text); - ok(hres == E_FAIL, "got %08x\n", hres); + ok(hres == E_FAIL, "got %08lx\n", hres); ok(text == NULL, "text = %p\n", text); val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_status(xhr, &val); - ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); - ok(val == 0, "Expect 0, got %d\n", val); + ok(hres == E_FAIL, "Expect E_FAIL, got: %08lx\n", hres); + ok(val == 0, "Expect 0, got %ld\n", val); text = (BSTR)0xdeadbeef; hres = IHTMLXMLHttpRequest_get_statusText(xhr, &text); - ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); + ok(hres == E_FAIL, "Expect E_FAIL, got: %08lx\n", hres); ok(text == NULL, "Expect NULL, got %p\n", text); val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_readyState(xhr, &val); - ok(hres == S_OK, "get_readyState failed: %08x\n", hres); - ok(val == 0, "Expect UNSENT, got %d\n", val); + ok(hres == S_OK, "get_readyState failed: %08lx\n", hres); + ok(val == 0, "Expect UNSENT, got %ld\n", val); SET_EXPECT(xmlhttprequest_onreadystatechange_opened); hres = xhr_open(xml_url, L"GET"); @@ -798,27 +798,27 @@ static void test_async_xhr(IHTMLDocument2 *doc, const WCHAR *xml_url, const WCHA text = (BSTR)0xdeadbeef; hres = IHTMLXMLHttpRequest_getAllResponseHeaders(xhr, &text); - ok(hres == E_FAIL, "got %08x\n", hres); + ok(hres == E_FAIL, "got %08lx\n", hres); ok(text == NULL, "text = %p\n", text); text = (BSTR)0xdeadbeef; hres = IHTMLXMLHttpRequest_getResponseHeader(xhr, content_type, &text); - ok(hres == E_FAIL, "got %08x\n", hres); + ok(hres == E_FAIL, "got %08lx\n", hres); ok(text == NULL, "text = %p\n", text); val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_status(xhr, &val); - ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); - ok(val == 0, "Expect 0, got %d\n", val); + ok(hres == E_FAIL, "Expect E_FAIL, got: %08lx\n", hres); + ok(val == 0, "Expect 0, got %ld\n", val); hres = IHTMLXMLHttpRequest_get_statusText(xhr, &text); - ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); + ok(hres == E_FAIL, "Expect E_FAIL, got: %08lx\n", hres); ok(text == NULL, "Expect NULL, got %p\n", text); val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_readyState(xhr, &val); - ok(hres == S_OK, "get_readyState failed: %08x\n", hres); - ok(val == 1, "Expect OPENED, got %d\n", val); + ok(hres == S_OK, "get_readyState failed: %08lx\n", hres); + ok(val == 1, "Expect OPENED, got %ld\n", val); set_request_header(xhr, L"x-wine-test", L"async-test"); @@ -830,7 +830,7 @@ static void test_async_xhr(IHTMLDocument2 *doc, const WCHAR *xml_url, const WCHA V_VT(&vempty) = VT_EMPTY; hres = IHTMLXMLHttpRequest_send(xhr, vempty); - ok(hres == S_OK, "send failed: %08x\n", hres); + ok(hres == S_OK, "send failed: %08lx\n", hres); if(SUCCEEDED(hres)) pump_msgs(&called_xmlhttprequest_onreadystatechange_done); todo_wine CHECK_CALLED(xmlhttprequest_onreadystatechange_opened); @@ -849,7 +849,7 @@ static void test_async_xhr(IHTMLDocument2 *doc, const WCHAR *xml_url, const WCHA text = NULL; hres = IHTMLXMLHttpRequest_getAllResponseHeaders(xhr, &text); - ok(hres == S_OK, "getAllResponseHeader failed, got %08x\n", hres); + ok(hres == S_OK, "getAllResponseHeader failed, got %08lx\n", hres); ok(text != NULL, "text == NULL\n"); SysFreeString(text); @@ -858,20 +858,20 @@ static void test_async_xhr(IHTMLDocument2 *doc, const WCHAR *xml_url, const WCHA val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_status(xhr, &val); - ok(hres == S_OK, "get_status failed: %08x\n", hres); - ok(val == 200, "Expect 200, got %d\n", val); + ok(hres == S_OK, "get_status failed: %08lx\n", hres); + ok(val == 200, "Expect 200, got %ld\n", val); text = NULL; hres = IHTMLXMLHttpRequest_get_statusText(xhr, &text); - ok(hres == S_OK, "get_statusText failed: %08x\n", hres); + ok(hres == S_OK, "get_statusText failed: %08lx\n", hres); ok(text != NULL, "text == NULL\n"); ok(!lstrcmpW(text, L"OK"), "Expected \"OK\", got %s\n", wine_dbgstr_w(text)); SysFreeString(text); val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_readyState(xhr, &val); - ok(hres == S_OK, "get_readyState failed: %08x\n", hres); - ok(val == 4, "Expect DONE, got %d\n", val); + ok(hres == S_OK, "get_readyState failed: %08lx\n", hres); + ok(val == 4, "Expect DONE, got %ld\n", val); test_response_text(expect_text); test_responseXML(expect_text); @@ -902,15 +902,15 @@ static void test_async_xhr_abort(IHTMLDocument2 *doc, const WCHAR *xml_url) CHECK_CALLED(xmlhttprequest_onreadystatechange_opened); hres = IHTMLXMLHttpRequest_abort(xhr); - ok(hres == S_OK, "abort failed: %08x\n", hres); + ok(hres == S_OK, "abort failed: %08lx\n", hres); hres = IHTMLXMLHttpRequest_get_status(xhr, &val); - ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); - ok(val == 0, "Expect 0, got %d\n", val); + ok(hres == E_FAIL, "Expect E_FAIL, got: %08lx\n", hres); + ok(val == 0, "Expect 0, got %ld\n", val); hres = IHTMLXMLHttpRequest_get_readyState(xhr, &val); - ok(hres == S_OK, "get_readyState failed: %08x\n", hres); - ok(val == 0, "Expect UNSENT, got %d\n", val); + ok(hres == S_OK, "get_readyState failed: %08lx\n", hres); + ok(val == 0, "Expect UNSENT, got %ld\n", val); IHTMLXMLHttpRequest_Release(xhr); xhr = NULL; @@ -930,20 +930,20 @@ static void test_async_xhr_abort(IHTMLDocument2 *doc, const WCHAR *xml_url) SET_EXPECT(xmlhttprequest_onreadystatechange_opened); SET_EXPECT(xmlhttprequest_onreadystatechange_done); hres = IHTMLXMLHttpRequest_send(xhr, vempty); - ok(hres == S_OK, "send failed: %08x\n", hres); + ok(hres == S_OK, "send failed: %08lx\n", hres); todo_wine CHECK_CALLED(xmlhttprequest_onreadystatechange_opened); hres = IHTMLXMLHttpRequest_abort(xhr); - ok(hres == S_OK, "abort failed: %08x\n", hres); + ok(hres == S_OK, "abort failed: %08lx\n", hres); CHECK_CALLED(xmlhttprequest_onreadystatechange_done); hres = IHTMLXMLHttpRequest_get_readyState(xhr, &val); - ok(hres == S_OK, "get_readyState failed: %08x\n", hres); - ok(val == 0, "Expect UNSENT, got %d\n", val); + ok(hres == S_OK, "get_readyState failed: %08lx\n", hres); + ok(val == 0, "Expect UNSENT, got %ld\n", val); hres = IHTMLXMLHttpRequest_get_status(xhr, &val); - ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); - ok(val == 0, "Expect 0, got %d\n", val); + ok(hres == E_FAIL, "Expect E_FAIL, got: %08lx\n", hres); + ok(val == 0, "Expect 0, got %ld\n", val); ok(loading_cnt == 0, "loading_cnt = %d, expect 0, loading_cnt\n", loading_cnt); todo_wine ok(readystatechange_cnt == 2, "readystatechange_cnt = %d, expect 2\n", readystatechange_cnt); @@ -966,7 +966,7 @@ static void test_xhr_post(IHTMLDocument2 *doc) V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = (IDispatch*)&xmlhttprequest_onreadystatechange_obj; hres = IHTMLXMLHttpRequest_put_onreadystatechange(xhr, v); - ok(hres == S_OK, "put_onreadystatechange failed: %08x\n", hres); + ok(hres == S_OK, "put_onreadystatechange failed: %08lx\n", hres); SET_EXPECT(xmlhttprequest_onreadystatechange_opened); xhr_open(L"http://test.winehq.org/tests/post.php", L"POST"); @@ -984,7 +984,7 @@ static void test_xhr_post(IHTMLDocument2 *doc) SET_EXPECT(xmlhttprequest_onreadystatechange_done); hres = IHTMLXMLHttpRequest_send(xhr, v); - ok(hres == S_OK, "send failed: %08x\n", hres); + ok(hres == S_OK, "send failed: %08lx\n", hres); if(SUCCEEDED(hres)) pump_msgs(&called_xmlhttprequest_onreadystatechange_done); @@ -1012,11 +1012,11 @@ static IHTMLDocument2 *create_doc_from_url(const WCHAR *start_url) HRESULT hres; hres = CreateBindCtx(0, &bc); - ok(hres == S_OK, "CreateBindCtx failed: 0x%08x\n", hres); + ok(hres == S_OK, "CreateBindCtx failed: 0x%08lx\n", hres); url = SysAllocString(start_url); hres = CreateURLMoniker(NULL, url, &url_mon); - ok(hres == S_OK, "CreateURLMoniker failed: 0x%08x\n", hres); + ok(hres == S_OK, "CreateURLMoniker failed: 0x%08lx\n", hres); hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IHTMLDocument2, @@ -1024,15 +1024,15 @@ static IHTMLDocument2 *create_doc_from_url(const WCHAR *start_url) #if !defined(__i386__) && !defined(__x86_64__) todo_wine #endif - ok(hres == S_OK, "CoCreateInstance failed: 0x%08x\n", hres); + ok(hres == S_OK, "CoCreateInstance failed: 0x%08lx\n", hres); hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistMoniker, (void**)&persist_mon); - ok(hres == S_OK, "IHTMLDocument2_QueryInterface failed: 0x%08x\n", hres); + ok(hres == S_OK, "IHTMLDocument2_QueryInterface failed: 0x%08lx\n", hres); hres = IPersistMoniker_Load(persist_mon, FALSE, url_mon, bc, STGM_SHARE_EXCLUSIVE | STGM_READWRITE); - ok(hres == S_OK, "IPersistMoniker_Load failed: 0x%08x\n", hres); + ok(hres == S_OK, "IPersistMoniker_Load failed: 0x%08lx\n", hres); IPersistMoniker_Release(persist_mon); IMoniker_Release(url_mon);
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=109504 Your paranoid android. === w8adm (32 bit report) === mshtml: events.c:1089: Test failed: unexpected call img_onerror events: Timeout === w10pro64_ja (64 bit report) === mshtml: htmldoc.c:2541: Test failed: unexpected call UpdateUI htmldoc.c:2853: Test failed: unexpected call Exec_UPDATECOMMANDS === w10pro64_zh_CN (64 bit report) === mshtml: htmldoc.c:2541: Test failed: unexpected call UpdateUI htmldoc.c:2853: Test failed: unexpected call Exec_UPDATECOMMANDS
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mspatcha/tests/Makefile.in | 1 dlls/mspatcha/tests/apply_patch.c | 90 +++++++++++++++++++------------------ 2 files changed, 45 insertions(+), 46 deletions(-) diff --git a/dlls/mspatcha/tests/Makefile.in b/dlls/mspatcha/tests/Makefile.in index 917dd733c5e..ef1d19271c7 100644 --- a/dlls/mspatcha/tests/Makefile.in +++ b/dlls/mspatcha/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mspatcha.dll IMPORTS = mspatcha diff --git a/dlls/mspatcha/tests/apply_patch.c b/dlls/mspatcha/tests/apply_patch.c index dae09c3cd79..bfde9b9a432 100644 --- a/dlls/mspatcha/tests/apply_patch.c +++ b/dlls/mspatcha/tests/apply_patch.c @@ -413,7 +413,7 @@ static void test_ApplyPatchToFile(void) ok(pApplyPatchToFileA(patch_null_input_uncompressed_tmp, NULL, output_file_temp, APPLY_OPTION_FAIL_IF_EXACT), "ApplyPatchToFileA: expected TRUE\n"); err = GetLastError(); - ok(err == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%X\n", err); + ok(err == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%lX\n", err); } /* dual input patch - first file */ @@ -421,7 +421,7 @@ static void test_ApplyPatchToFile(void) ok(pApplyPatchToFileA(patch_two_files_ranges_tmp, old_two_files_ranges_0_tmp, output_file_temp, APPLY_OPTION_FAIL_IF_EXACT), "ApplyPatchToFileA: expected TRUE\n"); err = GetLastError(); - ok(err == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%X\n", err); + ok(err == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%lX\n", err); /* ensure that ranges were applied properly by comparing with the result from Windows */ compare_file(output_file_temp, windows_output_0, sizeof(windows_output_0)); /* handles were closed */ @@ -437,7 +437,7 @@ static void test_ApplyPatchToFile(void) err = GetLastError(); /* error code is unstable across Windows versions and architectures (bug) */ ok(err == ERROR_PATCH_WRONG_FILE || err == ERROR_SUCCESS, - "Expected ERROR_SUCCESS or ERROR_PATCH_WRONG_FILE, got 0x%X\n", err); + "Expected ERROR_SUCCESS or ERROR_PATCH_WRONG_FILE, got 0x%lX\n", err); /* output deleted on failure */ ok(GetFileAttributesA(output_file_temp) == INVALID_FILE_ATTRIBUTES, "Output file should not exist\n"); /* handles were closed */ @@ -452,7 +452,7 @@ static void test_ApplyPatchToFile(void) err = GetLastError(); /* error code is unstable across Windows versions and architectures (bug) */ ok(err == ERROR_PATCH_WRONG_FILE || err == ERROR_SUCCESS, - "Expected ERROR_SUCCESS or ERROR_PATCH_WRONG_FILE, got 0x%X\n", err); + "Expected ERROR_SUCCESS or ERROR_PATCH_WRONG_FILE, got 0x%lX\n", err); /* output deleted on failure */ ok(GetFileAttributesA(output_file_temp) == INVALID_FILE_ATTRIBUTES, "Output file should not exist\n"); @@ -460,7 +460,7 @@ static void test_ApplyPatchToFile(void) SetLastError(0xdeadbeef); ok(!pApplyPatchToFileA("snarfalargle", old_two_files_ranges_0_tmp, output_file_temp, 0), "ApplyPatchToFileA: expected FALSE\n"); err = GetLastError(); - ok(err == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got 0x%X\n", err); + ok(err == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got 0x%lX\n", err); ok(file_closed(old_two_files_ranges_0_tmp), "File handle was not closed: %s\n", old_two_files_ranges_0_tmp); ok(GetFileAttributesA(output_file_temp) == INVALID_FILE_ATTRIBUTES, "Output file should not exist\n"); @@ -468,7 +468,7 @@ static void test_ApplyPatchToFile(void) SetLastError(0xdeadbeef); ok(!pApplyPatchToFileA(patch_two_files_ranges_tmp, "elbernoffle", output_file_temp, 0), "ApplyPatchToFileA: expected FALSE\n"); err = GetLastError(); - ok(err == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got 0x%X\n", err); + ok(err == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got 0x%lX\n", err); ok(file_closed(patch_two_files_ranges_tmp), "File handle was not closed: %s\n", patch_two_files_ranges_tmp); ok(GetFileAttributesA(output_file_temp) == INVALID_FILE_ATTRIBUTES, "Output file should not exist\n"); @@ -477,7 +477,7 @@ static void test_ApplyPatchToFile(void) ok(!pApplyPatchToFileA(patch_two_files_ranges_tmp, old_two_files_ranges_0_tmp, "up\\down\\left\\right", 0), "ApplyPatchToFileA: expected FALSE\n"); err = GetLastError(); - ok(err == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got 0x%X\n", err); + ok(err == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got 0x%lX\n", err); ok(file_closed(patch_two_files_ranges_tmp), "File handle was not closed: %s\n", patch_two_files_ranges_tmp); ok(file_closed(old_two_files_ranges_0_tmp), "File handle was not closed: %s\n", old_two_files_ranges_0_tmp); @@ -490,7 +490,7 @@ static void test_ApplyPatchToFile(void) ok(pApplyPatchToFileExA(patch_two_files_ranges_tmp, old_two_files_ranges_0_tmp, output_file_temp, APPLY_OPTION_FAIL_IF_EXACT, progress, ¤t), "ApplyPatchToFileExA: expected TRUE\n"); err = GetLastError(); - ok(err == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%X\n", err); + ok(err == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%lX\n", err); ok(current <= 100, "Expected 0-100, got 0xdeadbeef\n"); /* cancellation in ApplyPatchToFileExA */ @@ -500,7 +500,7 @@ static void test_ApplyPatchToFile(void) progress_cancel, ¤t), "ApplyPatchToFileExA: expected FALSE\n"); err = GetLastError(); /* the file is so small that cancellation occurs on completion and sometimes Windows reports success */ - ok(err == ERROR_CANCELLED || err == ERROR_SUCCESS, "Expected ERROR_SUCCESS or ERROR_CANCELLED, got 0x%X\n", err); + ok(err == ERROR_CANCELLED || err == ERROR_SUCCESS, "Expected ERROR_SUCCESS or ERROR_CANCELLED, got 0x%lX\n", err); ok(current <= 100, "Expected 0-100, got 0xdeadbeef\n"); } @@ -520,21 +520,21 @@ static void test_ApplyPatchToFileByHandles(void) patch_hndl = CreateFileA(patch_two_files_ranges_tmp, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); if (patch_hndl == INVALID_HANDLE_VALUE) { - skip("Failed to open patch file %s: %u\n", patch_two_files_ranges_tmp, GetLastError()); + skip("Failed to open patch file %s: %lu\n", patch_two_files_ranges_tmp, GetLastError()); goto close_handles; } old_hndl = CreateFileA(old_two_files_ranges_0_tmp, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); if (old_hndl == INVALID_HANDLE_VALUE) { - skip("Failed to open old file %s: %u\n", old_two_files_ranges_0_tmp, GetLastError()); + skip("Failed to open old file %s: %lu\n", old_two_files_ranges_0_tmp, GetLastError()); goto close_handles; } new_hndl = CreateFileA(output_file_temp, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); if (new_hndl == INVALID_HANDLE_VALUE) { - skip("Failed to open new file %s: %u\n", output_file_temp, GetLastError()); + skip("Failed to open new file %s: %lu\n", output_file_temp, GetLastError()); goto close_handles; } @@ -542,15 +542,15 @@ static void test_ApplyPatchToFileByHandles(void) ok(pApplyPatchToFileByHandles(patch_hndl, old_hndl, new_hndl, APPLY_OPTION_FAIL_IF_EXACT), "ApplyPatchToFileByHandles: expected TRUE\n"); err = GetLastError(); - ok(err == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%X\n", err); + ok(err == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%lX\n", err); w = SetFilePointer(patch_hndl, 0, NULL, FILE_CURRENT); - ok(w == 0, "Expected file pointer 0, got %u\n", w); + ok(w == 0, "Expected file pointer 0, got %lu\n", w); w = SetFilePointer(old_hndl, 0, NULL, FILE_CURRENT); - ok(w == 0, "Expected file pointer 0, got %u\n", w); + ok(w == 0, "Expected file pointer 0, got %lu\n", w); w = SetFilePointer(new_hndl, 0, NULL, FILE_CURRENT); - ok(w == sizeof(windows_output_0), "Expected file pointer %u, got %u\n", (unsigned)sizeof(windows_output_0), w); + ok(w == sizeof(windows_output_0), "Expected file pointer %u, got %lu\n", (unsigned)sizeof(windows_output_0), w); size = SetFilePointer(new_hndl, 0, NULL, FILE_END); - ok(size == sizeof(windows_output_0), "Expected file size %u, got %u\n",(unsigned)sizeof(windows_output_0), size); + ok(size == sizeof(windows_output_0), "Expected file size %u, got %lu\n",(unsigned)sizeof(windows_output_0), size); /* lengthen and check for truncation */ WriteFile(new_hndl, "", 1, &w, 0); @@ -558,9 +558,9 @@ static void test_ApplyPatchToFileByHandles(void) ok(pApplyPatchToFileByHandles(patch_hndl, old_hndl, new_hndl, APPLY_OPTION_FAIL_IF_EXACT), "ApplyPatchToFileByHandles: expected TRUE\n"); err = GetLastError(); - ok(err == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%X\n", err); + ok(err == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%lX\n", err); w = SetFilePointer(new_hndl, 0, NULL, FILE_END); - ok(w == size, "Expected file size %u, got %u\n", size, w); + ok(w == size, "Expected file size %lu, got %lu\n", size, w); if (!pTestApplyPatchToFileByHandles) goto close_handles; @@ -569,7 +569,7 @@ static void test_ApplyPatchToFileByHandles(void) ok(pTestApplyPatchToFileByHandles(patch_hndl, old_hndl, APPLY_OPTION_FAIL_IF_EXACT), "TestApplyPatchToFileByHandles: expected TRUE\n"); err = GetLastError(); - ok(err == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%X\n", err); + ok(err == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%lX\n", err); if (!pApplyPatchToFileByHandlesEx) goto close_handles; @@ -580,10 +580,10 @@ static void test_ApplyPatchToFileByHandles(void) ok(pApplyPatchToFileByHandlesEx(patch_hndl, old_hndl, new_hndl, APPLY_OPTION_FAIL_IF_EXACT, progress, ¤t), "ApplyPatchToFileByHandlesEx: expected TRUE\n"); err = GetLastError(); - ok(err == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%X\n", err); + ok(err == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%lX\n", err); ok(current <= 100, "Expected 0-100, got 0xdeadbeef\n"); w = SetFilePointer(new_hndl, 0, NULL, FILE_END); - ok(w == size, "Expected file size %u, got %u\n", size, w); + ok(w == size, "Expected file size %lu, got %lu\n", size, w); /* progress cancelled */ SetLastError(0xdeadbeef); @@ -591,7 +591,7 @@ static void test_ApplyPatchToFileByHandles(void) ok(!pApplyPatchToFileByHandlesEx(patch_hndl, old_hndl, new_hndl, APPLY_OPTION_FAIL_IF_EXACT, progress_cancel, ¤t), "ApplyPatchToFileByHandlesEx: expected FALSE\n"); err = GetLastError(); - ok(err == ERROR_CANCELLED || err == ERROR_SUCCESS, "Expected ERROR_SUCCESS or ERROR_CANCELLED, got 0x%X\n", err); + ok(err == ERROR_CANCELLED || err == ERROR_SUCCESS, "Expected ERROR_SUCCESS or ERROR_CANCELLED, got 0x%lX\n", err); ok(current <= 100, "Expected 0-100, got 0xdeadbeef\n"); close_handles: @@ -622,9 +622,9 @@ static void test_ApplyPatchToFileByBuffers(void) old_two_files_ranges_0, sizeof(old_two_files_ranges_0), &new_buf, 0, &new_size, &new_time, 0, progress, ¤t), "ApplyPatchToFileByBuffers: expected TRUE\n"); err = GetLastError(); - ok(err == 0xdeadbeef || err == ERROR_SUCCESS, "Expected 0xdeadbeef or ERROR_SUCCESS, got 0x%X\n", err); + ok(err == 0xdeadbeef || err == ERROR_SUCCESS, "Expected 0xdeadbeef or ERROR_SUCCESS, got 0x%lX\n", err); ok(new_buf != NULL, "Expected buffer returned, got NULL\n"); - ok(new_size == sizeof(windows_output_0), "Expected size %u, got %u\n", (unsigned)sizeof(windows_output_0), new_size); + ok(new_size == sizeof(windows_output_0), "Expected size %u, got %lu\n", (unsigned)sizeof(windows_output_0), new_size); if(new_buf != NULL) ok(memcmp(new_buf, windows_output_0, new_size) == 0, "Expected data equal, got not equal\n"); ok(current <= 100, "Expected progress 0-100, got 0xdeadbeef\n"); @@ -642,9 +642,9 @@ static void test_ApplyPatchToFileByBuffers(void) old_blocktype2_no_timestamp, sizeof(old_blocktype2_no_timestamp), &new_buf, sizeof(target_buf), &new_size, &new_time, 0, NULL, NULL), "ApplyPatchToFileByBuffers: expected TRUE\n"); err = GetLastError(); - ok(err == 0xdeadbeef || err == ERROR_SUCCESS, "Expected 0xdeadbeef or ERROR_SUCCESS, got 0x%X\n", err); + ok(err == 0xdeadbeef || err == ERROR_SUCCESS, "Expected 0xdeadbeef or ERROR_SUCCESS, got 0x%lX\n", err); ok(new_buf == target_buf, "Buffer pre-allocated; pointer should not be modified\n"); - ok(new_size == BLOCKTYPE2_NO_TIMESTAMP_SIZE, "Expected size %u, got %u\n", BLOCKTYPE2_NO_TIMESTAMP_SIZE, new_size); + ok(new_size == BLOCKTYPE2_NO_TIMESTAMP_SIZE, "Expected size %u, got %lu\n", BLOCKTYPE2_NO_TIMESTAMP_SIZE, new_size); ok(new_time.dwHighDateTime == 0, "Expected datetime 0, got nonzero\n"); /* null old file */ @@ -656,8 +656,8 @@ static void test_ApplyPatchToFileByBuffers(void) NULL, 0, &new_buf, sizeof(target_buf), &new_size, &new_time, 0, NULL, NULL), "ApplyPatchToFileByBuffers: expected TRUE\n"); err = GetLastError(); - ok(err == 0xdeadbeef || err == ERROR_SUCCESS, "Expected 0xdeadbeef or ERROR_SUCCESS, got 0x%X\n", err); - ok(new_size == NULL_INPUT_UNCOMPRESSED_SIZE, "Expected size %u, got %u\n", NULL_INPUT_UNCOMPRESSED_SIZE, new_size); + ok(err == 0xdeadbeef || err == ERROR_SUCCESS, "Expected 0xdeadbeef or ERROR_SUCCESS, got 0x%lX\n", err); + ok(new_size == NULL_INPUT_UNCOMPRESSED_SIZE, "Expected size %u, got %lu\n", NULL_INPUT_UNCOMPRESSED_SIZE, new_size); ok(new_time.dwHighDateTime != 0, "Expected nonzero, got 0\n"); /* null output */ @@ -665,7 +665,7 @@ static void test_ApplyPatchToFileByBuffers(void) ok(!pApplyPatchToFileByBuffers(patch_null_input_uncompressed, sizeof(patch_null_input_uncompressed), NULL, 0, NULL, 0, &new_size, &new_time, 0, NULL, NULL), "ApplyPatchToFileByBuffers: expected FALSE\n"); err = GetLastError(); - ok(err == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got 0x%X\n", err); + ok(err == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got 0x%lX\n", err); /* null output test only */ new_time.dwHighDateTime = 0; @@ -674,7 +674,7 @@ static void test_ApplyPatchToFileByBuffers(void) NULL, 0, NULL, 0, NULL, &new_time, APPLY_OPTION_TEST_ONLY, NULL, NULL), "ApplyPatchToFileByBuffers: expected TRUE\n"); err = GetLastError(); - ok(err == 0xdeadbeef || err == ERROR_SUCCESS, "Expected 0xdeadbeef or ERROR_SUCCESS, got 0x%X\n", err); + ok(err == 0xdeadbeef || err == ERROR_SUCCESS, "Expected 0xdeadbeef or ERROR_SUCCESS, got 0x%lX\n", err); ok(new_time.dwHighDateTime != 0, "Expected nonzero, got 0\n"); /* null old file test only */ @@ -684,8 +684,8 @@ static void test_ApplyPatchToFileByBuffers(void) NULL, 0, NULL, 0, &new_size, NULL, APPLY_OPTION_TEST_ONLY, NULL, NULL), "ApplyPatchToFileByBuffers: expected TRUE\n"); err = GetLastError(); - ok(err == 0xdeadbeef || err == ERROR_SUCCESS, "Expected 0xdeadbeef or ERROR_SUCCESS, got 0x%X\n", err); - ok(new_size == NULL_INPUT_UNCOMPRESSED_SIZE, "Expected size %u, got %u\n", NULL_INPUT_UNCOMPRESSED_SIZE, new_size); + ok(err == 0xdeadbeef || err == ERROR_SUCCESS, "Expected 0xdeadbeef or ERROR_SUCCESS, got 0x%lX\n", err); + ok(new_size == NULL_INPUT_UNCOMPRESSED_SIZE, "Expected size %u, got %lu\n", NULL_INPUT_UNCOMPRESSED_SIZE, new_size); /* alternate old file */ new_buf = target_buf; @@ -695,8 +695,8 @@ static void test_ApplyPatchToFileByBuffers(void) old_two_files_ranges_1, sizeof(old_two_files_ranges_1), &new_buf, sizeof(target_buf), &new_size, NULL, 0, NULL, NULL), "ApplyPatchToFileByBuffers: expected TRUE\n"); err = GetLastError(); - ok(new_size == TWO_FILES_RANGES_SIZE, "Expected size %u, got %u\n", TWO_FILES_RANGES_SIZE, new_size); - ok(err == 0xdeadbeef || err == ERROR_SUCCESS, "Expected 0xdeadbeef or ERROR_SUCCESS, got 0x%X\n", err); + ok(new_size == TWO_FILES_RANGES_SIZE, "Expected size %u, got %lu\n", TWO_FILES_RANGES_SIZE, new_size); + ok(err == 0xdeadbeef || err == ERROR_SUCCESS, "Expected 0xdeadbeef or ERROR_SUCCESS, got 0x%lX\n", err); /* wrong old file */ new_buf = target_buf; @@ -705,7 +705,7 @@ static void test_ApplyPatchToFileByBuffers(void) old_blocktype2_no_timestamp, sizeof(old_blocktype2_no_timestamp), &new_buf, sizeof(target_buf), NULL, &new_time, 0, NULL, NULL), "ApplyPatchToFileByBuffers: expected FALSE\n"); err = GetLastError(); - ok(err == ERROR_PATCH_WRONG_FILE, "Expected ERROR_PATCH_WRONG_FILE, got 0x%X\n", err); + ok(err == ERROR_PATCH_WRONG_FILE, "Expected ERROR_PATCH_WRONG_FILE, got 0x%lX\n", err); memcpy(corrupt_buf, patch_blocktype2_no_timestamp, sizeof(corrupt_buf)); @@ -716,7 +716,7 @@ static void test_ApplyPatchToFileByBuffers(void) old_blocktype2_no_timestamp, sizeof(old_blocktype2_no_timestamp), &new_buf, sizeof(target_buf), NULL, &new_time, 0, NULL, NULL), "ApplyPatchToFileByBuffers: expected FALSE\n"); err = GetLastError(); - ok(err == ERROR_PATCH_CORRUPT, "Expected ERROR_PATCH_CORRUPT, got 0x%X\n", err); + ok(err == ERROR_PATCH_CORRUPT, "Expected ERROR_PATCH_CORRUPT, got 0x%lX\n", err); corrupt_buf[sizeof(corrupt_buf) / 2] ^= 0xFF; @@ -727,7 +727,7 @@ static void test_ApplyPatchToFileByBuffers(void) old_blocktype2_no_timestamp, sizeof(old_blocktype2_no_timestamp), &new_buf, sizeof(target_buf), NULL, &new_time, 0, NULL, NULL), "ApplyPatchToFileByBuffers: expected FALSE\n"); err = GetLastError(); - ok(err == ERROR_PATCH_CORRUPT, "Expected ERROR_PATCH_CORRUPT, got 0x%X\n", err); + ok(err == ERROR_PATCH_CORRUPT, "Expected ERROR_PATCH_CORRUPT, got 0x%lX\n", err); /* patch created from identical files */ new_buf = target_buf; @@ -736,7 +736,7 @@ static void test_ApplyPatchToFileByBuffers(void) old_unnecessary, sizeof(old_unnecessary), &new_buf, sizeof(target_buf), NULL, &new_time, 0, NULL, NULL), "ApplyPatchToFileByBuffers: expected TRUE\n"); err = GetLastError(); - ok(err == 0xdeadbeef || err == ERROR_SUCCESS, "Expected 0xdeadbeef or ERROR_SUCCESS, got 0x%X\n", err); + ok(err == 0xdeadbeef || err == ERROR_SUCCESS, "Expected 0xdeadbeef or ERROR_SUCCESS, got 0x%lX\n", err); /* patch created from identical files and APPLY_OPTION_FAIL_IF_EXACT */ new_buf = target_buf; @@ -745,7 +745,7 @@ static void test_ApplyPatchToFileByBuffers(void) old_unnecessary, sizeof(old_unnecessary), &new_buf, sizeof(target_buf), NULL, &new_time, APPLY_OPTION_FAIL_IF_EXACT, NULL, NULL), "ApplyPatchToFileByBuffers: expected FALSE\n"); err = GetLastError(); - ok(err == ERROR_PATCH_NOT_NECESSARY, "Expected ERROR_PATCH_NOT_NECESSARY, got 0x%X\n", err); + ok(err == ERROR_PATCH_NOT_NECESSARY, "Expected ERROR_PATCH_NOT_NECESSARY, got 0x%lX\n", err); if (!pTestApplyPatchToFileByBuffers) return; @@ -757,8 +757,8 @@ static void test_ApplyPatchToFileByBuffers(void) old_blocktype2_no_timestamp, sizeof(old_blocktype2_no_timestamp), &new_size, 0), "TestApplyPatchToFileByBuffers: expected TRUE\n"); err = GetLastError(); - ok(err == 0xdeadbeef || err == ERROR_SUCCESS, "Expected 0xdeadbeef or ERROR_SUCCESS, got 0x%X\n", err); - ok(new_size == BLOCKTYPE2_NO_TIMESTAMP_SIZE, "Expected size %u, got %u\n", BLOCKTYPE2_NO_TIMESTAMP_SIZE, new_size); + ok(err == 0xdeadbeef || err == ERROR_SUCCESS, "Expected 0xdeadbeef or ERROR_SUCCESS, got 0x%lX\n", err); + ok(new_size == BLOCKTYPE2_NO_TIMESTAMP_SIZE, "Expected size %u, got %lu\n", BLOCKTYPE2_NO_TIMESTAMP_SIZE, new_size); /* header test, no size returned */ SetLastError(0xdeadbeef); @@ -766,7 +766,7 @@ static void test_ApplyPatchToFileByBuffers(void) old_blocktype2_no_timestamp, sizeof(old_blocktype2_no_timestamp), NULL, 0), "TestApplyPatchToFileByBuffers: expected TRUE\n"); err = GetLastError(); - ok(err == 0xdeadbeef || err == ERROR_SUCCESS, "Expected 0xdeadbeef or ERROR_SUCCESS, got 0x%X\n", err); + ok(err == 0xdeadbeef || err == ERROR_SUCCESS, "Expected 0xdeadbeef or ERROR_SUCCESS, got 0x%lX\n", err); } static void test_TestApplyPatchToFile(void) @@ -788,13 +788,13 @@ static void test_TestApplyPatchToFile(void) SetLastError(0xdeadbeef); ok(pTestApplyPatchToFileA(patch_header_only_tmp, old_two_files_ranges_0_tmp, 0), "TestApplyPatchToFileA: expected TRUE\n"); err = GetLastError(); - ok(err == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%X\n", err); + ok(err == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%lX\n", err); /* wrong old file */ SetLastError(0xdeadbeef); ok(!pTestApplyPatchToFileA(patch_header_only_tmp, old_blocktype2_no_timestamp_tmp, 0), "TestApplyPatchToFileA: expected FALSE\n"); err = GetLastError(); - ok(err == ERROR_PATCH_WRONG_FILE, "Expected ERROR_PATCH_WRONG_FILE, got 0x%X\n", err); + ok(err == ERROR_PATCH_WRONG_FILE, "Expected ERROR_PATCH_WRONG_FILE, got 0x%lX\n", err); } START_TEST(apply_patch)
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msrle32/tests/Makefile.in | 1 - dlls/msrle32/tests/msrle.c | 40 ++++++++++++++++++++-------------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/msrle32/tests/Makefile.in b/dlls/msrle32/tests/Makefile.in index b0d99b5de8f..5fe929a6ded 100644 --- a/dlls/msrle32/tests/Makefile.in +++ b/dlls/msrle32/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msrle32.dll IMPORTS = msvfw32 diff --git a/dlls/msrle32/tests/msrle.c b/dlls/msrle32/tests/msrle.c index 84c5c215108..c4dec7a8af7 100644 --- a/dlls/msrle32/tests/msrle.c +++ b/dlls/msrle32/tests/msrle.c @@ -62,37 +62,37 @@ static void test_encode(void) ok(hic != NULL, "ICOpen failed\n"); res = ICGetInfo(hic, &info, sizeof(info)); - ok(res == sizeof(info), "res = %ld\n", res); - ok(info.dwSize == sizeof(info), "dwSize = %d\n", info.dwSize); - ok(info.fccHandler == FCC('M','R','L','E'), "fccHandler = %x\n", info.fccHandler); - ok(info.dwFlags == (VIDCF_QUALITY|VIDCF_CRUNCH|VIDCF_TEMPORAL), "dwFlags = %x\n", info.dwFlags); - ok(info.dwVersionICM == ICVERSION, "dwVersionICM = %d\n", info.dwVersionICM); + ok(res == sizeof(info), "res = %Id\n", res); + ok(info.dwSize == sizeof(info), "dwSize = %ld\n", info.dwSize); + ok(info.fccHandler == FCC('M','R','L','E'), "fccHandler = %lx\n", info.fccHandler); + ok(info.dwFlags == (VIDCF_QUALITY|VIDCF_CRUNCH|VIDCF_TEMPORAL), "dwFlags = %lx\n", info.dwFlags); + ok(info.dwVersionICM == ICVERSION, "dwVersionICM = %ld\n", info.dwVersionICM); quality = 0xdeadbeef; res = ICSendMessage(hic, ICM_GETDEFAULTQUALITY, (DWORD_PTR)&quality, 0); - ok(res == ICERR_OK, "ICSendMessage(ICM_GETDEFAULTQUALITY) failed: %ld\n", res); - ok(quality == 8500, "quality = %d\n", quality); + ok(res == ICERR_OK, "ICSendMessage(ICM_GETDEFAULTQUALITY) failed: %Id\n", res); + ok(quality == 8500, "quality = %ld\n", quality); quality = 0xdeadbeef; res = ICSendMessage(hic, ICM_GETQUALITY, (DWORD_PTR)&quality, 0); - ok(res == ICERR_UNSUPPORTED, "ICSendMessage(ICM_GETQUALITY) failed: %ld\n", res); - ok(quality == 0xdeadbeef, "quality = %d\n", quality); + ok(res == ICERR_UNSUPPORTED, "ICSendMessage(ICM_GETQUALITY) failed: %Id\n", res); + ok(quality == 0xdeadbeef, "quality = %ld\n", quality); quality = ICQUALITY_HIGH; res = ICSendMessage(hic, ICM_SETQUALITY, (DWORD_PTR)&quality, 0); - ok(res == ICERR_UNSUPPORTED, "ICSendMessage(ICM_SETQUALITY) failed: %ld\n", res); + ok(res == ICERR_UNSUPPORTED, "ICSendMessage(ICM_SETQUALITY) failed: %Id\n", res); output_size = ICCompressGetFormatSize(hic, &input_header.header); - ok(output_size == 1064, "output_size = %d\n", output_size); + ok(output_size == 1064, "output_size = %ld\n", output_size); output_header = HeapAlloc(GetProcessHeap(), 0, output_size); ICCompressGetFormat(hic, &input_header.header, output_header); flags = 0; res = ICCompress(hic, ICCOMPRESS_KEYFRAME, output_header, buf, &input_header.header, input1, 0, &flags, 0, 0, 0, NULL, NULL); - ok(res == ICERR_OK, "ICCompress failed: %ld\n", res); + ok(res == ICERR_OK, "ICCompress failed: %Id\n", res); test_output(buf, output_header->biSizeImage, output1, sizeof(output1)); - ok(flags == (AVIIF_TWOCC|AVIIF_KEYFRAME), "flags = %x\n", flags); + ok(flags == (AVIIF_TWOCC|AVIIF_KEYFRAME), "flags = %lx\n", flags); HeapFree(GetProcessHeap(), 0, output_header); @@ -135,25 +135,25 @@ static void test_raw_decompress(void) /* Check which codec is able to decompress uncompressed data */ hic = ICLocate(FCC('V', 'I', 'D', 'C'), codecs[i], bih, NULL, ICMODE_DECOMPRESS); - ok(hic != NULL, "Test[%d]: Expected non-NULL return\n", i); + ok(hic != NULL, "Test[%ld]: Expected non-NULL return\n", i); /* Now which is this codec? Windows returns MRLE for uncompressed cases */ memset(&codec_info, 0, sizeof(codec_info)); hr = ICGetInfo(hic, &codec_info, sizeof(codec_info)); - ok(hr == sizeof(codec_info), "Test[%d]: Incorrect amount of data returned\n", i); + ok(hr == sizeof(codec_info), "Test[%ld]: Incorrect amount of data returned\n", i); ok(codec_info.fccType == FCC('v', 'i', 'd', 'c'), - "Test[%d]: Expected a video type, got 0x%x\n", i, codec_info.fccType); + "Test[%ld]: Expected a video type, got 0x%lx\n", i, codec_info.fccType); ok(codec_info.fccHandler == FCC('M', 'R', 'L', 'E'), - "Test[%d]: Expected MRLE, got 0x%x\n", i, codec_info.fccHandler); + "Test[%ld]: Expected MRLE, got 0x%lx\n", i, codec_info.fccHandler); /* Decompress the frame and check if we get the same output */ memset(outbits, 0, bih->biSizeImage); hr = ICDecompress(hic, 0, bih, bits, &biho, outbits); - ok(hr == ICERR_OK, "Test[%d]: Expected ICERR_OK, got %d\n", i, hr); - ok(!memcmp(bits, outbits, bih->biSizeImage), "Test[%d]: Image contents do not match!\n", i); + ok(hr == ICERR_OK, "Test[%ld]: Expected ICERR_OK, got %ld\n", i, hr); + ok(!memcmp(bits, outbits, bih->biSizeImage), "Test[%ld]: Image contents do not match!\n", i); hr = ICClose(hic); - ok(hr == ICERR_OK, "Test[%d]: Expected ICERR_OK, got %d\n", i, hr); + ok(hr == ICERR_OK, "Test[%ld]: Expected ICERR_OK, got %ld\n", i, hr); } HeapFree(GetProcessHeap(), 0, bits); HeapFree(GetProcessHeap(), 0, outbits);
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msscript.ocx/tests/Makefile.in | 1 dlls/msscript.ocx/tests/msscript.c | 1170 ++++++++++++++++++----------------- 2 files changed, 585 insertions(+), 586 deletions(-) diff --git a/dlls/msscript.ocx/tests/Makefile.in b/dlls/msscript.ocx/tests/Makefile.in index 83648fbc429..cc62590133a 100644 --- a/dlls/msscript.ocx/tests/Makefile.in +++ b/dlls/msscript.ocx/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msscript.ocx IMPORTS = user32 gdi32 ole32 oleaut32 advapi32 diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 897bcec3262..3ee96a35467 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -126,7 +126,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 %ld\n", ref, rc); } static IActiveScriptSite *site; @@ -228,9 +228,9 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac ok(!punkContext, "got wrong pointer: %p.\n", punkContext); ok(!pstrDelimiter, "got wrong pointer: %p.\n", pstrDelimiter); ok(!dwSourceContextCookie, "got wrong value: %s.\n", wine_dbgstr_longlong(dwSourceContextCookie)); - ok(ulStartingLine == 1, "got wrong value: %d.\n", ulStartingLine); + ok(ulStartingLine == 1, "got wrong value: %ld.\n", ulStartingLine); ok(!!pexcepinfo, "got wrong pointer: %p.\n", pexcepinfo); - ok(dwFlags == parse_flags, "got wrong flags: %x.\n", dwFlags); + ok(dwFlags == parse_flags, "got wrong flags: %lx.\n", dwFlags); if (parse_flags == SCRIPTTEXT_ISEXPRESSION) ok(!!pvarResult, "got wrong pointer: %p.\n", pvarResult); else @@ -284,7 +284,7 @@ static HRESULT WINAPI ObjectSafety_SetInterfaceSafetyOptions(IObjectSafety *ifac CHECK_EXPECT(SetInterfaceSafetyOptions); ok(IsEqualGUID(&IID_IActiveScriptParse, riid), "unexpected riid %s\n", wine_dbgstr_guid(riid)); - ok(mask == INTERFACESAFE_FOR_UNTRUSTED_DATA, "option mask = %x\n", mask); + ok(mask == INTERFACESAFE_FOR_UNTRUSTED_DATA, "option mask = %lx\n", mask); return S_OK; } @@ -323,7 +323,7 @@ static HRESULT WINAPI TypeComp_Bind(ITypeComp *iface, LPOLESTR szName, ULONG lHa UINT i; CHECK_EXPECT(Bind); - ok(lHashVal == hash, "wrong hash, expected 0x%08x, got 0x%08x.\n", hash, lHashVal); + ok(lHashVal == hash, "wrong hash, expected 0x%08lx, got 0x%08lx.\n", hash, lHashVal); ok(wFlags == INVOKE_FUNC, "wrong flags, got 0x%x.\n", wFlags); *ppTInfo = NULL; @@ -615,7 +615,7 @@ static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LC { CHECK_EXPECT(GetTypeInfo); ok(iTInfo == 0, "unexpected iTInfo %u.\n", iTInfo); - ok(lcid == LOCALE_USER_DEFAULT, "unexpected lcid %u\n", lcid); + ok(lcid == LOCALE_USER_DEFAULT, "unexpected lcid %lu\n", lcid); *ppTInfo = &TypeInfo; return S_OK; @@ -627,7 +627,7 @@ static HRESULT WINAPI DispatchEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid, { CHECK_EXPECT(GetIDsOfNames); ok(IsEqualGUID(&IID_NULL, riid), "unexpected riid %s\n", wine_dbgstr_guid(riid)); - ok(lcid == LOCALE_USER_DEFAULT, "unexpected lcid %u\n", lcid); + ok(lcid == LOCALE_USER_DEFAULT, "unexpected lcid %lu\n", lcid); ok(cNames == 1, "unexpected cNames %u\n", cNames); ok(Dispatch_expected_name && !lstrcmpW(rgszNames[0], Dispatch_expected_name), "unexpected name %s (expected %s).\n", wine_dbgstr_w(rgszNames[0]), wine_dbgstr_w(Dispatch_expected_name)); @@ -641,9 +641,9 @@ static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, { CHECK_EXPECT(Invoke); ok(IsEqualGUID(&IID_NULL, riid), "unexpected riid %s.\n", wine_dbgstr_guid(riid)); - ok(lcid == LOCALE_USER_DEFAULT, "unexpected lcid %u.\n", lcid); + ok(lcid == LOCALE_USER_DEFAULT, "unexpected lcid %lu.\n", lcid); ok(wFlags == DISPATCH_METHOD, "unexpected wFlags %u.\n", wFlags); - ok(dispIdMember == 0xdeadbeef, "unexpected dispIdMember %d.\n", dispIdMember); + ok(dispIdMember == 0xdeadbeef, "unexpected dispIdMember %ld.\n", dispIdMember); ok(pDispParams->cNamedArgs == 0, "unexpected number of named args %u.\n", pDispParams->cNamedArgs); ok(!pDispParams->rgdispidNamedArgs, "unexpected named args array %p\n", pDispParams->rgdispidNamedArgs); ok(pDispParams->cArgs == 2, "unexpected number of args %u.\n", pDispParams->cArgs); @@ -651,10 +651,10 @@ static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, if (pDispParams->rgvarg && pDispParams->cArgs >= 2) { ok(V_VT(pDispParams->rgvarg + 1) == VT_I4 && V_I4(pDispParams->rgvarg + 1) == 10, - "unexpected first parameter V_VT = %d, V_I4 = %d.\n", + "unexpected first parameter V_VT = %d, V_I4 = %ld.\n", V_VT(pDispParams->rgvarg + 1), V_I4(pDispParams->rgvarg + 1)); ok(V_VT(pDispParams->rgvarg) == VT_I4 && V_I4(pDispParams->rgvarg) == 3, - "unexpected second parameter V_VT = %d, V_I4 = %d.\n", + "unexpected second parameter V_VT = %d, V_I4 = %ld.\n", V_VT(pDispParams->rgvarg), V_I4(pDispParams->rgvarg)); } @@ -677,9 +677,9 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc HRESULT hr; CHECK_EXPECT(InvokeEx); - ok(lcid == LOCALE_USER_DEFAULT, "unexpected lcid %u.\n", lcid); + ok(lcid == LOCALE_USER_DEFAULT, "unexpected lcid %lu.\n", lcid); ok(wFlags == DISPATCH_METHOD, "unexpected wFlags %u.\n", wFlags); - ok(id == 0xdeadbeef, "unexpected id %d.\n", id); + ok(id == 0xdeadbeef, "unexpected id %ld.\n", id); ok(pdp->cNamedArgs == 0, "unexpected number of named args %u.\n", pdp->cNamedArgs); ok(!pdp->rgdispidNamedArgs, "unexpected named args array %p.\n", pdp->rgdispidNamedArgs); ok(pdp->cArgs == 2, "unexpected number of args %u.\n", pdp->cArgs); @@ -687,37 +687,37 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc if (pdp->rgvarg && pdp->cArgs >= 2) { ok(V_VT(pdp->rgvarg + 1) == VT_I4 && V_I4(pdp->rgvarg + 1) == 10, - "unexpected first parameter V_VT = %d, V_I4 = %d.\n", + "unexpected first parameter V_VT = %d, V_I4 = %ld.\n", V_VT(pdp->rgvarg + 1), V_I4(pdp->rgvarg + 1)); ok(V_VT(pdp->rgvarg) == VT_I4 && V_I4(pdp->rgvarg) == 3, - "unexpected second parameter V_VT = %d, V_I4 = %d.\n", + "unexpected second parameter V_VT = %d, V_I4 = %ld.\n", V_VT(pdp->rgvarg), V_I4(pdp->rgvarg)); } ok(!!pspCaller, "unexpected NULL pspCaller.\n"); hr = IActiveScriptSite_QueryInterface(site, &IID_IServiceProvider, (void**)&sp); - ok(hr == S_OK, "Failed to retrieve IID_IServiceProvider from script site: 0x%08x.\n", hr); + ok(hr == S_OK, "Failed to retrieve IID_IServiceProvider from script site: 0x%08lx.\n", hr); ok(sp != pspCaller, "Same IServiceProvider objects.\n"); IServiceProvider_Release(sp); hr = IServiceProvider_QueryInterface(pspCaller, &IID_IActiveScriptSite, (void**)&unk); - ok(hr == E_NOINTERFACE, "QueryInterface IActiveScriptSite returned: 0x%08x.\n", hr); + ok(hr == E_NOINTERFACE, "QueryInterface IActiveScriptSite returned: 0x%08lx.\n", hr); unk = (IUnknown*)0xdeadbeef; hr = IServiceProvider_QueryService(pspCaller, &SID_GetCaller, NULL, (void**)&unk); - ok(hr == S_OK, "QueryService failed: 0x%08x.\n", hr); + ok(hr == S_OK, "QueryService failed: 0x%08lx.\n", hr); ok(!unk, "unexpected object returned %p.\n", unk); unk = (IUnknown*)0xdeadbeef; hr = IServiceProvider_QueryService(pspCaller, &SID_GetCaller, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryService failed: 0x%08x.\n", hr); + ok(hr == S_OK, "QueryService failed: 0x%08lx.\n", hr); ok(!unk, "unexpected object returned %p.\n", unk); sp = (IServiceProvider*)0xdeadbeef; hr = IServiceProvider_QueryService(pspCaller, &SID_GetCaller, &IID_IServiceProvider, (void**)&sp); - ok(hr == S_OK, "QueryService failed: 0x%08x.\n", hr); + ok(hr == S_OK, "QueryService failed: 0x%08lx.\n", hr); ok(!sp, "unexpected object returned %p.\n", sp); unk = (IUnknown*)0xdeadbeef; hr = IServiceProvider_QueryService(pspCaller, &SID_VariantConversion, &IID_IVariantChangeType, (void**)&unk); - ok(hr == E_NOINTERFACE, "QueryService returned: 0x%08x.\n", hr); + ok(hr == E_NOINTERFACE, "QueryService returned: 0x%08lx.\n", hr); ok(!unk, "unexpected object returned %p.\n", unk); V_VT(pvarRes) = VT_I2; @@ -834,26 +834,26 @@ static HRESULT WINAPI ActiveScript_SetScriptSite(IActiveScript *iface, IActiveSc ok(pass != NULL, "pass == NULL\n"); hres = IActiveScriptSite_QueryInterface(pass, &IID_IActiveScriptSiteInterruptPoll, (void**)&poll); - ok(hres == E_NOINTERFACE, "Got IActiveScriptSiteInterruptPoll interface: %08x\n", hres); + ok(hres == E_NOINTERFACE, "Got IActiveScriptSiteInterruptPoll interface: %08lx\n", hres); hres = IActiveScriptSite_GetLCID(pass, &lcid); - ok(hres == S_OK, "GetLCID failed: %08x\n", hres); + ok(hres == S_OK, "GetLCID failed: %08lx\n", hres); hres = IActiveScriptSite_OnStateChange(pass, (state = SCRIPTSTATE_INITIALIZED)); - ok(hres == E_NOTIMPL, "OnStateChange failed: %08x\n", hres); + ok(hres == E_NOTIMPL, "OnStateChange failed: %08lx\n", hres); hres = IActiveScriptSite_QueryInterface(pass, &IID_IActiveScriptSiteDebug, (void**)&debug); - ok(hres == E_NOINTERFACE, "Got IActiveScriptSiteDebug interface: %08x\n", hres); + ok(hres == E_NOINTERFACE, "Got IActiveScriptSiteDebug interface: %08lx\n", hres); hres = IActiveScriptSite_QueryInterface(pass, &IID_ICanHandleException, (void**)&canexception); - ok(hres == E_NOINTERFACE, "Got IID_ICanHandleException interface: %08x\n", hres); + ok(hres == E_NOINTERFACE, "Got IID_ICanHandleException interface: %08lx\n", hres); hres = IActiveScriptSite_QueryInterface(pass, &IID_IServiceProvider, (void**)&service); - ok(hres == S_OK, "Could not get IServiceProvider interface: %08x\n", hres); + ok(hres == S_OK, "Could not get IServiceProvider interface: %08lx\n", hres); IServiceProvider_Release(service); hres = IActiveScriptSite_QueryInterface(pass, &IID_IActiveScriptSiteWindow, (void**)&window); - ok(hres == S_OK, "Could not get IActiveScriptSiteWindow interface: %08x\n", hres); + ok(hres == S_OK, "Could not get IActiveScriptSiteWindow interface: %08lx\n", hres); IActiveScriptSiteWindow_Release(window); if (site) @@ -911,7 +911,7 @@ static HRESULT WINAPI ActiveScript_AddNamedItem(IActiveScript *iface, LPCOLESTR { CHECK_EXPECT(AddNamedItem); ok(!lstrcmpW(name, AddNamedItem_expected_name), "got name %s\n", wine_dbgstr_w(name)); - ok(flags == AddNamedItem_expected_flags, "got flags %#x\n", flags); + ok(flags == AddNamedItem_expected_flags, "got flags %#lx\n", flags); return S_OK; } @@ -1174,7 +1174,7 @@ static BOOL register_script_engine(void) hres = CoRegisterClassObject(&CLSID_TestScript, (IUnknown *)&script_cf, CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, ®id); - ok(hres == S_OK, "Could not register script engine: %08x\n", hres); + ok(hres == S_OK, "Could not register script engine: %08lx\n", hres); return TRUE; } @@ -1260,32 +1260,32 @@ static void test_oleobject(void) hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IOleObject, (void**)&obj); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); if (0) /* crashes on w2k3 */ hr = IOleObject_GetMiscStatus(obj, DVASPECT_CONTENT, NULL); status = 0; hr = IOleObject_GetMiscStatus(obj, DVASPECT_CONTENT, &status); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(status != 0, "got 0x%08x\n", status); + ok(hr == S_OK, "got 0x%08lx\n", hr); + ok(status != 0, "got 0x%08lx\n", status); hr = IOleObject_SetClientSite(obj, &testclientsite); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); if (0) /* crashes on w2k3 */ hr = IOleObject_GetClientSite(obj, NULL); hr = IOleObject_GetClientSite(obj, &site); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(site == &testclientsite, "got %p, %p\n", site, &testclientsite); IOleClientSite_Release(site); hr = IOleObject_SetClientSite(obj, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = IOleObject_GetClientSite(obj, &site); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(site == NULL, "got %p\n", site); /* extents */ @@ -1296,27 +1296,27 @@ static void test_oleobject(void) memset(&extent, 0, sizeof(extent)); hr = IOleObject_GetExtent(obj, DVASPECT_CONTENT, &extent); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(extent.cx == MulDiv(38, 2540, dpi_x), "got %d\n", extent.cx); - ok(extent.cy == MulDiv(38, 2540, dpi_y), "got %d\n", extent.cy); + ok(hr == S_OK, "got 0x%08lx\n", hr); + ok(extent.cx == MulDiv(38, 2540, dpi_x), "got %ld\n", extent.cx); + ok(extent.cy == MulDiv(38, 2540, dpi_y), "got %ld\n", extent.cy); extent.cx = extent.cy = 0xdeadbeef; hr = IOleObject_GetExtent(obj, DVASPECT_THUMBNAIL, &extent); - ok(hr == DV_E_DVASPECT, "got 0x%08x\n", hr); - ok(extent.cx == 0xdeadbeef, "got %d\n", extent.cx); - ok(extent.cy == 0xdeadbeef, "got %d\n", extent.cy); + ok(hr == DV_E_DVASPECT, "got 0x%08lx\n", hr); + ok(extent.cx == 0xdeadbeef, "got %ld\n", extent.cx); + ok(extent.cy == 0xdeadbeef, "got %ld\n", extent.cy); extent.cx = extent.cy = 0xdeadbeef; hr = IOleObject_GetExtent(obj, DVASPECT_ICON, &extent); - ok(hr == DV_E_DVASPECT, "got 0x%08x\n", hr); - ok(extent.cx == 0xdeadbeef, "got %d\n", extent.cx); - ok(extent.cy == 0xdeadbeef, "got %d\n", extent.cy); + ok(hr == DV_E_DVASPECT, "got 0x%08lx\n", hr); + ok(extent.cx == 0xdeadbeef, "got %ld\n", extent.cx); + ok(extent.cy == 0xdeadbeef, "got %ld\n", extent.cy); extent.cx = extent.cy = 0xdeadbeef; hr = IOleObject_GetExtent(obj, DVASPECT_DOCPRINT, &extent); - ok(hr == DV_E_DVASPECT, "got 0x%08x\n", hr); - ok(extent.cx == 0xdeadbeef, "got %d\n", extent.cx); - ok(extent.cy == 0xdeadbeef, "got %d\n", extent.cy); + ok(hr == DV_E_DVASPECT, "got 0x%08lx\n", hr); + ok(extent.cx == 0xdeadbeef, "got %ld\n", extent.cx); + ok(extent.cy == 0xdeadbeef, "got %ld\n", extent.cy); IOleObject_Release(obj); } @@ -1328,7 +1328,7 @@ static void test_persiststreaminit(void) hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IPersistStreamInit, (void**)&init); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); IPersistStreamInit_Release(init); } @@ -1341,28 +1341,28 @@ static void test_olecontrol(void) hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IOleControl, (void**)&olecontrol); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); memset(&info, 0xab, sizeof(info)); info.cb = sizeof(info); hr = IOleControl_GetControlInfo(olecontrol, &info); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(info.hAccel == NULL, "got %p\n", info.hAccel); ok(info.cAccel == 0, "got %d\n", info.cAccel); - ok(info.dwFlags == 0xabababab, "got %x\n", info.dwFlags); + ok(info.dwFlags == 0xabababab, "got %lx\n", info.dwFlags); memset(&info, 0xab, sizeof(info)); info.cb = sizeof(info) - 1; hr = IOleControl_GetControlInfo(olecontrol, &info); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(info.hAccel == NULL, "got %p\n", info.hAccel); ok(info.cAccel == 0, "got %d\n", info.cAccel); - ok(info.dwFlags == 0xabababab, "got %x\n", info.dwFlags); + ok(info.dwFlags == 0xabababab, "got %lx\n", info.dwFlags); if (0) /* crashes on win2k3 */ { hr = IOleControl_GetControlInfo(olecontrol, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "got 0x%08lx\n", hr); } IOleControl_Release(olecontrol); @@ -1376,56 +1376,56 @@ static void test_Language(void) hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = IScriptControl_get_Language(sc, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "got 0x%08lx\n", hr); str = (BSTR)0xdeadbeef; hr = IScriptControl_get_Language(sc, &str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(str == NULL, "got %s\n", wine_dbgstr_w(str)); str = SysAllocString(L"VBScript"); hr = IScriptControl_put_Language(sc, str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); SysFreeString(str); str = SysAllocString(L"vBscript"); hr = IScriptControl_put_Language(sc, str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); SysFreeString(str); hr = IScriptControl_get_Language(sc, &str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(!lstrcmpW(str, L"VBScript"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = SysAllocString(L"dummy"); hr = IScriptControl_put_Language(sc, str); - ok(hr == CTL_E_INVALIDPROPERTYVALUE, "got 0x%08x\n", hr); + ok(hr == CTL_E_INVALIDPROPERTYVALUE, "got 0x%08lx\n", hr); SysFreeString(str); hr = IScriptControl_get_Language(sc, &str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(!lstrcmpW(str, L"VBScript"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = SysAllocString(L"JScript"); hr = IScriptControl_put_Language(sc, str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); SysFreeString(str); hr = IScriptControl_get_Language(sc, &str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(!lstrcmpW(str, L"JScript"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); hr = IScriptControl_put_Language(sc, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = IScriptControl_get_Language(sc, &str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(str == NULL, "got %s\n", wine_dbgstr_w(str)); IScriptControl_Release(sc); @@ -1434,7 +1434,7 @@ static void test_Language(void) if (have_custom_engine) { hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); SET_EXPECT(CreateInstance); SET_EXPECT(SetInterfaceSafetyOptions); @@ -1444,7 +1444,7 @@ static void test_Language(void) str = SysAllocString(L"testscript"); hr = IScriptControl_put_Language(sc, str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); SysFreeString(str); CHECK_CALLED(CreateInstance); @@ -1454,7 +1454,7 @@ static void test_Language(void) CHECK_CALLED(InitNew); hr = IScriptControl_get_Language(sc, &str); todo_wine - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); if (hr == S_OK) ok(!lstrcmpW(L"testscript", str), "%s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -1479,49 +1479,49 @@ static void test_connectionpoints(void) hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); EXPECT_REF(sc, 1); hr = IScriptControl_QueryInterface(sc, &IID_IConnectionPointContainer, (void**)&container); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); EXPECT_REF(sc, 2); EXPECT_REF(container, 2); hr = IConnectionPointContainer_FindConnectionPoint(container, &IID_IPropertyNotifySink, &cp); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); if (0) /* crashes on win2k3 */ { hr = IConnectionPoint_GetConnectionPointContainer(cp, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "got 0x%08lx\n", hr); } hr = IConnectionPoint_GetConnectionInterface(cp, &iid); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(IsEqualIID(&iid, &IID_IPropertyNotifySink), "got %s\n", wine_dbgstr_guid(&iid)); hr = IConnectionPoint_GetConnectionPointContainer(cp, &container2); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(container2 == container, "got %p, expected %p\n", container2, container); IConnectionPointContainer_Release(container2); IConnectionPoint_Release(cp); hr = IConnectionPointContainer_FindConnectionPoint(container, &DIID_DScriptControlSource, &cp); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); if (0) /* crashes on win2k3 */ { hr = IConnectionPoint_GetConnectionPointContainer(cp, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "got 0x%08lx\n", hr); } hr = IConnectionPoint_GetConnectionInterface(cp, &iid); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(IsEqualIID(&iid, &DIID_DScriptControlSource), "got %s\n", wine_dbgstr_guid(&iid)); hr = IConnectionPoint_GetConnectionPointContainer(cp, &container2); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(container2 == container, "got %p, expected %p\n", container2, container); IConnectionPointContainer_Release(container2); @@ -1539,10 +1539,10 @@ static void test_quickactivate(void) hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = IScriptControl_QueryInterface(sc, &IID_IQuickActivate, (void**)&qa); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); IQuickActivate_Release(qa); IScriptControl_Release(sc); @@ -1559,53 +1559,53 @@ static void test_viewobject(void) hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = IScriptControl_QueryInterface(sc, &IID_IViewObject, (void**)&view); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); IViewObject_Release(view); hr = IScriptControl_QueryInterface(sc, &IID_IViewObject2, (void**)&view); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); sink = (IAdviseSink*)0xdeadbeef; hr = IViewObject_GetAdvise(view, &aspect, &flags, &sink); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(aspect == DVASPECT_CONTENT, "got %u\n", aspect); - ok(flags == 0, "got %#x\n", flags); + ok(hr == S_OK, "got 0x%08lx\n", hr); + ok(aspect == DVASPECT_CONTENT, "got %lu\n", aspect); + ok(flags == 0, "got %#lx\n", flags); ok(sink == NULL, "got %p\n", sink); hr = IViewObject_SetAdvise(view, DVASPECT_CONTENT, 0, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = IViewObject_SetAdvise(view, DVASPECT_THUMBNAIL, 0, NULL); - ok(hr == DV_E_DVASPECT, "got 0x%08x\n", hr); + ok(hr == DV_E_DVASPECT, "got 0x%08lx\n", hr); hr = IViewObject_SetAdvise(view, DVASPECT_ICON, 0, NULL); - ok(hr == DV_E_DVASPECT, "got 0x%08x\n", hr); + ok(hr == DV_E_DVASPECT, "got 0x%08lx\n", hr); hr = IViewObject_SetAdvise(view, DVASPECT_DOCPRINT, 0, NULL); - ok(hr == DV_E_DVASPECT, "got 0x%08x\n", hr); + ok(hr == DV_E_DVASPECT, "got 0x%08lx\n", hr); sink = (IAdviseSink*)0xdeadbeef; hr = IViewObject_GetAdvise(view, &aspect, &flags, &sink); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(aspect == DVASPECT_CONTENT, "got %u\n", aspect); - ok(flags == 0, "got %#x\n", flags); + ok(hr == S_OK, "got 0x%08lx\n", hr); + ok(aspect == DVASPECT_CONTENT, "got %lu\n", aspect); + ok(flags == 0, "got %#lx\n", flags); ok(sink == NULL, "got %p\n", sink); IViewObject_Release(view); hr = IScriptControl_QueryInterface(sc, &IID_IViewObjectEx, (void**)&viewex); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); if (0) /* crashes */ hr = IViewObjectEx_GetViewStatus(viewex, NULL); status = 0; hr = IViewObjectEx_GetViewStatus(viewex, &status); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(status == VIEWSTATUS_OPAQUE, "got %#x\n", status); + ok(hr == S_OK, "got 0x%08lx\n", hr); + ok(status == VIEWSTATUS_OPAQUE, "got %#lx\n", status); IViewObjectEx_Release(viewex); @@ -1621,18 +1621,18 @@ static void test_pointerinactive(void) hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = IScriptControl_QueryInterface(sc, &IID_IPointerInactive, (void**)&pi); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); if (0) /* crashes w2k3 */ hr = IPointerInactive_GetActivationPolicy(pi, NULL); policy = 123; hr = IPointerInactive_GetActivationPolicy(pi, &policy); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(policy == 0, "got %#x\n", policy); + ok(hr == S_OK, "got 0x%08lx\n", hr); + ok(policy == 0, "got %#lx\n", policy); IPointerInactive_Release(pi); IScriptControl_Release(sc); @@ -1647,52 +1647,52 @@ static void test_timeout(void) hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = IScriptControl_get_Timeout(sc, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "got 0x%08lx\n", hr); val = 0; hr = IScriptControl_get_Timeout(sc, &val); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(val == 10000, "got %d\n", val); + ok(hr == S_OK, "got 0x%08lx\n", hr); + ok(val == 10000, "got %ld\n", val); hr = IScriptControl_put_Timeout(sc, -1); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); val = 0; hr = IScriptControl_get_Timeout(sc, &val); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(val == -1, "got %d\n", val); + ok(hr == S_OK, "got 0x%08lx\n", hr); + ok(val == -1, "got %ld\n", val); hr = IScriptControl_put_Timeout(sc, -2); - ok(hr == CTL_E_INVALIDPROPERTYVALUE, "got 0x%08x\n", hr); + ok(hr == CTL_E_INVALIDPROPERTYVALUE, "got 0x%08lx\n", hr); val = 0; hr = IScriptControl_get_Timeout(sc, &val); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(val == -1, "got %d\n", val); + ok(hr == S_OK, "got 0x%08lx\n", hr); + ok(val == -1, "got %ld\n", val); hr = IScriptControl_put_Timeout(sc, 0); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); val = 1; hr = IScriptControl_get_Timeout(sc, &val); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(val == 0, "got %d\n", val); + ok(hr == S_OK, "got 0x%08lx\n", hr); + ok(val == 0, "got %ld\n", val); str = SysAllocString(L"VBScript"); hr = IScriptControl_put_Language(sc, str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); SysFreeString(str); val = 1; hr = IScriptControl_get_Timeout(sc, &val); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(val == 0, "got %d\n", val); + ok(hr == S_OK, "got 0x%08lx\n", hr); + ok(val == 0, "got %ld\n", val); hr = IScriptControl_put_Timeout(sc, 10000); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); IScriptControl_Release(sc); } @@ -1705,21 +1705,21 @@ static void test_Reset(void) hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = IScriptControl_Reset(sc); - ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(hr == E_FAIL, "got 0x%08lx\n", hr); str = SysAllocString(L"VBScript"); hr = IScriptControl_put_Language(sc, str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); SysFreeString(str); hr = IScriptControl_Reset(sc); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = IScriptControl_get_Language(sc, &str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(!lstrcmpW(str, L"VBScript"), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -1729,7 +1729,7 @@ static void test_Reset(void) if (have_custom_engine) { hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); SET_EXPECT(CreateInstance); SET_EXPECT(SetInterfaceSafetyOptions); @@ -1739,17 +1739,17 @@ static void test_Reset(void) str = SysAllocString(L"testscript"); hr = IScriptControl_put_Language(sc, str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); SysFreeString(str); SET_EXPECT(SetScriptState_INITIALIZED); hr = IScriptControl_Reset(sc); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); CHECK_CALLED(SetScriptState_INITIALIZED); SET_EXPECT(SetScriptState_INITIALIZED); hr = IScriptControl_Reset(sc); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); CHECK_CALLED(SetScriptState_INITIALIZED); CHECK_CALLED(SetScriptSite); @@ -1831,28 +1831,28 @@ static void test_AddObject(void) hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); objname = SysAllocString(L"o"); hr = IScriptControl_AddObject(sc, objname, NULL, VARIANT_FALSE); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "got 0x%08lx\n", hr); hr = IScriptControl_AddObject(sc, objname, &testdisp, VARIANT_FALSE); - ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(hr == E_FAIL, "got 0x%08lx\n", hr); str = SysAllocString(L"VBScript"); hr = IScriptControl_put_Language(sc, str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); SysFreeString(str); hr = IScriptControl_AddObject(sc, objname, &testdisp, VARIANT_TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = IScriptControl_Reset(sc); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = IScriptControl_AddObject(sc, objname, &testdisp, VARIANT_TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); IScriptControl_Release(sc); @@ -1860,7 +1860,7 @@ static void test_AddObject(void) if (have_custom_engine) { hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); SET_EXPECT(CreateInstance); SET_EXPECT(SetInterfaceSafetyOptions); @@ -1870,21 +1870,21 @@ static void test_AddObject(void) str = SysAllocString(L"testscript"); hr = IScriptControl_put_Language(sc, str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); SysFreeString(str); hr = IScriptControl_AddObject(sc, objname, NULL, VARIANT_FALSE); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "got 0x%08lx\n", hr); SET_EXPECT(AddNamedItem); AddNamedItem_expected_name = objname; AddNamedItem_expected_flags = SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS; hr = IScriptControl_AddObject(sc, objname, &testdisp, VARIANT_TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); CHECK_CALLED(AddNamedItem); hr = IScriptControl_AddObject(sc, objname, &testdisp, VARIANT_TRUE); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "got 0x%08lx\n", hr); CHECK_CALLED(SetScriptSite); IActiveScriptSite_Release(site); @@ -1907,20 +1907,20 @@ static void test_AllowUI(void) hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = IScriptControl_get_AllowUI(sc, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "got 0x%08lx\n", hr); hr = IScriptControl_get_AllowUI(sc, &allow); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(allow == VARIANT_TRUE, "got %d\n", allow); hr = IScriptControl_put_AllowUI(sc, VARIANT_FALSE); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = IScriptControl_get_AllowUI(sc, &allow); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(allow == VARIANT_FALSE, "got %d\n", allow); IScriptControl_Release(sc); @@ -1935,42 +1935,42 @@ static void test_SitehWnd(void) BSTR str; hwnd = CreateWindowA("static", NULL, WS_OVERLAPPEDWINDOW, 50, 50, 100, 100, NULL, NULL, NULL, NULL); - ok(hwnd != NULL, "failed to create window, error %08x\n", GetLastError()); + ok(hwnd != NULL, "failed to create window, error %08lx\n", GetLastError()); hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = IScriptControl_get_SitehWnd(sc, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "got 0x%08lx\n", hr); site_hwnd = 0xdeadbeef; hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(!site_hwnd, "got %p\n", (HWND)(LONG_PTR)site_hwnd); hr = IScriptControl_put_SitehWnd(sc, 1); - ok(hr == CTL_E_INVALIDPROPERTYVALUE, "got 0x%08x\n", hr); + ok(hr == CTL_E_INVALIDPROPERTYVALUE, "got 0x%08lx\n", hr); site_hwnd = 0xdeadbeef; hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(!site_hwnd, "got %p\n", (HWND)(LONG_PTR)site_hwnd); hr = IScriptControl_put_SitehWnd(sc, 0); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = IScriptControl_put_SitehWnd(sc, (LONG)(LONG_PTR)hwnd); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); str = SysAllocString(L"vbscript"); hr = IScriptControl_put_Language(sc, str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); SysFreeString(str); site_hwnd = 0; hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok((HWND)(LONG_PTR)site_hwnd == hwnd, "got %p, expected %p\n", (HWND)(LONG_PTR)site_hwnd, hwnd); IScriptControl_Release(sc); @@ -1983,10 +1983,10 @@ static void test_SitehWnd(void) hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void **)&sc); - ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08lx.\n", hr); hr = IScriptControl_put_SitehWnd(sc, (LONG)(LONG_PTR)hwnd); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); SET_EXPECT(CreateInstance); SET_EXPECT(SetInterfaceSafetyOptions); @@ -1996,7 +1996,7 @@ static void test_SitehWnd(void) str = SysAllocString(L"testscript"); hr = IScriptControl_put_Language(sc, str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); SysFreeString(str); CHECK_CALLED(CreateInstance); @@ -2006,67 +2006,67 @@ static void test_SitehWnd(void) CHECK_CALLED(InitNew); hr = IActiveScriptSite_QueryInterface(site, &IID_IActiveScriptSiteWindow, (void**)&site_window); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); site_hwnd = 0; hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok((HWND)(LONG_PTR)site_hwnd == hwnd, "got %p, expected %p\n", (HWND)(LONG_PTR)site_hwnd, hwnd); window = NULL; hr = IActiveScriptSiteWindow_GetWindow(site_window, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "got 0x%08lx\n", hr); hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(window == hwnd, "got %p, expected %p\n", window, hwnd); hr = IActiveScriptSiteWindow_EnableModeless(site_window, FALSE); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = IActiveScriptSiteWindow_EnableModeless(site_window, TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); site_hwnd = 0xdeadbeef; hr = IScriptControl_put_SitehWnd(sc, 0); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(!site_hwnd, "got %p\n", (HWND)(LONG_PTR)site_hwnd); window = (HWND)0xdeadbeef; hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(!window, "got %p\n", window); site_hwnd = 0; hr = IScriptControl_put_SitehWnd(sc, (LONG)(LONG_PTR)hwnd); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok((HWND)(LONG_PTR)site_hwnd == hwnd, "got %p, expected %p\n", (HWND)(LONG_PTR)site_hwnd, hwnd); window = NULL; hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(window == hwnd, "got %p, expected %p\n", window, hwnd); hr = IScriptControl_put_AllowUI(sc, VARIANT_FALSE); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok((HWND)(LONG_PTR)site_hwnd == hwnd, "got %p, expected %p\n", (HWND)(LONG_PTR)site_hwnd, hwnd); window = NULL; hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); - ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(hr == E_FAIL, "got 0x%08lx\n", hr); ok(!window, "got %p\n", window); hr = IScriptControl_put_AllowUI(sc, VARIANT_TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); window = NULL; hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(window == hwnd, "got %p, expected %p\n", window, hwnd); IActiveScriptSite_Release(site); @@ -2077,7 +2077,7 @@ static void test_SitehWnd(void) window = NULL; hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(window == hwnd, "got %p, expected %p\n", window, hwnd); IActiveScriptSiteWindow_Release(site_window); @@ -2095,29 +2095,29 @@ static void test_UseSafeSubset(void) hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = IScriptControl_get_UseSafeSubset(sc, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "got 0x%08lx\n", hr); hr = IScriptControl_get_UseSafeSubset(sc, &use_safe_subset); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(use_safe_subset == VARIANT_FALSE, "got %d\n", use_safe_subset); hr = IScriptControl_put_UseSafeSubset(sc, VARIANT_TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = IScriptControl_get_UseSafeSubset(sc, &use_safe_subset); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(use_safe_subset == VARIANT_TRUE, "got %d\n", use_safe_subset); str = SysAllocString(L"VBScript"); hr = IScriptControl_put_Language(sc, str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); SysFreeString(str); hr = IScriptControl_get_UseSafeSubset(sc, &use_safe_subset); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(use_safe_subset == VARIANT_TRUE, "got %d\n", use_safe_subset); IScriptControl_Release(sc); @@ -2127,7 +2127,7 @@ static void test_UseSafeSubset(void) { hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void **)&sc); - ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08lx.\n", hr); SET_EXPECT(CreateInstance); SET_EXPECT(SetInterfaceSafetyOptions); @@ -2137,7 +2137,7 @@ static void test_UseSafeSubset(void) str = SysAllocString(L"testscript"); hr = IScriptControl_put_Language(sc, str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); SysFreeString(str); CHECK_CALLED(CreateInstance); @@ -2147,28 +2147,28 @@ static void test_UseSafeSubset(void) CHECK_CALLED(InitNew); hr = IScriptControl_get_UseSafeSubset(sc, &use_safe_subset); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(use_safe_subset == VARIANT_FALSE, "got %d\n", use_safe_subset); SET_EXPECT(SetInterfaceSafetyOptions_UseSafeSubset); hr = IScriptControl_put_UseSafeSubset(sc, VARIANT_TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); CHECK_CALLED(SetInterfaceSafetyOptions_UseSafeSubset); hr = IScriptControl_get_UseSafeSubset(sc, &use_safe_subset); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(use_safe_subset == VARIANT_TRUE, "got %d\n", use_safe_subset); hr = IScriptControl_put_UseSafeSubset(sc, VARIANT_TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); SET_EXPECT(SetInterfaceSafetyOptions); hr = IScriptControl_put_UseSafeSubset(sc, VARIANT_FALSE); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); CHECK_CALLED(SetInterfaceSafetyOptions); hr = IScriptControl_put_UseSafeSubset(sc, VARIANT_FALSE); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); IActiveScriptSite_Release(site); @@ -2178,10 +2178,10 @@ static void test_UseSafeSubset(void) hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void **)&sc); - ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08lx.\n", hr); hr = IScriptControl_put_UseSafeSubset(sc, VARIANT_TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); SET_EXPECT(CreateInstance); SET_EXPECT(SetInterfaceSafetyOptions_UseSafeSubset); @@ -2191,7 +2191,7 @@ static void test_UseSafeSubset(void) str = SysAllocString(L"testscript"); hr = IScriptControl_put_Language(sc, str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); SysFreeString(str); CHECK_CALLED(CreateInstance); @@ -2217,45 +2217,45 @@ static void test_State(void) hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = IScriptControl_get_State(sc, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "got 0x%08lx\n", hr); hr = IScriptControl_get_State(sc, &state); - ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(hr == E_FAIL, "got 0x%08lx\n", hr); hr = IScriptControl_put_State(sc, Connected); - ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(hr == E_FAIL, "got 0x%08lx\n", hr); str = SysAllocString(L"VBScript"); hr = IScriptControl_put_Language(sc, str); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); SysFreeString(str); hr = IScriptControl_get_State(sc, &state); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(state == Initialized, "got %d\n", state); hr = IScriptControl_put_State(sc, Connected); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = IScriptControl_get_State(sc, &state); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(state == Connected, "got %d\n", state); hr = IScriptControl_put_State(sc, 2); - ok(hr == CTL_E_INVALIDPROPERTYVALUE, "got 0x%08x\n", hr); + ok(hr == CTL_E_INVALIDPROPERTYVALUE, "got 0x%08lx\n", hr); hr = IScriptControl_get_State(sc, &state); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(state == Connected, "got %d\n", state); hr = IScriptControl_put_State(sc, -1); - ok(hr == CTL_E_INVALIDPROPERTYVALUE, "got 0x%08x\n", hr); + ok(hr == CTL_E_INVALIDPROPERTYVALUE, "got 0x%08lx\n", hr); hr = IScriptControl_get_State(sc, &state); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(state == Connected, "got %d\n", state); IScriptControl_Release(sc); @@ -2267,7 +2267,7 @@ static void test_State(void) hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void **)&sc); - ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08lx.\n", hr); SET_EXPECT(CreateInstance); SET_EXPECT(SetInterfaceSafetyOptions); @@ -2277,7 +2277,7 @@ static void test_State(void) language = SysAllocString(L"testscript"); hr = IScriptControl_put_Language(sc, language); - ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08lx.\n", hr); SysFreeString(language); CHECK_CALLED(CreateInstance); @@ -2288,22 +2288,22 @@ static void test_State(void) SET_EXPECT(SetScriptState_STARTED); hr = IScriptControl_put_State(sc, Initialized); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); CHECK_CALLED(SetScriptState_STARTED); SET_EXPECT(SetScriptState_STARTED); hr = IScriptControl_put_State(sc, Initialized); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); CHECK_CALLED(SetScriptState_STARTED); SET_EXPECT(SetScriptState_CONNECTED); hr = IScriptControl_put_State(sc, Connected); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); CHECK_CALLED(SetScriptState_CONNECTED); SET_EXPECT(SetScriptState_STARTED); hr = IScriptControl_put_State(sc, Initialized); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); CHECK_CALLED(SetScriptState_STARTED); SET_EXPECT(SetScriptState_STARTED); @@ -2312,7 +2312,7 @@ static void test_State(void) parse_flags = SCRIPTTEXT_ISVISIBLE; code_str = SysAllocString(L"1 + 1"); hr = IScriptControl_AddCode(sc, code_str); - ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08lx.\n", hr); SysFreeString(code_str); CHECK_CALLED(SetScriptState_STARTED); CHECK_CALLED(ParseScriptText); @@ -2320,34 +2320,34 @@ static void test_State(void) emulated_script_state = SCRIPTSTATE_INITIALIZED; SET_EXPECT(GetScriptState); hr = IScriptControl_get_State(sc, &state); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(state == Initialized, "got %d\n", state); CHECK_CALLED(GetScriptState); emulated_script_state = SCRIPTSTATE_STARTED; SET_EXPECT(GetScriptState); hr = IScriptControl_get_State(sc, &state); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(state == Initialized, "got %d\n", state); CHECK_CALLED(GetScriptState); emulated_script_state = SCRIPTSTATE_CONNECTED; SET_EXPECT(GetScriptState); hr = IScriptControl_get_State(sc, &state); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); ok(state == Connected, "got %d\n", state); CHECK_CALLED(GetScriptState); emulated_script_state = SCRIPTSTATE_UNINITIALIZED; SET_EXPECT(GetScriptState); hr = IScriptControl_get_State(sc, &state); - ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(hr == E_FAIL, "got 0x%08lx\n", hr); CHECK_CALLED(GetScriptState); SET_EXPECT(ParseScriptText); code_str = SysAllocString(L"0x100"); hr = IScriptControl_AddCode(sc, code_str); - ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08lx.\n", hr); SysFreeString(code_str); CHECK_CALLED(ParseScriptText); @@ -2359,7 +2359,7 @@ static void test_State(void) hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void **)&sc); - ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08lx.\n", hr); SET_EXPECT(CreateInstance); SET_EXPECT(SetInterfaceSafetyOptions); @@ -2369,7 +2369,7 @@ static void test_State(void) language = SysAllocString(L"testscript"); hr = IScriptControl_put_Language(sc, language); - ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08lx.\n", hr); SysFreeString(language); CHECK_CALLED(CreateInstance); @@ -2380,17 +2380,17 @@ static void test_State(void) SET_EXPECT(SetScriptState_STARTED); hr = IScriptControl_put_State(sc, Initialized); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); CHECK_CALLED(SetScriptState_STARTED); SET_EXPECT(SetScriptState_STARTED); hr = IScriptControl_put_State(sc, Initialized); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); CHECK_CALLED(SetScriptState_STARTED); SET_EXPECT(SetScriptState_CONNECTED); hr = IScriptControl_put_State(sc, Connected); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); CHECK_CALLED(SetScriptState_CONNECTED); SET_EXPECT(SetScriptState_STARTED); @@ -2399,20 +2399,20 @@ static void test_State(void) parse_flags = SCRIPTTEXT_ISVISIBLE; code_str = SysAllocString(L"1 + 1"); hr = IScriptControl_AddCode(sc, code_str); - ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08lx.\n", hr); SysFreeString(code_str); CHECK_CALLED(SetScriptState_STARTED); CHECK_CALLED(ParseScriptText); SET_EXPECT(SetScriptState_CONNECTED); hr = IScriptControl_put_State(sc, Connected); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); CHECK_CALLED(SetScriptState_CONNECTED); SET_EXPECT(ParseScriptText); code_str = SysAllocString(L"0x100"); hr = IScriptControl_AddCode(sc, code_str); - ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08lx.\n", hr); SysFreeString(code_str); CHECK_CALLED(ParseScriptText); @@ -2433,12 +2433,12 @@ static void _check_error(IScriptControl *sc, LONG exp_num, BOOL todo, int line) HRESULT hr; hr = IScriptControl_get_Error(sc, &script_err); - ok_(__FILE__,line)(hr == S_OK, "IScriptControl_get_Error failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(hr == S_OK, "IScriptControl_get_Error failed: 0x%08lx.\n", hr); error_num = 0xdeadbeef; hr = IScriptError_get_Number(script_err, &error_num); - ok_(__FILE__,line)(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(hr == S_OK, "IScriptError_get_Number failed: 0x%08lx.\n", hr); todo_wine_if(todo == TRUE) - ok_(__FILE__,line)(error_num == exp_num, "got wrong error number: %d, expected %d.\n", + ok_(__FILE__,line)(error_num == exp_num, "got wrong error number: %ld, expected %ld.\n", error_num, exp_num); IScriptError_Release(script_err); } @@ -2453,21 +2453,21 @@ static void test_IScriptControl_Eval(void) hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void **)&sc); - ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08lx.\n", hr); hr = IScriptControl_Eval(sc, NULL, NULL); - ok(hr == E_POINTER, "IScriptControl_Eval returned: 0x%08x.\n", hr); + ok(hr == E_POINTER, "IScriptControl_Eval returned: 0x%08lx.\n", hr); script_str = SysAllocString(L"1 + 1"); hr = IScriptControl_Eval(sc, script_str, NULL); - ok(hr == E_POINTER, "IScriptControl_Eval returned: 0x%08x.\n", hr); + ok(hr == E_POINTER, "IScriptControl_Eval returned: 0x%08lx.\n", hr); SysFreeString(script_str); V_VT(&var) = VT_NULL; V_I4(&var) = 0xdeadbeef; hr = IScriptControl_Eval(sc, NULL, &var); - ok(hr == E_FAIL, "IScriptControl_Eval returned: 0x%08x.\n", hr); - ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", + ok(hr == E_FAIL, "IScriptControl_Eval returned: 0x%08lx.\n", hr); + ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %ld.\n", V_VT(&var), V_I4(&var)); CHECK_ERROR(sc, 0); @@ -2475,27 +2475,27 @@ static void test_IScriptControl_Eval(void) V_VT(&var) = VT_NULL; V_I4(&var) = 0xdeadbeef; hr = IScriptControl_Eval(sc, script_str, &var); - ok(hr == E_FAIL, "IScriptControl_Eval returned: 0x%08x.\n", hr); - ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", + ok(hr == E_FAIL, "IScriptControl_Eval returned: 0x%08lx.\n", hr); + ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %ld.\n", V_VT(&var), V_I4(&var)); SysFreeString(script_str); language = SysAllocString(L"jscript"); hr = IScriptControl_put_Language(sc, language); - ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08lx.\n", hr); hr = IScriptControl_get_State(sc, &state); - ok(hr == S_OK, "IScriptControl_get_State failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_get_State failed: 0x%08lx.\n", hr); ok(state == Initialized, "got wrong state: %d\n", state); SysFreeString(language); script_str = SysAllocString(L"var1 = 1 + 1"); V_VT(&var) = VT_NULL; V_I4(&var) = 0xdeadbeef; hr = IScriptControl_Eval(sc, script_str, &var); - ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); - ok((V_VT(&var) == VT_I4) && (V_I4(&var) == 2), "V_VT(var) = %d, V_I4(var) = %d.\n", + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08lx.\n", hr); + ok((V_VT(&var) == VT_I4) && (V_I4(&var) == 2), "V_VT(var) = %d, V_I4(var) = %ld.\n", V_VT(&var), V_I4(&var)); hr = IScriptControl_get_State(sc, &state); - ok(hr == S_OK, "IScriptControl_get_State failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_get_State failed: 0x%08lx.\n", hr); ok(state == Initialized, "got wrong state: %d\n", state); SysFreeString(script_str); @@ -2503,8 +2503,8 @@ static void test_IScriptControl_Eval(void) V_VT(&var) = VT_NULL; V_I4(&var) = 0xdeadbeef; hr = IScriptControl_Eval(sc, script_str, &var); - ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); - ok((V_VT(&var) == VT_I4) && (V_I4(&var) == 12), "V_VT(var) = %d, V_I4(var) = %d.\n", + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08lx.\n", hr); + ok((V_VT(&var) == VT_I4) && (V_I4(&var) == 12), "V_VT(var) = %d, V_I4(var) = %ld.\n", V_VT(&var), V_I4(&var)); SysFreeString(script_str); @@ -2512,10 +2512,10 @@ static void test_IScriptControl_Eval(void) V_VT(&var) = VT_NULL; V_I4(&var) = 0xdeadbeef; hr = IScriptControl_Eval(sc, script_str, &var); - todo_wine ok(hr == 0x800a03ec, "IScriptControl_Eval failed: 0x%08x.\n", hr); + todo_wine ok(hr == 0x800a03ec, "IScriptControl_Eval failed: 0x%08lx.\n", hr); ok(V_VT(&var) == VT_EMPTY, "V_VT(var) = %d\n", V_VT(&var)); ok(V_I4(&var) == 0xdeadbeef || broken(V_I4(&var) == 0) /* after Win8 */, - "V_I4(var) = %d.\n", V_I4(&var)); + "V_I4(var) = %ld.\n", V_I4(&var)); SysFreeString(script_str); CHECK_ERROR_TODO(sc, 1004); @@ -2523,8 +2523,8 @@ static void test_IScriptControl_Eval(void) V_VT(&var) = VT_NULL; V_I4(&var) = 0xdeadbeef; hr = IScriptControl_Eval(sc, script_str, &var); - ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); - ok((V_VT(&var) == VT_I4) && (V_I4(&var) == 14), "V_VT(var) = %d, V_I4(var) = %d.\n", + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08lx.\n", hr); + ok((V_VT(&var) == VT_I4) && (V_I4(&var) == 14), "V_VT(var) = %d, V_I4(var) = %ld.\n", V_VT(&var), V_I4(&var)); SysFreeString(script_str); @@ -2532,7 +2532,7 @@ static void test_IScriptControl_Eval(void) V_VT(&var) = VT_NULL; V_I4(&var) = 0xdeadbeef; hr = IScriptControl_Eval(sc, script_str, &var); - ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08lx.\n", hr); expected_string = SysAllocString(L"Hello"); ok((V_VT(&var) == VT_BSTR) && (!lstrcmpW(V_BSTR(&var), expected_string)), "V_VT(var) = %d, V_BSTR(var) = %s.\n", V_VT(&var), wine_dbgstr_w(V_BSTR(&var))); @@ -2545,7 +2545,7 @@ static void test_IScriptControl_Eval(void) { hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void **)&sc); - ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08lx.\n", hr); SET_EXPECT(CreateInstance); SET_EXPECT(SetInterfaceSafetyOptions); @@ -2555,7 +2555,7 @@ static void test_IScriptControl_Eval(void) language= SysAllocString(L"testscript"); hr = IScriptControl_put_Language(sc, language); - ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08lx.\n", hr); SysFreeString(language); CHECK_CALLED(CreateInstance); @@ -2571,7 +2571,7 @@ static void test_IScriptControl_Eval(void) script_str = SysAllocString(L"var1 = 1 + 1"); V_VT(&var) = VT_NULL; hr = IScriptControl_Eval(sc, script_str, &var); - ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08lx.\n", hr); ok(V_VT(&var) == VT_EMPTY, "V_VT(var) = %d.\n", V_VT(&var)); SysFreeString(script_str); CHECK_CALLED(SetScriptState_STARTED); @@ -2582,15 +2582,15 @@ static void test_IScriptControl_Eval(void) V_VT(&var) = VT_NULL; V_I4(&var) = 0xdeadbeef; hr = IScriptControl_Eval(sc, script_str, &var); - ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); - ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08lx.\n", hr); + ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %ld.\n", V_VT(&var), V_I4(&var)); SysFreeString(script_str); CHECK_CALLED(ParseScriptText); SET_EXPECT(SetScriptState_INITIALIZED); hr = IScriptControl_Reset(sc); - ok(hr == S_OK, "IScriptControl_Reset failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_Reset failed: 0x%08lx.\n", hr); CHECK_CALLED(SetScriptState_INITIALIZED); SET_EXPECT(SetScriptState_STARTED); @@ -2599,8 +2599,8 @@ static void test_IScriptControl_Eval(void) V_VT(&var) = VT_NULL; V_I4(&var) = 0xdeadbeef; hr = IScriptControl_Eval(sc, script_str, &var); - ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); - ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08lx.\n", hr); + ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %ld.\n", V_VT(&var), V_I4(&var)); SysFreeString(script_str); CHECK_CALLED(SetScriptState_STARTED); @@ -2625,30 +2625,30 @@ static void test_IScriptControl_AddCode(void) hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void **)&sc); - ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08lx.\n", hr); code_str = SysAllocString(L"1 + 1"); hr = IScriptControl_AddCode(sc, code_str); - ok(hr == E_FAIL, "IScriptControl_AddCode returned: 0x%08x.\n", hr); + ok(hr == E_FAIL, "IScriptControl_AddCode returned: 0x%08lx.\n", hr); SysFreeString(code_str); hr = IScriptControl_AddCode(sc, NULL); - ok(hr == E_FAIL, "IScriptControl_AddCode returned: 0x%08x.\n", hr); + ok(hr == E_FAIL, "IScriptControl_AddCode returned: 0x%08lx.\n", hr); language = SysAllocString(L"jscript"); hr = IScriptControl_put_Language(sc, language); - ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08lx.\n", hr); SysFreeString(language); code_str = SysAllocString(L"1 + 1"); hr = IScriptControl_AddCode(sc, code_str); - ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08lx.\n", hr); SysFreeString(code_str); CHECK_ERROR(sc, 0); code_str = SysAllocString(L"invalid syntax"); hr = IScriptControl_AddCode(sc, code_str); - todo_wine ok(hr == 0x800a03ec, "IScriptControl_AddCode returned: 0x%08x.\n", hr); + todo_wine ok(hr == 0x800a03ec, "IScriptControl_AddCode returned: 0x%08lx.\n", hr); SysFreeString(code_str); CHECK_ERROR_TODO(sc, 1004); @@ -2659,7 +2659,7 @@ static void test_IScriptControl_AddCode(void) { hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void **)&sc); - ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08lx.\n", hr); SET_EXPECT(CreateInstance); SET_EXPECT(SetInterfaceSafetyOptions); @@ -2669,7 +2669,7 @@ static void test_IScriptControl_AddCode(void) language = SysAllocString(L"testscript"); hr = IScriptControl_put_Language(sc, language); - ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08lx.\n", hr); SysFreeString(language); CHECK_CALLED(CreateInstance); @@ -2684,7 +2684,7 @@ static void test_IScriptControl_AddCode(void) parse_flags = SCRIPTTEXT_ISVISIBLE; code_str = SysAllocString(L"1 + 1"); hr = IScriptControl_AddCode(sc, code_str); - ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08lx.\n", hr); SysFreeString(code_str); CHECK_CALLED(SetScriptState_STARTED); CHECK_CALLED(ParseScriptText); @@ -2692,7 +2692,7 @@ static void test_IScriptControl_AddCode(void) SET_EXPECT(ParseScriptText); code_str = SysAllocString(L"0x100"); hr = IScriptControl_AddCode(sc, code_str); - ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08lx.\n", hr); SysFreeString(code_str); CHECK_CALLED(ParseScriptText); @@ -2703,7 +2703,7 @@ static void test_IScriptControl_AddCode(void) code_str = SysAllocString(L"var2 = 10 + var1"); V_VT(&var) = VT_NULL; hr = IScriptControl_Eval(sc, code_str, &var); - ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08lx.\n", hr); ok(V_VT(&var) == VT_EMPTY, "V_VT(var) = %d.\n", V_VT(&var)); SysFreeString(code_str); CHECK_CALLED(ParseScriptText); @@ -2726,30 +2726,30 @@ static void test_IScriptControl_ExecuteStatement(void) hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); - ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08lx.\n", hr); str = SysAllocString(L"1 + 1"); hr = IScriptControl_ExecuteStatement(sc, str); - ok(hr == E_FAIL, "IScriptControl_ExecuteStatement returned: 0x%08x.\n", hr); + ok(hr == E_FAIL, "IScriptControl_ExecuteStatement returned: 0x%08lx.\n", hr); SysFreeString(str); hr = IScriptControl_ExecuteStatement(sc, NULL); - ok(hr == E_FAIL, "IScriptControl_ExecuteStatement returned: 0x%08x.\n", hr); + ok(hr == E_FAIL, "IScriptControl_ExecuteStatement returned: 0x%08lx.\n", hr); str = SysAllocString(L"jscript"); hr = IScriptControl_put_Language(sc, str); - ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08lx.\n", hr); SysFreeString(str); str = SysAllocString(L"1 + 1"); hr = IScriptControl_ExecuteStatement(sc, str); - ok(hr == S_OK, "IScriptControl_ExecuteStatement failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_ExecuteStatement failed: 0x%08lx.\n", hr); SysFreeString(str); CHECK_ERROR(sc, 0); str = SysAllocString(L"invalid syntax"); hr = IScriptControl_ExecuteStatement(sc, str); - todo_wine ok(hr == 0x800a03ec, "IScriptControl_ExecuteStatement returned: 0x%08x.\n", hr); + todo_wine ok(hr == 0x800a03ec, "IScriptControl_ExecuteStatement returned: 0x%08lx.\n", hr); SysFreeString(str); CHECK_ERROR_TODO(sc, 1004); @@ -2760,7 +2760,7 @@ static void test_IScriptControl_ExecuteStatement(void) { hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); - ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08lx.\n", hr); SET_EXPECT(CreateInstance); SET_EXPECT(SetInterfaceSafetyOptions); @@ -2770,7 +2770,7 @@ static void test_IScriptControl_ExecuteStatement(void) str = SysAllocString(L"testscript"); hr = IScriptControl_put_Language(sc, str); - ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08lx.\n", hr); SysFreeString(str); CHECK_CALLED(CreateInstance); @@ -2785,7 +2785,7 @@ static void test_IScriptControl_ExecuteStatement(void) parse_flags = 0; str = SysAllocString(L"1 + 1"); hr = IScriptControl_ExecuteStatement(sc, str); - ok(hr == S_OK, "IScriptControl_ExecuteStatement failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_ExecuteStatement failed: 0x%08lx.\n", hr); SysFreeString(str); CHECK_CALLED(SetScriptState_STARTED); CHECK_CALLED(ParseScriptText); @@ -2793,7 +2793,7 @@ static void test_IScriptControl_ExecuteStatement(void) SET_EXPECT(ParseScriptText); str = SysAllocString(L"0x100"); hr = IScriptControl_ExecuteStatement(sc, str); - ok(hr == S_OK, "IScriptControl_ExecuteStatement failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_ExecuteStatement failed: 0x%08lx.\n", hr); SysFreeString(str); CHECK_CALLED(ParseScriptText); @@ -2820,12 +2820,12 @@ static void test_IScriptControl_Run(void) hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); - ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08lx.\n", hr); params = NULL; str = SysAllocString(L"identifier"); hr = IScriptControl_Run(sc, str, ¶ms, &var); - ok(hr == E_POINTER, "IScriptControl_Run returned: 0x%08x.\n", hr); + ok(hr == E_POINTER, "IScriptControl_Run returned: 0x%08lx.\n", hr); params = SafeArrayCreate(VT_VARIANT, 1, bnd); ok(params != NULL, "Failed to create SafeArray.\n"); @@ -2837,48 +2837,48 @@ static void test_IScriptControl_Run(void) SafeArrayPutElement(params, idx0_1, &var); hr = IScriptControl_Run(sc, str, ¶ms, &var); - ok(hr == E_FAIL, "IScriptControl_Run returned: 0x%08x.\n", hr); + ok(hr == E_FAIL, "IScriptControl_Run returned: 0x%08lx.\n", hr); hr = IScriptControl_Run(sc, str, NULL, &var); - ok(hr == E_POINTER, "IScriptControl_Run returned: 0x%08x.\n", hr); + ok(hr == E_POINTER, "IScriptControl_Run returned: 0x%08lx.\n", hr); hr = IScriptControl_Run(sc, str, ¶ms, NULL); - ok(hr == E_POINTER, "IScriptControl_Run returned: 0x%08x.\n", hr); + ok(hr == E_POINTER, "IScriptControl_Run returned: 0x%08lx.\n", hr); SysFreeString(str); hr = IScriptControl_Run(sc, NULL, ¶ms, &var); - ok(hr == E_FAIL, "IScriptControl_Run returned: 0x%08x.\n", hr); + ok(hr == E_FAIL, "IScriptControl_Run returned: 0x%08lx.\n", hr); str = SysAllocString(L"jscript"); hr = IScriptControl_put_Language(sc, str); - ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08lx.\n", hr); SysFreeString(str); str = SysAllocString(L"foobar"); hr = IScriptControl_Run(sc, str, ¶ms, &var); - ok(hr == DISP_E_UNKNOWNNAME, "IScriptControl_Run failed: 0x%08x.\n", hr); + ok(hr == DISP_E_UNKNOWNNAME, "IScriptControl_Run failed: 0x%08lx.\n", hr); CHECK_ERROR(sc, 0); SysFreeString(str); str = SysAllocString(L"function subtract(a, b) { return a - b; }\n"); hr = IScriptControl_AddCode(sc, str); - ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08lx.\n", hr); CHECK_ERROR(sc, 0); SysFreeString(str); str = SysAllocString(L"Subtract"); hr = IScriptControl_Run(sc, str, ¶ms, &var); - ok(hr == DISP_E_UNKNOWNNAME, "IScriptControl_Run failed: 0x%08x.\n", hr); + ok(hr == DISP_E_UNKNOWNNAME, "IScriptControl_Run failed: 0x%08lx.\n", hr); SysFreeString(str); str = SysAllocString(L"subtract"); hr = IScriptControl_Run(sc, str, ¶ms, NULL); - ok(hr == E_POINTER, "IScriptControl_Run failed: 0x%08x.\n", hr); + ok(hr == E_POINTER, "IScriptControl_Run failed: 0x%08lx.\n", hr); CHECK_ERROR(sc, 0); hr = IScriptControl_Run(sc, str, ¶ms, &var); - ok(hr == S_OK, "IScriptControl_Run failed: 0x%08x.\n", hr); - ok((V_VT(&var) == VT_I4) && (V_I4(&var) == 7), "V_VT(var) = %d, V_I4(var) = %d.\n", V_VT(&var), V_I4(&var)); + ok(hr == S_OK, "IScriptControl_Run failed: 0x%08lx.\n", hr); + ok((V_VT(&var) == VT_I4) && (V_I4(&var) == 7), "V_VT(var) = %d, V_I4(var) = %ld.\n", V_VT(&var), V_I4(&var)); CHECK_ERROR(sc, 0); SafeArrayDestroy(params); @@ -2897,13 +2897,13 @@ static void test_IScriptControl_Run(void) SafeArrayPutElement(params, idx1_1, &var); hr = IScriptControl_Run(sc, str, ¶ms, &var); - ok(hr == S_OK, "IScriptControl_Run failed: 0x%08x.\n", hr); - ok((V_VT(&var) == VT_I4) && (V_I4(&var) == 7), "V_VT(var) = %d, V_I4(var) = %d.\n", V_VT(&var), V_I4(&var)); + ok(hr == S_OK, "IScriptControl_Run failed: 0x%08lx.\n", hr); + ok((V_VT(&var) == VT_I4) && (V_I4(&var) == 7), "V_VT(var) = %d, V_I4(var) = %ld.\n", V_VT(&var), V_I4(&var)); /* Hack the array's dimensions to 0 */ params->cDims = 0; hr = IScriptControl_Run(sc, str, ¶ms, &var); - ok(hr == DISP_E_BADINDEX, "IScriptControl_Run returned: 0x%08x.\n", hr); + ok(hr == DISP_E_BADINDEX, "IScriptControl_Run returned: 0x%08lx.\n", hr); ok(V_VT(&var) == VT_EMPTY, "V_VT(var) = %d.\n", V_VT(&var)); params->cDims = 2; SysFreeString(str); @@ -2914,7 +2914,7 @@ static void test_IScriptControl_Run(void) { hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); - ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08lx.\n", hr); SET_EXPECT(CreateInstance); SET_EXPECT(SetInterfaceSafetyOptions); @@ -2923,7 +2923,7 @@ static void test_IScriptControl_Run(void) SET_EXPECT(InitNew); str = SysAllocString(L"testscript"); hr = IScriptControl_put_Language(sc, str); - ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08lx.\n", hr); SysFreeString(str); CHECK_CALLED(CreateInstance); CHECK_CALLED(SetInterfaceSafetyOptions); @@ -2939,7 +2939,7 @@ static void test_IScriptControl_Run(void) SET_EXPECT(Invoke); Dispatch_expected_name = SysAllocString(L"function"); hr = IScriptControl_Run(sc, Dispatch_expected_name, ¶ms, &var); - ok(hr == S_OK, "IScriptControl_Run failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_Run failed: 0x%08lx.\n", hr); ok((V_VT(&var) == VT_R8) && (V_R8(&var) == 4.2), "V_VT(var) = %d, V_R8(var) = %lf.\n", V_VT(&var), V_R8(&var)); SysFreeString(Dispatch_expected_name); CHECK_CALLED(SetScriptState_STARTED); @@ -2955,7 +2955,7 @@ static void test_IScriptControl_Run(void) SET_EXPECT(Invoke); Dispatch_expected_name = SysAllocString(L"BarFoo"); hr = IScriptControl_Run(sc, Dispatch_expected_name, ¶ms, &var); - ok(hr == S_OK, "IScriptControl_Run failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_Run failed: 0x%08lx.\n", hr); SysFreeString(Dispatch_expected_name); CHECK_NOT_CALLED(GetScriptDispatch); CHECK_CALLED(QI_IDispatchEx); @@ -2970,7 +2970,7 @@ static void test_IScriptControl_Run(void) SET_EXPECT(InvokeEx); Dispatch_expected_name = SysAllocString(L"FooBar"); hr = IScriptControl_Run(sc, Dispatch_expected_name, ¶ms, &var); - ok(hr == S_OK, "IScriptControl_Run failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_Run failed: 0x%08lx.\n", hr); ok((V_VT(&var) == VT_I2) && (V_I2(&var) == 42), "V_VT(var) = %d, V_I2(var) = %d.\n", V_VT(&var), V_I2(&var)); SysFreeString(Dispatch_expected_name); CHECK_NOT_CALLED(GetScriptDispatch); @@ -2985,7 +2985,7 @@ static void test_IScriptControl_Run(void) SET_EXPECT(InvokeEx); Dispatch_expected_name = SysAllocString(L"1"); hr = IScriptControl_Run(sc, Dispatch_expected_name, ¶ms, &var); - ok(hr == S_OK, "IScriptControl_Run failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_Run failed: 0x%08lx.\n", hr); SysFreeString(Dispatch_expected_name); CHECK_NOT_CALLED(GetScriptDispatch); CHECK_CALLED(QI_IDispatchEx); @@ -3029,108 +3029,108 @@ static void test_IScriptControl_get_Modules(void) hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); - ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08lx.\n", hr); hr = IScriptControl_get_Modules(sc, &mods); - ok(hr == E_FAIL, "IScriptControl_get_Modules returned: 0x%08x.\n", hr); + ok(hr == E_FAIL, "IScriptControl_get_Modules returned: 0x%08lx.\n", hr); str = SysAllocString(L"jscript"); hr = IScriptControl_put_Language(sc, str); - ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08lx.\n", hr); SysFreeString(str); hr = IScriptControl_get_Modules(sc, &mods); - ok(hr == S_OK, "IScriptControl_get_Modules failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_get_Modules failed: 0x%08lx.\n", hr); hr = IScriptModuleCollection_get_Count(mods, NULL); - ok(hr == E_POINTER, "IScriptModuleCollection_get_Count returned: 0x%08x.\n", hr); + ok(hr == E_POINTER, "IScriptModuleCollection_get_Count returned: 0x%08lx.\n", hr); count = 0; hr = IScriptModuleCollection_get_Count(mods, &count); - ok(hr == S_OK, "IScriptModuleCollection_get_Count failed: 0x%08x.\n", hr); - ok(count == 1, "count is not 1, got %d.\n", count); + ok(hr == S_OK, "IScriptModuleCollection_get_Count failed: 0x%08lx.\n", hr); + ok(count == 1, "count is not 1, got %ld.\n", count); V_VT(&var) = VT_I4; V_I4(&var) = -1; hr = IScriptModuleCollection_get_Item(mods, var, NULL); - ok(hr == E_POINTER, "IScriptModuleCollection_get_Item returned: 0x%08x.\n", hr); + ok(hr == E_POINTER, "IScriptModuleCollection_get_Item returned: 0x%08lx.\n", hr); hr = IScriptModuleCollection_get_Item(mods, var, &mod); - ok(hr == 0x800a0009, "IScriptModuleCollection_get_Item returned: 0x%08x.\n", hr); + ok(hr == 0x800a0009, "IScriptModuleCollection_get_Item returned: 0x%08lx.\n", hr); V_VT(&var) = VT_EMPTY; str = SysAllocString(L"foobar"); hr = IScriptModuleCollection_Add(mods, str, &var, &mod); - ok(hr == E_INVALIDARG, "IScriptModuleCollection_Add returned: 0x%08x.\n", hr); + ok(hr == E_INVALIDARG, "IScriptModuleCollection_Add returned: 0x%08lx.\n", hr); hr = IScriptModuleCollection_Add(mods, str, &var, NULL); - ok(hr == E_POINTER, "IScriptModuleCollection_Add returned: 0x%08x.\n", hr); + ok(hr == E_POINTER, "IScriptModuleCollection_Add returned: 0x%08lx.\n", hr); V_VT(&var) = VT_DISPATCH; V_DISPATCH(&var) = NULL; hr = IScriptModuleCollection_Add(mods, NULL, &var, &mod); - ok(hr == E_INVALIDARG, "IScriptModuleCollection_Add returned: 0x%08x.\n", hr); + ok(hr == E_INVALIDARG, "IScriptModuleCollection_Add returned: 0x%08lx.\n", hr); hr = IScriptModuleCollection_Add(mods, str, &var, &mod); - ok(hr == S_OK, "IScriptModuleCollection_Add failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptModuleCollection_Add failed: 0x%08lx.\n", hr); IScriptModule_Release(mod); SysFreeString(str); /* Grab an enumerator before we add another module */ hr = IScriptModuleCollection_get__NewEnum(mods, NULL); - ok(hr == E_POINTER, "IScriptModuleCollection_get__NewEnum returned: 0x%08x.\n", hr); + ok(hr == E_POINTER, "IScriptModuleCollection_get__NewEnum returned: 0x%08lx.\n", hr); hr = IScriptModuleCollection_get__NewEnum(mods, &unknown); - ok(hr == S_OK, "IScriptModuleCollection_get__NewEnum failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptModuleCollection_get__NewEnum failed: 0x%08lx.\n", hr); hr = IUnknown_QueryInterface(unknown, &IID_IEnumVARIANT, (void**)&enumvar); - ok(hr == S_OK, "Failed to query for IEnumVARIANT: 0x%08x.\n", hr); + ok(hr == S_OK, "Failed to query for IEnumVARIANT: 0x%08lx.\n", hr); ok((char*)unknown == (char*)enumvar, "unknown and enumvar are not the same (%p vs %p).\n", unknown, enumvar); IUnknown_Release(unknown); str = SysAllocString(L"some other Module"); hr = IScriptModuleCollection_Add(mods, str, &var, &mod); - ok(hr == S_OK, "IScriptModuleCollection_Add failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptModuleCollection_Add failed: 0x%08lx.\n", hr); IScriptModule_Release(mod); SysFreeString(str); /* Adding a module with the same name is invalid (case insensitive) */ str = SysAllocString(L"FooBar"); hr = IScriptModuleCollection_Add(mods, str, &var, &mod); - ok(hr == E_INVALIDARG, "IScriptModuleCollection_Add failed: 0x%08x.\n", hr); + ok(hr == E_INVALIDARG, "IScriptModuleCollection_Add failed: 0x%08lx.\n", hr); SysFreeString(str); hr = IScriptModuleCollection_get_Count(mods, &count); - ok(hr == S_OK, "IScriptModuleCollection_get_Count failed: 0x%08x.\n", hr); - ok(count == 3, "count is not 3, got %d.\n", count); + ok(hr == S_OK, "IScriptModuleCollection_get_Count failed: 0x%08lx.\n", hr); + ok(count == 3, "count is not 3, got %ld.\n", count); V_VT(&var) = VT_I4; V_I4(&var) = count + 1; hr = IScriptModuleCollection_get_Item(mods, var, &mod); - ok(hr == 0x800a0009, "IScriptModuleCollection_get_Item returned: 0x%08x.\n", hr); + ok(hr == 0x800a0009, "IScriptModuleCollection_get_Item returned: 0x%08lx.\n", hr); V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(L"non-existent module"); hr = IScriptModuleCollection_get_Item(mods, var, &mod); - ok(hr == CTL_E_ILLEGALFUNCTIONCALL, "IScriptModuleCollection_get_Item returned: 0x%08x.\n", hr); + ok(hr == CTL_E_ILLEGALFUNCTIONCALL, "IScriptModuleCollection_get_Item returned: 0x%08lx.\n", hr); ok(V_VT(&var) == VT_BSTR, "var type not BSTR, got %d.\n", V_VT(&var)); VariantClear(&var); V_VT(&var) = VT_I4; V_I4(&var) = 1; hr = IScriptModuleCollection_get_Item(mods, var, &mod); - ok(hr == S_OK, "IScriptModuleCollection_get_Item failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptModuleCollection_get_Item failed: 0x%08lx.\n", hr); hr = IScriptModule_get_Name(mod, NULL); - ok(hr == E_POINTER, "IScriptModule_get_Name returned: 0x%08x.\n", hr); + ok(hr == E_POINTER, "IScriptModule_get_Name returned: 0x%08lx.\n", hr); hr = IScriptModule_get_Name(mod, &str); - ok(hr == S_OK, "IScriptModule_get_Name failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptModule_get_Name failed: 0x%08lx.\n", hr); ok(!lstrcmpW(str, L"Global"), "got %s.\n", wine_dbgstr_w(str)); SysFreeString(str); str = SysAllocString(L"function add(a, b) { return a + b; }\n"); hr = IScriptModule_AddCode(mod, str); - ok(hr == S_OK, "IScriptModule_AddCode failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptModule_AddCode failed: 0x%08lx.\n", hr); IScriptModule_Release(mod); SysFreeString(str); V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(L"some other module"); hr = IScriptModuleCollection_get_Item(mods, var, &mod); - ok(hr == S_OK, "IScriptModuleCollection_get_Item failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptModuleCollection_get_Item failed: 0x%08lx.\n", hr); ok(V_VT(&var) == VT_BSTR, "var type not BSTR, got %d.\n", V_VT(&var)); VariantClear(&var); hr = IScriptModule_get_Name(mod, &str); - ok(hr == S_OK, "IScriptModule_get_Name failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptModule_get_Name failed: 0x%08lx.\n", hr); ok(!lstrcmpW(str, L"some other Module"), "got %s.\n", wine_dbgstr_w(str)); IScriptModule_Release(mod); SysFreeString(str); @@ -3138,53 +3138,53 @@ static void test_IScriptControl_get_Modules(void) V_VT(&var) = VT_R8; V_R8(&var) = 2.0; hr = IScriptModuleCollection_get_Item(mods, var, &mod); - ok(hr == S_OK, "IScriptModuleCollection_get_Item failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptModuleCollection_get_Item failed: 0x%08lx.\n", hr); hr = IScriptModule_get_Name(mod, &str); - ok(hr == S_OK, "IScriptModule_get_Name failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptModule_get_Name failed: 0x%08lx.\n", hr); ok(!lstrcmpW(str, L"foobar"), "got %s.\n", wine_dbgstr_w(str)); SysFreeString(str); str = SysAllocString(L"function sub(a, b) { return a - b; }\n"); hr = IScriptModule_AddCode(mod, str); - ok(hr == S_OK, "IScriptModule_AddCode failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptModule_AddCode failed: 0x%08lx.\n", hr); IScriptModule_Release(mod); SysFreeString(str); /* Test the enumerator, should be updated */ fetched = 0xdeadbeef; hr = IEnumVARIANT_Next(enumvar, 0, NULL, NULL); - ok(hr == E_POINTER, "IEnumVARIANT_Next returned: 0x%08x.\n", hr); + ok(hr == E_POINTER, "IEnumVARIANT_Next returned: 0x%08lx.\n", hr); hr = IEnumVARIANT_Next(enumvar, 0, NULL, &fetched); - ok(hr == E_POINTER, "IEnumVARIANT_Next failed: 0x%08x.\n", hr); - ok(fetched == 0xdeadbeef, "got %u.\n", fetched); + ok(hr == E_POINTER, "IEnumVARIANT_Next failed: 0x%08lx.\n", hr); + ok(fetched == 0xdeadbeef, "got %lu.\n", fetched); hr = IEnumVARIANT_Next(enumvar, 0, &var, &fetched); - ok(hr == S_OK, "IEnumVARIANT_Next returned: 0x%08x.\n", hr); - ok(fetched == 0, "got %u.\n", fetched); + ok(hr == S_OK, "IEnumVARIANT_Next returned: 0x%08lx.\n", hr); + ok(fetched == 0, "got %lu.\n", fetched); hr = IEnumVARIANT_Next(enumvar, 0, &var, NULL); - ok(hr == S_OK, "IEnumVARIANT_Next returned: 0x%08x.\n", hr); + ok(hr == S_OK, "IEnumVARIANT_Next returned: 0x%08lx.\n", hr); hr = IEnumVARIANT_Clone(enumvar, NULL); - ok(hr == E_POINTER, "IEnumVARIANT_Clone failed: 0x%08x.\n", hr); + ok(hr == E_POINTER, "IEnumVARIANT_Clone failed: 0x%08lx.\n", hr); hr = IEnumVARIANT_Next(enumvar, ARRAY_SIZE(vars), vars, &fetched); - ok(hr == S_OK, "IEnumVARIANT_Next failed: 0x%08x.\n", hr); - ok(fetched == ARRAY_SIZE(vars), "got %u.\n", fetched); + ok(hr == S_OK, "IEnumVARIANT_Next failed: 0x%08lx.\n", hr); + ok(fetched == ARRAY_SIZE(vars), "got %lu.\n", fetched); hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); - ok(hr == S_FALSE, "IEnumVARIANT_Next failed: 0x%08x.\n", hr); - ok(fetched == 0, "got %u.\n", fetched); + ok(hr == S_FALSE, "IEnumVARIANT_Next failed: 0x%08lx.\n", hr); + ok(fetched == 0, "got %lu.\n", fetched); hr = IEnumVARIANT_Skip(enumvar, 0); - ok(hr == S_OK, "IEnumVARIANT_Skip failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IEnumVARIANT_Skip failed: 0x%08lx.\n", hr); hr = IEnumVARIANT_Skip(enumvar, 1); - ok(hr == S_FALSE, "IEnumVARIANT_Skip failed: 0x%08x.\n", hr); + ok(hr == S_FALSE, "IEnumVARIANT_Skip failed: 0x%08lx.\n", hr); hr = IEnumVARIANT_Clone(enumvar, &enumvar2); - ok(hr == S_OK, "IEnumVARIANT_Clone failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IEnumVARIANT_Clone failed: 0x%08lx.\n", hr); hr = IEnumVARIANT_Skip(enumvar2, 1); - ok(hr == S_FALSE, "IEnumVARIANT_Skip failed: 0x%08x.\n", hr); + ok(hr == S_FALSE, "IEnumVARIANT_Skip failed: 0x%08lx.\n", hr); IEnumVARIANT_Release(enumvar2); for (i = 0; i < ARRAY_SIZE(vars); i++) { ok(V_VT(&vars[i]) == VT_DISPATCH, "V_VT(vars[%u]) = %d.\n", i, V_VT(&vars[i])); hr = IDispatch_QueryInterface(V_DISPATCH(&vars[i]), &IID_IScriptModule, (void**)&mod); - ok(hr == S_OK, "Failed to query IScriptModule from vars[%u]: 0x%08x.\n", i, hr); + ok(hr == S_OK, "Failed to query IScriptModule from vars[%u]: 0x%08lx.\n", i, hr); IScriptModule_Release(mod); VariantClear(&vars[i]); } @@ -3192,32 +3192,32 @@ static void test_IScriptControl_get_Modules(void) /* The 'Global' module is the same as the script control */ str = SysAllocString(L"add(10, 5)"); hr = IScriptControl_Eval(sc, str, &var); - ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); - ok(V_VT(&var) == VT_I4 && V_I4(&var) == 15, "V_VT(var) = %d, V_I4(var) = %d.\n", V_VT(&var), V_I4(&var)); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08lx.\n", hr); + ok(V_VT(&var) == VT_I4 && V_I4(&var) == 15, "V_VT(var) = %d, V_I4(var) = %ld.\n", V_VT(&var), V_I4(&var)); SysFreeString(str); str = SysAllocString(L"sub(10, 5)"); hr = IScriptControl_Eval(sc, str, &var); - ok(FAILED(hr), "IScriptControl_Eval succeeded: 0x%08x.\n", hr); + ok(FAILED(hr), "IScriptControl_Eval succeeded: 0x%08lx.\n", hr); SysFreeString(str); V_VT(&var) = VT_R4; V_R4(&var) = 2.0f; hr = IScriptModuleCollection_get_Item(mods, var, &mod); - ok(hr == S_OK, "IScriptModuleCollection_get_Item failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptModuleCollection_get_Item failed: 0x%08lx.\n", hr); hr = IScriptModule_get_CodeObject(mod, &disp); - ok(hr == S_OK, "IScriptModule_get_CodeObject failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptModule_get_CodeObject failed: 0x%08lx.\n", hr); str = SysAllocString(L"sub"); hr = IDispatch_GetIDsOfNames(disp, &IID_NULL, &str, 1, LOCALE_USER_DEFAULT, &id); - ok(hr == S_OK, "IDispatch_GetIDsOfNames failed: 0x%08x.\n", hr); - ok(id != -1, "Unexpected id %d.\n", id); + ok(hr == S_OK, "IDispatch_GetIDsOfNames failed: 0x%08lx.\n", hr); + ok(id != -1, "Unexpected id %ld.\n", id); SysFreeString(str); str = SysAllocString(L"add"); hr = IDispatch_GetIDsOfNames(disp, &IID_NULL, &str, 1, LOCALE_USER_DEFAULT, &id); - ok(hr == DISP_E_UNKNOWNNAME, "IDispatch_GetIDsOfNames returned: 0x%08x.\n", hr); - ok(id == -1, "Unexpected id %d.\n", id); + ok(hr == DISP_E_UNKNOWNNAME, "IDispatch_GetIDsOfNames returned: 0x%08lx.\n", hr); + ok(id == -1, "Unexpected id %ld.\n", id); SysFreeString(str); IDispatch_Release(disp); @@ -3233,23 +3233,23 @@ static void test_IScriptControl_get_Modules(void) str = SysAllocString(L"sub"); hr = IScriptModule_Run(mod, str, NULL, &var); - ok(hr == E_POINTER, "IScriptModule_Run returned: 0x%08x.\n", hr); + ok(hr == E_POINTER, "IScriptModule_Run returned: 0x%08lx.\n", hr); hr = IScriptModule_Run(mod, str, ¶ms, NULL); - ok(hr == E_POINTER, "IScriptModule_Run returned: 0x%08x.\n", hr); + ok(hr == E_POINTER, "IScriptModule_Run returned: 0x%08lx.\n", hr); hr = IScriptControl_Run(sc, str, ¶ms, &var); - ok(hr == DISP_E_UNKNOWNNAME, "IScriptControl_Run failed: 0x%08x.\n", hr); + ok(hr == DISP_E_UNKNOWNNAME, "IScriptControl_Run failed: 0x%08lx.\n", hr); hr = IScriptModule_Run(mod, str, ¶ms, &var); - ok(hr == S_OK, "IScriptModule_Run failed: 0x%08x.\n", hr); - ok((V_VT(&var) == VT_I4) && (V_I4(&var) == 7), "V_VT(var) = %d, V_I4(var) = %d.\n", V_VT(&var), V_I4(&var)); + ok(hr == S_OK, "IScriptModule_Run failed: 0x%08lx.\n", hr); + ok((V_VT(&var) == VT_I4) && (V_I4(&var) == 7), "V_VT(var) = %d, V_I4(var) = %ld.\n", V_VT(&var), V_I4(&var)); SysFreeString(str); str = SysAllocString(L"add"); hr = IScriptControl_Run(sc, str, ¶ms, &var); - ok(hr == S_OK, "IScriptControl_Run failed: 0x%08x.\n", hr); - ok((V_VT(&var) == VT_I4) && (V_I4(&var) == 13), "V_VT(var) = %d, V_I4(var) = %d.\n", V_VT(&var), V_I4(&var)); + ok(hr == S_OK, "IScriptControl_Run failed: 0x%08lx.\n", hr); + ok((V_VT(&var) == VT_I4) && (V_I4(&var) == 13), "V_VT(var) = %d, V_I4(var) = %ld.\n", V_VT(&var), V_I4(&var)); hr = IScriptModule_Run(mod, str, ¶ms, &var); - ok(hr == DISP_E_UNKNOWNNAME, "IScriptModule_Run failed: 0x%08x.\n", hr); + ok(hr == DISP_E_UNKNOWNNAME, "IScriptModule_Run failed: 0x%08lx.\n", hr); SysFreeString(str); SafeArrayDestroy(params); @@ -3268,12 +3268,12 @@ static void test_IScriptControl_get_Modules(void) str = SysAllocString(L"sub"); hr = IScriptModule_Run(mod, str, ¶ms, &var); - ok(hr == S_OK, "IScriptModule_Run failed: 0x%08x.\n", hr); - ok((V_VT(&var) == VT_I4) && (V_I4(&var) == 42), "V_VT(var) = %d, V_I4(var) = %d.\n", V_VT(&var), V_I4(&var)); + ok(hr == S_OK, "IScriptModule_Run failed: 0x%08lx.\n", hr); + ok((V_VT(&var) == VT_I4) && (V_I4(&var) == 42), "V_VT(var) = %d, V_I4(var) = %ld.\n", V_VT(&var), V_I4(&var)); params->cDims = 0; hr = IScriptModule_Run(mod, str, ¶ms, &var); - ok(hr == DISP_E_BADINDEX, "IScriptModule_Run returned: 0x%08x.\n", hr); + ok(hr == DISP_E_BADINDEX, "IScriptModule_Run returned: 0x%08lx.\n", hr); ok(V_VT(&var) == VT_EMPTY, "V_VT(var) = %d.\n", V_VT(&var)); params->cDims = 2; SysFreeString(str); @@ -3284,69 +3284,69 @@ static void test_IScriptControl_get_Modules(void) V_VT(&var) = VT_I2; V_I2(&var) = 3; hr = IScriptModuleCollection_get_Item(mods, var, &mod); - ok(hr == S_OK, "IScriptModuleCollection_get_Item failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptModuleCollection_get_Item failed: 0x%08lx.\n", hr); str = SysAllocString(L"vbscript"); hr = IScriptControl_put_Language(sc, str); - ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08lx.\n", hr); SysFreeString(str); /* The module collection changes and module ref is invalid */ hr = IScriptModuleCollection_get_Count(mods, &count); - ok(hr == S_OK, "IScriptModuleCollection_get_Count failed: 0x%08x.\n", hr); - ok(count == 1, "count is not 1, got %d.\n", count); + ok(hr == S_OK, "IScriptModuleCollection_get_Count failed: 0x%08lx.\n", hr); + ok(count == 1, "count is not 1, got %ld.\n", count); hr = IScriptModule_get_Name(mod, &str); - ok(hr == E_FAIL, "IScriptModule_get_Name returned: 0x%08x.\n", hr); + ok(hr == E_FAIL, "IScriptModule_get_Name returned: 0x%08lx.\n", hr); hr = IScriptModule_get_CodeObject(mod, &disp); - ok(hr == E_FAIL, "IScriptModule_get_CodeObject returned: 0x%08x.\n", hr); + ok(hr == E_FAIL, "IScriptModule_get_CodeObject returned: 0x%08lx.\n", hr); hr = IScriptModule_get_Procedures(mod, &procs); - ok(hr == E_FAIL, "IScriptModule_get_Procedures returned: 0x%08x.\n", hr); + ok(hr == E_FAIL, "IScriptModule_get_Procedures returned: 0x%08lx.\n", hr); str = SysAllocString(L"function closed() { }\n"); hr = IScriptModule_AddCode(mod, str); - ok(hr == E_FAIL, "IScriptModule_AddCode failed: 0x%08x.\n", hr); + ok(hr == E_FAIL, "IScriptModule_AddCode failed: 0x%08lx.\n", hr); SysFreeString(str); str = SysAllocString(L"sub closed\nend sub"); hr = IScriptModule_AddCode(mod, str); - ok(hr == E_FAIL, "IScriptModule_AddCode failed: 0x%08x.\n", hr); + ok(hr == E_FAIL, "IScriptModule_AddCode failed: 0x%08lx.\n", hr); SysFreeString(str); str = SysAllocString(L"identifier"); hr = IScriptModule_Run(mod, str, ¶ms, &var); - ok(hr == E_FAIL, "IScriptModule_Run returned: 0x%08x.\n", hr); + ok(hr == E_FAIL, "IScriptModule_Run returned: 0x%08lx.\n", hr); IScriptModule_Release(mod); SafeArrayDestroy(params); SysFreeString(str); /* The enumerator is also invalid */ hr = IEnumVARIANT_Reset(enumvar); - ok(hr == E_FAIL, "IEnumVARIANT_Skip returned: 0x%08x.\n", hr); + ok(hr == E_FAIL, "IEnumVARIANT_Skip returned: 0x%08lx.\n", hr); hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); - ok(hr == E_FAIL, "IEnumVARIANT_Next returned: 0x%08x.\n", hr); + ok(hr == E_FAIL, "IEnumVARIANT_Next returned: 0x%08lx.\n", hr); hr = IEnumVARIANT_Skip(enumvar, 0); - ok(hr == E_FAIL, "IEnumVARIANT_Skip returned: 0x%08x.\n", hr); + ok(hr == E_FAIL, "IEnumVARIANT_Skip returned: 0x%08lx.\n", hr); hr = IEnumVARIANT_Clone(enumvar, &enumvar2); - ok(hr == E_FAIL, "IEnumVARIANT_Clone returned: 0x%08x.\n", hr); + ok(hr == E_FAIL, "IEnumVARIANT_Clone returned: 0x%08lx.\n", hr); IEnumVARIANT_Release(enumvar); hr = IScriptControl_put_Language(sc, NULL); - ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08lx.\n", hr); hr = IScriptModuleCollection_get_Count(mods, &count); - ok(hr == E_FAIL, "IScriptModuleCollection_get_Count returned: 0x%08x.\n", hr); + ok(hr == E_FAIL, "IScriptModuleCollection_get_Count returned: 0x%08lx.\n", hr); V_VT(&var) = VT_I4; V_I4(&var) = 1; hr = IScriptModuleCollection_get_Item(mods, var, &mod); - ok(hr == E_FAIL, "IScriptModuleCollection_get_Item returned: 0x%08x.\n", hr); + ok(hr == E_FAIL, "IScriptModuleCollection_get_Item returned: 0x%08lx.\n", hr); V_VT(&var) = VT_DISPATCH; V_DISPATCH(&var) = NULL; str = SysAllocString(L"module_name"); hr = IScriptModuleCollection_Add(mods, str, &var, &mod); - ok(hr == E_FAIL, "IScriptModuleCollection_Add returned: 0x%08x.\n", hr); + ok(hr == E_FAIL, "IScriptModuleCollection_Add returned: 0x%08lx.\n", hr); SysFreeString(str); hr = IScriptModuleCollection_get__NewEnum(mods, &unknown); - ok(hr == E_FAIL, "IScriptModuleCollection_get__NewEnum returned: 0x%08x.\n", hr); + ok(hr == E_FAIL, "IScriptModuleCollection_get__NewEnum returned: 0x%08lx.\n", hr); IScriptModuleCollection_Release(mods); hr = IScriptControl_get_Modules(sc, &mods); - ok(hr == E_FAIL, "IScriptControl_get_Modules returned: 0x%08x.\n", hr); + ok(hr == E_FAIL, "IScriptControl_get_Modules returned: 0x%08lx.\n", hr); IScriptControl_Release(sc); @@ -3358,7 +3358,7 @@ static void test_IScriptControl_get_Modules(void) /* A module collection ref keeps the control alive */ hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); - ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08lx.\n", hr); SET_EXPECT(CreateInstance); SET_EXPECT(SetInterfaceSafetyOptions); @@ -3367,7 +3367,7 @@ static void test_IScriptControl_get_Modules(void) SET_EXPECT(InitNew); str = SysAllocString(L"testscript"); hr = IScriptControl_put_Language(sc, str); - ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08lx.\n", hr); SysFreeString(str); CHECK_CALLED(CreateInstance); CHECK_CALLED(SetInterfaceSafetyOptions); @@ -3376,7 +3376,7 @@ static void test_IScriptControl_get_Modules(void) CHECK_CALLED(InitNew); hr = IScriptControl_get_Modules(sc, &mods); - ok(hr == S_OK, "IScriptControl_get_Modules failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_get_Modules failed: 0x%08lx.\n", hr); IActiveScriptSite_Release(site); IScriptControl_Release(sc); @@ -3388,7 +3388,7 @@ static void test_IScriptControl_get_Modules(void) /* Add a module with a non-null object and add some code to it */ hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); - ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08lx.\n", hr); SET_EXPECT(CreateInstance); SET_EXPECT(SetInterfaceSafetyOptions); @@ -3397,7 +3397,7 @@ static void test_IScriptControl_get_Modules(void) SET_EXPECT(InitNew); str = SysAllocString(L"testscript"); hr = IScriptControl_put_Language(sc, str); - ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08lx.\n", hr); SysFreeString(str); CHECK_CALLED(CreateInstance); CHECK_CALLED(SetInterfaceSafetyOptions); @@ -3406,7 +3406,7 @@ static void test_IScriptControl_get_Modules(void) CHECK_CALLED(InitNew); hr = IScriptControl_get_Modules(sc, &mods); - ok(hr == S_OK, "IScriptControl_get_Modules failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_get_Modules failed: 0x%08lx.\n", hr); SET_EXPECT(AddNamedItem); str = SysAllocString(L"modname"); @@ -3415,13 +3415,13 @@ static void test_IScriptControl_get_Modules(void) V_VT(&var) = VT_DISPATCH; V_DISPATCH(&var) = &testdisp; hr = IScriptModuleCollection_Add(mods, str, &var, &mod); - ok(hr == S_OK, "IScriptModuleCollection_Add failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptModuleCollection_Add failed: 0x%08lx.\n", hr); VariantClear(&var); CHECK_CALLED(AddNamedItem); unknown = (IUnknown*)0xdeadbeef; hr = IActiveScriptSite_GetItemInfo(site, str, SCRIPTINFO_IUNKNOWN, &unknown, NULL); - ok(hr == S_OK, "IActiveScriptSite_GetItemInfo failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IActiveScriptSite_GetItemInfo failed: 0x%08lx.\n", hr); ok(unknown == (IUnknown*)&testdisp, "Unexpected IUnknown for the item: %p.\n", unknown); IUnknown_Release(unknown); @@ -3429,7 +3429,7 @@ static void test_IScriptControl_get_Modules(void) SET_EXPECT(SetScriptState_STARTED); SET_EXPECT(GetScriptDispatch); hr = IScriptModule_get_CodeObject(mod, &disp); - ok(hr == S_OK, "IScriptModule_get_CodeObject failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptModule_get_CodeObject failed: 0x%08lx.\n", hr); ok(disp == (IDispatch*)&DispatchEx, "Unexpected code object %p.\n", disp); CHECK_CALLED(GetScriptDispatch); CHECK_CALLED(SetScriptState_STARTED); @@ -3441,7 +3441,7 @@ static void test_IScriptControl_get_Modules(void) parse_flags = SCRIPTTEXT_ISVISIBLE; code_str = SysAllocString(L"some code"); hr = IScriptModule_AddCode(mod, code_str); - ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08lx.\n", hr); CHECK_CALLED(ParseScriptText); SysFreeString(code_str); SysFreeString(str); @@ -3449,7 +3449,7 @@ static void test_IScriptControl_get_Modules(void) /* Keep the module ref before changing the language */ SET_EXPECT(Close); hr = IScriptControl_put_Language(sc, NULL); - ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08lx.\n", hr); CHECK_CALLED(Close); IScriptModuleCollection_Release(mods); IActiveScriptSite_Release(site); @@ -3459,7 +3459,7 @@ static void test_IScriptControl_get_Modules(void) /* Now try holding a module ref while closing the script */ hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); - ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08lx.\n", hr); SET_EXPECT(CreateInstance); SET_EXPECT(SetInterfaceSafetyOptions); @@ -3468,7 +3468,7 @@ static void test_IScriptControl_get_Modules(void) SET_EXPECT(InitNew); str = SysAllocString(L"testscript"); hr = IScriptControl_put_Language(sc, str); - ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08lx.\n", hr); SysFreeString(str); CHECK_CALLED(CreateInstance); CHECK_CALLED(SetInterfaceSafetyOptions); @@ -3477,7 +3477,7 @@ static void test_IScriptControl_get_Modules(void) CHECK_CALLED(InitNew); hr = IScriptControl_get_Modules(sc, &mods); - ok(hr == S_OK, "IScriptControl_get_Modules failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_get_Modules failed: 0x%08lx.\n", hr); SET_EXPECT(AddNamedItem); str = SysAllocString(L"foo"); @@ -3486,13 +3486,13 @@ static void test_IScriptControl_get_Modules(void) V_VT(&var) = VT_DISPATCH; V_DISPATCH(&var) = NULL; hr = IScriptModuleCollection_Add(mods, str, &var, &mod); - ok(hr == S_OK, "IScriptModuleCollection_Add failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptModuleCollection_Add failed: 0x%08lx.\n", hr); VariantClear(&var); CHECK_CALLED(AddNamedItem); unknown = (IUnknown*)0xdeadbeef; hr = IActiveScriptSite_GetItemInfo(site, str, SCRIPTINFO_IUNKNOWN, &unknown, NULL); - ok(hr == TYPE_E_ELEMENTNOTFOUND, "IActiveScriptSite_GetItemInfo returned: 0x%08x.\n", hr); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "IActiveScriptSite_GetItemInfo returned: 0x%08lx.\n", hr); IScriptModuleCollection_Release(mods); IActiveScriptSite_Release(site); IScriptControl_Release(sc); @@ -3503,7 +3503,7 @@ static void test_IScriptControl_get_Modules(void) parse_flags = SCRIPTTEXT_ISVISIBLE; code_str = SysAllocString(L"code after close"); hr = IScriptModule_AddCode(mod, code_str); - ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08lx.\n", hr); CHECK_CALLED(SetScriptState_STARTED); CHECK_CALLED(ParseScriptText); SysFreeString(code_str); @@ -3516,7 +3516,7 @@ static void test_IScriptControl_get_Modules(void) /* Hold an enumerator while releasing the script control */ hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); - ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08lx.\n", hr); SET_EXPECT(CreateInstance); SET_EXPECT(SetInterfaceSafetyOptions); @@ -3525,7 +3525,7 @@ static void test_IScriptControl_get_Modules(void) SET_EXPECT(InitNew); str = SysAllocString(L"testscript"); hr = IScriptControl_put_Language(sc, str); - ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08lx.\n", hr); SysFreeString(str); CHECK_CALLED(CreateInstance); CHECK_CALLED(SetInterfaceSafetyOptions); @@ -3534,7 +3534,7 @@ static void test_IScriptControl_get_Modules(void) CHECK_CALLED(InitNew); hr = IScriptControl_get_Modules(sc, &mods); - ok(hr == S_OK, "IScriptControl_get_Modules failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_get_Modules failed: 0x%08lx.\n", hr); IScriptControl_Release(sc); SET_EXPECT(AddNamedItem); @@ -3544,31 +3544,31 @@ static void test_IScriptControl_get_Modules(void) V_VT(&var) = VT_DISPATCH; V_DISPATCH(&var) = NULL; hr = IScriptModuleCollection_Add(mods, str, &var, &mod); - ok(hr == S_OK, "IScriptModuleCollection_Add failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptModuleCollection_Add failed: 0x%08lx.\n", hr); IScriptModule_Release(mod); VariantClear(&var); SysFreeString(str); CHECK_CALLED(AddNamedItem); hr = IScriptModuleCollection_get__NewEnum(mods, &unknown); - ok(hr == S_OK, "IScriptModuleCollection_get__NewEnum failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptModuleCollection_get__NewEnum failed: 0x%08lx.\n", hr); hr = IUnknown_QueryInterface(unknown, &IID_IEnumVARIANT, (void**)&enumvar); - ok(hr == S_OK, "Failed to query for IEnumVARIANT: 0x%08x.\n", hr); + ok(hr == S_OK, "Failed to query for IEnumVARIANT: 0x%08lx.\n", hr); IUnknown_Release(unknown); IScriptModuleCollection_Release(mods); IActiveScriptSite_Release(site); hr = IEnumVARIANT_Next(enumvar, ARRAY_SIZE(vars), vars, &fetched); - ok(hr == S_FALSE, "IEnumVARIANT_Next failed: 0x%08x.\n", hr); - ok(fetched == 2, "got %u.\n", fetched); + ok(hr == S_FALSE, "IEnumVARIANT_Next failed: 0x%08lx.\n", hr); + ok(fetched == 2, "got %lu.\n", fetched); for (i = 0; i < fetched; i++) { ok(V_VT(&vars[i]) == VT_DISPATCH, "V_VT(vars[%u]) = %d.\n", i, V_VT(&vars[i])); hr = IDispatch_QueryInterface(V_DISPATCH(&vars[i]), &IID_IScriptModule, (void**)&mod); - ok(hr == S_OK, "Failed to query IScriptModule from vars[%u]: 0x%08x.\n", i, hr); + ok(hr == S_OK, "Failed to query IScriptModule from vars[%u]: 0x%08lx.\n", i, hr); hr = IScriptModule_get_Name(mod, &str); - ok(hr == S_OK, "IScriptModule_get_Name failed for vars[%u]: 0x%08x.\n", i, hr); + ok(hr == S_OK, "IScriptModule_get_Name failed for vars[%u]: 0x%08lx.\n", i, hr); ok(!lstrcmpW(str, i ? L"bar" : L"Global"), "wrong name for vars[%u]: %s.\n", i, wine_dbgstr_w(str)); IScriptModule_Release(mod); VariantClear(&vars[i]); @@ -3591,42 +3591,42 @@ static void test_IScriptControl_get_Error(void) hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); - ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08lx.\n", hr); hr = IScriptControl_get_Error(sc, NULL); - ok(hr == E_POINTER, "IScriptControl_get_Error returned: 0x%08x.\n", hr); + ok(hr == E_POINTER, "IScriptControl_get_Error returned: 0x%08lx.\n", hr); hr = IScriptControl_get_Error(sc, &error); - ok(hr == S_OK, "IScriptControl_get_Error failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_get_Error failed: 0x%08lx.\n", hr); x = 0xdeadbeef; hr = IScriptError_get_Number(error, &x); - ok(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.\n", hr); - ok(x == 0, "Error Number is not 0, got %d.\n", x); + ok(hr == S_OK, "IScriptError_get_Number failed: 0x%08lx.\n", hr); + ok(x == 0, "Error Number is not 0, got %ld.\n", x); hr = IScriptError_get_Source(error, &str); - ok(hr == S_OK, "IScriptError_get_Source failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptError_get_Source failed: 0x%08lx.\n", hr); ok(str == NULL, "Error Source is not (null), got %s.\n", wine_dbgstr_w(str)); hr = IScriptError_get_Description(error, &str); - ok(hr == S_OK, "IScriptError_get_Description failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptError_get_Description failed: 0x%08lx.\n", hr); ok(str == NULL, "Error Description is not (null), got %s.\n", wine_dbgstr_w(str)); hr = IScriptError_get_HelpFile(error, &str); - ok(hr == S_OK, "IScriptError_get_HelpFile failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptError_get_HelpFile failed: 0x%08lx.\n", hr); ok(str == NULL, "Error HelpFile is not (null), got %s.\n", wine_dbgstr_w(str)); hr = IScriptError_get_HelpContext(error, &x); - ok(hr == S_OK, "IScriptError_get_HelpContext failed: 0x%08x.\n", hr); - ok(x == 0, "Error HelpContext is not 0, got %d.\n", x); + ok(hr == S_OK, "IScriptError_get_HelpContext failed: 0x%08lx.\n", hr); + ok(x == 0, "Error HelpContext is not 0, got %ld.\n", x); hr = IScriptError_get_Text(error, &str); - ok(hr == S_OK, "IScriptError_get_Text failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptError_get_Text failed: 0x%08lx.\n", hr); ok(str == NULL, "Error Text is not (null), got %s.\n", wine_dbgstr_w(str)); hr = IScriptError_get_Line(error, &x); - ok(hr == S_OK, "IScriptError_get_Line failed: 0x%08x.\n", hr); - ok(x == 0, "Error Line is not 0, got %d.\n", x); + ok(hr == S_OK, "IScriptError_get_Line failed: 0x%08lx.\n", hr); + ok(x == 0, "Error Line is not 0, got %ld.\n", x); hr = IScriptError_get_Column(error, &x); - ok(hr == S_OK, "IScriptError_get_Column failed: 0x%08x.\n", hr); - ok(x == 0, "Error Column is not 0, got %d.\n", x); + ok(hr == S_OK, "IScriptError_get_Column failed: 0x%08lx.\n", hr); + ok(x == 0, "Error Column is not 0, got %ld.\n", x); str = SysAllocString(L"jscript"); hr = IScriptControl_put_Language(sc, str); - ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08lx.\n", hr); SysFreeString(str); str = SysAllocString(L"" @@ -3634,62 +3634,62 @@ static void test_IScriptControl_get_Error(void) "// comment\n" "this is an invalid line\n"); hr = IScriptControl_AddCode(sc, str); - ok(FAILED(hr), "IScriptControl_AddCode succeeded: 0x%08x.\n", hr); + ok(FAILED(hr), "IScriptControl_AddCode succeeded: 0x%08lx.\n", hr); SysFreeString(str); x = 0xdeadbeef; hr = IScriptError_get_Number(error, &x); - ok(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.\n", hr); - todo_wine ok(x > 1000, "Error Number is wrong, got %d.\n", x); + ok(hr == S_OK, "IScriptError_get_Number failed: 0x%08lx.\n", hr); + todo_wine ok(x > 1000, "Error Number is wrong, got %ld.\n", x); hr = IScriptError_get_Source(error, &str); - ok(hr == S_OK, "IScriptError_get_Source failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptError_get_Source failed: 0x%08lx.\n", hr); ok(str != NULL, "Error Source is (null).\n"); SysFreeString(str); hr = IScriptError_get_Description(error, &str); - ok(hr == S_OK, "IScriptError_get_Description failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptError_get_Description failed: 0x%08lx.\n", hr); ok(str != NULL, "Error Description is (null).\n"); SysFreeString(str); hr = IScriptError_get_Text(error, &str); - ok(hr == S_OK, "IScriptError_get_Text failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptError_get_Text failed: 0x%08lx.\n", hr); ok(!lstrcmpW(str, L"this is an invalid line"), "Error Text is wrong, got %s.\n", wine_dbgstr_w(str)); SysFreeString(str); hr = IScriptError_get_Line(error, &x); - ok(hr == S_OK, "IScriptError_get_Line failed: 0x%08x.\n", hr); - ok(x == 3, "Error Line is not 3, got %d.\n", x); + ok(hr == S_OK, "IScriptError_get_Line failed: 0x%08lx.\n", hr); + ok(x == 3, "Error Line is not 3, got %ld.\n", x); hr = IScriptError_get_Column(error, &x); - ok(hr == S_OK, "IScriptError_get_Column failed: 0x%08x.\n", hr); - ok(x == 5, "Error Column is not 5, got %d.\n", x); + ok(hr == S_OK, "IScriptError_get_Column failed: 0x%08lx.\n", hr); + ok(x == 5, "Error Column is not 5, got %ld.\n", x); hr = IScriptError_Clear(error); - ok(hr == S_OK, "IScriptError_Clear failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptError_Clear failed: 0x%08lx.\n", hr); x = 0xdeadbeef; hr = IScriptError_get_Number(error, &x); - ok(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.\n", hr); - ok(x == 0, "Error Number is not 0, got %d.\n", x); + ok(hr == S_OK, "IScriptError_get_Number failed: 0x%08lx.\n", hr); + ok(x == 0, "Error Number is not 0, got %ld.\n", x); hr = IScriptError_get_Source(error, &str); - ok(hr == S_OK, "IScriptError_get_Source failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptError_get_Source failed: 0x%08lx.\n", hr); ok(str == NULL, "Error Source is not (null), got %s.\n", wine_dbgstr_w(str)); hr = IScriptError_get_Description(error, &str); - ok(hr == S_OK, "IScriptError_get_Description failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptError_get_Description failed: 0x%08lx.\n", hr); ok(str == NULL, "Error Description is not (null), got %s.\n", wine_dbgstr_w(str)); hr = IScriptError_get_HelpFile(error, &str); - ok(hr == S_OK, "IScriptError_get_HelpFile failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptError_get_HelpFile failed: 0x%08lx.\n", hr); ok(str == NULL, "Error HelpFile is not (null), got %s.\n", wine_dbgstr_w(str)); hr = IScriptError_get_HelpContext(error, &x); - ok(hr == S_OK, "IScriptError_get_HelpContext failed: 0x%08x.\n", hr); - ok(x == 0, "Error HelpContext is not 0, got %d.\n", x); + ok(hr == S_OK, "IScriptError_get_HelpContext failed: 0x%08lx.\n", hr); + ok(x == 0, "Error HelpContext is not 0, got %ld.\n", x); hr = IScriptError_get_Text(error, &str); - ok(hr == S_OK, "IScriptError_get_Text failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptError_get_Text failed: 0x%08lx.\n", hr); ok(str == NULL, "Error Text is not (null), got %s.\n", wine_dbgstr_w(str)); hr = IScriptError_get_Line(error, &x); - ok(hr == S_OK, "IScriptError_get_Line failed: 0x%08x.\n", hr); - ok(x == 0, "Error Line is not 0, got %d.\n", x); + ok(hr == S_OK, "IScriptError_get_Line failed: 0x%08lx.\n", hr); + ok(x == 0, "Error Line is not 0, got %ld.\n", x); hr = IScriptError_get_Column(error, &x); - ok(hr == S_OK, "IScriptError_get_Column failed: 0x%08x.\n", hr); - ok(x == 0, "Error Column is not 0, got %d.\n", x); + ok(hr == S_OK, "IScriptError_get_Column failed: 0x%08lx.\n", hr); + ok(x == 0, "Error Column is not 0, got %ld.\n", x); hr = IScriptControl_get_Error(sc, &error2); - ok(hr == S_OK, "IScriptControl_get_Error failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_get_Error failed: 0x%08lx.\n", hr); ok(error == error2, "Error objects are not the same (%p vs %p).\n", error, error2); IScriptError_Release(error2); @@ -3701,7 +3701,7 @@ static void test_IScriptControl_get_Error(void) { hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); - ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08lx.\n", hr); SET_EXPECT(CreateInstance); SET_EXPECT(SetInterfaceSafetyOptions); @@ -3710,7 +3710,7 @@ static void test_IScriptControl_get_Error(void) SET_EXPECT(InitNew); str = SysAllocString(L"testscript"); hr = IScriptControl_put_Language(sc, str); - ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08lx.\n", hr); SysFreeString(str); CHECK_CALLED(CreateInstance); CHECK_CALLED(SetInterfaceSafetyOptions); @@ -3719,125 +3719,125 @@ static void test_IScriptControl_get_Error(void) CHECK_CALLED(InitNew); hr = IScriptControl_get_Error(sc, &error); - ok(hr == S_OK, "IScriptControl_get_Error failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_get_Error failed: 0x%08lx.\n", hr); x = 0xdeadbeef; hr = IScriptError_get_Number(error, &x); - ok(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.\n", hr); - ok(x == 0, "Error Number is not 0, got %d.\n", x); + ok(hr == S_OK, "IScriptError_get_Number failed: 0x%08lx.\n", hr); + ok(x == 0, "Error Number is not 0, got %ld.\n", x); /* The calls are cached even if they fail */ ActiveScriptError_stage = 0; hr = IActiveScriptSite_OnScriptError(site, &ActiveScriptError); - ok(hr == S_FALSE, "IActiveScriptSite_OnScriptError returned: 0x%08x.\n", hr); + ok(hr == S_FALSE, "IActiveScriptSite_OnScriptError returned: 0x%08lx.\n", hr); SET_EXPECT(GetExceptionInfo); x = 0xdeadbeef; hr = IScriptError_get_Number(error, &x); - ok(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.\n", hr); - ok(x == 0, "Error Number is not 0, got %d.\n", x); + ok(hr == S_OK, "IScriptError_get_Number failed: 0x%08lx.\n", hr); + ok(x == 0, "Error Number is not 0, got %ld.\n", x); CHECK_CALLED(GetExceptionInfo); hr = IScriptError_get_Source(error, &str); - ok(hr == S_OK, "IScriptError_get_Source failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptError_get_Source failed: 0x%08lx.\n", hr); ok(str == NULL, "Error Source is not (null), got %s.\n", wine_dbgstr_w(str)); hr = IScriptError_get_Description(error, &str); - ok(hr == S_OK, "IScriptError_get_Description failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptError_get_Description failed: 0x%08lx.\n", hr); ok(str == NULL, "Error Description is not (null), got %s.\n", wine_dbgstr_w(str)); hr = IScriptError_get_HelpFile(error, &str); - ok(hr == S_OK, "IScriptError_get_HelpFile failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptError_get_HelpFile failed: 0x%08lx.\n", hr); ok(str == NULL, "Error HelpFile is not (null), got %s.\n", wine_dbgstr_w(str)); hr = IScriptError_get_HelpContext(error, &x); - ok(hr == S_OK, "IScriptError_get_HelpContext failed: 0x%08x.\n", hr); - ok(x == 0, "Error HelpContext is not 0, got %d.\n", x); + ok(hr == S_OK, "IScriptError_get_HelpContext failed: 0x%08lx.\n", hr); + ok(x == 0, "Error HelpContext is not 0, got %ld.\n", x); SET_EXPECT(GetSourceLineText); hr = IScriptError_get_Text(error, &str); - ok(hr == S_OK, "IScriptError_get_Text failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptError_get_Text failed: 0x%08lx.\n", hr); ok(!lstrcmpW(str, L"source line"), "Error Text is wrong, got %s.\n", wine_dbgstr_w(str)); SysFreeString(str); CHECK_CALLED(GetSourceLineText); SET_EXPECT(GetSourcePosition); hr = IScriptError_get_Line(error, &x); - ok(hr == S_OK, "IScriptError_get_Line failed: 0x%08x.\n", hr); - ok(x == 0, "Error Line is not 0, got %d.\n", x); + ok(hr == S_OK, "IScriptError_get_Line failed: 0x%08lx.\n", hr); + ok(x == 0, "Error Line is not 0, got %ld.\n", x); CHECK_CALLED(GetSourcePosition); hr = IScriptError_get_Column(error, &x); - ok(hr == S_OK, "IScriptError_get_Column failed: 0x%08x.\n", hr); - ok(x == 0, "Error Column is not 0, got %d.\n", x); + ok(hr == S_OK, "IScriptError_get_Column failed: 0x%08lx.\n", hr); + ok(x == 0, "Error Column is not 0, got %ld.\n", x); /* Check with deferred fill-in */ ActiveScriptError_stage = 1; hr = IActiveScriptSite_OnScriptError(site, &ActiveScriptError); - ok(hr == S_FALSE, "IActiveScriptSite_OnScriptError returned: 0x%08x.\n", hr); + ok(hr == S_FALSE, "IActiveScriptSite_OnScriptError returned: 0x%08lx.\n", hr); SET_EXPECT(GetExceptionInfo); SET_EXPECT(DeferredFillIn); x = 0xdeadbeef; hr = IScriptError_get_Number(error, &x); - ok(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.\n", hr); - ok(x == 0, "Error Number is not 0, got %d.\n", x); + ok(hr == S_OK, "IScriptError_get_Number failed: 0x%08lx.\n", hr); + ok(x == 0, "Error Number is not 0, got %ld.\n", x); CHECK_CALLED(GetExceptionInfo); CHECK_CALLED(DeferredFillIn); hr = IScriptError_get_Source(error, &str); - ok(hr == S_OK, "IScriptError_get_Source failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptError_get_Source failed: 0x%08lx.\n", hr); ok(!lstrcmpW(str, L"foobar"), "Error Source is wrong, got %s.\n", wine_dbgstr_w(str)); SysFreeString(str); hr = IScriptError_get_Description(error, &str); - ok(hr == S_OK, "IScriptError_get_Description failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptError_get_Description failed: 0x%08lx.\n", hr); ok(!lstrcmpW(str, L"barfoo"), "Error Description is wrong, got %s.\n", wine_dbgstr_w(str)); SysFreeString(str); SET_EXPECT(GetSourceLineText); hr = IScriptError_get_Text(error, &str); - ok(hr == S_OK, "IScriptError_get_Text failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptError_get_Text failed: 0x%08lx.\n", hr); ok(!lstrcmpW(str, L"source line"), "Error Text is wrong, got %s.\n", wine_dbgstr_w(str)); SysFreeString(str); CHECK_CALLED(GetSourceLineText); SET_EXPECT(GetSourcePosition); hr = IScriptError_get_Line(error, &x); - ok(hr == S_OK, "IScriptError_get_Line failed: 0x%08x.\n", hr); - ok(x == 42, "Error Line is not 42, got %d.\n", x); + ok(hr == S_OK, "IScriptError_get_Line failed: 0x%08lx.\n", hr); + ok(x == 42, "Error Line is not 42, got %ld.\n", x); CHECK_CALLED(GetSourcePosition); hr = IScriptError_get_Column(error, &x); - ok(hr == S_OK, "IScriptError_get_Column failed: 0x%08x.\n", hr); - ok(x == 10, "Error Column is not 10, got %d.\n", x); + ok(hr == S_OK, "IScriptError_get_Column failed: 0x%08lx.\n", hr); + ok(x == 10, "Error Column is not 10, got %ld.\n", x); /* Check without deferred fill-in, but using scode */ ActiveScriptError_stage = 2; hr = IActiveScriptSite_OnScriptError(site, &ActiveScriptError); - ok(hr == S_FALSE, "IActiveScriptSite_OnScriptError returned: 0x%08x.\n", hr); + ok(hr == S_FALSE, "IActiveScriptSite_OnScriptError returned: 0x%08lx.\n", hr); SET_EXPECT(GetExceptionInfo); x = 0xdeadbeef; hr = IScriptError_get_Number(error, &x); - ok(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.\n", hr); - ok(x == 0xbeef, "Error Number is not 0xbeef, got 0x%04x.\n", x); + ok(hr == S_OK, "IScriptError_get_Number failed: 0x%08lx.\n", hr); + ok(x == 0xbeef, "Error Number is not 0xbeef, got 0x%04lx.\n", x); CHECK_CALLED(GetExceptionInfo); hr = IScriptError_get_Source(error, &str); - ok(hr == S_OK, "IScriptError_get_Source failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptError_get_Source failed: 0x%08lx.\n", hr); ok(!lstrcmpW(str, L"source"), "Error Source is wrong, got %s.\n", wine_dbgstr_w(str)); SysFreeString(str); hr = IScriptError_get_Description(error, &str); - ok(hr == S_OK, "IScriptError_get_Description failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptError_get_Description failed: 0x%08lx.\n", hr); ok(str == NULL, "Error Description is not (null), got %s.\n", wine_dbgstr_w(str)); SET_EXPECT(GetSourceLineText); hr = IScriptError_get_Text(error, &str); - ok(hr == S_OK, "IScriptError_get_Text failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptError_get_Text failed: 0x%08lx.\n", hr); ok(!lstrcmpW(str, L"source line"), "Error Text is wrong, got %s.\n", wine_dbgstr_w(str)); SysFreeString(str); CHECK_CALLED(GetSourceLineText); SET_EXPECT(GetSourcePosition); hr = IScriptError_get_Line(error, &x); - ok(hr == S_OK, "IScriptError_get_Line failed: 0x%08x.\n", hr); - ok(x == 42, "Error Line is not 42, got %d.\n", x); + ok(hr == S_OK, "IScriptError_get_Line failed: 0x%08lx.\n", hr); + ok(x == 42, "Error Line is not 42, got %ld.\n", x); CHECK_CALLED(GetSourcePosition); hr = IScriptError_get_Column(error, &x); - ok(hr == S_OK, "IScriptError_get_Column failed: 0x%08x.\n", hr); - ok(x == 10, "Error Column is not 10, got %d.\n", x); + ok(hr == S_OK, "IScriptError_get_Column failed: 0x%08lx.\n", hr); + ok(x == 10, "Error Column is not 10, got %ld.\n", x); IActiveScriptSite_Release(site); @@ -3858,18 +3858,18 @@ static void test_IScriptControl_get_CodeObject(void) hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); - ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08lx.\n", hr); hr = IScriptControl_get_CodeObject(sc, &disp); - ok(hr == E_FAIL, "IScriptControl_get_CodeObject returned: 0x%08x.\n", hr); + ok(hr == E_FAIL, "IScriptControl_get_CodeObject returned: 0x%08lx.\n", hr); str = SysAllocString(L"jscript"); hr = IScriptControl_put_Language(sc, str); - ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08lx.\n", hr); SysFreeString(str); hr = IScriptControl_get_CodeObject(sc, &disp); - ok(hr == S_OK, "IScriptControl_get_CodeObject failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_get_CodeObject failed: 0x%08lx.\n", hr); IDispatch_Release(disp); IScriptControl_Release(sc); @@ -3878,7 +3878,7 @@ static void test_IScriptControl_get_CodeObject(void) { hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); - ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08lx.\n", hr); SET_EXPECT(CreateInstance); SET_EXPECT(SetInterfaceSafetyOptions); @@ -3888,7 +3888,7 @@ static void test_IScriptControl_get_CodeObject(void) str = SysAllocString(L"testscript"); hr = IScriptControl_put_Language(sc, str); - ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08lx.\n", hr); SysFreeString(str); CHECK_CALLED(CreateInstance); @@ -3901,7 +3901,7 @@ static void test_IScriptControl_get_CodeObject(void) SET_EXPECT(SetScriptState_STARTED); SET_EXPECT(GetScriptDispatch); hr = IScriptControl_get_CodeObject(sc, &disp); - ok(hr == S_OK, "IScriptControl_get_CodeObject failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_get_CodeObject failed: 0x%08lx.\n", hr); ok(disp == (IDispatch*)&DispatchEx, "unexpected code object %p\n", disp); CHECK_CALLED(GetScriptDispatch); CHECK_CALLED(SetScriptState_STARTED); @@ -3932,31 +3932,31 @@ static void test_IScriptControl_get_Procedures(void) hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); - ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08lx.\n", hr); hr = IScriptControl_get_Procedures(sc, &procs); - ok(hr == E_FAIL, "IScriptControl_get_Procedures returned: 0x%08x.\n", hr); + ok(hr == E_FAIL, "IScriptControl_get_Procedures returned: 0x%08lx.\n", hr); str = SysAllocString(L"jscript"); hr = IScriptControl_put_Language(sc, str); - ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08lx.\n", hr); SysFreeString(str); hr = IScriptControl_get_Procedures(sc, &procs); - ok(hr == S_OK, "IScriptControl_get_Procedures failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_get_Procedures failed: 0x%08lx.\n", hr); hr = IScriptProcedureCollection_get_Count(procs, NULL); - ok(hr == E_POINTER, "IScriptProcedureCollection_get_Count returned: 0x%08x.\n", hr); + ok(hr == E_POINTER, "IScriptProcedureCollection_get_Count returned: 0x%08lx.\n", hr); hr = IScriptProcedureCollection_get_Count(procs, &count); - ok(hr == S_OK, "IScriptProcedureCollection_get_Count failed: 0x%08x.\n", hr); - ok(count == 0, "count is not 0, got %d.\n", count); + ok(hr == S_OK, "IScriptProcedureCollection_get_Count failed: 0x%08lx.\n", hr); + ok(count == 0, "count is not 0, got %ld.\n", count); V_VT(&var) = VT_I4; V_I4(&var) = -1; hr = IScriptProcedureCollection_get_Item(procs, var, NULL); - ok(hr == E_POINTER, "IScriptProcedureCollection_get_Item returned: 0x%08x.\n", hr); + ok(hr == E_POINTER, "IScriptProcedureCollection_get_Item returned: 0x%08lx.\n", hr); hr = IScriptProcedureCollection_get_Item(procs, var, &proc); - ok(hr == 0x800a0009, "IScriptProcedureCollection_get_Item returned: 0x%08x.\n", hr); + ok(hr == 0x800a0009, "IScriptProcedureCollection_get_Item returned: 0x%08lx.\n", hr); str = SysAllocString(L"" "function add(a, b) { return a + b; }\n" @@ -3964,70 +3964,70 @@ static void test_IScriptControl_get_Procedures(void) "function muladd(a, b, c) { return a * b + c; }\n" ); hr = IScriptControl_AddCode(sc, str); - ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08lx.\n", hr); CHECK_ERROR(sc, 0); SysFreeString(str); hr = IScriptProcedureCollection_get_Count(procs, &count); - ok(hr == S_OK, "IScriptProcedureCollection_get_Count failed: 0x%08x.\n", hr); - ok(count == 3, "count is not 3, got %d.\n", count); + ok(hr == S_OK, "IScriptProcedureCollection_get_Count failed: 0x%08lx.\n", hr); + ok(count == 3, "count is not 3, got %ld.\n", count); V_VT(&var) = VT_I4; V_I4(&var) = 1; IScriptProcedureCollection_AddRef(procs); i = IScriptProcedureCollection_Release(procs); hr = IScriptProcedureCollection_get_Item(procs, var, &proc); - ok(hr == S_OK, "IScriptProcedureCollection_get_Item failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptProcedureCollection_get_Item failed: 0x%08lx.\n", hr); IScriptProcedureCollection_AddRef(procs); ok(i == IScriptProcedureCollection_Release(procs), "IScriptProcedureCollection_get_Item should not have added a ref to the collection.\n"); hr = IScriptProcedure_get_Name(proc, NULL); - ok(hr == E_POINTER, "IScriptProcedure_get_Name returned: 0x%08x.\n", hr); + ok(hr == E_POINTER, "IScriptProcedure_get_Name returned: 0x%08lx.\n", hr); hr = IScriptProcedure_get_Name(proc, &str); - ok(hr == S_OK, "IScriptProcedure_get_Name failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptProcedure_get_Name failed: 0x%08lx.\n", hr); ok(!lstrcmpW(str, L"add"), "Wrong name, got %s.\n", wine_dbgstr_w(str)); SysFreeString(str); hr = IScriptProcedure_get_NumArgs(proc, NULL); - ok(hr == E_POINTER, "IScriptProcedure_get_NumArgs returned: 0x%08x.\n", hr); + ok(hr == E_POINTER, "IScriptProcedure_get_NumArgs returned: 0x%08lx.\n", hr); hr = IScriptProcedure_get_NumArgs(proc, &count); - ok(hr == S_OK, "IScriptProcedure_get_NumArgs failed: 0x%08x.\n", hr); - ok(count == 2, "Wrong NumArgs, got %d.\n", count); + ok(hr == S_OK, "IScriptProcedure_get_NumArgs failed: 0x%08lx.\n", hr); + ok(count == 2, "Wrong NumArgs, got %ld.\n", count); hr = IScriptProcedure_get_HasReturnValue(proc, NULL); - ok(hr == E_POINTER, "IScriptProcedure_get_HasReturnValue returned: 0x%08x.\n", hr); + ok(hr == E_POINTER, "IScriptProcedure_get_HasReturnValue returned: 0x%08lx.\n", hr); hr = IScriptProcedure_get_HasReturnValue(proc, &vbool); - ok(hr == S_OK, "IScriptProcedure_get_HasReturnValue failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptProcedure_get_HasReturnValue failed: 0x%08lx.\n", hr); ok(vbool == VARIANT_TRUE, "HasReturnValue did not return True, got %x.\n", vbool); IScriptProcedure_Release(proc); V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(L"Nop"); hr = IScriptProcedureCollection_get_Item(procs, var, &proc); - ok(hr == S_OK, "IScriptProcedureCollection_get_Item failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptProcedureCollection_get_Item failed: 0x%08lx.\n", hr); ok(V_VT(&var) == VT_BSTR, "var type not BSTR, got %d.\n", V_VT(&var)); VariantClear(&var); hr = IScriptProcedure_get_Name(proc, &str); - ok(hr == S_OK, "IScriptProcedure_get_Name failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptProcedure_get_Name failed: 0x%08lx.\n", hr); ok(!lstrcmpW(str, L"nop"), "Wrong name, got %s.\n", wine_dbgstr_w(str)); SysFreeString(str); hr = IScriptProcedure_get_NumArgs(proc, &count); - ok(hr == S_OK, "IScriptProcedure_get_NumArgs failed: 0x%08x.\n", hr); - ok(count == 1, "Wrong NumArgs, got %d.\n", count); + ok(hr == S_OK, "IScriptProcedure_get_NumArgs failed: 0x%08lx.\n", hr); + ok(count == 1, "Wrong NumArgs, got %ld.\n", count); hr = IScriptProcedure_get_HasReturnValue(proc, &vbool); - ok(hr == S_OK, "IScriptProcedure_get_HasReturnValue failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptProcedure_get_HasReturnValue failed: 0x%08lx.\n", hr); ok(vbool == VARIANT_TRUE, "HasReturnValue did not return True, got %x.\n", vbool); IScriptProcedure_Release(proc); V_VT(&var) = VT_R8; V_R8(&var) = 3.0; hr = IScriptProcedureCollection_get_Item(procs, var, &proc); - ok(hr == S_OK, "IScriptProcedureCollection_get_Item failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptProcedureCollection_get_Item failed: 0x%08lx.\n", hr); hr = IScriptProcedure_get_Name(proc, &str); - ok(hr == S_OK, "IScriptProcedure_get_Name failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptProcedure_get_Name failed: 0x%08lx.\n", hr); ok(!lstrcmpW(str, L"muladd"), "Wrong name, got %s.\n", wine_dbgstr_w(str)); SysFreeString(str); hr = IScriptProcedure_get_NumArgs(proc, &count); - ok(hr == S_OK, "IScriptProcedure_get_NumArgs failed: 0x%08x.\n", hr); - ok(count == 3, "Wrong NumArgs, got %d.\n", count); + ok(hr == S_OK, "IScriptProcedure_get_NumArgs failed: 0x%08lx.\n", hr); + ok(count == 3, "Wrong NumArgs, got %ld.\n", count); IScriptProcedure_Release(proc); IScriptProcedureCollection_Release(procs); @@ -4037,7 +4037,7 @@ static void test_IScriptControl_get_Procedures(void) { hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IScriptControl, (void**)&sc); - ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08lx.\n", hr); SET_EXPECT(CreateInstance); SET_EXPECT(SetInterfaceSafetyOptions); @@ -4047,7 +4047,7 @@ static void test_IScriptControl_get_Procedures(void) str = SysAllocString(L"testscript"); hr = IScriptControl_put_Language(sc, str); - ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08lx.\n", hr); SysFreeString(str); CHECK_CALLED(CreateInstance); @@ -4057,9 +4057,9 @@ static void test_IScriptControl_get_Procedures(void) CHECK_CALLED(InitNew); hr = IScriptControl_get_Procedures(sc, &procs); - ok(hr == S_OK, "IScriptControl_get_Procedures failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_get_Procedures failed: 0x%08lx.\n", hr); hr = IScriptControl_get_Procedures(sc, &procs2); - ok(hr == S_OK, "IScriptControl_get_Procedures failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_get_Procedures failed: 0x%08lx.\n", hr); ok(procs == procs2, "Procedure collections are not the same (%p vs %p).\n", procs, procs2); IScriptProcedureCollection_Release(procs2); @@ -4071,8 +4071,8 @@ static void test_IScriptControl_get_Procedures(void) SET_EXPECT(ReleaseTypeAttr); TypeInfo_GetTypeAttr_cFuncs = 1337; hr = IScriptProcedureCollection_get_Count(procs, &count); - ok(hr == S_OK, "IScriptProcedureCollection_get_Count failed: 0x%08x.\n", hr); - ok(count == 1337, "count is not 1337, got %d.\n", count); + ok(hr == S_OK, "IScriptProcedureCollection_get_Count failed: 0x%08lx.\n", hr); + ok(count == 1337, "count is not 1337, got %ld.\n", count); CHECK_CALLED(SetScriptState_STARTED); CHECK_CALLED(GetScriptDispatch); CHECK_CALLED(GetTypeInfo); @@ -4081,19 +4081,19 @@ static void test_IScriptControl_get_Procedures(void) TypeInfo_GetTypeAttr_cFuncs = ARRAY_SIZE(custom_engine_funcs); count = 0; hr = IScriptProcedureCollection_get_Count(procs, &count); - ok(hr == S_OK, "IScriptProcedureCollection_get_Count failed: 0x%08x.\n", hr); - ok(count == 1337, "count is not 1337, got %d.\n", count); + ok(hr == S_OK, "IScriptProcedureCollection_get_Count failed: 0x%08lx.\n", hr); + ok(count == 1337, "count is not 1337, got %ld.\n", count); /* Reload the collection to update the cached function count */ IScriptProcedureCollection_Release(procs); hr = IScriptControl_get_Procedures(sc, &procs); - ok(hr == S_OK, "IScriptControl_get_Procedures failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_get_Procedures failed: 0x%08lx.\n", hr); count = 0; SET_EXPECT(GetTypeAttr); SET_EXPECT(ReleaseTypeAttr); hr = IScriptProcedureCollection_get_Count(procs, &count); - ok(hr == S_OK, "IScriptProcedureCollection_get_Count failed: 0x%08x.\n", hr); - ok(count == ARRAY_SIZE(custom_engine_funcs), "count is not %u, got %d.\n", TypeInfo_GetTypeAttr_cFuncs, count); + ok(hr == S_OK, "IScriptProcedureCollection_get_Count failed: 0x%08lx.\n", hr); + ok(count == ARRAY_SIZE(custom_engine_funcs), "count is not %u, got %ld.\n", TypeInfo_GetTypeAttr_cFuncs, count); CHECK_CALLED(GetTypeAttr); CHECK_CALLED(ReleaseTypeAttr); @@ -4103,7 +4103,7 @@ static void test_IScriptControl_get_Procedures(void) parse_flags = SCRIPTTEXT_ISVISIBLE; str = SysAllocString(L" "); hr = IScriptControl_AddCode(sc, str); - ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08lx.\n", hr); SysFreeString(str); CHECK_ERROR(sc, 0); CHECK_CALLED(ParseScriptText); @@ -4114,8 +4114,8 @@ static void test_IScriptControl_get_Procedures(void) SET_EXPECT(GetTypeAttr); SET_EXPECT(ReleaseTypeAttr); hr = IScriptProcedureCollection_get_Count(procs, &count); - ok(hr == S_OK, "IScriptProcedureCollection_get_Count failed: 0x%08x.\n", hr); - ok(count == ARRAY_SIZE(custom_engine_funcs), "count is not %u, got %d.\n", TypeInfo_GetTypeAttr_cFuncs, count); + ok(hr == S_OK, "IScriptProcedureCollection_get_Count failed: 0x%08lx.\n", hr); + ok(count == ARRAY_SIZE(custom_engine_funcs), "count is not %u, got %ld.\n", TypeInfo_GetTypeAttr_cFuncs, count); CHECK_CALLED(GetScriptDispatch); CHECK_CALLED(GetTypeInfo); CHECK_CALLED(GetTypeAttr); @@ -4127,8 +4127,8 @@ static void test_IScriptControl_get_Procedures(void) CHECK_CALLED(SetScriptState_INITIALIZED); count = 0; hr = IScriptProcedureCollection_get_Count(procs, &count); - ok(hr == S_OK, "IScriptProcedureCollection_get_Count failed: 0x%08x.\n", hr); - ok(count == ARRAY_SIZE(custom_engine_funcs), "count is not %u, got %d.\n", TypeInfo_GetTypeAttr_cFuncs, count); + ok(hr == S_OK, "IScriptProcedureCollection_get_Count failed: 0x%08lx.\n", hr); + ok(count == ARRAY_SIZE(custom_engine_funcs), "count is not %u, got %ld.\n", TypeInfo_GetTypeAttr_cFuncs, count); /* Try without ITypeComp interface */ SET_EXPECT(SetScriptState_STARTED); @@ -4138,7 +4138,7 @@ static void test_IScriptControl_get_Procedures(void) V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(L"foobar"); hr = IScriptProcedureCollection_get_Item(procs, var, &proc); - ok(hr == E_NOINTERFACE, "IScriptProcedureCollection_get_Item returned: 0x%08x.\n", hr); + ok(hr == E_NOINTERFACE, "IScriptProcedureCollection_get_Item returned: 0x%08lx.\n", hr); ok(V_VT(&var) == VT_BSTR, "var type not BSTR, got %d.\n", V_VT(&var)); VariantClear(&var); CHECK_CALLED(SetScriptState_STARTED); @@ -4148,8 +4148,8 @@ static void test_IScriptControl_get_Procedures(void) count = 0; hr = IScriptProcedureCollection_get_Count(procs, &count); - ok(hr == S_OK, "IScriptProcedureCollection_get_Count failed: 0x%08x.\n", hr); - ok(count == ARRAY_SIZE(custom_engine_funcs), "count is not %u, got %d.\n", TypeInfo_GetTypeAttr_cFuncs, count); + ok(hr == S_OK, "IScriptProcedureCollection_get_Count failed: 0x%08lx.\n", hr); + ok(count == ARRAY_SIZE(custom_engine_funcs), "count is not %u, got %ld.\n", TypeInfo_GetTypeAttr_cFuncs, count); /* Make ITypeComp available */ TypeComp_available = TRUE; @@ -4158,7 +4158,7 @@ static void test_IScriptControl_get_Procedures(void) V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(L"type_mismatch"); hr = IScriptProcedureCollection_get_Item(procs, var, &proc); - ok(hr == TYPE_E_TYPEMISMATCH, "IScriptProcedureCollection_get_Item returned: 0x%08x.\n", hr); + ok(hr == TYPE_E_TYPEMISMATCH, "IScriptProcedureCollection_get_Item returned: 0x%08lx.\n", hr); VariantClear(&var); CHECK_CALLED(QI_ITypeComp); CHECK_CALLED(Bind); @@ -4168,7 +4168,7 @@ static void test_IScriptControl_get_Procedures(void) V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(L"not_found"); hr = IScriptProcedureCollection_get_Item(procs, var, &proc); - ok(hr == CTL_E_ILLEGALFUNCTIONCALL, "IScriptProcedureCollection_get_Item failed: 0x%08x.\n", hr); + ok(hr == CTL_E_ILLEGALFUNCTIONCALL, "IScriptProcedureCollection_get_Item failed: 0x%08lx.\n", hr); VariantClear(&var); CHECK_CALLED(Bind); @@ -4177,7 +4177,7 @@ static void test_IScriptControl_get_Procedures(void) V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(L"variable"); hr = IScriptProcedureCollection_get_Item(procs, var, &proc); - ok(hr == CTL_E_ILLEGALFUNCTIONCALL, "IScriptProcedureCollection_get_Item failed: 0x%08x.\n", hr); + ok(hr == CTL_E_ILLEGALFUNCTIONCALL, "IScriptProcedureCollection_get_Item failed: 0x%08lx.\n", hr); VariantClear(&var); CHECK_CALLED(Bind); CHECK_CALLED(ReleaseVarDesc); @@ -4186,53 +4186,53 @@ static void test_IScriptControl_get_Procedures(void) V_VT(&var) = VT_I4; V_I4(&var) = 0; hr = IScriptProcedureCollection_get_Item(procs, var, &proc); - ok(hr == 0x800a0009, "IScriptProcedureCollection_get_Item returned: 0x%08x.\n", hr); + ok(hr == 0x800a0009, "IScriptProcedureCollection_get_Item returned: 0x%08lx.\n", hr); V_I4(&var) = -1; hr = IScriptProcedureCollection_get_Item(procs, var, &proc); - ok(hr == 0x800a0009, "IScriptProcedureCollection_get_Item returned: 0x%08x.\n", hr); + ok(hr == 0x800a0009, "IScriptProcedureCollection_get_Item returned: 0x%08lx.\n", hr); SET_EXPECT(GetFuncDesc); V_I4(&var) = 1337; hr = IScriptProcedureCollection_get_Item(procs, var, &proc); - ok(hr == E_INVALIDARG, "IScriptProcedureCollection_get_Item returned: 0x%08x.\n", hr); + ok(hr == E_INVALIDARG, "IScriptProcedureCollection_get_Item returned: 0x%08lx.\n", hr); CHECK_CALLED(GetFuncDesc); /* _NewEnum never caches the function count */ hr = IScriptProcedureCollection_get__NewEnum(procs, NULL); - ok(hr == E_POINTER, "IScriptProcedureCollection_get__NewEnum returned: 0x%08x.\n", hr); + ok(hr == E_POINTER, "IScriptProcedureCollection_get__NewEnum returned: 0x%08lx.\n", hr); SET_EXPECT(GetTypeAttr); SET_EXPECT(ReleaseTypeAttr); hr = IScriptProcedureCollection_get__NewEnum(procs, &unknown); - ok(hr == S_OK, "IScriptProcedureCollection_get__NewEnum failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptProcedureCollection_get__NewEnum failed: 0x%08lx.\n", hr); CHECK_CALLED(GetTypeAttr); CHECK_CALLED(ReleaseTypeAttr); hr = IUnknown_QueryInterface(unknown, &IID_IEnumVARIANT, (void**)&enumvar); - ok(hr == S_OK, "Failed to query for IEnumVARIANT: 0x%08x.\n", hr); + ok(hr == S_OK, "Failed to query for IEnumVARIANT: 0x%08lx.\n", hr); ok((char*)unknown == (char*)enumvar, "unknown and enumvar are not the same (%p vs %p).\n", unknown, enumvar); IEnumVARIANT_Release(enumvar); IUnknown_Release(unknown); SET_EXPECT(GetTypeAttr); SET_EXPECT(ReleaseTypeAttr); hr = IScriptProcedureCollection_get__NewEnum(procs, &unknown); - ok(hr == S_OK, "IScriptProcedureCollection_get__NewEnum failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IScriptProcedureCollection_get__NewEnum failed: 0x%08lx.\n", hr); CHECK_CALLED(GetTypeAttr); CHECK_CALLED(ReleaseTypeAttr); hr = IUnknown_QueryInterface(unknown, &IID_IEnumVARIANT, (void**)&enumvar); - ok(hr == S_OK, "Failed to query for IEnumVARIANT: 0x%08x.\n", hr); + ok(hr == S_OK, "Failed to query for IEnumVARIANT: 0x%08lx.\n", hr); IUnknown_Release(unknown); fetched = 0xdeadbeef; hr = IEnumVARIANT_Next(enumvar, 0, NULL, NULL); - ok(hr == E_POINTER, "IEnumVARIANT_Next returned: 0x%08x.\n", hr); + ok(hr == E_POINTER, "IEnumVARIANT_Next returned: 0x%08lx.\n", hr); hr = IEnumVARIANT_Next(enumvar, 0, NULL, &fetched); - ok(hr == E_POINTER, "IEnumVARIANT_Next failed: 0x%08x.\n", hr); - ok(fetched == 0xdeadbeef, "got %u.\n", fetched); + ok(hr == E_POINTER, "IEnumVARIANT_Next failed: 0x%08lx.\n", hr); + ok(fetched == 0xdeadbeef, "got %lu.\n", fetched); hr = IEnumVARIANT_Next(enumvar, 0, &var, &fetched); - ok(hr == S_OK, "IEnumVARIANT_Next returned: 0x%08x.\n", hr); - ok(fetched == 0, "got %u.\n", fetched); + ok(hr == S_OK, "IEnumVARIANT_Next returned: 0x%08lx.\n", hr); + ok(fetched == 0, "got %lu.\n", fetched); hr = IEnumVARIANT_Next(enumvar, 0, &var, NULL); - ok(hr == S_OK, "IEnumVARIANT_Next returned: 0x%08x.\n", hr); + ok(hr == S_OK, "IEnumVARIANT_Next returned: 0x%08lx.\n", hr); hr = IEnumVARIANT_Clone(enumvar, NULL); - ok(hr == E_POINTER, "IEnumVARIANT_Clone failed: 0x%08x.\n", hr); + ok(hr == E_POINTER, "IEnumVARIANT_Clone failed: 0x%08lx.\n", hr); for (i = 0; i < ARRAY_SIZE(custom_engine_funcs); i++) { @@ -4243,7 +4243,7 @@ static void test_IScriptControl_get_Procedures(void) V_VT(&var) = VT_R4; V_R4(&var) = i + 1; hr = IScriptProcedureCollection_get_Item(procs, var, &proc); - ok(hr == S_OK, "get_Item for index %u failed: 0x%08x.\n", i, hr); + ok(hr == S_OK, "get_Item for index %u failed: 0x%08lx.\n", i, hr); CHECK_CALLED(GetFuncDesc); CHECK_CALLED(GetNames); CHECK_CALLED(ReleaseFuncDesc); @@ -4252,7 +4252,7 @@ static void test_IScriptControl_get_Procedures(void) V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(custom_engine_funcs[i].name); hr = IScriptProcedureCollection_get_Item(procs, var, &proc2); - ok(hr == S_OK, "get_Item for %s failed: 0x%08x.\n", wine_dbgstr_w(custom_engine_funcs[i].name), hr); + ok(hr == S_OK, "get_Item for %s failed: 0x%08lx.\n", wine_dbgstr_w(custom_engine_funcs[i].name), hr); ok(proc == proc2, "proc and proc2 are not the same for %s and index %u.\n", wine_dbgstr_w(custom_engine_funcs[i].name), i + 1); IScriptProcedure_Release(proc); @@ -4263,7 +4263,7 @@ static void test_IScriptControl_get_Procedures(void) SET_EXPECT(GetNames); SET_EXPECT(ReleaseFuncDesc); hr = IScriptProcedureCollection_get_Item(procs, var, &proc); - ok(hr == S_OK, "get_Item for %s failed: 0x%08x.\n", wine_dbgstr_w(custom_engine_funcs[i].name), hr); + ok(hr == S_OK, "get_Item for %s failed: 0x%08lx.\n", wine_dbgstr_w(custom_engine_funcs[i].name), hr); VariantClear(&var); CHECK_CALLED(Bind); CHECK_CALLED(GetNames); @@ -4274,14 +4274,14 @@ static void test_IScriptControl_get_Procedures(void) SET_EXPECT(GetNames); SET_EXPECT(ReleaseFuncDesc); hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); - ok(hr == S_OK, "IEnumVARIANT_Next for index %u failed: 0x%08x.\n", i, hr); - ok(fetched == 1, "got %u.\n", fetched); + ok(hr == S_OK, "IEnumVARIANT_Next for index %u failed: 0x%08lx.\n", i, hr); + ok(fetched == 1, "got %lu.\n", fetched); ok(V_VT(&var) == VT_DISPATCH, "V_VT(var) = %d.\n", V_VT(&var)); CHECK_CALLED(GetFuncDesc); CHECK_CALLED(GetNames); CHECK_CALLED(ReleaseFuncDesc); hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IScriptProcedure, (void**)&proc2); - ok(hr == S_OK, "Failed to query IScriptProcedure for index %u: 0x%08x.\n", i, hr); + ok(hr == S_OK, "Failed to query IScriptProcedure for index %u: 0x%08lx.\n", i, hr); VariantClear(&var); ok(proc == proc2, "proc and proc2 are not the same for %s and enum index %u.\n", @@ -4290,16 +4290,16 @@ static void test_IScriptControl_get_Procedures(void) /* Verify the properties */ hr = IScriptProcedure_get_Name(proc, &str); - ok(hr == S_OK, "get_Name for %s failed: 0x%08x.\n", wine_dbgstr_w(custom_engine_funcs[i].name), hr); + ok(hr == S_OK, "get_Name for %s failed: 0x%08lx.\n", wine_dbgstr_w(custom_engine_funcs[i].name), hr); ok(!lstrcmpW(str, custom_engine_funcs[i].name), "Name is not %s, got %s.\n", wine_dbgstr_w(custom_engine_funcs[i].name), wine_dbgstr_w(str)); SysFreeString(str); hr = IScriptProcedure_get_NumArgs(proc, &count); - ok(hr == S_OK, "get_NumArgs for %s failed: 0x%08x.\n", wine_dbgstr_w(custom_engine_funcs[i].name), hr); + ok(hr == S_OK, "get_NumArgs for %s failed: 0x%08lx.\n", wine_dbgstr_w(custom_engine_funcs[i].name), hr); ok(count == custom_engine_funcs[i].num_args + custom_engine_funcs[i].num_opt_args, - "NumArgs is not %d, got %d.\n", custom_engine_funcs[i].num_args + custom_engine_funcs[i].num_opt_args, count); + "NumArgs is not %d, got %ld.\n", custom_engine_funcs[i].num_args + custom_engine_funcs[i].num_opt_args, count); hr = IScriptProcedure_get_HasReturnValue(proc, &vbool); - ok(hr == S_OK, "get_HasReturnValue for %s failed: 0x%08x.\n", wine_dbgstr_w(custom_engine_funcs[i].name), hr); + ok(hr == S_OK, "get_HasReturnValue for %s failed: 0x%08lx.\n", wine_dbgstr_w(custom_engine_funcs[i].name), hr); ok(vbool == ((custom_engine_funcs[i].ret_type == VT_VOID) ? VARIANT_FALSE : VARIANT_TRUE), "get_HasReturnValue for %s returned %x.\n", wine_dbgstr_w(custom_engine_funcs[i].name), vbool); @@ -4307,22 +4307,22 @@ static void test_IScriptControl_get_Procedures(void) } hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); - ok(hr == S_FALSE, "IEnumVARIANT_Next failed: 0x%08x.\n", hr); - ok(fetched == 0, "got %u.\n", fetched); + ok(hr == S_FALSE, "IEnumVARIANT_Next failed: 0x%08lx.\n", hr); + ok(fetched == 0, "got %lu.\n", fetched); hr = IEnumVARIANT_Skip(enumvar, 0); - ok(hr == S_OK, "IEnumVARIANT_Skip failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IEnumVARIANT_Skip failed: 0x%08lx.\n", hr); hr = IEnumVARIANT_Skip(enumvar, 1); - ok(hr == S_FALSE, "IEnumVARIANT_Skip failed: 0x%08x.\n", hr); + ok(hr == S_FALSE, "IEnumVARIANT_Skip failed: 0x%08lx.\n", hr); hr = IEnumVARIANT_Reset(enumvar); - ok(hr == S_OK, "IEnumVARIANT_Reset failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IEnumVARIANT_Reset failed: 0x%08lx.\n", hr); hr = IEnumVARIANT_Skip(enumvar, ARRAY_SIZE(custom_engine_funcs) - 1); - ok(hr == S_OK, "IEnumVARIANT_Skip failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IEnumVARIANT_Skip failed: 0x%08lx.\n", hr); hr = IEnumVARIANT_Clone(enumvar, &enumvar2); - ok(hr == S_OK, "IEnumVARIANT_Clone failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IEnumVARIANT_Clone failed: 0x%08lx.\n", hr); hr = IEnumVARIANT_Skip(enumvar2, 1); - ok(hr == S_OK, "IEnumVARIANT_Skip failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IEnumVARIANT_Skip failed: 0x%08lx.\n", hr); hr = IEnumVARIANT_Skip(enumvar2, 1); - ok(hr == S_FALSE, "IEnumVARIANT_Skip failed: 0x%08x.\n", hr); + ok(hr == S_FALSE, "IEnumVARIANT_Skip failed: 0x%08lx.\n", hr); IEnumVARIANT_Release(enumvar2); IEnumVARIANT_Release(enumvar); @@ -4345,7 +4345,7 @@ START_TEST(msscript) hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IUnknown, (void**)&unk); if (FAILED(hr)) { - win_skip("Could not create ScriptControl object: %08x\n", hr); + win_skip("Could not create ScriptControl object: %08lx\n", hr); return; } IUnknown_Release(unk);
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mstask/tests/Makefile.in | 1 dlls/mstask/tests/task.c | 214 ++++++++++++++++++----------------- dlls/mstask/tests/task_scheduler.c | 132 +++++++++++----------- dlls/mstask/tests/task_trigger.c | 220 ++++++++++++++++++------------------ 4 files changed, 283 insertions(+), 284 deletions(-) diff --git a/dlls/mstask/tests/Makefile.in b/dlls/mstask/tests/Makefile.in index daaf63abdef..ad5d7d683fa 100644 --- a/dlls/mstask/tests/Makefile.in +++ b/dlls/mstask/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mstask.dll IMPORTS = ole32 user32 diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 0c7f85394ea..e79a1c44687 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -66,7 +66,7 @@ static void test_SetApplicationName_GetApplicationName(void) /* Attempt getting before setting application name */ hres = ITask_GetApplicationName(test_task, &stored_name); - ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); + ok(hres == S_OK, "GetApplicationName failed: %08lx\n", hres); if (hres == S_OK) { ok(!lstrcmpiW(stored_name, empty), @@ -77,10 +77,10 @@ static void test_SetApplicationName_GetApplicationName(void) /* Set application name to a nonexistent application and then get * the application name that is actually stored */ hres = ITask_SetApplicationName(test_task, non_application_name); - ok(hres == S_OK, "Failed setting name %s: %08x\n", + ok(hres == S_OK, "Failed setting name %s: %08lx\n", wine_dbgstr_w(non_application_name), hres); hres = ITask_GetApplicationName(test_task, &stored_name); - ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); + ok(hres == S_OK, "GetApplicationName failed: %08lx\n", hres); if (hres == S_OK) { full_name = path_resolve_name(non_application_name); @@ -92,10 +92,10 @@ static void test_SetApplicationName_GetApplicationName(void) /* Set a valid application name with program type extension and then * get the stored name */ hres = ITask_SetApplicationName(test_task, notepad_exe); - ok(hres == S_OK, "Failed setting name %s: %08x\n", + ok(hres == S_OK, "Failed setting name %s: %08lx\n", wine_dbgstr_w(notepad_exe), hres); hres = ITask_GetApplicationName(test_task, &stored_name); - ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); + ok(hres == S_OK, "GetApplicationName failed: %08lx\n", hres); if (hres == S_OK) { full_name = path_resolve_name(notepad_exe); @@ -107,9 +107,9 @@ static void test_SetApplicationName_GetApplicationName(void) /* Set a valid application name without program type extension and * then get the stored name */ hres = ITask_SetApplicationName(test_task, notepad); - ok(hres == S_OK, "Failed setting name %s: %08x\n", wine_dbgstr_w(notepad), hres); + ok(hres == S_OK, "Failed setting name %s: %08lx\n", wine_dbgstr_w(notepad), hres); hres = ITask_GetApplicationName(test_task, &stored_name); - ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); + ok(hres == S_OK, "GetApplicationName failed: %08lx\n", hres); if (hres == S_OK) { full_name = path_resolve_name(notepad_exe); /* XP SP1 appends .exe */ @@ -126,10 +126,10 @@ static void test_SetApplicationName_GetApplicationName(void) * to a nonexistent application and then get the name that is * actually stored */ hres = ITask_SetApplicationName(test_task, non_application_name); - ok(hres == S_OK, "Failed setting name %s: %08x\n", + ok(hres == S_OK, "Failed setting name %s: %08lx\n", wine_dbgstr_w(non_application_name), hres); hres = ITask_GetApplicationName(test_task, &stored_name); - ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); + ok(hres == S_OK, "GetApplicationName failed: %08lx\n", hres); if (hres == S_OK) { full_name = path_resolve_name(non_application_name); @@ -140,9 +140,9 @@ static void test_SetApplicationName_GetApplicationName(void) /* Clear application name */ hres = ITask_SetApplicationName(test_task, empty); - ok(hres == S_OK, "Failed setting name %s: %08x\n", wine_dbgstr_w(empty), hres); + ok(hres == S_OK, "Failed setting name %s: %08lx\n", wine_dbgstr_w(empty), hres); hres = ITask_GetApplicationName(test_task, &stored_name); - ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); + ok(hres == S_OK, "GetApplicationName failed: %08lx\n", hres); if (hres == S_OK) { ok(!lstrcmpiW(stored_name, empty), @@ -165,7 +165,7 @@ static void test_CreateTrigger(void) ok(hres == S_OK, "Failed to setup test_task\n"); hres = ITask_CreateTrigger(test_task, &trigger_index, &test_trigger); - ok(hres == S_OK, "Failed to create trigger: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to create trigger: 0x%08lx\n", hres); ITaskTrigger_Release(test_trigger); ITask_Release(test_task); @@ -186,7 +186,7 @@ static void test_SetParameters_GetParameters(void) /* Get parameters before setting them */ hres = ITask_GetParameters(test_task, ¶meters); - ok(hres == S_OK, "GetParameters failed: %08x\n", hres); + ok(hres == S_OK, "GetParameters failed: %08lx\n", hres); if (hres == S_OK) { ok(!lstrcmpW(parameters, empty), @@ -196,10 +196,10 @@ static void test_SetParameters_GetParameters(void) /* Set parameters to a simple string */ hres = ITask_SetParameters(test_task, parameters_a); - ok(hres == S_OK, "Failed setting parameters %s: %08x\n", + ok(hres == S_OK, "Failed setting parameters %s: %08lx\n", wine_dbgstr_w(parameters_a), hres); hres = ITask_GetParameters(test_task, ¶meters); - ok(hres == S_OK, "GetParameters failed: %08x\n", hres); + ok(hres == S_OK, "GetParameters failed: %08lx\n", hres); if (hres == S_OK) { ok(!lstrcmpW(parameters, parameters_a), "Got %s, expected %s\n", @@ -209,10 +209,10 @@ static void test_SetParameters_GetParameters(void) /* Update parameters to a different simple string */ hres = ITask_SetParameters(test_task, parameters_b); - ok(hres == S_OK, "Failed setting parameters %s: %08x\n", + ok(hres == S_OK, "Failed setting parameters %s: %08lx\n", wine_dbgstr_w(parameters_b), hres); hres = ITask_GetParameters(test_task, ¶meters); - ok(hres == S_OK, "GetParameters failed: %08x\n", hres); + ok(hres == S_OK, "GetParameters failed: %08lx\n", hres); if (hres == S_OK) { ok(!lstrcmpW(parameters, parameters_b), "Got %s, expected %s\n", @@ -222,10 +222,10 @@ static void test_SetParameters_GetParameters(void) /* Clear parameters */ hres = ITask_SetParameters(test_task, empty); - ok(hres == S_OK, "Failed setting parameters %s: %08x\n", + ok(hres == S_OK, "Failed setting parameters %s: %08lx\n", wine_dbgstr_w(empty), hres); hres = ITask_GetParameters(test_task, ¶meters); - ok(hres == S_OK, "GetParameters failed: %08x\n", hres); + ok(hres == S_OK, "GetParameters failed: %08lx\n", hres); if (hres == S_OK) { ok(!lstrcmpW(parameters, empty), @@ -251,7 +251,7 @@ static void test_SetComment_GetComment(void) /* Get comment before setting it*/ hres = ITask_GetComment(test_task, &comment); - ok(hres == S_OK, "GetComment failed: %08x\n", hres); + ok(hres == S_OK, "GetComment failed: %08lx\n", hres); if (hres == S_OK) { ok(!lstrcmpW(comment, empty), @@ -261,10 +261,10 @@ static void test_SetComment_GetComment(void) /* Set comment to a simple string */ hres = ITask_SetComment(test_task, comment_a); - ok(hres == S_OK, "Failed setting comment %s: %08x\n", + ok(hres == S_OK, "Failed setting comment %s: %08lx\n", wine_dbgstr_w(comment_a), hres); hres = ITask_GetComment(test_task, &comment); - ok(hres == S_OK, "GetComment failed: %08x\n", hres); + ok(hres == S_OK, "GetComment failed: %08lx\n", hres); if (hres == S_OK) { ok(!lstrcmpW(comment, comment_a), "Got %s, expected %s\n", @@ -274,10 +274,10 @@ static void test_SetComment_GetComment(void) /* Update comment to a different simple string */ hres = ITask_SetComment(test_task, comment_b); - ok(hres == S_OK, "Failed setting comment %s: %08x\n", + ok(hres == S_OK, "Failed setting comment %s: %08lx\n", wine_dbgstr_w(comment_b), hres); hres = ITask_GetComment(test_task, &comment); - ok(hres == S_OK, "GetComment failed: %08x\n", hres); + ok(hres == S_OK, "GetComment failed: %08lx\n", hres); if (hres == S_OK) { ok(!lstrcmpW(comment, comment_b), "Got %s, expected %s\n", @@ -287,10 +287,10 @@ static void test_SetComment_GetComment(void) /* Clear comment */ hres = ITask_SetComment(test_task, empty); - ok(hres == S_OK, "Failed setting comment %s: %08x\n", + ok(hres == S_OK, "Failed setting comment %s: %08lx\n", wine_dbgstr_w(empty), hres); hres = ITask_GetComment(test_task, &comment); - ok(hres == S_OK, "GetComment failed: %08x\n", hres); + ok(hres == S_OK, "GetComment failed: %08lx\n", hres); if (hres == S_OK) { ok(!lstrcmpW(comment, empty), @@ -315,40 +315,40 @@ static void test_SetMaxRunTime_GetMaxRunTime(void) * 3 days * 24 hours * 60 minutes * 60 seconds * 1000 ms = 259200000 */ max_run_time = 0; hres = ITask_GetMaxRunTime(test_task, &max_run_time); - ok(hres == S_OK, "Failed to get max runtime: 0x%08x\n", hres); - ok(max_run_time == 259200000, "Expected 259200000: %d\n", max_run_time); + ok(hres == S_OK, "Failed to get max runtime: 0x%08lx\n", hres); + ok(max_run_time == 259200000, "Expected 259200000: %ld\n", max_run_time); /* Basic set test */ max_run_time = 0; hres = ITask_SetMaxRunTime(test_task, 1234); - ok(hres == S_OK, "Failed to set max runtime: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to set max runtime: 0x%08lx\n", hres); hres = ITask_GetMaxRunTime(test_task, &max_run_time); - ok(hres == S_OK, "Failed to get max runtime: 0x%08x\n", hres); - ok(max_run_time == 1234, "Expected 1234: %d\n", max_run_time); + ok(hres == S_OK, "Failed to get max runtime: 0x%08lx\n", hres); + ok(max_run_time == 1234, "Expected 1234: %ld\n", max_run_time); /* Verify that time can be set to zero */ max_run_time = 1; hres = ITask_SetMaxRunTime(test_task, 0); - ok(hres == S_OK, "Failed to set max runtime: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to set max runtime: 0x%08lx\n", hres); hres = ITask_GetMaxRunTime(test_task, &max_run_time); - ok(hres == S_OK, "Failed to get max runtime: 0x%08x\n", hres); - ok(max_run_time == 0, "Expected 0: %d\n", max_run_time); + ok(hres == S_OK, "Failed to get max runtime: 0x%08lx\n", hres); + ok(max_run_time == 0, "Expected 0: %ld\n", max_run_time); /* Check resolution by setting time to one */ max_run_time = 0; hres = ITask_SetMaxRunTime(test_task, 1); - ok(hres == S_OK, "Failed to set max runtime: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to set max runtime: 0x%08lx\n", hres); hres = ITask_GetMaxRunTime(test_task, &max_run_time); - ok(hres == S_OK, "Failed to get max runtime: 0x%08x\n", hres); - ok(max_run_time == 1, "Expected 1: %d\n", max_run_time); + ok(hres == S_OK, "Failed to get max runtime: 0x%08lx\n", hres); + ok(max_run_time == 1, "Expected 1: %ld\n", max_run_time); /* Verify that time can be set to INFINITE */ max_run_time = 0; hres = ITask_SetMaxRunTime(test_task, INFINITE); - ok(hres == S_OK, "Failed to set max runtime: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to set max runtime: 0x%08lx\n", hres); hres = ITask_GetMaxRunTime(test_task, &max_run_time); - ok(hres == S_OK, "Failed to get max runtime: 0x%08x\n", hres); - ok(max_run_time == INFINITE, "Expected INFINITE: %d\n", max_run_time); + ok(hres == S_OK, "Failed to get max runtime: 0x%08lx\n", hres); + ok(max_run_time == INFINITE, "Expected INFINITE: %ld\n", max_run_time); ITask_Release(test_task); } @@ -379,19 +379,19 @@ static void test_SetAccountInformation_GetAccountInformation(void) } ok(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || hres == SCHED_E_CANNOT_OPEN_TASK, - "Unset account name generated: 0x%08x\n", hres); + "Unset account name generated: 0x%08lx\n", hres); /* Attempt to set to a dummy account without a password */ /* This test passes on WinXP but fails on Win2K */ hres = ITask_SetAccountInformation(test_task, dummy_account_name, NULL); ok(hres == S_OK, - "Failed setting dummy account with no password: %08x\n", hres); + "Failed setting dummy account with no password: %08lx\n", hres); hres = ITask_GetAccountInformation(test_task, &account_name); ok(hres == S_OK || broken(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || hres == SCHED_E_CANNOT_OPEN_TASK || hres == 0x200), /* win2k */ - "GetAccountInformation failed: %08x\n", hres); + "GetAccountInformation failed: %08lx\n", hres); if (hres == S_OK) { ok(!lstrcmpW(account_name, dummy_account_name), @@ -405,13 +405,13 @@ static void test_SetAccountInformation_GetAccountInformation(void) hres = ITask_SetAccountInformation(test_task, dummy_account_name_b, dummy_account_name_b); ok(hres == S_OK, - "Failed setting dummy account with password: %08x\n", hres); + "Failed setting dummy account with password: %08lx\n", hres); hres = ITask_GetAccountInformation(test_task, &account_name); ok(hres == S_OK || broken(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || hres == SCHED_E_CANNOT_OPEN_TASK || hres == 0x200), /* win2k */ - "GetAccountInformation failed: %08x\n", hres); + "GetAccountInformation failed: %08lx\n", hres); if (hres == S_OK) { ok(!lstrcmpW(account_name, dummy_account_name_b), @@ -422,13 +422,13 @@ static void test_SetAccountInformation_GetAccountInformation(void) /* Attempt to set to the local system account */ hres = ITask_SetAccountInformation(test_task, empty, NULL); - ok(hres == S_OK, "Failed setting system account: %08x\n", hres); + ok(hres == S_OK, "Failed setting system account: %08lx\n", hres); hres = ITask_GetAccountInformation(test_task, &account_name); ok(hres == S_OK || broken(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || hres == SCHED_E_CANNOT_OPEN_TASK || hres == 0x200), /* win2k */ - "GetAccountInformation failed: %08x\n", hres); + "GetAccountInformation failed: %08lx\n", hres); if (hres == S_OK) { ok(!lstrcmpW(account_name, empty), @@ -456,36 +456,36 @@ static void test_task_state(void) flags = 0xdeadbeef; hr = ITask_GetFlags(test_task, &flags); - ok(hr == S_OK, "GetFlags error %#x\n", hr); - ok(flags == 0, "got %#x\n", flags); + ok(hr == S_OK, "GetFlags error %#lx\n", hr); + ok(flags == 0, "got %#lx\n", flags); if (0) /* crashes under Windows */ hr = ITask_GetTaskFlags(test_task, NULL); flags = 0xdeadbeef; hr = ITask_GetTaskFlags(test_task, &flags); - ok(hr == S_OK, "GetTaskFlags error %#x\n", hr); - ok(flags == 0, "got %#x\n", flags); + ok(hr == S_OK, "GetTaskFlags error %#lx\n", hr); + ok(flags == 0, "got %#lx\n", flags); if (0) /* crashes under Windows */ hr = ITask_GetStatus(test_task, NULL); status = 0xdeadbeef; hr = ITask_GetStatus(test_task, &status); - ok(hr == S_OK, "GetStatus error %#x\n", hr); - ok(status == SCHED_S_TASK_NOT_SCHEDULED, "got %#x\n", status); + ok(hr == S_OK, "GetStatus error %#lx\n", hr); + ok(status == SCHED_S_TASK_NOT_SCHEDULED, "got %#lx\n", status); if (0) /* crashes under Windows */ hr = ITask_GetErrorRetryCount(test_task, NULL); hr = ITask_GetErrorRetryCount(test_task, &val1); - ok(hr == E_NOTIMPL, "got %#x\n", hr); + ok(hr == E_NOTIMPL, "got %#lx\n", hr); if (0) /* crashes under Windows */ hr = ITask_GetErrorRetryInterval(test_task, NULL); hr = ITask_GetErrorRetryInterval(test_task, &val1); - ok(hr == E_NOTIMPL, "got %#x\n", hr); + ok(hr == E_NOTIMPL, "got %#lx\n", hr); if (0) /* crashes under Windows */ hr = ITask_GetIdleWait(test_task, NULL, NULL); @@ -493,7 +493,7 @@ static void test_task_state(void) val1 = 0xdead; val2 = 0xbeef; hr = ITask_GetIdleWait(test_task, &val1, &val2); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(val1 == 10, "got %u\n", val1); ok(val2 == 60, "got %u\n", val2); @@ -502,23 +502,23 @@ static void test_task_state(void) val = 0xdeadbeef; hr = ITask_GetPriority(test_task, &val); - ok(hr == S_OK, "got %#x\n", hr); - ok(val == NORMAL_PRIORITY_CLASS, "got %#x\n", val); + ok(hr == S_OK, "got %#lx\n", hr); + ok(val == NORMAL_PRIORITY_CLASS, "got %#lx\n", val); if (0) /* crashes under Windows */ hr = ITask_GetExitCode(test_task, NULL); val = 0xdeadbeef; hr = ITask_GetExitCode(test_task, &val); - ok(hr == SCHED_S_TASK_HAS_NOT_RUN, "got %#x\n", hr); - ok(val == 0, "got %#x\n", val); + ok(hr == SCHED_S_TASK_HAS_NOT_RUN, "got %#lx\n", hr); + ok(val == 0, "got %#lx\n", val); if (0) /* crashes under Windows */ hr = ITask_GetMostRecentRunTime(test_task, NULL); memset(&st, 0xff, sizeof(st)); hr = ITask_GetMostRecentRunTime(test_task, &st); - ok(hr == SCHED_S_TASK_HAS_NOT_RUN, "got %#x\n", hr); + ok(hr == SCHED_S_TASK_HAS_NOT_RUN, "got %#lx\n", hr); ok(st.wYear == 0, "got %u\n", st.wYear); ok(st.wMonth == 0, "got %u\n", st.wMonth); ok(st.wDay == 0, "got %u\n", st.wDay); @@ -535,10 +535,10 @@ static void save_job(ITask *task) IPersistFile *pfile; hr = ITask_QueryInterface(task, &IID_IPersistFile, (void **)&pfile); - ok(hr == S_OK, "QueryInterface error %#x\n", hr); + ok(hr == S_OK, "QueryInterface error %#lx\n", hr); hr = IPersistFile_Save(pfile, NULL, FALSE); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); IPersistFile_Release(pfile); } @@ -559,26 +559,26 @@ static void test_Run(void) hr = ITaskScheduler_NewWorkItem(scheduler, wine_test_runW, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = ITask_Run(task); - ok(hr == SCHED_E_TASK_NOT_READY, "got %#x\n", hr); + ok(hr == SCHED_E_TASK_NOT_READY, "got %#lx\n", hr); hr = ITask_Terminate(task); - ok(hr == SCHED_E_TASK_NOT_RUNNING, "got %#x\n", hr); + ok(hr == SCHED_E_TASK_NOT_RUNNING, "got %#lx\n", hr); hr = ITask_GetStatus(task, &status); - ok(hr == S_OK, "got %#x\n", hr); - ok(status == SCHED_S_TASK_NOT_SCHEDULED, "got %#x\n", status); + ok(hr == S_OK, "got %#lx\n", hr); + ok(status == SCHED_S_TASK_NOT_SCHEDULED, "got %#lx\n", status); save_job(task); hr = ITask_GetStatus(task, &status); - ok(hr == S_OK, "got %#x\n", hr); - ok(status == SCHED_S_TASK_NOT_SCHEDULED, "got %#x\n", status); + ok(hr == S_OK, "got %#lx\n", hr); + ok(status == SCHED_S_TASK_NOT_SCHEDULED, "got %#lx\n", status); hr = ITask_CreateTrigger(task, &idx, &trigger); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); memset(&trigger_data, 0, sizeof(trigger_data)); trigger_data.cbTriggerSize = sizeof(trigger_data); @@ -593,32 +593,32 @@ static void test_Run(void) trigger_data.Type.Weekly.WeeksInterval = 1; trigger_data.Type.Weekly.rgfDaysOfTheWeek = 0x7f; /* every day */ hr = ITaskTrigger_SetTrigger(trigger, &trigger_data); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ITaskTrigger_Release(trigger); hr = ITask_SetApplicationName(task, cmdW); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = ITask_SetParameters(task, empty); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = ITask_SetWorkingDirectory(task, empty); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); /* Save the task so that the Scheduler service would notice the changes */ save_job(task); hr = ITask_GetStatus(task, &status); - ok(hr == S_OK, "got %#x\n", hr); - ok(status == SCHED_S_TASK_HAS_NOT_RUN, "got %#x\n", status); + ok(hr == S_OK, "got %#lx\n", hr); + ok(status == SCHED_S_TASK_HAS_NOT_RUN, "got %#lx\n", status); hr = ITask_Run(task); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); /* According to MSDN the task status doesn't update dynamically */ hr = ITask_GetStatus(task, &status); - ok(hr == S_OK, "got %#x\n", hr); - ok(status == SCHED_S_TASK_HAS_NOT_RUN, "got %#x\n", status); + ok(hr == S_OK, "got %#lx\n", hr); + ok(status == SCHED_S_TASK_HAS_NOT_RUN, "got %#lx\n", status); ITask_Release(task); @@ -632,10 +632,10 @@ static void test_Run(void) for (i = 0; i < 5; i++) { hr = ITaskScheduler_Activate(scheduler, wine_test_runW, &IID_ITask, (IUnknown **)&task); - ok(hr == S_OK, "Activate error %#x\n", hr); + ok(hr == S_OK, "Activate error %#lx\n", hr); hr = ITask_GetStatus(task, &status); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ITask_Release(task); @@ -645,15 +645,15 @@ static void test_Run(void) } hr = ITaskScheduler_Activate(scheduler, wine_test_runW, &IID_ITask, (IUnknown **)&task); - ok(hr == S_OK, "Activate error %#x\n", hr); + ok(hr == S_OK, "Activate error %#lx\n", hr); hr = ITask_GetStatus(task, &status); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); if (status == SCHED_S_TASK_RUNNING) { hr = ITask_Terminate(task); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ITask_Release(task); @@ -667,10 +667,10 @@ static void test_Run(void) for (i = 0; i < 5; i++) { hr = ITaskScheduler_Activate(scheduler, wine_test_runW, &IID_ITask, (IUnknown **)&task); - ok(hr == S_OK, "Activate error %#x\n", hr); + ok(hr == S_OK, "Activate error %#lx\n", hr); hr = ITask_GetStatus(task, &status); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ITask_Release(task); @@ -683,7 +683,7 @@ static void test_Run(void) ITask_Release(task); hr = taskscheduler_delete(scheduler, wine_test_runW); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); } static void test_SetFlags(void) @@ -694,31 +694,31 @@ static void test_SetFlags(void) hr = ITaskScheduler_NewWorkItem(scheduler, task_name, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = ITask_SetFlags(task, 0); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); flags = 0xdeadbeef; hr = ITask_GetFlags(task, &flags); - ok(hr == S_OK, "got %#x\n", hr); - ok(flags == 0, "got %#x\n", flags); + ok(hr == S_OK, "got %#lx\n", hr); + ok(flags == 0, "got %#lx\n", flags); hr = ITask_SetFlags(task, 0xffffffff); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); flags = 0xdeadbeef; hr = ITask_GetFlags(task, &flags); - ok(hr == S_OK, "got %#x\n", hr); - ok(flags == 0x7fff, "got %#x\n", flags); + ok(hr == S_OK, "got %#lx\n", hr); + ok(flags == 0x7fff, "got %#lx\n", flags); hr = ITask_SetFlags(task, 0x9234); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); flags = 0xdeadbeef; hr = ITask_GetFlags(task, &flags); - ok(hr == S_OK, "got %#x\n", hr); - ok(flags == 0x1234, "got %#x\n", flags); + ok(hr == S_OK, "got %#lx\n", hr); + ok(flags == 0x1234, "got %#lx\n", flags); ITask_Release(task); } @@ -733,7 +733,7 @@ static void test_workitem_data(void) hr = ITaskScheduler_NewWorkItem(scheduler, task_name, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); if (0) /* crashes under Windows */ hr = ITask_GetWorkItemData(task, &count, NULL); @@ -743,35 +743,35 @@ static void test_workitem_data(void) count = 0xdead; data = (BYTE *)0xdeadbeef; hr = ITask_GetWorkItemData(task, &count, &data); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(count == 0, "got %u\n", count); ok(data == NULL, "got %p\n", data); hr = ITask_SetWorkItemData(task, sizeof(hello), NULL); - ok(hr == E_INVALIDARG, "got %#x\n", hr); + ok(hr == E_INVALIDARG, "got %#lx\n", hr); hr = ITask_SetWorkItemData(task, 0, hello); - ok(hr == E_INVALIDARG, "got %#x\n", hr); + ok(hr == E_INVALIDARG, "got %#lx\n", hr); hr = ITask_SetWorkItemData(task, sizeof(hello), hello); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); count = 0xdead; data = NULL; hr = ITask_GetWorkItemData(task, &count, &data); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(count == sizeof(hello), "got %u\n", count); ok(data != NULL, "got NULL\n"); ok(!memcmp(data, hello, sizeof(hello)), "data mismatch\n"); CoTaskMemFree(data); hr = ITask_SetWorkItemData(task, 0, NULL); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); count = 0xdead; data = (BYTE *)0xdeadbeef; hr = ITask_GetWorkItemData(task, &count, &data); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(count == 0, "got %u\n", count); ok(data == NULL, "got %p\n", data); @@ -785,7 +785,7 @@ START_TEST(task) CoInitialize(NULL); hr = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskScheduler, (void **)&scheduler); - ok(hr == S_OK, "failed to create task scheduler: %#x\n", hr); + ok(hr == S_OK, "failed to create task scheduler: %#lx\n", hr); test_SetApplicationName_GetApplicationName(); test_CreateTrigger(); diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index fafad585f53..fbee3f46190 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -65,7 +65,7 @@ static void test_NewWorkItem(void) /* Create TaskScheduler */ hres = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskScheduler, (void **) &test_task_scheduler); - ok(hres == S_OK, "CTaskScheduler CoCreateInstance failed: %08x\n", hres); + ok(hres == S_OK, "CTaskScheduler CoCreateInstance failed: %08lx\n", hres); if (hres != S_OK) { skip("Failed to create task scheduler. Skipping tests.\n"); @@ -75,7 +75,7 @@ static void test_NewWorkItem(void) /* Test basic task creation */ hres = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &CLSID_CTask, &IID_ITask, (IUnknown**)&task); - ok(hres == S_OK, "NewNetworkItem failed: %08x\n", hres); + ok(hres == S_OK, "NewNetworkItem failed: %08lx\n", hres); if (hres == S_OK) ITask_Release(task); @@ -83,18 +83,18 @@ static void test_NewWorkItem(void) hres = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &GUID_BAD, &IID_ITask, (IUnknown**)&task); ok(hres == CLASS_E_CLASSNOTAVAILABLE, - "Expected CLASS_E_CLASSNOTAVAILABLE: %08x\n", hres); + "Expected CLASS_E_CLASSNOTAVAILABLE: %08lx\n", hres); /* Task creation attempt using invalid interface ID */ hres = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &CLSID_CTask, &GUID_BAD, (IUnknown**)&task); - ok(hres == E_NOINTERFACE, "Expected E_NOINTERFACE: %08x\n", hres); + ok(hres == E_NOINTERFACE, "Expected E_NOINTERFACE: %08lx\n", hres); /* Task creation attempt using invalid work item class and interface ID */ hres = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &GUID_BAD, &GUID_BAD, (IUnknown**)&task); ok(hres == CLASS_E_CLASSNOTAVAILABLE, - "Expected CLASS_E_CLASSNOTAVAILABLE: %08x\n", hres); + "Expected CLASS_E_CLASSNOTAVAILABLE: %08lx\n", hres); ITaskScheduler_Release(test_task_scheduler); return; @@ -110,7 +110,7 @@ static void test_Activate(void) /* Create TaskScheduler */ hres = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskScheduler, (void **) &test_task_scheduler); - ok(hres == S_OK, "CTaskScheduler CoCreateInstance failed: %08x\n", hres); + ok(hres == S_OK, "CTaskScheduler CoCreateInstance failed: %08lx\n", hres); if (hres != S_OK) { skip("Failed to create task scheduler. Skipping tests.\n"); @@ -120,7 +120,7 @@ static void test_Activate(void) /* Attempt to activate a nonexistent task */ hres = ITaskScheduler_Activate(test_task_scheduler, not_task_name, &IID_ITask, (IUnknown**)&task); - ok(hres == COR_E_FILENOTFOUND, "Expected COR_E_FILENOTFOUND: %08x\n", hres); + ok(hres == COR_E_FILENOTFOUND, "Expected COR_E_FILENOTFOUND: %08lx\n", hres); ITaskScheduler_Release(test_task_scheduler); return; @@ -134,7 +134,7 @@ static void test_GetTargetComputer(void) /* Create TaskScheduler */ hres = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskScheduler, (void **) &test_task_scheduler); - ok(hres == S_OK, "CTaskScheduler CoCreateInstance failed: %08x\n", hres); + ok(hres == S_OK, "CTaskScheduler CoCreateInstance failed: %08lx\n", hres); if (hres != S_OK) { skip("Failed to create task scheduler.\n"); @@ -145,12 +145,12 @@ static void test_GetTargetComputer(void) { /* This crashes on w2k */ hres = ITaskScheduler_GetTargetComputer(test_task_scheduler, NULL); - ok(hres == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hres); + ok(hres == E_INVALIDARG, "got 0x%lx (expected E_INVALIDARG)\n", hres); } hres = ITaskScheduler_GetTargetComputer(test_task_scheduler, &oldname); ok((hres == S_OK) && oldname && oldname[0] == '\\' && oldname[1] == '\\' && oldname[2], - "got 0x%x and %s (expected S_OK and an unc name)\n", hres, wine_dbgstr_w(oldname)); + "got 0x%lx and %s (expected S_OK and an unc name)\n", hres, wine_dbgstr_w(oldname)); CoTaskMemFree(oldname); @@ -175,7 +175,7 @@ static void test_SetTargetComputer(void) /* Create TaskScheduler */ hres = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskScheduler, (void **) &test_task_scheduler); - ok(hres == S_OK, "CTaskScheduler CoCreateInstance failed: %08x\n", hres); + ok(hres == S_OK, "CTaskScheduler CoCreateInstance failed: %08lx\n", hres); if (hres != S_OK) { skip("Failed to create task scheduler. Skipping tests.\n"); @@ -183,24 +183,24 @@ static void test_SetTargetComputer(void) } hres = ITaskScheduler_GetTargetComputer(test_task_scheduler, &oldname); - ok(hres == S_OK, "got 0x%x and %s (expected S_OK)\n", hres, wine_dbgstr_w(oldname)); + ok(hres == S_OK, "got 0x%lx and %s (expected S_OK)\n", hres, wine_dbgstr_w(oldname)); /* NULL is an alias for the local computer */ hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, NULL); - ok(hres == S_OK, "got 0x%x (expected S_OK)\n", hres); + ok(hres == S_OK, "got 0x%lx (expected S_OK)\n", hres); hres = ITaskScheduler_GetTargetComputer(test_task_scheduler, &name); ok((hres == S_OK && !lstrcmpiW(name, buffer)), - "got 0x%x with %s (expected S_OK and %s)\n", + "got 0x%lx with %s (expected S_OK and %s)\n", hres, wine_dbgstr_w(name), wine_dbgstr_w(buffer)); CoTaskMemFree(name); /* The name must be valid */ hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, does_not_existW); - ok(hres == HRESULT_FROM_WIN32(ERROR_BAD_NETPATH), "got 0x%x (expected 0x80070035)\n", hres); + ok(hres == HRESULT_FROM_WIN32(ERROR_BAD_NETPATH), "got 0x%lx (expected 0x80070035)\n", hres); /* the name of the target computer is unchanged */ hres = ITaskScheduler_GetTargetComputer(test_task_scheduler, &name); ok((hres == S_OK && !lstrcmpiW(name, buffer)), - "got 0x%x with %s (expected S_OK and %s)\n", + "got 0x%lx with %s (expected S_OK and %s)\n", hres, wine_dbgstr_w(name), wine_dbgstr_w(buffer)); CoTaskMemFree(name); @@ -211,19 +211,19 @@ static void test_SetTargetComputer(void) skip("SetTargetComputer failed with E_ACCESSDENIED (needs admin rights)\n"); goto done; } - ok(hres == S_OK, "got 0x%x (expected S_OK)\n", hres); + ok(hres == S_OK, "got 0x%lx (expected S_OK)\n", hres); /* the case is ignored */ CharUpperW(buffer); hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, buffer); - ok(hres == S_OK, "got 0x%x (expected S_OK)\n", hres); + ok(hres == S_OK, "got 0x%lx (expected S_OK)\n", hres); CharLowerW(buffer); hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, buffer); - ok(hres == S_OK, "got 0x%x (expected S_OK)\n", hres); + ok(hres == S_OK, "got 0x%lx (expected S_OK)\n", hres); /* cleanup */ hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, oldname); - ok(hres == S_OK, "got 0x%x (expected S_OK)\n", hres); + ok(hres == S_OK, "got 0x%lx (expected S_OK)\n", hres); done: CoTaskMemFree(oldname); @@ -243,37 +243,37 @@ static void test_Enum(void) hr = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskScheduler, (void **)&scheduler); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); /* cleanup after previous runs */ taskscheduler_delete(scheduler, Task1); hr = ITaskScheduler_NewWorkItem(scheduler, Task1, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = ITaskScheduler_AddWorkItem(scheduler, Task1, (IScheduledWorkItem *)task); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ITask_Release(task); hr = ITaskScheduler_Enum(scheduler, NULL); - ok(hr == E_INVALIDARG, "got %#x\n", hr); + ok(hr == E_INVALIDARG, "got %#lx\n", hr); hr = ITaskScheduler_Enum(scheduler, &tasks); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); names = (void *)0xdeadbeef; fetched = 0xdeadbeef; hr = IEnumWorkItems_Next(tasks, 0, &names, &fetched); - ok(hr == E_INVALIDARG, "got %#x\n", hr); + ok(hr == E_INVALIDARG, "got %#lx\n", hr); ok(names == (void *)0xdeadbeef, "got %p\n", names); - ok(fetched == 0xdeadbeef, "got %#x\n", fetched); + ok(fetched == 0xdeadbeef, "got %#lx\n", fetched); hr = IEnumWorkItems_Next(tasks, 1, NULL, NULL); - ok(hr == E_INVALIDARG, "got %#x\n", hr); + ok(hr == E_INVALIDARG, "got %#lx\n", hr); names = NULL; hr = IEnumWorkItems_Next(tasks, 1, &names, NULL); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(names != NULL, "got NULL\n"); ok(names[0] != NULL, "got NULL\n"); CoTaskMemFree(names[0]); @@ -281,19 +281,19 @@ static void test_Enum(void) names = (void *)0xdeadbeef; hr = IEnumWorkItems_Next(tasks, 2, &names, NULL); - ok(hr == E_INVALIDARG, "got %#x\n", hr); + ok(hr == E_INVALIDARG, "got %#lx\n", hr); ok(names == (void *)0xdeadbeef, "got %p\n", names); hr = IEnumWorkItems_Reset(tasks); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); names = NULL; fetched = 0xdeadbeef; hr = IEnumWorkItems_Next(tasks, 1, &names, &fetched); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(names != NULL, "got NULL\n"); ok(names[0] != NULL, "got NULL\n"); - ok(fetched == 1, "got %u\n", fetched); + ok(fetched == 1, "got %lu\n", fetched); CoTaskMemFree(names[0]); CoTaskMemFree(names); @@ -301,19 +301,19 @@ static void test_Enum(void) /* do nothing*/; hr = IEnumWorkItems_Skip(tasks, 1); - ok(hr == S_FALSE, "got %#x\n", hr); + ok(hr == S_FALSE, "got %#lx\n", hr); names = (void *)0xdeadbeef; fetched = 0xdeadbeef; hr = IEnumWorkItems_Next(tasks, 1, &names, &fetched); - ok(hr == S_FALSE, "got %#x\n", hr); + ok(hr == S_FALSE, "got %#lx\n", hr); ok(names == NULL, "got %p\n", names); - ok(fetched == 0, "got %u\n", fetched); + ok(fetched == 0, "got %lu\n", fetched); IEnumWorkItems_Release(tasks); hr = taskscheduler_delete(scheduler, Task1); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ITaskScheduler_Release(scheduler); } @@ -330,31 +330,31 @@ static void test_save_task_curfile(ITask *task) WCHAR *curfile; hr = ITask_QueryInterface(task, &IID_IPersistFile, (void **)&pfile); - ok(hr == S_OK, "QueryInterface error %#x\n", hr); + ok(hr == S_OK, "QueryInterface error %#lx\n", hr); curfile = NULL; hr = IPersistFile_GetCurFile(pfile, &curfile); - ok(hr == S_OK, "GetCurFile error %#x\n", hr); + ok(hr == S_OK, "GetCurFile error %#lx\n", hr); ok(curfile && curfile[0], "curfile should not be NULL\n"); ok(file_exists(curfile), "curfile should exist\n"); hr = IPersistFile_Save(pfile, curfile, FALSE); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "wrong error %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "wrong error %#lx\n", hr); hr = IPersistFile_Save(pfile, curfile, TRUE); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "wrong error %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "wrong error %#lx\n", hr); hr = IPersistFile_Save(pfile, NULL, FALSE); - ok(hr == S_OK, "Save error %#x\n", hr); + ok(hr == S_OK, "Save error %#lx\n", hr); hr = IPersistFile_Save(pfile, NULL, TRUE); - ok(hr == S_OK, "Save error %#x\n", hr); + ok(hr == S_OK, "Save error %#lx\n", hr); CoTaskMemFree(curfile); curfile = NULL; hr = IPersistFile_GetCurFile(pfile, &curfile); - ok(hr == S_OK, "GetCurFile error %#x\n", hr); + ok(hr == S_OK, "GetCurFile error %#lx\n", hr); ok(curfile && curfile[0] , "curfile should not be NULL\n"); CoTaskMemFree(curfile); @@ -369,27 +369,27 @@ static WCHAR *get_task_curfile(ITask *task, BOOL should_exist, BOOL is_dirty, in CLSID clsid; hr = ITask_QueryInterface(task, &IID_IPersistFile, (void **)&pfile); - ok_(__FILE__, line)(hr == S_OK, "QueryInterface error %#x\n", hr); + ok_(__FILE__, line)(hr == S_OK, "QueryInterface error %#lx\n", hr); hr = IPersistFile_IsDirty(pfile); - ok_(__FILE__, line)(hr == is_dirty ? S_OK : S_FALSE, "got %#x\n", hr); + ok_(__FILE__, line)(hr == is_dirty ? S_OK : S_FALSE, "got %#lx\n", hr); curfile = NULL; hr = IPersistFile_GetCurFile(pfile, &curfile); - ok_(__FILE__, line)(hr == S_OK, "GetCurFile error %#x\n", hr); + ok_(__FILE__, line)(hr == S_OK, "GetCurFile error %#lx\n", hr); ok_(__FILE__, line)(curfile && curfile[0] , "curfile should not be NULL\n"); hr = IPersistFile_Load(pfile, curfile, STGM_READ); if (should_exist) - ok_(__FILE__, line)(hr == S_OK, "Load error %#x\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Load error %#lx\n", hr); else - ok_(__FILE__, line)(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "wrong error %#x\n", hr); + ok_(__FILE__, line)(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "wrong error %#lx\n", hr); if (0) /* crashes under Windows */ hr = IPersistFile_GetClassID(pfile, NULL); hr = IPersistFile_GetClassID(pfile, &clsid); - ok_(__FILE__, line)(hr == S_OK, "GetClassID error %#x\n", hr); + ok_(__FILE__, line)(hr == S_OK, "GetClassID error %#lx\n", hr); ok_(__FILE__, line)(IsEqualCLSID(&clsid, &CLSID_CTask), "got %s\n", wine_dbgstr_guid(&clsid)); IPersistFile_Release(pfile); @@ -427,28 +427,28 @@ static void test_task_storage(void) hr = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskScheduler, (void **)&scheduler); if (hr != S_OK) { - win_skip("CoCreateInstance(CLSID_CTaskScheduler) error %#x\n", hr); + win_skip("CoCreateInstance(CLSID_CTaskScheduler) error %#lx\n", hr); return; } hr = ITaskScheduler_Delete(scheduler, Task1_ext); - ok(hr == E_INVALIDARG, "wrong error %#x\n", hr); + ok(hr == E_INVALIDARG, "wrong error %#lx\n", hr); hr = ITaskScheduler_Delete(scheduler, Task1); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "wrong error %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "wrong error %#lx\n", hr); hr = ITaskScheduler_NewWorkItem(scheduler, Task1_ext, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); - ok(hr == E_INVALIDARG, "wrong error %#x\n", hr); + ok(hr == E_INVALIDARG, "wrong error %#lx\n", hr); hr = ITaskScheduler_NewWorkItem(scheduler, Task1, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); - ok(hr == S_OK, "NewWorkItem error %#x\n", hr); + ok(hr == S_OK, "NewWorkItem error %#lx\n", hr); curfile = get_task_curfile(task, FALSE, FALSE, __LINE__); ok(!file_exists(curfile), "curfile should not exist\n"); ok(!lstrcmpW(curfile, task1_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile)); hr = ITask_SetComment(task, Task1); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); curfile2 = get_task_curfile(task, FALSE, TRUE, __LINE__); ok(!file_exists(curfile2), "curfile should not exist\n"); @@ -456,7 +456,7 @@ static void test_task_storage(void) CoTaskMemFree(curfile2); hr = ITaskScheduler_NewWorkItem(scheduler, Task1, &CLSID_CTask, &IID_ITask, (IUnknown **)&task2); - ok(hr == S_OK, "NewWorkItem error %#x\n", hr); + ok(hr == S_OK, "NewWorkItem error %#lx\n", hr); ok(task2 != task, "tasks should not be equal\n"); curfile2 = get_task_curfile(task2, FALSE, FALSE, __LINE__); @@ -469,32 +469,32 @@ static void test_task_storage(void) task2 = (ITask *)0xdeadbeef; hr = ITaskScheduler_Activate(scheduler, Task1, &IID_ITask, (IUnknown **)&task2); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "wrong error %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "wrong error %#lx\n", hr); ok(task2 == (ITask *)0xdeadbeef, "task should not be set to NULL\n"); hr = ITaskScheduler_AddWorkItem(scheduler, Task2, (IScheduledWorkItem *)task); - ok(hr == S_OK, "AddWorkItem error %#x\n", hr); + ok(hr == S_OK, "AddWorkItem error %#lx\n", hr); curfile = get_task_curfile(task, TRUE, FALSE, __LINE__); ok(file_exists(curfile), "curfile should exist\n"); ok(!lstrcmpW(curfile, task2_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile)); CoTaskMemFree(curfile); hr = ITaskScheduler_AddWorkItem(scheduler, Task3, (IScheduledWorkItem *)task); - ok(hr == S_OK, "AddWorkItem error %#x\n", hr); + ok(hr == S_OK, "AddWorkItem error %#lx\n", hr); curfile = get_task_curfile(task, TRUE, FALSE, __LINE__); ok(file_exists(curfile), "curfile should exist\n"); ok(!lstrcmpW(curfile, task3_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile)); CoTaskMemFree(curfile); hr = ITaskScheduler_AddWorkItem(scheduler, Task1, (IScheduledWorkItem *)task); - ok(hr == S_OK, "AddWorkItem error %#x\n", hr); + ok(hr == S_OK, "AddWorkItem error %#lx\n", hr); curfile = get_task_curfile(task, TRUE, FALSE, __LINE__); ok(file_exists(curfile), "curfile should exist\n"); ok(!lstrcmpW(curfile, task1_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile)); CoTaskMemFree(curfile); hr = ITaskScheduler_AddWorkItem(scheduler, Task1, (IScheduledWorkItem *)task); - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "wrong error %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "wrong error %#lx\n", hr); curfile = get_task_curfile(task, TRUE, FALSE, __LINE__); ok(file_exists(curfile), "curfile should exist\n"); @@ -504,7 +504,7 @@ static void test_task_storage(void) task = NULL; hr = ITaskScheduler_Activate(scheduler, Task1, &IID_ITask, (IUnknown **)&task); - ok(hr == S_OK, "Activate error %#x\n", hr); + ok(hr == S_OK, "Activate error %#lx\n", hr); ok(task != NULL, "task should not be set to NULL\n"); curfile = get_task_curfile(task, TRUE, FALSE, __LINE__); @@ -516,11 +516,11 @@ static void test_task_storage(void) test_save_task_curfile(task); hr = taskscheduler_delete(scheduler, Task1); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = taskscheduler_delete(scheduler, Task2); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = taskscheduler_delete(scheduler, Task3); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ITask_Release(task); ITaskScheduler_Release(scheduler); diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c index 168d6f34212..d0f659ef246 100644 --- a/dlls/mstask/tests/task_trigger.c +++ b/dlls/mstask/tests/task_trigger.c @@ -79,15 +79,15 @@ static BOOL compare_trigger_state(TASK_TRIGGER found_state, found_state.wStartMinute, expected_state.wStartMinute); ok(found_state.MinutesDuration == expected_state.MinutesDuration, - "MinutesDuration: Found %d but expected %d\n", + "MinutesDuration: Found %ld but expected %ld\n", found_state.MinutesDuration, expected_state.MinutesDuration); ok(found_state.MinutesInterval == expected_state.MinutesInterval, - "MinutesInterval: Found %d but expected %d\n", + "MinutesInterval: Found %ld but expected %ld\n", found_state.MinutesInterval, expected_state.MinutesInterval); ok(found_state.rgFlags == expected_state.rgFlags, - "rgFlags: Found %d but expected %d\n", + "rgFlags: Found %ld but expected %ld\n", found_state.rgFlags, expected_state.rgFlags); ok(found_state.TriggerType == expected_state.TriggerType, @@ -138,16 +138,16 @@ static void test_SetTrigger_GetTrigger(void) hres = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &CLSID_CTask, &IID_ITask, (IUnknown **)&test_task); - ok(hres == S_OK, "got %#x\n", hres); + ok(hres == S_OK, "got %#lx\n", hres); hres = ITask_CreateTrigger(test_task, &idx, &test_trigger); - ok(hres == S_OK, "got %#x\n", hres); + ok(hres == S_OK, "got %#lx\n", hres); hres = ITaskTrigger_SetTrigger(test_trigger, NULL); - ok(hres == E_INVALIDARG, "got %#x\n", hres); + ok(hres == E_INVALIDARG, "got %#lx\n", hres); hres = ITaskTrigger_GetTrigger(test_trigger, NULL); - ok(hres == E_INVALIDARG, "got %#x\n", hres); + ok(hres == E_INVALIDARG, "got %#lx\n", hres); /* Setup a trigger with base values for this test run */ GetLocalTime(&time); @@ -161,12 +161,12 @@ static void test_SetTrigger_GetTrigger(void) memset(&trigger_state, 0xcf, sizeof(trigger_state)); trigger_state.cbTriggerSize = sizeof(trigger_state); hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state); - ok(hres == S_OK, "Failed to set trigger: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to set trigger: 0x%08lx\n", hres); compare_trigger_state(trigger_state, empty_trigger_state); /* Test setting basic empty trigger */ hres = ITaskTrigger_SetTrigger(test_trigger, &empty_trigger_state); - ok(hres == S_OK, "Failed to set trigger: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to set trigger: 0x%08lx\n", hres); memset(&trigger_state, 0xcf, sizeof(trigger_state)); trigger_state.cbTriggerSize = sizeof(trigger_state); hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state); @@ -175,7 +175,7 @@ static void test_SetTrigger_GetTrigger(void) /* Test setting basic non-empty trigger */ hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == S_OK, "Failed to set trigger: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to set trigger: 0x%08lx\n", hres); memset(&trigger_state, 0xcf, sizeof(trigger_state)); trigger_state.cbTriggerSize = sizeof(trigger_state); hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state); @@ -190,21 +190,21 @@ static void test_SetTrigger_GetTrigger(void) /* Test setting trigger with invalid cbTriggerSize */ normal_trigger_state.cbTriggerSize = sizeof(trigger_state) - 1; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres); + ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08lx\n", hres); normal_trigger_state.cbTriggerSize = sizeof(trigger_state) + 1; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres); + ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08lx\n", hres); normal_trigger_state.cbTriggerSize = sizeof(trigger_state); /* Test setting trigger with invalid Reserved fields */ normal_trigger_state.Reserved1 = 80; normal_trigger_state.Reserved2 = 80; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == S_OK, "Failed to set trigger: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to set trigger: 0x%08lx\n", hres); memset(&trigger_state, 0xcf, sizeof(trigger_state)); trigger_state.cbTriggerSize = sizeof(trigger_state); hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state); - ok(hres == S_OK, "Expected S_OK: 0x%08x\n", hres); + ok(hres == S_OK, "Expected S_OK: 0x%08lx\n", hres); ok(trigger_state.Reserved1 == 0 && trigger_state.Reserved2 == 0, "Reserved fields should be set to zero\n"); normal_trigger_state.Reserved1 = 0; @@ -213,23 +213,23 @@ static void test_SetTrigger_GetTrigger(void) /* Test setting trigger with invalid month */ normal_trigger_state.wBeginMonth = 0; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres); + ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08lx\n", hres); normal_trigger_state.wBeginMonth = 13; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres); + ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08lx\n", hres); normal_trigger_state.wBeginMonth = 1; /* Test setting trigger with invalid begin date */ normal_trigger_state.wBeginDay = 0; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres); + ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08lx\n", hres); normal_trigger_state.wBeginDay = 32; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres); + ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08lx\n", hres); normal_trigger_state.wBeginMonth = 2; normal_trigger_state.wBeginDay = 30; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres); + ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08lx\n", hres); normal_trigger_state.wBeginMonth = 1; normal_trigger_state.wBeginDay = 1; @@ -238,11 +238,11 @@ static void test_SetTrigger_GetTrigger(void) normal_trigger_state.wEndMonth = 200; normal_trigger_state.wEndDay = 200; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == S_OK, "Failed to set trigger: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to set trigger: 0x%08lx\n", hres); memset(&trigger_state, 0xcf, sizeof(trigger_state)); trigger_state.cbTriggerSize = sizeof(trigger_state); hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state); - ok(hres == S_OK, "Expected S_OK: 0x%08x\n", hres); + ok(hres == S_OK, "Expected S_OK: 0x%08lx\n", hres); ok(trigger_state.wEndYear == 0, "End year should be 0: %d\n", trigger_state.wEndYear); ok(trigger_state.wEndMonth == 200, "End month should be 200: %d\n", @@ -252,7 +252,7 @@ static void test_SetTrigger_GetTrigger(void) normal_trigger_state.rgFlags = TASK_TRIGGER_FLAG_DISABLED | TASK_TRIGGER_FLAG_HAS_END_DATE; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres); + ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08lx\n", hres); normal_trigger_state.rgFlags = TASK_TRIGGER_FLAG_DISABLED; normal_trigger_state.wEndYear = 2980; normal_trigger_state.wEndMonth = 1; @@ -261,40 +261,40 @@ static void test_SetTrigger_GetTrigger(void) /* Test setting trigger with invalid hour or minute*/ normal_trigger_state.wStartHour = 24; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres); + ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08lx\n", hres); normal_trigger_state.wStartHour = 60; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres); + ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08lx\n", hres); normal_trigger_state.wStartHour = 3; /* Test setting trigger with invalid duration / interval pairs */ normal_trigger_state.MinutesDuration = 5; normal_trigger_state.MinutesInterval = 5; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres); + ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08lx\n", hres); normal_trigger_state.MinutesDuration = 5; normal_trigger_state.MinutesInterval = 6; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres); + ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08lx\n", hres); normal_trigger_state.MinutesDuration = 0; normal_trigger_state.MinutesInterval = 6; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres); + ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08lx\n", hres); normal_trigger_state.MinutesDuration = 5; normal_trigger_state.MinutesInterval = 0; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == S_OK, "Failed to set trigger: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to set trigger: 0x%08lx\n", hres); normal_trigger_state.MinutesDuration = 0; normal_trigger_state.MinutesInterval = 0; /* Test setting trigger with end date before start date */ normal_trigger_state.wEndYear = 1979; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == S_OK, "Failed to set trigger: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to set trigger: 0x%08lx\n", hres); normal_trigger_state.rgFlags = TASK_TRIGGER_FLAG_DISABLED | TASK_TRIGGER_FLAG_HAS_END_DATE; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == S_OK, "Failed to set trigger: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to set trigger: 0x%08lx\n", hres); normal_trigger_state.rgFlags = TASK_TRIGGER_FLAG_DISABLED; normal_trigger_state.wEndYear = 2980; normal_trigger_state.wEndMonth = 1; @@ -306,11 +306,11 @@ static void test_SetTrigger_GetTrigger(void) normal_trigger_state.Type.Weekly.WeeksInterval = 2; normal_trigger_state.Type.Weekly.rgfDaysOfTheWeek = (TASK_MONDAY | TASK_TUESDAY); hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == S_OK, "Failed to set trigger: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to set trigger: 0x%08lx\n", hres); memset(&trigger_state, 0xcf, sizeof(trigger_state)); trigger_state.cbTriggerSize = sizeof(trigger_state); hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state); - ok(hres == S_OK, "Expected S_OK: 0x%08x\n", hres); + ok(hres == S_OK, "Expected S_OK: 0x%08lx\n", hres); ok(trigger_state.Type.Weekly.WeeksInterval == 0xcfcf, "Expected WeeksInterval set remain untouched: %d\n", trigger_state.Type.Weekly.WeeksInterval); @@ -320,16 +320,16 @@ static void test_SetTrigger_GetTrigger(void) normal_trigger_state.TriggerType = TASK_TIME_TRIGGER_DAILY; normal_trigger_state.Type.Daily.DaysInterval = 1; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == S_OK, "Expected S_OK: 0x%08x\n", hres); + ok(hres == S_OK, "Expected S_OK: 0x%08lx\n", hres); /* Test setting trigger with set wRandomMinutesInterval */ normal_trigger_state.wRandomMinutesInterval = 5; hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == S_OK, "Failed to set trigger: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to set trigger: 0x%08lx\n", hres); memset(&trigger_state, 0xcf, sizeof(trigger_state)); trigger_state.cbTriggerSize = sizeof(trigger_state); hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state); - ok(hres == S_OK, "Expected S_OK: 0x%08x\n", hres); + ok(hres == S_OK, "Expected S_OK: 0x%08lx\n", hres); ok(trigger_state.wRandomMinutesInterval == 0, "wRandomMinutesInterval should be set to zero\n"); normal_trigger_state.wRandomMinutesInterval = 0; @@ -337,7 +337,7 @@ static void test_SetTrigger_GetTrigger(void) /* Test GetTrigger using invalid cbTriggerSiz in pTrigger. In * contrast to available documentation, this succeeds in practice. */ hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); - ok(hres == S_OK, "Failed to set trigger: 0x%08x\n", hres); + ok(hres == S_OK, "Failed to set trigger: 0x%08lx\n", hres); memset(&trigger_state, 0xcf, sizeof(trigger_state)); trigger_state.cbTriggerSize = sizeof(trigger_state) - 1; hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state); @@ -366,60 +366,60 @@ static void test_task_trigger(void) hr = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); count = 0xdead; hr = ITask_GetTriggerCount(task, &count); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(count == 0, "got %u\n", count); hr = ITask_DeleteTrigger(task, 0); - ok(hr == SCHED_E_TRIGGER_NOT_FOUND, "got %#x\n", hr); + ok(hr == SCHED_E_TRIGGER_NOT_FOUND, "got %#lx\n", hr); hr = ITask_GetTrigger(task, 0, &trigger); - ok(hr == SCHED_E_TRIGGER_NOT_FOUND, "got %#x\n", hr); + ok(hr == SCHED_E_TRIGGER_NOT_FOUND, "got %#lx\n", hr); idx = 0xdead; hr = ITask_CreateTrigger(task, &idx, &trigger); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(idx == 0, "got %u\n", idx); hr = ITask_GetTrigger(task, 0, &trigger2); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(trigger != trigger2, "%p != %p\n", trigger, trigger2); ref = ITaskTrigger_Release(trigger2); - ok(ref == 0, "got %u\n", ref); + ok(ref == 0, "got %lu\n", ref); ref = ITaskTrigger_Release(trigger); - ok(ref == 0, "got %u\n", ref); + ok(ref == 0, "got %lu\n", ref); count = 0xdead; hr = ITask_GetTriggerCount(task, &count); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(count == 1, "got %u\n", count); hr = ITask_DeleteTrigger(task, 0); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); idx = 0xdead; hr = ITask_CreateTrigger(task, &idx, &trigger); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(idx == 0, "got %u\n", idx); hr = ITask_DeleteTrigger(task, 0); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); count = 0xdead; hr = ITask_GetTriggerCount(task, &count); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(count == 0, "got %u\n", count); ref = ITaskTrigger_Release(trigger); - ok(ref == 0, "got %u\n", ref); + ok(ref == 0, "got %lu\n", ref); ref = ITask_Release(task); - ok(ref == 0, "got %u\n", ref); + ok(ref == 0, "got %lu\n", ref); } static void time_add_ms(SYSTEMTIME *st, DWORD ms) @@ -435,11 +435,11 @@ static void time_add_ms(SYSTEMTIME *st, DWORD ms) st->wDay, st->wMonth, st->wYear, st->wDayOfWeek, st->wHour, st->wMinute, st->wSecond, st->wMilliseconds); ret = SystemTimeToFileTime(st, &ftll.ft); - ok(ret, "SystemTimeToFileTime error %u\n", GetLastError()); + ok(ret, "SystemTimeToFileTime error %lu\n", GetLastError()); ftll.ll += ms * (ULONGLONG)10000; ret = FileTimeToSystemTime(&ftll.ft, st); - ok(ret, "FileTimeToSystemTime error %u\n", GetLastError()); + ok(ret, "FileTimeToSystemTime error %lu\n", GetLastError()); trace("new: %u/%u/%u wday %u %u:%02u:%02u.%03u\n", st->wDay, st->wMonth, st->wYear, st->wDayOfWeek, st->wHour, st->wMinute, st->wSecond, st->wMilliseconds); @@ -482,37 +482,37 @@ static void test_GetNextRunTime(void) hr = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); if (0) /* crashes under Windows */ hr = ITask_GetNextRunTime(task, NULL); hr = ITask_SetFlags(task, TASK_FLAG_DISABLED); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); memset(&st, 0xff, sizeof(st)); hr = ITask_GetNextRunTime(task, &st); - ok(hr == SCHED_S_TASK_DISABLED, "got %#x\n", hr); + ok(hr == SCHED_S_TASK_DISABLED, "got %#lx\n", hr); ok(!memcmp(&st, &st_empty, sizeof(st)), "got %u/%u/%u wday %u %u:%02u:%02u\n", st.wDay, st.wMonth, st.wYear, st.wDayOfWeek, st.wHour, st.wMinute, st.wSecond); hr = ITask_SetFlags(task, 0); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); memset(&st, 0xff, sizeof(st)); hr = ITask_GetNextRunTime(task, &st); - ok(hr == SCHED_S_TASK_NO_VALID_TRIGGERS, "got %#x\n", hr); + ok(hr == SCHED_S_TASK_NO_VALID_TRIGGERS, "got %#lx\n", hr); ok(!memcmp(&st, &st_empty, sizeof(st)), "got %u/%u/%u wday %u %u:%02u:%02u\n", st.wDay, st.wMonth, st.wYear, st.wDayOfWeek, st.wHour, st.wMinute, st.wSecond); hr = ITask_CreateTrigger(task, &idx, &trigger); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); memset(&st, 0xff, sizeof(st)); hr = ITask_GetNextRunTime(task, &st); - ok(hr == SCHED_S_TASK_NO_VALID_TRIGGERS, "got %#x\n", hr); + ok(hr == SCHED_S_TASK_NO_VALID_TRIGGERS, "got %#lx\n", hr); ok(!memcmp(&st, &st_empty, sizeof(st)), "got %u/%u/%u wday %u %u:%02u:%02u\n", st.wDay, st.wMonth, st.wYear, st.wDayOfWeek, st.wHour, st.wMinute, st.wSecond); @@ -520,17 +520,17 @@ static void test_GetNextRunTime(void) /* TASK_TIME_TRIGGER_ONCE */ hr = ITaskTrigger_GetTrigger(trigger, &data); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); data.rgFlags &= ~TASK_TRIGGER_FLAG_DISABLED; data.TriggerType = TASK_TIME_TRIGGER_ONCE; /* add 5 minutes to avoid races */ trigger_add_ms(&data, 5 * 60 * 1000, &cmp); hr = ITaskTrigger_SetTrigger(trigger, &data); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); memset(&st, 0xff, sizeof(st)); hr = ITask_GetNextRunTime(task, &st); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(!memcmp(&st, &cmp, sizeof(st)), "got %u/%u/%u wday %u %u:%02u:%02u\n", st.wDay, st.wMonth, st.wYear, st.wDayOfWeek, st.wHour, st.wMinute, st.wSecond); @@ -538,16 +538,16 @@ static void test_GetNextRunTime(void) /* TASK_TIME_TRIGGER_DAILY */ hr = ITaskTrigger_GetTrigger(trigger, &data); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); data.rgFlags &= ~TASK_TRIGGER_FLAG_DISABLED; data.TriggerType = TASK_TIME_TRIGGER_DAILY; data.Type.Daily.DaysInterval = 1; hr = ITaskTrigger_SetTrigger(trigger, &data); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); memset(&st, 0xff, sizeof(st)); hr = ITask_GetNextRunTime(task, &st); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(!memcmp(&st, &cmp, sizeof(st)), "got %u/%u/%u wday %u %u:%02u:%02u\n", st.wDay, st.wMonth, st.wYear, st.wDayOfWeek, st.wHour, st.wMinute, st.wSecond); @@ -555,7 +555,7 @@ static void test_GetNextRunTime(void) /* TASK_TIME_TRIGGER_WEEKLY */ hr = ITaskTrigger_GetTrigger(trigger, &data); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); data.rgFlags &= ~TASK_TRIGGER_FLAG_DISABLED; data.TriggerType = TASK_TIME_TRIGGER_WEEKLY; data.Type.Weekly.WeeksInterval = 1; @@ -564,11 +564,11 @@ static void test_GetNextRunTime(void) /* bits: TASK_SUNDAY = 1, TASK_MONDAY = 2, TASK_TUESDAY = 4, etc. */ data.Type.Weekly.rgfDaysOfTheWeek = 1 << cmp.wDayOfWeek; /* wDayOfWeek is 0 based */ hr = ITaskTrigger_SetTrigger(trigger, &data); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); memset(&st, 0xff, sizeof(st)); hr = ITask_GetNextRunTime(task, &st); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(!memcmp(&st, &cmp, sizeof(st)), "got %u/%u/%u wday %u %u:%02u:%02u\n", st.wDay, st.wMonth, st.wYear, st.wDayOfWeek, st.wHour, st.wMinute, st.wSecond); @@ -581,7 +581,7 @@ static void test_GetNextRunTime(void) idx = 0xdead; hr = ITask_CreateTrigger(task, &idx, &trigger); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(idx == 1, "got %u\n", idx); /* TASK_EVENT_TRIGGER_ON_IDLE = 5 @@ -591,15 +591,15 @@ static void test_GetNextRunTime(void) for (i = 5; i <= 7; i++) { hr = ITaskTrigger_GetTrigger(trigger, &data); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); data.rgFlags &= ~TASK_TRIGGER_FLAG_DISABLED; data.TriggerType = i; hr = ITaskTrigger_SetTrigger(trigger, &data); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); memset(&st, 0xff, sizeof(st)); hr = ITask_GetNextRunTime(task, &st); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(!memcmp(&st, &cmp, sizeof(st)), "got %u/%u/%u wday %u %u:%02u:%02u\n", st.wDay, st.wMonth, st.wYear, st.wDayOfWeek, st.wHour, st.wMinute, st.wSecond); @@ -608,23 +608,23 @@ static void test_GetNextRunTime(void) ITaskTrigger_Release(trigger); hr = ITask_DeleteTrigger(task, 0); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = ITask_GetTrigger(task, 0, &trigger); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); for (i = 5; i <= 7; i++) { hr = ITaskTrigger_GetTrigger(trigger, &data); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); data.rgFlags &= ~TASK_TRIGGER_FLAG_DISABLED; data.TriggerType = i; hr = ITaskTrigger_SetTrigger(trigger, &data); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); memset(&st, 0xff, sizeof(st)); hr = ITask_GetNextRunTime(task, &st); - ok(hr == SCHED_S_EVENT_TRIGGER, "got %#x\n", hr); + ok(hr == SCHED_S_EVENT_TRIGGER, "got %#lx\n", hr); ok(!memcmp(&st, &st_empty, sizeof(st)), "got %u/%u/%u wday %u %u:%02u:%02u\n", st.wDay, st.wMonth, st.wYear, st.wDayOfWeek, st.wHour, st.wMinute, st.wSecond); @@ -661,111 +661,111 @@ static void test_trigger_manager(void) hr = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); - ok(hr == S_OK, "got %#x\n", hr); - ok(obj_refcount(task) == 1, "got %u\n", obj_refcount(task)); + ok(hr == S_OK, "got %#lx\n", hr); + ok(obj_refcount(task) == 1, "got %lu\n", obj_refcount(task)); count = 0xdead; hr = ITask_GetTriggerCount(task, &count); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(count == 0, "got %u\n", count); idx = 0xdead; hr = ITask_CreateTrigger(task, &idx, &trigger0); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(idx == 0, "got %u\n", idx); - ok(obj_refcount(task) == 2, "got %u\n", obj_refcount(task)); + ok(obj_refcount(task) == 2, "got %lu\n", obj_refcount(task)); idx = 0xdead; hr = ITask_CreateTrigger(task, &idx, &trigger1); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(idx == 1, "got %u\n", idx); - ok(obj_refcount(task) == 3, "got %u\n", obj_refcount(task)); + ok(obj_refcount(task) == 3, "got %lu\n", obj_refcount(task)); count = 0xdead; hr = ITask_GetTriggerCount(task, &count); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(count == 2, "got %u\n", count); hr = ITaskTrigger_GetTrigger(trigger0, &state0); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); state0.wBeginYear = 3000; state0.rgFlags = 0; state0.TriggerType = TASK_TIME_TRIGGER_ONCE; hr = ITaskTrigger_SetTrigger(trigger0, &state0); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = get_task_trigger(task, 0, &state); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(state.wBeginYear == 3000, "got %u\n", state.wBeginYear); ok(state.TriggerType == TASK_TIME_TRIGGER_ONCE, "got %u\n", state.TriggerType); hr = ITaskTrigger_GetTrigger(trigger1, &state1); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); state1.wBeginYear = 2000; state1.rgFlags = 0; state1.TriggerType = TASK_TIME_TRIGGER_DAILY; hr = ITaskTrigger_SetTrigger(trigger1, &state1); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = get_task_trigger(task, 1, &state); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(state.wBeginYear == 2000, "got %u\n", state.wBeginYear); ok(state.TriggerType == TASK_TIME_TRIGGER_DAILY, "got %u\n", state.TriggerType); ref = ITaskTrigger_Release(trigger0); - ok(ref == 0, "got %u\n", ref); + ok(ref == 0, "got %lu\n", ref); ref = ITaskTrigger_Release(trigger1); - ok(ref == 0, "got %u\n", ref); + ok(ref == 0, "got %lu\n", ref); - ok(obj_refcount(task) == 1, "got %u\n", obj_refcount(task)); + ok(obj_refcount(task) == 1, "got %lu\n", obj_refcount(task)); hr = get_task_trigger(task, 0, &state); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(state.wBeginYear == 3000, "got %u\n", state.wBeginYear); ok(state.TriggerType == TASK_TIME_TRIGGER_ONCE, "got %u\n", state.TriggerType); hr = get_task_trigger(task, 1, &state); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(state.wBeginYear == 2000, "got %u\n", state.wBeginYear); ok(state.TriggerType == TASK_TIME_TRIGGER_DAILY, "got %u\n", state.TriggerType); hr = ITask_GetTrigger(task, 0, &trigger0); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = ITask_GetTrigger(task, 1, &trigger1); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = ITask_DeleteTrigger(task, 0); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = get_task_trigger(task, 0, &state); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(state.wBeginYear == 2000, "got %u\n", state.wBeginYear); ok(state.TriggerType == TASK_TIME_TRIGGER_DAILY, "got %u\n", state.TriggerType); hr = get_task_trigger(task, 1, &state); - ok(hr == SCHED_E_TRIGGER_NOT_FOUND, "got %#x\n", hr); + ok(hr == SCHED_E_TRIGGER_NOT_FOUND, "got %#lx\n", hr); hr = ITaskTrigger_SetTrigger(trigger0, &state0); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = ITaskTrigger_SetTrigger(trigger1, &state1); - ok(hr == E_FAIL, "got %#x\n", hr); + ok(hr == E_FAIL, "got %#lx\n", hr); count = 0xdead; hr = ITask_GetTriggerCount(task, &count); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); ok(count == 1, "got %u\n", count); - ok(obj_refcount(task) == 3, "got %u\n", obj_refcount(task)); + ok(obj_refcount(task) == 3, "got %lu\n", obj_refcount(task)); ref = ITaskTrigger_Release(trigger0); - ok(ref == 0, "got %u\n", ref); + ok(ref == 0, "got %lu\n", ref); ref = ITaskTrigger_Release(trigger1); - ok(ref == 0, "got %u\n", ref); + ok(ref == 0, "got %lu\n", ref); ref = ITask_Release(task); - ok(ref == 0, "got %u\n", ref); + ok(ref == 0, "got %lu\n", ref); } START_TEST(task_trigger) @@ -776,7 +776,7 @@ START_TEST(task_trigger) hr = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskScheduler, (void **)&test_task_scheduler); - ok(hr == S_OK, "error creating TaskScheduler instance %#x\n", hr); + ok(hr == S_OK, "error creating TaskScheduler instance %#lx\n", hr); test_SetTrigger_GetTrigger(); test_task_trigger();
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msvfw32/tests/Makefile.in | 1 dlls/msvfw32/tests/mciwnd.c | 12 +-- dlls/msvfw32/tests/msvfw.c | 178 ++++++++++++++++++++-------------------- 3 files changed, 95 insertions(+), 96 deletions(-) diff --git a/dlls/msvfw32/tests/Makefile.in b/dlls/msvfw32/tests/Makefile.in index 66d8ed3089b..01d83acb105 100644 --- a/dlls/msvfw32/tests/Makefile.in +++ b/dlls/msvfw32/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msvfw32.dll IMPORTS = msvfw32 advapi32 gdi32 user32 diff --git a/dlls/msvfw32/tests/mciwnd.c b/dlls/msvfw32/tests/mciwnd.c index 27ca2e8d203..85006ca95bf 100644 --- a/dlls/msvfw32/tests/mciwnd.c +++ b/dlls/msvfw32/tests/mciwnd.c @@ -119,12 +119,12 @@ static BOOL create_avi_file(char *fname) ULONG buffer_length; ret = GetTempPathA(sizeof(temp_path), temp_path); - ok(ret, "Failed to get a temp path, err %d\n", GetLastError()); + ok(ret, "Failed to get a temp path, err %ld\n", GetLastError()); if (!ret) return FALSE; ret = GetTempFileNameA(temp_path, "mci", 0, fname); - ok(ret, "Failed to get a temp name, err %d\n", GetLastError()); + ok(ret, "Failed to get a temp name, err %ld\n", GetLastError()); if (!ret) return FALSE; DeleteFileA(fname); @@ -132,7 +132,7 @@ static BOOL create_avi_file(char *fname) lstrcatA(fname, ".avi"); hFile = CreateFileA(fname, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - ok(hFile != INVALID_HANDLE_VALUE, "Failed to create a file, err %d\n", GetLastError()); + ok(hFile != INVALID_HANDLE_VALUE, "Failed to create a file, err %ld\n", GetLastError()); if (hFile == INVALID_HANDLE_VALUE) return FALSE; buffer_length = padding[1]; @@ -169,7 +169,7 @@ static void test_MCIWndCreate(void) ret = SendMessageA(window, MCIWNDM_GETERRORA, sizeof(error), (LPARAM)error); ok(!ret || broken(ret == ERROR_INVALID_HANDLE) /* w2003std, w2008s64 */, - "Unexpected error %ld\n", ret); + "Unexpected error %Id\n", ret); DestroyWindow(window); @@ -182,7 +182,7 @@ static void test_MCIWndCreate(void) ret = SendMessageA(window, MCIWNDM_GETERRORA, sizeof(error), (LPARAM)error); ok(!ret || broken(ret == ERROR_INVALID_HANDLE) /* w2003std, w2008s64 */, - "Unexpected error %ld\n", ret); + "Unexpected error %Id\n", ret); DestroyWindow(parent); @@ -190,7 +190,7 @@ static void test_MCIWndCreate(void) ok(window != NULL, "Failed to create an MCIWnd window\n"); ret = SendMessageA(window, MCIWNDM_GETERRORA, sizeof(error), (LPARAM)error); - todo_wine ok(ret == MCIERR_FILE_NOT_FOUND, "Unexpected error %ld\n", ret); + todo_wine ok(ret == MCIERR_FILE_NOT_FOUND, "Unexpected error %Id\n", ret); DestroyWindow(window); diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 07ff7e3694c..b22b466f595 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -119,51 +119,51 @@ static void test_Locate(void) else { bo.biBitCount = bi.biBitCount = 32; err = ICDecompressQuery(h, &bi, &bo); - ok(err == ICERR_OK, "Query cvid->RGB32: %d\n", err); + ok(err == ICERR_OK, "Query cvid->RGB32: %ld\n", err); err = ICDecompressQuery(h, &bi, NULL); - ok(err == ICERR_OK, "Query cvid 32: %d\n", err); + ok(err == ICERR_OK, "Query cvid 32: %ld\n", err); bo.biHeight = -bo.biHeight; err = ICDecompressQuery(h, &bi, &bo); - ok(err == ICERR_OK, "Query cvid->RGB32 height<0: %d\n", err); + ok(err == ICERR_OK, "Query cvid->RGB32 height<0: %ld\n", err); bo.biHeight = -bo.biHeight; bi.biWidth = 17; bi.biBitCount = 8; err = ICDecompressGetFormat(h, &bi, &tmp); - ok(err == ICERR_OK, "Query cvid output format: %d\n", err); + ok(err == ICERR_OK, "Query cvid output format: %ld\n", err); ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n", tmp.biBitCount); - ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %d\n", + ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %ld\n", get_stride(17, 24) * 8, tmp.biSizeImage); bi.biBitCount = 15; err = ICDecompressGetFormat(h, &bi, &tmp); - ok(err == ICERR_OK, "Query cvid output format: %d\n", err); + ok(err == ICERR_OK, "Query cvid output format: %ld\n", err); ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n", tmp.biBitCount); - ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %d\n", + ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %ld\n", get_stride(17, 24) * 8, tmp.biSizeImage); bi.biBitCount = 16; err = ICDecompressGetFormat(h, &bi, &tmp); - ok(err == ICERR_OK, "Query cvid output format: %d\n", err); + ok(err == ICERR_OK, "Query cvid output format: %ld\n", err); ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n", tmp.biBitCount); - ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %d\n", + ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %ld\n", get_stride(17, 24) * 8, tmp.biSizeImage); bi.biBitCount = 24; err = ICDecompressGetFormat(h, &bi, &tmp); - ok(err == ICERR_OK, "Query cvid output format: %d\n", err); + ok(err == ICERR_OK, "Query cvid output format: %ld\n", err); ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n", tmp.biBitCount); - ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %d\n", + ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %ld\n", get_stride(17, 24) * 8, tmp.biSizeImage); bi.biBitCount = 32; err = ICDecompressGetFormat(h, &bi, &tmp); - ok(err == ICERR_OK, "Query cvid output format: %d\n", err); + ok(err == ICERR_OK, "Query cvid output format: %ld\n", err); ok(tmp.biBitCount == 24, "Expected 24 bit, got %d bit\n", tmp.biBitCount); - ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %d\n", + ok(tmp.biSizeImage == get_stride(17, 24) * 8, "Expected size %d, got %ld\n", get_stride(17, 24) * 8, tmp.biSizeImage); bi.biWidth = 32; @@ -237,63 +237,63 @@ static void test_Locate(void) ok(h != 0, "No MSVC codec installed!?\n"); if (h != 0) { err = ICDecompressQuery(h, &bi, &bo); - ok(err == ICERR_OK, "Query MSVC->RGB16: %d\n", err); + ok(err == ICERR_OK, "Query MSVC->RGB16: %ld\n", err); err = ICDecompressQuery(h, &bi, NULL); - ok(err == ICERR_OK, "Query MSVC 16: %d\n", err); + ok(err == ICERR_OK, "Query MSVC 16: %ld\n", err); bo.biHeight = -bo.biHeight; err = ICDecompressQuery(h, &bi, &bo); - todo_wine ok(err == ICERR_OK, "Query MSVC->RGB16 height<0: %d\n", err); + todo_wine ok(err == ICERR_OK, "Query MSVC->RGB16 height<0: %ld\n", err); bo.biHeight = -bo.biHeight; bo.biBitCount = 24; err = ICDecompressQuery(h, &bi, &bo); - ok(err == ICERR_OK, "Query MSVC 16->24: %d\n", err); + ok(err == ICERR_OK, "Query MSVC 16->24: %ld\n", err); bo.biBitCount = 16; bi.biWidth = 553; bi.biBitCount = 8; err = ICDecompressGetFormat(h, &bi, &tmp); - ok(err == ICERR_OK, "Query MSVC output format: %d\n", err); + ok(err == ICERR_OK, "Query MSVC output format: %ld\n", err); ok(tmp.biBitCount == 8, "Expected 8 bit, got %d bit\n", tmp.biBitCount); - ok(tmp.biWidth == 552, "Expected width 552, got %d\n", tmp.biWidth); - ok(tmp.biSizeImage == get_stride(552, 8) * 8, "Expected size %d, got %d\n", + ok(tmp.biWidth == 552, "Expected width 552, got %ld\n", tmp.biWidth); + ok(tmp.biSizeImage == get_stride(552, 8) * 8, "Expected size %d, got %ld\n", get_stride(552, 8) * 8, tmp.biSizeImage); bi.biBitCount = 15; err = ICDecompressGetFormat(h, &bi, &tmp); - ok(err == ICERR_BADFORMAT, "Query MSVC output format: %d\n", err); + ok(err == ICERR_BADFORMAT, "Query MSVC output format: %ld\n", err); bi.biBitCount = 16; err = ICDecompressGetFormat(h, &bi, &tmp); - ok(err == ICERR_OK, "Query MSVC output format: %d\n", err); + ok(err == ICERR_OK, "Query MSVC output format: %ld\n", err); ok(tmp.biBitCount == 16, "Expected 16 bit, got %d bit\n", tmp.biBitCount); - ok(tmp.biWidth == 552, "Expected width 552, got %d\n", tmp.biWidth); - ok(tmp.biSizeImage == get_stride(552, 16) * 8, "Expected size %d, got %d\n", + ok(tmp.biWidth == 552, "Expected width 552, got %ld\n", tmp.biWidth); + ok(tmp.biSizeImage == get_stride(552, 16) * 8, "Expected size %d, got %ld\n", get_stride(552, 16) * 8, tmp.biSizeImage); bi.biBitCount = 24; err = ICDecompressGetFormat(h, &bi, &tmp); - ok(err == ICERR_BADFORMAT, "Query MSVC output format: %d\n", err); + ok(err == ICERR_BADFORMAT, "Query MSVC output format: %ld\n", err); bi.biBitCount = 32; err = ICDecompressGetFormat(h, &bi, &tmp); - ok(err == ICERR_BADFORMAT, "Query MSVC output format: %d\n", err); + ok(err == ICERR_BADFORMAT, "Query MSVC output format: %ld\n", err); bi.biHeight = 17; bi.biBitCount = 8; err = ICDecompressGetFormat(h, &bi, &tmp); - ok(err == ICERR_OK, "Query MSVC output format: %d\n", err); - ok(tmp.biHeight == 16, "Expected height 16, got %d\n", tmp.biHeight); + ok(err == ICERR_OK, "Query MSVC output format: %ld\n", err); + ok(tmp.biHeight == 16, "Expected height 16, got %ld\n", tmp.biHeight); bi.biHeight = 8; bi.biWidth = 32; bi.biCompression = mmioFOURCC('m','s','v','c'); err = ICDecompressQuery(h, &bi, &bo); - ok(err == ICERR_BADFORMAT, "Query msvc->RGB16: %d\n", err); + ok(err == ICERR_BADFORMAT, "Query msvc->RGB16: %ld\n", err); ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); } @@ -358,20 +358,20 @@ static void test_ICSeqCompress(void) { frame_len = 0; frame = ICSeqCompressFrame(&pc, 0, input, &key_frame, &frame_len); - ok(frame != NULL, "Frame[%d]: Expected non-NULL\n", i); + ok(frame != NULL, "Frame[%ld]: Expected non-NULL\n", i); if (frame_len == sizeof(output_nkf)) - ok(!memcmp(output_nkf, frame, frame_len), "Frame[%d]: Contents do not match\n", i); + ok(!memcmp(output_nkf, frame, frame_len), "Frame[%ld]: Contents do not match\n", i); else if (frame_len == sizeof(output_kf)) - ok(!memcmp(output_kf, frame, frame_len), "Frame[%d]: Contents do not match\n", i); + ok(!memcmp(output_kf, frame, frame_len), "Frame[%ld]: Contents do not match\n", i); else - ok(0, "Unknown frame size of %d byten\n", frame_len); + ok(0, "Unknown frame size of %ld byten\n", frame_len); } ICSeqCompressFrameEnd(&pc); ICCompressorFree(&pc); /* ICCompressorFree already closed the HIC */ err = ICClose(h); - ok(err == ICERR_BADHANDLE, "Expected -8, got %d\n", err); + ok(err == ICERR_BADHANDLE, "Expected -8, got %ld\n", err); } static ICINFO enum_info; @@ -381,16 +381,16 @@ static LRESULT CALLBACK enum_driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, { ICINFO *info = (ICINFO *)lparam1; - ok(!id, "Got unexpected id %#lx.\n", id); + ok(!id, "Got unexpected id %#Ix.\n", id); ok(msg == ICM_GETINFO, "Got unexpected message %#x.\n", msg); ok(info == &enum_info, "Expected lparam1 %p, got %p.\n", &enum_info, info); - ok(lparam2 == sizeof(ICINFO), "Got lparam2 %ld.\n", lparam2); + ok(lparam2 == sizeof(ICINFO), "Got lparam2 %Id.\n", lparam2); - ok(!info->fccType, "Got unexpected type %#x.\n", info->fccType); - ok(!info->fccHandler, "Got unexpected handler %#x.\n", info->fccHandler); - ok(!info->dwFlags, "Got unexpected flags %#x.\n", info->dwFlags); - ok(!info->dwVersion, "Got unexpected version %#x.\n", info->dwVersion); - ok(info->dwVersionICM == ICVERSION, "Got unexpected ICM version %#x.\n", info->dwVersionICM); + ok(!info->fccType, "Got unexpected type %#lx.\n", info->fccType); + ok(!info->fccHandler, "Got unexpected handler %#lx.\n", info->fccHandler); + ok(!info->dwFlags, "Got unexpected flags %#lx.\n", info->dwFlags); + ok(!info->dwVersion, "Got unexpected version %#lx.\n", info->dwVersion); + ok(info->dwVersionICM == ICVERSION, "Got unexpected ICM version %#lx.\n", info->dwVersionICM); ok(!info->szName[0], "Got unexpected name %s.\n", wine_dbgstr_w(info->szName)); ok(!info->szDescription[0], "Got unexpected name %s.\n", wine_dbgstr_w(info->szDescription)); ok(!info->szDriver[0], "Got unexpected driver %s.\n", wine_dbgstr_w(info->szDriver)); @@ -418,17 +418,17 @@ static void test_ICInfo(void) info.dwSize = sizeof(info); if (!ICInfo(0, i++, &info)) break; - trace("Codec name: %s, fccHandler: 0x%08x\n", wine_dbgstr_w(info.szName), info.fccHandler); + trace("Codec name: %s, fccHandler: 0x%08lx\n", wine_dbgstr_w(info.szName), info.fccHandler); ok(info.fccType, "Expected nonzero type.\n"); ok(info.fccHandler, "Expected nonzero handler.\n"); - ok(!info.dwFlags, "Got unexpected flags %#x.\n", info.dwFlags); - ok(!info.dwVersion, "Got unexpected version %#x.\n", info.dwVersion); - ok(info.dwVersionICM == ICVERSION, "Got unexpected ICM version %#x.\n", info.dwVersionICM); + ok(!info.dwFlags, "Got unexpected flags %#lx.\n", info.dwFlags); + ok(!info.dwVersion, "Got unexpected version %#lx.\n", info.dwVersion); + ok(info.dwVersionICM == ICVERSION, "Got unexpected ICM version %#lx.\n", info.dwVersionICM); ok(!info.szName[0], "Got unexpected name %s.\n", wine_dbgstr_w(info.szName)); ok(!info.szDescription[0], "Got unexpected name %s.\n", wine_dbgstr_w(info.szDescription)); ok(ICInfo(info.fccType, info.fccHandler, &info2), - "ICInfo failed on fcc 0x%08x\n", info.fccHandler); + "ICInfo failed on fcc 0x%08lx\n", info.fccHandler); fcc = (unsigned char *)&info.fccHandler; if (!isalpha(fcc[0])) continue; @@ -437,18 +437,18 @@ static void test_ICInfo(void) /* Test getting info with a different case - bug 41602 */ fcc[0] ^= 0x20; ok(ICInfo(info.fccType, info.fccHandler, &info2), - "ICInfo failed on fcc 0x%08x\n", info.fccHandler); + "ICInfo failed on fcc 0x%08lx\n", info.fccHandler); } ok(found != 0, "expected at least one codec\n"); memset(&info, 0x55, sizeof(info)); info.dwSize = sizeof(info); ok(!ICInfo(ICTYPE_VIDEO, mmioFOURCC('f','a','k','e'), &info), "expected failure\n"); - ok(info.fccType == ICTYPE_VIDEO, "got 0x%08x\n", info.fccType); - ok(info.fccHandler == mmioFOURCC('f','a','k','e'), "got 0x%08x\n", info.fccHandler); - ok(!info.dwFlags, "Got unexpected flags %#x.\n", info.dwFlags); - ok(!info.dwVersion, "Got unexpected version %#x.\n", info.dwVersion); - ok(info.dwVersionICM == ICVERSION, "Got unexpected ICM version %#x.\n", info.dwVersionICM); + ok(info.fccType == ICTYPE_VIDEO, "got 0x%08lx\n", info.fccType); + ok(info.fccHandler == mmioFOURCC('f','a','k','e'), "got 0x%08lx\n", info.fccHandler); + ok(!info.dwFlags, "Got unexpected flags %#lx.\n", info.dwFlags); + ok(!info.dwVersion, "Got unexpected version %#lx.\n", info.dwVersion); + ok(info.dwVersionICM == ICVERSION, "Got unexpected ICM version %#lx.\n", info.dwVersionICM); ok(!info.szName[0], "Got unexpected name %s.\n", wine_dbgstr_w(info.szName)); ok(!info.szDescription[0], "Got unexpected name %s.\n", wine_dbgstr_w(info.szDescription)); ok(!info.szDriver[0], "Got unexpected driver %s.\n", wine_dbgstr_w(info.szDriver)); @@ -461,17 +461,17 @@ static void test_ICInfo(void) size = sizeof(buffer); res = RegQueryValueExA(key, "wine.test", NULL, NULL, (BYTE *)buffer, &size); - ok(!res, "Failed to query value, error %d.\n", res); + ok(!res, "Failed to query value, error %ld.\n", res); ok(!strcmp(buffer, "bogus"), "Got unexpected value \"%s\".\n", buffer); memset(&info, 0x55, sizeof(info)); info.dwSize = sizeof(info); ok(ICInfo(test_type, test_handler, &info), "Expected success.\n"); - ok(info.fccType == test_type, "Got unexpected type %#x.\n", info.fccType); - ok(info.fccHandler == test_handler, "Got unexpected handler %#x.\n", info.fccHandler); - ok(!info.dwFlags, "Got unexpected flags %#x.\n", info.dwFlags); - ok(!info.dwVersion, "Got unexpected version %#x.\n", info.dwVersion); - ok(info.dwVersionICM == ICVERSION, "Got unexpected ICM version %#x.\n", info.dwVersionICM); + ok(info.fccType == test_type, "Got unexpected type %#lx.\n", info.fccType); + ok(info.fccHandler == test_handler, "Got unexpected handler %#lx.\n", info.fccHandler); + ok(!info.dwFlags, "Got unexpected flags %#lx.\n", info.dwFlags); + ok(!info.dwVersion, "Got unexpected version %#lx.\n", info.dwVersion); + ok(info.dwVersionICM == ICVERSION, "Got unexpected ICM version %#lx.\n", info.dwVersionICM); ok(!info.szName[0], "Got unexpected name %s.\n", wine_dbgstr_w(info.szName)); ok(!info.szDescription[0], "Got unexpected name %s.\n", wine_dbgstr_w(info.szDescription)); ok(!lstrcmpW(info.szDriver, L"bogus"), "Got unexpected driver %s.\n", wine_dbgstr_w(info.szDriver)); @@ -484,7 +484,7 @@ static void test_ICInfo(void) ok(ret, "Failed to remove driver.\n"); res = RegDeleteValueA(key, "wine.test"); - ok(res == ERROR_FILE_NOT_FOUND, "Got error %u.\n", res); + ok(res == ERROR_FILE_NOT_FOUND, "Got error %lu.\n", res); RegCloseKey(key); } else @@ -495,11 +495,11 @@ static void test_ICInfo(void) memset(&info, 0x55, sizeof(info)); info.dwSize = sizeof(info); ok(ICInfo(test_type, test_handler, &info), "Expected success.\n"); - ok(info.fccType == test_type, "Got unexpected type %#x.\n", info.fccType); - ok(info.fccHandler == test_handler, "Got unexpected handler %#x.\n", info.fccHandler); - ok(!info.dwFlags, "Got unexpected flags %#x.\n", info.dwFlags); - ok(!info.dwVersion, "Got unexpected version %#x.\n", info.dwVersion); - ok(info.dwVersionICM == ICVERSION, "Got unexpected ICM version %#x.\n", info.dwVersionICM); + ok(info.fccType == test_type, "Got unexpected type %#lx.\n", info.fccType); + ok(info.fccHandler == test_handler, "Got unexpected handler %#lx.\n", info.fccHandler); + ok(!info.dwFlags, "Got unexpected flags %#lx.\n", info.dwFlags); + ok(!info.dwVersion, "Got unexpected version %#lx.\n", info.dwVersion); + ok(info.dwVersionICM == ICVERSION, "Got unexpected ICM version %#lx.\n", info.dwVersionICM); ok(!info.szName[0], "Got unexpected name %s.\n", wine_dbgstr_w(info.szName)); ok(!info.szDescription[0], "Got unexpected name %s.\n", wine_dbgstr_w(info.szDescription)); ok(!lstrcmpW(info.szDriver, L"bogus"), "Got unexpected driver %s.\n", wine_dbgstr_w(info.szDriver)); @@ -518,11 +518,11 @@ static void test_ICInfo(void) memset(&enum_info, 0x55, sizeof(enum_info)); enum_info.dwSize = sizeof(enum_info); ok(ICInfo(test_type, test_handler, &enum_info), "Expected success.\n"); - ok(!enum_info.fccType, "Got unexpected type %#x.\n", enum_info.fccType); - ok(!enum_info.fccHandler, "Got unexpected handler %#x.\n", enum_info.fccHandler); - ok(!enum_info.dwFlags, "Got unexpected flags %#x.\n", enum_info.dwFlags); - ok(enum_info.dwVersion == 0xdeadbeef, "Got unexpected version %#x.\n", enum_info.dwVersion); - ok(enum_info.dwVersionICM == ICVERSION, "Got unexpected ICM version %#x.\n", enum_info.dwVersionICM); + ok(!enum_info.fccType, "Got unexpected type %#lx.\n", enum_info.fccType); + ok(!enum_info.fccHandler, "Got unexpected handler %#lx.\n", enum_info.fccHandler); + ok(!enum_info.dwFlags, "Got unexpected flags %#lx.\n", enum_info.dwFlags); + ok(enum_info.dwVersion == 0xdeadbeef, "Got unexpected version %#lx.\n", enum_info.dwVersion); + ok(enum_info.dwVersionICM == ICVERSION, "Got unexpected ICM version %#lx.\n", enum_info.dwVersionICM); ok(!enum_info.szName[0], "Got unexpected name %s.\n", wine_dbgstr_w(enum_info.szName)); ok(!enum_info.szDescription[0], "Got unexpected name %s.\n", wine_dbgstr_w(enum_info.szDescription)); ok(!enum_info.szDriver[0], "Got unexpected driver %s.\n", wine_dbgstr_w(enum_info.szDriver)); @@ -531,11 +531,11 @@ static void test_ICInfo(void) memset(&enum_info, 0x55, sizeof(enum_info)); enum_info.dwSize = sizeof(enum_info); ok(ICInfo(test_type, 0, &enum_info), "Expected success.\n"); - ok(!enum_info.fccType, "Got unexpected type %#x.\n", enum_info.fccType); - ok(!enum_info.fccHandler, "Got unexpected handler %#x.\n", enum_info.fccHandler); - ok(!enum_info.dwFlags, "Got unexpected flags %#x.\n", enum_info.dwFlags); - ok(enum_info.dwVersion == 0xdeadbeef, "Got unexpected version %#x.\n", enum_info.dwVersion); - ok(enum_info.dwVersionICM == ICVERSION, "Got unexpected ICM version %#x.\n", enum_info.dwVersionICM); + ok(!enum_info.fccType, "Got unexpected type %#lx.\n", enum_info.fccType); + ok(!enum_info.fccHandler, "Got unexpected handler %#lx.\n", enum_info.fccHandler); + ok(!enum_info.dwFlags, "Got unexpected flags %#lx.\n", enum_info.dwFlags); + ok(enum_info.dwVersion == 0xdeadbeef, "Got unexpected version %#lx.\n", enum_info.dwVersion); + ok(enum_info.dwVersionICM == ICVERSION, "Got unexpected ICM version %#lx.\n", enum_info.dwVersionICM); ok(!enum_info.szName[0], "Got unexpected name %s.\n", wine_dbgstr_w(enum_info.szName)); ok(!enum_info.szDescription[0], "Got unexpected name %s.\n", wine_dbgstr_w(enum_info.szDescription)); ok(!enum_info.szDriver[0], "Got unexpected driver %s.\n", wine_dbgstr_w(enum_info.szDriver)); @@ -565,7 +565,7 @@ static LRESULT CALLBACK gdf_driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, LRESULT ret = 0; if (winetest_debug > 1) - trace("(%#lx, %p, %#x, %#lx, %#lx)\n", id, driver, msg, lparam1, lparam2); + trace("(%#Ix, %p, %#x, %#Ix, %#Ix)\n", id, driver, msg, lparam1, lparam2); switch(msg) { @@ -579,23 +579,23 @@ static LRESULT CALLBACK gdf_driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, BITMAPINFOHEADER *out = (BITMAPINFOHEADER *)lparam2; DWORD expected_size; - ok(lparam1 == (LPARAM)&gdf_in, "got input %#lx\n", lparam1); + ok(lparam1 == (LPARAM)&gdf_in, "got input %#Ix\n", lparam1); if (!out) return ICERR_OK; ok(out == gdf_out, "got output %p\n", out); - ok(out->biSize == sizeof(*out), "got size %d\n", out->biSize); + ok(out->biSize == sizeof(*out), "got size %ld\n", out->biSize); expected_size = get_size_image(out->biWidth, out->biHeight, out->biBitCount); - ok(out->biSizeImage == expected_size, "expected image size %d, got %d\n", + ok(out->biSizeImage == expected_size, "expected image size %ld, got %ld\n", expected_size, out->biSizeImage); ok(out->biPlanes == 0xcccc, "got planes %d\n", out->biPlanes); ok(out->biXPelsPerMeter == 0xcccccccc && out->biYPelsPerMeter == 0xcccccccc, - "got resolution %dx%d\n", out->biXPelsPerMeter, out->biYPelsPerMeter); - ok(out->biClrUsed == 0xcccccccc, "got biClrUsed %u\n", out->biClrUsed); - ok(out->biClrImportant == 0xcccccccc, "got biClrImportant %u\n", out->biClrImportant); + "got resolution %ldx%ld\n", out->biXPelsPerMeter, out->biYPelsPerMeter); + ok(out->biClrUsed == 0xcccccccc, "got biClrUsed %lu\n", out->biClrUsed); + ok(out->biClrImportant == 0xcccccccc, "got biClrImportant %lu\n", out->biClrImportant); switch (get_display_format_test) { @@ -631,7 +631,7 @@ static LRESULT CALLBACK gdf_driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, { BITMAPINFOHEADER *out = (BITMAPINFOHEADER *)lparam2; - ok(lparam1 == (LPARAM)&gdf_in, "got input %#lx\n", lparam1); + ok(lparam1 == (LPARAM)&gdf_in, "got input %#Ix\n", lparam1); if (out) { ok(out == gdf_out, "got output %p\n", out); @@ -650,7 +650,7 @@ static LRESULT CALLBACK gdf_driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, { BITMAPINFO *out = (BITMAPINFO *)lparam2; - ok(lparam1 == (LPARAM)&gdf_in, "got input %#lx\n", lparam1); + ok(lparam1 == (LPARAM)&gdf_in, "got input %#Ix\n", lparam1); if (out) { ok(out == (BITMAPINFO *)gdf_out, "got output %p\n", out); @@ -668,10 +668,10 @@ static LRESULT CALLBACK gdf_driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, static void check_bitmap_header_(int line, BITMAPINFOHEADER *header, LONG width, LONG height, WORD depth, DWORD compression) { - ok_(__FILE__, line)(header->biWidth == width, "expected %d, got %d\n", width, header->biWidth); - ok_(__FILE__, line)(header->biHeight == height, "expected %d, got %d\n", height, header->biHeight); + ok_(__FILE__, line)(header->biWidth == width, "expected %ld, got %ld\n", width, header->biWidth); + ok_(__FILE__, line)(header->biHeight == height, "expected %ld, got %ld\n", height, header->biHeight); ok_(__FILE__, line)(header->biBitCount == depth, "expected %d, got %d\n", depth, header->biBitCount); - ok_(__FILE__, line)(header->biCompression == compression, "expected %#x, got %#x\n", compression, header->biCompression); + ok_(__FILE__, line)(header->biCompression == compression, "expected %#lx, got %#lx\n", compression, header->biCompression); } #define check_bitmap_header(a,b,c,d,e) check_bitmap_header_(__LINE__,a,b,c,d,e) @@ -773,19 +773,19 @@ static void test_ICGetDisplayFormat(void) ok(hic != NULL, "ICGetDisplayFormat failed\n"); ok(gdf_out->biBitCount == 32 || gdf_out->biBitCount == 24, "got %d\n", gdf_out->biBitCount); - ok(gdf_out->biCompression == BI_RGB, "got %#x\n", gdf_out->biCompression); + ok(gdf_out->biCompression == BI_RGB, "got %#lx\n", gdf_out->biCompression); /* specifying 8 bpp yields a request for palette colours */ hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 8, 30, 40); ok(hic != NULL, "ICGetDisplayFormat failed\n"); check_bitmap_header(gdf_out, 30, 40, 8, BI_RGB); - ok(gdf_out->biClrUsed == 1, "got biClrUsed %u\n", gdf_out->biClrUsed); + ok(gdf_out->biClrUsed == 1, "got biClrUsed %lu\n", gdf_out->biClrUsed); out_bmi = (BITMAPINFO *)gdf_out; ok(!memcmp(&out_bmi->bmiColors[0], &color_yellow, sizeof(color_yellow)), "got wrong colour\n"); lres = ICClose(hic); - ok(lres == ICERR_OK, "got %ld\n", lres); + ok(lres == ICERR_OK, "got %Id\n", lres); ret = ICRemove(ICTYPE_VIDEO, testcc, 0); ok(ret, "ICRemove failed\n");
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ndis.sys/tests/Makefile.in | 1 - dlls/ndis.sys/tests/ndis.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ndis.sys/tests/Makefile.in b/dlls/ndis.sys/tests/Makefile.in index f7073072fbf..8544dfdff2f 100644 --- a/dlls/ndis.sys/tests/Makefile.in +++ b/dlls/ndis.sys/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = ndis.sys IMPORTS = iphlpapi advapi32 ole32 diff --git a/dlls/ndis.sys/tests/ndis.c b/dlls/ndis.sys/tests/ndis.c index 3349f1dae97..9a9ddcf7e7f 100644 --- a/dlls/ndis.sys/tests/ndis.c +++ b/dlls/ndis.sys/tests/ndis.c @@ -54,7 +54,7 @@ static void test_device(const WCHAR *service_name, const MIB_IF_ROW2 *row) if (status != STATUS_SUCCESS) { - skip( "Couldn't open the device (status = %d)\n", status ); + skip( "Couldn't open the device (status = %ld)\n", status ); return; } @@ -63,8 +63,8 @@ static void test_device(const WCHAR *service_name, const MIB_IF_ROW2 *row) iosb.Information = 0xdeadbeef; status = NtDeviceIoControlFile( netdev, NULL, NULL, NULL, &iosb, IOCTL_NDIS_QUERY_GLOBAL_STATS, &oid, sizeof(oid), &medium, sizeof(medium) ); - ok(status == STATUS_INVALID_PARAMETER, "got status %#x\n", status); - ok(iosb.Status == 0xdeadbeef, "got %#x\n", iosb.Status); + ok(status == STATUS_INVALID_PARAMETER, "got status %#lx\n", status); + ok(iosb.Status == 0xdeadbeef, "got %#lx\n", iosb.Status); ok(iosb.Information == 0xdeadbeef, "got size %#Ix\n", iosb.Information); oid = OID_GEN_MEDIA_SUPPORTED;
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/netapi32/tests/Makefile.in | 1 dlls/netapi32/tests/access.c | 90 ++++++++++++++++++++------------------- dlls/netapi32/tests/apibuf.c | 4 +- dlls/netapi32/tests/ds.c | 14 +++--- dlls/netapi32/tests/wksta.c | 20 ++++----- 5 files changed, 64 insertions(+), 65 deletions(-) diff --git a/dlls/netapi32/tests/Makefile.in b/dlls/netapi32/tests/Makefile.in index a41e57406e8..3ca81e6e2bc 100644 --- a/dlls/netapi32/tests/Makefile.in +++ b/dlls/netapi32/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = netapi32.dll IMPORTS = advapi32 netapi32 diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index 0f0ac5417f1..5fdcb1573ea 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -72,13 +72,13 @@ static void run_usergetinfo_tests(void) if((rc = create_test_user()) != NERR_Success ) { - skip("Skipping usergetinfo_tests, create_test_user failed: 0x%08x\n", rc); + skip("Skipping usergetinfo_tests, create_test_user failed: 0x%08lx\n", rc); return; } /* Level 0 */ rc = NetUserGetInfo(NULL, L"testuser", 0, (BYTE **)&ui0); - ok(rc == NERR_Success, "NetUserGetInfo level 0 failed: 0x%08x.\n", rc); + ok(rc == NERR_Success, "NetUserGetInfo level 0 failed: 0x%08lx.\n", rc); ok(!wcscmp(L"testuser", ui0->usri0_name), "Got level 0 name %s.\n", debugstr_w(ui0->usri0_name)); NetApiBufferSize(ui0, &dwSize); ok(dwSize >= (sizeof(USER_INFO_0) + (wcslen(ui0->usri0_name) + 1) * sizeof(WCHAR)), @@ -86,7 +86,7 @@ static void run_usergetinfo_tests(void) /* Level 10 */ rc = NetUserGetInfo(NULL, L"testuser", 10, (BYTE **)&ui10); - ok(rc == NERR_Success, "NetUserGetInfo level 10 failed: 0x%08x.\n", rc); + ok(rc == NERR_Success, "NetUserGetInfo level 10 failed: 0x%08lx.\n", rc); ok(!wcscmp(L"testuser", ui10->usri10_name), "Got level 10 name %s.\n", debugstr_w(ui10->usri10_name)); NetApiBufferSize(ui10, &dwSize); ok(dwSize >= (sizeof(USER_INFO_10) + @@ -101,14 +101,14 @@ static void run_usergetinfo_tests(void) /* NetUserGetInfo should always work for the current user. */ rc = NetUserGetInfo(NULL, user_name, 0, (BYTE **)&ui0); - ok(rc == NERR_Success, "NetUsetGetInfo for current user failed: 0x%08x.\n", rc); + ok(rc == NERR_Success, "NetUsetGetInfo for current user failed: 0x%08lx.\n", rc); NetApiBufferFree(ui0); /* errors handling */ rc = NetUserGetInfo(NULL, L"testuser", 10000, (BYTE **)&ui0); - ok(rc == ERROR_INVALID_LEVEL,"Invalid Level: rc=%d\n",rc); + ok(rc == ERROR_INVALID_LEVEL,"Invalid Level: rc=%ld\n",rc); rc = NetUserGetInfo(NULL, L"Nonexistent User", 0, (BYTE **)&ui0); - ok(rc == NERR_UserNotFound,"Invalid User Name: rc=%d\n",rc); + ok(rc == NERR_UserNotFound,"Invalid User Name: rc=%ld\n",rc); todo_wine { /* FIXME - Currently Wine can't verify whether the network path is good or bad */ rc = NetUserGetInfo(L"\\\\Ba path", L"testuser", 0, (BYTE **)&ui0); @@ -117,15 +117,15 @@ static void run_usergetinfo_tests(void) rc == RPC_S_SERVER_UNAVAILABLE || rc == NERR_WkstaNotStarted || /* workstation service not running */ rc == RPC_S_INVALID_NET_ADDR, /* Some Win7 */ - "Bad Network Path: rc=%d\n",rc); + "Bad Network Path: rc=%ld\n",rc); } rc = NetUserGetInfo(L"", L"testuser", 0, (BYTE **)&ui0); ok(rc == ERROR_BAD_NETPATH || rc == NERR_Success, - "Bad Network Path: rc=%d\n",rc); + "Bad Network Path: rc=%ld\n",rc); rc = NetUserGetInfo(L"\\", L"testuser", 0, (BYTE **)&ui0); - ok(rc == ERROR_INVALID_NAME || rc == ERROR_INVALID_HANDLE,"Invalid Server Name: rc=%d\n",rc); + ok(rc == ERROR_INVALID_NAME || rc == ERROR_INVALID_HANDLE,"Invalid Server Name: rc=%ld\n",rc); rc = NetUserGetInfo(L"\\\\", L"testuser", 0, (BYTE **)&ui0); - ok(rc == ERROR_INVALID_NAME || rc == ERROR_INVALID_HANDLE,"Invalid Server Name: rc=%d\n",rc); + ok(rc == ERROR_INVALID_NAME || rc == ERROR_INVALID_HANDLE,"Invalid Server Name: rc=%ld\n",rc); if(delete_test_user() != NERR_Success) trace("Deleting the test user failed. You might have to manually delete it.\n"); @@ -182,7 +182,7 @@ static void run_usermodalsget_tests(void) USER_MODALS_INFO_2 * umi2 = NULL; rc = NetUserModalsGet(NULL, 2, (BYTE **)&umi2); - ok(rc == ERROR_SUCCESS, "NetUserModalsGet failed, rc = %d\n", rc); + ok(rc == ERROR_SUCCESS, "NetUserModalsGet failed, rc = %ld\n", rc); if (umi2) NetApiBufferFree(umi2); @@ -209,14 +209,14 @@ static void run_userhandling_tests(void) return; } else - ok(ret == NERR_BadUsername, "Got %u.\n", ret); + ok(ret == NERR_BadUsername, "Got %lu.\n", ret); usri.usri1_name = (WCHAR *)L"testuser"; usri.usri1_password = sTooLongPassword; ret = NetUserAdd(NULL, 1, (BYTE *)&usri, NULL); ok(ret == NERR_PasswordTooShort || ret == ERROR_ACCESS_DENIED /* Win2003 */, - "Adding user with too long password returned 0x%08x\n", ret); + "Adding user with too long password returned 0x%08lx\n", ret); usri.usri1_name = sTooLongName; usri.usri1_password = sTooLongPassword; @@ -226,13 +226,13 @@ static void run_userhandling_tests(void) * as the error. NERR_PasswordTooShort is reported for all kind of password related errors. */ ok(ret == NERR_BadUsername || ret == NERR_PasswordTooShort, - "Adding user with too long username/password returned 0x%08x\n", ret); + "Adding user with too long username/password returned 0x%08lx\n", ret); usri.usri1_name = (WCHAR *)L"testuser"; usri.usri1_password = sTestUserOldPass; ret = NetUserAdd(NULL, 5, (BYTE *)&usri, NULL); - ok(ret == ERROR_INVALID_LEVEL, "Adding user with level 5 returned 0x%08x\n", ret); + ok(ret == ERROR_INVALID_LEVEL, "Adding user with level 5 returned 0x%08lx\n", ret); ret = NetUserAdd(NULL, 1, (BYTE *)&usri, NULL); if(ret == ERROR_ACCESS_DENIED) @@ -246,7 +246,7 @@ static void run_userhandling_tests(void) return; } - ok(!ret, "Got %u.\n", ret); + ok(!ret, "Got %lu.\n", ret); /* On Windows XP (and newer), calling NetUserChangePassword with a NULL * domainname parameter creates a user home directory, iff the machine is @@ -260,7 +260,7 @@ static void run_userhandling_tests(void) ok(ret == NERR_Success, "Deleting the user failed.\n"); ret = NetUserDel(NULL, L"testuser"); - ok(ret == NERR_UserNotFound, "Deleting a nonexistent user returned 0x%08x\n",ret); + ok(ret == NERR_UserNotFound, "Deleting a nonexistent user returned 0x%08lx\n",ret); } static void run_localgroupgetinfo_tests(void) @@ -273,7 +273,7 @@ static void run_localgroupgetinfo_tests(void) status = NetLocalGroupGetInfo(NULL, L"Administrators", 1, (BYTE **)&lgi); ok(status == NERR_Success || broken(status == NERR_GroupNotFound), - "NetLocalGroupGetInfo unexpectedly returned %d\n", status); + "NetLocalGroupGetInfo unexpectedly returned %ld\n", status); if (status != NERR_Success) return; trace("Local groupname:%s\n", wine_dbgstr_w( lgi->lgrpi1_name)); @@ -283,7 +283,7 @@ static void run_localgroupgetinfo_tests(void) status = NetLocalGroupGetMembers(NULL, L"Administrators", 3, (BYTE **)&buffer, MAX_PREFERRED_LENGTH, &entries_read, &total_entries, NULL); - ok(status == NERR_Success, "NetLocalGroupGetMembers unexpectedly returned %d\n", status); + ok(status == NERR_Success, "NetLocalGroupGetMembers unexpectedly returned %ld\n", status); ok(entries_read > 0 && total_entries > 0, "Amount of entries is unexpectedly 0\n"); for(i=0;i<entries_read;i++) @@ -344,32 +344,32 @@ static void test_DavGetHTTPFromUNCPath(void) if (0) /* crashes on Windows */ { ret = pDavGetHTTPFromUNCPath(NULL, NULL, NULL); - ok(ret == ERROR_INVALID_PARAMETER, "got %u\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "got %lu\n", ret); size = 0; ret = pDavGetHTTPFromUNCPath(L"", buf, &size); - ok(ret == ERROR_INVALID_PARAMETER, "got %u\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "got %lu\n", ret); ret = pDavGetHTTPFromUNCPath(L"\\\\a\\b", buf, NULL); - ok(ret == ERROR_INVALID_PARAMETER, "got %u\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "got %lu\n", ret); } ret = pDavGetHTTPFromUNCPath(L"", buf, NULL); - ok(ret == ERROR_INVALID_PARAMETER, "got %u\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "got %lu\n", ret); size = 0; ret = pDavGetHTTPFromUNCPath(L"", NULL, &size); - ok(ret == ERROR_INVALID_PARAMETER || ret == ERROR_BAD_NET_NAME /* Win10 1709+ */, "got %u\n", ret); + ok(ret == ERROR_INVALID_PARAMETER || ret == ERROR_BAD_NET_NAME /* Win10 1709+ */, "got %lu\n", ret); size = 0; ret = pDavGetHTTPFromUNCPath(L"\\\\a\\b", NULL, &size); - ok(ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret); + ok(ret == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", ret); buf[0] = 0; size = 0; ret = pDavGetHTTPFromUNCPath(L"\\\\a\\b", buf, &size); - ok(ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret); - ok(size == 11, "got %u\n", size); + ok(ret == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", ret); + ok(size == 11, "got %lu\n", size); for (i = 0; i < ARRAY_SIZE(tests); i++) { @@ -378,16 +378,16 @@ static void test_DavGetHTTPFromUNCPath(void) ret = pDavGetHTTPFromUNCPath( tests[i].path, buf, &size ); todo_wine_if (tests[i].todo) ok(ret == tests[i].ret || broken(ret == tests[i].broken_ret), - "%u: expected %u got %u\n", i, tests[i].ret, ret); + "%lu: expected %lu got %lu\n", i, tests[i].ret, ret); if (!ret) { if (tests[i].ret_path) - ok(!wcscmp(buf, tests[i].ret_path), "%u: expected %s got %s\n", + ok(!wcscmp(buf, tests[i].ret_path), "%lu: expected %s got %s\n", i, wine_dbgstr_w(tests[i].ret_path), wine_dbgstr_w(buf)); - ok(size == wcslen(buf) + 1, "%u: got %u\n", i, size); + ok(size == wcslen(buf) + 1, "%lu: got %lu\n", i, size); } else - ok(size == ARRAY_SIZE(buf), "%u: wrong size %u\n", i, size); + ok(size == ARRAY_SIZE(buf), "%lu: wrong size %lu\n", i, size); } } @@ -437,33 +437,33 @@ static void test_DavGetUNCFromHTTPPath(void) if (0) /* crashes on Windows */ { ret = pDavGetUNCFromHTTPPath(NULL, NULL, NULL); - ok(ret == ERROR_INVALID_PARAMETER, "got %u\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "got %lu\n", ret); ret = pDavGetUNCFromHTTPPath(L"http://server/path", buf, NULL); - ok(ret == ERROR_INVALID_PARAMETER, "got %u\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "got %lu\n", ret); } ret = pDavGetUNCFromHTTPPath(L"", buf, NULL); - ok(ret == ERROR_INVALID_PARAMETER, "got %u\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "got %lu\n", ret); size = 0; ret = pDavGetUNCFromHTTPPath(L"", NULL, &size); - ok(ret == ERROR_INVALID_PARAMETER, "got %u\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "got %lu\n", ret); buf[0] = 0; size = 0; ret = pDavGetUNCFromHTTPPath(L"", buf, &size); - ok(ret == ERROR_INVALID_PARAMETER, "got %u\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "got %lu\n", ret); size = 0; ret = pDavGetUNCFromHTTPPath(L"http://server/path", NULL, &size); - ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); + ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", ret ); buf[0] = 0; size = 0; ret = pDavGetUNCFromHTTPPath(L"http://server/path", buf, &size); - ok(ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret); - ok(size == 25, "got %u\n", size); + ok(ret == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", ret); + ok(size == 25, "got %lu\n", size); for (i = 0; i < ARRAY_SIZE(tests); i++) { @@ -472,16 +472,16 @@ static void test_DavGetUNCFromHTTPPath(void) ret = pDavGetUNCFromHTTPPath( tests[i].path, buf, &size ); todo_wine_if (tests[i].todo) ok(ret == tests[i].ret || broken(ret == tests[i].broken_ret), - "%u: expected %u got %u\n", i, tests[i].ret, ret); + "%lu: expected %lu got %lu\n", i, tests[i].ret, ret); if (!ret) { if (tests[i].ret_path) - ok(!wcscmp(buf, tests[i].ret_path), "%u: expected %s got %s\n", + ok(!wcscmp(buf, tests[i].ret_path), "%lu: expected %s got %s\n", i, wine_dbgstr_w(tests[i].ret_path), wine_dbgstr_w(buf)); - ok(size == wcslen(buf) + 1, "%u: got %u\n", i, size); + ok(size == wcslen(buf) + 1, "%lu: got %lu\n", i, size); } else - ok(size == ARRAY_SIZE(buf), "%u: wrong size %u\n", i, size); + ok(size == ARRAY_SIZE(buf), "%lu: wrong size %lu\n", i, size); } } @@ -496,10 +496,10 @@ START_TEST(access) size = ARRAY_SIZE(user_name); ret = GetUserNameW(user_name, &size); - ok(ret, "Failed to get user name, error %u.\n", GetLastError()); + ok(ret, "Failed to get user name, error %lu.\n", GetLastError()); size = ARRAY_SIZE(computer_name); ret = GetComputerNameW(computer_name, &size); - ok(ret, "Failed to get computer name, error %u.\n", GetLastError()); + ok(ret, "Failed to get computer name, error %lu.\n", GetLastError()); run_userhandling_tests(); run_usergetinfo_tests(); diff --git a/dlls/netapi32/tests/apibuf.c b/dlls/netapi32/tests/apibuf.c index 9063a4f6c55..777291dd654 100644 --- a/dlls/netapi32/tests/apibuf.c +++ b/dlls/netapi32/tests/apibuf.c @@ -71,13 +71,13 @@ static void run_apibuf_tests(void) SetLastError(0xdeadbeef); res = NetApiBufferAllocate(0, NULL); ok( (res == ERROR_INVALID_PARAMETER) && (GetLastError() == 0xdeadbeef), - "returned %d with 0x%x (expected ERROR_INVALID_PARAMETER with " + "returned %ld with 0x%lx (expected ERROR_INVALID_PARAMETER with " "0xdeadbeef)\n", res, GetLastError()); SetLastError(0xdeadbeef); res = NetApiBufferAllocate(1024, NULL); ok( (res == ERROR_INVALID_PARAMETER) && (GetLastError() == 0xdeadbeef), - "returned %d with 0x%x (expected ERROR_INVALID_PARAMETER with " + "returned %ld with 0x%lx (expected ERROR_INVALID_PARAMETER with " "0xdeadbeef)\n", res, GetLastError()); } diff --git a/dlls/netapi32/tests/ds.c b/dlls/netapi32/tests/ds.c index 10cbddab6cb..5208cd72012 100644 --- a/dlls/netapi32/tests/ds.c +++ b/dlls/netapi32/tests/ds.c @@ -33,18 +33,18 @@ static void test_params(void) SetLastError(0xdeadbeef); ret = DsRoleGetPrimaryDomainInformation(NULL, DsRolePrimaryDomainInfoBasic, NULL); - ok( ret == ERROR_INVALID_PARAMETER, "Expected error ERROR_INVALID_PARAMETER, got (%d)\n", ret); + ok( ret == ERROR_INVALID_PARAMETER, "Expected error ERROR_INVALID_PARAMETER, got (%ld)\n", ret); SetLastError(0xdeadbeef); ret = DsRoleGetPrimaryDomainInformation(NULL, 0, NULL); - ok( ret == ERROR_INVALID_PARAMETER, "Expected error ERROR_INVALID_PARAMETER, got (%d)\n", ret); + ok( ret == ERROR_INVALID_PARAMETER, "Expected error ERROR_INVALID_PARAMETER, got (%ld)\n", ret); SetLastError(0xdeadbeef); ret = DsRoleGetPrimaryDomainInformation(NULL, 4, NULL); - ok( ret == ERROR_INVALID_PARAMETER, "Expected error ERROR_INVALID_PARAMETER, got (%d)\n", ret); + ok( ret == ERROR_INVALID_PARAMETER, "Expected error ERROR_INVALID_PARAMETER, got (%ld)\n", ret); SetLastError(0xdeadbeef); ret = DsRoleGetPrimaryDomainInformation(NULL, 4, (BYTE **)&dpdi); - ok( ret == ERROR_INVALID_PARAMETER, "Expected error ERROR_INVALID_PARAMETER, got (%d)\n", ret); + ok( ret == ERROR_INVALID_PARAMETER, "Expected error ERROR_INVALID_PARAMETER, got (%ld)\n", ret); } static void test_get(void) @@ -56,17 +56,17 @@ static void test_get(void) SetLastError(0xdeadbeef); ret = DsRoleGetPrimaryDomainInformation(NULL, DsRolePrimaryDomainInfoBasic, (BYTE **)&dpdi); - ok( ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got (%d)\n", ret); + ok( ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got (%ld)\n", ret); DsRoleFreeMemory(dpdi); SetLastError(0xdeadbeef); ret = DsRoleGetPrimaryDomainInformation(NULL, DsRoleUpgradeStatus, (BYTE **)&dusi); - todo_wine { ok( ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got (%d)\n", ret); } + todo_wine { ok( ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got (%ld)\n", ret); } DsRoleFreeMemory(dusi); SetLastError(0xdeadbeef); ret = DsRoleGetPrimaryDomainInformation(NULL, DsRoleOperationState, (BYTE **)&dosi); - todo_wine { ok( ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got (%d)\n", ret); } + todo_wine { ok( ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got (%ld)\n", ret); } DsRoleFreeMemory(dosi); } diff --git a/dlls/netapi32/tests/wksta.c b/dlls/netapi32/tests/wksta.c index f53fcbbcce1..7b6e1bb97ee 100644 --- a/dlls/netapi32/tests/wksta.c +++ b/dlls/netapi32/tests/wksta.c @@ -62,7 +62,7 @@ static void run_wkstausergetinfo_tests(void) skip("Workstation service not running\n"); return; } - ok(!rc && ui0, "got %d and %p (expected NERR_Success and != NULL\n", rc, ui0); + ok(!rc && ui0, "got %ld and %p (expected NERR_Success and != NULL\n", rc, ui0); ok(!wcscmp(user_name, ui0->wkui0_username), "Expected username %s, got %s.\n", debugstr_w(user_name), debugstr_w(ui0->wkui0_username)); NetApiBufferSize(ui0, &dwSize); @@ -110,7 +110,7 @@ static void run_wkstatransportenum_tests(void) apiReturn = NetWkstaTransportEnum(NULL, 1, NULL, MAX_PREFERRED_LENGTH, NULL, &totalEntries, NULL); ok(apiReturn == ERROR_INVALID_LEVEL || apiReturn == ERROR_INVALID_PARAMETER, - "NetWkstaTransportEnum returned %d\n", apiReturn); + "NetWkstaTransportEnum returned %ld\n", apiReturn); /* 2nd check: is param 5 passed? (only if level passes?) */ apiReturn = NetWkstaTransportEnum(NULL, 0, NULL, MAX_PREFERRED_LENGTH, @@ -121,25 +121,25 @@ static void run_wkstatransportenum_tests(void) return; ok(apiReturn == STATUS_ACCESS_VIOLATION || apiReturn == ERROR_INVALID_PARAMETER, - "NetWkstaTransportEnum returned %d\n", apiReturn); + "NetWkstaTransportEnum returned %ld\n", apiReturn); /* 3rd check: is param 3 passed? */ apiReturn = NetWkstaTransportEnum(NULL, 0, NULL, MAX_PREFERRED_LENGTH, NULL, NULL, NULL); ok(apiReturn == STATUS_ACCESS_VIOLATION || apiReturn == RPC_X_NULL_REF_POINTER || apiReturn == ERROR_INVALID_PARAMETER, - "NetWkstaTransportEnum returned %d\n", apiReturn); + "NetWkstaTransportEnum returned %ld\n", apiReturn); /* 4th check: is param 6 passed? */ apiReturn = NetWkstaTransportEnum(NULL, 0, &bufPtr, MAX_PREFERRED_LENGTH, &entriesRead, NULL, NULL); ok(apiReturn == RPC_X_NULL_REF_POINTER, - "NetWkstaTransportEnum returned %d\n", apiReturn); + "NetWkstaTransportEnum returned %ld\n", apiReturn); /* final check: valid return, actually get data back */ apiReturn = NetWkstaTransportEnum(NULL, 0, &bufPtr, MAX_PREFERRED_LENGTH, &entriesRead, &totalEntries, NULL); ok(apiReturn == NERR_Success || apiReturn == ERROR_NETWORK_UNREACHABLE || apiReturn == NERR_WkstaNotStarted, - "NetWkstaTransportEnum returned %d\n", apiReturn); + "NetWkstaTransportEnum returned %ld\n", apiReturn); if (apiReturn == NERR_Success) { /* WKSTA_TRANSPORT_INFO_0 *transports = (WKSTA_TRANSPORT_INFO_0 *)bufPtr; */ @@ -158,11 +158,11 @@ static void run_wkstajoininfo_tests(void) NETSETUP_JOIN_STATUS buffertype = 0xdada; ret = NetGetJoinInformation(NULL, NULL, NULL); - ok(ret == ERROR_INVALID_PARAMETER, "NetJoinGetInformation returned unexpected 0x%08x\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "NetJoinGetInformation returned unexpected 0x%08lx\n", ret); ok(buffertype == 0xdada, "buffertype set to unexpected value %d\n", buffertype); ret = NetGetJoinInformation(NULL, &buffer, &buffertype); - ok(ret == NERR_Success, "NetJoinGetInformation returned unexpected 0x%08x\n", ret); + ok(ret == NERR_Success, "NetJoinGetInformation returned unexpected 0x%08lx\n", ret); ok(buffertype != 0xdada && buffertype != NetSetupUnknownStatus, "buffertype set to unexpected value %d\n", buffertype); trace("workstation joined to %s with status %d\n", wine_dbgstr_w(buffer), buffertype); NetApiBufferFree(buffer); @@ -177,10 +177,10 @@ START_TEST(wksta) size = ARRAY_SIZE(user_name); ret = GetUserNameW(user_name, &size); - ok(ret, "Failed to get user name, error %u.\n", GetLastError()); + ok(ret, "Failed to get user name, error %lu.\n", GetLastError()); size = ARRAY_SIZE(computer_name); ret = GetComputerNameW(computer_name, &size); - ok(ret, "Failed to get computer name, error %u.\n", GetLastError()); + ok(ret, "Failed to get computer name, error %lu.\n", GetLastError()); if (pNetpGetComputerName) run_get_comp_name_tests();
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/netcfgx/tests/Makefile.in | 1 - dlls/netcfgx/tests/netcfgx.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/netcfgx/tests/Makefile.in b/dlls/netcfgx/tests/Makefile.in index 3caf6c9da7a..699af30f213 100644 --- a/dlls/netcfgx/tests/Makefile.in +++ b/dlls/netcfgx/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = netcfgx.dll IMPORTS = uuid ole32 diff --git a/dlls/netcfgx/tests/netcfgx.c b/dlls/netcfgx/tests/netcfgx.c index 31558f44f42..ab8104fa611 100644 --- a/dlls/netcfgx/tests/netcfgx.c +++ b/dlls/netcfgx/tests/netcfgx.c @@ -36,11 +36,11 @@ static void create_configuration(void) if(SUCCEEDED(hr)) { hr = INetCfg_QueryInterface(config, &IID_INetCfgLock, (LPVOID*)&netlock); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = INetCfgLock_AcquireWriteLock(netlock, 5000, L"MY CLIENT", &client); ok(hr == S_OK || - hr == E_ACCESSDENIED /* Not run as admin */, "got 0x%08x\n", hr); + hr == E_ACCESSDENIED /* Not run as admin */, "got 0x%08lx\n", hr); if(hr == S_OK) { trace("Lock value: %s\n", wine_dbgstr_w(client)); @@ -50,27 +50,27 @@ static void create_configuration(void) trace("Not run with Admin permissions\n"); hr = INetCfg_Initialize(config, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); /* AcquireWriteLock needs to be run before Initialize */ hr = INetCfgLock_AcquireWriteLock(netlock, 5000, L"MY CLIENT", &client); - todo_wine ok(hr == NETCFG_E_ALREADY_INITIALIZED || hr == E_ACCESSDENIED, "got 0x%08x\n", hr); + todo_wine ok(hr == NETCFG_E_ALREADY_INITIALIZED || hr == E_ACCESSDENIED, "got 0x%08lx\n", hr); hr = INetCfg_FindComponent(config, L"MS_TCPIP", &component); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(hr == S_OK, "got 0x%08lx\n", hr); if(hr == S_OK) { INetCfgComponent_Release(component); } hr = INetCfg_Apply(config); - todo_wine ok(hr == S_OK || hr == NETCFG_E_NO_WRITE_LOCK, "got 0x%08x\n", hr); + todo_wine ok(hr == S_OK || hr == NETCFG_E_NO_WRITE_LOCK, "got 0x%08lx\n", hr); hr = INetCfg_Uninitialize(config); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); hr = INetCfgLock_ReleaseWriteLock(netlock); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08lx\n", hr); INetCfgLock_Release(netlock); INetCfg_Release(config);
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/netprofm/tests/Makefile.in | 1 dlls/netprofm/tests/list.c | 96 ++++++++++++++++++++------------------- 2 files changed, 48 insertions(+), 49 deletions(-) diff --git a/dlls/netprofm/tests/Makefile.in b/dlls/netprofm/tests/Makefile.in index 1b40b618f04..3b5be5c5453 100644 --- a/dlls/netprofm/tests/Makefile.in +++ b/dlls/netprofm/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = netprofm.dll IMPORTS = oleaut32 ole32 diff --git a/dlls/netprofm/tests/list.c b/dlls/netprofm/tests/list.c index 56052ceb512..9295eeebc7c 100644 --- a/dlls/netprofm/tests/list.c +++ b/dlls/netprofm/tests/list.c @@ -37,49 +37,49 @@ static void test_INetwork( INetwork *network ) str = NULL; hr = INetwork_GetName( network, &str ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( hr == S_OK, "got %08lx\n", hr ); todo_wine ok( str != NULL, "str not set\n" ); if (str) trace( "name %s\n", wine_dbgstr_w(str) ); SysFreeString( str ); str = NULL; hr = INetwork_GetDescription( network, &str ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( hr == S_OK, "got %08lx\n", hr ); todo_wine ok( str != NULL, "str not set\n" ); if (str) trace( "description %s\n", wine_dbgstr_w(str) ); SysFreeString( str ); memset( &id, 0, sizeof(id) ); hr = INetwork_GetNetworkId( network, &id ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); trace("network id %s\n", wine_dbgstr_guid(&id)); domain_type = 0xdeadbeef; hr = INetwork_GetDomainType( network, &domain_type ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( domain_type != 0xdeadbeef, "domain_type not set\n" ); trace( "domain type %08x\n", domain_type ); category = 0xdeadbeef; hr = INetwork_GetCategory( network, &category ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( category != 0xdeadbeef, "category not set\n" ); trace( "category %08x\n", category ); connectivity = 0xdeadbeef; hr = INetwork_GetConnectivity( network, &connectivity ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( connectivity != 0xdeadbeef, "connectivity not set\n" ); trace( "connectivity %08x\n", connectivity ); connected = 0xdead; hr = INetwork_get_IsConnected( network, &connected ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); trace("connected %d\n", connected); connected = 0xdead; hr = INetwork_get_IsConnectedToInternet( network, &connected ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); trace("connected to internet %d\n", connected); } @@ -95,39 +95,39 @@ static void test_INetworkConnection( INetworkConnection *conn ) memset( &id, 0, sizeof(id) ); hr = INetworkConnection_GetAdapterId( conn, &id ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); trace("adapter id %s\n", wine_dbgstr_guid(&id)); memset( &id, 0, sizeof(id) ); hr = INetworkConnection_GetConnectionId( conn, &id ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); trace("connection id %s\n", wine_dbgstr_guid(&id)); connectivity = 0xdeadbeef; hr = INetworkConnection_GetConnectivity( conn, &connectivity ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( connectivity != 0xdeadbeef, "connectivity not set\n" ); trace( "connectivity %08x\n", connectivity ); domain_type = 0xdeadbeef; hr = INetworkConnection_GetDomainType( conn, &domain_type ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( domain_type != 0xdeadbeef, "domain_type not set\n" ); trace( "domain type %08x\n", domain_type ); connected = 0xdead; hr = INetworkConnection_get_IsConnected( conn, &connected ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); trace("connected %d\n", connected); connected = 0xdead; hr = INetworkConnection_get_IsConnectedToInternet( conn, &connected ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); trace("connected to internet %d\n", connected); network = NULL; hr = INetworkConnection_GetNetwork( conn, &network ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); if (network) { test_INetwork( network ); @@ -136,7 +136,7 @@ static void test_INetworkConnection( INetworkConnection *conn ) conn_cost = NULL; hr = INetworkConnection_QueryInterface( conn, &IID_INetworkConnectionCost, (void **)&conn_cost ); - ok( hr == S_OK || broken(hr == E_NOINTERFACE), "got %08x\n", hr ); + ok( hr == S_OK || broken(hr == E_NOINTERFACE), "got %08lx\n", hr ); if (conn_cost) { DWORD cost; @@ -144,13 +144,13 @@ static void test_INetworkConnection( INetworkConnection *conn ) cost = 0xdeadbeef; hr = INetworkConnectionCost_GetCost( conn_cost, &cost ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( cost != 0xdeadbeef, "cost not set\n" ); - trace("cost %08x\n", cost); + trace("cost %08lx\n", cost); memset( &status, 0,sizeof(status) ); hr = INetworkConnectionCost_GetDataPlanStatus( conn_cost, &status ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); trace("InterfaceGuid %s\n", wine_dbgstr_guid(&status.InterfaceGuid)); INetworkConnectionCost_Release( conn_cost ); @@ -242,104 +242,104 @@ static void test_INetworkListManager( void ) connectivity = 0xdeadbeef; hr = INetworkListManager_GetConnectivity( mgr, &connectivity ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( connectivity != 0xdeadbeef, "unchanged value\n" ); trace( "GetConnectivity: %08x\n", connectivity ); connected = 0xdead; hr = INetworkListManager_IsConnected( mgr, &connected ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( connected == VARIANT_TRUE || connected == VARIANT_FALSE, "expected boolean value\n" ); connected = 0xdead; hr = INetworkListManager_IsConnectedToInternet( mgr, &connected ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( connected == VARIANT_TRUE || connected == VARIANT_FALSE, "expected boolean value\n" ); /* INetworkCostManager is supported starting Win8 */ cost_mgr = NULL; hr = INetworkListManager_QueryInterface( mgr, &IID_INetworkCostManager, (void **)&cost_mgr ); - ok( hr == S_OK || broken(hr == E_NOINTERFACE), "got %08x\n", hr ); + ok( hr == S_OK || broken(hr == E_NOINTERFACE), "got %08lx\n", hr ); if (cost_mgr) { DWORD cost; NLM_DATAPLAN_STATUS status; hr = INetworkCostManager_GetCost( cost_mgr, NULL, NULL ); - ok( hr == E_POINTER, "got %08x\n", hr ); + ok( hr == E_POINTER, "got %08lx\n", hr ); cost = 0xdeadbeef; hr = INetworkCostManager_GetCost( cost_mgr, &cost, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( cost != 0xdeadbeef, "cost not set\n" ); hr = INetworkCostManager_GetDataPlanStatus( cost_mgr, NULL, NULL ); - ok( hr == E_POINTER, "got %08x\n", hr ); + ok( hr == E_POINTER, "got %08lx\n", hr ); hr = INetworkCostManager_GetDataPlanStatus( cost_mgr, &status, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); INetworkCostManager_Release( cost_mgr ); } hr = INetworkListManager_QueryInterface( mgr, &IID_IConnectionPointContainer, (void**)&cpc ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ref1 = IConnectionPointContainer_AddRef( cpc ); hr = IConnectionPointContainer_FindConnectionPoint( cpc, &IID_INetworkListManagerEvents, &pt ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ref2 = IConnectionPointContainer_AddRef( cpc ); - ok( ref2 == ref1 + 2, "Expected refcount %d, got %d\n", ref1 + 2, ref2 ); + ok( ref2 == ref1 + 2, "Expected refcount %ld, got %ld\n", ref1 + 2, ref2 ); IConnectionPointContainer_Release( cpc ); IConnectionPointContainer_Release( cpc ); hr = IConnectionPoint_GetConnectionPointContainer( pt, &cpc2 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( cpc2 == cpc, "Expected cpc2 == %p, but got %p\n", cpc, cpc2 ); IConnectionPointContainer_Release( cpc2 ); memset( &iid, 0, sizeof(iid) ); hr = IConnectionPoint_GetConnectionInterface( pt, &iid ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( !memcmp( &iid, &IID_INetworkListManagerEvents, sizeof(iid) ), "Expected iid to be IID_INetworkListManagerEvents\n" ); hr = IConnectionPoint_Advise( pt, (IUnknown*)&mgr_sink_unk, &cookie); - ok( hr == CO_E_FAILEDTOOPENTHREADTOKEN, "Advise failed: %08x\n", hr ); + ok( hr == CO_E_FAILEDTOOPENTHREADTOKEN, "Advise failed: %08lx\n", hr ); hr = IConnectionPoint_Advise( pt, (IUnknown*)&mgr_sink, &cookie); - ok( hr == S_OK, "Advise failed: %08x\n", hr ); + ok( hr == S_OK, "Advise failed: %08lx\n", hr ); hr = IConnectionPoint_Unadvise( pt, 0xdeadbeef ); - ok( hr == OLE_E_NOCONNECTION || hr == CO_E_FAILEDTOIMPERSONATE, "Unadvise failed: %08x\n", hr ); + ok( hr == OLE_E_NOCONNECTION || hr == CO_E_FAILEDTOIMPERSONATE, "Unadvise failed: %08lx\n", hr ); hr = IConnectionPoint_Unadvise( pt, cookie ); - ok( hr == S_OK, "Unadvise failed: %08x\n", hr ); + ok( hr == S_OK, "Unadvise failed: %08lx\n", hr ); hr = IConnectionPointContainer_FindConnectionPoint( cpc, &IID_INetworkListManagerEvents, &pt2 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); ok( pt == pt2, "pt != pt2\n"); IConnectionPoint_Release( pt2 ); hr = IConnectionPointContainer_FindConnectionPoint( cpc, &IID_INetworkCostManagerEvents, &pt ); - ok( hr == S_OK || hr == CO_E_FAILEDTOIMPERSONATE, "got %08x\n", hr ); + ok( hr == S_OK || hr == CO_E_FAILEDTOIMPERSONATE, "got %08lx\n", hr ); if (hr == S_OK) IConnectionPoint_Release( pt ); hr = IConnectionPointContainer_FindConnectionPoint( cpc, &IID_INetworkConnectionEvents, &pt ); - ok( hr == S_OK || hr == CO_E_FAILEDTOIMPERSONATE, "got %08x\n", hr ); + ok( hr == S_OK || hr == CO_E_FAILEDTOIMPERSONATE, "got %08lx\n", hr ); if (hr == S_OK) IConnectionPoint_Release( pt ); hr = IConnectionPointContainer_FindConnectionPoint( cpc, &IID_INetworkEvents, &pt ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); IConnectionPoint_Release( pt ); IConnectionPointContainer_Release( cpc ); network_iter = NULL; hr = INetworkListManager_GetNetworks( mgr, NLM_ENUM_NETWORK_ALL, &network_iter ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); if (network_iter) { while ((hr = IEnumNetworks_Next( network_iter, 1, &network, NULL )) == S_OK) @@ -352,17 +352,17 @@ static void test_INetworkListManager( void ) conn_iter = NULL; hr = INetworkListManager_GetNetworkConnections( mgr, &conn_iter ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); if (conn_iter) { fetched = 256; hr = IEnumNetworkConnections_Next( conn_iter, 1, NULL, &fetched ); - ok( hr == E_POINTER, "got hr %#x.\n", hr ); - ok( fetched == 256, "got wrong feteched: %d.\n", fetched ); + ok( hr == E_POINTER, "got hr %#lx.\n", hr ); + ok( fetched == 256, "got wrong feteched: %ld.\n", fetched ); hr = IEnumNetworkConnections_Next( conn_iter, 0, NULL, &fetched ); - ok( hr == E_POINTER, "got hr %#x.\n", hr ); - ok( fetched == 256, "got wrong feteched: %d.\n", fetched ); + ok( hr == E_POINTER, "got hr %#lx.\n", hr ); + ok( fetched == 256, "got wrong feteched: %ld.\n", fetched ); while ((hr = IEnumNetworkConnections_Next( conn_iter, 1, &conn, NULL )) == S_OK) { @@ -380,11 +380,11 @@ static void test_INetworkListManager( void ) ref1 = IConnectionPoint_Release( pt ); ref2 = INetworkListManager_Release( mgr ); - ok( ref2 == ref1 - 1, "ref = %u\n", ref1 ); + ok( ref2 == ref1 - 1, "ref = %lu\n", ref1 ); IConnectionPoint_Release( pt ); ref1 = IConnectionPoint_Release( pt ); - ok( !ref1, "ref = %u\n", ref1 ); + ok( !ref1, "ref = %lu\n", ref1 ); } START_TEST( list )
participants (6)
-
Andrew Eikum -
Eric Pouech -
Esme Povirk (she/they) -
Huw Davies -
Jacek Caban -
Marvin