- wine-devel - winehq.org

[PATCH 1/6] d3d10/tests: Build without -DWINE_NO_LONG_TYPES.
by Henri Verbeet 08 Feb '22

08 Feb '22

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10/tests/Makefile.in | 2 +- dlls/d3d10/tests/device.c | 54 +- dlls/d3d10/tests/effect.c | 1168 ++++++++++++------------ dlls/d3dcompiler_43/tests/reflection.c | 3 + 4 files changed, 614 insertions(+), 613 deletions(-) diff --git a/dlls/d3d10/tests/Makefile.in b/dlls/d3d10/tests/Makefile.in index ed342153184..e3849ec634b 100644 --- a/dlls/d3d10/tests/Makefile.in +++ b/dlls/d3d10/tests/Makefile.in @@ -1,6 +1,6 @@ TESTDLL = d3d10.dll IMPORTS = d3d10 -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=0 +EXTRADEFS = -DD3D_COMPILER_VERSION=0 PARENTSRC = ../../d3dcompiler_43/tests C_SRCS = \ diff --git a/dlls/d3d10/tests/device.c b/dlls/d3d10/tests/device.c index bb4bff51bdb..9307cc4713d 100644 --- a/dlls/d3d10/tests/device.c +++ b/dlls/d3d10/tests/device.c @@ -38,7 +38,7 @@ static void test_create_device(void) if (i == D3D10_SDK_VERSION) continue; hr = D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, i, &device); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x for SDK version %#x.\n", hr, i); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx for SDK version %#x.\n", hr, i); } } @@ -85,80 +85,80 @@ static void test_stateblock_mask(void) mask_y.Predication = 0xaa; hr = D3D10StateBlockMaskDifference(&mask_x, &mask_y, &result); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskDifference failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(result.VS == 0x66, "Got unexpected result.VS %#x.\n", result.VS); ok(result.Predication == 0x33, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskDifference(NULL, &mask_y, &result); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskDifference(&mask_x, NULL, &result); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskDifference(&mask_x, &mask_y, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskIntersect(&mask_x, &mask_y, &result); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskIntersect failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(result.VS == 0x11, "Got unexpected result.VS %#x.\n", result.VS); ok(result.Predication == 0x88, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskIntersect(NULL, &mask_y, &result); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskIntersect(&mask_x, NULL, &result); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskIntersect(&mask_x, &mask_y, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskUnion(&mask_x, &mask_y, &result); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskUnion failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(result.VS == 0x77, "Got unexpected result.VS %#x.\n", result.VS); ok(result.Predication == 0xbb, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskUnion(NULL, &mask_y, &result); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskUnion(&mask_x, NULL, &result); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskUnion(&mask_x, &mask_y, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); memset(&result, 0xff, sizeof(result)); hr = D3D10StateBlockMaskDisableAll(&result); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskDisableAll failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!result.VS, "Got unexpected result.VS %#x.\n", result.VS); ok(!result.Predication, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskDisableAll(NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); memset(&result, 0, sizeof(result)); hr = D3D10StateBlockMaskEnableAll(&result); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskEnableAll failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(result.VS == 0xff, "Got unexpected result.VS %#x.\n", result.VS); ok(result.Predication == 0xff, "Got unexpected result.Predication %#x.\n", result.Predication); hr = D3D10StateBlockMaskEnableAll(NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); result.VS = 0xff; hr = D3D10StateBlockMaskDisableCapture(&result, D3D10_DST_VS, 0, 1); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskDisableCapture failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(result.VS == 0xfe, "Got unexpected result.VS %#x.\n", result.VS); hr = D3D10StateBlockMaskDisableCapture(&result, D3D10_DST_VS, 0, 4); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskDisableCapture(&result, D3D10_DST_VS, 1, 1); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskDisableCapture(NULL, D3D10_DST_VS, 0, 1); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); result.VS = 0; hr = D3D10StateBlockMaskEnableCapture(&result, D3D10_DST_VS, 0, 1); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskEnableCapture failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(result.VS == 0x01, "Got unexpected result.VS %#x.\n", result.VS); hr = D3D10StateBlockMaskEnableCapture(&result, D3D10_DST_VS, 0, 4); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskEnableCapture(&result, D3D10_DST_VS, 1, 1); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = D3D10StateBlockMaskEnableCapture(NULL, D3D10_DST_VS, 0, 1); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); for (i = 0; i < ARRAY_SIZE(capture_test); ++i) { memset(&result, 0xff, sizeof(result)); hr = D3D10StateBlockMaskDisableCapture(&result, D3D10_DST_VS_SHADER_RESOURCES, capture_test[i].start_idx, capture_test[i].count); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskDisableCapture failed, hr %#x.\n", hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); ok(!memcmp(result.VSShaderResources, capture_test[i].expected_disable, 5), "Got unexpected result.VSShaderResources[0..4] {%#x, %#x, %#x, %#x, %#x} for test %u.\n", @@ -169,7 +169,7 @@ static void test_stateblock_mask(void) memset(&result, 0, sizeof(result)); hr = D3D10StateBlockMaskEnableCapture(&result, D3D10_DST_VS_SHADER_RESOURCES, capture_test[i].start_idx, capture_test[i].count); - ok(SUCCEEDED(hr), "D3D10StateBlockMaskEnableCapture failed, hr %#x.\n", hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); ok(!memcmp(result.VSShaderResources, capture_test[i].expected_enable, 5), "Got unexpected result.VSShaderResources[0..4] {%#x, %#x, %#x, %#x, %#x} for test %u.\n", diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index b5df2fd8538..3bd6d6d0ecc 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -119,13 +119,13 @@ static void test_effect_constant_buffer_type(void) } hr = create_effect(fx_test_ecbt, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, NULL); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(desc.ConstantBuffers == 2, "Unexpected constant buffers count %u.\n", desc.ConstantBuffers); ok(desc.SharedConstantBuffers == 0, "Unexpected shared constant buffers count %u.\n", @@ -138,14 +138,14 @@ static void test_effect_constant_buffer_type(void) constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); hr = constantbuffer->lpVtbl->GetDesc(constantbuffer, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_EXPLICIT_BIND_POINT, "Unexpected variable flags %#x.\n", var_desc.Flags); ok(var_desc.ExplicitBindPoint == 1, "Unexpected bind point %#x.\n", var_desc.ExplicitBindPoint); type = constantbuffer->lpVtbl->GetType(constantbuffer); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "cbuffer") == 0, "TypeName is \"%s\", expected \"cbuffer\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_OBJECT); @@ -159,7 +159,7 @@ static void test_effect_constant_buffer_type(void) ok(type_desc.Stride == 0x10, "Stride is %#x, expected 0x10\n", type_desc.Stride); hr = constantbuffer->lpVtbl->GetConstantBuffer(constantbuffer, &buffer); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Buffer_GetDesc(buffer, &buffer_desc); ok(buffer_desc.ByteWidth == type_desc.UnpackedSize, "Unexpected buffer size %u.\n", buffer_desc.ByteWidth); ok(!buffer_desc.Usage, "Unexpected buffer usage %u.\n", buffer_desc.Usage); @@ -170,7 +170,7 @@ static void test_effect_constant_buffer_type(void) ID3D10Buffer_Release(buffer); hr = constantbuffer->lpVtbl->GetTextureBuffer(constantbuffer, &srv); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); string = type->lpVtbl->GetMemberName(type, 0); ok(strcmp(string, "f1") == 0, "GetMemberName is \"%s\", expected \"f1\"\n", string); @@ -191,7 +191,7 @@ static void test_effect_constant_buffer_type(void) else type2 = type->lpVtbl->GetMemberTypeBySemantic(type, "SV_POSITION"); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -209,7 +209,7 @@ static void test_effect_constant_buffer_type(void) else type2 = type->lpVtbl->GetMemberTypeBySemantic(type, "COLOR0"); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -225,14 +225,14 @@ static void test_effect_constant_buffer_type(void) type2 = type->lpVtbl->GetMemberTypeByIndex(type, 0); hr = type2->lpVtbl->GetDesc(type2, NULL); - ok(hr == E_INVALIDARG, "GetDesc got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); null_type = type->lpVtbl->GetMemberTypeByIndex(type, 3); hr = null_type->lpVtbl->GetDesc(null_type, &type_desc); - ok(hr == E_FAIL, "GetDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = null_type->lpVtbl->GetDesc(null_type, NULL); - ok(hr == E_FAIL, "GetDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); type2 = type->lpVtbl->GetMemberTypeByName(type, "invalid"); ok(type2 == null_type, "GetMemberTypeByName got wrong type %p, expected %p\n", type2, null_type); @@ -255,7 +255,7 @@ static void test_effect_constant_buffer_type(void) constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 1); v = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, 0); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "f3"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_EXPLICIT_BIND_POINT, "Unexpected variable flags %#x.\n", var_desc.Flags); ok(var_desc.BufferOffset == 0x20, "Unexpected buffer offset %#x.\n", var_desc.BufferOffset); @@ -264,14 +264,14 @@ static void test_effect_constant_buffer_type(void) /* Invalid buffer variable */ constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 100); hr = constantbuffer->lpVtbl->GetConstantBuffer(constantbuffer, &buffer); - ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = constantbuffer->lpVtbl->GetTextureBuffer(constantbuffer, &srv); - ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -343,10 +343,10 @@ static void test_effect_variable_type(void) } hr = create_effect(fx_test_evt, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(desc.ConstantBuffers == 1, "Unexpected constant buffers count %u.\n", desc.ConstantBuffers); ok(desc.SharedConstantBuffers == 0, "Unexpected shared constant buffers count %u.\n", @@ -359,7 +359,7 @@ static void test_effect_variable_type(void) constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); type = constantbuffer->lpVtbl->GetType(constantbuffer); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "cbuffer") == 0, "TypeName is \"%s\", expected \"cbuffer\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_OBJECT); @@ -376,7 +376,7 @@ static void test_effect_variable_type(void) variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, 0); type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "test1") == 0, "TypeName is \"%s\", expected \"test1\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_STRUCT, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_STRUCT); @@ -400,7 +400,7 @@ static void test_effect_variable_type(void) type2 = type->lpVtbl->GetMemberTypeByIndex(type, 0); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -415,7 +415,7 @@ static void test_effect_variable_type(void) type2 = type->lpVtbl->GetMemberTypeByIndex(type, 1); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -430,7 +430,7 @@ static void test_effect_variable_type(void) type2 = type->lpVtbl->GetMemberTypeByIndex(type, 2); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "test") == 0, "TypeName is \"%s\", expected \"test\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_STRUCT, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_STRUCT); @@ -451,7 +451,7 @@ static void test_effect_variable_type(void) else type3 = type2->lpVtbl->GetMemberTypeBySemantic(type2, "sv_POSITION"); hr = type3->lpVtbl->GetDesc(type3, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); @@ -471,7 +471,7 @@ static void test_effect_variable_type(void) else type3 = type2->lpVtbl->GetMemberTypeBySemantic(type2, "color0"); hr = type3->lpVtbl->GetDesc(type3, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); @@ -488,27 +488,27 @@ static void test_effect_variable_type(void) type2 = type->lpVtbl->GetMemberTypeByIndex(type, 0); hr = type2->lpVtbl->GetDesc(type2, NULL); - ok(hr == E_INVALIDARG, "GetDesc got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); type2 = type->lpVtbl->GetMemberTypeByIndex(type, 4); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(hr == E_FAIL, "GetDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); type2 = type->lpVtbl->GetMemberTypeByName(type, "invalid"); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(hr == E_FAIL, "GetDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); type2 = type->lpVtbl->GetMemberTypeByName(type, NULL); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(hr == E_FAIL, "GetDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); type2 = type->lpVtbl->GetMemberTypeBySemantic(type, "invalid"); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(hr == E_FAIL, "GetDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); type2 = type->lpVtbl->GetMemberTypeBySemantic(type, NULL); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(hr == E_FAIL, "GetDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); string = type->lpVtbl->GetMemberName(type, 4); ok(string == NULL, "GetMemberName is \"%s\", expected NULL\n", string); @@ -519,7 +519,7 @@ static void test_effect_variable_type(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -588,10 +588,10 @@ static void test_effect_variable_member(void) } hr = create_effect(fx_test_evm, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 1, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -605,7 +605,7 @@ static void test_effect_variable_member(void) constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); hr = constantbuffer->lpVtbl->GetDesc(constantbuffer, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "cb") == 0, "Name is \"%s\", expected \"cb\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -616,16 +616,16 @@ static void test_effect_variable_member(void) null_variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, 1); hr = null_variable->lpVtbl->GetDesc(null_variable, &desc); - ok(hr == E_FAIL, "GetDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, 0); hr = variable->lpVtbl->GetDesc(variable, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); variable2 = constantbuffer->lpVtbl->GetMemberByName(constantbuffer, "t1"); ok(variable == variable2, "GetMemberByName got %p, expected %p\n", variable2, variable); hr = variable2->lpVtbl->GetDesc(variable2, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "t1") == 0, "Name is \"%s\", expected \"t1\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -649,7 +649,7 @@ static void test_effect_variable_member(void) /* check members of "t1" */ variable2 = variable->lpVtbl->GetMemberByName(variable, "f1"); hr = variable2->lpVtbl->GetDesc(variable2, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f1") == 0, "Name is \"%s\", expected \"f1\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -663,7 +663,7 @@ static void test_effect_variable_member(void) variable2 = variable->lpVtbl->GetMemberByName(variable, "f2"); hr = variable2->lpVtbl->GetDesc(variable2, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f2") == 0, "Name is \"%s\", expected \"f2\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -677,7 +677,7 @@ static void test_effect_variable_member(void) variable2 = variable->lpVtbl->GetMemberByName(variable, "t"); hr = variable2->lpVtbl->GetDesc(variable2, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "t") == 0, "Name is \"%s\", expected \"t\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -692,7 +692,7 @@ static void test_effect_variable_member(void) /* check members of "t" */ variable3 = variable2->lpVtbl->GetMemberByName(variable2, "f3"); hr = variable3->lpVtbl->GetDesc(variable3, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f3") == 0, "Name is \"%s\", expected \"f3\"\n", desc.Name); ok(strcmp(desc.Semantic, "SV_POSITION") == 0, "Semantic is \"%s\", expected \"SV_POSITION\"\n", desc.Semantic); @@ -712,7 +712,7 @@ static void test_effect_variable_member(void) variable3 = variable2->lpVtbl->GetMemberByName(variable2, "f4"); hr = variable3->lpVtbl->GetDesc(variable3, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f4") == 0, "Name is \"%s\", expected \"f4\"\n", desc.Name); ok(strcmp(desc.Semantic, "COLOR0") == 0, "Semantic is \"%s\", expected \"COLOR0\"\n", desc.Semantic); @@ -733,7 +733,7 @@ static void test_effect_variable_member(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -809,10 +809,10 @@ static void test_effect_variable_element(void) } hr = create_effect(fx_test_eve, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 1, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -826,7 +826,7 @@ static void test_effect_variable_element(void) constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); hr = constantbuffer->lpVtbl->GetDesc(constantbuffer, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "cb") == 0, "Name is \"%s\", expected \"cb\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -837,7 +837,7 @@ static void test_effect_variable_element(void) variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, 0); hr = variable->lpVtbl->GetDesc(variable, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); parent = variable->lpVtbl->GetParentConstantBuffer(variable); ok(parent == constantbuffer, "GetParentConstantBuffer got %p, expected %p\n", @@ -845,7 +845,7 @@ static void test_effect_variable_element(void) variable2 = constantbuffer->lpVtbl->GetMemberByName(constantbuffer, "t1"); hr = variable2->lpVtbl->GetDesc(variable2, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); parent = variable2->lpVtbl->GetParentConstantBuffer(variable2); ok(parent == constantbuffer, "GetParentConstantBuffer got %p, expected %p\n", parent, constantbuffer); @@ -853,7 +853,7 @@ static void test_effect_variable_element(void) /* check variable f1 */ variable3 = variable2->lpVtbl->GetMemberByName(variable2, "f1"); hr = variable3->lpVtbl->GetDesc(variable3, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f1") == 0, "Name is \"%s\", expected \"f1\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -868,7 +868,7 @@ static void test_effect_variable_element(void) type = variable3->lpVtbl->GetType(variable3); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -884,7 +884,7 @@ static void test_effect_variable_element(void) /* check variable f2 */ variable3 = variable2->lpVtbl->GetMemberByName(variable2, "f2"); hr = variable3->lpVtbl->GetDesc(variable3, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)!\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f2") == 0, "Name is \"%s\", expected \"f2\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -899,7 +899,7 @@ static void test_effect_variable_element(void) type = variable3->lpVtbl->GetType(variable3); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -914,7 +914,7 @@ static void test_effect_variable_element(void) variable4 = variable3->lpVtbl->GetElement(variable3, 0); hr = variable4->lpVtbl->GetDesc(variable4, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f2") == 0, "Name is \"%s\", expected \"f2\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -929,7 +929,7 @@ static void test_effect_variable_element(void) type = variable4->lpVtbl->GetType(variable4); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -944,7 +944,7 @@ static void test_effect_variable_element(void) variable4 = variable3->lpVtbl->GetElement(variable3, 1); hr = variable4->lpVtbl->GetDesc(variable4, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f2") == 0, "Name is \"%s\", expected \"f2\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -959,7 +959,7 @@ static void test_effect_variable_element(void) type2 = variable4->lpVtbl->GetType(variable4); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(type == type2, "type(%p) != type2(%p)\n", type, type2); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); @@ -975,7 +975,7 @@ static void test_effect_variable_element(void) variable4 = variable3->lpVtbl->GetElement(variable3, 2); hr = variable4->lpVtbl->GetDesc(variable4, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f2") == 0, "Name is \"%s\", expected \"f2\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -990,7 +990,7 @@ static void test_effect_variable_element(void) type2 = variable4->lpVtbl->GetType(variable4); hr = type2->lpVtbl->GetDesc(type2, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(type == type2, "type(%p) != type2(%p)\n", type, type2); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); @@ -1007,7 +1007,7 @@ static void test_effect_variable_element(void) /* check variable t */ variable3 = variable2->lpVtbl->GetMemberByName(variable2, "t"); hr = variable3->lpVtbl->GetDesc(variable3, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)!\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "t") == 0, "Name is \"%s\", expected \"t\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -1022,7 +1022,7 @@ static void test_effect_variable_element(void) type = variable3->lpVtbl->GetType(variable3); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "test") == 0, "TypeName is \"%s\", expected \"test\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_STRUCT, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_STRUCT); @@ -1037,7 +1037,7 @@ static void test_effect_variable_element(void) variable4 = variable3->lpVtbl->GetElement(variable3, 0); hr = variable4->lpVtbl->GetDesc(variable4, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "t") == 0, "Name is \"%s\", expected \"t\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -1052,7 +1052,7 @@ static void test_effect_variable_element(void) type = variable4->lpVtbl->GetType(variable4); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "test") == 0, "TypeName is \"%s\", expected \"test\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_STRUCT, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_STRUCT); @@ -1067,7 +1067,7 @@ static void test_effect_variable_element(void) variable5 = variable4->lpVtbl->GetMemberByIndex(variable4, 0); hr = variable5->lpVtbl->GetDesc(variable5, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f3") == 0, "Name is \"%s\", expected \"f3\"\n", desc.Name); ok(strcmp(desc.Semantic, "SV_POSITION") == 0, "Semantic is \"%s\", expected \"SV_POSITION\"\n", desc.Semantic); @@ -1081,7 +1081,7 @@ static void test_effect_variable_element(void) type = variable5->lpVtbl->GetType(variable5); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -1096,7 +1096,7 @@ static void test_effect_variable_element(void) variable5 = variable4->lpVtbl->GetMemberByIndex(variable4, 1); hr = variable5->lpVtbl->GetDesc(variable5, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f4") == 0, "Name is \"%s\", expected \"f4\"\n", desc.Name); ok(strcmp(desc.Semantic, "COLOR0") == 0, "Semantic is \"%s\", expected \"COLOR0\"\n", desc.Semantic); @@ -1110,7 +1110,7 @@ static void test_effect_variable_element(void) type = variable5->lpVtbl->GetType(variable5); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -1125,7 +1125,7 @@ static void test_effect_variable_element(void) variable5 = variable4->lpVtbl->GetMemberByIndex(variable4, 2); hr = variable5->lpVtbl->GetDesc(variable5, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f5") == 0, "Name is \"%s\", expected \"f5\"\n", desc.Name); ok(strcmp(desc.Semantic, "COLOR1") == 0, "Semantic is \"%s\", expected \"COLOR1\"\n", desc.Semantic); @@ -1139,7 +1139,7 @@ static void test_effect_variable_element(void) type = variable5->lpVtbl->GetType(variable5); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -1154,7 +1154,7 @@ static void test_effect_variable_element(void) variable4 = variable3->lpVtbl->GetElement(variable3, 1); hr = variable4->lpVtbl->GetDesc(variable4, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "t") == 0, "Name is \"%s\", expected \"t\"\n", desc.Name); ok(desc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", desc.Semantic); @@ -1169,7 +1169,7 @@ static void test_effect_variable_element(void) type = variable4->lpVtbl->GetType(variable4); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "test") == 0, "TypeName is \"%s\", expected \"test\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_STRUCT, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_STRUCT); @@ -1184,7 +1184,7 @@ static void test_effect_variable_element(void) variable5 = variable4->lpVtbl->GetMemberByIndex(variable4, 0); hr = variable5->lpVtbl->GetDesc(variable5, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f3") == 0, "Name is \"%s\", expected \"f3\"\n", desc.Name); ok(strcmp(desc.Semantic, "SV_POSITION") == 0, "Semantic is \"%s\", expected \"SV_POSITION\"\n", desc.Semantic); @@ -1198,7 +1198,7 @@ static void test_effect_variable_element(void) type = variable5->lpVtbl->GetType(variable5); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -1213,7 +1213,7 @@ static void test_effect_variable_element(void) variable5 = variable4->lpVtbl->GetMemberByIndex(variable4, 1); hr = variable5->lpVtbl->GetDesc(variable5, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f4") == 0, "Name is \"%s\", expected \"f4\"\n", desc.Name); ok(strcmp(desc.Semantic, "COLOR0") == 0, "Semantic is \"%s\", expected \"COLOR0\"\n", desc.Semantic); @@ -1227,7 +1227,7 @@ static void test_effect_variable_element(void) type = variable5->lpVtbl->GetType(variable5); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -1242,7 +1242,7 @@ static void test_effect_variable_element(void) variable5 = variable4->lpVtbl->GetMemberByIndex(variable4, 2); hr = variable5->lpVtbl->GetDesc(variable5, &desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(desc.Name, "f5") == 0, "Name is \"%s\", expected \"f5\"\n", desc.Name); ok(strcmp(desc.Semantic, "COLOR1") == 0, "Semantic is \"%s\", expected \"COLOR1\"\n", desc.Semantic); @@ -1256,7 +1256,7 @@ static void test_effect_variable_element(void) type = variable5->lpVtbl->GetType(variable5); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(type_desc.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", type_desc.TypeName); ok(type_desc.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", type_desc.Class, D3D10_SVC_SCALAR); @@ -1272,7 +1272,7 @@ static void test_effect_variable_element(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -1390,7 +1390,7 @@ static void check_as(ID3D10EffectVariable *variable) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); variable2 = (ID3D10EffectVariable *)variable->lpVtbl->AsConstantBuffer(variable); is_valid = variable2->lpVtbl->IsValid(variable2); @@ -1487,10 +1487,10 @@ static void test_effect_variable_type_class(void) } hr = create_effect(fx_test_evtc, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 1, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -1508,7 +1508,7 @@ static void test_effect_variable_type_class(void) /* check constantbuffer cb */ constantbuffer = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); hr = constantbuffer->lpVtbl->GetDesc(constantbuffer, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "cb") == 0, "Name is \"%s\", expected \"cb\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1524,7 +1524,7 @@ static void test_effect_variable_type_class(void) type = constantbuffer->lpVtbl->GetType(constantbuffer); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "cbuffer") == 0, "TypeName is \"%s\", expected \"cbuffer\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1539,7 +1539,7 @@ static void test_effect_variable_type_class(void) variable = constantbuffer->lpVtbl->GetAnnotationByIndex(constantbuffer, 0); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "s") == 0, "Name is \"%s\", expected \"s\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1555,7 +1555,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "String") == 0, "TypeName is \"%s\", expected \"String\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1570,15 +1570,15 @@ static void test_effect_variable_type_class(void) string_var = variable->lpVtbl->AsString(variable); hr = string_var->lpVtbl->GetString(string_var, NULL); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = string_var->lpVtbl->GetString(string_var, &str1); - ok(SUCCEEDED(hr), "GetString failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(str1, "STRING"), "Unexpected value %s.\n", str1); variable = constantbuffer->lpVtbl->GetAnnotationByIndex(constantbuffer, 1); string_var = variable->lpVtbl->AsString(variable); hr = string_var->lpVtbl->GetString(string_var, &str2); - ok(SUCCEEDED(hr), "GetString failed, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(str2 != str1, "Unexpected string pointer.\n"); ok(!strcmp(str2, "STRING"), "Unexpected value %s.\n", str1); @@ -1586,16 +1586,16 @@ static void test_effect_variable_type_class(void) variable = constantbuffer->lpVtbl->GetAnnotationByIndex(constantbuffer, 2); string_var = variable->lpVtbl->AsString(variable); hr = string_var->lpVtbl->GetString(string_var, NULL); - ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); str1 = (void *)0xdeadbeef; hr = string_var->lpVtbl->GetString(string_var, &str1); - ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); ok(str1 == (void *)0xdeadbeef, "Unexpected pointer.\n"); /* check float f */ variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "f") == 0, "Name is \"%s\", expected \"f\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1611,7 +1611,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "float") == 0, "TypeName is \"%s\", expected \"float\"\n", td.TypeName); ok(td.Class == D3D10_SVC_SCALAR, "Class is %x, expected %x\n", td.Class, D3D10_SVC_SCALAR); @@ -1627,7 +1627,7 @@ static void test_effect_variable_type_class(void) /* check int2 i */ variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "i") == 0, "Name is \"%s\", expected \"i\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1643,7 +1643,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "int2") == 0, "TypeName is \"%s\", expected \"int2\"\n", td.TypeName); ok(td.Class == D3D10_SVC_VECTOR, "Class is %x, expected %x\n", td.Class, D3D10_SVC_VECTOR); @@ -1659,7 +1659,7 @@ static void test_effect_variable_type_class(void) /* check uint2x3 u */ variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "u") == 0, "Name is \"%s\", expected \"u\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1675,7 +1675,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "uint2x3") == 0, "TypeName is \"%s\", expected \"uint2x3\"\n", td.TypeName); ok(td.Class == D3D10_SVC_MATRIX_COLUMNS, "Class is %x, expected %x\n", td.Class, D3D10_SVC_MATRIX_COLUMNS); @@ -1691,7 +1691,7 @@ static void test_effect_variable_type_class(void) /* check bool2x3 b */ variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "b") == 0, "Name is \"%s\", expected \"b\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1707,7 +1707,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "bool2x3") == 0, "TypeName is \"%s\", expected \"bool2x3\"\n", td.TypeName); ok(td.Class == D3D10_SVC_MATRIX_ROWS, "Class is %x, expected %x\n", td.Class, D3D10_SVC_MATRIX_ROWS); @@ -1723,7 +1723,7 @@ static void test_effect_variable_type_class(void) /* check BlendState blend */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "blend") == 0, "Name is \"%s\", expected \"blend\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1739,7 +1739,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "BlendState") == 0, "TypeName is \"%s\", expected \"BlendState\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1755,7 +1755,7 @@ static void test_effect_variable_type_class(void) /* check DepthStencilState depthstencil */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "depthstencil") == 0, "Name is \"%s\", expected \"depthstencil\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1771,7 +1771,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "DepthStencilState") == 0, "TypeName is \"%s\", expected \"DepthStencilState\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1787,7 +1787,7 @@ static void test_effect_variable_type_class(void) /* check RasterizerState rast */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "rast") == 0, "Name is \"%s\", expected \"rast\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1803,7 +1803,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "RasterizerState") == 0, "TypeName is \"%s\", expected \"RasterizerState\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1819,7 +1819,7 @@ static void test_effect_variable_type_class(void) /* check SamplerState sam */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "sam") == 0, "Name is \"%s\", expected \"sam\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1835,7 +1835,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "SamplerState") == 0, "TypeName is \"%s\", expected \"SamplerState\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1851,7 +1851,7 @@ static void test_effect_variable_type_class(void) /* check RenderTargetView rtv */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "rtv") == 0, "Name is \"%s\", expected \"rtv\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1867,7 +1867,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "RenderTargetView") == 0, "TypeName is \"%s\", expected \"RenderTargetView\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1883,7 +1883,7 @@ static void test_effect_variable_type_class(void) /* check DepthStencilView dsv */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "dsv") == 0, "Name is \"%s\", expected \"dsv\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1899,7 +1899,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "DepthStencilView") == 0, "TypeName is \"%s\", expected \"DepthStencilView\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1915,7 +1915,7 @@ static void test_effect_variable_type_class(void) /* check Texture t0 */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(vd.Name, "t0"), "Unexpected Name \"%s\".\n", vd.Name); ok(!vd.Semantic, "Unexpected Semantic \"%s\".\n", vd.Semantic); @@ -1931,7 +1931,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(td.TypeName, "texture"), "Unexpected TypeName \"%s\".\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Unexpected Class %x.\n", td.Class); @@ -1947,7 +1947,7 @@ static void test_effect_variable_type_class(void) /* check Texture1D t1 */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "t1") == 0, "Name is \"%s\", expected \"t1\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1963,7 +1963,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "Texture1D") == 0, "TypeName is \"%s\", expected \"Texture1D\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -1979,7 +1979,7 @@ static void test_effect_variable_type_class(void) /* check Texture1DArray t1a */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "t1a") == 0, "Name is \"%s\", expected \"t1a\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -1995,7 +1995,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "Texture1DArray") == 0, "TypeName is \"%s\", expected \"Texture1DArray\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2011,7 +2011,7 @@ static void test_effect_variable_type_class(void) /* check Texture2D t2 */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "t2") == 0, "Name is \"%s\", expected \"t2\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2027,7 +2027,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "Texture2D") == 0, "TypeName is \"%s\", expected \"Texture2D\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2043,7 +2043,7 @@ static void test_effect_variable_type_class(void) /* check Texture2DMS t2dms */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "t2dms") == 0, "Name is \"%s\", expected \"t2dms\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2059,7 +2059,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "Texture2DMS") == 0, "TypeName is \"%s\", expected \"Texture2DMS\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2075,7 +2075,7 @@ static void test_effect_variable_type_class(void) /* check Texture2DArray t2a */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "t2a") == 0, "Name is \"%s\", expected \"t2a\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2091,7 +2091,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "Texture2DArray") == 0, "TypeName is \"%s\", expected \"Texture2DArray\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2107,7 +2107,7 @@ static void test_effect_variable_type_class(void) /* check Texture2DMSArray t2dmsa */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "t2dmsa") == 0, "Name is \"%s\", expected \"t2dmsa\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2123,7 +2123,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "Texture2DMSArray") == 0, "TypeName is \"%s\", expected \"TTexture2DMSArray\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2139,7 +2139,7 @@ static void test_effect_variable_type_class(void) /* check Texture3D t3 */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "t3") == 0, "Name is \"%s\", expected \"t3\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2155,7 +2155,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "Texture3D") == 0, "TypeName is \"%s\", expected \"Texture3D\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2171,7 +2171,7 @@ static void test_effect_variable_type_class(void) /* check TextureCube tq */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "tq") == 0, "Name is \"%s\", expected \"tq\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2187,7 +2187,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "TextureCube") == 0, "TypeName is \"%s\", expected \"TextureCube\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2203,7 +2203,7 @@ static void test_effect_variable_type_class(void) /* check GeometryShader gs[2] */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "gs") == 0, "Name is \"%s\", expected \"gs\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2219,7 +2219,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "GeometryShader") == 0, "TypeName is \"%s\", expected \"GeometryShader\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2235,7 +2235,7 @@ static void test_effect_variable_type_class(void) /* check PixelShader ps */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "ps") == 0, "Name is \"%s\", expected \"ps\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2251,7 +2251,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "PixelShader") == 0, "TypeName is \"%s\", expected \"PixelShader\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2267,7 +2267,7 @@ static void test_effect_variable_type_class(void) /* check VertexShader vs[1] */ variable = effect->lpVtbl->GetVariableByIndex(effect, variable_nr++); hr = variable->lpVtbl->GetDesc(variable, &vd); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vd.Name, "vs") == 0, "Name is \"%s\", expected \"vs\"\n", vd.Name); ok(vd.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vd.Semantic); @@ -2283,7 +2283,7 @@ static void test_effect_variable_type_class(void) type = variable->lpVtbl->GetType(variable); hr = type->lpVtbl->GetDesc(type, &td); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(td.TypeName, "VertexShader") == 0, "TypeName is \"%s\", expected \"VertexShader\"\n", td.TypeName); ok(td.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", td.Class, D3D10_SVC_OBJECT); @@ -2299,7 +2299,7 @@ static void test_effect_variable_type_class(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -2579,10 +2579,10 @@ static void test_effect_constant_buffer_stride(void) } hr = create_effect(fx_test_ecbs, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 15, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -2600,7 +2600,7 @@ static void test_effect_constant_buffer_stride(void) type = constantbuffer->lpVtbl->GetType(constantbuffer); hr = type->lpVtbl->GetDesc(type, &tdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "%u: Got unexpected hr %#lx.\n", i, hr); ok(strcmp(tdesc.TypeName, "cbuffer") == 0, "TypeName is \"%s\", expected \"cbuffer\"\n", tdesc.TypeName); ok(tdesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", tdesc.Class, D3D10_SVC_OBJECT); @@ -2617,7 +2617,7 @@ static void test_effect_constant_buffer_stride(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -2948,10 +2948,10 @@ static void test_effect_local_shader(void) } hr = create_effect(fx_local_shader, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed!\n"); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 0, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -2998,22 +2998,22 @@ if (0) /* check for invalid arguments */ hr = null_pass->lpVtbl->GetVertexShaderDesc(null_pass, NULL); - ok(hr == E_FAIL, "GetVertexShaderDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = null_pass->lpVtbl->GetVertexShaderDesc(null_pass, &pdesc); - ok(hr == E_FAIL, "GetVertexShaderDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = null_pass->lpVtbl->GetPixelShaderDesc(null_pass, NULL); - ok(hr == E_FAIL, "GetPixelShaderDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = null_pass->lpVtbl->GetPixelShaderDesc(null_pass, &pdesc); - ok(hr == E_FAIL, "GetPixelShaderDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = null_pass->lpVtbl->GetGeometryShaderDesc(null_pass, NULL); - ok(hr == E_FAIL, "GetGeometryShaderDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = null_pass->lpVtbl->GetGeometryShaderDesc(null_pass, &pdesc); - ok(hr == E_FAIL, "GetGeometryShaderDesc got %x, expected %x\n", hr, E_FAIL); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* check valid pass arguments */ t = effect->lpVtbl->GetTechniqueByIndex(effect, 0); @@ -3023,19 +3023,19 @@ if (0) ok(p2 == p, "GetPassByName got %p, expected %p\n", p2, p); hr = p->lpVtbl->GetVertexShaderDesc(p, NULL); - ok(hr == E_INVALIDARG, "GetVertexShaderDesc got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = p->lpVtbl->GetPixelShaderDesc(p, NULL); - ok(hr == E_INVALIDARG, "GetPixelShaderDesc got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = p->lpVtbl->GetGeometryShaderDesc(p, NULL); - ok(hr == E_INVALIDARG, "GetGeometryShaderDesc got %x, expected %x\n", hr, E_INVALIDARG); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); v = effect->lpVtbl->GetVariableByName(effect, "p"); ps = v->lpVtbl->AsShader(v); hr = ps->lpVtbl->GetPixelShader(ps, 0, &ps_d3d); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); /* get the null_shader_variable */ v = effect->lpVtbl->GetVariableByIndex(effect, 10000); @@ -3046,9 +3046,9 @@ if (0) /* Pass without Set*Shader() instructions */ hr = D3D10StateBlockMaskDisableAll(&mask); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = p->lpVtbl->ComputeStateBlockMask(p, &mask); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_VS, 0); ok(!ret, "Unexpected mask.\n"); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_PS, 0); @@ -3058,52 +3058,52 @@ if (0) ID3D10Device_PSSetShader(device, ps_d3d); hr = p->lpVtbl->Apply(p, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_PSGetShader(device, &ps_d3d_2); ok(ps_d3d_2 == ps_d3d, "Unexpected shader object.\n"); ID3D10PixelShader_Release(ps_d3d_2); hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == null_shader, "Got %p, expected %p\n", pdesc.pShaderVariable, null_shader); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(hr == E_FAIL, "GetDesc failed (%x)\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = p->lpVtbl->GetPixelShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetPixelShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == null_shader, "Got %p, expected %p\n", pdesc.pShaderVariable, null_shader); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(hr == E_FAIL, "GetDesc failed (%x)\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetGeometryShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == null_shader, "Got %p, expected %p\n", pdesc.pShaderVariable, null_shader); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(hr == E_FAIL, "GetDesc failed (%x)\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); /* pass 1 */ p = t->lpVtbl->GetPassByIndex(t, 1); ID3D10Device_PSSetShader(device, ps_d3d); hr = p->lpVtbl->Apply(p, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_PSGetShader(device, &ps_d3d_2); ok(!ps_d3d_2, "Unexpected shader object.\n"); /* pass 1 vertexshader */ hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); null_anon_vs = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3120,7 +3120,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "vertexshader") == 0, "TypeName is \"%s\", expected \"vertexhader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_VERTEXSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_VERTEXSHADER); @@ -3134,12 +3134,12 @@ if (0) /* pass 1 pixelshader */ hr = p->lpVtbl->GetPixelShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetPixelShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); null_anon_ps = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3156,7 +3156,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "pixelshader") == 0, "TypeName is \"%s\", expected \"pixelshader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_PIXELSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_PIXELSHADER); @@ -3170,12 +3170,12 @@ if (0) /* pass 1 geometryshader */ hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetGeometryShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); null_anon_gs = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(hr == S_OK, "GetDesc failed (%x) expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3192,7 +3192,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "geometryshader") == 0, "TypeName is \"%s\", expected \"geometryshader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_GEOMETRYSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_GEOMETRYSHADER); @@ -3206,9 +3206,9 @@ if (0) /* Pass is using Set*Shader(NULL) */ hr = D3D10StateBlockMaskDisableAll(&mask); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = p->lpVtbl->ComputeStateBlockMask(p, &mask); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_VS, 0); ok(ret, "Unexpected mask.\n"); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_PS, 0); @@ -3221,12 +3221,12 @@ if (0) /* pass 2 vertexshader */ hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == null_anon_vs, "Got %p, expected %p\n", pdesc.pShaderVariable, null_anon_vs); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3237,12 +3237,12 @@ if (0) /* pass 2 pixelshader */ hr = p->lpVtbl->GetPixelShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetPixelShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == null_anon_ps, "Got %p, expected %p\n", pdesc.pShaderVariable, null_anon_ps); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3253,12 +3253,12 @@ if (0) /* pass 2 geometryshader */ hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetGeometryShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == null_anon_gs, "Got %p, expected %p\n", pdesc.pShaderVariable, null_anon_gs); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(hr == S_OK, "GetDesc failed (%x) expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3272,12 +3272,12 @@ if (0) /* pass 3 vertexshader */ hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); p3_anon_vs = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3294,7 +3294,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "vertexshader") == 0, "TypeName is \"%s\", expected \"vertexshader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_VERTEXSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_VERTEXSHADER); @@ -3308,12 +3308,12 @@ if (0) /* pass 3 pixelshader */ hr = p->lpVtbl->GetPixelShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetPixelShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); p3_anon_ps = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3330,7 +3330,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "pixelshader") == 0, "TypeName is \"%s\", expected \"pixelshader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_PIXELSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_PIXELSHADER); @@ -3344,12 +3344,12 @@ if (0) /* pass 3 geometryshader */ hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetGeometryShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); p3_anon_gs = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3366,7 +3366,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "geometryshader") == 0, "TypeName is \"%s\", expected \"geometryshader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_GEOMETRYSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_GEOMETRYSHADER); @@ -3383,12 +3383,12 @@ if (0) /* pass 4 vertexshader */ hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable != p3_anon_vs, "Got %p, expected %p\n", pdesc.pShaderVariable, p3_anon_vs); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3405,7 +3405,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "vertexshader") == 0, "TypeName is \"%s\", expected \"vertexshader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_VERTEXSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_VERTEXSHADER); @@ -3419,12 +3419,12 @@ if (0) /* pass 4 pixelshader */ hr = p->lpVtbl->GetPixelShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetPixelShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable != p3_anon_ps, "Got %p, expected %p\n", pdesc.pShaderVariable, p3_anon_ps); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3441,7 +3441,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "pixelshader") == 0, "TypeName is \"%s\", expected \"pixelshader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_PIXELSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_PIXELSHADER); @@ -3455,12 +3455,12 @@ if (0) /* pass 4 geometryshader */ hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetGeometryShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable != p3_anon_gs, "Got %p, expected %p\n", pdesc.pShaderVariable, p3_anon_gs); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %x\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "$Anonymous") == 0, "Name is \"%s\", expected \"$Anonymous\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3477,7 +3477,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "geometryshader") == 0, "TypeName is \"%s\", expected \"geometryshader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_GEOMETRYSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_GEOMETRYSHADER); @@ -3494,11 +3494,11 @@ if (0) /* pass 5 vertexshader */ hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "v0") == 0, "Name is \"%s\", expected \"v0\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3515,7 +3515,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "VertexShader") == 0, "TypeName is \"%s\", expected \"VertexShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_VERTEXSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_VERTEXSHADER); @@ -3529,11 +3529,11 @@ if (0) /* pass 5 pixelshader */ hr = p->lpVtbl->GetPixelShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetPixelShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "p0") == 0, "Name is \"%s\", expected \"p0\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3550,7 +3550,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "PixelShader") == 0, "TypeName is \"%s\", expected \"PixelShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_PIXELSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_PIXELSHADER); @@ -3564,11 +3564,11 @@ if (0) /* pass 5 geometryshader */ hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetGeometryShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "g0") == 0, "Name is \"%s\", expected \"g0\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3585,7 +3585,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "GeometryShader") == 0, "TypeName is \"%s\", expected \"GeometryShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_GEOMETRYSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_GEOMETRYSHADER); @@ -3602,12 +3602,12 @@ if (0) /* pass 6 vertexshader */ hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); p6_vs = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "v") == 0, "Name is \"%s\", expected \"v\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3624,7 +3624,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "VertexShader") == 0, "TypeName is \"%s\", expected \"VertexShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_VERTEXSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_VERTEXSHADER); @@ -3638,18 +3638,18 @@ if (0) /* Get input signature from vertex shader set from array element. */ hr = p->lpVtbl->GetDesc(p, &pass_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!pass_desc.pIAInputSignature, "Expected input signature.\n"); ok(pass_desc.IAInputSignatureSize == 88, "Unexpected input signature size.\n"); /* pass 6 pixelshader */ hr = p->lpVtbl->GetPixelShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetPixelShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); p6_ps = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "p") == 0, "Name is \"%s\", expected \"p\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3666,7 +3666,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "PixelShader") == 0, "TypeName is \"%s\", expected \"PixelShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_PIXELSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_PIXELSHADER); @@ -3680,12 +3680,12 @@ if (0) /* pass 6 geometryshader */ hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetGeometryShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); p6_gs = pdesc.pShaderVariable; ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "g") == 0, "Name is \"%s\", expected \"g\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3702,7 +3702,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "GeometryShader") == 0, "TypeName is \"%s\", expected \"GeometryShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_GEOMETRYSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_GEOMETRYSHADER); @@ -3719,12 +3719,12 @@ if (0) /* pass 7 vertexshader */ hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == p6_vs, "Got %p, expected %p\n", pdesc.pShaderVariable, p6_vs); ok(pdesc.ShaderIndex == 1, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 1); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "v") == 0, "Name is \"%s\", expected \"v\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3741,7 +3741,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "VertexShader") == 0, "TypeName is \"%s\", expected \"VertexShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_VERTEXSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_VERTEXSHADER); @@ -3755,12 +3755,12 @@ if (0) /* pass 7 pixelshader */ hr = p->lpVtbl->GetPixelShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetPixelShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == p6_ps, "Got %p, expected %p\n", pdesc.pShaderVariable, p6_ps); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "p") == 0, "Name is \"%s\", expected \"p\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3777,7 +3777,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "PixelShader") == 0, "TypeName is \"%s\", expected \"PixelShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_PIXELSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_PIXELSHADER); @@ -3791,12 +3791,12 @@ if (0) /* pass 7 geometryshader */ hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "GetGeometryShaderDesc got %x, expected %x\n", hr, S_OK); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pdesc.pShaderVariable == p6_gs, "Got %p, expected %p\n", pdesc.pShaderVariable, p6_gs); ok(pdesc.ShaderIndex == 0, "ShaderIndex is %u, expected %u\n", pdesc.ShaderIndex, 0); hr = pdesc.pShaderVariable->lpVtbl->GetDesc(pdesc.pShaderVariable, &vdesc); - ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(vdesc.Name, "g") == 0, "Name is \"%s\", expected \"g\"\n", vdesc.Name); ok(vdesc.Semantic == NULL, "Semantic is \"%s\", expected NULL\n", vdesc.Semantic); @@ -3813,7 +3813,7 @@ if (0) ok(ret, "IsValid() failed\n"); hr = type->lpVtbl->GetDesc(type, &typedesc); - ok(hr == S_OK, "GetDesc failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(strcmp(typedesc.TypeName, "GeometryShader") == 0, "TypeName is \"%s\", expected \"GeometryShader\"\n", typedesc.TypeName); ok(typedesc.Class == D3D10_SVC_OBJECT, "Class is %x, expected %x\n", typedesc.Class, D3D10_SVC_OBJECT); ok(typedesc.Type == D3D10_SVT_GEOMETRYSHADER, "Type is %x, expected %x\n", typedesc.Type, D3D10_SVT_GEOMETRYSHADER); @@ -3830,9 +3830,9 @@ if (0) /* Inline variant */ p = t->lpVtbl->GetPassByName(t, "P8"); hr = p->lpVtbl->GetGeometryShaderDesc(p, &pdesc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pdesc.pShaderVariable->lpVtbl->GetShaderDesc(pdesc.pShaderVariable, 0, &shaderdesc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shaderdesc.IsInline, "Unexpected inline flag.\n"); ok(!strcmp(shaderdesc.SODecl, "SV_POSITION.y"), "Unexpected stream output declaration %s.\n", shaderdesc.SODecl); @@ -3840,7 +3840,7 @@ if (0) v = effect->lpVtbl->GetVariableByName(effect, "g_so"); gs = v->lpVtbl->AsShader(v); hr = gs->lpVtbl->GetShaderDesc(gs, 0, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shaderdesc.IsInline, "Unexpected inline flag.\n"); ok(!strcmp(shaderdesc.SODecl, "SV_POSITION.x; $Skip.x; SV_POSITION.gb"), "Unexpected stream output declaration %s.\n", shaderdesc.SODecl); @@ -3850,25 +3850,25 @@ if (0) ps = v->lpVtbl->AsShader(v); hr = ps->lpVtbl->GetOutputSignatureElementDesc(ps, 0, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "SV_Target"), "Unexpected semantic %s.\n", sign.SemanticName); todo_wine ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); hr = ps->lpVtbl->GetOutputSignatureElementDesc(ps, 4, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", sign.SystemValueType); hr = ps->lpVtbl->GetInputSignatureElementDesc(ps, 0, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", sign.SystemValueType); hr = ps->lpVtbl->GetInputSignatureElementDesc(ps, 4, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); @@ -3876,24 +3876,24 @@ if (0) vs = v->lpVtbl->AsShader(v); hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 0, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", sign.SystemValueType); hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 1, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", sign.SystemValueType); hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 0, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 1, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); @@ -3902,31 +3902,31 @@ if (0) vs = v->lpVtbl->AsShader(v); hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 0, 0, &sign); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 1, 0, &sign); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 2, 0, &sign); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = vs->lpVtbl->GetOutputSignatureElementDesc(vs, 3, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "SV_POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(sign.SystemValueType == D3D10_NAME_POSITION, "Unexpected system value type %u.\n", sign.SystemValueType); hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 0, 0, &sign); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 1, 0, &sign); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 2, 0, &sign); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); hr = vs->lpVtbl->GetInputSignatureElementDesc(vs, 3, 0, &sign); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(sign.SemanticName, "POSITION"), "Unexpected semantic %s.\n", sign.SemanticName); ok(!sign.SystemValueType, "Unexpected system value type %u.\n", sign.SystemValueType); @@ -3935,7 +3935,7 @@ if (0) ID3D10PixelShader_Release(ps_d3d); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -3989,10 +3989,10 @@ static void test_effect_get_variable_by(void) } hr = create_effect(fx_test_egvb, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 2, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -4091,7 +4091,7 @@ static void test_effect_get_variable_by(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -4423,9 +4423,9 @@ static void create_effect_texture_resource(ID3D10Device *device, ID3D10ShaderRes tex_desc.MiscFlags = 0; hr = ID3D10Device_CreateTexture2D(device, &tex_desc, NULL, tex); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)*tex, NULL, srv); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); } static void test_effect_state_groups(void) @@ -4465,10 +4465,10 @@ static void test_effect_state_groups(void) } hr = create_effect(fx_test_state_groups, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create effect, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(!effect_desc.ConstantBuffers, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -4498,7 +4498,7 @@ static void test_effect_state_groups(void) ok(sampler_desc.MinLOD == 6.0f, "Got unexpected MinLOD %.8e.\n", sampler_desc.MinLOD); ok(sampler_desc.MaxLOD == 5.0f, "Got unexpected MaxLOD %.8e.\n", sampler_desc.MaxLOD); hr = s->lpVtbl->GetSampler(s, 0, &sampler); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10SamplerState_GetDesc(sampler, &sampler_desc); ok(sampler_desc.Filter == D3D10_FILTER_MIN_MAG_MIP_LINEAR, "Got unexpected Filter %#x.\n", sampler_desc.Filter); ID3D10SamplerState_Release(sampler); @@ -4506,7 +4506,7 @@ static void test_effect_state_groups(void) s->lpVtbl->GetBackingStore(s, 1, &sampler_desc); ok(sampler_desc.AddressU == D3D10_TEXTURE_ADDRESS_MIRROR, "Got unexpected AddressU %#x.\n", sampler_desc.AddressU); hr = s->lpVtbl->GetSampler(s, 1, &sampler); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10SamplerState_GetDesc(sampler, &sampler_desc); ok(sampler_desc.AddressU == D3D10_TEXTURE_ADDRESS_MIRROR, "Got unexpected AddressU %#x.\n", sampler_desc.AddressU); ID3D10SamplerState_Release(sampler); @@ -4531,14 +4531,14 @@ static void test_effect_state_groups(void) ok(blend_desc.RenderTargetWriteMask[7] == 0x7, "Got unexpected RenderTargetWriteMask[7] %#x.\n", blend_desc.RenderTargetWriteMask[7]); hr = b->lpVtbl->GetBlendState(b, 0, &blend_state); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10BlendState_GetDesc(blend_state, &blend_desc); ok(blend_desc.SrcBlend == D3D10_BLEND_ONE, "Got unexpected SrcBlend %#x.\n", blend_desc.SrcBlend); ID3D10BlendState_Release(blend_state); b->lpVtbl->GetBackingStore(b, 1, &blend_desc); ok(blend_desc.SrcBlend == D3D10_BLEND_SRC_COLOR, "Got unexpected SrcBlend %#x.\n", blend_desc.SrcBlend); hr = b->lpVtbl->GetBlendState(b, 1, &blend_state); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10BlendState_GetDesc(blend_state, &blend_desc); /* We can't check the SrcBlend value from the ID3D10BlendState object * descriptor because BlendEnable[0] is effectively false, which forces @@ -4574,14 +4574,14 @@ static void test_effect_state_groups(void) ok(ds_desc.BackFace.StencilFunc == D3D10_COMPARISON_GREATER_EQUAL, "Got unexpected BackFaceStencilFunc %#x.\n", ds_desc.BackFace.StencilFunc); hr = d->lpVtbl->GetDepthStencilState(d, 0, &ds_state); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10DepthStencilState_GetDesc(ds_state, &ds_desc); ok(ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); ID3D10DepthStencilState_Release(ds_state); d->lpVtbl->GetBackingStore(d, 1, &ds_desc); ok(!ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); hr = d->lpVtbl->GetDepthStencilState(d, 1, &ds_state); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10DepthStencilState_GetDesc(ds_state, &ds_desc); ok(!ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); ID3D10DepthStencilState_Release(ds_state); @@ -4603,7 +4603,7 @@ static void test_effect_state_groups(void) ok(rast_desc.AntialiasedLineEnable, "Got unexpected AntialiasedLineEnable %#x.\n", rast_desc.AntialiasedLineEnable); hr = r->lpVtbl->GetRasterizerState(r, 0, &rast_state); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10RasterizerState_GetDesc(rast_state, &rast_desc); ok(rast_desc.CullMode == D3D10_CULL_FRONT, "Got unexpected CullMode %#x.\n", rast_desc.CullMode); ID3D10RasterizerState_Release(rast_state); @@ -4611,7 +4611,7 @@ static void test_effect_state_groups(void) r->lpVtbl->GetBackingStore(r, 1, &rast_desc); ok(rast_desc.CullMode == D3D10_CULL_BACK, "Got unexpected CullMode %#x.\n", rast_desc.CullMode); hr = r->lpVtbl->GetRasterizerState(r, 1, &rast_state); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10RasterizerState_GetDesc(rast_state, &rast_desc); ok(rast_desc.CullMode == D3D10_CULL_BACK, "Got unexpected CullMode %#x.\n", rast_desc.CullMode); ID3D10RasterizerState_Release(rast_state); @@ -4621,7 +4621,7 @@ static void test_effect_state_groups(void) pass = technique->lpVtbl->GetPassByName(technique, "pass0"); ok(pass->lpVtbl->IsValid(pass), "Expected valid pass.\n"); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); - ok(SUCCEEDED(hr), "Failed to get pass desc, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(pass_desc.Name, "pass0"), "Got unexpected Name \"%s\".\n", pass_desc.Name); ok(!pass_desc.Annotations, "Got unexpected Annotations %#x.\n", pass_desc.Annotations); ok(!pass_desc.pIAInputSignature, "Got unexpected pIAInputSignature %p.\n", pass_desc.pIAInputSignature); @@ -4633,9 +4633,9 @@ static void test_effect_state_groups(void) ok(pass_desc.BlendFactor[3] == 0.8f, "Got unexpected BlendFactor[3] %.8e.\n", pass_desc.BlendFactor[3]); hr = D3D10StateBlockMaskDisableAll(&mask); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->ComputeStateBlockMask(pass, &mask); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_RS_RASTERIZER_STATE, 0); ok(ret, "Unexpected mask.\n"); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_OM_DEPTH_STENCIL_STATE, 0); @@ -4644,7 +4644,7 @@ static void test_effect_state_groups(void) ok(ret, "Unexpected mask.\n"); hr = pass->lpVtbl->Apply(pass, 0); - ok(SUCCEEDED(hr), "Failed to apply pass, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetBlendState(device, &blend_state, blend_factor, &sample_mask); ID3D10BlendState_GetDesc(blend_state, &blend_desc); @@ -4722,15 +4722,15 @@ static void test_effect_state_groups(void) create_effect_texture_resource(device, &srv0, &tex0); hr = D3D10StateBlockMaskDisableAll(&mask); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->ComputeStateBlockMask(pass, &mask); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_VS_SHADER_RESOURCES, 0); ok(!ret, "Unexpected mask.\n"); ID3D10Device_PSSetShaderResources(device, 0, 1, &srv0); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_PSGetShaderResources(device, 0, 1, &srv1); ok(!srv1, "Unexpected resource pointer.\n"); @@ -4744,7 +4744,7 @@ static void test_effect_state_groups(void) ID3D10Device_OMSetDepthStencilState(device, ds_state, 0); ID3D10Device_OMSetBlendState(device, blend_state, NULL, 0); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetDepthStencilState(device, &ds_state2, &stencil_ref); ok(!ds_state2, "Unexpected depth stencil state.\n"); ID3D10Device_OMGetBlendState(device, &blend_state2, blend_factor, &sample_mask); @@ -4755,7 +4755,7 @@ static void test_effect_state_groups(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -4820,10 +4820,10 @@ static void test_effect_state_group_defaults(void) } hr = create_effect(fx_test_state_group_defaults, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create effect, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 0, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -4924,7 +4924,7 @@ static void test_effect_state_group_defaults(void) pass = technique->lpVtbl->GetPassByName(technique, "pass0"); ok(pass->lpVtbl->IsValid(pass), "Failed to get pass.\n"); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); - ok(SUCCEEDED(hr), "Failed to get pass desc, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(pass_desc.Name, "pass0"), "Got unexpected Name \"%s\".\n", pass_desc.Name); ok(pass_desc.Annotations == 1, "Got unexpected Annotations %u.\n", pass_desc.Annotations); ok(!pass_desc.pIAInputSignature, "Got unexpected pIAInputSignature %p.\n", pass_desc.pIAInputSignature); @@ -4938,7 +4938,7 @@ static void test_effect_state_group_defaults(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -4987,68 +4987,68 @@ static void test_scalar_methods(ID3D10EffectScalarVariable *var, D3D10_SHADER_VA HRESULT hr; hr = var->lpVtbl->SetFloat(var, 5.0f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloat(var, &ret_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_f = type == D3D10_SVT_BOOL ? -1.0f : 5.0f; ok(ret_f == expected_f, "Variable %s, got unexpected value %.8e.\n", name, ret_f); hr = var->lpVtbl->GetInt(var, &ret_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_i = type == D3D10_SVT_BOOL ? -1 : 5; ok(ret_i == expected_i, "Variable %s, got unexpected value %#x.\n", name, ret_i); hr = var->lpVtbl->GetBool(var, &ret_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); ok(ret_b == -1, "Variable %s, got unexpected value %#x.\n", name, ret_b); hr = var->lpVtbl->SetInt(var, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloat(var, &ret_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_f = type == D3D10_SVT_BOOL ? -1.0f : 2.0f; ok(ret_f == expected_f, "Variable %s, got unexpected value %.8e.\n", name, ret_f); hr = var->lpVtbl->GetInt(var, &ret_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_i = type == D3D10_SVT_BOOL ? -1 : 2; ok(ret_i == expected_i, "Variable %s, got unexpected value %#x.\n", name, ret_i); hr = var->lpVtbl->GetBool(var, &ret_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); ok(ret_b == -1, "Variable %s, got unexpected value %#x.\n", name, ret_b); hr = var->lpVtbl->SetBool(var, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloat(var, &ret_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); ok(ret_f == -1.0f, "Variable %s, got unexpected value %.8e.\n", name, ret_f); hr = var->lpVtbl->GetInt(var, &ret_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); ok(ret_i == -1, "Variable %s, got unexpected value %#x.\n", name, ret_i); hr = var->lpVtbl->GetBool(var, &ret_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_b = type == D3D10_SVT_BOOL ? 1 : -1; ok(ret_b == expected_b, "Variable %s, got unexpected value %#x.\n", name, ret_b); hr = var->lpVtbl->SetBool(var, 32); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloat(var, &ret_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); ok(ret_f == -1.0f, "Variable %s, got unexpected value %.8e.\n", name, ret_f); hr = var->lpVtbl->GetInt(var, &ret_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); ok(ret_i == -1, "Variable %s, got unexpected value %#x.\n", name, ret_i); hr = var->lpVtbl->GetBool(var, &ret_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_b = type == D3D10_SVT_BOOL ? 32 : -1; ok(ret_b == expected_b, "Variable %s, got unexpected value %#x.\n", name, ret_b); } @@ -5064,10 +5064,10 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA set_f[0] = 10.0f; set_f[1] = 20.0f; hr = var->lpVtbl->SetFloatArray(var, set_f, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatArray(var, ret_f, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) { expected_f = type == D3D10_SVT_BOOL ? -1.0f : set_f[i]; @@ -5075,7 +5075,7 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA } hr = var->lpVtbl->GetIntArray(var, ret_i, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) { expected_i = type == D3D10_SVT_BOOL ? -1 : (int)set_f[i]; @@ -5083,16 +5083,16 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA } hr = var->lpVtbl->GetBoolArray(var, ret_b, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) ok(ret_b[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_b[i]); set_i[0] = 5; set_i[1] = 6; hr = var->lpVtbl->SetIntArray(var, set_i, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatArray(var, ret_f, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) { expected_f = type == D3D10_SVT_BOOL ? -1.0f : (float)set_i[i]; @@ -5100,7 +5100,7 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA } hr = var->lpVtbl->GetIntArray(var, ret_i, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) { expected_i = type == D3D10_SVT_BOOL ? -1 : set_i[i]; @@ -5108,26 +5108,26 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA } hr = var->lpVtbl->GetBoolArray(var, ret_b, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) ok(ret_b[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_b[i]); set_b[0] = 1; set_b[1] = 1; hr = var->lpVtbl->SetBoolArray(var, set_b, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatArray(var, ret_f, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) ok(ret_f[i] == -1.0f, "Variable %s, got unexpected value %.8e.\n", name, ret_f[i]); hr = var->lpVtbl->GetIntArray(var, ret_i, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) ok(ret_i[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_i[i]); hr = var->lpVtbl->GetBoolArray(var, ret_b, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) { expected_b = type == D3D10_SVT_BOOL ? 1 : -1; @@ -5136,20 +5136,20 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA set_b[0] = 10; set_b[1] = 20; hr = var->lpVtbl->SetBoolArray(var, set_b, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatArray(var, ret_f, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) ok(ret_f[i] == -1.0f, "Variable %s, got unexpected value %.8e.\n", name, ret_f[i]); hr = var->lpVtbl->GetIntArray(var, ret_i, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) ok(ret_i[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_i[i]); hr = var->lpVtbl->GetBoolArray(var, ret_b, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < 2; ++i) { expected_b = type == D3D10_SVT_BOOL ? set_b[i] : -1; @@ -5159,15 +5159,15 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA /* Array offset tests. Offset argument goes unused for scalar arrays. */ set_i[0] = 0; set_i[1] = 0; hr = var->lpVtbl->SetIntArray(var, set_i, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); /* After this, if offset is in use, return should be { 0, 5 }. */ set_i[0] = 5; hr = var->lpVtbl->SetIntArray(var, set_i, 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetIntArray(var, ret_i, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_b_a[0] = -1; expected_b_a[1] = 0; expected_i_a[0] = 5; expected_i_a[1] = 0; for (i = 0; i < 2; ++i) @@ -5179,29 +5179,29 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA /* Test the offset on GetArray methods. If offset was in use, we'd get * back 5 given that the variable was previously set to { 0, 5 }. */ hr = var->lpVtbl->GetIntArray(var, ret_i, 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_i = type == D3D10_SVT_BOOL ? -1 : 5; ok(ret_i[0] == expected_i, "Variable %s, got unexpected value %#x.\n", name, ret_i[0]); /* Try setting offset larger than number of elements. */ set_i[0] = 0; set_i[1] = 0; hr = var->lpVtbl->SetIntArray(var, set_i, 0, 2); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); set_i[0] = 1; hr = var->lpVtbl->SetIntArray(var, set_i, 6, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); /* Since offset goes unused, a larger offset than the number of elements * in the array should have no effect. */ hr = var->lpVtbl->GetIntArray(var, ret_i, 0, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_i = type == D3D10_SVT_BOOL ? -1 : 1; ok(ret_i[0] == expected_i, "Variable %s, got unexpected value %#x.\n", name, ret_i[0]); memset(ret_i, 0, sizeof(ret_i)); hr = var->lpVtbl->GetIntArray(var, ret_i, 6, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_i = type == D3D10_SVT_BOOL ? -1 : 1; ok(ret_i[0] == expected_i, "Variable %s, got unexpected value %#x.\n", name, ret_i[0]); @@ -5211,11 +5211,11 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA * ends up writing over into the adjacent variables in the local buffer. */ set_i[0] = 1; set_i[1] = 2; set_i[2] = 3; set_i[3] = 4; set_i[4] = 5; set_i[5] = 6; hr = var->lpVtbl->SetIntArray(var, set_i, 0, 6); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); memset(ret_i, 0, sizeof(ret_i)); hr = var->lpVtbl->GetIntArray(var, ret_i, 0, 6); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_i_a[0] = 1; expected_i_a[1] = 2; expected_i_a[2] = 0; expected_i_a[3] = 0; expected_i_a[4] = 0; expected_i_a[5] = 0; @@ -5267,10 +5267,10 @@ static void test_effect_scalar_variable(void) } hr = create_effect(fx_test_scalar_variable, 0, device, NULL, &effect); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 1, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -5290,7 +5290,7 @@ static void test_effect_scalar_variable(void) var = effect->lpVtbl->GetVariableByName(effect, tests[i].name); type = var->lpVtbl->GetType(var); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", tests[i].name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", tests[i].name, hr); ok(type_desc.Type == tests[i].type, "Variable %s, got unexpected type %#x.\n", tests[i].name, type_desc.Type); s_v = var->lpVtbl->AsScalar(var); @@ -5303,22 +5303,22 @@ static void test_effect_scalar_variable(void) var = effect->lpVtbl->GetVariableByName(effect, "f0"); s_v = var->lpVtbl->AsScalar(var); hr = s_v->lpVtbl->SetFloat(s_v, 1.0f); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); var2 = effect->lpVtbl->GetVariableByName(effect, "f_a"); var2 = var2->lpVtbl->GetElement(var2, 0); s_v2 = var->lpVtbl->AsScalar(var2); hr = s_v2->lpVtbl->SetFloat(s_v2, 2.0f); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = s_v->lpVtbl->GetFloat(s_v, &f); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(f == 1.0f, "Unexpected value %f.\n", f); effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -5381,10 +5381,10 @@ static void test_vector_methods(ID3D10EffectVectorVariable *var, D3D10_SHADER_VA set_f[0] = 1.0f; set_f[1] = 2.0f; set_f[2] = 3.0f; set_f[3] = 4.0f; hr = var->lpVtbl->SetFloatVector(var, set_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatVector(var, ret_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) { expected_f = type == D3D10_SVT_BOOL ? -1.0f : set_f[i]; @@ -5392,7 +5392,7 @@ static void test_vector_methods(ID3D10EffectVectorVariable *var, D3D10_SHADER_VA } hr = var->lpVtbl->GetIntVector(var, ret_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) { expected_i = type == D3D10_SVT_BOOL ? -1 : (int)set_f[i]; @@ -5400,16 +5400,16 @@ static void test_vector_methods(ID3D10EffectVectorVariable *var, D3D10_SHADER_VA } hr = var->lpVtbl->GetBoolVector(var, ret_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(ret_b[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_b[i]); set_i[0] = 5; set_i[1] = 6; set_i[2] = 7; set_i[3] = 8; hr = var->lpVtbl->SetIntVector(var, set_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatVector(var, ret_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) { expected_f = type == D3D10_SVT_BOOL ? -1.0f : (float)set_i[i]; @@ -5417,7 +5417,7 @@ static void test_vector_methods(ID3D10EffectVectorVariable *var, D3D10_SHADER_VA } hr = var->lpVtbl->GetIntVector(var, ret_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) { expected_i = type == D3D10_SVT_BOOL ? -1 : set_i[i]; @@ -5425,28 +5425,28 @@ static void test_vector_methods(ID3D10EffectVectorVariable *var, D3D10_SHADER_VA } hr = var->lpVtbl->GetBoolVector(var, ret_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(ret_b[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_b[i]); set_b[0] = 1; set_b[1] = 0; set_b[2] = 1; set_b[3] = 0; hr = var->lpVtbl->SetBoolVector(var, set_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatVector(var, ret_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_f_v[0] = -1.0f; expected_f_v[1] = 0.0f; expected_f_v[2] = -1.0f; expected_f_v[3] = 0.0f; for (i = 0; i < components; ++i) ok(ret_f[i] == expected_f_v[i], "Variable %s, got unexpected value %.8e.\n", name, ret_f[i]); hr = var->lpVtbl->GetIntVector(var, ret_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_i_v[0] = -1; expected_i_v[1] = 0; expected_i_v[2] = -1; expected_i_v[3] = 0; for (i = 0; i < components; ++i) ok(ret_i[i] == expected_i_v[i], "Variable %s, got unexpected value %#x.\n", name, ret_i[i]); hr = var->lpVtbl->GetBoolVector(var, ret_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) { expected_b = type == D3D10_SVT_BOOL ? set_b[i] : expected_i_v[i]; @@ -5455,20 +5455,20 @@ static void test_vector_methods(ID3D10EffectVectorVariable *var, D3D10_SHADER_VA set_b[0] = 5; set_b[1] = 10; set_b[2] = 15; set_b[3] = 20; hr = var->lpVtbl->SetBoolVector(var, set_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatVector(var, ret_f); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(ret_f[i] == -1.0f, "Variable %s, got unexpected value %.8e.\n", name, ret_f[i]); hr = var->lpVtbl->GetIntVector(var, ret_i); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(ret_i[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_i[i]); hr = var->lpVtbl->GetBoolVector(var, ret_b); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) { expected_b = type == D3D10_SVT_BOOL ? set_b[i] : -1; @@ -5489,10 +5489,10 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA set_f[4] = 5.0f; set_f[5] = 6.0f; set_f[6] = 7.0f; set_f[7] = 8.0f; set_f[8] = 9.0f; hr = var->lpVtbl->SetFloatVectorArray(var, set_f, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatVectorArray(var, ret_f, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) { expected_f = type == D3D10_SVT_BOOL ? -1.0f : set_f[i]; @@ -5500,7 +5500,7 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA } hr = var->lpVtbl->GetIntVectorArray(var, ret_i, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) { expected_i = type == D3D10_SVT_BOOL ? -1 : (int)set_f[i]; @@ -5508,7 +5508,7 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA } hr = var->lpVtbl->GetBoolVectorArray(var, ret_b, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) ok(ret_b[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_b[i]); @@ -5516,10 +5516,10 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA set_i[4] = 14; set_i[5] = 15; set_i[6] = 16; set_i[7] = 17; set_i[8] = 18; hr = var->lpVtbl->SetIntVectorArray(var, set_i, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatVectorArray(var, ret_f, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) { expected_f = type == D3D10_SVT_BOOL ? -1.0f : (float)set_i[i]; @@ -5527,7 +5527,7 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA } hr = var->lpVtbl->GetIntVectorArray(var, ret_i, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) { expected_i = type == D3D10_SVT_BOOL ? -1 : set_i[i]; @@ -5535,7 +5535,7 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA } hr = var->lpVtbl->GetBoolVectorArray(var, ret_b, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) ok(ret_b[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_b[i]); @@ -5543,10 +5543,10 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA set_b[4] = 1; set_b[5] = 0; set_b[6] = 0; set_b[7] = 1; set_b[8] = 1; hr = var->lpVtbl->SetBoolVectorArray(var, set_b, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatVectorArray(var, ret_f, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_f_a[0] = -1.0f; expected_f_a[1] = 0.0f; expected_f_a[2] = -1.0f; expected_f_a[3] = -1.0f; expected_f_a[4] = -1.0f; expected_f_a[5] = 0.0f; expected_f_a[6] = 0.0f; expected_f_a[7] = -1.0f; expected_f_a[8] = -1.0f; @@ -5554,7 +5554,7 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA ok(ret_f[i] == expected_f_a[i], "Variable %s, got unexpected value %.8e.\n", name, ret_f[i]); hr = var->lpVtbl->GetIntVectorArray(var, ret_i, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); expected_i_a[0] = -1; expected_i_a[1] = 0; expected_i_a[2] = -1; expected_i_a[3] = -1; expected_i_a[4] = -1; expected_i_a[5] = 0; expected_i_a[6] = 0; expected_i_a[7] = -1; expected_i_a[8] = -1; @@ -5562,7 +5562,7 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA ok(ret_i[i] == expected_i_a[i], "Variable %s, got unexpected value %#x.\n", name, ret_i[i]); hr = var->lpVtbl->GetBoolVectorArray(var, ret_b, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) { expected_b = type == D3D10_SVT_BOOL ? set_b[i] : expected_i_a[i]; @@ -5573,20 +5573,20 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA set_b[4] = 25; set_b[5] = 30; set_b[6] = 35; set_b[7] = 40; set_b[8] = 45; hr = var->lpVtbl->SetBoolVectorArray(var, set_b, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetFloatVectorArray(var, ret_f, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) ok(ret_f[i] == -1.0f, "Variable %s, got unexpected value %.8e.\n", name, ret_f[i]); hr = var->lpVtbl->GetIntVectorArray(var, ret_i, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) ok(ret_i[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_i[i]); hr = var->lpVtbl->GetBoolVectorArray(var, ret_b, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components * elements; ++i) { expected_b = type == D3D10_SVT_BOOL ? set_b[i] : -1; @@ -5600,43 +5600,43 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA set_b[4] = 0; set_b[5] = 0; set_b[6] = 0; set_b[7] = 0; set_b[8] = 0; hr = var->lpVtbl->SetBoolVectorArray(var, set_b, 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); set_b[0] = 1; set_b[1] = 1; set_b[2] = 1; set_b[3] = 1; hr = var->lpVtbl->SetBoolVectorArray(var, set_b, 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); /* If the previous offset of 1 worked, then the first vector value of the * array should still be false. */ hr = var->lpVtbl->GetFloatVectorArray(var, ret_f, 0, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(ret_f[i] == 0, "Variable %s, got unexpected value %.8e.\n", name, ret_f[i]); hr = var->lpVtbl->GetIntVectorArray(var, ret_i, 0, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(ret_i[i] == 0, "Variable %s, got unexpected value %#x.\n", name, ret_i[i]); hr = var->lpVtbl->GetBoolVectorArray(var, ret_b, 0, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(!ret_b[i], "Variable %s, got unexpected value %#x.\n", name, ret_b[i]); /* Test the GetFloatVectorArray offset argument. If it works, we should * get a vector with all values set to true. */ hr = var->lpVtbl->GetFloatVectorArray(var, ret_f, 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(ret_f[i] == -1.0f, "Variable %s, got unexpected value %.8e.\n", name, ret_f[i]); hr = var->lpVtbl->GetIntVectorArray(var, ret_i, 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) ok(ret_i[i] == -1, "Variable %s, got unexpected value %#x.\n", name, ret_i[i]); hr = var->lpVtbl->GetBoolVectorArray(var, ret_b, 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) { expected_b = type == D3D10_SVT_BOOL ? 1 : -1; @@ -5648,10 +5648,10 @@ static void test_vector_array_methods(ID3D10EffectVectorVariable *var, D3D10_SHA /* Windows array setting function has no bounds checking on offset values * either, so this ends up writing into adjacent variables. */ hr = var->lpVtbl->SetBoolVectorArray(var, set_b, elements + 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetBoolVectorArray(var, ret_b, elements + 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < components; ++i) { expected_b = type == D3D10_SVT_BOOL ? 1 : -1; @@ -5696,10 +5696,10 @@ static void test_effect_vector_variable(void) } hr = create_effect(fx_test_vector_variable, 0, device, NULL, &effect); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 1, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -5716,7 +5716,7 @@ static void test_effect_vector_variable(void) var = effect->lpVtbl->GetVariableByName(effect, tests[i].name); type = var->lpVtbl->GetType(var); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", tests[i].name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", tests[i].name, hr); ok(type_desc.Type == tests[i].type, "Variable %s, got unexpected type %#x.\n", tests[i].name, type_desc.Type); v_var = var->lpVtbl->AsVector(var); @@ -5728,7 +5728,7 @@ static void test_effect_vector_variable(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -5888,31 +5888,31 @@ static void test_matrix_methods(ID3D10EffectMatrixVariable *var, D3D10_SHADER_VA set_test_matrix(&m_set, type, row_count, col_count, 1); hr = var->lpVtbl->SetMatrix(var, &m_set.m[0][0]); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); memset(&m_ret.m[0][0], 0, sizeof(m_ret)); hr = var->lpVtbl->GetMatrix(var, &m_ret.m[0][0]); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); compare_matrix(name, __LINE__, &m_set, &m_ret, row_count, col_count, FALSE); memset(&m_ret.m[0][0], 0, sizeof(m_ret)); hr = var->lpVtbl->GetMatrixTranspose(var, &m_ret.m[0][0]); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); compare_matrix(name, __LINE__, &m_set, &m_ret, row_count, col_count, TRUE); hr = var->lpVtbl->SetMatrixTranspose(var, &m_set.m[0][0]); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); memset(&m_ret.m[0][0], 0, sizeof(m_ret)); hr = var->lpVtbl->GetMatrix(var, &m_ret.m[0][0]); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); compare_matrix(name, __LINE__, &m_ret, &m_set, row_count, col_count, TRUE); memset(&m_ret.m[0][0], 0, sizeof(m_ret)); memset(&m_expected.m[0][0], 0, sizeof(m_expected)); hr = var->lpVtbl->GetMatrixTranspose(var, &m_ret.m[0][0]); transpose_matrix(&m_set, &m_expected, row_count, col_count); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); compare_matrix(name, __LINE__, &m_expected, &m_ret, row_count, col_count, TRUE); } @@ -5926,33 +5926,33 @@ static void test_matrix_array_methods(ID3D10EffectMatrixVariable *var, D3D10_SHA set_test_matrix(&m_set[0], type, row_count, col_count, elements); hr = var->lpVtbl->SetMatrixArray(var, &m_set[0].m[0][0], 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); memset(m_ret, 0, sizeof(m_ret)); hr = var->lpVtbl->GetMatrixArray(var, &m_ret[0].m[0][0], 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < elements; ++i) compare_matrix(name, __LINE__, &m_set[i], &m_ret[i], row_count, col_count, FALSE); memset(m_ret, 0, sizeof(m_ret)); hr = var->lpVtbl->GetMatrixTransposeArray(var, &m_ret[0].m[0][0], 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < elements; ++i) compare_matrix(name, __LINE__, &m_set[i], &m_ret[i], row_count, col_count, TRUE); hr = var->lpVtbl->SetMatrixTransposeArray(var, &m_set[0].m[0][0], 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); memset(m_ret, 0, sizeof(m_ret)); hr = var->lpVtbl->GetMatrixArray(var, &m_ret[0].m[0][0], 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < elements; ++i) compare_matrix(name, __LINE__, &m_ret[i], &m_set[i], row_count, col_count, TRUE); memset(m_ret, 0, sizeof(m_ret)); memset(&m_expected, 0, sizeof(m_expected)); hr = var->lpVtbl->GetMatrixTransposeArray(var, &m_ret[0].m[0][0], 0, elements); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); for (i = 0; i < elements; ++i) { memset(&m_expected, 0, sizeof(m_expected)); @@ -5965,21 +5965,21 @@ static void test_matrix_array_methods(ID3D10EffectMatrixVariable *var, D3D10_SHA hr = var->lpVtbl->SetMatrixArray(var, &m_ret[0].m[0][0], 0, elements); hr = var->lpVtbl->SetMatrixArray(var, &m_set[0].m[0][0], 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); hr = var->lpVtbl->GetMatrixArray(var, &m_ret[0].m[0][0], 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); compare_matrix(name, __LINE__, &m_ret[0], &m_set[0], row_count, col_count, FALSE); memset(m_ret, 0, sizeof(m_ret)); hr = var->lpVtbl->SetMatrixArray(var, &m_ret[0].m[0][0], 0, elements); hr = var->lpVtbl->SetMatrixTransposeArray(var, &m_set[0].m[0][0], 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); memset(&m_expected, 0, sizeof(m_expected)); hr = var->lpVtbl->GetMatrixTransposeArray(var, &m_ret[0].m[0][0], 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); transpose_matrix(&m_set[0], &m_expected, row_count, col_count); compare_matrix(name, __LINE__, &m_expected, &m_ret[0], row_count, col_count, TRUE); @@ -5988,19 +5988,19 @@ static void test_matrix_array_methods(ID3D10EffectMatrixVariable *var, D3D10_SHA /* Like vector array functions, matrix array functions will allow for * writing out of bounds into adjacent memory. */ hr = var->lpVtbl->SetMatrixArray(var, &m_set[0].m[0][0], elements + 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); memset(m_ret, 0, sizeof(m_ret)); hr = var->lpVtbl->GetMatrixArray(var, &m_ret[0].m[0][0], elements + 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); compare_matrix(name, __LINE__, &m_expected, &m_ret[0], row_count, col_count, TRUE); hr = var->lpVtbl->SetMatrixTransposeArray(var, &m_set[0].m[0][0], elements + 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); memset(&m_expected, 0, sizeof(m_expected)); hr = var->lpVtbl->GetMatrixTransposeArray(var, &m_ret[0].m[0][0], elements + 1, 1); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", name, hr); transpose_matrix(&m_set[0], &m_expected, row_count, col_count); compare_matrix(name, __LINE__, &m_expected, &m_ret[0], row_count, col_count, TRUE); } @@ -6042,10 +6042,10 @@ static void test_effect_matrix_variable(void) } hr = create_effect(fx_test_matrix_variable, 0, device, NULL, &effect); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 1, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -6062,7 +6062,7 @@ static void test_effect_matrix_variable(void) var = effect->lpVtbl->GetVariableByName(effect, tests[i].name); type = var->lpVtbl->GetType(var); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok(hr == S_OK, "Variable %s, got unexpected hr %#x.\n", tests[i].name, hr); + ok(hr == S_OK, "Variable %s, got unexpected hr %#lx.\n", tests[i].name, hr); ok(type_desc.Type == tests[i].type, "Variable %s, got unexpected type %#x.\n", tests[i].name, type_desc.Type); m_var = var->lpVtbl->AsMatrix(var); @@ -6075,7 +6075,7 @@ static void test_effect_matrix_variable(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } /* @@ -6225,7 +6225,7 @@ static ID3D10EffectShaderResourceVariable *get_effect_shader_resource_variable_( type = var->lpVtbl->GetType(var); ok_(__FILE__, line)(!!type, "Got unexpected type %p.\n", type); hr = type->lpVtbl->GetDesc(type, &type_desc); - ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok_(__FILE__, line)(type_desc.Type == D3D10_SVT_TEXTURE2D, "Type is %x, expected %x.\n", type_desc.Type, D3D10_SVT_TEXTURE2D); return var->lpVtbl->AsShaderResource(var); @@ -6257,10 +6257,10 @@ static void test_effect_resource_variable(void) } hr = create_effect(fx_test_resource_variable, 0, device, NULL, &effect); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->GetDesc(effect, &effect_desc); - ok(SUCCEEDED(hr), "Failed to get effect description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!effect_desc.IsChildEffect, "Unexpected IsChildEffect.\n"); ok(effect_desc.ConstantBuffers == 0, "Unexpected constant buffers count %u.\n", effect_desc.ConstantBuffers); @@ -6278,19 +6278,19 @@ static void test_effect_resource_variable(void) var = effect->lpVtbl->GetVariableByName(effect, "dummy name"); t0 = var->lpVtbl->AsShaderResource(var); hr = t0->lpVtbl->SetResource(t0, srv0); - ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); var = effect->lpVtbl->GetVariableByName(effect, "t0"); t0 = get_effect_shader_resource_variable(var); hr = t0->lpVtbl->SetResource(t0, srv0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); var = effect->lpVtbl->GetVariableByName(effect, "t_a"); t_a = get_effect_shader_resource_variable(var); for (i = 0; i < 2; ++i) create_effect_texture_resource(device, &srv_a[i], &tex_a[i]); hr = t_a->lpVtbl->SetResourceArray(t_a, srv_a, 0, 2); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); /* Apply the pass to bind the resource to the shader. */ technique = effect->lpVtbl->GetTechniqueByName(effect, "rsrc_test"); @@ -6298,13 +6298,13 @@ static void test_effect_resource_variable(void) pass = technique->lpVtbl->GetPassByName(technique, "p0"); ok(pass->lpVtbl->IsValid(pass), "Expected valid pass.\n"); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!pass_desc.pIAInputSignature, "Unexpected input signature.\n"); - ok(pass_desc.IAInputSignatureSize == 88, "Unexpected input signature size %lu.\n", + ok(pass_desc.IAInputSignatureSize == 88, "Got unexpected input signature size %Iu.\n", pass_desc.IAInputSignatureSize); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_PSGetShaderResources(device, 0, 1, &srv_tmp[0]); ok(srv_tmp[0] == srv0, "Got unexpected shader resource view %p.\n", srv_tmp[0]); @@ -6321,10 +6321,10 @@ static void test_effect_resource_variable(void) var = t_a->lpVtbl->GetElement(t_a, 1); t_a_0 = get_effect_shader_resource_variable(var); hr = t_a_0->lpVtbl->SetResource(t_a_0, srv0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_PSGetShaderResources(device, 1, 2, srv_tmp); ok(srv_tmp[0] == srv_a[0], "Got unexpected shader resource view %p.\n", srv_tmp[0]); @@ -6334,10 +6334,10 @@ static void test_effect_resource_variable(void) /* Test offset. */ hr = t_a->lpVtbl->SetResourceArray(t_a, srv_a, 1, 1); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_PSGetShaderResources(device, 1, 2, srv_tmp); ok(srv_tmp[0] == srv_a[0], "Got unexpected shader resource view %p.\n", srv_tmp[0]); @@ -6349,7 +6349,7 @@ static void test_effect_resource_variable(void) { /* This crashes on Windows. */ hr = t_a->lpVtbl->SetResourceArray(t_a, srv_a, 2, 2); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); } ID3D10ShaderResourceView_Release(srv0); @@ -6363,7 +6363,7 @@ static void test_effect_resource_variable(void) effect->lpVtbl->Release(effect); hr = create_effect(fx_test_resource_variable2, 0, device, NULL, &effect); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); technique = effect->lpVtbl->GetTechniqueByName(effect, "rsrc_test"); ok(technique->lpVtbl->IsValid(technique), "Expected valid technique.\n"); @@ -6377,12 +6377,12 @@ static void test_effect_resource_variable(void) ok(s->lpVtbl->IsValid(s), "Expected valid sample variable.\n"); hr = s->lpVtbl->GetSampler(s, 0, &sampler[0]); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = s->lpVtbl->GetSampler(s, 1, &sampler[1]); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_PSGetSamplers(device, 0, ARRAY_SIZE(samplers), samplers); for (i = 0; i < ARRAY_SIZE(samplers); ++i) @@ -6402,7 +6402,7 @@ static void test_effect_resource_variable(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -6492,7 +6492,7 @@ static void test_effect_annotations(void) } hr = create_effect(fx_test_annotations, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect.\n"); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); cb = effect->lpVtbl->GetConstantBufferByName(effect, "cb"); a = cb->lpVtbl->GetAnnotationByName(cb, "s"); @@ -6505,7 +6505,7 @@ static void test_effect_annotations(void) { v = effect->lpVtbl->GetVariableByIndex(effect, i); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(var_desc.Annotations == 1, "Unexpected annotations count %u.\n", var_desc.Annotations); v = v->lpVtbl->GetAnnotationByName(v, "s"); ok(v->lpVtbl->IsValid(v), "Expected valid variable.\n"); @@ -6530,7 +6530,7 @@ static void test_effect_annotations(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } static void test_effect_optimize(void) @@ -6558,23 +6558,23 @@ static void test_effect_optimize(void) } hr = create_effect(fx_local_shader, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect.\n"); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); tech = effect->lpVtbl->GetTechniqueByIndex(effect, 0); hr = tech->lpVtbl->GetDesc(tech, &tech_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(tech_desc.Name, "Render"), "Unexpected technique name %s.\n", tech_desc.Name); pass = tech->lpVtbl->GetPassByIndex(tech, 0); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(pass_desc.Name, "P0"), "Unexpected pass name %s.\n", pass_desc.Name); v = effect->lpVtbl->GetVariableByName(effect, "g_so"); gs = v->lpVtbl->AsShader(v); hr = gs->lpVtbl->GetShaderDesc(gs, 0, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!shaderdesc.pInputSignature, "Expected input signature.\n"); ok(!shaderdesc.IsInline, "Unexpected inline flag.\n"); ok(!!shaderdesc.pBytecode, "Expected bytecode.\n"); @@ -6588,13 +6588,13 @@ static void test_effect_optimize(void) ok(!ret, "Unexpected return value.\n"); hr = effect->lpVtbl->Optimize(effect); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ret = effect->lpVtbl->IsOptimized(effect); ok(ret, "Unexpected return value.\n"); hr = gs->lpVtbl->GetShaderDesc(gs, 0, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!shaderdesc.pInputSignature, "Expected input signature.\n"); ok(!shaderdesc.IsInline, "Unexpected inline flag.\n"); ok(!shaderdesc.pBytecode, "Unexpected bytecode.\n"); @@ -6604,11 +6604,11 @@ static void test_effect_optimize(void) ok(!shaderdesc.NumOutputSignatureEntries, "Unexpected output signature count.\n"); hr = tech->lpVtbl->GetDesc(tech, &tech_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!tech_desc.Name, "Unexpected technique name %p.\n", tech_desc.Name); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!pass_desc.Name, "Unexpected pass name %p.\n", pass_desc.Name); pass = tech->lpVtbl->GetPassByName(tech, "P0"); @@ -6622,17 +6622,17 @@ static void test_effect_optimize(void) /* Already optimized */ hr = effect->lpVtbl->Optimize(effect); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); effect->lpVtbl->Release(effect); /* Annotations are stripped. */ hr = create_effect(fx_test_annotations, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect.\n"); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); cb = effect->lpVtbl->GetConstantBufferByName(effect, "cb"); hr = cb->lpVtbl->GetDesc(cb, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(var_desc.Annotations == 1, "Unexpected annotations count %u.\n", var_desc.Annotations); v = cb->lpVtbl->GetAnnotationByName(cb, "s"); ok(v->lpVtbl->IsValid(v), "Expected valid variable.\n"); @@ -6643,7 +6643,7 @@ static void test_effect_optimize(void) { v = effect->lpVtbl->GetVariableByIndex(effect, i); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(var_desc.Annotations == 1, "Unexpected annotations count %u.\n", var_desc.Annotations); v = v->lpVtbl->GetAnnotationByName(v, "s"); ok(v->lpVtbl->IsValid(v), "Expected valid variable.\n"); @@ -6651,7 +6651,7 @@ static void test_effect_optimize(void) tech = effect->lpVtbl->GetTechniqueByIndex(effect, 0); hr = tech->lpVtbl->GetDesc(tech, &tech_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(tech_desc.Annotations == 1, "Unexpected annotations count %u.\n", tech_desc.Annotations); v = tech->lpVtbl->GetAnnotationByName(tech, "s"); ok(v->lpVtbl->IsValid(v), "Expected valid variable.\n"); @@ -6659,17 +6659,17 @@ static void test_effect_optimize(void) pass = tech->lpVtbl->GetPassByIndex(tech, 0); ok(pass->lpVtbl->IsValid(pass), "Expected valid technique.\n"); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pass_desc.Annotations == 1, "Unexpected annotations count %u.\n", pass_desc.Annotations); v = pass->lpVtbl->GetAnnotationByName(pass, "s"); ok(v->lpVtbl->IsValid(v), "Expected valid variable.\n"); hr = effect->lpVtbl->Optimize(effect); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); cb = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); hr = cb->lpVtbl->GetDesc(cb, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine { ok(!var_desc.Annotations, "Unexpected annotations count %u.\n", var_desc.Annotations); v = cb->lpVtbl->GetAnnotationByName(cb, "s"); @@ -6682,7 +6682,7 @@ todo_wine { { v = effect->lpVtbl->GetVariableByIndex(effect, i); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine { ok(!var_desc.Annotations, "Unexpected annotations count %u.\n", var_desc.Annotations); v = v->lpVtbl->GetAnnotationByName(v, "s"); @@ -6692,7 +6692,7 @@ todo_wine { tech = effect->lpVtbl->GetTechniqueByIndex(effect, 0); hr = tech->lpVtbl->GetDesc(tech, &tech_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine { ok(!tech_desc.Annotations, "Unexpected annotations count %u.\n", tech_desc.Annotations); v = tech->lpVtbl->GetAnnotationByName(tech, "s"); @@ -6702,7 +6702,7 @@ todo_wine { pass = tech->lpVtbl->GetPassByIndex(tech, 0); ok(pass->lpVtbl->IsValid(pass), "Expected valid technique.\n"); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); todo_wine { ok(!pass_desc.Annotations, "Unexpected annotations count %u.\n", pass_desc.Annotations); v = pass->lpVtbl->GetAnnotationByName(pass, "s"); @@ -6712,7 +6712,7 @@ todo_wine { effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } static void test_effect_shader_description(void) @@ -6732,40 +6732,40 @@ static void test_effect_shader_description(void) } hr = create_effect(fx_local_shader, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect.\n"); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); v = effect->lpVtbl->GetVariableByName(effect, "v0"); /* GetShaderDesc() is indexing through all shaders in the effect.*/ s = v->lpVtbl->AsShader(v); hr = s->lpVtbl->GetShaderDesc(s, 0, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shaderdesc.BytecodeLength, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); hr = s->lpVtbl->GetShaderDesc(s, 1, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shaderdesc.BytecodeLength, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); hr = s->lpVtbl->GetShaderDesc(s, 2, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shaderdesc.BytecodeLength, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); hr = s->lpVtbl->GetShaderDesc(s, 3, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shaderdesc.BytecodeLength == 424, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); hr = s->lpVtbl->GetShaderDesc(s, 4, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shaderdesc.BytecodeLength == 424, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); hr = s->lpVtbl->GetShaderDesc(s, 5, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shaderdesc.BytecodeLength == 420, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); hr = s->lpVtbl->GetShaderDesc(s, 6, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shaderdesc.BytecodeLength == 516, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); ok(!shaderdesc.SODecl, "Unexpected SO declaration %p.\n", shaderdesc.SODecl); hr = s->lpVtbl->GetShaderDesc(s, 7, &shaderdesc); - ok(hr == S_OK, "Failed to get shader description, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shaderdesc.BytecodeLength == 516, "Unexpected bytecode length %u.\n", shaderdesc.BytecodeLength); ok(!strcmp(shaderdesc.SODecl, "SV_POSITION.x; $Skip.x; SV_POSITION.gb"), @@ -6774,7 +6774,7 @@ static void test_effect_shader_description(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } static void test_effect_shader_object(void) @@ -6796,7 +6796,7 @@ static void test_effect_shader_object(void) } hr = create_effect(fx_local_shader, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect!\n"); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); v = effect->lpVtbl->GetVariableByName(effect, "v0"); @@ -6804,108 +6804,108 @@ static void test_effect_shader_object(void) vs = (void *)0xdeadbeef; hr = s->lpVtbl->GetVertexShader(s, 0, &vs); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!vs, "Unexpected shader object.\n"); vs = (void *)0xdeadbeef; hr = s->lpVtbl->GetVertexShader(s, 1, &vs); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!vs, "Unexpected shader object.\n"); vs = (void *)0xdeadbeef; hr = s->lpVtbl->GetVertexShader(s, 2, &vs); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!vs, "Unexpected shader object.\n"); vs = NULL; hr = s->lpVtbl->GetVertexShader(s, 3, &vs); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!vs, "Unexpected shader object.\n"); ID3D10VertexShader_Release(vs); vs = NULL; hr = s->lpVtbl->GetVertexShader(s, 4, &vs); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!vs, "Unexpected shader object.\n"); ID3D10VertexShader_Release(vs); ps = (void *)0xdeadbeef; hr = s->lpVtbl->GetPixelShader(s, 0, &ps); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!ps, "Unexpected shader object.\n"); ps = (void *)0xdeadbeef; hr = s->lpVtbl->GetPixelShader(s, 1, &ps); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!ps, "Unexpected shader object.\n"); ps = (void *)0xdeadbeef; hr = s->lpVtbl->GetPixelShader(s, 2, &ps); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!ps, "Unexpected shader object.\n"); ps = (void *)0xdeadbeef; hr = s->lpVtbl->GetPixelShader(s, 3, &ps); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!ps, "Unexpected shader object.\n"); ps = (void *)0xdeadbeef; hr = s->lpVtbl->GetPixelShader(s, 4, &ps); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!ps, "Unexpected shader object.\n"); ps = NULL; hr = s->lpVtbl->GetPixelShader(s, 5, &ps); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!ps, "Unexpected shader object.\n"); ID3D10PixelShader_Release(ps); gs = (void *)0xdeadbeef; hr = s->lpVtbl->GetGeometryShader(s, 0, &gs); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!gs, "Unexpected shader object.\n"); gs = (void *)0xdeadbeef; hr = s->lpVtbl->GetGeometryShader(s, 1, &gs); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!gs, "Unexpected shader object.\n"); gs = (void *)0xdeadbeef; hr = s->lpVtbl->GetGeometryShader(s, 2, &gs); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!gs, "Unexpected shader object.\n"); gs = (void *)0xdeadbeef; hr = s->lpVtbl->GetGeometryShader(s, 3, &gs); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!gs, "Unexpected shader object.\n"); gs = (void *)0xdeadbeef; hr = s->lpVtbl->GetGeometryShader(s, 4, &gs); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!gs, "Unexpected shader object.\n"); gs = (void *)0xdeadbeef; hr = s->lpVtbl->GetGeometryShader(s, 5, &gs); - ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); ok(!gs, "Unexpected shader object.\n"); gs = NULL; hr = s->lpVtbl->GetGeometryShader(s, 6, &gs); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!gs, "Unexpected shader object.\n"); ID3D10GeometryShader_Release(gs); gs = NULL; hr = s->lpVtbl->GetGeometryShader(s, 7, &gs); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!!gs, "Unexpected shader object.\n"); ID3D10GeometryShader_Release(gs); effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -7115,44 +7115,44 @@ static void test_effect_pool(void) hr = D3D10CreateEffectPoolFromMemory(NULL, 0, 0, device, &pool); todo_wine - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = create_effect_pool(fx_test_pool, device, &pool); - ok(hr == S_OK, "Failed to create effect pool, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = get_refcount(pool); - ok(refcount == 1, "Unexpected refcount %u.\n", refcount); + ok(refcount == 1, "Got unexpected refcount %lu.\n", refcount); effect = pool->lpVtbl->AsEffect(pool); ok(!!effect, "Expected effect pointer.\n"); effect->lpVtbl->AddRef(effect); refcount = get_refcount(pool); - ok(refcount == 2, "Unexpected refcount %u.\n", refcount); + ok(refcount == 2, "Got unexpected refcount %lu.\n", refcount); effect->lpVtbl->Release(effect); hr = pool->lpVtbl->QueryInterface(pool, &IID_IUnknown, (void **)&unk); todo_wine - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); hr = pool->lpVtbl->QueryInterface(pool, &IID_ID3D10Effect, (void **)&unk); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); hr = pool->lpVtbl->QueryInterface(pool, &IID_ID3D10EffectPool, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(unk == (IUnknown *)pool, "Unexpected pointer.\n"); IUnknown_Release(unk); hr = effect->lpVtbl->QueryInterface(effect, &IID_IUnknown, (void **)&unk); todo_wine - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); hr = effect->lpVtbl->QueryInterface(effect, &IID_ID3D10Effect, (void **)&unk); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); hr = effect->lpVtbl->QueryInterface(effect, &IID_ID3D10EffectPool, (void **)&pool2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pool2 == pool, "Unexpected pool pointer.\n"); pool2->lpVtbl->Release(pool2); @@ -7160,7 +7160,7 @@ static void test_effect_pool(void) ok(ret, "Expected pool.\n"); hr = effect->lpVtbl->GetDesc(effect, &desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!desc.IsChildEffect, "Unexpected child flag.\n"); ok(desc.ConstantBuffers == 1, "Unexpected buffer count %u.\n", desc.ConstantBuffers); ok(!desc.SharedConstantBuffers, "Unexpected shared buffer count %u.\n", @@ -7171,13 +7171,13 @@ static void test_effect_pool(void) cb = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); hr = cb->lpVtbl->GetDesc(cb, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "s_cb"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); a = cb->lpVtbl->GetAnnotationByIndex(cb, 0); ok(a->lpVtbl->IsValid(a), "Expected valid annotation.\n"); hr = a->lpVtbl->GetDesc(a, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "s"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == (D3D10_EFFECT_VARIABLE_POOLED | D3D10_EFFECT_VARIABLE_ANNOTATION), "Unexpected flags %#x.\n", var_desc.Flags); @@ -7186,70 +7186,68 @@ static void test_effect_pool(void) pass = t->lpVtbl->GetPassByName(t, "P1"); ok(pass->lpVtbl->IsValid(pass), "Expected valid pass.\n"); hr = pass->lpVtbl->GetVertexShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = shader_desc.pShaderVariable->lpVtbl->GetDesc(shader_desc.pShaderVariable, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "$Anonymous"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); v = effect->lpVtbl->GetVariableByName(effect, "s_blendstate"); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "s_blendstate"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); v = effect->lpVtbl->GetVariableByName(effect, "s_texture"); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "s_texture"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); v = effect->lpVtbl->GetVariableByName(effect, "ps"); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "ps"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); t = effect->lpVtbl->GetTechniqueByIndex(effect, 0); pass = t->lpVtbl->GetPassByIndex(t, 0); hr = pass->lpVtbl->GetVertexShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); sv = shader_desc.pShaderVariable; hr = sv->lpVtbl->GetDesc(sv, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "$Anonymous"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); /* Create standalone effect from the same blob used for pool, */ hr = create_effect(fx_test_pool, D3D10_EFFECT_COMPILE_CHILD_EFFECT, device, NULL, &child_effect); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = create_effect(fx_test_pool, 0, device, NULL, &effect2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = effect2->lpVtbl->QueryInterface(effect2, &IID_IUnknown, (void **)&unk); todo_wine - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); hr = effect2->lpVtbl->QueryInterface(effect2, &IID_ID3D10Effect, (void **)&unk); todo_wine - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); /* For regular effects querying for ID3D10EffectPool is broken */ hr = effect2->lpVtbl->QueryInterface(effect2, &IID_ID3D10EffectPool, (void **)&unk); -todo_wine { - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(unk == (IUnknown *)effect2, "Unexpected pointer.\n"); -} + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + todo_wine ok(unk == (IUnknown *)effect2, "Got unexpected pointer %p.\n", unk); if (SUCCEEDED(hr)) IUnknown_Release(unk); ret = effect2->lpVtbl->IsPool(effect2); ok(!ret, "Unexpected pool.\n"); hr = effect2->lpVtbl->GetDesc(effect2, &desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!desc.IsChildEffect, "Unexpected child flag.\n"); ok(desc.ConstantBuffers == 1, "Unexpected buffer count %u.\n", desc.ConstantBuffers); ok(!desc.SharedConstantBuffers, "Unexpected shared buffer count %u.\n", @@ -7260,7 +7258,7 @@ todo_wine { cb = effect2->lpVtbl->GetConstantBufferByIndex(effect2, 0); hr = cb->lpVtbl->GetDesc(cb, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "s_cb"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); @@ -7268,13 +7266,13 @@ todo_wine { /* Pool and child that use different devices. */ hr = create_effect_pool(fx_test_pool, device2, &pool2); - ok(hr == S_OK, "Failed to create an effect pool, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = create_effect(fx_test_pool_child, D3D10_EFFECT_COMPILE_CHILD_EFFECT, device, pool2, &child_effect); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = child_effect->lpVtbl->GetDevice(child_effect, &device3); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(device3 == device, "Unexpected device.\n"); ID3D10Device_Release(device3); @@ -7282,7 +7280,7 @@ todo_wine { ok(cb->lpVtbl->IsValid(cb), "Expected valid constant buffer.\n"); hr = cb->lpVtbl->GetConstantBuffer(cb, &buffer); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Buffer_GetDevice(buffer, &device3); ok(device3 == device2, "Unexpected device.\n"); ID3D10Device_Release(device3); @@ -7293,22 +7291,22 @@ todo_wine { /* When pool is specified, corresponding flag has to be set. */ hr = create_effect(fx_test_pool_child, 0, device, pool, &child_effect); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = create_effect(fx_test_pool_child, D3D10_EFFECT_COMPILE_CHILD_EFFECT, device, NULL, &child_effect); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); refcount = get_refcount(pool); - ok(refcount == 1, "Unexpected refcount %u.\n", refcount); + ok(refcount == 1, "Got unexpected refcount %lu.\n", refcount); hr = create_effect(fx_test_pool_child, D3D10_EFFECT_COMPILE_CHILD_EFFECT, device, pool, &child_effect); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); refcount = get_refcount(pool); - ok(refcount == 2, "Unexpected refcount %u.\n", refcount); + ok(refcount == 2, "Got unexpected refcount %lu.\n", refcount); hr = child_effect->lpVtbl->GetDesc(child_effect, &desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(desc.IsChildEffect, "Unexpected child flag.\n"); ok(desc.ConstantBuffers == 2, "Unexpected buffer count %u.\n", desc.ConstantBuffers); ok(desc.SharedConstantBuffers == 1, "Unexpected shared buffer count %u.\n", @@ -7323,7 +7321,7 @@ todo_wine { ok(ret, "Unexpected invalid variable.\n"); hr = cb->lpVtbl->GetDesc(cb, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "l_cb"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); @@ -7332,7 +7330,7 @@ todo_wine { ok(ret, "Unexpected invalid variable.\n"); hr = cb->lpVtbl->GetDesc(cb, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "l_cb2"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); @@ -7341,7 +7339,7 @@ todo_wine { ok(ret, "Unexpected invalid variable.\n"); hr = cb->lpVtbl->GetDesc(cb, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "s_cb"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); @@ -7355,49 +7353,49 @@ todo_wine { /* Local variables first */ v = child_effect->lpVtbl->GetVariableByIndex(child_effect, 0); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "f0"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); v = child_effect->lpVtbl->GetVariableByIndex(child_effect, 1); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "f3"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); v = child_effect->lpVtbl->GetVariableByIndex(child_effect, 2); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "vs"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); v = child_effect->lpVtbl->GetVariableByIndex(child_effect, 3); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "f1"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); v = child_effect->lpVtbl->GetVariableByIndex(child_effect, 4); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "f2"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); v = child_effect->lpVtbl->GetVariableByName(child_effect, "s_texture"); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "s_texture"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); v = child_effect->lpVtbl->GetVariableBySemantic(child_effect, "COLOR0"); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "f0"), "Unexpected name %s.\n", var_desc.Name); ok(!var_desc.Flags, "Unexpected flags %#x.\n", var_desc.Flags); v = child_effect->lpVtbl->GetVariableBySemantic(child_effect, "COLOR1"); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!strcmp(var_desc.Name, "f2"), "Unexpected name %s.\n", var_desc.Name); ok(var_desc.Flags == D3D10_EFFECT_VARIABLE_POOLED, "Unexpected flags %#x.\n", var_desc.Flags); @@ -7406,10 +7404,10 @@ todo_wine { pool->lpVtbl->Release(pool); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); refcount = ID3D10Device_Release(device2); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -7495,13 +7493,13 @@ static void test_effect_default_variable_value(void) } hr = create_effect(fx_test_default_variable_value, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); memset(float_v, 0, sizeof(float_v)); v = effect->lpVtbl->GetVariableByName(effect, "f4"); vector = v->lpVtbl->AsVector(v); hr = vector->lpVtbl->GetFloatVector(vector, float_v); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(float_v[0] == 1.0f && float_v[1] == 2.0f && float_v[2] == 3.0f && float_v[3] == 4.0f, "Unexpected vector {%.8e,%.8e,%.8e,%.8e}\n", float_v[0], float_v[1], float_v[2], float_v[3]); @@ -7510,7 +7508,7 @@ static void test_effect_default_variable_value(void) v = effect->lpVtbl->GetVariableByName(effect, "f2"); vector = v->lpVtbl->AsVector(v); hr = vector->lpVtbl->GetFloatVector(vector, float_v); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(float_v[0] == 1.0f && float_v[1] == 2.0f && float_v[2] == 5.0f && float_v[3] == 5.0f, "Unexpected vector {%.8e,%.8e,%.8e,%.8e}\n", float_v[0], float_v[1], float_v[2], float_v[3]); @@ -7519,7 +7517,7 @@ static void test_effect_default_variable_value(void) v = effect->lpVtbl->GetVariableByName(effect, "f1"); vector = v->lpVtbl->AsVector(v); hr = vector->lpVtbl->GetFloatVector(vector, float_v); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(float_v[0] == 1.0f && float_v[1] == 5.0f && float_v[2] == 5.0f && float_v[3] == 5.0f, "Unexpected vector {%.8e,%.8e,%.8e,%.8e}\n", float_v[0], float_v[1], float_v[2], float_v[3]); @@ -7527,32 +7525,32 @@ static void test_effect_default_variable_value(void) v = effect->lpVtbl->GetVariableByName(effect, "i"); scalar = v->lpVtbl->AsScalar(v); hr = scalar->lpVtbl->GetInt(scalar, &int_s); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(int_s == 10, "Unexpected value %d.\n", int_s); memset(int_v, 0, sizeof(int_v)); v = effect->lpVtbl->GetVariableByName(effect, "i2"); scalar = v->lpVtbl->AsScalar(v); hr = scalar->lpVtbl->GetIntArray(scalar, int_v, 0, 2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(int_v[0] == 9 && int_v[1] == 12, "Unexpected vector {%d,%d}\n", int_v[0], int_v[1]); hr = v->lpVtbl->GetDesc(v, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(var_desc.BufferOffset == 32, "Unexpected offset %u.\n", var_desc.BufferOffset); v2 = v->lpVtbl->GetElement(v, 0); hr = v2->lpVtbl->GetDesc(v2, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(var_desc.BufferOffset == 32, "Unexpected offset %u.\n", var_desc.BufferOffset); v2 = v->lpVtbl->GetElement(v, 1); hr = v2->lpVtbl->GetDesc(v2, &var_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(var_desc.BufferOffset == 48, "Unexpected offset %u.\n", var_desc.BufferOffset); float_s = 0.0f; v = effect->lpVtbl->GetVariableByName(effect, "f"); scalar = v->lpVtbl->AsScalar(v); hr = scalar->lpVtbl->GetFloat(scalar, &float_s); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(float_s == 0.2f, "Unexpected value %.8e.\n", float_s); /* Matrix */ @@ -7561,7 +7559,7 @@ static void test_effect_default_variable_value(void) ok(matrix->lpVtbl->IsValid(matrix), "Expected valid matrix.\n"); memset(&m_ret, 0, sizeof(m_ret)); hr = matrix->lpVtbl->GetMatrix(matrix, &m_ret.m[0][0]); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); set_test_matrix(&m_set, D3D10_SVT_INT, 2, 3, 1); compare_matrix("m1", __LINE__, &m_set, &m_ret, 2, 3, FALSE); @@ -7571,7 +7569,7 @@ static void test_effect_default_variable_value(void) ok(matrix->lpVtbl->IsValid(matrix), "Expected valid matrix.\n"); memset(&m_ret, 0, sizeof(m_ret)); hr = matrix->lpVtbl->GetMatrix(matrix, &m_ret.m[0][0]); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); set_test_matrix(&m_set, D3D10_SVT_INT, 2, 3, 1); compare_matrix("m2", __LINE__, &m_set, &m_ret, 2, 3, FALSE); @@ -7581,7 +7579,7 @@ static void test_effect_default_variable_value(void) ok(matrix->lpVtbl->IsValid(matrix), "Expected valid matrix.\n"); memset(&m_ret, 0, sizeof(m_ret)); hr = matrix->lpVtbl->GetMatrix(matrix, &m_ret.m[0][0]); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); memset(&m_set, 0, sizeof(m_set)); *(unsigned int *)&m_set.m[0][0] = 1; @@ -7597,7 +7595,7 @@ static void test_effect_default_variable_value(void) ok(matrix->lpVtbl->IsValid(matrix), "Expected valid matrix.\n"); memset(&m_ret, 0, sizeof(m_ret)); hr = matrix->lpVtbl->GetMatrix(matrix, &m_ret.m[0][0]); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); set_test_matrix(&m_set, D3D10_SVT_FLOAT, 2, 2, 1); compare_matrix("m4", __LINE__, &m_set, &m_ret, 2, 2, FALSE); @@ -7610,27 +7608,27 @@ static void test_effect_default_variable_value(void) ok(m->lpVtbl->IsValid(m), "Expected valid variable.\n"); scalar = m->lpVtbl->AsScalar(m); hr = scalar->lpVtbl->GetBool(scalar, &ret); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(ret == 1, "Unexpected value.\n"); m = v->lpVtbl->GetMemberByName(v, "f2"); ok(m->lpVtbl->IsValid(m), "Expected valid variable.\n"); scalar = m->lpVtbl->AsScalar(m); hr = scalar->lpVtbl->GetFloat(scalar, &float_s); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(float_s == -0.2f, "Unexpected value %f.\n", float_s); m = v->lpVtbl->GetMemberByName(v, "b2"); ok(m->lpVtbl->IsValid(m), "Expected valid variable.\n"); scalar = m->lpVtbl->AsScalar(m); hr = scalar->lpVtbl->GetBool(scalar, &ret); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!ret, "Unexpected value.\n"); effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } static void test_effect_raw_value(void) @@ -7652,29 +7650,29 @@ static void test_effect_raw_value(void) } hr = create_effect(fx_test_default_variable_value, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); /* Read 1 float at a time, from float4 vector. */ v = effect->lpVtbl->GetVariableByName(effect, "f4"); for (i = 0; i < 4; ++i) { hr = v->lpVtbl->GetRawValue(v, &f, sizeof(f) * i, sizeof(f)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(f == i + 1.0f, "Unexpected value %f.\n", f); } /* Offset outside of variable storage, returns adjacent memory contents. */ hr = v->lpVtbl->GetRawValue(v, &f, 16, sizeof(f)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(f == 1.0f, "Unexpected value %f.\n", f); hr = v->lpVtbl->GetRawValue(v, &f, 20, sizeof(f)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(f == 2.0f, "Unexpected value %f.\n", f); /* Array */ v = effect->lpVtbl->GetVariableByName(effect, "i2"); ok(v->lpVtbl->IsValid(v), "Expected valid variable.\n"); hr = v->lpVtbl->GetRawValue(v, i_v, 0, 8 * sizeof(float)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(i_v[0] == 9, "Unexpected value %d.\n", i_v[0]); ok(i_v[1] == 0, "Unexpected value %d.\n", i_v[1]); ok(i_v[2] == 0, "Unexpected value %d.\n", i_v[2]); @@ -7682,7 +7680,7 @@ static void test_effect_raw_value(void) ok(i_v[4] == 12, "Unexpected value %d.\n", i_v[4]); hr = v->lpVtbl->GetRawValue(v, &f, 20, sizeof(f)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(f == 0.2f, "Unexpected value %f.\n", f); /* Matrix */ @@ -7715,25 +7713,25 @@ static void test_effect_raw_value(void) for (i = 0; i < 4; ++i) { hr = cb->lpVtbl->GetRawValue(cb, &f, sizeof(f) * i, sizeof(f)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(f == i + 1.0f, "Unexpected value %f.\n", f); } hr = cb->lpVtbl->GetRawValue(cb, &f, 16, sizeof(f)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(f == 1.0f, "Unexpected value %f.\n", f); hr = cb->lpVtbl->GetRawValue(cb, &f, 20, sizeof(f)); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(f == 2.0f, "Unexpected value %f.\n", f); /* Invalid variable */ v = effect->lpVtbl->GetVariableByName(effect, "invalid"); hr = v->lpVtbl->GetRawValue(v, &f, 0, sizeof(f)); - ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -7816,7 +7814,7 @@ static void test_effect_dynamic_numeric_field(void) } hr = create_effect(fx_test_effect_dynamic_numeric_field, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); tech = effect->lpVtbl->GetTechniqueByIndex(effect, 0); ok(tech->lpVtbl->IsValid(tech), "Expected valid technique.\n"); @@ -7828,7 +7826,7 @@ static void test_effect_dynamic_numeric_field(void) memset(blend_factor, 0, sizeof(blend_factor)); ID3D10Device_OMSetBlendState(device, NULL, blend_factor, 0); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetDepthStencilState(device, &ds_state, &stencil_ref); ok(!stencil_ref, "Unexpected stencil ref value %#x.\n", stencil_ref); ID3D10Device_OMGetBlendState(device, &blend_state, blend_factor, &sample_mask); @@ -7841,17 +7839,17 @@ static void test_effect_dynamic_numeric_field(void) v = effect->lpVtbl->GetVariableByName(effect, "i1"); scalar = v->lpVtbl->AsScalar(v); hr = scalar->lpVtbl->SetInt(scalar, 2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetDepthStencilState(device, &ds_state, &stencil_ref); ok(stencil_ref == 0x2, "Unexpected stencil ref value %#x.\n", stencil_ref); hr = scalar->lpVtbl->SetInt(scalar, 3); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(pass_desc.StencilRef == 0x3, "Unexpected stencil ref value %#x.\n", stencil_ref); ID3D10Device_OMGetDepthStencilState(device, &ds_state, &stencil_ref); ok(stencil_ref == 0x2, "Unexpected stencil ref value %#x.\n", stencil_ref); @@ -7862,13 +7860,13 @@ static void test_effect_dynamic_numeric_field(void) v = v->lpVtbl->GetElement(v, 1); scalar = v->lpVtbl->AsScalar(v); hr = scalar->lpVtbl->SetInt(scalar, 4); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMSetDepthStencilState(device, NULL, 0x1); memset(blend_factor, 0, sizeof(blend_factor)); ID3D10Device_OMSetBlendState(device, NULL, blend_factor, 0); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetDepthStencilState(device, &ds_state, &stencil_ref); ok(stencil_ref == 0x4, "Unexpected stencil ref value %#x.\n", stencil_ref); ID3D10Device_OMGetBlendState(device, &blend_state, blend_factor, &sample_mask); @@ -7881,7 +7879,7 @@ static void test_effect_dynamic_numeric_field(void) effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -8000,13 +7998,13 @@ static void test_effect_index_expression(void) } hr = create_effect(fx_test_index_expression, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); /* Initial index */ tech = effect->lpVtbl->GetTechniqueByIndex(effect, 0); pass = tech->lpVtbl->GetPassByIndex(tech, 0); hr = pass->lpVtbl->GetPixelShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shader_desc.ShaderIndex, "Unexpected shader index.\n"); v = effect->lpVtbl->GetVariableByName(effect, "g_var"); @@ -8014,14 +8012,14 @@ static void test_effect_index_expression(void) set_vec4(val, 0.0f, 0.0f, 1.0f, 0.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->GetPixelShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shader_desc.ShaderIndex == 1, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetBlendState(device, &bs, NULL, NULL); ID3D10BlendState_GetDesc(bs, &bs_desc); ok(bs_desc.SrcBlend == D3D10_BLEND_INV_SRC_COLOR, "Unexpected blend state parameter %u.\n", bs_desc.SrcBlend); @@ -8029,10 +8027,10 @@ static void test_effect_index_expression(void) set_vec4(val, 0.0f, 0.0f, 1.0f, 1.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetBlendState(device, &bs, NULL, NULL); ID3D10BlendState_GetDesc(bs, &bs_desc); ok(bs_desc.SrcBlend == D3D10_BLEND_SRC_COLOR, "Unexpected blend state parameter %u.\n", bs_desc.SrcBlend); @@ -8041,14 +8039,14 @@ static void test_effect_index_expression(void) /* Out of bounds index */ set_vec4(val, 0.0f, 0.0f, 2.0f, 2.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->GetPixelShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shader_desc.ShaderIndex, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetBlendState(device, &bs, NULL, NULL); ID3D10BlendState_GetDesc(bs, &bs_desc); ok(bs_desc.SrcBlend == D3D10_BLEND_INV_SRC_COLOR, "Unexpected blend state parameter %u.\n", bs_desc.SrcBlend); @@ -8056,14 +8054,14 @@ static void test_effect_index_expression(void) set_vec4(val, 0.0f, 0.0f, 3.0f, 3.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->GetPixelShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shader_desc.ShaderIndex, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetBlendState(device, &bs, NULL, NULL); ID3D10BlendState_GetDesc(bs, &bs_desc); ok(bs_desc.SrcBlend == D3D10_BLEND_INV_SRC_COLOR, "Unexpected blend state parameter %u.\n", bs_desc.SrcBlend); @@ -8071,14 +8069,14 @@ static void test_effect_index_expression(void) set_vec4(val, 0.0f, 0.0f, -1.0f, -1.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->GetPixelShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shader_desc.ShaderIndex, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetBlendState(device, &bs, NULL, NULL); ID3D10BlendState_GetDesc(bs, &bs_desc); ok(bs_desc.SrcBlend == D3D10_BLEND_INV_SRC_COLOR, "Unexpected blend state parameter %u.\n", bs_desc.SrcBlend); @@ -8086,50 +8084,50 @@ static void test_effect_index_expression(void) set_vec4(val, 0.0f, 0.0f, -11.0f, 0.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->GetPixelShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shader_desc.ShaderIndex, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); hr = pass->lpVtbl->Apply(pass, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D10Device_OMGetBlendState(device, &bs, NULL, NULL); ID3D10BlendState_GetDesc(bs, &bs_desc); ok(bs_desc.SrcBlend == D3D10_BLEND_INV_SRC_COLOR, "Unexpected blend state parameter %u.\n", bs_desc.SrcBlend); ID3D10BlendState_Release(bs); hr = pass->lpVtbl->GetVertexShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shader_desc.ShaderIndex, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); set_vec4(val, 0.9f, 0.0f, 1.0f, 0.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->GetVertexShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shader_desc.ShaderIndex == 1, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); v = effect->lpVtbl->GetVariableByName(effect, "g_var2"); vector = v->lpVtbl->AsVector(v); hr = pass->lpVtbl->GetGeometryShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(!shader_desc.ShaderIndex, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); set_vec4(val, 0.0f, 1.0f, 0.0f, 0.0f); hr = vector->lpVtbl->SetFloatVector(vector, val); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = pass->lpVtbl->GetGeometryShaderDesc(pass, &shader_desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(shader_desc.ShaderIndex == 1, "Unexpected shader index %#x.\n", shader_desc.ShaderIndex); effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -8201,12 +8199,12 @@ static void test_effect_value_expression(void) } hr = create_effect(fx_test_value_expression, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } #if 0 @@ -8238,12 +8236,12 @@ static void test_effect_fx_4_1(void) } hr = create_effect(fx_test_fx_4_1, 0, device, NULL, &effect); - ok(SUCCEEDED(hr), "Failed to create an effect, hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %lu references left.\n", refcount); } START_TEST(effect) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 6d6173824a2..13769d57e34 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -22,6 +22,9 @@ * The functions are e.g.: D3DGet*SignatureBlob, D3DReflect */ +#ifndef WINE_NO_LONG_TYPES +#define WINE_NO_LONG_TYPES +#endif #define COBJMACROS #include "initguid.h" #include "d3dcompiler.h" -- 2.30.2

1 0

[PATCH v3 5/5] msvcp: Print 0x prefix with %#x format in traces.
by Piotr Caban 08 Feb '22

08 Feb '22

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

1 0

[PATCH v3 4/5] msvcrt: Print 0x prefix with %#x format in traces.
by Piotr Caban 08 Feb '22

08 Feb '22

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

1 0

[PATCH v3 3/5] msvcrt: Use %#I64x format in traces.
by Piotr Caban 08 Feb '22

08 Feb '22

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

1 0

[PATCH v3 2/5] msvcr: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban 08 Feb '22

08 Feb '22

1 0

[PATCH v3 1/5] msvcp: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban 08 Feb '22

08 Feb '22

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v3: - use I64 instead of ll printf format dlls/msvcirt/Makefile.in | 2 +- dlls/msvcirt/msvcirt.c | 30 +++++++++++++++--------------- dlls/msvcp100/Makefile.in | 2 +- dlls/msvcp110/Makefile.in | 2 +- dlls/msvcp120/Makefile.in | 2 +- dlls/msvcp140/Makefile.in | 2 +- dlls/msvcp60/Makefile.in | 2 +- dlls/msvcp60/main.c | 2 +- dlls/msvcp70/Makefile.in | 2 +- dlls/msvcp71/Makefile.in | 2 +- dlls/msvcp80/Makefile.in | 2 +- dlls/msvcp90/Makefile.in | 2 +- dlls/msvcp90/locale.c | 20 ++++++++++---------- dlls/msvcp90/misc.c | 18 +++++++++--------- dlls/msvcp90/msvcp_main.c | 2 +- 15 files changed, 46 insertions(+), 46 deletions(-)

1 0

[PATCH v2 1/5] msvcp: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban 08 Feb '22

08 Feb '22

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

1 1

[PATCH v2 5/5] msvcp: Print 0x prefix with %#x format in traces.
by Piotr Caban 08 Feb '22

08 Feb '22

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

1 0

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

08 Feb '22

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

1 0

[PATCH v2 3/5] msvcrt: Use %#llx format in traces.
by Piotr Caban 08 Feb '22

08 Feb '22

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

1 0

[PATCH v2 2/5] msvcr: Build without -DWINE_NO_LONG_TYPES.
by Piotr Caban 08 Feb '22

08 Feb '22

1 0

[PATCH] winegstreamer: Handle EnableDiscreteOutput and SpeakerConfig settings in WMSyncReader_SetOutputSetting().
by Andrey Gusev 08 Feb '22

08 Feb '22

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

2 1

[PATCH vkd3d 2/2] vkd3d-shader: Undefine ERROR to avoid a compiler warning on Windows.
by Alexandre Julliard 08 Feb '22

08 Feb '22

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

2 1

[PATCH vkd3d 1/2] vkd3d-shader: Define S_ISREG if necessary for the Windows build.
by Alexandre Julliard 08 Feb '22

08 Feb '22

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

2 1

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

08 Feb '22

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

2 1

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

08 Feb '22

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

2 1

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

08 Feb '22

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

2 1

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

08 Feb '22

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

2 1

[PATCH] ddraw/tests: Skip a crashy test on WARP (v2).
by Stefan Dösinger 08 Feb '22

08 Feb '22

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

3 2

[PATCH 2/2] winealsa: Remove alsa-pulse handle underrun workaround.
by Huw Davies 08 Feb '22

08 Feb '22

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

1 0

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

08 Feb '22

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

1 0

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

08 Feb '22

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

1 0

[PATCH v2 2/8] server: Make window struct a server object.
by Jacek Caban 08 Feb '22

08 Feb '22

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

1 0

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

08 Feb '22

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

1 0

[PATCH 1/8] server: Allocate extra_bytes separatelly from window struct.
by Jacek Caban 08 Feb '22

08 Feb '22

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

2 2

[PATCH] combase: Build without WINE_NO_LONG_TYPES.
by Nikolay Sivov 08 Feb '22

08 Feb '22

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

1 0

[PATCH] ntdll: Map ETXTBSY to STATUS_SHARING_VIOLATION.
by Jinoh Kang 08 Feb '22

08 Feb '22

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

1 0

[PATCH 1/5] user32/tests: Add more tests for windows destroyed by thread exit.
by Jacek Caban 08 Feb '22

08 Feb '22

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

3 6

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

08 Feb '22

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

1 0

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

08 Feb '22

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

1 0

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

08 Feb '22

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

1 0

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

08 Feb '22

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

1 0

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

08 Feb '22

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

1 0

[PATCH 3/8] server: Keep a reference to parent in window objects.
by Jacek Caban 08 Feb '22

08 Feb '22

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

1 0

[PATCH 2/8] server: Make window struct a server object.
by Jacek Caban 08 Feb '22

08 Feb '22

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

1 0

[PATCH 1/3] winhttp/tests: Remove unused include.
by Hans Leidekker 08 Feb '22

08 Feb '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/tests/winhttp.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 053f8315fec..21af2761323 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -32,7 +32,6 @@ #include <httprequestid.h> #include "wine/test.h" -#include "wine/heap.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); -- 2.30.2

2 1

[PATCH 3/3] winhttp: Build without -DWINE_NO_LONG_TYPES.
by Hans Leidekker 08 Feb '22

08 Feb '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/Makefile.in | 1 - dlls/winhttp/handle.c | 10 ++-- dlls/winhttp/net.c | 39 +++++++------- dlls/winhttp/request.c | 106 +++++++++++++++++++-------------------- dlls/winhttp/session.c | 76 ++++++++++++++-------------- dlls/winhttp/url.c | 8 +-- 6 files changed, 119 insertions(+), 121 deletions(-) diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in index 44ccf738d99..97266fbc92a 100644 --- a/dlls/winhttp/Makefile.in +++ b/dlls/winhttp/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winhttp.dll IMPORTLIB = winhttp IMPORTS = uuid jsproxy user32 advapi32 ws2_32 diff --git a/dlls/winhttp/handle.c b/dlls/winhttp/handle.c index 4fc94f10d01..38959fd6456 100644 --- a/dlls/winhttp/handle.c +++ b/dlls/winhttp/handle.c @@ -48,7 +48,7 @@ static ULONG_PTR max_handles; struct object_header *addref_object( struct object_header *hdr ) { ULONG refs = InterlockedIncrement( &hdr->refs ); - TRACE("%p -> refcount = %d\n", hdr, refs); + TRACE( "%p -> refcount = %lu\n", hdr, refs ); return hdr; } @@ -64,21 +64,21 @@ struct object_header *grab_object( HINTERNET hinternet ) LeaveCriticalSection( &handle_cs ); - TRACE("handle 0x%lx -> %p\n", handle, hdr); + TRACE( "handle %Ix -> %p\n", handle, hdr ); return hdr; } void release_object( struct object_header *hdr ) { ULONG refs = InterlockedDecrement( &hdr->refs ); - TRACE("object %p refcount = %d\n", hdr, refs); + TRACE( "object %p refcount = %lu\n", hdr, refs ); if (!refs) { if (hdr->type == WINHTTP_HANDLE_TYPE_REQUEST) close_connection( (struct request *)hdr ); send_callback( hdr, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, &hdr->handle, sizeof(HINTERNET) ); - TRACE("destroying object %p\n", hdr); + TRACE( "destroying object %p\n", hdr ); hdr->vtbl->destroy( hdr ); } } @@ -134,7 +134,7 @@ BOOL free_handle( HINTERNET hinternet ) if (handles[handle]) { hdr = handles[handle]; - TRACE("destroying handle 0x%lx for object %p\n", handle + 1, hdr); + TRACE( "destroying handle %Ix for object %p\n", handle + 1, hdr ); handles[handle] = NULL; ret = TRUE; } diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 446dbc996e7..19fafb25804 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -36,7 +36,7 @@ static int sock_send(int fd, const void *msg, size_t len, WSAOVERLAPPED *ovr) { WSABUF wsabuf; DWORD size; - DWORD err; + int err; wsabuf.len = len; wsabuf.buf = (void *)msg; @@ -47,7 +47,7 @@ static int sock_send(int fd, const void *msg, size_t len, WSAOVERLAPPED *ovr) return size; } err = WSAGetLastError(); - if (!(ovr && err == WSA_IO_PENDING)) WARN( "send error %u\n", err ); + if (!(ovr && err == WSA_IO_PENDING)) WARN( "send error %d\n", err ); return -1; } @@ -56,7 +56,7 @@ static int sock_recv(int fd, void *msg, size_t len, int flags) int ret; do { - if ((ret = recv(fd, msg, len, flags)) == -1) WARN("recv error %u\n", WSAGetLastError()); + if ((ret = recv(fd, msg, len, flags)) == -1) WARN( "recv error %d\n", WSAGetLastError() ); } while(ret == -1 && WSAGetLastError() == WSAEINTR); return ret; @@ -154,7 +154,7 @@ static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, WCHAR *server, DWORD secu } else err = ERROR_WINHTTP_SECURE_CHANNEL_ERROR; - TRACE("returning %08x\n", err); + TRACE( "returning %#lx\n", err ); return err; } @@ -201,7 +201,7 @@ DWORD netconn_create( struct hostdata *host, const struct sockaddr_storage *sock if ((conn->socket = WSASocketW( sockaddr->ss_family, SOCK_STREAM, 0, NULL, 0, WSA_FLAG_OVERLAPPED )) == -1) { ret = WSAGetLastError(); - WARN("unable to create socket (%u)\n", ret); + WARN( "unable to create socket (%lu)\n", ret ); free( conn ); return ret; } @@ -243,7 +243,7 @@ DWORD netconn_create( struct hostdata *host, const struct sockaddr_storage *sock if (ret) { - WARN("unable to connect to host (%u)\n", ret); + WARN( "unable to connect to host (%lu)\n", ret ); closesocket( conn->socket ); free( conn ); return ret; @@ -296,7 +296,7 @@ DWORD netconn_secure_connect( struct netconn *conn, WCHAR *hostname, DWORD secur if(out_buf.cbBuffer) { assert(status == SEC_I_CONTINUE_NEEDED); - TRACE("sending %u bytes\n", out_buf.cbBuffer); + TRACE( "sending %lu bytes\n", out_buf.cbBuffer ); size = sock_send(conn->socket, out_buf.pvBuffer, out_buf.cbBuffer, NULL); if(size != out_buf.cbBuffer) { @@ -343,13 +343,13 @@ DWORD netconn_secure_connect( struct netconn *conn, WCHAR *hostname, DWORD secur break; } - TRACE("recv %lu bytes\n", size); + TRACE( "recv %Iu bytes\n", size ); in_bufs[0].cbBuffer += size; in_bufs[0].pvBuffer = read_buf; status = InitializeSecurityContextW(cred_handle, &ctx, hostname, isc_req_flags, 0, 0, &in_desc, 0, NULL, &out_desc, &attrs, NULL); - TRACE("InitializeSecurityContext ret %08x\n", status); + TRACE( "InitializeSecurityContext ret %#lx\n", status ); if(status == SEC_E_OK) { if(in_bufs[1].BufferType == SECBUFFER_EXTRA) @@ -366,7 +366,7 @@ DWORD netconn_secure_connect( struct netconn *conn, WCHAR *hostname, DWORD secur res = netconn_verify_cert(cert, hostname, security_flags, check_revocation); CertFreeCertificateContext(cert); if(res != ERROR_SUCCESS) { - WARN("cert verify failed: %u\n", res); + WARN( "cert verify failed: %lu\n", res ); break; } }else { @@ -390,7 +390,7 @@ DWORD netconn_secure_connect( struct netconn *conn, WCHAR *hostname, DWORD secur free(read_buf); if(status != SEC_E_OK || res != ERROR_SUCCESS) { - WARN("Failed to initialize security context: %08x\n", status); + WARN( "Failed to initialize security context: %#lx\n", status ); free(conn->ssl_read_buf); conn->ssl_read_buf = NULL; free(conn->ssl_write_buf); @@ -420,12 +420,11 @@ static DWORD send_ssl_chunk( struct netconn *conn, const void *msg, size_t size, memcpy( bufs[1].pvBuffer, msg, size ); if ((res = EncryptMessage(&conn->ssl_ctx, 0, &buf_desc, 0)) != SEC_E_OK) { - WARN("EncryptMessage failed: %08x\n", res); + WARN( "EncryptMessage failed: %#lx\n", res ); return res; } - if (sock_send( conn->socket, conn->ssl_write_buf, - bufs[0].cbBuffer + bufs[1].cbBuffer + bufs[2].cbBuffer, ovr ) < 1) + if (sock_send( conn->socket, conn->ssl_write_buf, bufs[0].cbBuffer + bufs[1].cbBuffer + bufs[2].cbBuffer, ovr ) < 1) { WARN("send failed\n"); return WSAGetLastError(); @@ -531,7 +530,7 @@ static DWORD read_ssl_chunk( struct netconn *conn, void *buf, SIZE_T buf_size, S continue; default: - WARN("failed: %08x\n", res); + WARN( "failed: %#lx\n", res ); return res; } } while (res != SEC_E_OK); @@ -601,7 +600,7 @@ DWORD netconn_recv( struct netconn *conn, void *buf, size_t len, int flags, int SIZE_T cread = 0; if ((res = read_ssl_chunk( conn, (BYTE *)buf + size, len - size, &cread, &eof ))) { - WARN("read_ssl_chunk failed: %u\n", res); + WARN( "read_ssl_chunk failed: %lu\n", res ); if (!size) return res; break; } @@ -614,7 +613,7 @@ DWORD netconn_recv( struct netconn *conn, void *buf, size_t len, int flags, int } while (!size || ((flags & MSG_WAITALL) && size < len)); - TRACE("received %ld bytes\n", size); + TRACE( "received %Iu bytes\n", size ); *recvd = size; return ERROR_SUCCESS; } @@ -634,7 +633,7 @@ DWORD netconn_set_timeout( struct netconn *netconn, BOOL send, int value ) if (setsockopt( netconn->socket, SOL_SOCKET, opt, (void *)&value, sizeof(value) ) == -1) { DWORD err = WSAGetLastError(); - WARN("setsockopt failed (%u)\n", err ); + WARN( "setsockopt failed (%lu)\n", err ); return err; } return ERROR_SUCCESS; @@ -654,7 +653,7 @@ BOOL netconn_is_alive( struct netconn *netconn ) while (!netconn->peek_msg && !(err = read_ssl_chunk( netconn, NULL, 0, &size, &eof )) && !eof) ; - TRACE("Checking secure connection, err %d.\n", err); + TRACE( "checking secure connection, err %lu\n", err ); if (netconn->peek_msg || err == WSAEWOULDBLOCK) { @@ -772,6 +771,6 @@ int netconn_get_cipher_strength( struct netconn *conn ) if (!conn->secure) return 0; res = QueryContextAttributesW(&conn->ssl_ctx, SECPKG_ATTR_CONNECTION_INFO, (void*)&conn_info); if(res != SEC_E_OK) - WARN("QueryContextAttributesW failed: %08x\n", res); + WARN( "QueryContextAttributesW failed: %#lx\n", res ); return res == SEC_E_OK ? conn_info.dwCipherStrength : 0; } diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index c32a33cbaf2..d0732952e11 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -299,7 +299,7 @@ DWORD process_header( struct request *request, const WCHAR *field, const WCHAR * int index; struct header hdr; - TRACE("%s: %s 0x%08x\n", debugstr_w(field), debugstr_w(value), flags); + TRACE( "%s: %s %#lx\n", debugstr_w(field), debugstr_w(value), flags ); if ((index = get_header_index( request, field, 0, request_only )) >= 0) { @@ -405,12 +405,12 @@ DWORD add_request_headers( struct request *request, const WCHAR *headers, DWORD /*********************************************************************** * WinHttpAddRequestHeaders (winhttp.@) */ -BOOL WINAPI WinHttpAddRequestHeaders( HINTERNET hrequest, LPCWSTR headers, DWORD len, DWORD flags ) +BOOL WINAPI WinHttpAddRequestHeaders( HINTERNET hrequest, const WCHAR *headers, DWORD len, DWORD flags ) { DWORD ret; struct request *request; - TRACE("%p, %s, %u, 0x%08x\n", hrequest, debugstr_wn(headers, len), len, flags); + TRACE( "%p, %s, %lu, %#lx\n", hrequest, debugstr_wn(headers, len), len, flags ); if (!headers || !len) { @@ -637,7 +637,7 @@ static DWORD query_headers( struct request *request, DWORD level, const WCHAR *n if (attr >= ARRAY_SIZE(attribute_table)) return ERROR_INVALID_PARAMETER; if (!attribute_table[attr]) { - FIXME("attribute %u not implemented\n", attr); + FIXME( "attribute %lu not implemented\n", attr ); return ERROR_WINHTTP_HEADER_NOT_FOUND; } TRACE("attribute %s\n", debugstr_w(attribute_table[attr])); @@ -698,12 +698,13 @@ static DWORD query_headers( struct request *request, DWORD level, const WCHAR *n /*********************************************************************** * WinHttpQueryHeaders (winhttp.@) */ -BOOL WINAPI WinHttpQueryHeaders( HINTERNET hrequest, DWORD level, LPCWSTR name, LPVOID buffer, LPDWORD buflen, LPDWORD index ) +BOOL WINAPI WinHttpQueryHeaders( HINTERNET hrequest, DWORD level, const WCHAR *name, void *buffer, DWORD *buflen, + DWORD *index ) { DWORD ret; struct request *request; - TRACE("%p, 0x%08x, %s, %p, %p, %p\n", hrequest, level, debugstr_w(name), buffer, buflen, index); + TRACE( "%p, %#lx, %s, %p, %p, %p\n", hrequest, level, debugstr_w(name), buffer, buflen, index ); if (!(request = (struct request *)grab_object( hrequest ))) { @@ -1047,7 +1048,7 @@ static BOOL do_authorization( struct request *request, DWORD target, DWORD schem break; default: - WARN("unknown target %x\n", target); + WARN( "unknown target %#lx\n", target ); return FALSE; } authinfo = *auth_ptr; @@ -1126,8 +1127,8 @@ static BOOL do_authorization( struct request *request, DWORD target, DWORD schem } if (status != SEC_E_OK) { - WARN("AcquireCredentialsHandleW for scheme %s failed with error 0x%08x\n", - debugstr_w(auth_schemes[scheme].str), status); + WARN( "AcquireCredentialsHandleW for scheme %s failed with error %#lx\n", + debugstr_w(auth_schemes[scheme].str), status ); free( authinfo ); return FALSE; } @@ -1199,7 +1200,7 @@ static BOOL do_authorization( struct request *request, DWORD target, DWORD schem } else { - ERR("InitializeSecurityContextW failed with error 0x%08x\n", status); + ERR( "InitializeSecurityContextW failed with error %#lx\n", status ); free( out.pvBuffer ); destroy_authinfo( authinfo ); *auth_ptr = NULL; @@ -1437,7 +1438,7 @@ static DWORD ensure_cred_handle( struct request *request ) if (status != SEC_E_OK) { - WARN( "AcquireCredentialsHandleW failed: 0x%08x\n", status ); + WARN( "AcquireCredentialsHandleW failed: %#lx\n", status ); return status; } return ERROR_SUCCESS; @@ -1735,7 +1736,7 @@ static DWORD start_next_chunk( struct request *request, BOOL notify ) else if (ch >= 'A' && ch <= 'F') chunk_size = chunk_size * 16 + ch - 'A' + 10; else if (ch == ';' || ch == '\r' || ch == '\n') { - TRACE("reading %u byte chunk\n", chunk_size); + TRACE( "reading %lu byte chunk\n", chunk_size ); if (request->content_length == ~0u) request->content_length = chunk_size; else request->content_length += chunk_size; @@ -1847,7 +1848,7 @@ static DWORD read_data( struct request *request, void *buffer, DWORD size, DWORD if (request->read_chunked && !request->read_chunked_size) ret = refill_buffer( request, async ); done: - TRACE( "retrieved %u bytes (%u/%u)\n", bytes_read, request->content_read, request->content_length ); + TRACE( "retrieved %u bytes (%lu/%lu)\n", bytes_read, request->content_read, request->content_length ); if (end_of_read_data( request )) finished_reading( request ); if (async) { @@ -2117,12 +2118,12 @@ static DWORD send_request( struct request *request, const WCHAR *headers, DWORD if (headers && (ret = add_request_headers( request, headers, headers_len, WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE ))) { - TRACE("failed to add request headers: %u\n", ret); + TRACE( "failed to add request headers: %lu\n", ret ); return ret; } if (!(request->hdr.disable_flags & WINHTTP_DISABLE_COOKIES) && (ret = add_cookie_headers( request ))) { - WARN("failed to add cookie headers: %u\n", ret); + WARN( "failed to add cookie headers: %lu\n", ret ); return ret; } @@ -2181,14 +2182,14 @@ static void CALLBACK task_send_request( TP_CALLBACK_INSTANCE *instance, void *ct /*********************************************************************** * WinHttpSendRequest (winhttp.@) */ -BOOL WINAPI WinHttpSendRequest( HINTERNET hrequest, LPCWSTR headers, DWORD headers_len, - LPVOID optional, DWORD optional_len, DWORD total_len, DWORD_PTR context ) +BOOL WINAPI WinHttpSendRequest( HINTERNET hrequest, const WCHAR *headers, DWORD headers_len, + void *optional, DWORD optional_len, DWORD total_len, DWORD_PTR context ) { DWORD ret; struct request *request; - TRACE("%p, %s, %u, %p, %u, %u, %lx\n", hrequest, debugstr_wn(headers, headers_len), headers_len, optional, - optional_len, total_len, context); + TRACE( "%p, %s, %lu, %p, %lu, %lu, %Ix\n", hrequest, debugstr_wn(headers, headers_len), headers_len, optional, + optional_len, total_len, context ); if (!(request = (struct request *)grab_object( hrequest ))) { @@ -2266,7 +2267,7 @@ static DWORD set_credentials( struct request *request, DWORD target, DWORD schem break; } default: - WARN("unknown target %u\n", target); + WARN( "unknown target %lu\n", target ); return ERROR_INVALID_PARAMETER; } return ERROR_SUCCESS; @@ -2275,13 +2276,13 @@ static DWORD set_credentials( struct request *request, DWORD target, DWORD schem /*********************************************************************** * WinHttpSetCredentials (winhttp.@) */ -BOOL WINAPI WinHttpSetCredentials( HINTERNET hrequest, DWORD target, DWORD scheme, LPCWSTR username, - LPCWSTR password, LPVOID params ) +BOOL WINAPI WinHttpSetCredentials( HINTERNET hrequest, DWORD target, DWORD scheme, const WCHAR *username, + const WCHAR *password, void *params ) { DWORD ret; struct request *request; - TRACE("%p, %x, 0x%08x, %s, %p, %p\n", hrequest, target, scheme, debugstr_w(username), password, params); + TRACE( "%p, %lu, %#lx, %s, %p, %p\n", hrequest, target, scheme, debugstr_w(username), password, params ); if (!(request = (struct request *)grab_object( hrequest ))) { @@ -2319,7 +2320,7 @@ static DWORD handle_authorization( struct request *request, DWORD status ) break; default: - ERR("unhandled status %u\n", status); + ERR( "unhandled status %lu\n", status ); return ERROR_WINHTTP_INTERNAL_ERROR; } @@ -2834,7 +2835,7 @@ static DWORD query_data_available( struct request *request, DWORD *available, BO } done: - TRACE("%u bytes available\n", count); + TRACE( "%lu bytes available\n", count ); if (async) { if (!ret) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE, &count, sizeof(count) ); @@ -2922,13 +2923,13 @@ static void CALLBACK task_read_data( TP_CALLBACK_INSTANCE *instance, void *ctx, /*********************************************************************** * WinHttpReadData (winhttp.@) */ -BOOL WINAPI WinHttpReadData( HINTERNET hrequest, LPVOID buffer, DWORD to_read, LPDWORD read ) +BOOL WINAPI WinHttpReadData( HINTERNET hrequest, void *buffer, DWORD to_read, DWORD *read ) { DWORD ret; struct request *request; BOOL async; - TRACE("%p, %p, %d, %p\n", hrequest, buffer, to_read, read); + TRACE( "%p, %p, %lu, %p\n", hrequest, buffer, to_read, read ); if (!(request = (struct request *)grab_object( hrequest ))) { @@ -3003,12 +3004,12 @@ static void CALLBACK task_write_data( TP_CALLBACK_INSTANCE *instance, void *ctx, /*********************************************************************** * WinHttpWriteData (winhttp.@) */ -BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, LPCVOID buffer, DWORD to_write, LPDWORD written ) +BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, const void *buffer, DWORD to_write, DWORD *written ) { DWORD ret; struct request *request; - TRACE("%p, %p, %d, %p\n", hrequest, buffer, to_write, written); + TRACE( "%p, %p, %lu, %p\n", hrequest, buffer, to_write, written ); if (!(request = (struct request *)grab_object( hrequest ))) { @@ -3048,7 +3049,7 @@ BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, LPCVOID buffer, DWORD to_write static BOOL socket_query_option( struct object_header *hdr, DWORD option, void *buffer, DWORD *buflen ) { - FIXME("unimplemented option %u\n", option); + FIXME( "unimplemented option %lu\n", option ); SetLastError( ERROR_WINHTTP_INVALID_OPTION ); return FALSE; } @@ -3069,7 +3070,7 @@ static void socket_destroy( struct object_header *hdr ) static BOOL socket_set_option( struct object_header *hdr, DWORD option, void *buffer, DWORD buflen ) { - FIXME("unimplemented option %u\n", option); + FIXME( "unimplemented option %lu\n", option ); SetLastError( ERROR_WINHTTP_INVALID_OPTION ); return FALSE; } @@ -3087,7 +3088,7 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR struct request *request; HINTERNET hsocket = NULL; - TRACE("%p, %08lx\n", hrequest, context); + TRACE( "%p, %Ix\n", hrequest, context ); if (!(request = (struct request *)grab_object( hrequest ))) { @@ -3146,13 +3147,12 @@ static DWORD send_bytes( struct socket *socket, char *bytes, int len, int *sent, static DWORD send_frame( struct socket *socket, enum socket_opcode opcode, USHORT status, const char *buf, DWORD buflen, BOOL final, WSAOVERLAPPED *ovr ) { - DWORD i, offset = 2, len = buflen; - DWORD buffer_size, ret = 0; + DWORD i, offset = 2, len = buflen, buffer_size, ret = 0; int sent_size; char hdr[14]; char *ptr; - TRACE( "sending %02x frame, len %u.\n", opcode, len ); + TRACE( "sending %02x frame, len %lu\n", opcode, len ); if (opcode == SOCKET_OPCODE_CLOSE) len += sizeof(status); @@ -3188,7 +3188,7 @@ static DWORD send_frame( struct socket *socket, enum socket_opcode opcode, USHOR new_size = min( buffer_size, MAX_FRAME_BUFFER_SIZE ); if (!(new = realloc( socket->send_frame_buffer, new_size ))) { - ERR("Out of memory, buffer_size %u.\n", buffer_size); + ERR( "out of memory, buffer_size %lu\n", buffer_size); return ERROR_OUTOFMEMORY; } socket->send_frame_buffer = new; @@ -3360,7 +3360,7 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ struct socket *socket; DWORD ret = 0; - TRACE("%p, %u, %p, %u\n", hsocket, type, buf, len); + TRACE( "%p, %u, %p, %lu\n", hsocket, type, buf, len ); if (len && !buf) return ERROR_INVALID_PARAMETER; if (type != WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE && type != WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE) @@ -3729,7 +3729,7 @@ DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, D struct socket *socket; DWORD ret; - TRACE("%p, %p, %u, %p, %p\n", hsocket, buf, len, ret_len, ret_type); + TRACE( "%p, %p, %lu, %p, %p\n", hsocket, buf, len, ret_len, ret_type ); if (!buf || !len) return ERROR_INVALID_PARAMETER; @@ -3874,7 +3874,7 @@ DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *r struct socket *socket; DWORD ret; - TRACE("%p, %u, %p, %u\n", hsocket, status, reason, len); + TRACE( "%p, %u, %p, %lu\n", hsocket, status, reason, len ); if ((len && !reason) || len > sizeof(socket->reason)) return ERROR_INVALID_PARAMETER; @@ -3949,7 +3949,7 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas struct socket *socket; DWORD ret; - TRACE("%p, %u, %p, %u\n", hsocket, status, reason, len); + TRACE( "%p, %u, %p, %lu\n", hsocket, status, reason, len ); if ((len && !reason) || len > sizeof(socket->reason)) return ERROR_INVALID_PARAMETER; @@ -4022,7 +4022,7 @@ DWORD WINAPI WinHttpWebSocketQueryCloseStatus( HINTERNET hsocket, USHORT *status struct socket *socket; DWORD ret; - TRACE("%p, %p, %p, %u, %p\n", hsocket, status, reason, len, ret_len); + TRACE( "%p, %p, %p, %lu, %p\n", hsocket, status, reason, len, ret_len ); if (!status || (len && !reason) || !ret_len) return ERROR_INVALID_PARAMETER; @@ -4218,7 +4218,7 @@ static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) hr = LoadRegTypeLib( &LIBID_WinHttp, 5, 1, LOCALE_SYSTEM_DEFAULT, &typelib ); if (FAILED(hr)) { - ERR("LoadRegTypeLib failed: %08x\n", hr); + ERR( "LoadRegTypeLib failed: %#lx\n", hr ); return hr; } if (InterlockedCompareExchangePointer( (void **)&winhttp_typelib, typelib, NULL )) @@ -4231,7 +4231,7 @@ static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) hr = ITypeLib_GetTypeInfoOfGuid( winhttp_typelib, winhttp_tid_id[tid], &typeinfo ); if (FAILED(hr)) { - ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(winhttp_tid_id[tid]), hr); + ERR( "GetTypeInfoOfGuid(%s) failed: %#lx\n", debugstr_guid(winhttp_tid_id[tid]), hr ); return hr; } if (InterlockedCompareExchangePointer( (void **)(winhttp_typeinfo + tid), typeinfo, NULL )) @@ -4261,7 +4261,7 @@ static HRESULT WINAPI winhttp_request_GetTypeInfo( ITypeInfo **info ) { struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); - TRACE("%p, %u, %u, %p\n", request, index, lcid, info); + TRACE( "%p, %u, %lu, %p\n", request, index, lcid, info ); return get_typeinfo( IWinHttpRequest_tid, info ); } @@ -4278,7 +4278,7 @@ static HRESULT WINAPI winhttp_request_GetIDsOfNames( ITypeInfo *typeinfo; HRESULT hr; - TRACE("%p, %s, %p, %u, %u, %p\n", request, debugstr_guid(riid), names, count, lcid, dispid); + TRACE( "%p, %s, %p, %u, %lu, %p\n", request, debugstr_guid(riid), names, count, lcid, dispid ); if (!names || !count || !dispid) return E_INVALIDARG; @@ -4306,8 +4306,8 @@ static HRESULT WINAPI winhttp_request_Invoke( ITypeInfo *typeinfo; HRESULT hr; - TRACE("%p, %d, %s, %d, %d, %p, %p, %p, %p\n", request, member, debugstr_guid(riid), - lcid, flags, params, result, excep_info, arg_err); + TRACE( "%p, %ld, %s, %lu, %d, %p, %p, %p, %p\n", request, member, debugstr_guid(riid), + lcid, flags, params, result, excep_info, arg_err ); if (!IsEqualIID( riid, &IID_NULL )) return DISP_E_UNKNOWNINTERFACE; @@ -4331,7 +4331,7 @@ static HRESULT WINAPI winhttp_request_Invoke( hr = IWinHttpRequest_put_Option( &request->IWinHttpRequest_iface, V_I4( &option ), params->rgvarg[0] ); if (FAILED(hr)) - WARN("put_Option(%d) failed: %x\n", V_I4( &option ), hr); + WARN( "put_Option(%ld) failed: %#lx\n", V_I4( &option ), hr ); return hr; } else if (flags & (DISPATCH_PROPERTYGET | DISPATCH_METHOD)) @@ -4341,7 +4341,7 @@ static HRESULT WINAPI winhttp_request_Invoke( hr = IWinHttpRequest_get_Option( &request->IWinHttpRequest_iface, V_I4( &option ), result ); if (FAILED(hr)) - WARN("get_Option(%d) failed: %x\n", V_I4( &option ), hr); + WARN( "get_Option(%ld) failed: %#lx\n", V_I4( &option ), hr ); return hr; } @@ -4370,8 +4370,8 @@ static HRESULT WINAPI winhttp_request_SetProxy( struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); DWORD err = ERROR_SUCCESS; - TRACE("%p, %u, %s, %s\n", request, proxy_setting, debugstr_variant(&proxy_server), - debugstr_variant(&bypass_list)); + TRACE( "%p, %lu, %s, %s\n", request, proxy_setting, debugstr_variant(&proxy_server), + debugstr_variant(&bypass_list) ); EnterCriticalSection( &request->cs ); switch (proxy_setting) @@ -4424,7 +4424,7 @@ static HRESULT WINAPI winhttp_request_SetCredentials( DWORD target, scheme = WINHTTP_AUTH_SCHEME_BASIC; /* FIXME: query supported schemes */ DWORD err = ERROR_SUCCESS; - TRACE("%p, %s, %p, 0x%08x\n", request, debugstr_w(username), password, flags); + TRACE( "%p, %s, %p, %#lx\n", request, debugstr_w(username), password, flags ); EnterCriticalSection( &request->cs ); if (request->state < REQUEST_STATE_OPEN) @@ -5508,7 +5508,7 @@ static HRESULT WINAPI winhttp_request_SetTimeouts( { struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); - TRACE("%p, %d, %d, %d, %d\n", request, resolve_timeout, connect_timeout, send_timeout, receive_timeout); + TRACE( "%p, %ld, %ld, %ld, %ld\n", request, resolve_timeout, connect_timeout, send_timeout, receive_timeout ); EnterCriticalSection( &request->cs ); request->resolve_timeout = resolve_timeout; diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 2620bf30ac0..971c51ada4f 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -48,11 +48,11 @@ void send_callback( struct object_header *hdr, DWORD status, void *info, DWORD b { if (hdr->callback && (hdr->notify_mask & status)) { - TRACE("%p, 0x%08x, %p, %u, %u\n", hdr, status, info, buflen, hdr->recursion_count); + TRACE( "%p, %#lx, %p, %lu, %lu\n", hdr, status, info, buflen, hdr->recursion_count ); InterlockedIncrement( &hdr->recursion_count ); hdr->callback( hdr->handle, hdr->context, status, info, buflen ); InterlockedDecrement( &hdr->recursion_count ); - TRACE("returning from 0x%08x callback\n", status); + TRACE("returning from %#lx callback\n", status); } } @@ -145,7 +145,7 @@ static BOOL session_query_option( struct object_header *hdr, DWORD option, void return TRUE; default: - FIXME("unimplemented option %u\n", option); + FIXME( "unimplemented option %lu\n", option ); SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } @@ -161,7 +161,7 @@ static BOOL session_set_option( struct object_header *hdr, DWORD option, void *b { WINHTTP_PROXY_INFO *pi = buffer; - FIXME("%u %s %s\n", pi->dwAccessType, debugstr_w(pi->lpszProxy), debugstr_w(pi->lpszProxyBypass)); + FIXME( "%lu %s %s\n", pi->dwAccessType, debugstr_w(pi->lpszProxy), debugstr_w(pi->lpszProxyBypass) ); return TRUE; } case WINHTTP_OPTION_REDIRECT_POLICY: @@ -175,7 +175,7 @@ static BOOL session_set_option( struct object_header *hdr, DWORD option, void *b } policy = *(DWORD *)buffer; - TRACE("0x%x\n", policy); + TRACE( "%#lx\n", policy ); hdr->redirect_policy = policy; return TRUE; } @@ -189,7 +189,7 @@ static BOOL session_set_option( struct object_header *hdr, DWORD option, void *b EnterCriticalSection( &session->cs ); session->secure_protocols = *(DWORD *)buffer; LeaveCriticalSection( &session->cs ); - TRACE("0x%x\n", session->secure_protocols); + TRACE( "%#lx\n", session->secure_protocols ); return TRUE; } case WINHTTP_OPTION_DISABLE_FEATURE: @@ -226,15 +226,15 @@ static BOOL session_set_option( struct object_header *hdr, DWORD option, void *b return TRUE; case WINHTTP_OPTION_MAX_CONNS_PER_SERVER: - FIXME("WINHTTP_OPTION_MAX_CONNS_PER_SERVER: %d\n", *(DWORD *)buffer); + FIXME( "WINHTTP_OPTION_MAX_CONNS_PER_SERVER: %lu\n", *(DWORD *)buffer ); return TRUE; case WINHTTP_OPTION_MAX_CONNS_PER_1_0_SERVER: - FIXME("WINHTTP_OPTION_MAX_CONNS_PER_1_0_SERVER: %d\n", *(DWORD *)buffer); + FIXME( "WINHTTP_OPTION_MAX_CONNS_PER_1_0_SERVER: %lu\n", *(DWORD *)buffer ); return TRUE; default: - FIXME("unimplemented option %u\n", option); + FIXME( "unimplemented option %lu\n", option ); SetLastError( ERROR_WINHTTP_INVALID_OPTION ); return FALSE; } @@ -255,7 +255,7 @@ HINTERNET WINAPI WinHttpOpen( LPCWSTR agent, DWORD access, LPCWSTR proxy, LPCWST struct session *session; HINTERNET handle = NULL; - TRACE("%s, %u, %s, %s, 0x%08x\n", debugstr_w(agent), access, debugstr_w(proxy), debugstr_w(bypass), flags); + TRACE( "%s, %lu, %s, %s, %#lx\n", debugstr_w(agent), access, debugstr_w(proxy), debugstr_w(bypass), flags ); if (!(session = calloc( 1, sizeof(*session) ))) return NULL; @@ -374,7 +374,7 @@ static BOOL connect_query_option( struct object_header *hdr, DWORD option, void return TRUE; default: - FIXME("unimplemented option %u\n", option); + FIXME( "unimplemented option %lu\n", option ); SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } @@ -533,13 +533,13 @@ end: /*********************************************************************** * WinHttpConnect (winhttp.@) */ -HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PORT port, DWORD reserved ) +HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, const WCHAR *server, INTERNET_PORT port, DWORD reserved ) { struct connect *connect; struct session *session; HINTERNET hconnect = NULL; - TRACE("%p, %s, %u, %x\n", hsession, debugstr_w(server), port, reserved); + TRACE( "%p, %s, %u, %#lx\n", hsession, debugstr_w(server), port, reserved ); if (!server) { @@ -841,7 +841,7 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void return TRUE; default: - FIXME("unimplemented option %u\n", option); + FIXME( "unimplemented option %lu\n", option ); SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } @@ -870,7 +870,7 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b { WINHTTP_PROXY_INFO *pi = buffer; - FIXME("%u %s %s\n", pi->dwAccessType, debugstr_w(pi->lpszProxy), debugstr_w(pi->lpszProxyBypass)); + FIXME( "%lu %s %s\n", pi->dwAccessType, debugstr_w(pi->lpszProxy), debugstr_w(pi->lpszProxyBypass) ); return TRUE; } case WINHTTP_OPTION_DISABLE_FEATURE: @@ -884,7 +884,7 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b } disable = *(DWORD *)buffer; - TRACE("0x%x\n", disable); + TRACE( "%#lx\n", disable ); hdr->disable_flags |= disable; return TRUE; } @@ -899,7 +899,7 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b } policy = *(DWORD *)buffer; - TRACE("0x%x\n", policy); + TRACE( "%#lx\n", policy ); hdr->logon_policy = policy; return TRUE; } @@ -914,7 +914,7 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b } policy = *(DWORD *)buffer; - TRACE("0x%x\n", policy); + TRACE( "%#lx\n", policy ); hdr->redirect_policy = policy; return TRUE; } @@ -932,7 +932,7 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b return FALSE; } flags = *(DWORD *)buffer; - TRACE("0x%x\n", flags); + TRACE( "%#lx\n", flags ); if (flags && (flags & ~accepted)) { SetLastError( ERROR_INVALID_PARAMETER ); @@ -1070,14 +1070,14 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b case WINHTTP_OPTION_ENABLE_HTTP_PROTOCOL: if (buflen == sizeof(DWORD)) { - FIXME("WINHTTP_OPTION_ENABLE_HTTP_PROTOCOL %08x\n", *(DWORD *)buffer); + FIXME( "WINHTTP_OPTION_ENABLE_HTTP_PROTOCOL %#lx\n", *(DWORD *)buffer ); return TRUE; } SetLastError(ERROR_INVALID_PARAMETER); return FALSE; default: - FIXME("unimplemented option %u\n", option); + FIXME( "unimplemented option %lu\n", option ); SetLastError( ERROR_WINHTTP_INVALID_OPTION ); return FALSE; } @@ -1119,15 +1119,15 @@ static WCHAR *get_request_path( const WCHAR *object ) /*********************************************************************** * WinHttpOpenRequest (winhttp.@) */ -HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR object, LPCWSTR version, - LPCWSTR referrer, LPCWSTR *types, DWORD flags ) +HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, const WCHAR *verb, const WCHAR *object, const WCHAR *version, + const WCHAR *referrer, const WCHAR **types, DWORD flags ) { struct request *request; struct connect *connect; HINTERNET hrequest = NULL; - TRACE("%p, %s, %s, %s, %s, %p, 0x%08x\n", hconnect, debugstr_w(verb), debugstr_w(object), - debugstr_w(version), debugstr_w(referrer), types, flags); + TRACE( "%p, %s, %s, %s, %s, %p, %#lx\n", hconnect, debugstr_w(verb), debugstr_w(object), + debugstr_w(version), debugstr_w(referrer), types, flags ); if (types && TRACE_ON(winhttp)) { @@ -1236,7 +1236,7 @@ static BOOL query_option( struct object_header *hdr, DWORD option, void *buffer, if (hdr->vtbl->query_option) ret = hdr->vtbl->query_option( hdr, option, buffer, buflen ); else { - FIXME("unimplemented option %u\n", option); + FIXME( "unimplemented option %lu\n", option ); SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return FALSE; } @@ -1248,12 +1248,12 @@ static BOOL query_option( struct object_header *hdr, DWORD option, void *buffer, /*********************************************************************** * WinHttpQueryOption (winhttp.@) */ -BOOL WINAPI WinHttpQueryOption( HINTERNET handle, DWORD option, LPVOID buffer, LPDWORD buflen ) +BOOL WINAPI WinHttpQueryOption( HINTERNET handle, DWORD option, void *buffer, DWORD *buflen ) { BOOL ret = FALSE; struct object_header *hdr; - TRACE("%p, %u, %p, %p\n", handle, option, buffer, buflen); + TRACE( "%p, %lu, %p, %p\n", handle, option, buffer, buflen ); if (!(hdr = grab_object( handle ))) { @@ -1295,7 +1295,7 @@ static BOOL set_option( struct object_header *hdr, DWORD option, void *buffer, D if (hdr->vtbl->set_option) ret = hdr->vtbl->set_option( hdr, option, buffer, buflen ); else { - FIXME("unimplemented option %u\n", option); + FIXME( "unimplemented option %lu\n", option ); SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return FALSE; } @@ -1307,12 +1307,12 @@ static BOOL set_option( struct object_header *hdr, DWORD option, void *buffer, D /*********************************************************************** * WinHttpSetOption (winhttp.@) */ -BOOL WINAPI WinHttpSetOption( HINTERNET handle, DWORD option, LPVOID buffer, DWORD buflen ) +BOOL WINAPI WinHttpSetOption( HINTERNET handle, DWORD option, void *buffer, DWORD buflen ) { BOOL ret = FALSE; struct object_header *hdr; - TRACE("%p, %u, %p, %u\n", handle, option, buffer, buflen); + TRACE( "%p, %lu, %p, %lu\n", handle, option, buffer, buflen ); if (!(hdr = grab_object( handle ))) { @@ -1366,7 +1366,7 @@ static WCHAR *detect_autoproxyconfig_url_dhcp(void) for (ptr = adapters; ptr; ptr = ptr->Next) { MultiByteToWideChar( CP_ACP, 0, ptr->AdapterName, -1, name, ARRAY_SIZE(name) ); - TRACE( "adapter '%s' type %u dhcpv4 enabled %d\n", wine_dbgstr_w(name), ptr->IfType, ptr->Dhcpv4Enabled ); + TRACE( "adapter '%s' type %lu dhcpv4 enabled %d\n", wine_dbgstr_w(name), ptr->IfType, ptr->Dhcpv4Enabled ); if (ptr->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue; /* FIXME: also skip adapters where DHCP is disabled */ @@ -1503,9 +1503,9 @@ static WCHAR *detect_autoproxyconfig_url_dns(void) /*********************************************************************** * WinHttpDetectAutoProxyConfigUrl (winhttp.@) */ -BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url ) +BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, WCHAR **url ) { - TRACE("0x%08x, %p\n", flags, url); + TRACE( "%#lx, %p\n", flags, url ); if (!flags || !url) { @@ -2104,7 +2104,7 @@ void WINAPI WinHttpFreeProxySettings( WINHTTP_PROXY_SETTINGS *settings ) DWORD WINAPI WinHttpGetProxyForUrlEx( HINTERNET hresolver, const WCHAR *url, WINHTTP_AUTOPROXY_OPTIONS *options, DWORD_PTR ctx ) { - FIXME("%p, %s, %p, %lx\n", hresolver, debugstr_w(url), options, ctx); + FIXME( "%p, %s, %p, %Ix\n", hresolver, debugstr_w(url), options, ctx ); return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; } @@ -2114,7 +2114,7 @@ DWORD WINAPI WinHttpGetProxyForUrlEx( HINTERNET hresolver, const WCHAR *url, WIN DWORD WINAPI WinHttpGetProxyForUrlEx2( HINTERNET hresolver, const WCHAR *url, WINHTTP_AUTOPROXY_OPTIONS *options, DWORD selection_len, BYTE *selection, DWORD_PTR ctx ) { - FIXME("%p, %s, %p, %u, %p, %lx\n", hresolver, debugstr_w(url), options, selection_len, selection, ctx); + FIXME( "%p, %s, %p, %lu, %p, %Ix\n", hresolver, debugstr_w(url), options, selection_len, selection, ctx ); return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; } @@ -2162,7 +2162,7 @@ DWORD WINAPI WinHttpReadProxySettings( HINTERNET hsession, const WCHAR *connecti */ DWORD WINAPI WinHttpResetAutoProxy( HINTERNET hsession, DWORD flags ) { - FIXME("%p, %08x\n", hsession, flags); + FIXME( "%p, %#lx\n", hsession, flags ); return ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR; } @@ -2181,7 +2181,7 @@ WINHTTP_STATUS_CALLBACK WINAPI WinHttpSetStatusCallback( HINTERNET handle, WINHT struct object_header *hdr; WINHTTP_STATUS_CALLBACK ret; - TRACE("%p, %p, 0x%08x, 0x%lx\n", handle, callback, flags, reserved); + TRACE( "%p, %p, %#lx, %Ix\n", handle, callback, flags, reserved ); if (!(hdr = grab_object( handle ))) { diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 8efd5ed0c49..9e7f5478dfe 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -170,7 +170,7 @@ static DWORD parse_port( const WCHAR *str, DWORD len, INTERNET_PORT *ret ) /*********************************************************************** * WinHttpCrackUrl (winhttp.@) */ -BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONENTSW uc ) +BOOL WINAPI WinHttpCrackUrl( const WCHAR *url, DWORD len, DWORD flags, URL_COMPONENTSW *uc ) { WCHAR *p, *q, *r, *url_transformed = NULL; INTERNET_SCHEME scheme_number = 0; @@ -178,7 +178,7 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN BOOL overflow = FALSE; DWORD err; - TRACE("%s, %d, %x, %p\n", debugstr_wn(url, len), len, flags, uc); + TRACE( "%s, %lu, %#lx, %p\n", debugstr_wn(url, len), len, flags, uc ); if (!url || !uc || uc->dwStructSize != sizeof(*uc)) { @@ -427,12 +427,12 @@ static BOOL get_url_length( URL_COMPONENTS *uc, DWORD flags, DWORD *len ) /*********************************************************************** * WinHttpCreateUrl (winhttp.@) */ -BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDWORD required ) +BOOL WINAPI WinHttpCreateUrl( URL_COMPONENTS *uc, DWORD flags, WCHAR *url, DWORD *required ) { DWORD len, len_escaped; INTERNET_SCHEME scheme; - TRACE("%p, 0x%08x, %p, %p\n", uc, flags, url, required); + TRACE( "%p, %#lx, %p, %p\n", uc, flags, url, required ); if (!uc || uc->dwStructSize != sizeof(URL_COMPONENTS) || !required) { -- 2.30.2

1 0

[PATCH 2/3] winhttp/tests: Build without -DWINE_NO_LONG_TYPES.
by Hans Leidekker 08 Feb '22

08 Feb '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/tests/Makefile.in | 1 - dlls/winhttp/tests/notification.c | 422 +++---- dlls/winhttp/tests/url.c | 190 +-- dlls/winhttp/tests/winhttp.c | 1902 ++++++++++++++--------------- 4 files changed, 1246 insertions(+), 1269 deletions(-) diff --git a/dlls/winhttp/tests/Makefile.in b/dlls/winhttp/tests/Makefile.in index 73dce0b7dc9..77ebefae170 100644 --- a/dlls/winhttp/tests/Makefile.in +++ b/dlls/winhttp/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = winhttp.dll IMPORTS = winhttp oleaut32 ole32 crypt32 advapi32 ws2_32 diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 121190ba9d2..ffde61b3bf5 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -104,16 +104,16 @@ static void CALLBACK check_notification( HINTERNET handle, DWORD_PTR context, DW info->index++; while (info->index < info->count && (info->test[info->index].flags & NF_WINE_ALLOW)) { - todo_wine ok(info->test[info->index].status != status, "unexpected %x notification\n", status); + todo_wine ok( info->test[info->index].status != status, "unexpected %#lx notification\n", status ); if (info->test[info->index].status == status) break; info->index++; } - ok(info->index < info->count, "%u: unexpected notification 0x%08x\n", info->line, status); + ok( info->index < info->count, "%u: unexpected notification %#lx\n", info->line, status ); if (info->index >= info->count) return; status_ok = (info->test[info->index].status == status); function_ok = (info->test[info->index].function == info->function); - ok(status_ok, "%u: expected status 0x%08x got 0x%08x\n", info->line, info->test[info->index].status, status); + ok( status_ok, "%u: expected status %#x got %#lx\n", info->line, info->test[info->index].status, status ); ok(function_ok, "%u: expected function %u got %u\n", info->line, info->test[info->index].function, info->function); if (info->test[info->index].flags & NF_MAIN_THREAD) @@ -222,7 +222,7 @@ static void test_connection_cache( void ) info.wait = CreateEventW( NULL, FALSE, FALSE, NULL ); ses = WinHttpOpen( L"winetest", 0, NULL, NULL, 0 ); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok( ses != NULL, "failed to open session %lu\n", GetLastError() ); event = CreateEventW( NULL, FALSE, FALSE, NULL ); ret = WinHttpSetOption( ses, WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT, &event, sizeof(event) ); @@ -235,15 +235,15 @@ static void test_connection_cache( void ) WinHttpSetStatusCallback( ses, check_notification, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); ret = WinHttpSetOption( ses, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(struct info *) ); - ok(ret, "failed to set context value %u\n", GetLastError()); + ok( ret, "failed to set context value %lu\n", GetLastError() ); setup_test( &info, winhttp_connect, __LINE__ ); con = WinHttpConnect( ses, L"test.winehq.org", 0, 0 ); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok( con != NULL, "failed to open a connection %lu\n", GetLastError() ); setup_test( &info, winhttp_open_request, __LINE__ ); req = WinHttpOpenRequest( con, NULL, L"/tests/hello.html", NULL, NULL, NULL, 0 ); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); @@ -253,16 +253,16 @@ static void test_connection_cache( void ) skip("connection failed, skipping\n"); goto done; } - ok(ret, "failed to send request %u\n", GetLastError()); + ok( ret, "failed to send request %lu\n", GetLastError() ); setup_test( &info, winhttp_receive_response, __LINE__ ); ret = WinHttpReceiveResponse( req, NULL ); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok( ret, "failed to receive response %lu\n", GetLastError() ); size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); - ok(ret, "failed unexpectedly %u\n", GetLastError()); - ok(status == 200, "request failed unexpectedly %u\n", status); + ok( ret, "failed unexpectedly %lu\n", GetLastError() ); + ok( status == 200, "request failed unexpectedly %lu\n", status ); ResetEvent( info.wait ); setup_test( &info, winhttp_close_handle, __LINE__ ); @@ -271,10 +271,10 @@ static void test_connection_cache( void ) setup_test( &info, winhttp_open_request, __LINE__ ); req = WinHttpOpenRequest( con, NULL, L"/tests/hello.html", NULL, NULL, NULL, 0 ); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); ret = WinHttpSetOption( req, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(struct info *) ); - ok(ret, "failed to set context value %u\n", GetLastError()); + ok( ret, "failed to set context value %lu\n", GetLastError() ); setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); @@ -284,16 +284,16 @@ static void test_connection_cache( void ) skip("connection failed, skipping\n"); goto done; } - ok(ret, "failed to send request %u\n", GetLastError()); + ok( ret, "failed to send request %lu\n", GetLastError() ); setup_test( &info, winhttp_receive_response, __LINE__ ); ret = WinHttpReceiveResponse( req, NULL ); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok( ret, "failed to receive response %lu\n", GetLastError() ); size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); - ok(ret, "failed unexpectedly %u\n", GetLastError()); - ok(status == 200, "request failed unexpectedly %u\n", status); + ok( ret, "failed unexpectedly %lu\n", GetLastError() ); + ok( status == 200, "request failed unexpectedly %lu\n", status ); ResetEvent( info.wait ); setup_test( &info, winhttp_close_handle, __LINE__ ); @@ -305,7 +305,7 @@ static void test_connection_cache( void ) if (unload) { status = WaitForSingleObject( event, 0 ); - ok(status == WAIT_TIMEOUT, "got %08x\n", status); + ok( status == WAIT_TIMEOUT, "got %#lx\n", status ); } setup_test( &info, winhttp_close_handle, __LINE__ ); @@ -315,12 +315,11 @@ static void test_connection_cache( void ) if (unload) { status = WaitForSingleObject( event, 100 ); - ok(status == WAIT_OBJECT_0, "got %08x\n", status); + ok( status == WAIT_OBJECT_0, "got %#lx\n", status ); } - ses = WinHttpOpen( L"winetest", 0, NULL, NULL, 0 ); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok( ses != NULL, "failed to open session %lu\n", GetLastError() ); if (unload) { @@ -331,18 +330,18 @@ static void test_connection_cache( void ) WinHttpSetStatusCallback( ses, check_notification, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); ret = WinHttpSetOption( ses, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(struct info *) ); - ok(ret, "failed to set context value %u\n", GetLastError()); + ok( ret, "failed to set context value %lu\n", GetLastError() ); setup_test( &info, winhttp_connect, __LINE__ ); con = WinHttpConnect( ses, L"test.winehq.org", 0, 0 ); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok( con != NULL, "failed to open a connection %lu\n", GetLastError() ); setup_test( &info, winhttp_open_request, __LINE__ ); req = WinHttpOpenRequest( con, NULL, L"/tests/hello.html", NULL, NULL, NULL, 0 ); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); ret = WinHttpSetOption( req, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(struct info *) ); - ok(ret, "failed to set context value %u\n", GetLastError()); + ok( ret, "failed to set context value %lu\n", GetLastError() ); setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); @@ -352,16 +351,16 @@ static void test_connection_cache( void ) skip("connection failed, skipping\n"); goto done; } - ok(ret, "failed to send request %u\n", GetLastError()); + ok( ret, "failed to send request %lu\n", GetLastError() ); setup_test( &info, winhttp_receive_response, __LINE__ ); ret = WinHttpReceiveResponse( req, NULL ); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok( ret, "failed to receive response %lu\n", GetLastError() ); size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); - ok(ret, "failed unexpectedly %u\n", GetLastError()); - ok(status == 200, "request failed unexpectedly %u\n", status); + ok( ret, "failed unexpectedly %lu\n", GetLastError() ); + ok( status == 200, "request failed unexpectedly %lu\n", status ); ResetEvent( info.wait ); setup_test( &info, winhttp_close_handle, __LINE__ ); @@ -370,10 +369,10 @@ static void test_connection_cache( void ) setup_test( &info, winhttp_open_request, __LINE__ ); req = WinHttpOpenRequest( con, NULL, L"/tests/hello.html", NULL, NULL, NULL, 0 ); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); ret = WinHttpSetOption( req, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(struct info *) ); - ok(ret, "failed to set context value %u\n", GetLastError()); + ok( ret, "failed to set context value %lu\n", GetLastError() ); setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); @@ -383,16 +382,16 @@ static void test_connection_cache( void ) skip("connection failed, skipping\n"); goto done; } - ok(ret, "failed to send request %u\n", GetLastError()); + ok( ret, "failed to send request %lu\n", GetLastError() ); setup_test( &info, winhttp_receive_response, __LINE__ ); ret = WinHttpReceiveResponse( req, NULL ); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok( ret, "failed to receive response %lu\n", GetLastError() ); size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); - ok(ret, "failed unexpectedly %u\n", GetLastError()); - ok(status == 200, "request failed unexpectedly %u\n", status); + ok( ret, "failed unexpectedly %lu\n", GetLastError() ); + ok( status == 200, "request failed unexpectedly %lu\n", status ); setup_test( &info, winhttp_close_handle, __LINE__ ); done: @@ -403,7 +402,7 @@ done: if (unload) { status = WaitForSingleObject( event, 0 ); - ok(status == WAIT_TIMEOUT, "got %08x\n", status); + ok( status == WAIT_TIMEOUT, "got %#lx\n", status ); } setup_test( &info, winhttp_close_handle, __LINE__ ); @@ -415,7 +414,7 @@ done: if (unload) { status = WaitForSingleObject( event, 100 ); - ok(status == WAIT_OBJECT_0, "got %08x\n", status); + ok( status == WAIT_OBJECT_0, "got %#lx\n", status ); } CloseHandle( event ); @@ -462,20 +461,20 @@ static void test_redirect( void ) info.wait = CreateEventW( NULL, FALSE, FALSE, NULL ); ses = WinHttpOpen( L"winetest", 0, NULL, NULL, 0 ); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok( ses != NULL, "failed to open session %lu\n", GetLastError() ); WinHttpSetStatusCallback( ses, check_notification, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); ret = WinHttpSetOption( ses, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(struct info *) ); - ok(ret, "failed to set context value %u\n", GetLastError()); + ok( ret, "failed to set context value %lu\n", GetLastError() ); setup_test( &info, winhttp_connect, __LINE__ ); con = WinHttpConnect( ses, L"test.winehq.org", 0, 0 ); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok( con != NULL, "failed to open a connection %lu\n", GetLastError() ); setup_test( &info, winhttp_open_request, __LINE__ ); req = WinHttpOpenRequest( con, NULL, L"/tests/redirect", NULL, NULL, NULL, 0 ); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); @@ -485,16 +484,16 @@ static void test_redirect( void ) skip("connection failed, skipping\n"); goto done; } - ok(ret, "failed to send request %u\n", GetLastError()); + ok( ret, "failed to send request %lu\n", GetLastError() ); setup_test( &info, winhttp_receive_response, __LINE__ ); ret = WinHttpReceiveResponse( req, NULL ); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok( ret, "failed to receive response %lu\n", GetLastError() ); size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); - ok(ret, "failed unexpectedly %u\n", GetLastError()); - ok(status == 200, "request failed unexpectedly %u\n", status); + ok( ret, "failed unexpectedly %lu\n", GetLastError() ); + ok( status == 200, "request failed unexpectedly %lu\n", status ); setup_test( &info, winhttp_close_handle, __LINE__ ); done: @@ -543,7 +542,7 @@ static void test_async( void ) info.wait = CreateEventW( NULL, FALSE, FALSE, NULL ); ses = WinHttpOpen( L"winetest", 0, NULL, NULL, WINHTTP_FLAG_ASYNC ); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok( ses != NULL, "failed to open session %lu\n", GetLastError() ); event = CreateEventW( NULL, FALSE, FALSE, NULL ); ret = WinHttpSetOption( ses, WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT, &event, sizeof(event) ); @@ -556,27 +555,27 @@ static void test_async( void ) SetLastError( 0xdeadbeef ); WinHttpSetStatusCallback( ses, check_notification, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); err = GetLastError(); - ok(err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %u\n", err); + ok( err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %lu\n", err ); SetLastError( 0xdeadbeef ); ret = WinHttpSetOption( ses, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(struct info *) ); err = GetLastError(); - ok(ret, "failed to set context value %u\n", err); - ok(err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %u\n", err); + ok( ret, "failed to set context value %lu\n", err ); + ok( err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %lu\n", err ); setup_test( &info, winhttp_connect, __LINE__ ); SetLastError( 0xdeadbeef ); con = WinHttpConnect( ses, L"test.winehq.org", 0, 0 ); err = GetLastError(); - ok(con != NULL, "failed to open a connection %u\n", err); - ok(err == ERROR_SUCCESS || broken(err == WSAEINVAL) /* < win7 */, "got %u\n", err); + ok( con != NULL, "failed to open a connection %lu\n", err ); + ok( err == ERROR_SUCCESS || broken(err == WSAEINVAL) /* < win7 */, "got %lu\n", err ); setup_test( &info, winhttp_open_request, __LINE__ ); SetLastError( 0xdeadbeef ); req = WinHttpOpenRequest( con, NULL, L"/tests/hello.html", NULL, NULL, NULL, 0 ); err = GetLastError(); - ok(req != NULL, "failed to open a request %u\n", err); - ok(err == ERROR_SUCCESS, "got %u\n", err); + ok( req != NULL, "failed to open a request %lu\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); setup_test( &info, winhttp_send_request, __LINE__ ); SetLastError( 0xdeadbeef ); @@ -591,8 +590,8 @@ static void test_async( void ) CloseHandle( info.wait ); return; } - ok(ret, "failed to send request %u\n", err); - ok(err == ERROR_SUCCESS, "got %u\n", err); + ok( ret, "failed to send request %lu\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); @@ -600,8 +599,8 @@ static void test_async( void ) SetLastError( 0xdeadbeef ); ret = WinHttpReceiveResponse( req, NULL ); err = GetLastError(); - ok(ret, "failed to receive response %u\n", err); - ok(err == ERROR_SUCCESS, "got %u\n", err); + ok( ret, "failed to receive response %lu\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); @@ -609,33 +608,33 @@ static void test_async( void ) SetLastError( 0xdeadbeef ); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); err = GetLastError(); - ok(ret, "failed unexpectedly %u\n", err); - ok(status == 200, "request failed unexpectedly %u\n", status); - ok(err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %u\n", err); + ok( ret, "failed unexpectedly %lu\n", err ); + ok( status == 200, "request failed unexpectedly %lu\n", status ); + ok( err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %lu\n", err ); setup_test( &info, winhttp_query_data, __LINE__ ); SetLastError( 0xdeadbeef ); ret = WinHttpQueryDataAvailable( req, NULL ); err = GetLastError(); - ok(ret, "failed to query data available %u\n", err); - ok(err == ERROR_SUCCESS || err == ERROR_IO_PENDING || broken(err == 0xdeadbeef) /* < win7 */, "got %u\n", err); + ok( ret, "failed to query data available %lu\n", err ); + ok( err == ERROR_SUCCESS || err == ERROR_IO_PENDING || broken(err == 0xdeadbeef) /* < win7 */, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); - ok(info.last_status == WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE, "got status %#x.\n", status); - ok((err == ERROR_SUCCESS && info.last_thread_id == GetCurrentThreadId()) - || (err == ERROR_IO_PENDING && info.last_thread_id != GetCurrentThreadId()), - "Got unexpected thread %#x, err %#x.\n", info.last_thread_id, err); + ok( info.last_status == WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE, "got status %#lx\n", status ); + ok(( err == ERROR_SUCCESS && info.last_thread_id == GetCurrentThreadId()) + || (err == ERROR_IO_PENDING && info.last_thread_id != GetCurrentThreadId()), + "got unexpected thread %#lx, err %#lx\n", info.last_thread_id, err ); setup_test( &info, winhttp_read_data, __LINE__ ); ret = WinHttpReadData( req, buffer, sizeof(buffer), NULL ); - ok(ret, "failed to read data %u\n", err); + ok( ret, "failed to read data %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); - ok(info.last_status == WINHTTP_CALLBACK_STATUS_READ_COMPLETE, "got status %#x.\n", status); - ok((err == ERROR_SUCCESS && info.last_thread_id == GetCurrentThreadId()) - || (err == ERROR_IO_PENDING && info.last_thread_id != GetCurrentThreadId()), - "Got unexpected thread %#x, err %#x.\n", info.last_thread_id, err); + ok( info.last_status == WINHTTP_CALLBACK_STATUS_READ_COMPLETE, "got status %#lx\n", status ); + ok( (err == ERROR_SUCCESS && info.last_thread_id == GetCurrentThreadId()) + || (err == ERROR_IO_PENDING && info.last_thread_id != GetCurrentThreadId()), + "got unexpected thread %#lx, err %#lx\n", info.last_thread_id, err ); setup_test( &info, winhttp_close_handle, __LINE__ ); WinHttpCloseHandle( req ); @@ -644,7 +643,7 @@ static void test_async( void ) if (unload) { status = WaitForSingleObject( event, 0 ); - ok(status == WAIT_TIMEOUT, "got %08x\n", status); + ok( status == WAIT_TIMEOUT, "got %#lx\n", status ); } WinHttpCloseHandle( ses ); WaitForSingleObject( info.wait, INFINITE ); @@ -653,7 +652,7 @@ static void test_async( void ) if (unload) { status = WaitForSingleObject( event, 2000 ); - ok(status == WAIT_OBJECT_0, "got %08x\n", status); + ok( status == WAIT_OBJECT_0, "got %#lx\n", status ); } CloseHandle( event ); CloseHandle( info.wait ); @@ -767,7 +766,7 @@ static void test_websocket(BOOL secure) info.wait = CreateEventW( NULL, FALSE, FALSE, NULL ); session = WinHttpOpen( L"winetest", 0, NULL, NULL, WINHTTP_FLAG_ASYNC ); - ok( session != NULL, "got %u\n", GetLastError() ); + ok( session != NULL, "got %lu\n", GetLastError() ); event = CreateEventW( NULL, FALSE, FALSE, NULL ); ret = WinHttpSetOption( session, WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT, &event, sizeof(event) ); @@ -781,44 +780,44 @@ static void test_websocket(BOOL secure) { protocols = WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2; ret = WinHttpSetOption(session, WINHTTP_OPTION_SECURE_PROTOCOLS, &protocols, sizeof(protocols)); - ok(ret, "failed to set protocols %u\n", GetLastError()); + ok( ret, "failed to set protocols %lu\n", GetLastError() ); } SetLastError( 0xdeadbeef ); WinHttpSetStatusCallback( session, check_notification, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); err = GetLastError(); - ok( err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %u\n", err ); + ok( err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %lu\n", err ); SetLastError( 0xdeadbeef ); ret = WinHttpSetOption( session, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(context) ); err = GetLastError(); - ok( ret, "got %u\n", err ); - ok( err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %u\n", err); + ok( ret, "got %lu\n", err ); + ok( err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %lu\n", err ); setup_test( &info, winhttp_connect, __LINE__ ); SetLastError( 0xdeadbeef ); connection = WinHttpConnect( session, L"ws.ifelse.io", 0, 0 ); err = GetLastError(); - ok( connection != NULL, "got %u\n", err); - ok( err == ERROR_SUCCESS || broken(err == WSAEINVAL) /* < win7 */, "got %u\n", err ); + ok( connection != NULL, "got %lu\n", err ); + ok( err == ERROR_SUCCESS || broken(err == WSAEINVAL) /* < win7 */, "got %lu\n", err ); setup_test( &info, winhttp_open_request, __LINE__ ); SetLastError( 0xdeadbeef ); request = WinHttpOpenRequest( connection, NULL, L"/", NULL, NULL, NULL, secure ? WINHTTP_FLAG_SECURE : 0); err = GetLastError(); - ok( request != NULL, "got %u\n", err ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( request != NULL, "got %lu\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); if (secure) { flags = SECURITY_FLAG_IGNORE_UNKNOWN_CA | SECURITY_FLAG_IGNORE_CERT_DATE_INVALID | SECURITY_FLAG_IGNORE_CERT_CN_INVALID; ret = WinHttpSetOption(request, WINHTTP_OPTION_SECURITY_FLAGS, &flags, sizeof(flags)); - ok(ret, "failed to set security flags %u\n", GetLastError()); + ok( ret, "failed to set security flags %lu\n", GetLastError() ); } ret = WinHttpSetOption( request, WINHTTP_OPTION_UPGRADE_TO_WEB_SOCKET, NULL, 0 ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); setup_test( &info, winhttp_send_request, __LINE__ ); SetLastError( 0xdeadbeef ); @@ -833,81 +832,76 @@ static void test_websocket(BOOL secure) CloseHandle( info.wait ); return; } - ok( ret, "got %u\n", err ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( ret, "got %lu\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); setup_test( &info, winhttp_receive_response, __LINE__ ); SetLastError( 0xdeadbeef ); ret = WinHttpReceiveResponse( request, NULL ); err = GetLastError(); - ok( ret, "got %u\n", err ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( ret, "got %lu\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); size = sizeof(status); SetLastError( 0xdeadbeef ); ret = WinHttpQueryHeaders( request, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); err = GetLastError(); - ok( ret, "failed unexpectedly %u\n", err ); - ok( status == 101, "got %u\n", status ); - ok( err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %u\n", err ); + ok( ret, "failed unexpectedly %lu\n", err ); + ok( status == 101, "got %lu\n", status ); + ok( err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %lu\n", err ); setup_test( &info, winhttp_websocket_complete_upgrade, __LINE__ ); SetLastError( 0xdeadbeef ); socket = pWinHttpWebSocketCompleteUpgrade( request, (DWORD_PTR)context ); err = GetLastError(); - ok( socket != NULL, "got %u\n", err ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( socket != NULL, "got %lu\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); /* The send is executed synchronously (even if sending a reasonably big buffer exceeding SSL buffer size). * It is possible to trigger queueing the send into another thread but that involves sending a considerable * amount of big enough buffers. */ big_buffer = malloc( BIG_BUFFER_SIZE ); - for (i = 0; i < BIG_BUFFER_SIZE; ++i) - big_buffer[i] = (i & 0xff) ^ 0xcc; + for (i = 0; i < BIG_BUFFER_SIZE; ++i) big_buffer[i] = (i & 0xff) ^ 0xcc; setup_test( &info, winhttp_websocket_send, __LINE__ ); - err = pWinHttpWebSocketSend( socket, WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, - big_buffer, BIG_BUFFER_SIZE ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + err = pWinHttpWebSocketSend( socket, WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, big_buffer, BIG_BUFFER_SIZE ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); setup_test( &info, winhttp_websocket_send, __LINE__ ); - err = pWinHttpWebSocketSend( socket, WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, - (void*)"hello", sizeof("hello") ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + err = pWinHttpWebSocketSend( socket, WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, (void *)"hello", sizeof("hello") ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); setup_test( &info, winhttp_websocket_shutdown, __LINE__ ); err = pWinHttpWebSocketShutdown( socket, 1000, (void *)"success", sizeof("success") ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); - err = pWinHttpWebSocketSend( socket, WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, - (void*)"hello", sizeof("hello") ); - ok( err == ERROR_INVALID_OPERATION, "got %u\n", err ); + err = pWinHttpWebSocketSend( socket, WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, (void *)"hello", sizeof("hello") ); + ok( err == ERROR_INVALID_OPERATION, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); err = pWinHttpWebSocketShutdown( socket, 1000, (void *)"success", sizeof("success") ); - ok( err == ERROR_INVALID_OPERATION, "got %u\n", err ); - err = pWinHttpWebSocketSend( socket, WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, - (void*)"hello", sizeof("hello") ); - ok( err == ERROR_INVALID_OPERATION, "got %u\n", err ); + ok( err == ERROR_INVALID_OPERATION, "got %lu\n", err ); + err = pWinHttpWebSocketSend( socket, WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, (void *)"hello", sizeof("hello") ); + ok( err == ERROR_INVALID_OPERATION, "got %lu\n", err ); setup_test( &info, winhttp_websocket_receive, __LINE__ ); buffer[0] = 0; size = 0xdeadbeef; type = 0xdeadbeef; err = pWinHttpWebSocketReceive( socket, buffer, sizeof(buffer), &size, &type ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); - ok( info.buflen == sizeof(*ws_status), "got unexpected buflen %u.\n", info.buflen ); + ok( info.buflen == sizeof(*ws_status), "got %u\n", info.buflen ); ws_status = (WINHTTP_WEB_SOCKET_STATUS *)info.buffer; ok( ws_status->eBufferType == WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE, - "Got unexpected eBufferType %u.\n", ws_status->eBufferType ); - ok( size == 0xdeadbeef, "got %u\n", size ); + "got unexpected eBufferType %u\n", ws_status->eBufferType ); + ok( size == 0xdeadbeef, "got %lu\n", size ); ok( type == 0xdeadbeef, "got %u\n", type ); ok( buffer[0] == 'R', "unexpected data\n" ); @@ -923,21 +917,19 @@ static void test_websocket(BOOL secure) ws_status = (WINHTTP_WEB_SOCKET_STATUS *)info.buffer; ws_status->eBufferType = ~0u; err = pWinHttpWebSocketReceive( socket, big_buffer + offset, BIG_BUFFER_SIZE - offset, &size, &type ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); - ok( info.buflen == sizeof(*ws_status), "got unexpected buflen %u.\n", info.buflen ); + ok( info.buflen == sizeof(*ws_status), "got %u\n", info.buflen ); ok( ws_status->eBufferType == WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE - || ws_status->eBufferType == WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE, - "Got unexpected eBufferType %u.\n", ws_status->eBufferType ); + || ws_status->eBufferType == WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE, "got %u\n", ws_status->eBufferType ); offset += ws_status->dwBytesTransferred; - ok( offset <= BIG_BUFFER_SIZE, "Got unexpected dwBytesTransferred %u.\n", - ws_status->dwBytesTransferred ); - ok( size == 0xdeadbeef, "got %u\n", size ); + ok( offset <= BIG_BUFFER_SIZE, "got %lu\n", ws_status->dwBytesTransferred ); + ok( size == 0xdeadbeef, "got %lu\n", size ); ok( type == 0xdeadbeef, "got %u\n", type ); } while (ws_status->eBufferType == WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE); - ok( offset == BIG_BUFFER_SIZE, "Got unexpected offset %u.\n", offset ); + ok( offset == BIG_BUFFER_SIZE, "got %u\n", offset ); for (i = 0; i < BIG_BUFFER_SIZE; ++i) if (big_buffer[i] != ((i & 0xff) ^ 0xcc)) break; @@ -948,21 +940,21 @@ static void test_websocket(BOOL secure) close_status = 0xdead; size = sizeof(buffer) + 1; err = pWinHttpWebSocketQueryCloseStatus( socket, &close_status, buffer, sizeof(buffer), &size ); - ok( err == ERROR_INVALID_OPERATION, "got %u\n", err ); + ok( err == ERROR_INVALID_OPERATION, "got %lu\n", err ); ok( close_status == 0xdead, "got %u\n", close_status ); - ok( size == sizeof(buffer) + 1, "got %u\n", size ); + ok( size == sizeof(buffer) + 1, "got %lu\n", size ); setup_test( &info, winhttp_websocket_close, __LINE__ ); err = pWinHttpWebSocketClose( socket, 1000, (void *)"success", sizeof("success") ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); close_status = 0xdead; size = sizeof(buffer) + 1; err = pWinHttpWebSocketQueryCloseStatus( socket, &close_status, buffer, sizeof(buffer), &size ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); ok( close_status == 1000, "got %u\n", close_status ); - ok( size <= sizeof(buffer), "got %u\n", size ); + ok( size <= sizeof(buffer), "got %lu\n", size ); setup_test( &info, winhttp_close_handle, __LINE__ ); WinHttpCloseHandle( socket ); @@ -978,75 +970,73 @@ static void test_websocket(BOOL secure) setup_test( &info, winhttp_open_request, __LINE__ ); request = WinHttpOpenRequest( connection, NULL, L"/", NULL, NULL, NULL, secure ? WINHTTP_FLAG_SECURE : 0); - ok( request != NULL, "got %u\n", err ); + ok( request != NULL, "got %lu\n", err ); if (secure) { flags = SECURITY_FLAG_IGNORE_UNKNOWN_CA | SECURITY_FLAG_IGNORE_CERT_DATE_INVALID | SECURITY_FLAG_IGNORE_CERT_CN_INVALID; ret = WinHttpSetOption(request, WINHTTP_OPTION_SECURITY_FLAGS, &flags, sizeof(flags)); - ok(ret, "failed to set security flags %u\n", GetLastError()); + ok( ret, "failed to set security flags %lu\n", GetLastError() ); } ret = WinHttpSetOption( request, WINHTTP_OPTION_UPGRADE_TO_WEB_SOCKET, NULL, 0 ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( request, NULL, 0, NULL, 0, 0, 0 ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); WaitForSingleObject( info.wait, INFINITE ); setup_test( &info, winhttp_receive_response, __LINE__ ); ret = WinHttpReceiveResponse( request, NULL ); - ok( ret, "got %u\n", err ); + ok( ret, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); size = sizeof(status); ret = WinHttpQueryHeaders( request, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); - ok( ret, "failed unexpectedly %u\n", err ); - ok( status == 101, "got %u\n", status ); + ok( ret, "failed unexpectedly %lu\n", err ); + ok( status == 101, "got %lu\n", status ); setup_test( &info, winhttp_websocket_complete_upgrade, __LINE__ ); socket = pWinHttpWebSocketCompleteUpgrade( request, (DWORD_PTR)context ); - ok( socket != NULL, "got %u\n", err ); + ok( socket != NULL, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); setup_test( &info, winhttp_websocket_receive, __LINE__ ); buffer[0] = 0; err = pWinHttpWebSocketReceive( socket, buffer, sizeof(buffer), &size, &type ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); ok( buffer[0] == 'R', "unexpected data\n" ); err = pWinHttpWebSocketReceive( socket, buffer, sizeof(buffer), &size, &type ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); setup_test( &info, winhttp_websocket_close, __LINE__ ); err = pWinHttpWebSocketClose( socket, 1000, (void *)"success", sizeof("success") ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); - ok( info.buflen == sizeof(*result), "got unexpected buflen %u.\n", info.buflen ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); + ok( info.buflen == sizeof(*result), "got %u\n", info.buflen ); result = (WINHTTP_WEB_SOCKET_ASYNC_RESULT *)info.buffer; - ok( result->Operation == WINHTTP_WEB_SOCKET_RECEIVE_OPERATION, "got unexpected operation %u.\n", - result->Operation ); - ok( !result->AsyncResult.dwResult, "got unexpected result %lu.\n", result->AsyncResult.dwResult ); - ok( result->AsyncResult.dwError == ERROR_WINHTTP_OPERATION_CANCELLED, "got unexpected error %u.\n", - result->AsyncResult.dwError ); + ok( result->Operation == WINHTTP_WEB_SOCKET_RECEIVE_OPERATION, "got %u\n", result->Operation ); + ok( !result->AsyncResult.dwResult, "got %Iu\n", result->AsyncResult.dwResult ); + ok( result->AsyncResult.dwError == ERROR_WINHTTP_OPERATION_CANCELLED, "got %lu\n", result->AsyncResult.dwError ); close_status = 0xdead; size = sizeof(buffer) + 1; err = pWinHttpWebSocketQueryCloseStatus( socket, &close_status, buffer, sizeof(buffer), &size ); - ok( err == ERROR_INVALID_OPERATION, "got %u\n", err ); + ok( err == ERROR_INVALID_OPERATION, "got %lu\n", err ); ok( close_status == 0xdead, "got %u\n", close_status ); - ok( size == sizeof(buffer) + 1, "got %u\n", size ); + ok( size == sizeof(buffer) + 1, "got %lu\n", size ); WaitForSingleObject( info.wait, INFINITE ); close_status = 0xdead; size = sizeof(buffer) + 1; err = pWinHttpWebSocketQueryCloseStatus( socket, &close_status, buffer, sizeof(buffer), &size ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); ok( close_status == 1000, "got %u\n", close_status ); - ok( size <= sizeof(buffer), "got %u\n", size ); + ok( size <= sizeof(buffer), "got %lu\n", size ); setup_test( &info, winhttp_close_handle, __LINE__ ); WinHttpCloseHandle( socket ); @@ -1062,88 +1052,87 @@ static void test_websocket(BOOL secure) setup_test( &info, winhttp_open_request, __LINE__ ); request = WinHttpOpenRequest( connection, NULL, L"/", NULL, NULL, NULL, secure ? WINHTTP_FLAG_SECURE : 0); - ok( request != NULL, "got %u\n", err ); + ok( request != NULL, "got %lu\n", err ); if (secure) { flags = SECURITY_FLAG_IGNORE_UNKNOWN_CA | SECURITY_FLAG_IGNORE_CERT_DATE_INVALID | SECURITY_FLAG_IGNORE_CERT_CN_INVALID; ret = WinHttpSetOption(request, WINHTTP_OPTION_SECURITY_FLAGS, &flags, sizeof(flags)); - ok(ret, "failed to set security flags %u\n", GetLastError()); + ok( ret, "failed to set security flags %lu\n", GetLastError() ); } ret = WinHttpSetOption( request, WINHTTP_OPTION_UPGRADE_TO_WEB_SOCKET, NULL, 0 ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( request, NULL, 0, NULL, 0, 0, 0 ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); WaitForSingleObject( info.wait, INFINITE ); setup_test( &info, winhttp_receive_response, __LINE__ ); ret = WinHttpReceiveResponse( request, NULL ); - ok( ret, "got %u\n", err ); + ok( ret, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); size = sizeof(status); ret = WinHttpQueryHeaders( request, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); - ok( ret, "failed unexpectedly %u\n", err ); - ok( status == 101, "got %u\n", status ); + ok( ret, "failed unexpectedly %lu\n", err ); + ok( status == 101, "got %lu\n", status ); setup_test( &info, winhttp_websocket_complete_upgrade, __LINE__ ); socket = pWinHttpWebSocketCompleteUpgrade( request, (DWORD_PTR)context ); - ok( socket != NULL, "got %u\n", err ); + ok( socket != NULL, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); setup_test( &info, winhttp_websocket_receive, __LINE__ ); buffer[0] = 0; err = pWinHttpWebSocketReceive( socket, buffer, sizeof(buffer), &size, &type ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); ok( buffer[0] == 'R', "unexpected data\n" ); err = pWinHttpWebSocketReceive( socket, buffer, sizeof(buffer), &size, &type ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); err = pWinHttpWebSocketReceive( socket, buffer, sizeof(buffer), &size, &type ); - ok( err == ERROR_INVALID_OPERATION, "got %u\n", err ); + ok( err == ERROR_INVALID_OPERATION, "got %lu\n", err ); setup_test( &info, winhttp_websocket_shutdown, __LINE__ ); ws_status = (WINHTTP_WEB_SOCKET_STATUS *)info.buffer; ws_status->eBufferType = ~0u; err = pWinHttpWebSocketShutdown( socket, 1000, (void *)"success", sizeof("success") ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); close_status = 0xdead; size = sizeof(buffer) + 1; err = pWinHttpWebSocketQueryCloseStatus( socket, &close_status, buffer, sizeof(buffer), &size ); - ok( err == ERROR_INVALID_OPERATION, "got %u\n", err ); + ok( err == ERROR_INVALID_OPERATION, "got %lu\n", err ); ok( close_status == 0xdead, "got %u\n", close_status ); - ok( size == sizeof(buffer) + 1, "got %u\n", size ); + ok( size == sizeof(buffer) + 1, "got %lu\n", size ); WaitForSingleObject( info.wait, INFINITE ); - ok( info.buflen == sizeof(*ws_status), "got unexpected buflen %u.\n", info.buflen ); - ok( ws_status->eBufferType == WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE, "Got unexpected eBufferType %u.\n", - ws_status->eBufferType ); - ok( !ws_status->dwBytesTransferred, "got unexpected dwBytesTransferred %u.\n", ws_status->dwBytesTransferred ); + ok( info.buflen == sizeof(*ws_status), "got %u\n", info.buflen ); + ok( ws_status->eBufferType == WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE, "got %u\n", ws_status->eBufferType ); + ok( !ws_status->dwBytesTransferred, "got %lu\n", ws_status->dwBytesTransferred ); close_status = 0xdead; size = sizeof(buffer) + 1; err = pWinHttpWebSocketQueryCloseStatus( socket, &close_status, buffer, sizeof(buffer), &size ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); ok( close_status == 1000, "got %u\n", close_status ); - ok( size <= sizeof(buffer), "got %u\n", size ); + ok( size <= sizeof(buffer), "got %lu\n", size ); err = pWinHttpWebSocketReceive( socket, buffer, sizeof(buffer), &size, &type ); - ok( err == ERROR_INVALID_OPERATION, "got %u\n", err ); + ok( err == ERROR_INVALID_OPERATION, "got %lu\n", err ); info.buflen = 0xdeadbeef; setup_test( &info, winhttp_websocket_close, __LINE__ ); err = pWinHttpWebSocketClose( socket, 1000, (void *)"success", sizeof("success") ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); - ok( !info.buflen, "Got unexpected buflen %u.\n", info.buflen ); + ok( !info.buflen, "got %u\n", info.buflen ); setup_test( &info, winhttp_close_handle, __LINE__ ); @@ -1154,7 +1143,7 @@ static void test_websocket(BOOL secure) if (unload) { status = WaitForSingleObject( event, 0 ); - ok( status == WAIT_TIMEOUT, "got %08x\n", status ); + ok( status == WAIT_TIMEOUT, "got %#lx\n", status ); } WinHttpCloseHandle( session ); WaitForSingleObject( info.wait, INFINITE ); @@ -1163,7 +1152,7 @@ static void test_websocket(BOOL secure) if (unload) { status = WaitForSingleObject( event, 2000 ); - ok( status == WAIT_OBJECT_0, "got %08x\n", status ); + ok( status == WAIT_OBJECT_0, "got %#lx\n", status ); } CloseHandle( event ); CloseHandle( info.wait ); @@ -1265,30 +1254,30 @@ static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path) BOOL ret; ses = WinHttpOpen(NULL, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok( ses != NULL, "failed to open session %lu\n", GetLastError() ); con = WinHttpConnect(ses, L"localhost", port, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok( con != NULL, "failed to open a connection %lu\n", GetLastError() ); req = WinHttpOpenRequest(con, verb, path, NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); - ok(ret, "failed to send request %u\n", GetLastError()); + ok( ret, "failed to send request %lu\n", GetLastError() ); ret = WinHttpReceiveResponse(req, NULL); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok( ret, "failed to receive response %lu\n", GetLastError() ); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); - ok(ret, "failed to query status code %u\n", GetLastError()); - ok(status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status); + ok( ret, "failed to query status code %lu\n", GetLastError()); + ok( status == HTTP_STATUS_OK, "request failed unexpectedly %lu\n", status ); count = 0; memset(buffer, 0, sizeof(buffer)); ret = WinHttpReadData(req, buffer, sizeof buffer, &count); - ok(ret, "failed to read data %u\n", GetLastError()); + ok( ret, "failed to read data %lu\n", GetLastError() ); ok(count == sizeof page1 - 1, "count was wrong\n"); ok(!memcmp(buffer, page1, sizeof page1), "http data wrong\n"); @@ -1337,22 +1326,22 @@ static void open_async_request(int port, struct test_request *req, struct info * } req->session = WinHttpOpen( L"winetest", 0, NULL, NULL, WINHTTP_FLAG_ASYNC ); - ok(req->session != NULL, "failed to open session %u\n", GetLastError()); + ok( req->session != NULL, "failed to open session %lu\n", GetLastError() ); WinHttpSetOption( req->session, WINHTTP_OPTION_CONTEXT_VALUE, &info, sizeof(struct info *) ); WinHttpSetStatusCallback( req->session, check_notification, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); setup_test( info, winhttp_connect, __LINE__ ); req->connection = WinHttpConnect( req->session, L"localhost", port, 0 ); - ok(req->connection != NULL, "failed to open a connection %u\n", GetLastError()); + ok( req->connection != NULL, "failed to open a connection %lu\n", GetLastError() ); setup_test( info, winhttp_open_request, __LINE__ ); req->request = WinHttpOpenRequest( req->connection, NULL, path, NULL, NULL, NULL, 0 ); - ok(req->request != NULL, "failed to open a request %u\n", GetLastError()); + ok( req->request != NULL, "failed to open a request %lu\n", GetLastError() ); setup_test( info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req->request, NULL, 0, NULL, 0, 0, 0 ); - ok(ret, "failed to send request %u\n", GetLastError()); + ok( ret, "failed to send request %lu\n", GetLastError() ); } static void open_socket_request(int port, struct test_request *req, struct info *info) @@ -1381,7 +1370,7 @@ static void server_send_reply(struct test_request *req, struct info *info, const info->index = 0; setup_test( info, winhttp_send_request, __LINE__ ); ret = WinHttpReceiveResponse( req->request, NULL ); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok( ret, "failed to receive response %lu\n", GetLastError() ); WaitForSingleObject( info->wait, INFINITE ); end_test( info, __LINE__ ); @@ -1437,11 +1426,11 @@ static void close_request(struct test_request *req, struct info *info, BOOL allo setup_test( info, winhttp_close_handle, __LINE__ ); ret = WinHttpCloseHandle( req->request ); - ok(ret, "WinHttpCloseHandle failed: %u\n", GetLastError()); + ok( ret, "WinHttpCloseHandle failed: %lu\n", GetLastError() ); ret = WinHttpCloseHandle( req->connection ); - ok(ret, "WinHttpCloseHandle failed: %u\n", GetLastError()); + ok( ret, "WinHttpCloseHandle failed: %lu\n", GetLastError() ); ret = WinHttpCloseHandle( req->session ); - ok(ret, "WinHttpCloseHandle failed: %u\n", GetLastError()); + ok( ret, "WinHttpCloseHandle failed: %lu\n", GetLastError() ); WaitForSingleObject( info->wait, INFINITE ); end_test( info, __LINE__ ); @@ -1468,7 +1457,7 @@ static void _read_request_data(struct test_request *req, struct info *info, cons setup_test( info, winhttp_read_data, line ); memset(buffer, '?', sizeof(buffer)); ret = WinHttpReadData( req->request, buffer, sizeof(buffer), NULL ); - ok(ret, "failed to read data %u\n", GetLastError()); + ok( ret, "failed to read data %lu\n", GetLastError() ); WaitForSingleObject( info->wait, INFINITE ); @@ -1578,17 +1567,15 @@ static void CALLBACK test_recursion_callback( HINTERNET handle, DWORD_PTR contex break; } - ok(context->recursion_count < TEST_RECURSION_LIMIT, - "Got unexpected context->recursion_count %u, thread %#x.\n", - context->recursion_count, GetCurrentThreadId()); + ok( context->recursion_count < TEST_RECURSION_LIMIT, + "got %lu, thread %#lx\n", context->recursion_count, GetCurrentThreadId() ); context->max_recursion_query = max( context->max_recursion_query, context->recursion_count ); InterlockedIncrement( &context->recursion_count ); ret = WinHttpReadData( context->request, &b, 1, NULL ); err = GetLastError(); - ok(ret, "Failed to read data, GetLastError() %u.\n", err); - ok(err == ERROR_SUCCESS || err == ERROR_IO_PENDING, "Got unexpected err %u.\n", err); - if (err == ERROR_SUCCESS) - context->have_sync_callback = TRUE; + ok( ret, "failed to read data, GetLastError() %lu\n", err ); + ok( err == ERROR_SUCCESS || err == ERROR_IO_PENDING, "got %lu\n", err ); + if (err == ERROR_SUCCESS) context->have_sync_callback = TRUE; InterlockedDecrement( &context->recursion_count ); break; @@ -1598,18 +1585,16 @@ static void CALLBACK test_recursion_callback( HINTERNET handle, DWORD_PTR contex SetEvent( context->wait ); break; } - ok(context->recursion_count < TEST_RECURSION_LIMIT, - "Got unexpected context->recursion_count %u, thread %#x.\n", - context->recursion_count, GetCurrentThreadId()); + ok( context->recursion_count < TEST_RECURSION_LIMIT, + "got %lu, thread %#lx\n", context->recursion_count, GetCurrentThreadId() ); context->max_recursion_read = max( context->max_recursion_read, context->recursion_count ); context->read_from_callback = TRUE; InterlockedIncrement( &context->recursion_count ); ret = WinHttpQueryDataAvailable( context->request, NULL ); err = GetLastError(); - ok(ret, "Failed to query data available, GetLastError() %u.\n", err); - ok(err == ERROR_SUCCESS || err == ERROR_IO_PENDING, "Got unexpected err %u.\n", err); - if (err == ERROR_SUCCESS) - context->have_sync_callback = TRUE; + ok( ret, "failed to query data available, GetLastError() %lu\n", err ); + ok( err == ERROR_SUCCESS || err == ERROR_IO_PENDING, "got %lu\n", err ); + if (err == ERROR_SUCCESS) context->have_sync_callback = TRUE; InterlockedDecrement( &context->recursion_count ); break; } @@ -1628,15 +1613,15 @@ static void test_recursion(void) context.wait = CreateEventW( NULL, FALSE, FALSE, NULL ); session = WinHttpOpen( L"winetest", 0, NULL, NULL, WINHTTP_FLAG_ASYNC ); - ok(!!session, "Failed to open session, GetLastError() %u.\n", GetLastError()); + ok( !!session, "failed to open session, GetLastError() %lu\n", GetLastError() ); WinHttpSetStatusCallback( session, test_recursion_callback, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); connection = WinHttpConnect( session, L"test.winehq.org", 0, 0 ); - ok(!!connection, "Failed to open a connection, GetLastError() %u.\n", GetLastError()); + ok( !!connection, "failed to open a connection, GetLastError() %lu\n", GetLastError() ); request = WinHttpOpenRequest( connection, NULL, L"/tests/hello.html", NULL, NULL, NULL, 0 ); - ok(!!request, "Failed to open a request, GetLastError() %u.\n", GetLastError()); + ok( !!request, "failed to open a request, GetLastError() %lu\n", GetLastError() ); context.request = request; ret = WinHttpSendRequest( request, NULL, 0, NULL, 0, 0, (DWORD_PTR)&context ); @@ -1651,39 +1636,36 @@ static void test_recursion(void) CloseHandle( context.wait ); return; } - ok(ret, "Failed to send request, GetLastError() %u.\n", GetLastError()); + ok( ret, "failed to send request, GetLastError() %lu\n", GetLastError() ); WaitForSingleObject( context.wait, INFINITE ); ret = WinHttpReceiveResponse( request, NULL ); - ok(ret, "Failed to receive response, GetLastError() %u.\n", GetLastError()); + ok( ret, "failed to receive response, GetLastError() %lu\n", GetLastError() ); WaitForSingleObject( context.wait, INFINITE ); size = sizeof(status); ret = WinHttpQueryHeaders( request, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); - ok(ret, "Request failed, GetLastError() %u.\n", GetLastError()); - ok(status == 200, "Request failed unexpectedly, status %u.\n", status); + ok( ret, "request failed, GetLastError() %lu\n", GetLastError() ); + ok( status == 200, "request failed unexpectedly, status %lu\n", status ); ret = WinHttpQueryDataAvailable( request, NULL ); - ok(ret, "Failed to query data available, GetLastError() %u.\n", GetLastError()); + ok( ret, "failed to query data available, GetLastError() %lu\n", GetLastError() ); WaitForSingleObject( context.wait, INFINITE ); ret = WinHttpReadData( request, &b, 1, NULL ); - ok(ret, "Failed to read data, GetLastError() %u.\n", GetLastError()); + ok( ret, "failed to read data, GetLastError() %lu\n", GetLastError() ); WaitForSingleObject( context.wait, INFINITE ); if (context.have_sync_callback) { - ok(context.max_recursion_query >= 2, "Got unexpected max_recursion_query %u.\n", context.max_recursion_query); - ok(context.max_recursion_read >= 2, "Got unexpected max_recursion_read %u.\n", context.max_recursion_read); - } - else - { - skip("No sync callbacks.\n"); + ok( context.max_recursion_query >= 2, "got %lu\n", context.max_recursion_query ); + ok( context.max_recursion_read >= 2, "got %lu\n", context.max_recursion_read ); } + else skip( "no sync callbacks\n"); WinHttpSetStatusCallback( session, NULL, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); @@ -1720,13 +1702,13 @@ START_TEST (notification) si.port = 7533; thread = CreateThread( NULL, 0, server_thread, &si, 0, NULL ); - ok(thread != NULL, "failed to create thread %u\n", GetLastError()); + ok( thread != NULL, "failed to create thread %lu\n", GetLastError() ); server_socket_available = CreateEventW( NULL, 0, 0, NULL ); server_socket_done = CreateEventW( NULL, 0, 0, NULL ); ret = WaitForSingleObject( si.event, 10000 ); - ok(ret == WAIT_OBJECT_0, "failed to start winhttp test server %u\n", GetLastError()); + ok( ret == WAIT_OBJECT_0, "failed to start winhttp test server %lu\n", GetLastError() ); if (ret != WAIT_OBJECT_0) { CloseHandle(thread); diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index 35d23c5b083..5f137dc6365 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -104,31 +104,31 @@ static void WinHttpCreateUrl_test( void ) SetLastError( 0xdeadbeef ); ret = WinHttpCreateUrl( NULL, 0, NULL, &len ); ok( !ret, "expected failure\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", GetLastError() ); - ok( len == ~0u, "expected len ~0u got %u\n", len ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %lu\n", GetLastError() ); + ok( len == ~0u, "expected len ~0u got %lu\n", len ); /* zero'ed components */ memset( &uc, 0, sizeof(URL_COMPONENTS) ); SetLastError( 0xdeadbeef ); ret = WinHttpCreateUrl( &uc, 0, NULL, &len ); ok( !ret, "expected failure\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", GetLastError() ); - ok( len == ~0u, "expected len ~0u got %u\n", len ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %lu\n", GetLastError() ); + ok( len == ~0u, "expected len ~0u got %lu\n", len ); /* valid components, NULL url, NULL length */ fill_url_components( &uc ); SetLastError( 0xdeadbeef ); ret = WinHttpCreateUrl( &uc, 0, NULL, NULL ); ok( !ret, "expected failure\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %lu\n", GetLastError() ); /* valid components, NULL url, insufficient length */ len = 0; SetLastError( 0xdeadbeef ); ret = WinHttpCreateUrl( &uc, 0, NULL, &len ); ok( !ret, "expected failure\n" ); - ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER got %u\n", GetLastError() ); - ok( len == 57, "expected len 57 got %u\n", len ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER got %lu\n", GetLastError() ); + ok( len == 57, "expected len 57 got %lu\n", len ); /* valid components, NULL url, sufficient length */ SetLastError( 0xdeadbeef ); @@ -137,8 +137,8 @@ static void WinHttpCreateUrl_test( void ) err = GetLastError(); ok( !ret, "expected failure\n" ); ok( err == ERROR_INVALID_PARAMETER || broken(err == ERROR_INSUFFICIENT_BUFFER) /* < win7 */, - "expected ERROR_INVALID_PARAMETER got %u\n", GetLastError() ); - ok( len == 256 || broken(len == 57) /* < win7 */, "expected len 256 got %u\n", len ); + "expected ERROR_INVALID_PARAMETER got %lu\n", GetLastError() ); + ok( len == 256 || broken(len == 57) /* < win7 */, "expected len 256 got %lu\n", len ); /* correct size, NULL url */ fill_url_components( &uc ); @@ -147,8 +147,8 @@ static void WinHttpCreateUrl_test( void ) err = GetLastError(); ok( !ret, "expected failure\n" ); ok( err == ERROR_INVALID_PARAMETER || broken(err == ERROR_INSUFFICIENT_BUFFER) /* < win7 */, - "expected ERROR_INVALID_PARAMETER got %u\n", GetLastError() ); - ok( len == 256 || broken(len == 57) /* < win7 */, "expected len 256 got %u\n", len ); + "expected ERROR_INVALID_PARAMETER got %lu\n", GetLastError() ); + ok( len == 256 || broken(len == 57) /* < win7 */, "expected len 256 got %lu\n", len ); /* valid components, allocated url, short length */ SetLastError( 0xdeadbeef ); @@ -157,8 +157,8 @@ static void WinHttpCreateUrl_test( void ) len = 2; ret = WinHttpCreateUrl( &uc, 0, url, &len ); ok( !ret, "expected failure\n" ); - ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER got %u\n", GetLastError() ); - ok( len == 57, "expected len 57 got %u\n", len ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER got %lu\n", GetLastError() ); + ok( len == 57, "expected len 57 got %lu\n", len ); /* allocated url, NULL scheme */ SetLastError( 0xdeadbeef ); @@ -168,8 +168,8 @@ static void WinHttpCreateUrl_test( void ) ret = WinHttpCreateUrl( &uc, 0, url, &len ); ok( ret, "expected success\n" ); ok( GetLastError() == ERROR_SUCCESS || broken(GetLastError() == 0xdeadbeef) /* < win7 */, - "expected ERROR_SUCCESS got %u\n", GetLastError() ); - ok( len == 56, "expected len 56 got %u\n", len ); + "expected ERROR_SUCCESS got %lu\n", GetLastError() ); + ok( len == 56, "expected len 56 got %lu\n", len ); ok( !lstrcmpW( url, url1 ), "url doesn't match\n" ); /* allocated url, 0 scheme */ @@ -179,7 +179,7 @@ static void WinHttpCreateUrl_test( void ) len = 256; ret = WinHttpCreateUrl( &uc, 0, url, &len ); ok( ret, "expected success\n" ); - ok( len == 56, "expected len 56 got %u\n", len ); + ok( len == 56, "expected len 56 got %lu\n", len ); /* valid components, allocated url */ fill_url_components( &uc ); @@ -187,7 +187,7 @@ static void WinHttpCreateUrl_test( void ) len = 256; ret = WinHttpCreateUrl( &uc, 0, url, &len ); ok( ret, "expected success\n" ); - ok( len == 56, "expected len 56 got %d\n", len ); + ok( len == 56, "expected len 56 got %lu\n", len ); ok( !lstrcmpW( url, url1 ), "url doesn't match\n" ); /* valid username, NULL password */ @@ -205,7 +205,7 @@ static void WinHttpCreateUrl_test( void ) len = 256; ret = WinHttpCreateUrl( &uc, 0, url, &len ); ok( ret, "expected success\n" ); - ok( len == 56, "expected len 56 got %u\n", len ); + ok( len == 56, "expected len 56 got %lu\n", len ); ok( !lstrcmpW( url, url2 ), "url doesn't match\n" ); /* valid password, NULL username */ @@ -216,7 +216,7 @@ static void WinHttpCreateUrl_test( void ) len = 256; ret = WinHttpCreateUrl( &uc, 0, url, &len ); ok( !ret, "expected failure\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %lu\n", GetLastError() ); /* valid password, empty username */ fill_url_components( &uc ); @@ -234,7 +234,7 @@ static void WinHttpCreateUrl_test( void ) len = 256; ret = WinHttpCreateUrl( &uc, 0, url, &len ); ok( ret, "expected success\n" ); - ok( len == 38, "expected len 38 got %u\n", len ); + ok( len == 38, "expected len 38 got %lu\n", len ); ok( !lstrcmpW( url, url3 ), "url doesn't match\n" ); /* empty username, empty password */ @@ -245,7 +245,7 @@ static void WinHttpCreateUrl_test( void ) len = 256; ret = WinHttpCreateUrl( &uc, 0, url, &len ); ok( ret, "expected success\n" ); - ok( len == 56, "expected len 56 got %u\n", len ); + ok( len == 56, "expected len 56 got %lu\n", len ); ok( !lstrcmpW( url, url4 ), "url doesn't match\n" ); /* nScheme has lower precedence than lpszScheme */ @@ -256,7 +256,7 @@ static void WinHttpCreateUrl_test( void ) len = 256; ret = WinHttpCreateUrl( &uc, 0, url, &len ); ok( ret, "expected success\n" ); - ok( len == lstrlenW( url5 ), "expected len %d got %u\n", lstrlenW( url5 ) + 1, len ); + ok( len == lstrlenW( url5 ), "expected len %d got %lu\n", lstrlenW( url5 ) + 1, len ); ok( !lstrcmpW( url, url5 ), "url doesn't match\n" ); /* non-standard port */ @@ -267,7 +267,7 @@ static void WinHttpCreateUrl_test( void ) len = 256; ret = WinHttpCreateUrl( &uc, 0, url, &len ); ok( ret, "expected success\n" ); - ok( len == 59, "expected len 59 got %u\n", len ); + ok( len == 59, "expected len 59 got %lu\n", len ); ok( !lstrcmpW( url, url6 ), "url doesn't match\n" ); /* escape extra info */ @@ -278,7 +278,7 @@ static void WinHttpCreateUrl_test( void ) len = 256; ret = WinHttpCreateUrl( &uc, ICU_ESCAPE, url, &len ); ok( ret, "expected success\n" ); - ok( len == 113, "expected len 113 got %u\n", len ); + ok( len == 113, "expected len 113 got %lu\n", len ); ok( !lstrcmpW( url, url7 ), "url doesn't match %s\n", wine_dbgstr_w(url) ); /* escape extra info */ @@ -290,7 +290,7 @@ static void WinHttpCreateUrl_test( void ) len = 256; ret = WinHttpCreateUrl( &uc, ICU_ESCAPE, url, &len ); ok( ret, "expected success\n" ); - ok( len == lstrlenW(url18), "expected len %u got %u\n", lstrlenW(url18), len ); + ok( len == lstrlenW(url18), "expected len %u got %lu\n", lstrlenW(url18), len ); ok( !lstrcmpW( url, url18 ), "url doesn't match\n" ); /* extra info with Unicode characters */ @@ -304,7 +304,7 @@ static void WinHttpCreateUrl_test( void ) ret = WinHttpCreateUrl( &uc, ICU_ESCAPE, url, &len ); err = GetLastError(); ok( !ret, "expected failure\n" ); - ok( err == ERROR_INVALID_PARAMETER, "got %u\n", err ); + ok( err == ERROR_INVALID_PARAMETER, "got %lu\n", err ); /* extra info with Unicode characters, no ICU_ESCAPE */ memset( &uc, 0, sizeof(uc) ); @@ -317,7 +317,7 @@ static void WinHttpCreateUrl_test( void ) ok( ret || broken(!ret) /* < win7 */, "expected success\n" ); if (ret) { - ok( len == lstrlenW(url19), "expected len %u got %u\n", lstrlenW(url19), len ); + ok( len == lstrlenW(url19), "expected len %u got %lu\n", lstrlenW(url19), len ); ok( !lstrcmpW( url, url19 ), "url doesn't match %s\n", wine_dbgstr_w(url) ); } @@ -330,7 +330,7 @@ static void WinHttpCreateUrl_test( void ) len = 256; ret = WinHttpCreateUrl( &uc, ICU_ESCAPE, url, &len ); ok( ret, "expected success\n" ); - ok( len == lstrlenW(url18), "expected len %u got %u\n", lstrlenW(url18), len ); + ok( len == lstrlenW(url18), "expected len %u got %lu\n", lstrlenW(url18), len ); ok( !lstrcmpW( url, url18 ), "url doesn't match\n" ); /* path with Unicode characters */ @@ -344,7 +344,7 @@ static void WinHttpCreateUrl_test( void ) ret = WinHttpCreateUrl( &uc, ICU_ESCAPE, url, &len ); err = GetLastError(); ok( !ret, "expected failure\n" ); - ok( err == ERROR_INVALID_PARAMETER, "got %u\n", err ); + ok( err == ERROR_INVALID_PARAMETER, "got %lu\n", err ); /* path with Unicode characters, no ICU_ESCAPE */ memset( &uc, 0, sizeof(uc) ); @@ -357,7 +357,7 @@ static void WinHttpCreateUrl_test( void ) ok( ret || broken(!ret) /* < win7 */, "expected success\n" ); if (ret) { - ok( len == lstrlenW(url20), "expected len %u got %u\n", lstrlenW(url20), len ); + ok( len == lstrlenW(url20), "expected len %u got %lu\n", lstrlenW(url20), len ); ok( !lstrcmpW( url, url20 ), "url doesn't match %s\n", wine_dbgstr_w(url) ); } @@ -371,7 +371,7 @@ static void WinHttpCreateUrl_test( void ) len = 256; ret = WinHttpCreateUrl( &uc, 0, url, &len ); ok( ret, "expected success\n" ); - ok( len == 58, "expected len 58 got %u\n", len ); + ok( len == 58, "expected len 58 got %lu\n", len ); ok( !lstrcmpW( url, url8 ), "url doesn't match\n" ); HeapFree( GetProcessHeap(), 0, url ); @@ -417,21 +417,21 @@ static void WinHttpCrackUrl_test( void ) uc.dwExtraInfoLength = 20; ret = WinHttpCrackUrl( url1, 0, 0, &uc ); - ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); + ok( ret, "WinHttpCrackUrl failed le = %lu\n", GetLastError() ); ok( uc.nScheme == INTERNET_SCHEME_HTTP, "unexpected scheme: %u\n", uc.nScheme ); ok( !memcmp( uc.lpszScheme, http, sizeof(http) ), "unexpected scheme: %s\n", wine_dbgstr_w(uc.lpszScheme) ); - ok( uc.dwSchemeLength == 4, "unexpected scheme length: %u\n", uc.dwSchemeLength ); + ok( uc.dwSchemeLength == 4, "unexpected scheme length: %lu\n", uc.dwSchemeLength ); ok( !memcmp( uc.lpszUserName, username, sizeof(username) ), "unexpected username: %s\n", wine_dbgstr_w(uc.lpszUserName) ); - ok( uc.dwUserNameLength == 8, "unexpected username length: %u\n", uc.dwUserNameLength ); + ok( uc.dwUserNameLength == 8, "unexpected username length: %lu\n", uc.dwUserNameLength ); ok( !memcmp( uc.lpszPassword, password, sizeof(password) ), "unexpected password: %s\n", wine_dbgstr_w(uc.lpszPassword) ); - ok( uc.dwPasswordLength == 8, "unexpected password length: %u\n", uc.dwPasswordLength ); + ok( uc.dwPasswordLength == 8, "unexpected password length: %lu\n", uc.dwPasswordLength ); ok( !memcmp( uc.lpszHostName, winehq, sizeof(winehq) ), "unexpected hostname: %s\n", wine_dbgstr_w(uc.lpszHostName) ); - ok( uc.dwHostNameLength == 14, "unexpected hostname length: %u\n", uc.dwHostNameLength ); + ok( uc.dwHostNameLength == 14, "unexpected hostname length: %lu\n", uc.dwHostNameLength ); ok( uc.nPort == 80, "unexpected port: %u\n", uc.nPort ); ok( !memcmp( uc.lpszUrlPath, about, sizeof(about) ), "unexpected path: %s\n", wine_dbgstr_w(uc.lpszUrlPath) ); - ok( uc.dwUrlPathLength == 11, "unexpected path length: %u\n", uc.dwUrlPathLength ); + ok( uc.dwUrlPathLength == 11, "unexpected path length: %lu\n", uc.dwUrlPathLength ); ok( !memcmp( uc.lpszExtraInfo, query, sizeof(query) ), "unexpected extra info: %s\n", wine_dbgstr_w(uc.lpszExtraInfo) ); - ok( uc.dwExtraInfoLength == 6, "unexpected extra info length: %u\n", uc.dwExtraInfoLength ); + ok( uc.dwExtraInfoLength == 6, "unexpected extra info length: %lu\n", uc.dwExtraInfoLength ); /* buffers of insufficient length */ uc.dwSchemeLength = 1; @@ -441,19 +441,19 @@ static void WinHttpCrackUrl_test( void ) ret = WinHttpCrackUrl( url1, 0, 0, &uc ); error = GetLastError(); ok( !ret, "WinHttpCrackUrl succeeded\n" ); - ok( error == ERROR_INSUFFICIENT_BUFFER, "got %u, expected ERROR_INSUFFICIENT_BUFFER\n", error ); - ok( uc.dwSchemeLength == 5, "unexpected scheme length: %u\n", uc.dwSchemeLength ); - ok( uc.dwHostNameLength == 15, "unexpected hostname length: %u\n", uc.dwHostNameLength ); - ok( uc.dwUrlPathLength == 11, "unexpected path length: %u\n", uc.dwUrlPathLength ); + ok( error == ERROR_INSUFFICIENT_BUFFER, "got %lu, expected ERROR_INSUFFICIENT_BUFFER\n", error ); + ok( uc.dwSchemeLength == 5, "unexpected scheme length: %lu\n", uc.dwSchemeLength ); + ok( uc.dwHostNameLength == 15, "unexpected hostname length: %lu\n", uc.dwHostNameLength ); + ok( uc.dwUrlPathLength == 11, "unexpected path length: %lu\n", uc.dwUrlPathLength ); /* no buffers */ reset_url_components( &uc ); SetLastError( 0xdeadbeef ); ret = WinHttpCrackUrl( url_k1, 0, 0, &uc); error = GetLastError(); - ok( ret, "WinHttpCrackUrl failed le=%u\n", error ); + ok( ret, "WinHttpCrackUrl failed le = %lu\n", error ); ok( error == ERROR_SUCCESS || broken(error == ERROR_INVALID_PARAMETER) /* < win7 */, - "got %u, expected ERROR_SUCCESS\n", error ); + "got %lu, expected ERROR_SUCCESS\n", error ); ok( uc.nScheme == INTERNET_SCHEME_HTTP, "unexpected scheme\n" ); ok( uc.lpszScheme == url_k1,"unexpected scheme\n" ); ok( uc.dwSchemeLength == 4, "unexpected scheme length\n" ); @@ -473,7 +473,7 @@ static void WinHttpCrackUrl_test( void ) uc.dwSchemeLength = uc.dwHostNameLength = uc.dwUserNameLength = 1; uc.dwPasswordLength = uc.dwUrlPathLength = uc.dwExtraInfoLength = 1; ret = WinHttpCrackUrl( url_k2, 0, 0,&uc); - ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); + ok( ret, "WinHttpCrackUrl failed le = %lu\n", GetLastError() ); ok( uc.nScheme == INTERNET_SCHEME_HTTP, "unexpected scheme\n" ); ok( uc.lpszScheme == url_k2, "unexpected scheme\n" ); ok( uc.dwSchemeLength == 4, "unexpected scheme length\n" ); @@ -491,7 +491,7 @@ static void WinHttpCrackUrl_test( void ) reset_url_components( &uc ); ret = WinHttpCrackUrl( url_k3, 0, 0, &uc ); - ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); + ok( ret, "WinHttpCrackUrl failed le = %lu\n", GetLastError() ); ok( uc.nScheme == INTERNET_SCHEME_HTTPS, "unexpected scheme\n" ); ok( uc.lpszScheme == url_k3, "unexpected scheme\n" ); ok( uc.dwSchemeLength == 5, "unexpected scheme length\n" ); @@ -513,80 +513,80 @@ static void WinHttpCrackUrl_test( void ) ret = WinHttpCrackUrl( url_k4, 0, 0, &uc ); ok( !ret, "WinHttpCrackUrl succeeded\n" ); error = GetLastError(); - ok( error == ERROR_WINHTTP_INVALID_URL, "got %u\n", error ); + ok( error == ERROR_WINHTTP_INVALID_URL, "got %lu\n", error ); reset_url_components( &uc ); SetLastError( 0xdeadbeef ); ret = WinHttpCrackUrl( url_k5, 0, 0, &uc ); ok( !ret, "WinHttpCrackUrl succeeded\n" ); error = GetLastError(); - ok( error == ERROR_WINHTTP_INVALID_URL, "got %u\n", error ); + ok( error == ERROR_WINHTTP_INVALID_URL, "got %lu\n", error ); reset_url_components( &uc ); SetLastError( 0xdeadbeef ); ret = WinHttpCrackUrl( url_k6, 0, 0, &uc ); ok( !ret, "WinHttpCrackUrl succeeded\n" ); error = GetLastError(); - ok( error == ERROR_WINHTTP_UNRECOGNIZED_SCHEME, "got %u\n", error ); + ok( error == ERROR_WINHTTP_UNRECOGNIZED_SCHEME, "got %lu\n", error ); reset_url_components( &uc ); SetLastError( 0xdeadbeef ); ret = WinHttpCrackUrl( url_k7, 0, 0, &uc ); ok( !ret, "WinHttpCrackUrl succeeded\n" ); error = GetLastError(); - ok( error == ERROR_WINHTTP_UNRECOGNIZED_SCHEME, "got %u\n", error ); + ok( error == ERROR_WINHTTP_UNRECOGNIZED_SCHEME, "got %lu\n", error ); reset_url_components( &uc ); SetLastError( 0xdeadbeef ); ret = WinHttpCrackUrl( url_k8, 0, 0, &uc ); error = GetLastError(); ok( !ret, "WinHttpCrackUrl succeeded\n" ); - ok( error == ERROR_WINHTTP_UNRECOGNIZED_SCHEME, "got %u\n", error ); + ok( error == ERROR_WINHTTP_UNRECOGNIZED_SCHEME, "got %lu\n", error ); reset_url_components( &uc ); ret = WinHttpCrackUrl( url_k9, 0, 0, &uc ); - ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); + ok( ret, "WinHttpCrackUrl failed le = %lu\n", GetLastError() ); ok( uc.lpszUrlPath == url_k9 + 14 || broken(uc.lpszUrlPath == url_k9 + 13) /* win8 */, "unexpected path: %s\n", wine_dbgstr_w(uc.lpszUrlPath) ); - ok( uc.dwUrlPathLength == 0, "unexpected path length: %u\n", uc.dwUrlPathLength ); + ok( uc.dwUrlPathLength == 0, "unexpected path length: %lu\n", uc.dwUrlPathLength ); ok( uc.lpszExtraInfo == url_k9 + 14 || broken(uc.lpszExtraInfo == url_k9 + 13) /* win8 */, "unexpected extra info: %s\n", wine_dbgstr_w(uc.lpszExtraInfo) ); ok( uc.dwExtraInfoLength == 0 || broken(uc.dwExtraInfoLength == 1) /* win8 */, - "unexpected extra info length: %u\n", uc.dwExtraInfoLength ); + "unexpected extra info length: %lu\n", uc.dwExtraInfoLength ); reset_url_components( &uc ); ret = WinHttpCrackUrl( url_k10, 0, 0, &uc ); - ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); + ok( ret, "WinHttpCrackUrl failed le = %lu\n", GetLastError() ); ok( uc.lpszUrlPath == url_k10 + 13, "unexpected path: %s\n", wine_dbgstr_w(uc.lpszUrlPath) ); - ok( uc.dwUrlPathLength == 7, "unexpected path length: %u\n", uc.dwUrlPathLength ); + ok( uc.dwUrlPathLength == 7, "unexpected path length: %lu\n", uc.dwUrlPathLength ); ok( uc.lpszExtraInfo == url_k10 + 20, "unexpected extra info: %s\n", wine_dbgstr_w(uc.lpszExtraInfo) ); - ok( uc.dwExtraInfoLength == 0, "unexpected extra info length: %u\n", uc.dwExtraInfoLength ); + ok( uc.dwExtraInfoLength == 0, "unexpected extra info length: %lu\n", uc.dwExtraInfoLength ); reset_url_components( &uc ); SetLastError( 0xdeadbeef ); ret = WinHttpCrackUrl( url4, 0, 0, &uc ); error = GetLastError(); ok( !ret, "WinHttpCrackUrl succeeded\n" ); - ok( error == ERROR_WINHTTP_INVALID_URL, "got %u\n", error ); + ok( error == ERROR_WINHTTP_INVALID_URL, "got %lu\n", error ); reset_url_components( &uc ); SetLastError( 0xdeadbeef ); ret = WinHttpCrackUrl( empty, 0, 0, &uc ); error = GetLastError(); ok( !ret, "WinHttpCrackUrl succeeded\n" ); - ok( error == ERROR_WINHTTP_UNRECOGNIZED_SCHEME, "got %u\n", error ); + ok( error == ERROR_WINHTTP_UNRECOGNIZED_SCHEME, "got %lu\n", error ); SetLastError( 0xdeadbeef ); ret = WinHttpCrackUrl( url1, 0, 0, NULL ); error = GetLastError(); ok( !ret, "WinHttpCrackUrl succeeded\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "got %lu\n", error ); SetLastError( 0xdeadbeef ); ret = WinHttpCrackUrl( NULL, 0, 0, &uc ); error = GetLastError(); ok( !ret, "WinHttpCrackUrl succeeded\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "got %lu\n", error ); /* decoding without buffers */ reset_url_components( &uc ); @@ -594,7 +594,7 @@ static void WinHttpCrackUrl_test( void ) ret = WinHttpCrackUrl( url7, 0, ICU_DECODE, &uc ); error = GetLastError(); ok( !ret, "WinHttpCrackUrl succeeded\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u, expected ERROR_INVALID_PARAMETER\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "got %lu, expected ERROR_INVALID_PARAMETER\n", error ); /* decoding with buffers */ uc.lpszScheme = scheme; @@ -613,11 +613,11 @@ static void WinHttpCrackUrl_test( void ) path[0] = 0; ret = WinHttpCrackUrl( url7, 0, ICU_DECODE, &uc ); - ok( ret, "WinHttpCrackUrl failed %u\n", GetLastError() ); + ok( ret, "WinHttpCrackUrl failed %lu\n", GetLastError() ); ok( !memcmp( uc.lpszUrlPath + 11, escape, 21 * sizeof(WCHAR) ), "unexpected path\n" ); - ok( uc.dwUrlPathLength == 32, "unexpected path length %u\n", uc.dwUrlPathLength ); + ok( uc.dwUrlPathLength == 32, "unexpected path length %lu\n", uc.dwUrlPathLength ); ok( !memcmp( uc.lpszExtraInfo, escape + 21, 12 * sizeof(WCHAR) ), "unexpected extra info\n" ); - ok( uc.dwExtraInfoLength == 12, "unexpected extra info length %u\n", uc.dwExtraInfoLength ); + ok( uc.dwExtraInfoLength == 12, "unexpected extra info length %lu\n", uc.dwExtraInfoLength ); /* Urls with specified port numbers */ /* decoding with buffers */ @@ -637,25 +637,25 @@ static void WinHttpCrackUrl_test( void ) path[0] = 0; ret = WinHttpCrackUrl( url6, 0, 0, &uc ); - ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); + ok( ret, "WinHttpCrackUrl failed le = %lu\n", GetLastError() ); ok( !memcmp( uc.lpszHostName, winehq, sizeof(winehq) ), "unexpected host name: %s\n", wine_dbgstr_w(uc.lpszHostName) ); - ok( uc.dwHostNameLength == 14, "unexpected host name length: %d\n", uc.dwHostNameLength ); + ok( uc.dwHostNameLength == 14, "unexpected host name length: %lu\n", uc.dwHostNameLength ); ok( uc.nPort == 42, "unexpected port: %u\n", uc.nPort ); /* decoding without buffers */ reset_url_components( &uc ); ret = WinHttpCrackUrl( url8, 0, 0, &uc ); - ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); + ok( ret, "WinHttpCrackUrl failed le = %lu\n", GetLastError() ); ok( uc.nPort == 0, "unexpected port: %u\n", uc.nPort ); reset_url_components( &uc ); ret = WinHttpCrackUrl( url9, 0, 0, &uc ); - ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); + ok( ret, "WinHttpCrackUrl failed le = %lu\n", GetLastError() ); ok( uc.nPort == 80, "unexpected port: %u\n", uc.nPort ); reset_url_components( &uc ); ret = WinHttpCrackUrl( url10, 0, 0, &uc ); - ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); + ok( ret, "WinHttpCrackUrl failed le = %lu\n", GetLastError() ); ok( uc.nPort == 443, "unexpected port: %u\n", uc.nPort ); reset_url_components( &uc ); @@ -663,18 +663,18 @@ static void WinHttpCrackUrl_test( void ) ret = WinHttpCrackUrl( empty, 0, 0, &uc ); error = GetLastError(); ok( !ret, "WinHttpCrackUrl succeeded\n" ); - ok( error == ERROR_WINHTTP_UNRECOGNIZED_SCHEME, "got %u, expected ERROR_WINHTTP_UNRECOGNIZED_SCHEME\n", error ); + ok( error == ERROR_WINHTTP_UNRECOGNIZED_SCHEME, "got %lu, expected ERROR_WINHTTP_UNRECOGNIZED_SCHEME\n", error ); reset_url_components( &uc ); SetLastError( 0xdeadbeef ); ret = WinHttpCrackUrl( http, 0, 0, &uc ); error = GetLastError(); ok( !ret, "WinHttpCrackUrl succeeded\n" ); - ok( error == ERROR_WINHTTP_UNRECOGNIZED_SCHEME, "got %u, expected ERROR_WINHTTP_UNRECOGNIZED_SCHEME\n", error ); + ok( error == ERROR_WINHTTP_UNRECOGNIZED_SCHEME, "got %lu, expected ERROR_WINHTTP_UNRECOGNIZED_SCHEME\n", error ); reset_url_components( &uc ); ret = WinHttpCrackUrl( url11, 0, 0, &uc); - ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); + ok( ret, "WinHttpCrackUrl failed le = %lu\n", GetLastError() ); ok( uc.nScheme == INTERNET_SCHEME_HTTP, "unexpected scheme\n" ); ok( uc.lpszScheme == url11,"unexpected scheme\n" ); ok( uc.dwSchemeLength == 4, "unexpected scheme length\n" ); @@ -702,7 +702,7 @@ static void WinHttpCrackUrl_test( void ) uc.dwExtraInfoLength = 0; uc.nPort = 0; ret = WinHttpCrackUrl( url12, 0, ICU_DECODE, &uc ); - ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); + ok( ret, "WinHttpCrackUrl failed le = %lu\n", GetLastError() ); uc.lpszScheme = scheme; uc.dwSchemeLength = 20; @@ -718,10 +718,10 @@ static void WinHttpCrackUrl_test( void ) uc.dwExtraInfoLength = 0; uc.nPort = 0; ret = WinHttpCrackUrl( url13, 0, ICU_ESCAPE|ICU_DECODE, &uc ); - ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); + ok( ret, "WinHttpCrackUrl failed le = %lu\n", GetLastError() ); ok( !lstrcmpW( uc.lpszHostName, L"winehq.o g" ), "unexpected host name\n" ); ok( !lstrcmpW( uc.lpszUrlPath, L"/path%20with%20spaces" ), "unexpected path\n" ); - ok( uc.dwUrlPathLength == lstrlenW(L"/path%20with%20spaces"), "got %u\n", uc.dwUrlPathLength ); + ok( uc.dwUrlPathLength == lstrlenW(L"/path%20with%20spaces"), "got %lu\n", uc.dwUrlPathLength ); uc.dwStructSize = sizeof(uc); uc.lpszScheme = NULL; @@ -739,21 +739,21 @@ static void WinHttpCrackUrl_test( void ) uc.lpszExtraInfo = NULL; uc.dwExtraInfoLength = ~0u; ret = WinHttpCrackUrl( url14, 0, 0, &uc ); - ok( ret, "WinHttpCrackUrl failed le=%u\n", GetLastError() ); + ok( ret, "WinHttpCrackUrl failed le = %lu\n", GetLastError() ); ok( !uc.lpszScheme, "unexpected scheme %s\n", wine_dbgstr_w(uc.lpszScheme) ); - ok( !uc.dwSchemeLength, "unexpected length %u\n", uc.dwSchemeLength ); + ok( !uc.dwSchemeLength, "unexpected length %lu\n", uc.dwSchemeLength ); ok( uc.nScheme == INTERNET_SCHEME_HTTP, "unexpected scheme %u\n", uc.nScheme ); ok( !lstrcmpW( uc.lpszHostName, url14 + 7 ), "unexpected hostname %s\n", wine_dbgstr_w(uc.lpszHostName) ); - ok( uc.dwHostNameLength == 14, "unexpected length %u\n", uc.dwHostNameLength ); + ok( uc.dwHostNameLength == 14, "unexpected length %lu\n", uc.dwHostNameLength ); ok( uc.nPort == 80, "unexpected port %u\n", uc.nPort ); ok( !uc.lpszUserName, "unexpected username\n" ); - ok( !uc.dwUserNameLength, "unexpected length %u\n", uc.dwUserNameLength ); + ok( !uc.dwUserNameLength, "unexpected length %lu\n", uc.dwUserNameLength ); ok( !uc.lpszPassword, "unexpected password\n" ); - ok( !uc.dwPasswordLength, "unexpected length %u\n", uc.dwPasswordLength ); + ok( !uc.dwPasswordLength, "unexpected length %lu\n", uc.dwPasswordLength ); ok( !lstrcmpW( uc.lpszUrlPath, url14 + 21 ), "unexpected path %s\n", wine_dbgstr_w(uc.lpszUrlPath) ); - ok( uc.dwUrlPathLength == 5, "unexpected length %u\n", uc.dwUrlPathLength ); + ok( uc.dwUrlPathLength == 5, "unexpected length %lu\n", uc.dwUrlPathLength ); ok( !uc.lpszExtraInfo[0], "unexpected extra info %s\n", wine_dbgstr_w(uc.lpszExtraInfo) ); - ok( uc.dwExtraInfoLength == 0, "unexpected length %u\n", uc.dwExtraInfoLength ); + ok( uc.dwExtraInfoLength == 0, "unexpected length %lu\n", uc.dwExtraInfoLength ); uc.dwStructSize = sizeof(uc); uc.lpszScheme = scheme; @@ -774,39 +774,39 @@ static void WinHttpCrackUrl_test( void ) ret = WinHttpCrackUrl( url14, 0, 0, &uc ); error = GetLastError(); ok( !ret, "WinHttpCrackUrl succeeded\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "got %lu\n", error ); ok( !lstrcmpW( uc.lpszScheme, http ), "unexpected scheme %s\n", wine_dbgstr_w(uc.lpszScheme) ); - ok( !uc.dwSchemeLength, "unexpected length %u\n", uc.dwSchemeLength ); + ok( !uc.dwSchemeLength, "unexpected length %lu\n", uc.dwSchemeLength ); ok( uc.nScheme == 0, "unexpected scheme %u\n", uc.nScheme ); ok( !uc.lpszHostName, "unexpected hostname %s\n", wine_dbgstr_w(uc.lpszHostName) ); - ok( uc.dwHostNameLength == 0, "unexpected length %u\n", uc.dwHostNameLength ); + ok( uc.dwHostNameLength == 0, "unexpected length %lu\n", uc.dwHostNameLength ); ok( uc.nPort == 0, "unexpected port %u\n", uc.nPort ); ok( !uc.lpszUserName, "unexpected username\n" ); - ok( uc.dwUserNameLength == ~0u, "unexpected length %u\n", uc.dwUserNameLength ); + ok( uc.dwUserNameLength == ~0u, "unexpected length %lu\n", uc.dwUserNameLength ); ok( !uc.lpszPassword, "unexpected password\n" ); - ok( uc.dwPasswordLength == ~0u, "unexpected length %u\n", uc.dwPasswordLength ); + ok( uc.dwPasswordLength == ~0u, "unexpected length %lu\n", uc.dwPasswordLength ); ok( !uc.lpszUrlPath, "unexpected path %s\n", wine_dbgstr_w(uc.lpszUrlPath) ); - ok( uc.dwUrlPathLength == 0, "unexpected length %u\n", uc.dwUrlPathLength ); + ok( uc.dwUrlPathLength == 0, "unexpected length %lu\n", uc.dwUrlPathLength ); ok( !uc.lpszExtraInfo, "unexpected extra info %s\n", wine_dbgstr_w(uc.lpszExtraInfo) ); - ok( uc.dwExtraInfoLength == 0, "unexpected length %u\n", uc.dwExtraInfoLength ); + ok( uc.dwExtraInfoLength == 0, "unexpected length %lu\n", uc.dwExtraInfoLength ); reset_url_components( &uc ); SetLastError( 0xdeadbeef ); ret = WinHttpCrackUrl( url15, 0, 0, &uc ); error = GetLastError(); ok( !ret, "WinHttpCrackUrl succeeded\n" ); - ok( error == ERROR_WINHTTP_INVALID_URL, "got %u\n", error ); + ok( error == ERROR_WINHTTP_INVALID_URL, "got %lu\n", error ); reset_url_components( &uc ); uc.nPort = 1; ret = WinHttpCrackUrl( url16, 0, 0, &uc ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); ok( !uc.nPort, "got %u\n", uc.nPort ); reset_url_components( &uc ); uc.nPort = 1; ret = WinHttpCrackUrl( url17, 0, 0, &uc ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); todo_wine ok( uc.nPort == 80, "got %u\n", uc.nPort ); memset( &uc, 0, sizeof(uc) ); @@ -818,9 +818,9 @@ static void WinHttpCrackUrl_test( void ) uc.lpszUrlPath = path; uc.dwUrlPathLength = ARRAY_SIZE(path); ret = WinHttpCrackUrl( url21, 0, 0, &uc ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); ok( !lstrcmpW( uc.lpszUrlPath, url21 + 37 ), "unexpected path %s\n", wine_dbgstr_w(uc.lpszUrlPath) ); - ok( uc.dwUrlPathLength == 50, "unexpected length %u\n", uc.dwUrlPathLength ); + ok( uc.dwUrlPathLength == 50, "unexpected length %lu\n", uc.dwUrlPathLength ); } START_TEST(url) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 21af2761323..354c85c6d28 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -50,8 +50,8 @@ static BOOL proxy_active(void) SetLastError(0xdeadbeef); if (WinHttpGetDefaultProxyConfiguration(&proxy_info)) { - ok(GetLastError() == ERROR_SUCCESS || broken(GetLastError() == 0xdeadbeef) /* < win7 */, - "got %u\n", GetLastError()); + ok( GetLastError() == ERROR_SUCCESS || broken(GetLastError() == 0xdeadbeef) /* < win7 */, + "got %lu\n", GetLastError() ); active = (proxy_info.lpszProxy != NULL); if (active) GlobalFree(proxy_info.lpszProxy); @@ -72,92 +72,89 @@ static void test_WinHttpQueryOption(void) SetLastError(0xdeadbeef); session = WinHttpOpen(L"winetest", 0, 0, 0, 0); - ok(session != NULL, "WinHttpOpen failed to open session, error %u\n", GetLastError()); + ok( session != NULL, "WinHttpOpen failed to open session, error %lu\n", GetLastError() ); SetLastError(0xdeadbeef); ret = WinHttpQueryOption(session, WINHTTP_OPTION_REDIRECT_POLICY, NULL, NULL); - ok(!ret, "should fail to set redirect policy %u\n", GetLastError()); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + ok( !ret, "should fail to set redirect policy %lu\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError() ); size = 0xdeadbeef; SetLastError(0xdeadbeef); ret = WinHttpQueryOption(session, WINHTTP_OPTION_REDIRECT_POLICY, NULL, &size); ok(!ret, "should fail to query option\n"); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); - ok(size == 4, "expected 4, got %u\n", size); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %lu\n", GetLastError() ); + ok( size == 4, "expected 4, got %lu\n", size ); feature = 0xdeadbeef; size = sizeof(feature) - 1; SetLastError(0xdeadbeef); ret = WinHttpQueryOption(session, WINHTTP_OPTION_REDIRECT_POLICY, &feature, &size); ok(!ret, "should fail to query option\n"); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); - ok(size == 4, "expected 4, got %u\n", size); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %lu\n", GetLastError() ); + ok( size == 4, "expected 4, got %lu\n", size ); feature = 0xdeadbeef; size = sizeof(feature) + 1; SetLastError(0xdeadbeef); ret = WinHttpQueryOption(session, WINHTTP_OPTION_REDIRECT_POLICY, &feature, &size); - ok(ret, "failed to query option %u\n", GetLastError()); + ok(ret, "failed to query option %lu\n", GetLastError()); ok(GetLastError() == ERROR_SUCCESS || broken(GetLastError() == 0xdeadbeef) /* < win7 */, - "got %u\n", GetLastError()); - ok(size == sizeof(feature), "WinHttpQueryOption should set the size: %u\n", size); + "got %lu\n", GetLastError()); + ok(size == sizeof(feature), "WinHttpQueryOption should set the size: %lu\n", size); ok(feature == WINHTTP_OPTION_REDIRECT_POLICY_DISALLOW_HTTPS_TO_HTTP, - "expected WINHTTP_OPTION_REDIRECT_POLICY_DISALLOW_HTTPS_TO_HTTP, got %#x\n", feature); + "expected WINHTTP_OPTION_REDIRECT_POLICY_DISALLOW_HTTPS_TO_HTTP, got %#lx\n", feature); SetLastError(0xdeadbeef); ret = WinHttpSetOption(session, WINHTTP_OPTION_REDIRECT_POLICY, NULL, sizeof(feature)); - ok(!ret, "should fail to set redirect policy %u\n", GetLastError()); + ok(!ret, "should fail to set redirect policy %lu\n", GetLastError()); ok(GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); feature = WINHTTP_OPTION_REDIRECT_POLICY_ALWAYS; SetLastError(0xdeadbeef); ret = WinHttpSetOption(session, WINHTTP_OPTION_REDIRECT_POLICY, &feature, sizeof(feature) - 1); - ok(!ret, "should fail to set redirect policy %u\n", GetLastError()); + ok(!ret, "should fail to set redirect policy %lu\n", GetLastError()); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); + "expected ERROR_INSUFFICIENT_BUFFER, got %lu\n", GetLastError()); feature = WINHTTP_OPTION_REDIRECT_POLICY_ALWAYS; SetLastError(0xdeadbeef); ret = WinHttpSetOption(session, WINHTTP_OPTION_REDIRECT_POLICY, &feature, sizeof(feature) + 1); - ok(!ret, "should fail to set redirect policy %u\n", GetLastError()); + ok(!ret, "should fail to set redirect policy %lu\n", GetLastError()); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); + "expected ERROR_INSUFFICIENT_BUFFER, got %lu\n", GetLastError()); feature = WINHTTP_OPTION_REDIRECT_POLICY_ALWAYS; SetLastError(0xdeadbeef); ret = WinHttpSetOption(session, WINHTTP_OPTION_REDIRECT_POLICY, &feature, sizeof(feature)); - ok(ret, "failed to set redirect policy %u\n", GetLastError()); + ok(ret, "failed to set redirect policy %lu\n", GetLastError()); feature = 0xdeadbeef; size = sizeof(feature); SetLastError(0xdeadbeef); ret = WinHttpQueryOption(session, WINHTTP_OPTION_REDIRECT_POLICY, &feature, &size); - ok(ret, "failed to query option %u\n", GetLastError()); + ok(ret, "failed to query option %lu\n", GetLastError()); ok(feature == WINHTTP_OPTION_REDIRECT_POLICY_ALWAYS, - "expected WINHTTP_OPTION_REDIRECT_POLICY_ALWAYS, got %#x\n", feature); + "expected WINHTTP_OPTION_REDIRECT_POLICY_ALWAYS, got %#lx\n", feature); feature = WINHTTP_DISABLE_COOKIES; SetLastError(0xdeadbeef); ret = WinHttpSetOption(session, WINHTTP_OPTION_DISABLE_FEATURE, &feature, sizeof(feature)); ok(!ret, "should fail to set disable feature for a session\n"); ok(GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, - "expected ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, got %u\n", GetLastError()); + "expected ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); connection = WinHttpConnect(session, L"test.winehq.org", INTERNET_DEFAULT_HTTP_PORT, 0); - ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %u\n", GetLastError()); + ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %lu\n", GetLastError()); feature = WINHTTP_DISABLE_COOKIES; SetLastError(0xdeadbeef); ret = WinHttpSetOption(connection, WINHTTP_OPTION_DISABLE_FEATURE, &feature, sizeof(feature)); ok(!ret, "should fail to set disable feature for a connection\n"); ok(GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, - "expected ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, got %u\n", GetLastError()); + "expected ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); request = WinHttpOpenRequest(connection, NULL, NULL, NULL, WINHTTP_NO_REFERER, @@ -174,80 +171,80 @@ static void test_WinHttpQueryOption(void) ret = WinHttpQueryOption(request, WINHTTP_OPTION_DISABLE_FEATURE, &feature, &size); ok(!ret, "should fail to query disable feature for a request\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); feature = 0; size = sizeof(feature); SetLastError(0xdeadbeef); ret = WinHttpSetOption(request, WINHTTP_OPTION_DISABLE_FEATURE, &feature, sizeof(feature)); - ok(ret, "failed to set feature %u\n", GetLastError()); + ok(ret, "failed to set feature %lu\n", GetLastError()); feature = 0xffffffff; size = sizeof(feature); SetLastError(0xdeadbeef); ret = WinHttpSetOption(request, WINHTTP_OPTION_DISABLE_FEATURE, &feature, sizeof(feature)); - ok(ret, "failed to set feature %u\n", GetLastError()); + ok(ret, "failed to set feature %lu\n", GetLastError()); feature = WINHTTP_DISABLE_COOKIES; size = sizeof(feature); SetLastError(0xdeadbeef); ret = WinHttpSetOption(request, WINHTTP_OPTION_DISABLE_FEATURE, &feature, sizeof(feature)); - ok(ret, "failed to set feature %u\n", GetLastError()); + ok(ret, "failed to set feature %lu\n", GetLastError()); size = 0; SetLastError(0xdeadbeef); ret = WinHttpQueryOption(request, WINHTTP_OPTION_DISABLE_FEATURE, NULL, &size); ok(!ret, "should fail to query disable feature for a request\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); feature = 0xdeadbeef; size = sizeof(feature); SetLastError(0xdeadbeef); ret = WinHttpQueryOption(request, WINHTTP_OPTION_ENABLE_FEATURE, &feature, &size); ok(!ret, "should fail to query enabled features for a request\n"); - ok(feature == 0xdeadbeef, "expect feature 0xdeadbeef, got %u\n", feature); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + ok(feature == 0xdeadbeef, "expect feature 0xdeadbeef, got %#lx\n", feature); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); feature = WINHTTP_ENABLE_SSL_REVOCATION; SetLastError(0xdeadbeef); ret = WinHttpSetOption(request, WINHTTP_OPTION_ENABLE_FEATURE, 0, sizeof(feature)); ok(!ret, "should fail to enable WINHTTP_ENABLE_SSL_REVOCATION with invalid parameters\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetOption(request, WINHTTP_OPTION_ENABLE_FEATURE, &feature, 0); ok(!ret, "should fail to enable WINHTTP_ENABLE_SSL_REVOCATION with invalid parameters\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetOption(request, WINHTTP_OPTION_ENABLE_FEATURE, &feature, sizeof(feature)); ok(ret, "failed to set feature\n"); ok(GetLastError() == NO_ERROR || broken(GetLastError() == 0xdeadbeef), /* Doesn't set error code on Vista or older */ - "expected NO_ERROR, got %u\n", GetLastError()); + "expected NO_ERROR, got %lu\n", GetLastError()); feature = 0xdeadbeef; SetLastError(0xdeadbeef); ret = WinHttpSetOption(request, WINHTTP_OPTION_ENABLE_FEATURE, &feature, sizeof(feature)); ok(!ret, "should fail to enable WINHTTP_ENABLE_SSL_REVOCATION with invalid parameters\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); feature = 6; size = sizeof(feature); ret = WinHttpSetOption(request, WINHTTP_OPTION_CONNECT_RETRIES, &feature, sizeof(feature)); - ok(ret, "failed to set WINHTTP_OPTION_CONNECT_RETRIES %u\n", GetLastError()); + ok(ret, "failed to set WINHTTP_OPTION_CONNECT_RETRIES %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpCloseHandle(request); - ok(ret, "WinHttpCloseHandle failed on closing request: %u\n", GetLastError()); + ok(ret, "WinHttpCloseHandle failed on closing request: %lu\n", GetLastError()); done: SetLastError(0xdeadbeef); ret = WinHttpCloseHandle(connection); - ok(ret, "WinHttpCloseHandle failed on closing connection: %u\n", GetLastError()); + ok(ret, "WinHttpCloseHandle failed on closing connection: %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpCloseHandle(session); - ok(ret, "WinHttpCloseHandle failed on closing session: %u\n", GetLastError()); + ok(ret, "WinHttpCloseHandle failed on closing session: %lu\n", GetLastError()); } static void test_WinHttpOpenRequest (void) @@ -261,21 +258,21 @@ static void test_WinHttpOpenRequest (void) WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0); err = GetLastError(); ok(session != NULL, "WinHttpOpen failed to open session.\n"); - ok(err == ERROR_SUCCESS, "got %u\n", err); + ok(err == ERROR_SUCCESS, "got %lu\n", err); /* Test with a bad server name */ SetLastError(0xdeadbeef); connection = WinHttpConnect(session, NULL, INTERNET_DEFAULT_HTTP_PORT, 0); err = GetLastError(); ok (connection == NULL, "WinHttpConnect succeeded in opening connection to NULL server argument.\n"); - ok(err == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u.\n", err); + ok(err == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %lu.\n", err); /* Test with a valid server name */ SetLastError(0xdeadbeef); connection = WinHttpConnect (session, L"test.winehq.org", INTERNET_DEFAULT_HTTP_PORT, 0); err = GetLastError(); - ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %u.\n", err); - ok(err == ERROR_SUCCESS || broken(err == WSAEINVAL) /* < win7 */, "got %u\n", err); + ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %lu.\n", err); + ok(err == ERROR_SUCCESS || broken(err == WSAEINVAL) /* < win7 */, "got %lu\n", err); SetLastError(0xdeadbeef); request = WinHttpOpenRequest(connection, NULL, NULL, NULL, WINHTTP_NO_REFERER, @@ -286,8 +283,8 @@ static void test_WinHttpOpenRequest (void) skip("Network unreachable, skipping.\n"); goto done; } - ok(request != NULL, "WinHttpOpenrequest failed to open a request, error: %u.\n", err); - ok(err == ERROR_SUCCESS, "got %u\n", err); + ok(request != NULL, "WinHttpOpenrequest failed to open a request, error: %lu.\n", err); + ok(err == ERROR_SUCCESS, "got %lu\n", err); SetLastError(0xdeadbeef); ret = WinHttpSendRequest(request, WINHTTP_NO_ADDITIONAL_HEADERS, 0, NULL, 0, 0, 0); @@ -297,14 +294,14 @@ static void test_WinHttpOpenRequest (void) skip("Connection failed, skipping.\n"); goto done; } - ok(ret, "WinHttpSendRequest failed: %u\n", err); - ok(err == ERROR_SUCCESS, "got %u\n", err); + ok(ret, "WinHttpSendRequest failed: %lu\n", err); + ok(err == ERROR_SUCCESS, "got %lu\n", err); SetLastError(0xdeadbeef); ret = WinHttpCloseHandle(request); err = GetLastError(); - ok(ret, "WinHttpCloseHandle failed on closing request, got %u.\n", err); - ok(err == ERROR_SUCCESS, "got %u\n", err); + ok(ret, "WinHttpCloseHandle failed on closing request, got %lu.\n", err); + ok(err == ERROR_SUCCESS, "got %lu\n", err); done: ret = WinHttpCloseHandle(connection); @@ -321,13 +318,13 @@ static void test_empty_headers_param(void) BOOL ret; ses = WinHttpOpen(L"winetest", 0, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); con = WinHttpConnect(ses, L"test.winehq.org", 80, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); ret = WinHttpSendRequest(req, L"", 0, NULL, 0, 0, 0); err = GetLastError(); @@ -336,7 +333,7 @@ static void test_empty_headers_param(void) skip("connection failed, skipping\n"); goto done; } - ok(ret, "failed to send request %u\n", GetLastError()); + ok(ret, "failed to send request %lu\n", GetLastError()); done: WinHttpCloseHandle(req); @@ -366,7 +363,7 @@ static void test_WinHttpSendRequest (void) ok(session != NULL, "WinHttpOpen failed to open session.\n"); connection = WinHttpConnect (session, L"test.winehq.org", INTERNET_DEFAULT_HTTP_PORT, 0); - ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %u.\n", GetLastError()); + ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %lu\n", GetLastError()); request = WinHttpOpenRequest(connection, L"POST", L"tests/post.php", NULL, WINHTTP_NO_REFERER, WINHTTP_DEFAULT_ACCEPT_TYPES, WINHTTP_FLAG_BYPASS_PROXY_CACHE); @@ -375,25 +372,25 @@ static void test_WinHttpSendRequest (void) skip("Network unreachable, skipping.\n"); goto done; } - ok(request != NULL, "WinHttpOpenrequest failed to open a request, error: %u.\n", GetLastError()); + ok(request != NULL, "WinHttpOpenrequest failed to open a request, error: %lu\n", GetLastError()); if (!request) goto done; method[0] = 0; len = sizeof(method); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_REQUEST_METHOD, NULL, method, &len, NULL); - ok(ret, "got %u\n", GetLastError()); - ok(len == lstrlenW(L"POST") * sizeof(WCHAR), "got %u\n", len); + ok(ret, "got %lu\n", GetLastError()); + ok(len == lstrlenW(L"POST") * sizeof(WCHAR), "got %lu\n", len); ok(!lstrcmpW(method, L"POST"), "got %s\n", wine_dbgstr_w(method)); context = 0xdeadbeef; ret = WinHttpSetOption(request, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(context)); - ok(ret, "WinHttpSetOption failed: %u\n", GetLastError()); + ok(ret, "WinHttpSetOption failed: %lu\n", GetLastError()); /* writing more data than promised by the content-length header causes an error when the connection is reused, so disable keep-alive */ disable = WINHTTP_DISABLE_KEEP_ALIVE; ret = WinHttpSetOption(request, WINHTTP_OPTION_DISABLE_FEATURE, &disable, sizeof(disable)); - ok(ret, "WinHttpSetOption failed: %u\n", GetLastError()); + ok(ret, "WinHttpSetOption failed: %lu\n", GetLastError()); context++; ret = WinHttpSendRequest(request, content_type, header_len, post_data, optional_len, total_len, context); @@ -403,13 +400,13 @@ static void test_WinHttpSendRequest (void) skip("connection failed, skipping\n"); goto done; } - ok(ret == TRUE, "WinHttpSendRequest failed: %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpSendRequest failed: %lu\n", GetLastError()); context = 0; size = sizeof(context); ret = WinHttpQueryOption(request, WINHTTP_OPTION_CONTEXT_VALUE, &context, &size); - ok(ret, "WinHttpQueryOption failed: %u\n", GetLastError()); - ok(context == 0xdeadbef0, "expected 0xdeadbef0, got %lx\n", context); + ok(ret, "WinHttpQueryOption failed: %lu\n", GetLastError()); + ok(context == 0xdeadbef0, "expected 0xdeadbef0, got %#Ix\n", context); for (i = 3; post_data[i]; i++) { @@ -418,12 +415,12 @@ static void test_WinHttpSendRequest (void) ret = WinHttpWriteData(request, &post_data[i], 1, &bytes_rw); if (ret) { - ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %u.\n", GetLastError()); - ok(bytes_rw == 1, "WinHttpWriteData failed, wrote %u bytes instead of 1 byte.\n", bytes_rw); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %lu\n", GetLastError()); + ok(bytes_rw == 1, "WinHttpWriteData failed, wrote %lu bytes instead of 1 byte\n", bytes_rw); } else /* Since we already passed all optional data in WinHttpSendRequest Win7 fails our WinHttpWriteData call */ { - ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER got %u.\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER got %lu\n", GetLastError()); ok(bytes_rw == -1, "Expected bytes_rw to remain unchanged.\n"); } } @@ -431,22 +428,22 @@ static void test_WinHttpSendRequest (void) SetLastError(0xdeadbeef); ret = WinHttpReceiveResponse(request, NULL); ok(GetLastError() == ERROR_SUCCESS || broken(GetLastError() == ERROR_NO_TOKEN) /* < win7 */, - "Expected ERROR_SUCCESS got %u.\n", GetLastError()); - ok(ret == TRUE, "WinHttpReceiveResponse failed: %u.\n", GetLastError()); + "Expected ERROR_SUCCESS got %lu\n", GetLastError()); + ok(ret == TRUE, "WinHttpReceiveResponse failed: %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_ORIG_URI, NULL, NULL, &len, NULL); - ok(!ret && GetLastError() == ERROR_WINHTTP_HEADER_NOT_FOUND, "got %u\n", GetLastError()); + ok(!ret && GetLastError() == ERROR_WINHTTP_HEADER_NOT_FOUND, "got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_MAX + 1, NULL, NULL, &len, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %lu\n", GetLastError()); bytes_rw = -1; ret = WinHttpReadData(request, buffer, sizeof(buffer) - 1, &bytes_rw); - ok(ret == TRUE, "WinHttpReadData failed: %u.\n", GetLastError()); + ok(ret == TRUE, "WinHttpReadData failed: %lu\n", GetLastError()); - ok(bytes_rw == sizeof(test_post) - 1, "Read %u bytes\n", bytes_rw); + ok(bytes_rw == sizeof(test_post) - 1, "Read %lu bytes\n", bytes_rw); ok(!memcmp(buffer, test_post, sizeof(test_post) - 1), "Data read did not match.\n"); done: @@ -469,19 +466,19 @@ static void test_WinHttpTimeFromSystemTime(void) ret = WinHttpTimeFromSystemTime(&time, NULL); err = GetLastError(); ok(!ret, "WinHttpTimeFromSystemTime succeeded\n"); - ok(err == ERROR_INVALID_PARAMETER, "got %u\n", err); + ok(err == ERROR_INVALID_PARAMETER, "got %lu\n", err); SetLastError(0xdeadbeef); ret = WinHttpTimeFromSystemTime(NULL, time_string); err = GetLastError(); ok(!ret, "WinHttpTimeFromSystemTime succeeded\n"); - ok(err == ERROR_INVALID_PARAMETER, "got %u\n", err); + ok(err == ERROR_INVALID_PARAMETER, "got %lu\n", err); SetLastError(0xdeadbeef); ret = WinHttpTimeFromSystemTime(&time, time_string); err = GetLastError(); - ok(ret, "WinHttpTimeFromSystemTime failed: %u\n", err); - ok(err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %u\n", err); + ok(ret, "WinHttpTimeFromSystemTime failed: %lu\n", err); + ok(err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %lu\n", err); ok(!memcmp(time_string, L"Mon, 28 Jul 2008 10:05:52 GMT", sizeof(L"Mon, 28 Jul 2008 10:05:52 GMT")), "Time string returned did not match expected time string.\n"); } @@ -497,27 +494,27 @@ static void test_WinHttpTimeToSystemTime(void) ret = WinHttpTimeToSystemTime(L"Mon, 28 Jul 2008 10:05:52 GMT\n", NULL); err = GetLastError(); ok(!ret, "WinHttpTimeToSystemTime succeeded\n"); - ok(err == ERROR_INVALID_PARAMETER, "got %u\n", err); + ok(err == ERROR_INVALID_PARAMETER, "got %lu\n", err); SetLastError(0xdeadbeef); ret = WinHttpTimeToSystemTime(NULL, &time); err = GetLastError(); ok(!ret, "WinHttpTimeToSystemTime succeeded\n"); - ok(err == ERROR_INVALID_PARAMETER, "got %u\n", err); + ok(err == ERROR_INVALID_PARAMETER, "got %lu\n", err); SetLastError(0xdeadbeef); ret = WinHttpTimeToSystemTime(L"Mon, 28 Jul 2008 10:05:52 GMT\n", &time); err = GetLastError(); - ok(ret, "WinHttpTimeToSystemTime failed: %u\n", err); - ok(err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %u\n", err); + ok(ret, "WinHttpTimeToSystemTime failed: %lu\n", err); + ok(err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %lu\n", err); ok(memcmp(&time, &expected_time, sizeof(SYSTEMTIME)) == 0, "Returned SYSTEMTIME structure did not match expected SYSTEMTIME structure.\n"); SetLastError(0xdeadbeef); ret = WinHttpTimeToSystemTime(L" mon 28 jul 2008 10 05 52\n", &time); err = GetLastError(); - ok(ret, "WinHttpTimeToSystemTime failed: %u\n", err); - ok(err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %u\n", err); + ok(ret, "WinHttpTimeToSystemTime failed: %lu\n", err); + ok(err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %lu\n", err); ok(memcmp(&time, &expected_time, sizeof(SYSTEMTIME)) == 0, "Returned SYSTEMTIME structure did not match expected SYSTEMTIME structure.\n"); } @@ -564,7 +561,7 @@ static void test_WinHttpAddHeaders(void) ok(session != NULL, "WinHttpOpen failed to open session.\n"); connection = WinHttpConnect (session, L"test.winehq.org", INTERNET_DEFAULT_HTTP_PORT, 0); - ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %u.\n", GetLastError()); + ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %lu\n", GetLastError()); request = WinHttpOpenRequest(connection, L"POST", L"/posttest.php", NULL, WINHTTP_NO_REFERER, WINHTTP_DEFAULT_ACCEPT_TYPES, 0); @@ -573,7 +570,7 @@ static void test_WinHttpAddHeaders(void) skip("Network unreachable, skipping.\n"); goto done; } - ok(request != NULL, "WinHttpOpenRequest failed to open a request, error: %u.\n", GetLastError()); + ok(request != NULL, "WinHttpOpenRequest failed to open a request, error: %lu\n", GetLastError()); index = 0; len = sizeof(buffer); @@ -583,18 +580,18 @@ static void test_WinHttpAddHeaders(void) SetLastError(0xdeadbeef); ret = WinHttpAddRequestHeaders(request, test_headers[0], -1L, WINHTTP_ADDREQ_FLAG_ADD); err = GetLastError(); - ok(ret, "WinHttpAddRequestHeaders failed to add new header, got %d with error %u.\n", ret, err); - ok(err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %u\n", err); + ok(ret, "WinHttpAddRequestHeaders failed to add new header, got %d with error %lu\n", ret, err); + ok(err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %lu\n", err); index = 0; len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", buffer, &len, &index); - ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); ok(index == 1, "WinHttpQueryHeaders failed: header index not incremented\n"); ok(!memcmp(buffer, test_indices[0], sizeof(test_indices[0])), "WinHttpQueryHeaders failed: incorrect string returned\n"); - ok(len == 5*sizeof(WCHAR), "WinHttpQueryHeaders failed: invalid length returned, expected 5, got %d\n", len); + ok(len == 5 * sizeof(WCHAR), "WinHttpQueryHeaders failed: invalid length returned, expected 5, got %lu\n", len); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", buffer, &len, &index); @@ -612,7 +609,7 @@ static void test_WinHttpAddHeaders(void) ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded with a buffer that's too small.\n"); ok(memcmp(buffer, check_buffer, sizeof(buffer)) == 0, "WinHttpQueryHeaders failed, modified the buffer when it should not have.\n"); - ok(len == 6*sizeof(WCHAR), "WinHttpQueryHeaders returned invalid length, expected 12, got %d\n", len); + ok(len == 6 * sizeof(WCHAR), "WinHttpQueryHeaders returned invalid length, expected 12, got %lu\n", len); /* Try with a NULL buffer */ index = 0; @@ -621,8 +618,8 @@ static void test_WinHttpAddHeaders(void) ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_RAW_HEADERS_CRLF | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", NULL, &len, &index); ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded.\n"); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); - ok(len > 40, "WinHttpQueryHeaders returned invalid length: expected greater than 40, got %d\n", len); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %lu\n", GetLastError()); + ok(len > 40, "WinHttpQueryHeaders returned invalid length: expected greater than 40, got %lu\n", len); ok(index == 0, "WinHttpQueryHeaders incorrectly incremented header index.\n"); /* Try with a NULL buffer and a length that's too small */ @@ -633,8 +630,8 @@ static void test_WinHttpAddHeaders(void) L"Warning", NULL, &len, &index); ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded.\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "WinHttpQueryHeaders set incorrect error: expected ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); - ok(len > 40, "WinHttpQueryHeaders returned invalid length: expected greater than 40, got %d\n", len); + "WinHttpQueryHeaders set incorrect error: expected ERROR_INSUFFICIENT_BUFFER, got %lu\n", GetLastError()); + ok(len > 40, "WinHttpQueryHeaders returned invalid length: expected greater than 40, got %lu\n", len); ok(index == 0, "WinHttpQueryHeaders incorrectly incremented header index.\n"); index = 0; @@ -644,8 +641,8 @@ static void test_WinHttpAddHeaders(void) L"Warning", NULL, &len, &index); ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded.\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "WinHttpQueryHeaders set incorrect error: expected ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); - ok(len > 40, "WinHttpQueryHeaders returned invalid length: expected greater than 40, got %d\n", len); + "WinHttpQueryHeaders set incorrect error: expected ERROR_INSUFFICIENT_BUFFER, got %lu\n", GetLastError()); + ok(len > 40, "WinHttpQueryHeaders returned invalid length: expected greater than 40, got %lu\n", len); ok(index == 0, "WinHttpQueryHeaders failed: index was incremented.\n"); /* valid query */ @@ -672,8 +669,8 @@ static void test_WinHttpAddHeaders(void) L"Warning", NULL, &len, &index); ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded.\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "WinHttpQueryHeaders set incorrect error: expected ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); - ok(len > 40, "WinHttpQueryHeaders returned invalid length: expected greater than 40, got %d\n", len); + "WinHttpQueryHeaders set incorrect error: expected ERROR_INSUFFICIENT_BUFFER, got %lu\n", GetLastError()); + ok(len > 40, "WinHttpQueryHeaders returned invalid length: expected greater than 40, got %lu\n", len); ok(index == 0, "WinHttpQueryHeaders failed: index was incremented.\n"); oldlen = len; @@ -682,7 +679,7 @@ static void test_WinHttpAddHeaders(void) memset(buffer, 0xff, sizeof(buffer)); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_RAW_HEADERS | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", buffer, &len, &index); - ok(ret == TRUE, "WinHttpQueryHeaders failed %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpQueryHeaders failed %lu\n", GetLastError()); ok(len + sizeof(WCHAR) <= oldlen, "resulting length longer than advertized\n"); ok((len < sizeof(buffer) - sizeof(WCHAR)) && !buffer[len / sizeof(WCHAR)] && !buffer[len / sizeof(WCHAR) - 1], "no double NULL terminator\n"); @@ -697,14 +694,14 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", buffer, &len, &index); - ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); ok(index == 1, "WinHttpQueryHeaders failed to increment index.\n"); ok(memcmp(buffer, test_indices[0], sizeof(test_indices[0])) == 0, "WinHttpQueryHeaders returned incorrect string.\n"); len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", buffer, &len, &index); - ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); ok(index == 2, "WinHttpQueryHeaders failed to increment index.\n"); ok(memcmp(buffer, test_indices[1], sizeof(test_indices[1])) == 0, "WinHttpQueryHeaders returned incorrect string.\n"); @@ -715,7 +712,7 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", buffer, &len, &index); - ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); ok(index == 1, "WinHttpQueryHeaders failed to increment index.\n"); reverse = (memcmp(buffer, test_indices[1], sizeof(test_indices[1])) != 0); /* Win7 returns values in reverse order of adding */ ok(!memcmp(buffer, test_indices[reverse ? 2 : 1], sizeof(test_indices[reverse ? 2 : 1])), @@ -724,7 +721,7 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", buffer, &len, &index); - ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); ok(index == 2, "WinHttpQueryHeaders failed to increment index.\n"); ok(!memcmp(buffer, test_indices[reverse ? 1 : 2], sizeof(test_indices[reverse ? 1 : 2])), "WinHttpQueryHeaders returned incorrect string.\n"); @@ -737,7 +734,7 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", buffer, &len, &index); - ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); ok(index == 1, "WinHttpQueryHeaders failed to increment index.\n"); ok(!memcmp(buffer, test_indices[reverse ? 2 : 1], sizeof(test_indices[reverse ? 2 : 1])), "WinHttpQueryHeaders returned incorrect string.\n"); @@ -745,7 +742,7 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", buffer, &len, &index); - ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); ok(index == 2, "WinHttpQueryHeaders failed to increment index.\n"); ok(!memcmp(buffer, test_indices[reverse ? 1 : 2], sizeof(test_indices[reverse ? 1 : 2])), "WinHttpQueryHeaders returned incorrect string.\n"); @@ -763,7 +760,7 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", buffer, &len, &index); - ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); ok(index == 1, "WinHttpQueryHeaders failed to increment index.\n"); ok(!memcmp(buffer, reverse ? L"test3, test4" : L"test2, test4", reverse ? sizeof(L"test3, test4") : sizeof(L"test2, test4")), @@ -772,7 +769,7 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", buffer, &len, &index); - ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); ok(index == 2, "WinHttpQueryHeaders failed to increment index.\n"); ok(!memcmp(buffer, test_indices[reverse ? 1 : 2], sizeof(test_indices[reverse ? 1 : 2])), "WinHttpQueryHeaders returned incorrect string.\n"); @@ -790,7 +787,7 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", buffer, &len, &index); - ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); ok(index == 1, "WinHttpQueryHeaders failed to increment index.\n"); ok(!memcmp(buffer, reverse ? L"test3, test4, test5" : L"test2, test4, test5", @@ -800,7 +797,7 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", buffer, &len, &index); - ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); ok(index == 2, "WinHttpQueryHeaders failed to increment index.\n"); ok(!memcmp(buffer, test_indices[reverse ? 1 : 2], sizeof(test_indices[reverse ? 1 : 2])), "WinHttpQueryHeaders returned incorrect string.\n"); @@ -819,7 +816,7 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", buffer, &len, &index); - ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); ok(index == 1, "WinHttpQueryHeaders failed to increment index.\n"); ok(!memcmp(buffer, reverse ? L"test3, test4, test5; test6" : L"test2, test4, test5; test6", @@ -829,7 +826,7 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", buffer, &len, &index); - ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); ok(index == 2, "WinHttpQueryHeaders failed to increment index.\n"); ok(!memcmp(buffer, test_indices[reverse ? 1 : 2], sizeof(test_indices[reverse ? 1 : 2])), "WinHttpQueryHeaders returned incorrect string.\n"); @@ -847,7 +844,7 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", buffer, &len, &index); - ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); ok(index == 1, "WinHttpQueryHeaders failed to increment index.\n"); ok(!memcmp(buffer, test_indices[reverse ? 3 : 2], sizeof(test_indices[reverse ? 3 : 2])), "WinHttpQueryHeaders returned incorrect string.\n"); @@ -855,7 +852,7 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Warning", buffer, &len, &index); - ok(ret == TRUE, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); ok(index == 2, "WinHttpQueryHeaders failed to increment index.\n"); ok(!memcmp(buffer, test_indices[reverse ? 1 : 3], sizeof(test_indices[reverse ? 1 : 3])), "WinHttpQueryHeaders returned incorrect string.\n"); @@ -876,7 +873,7 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"a", buffer, &len, &index); - ok(ret, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(ret, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); ok(!memcmp(buffer, L"", sizeof(L"")), "unexpected result\n"); ret = WinHttpAddRequestHeaders(request, test_headers[10], ~0u, WINHTTP_ADDREQ_FLAG_ADD); @@ -896,7 +893,7 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"field", buffer, &len, &index); - ok(ret, "WinHttpQueryHeaders failed: %u\n", GetLastError()); + ok(ret, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); ok(!memcmp(buffer, L"value ", sizeof(L"value ")) || !memcmp(buffer, L"value", sizeof(L"value")), "unexpected result\n"); @@ -905,20 +902,20 @@ static void test_WinHttpAddHeaders(void) WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE); err = GetLastError(); ok(!ret, "unexpected success\n"); - ok(err == ERROR_INVALID_PARAMETER, "got %u\n", err); + ok(err == ERROR_INVALID_PARAMETER, "got %lu\n", err); ret = WinHttpAddRequestHeaders(request, L"Range: bytes=0-773\r\n", ~0u, WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE); - ok(ret, "failed to add header: %u\n", GetLastError()); + ok(ret, "failed to add header: %lu\n", GetLastError()); index = 0; len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Range", buffer, &len, &index); - ok(ret, "failed to get range header %u\n", GetLastError()); + ok(ret, "failed to get range header %lu\n", GetLastError()); ok(!memcmp(buffer, L"bytes=0-773", sizeof(L"bytes=0-773")), "incorrect string returned\n"); - ok(len == lstrlenW(L"bytes=0-773") * sizeof(WCHAR), "wrong length %u\n", len); - ok(index == 1, "wrong index %u\n", index); + ok(len == lstrlenW(L"bytes=0-773") * sizeof(WCHAR), "wrong length %lu\n", len); + ok(index == 1, "wrong index %lu\n", index); index = 0; len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, @@ -929,21 +926,21 @@ static void test_WinHttpAddHeaders(void) ret = WinHttpAddRequestHeaders(request, test_headers[14], ~0u, WINHTTP_ADDREQ_FLAG_REPLACE); err = GetLastError(); ok(!ret, "unexpected success\n"); - ok(err == ERROR_WINHTTP_HEADER_NOT_FOUND, "got %u\n", err); + ok(err == ERROR_WINHTTP_HEADER_NOT_FOUND, "got %lu\n", err); ret = WinHttpAddRequestHeaders(request, test_headers[14], ~0u, WINHTTP_ADDREQ_FLAG_ADD); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); index = 0; len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"name", buffer, &len, &index); - ok(ret, "got %u\n", GetLastError()); - ok(index == 1, "wrong index %u\n", index); + ok(ret, "got %lu\n", GetLastError()); + ok(index == 1, "wrong index %lu\n", index); ok(!memcmp(buffer, L"value", sizeof(L"value")), "incorrect string\n"); ret = WinHttpAddRequestHeaders(request, test_headers[15], ~0u, WINHTTP_ADDREQ_FLAG_REPLACE); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); index = 0; len = sizeof(buffer); @@ -952,17 +949,17 @@ static void test_WinHttpAddHeaders(void) L"name", buffer, &len, &index); err = GetLastError(); ok(!ret, "unexpected success\n"); - ok(err == ERROR_WINHTTP_HEADER_NOT_FOUND, "got %u\n", err); + ok(err == ERROR_WINHTTP_HEADER_NOT_FOUND, "got %lu\n", err); ret = WinHttpAddRequestHeaders(request, test_headers[14], -1L, 0); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); index = 0; len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"name", buffer, &len, &index); - ok(ret, "got %u\n", GetLastError()); - ok(index == 1, "wrong index %u\n", index); + ok(ret, "got %lu\n", GetLastError()); + ok(index == 1, "wrong index %lu\n", index); ok(!memcmp(buffer, L"value", sizeof(L"value")), "incorrect string\n"); ret = WinHttpCloseHandle(request); @@ -1006,36 +1003,36 @@ static void test_secure_connection(void) char buffer[32]; ses = WinHttpOpen(L"winetest", 0, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); policy = WINHTTP_OPTION_REDIRECT_POLICY_ALWAYS; ret = WinHttpSetOption(ses, WINHTTP_OPTION_REDIRECT_POLICY, &policy, sizeof(policy)); - ok(ret, "failed to set redirect policy %u\n", GetLastError()); + ok(ret, "failed to set redirect policy %lu\n", GetLastError()); protocols = WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2; ret = WinHttpSetOption(ses, WINHTTP_OPTION_SECURE_PROTOCOLS, &protocols, sizeof(protocols)); err = GetLastError(); - ok(ret || err == ERROR_INVALID_PARAMETER /* < win7 */, "failed to set protocols %u\n", err); + ok(ret || err == ERROR_INVALID_PARAMETER /* < win7 */, "failed to set protocols %lu\n", err); con = WinHttpConnect(ses, L"test.winehq.org", 443, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); SetLastError( 0xdeadbeef ); protocols = WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2; ret = WinHttpSetOption(con, WINHTTP_OPTION_SECURE_PROTOCOLS, &protocols, sizeof(protocols)); err = GetLastError(); ok(!ret, "unexpected success\n"); - ok(err == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, "got %u\n", err); + ok(err == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, "got %lu\n", err); /* try without setting WINHTTP_FLAG_SECURE */ req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); ret = WinHttpSetOption(req, WINHTTP_OPTION_CLIENT_CERT_CONTEXT, WINHTTP_NO_CLIENT_CERT_CONTEXT, 0); err = GetLastError(); ok(!ret, "unexpected success\n"); ok(err == ERROR_WINHTTP_INCORRECT_HANDLE_STATE || broken(err == ERROR_INVALID_PARAMETER) /* winxp */, - "setting client cert context returned %u\n", err); + "setting client cert context returned %lu\n", err); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); err = GetLastError(); @@ -1044,31 +1041,31 @@ static void test_secure_connection(void) skip("Connection failed, skipping.\n"); goto cleanup; } - ok(ret, "failed to send request %u\n", GetLastError()); + ok(ret, "failed to send request %lu\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok(ret, "failed to receive response %lu\n", GetLastError()); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); - ok(ret, "header query failed %u\n", GetLastError()); - ok(status == HTTP_STATUS_BAD_REQUEST, "got %u\n", status); + ok(ret, "header query failed %lu\n", GetLastError()); + ok(status == HTTP_STATUS_BAD_REQUEST, "got %lu\n", status); WinHttpCloseHandle(req); req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, WINHTTP_FLAG_SECURE); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); flags = 0xdeadbeef; size = sizeof(flags); ret = WinHttpQueryOption(req, WINHTTP_OPTION_SECURITY_FLAGS, &flags, &size); - ok(ret, "failed to query security flags %u\n", GetLastError()); - ok(!flags, "got %08x\n", flags); + ok(ret, "failed to query security flags %lu\n", GetLastError()); + ok(!flags, "got %#lx\n", flags); flags = SECURITY_FLAG_IGNORE_CERT_WRONG_USAGE; ret = WinHttpSetOption(req, WINHTTP_OPTION_SECURITY_FLAGS, &flags, sizeof(flags)); - ok(ret, "failed to set security flags %u\n", GetLastError()); + ok(ret, "failed to set security flags %lu\n", GetLastError()); flags = SECURITY_FLAG_SECURE; ret = WinHttpSetOption(req, WINHTTP_OPTION_SECURITY_FLAGS, &flags, sizeof(flags)); @@ -1081,15 +1078,15 @@ static void test_secure_connection(void) flags = SECURITY_FLAG_IGNORE_UNKNOWN_CA | SECURITY_FLAG_IGNORE_CERT_DATE_INVALID | SECURITY_FLAG_IGNORE_CERT_CN_INVALID; ret = WinHttpSetOption(req, WINHTTP_OPTION_SECURITY_FLAGS, &flags, sizeof(flags)); - ok(ret, "failed to set security flags %u\n", GetLastError()); + ok(ret, "failed to set security flags %lu\n", GetLastError()); flags = 0; ret = WinHttpSetOption(req, WINHTTP_OPTION_SECURITY_FLAGS, &flags, sizeof(flags)); - ok(ret, "failed to set security flags %u\n", GetLastError()); + ok(ret, "failed to set security flags %lu\n", GetLastError()); ret = WinHttpSetOption(req, WINHTTP_OPTION_CLIENT_CERT_CONTEXT, WINHTTP_NO_CLIENT_CERT_CONTEXT, 0); err = GetLastError(); - ok(ret || broken(!ret && err == ERROR_INVALID_PARAMETER) /* winxp */, "failed to set client cert context %u\n", err); + ok(ret || broken(!ret && err == ERROR_INVALID_PARAMETER) /* winxp */, "failed to set client cert context %lu\n", err); WinHttpSetStatusCallback(req, cert_error, WINHTTP_CALLBACK_STATUS_SECURE_FAILURE, 0); @@ -1101,20 +1098,20 @@ static void test_secure_connection(void) skip("secure connection failed, skipping remaining secure tests\n"); goto cleanup; } - ok(ret, "failed to send request %u\n", GetLastError()); + ok(ret, "failed to send request %lu\n", GetLastError()); size = sizeof(cert); ret = WinHttpQueryOption(req, WINHTTP_OPTION_SERVER_CERT_CONTEXT, &cert, &size ); - ok(ret, "failed to retrieve certificate context %u\n", GetLastError()); + ok(ret, "failed to retrieve certificate context %lu\n", GetLastError()); if (ret) CertFreeCertificateContext(cert); size = sizeof(bitness); ret = WinHttpQueryOption(req, WINHTTP_OPTION_SECURITY_KEY_BITNESS, &bitness, &size ); - ok(ret, "failed to retrieve key bitness %u\n", GetLastError()); + ok(ret, "failed to retrieve key bitness %lu\n", GetLastError()); size = sizeof(info); ret = WinHttpQueryOption(req, WINHTTP_OPTION_SECURITY_CERTIFICATE_STRUCT, &info, &size ); - ok(ret, "failed to retrieve certificate info %u\n", GetLastError()); + ok(ret, "failed to retrieve certificate info %lu\n", GetLastError()); if (ret) { @@ -1123,7 +1120,7 @@ static void test_secure_connection(void) trace("lpszProtocolName %s\n", wine_dbgstr_w(info.lpszProtocolName)); trace("lpszSignatureAlgName %s\n", wine_dbgstr_w(info.lpszSignatureAlgName)); trace("lpszEncryptionAlgName %s\n", wine_dbgstr_w(info.lpszEncryptionAlgName)); - trace("dwKeySize %u\n", info.dwKeySize); + trace("dwKeySize %lu\n", info.dwKeySize); LocalFree( info.lpszSubjectInfo ); LocalFree( info.lpszIssuerInfo ); } @@ -1134,18 +1131,18 @@ static void test_secure_connection(void) skip("connection error, skipping remaining secure tests\n"); goto cleanup; } - ok(ret, "failed to receive response %u\n", GetLastError()); + ok(ret, "failed to receive response %lu\n", GetLastError()); available_size = 0; ret = WinHttpQueryDataAvailable(req, &available_size); - ok(ret, "failed to query available data %u\n", GetLastError()); - ok(available_size > 2014, "available_size = %u\n", available_size); + ok(ret, "failed to query available data %lu\n", GetLastError()); + ok(available_size > 2014, "available_size = %lu\n", available_size); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); - ok(ret, "failed unexpectedly %u\n", GetLastError()); - ok(status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status); + ok(ret, "failed unexpectedly %lu\n", GetLastError()); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %lu\n", status); size = 0; ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, NULL, &size, NULL); @@ -1156,18 +1153,18 @@ static void test_secure_connection(void) { size = 0; ret = WinHttpReadData(req, buffer, sizeof(buffer), &size); - ok(ret == TRUE, "WinHttpReadData failed: %u.\n", GetLastError()); + ok(ret == TRUE, "WinHttpReadData failed: %lu\n", GetLastError()); if (!size) break; read_size += size; if (read_size <= 32) ok(!memcmp(buffer, data_start, sizeof(data_start)-1), "not expected: %.32s\n", buffer); } - ok(read_size >= available_size, "read_size = %u, available_size = %u\n", read_size, available_size); + ok(read_size >= available_size, "read_size = %lu, available_size = %lu\n", read_size, available_size); size = sizeof(cert); ret = WinHttpQueryOption(req, WINHTTP_OPTION_SERVER_CERT_CONTEXT, &cert, &size); - ok(ret, "failed to retrieve certificate context %u\n", GetLastError()); + ok(ret, "failed to retrieve certificate context %lu\n", GetLastError()); if (ret) CertFreeCertificateContext(cert); cleanup: @@ -1184,13 +1181,13 @@ static void test_request_parameter_defaults(void) BOOL ret; ses = WinHttpOpen(L"winetest", 0, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); con = WinHttpConnect(ses, L"test.winehq.org", 0, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); error = GetLastError(); @@ -1199,21 +1196,21 @@ static void test_request_parameter_defaults(void) skip("connection failed, skipping\n"); goto done; } - ok(ret, "failed to send request %u\n", GetLastError()); + ok(ret, "failed to send request %lu\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok(ret, "failed to receive response %lu\n", GetLastError()); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); - ok(ret, "failed unexpectedly %u\n", GetLastError()); - ok(status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status); + ok(ret, "failed unexpectedly %lu\n", GetLastError()); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %lu\n", status); WinHttpCloseHandle(req); req = WinHttpOpenRequest(con, L"", L"", L"", NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); error = GetLastError(); @@ -1222,29 +1219,29 @@ static void test_request_parameter_defaults(void) skip("connection failed, skipping\n"); goto done; } - ok(ret, "failed to send request %u\n", GetLastError()); + ok(ret, "failed to send request %lu\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok(ret, "failed to receive response %lu\n", GetLastError()); size = 0; SetLastError(0xdeadbeef); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_VERSION, NULL, NULL, &size, NULL); error = GetLastError(); ok(!ret, "succeeded unexpectedly\n"); - ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", error); + ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %lu\n", error); version = HeapAlloc(GetProcessHeap(), 0, size); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_VERSION, NULL, version, &size, NULL); - ok(ret, "failed unexpectedly %u\n", GetLastError()); - ok(lstrlenW(version) == size / sizeof(WCHAR), "unexpected size %u\n", size); + ok(ret, "failed unexpectedly %lu\n", GetLastError()); + ok(lstrlenW(version) == size / sizeof(WCHAR), "unexpected size %lu\n", size); HeapFree(GetProcessHeap(), 0, version); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); - ok(ret, "failed unexpectedly %u\n", GetLastError()); - ok(status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status); + ok(ret, "failed unexpectedly %lu\n", GetLastError()); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %lu\n", status); done: WinHttpCloseHandle(req); @@ -1350,7 +1347,7 @@ static void test_set_default_proxy_config(void) SetLastError(0xdeadbeef); ret = WinHttpSetDefaultProxyConfiguration(NULL); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); } /* test with invalid access type */ @@ -1359,7 +1356,7 @@ static void test_set_default_proxy_config(void) SetLastError(0xdeadbeef); ret = WinHttpSetDefaultProxyConfiguration(&info); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); /* at a minimum, the proxy server must be set */ info.dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; @@ -1367,12 +1364,12 @@ static void test_set_default_proxy_config(void) SetLastError(0xdeadbeef); ret = WinHttpSetDefaultProxyConfiguration(&info); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); info.lpszProxyBypass = normalString; SetLastError(0xdeadbeef); ret = WinHttpSetDefaultProxyConfiguration(&info); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); /* the proxy server can't have wide characters */ info.lpszProxy = wideString; @@ -1383,7 +1380,7 @@ static void test_set_default_proxy_config(void) else ok((!ret && GetLastError() == ERROR_INVALID_PARAMETER) || broken(ret), /* Earlier winhttp versions on W2K/XP */ - "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); info.lpszProxy = normalString; SetLastError(0xdeadbeef); @@ -1392,9 +1389,9 @@ static void test_set_default_proxy_config(void) skip("couldn't set default proxy configuration: access denied\n"); else { - ok(ret, "WinHttpSetDefaultProxyConfiguration failed: %u\n", GetLastError()); - ok(GetLastError() == ERROR_SUCCESS || broken(GetLastError() == 0xdeadbeef) /* < win7 */, - "got %u\n", GetLastError()); + ok(ret, "WinHttpSetDefaultProxyConfiguration failed: %lu\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS || broken(GetLastError() == 0xdeadbeef) /* < win7 */, + "got %lu\n", GetLastError()); } set_default_proxy_reg_value( saved_proxy_settings, len, type ); } @@ -1406,488 +1403,488 @@ static void test_timeouts(void) HINTERNET ses, req, con; ses = WinHttpOpen(L"winetest", 0, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(ses, -2, 0, 0, 0); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(ses, 0, -2, 0, 0); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(ses, 0, 0, -2, 0); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(ses, 0, 0, 0, -2); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(ses, -1, -1, -1, -1); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); ok(GetLastError() == ERROR_SUCCESS || broken(GetLastError() == 0xdeadbeef) /* < win7 */, - "expected ERROR_SUCCESS, got %u\n", GetLastError()); + "expected ERROR_SUCCESS, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(ses, 0, 0, 0, 0); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(ses, 0x0123, 0x4567, 0x89ab, 0xcdef); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0x0123, "Expected 0x0123, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0x0123, "Expected 0x0123, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0x4567, "Expected 0x4567, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0x4567, "Expected 0x4567, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_SEND_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0x89ab, "Expected 0x89ab, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0x89ab, "Expected 0x89ab, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xcdef, "Expected 0xcdef, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xcdef, "Expected 0xcdef, got %lu\n", value); SetLastError(0xdeadbeef); value = 0; ret = WinHttpSetOption(ses, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0, "Expected 0, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0, "Expected 0, got %lu\n", value); SetLastError(0xdeadbeef); value = 0; ret = WinHttpSetOption(ses, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0, "Expected 0, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0, "Expected 0, got %lu\n", value); SetLastError(0xdeadbeef); value = 0; ret = WinHttpSetOption(ses, WINHTTP_OPTION_SEND_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_SEND_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0, "Expected 0, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0, "Expected 0, got %lu\n", value); SetLastError(0xdeadbeef); value = 0; ret = WinHttpSetOption(ses, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0, "Expected 0, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0, "Expected 0, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xbeefdead; ret = WinHttpSetOption(ses, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xbeefdead, "Expected 0xbeefdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xbeefdead; ret = WinHttpSetOption(ses, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xbeefdead, "Expected 0xbeefdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xbeefdead; ret = WinHttpSetOption(ses, WINHTTP_OPTION_SEND_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_SEND_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xbeefdead, "Expected 0xbeefdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xbeefdead; ret = WinHttpSetOption(ses, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xbeefdead, "Expected 0xbeefdead, got %lu\n", value); con = WinHttpConnect(ses, L"test.winehq.org", 0, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); /* Timeout values should match the last one set for session */ SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(con, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xbeefdead, "Expected 0xbeefdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(con, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xbeefdead, "Expected 0xbeefdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(con, WINHTTP_OPTION_SEND_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xbeefdead, "Expected 0xbeefdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(con, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xbeefdead, "Expected 0xbeefdead, got %lu\n", value); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(con, -2, 0, 0, 0); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(con, 0, -2, 0, 0); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(con, 0, 0, -2, 0); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(con, 0, 0, 0, -2); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(con, -1, -1, -1, -1); ok(!ret && GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, - "expected ERROR_WINHTTP_INVALID_TYPE, got %u\n", GetLastError()); + "expected ERROR_WINHTTP_INVALID_TYPE, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(con, 0, 0, 0, 0); ok(!ret && GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, - "expected ERROR_WINHTTP_INVALID_TYPE, got %u\n", GetLastError()); + "expected ERROR_WINHTTP_INVALID_TYPE, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0; ret = WinHttpSetOption(con, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, sizeof(value)); ok(!ret && GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, - "expected ERROR_WINHTTP_INVALID_TYPE, got %u\n", GetLastError()); + "expected ERROR_WINHTTP_INVALID_TYPE, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0; ret = WinHttpSetOption(con, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, sizeof(value)); ok(!ret && GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, - "expected ERROR_WINHTTP_INVALID_TYPE, got %u\n", GetLastError()); + "expected ERROR_WINHTTP_INVALID_TYPE, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0; ret = WinHttpSetOption(con, WINHTTP_OPTION_SEND_TIMEOUT, &value, sizeof(value)); ok(!ret && GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, - "expected ERROR_WINHTTP_INVALID_TYPE, got %u\n", GetLastError()); + "expected ERROR_WINHTTP_INVALID_TYPE, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0; ret = WinHttpSetOption(con, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, sizeof(value)); ok(!ret && GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, - "expected ERROR_WINHTTP_INVALID_TYPE, got %u\n", GetLastError()); + "expected ERROR_WINHTTP_INVALID_TYPE, got %lu\n", GetLastError()); /* Changing timeout values for session should affect the values for connection */ SetLastError(0xdeadbeef); value = 0xdead; ret = WinHttpSetOption(ses, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(con, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xdead, "Expected 0xdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xdead, "Expected 0xdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xdead; ret = WinHttpSetOption(ses, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(con, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xdead, "Expected 0xdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xdead, "Expected 0xdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xdead; ret = WinHttpSetOption(ses, WINHTTP_OPTION_SEND_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(con, WINHTTP_OPTION_SEND_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xdead, "Expected 0xdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xdead, "Expected 0xdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xdead; ret = WinHttpSetOption(ses, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(con, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xdead, "Expected 0xdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xdead, "Expected 0xdead, got %lu\n", value); req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); /* Timeout values should match the last one set for session */ SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xdead, "Expected 0xdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xdead, "Expected 0xdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xdead, "Expected 0xdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xdead, "Expected 0xdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_SEND_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xdead, "Expected 0xdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xdead, "Expected 0xdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xdead, "Expected 0xdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xdead, "Expected 0xdead, got %lu\n", value); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(req, -2, 0, 0, 0); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(req, 0, -2, 0, 0); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(req, 0, 0, -2, 0); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(req, 0, 0, 0, -2); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + "expected ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(req, -1, -1, -1, -1); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(req, 0, 0, 0, 0); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetTimeouts(req, 0xcdef, 0x89ab, 0x4567, 0x0123); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xcdef, "Expected 0xcdef, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xcdef, "Expected 0xcdef, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0x89ab, "Expected 0x89ab, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0x89ab, "Expected 0x89ab, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_SEND_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0x4567, "Expected 0x4567, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0x4567, "Expected 0x4567, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0x0123, "Expected 0x0123, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0x0123, "Expected 0x0123, got %lu\n", value); SetLastError(0xdeadbeef); value = 0; ret = WinHttpSetOption(req, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0, "Expected 0, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0, "Expected 0, got %lu\n", value); SetLastError(0xdeadbeef); value = 0; ret = WinHttpSetOption(req, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0, "Expected 0, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0, "Expected 0, got %lu\n", value); SetLastError(0xdeadbeef); value = 0; ret = WinHttpSetOption(req, WINHTTP_OPTION_SEND_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_SEND_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0, "Expected 0, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0, "Expected 0, got %lu\n", value); SetLastError(0xdeadbeef); value = 0; ret = WinHttpSetOption(req, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0, "Expected 0, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0, "Expected 0, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xbeefdead; ret = WinHttpSetOption(req, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xbeefdead, "Expected 0xbeefdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xbeefdead; ret = WinHttpSetOption(req, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xbeefdead, "Expected 0xbeefdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xbeefdead; ret = WinHttpSetOption(req, WINHTTP_OPTION_SEND_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_SEND_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xbeefdead, "Expected 0xbeefdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xbeefdead; ret = WinHttpSetOption(req, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xbeefdead, "Expected 0xbeefdead, got %lu\n", value); /* Changing timeout values for session should not affect the values for a request, * neither should the other way around. @@ -1895,162 +1892,162 @@ static void test_timeouts(void) SetLastError(0xdeadbeef); value = 0xbeefdead; ret = WinHttpSetOption(req, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xdead, "Expected 0xdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xdead, "Expected 0xdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xbeefdead; ret = WinHttpSetOption(req, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xdead, "Expected 0xdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xdead, "Expected 0xdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xbeefdead; ret = WinHttpSetOption(req, WINHTTP_OPTION_SEND_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_SEND_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xdead, "Expected 0xdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xdead, "Expected 0xdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xbeefdead; ret = WinHttpSetOption(req, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xdead, "Expected 0xdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xdead, "Expected 0xdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xbeef; ret = WinHttpSetOption(ses, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_RESOLVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xbeefdead, "Expected 0xbeefdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xbeef; ret = WinHttpSetOption(ses, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_CONNECT_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xbeefdead, "Expected 0xbeefdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xbeef; ret = WinHttpSetOption(ses, WINHTTP_OPTION_SEND_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_SEND_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xbeefdead, "Expected 0xbeefdead, got %lu\n", value); SetLastError(0xdeadbeef); value = 0xbeef; ret = WinHttpSetOption(ses, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(DWORD); ret = WinHttpQueryOption(req, WINHTTP_OPTION_RECEIVE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 0xbeefdead, "Expected 0xbeefdead, got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 0xbeefdead, "Expected 0xbeefdead, got %lu\n", value); /* response timeout */ SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(value); ret = WinHttpQueryOption(req, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == ~0u, "got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == ~0u, "got %lu\n", value); SetLastError(0xdeadbeef); value = 30000; ret = WinHttpSetOption(req, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(value); ret = WinHttpQueryOption(req, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - todo_wine ok(value == 0xbeefdead, "got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + todo_wine ok(value == 0xbeefdead, "got %lu\n", value); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(value); ret = WinHttpQueryOption(con, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == ~0u, "got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == ~0u, "got %lu\n", value); SetLastError(0xdeadbeef); value = 30000; ret = WinHttpSetOption(con, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, sizeof(value)); ok(!ret, "expected failure\n"); - ok(GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, "got %u\n", GetLastError()); + ok(GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, "got %lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(value); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == ~0u, "got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == ~0u, "got %lu\n", value); SetLastError(0xdeadbeef); value = 48878; ret = WinHttpSetOption(ses, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(value); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - todo_wine ok(value == 48879, "got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + todo_wine ok(value == 48879, "got %lu\n", value); SetLastError(0xdeadbeef); value = 48880; ret = WinHttpSetOption(ses, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, sizeof(value)); - ok(ret, "%u\n", GetLastError()); + ok(ret, "%lu\n", GetLastError()); SetLastError(0xdeadbeef); value = 0xdeadbeef; size = sizeof(value); ret = WinHttpQueryOption(ses, WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT, &value, &size); - ok(ret, "%u\n", GetLastError()); - ok(value == 48880, "got %u\n", value); + ok(ret, "%lu\n", GetLastError()); + ok(value == 48880, "got %lu\n", value); WinHttpCloseHandle(req); WinHttpCloseHandle(con); @@ -2066,17 +2063,17 @@ static void test_resolve_timeout(void) if (! proxy_active()) { ses = WinHttpOpen(L"winetest", 0, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); timeout = 10000; ret = WinHttpSetOption(ses, WINHTTP_OPTION_RESOLVE_TIMEOUT, &timeout, sizeof(timeout)); - ok(ret, "failed to set resolve timeout %u\n", GetLastError()); + ok(ret, "failed to set resolve timeout %lu\n", GetLastError()); con = WinHttpConnect(ses, L"nxdomain.winehq.org", 0, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); @@ -2086,12 +2083,12 @@ static void test_resolve_timeout(void) goto done; } ok(GetLastError() == ERROR_WINHTTP_NAME_NOT_RESOLVED, - "expected ERROR_WINHTTP_NAME_NOT_RESOLVED got %u\n", GetLastError()); + "expected ERROR_WINHTTP_NAME_NOT_RESOLVED got %lu\n", GetLastError()); ret = WinHttpReceiveResponse( req, NULL ); ok( !ret && (GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_STATE || GetLastError() == ERROR_WINHTTP_OPERATION_CANCELLED /* < win7 */), - "got %u\n", GetLastError() ); + "got %lu\n", GetLastError() ); WinHttpCloseHandle(req); WinHttpCloseHandle(con); @@ -2101,17 +2098,17 @@ static void test_resolve_timeout(void) skip("Skipping host resolution tests, host resolution performed by proxy\n"); ses = WinHttpOpen(L"winetest", 0, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); timeout = 10000; ret = WinHttpSetOption(ses, WINHTTP_OPTION_RESOLVE_TIMEOUT, &timeout, sizeof(timeout)); - ok(ret, "failed to set resolve timeout %u\n", GetLastError()); + ok(ret, "failed to set resolve timeout %lu\n", GetLastError()); con = WinHttpConnect(ses, L"test.winehq.org", 0, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) @@ -2489,71 +2486,71 @@ static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path) BOOL ret; ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetOption(ses, 0, buffer, sizeof(buffer)); - ok(!ret && GetLastError() == ERROR_WINHTTP_INVALID_OPTION, "got %u\n", GetLastError()); + ok(!ret && GetLastError() == ERROR_WINHTTP_INVALID_OPTION, "got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpQueryOption(ses, 0, buffer, &size); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %lu\n", GetLastError()); con = WinHttpConnect(ses, L"localhost", port, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetOption(con, 0, buffer, sizeof(buffer)); - todo_wine ok(!ret && GetLastError() == ERROR_WINHTTP_INVALID_OPTION, "got %u\n", GetLastError()); + todo_wine ok(!ret && GetLastError() == ERROR_WINHTTP_INVALID_OPTION, "got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpQueryOption(con, 0, buffer, &size); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %lu\n", GetLastError()); req = WinHttpOpenRequest(con, verb, path, NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetOption(req, 0, buffer, sizeof(buffer)); - ok(!ret && GetLastError() == ERROR_WINHTTP_INVALID_OPTION, "got %u\n", GetLastError()); + ok(!ret && GetLastError() == ERROR_WINHTTP_INVALID_OPTION, "got %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpQueryOption(req, 0, buffer, &size); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %lu\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); - ok(ret, "failed to send request %u\n", GetLastError()); + ok(ret, "failed to send request %lu\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok(ret, "failed to receive response %lu\n", GetLastError()); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); - ok(ret, "failed to query status code %u\n", GetLastError()); - ok(status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status); + ok(ret, "failed to query status code %lu\n", GetLastError()); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %lu\n", status); supported = first = target = 0xdeadbeef; SetLastError(0xdeadbeef); ret = WinHttpQueryAuthSchemes(req, &supported, &first, &target); error = GetLastError(); ok(!ret, "unexpected success\n"); - ok(error == ERROR_INVALID_OPERATION, "expected ERROR_INVALID_OPERATION, got %u\n", error); - ok(supported == 0xdeadbeef, "got %x\n", supported); - ok(first == 0xdeadbeef, "got %x\n", first); - ok(target == 0xdeadbeef, "got %x\n", target); + ok(error == ERROR_INVALID_OPERATION, "expected ERROR_INVALID_OPERATION, got %lu\n", error); + ok(supported == 0xdeadbeef, "got %lu\n", supported); + ok(first == 0xdeadbeef, "got %lu\n", first); + ok(target == 0xdeadbeef, "got %lu\n", target); size = sizeof(buffer2); memset(buffer2, 0, sizeof(buffer2)); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, buffer2, &size, NULL); - ok(ret, "failed to query for raw headers: %u\n", GetLastError()); + ok(ret, "failed to query for raw headers: %lu\n", GetLastError()); ok(!memcmp(buffer2 + lstrlenW(buffer2) - 4, L"\r\n\r\n", sizeof(L"\r\n\r\n")), "WinHttpQueryHeaders returned invalid end of header string\n"); size = sizeof(buffer2); memset(buffer2, 0, sizeof(buffer2)); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS, NULL, buffer2, &size, NULL); - ok(ret, "failed to query for raw headers: %u\n", GetLastError()); + ok(ret, "failed to query for raw headers: %lu\n", GetLastError()); ok(!memcmp(buffer2 + (size / sizeof(WCHAR)) - 1, L"", sizeof(L"")), "WinHttpQueryHeaders returned invalid end of header string\n"); ok(buffer2[(size / sizeof(WCHAR)) - 2] != 0, "returned string has too many NULL characters\n"); @@ -2561,7 +2558,7 @@ static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path) count = 0; memset(buffer, 0, sizeof(buffer)); ret = WinHttpReadData(req, buffer, sizeof buffer, &count); - ok(ret, "failed to read data %u\n", GetLastError()); + ok(ret, "failed to read data %lu\n", GetLastError()); ok(count == sizeof page1 - 1, "count was wrong\n"); ok(!memcmp(buffer, page1, sizeof page1), "http data wrong\n"); @@ -2578,82 +2575,82 @@ static void test_basic_authentication(int port) BOOL ret; ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); con = WinHttpConnect(ses, L"localhost", port, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); req = WinHttpOpenRequest(con, NULL, L"/auth", NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpQueryAuthSchemes(NULL, NULL, NULL, NULL); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %u\n", error); + ok(error == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %lu\n", error); SetLastError(0xdeadbeef); ret = WinHttpQueryAuthSchemes(req, NULL, NULL, NULL); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER || error == ERROR_INVALID_OPERATION, "got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER || error == ERROR_INVALID_OPERATION, "got %lu\n", error); supported = 0xdeadbeef; SetLastError(0xdeadbeef); ret = WinHttpQueryAuthSchemes(req, &supported, NULL, NULL); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER || error == ERROR_INVALID_OPERATION, "got %u\n", error); - ok(supported == 0xdeadbeef, "got %x\n", supported); + ok(error == ERROR_INVALID_PARAMETER || error == ERROR_INVALID_OPERATION, "got %lu\n", error); + ok(supported == 0xdeadbeef, "got %lu\n", supported); supported = first = 0xdeadbeef; SetLastError(0xdeadbeef); ret = WinHttpQueryAuthSchemes(req, &supported, &first, NULL); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER || error == ERROR_INVALID_OPERATION, "got %u\n", error); - ok(supported == 0xdeadbeef, "got %x\n", supported); - ok(first == 0xdeadbeef, "got %x\n", first); + ok(error == ERROR_INVALID_PARAMETER || error == ERROR_INVALID_OPERATION, "got %lu\n", error); + ok(supported == 0xdeadbeef, "got %lu\n", supported); + ok(first == 0xdeadbeef, "got %lu\n", first); supported = first = target = 0xdeadbeef; SetLastError(0xdeadbeef); ret = WinHttpQueryAuthSchemes(req, &supported, &first, &target); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_OPERATION, "expected ERROR_INVALID_OPERATION, got %u\n", error); - ok(supported == 0xdeadbeef, "got %x\n", supported); - ok(first == 0xdeadbeef, "got %x\n", first); - ok(target == 0xdeadbeef, "got %x\n", target); + ok(error == ERROR_INVALID_OPERATION, "expected ERROR_INVALID_OPERATION, got %lu\n", error); + ok(supported == 0xdeadbeef, "got %lu\n", supported); + ok(first == 0xdeadbeef, "got %lu\n", first); + ok(target == 0xdeadbeef, "got %lu\n", target); supported = first = target = 0xdeadbeef; SetLastError(0xdeadbeef); ret = WinHttpQueryAuthSchemes(NULL, &supported, &first, &target); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %u\n", error); - ok(supported == 0xdeadbeef, "got %x\n", supported); - ok(first == 0xdeadbeef, "got %x\n", first); - ok(target == 0xdeadbeef, "got %x\n", target); + ok(error == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %lu\n", error); + ok(supported == 0xdeadbeef, "got %lu\n", supported); + ok(first == 0xdeadbeef, "got %lu\n", first); + ok(target == 0xdeadbeef, "got %lu\n", target); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); - ok(ret, "failed to send request %u\n", GetLastError()); + ok(ret, "failed to send request %lu\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok(ret, "failed to receive response %lu\n", GetLastError()); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); - ok(ret, "failed to query status code %u\n", GetLastError()); - ok(status == HTTP_STATUS_DENIED, "request failed unexpectedly %u\n", status); + ok(ret, "failed to query status code %lu\n", GetLastError()); + ok(status == HTTP_STATUS_DENIED, "request failed unexpectedly %lu\n", status); size = 0; ret = WinHttpReadData(req, buffer, sizeof(buffer), &size); error = GetLastError(); - ok(ret || broken(error == ERROR_WINHTTP_SHUTDOWN || error == ERROR_WINHTTP_TIMEOUT) /* XP */, "failed to read data %u\n", GetLastError()); + ok(ret || broken(error == ERROR_WINHTTP_SHUTDOWN || error == ERROR_WINHTTP_TIMEOUT) /* XP */, "failed to read data %lu\n", GetLastError()); if (ret) { - ok(size == 12, "expected 12, got %u\n", size); + ok(size == 12, "expected 12, got %lu\n", size); ok(!memcmp(buffer, unauthorized, 12), "got %s\n", buffer); } @@ -2661,70 +2658,70 @@ static void test_basic_authentication(int port) SetLastError(0xdeadbeef); ret = WinHttpQueryAuthSchemes(req, &supported, &first, &target); error = GetLastError(); - ok(ret, "failed to query authentication schemes %u\n", error); - ok(error == ERROR_SUCCESS || broken(error == 0xdeadbeef) /* < win7 */, "expected ERROR_SUCCESS, got %u\n", error); - ok(supported == WINHTTP_AUTH_SCHEME_BASIC, "got %x\n", supported); - ok(first == WINHTTP_AUTH_SCHEME_BASIC, "got %x\n", first); - ok(target == WINHTTP_AUTH_TARGET_SERVER, "got %x\n", target); + ok(ret, "failed to query authentication schemes %lu\n", error); + ok(error == ERROR_SUCCESS || broken(error == 0xdeadbeef) /* < win7 */, "expected ERROR_SUCCESS, got %lu\n", error); + ok(supported == WINHTTP_AUTH_SCHEME_BASIC, "got %lu\n", supported); + ok(first == WINHTTP_AUTH_SCHEME_BASIC, "got %lu\n", first); + ok(target == WINHTTP_AUTH_TARGET_SERVER, "got %lu\n", target); SetLastError(0xdeadbeef); ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_NTLM, NULL, NULL, NULL); error = GetLastError(); - ok(ret, "failed to set credentials %u\n", error); - ok(error == ERROR_SUCCESS || broken(error == 0xdeadbeef) /* < win7 */, "expected ERROR_SUCCESS, got %u\n", error); + ok(ret, "failed to set credentials %lu\n", error); + ok(error == ERROR_SUCCESS || broken(error == 0xdeadbeef) /* < win7 */, "expected ERROR_SUCCESS, got %lu\n", error); ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_PASSPORT, NULL, NULL, NULL); - ok(ret, "failed to set credentials %u\n", GetLastError()); + ok(ret, "failed to set credentials %lu\n", GetLastError()); ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_NEGOTIATE, NULL, NULL, NULL); - ok(ret, "failed to set credentials %u\n", GetLastError()); + ok(ret, "failed to set credentials %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_DIGEST, NULL, NULL, NULL); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error); SetLastError(0xdeadbeef); ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, NULL, NULL, NULL); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error); SetLastError(0xdeadbeef); ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, L"user", NULL, NULL); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error); SetLastError(0xdeadbeef); ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, NULL, L"pwd", NULL); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error); ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, L"user", L"pwd", NULL); - ok(ret, "failed to set credentials %u\n", GetLastError()); + ok(ret, "failed to set credentials %lu\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); - ok(ret, "failed to send request %u\n", GetLastError()); + ok(ret, "failed to send request %lu\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok(ret, "failed to receive response %lu\n", GetLastError()); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); - ok(ret, "failed to query status code %u\n", GetLastError()); - ok(status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status); + ok(ret, "failed to query status code %lu\n", GetLastError()); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %lu\n", status); size = 0; ret = WinHttpReadData(req, buffer, sizeof(buffer), &size); error = GetLastError(); - ok(ret || broken(error == ERROR_WINHTTP_SHUTDOWN || error == ERROR_WINHTTP_TIMEOUT) /* XP */, "failed to read data %u\n", GetLastError()); + ok(ret || broken(error == ERROR_WINHTTP_SHUTDOWN || error == ERROR_WINHTTP_TIMEOUT) /* XP */, "failed to read data %lu\n", GetLastError()); if (ret) { - ok(size == 11, "expected 11, got %u\n", size); + ok(size == 11, "expected 11, got %lu\n", size); ok(!memcmp(buffer, hello_world, 11), "got %s\n", buffer); } @@ -2734,36 +2731,36 @@ static void test_basic_authentication(int port) /* now set the credentials first to show that they get sent with the first request */ ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); con = WinHttpConnect(ses, L"localhost", port, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); req = WinHttpOpenRequest(con, NULL, L"/auth_with_creds", NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, L"user", L"pwd", NULL); - ok(ret, "failed to set credentials %u\n", GetLastError()); + ok(ret, "failed to set credentials %lu\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); - ok(ret, "failed to send request %u\n", GetLastError()); + ok(ret, "failed to send request %lu\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok(ret, "failed to receive response %lu\n", GetLastError()); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); - ok(ret, "failed to query status code %u\n", GetLastError()); - ok(status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status); + ok(ret, "failed to query status code %lu\n", GetLastError()); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %lu\n", status); size = 0; ret = WinHttpReadData(req, buffer, sizeof(buffer), &size); error = GetLastError(); - ok(ret || broken(error == ERROR_WINHTTP_SHUTDOWN || error == ERROR_WINHTTP_TIMEOUT) /* XP */, "failed to read data %u\n", GetLastError()); + ok(ret || broken(error == ERROR_WINHTTP_SHUTDOWN || error == ERROR_WINHTTP_TIMEOUT) /* XP */, "failed to read data %lu\n", GetLastError()); if (ret) { - ok(size == 11, "expected 11, got %u\n", size); + ok(size == 11, "expected 11, got %lu\n", size); ok(!memcmp(buffer, hello_world, 11), "got %s\n", buffer); } @@ -2774,68 +2771,68 @@ static void test_basic_authentication(int port) /* credentials set with WinHttpSetCredentials take precedence over those set through options */ ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); con = WinHttpConnect(ses, L"localhost", port, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); req = WinHttpOpenRequest(con, NULL, L"/auth", NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, L"user", L"pwd", NULL); - ok(ret, "failed to set credentials %u\n", GetLastError()); + ok(ret, "failed to set credentials %lu\n", GetLastError()); ret = WinHttpSetOption(req, WINHTTP_OPTION_USERNAME, (void *)L"user", lstrlenW(L"user")); - ok(ret, "failed to set username %u\n", GetLastError()); + ok(ret, "failed to set username %lu\n", GetLastError()); ret = WinHttpSetOption(req, WINHTTP_OPTION_PASSWORD, (void *)L"pwd2", lstrlenW(L"pwd2")); - ok(ret, "failed to set password %u\n", GetLastError()); + ok(ret, "failed to set password %lu\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); - ok(ret, "failed to send request %u\n", GetLastError()); + ok(ret, "failed to send request %lu\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok(ret, "failed to receive response %lu\n", GetLastError()); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); - ok(ret, "failed to query status code %u\n", GetLastError()); - ok(status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status); + ok(ret, "failed to query status code %lu\n", GetLastError()); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %lu\n", status); WinHttpCloseHandle(req); WinHttpCloseHandle(con); WinHttpCloseHandle(ses); ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); con = WinHttpConnect(ses, L"localhost", port, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); req = WinHttpOpenRequest(con, NULL, L"/auth", NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); ret = WinHttpSetOption(req, WINHTTP_OPTION_USERNAME, (void *)L"user", lstrlenW(L"user")); - ok(ret, "failed to set username %u\n", GetLastError()); + ok(ret, "failed to set username %lu\n", GetLastError()); ret = WinHttpSetOption(req, WINHTTP_OPTION_PASSWORD, (void *)L"pwd", lstrlenW(L"pwd")); - ok(ret, "failed to set password %u\n", GetLastError()); + ok(ret, "failed to set password %lu\n", GetLastError()); ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, L"user", L"pwd2", NULL); - ok(ret, "failed to set credentials %u\n", GetLastError()); + ok(ret, "failed to set credentials %lu\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); - ok(ret, "failed to send request %u\n", GetLastError()); + ok(ret, "failed to send request %lu\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok(ret, "failed to receive response %lu\n", GetLastError()); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); - ok(ret, "failed to query status code %u\n", GetLastError()); - ok(status == HTTP_STATUS_DENIED, "request failed unexpectedly %u\n", status); + ok(ret, "failed to query status code %lu\n", GetLastError()); + ok(status == HTTP_STATUS_DENIED, "request failed unexpectedly %lu\n", status); WinHttpCloseHandle(req); WinHttpCloseHandle(con); @@ -2850,13 +2847,13 @@ static void test_multi_authentication(int port) BOOL ret; ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); con = WinHttpConnect(ses, L"localhost", port, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); req = WinHttpOpenRequest(con, L"GET", L"/multiauth", NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); ret = WinHttpSendRequest(req, WINHTTP_NO_ADDITIONAL_HEADERS, 0, WINHTTP_NO_REQUEST_DATA,0, 0, 0 ); @@ -2868,25 +2865,25 @@ static void test_multi_authentication(int port) supported = first = target = 0xdeadbeef; ret = WinHttpQueryAuthSchemes(req, &supported, &first, &target); ok(ret, "expected success\n"); - ok(supported == (WINHTTP_AUTH_SCHEME_BASIC | WINHTTP_AUTH_SCHEME_NTLM), "got %x\n", supported); - ok(target == WINHTTP_AUTH_TARGET_SERVER, "got %x\n", target); - ok(first == WINHTTP_AUTH_SCHEME_BASIC, "got %x\n", first); + ok(supported == (WINHTTP_AUTH_SCHEME_BASIC | WINHTTP_AUTH_SCHEME_NTLM), "got %#lx\n", supported); + ok(target == WINHTTP_AUTH_TARGET_SERVER, "got %#lx\n", target); + ok(first == WINHTTP_AUTH_SCHEME_BASIC, "got %#lx\n", first); index = 0; size = sizeof(buf); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_CUSTOM, L"WWW-Authenticate", buf, &size, &index); ok(ret, "expected success\n"); ok(!lstrcmpW(buf, L"Bearer"), "buf = %s\n", wine_dbgstr_w(buf)); - ok(size == lstrlenW(buf) * sizeof(WCHAR), "size = %u\n", size); - ok(index == 1, "index = %u\n", index); + ok(size == lstrlenW(buf) * sizeof(WCHAR), "size = %lu\n", size); + ok(index == 1, "index = %lu\n", index); index = 0; size = 0xdeadbeef; ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_CUSTOM, L"WWW-Authenticate", NULL, &size, &index); ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "WinHttpQueryHeaders returned %x(%u)\n", ret, GetLastError()); - ok(size == (lstrlenW(buf) + 1) * sizeof(WCHAR), "size = %u\n", size); - ok(index == 0, "index = %u\n", index); + "WinHttpQueryHeaders returned %d(%lu)\n", ret, GetLastError()); + ok(size == (lstrlenW(buf) + 1) * sizeof(WCHAR), "size = %lu\n", size); + ok(index == 0, "index = %lu\n", index); WinHttpCloseHandle(req); WinHttpCloseHandle(con); @@ -2900,13 +2897,13 @@ static void test_large_data_authentication(int port) BOOL ret; ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); con = WinHttpConnect(ses, L"localhost", port, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); req = WinHttpOpenRequest(con, L"GET", L"/largeauth", NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); ret = WinHttpSendRequest(req, WINHTTP_NO_ADDITIONAL_HEADERS, 0, WINHTTP_NO_REQUEST_DATA, 0, 0, 0); ok(ret, "expected success\n"); @@ -2918,13 +2915,13 @@ static void test_large_data_authentication(int port) ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "expected success\n"); - ok(status == HTTP_STATUS_DENIED, "got %d\n", status); + ok(status == HTTP_STATUS_DENIED, "got %lu\n", status); ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_NTLM, L"user", L"pwd", NULL); ok(ret, "expected success\n"); ret = WinHttpSendRequest(req, WINHTTP_NO_ADDITIONAL_HEADERS, 0, WINHTTP_NO_REQUEST_DATA, 0, 0, 0); - ok(ret, "expected success %d\n", GetLastError()); + ok(ret, "expected success %lu\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); ok(ret, "expected success\n"); @@ -2933,7 +2930,7 @@ static void test_large_data_authentication(int port) ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "expected success\n"); - ok(status == HTTP_STATUS_OK, "got %d\n", status); + ok(status == HTTP_STATUS_OK, "got %lu\n", status); WinHttpCloseHandle(req); WinHttpCloseHandle(con); @@ -2947,19 +2944,19 @@ static void test_no_headers(int port) BOOL ret; ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); con = WinHttpConnect(ses, L"localhost", port, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); req = WinHttpOpenRequest(con, NULL, L"/no_headers", NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); if (!ret) { error = GetLastError(); - ok(error == ERROR_WINHTTP_INVALID_SERVER_RESPONSE, "got %u\n", error); + ok(error == ERROR_WINHTTP_INVALID_SERVER_RESPONSE, "got %lu\n", error); } else { @@ -2967,7 +2964,7 @@ static void test_no_headers(int port) ret = WinHttpReceiveResponse(req, NULL); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_WINHTTP_INVALID_SERVER_RESPONSE, "got %u\n", error); + ok(error == ERROR_WINHTTP_INVALID_SERVER_RESPONSE, "got %lu\n", error); } WinHttpCloseHandle(req); @@ -2983,13 +2980,13 @@ static void test_no_content(int port) BOOL ret; ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); con = WinHttpConnect(ses, L"localhost", port, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); req = WinHttpOpenRequest(con, NULL, L"/no_content", NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); size = 12345; SetLastError(0xdeadbeef); @@ -2997,9 +2994,9 @@ static void test_no_content(int port) todo_wine { ok(!ret, "expected error\n"); ok(GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, - "expected ERROR_WINHTTP_INCORRECT_HANDLE_STATE, got 0x%08x\n", GetLastError()); + "expected ERROR_WINHTTP_INCORRECT_HANDLE_STATE, got %lu\n", GetLastError()); ok(size == 12345 || broken(size == 0) /* Win <= 2003 */, - "expected 12345, got %u\n", size); + "expected 12345, got %lu\n", size); } ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); @@ -3013,7 +3010,7 @@ static void test_no_content(int port) ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "expected success\n"); - ok(status == HTTP_STATUS_NO_CONTENT, "expected status 204, got %d\n", status); + ok(status == HTTP_STATUS_NO_CONTENT, "expected status 204, got %lu\n", status); SetLastError(0xdeadbeef); size = sizeof(status); @@ -3021,28 +3018,28 @@ static void test_no_content(int port) ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_CONTENT_LENGTH | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, 0); ok(!ret, "expected no content-length header\n"); - ok(GetLastError() == ERROR_WINHTTP_HEADER_NOT_FOUND, "wrong error %u\n", GetLastError()); - ok(status == 12345, "expected 0, got %d\n", status); + ok(GetLastError() == ERROR_WINHTTP_HEADER_NOT_FOUND, "wrong error %lu\n", GetLastError()); + ok(status == 12345, "expected 0, got %lu\n", status); SetLastError(0xdeadbeef); size = 12345; ret = WinHttpQueryDataAvailable(req, &size); ok(ret, "expected success\n"); ok(GetLastError() == ERROR_SUCCESS || broken(GetLastError() == 0xdeadbeef) /* < win7 */, - "wrong error %u\n", GetLastError()); - ok(!size, "expected 0, got %u\n", size); + "wrong error %lu\n", GetLastError()); + ok(!size, "expected 0, got %lu\n", size); SetLastError(0xdeadbeef); ret = WinHttpReadData(req, buf, len, &bytes_read); ok(ret, "expected success\n"); ok(GetLastError() == ERROR_SUCCESS || broken(GetLastError() == 0xdeadbeef) /* < win7 */, - "wrong error %u\n", GetLastError()); - ok(!bytes_read, "expected 0, got %u\n", bytes_read); + "wrong error %lu\n", GetLastError()); + ok(!bytes_read, "expected 0, got %lu\n", bytes_read); size = 12345; ret = WinHttpQueryDataAvailable(req, &size); ok(ret, "expected success\n"); - ok(size == 0, "expected 0, got %d\n", size); + ok(size == 0, "expected 0, got %lu\n", size); WinHttpCloseHandle(req); @@ -3050,9 +3047,8 @@ static void test_no_content(int port) SetLastError(0xdeadbeef); ret = WinHttpQueryDataAvailable(req, &size); ok(!ret, "expected error\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, - "expected ERROR_INVALID_HANDLE, got 0x%08x\n", GetLastError()); - ok(size == 12345, "expected 12345, got %u\n", size); + ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %#lx\n", GetLastError()); + ok(size == 12345, "expected 12345, got %lu\n", size); WinHttpCloseHandle(con); WinHttpCloseHandle(ses); @@ -3066,49 +3062,49 @@ static void test_head_request(int port) BOOL ret; ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); con = WinHttpConnect(ses, L"localhost", port, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); req = WinHttpOpenRequest(con, L"HEAD", L"/head", NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); - ok(ret, "failed to send request %u\n", GetLastError()); + ok(ret, "failed to send request %lu\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok(ret, "failed to receive response %lu\n", GetLastError()); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); - ok(ret, "failed to get status code %u\n", GetLastError()); - ok(status == HTTP_STATUS_OK, "got %u\n", status); + ok(ret, "failed to get status code %lu\n", GetLastError()); + ok(status == HTTP_STATUS_OK, "got %lu\n", status); len = 0xdeadbeef; size = sizeof(len); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_CONTENT_LENGTH | WINHTTP_QUERY_FLAG_NUMBER, NULL, &len, &size, 0); - ok(ret, "failed to get content-length header %u\n", GetLastError()); - ok(len == HTTP_STATUS_CONTINUE, "got %u\n", len); + ok(ret, "failed to get content-length header %lu\n", GetLastError()); + ok(len == HTTP_STATUS_CONTINUE, "got %lu\n", len); count = 0xdeadbeef; ret = WinHttpQueryDataAvailable(req, &count); - ok(ret, "failed to query data available %u\n", GetLastError()); - ok(!count, "got %u\n", count); + ok(ret, "failed to query data available %lu\n", GetLastError()); + ok(!count, "got %lu\n", count); len = sizeof(buf); count = 0xdeadbeef; ret = WinHttpReadData(req, buf, len, &count); - ok(ret, "failed to read data %u\n", GetLastError()); - ok(!count, "got %u\n", count); + ok(ret, "failed to read data %lu\n", GetLastError()); + ok(!count, "got %lu\n", count); count = 0xdeadbeef; ret = WinHttpQueryDataAvailable(req, &count); - ok(ret, "failed to query data available %u\n", GetLastError()); - ok(!count, "got %u\n", count); + ok(ret, "failed to query data available %lu\n", GetLastError()); + ok(!count, "got %lu\n", count); WinHttpCloseHandle(req); WinHttpCloseHandle(con); @@ -3123,37 +3119,37 @@ static void test_redirect(int port) BOOL ret; ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); con = WinHttpConnect(ses, L"localhost", port, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); req = WinHttpOpenRequest(con, L"POST", L"/redirect", NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, (void *)"data", sizeof("data"), sizeof("data"), 0); - ok(ret, "failed to send request %u\n", GetLastError()); + ok(ret, "failed to send request %lu\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); - ok(ret, "failed to receive response %u\n", GetLastError()); + ok(ret, "failed to receive response %lu\n", GetLastError()); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); - ok(ret, "failed to get status code %u\n", GetLastError()); - ok(status == HTTP_STATUS_OK, "got %u\n", status); + ok(ret, "failed to get status code %lu\n", GetLastError()); + ok(status == HTTP_STATUS_OK, "got %lu\n", status); count = 0; ret = WinHttpQueryDataAvailable(req, &count); - ok(ret, "failed to query data available %u\n", GetLastError()); - ok(count == 128, "got %u\n", count); + ok(ret, "failed to query data available %lu\n", GetLastError()); + ok(count == 128, "got %lu\n", count); len = sizeof(buf); count = 0; ret = WinHttpReadData(req, buf, len, &count); - ok(ret, "failed to read data %u\n", GetLastError()); - ok(count == 128, "got %u\n", count); + ok(ret, "failed to read data %lu\n", GetLastError()); + ok(count == 128, "got %lu\n", count); WinHttpCloseHandle(req); WinHttpCloseHandle(con); @@ -3178,30 +3174,30 @@ static void test_websocket(int port) } session = WinHttpOpen(L"winetest", 0, NULL, NULL, 0); - ok(session != NULL, "got %u\n", GetLastError()); + ok(session != NULL, "got %lu\n", GetLastError()); connection = WinHttpConnect(session, L"localhost", port, 0); - ok(connection != NULL, "got %u\n", GetLastError()); + ok(connection != NULL, "got %lu\n", GetLastError()); request = WinHttpOpenRequest(connection, L"GET", L"/websocket", NULL, NULL, NULL, 0); - ok(request != NULL, "got %u\n", GetLastError()); + ok(request != NULL, "got %lu\n", GetLastError()); ret = WinHttpSetOption(request, WINHTTP_OPTION_UPGRADE_TO_WEB_SOCKET, NULL, 0); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); size = sizeof(header); SetLastError(0xdeadbeef); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_UPGRADE, NULL, &header, &size, NULL); error = GetLastError(); ok(!ret, "success\n"); - todo_wine ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %u\n", error); + todo_wine ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %lu\n", error); size = sizeof(header); SetLastError(0xdeadbeef); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CONNECTION, NULL, &header, &size, NULL); error = GetLastError(); ok(!ret, "success\n"); - todo_wine ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %u\n", error); + todo_wine ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %lu\n", error); index = 0; size = sizeof(buf); @@ -3210,7 +3206,7 @@ static void test_websocket(int port) L"Sec-WebSocket-Key", buf, &size, &index); error = GetLastError(); ok(!ret, "success\n"); - ok(error == ERROR_WINHTTP_HEADER_NOT_FOUND, "got %u\n", error); + ok(error == ERROR_WINHTTP_HEADER_NOT_FOUND, "got %lu\n", error); index = 0; size = sizeof(buf); @@ -3219,65 +3215,65 @@ static void test_websocket(int port) L"Sec-WebSocket-Version", buf, &size, &index); error = GetLastError(); ok(!ret, "success\n"); - ok(error == ERROR_WINHTTP_HEADER_NOT_FOUND, "got %u\n", error); + ok(error == ERROR_WINHTTP_HEADER_NOT_FOUND, "got %lu\n", error); ret = WinHttpSendRequest(request, NULL, 0, NULL, 0, 0, 0); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); size = sizeof(header); SetLastError(0xdeadbeef); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_UPGRADE, NULL, &header, &size, NULL); error = GetLastError(); ok(!ret, "success\n"); - todo_wine ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %u\n", error); + todo_wine ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %lu\n", error); size = sizeof(header); SetLastError(0xdeadbeef); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CONNECTION, NULL, &header, &size, NULL); error = GetLastError(); ok(!ret, "success\n"); - todo_wine ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %u\n", error); + todo_wine ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %lu\n", error); index = 0; buf[0] = 0; size = sizeof(buf); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Sec-WebSocket-Key", buf, &size, &index); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); index = 0; buf[0] = 0; size = sizeof(buf); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Sec-WebSocket-Version", buf, &size, &index); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); ret = WinHttpReceiveResponse(request, NULL); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); count = 0xdeadbeef; ret = WinHttpQueryDataAvailable(request, &count); - ok(ret, "got %u\n", GetLastError()); - ok(!count, "got %u\n", count); + ok(ret, "got %lu\n", GetLastError()); + ok(!count, "got %lu\n", count); header[0] = 0; size = sizeof(header); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_UPGRADE, NULL, &header, &size, NULL); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); ok(!wcscmp( header, L"websocket" ), "got %s\n", wine_dbgstr_w(header)); header[0] = 0; size = sizeof(header); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CONNECTION, NULL, &header, &size, NULL); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); ok(!wcscmp( header, L"Upgrade" ), "got %s\n", wine_dbgstr_w(header)); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); - ok(ret, "got %u\n", GetLastError()); - ok(status == HTTP_STATUS_SWITCH_PROTOCOLS, "got %u\n", status); + ok(ret, "got %lu\n", GetLastError()); + ok(status == HTTP_STATUS_SWITCH_PROTOCOLS, "got %lu\n", status); len = 0xdeadbeef; size = sizeof(len); @@ -3288,191 +3284,191 @@ static void test_websocket(int port) index = 0; size = sizeof(buf); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM, L"Sec-WebSocket-Accept", buf, &size, &index); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); socket = pWinHttpWebSocketCompleteUpgrade(request, 0); - ok(socket != NULL, "got %u\n", GetLastError()); + ok(socket != NULL, "got %lu\n", GetLastError()); size = sizeof(header); ret = WinHttpQueryHeaders(socket, WINHTTP_QUERY_UPGRADE, NULL, &header, &size, NULL); error = GetLastError(); ok(!ret, "success\n"); - ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, "got %u\n", error); + ok(error == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, "got %lu\n", error); header[0] = 0; size = sizeof(header); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_UPGRADE, NULL, &header, &size, NULL); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); ok(!wcscmp( header, L"websocket" ), "got %s\n", wine_dbgstr_w(header)); header[0] = 0; size = sizeof(header); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CONNECTION, NULL, &header, &size, NULL); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); ok(!wcscmp( header, L"Upgrade" ), "got %s\n", wine_dbgstr_w(header)); index = 0; size = sizeof(buf); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM, L"Sec-WebSocket-Accept", buf, &size, &index); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); /* sending request again generates new key */ ret = WinHttpSendRequest(request, NULL, 0, NULL, 0, 0, 0); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); /* and creates a new websocket */ socket2 = pWinHttpWebSocketCompleteUpgrade(request, 0); - ok(socket2 != NULL, "got %u\n", GetLastError()); + ok(socket2 != NULL, "got %lu\n", GetLastError()); ok(socket2 != socket, "got same socket\n"); WinHttpCloseHandle(connection); /* request handle is still valid */ size = sizeof(ctx); ret = WinHttpQueryOption(request, WINHTTP_OPTION_CONTEXT_VALUE, &ctx, &size); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); ret = WinHttpCloseHandle(socket2); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); ret = WinHttpCloseHandle(socket); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); ret = WinHttpQueryOption(request, WINHTTP_OPTION_CONTEXT_VALUE, &ctx, &size); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); ret = WinHttpCloseHandle(session); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); ret = WinHttpQueryOption(request, WINHTTP_OPTION_CONTEXT_VALUE, &ctx, &size); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); ret = WinHttpCloseHandle(request); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); session = WinHttpOpen(L"winetest", 0, NULL, NULL, 0); - ok(session != NULL, "got %u\n", GetLastError()); + ok(session != NULL, "got %lu\n", GetLastError()); connection = WinHttpConnect(session, L"ws.ifelse.io", 0, 0); - ok(connection != NULL, "got %u\n", GetLastError()); + ok(connection != NULL, "got %lu\n", GetLastError()); request = WinHttpOpenRequest(connection, L"GET", L"/", NULL, NULL, NULL, 0); - ok(request != NULL, "got %u\n", GetLastError()); + ok(request != NULL, "got %lu\n", GetLastError()); ret = WinHttpSetOption(request, WINHTTP_OPTION_UPGRADE_TO_WEB_SOCKET, NULL, 0); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); ret = WinHttpSendRequest(request, NULL, 0, NULL, 0, 0, 0); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); ret = WinHttpReceiveResponse(request, NULL); - ok(ret, "got %u\n", GetLastError()); + ok(ret, "got %lu\n", GetLastError()); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); - ok(ret, "got %u\n", GetLastError()); - ok(status == HTTP_STATUS_SWITCH_PROTOCOLS, "got %u\n", status); + ok(ret, "got %lu\n", GetLastError()); + ok(status == HTTP_STATUS_SWITCH_PROTOCOLS, "got %lu\n", status); socket = pWinHttpWebSocketCompleteUpgrade(request, 0); - ok(socket != NULL, "got %u\n", GetLastError()); + ok(socket != NULL, "got %lu\n", GetLastError()); buf[0] = 0; count = 0; type = 0xdeadbeef; error = pWinHttpWebSocketReceive(socket, buf, sizeof(buf), &count, &type); - ok(!error, "got %u\n", error); + ok(!error, "got %lu\n", error); ok(buf[0] == 'R', "got %c\n", buf[0]); - ok(count == 26, "got %u\n", count); + ok(count == 26, "got %lu\n", count); ok(type == WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE, "got %u\n", type); error = pWinHttpWebSocketSend(socket, WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, NULL, 1); - ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "got %lu\n", error); large_buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(buf) * 2); memcpy(large_buf, "hello", sizeof("hello")); memcpy(large_buf + sizeof(buf), "world", sizeof("world")); error = pWinHttpWebSocketSend(socket, WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, large_buf, sizeof(buf) * 2); - ok(!error, "got %u\n", error); + ok(!error, "got %lu\n", error); HeapFree(GetProcessHeap(), 0, large_buf); error = pWinHttpWebSocketReceive(socket, NULL, 0, NULL, NULL); - ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "got %lu\n", error); error = pWinHttpWebSocketReceive(socket, buf, 0, NULL, NULL); - ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "got %lu\n", error); error = pWinHttpWebSocketReceive(socket, NULL, 1, NULL, NULL); - ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "got %lu\n", error); buf[0] = 0; count = 0; type = 0xdeadbeef; error = pWinHttpWebSocketReceive(socket, buf, sizeof(buf), &count, &type); - ok(!error, "got %u\n", error); + ok(!error, "got %lu\n", error); ok(buf[0] == 'h', "got %c\n", buf[0]); - ok(count == sizeof(buf), "got %u\n", count); + ok(count == sizeof(buf), "got %lu\n", count); ok(type == WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE, "got %u\n", type); buf[0] = 0; count = 0; type = 0xdeadbeef; error = pWinHttpWebSocketReceive(socket, buf, sizeof(buf), &count, &type); - ok(!error, "got %u\n", error); + ok(!error, "got %lu\n", error); ok(buf[0] == 'w', "got %c\n", buf[0]); - ok(count == sizeof(buf), "got %u\n", count); + ok(count == sizeof(buf), "got %lu\n", count); ok(type == WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, "got %u\n", type); error = pWinHttpWebSocketShutdown(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, NULL, 1); - ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "got %lu\n", error); error = pWinHttpWebSocketShutdown(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, buf, sizeof(buf)); - ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "got %lu\n", error); error = pWinHttpWebSocketShutdown(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, (void *)"success", sizeof("success")); - ok(!error, "got %u\n", error); + ok(!error, "got %lu\n", error); error = pWinHttpWebSocketClose(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, NULL, 1); - ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "got %lu\n", error); error = pWinHttpWebSocketClose(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, buf, sizeof(buf)); - ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "got %lu\n", error); error = pWinHttpWebSocketClose(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, (void *)"success2", sizeof("success2")); - ok(!error, "got %u\n", error); + ok(!error, "got %lu\n", error); error = pWinHttpWebSocketQueryCloseStatus(socket, NULL, NULL, 0, NULL); - ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "got %lu\n", error); error = pWinHttpWebSocketQueryCloseStatus(socket, &close_status, NULL, 0, NULL); - ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "got %lu\n", error); error = pWinHttpWebSocketQueryCloseStatus(socket, &close_status, buf, 0, NULL); - ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "got %lu\n", error); error = pWinHttpWebSocketQueryCloseStatus(socket, &close_status, buf, sizeof(buf), NULL); - ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "got %lu\n", error); error = pWinHttpWebSocketQueryCloseStatus(socket, NULL, NULL, 0, &len); - ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "got %lu\n", error); len = 0xdeadbeef; error = pWinHttpWebSocketQueryCloseStatus(socket, &close_status, NULL, 0, &len); - ok(!error, "got %u\n", error); - ok(!len, "got %u\n", len); + ok(!error, "got %lu\n", error); + ok(!len, "got %lu\n", len); error = pWinHttpWebSocketQueryCloseStatus(socket, &close_status, NULL, 1, &len); - ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "got %lu\n", error); close_status = 0xdead; len = 0xdeadbeef; memset(buf, 0, sizeof(buf)); error = pWinHttpWebSocketQueryCloseStatus(socket, &close_status, buf, sizeof(buf), &len); - ok(!error, "got %u\n", error); - ok(close_status == 1000, "got %08x\n", close_status); - ok(!len, "got %u\n", len); + ok(!error, "got %lu\n", error); + ok(close_status == 1000, "got %d\n", close_status); + ok(!len, "got %lu\n", len); WinHttpCloseHandle(socket); WinHttpCloseHandle(request); @@ -3494,44 +3490,44 @@ static void test_not_modified(int port) session = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0); - ok(session != NULL, "WinHttpOpen failed: %u\n", GetLastError()); + ok(session != NULL, "WinHttpOpen failed: %lu\n", GetLastError()); connection = WinHttpConnect(session, L"localhost", port, 0); - ok(connection != NULL, "WinHttpConnect failed: %u\n", GetLastError()); + ok(connection != NULL, "WinHttpConnect failed: %lu\n", GetLastError()); request = WinHttpOpenRequest(connection, NULL, L"/not_modified", NULL, WINHTTP_NO_REFERER, WINHTTP_DEFAULT_ACCEPT_TYPES, WINHTTP_FLAG_BYPASS_PROXY_CACHE); - ok(request != NULL, "WinHttpOpenrequest failed: %u\n", GetLastError()); + ok(request != NULL, "WinHttpOpenrequest failed: %lu\n", GetLastError()); ret = WinHttpSendRequest(request, today, 0, NULL, 0, 0, 0); - ok(ret, "WinHttpSendRequest failed: %u\n", GetLastError()); + ok(ret, "WinHttpSendRequest failed: %lu\n", GetLastError()); ret = WinHttpReceiveResponse(request, NULL); - ok(ret, "WinHttpReceiveResponse failed: %u\n", GetLastError()); + ok(ret, "WinHttpReceiveResponse failed: %lu\n", GetLastError()); index = 0; len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"If-Modified-Since", buffer, &len, &index); - ok(ret, "failed to get header %u\n", GetLastError()); + ok(ret, "failed to get header %lu\n", GetLastError()); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); - ok(ret, "WinHttpQueryHeaders failed: %u\n", GetLastError()); - ok(status == HTTP_STATUS_NOT_MODIFIED, "got %u\n", status); + ok(ret, "WinHttpQueryHeaders failed: %lu\n", GetLastError()); + ok(status == HTTP_STATUS_NOT_MODIFIED, "got %lu\n", status); size = 0xdeadbeef; ret = WinHttpQueryDataAvailable(request, &size); - ok(ret, "WinHttpQueryDataAvailable failed: %u\n", GetLastError()); - ok(!size, "got %u\n", size); + ok(ret, "WinHttpQueryDataAvailable failed: %lu\n", GetLastError()); + ok(!size, "got %lu\n", size); WinHttpCloseHandle(request); WinHttpCloseHandle(connection); WinHttpCloseHandle(session); start = GetTickCount() - start; - ok(start <= 2000, "Expected less than 2 seconds for the test, got %u ms\n", start); + ok(start <= 2000, "Expected less than 2 seconds for the test, got %lu ms\n", start); } static void test_bad_header( int port ) @@ -3542,34 +3538,34 @@ static void test_bad_header( int port ) BOOL ret; ses = WinHttpOpen( L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); - ok( ses != NULL, "failed to open session %u\n", GetLastError() ); + ok( ses != NULL, "failed to open session %lu\n", GetLastError() ); con = WinHttpConnect( ses, L"localhost", port, 0 ); - ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + ok( con != NULL, "failed to open a connection %lu\n", GetLastError() ); req = WinHttpOpenRequest( con, NULL, NULL, NULL, NULL, NULL, 0 ); - ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); ret = WinHttpAddRequestHeaders( req, L"Content-Type: text/html\n\rContent-Length:6\rCookie:111", ~0u, WINHTTP_ADDREQ_FLAG_ADD ); - ok( ret, "failed to add header %u\n", GetLastError() ); + ok( ret, "failed to add header %lu\n", GetLastError() ); index = 0; buffer[0] = 0; len = sizeof(buffer); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_CUSTOM|WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Content-Type", buffer, &len, &index ); - ok( ret, "failed to query headers %u\n", GetLastError() ); + ok( ret, "failed to query headers %lu\n", GetLastError() ); ok( !lstrcmpW( buffer, L"text/html" ), "got %s\n", wine_dbgstr_w(buffer) ); - ok( index == 1, "index = %u\n", index ); + ok( index == 1, "index = %lu\n", index ); index = 0; buffer[0] = 0; len = sizeof(buffer); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_CUSTOM|WINHTTP_QUERY_FLAG_REQUEST_HEADERS, L"Cookie", buffer, &len, &index ); - ok( ret, "failed to query headers %u\n", GetLastError() ); + ok( ret, "failed to query headers %lu\n", GetLastError() ); ok( !lstrcmpW( buffer, L"111" ), "got %s\n", wine_dbgstr_w(buffer) ); - ok( index == 1, "index = %u\n", index ); + ok( index == 1, "index = %lu\n", index ); WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); @@ -3583,16 +3579,16 @@ static void test_multiple_reads(int port) BOOL ret; ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); con = WinHttpConnect(ses, L"localhost", port, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); req = WinHttpOpenRequest(con, NULL, L"big", NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); - ok(ret, "failed to send request %u\n", GetLastError()); + ok(ret, "failed to send request %lu\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); ok(ret == TRUE, "expected success\n"); @@ -3601,7 +3597,7 @@ static void test_multiple_reads(int port) { DWORD len = 0xdeadbeef; ret = WinHttpQueryDataAvailable( req, &len ); - ok( ret, "WinHttpQueryDataAvailable failed with error %u\n", GetLastError() ); + ok( ret, "WinHttpQueryDataAvailable failed with error %lu\n", GetLastError() ); if (ret) ok( len != 0xdeadbeef, "WinHttpQueryDataAvailable return wrong length\n" ); if (len) { @@ -3609,8 +3605,8 @@ static void test_multiple_reads(int port) char *buf = HeapAlloc( GetProcessHeap(), 0, len + 1 ); ret = WinHttpReadData( req, buf, len, &bytes_read ); - ok(ret, "WinHttpReadData failed: %u.\n", GetLastError()); - ok( len == bytes_read, "only got %u of %u available\n", bytes_read, len ); + ok(ret, "WinHttpReadData failed: %lu\n", GetLastError()); + ok( len == bytes_read, "only got %lu of %lu available\n", bytes_read, len ); HeapFree( GetProcessHeap(), 0, buf ); if (!bytes_read) break; @@ -3618,7 +3614,7 @@ static void test_multiple_reads(int port) } if (!len) break; } - ok(total_len == BIG_BUFFER_LEN, "got wrong length: 0x%x\n", total_len); + ok(total_len == BIG_BUFFER_LEN, "got wrong length: %lu\n", total_len); WinHttpCloseHandle(req); WinHttpCloseHandle(con); @@ -3632,146 +3628,146 @@ static void test_cookies( int port ) BOOL ret; ses = WinHttpOpen( L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); - ok( ses != NULL, "failed to open session %u\n", GetLastError() ); + ok( ses != NULL, "failed to open session %lu\n", GetLastError() ); con = WinHttpConnect( ses, L"localhost", port, 0 ); - ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + ok( con != NULL, "failed to open a connection %lu\n", GetLastError() ); req = WinHttpOpenRequest( con, NULL, L"/cookie", NULL, NULL, NULL, 0 ); - ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); - ok( ret, "failed to send request %u\n", GetLastError() ); + ok( ret, "failed to send request %lu\n", GetLastError() ); ret = WinHttpReceiveResponse( req, NULL ); - ok( ret, "failed to receive response %u\n", GetLastError() ); + ok( ret, "failed to receive response %lu\n", GetLastError() ); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); - ok( ret, "failed to query status code %u\n", GetLastError() ); - ok( status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status ); + ok( ret, "failed to query status code %lu\n", GetLastError() ); + ok( status == HTTP_STATUS_OK, "request failed unexpectedly %lu\n", status ); WinHttpCloseHandle( req ); req = WinHttpOpenRequest( con, NULL, L"/cookie2", NULL, NULL, NULL, 0 ); - ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); - ok( ret, "failed to send request %u\n", GetLastError() ); + ok( ret, "failed to send request %lu\n", GetLastError() ); ret = WinHttpReceiveResponse( req, NULL ); - ok( ret, "failed to receive response %u\n", GetLastError() ); + ok( ret, "failed to receive response %lu\n", GetLastError() ); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); - ok( ret, "failed to query status code %u\n", GetLastError() ); - ok( status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status ); + ok( ret, "failed to query status code %lu\n", GetLastError() ); + ok( status == HTTP_STATUS_OK, "request failed unexpectedly %lu\n", status ); WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); con = WinHttpConnect( ses, L"localhost", port, 0 ); - ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + ok( con != NULL, "failed to open a connection %lu\n", GetLastError() ); req = WinHttpOpenRequest( con, NULL, L"/cookie2", NULL, NULL, NULL, 0 ); - ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); - ok( ret, "failed to send request %u\n", GetLastError() ); + ok( ret, "failed to send request %lu\n", GetLastError() ); ret = WinHttpReceiveResponse( req, NULL ); - ok( ret, "failed to receive response %u\n", GetLastError() ); + ok( ret, "failed to receive response %lu\n", GetLastError() ); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); - ok( ret, "failed to query status code %u\n", GetLastError() ); - ok( status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status ); + ok( ret, "failed to query status code %lu\n", GetLastError() ); + ok( status == HTTP_STATUS_OK, "request failed unexpectedly %lu\n", status ); WinHttpCloseHandle( req ); req = WinHttpOpenRequest( con, NULL, L"/cookie3", NULL, NULL, NULL, 0 ); - ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); ret = WinHttpSendRequest( req, L"Cookie: name=value2\r\n", ~0u, NULL, 0, 0, 0 ); - ok( ret, "failed to send request %u\n", GetLastError() ); + ok( ret, "failed to send request %lu\n", GetLastError() ); ret = WinHttpReceiveResponse( req, NULL ); - ok( ret, "failed to receive response %u\n", GetLastError() ); + ok( ret, "failed to receive response %lu\n", GetLastError() ); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); - ok( ret, "failed to query status code %u\n", GetLastError() ); - ok( status == HTTP_STATUS_OK || broken(status == HTTP_STATUS_BAD_REQUEST), "request failed unexpectedly %u\n", status ); + ok( ret, "failed to query status code %lu\n", GetLastError() ); + ok( status == HTTP_STATUS_OK || broken(status == HTTP_STATUS_BAD_REQUEST), "request failed unexpectedly %lu\n", status ); WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); ses = WinHttpOpen( L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); - ok( ses != NULL, "failed to open session %u\n", GetLastError() ); + ok( ses != NULL, "failed to open session %lu\n", GetLastError() ); con = WinHttpConnect( ses, L"localhost", port, 0 ); - ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + ok( con != NULL, "failed to open a connection %lu\n", GetLastError() ); req = WinHttpOpenRequest( con, NULL, L"/cookie2", NULL, NULL, NULL, 0 ); - ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); - ok( ret, "failed to send request %u\n", GetLastError() ); + ok( ret, "failed to send request %lu\n", GetLastError() ); ret = WinHttpReceiveResponse( req, NULL ); - ok( ret, "failed to receive response %u\n", GetLastError() ); + ok( ret, "failed to receive response %lu\n", GetLastError() ); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); - ok( ret, "failed to query status code %u\n", GetLastError() ); - ok( status == HTTP_STATUS_BAD_REQUEST, "request failed unexpectedly %u\n", status ); + ok( ret, "failed to query status code %lu\n", GetLastError() ); + ok( status == HTTP_STATUS_BAD_REQUEST, "request failed unexpectedly %lu\n", status ); WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); ses = WinHttpOpen( L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); - ok( ses != NULL, "failed to open session %u\n", GetLastError() ); + ok( ses != NULL, "failed to open session %lu\n", GetLastError() ); con = WinHttpConnect( ses, L"localhost", port, 0 ); - ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + ok( con != NULL, "failed to open a connection %lu\n", GetLastError() ); req = WinHttpOpenRequest( con, NULL, L"/cookie4", NULL, NULL, NULL, 0 ); - ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); - ok( ret, "failed to send request %u\n", GetLastError() ); + ok( ret, "failed to send request %lu\n", GetLastError() ); ret = WinHttpReceiveResponse( req, NULL ); - ok( ret, "failed to receive response %u\n", GetLastError() ); + ok( ret, "failed to receive response %lu\n", GetLastError() ); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); - ok( ret, "failed to query status code %u\n", GetLastError() ); - ok( status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status ); + ok( ret, "failed to query status code %lu\n", GetLastError() ); + ok( status == HTTP_STATUS_OK, "request failed unexpectedly %lu\n", status ); WinHttpCloseHandle( req ); req = WinHttpOpenRequest( con, NULL, L"/cookie5", NULL, NULL, NULL, 0 ); - ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); - ok( ret, "failed to send request %u\n", GetLastError() ); + ok( ret, "failed to send request %lu\n", GetLastError() ); ret = WinHttpReceiveResponse( req, NULL ); - ok( ret, "failed to receive response %u\n", GetLastError() ); + ok( ret, "failed to receive response %lu\n", GetLastError() ); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); - ok( ret, "failed to query status code %u\n", GetLastError() ); + ok( ret, "failed to query status code %lu\n", GetLastError() ); ok( status == HTTP_STATUS_OK || broken(status == HTTP_STATUS_BAD_REQUEST) /* < win7 */, - "request failed unexpectedly %u\n", status ); + "request failed unexpectedly %lu\n", status ); WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); @@ -3785,20 +3781,20 @@ static void do_request( HINTERNET con, const WCHAR *obj, DWORD flags ) BOOL ret; req = WinHttpOpenRequest( con, NULL, obj, NULL, NULL, NULL, flags ); - ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); - ok( ret, "failed to send request %u\n", GetLastError() ); + ok( ret, "failed to send request %lu\n", GetLastError() ); ret = WinHttpReceiveResponse( req, NULL ); - ok( ret, "failed to receive response %u\n", GetLastError() ); + ok( ret, "failed to receive response %lu\n", GetLastError() ); status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); - ok( ret, "failed to query status code %u\n", GetLastError() ); + ok( ret, "failed to query status code %lu\n", GetLastError() ); ok( status == HTTP_STATUS_OK || broken(status == HTTP_STATUS_BAD_REQUEST) /* < win7 */, - "request %s with flags %08x failed %u\n", wine_dbgstr_w(obj), flags, status ); + "request %s with flags %#lx failed %lu\n", wine_dbgstr_w(obj), flags, status ); WinHttpCloseHandle( req ); } @@ -3829,10 +3825,10 @@ static void test_request_path_escapes( int port ) HINTERNET ses, con; ses = WinHttpOpen( L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); - ok( ses != NULL, "failed to open session %u\n", GetLastError() ); + ok( ses != NULL, "failed to open session %lu\n", GetLastError() ); con = WinHttpConnect( ses, L"localhost", port, 0 ); - ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + ok( con != NULL, "failed to open a connection %lu\n", GetLastError() ); do_request( con, objW, 0 ); do_request( con, obj2W, WINHTTP_FLAG_ESCAPE_PERCENT ); @@ -3854,13 +3850,13 @@ static void test_connection_info( int port ) BOOL ret; ses = WinHttpOpen( L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); - ok( ses != NULL, "failed to open session %u\n", GetLastError() ); + ok( ses != NULL, "failed to open session %lu\n", GetLastError() ); con = WinHttpConnect( ses, L"localhost", port, 0 ); - ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + ok( con != NULL, "failed to open a connection %lu\n", GetLastError() ); req = WinHttpOpenRequest( con, NULL, L"/basic", NULL, NULL, NULL, 0 ); - ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); size = sizeof(info); SetLastError( 0xdeadbeef ); @@ -3872,32 +3868,32 @@ static void test_connection_info( int port ) return; } ok( !ret, "unexpected success\n" ); - ok( error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %u\n", error ); + ok( error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %lu\n", error ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); - ok( ret, "failed to send request %u\n", GetLastError() ); + ok( ret, "failed to send request %lu\n", GetLastError() ); size = 0; SetLastError( 0xdeadbeef ); ret = WinHttpQueryOption( req, WINHTTP_OPTION_CONNECTION_INFO, &info, &size ); error = GetLastError(); ok( !ret, "unexpected success\n" ); - ok( error == ERROR_INSUFFICIENT_BUFFER, "got %u\n", error ); + ok( error == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", error ); size = sizeof(info); memset( &info, 0, sizeof(info) ); ret = WinHttpQueryOption( req, WINHTTP_OPTION_CONNECTION_INFO, &info, &size ); - ok( ret, "failed to retrieve connection info %u\n", GetLastError() ); - ok( info.cbSize == sizeof(info) || info.cbSize == sizeof(info) - sizeof(info.cbSize) /* Win7 */, "wrong size %u\n", info.cbSize ); + ok( ret, "failed to retrieve connection info %lu\n", GetLastError() ); + ok( info.cbSize == sizeof(info) || info.cbSize == sizeof(info) - sizeof(info.cbSize) /* Win7 */, "wrong size %lu\n", info.cbSize ); ret = WinHttpReceiveResponse( req, NULL ); - ok( ret, "failed to receive response %u\n", GetLastError() ); + ok( ret, "failed to receive response %lu\n", GetLastError() ); size = sizeof(info); memset( &info, 0, sizeof(info) ); ret = WinHttpQueryOption( req, WINHTTP_OPTION_CONNECTION_INFO, &info, &size ); - ok( ret, "failed to retrieve connection info %u\n", GetLastError() ); - ok( info.cbSize == sizeof(info) || info.cbSize == sizeof(info) - sizeof(info.cbSize) /* Win7 */, "wrong size %u\n", info.cbSize ); + ok( ret, "failed to retrieve connection info %lu\n", GetLastError() ); + ok( info.cbSize == sizeof(info) || info.cbSize == sizeof(info) - sizeof(info.cbSize) /* Win7 */, "wrong size %lu\n", info.cbSize ); WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); @@ -3914,25 +3910,25 @@ static void test_passport_auth( int port ) BOOL ret; ses = WinHttpOpen( L"winetest", 0, NULL, NULL, 0 ); - ok( ses != NULL, "got %u\n", GetLastError() ); + ok( ses != NULL, "got %lu\n", GetLastError() ); option = WINHTTP_ENABLE_PASSPORT_AUTH; ret = WinHttpSetOption( ses, WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH, &option, sizeof(option) ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); con = WinHttpConnect( ses, L"localhost", port, 0 ); - ok( con != NULL, "got %u\n", GetLastError() ); + ok( con != NULL, "got %lu\n", GetLastError() ); req = WinHttpOpenRequest( con, NULL, L"/passport", NULL, NULL, NULL, 0 ); - ok( req != NULL, "got %u\n", GetLastError() ); + ok( req != NULL, "got %lu\n", GetLastError() ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); ret = WinHttpReceiveResponse( req, NULL ); err = GetLastError(); ok( ret || broken(!ret && err == ERROR_WINHTTP_LOGIN_FAILURE) /* winxp */ - || broken(!ret && err == ERROR_WINHTTP_INVALID_SERVER_RESPONSE ), "got %u\n", err ); + || broken(!ret && err == ERROR_WINHTTP_INVALID_SERVER_RESPONSE ), "got %lu\n", err ); if (!ret) { win_skip("no support for Passport redirects\n"); @@ -3942,23 +3938,23 @@ static void test_passport_auth( int port ) status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); - ok( ret, "got %u\n", GetLastError() ); - ok( status == HTTP_STATUS_DENIED, "got %u\n", status ); + ok( ret, "got %lu\n", GetLastError() ); + ok( status == HTTP_STATUS_DENIED, "got %lu\n", status ); buf[0] = 0; size = sizeof(buf); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_TEXT, NULL, buf, &size, NULL ); - ok( ret, "got %u\n", GetLastError() ); + ok( ret, "got %lu\n", GetLastError() ); ok( !lstrcmpW(L"Found", buf) || broken(!lstrcmpW(L"Unauthorized", buf)) /* < win7 */, "got %s\n", wine_dbgstr_w(buf) ); buf[0] = 0; size = sizeof(buf); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, buf, &size, NULL ); - ok( ret || broken(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER) /* < win7 */, "got %u\n", GetLastError() ); + ok( ret || broken(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER) /* < win7 */, "got %lu\n", GetLastError() ); if (ret) { - ok( size == lstrlenW(headersW) * sizeof(WCHAR), "got %u\n", size ); + ok( size == lstrlenW(headersW) * sizeof(WCHAR), "got %lu\n", size ); ok( !lstrcmpW(headersW, buf), "got %s\n", wine_dbgstr_w(buf) ); } @@ -3980,108 +3976,108 @@ static void test_credentials(void) BOOL ret; ses = WinHttpOpen(L"winetest", 0, proxy_userW, proxy_passW, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); + ok(ses != NULL, "failed to open session %lu\n", GetLastError()); con = WinHttpConnect(ses, L"localhost", 0, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + ok(con != NULL, "failed to open a connection %lu\n", GetLastError()); req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_USERNAME, &buffer, &size); - ok(ret, "failed to query proxy username %u\n", GetLastError()); + ok(ret, "failed to query proxy username %lu\n", GetLastError()); ok(!buffer[0], "unexpected result %s\n", wine_dbgstr_w(buffer)); - ok(!size, "expected 0, got %u\n", size); + ok(!size, "expected 0, got %lu\n", size); size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_PASSWORD, &buffer, &size); - ok(ret, "failed to query proxy password %u\n", GetLastError()); + ok(ret, "failed to query proxy password %lu\n", GetLastError()); ok(!buffer[0], "unexpected result %s\n", wine_dbgstr_w(buffer)); - ok(!size, "expected 0, got %u\n", size); + ok(!size, "expected 0, got %lu\n", size); ret = WinHttpSetOption(req, WINHTTP_OPTION_PROXY_USERNAME, proxy_userW, lstrlenW(proxy_userW)); - ok(ret, "failed to set username %u\n", GetLastError()); + ok(ret, "failed to set username %lu\n", GetLastError()); size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_USERNAME, &buffer, &size); - ok(ret, "failed to query proxy username %u\n", GetLastError()); + ok(ret, "failed to query proxy username %lu\n", GetLastError()); ok(!wcscmp(buffer, proxy_userW), "unexpected result %s\n", wine_dbgstr_w(buffer)); - ok(size == lstrlenW(proxy_userW) * sizeof(WCHAR), "unexpected result %u\n", size); + ok(size == lstrlenW(proxy_userW) * sizeof(WCHAR), "unexpected result %lu\n", size); size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_USERNAME, &buffer, &size); - ok(ret, "failed to query username %u\n", GetLastError()); + ok(ret, "failed to query username %lu\n", GetLastError()); ok(!buffer[0], "unexpected result %s\n", wine_dbgstr_w(buffer)); - ok(!size, "expected 0, got %u\n", size); + ok(!size, "expected 0, got %lu\n", size); size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PASSWORD, &buffer, &size); - ok(ret, "failed to query password %u\n", GetLastError()); + ok(ret, "failed to query password %lu\n", GetLastError()); ok(!buffer[0], "unexpected result %s\n", wine_dbgstr_w(buffer)); - ok(!size, "expected 0, got %u\n", size); + ok(!size, "expected 0, got %lu\n", size); ret = WinHttpSetOption(req, WINHTTP_OPTION_PROXY_PASSWORD, proxy_passW, lstrlenW(proxy_passW)); - ok(ret, "failed to set proxy password %u\n", GetLastError()); + ok(ret, "failed to set proxy password %lu\n", GetLastError()); size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_PASSWORD, &buffer, &size); - ok(ret, "failed to query proxy password %u\n", GetLastError()); + ok(ret, "failed to query proxy password %lu\n", GetLastError()); ok(!wcscmp(buffer, proxy_passW), "unexpected result %s\n", wine_dbgstr_w(buffer)); - ok(size == lstrlenW(proxy_passW) * sizeof(WCHAR), "unexpected result %u\n", size); + ok(size == lstrlenW(proxy_passW) * sizeof(WCHAR), "unexpected result %lu\n", size); ret = WinHttpSetOption(req, WINHTTP_OPTION_USERNAME, userW, lstrlenW(userW)); - ok(ret, "failed to set username %u\n", GetLastError()); + ok(ret, "failed to set username %lu\n", GetLastError()); size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_USERNAME, &buffer, &size); - ok(ret, "failed to query username %u\n", GetLastError()); + ok(ret, "failed to query username %lu\n", GetLastError()); ok(!wcscmp(buffer, userW), "unexpected result %s\n", wine_dbgstr_w(buffer)); - ok(size == lstrlenW(userW) * sizeof(WCHAR), "unexpected result %u\n", size); + ok(size == lstrlenW(userW) * sizeof(WCHAR), "unexpected result %lu\n", size); ret = WinHttpSetOption(req, WINHTTP_OPTION_PASSWORD, passW, lstrlenW(passW)); - ok(ret, "failed to set password %u\n", GetLastError()); + ok(ret, "failed to set password %lu\n", GetLastError()); size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PASSWORD, &buffer, &size); - ok(ret, "failed to query password %u\n", GetLastError()); + ok(ret, "failed to query password %lu\n", GetLastError()); ok(!wcscmp(buffer, passW), "unexpected result %s\n", wine_dbgstr_w(buffer)); - ok(size == lstrlenW(passW) * sizeof(WCHAR), "unexpected result %u\n", size); + ok(size == lstrlenW(passW) * sizeof(WCHAR), "unexpected result %lu\n", size); WinHttpCloseHandle(req); req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + ok(req != NULL, "failed to open a request %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, userW, NULL, NULL); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error); SetLastError(0xdeadbeef); ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, NULL, passW, NULL); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %lu\n", error); ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, userW, passW, NULL); - ok(ret, "failed to set credentials %u\n", GetLastError()); + ok(ret, "failed to set credentials %lu\n", GetLastError()); size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_USERNAME, &buffer, &size); - ok(ret, "failed to query username %u\n", GetLastError()); + ok(ret, "failed to query username %lu\n", GetLastError()); todo_wine { ok(!buffer[0], "unexpected result %s\n", wine_dbgstr_w(buffer)); - ok(!size, "expected 0, got %u\n", size); + ok(!size, "expected 0, got %lu\n", size); } size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PASSWORD, &buffer, &size); - ok(ret, "failed to query password %u\n", GetLastError()); + ok(ret, "failed to query password %lu\n", GetLastError()); todo_wine { ok(!buffer[0], "unexpected result %s\n", wine_dbgstr_w(buffer)); - ok(!size, "expected 0, got %u\n", size); + ok(!size, "expected 0, got %lu\n", size); } WinHttpCloseHandle(req); @@ -4112,7 +4108,7 @@ static void test_IWinHttpRequest(int port) CoInitialize( NULL ); hr = CoCreateInstance( &CLSID_WinHttpRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IWinHttpRequest, (void **)&req ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); V_VT( &empty ) = VT_ERROR; V_ERROR( &empty ) = 0xdeadbeef; @@ -4123,54 +4119,54 @@ static void test_IWinHttpRequest(int port) method = SysAllocString( L"POST" ); url = SysAllocString( L"http://test.winehq.org/tests/post.php" ); hr = IWinHttpRequest_Open( req, method, url, async ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( method ); SysFreeString( url ); V_VT( &data ) = VT_BSTR; V_BSTR( &data ) = SysAllocString( L"testdata\x80" ); hr = IWinHttpRequest_Send( req, data ); - ok( hr == S_OK || hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_INVALID_SERVER_RESPONSE ), "got %08x\n", hr ); + ok( hr == S_OK || hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_INVALID_SERVER_RESPONSE ), "got %#lx\n", hr ); SysFreeString( V_BSTR( &data ) ); if (hr != S_OK) goto done; hr = IWinHttpRequest_Open( req, NULL, NULL, empty ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); method = SysAllocString( L"GET" ); hr = IWinHttpRequest_Open( req, method, NULL, empty ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_Open( req, method, NULL, async ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); url = SysAllocString( L"http://test.winehq.org" ); hr = IWinHttpRequest_Open( req, NULL, url, empty ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_Abort( req ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_Open( req, method, url, empty ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_Abort( req ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); IWinHttpRequest_Release( req ); hr = CoCreateInstance( &CLSID_WinHttpRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IWinHttpRequest, (void **)&req ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( url ); url = SysAllocString( L"test.winehq.org" ); hr = IWinHttpRequest_Open( req, method, url, async ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ), "got %#lx\n", hr ); SysFreeString( method ); method = SysAllocString( L"INVALID" ); hr = IWinHttpRequest_Open( req, method, url, async ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ), "got %#lx\n", hr ); SysFreeString( method ); method = SysAllocString( L"GET" ); @@ -4179,401 +4175,401 @@ static void test_IWinHttpRequest(int port) V_VT( &async ) = VT_ERROR; V_ERROR( &async ) = DISP_E_PARAMNOTFOUND; hr = IWinHttpRequest_Open( req, method, url, async ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); V_VT( &cp ) = VT_ERROR; V_ERROR( &cp ) = 0xdeadbeef; hr = IWinHttpRequest_get_Option( req, WinHttpRequestOption_URLCodePage, &cp ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &cp ) == VT_I4, "got %08x\n", V_VT( &cp ) ); - ok( V_I4( &cp ) == CP_UTF8, "got %u\n", V_I4( &cp ) ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( V_VT( &cp ) == VT_I4, "got %#x\n", V_VT( &cp ) ); + ok( V_I4( &cp ) == CP_UTF8, "got %ld\n", V_I4( &cp ) ); V_VT( &cp ) = VT_UI4; V_UI4( &cp ) = CP_ACP; hr = IWinHttpRequest_put_Option( req, WinHttpRequestOption_URLCodePage, cp ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); V_VT( &cp ) = VT_ERROR; V_ERROR( &cp ) = 0xdeadbeef; hr = IWinHttpRequest_get_Option( req, WinHttpRequestOption_URLCodePage, &cp ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &cp ) == VT_I4, "got %08x\n", V_VT( &cp ) ); - ok( V_I4( &cp ) == CP_ACP, "got %u\n", V_I4( &cp ) ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( V_VT( &cp ) == VT_I4, "got %#x\n", V_VT( &cp ) ); + ok( V_I4( &cp ) == CP_ACP, "got %ld\n", V_I4( &cp ) ); value = SysAllocString( L"utf-8" ); V_VT( &cp ) = VT_BSTR; V_BSTR( &cp ) = value; hr = IWinHttpRequest_put_Option( req, WinHttpRequestOption_URLCodePage, cp ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( value ); V_VT( &cp ) = VT_ERROR; V_ERROR( &cp ) = 0xdeadbeef; hr = IWinHttpRequest_get_Option( req, WinHttpRequestOption_URLCodePage, &cp ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &cp ) == VT_I4, "got %08x\n", V_VT( &cp ) ); - ok( V_I4( &cp ) == CP_UTF8, "got %u\n", V_I4( &cp ) ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( V_VT( &cp ) == VT_I4, "got %#x\n", V_VT( &cp ) ); + ok( V_I4( &cp ) == CP_UTF8, "got %ld\n", V_I4( &cp ) ); hr = IWinHttpRequest_Abort( req ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_Send( req, empty ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN ), "got %#lx\n", hr ); hr = IWinHttpRequest_Abort( req ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); IWinHttpRequest_Release( req ); hr = CoCreateInstance( &CLSID_WinHttpRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IWinHttpRequest, (void **)&req ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_get_ResponseText( req, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_get_ResponseText( req, &response ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %#lx\n", hr ); hr = IWinHttpRequest_get_Status( req, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_get_Status( req, &status ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %#lx\n", hr ); hr = IWinHttpRequest_get_StatusText( req, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_get_StatusText( req, &status_text ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %#lx\n", hr ); hr = IWinHttpRequest_get_ResponseBody( req, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_SetTimeouts( req, 10000, 10000, 10000, 10000 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_SetCredentials( req, NULL, NULL, 0xdeadbeef ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN ), "got %#lx\n", hr ); VariantInit( &proxy_server ); V_VT( &proxy_server ) = VT_ERROR; VariantInit( &bypass_list ); V_VT( &bypass_list ) = VT_ERROR; hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_DIRECT, proxy_server, bypass_list ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_PROXY, proxy_server, bypass_list ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_DIRECT, proxy_server, bypass_list ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_GetAllResponseHeaders( req, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_GetAllResponseHeaders( req, &headers ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %#lx\n", hr ); hr = IWinHttpRequest_GetResponseHeader( req, NULL, NULL ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %#lx\n", hr ); connection = SysAllocString( L"Connection" ); hr = IWinHttpRequest_GetResponseHeader( req, connection, NULL ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %#lx\n", hr ); hr = IWinHttpRequest_GetResponseHeader( req, connection, &value ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %#lx\n", hr ); hr = IWinHttpRequest_SetRequestHeader( req, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); date = SysAllocString( L"Date" ); hr = IWinHttpRequest_SetRequestHeader( req, date, NULL ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN ), "got %#lx\n", hr ); today = SysAllocString( todayW ); hr = IWinHttpRequest_SetRequestHeader( req, date, today ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN ), "got %#lx\n", hr ); hr = IWinHttpRequest_SetAutoLogonPolicy( req, 0xdeadbeef ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_SetAutoLogonPolicy( req, AutoLogonPolicy_OnlyIfBypassProxy ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( method ); method = SysAllocString( L"GET" ); SysFreeString( url ); url = SysAllocString( L"http://test.winehq.org" ); hr = IWinHttpRequest_Open( req, method, url, async ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_get_ResponseText( req, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_get_ResponseText( req, &response ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %#lx\n", hr ); hr = IWinHttpRequest_get_Status( req, &status ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %#lx\n", hr ); hr = IWinHttpRequest_get_StatusText( req, &status_text ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %#lx\n", hr ); hr = IWinHttpRequest_get_ResponseBody( req, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_SetTimeouts( req, 10000, 10000, 10000, 10000 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_SetCredentials( req, NULL, NULL, 0xdeadbeef ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); username = SysAllocString( L"username" ); hr = IWinHttpRequest_SetCredentials( req, username, NULL, 0xdeadbeef ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); password = SysAllocString( L"password" ); hr = IWinHttpRequest_SetCredentials( req, NULL, password, 0xdeadbeef ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_SetCredentials( req, username, password, 0xdeadbeef ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_SetCredentials( req, NULL, password, HTTPREQUEST_SETCREDENTIALS_FOR_SERVER ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_SetCredentials( req, username, password, HTTPREQUEST_SETCREDENTIALS_FOR_SERVER ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); V_VT( &proxy_server ) = VT_BSTR; V_BSTR( &proxy_server ) = SysAllocString( L"proxyserver" ); V_VT( &bypass_list ) = VT_BSTR; V_BSTR( &bypass_list ) = SysAllocString( L"bypasslist" ); hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_PROXY, proxy_server, bypass_list ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_SetProxy( req, 0xdeadbeef, proxy_server, bypass_list ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_DIRECT, proxy_server, bypass_list ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_GetAllResponseHeaders( req, &headers ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %#lx\n", hr ); hr = IWinHttpRequest_GetResponseHeader( req, connection, &value ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %#lx\n", hr ); hr = IWinHttpRequest_SetRequestHeader( req, date, today ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_SetRequestHeader( req, date, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_SetAutoLogonPolicy( req, AutoLogonPolicy_OnlyIfBypassProxy ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_Send( req, empty ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_Send( req, empty ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_get_ResponseText( req, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_get_ResponseText( req, &response ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !memcmp(response, data_start, sizeof(data_start)), "got %s\n", wine_dbgstr_wn(response, 32) ); SysFreeString( response ); hr = IWinHttpRequest_get_Status( req, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); status = 0; hr = IWinHttpRequest_get_Status( req, &status ); - ok( hr == S_OK, "got %08x\n", hr ); - trace("Status=%d\n", status); + ok( hr == S_OK, "got %#lx\n", hr ); + trace("Status = %lu\n", status); hr = IWinHttpRequest_get_StatusText( req, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_get_StatusText( req, &status_text ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); trace("StatusText=%s\n", wine_dbgstr_w(status_text)); SysFreeString( status_text ); hr = IWinHttpRequest_get_ResponseBody( req, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_SetCredentials( req, username, password, HTTPREQUEST_SETCREDENTIALS_FOR_SERVER ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_PROXY, proxy_server, bypass_list ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_DIRECT, proxy_server, bypass_list ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_GetAllResponseHeaders( req, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_GetAllResponseHeaders( req, &headers ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( headers ); hr = IWinHttpRequest_GetResponseHeader( req, NULL, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_GetResponseHeader( req, connection, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_GetResponseHeader( req, connection, &value ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( value ); hr = IWinHttpRequest_SetRequestHeader( req, date, today ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_AFTER_SEND ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_AFTER_SEND ), "got %#lx\n", hr ); hr = IWinHttpRequest_SetAutoLogonPolicy( req, AutoLogonPolicy_OnlyIfBypassProxy ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); VariantInit( &timeout ); V_VT( &timeout ) = VT_I4; V_I4( &timeout ) = 10; hr = IWinHttpRequest_WaitForResponse( req, timeout, &succeeded ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_get_Status( req, &status ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_get_StatusText( req, &status_text ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( status_text ); hr = IWinHttpRequest_SetCredentials( req, username, password, HTTPREQUEST_SETCREDENTIALS_FOR_SERVER ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_PROXY, proxy_server, bypass_list ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_DIRECT, proxy_server, bypass_list ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_Send( req, empty ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_get_ResponseText( req, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); hr = IWinHttpRequest_get_ResponseText( req, &response ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( response ); hr = IWinHttpRequest_get_ResponseBody( req, NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %#lx\n", hr ); VariantInit( &body ); V_VT( &body ) = VT_ERROR; hr = IWinHttpRequest_get_ResponseBody( req, &body ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &body ) == (VT_ARRAY|VT_UI1), "got %08x\n", V_VT( &body ) ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( V_VT( &body ) == (VT_ARRAY|VT_UI1), "got %#x\n", V_VT( &body ) ); hr = VariantClear( &body ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); VariantInit( &body ); V_VT( &body ) = VT_ERROR; hr = IWinHttpRequest_get_ResponseStream( req, &body ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &body ) == VT_UNKNOWN, "got %08x\n", V_VT( &body ) ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( V_VT( &body ) == VT_UNKNOWN, "got %#x\n", V_VT( &body ) ); hr = IUnknown_QueryInterface( V_UNKNOWN( &body ), &IID_IStream, (void **)&stream ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( V_UNKNOWN( &body ) == (IUnknown *)stream, "got different interface pointer\n" ); buf[0] = 0; count = 0xdeadbeef; hr = IStream_Read( stream, buf, 128, &count ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( count != 0xdeadbeef, "count not set\n" ); ok( buf[0], "no data\n" ); VariantInit( &body2 ); V_VT( &body2 ) = VT_ERROR; hr = IWinHttpRequest_get_ResponseStream( req, &body2 ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &body2 ) == VT_UNKNOWN, "got %08x\n", V_VT( &body2 ) ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( V_VT( &body2 ) == VT_UNKNOWN, "got %#x\n", V_VT( &body2 ) ); ok( V_UNKNOWN( &body ) != V_UNKNOWN( &body2 ), "got same interface pointer\n" ); hr = IUnknown_QueryInterface( V_UNKNOWN( &body2 ), &IID_IStream, (void **)&stream2 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( V_UNKNOWN( &body2 ) == (IUnknown *)stream2, "got different interface pointer\n" ); IStream_Release( stream2 ); hr = VariantClear( &body ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = VariantClear( &body2 ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_PROXY, proxy_server, bypass_list ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_SetProxy( req, HTTPREQUEST_PROXYSETTING_DIRECT, proxy_server, bypass_list ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_GetAllResponseHeaders( req, &headers ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( headers ); hr = IWinHttpRequest_GetResponseHeader( req, connection, &value ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( value ); hr = IWinHttpRequest_SetRequestHeader( req, date, today ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_AFTER_SEND ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_AFTER_SEND ), "got %#lx\n", hr ); hr = IWinHttpRequest_SetAutoLogonPolicy( req, AutoLogonPolicy_OnlyIfBypassProxy ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_Send( req, empty ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_Abort( req ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_Abort( req ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); IWinHttpRequest_Release( req ); pos.QuadPart = 0; hr = IStream_Seek( stream, pos, STREAM_SEEK_SET, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); buf[0] = 0; count = 0xdeadbeef; hr = IStream_Read( stream, buf, 128, &count ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( count != 0xdeadbeef, "count not set\n" ); ok( buf[0], "no data\n" ); IStream_Release( stream ); hr = CoCreateInstance( &CLSID_WinHttpRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IWinHttpRequest, (void **)&req ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); V_VT( &async ) = VT_I4; V_I4( &async ) = 1; hr = IWinHttpRequest_Open( req, method, url, async ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_Send( req, empty ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); hr = IWinHttpRequest_WaitForResponse( req, timeout, &succeeded ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); IWinHttpRequest_Release( req ); @@ -4588,31 +4584,31 @@ static void test_IWinHttpRequest(int port) VariantClear( &bypass_list ); hr = CoCreateInstance( &CLSID_WinHttpRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IWinHttpRequest, (void **)&req ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); url = SysAllocString( L"https://test.winehq.org:443" ); method = SysAllocString( L"POST" ); V_VT( &async ) = VT_BOOL; V_BOOL( &async ) = VARIANT_FALSE; hr = IWinHttpRequest_Open( req, method, url, async ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( method ); SysFreeString( url ); hr = IWinHttpRequest_Send( req, empty ); ok( hr == S_OK || hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_INVALID_SERVER_RESPONSE ) || - hr == SEC_E_ILLEGAL_MESSAGE /* winxp */, "got %08x\n", hr ); + hr == SEC_E_ILLEGAL_MESSAGE /* winxp */, "got %#lx\n", hr ); if (hr != S_OK) goto done; hr = IWinHttpRequest_get_ResponseText( req, &response ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !memcmp(response, data_start, sizeof(data_start)), "got %s\n", wine_dbgstr_wn(response, 32) ); SysFreeString( response ); IWinHttpRequest_Release( req ); hr = CoCreateInstance( &CLSID_WinHttpRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IWinHttpRequest, (void **)&req ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); sprintf( buf, "http://localhost:%d/auth", port ); MultiByteToWideChar( CP_ACP, 0, buf, -1, bufW, ARRAY_SIZE( bufW )); @@ -4621,28 +4617,28 @@ static void test_IWinHttpRequest(int port) V_VT( &async ) = VT_BOOL; V_BOOL( &async ) = VARIANT_FALSE; hr = IWinHttpRequest_Open( req, method, url, async ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( method ); SysFreeString( url ); hr = IWinHttpRequest_get_Status( req, &status ); - ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %#lx\n", hr ); V_VT( &data ) = VT_BSTR; V_BSTR( &data ) = SysAllocString( L"testdata\x80" ); hr = IWinHttpRequest_Send( req, data ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); SysFreeString( V_BSTR( &data ) ); hr = IWinHttpRequest_get_ResponseText( req, &response ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %#lx\n", hr ); ok( !memcmp( response, L"Unauthorized", sizeof(L"Unauthorized") ), "got %s\n", wine_dbgstr_w(response) ); SysFreeString( response ); status = 0xdeadbeef; hr = IWinHttpRequest_get_Status( req, &status ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( status == HTTP_STATUS_DENIED, "got %d\n", status ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( status == HTTP_STATUS_DENIED, "got %lu\n", status ); done: IWinHttpRequest_Release( req ); @@ -4666,7 +4662,7 @@ static void request_get_property(IWinHttpRequest *request, int property, VARIANT VariantInit(ret); hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYGET, &params, ret, NULL, NULL); - ok(hr == S_OK, "error %#x\n", hr); + ok(hr == S_OK, "error %#lx\n", hr); } static void test_IWinHttpRequest_Invoke(void) @@ -4688,28 +4684,28 @@ static void test_IWinHttpRequest_Invoke(void) CoInitialize(NULL); hr = CLSIDFromProgID(L"WinHttp.WinHttpRequest.5.1", &clsid); - ok(hr == S_OK, "CLSIDFromProgID error %#x\n", hr); + ok(hr == S_OK, "CLSIDFromProgID error %#lx\n", hr); bret = IsEqualIID(&clsid, &CLSID_WinHttpRequest); ok(bret || broken(!bret) /* win2003 */, "not expected %s\n", wine_dbgstr_guid(&clsid)); hr = CoCreateInstance(&CLSID_WinHttpRequest, 0, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&request); - ok(hr == S_OK, "error %#x\n", hr); + ok(hr == S_OK, "error %#lx\n", hr); hr = IWinHttpRequest_QueryInterface(request, &IID_IDispatch, (void **)&dispatch); - ok(hr == S_OK, "error %#x\n", hr); + ok(hr == S_OK, "error %#lx\n", hr); IDispatch_Release(dispatch); hr = IWinHttpRequest_GetIDsOfNames(request, &IID_NULL, &open, 1, 0x0409, &id); - ok(hr == S_OK, "error %#x\n", hr); - ok(id == DISPID_HTTPREQUEST_OPEN, "expected DISPID_HTTPREQUEST_OPEN, got %u\n", id); + ok(hr == S_OK, "error %#lx\n", hr); + ok(id == DISPID_HTTPREQUEST_OPEN, "expected DISPID_HTTPREQUEST_OPEN, got %lu\n", id); hr = IWinHttpRequest_GetIDsOfNames(request, &IID_NULL, &option, 1, 0x0409, &id); - ok(hr == S_OK, "error %#x\n", hr); - ok(id == DISPID_HTTPREQUEST_OPTION, "expected DISPID_HTTPREQUEST_OPTION, got %u\n", id); + ok(hr == S_OK, "error %#lx\n", hr); + ok(id == DISPID_HTTPREQUEST_OPTION, "expected DISPID_HTTPREQUEST_OPTION, got %lu\n", id); request_get_property(request, WinHttpRequestOption_URLCodePage, &ret); - ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); - ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %d\n", V_I4(&ret)); + ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %#x\n", V_VT(&ret)); + ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %ld\n", V_I4(&ret)); memset(&params, 0, sizeof(params)); params.cArgs = 2; @@ -4722,11 +4718,11 @@ static void test_IWinHttpRequest_Invoke(void) VariantInit(&ret); hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_METHOD, &params, NULL, NULL, &err); - ok(hr == S_OK, "error %#x\n", hr); + ok(hr == S_OK, "error %#lx\n", hr); request_get_property(request, WinHttpRequestOption_URLCodePage, &ret); - ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); - ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %d\n", V_I4(&ret)); + ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %#x\n", V_VT(&ret)); + ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %ld\n", V_I4(&ret)); memset(&params, 0, sizeof(params)); params.cArgs = 2; @@ -4739,11 +4735,11 @@ static void test_IWinHttpRequest_Invoke(void) VariantInit(&ret); hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_METHOD | DISPATCH_PROPERTYPUT, &params, NULL, NULL, &err); - ok(hr == S_OK, "error %#x\n", hr); + ok(hr == S_OK, "error %#lx\n", hr); request_get_property(request, WinHttpRequestOption_URLCodePage, &ret); - ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); - ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %d\n", V_I4(&ret)); + ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %#x\n", V_VT(&ret)); + ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %ld\n", V_I4(&ret)); memset(&params, 0, sizeof(params)); params.cArgs = 2; @@ -4756,11 +4752,11 @@ static void test_IWinHttpRequest_Invoke(void) VariantInit(&ret); hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &params, NULL, NULL, &err); - ok(hr == S_OK, "error %#x\n", hr); + ok(hr == S_OK, "error %#lx\n", hr); request_get_property(request, WinHttpRequestOption_URLCodePage, &ret); - ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); - ok(V_I4(&ret) == 1252, "expected 1252, got %d\n", V_I4(&ret)); + ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %#x\n", V_VT(&ret)); + ok(V_I4(&ret) == 1252, "expected 1252, got %ld\n", V_I4(&ret)); memset(&params, 0, sizeof(params)); params.cArgs = 2; @@ -4772,37 +4768,37 @@ static void test_IWinHttpRequest_Invoke(void) V_VT(&arg[1]) = VT_R8; V_R8(&arg[1]) = 2.0; /* WinHttpRequestOption_URLCodePage */ hr = IWinHttpRequest_Invoke(request, id, &IID_NULL, 0, DISPATCH_METHOD, &params, NULL, NULL, &err); - ok(hr == S_OK, "error %#x\n", hr); + ok(hr == S_OK, "error %#lx\n", hr); request_get_property(request, WinHttpRequestOption_URLCodePage, &ret); - ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); - ok(V_I4(&ret) == 1252, "expected 1252, got %d\n", V_I4(&ret)); + ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %#x\n", V_VT(&ret)); + ok(V_I4(&ret) == 1252, "expected 1252, got %ld\n", V_I4(&ret)); VariantInit(&ret); hr = IWinHttpRequest_Invoke(request, id, &IID_NULL, 0, DISPATCH_METHOD, &params, &ret, NULL, &err); - ok(hr == S_OK, "error %#x\n", hr); + ok(hr == S_OK, "error %#lx\n", hr); request_get_property(request, WinHttpRequestOption_URLCodePage, &ret); - ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); - ok(V_I4(&ret) == 1252, "expected 1252, got %d\n", V_I4(&ret)); + ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %#x\n", V_VT(&ret)); + ok(V_I4(&ret) == 1252, "expected 1252, got %ld\n", V_I4(&ret)); VariantInit(&ret); hr = IWinHttpRequest_Invoke(request, id, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &params, &ret, NULL, &err); - ok(hr == S_OK, "error %#x\n", hr); + ok(hr == S_OK, "error %#lx\n", hr); request_get_property(request, WinHttpRequestOption_URLCodePage, &ret); - ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); - ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %d\n", V_I4(&ret)); + ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %#x\n", V_VT(&ret)); + ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %ld\n", V_I4(&ret)); hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &params, NULL, NULL, NULL); - ok(hr == S_OK, "error %#x\n", hr); + ok(hr == S_OK, "error %#lx\n", hr); hr = IWinHttpRequest_Invoke(request, 255, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &params, NULL, NULL, NULL); - ok(hr == DISP_E_MEMBERNOTFOUND, "error %#x\n", hr); + ok(hr == DISP_E_MEMBERNOTFOUND, "error %#lx\n", hr); VariantInit(&ret); hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_IUnknown, 0, DISPATCH_PROPERTYPUT, &params, &ret, NULL, &err); - ok(hr == DISP_E_UNKNOWNINTERFACE, "error %#x\n", hr); + ok(hr == DISP_E_UNKNOWNINTERFACE, "error %#lx\n", hr); VariantInit(&ret); if (0) /* crashes */ @@ -4810,13 +4806,13 @@ static void test_IWinHttpRequest_Invoke(void) params.cArgs = 1; hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &params, &ret, NULL, &err); - ok(hr == DISP_E_TYPEMISMATCH, "error %#x\n", hr); + ok(hr == DISP_E_TYPEMISMATCH, "error %#lx\n", hr); VariantInit(&arg[2]); params.cArgs = 3; hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &params, &ret, NULL, &err); todo_wine - ok(hr == S_OK, "error %#x\n", hr); + ok(hr == S_OK, "error %#lx\n", hr); VariantInit(&arg[0]); VariantInit(&arg[1]); @@ -4826,46 +4822,46 @@ static void test_IWinHttpRequest_Invoke(void) V_VT(&arg[0]) = VT_I4; V_I4(&arg[0]) = WinHttpRequestOption_URLCodePage; hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYGET, &params, NULL, NULL, NULL); - ok(hr == S_OK, "error %#x\n", hr); + ok(hr == S_OK, "error %#lx\n", hr); V_VT(&ret) = 0xdead; V_I4(&ret) = 0xbeef; hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_METHOD|DISPATCH_PROPERTYGET, &params, &ret, NULL, NULL); - ok(hr == S_OK, "error %#x\n", hr); - ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); - ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %d\n", V_I4(&ret)); + ok(hr == S_OK, "error %#lx\n", hr); + ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %#x\n", V_VT(&ret)); + ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %ld\n", V_I4(&ret)); V_VT(&ret) = 0xdead; V_I4(&ret) = 0xbeef; hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_METHOD, &params, &ret, NULL, NULL); - ok(hr == S_OK, "error %#x\n", hr); - ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %d\n", V_VT(&ret)); - ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %d\n", V_I4(&ret)); + ok(hr == S_OK, "error %#lx\n", hr); + ok(V_VT(&ret) == VT_I4, "expected VT_I4, got %#x\n", V_VT(&ret)); + ok(V_I4(&ret) == CP_UTF8, "expected CP_UTF8, got %ld\n", V_I4(&ret)); hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_METHOD|DISPATCH_PROPERTYGET, &params, NULL, NULL, NULL); - ok(hr == S_OK, "error %#x\n", hr); + ok(hr == S_OK, "error %#lx\n", hr); V_VT(&ret) = 0xdead; V_I4(&ret) = 0xbeef; hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, 0, &params, &ret, NULL, NULL); - ok(hr == S_OK, "error %#x\n", hr); - ok(V_VT(&ret) == VT_EMPTY, "expected VT_EMPTY, got %d\n", V_VT(&ret)); - ok(V_I4(&ret) == 0xbeef || V_I4(&ret) == 0 /* Win8 */, "expected 0xdead, got %d\n", V_I4(&ret)); + ok(hr == S_OK, "error %#lx\n", hr); + ok(V_VT(&ret) == VT_EMPTY, "expected VT_EMPTY, got %#x\n", V_VT(&ret)); + ok(V_I4(&ret) == 0xbeef || V_I4(&ret) == 0 /* Win8 */, "expected 0xdead, got %ld\n", V_I4(&ret)); hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, 0, &params, NULL, NULL, NULL); - ok(hr == S_OK, "error %#x\n", hr); + ok(hr == S_OK, "error %#lx\n", hr); hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_IUnknown, 0, DISPATCH_PROPERTYGET, &params, NULL, NULL, NULL); - ok(hr == DISP_E_UNKNOWNINTERFACE, "error %#x\n", hr); + ok(hr == DISP_E_UNKNOWNINTERFACE, "error %#lx\n", hr); params.cArgs = 2; hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYGET, &params, NULL, NULL, NULL); todo_wine - ok(hr == S_OK, "error %#x\n", hr); + ok(hr == S_OK, "error %#lx\n", hr); params.cArgs = 0; hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYGET, &params, NULL, NULL, NULL); - ok(hr == DISP_E_PARAMNOTFOUND, "error %#x\n", hr); + ok(hr == DISP_E_PARAMNOTFOUND, "error %#lx\n", hr); SysFreeString(utf8); @@ -4875,7 +4871,7 @@ static void test_IWinHttpRequest_Invoke(void) VariantInit(&ret); hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_SETAUTOLOGONPOLICY, &IID_NULL, 0, DISPATCH_METHOD, &params, &ret, NULL, NULL); - ok(hr == S_OK, "error %#x\n", hr); + ok(hr == S_OK, "error %#lx\n", hr); IWinHttpRequest_Release(request); @@ -4892,20 +4888,20 @@ static void test_WinHttpDetectAutoProxyConfigUrl(void) ret = WinHttpDetectAutoProxyConfigUrl( 0, NULL ); error = GetLastError(); ok( !ret, "expected failure\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "got %lu\n", error ); url = NULL; SetLastError(0xdeadbeef); ret = WinHttpDetectAutoProxyConfigUrl( 0, &url ); error = GetLastError(); ok( !ret, "expected failure\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "got %lu\n", error ); SetLastError(0xdeadbeef); ret = WinHttpDetectAutoProxyConfigUrl( WINHTTP_AUTO_DETECT_TYPE_DNS_A, NULL ); error = GetLastError(); ok( !ret, "expected failure\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "got %lu\n", error ); url = (WCHAR *)0xdeadbeef; SetLastError(0xdeadbeef); @@ -4913,7 +4909,7 @@ static void test_WinHttpDetectAutoProxyConfigUrl(void) error = GetLastError(); if (!ret) { - ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED, "got %u\n", error ); + ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED, "got %lu\n", error ); ok( !url || broken(url == (WCHAR *)0xdeadbeef), "got %p\n", url ); } else @@ -4928,12 +4924,12 @@ static void test_WinHttpDetectAutoProxyConfigUrl(void) error = GetLastError(); if (!ret) { - ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED, "got %u\n", error ); + ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED, "got %lu\n", error ); ok( !url || broken(url == (WCHAR *)0xdeadbeef), "got %p\n", url ); } else { - ok( error == ERROR_SUCCESS, "got %u\n", error ); + ok( error == ERROR_SUCCESS, "got %lu\n", error ); trace("%s\n", wine_dbgstr_w(url)); GlobalFree( url ); } @@ -4951,13 +4947,13 @@ static void test_WinHttpGetIEProxyConfigForCurrentUser(void) ret = WinHttpGetIEProxyConfigForCurrentUser( NULL ); error = GetLastError(); ok( !ret, "expected failure\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "got %lu\n", error ); SetLastError(0xdeadbeef); ret = WinHttpGetIEProxyConfigForCurrentUser( &cfg ); error = GetLastError(); ok( ret, "expected success\n" ); - ok( error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* < win7 */, "got %u\n", error ); + ok( error == ERROR_SUCCESS || broken(error == ERROR_NO_TOKEN) /* < win7 */, "got %lu\n", error ); trace("IEProxy.AutoDetect=%d\n", cfg.fAutoDetect); trace("IEProxy.AutoConfigUrl=%s\n", wine_dbgstr_w(cfg.lpszAutoConfigUrl)); @@ -4982,34 +4978,34 @@ static void test_WinHttpGetProxyForUrl(void) ret = WinHttpGetProxyForUrl( NULL, NULL, NULL, NULL ); error = GetLastError(); ok( !ret, "expected failure\n" ); - ok( error == ERROR_INVALID_HANDLE, "got %u\n", error ); + ok( error == ERROR_INVALID_HANDLE, "got %lu\n", error ); session = WinHttpOpen( L"winetest", 0, NULL, NULL, 0 ); - ok( session != NULL, "failed to open session %u\n", GetLastError() ); + ok( session != NULL, "failed to open session %lu\n", GetLastError() ); SetLastError(0xdeadbeef); ret = WinHttpGetProxyForUrl( session, NULL, NULL, NULL ); error = GetLastError(); ok( !ret, "expected failure\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "got %lu\n", error ); SetLastError(0xdeadbeef); ret = WinHttpGetProxyForUrl( session, L"", NULL, NULL ); error = GetLastError(); ok( !ret, "expected failure\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "got %lu\n", error ); SetLastError(0xdeadbeef); ret = WinHttpGetProxyForUrl( session, L"http://winehq.org", NULL, NULL ); error = GetLastError(); ok( !ret, "expected failure\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "got %lu\n", error ); SetLastError(0xdeadbeef); ret = WinHttpGetProxyForUrl( session, L"http://winehq.org", &options, &info ); error = GetLastError(); ok( !ret, "expected failure\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "got %lu\n", error ); options.dwFlags = WINHTTP_AUTOPROXY_AUTO_DETECT; options.dwAutoDetectFlags = WINHTTP_AUTO_DETECT_TYPE_DNS_A; @@ -5018,7 +5014,7 @@ static void test_WinHttpGetProxyForUrl(void) ret = WinHttpGetProxyForUrl( session, L"http://winehq.org", &options, NULL ); error = GetLastError(); ok( !ret, "expected failure\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "got %lu\n", error ); options.dwFlags = WINHTTP_AUTOPROXY_AUTO_DETECT; options.dwAutoDetectFlags = 0; @@ -5027,7 +5023,7 @@ static void test_WinHttpGetProxyForUrl(void) ret = WinHttpGetProxyForUrl( session, L"http://winehq.org", &options, &info ); error = GetLastError(); ok( !ret, "expected failure\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "got %lu\n", error ); options.dwFlags = WINHTTP_AUTOPROXY_AUTO_DETECT | WINHTTP_AUTOPROXY_CONFIG_URL; options.dwAutoDetectFlags = WINHTTP_AUTO_DETECT_TYPE_DNS_A; @@ -5036,7 +5032,7 @@ static void test_WinHttpGetProxyForUrl(void) ret = WinHttpGetProxyForUrl( session, L"http://winehq.org", &options, &info ); error = GetLastError(); ok( !ret, "expected failure\n" ); - ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( error == ERROR_INVALID_PARAMETER, "got %lu\n", error ); options.dwFlags = WINHTTP_AUTOPROXY_AUTO_DETECT; options.dwAutoDetectFlags = WINHTTP_AUTO_DETECT_TYPE_DNS_A; @@ -5047,8 +5043,8 @@ static void test_WinHttpGetProxyForUrl(void) error = GetLastError(); if (ret) { - ok( error == ERROR_SUCCESS, "got %u\n", error ); - trace("Proxy.AccessType=%u\n", info.dwAccessType); + ok( error == ERROR_SUCCESS, "got %lu\n", error ); + trace("Proxy.AccessType=%lu\n", info.dwAccessType); trace("Proxy.Proxy=%s\n", wine_dbgstr_w(info.lpszProxy)); trace("Proxy.ProxyBypass=%s\n", wine_dbgstr_w(info.lpszProxyBypass)); GlobalFree( info.lpszProxy ); @@ -5066,7 +5062,7 @@ static void test_WinHttpGetProxyForUrl(void) ret = WinHttpGetProxyForUrl( session, L"http://winehq.org", &options, &info ); if (ret) { - trace("Proxy.AccessType=%u\n", info.dwAccessType); + trace("Proxy.AccessType=%lu\n", info.dwAccessType); trace("Proxy.Proxy=%s\n", wine_dbgstr_w(info.lpszProxy)); trace("Proxy.ProxyBypass=%s\n", wine_dbgstr_w(info.lpszProxyBypass)); GlobalFree( info.lpszProxy ); @@ -5092,15 +5088,15 @@ static void test_chunked_read(void) trace( "starting chunked read test\n" ); ses = WinHttpOpen( L"winetest", 0, NULL, NULL, 0 ); - ok( ses != NULL, "WinHttpOpen failed with error %u\n", GetLastError() ); + ok( ses != NULL, "WinHttpOpen failed with error %lu\n", GetLastError() ); if (!ses) goto done; con = WinHttpConnect( ses, L"test.winehq.org", 0, 0 ); - ok( con != NULL, "WinHttpConnect failed with error %u\n", GetLastError() ); + ok( con != NULL, "WinHttpConnect failed with error %lu\n", GetLastError() ); if (!con) goto done; req = WinHttpOpenRequest( con, NULL, L"/tests/chunked", NULL, NULL, NULL, 0 ); - ok( req != NULL, "WinHttpOpenRequest failed with error %u\n", GetLastError() ); + ok( req != NULL, "WinHttpOpenRequest failed with error %lu\n", GetLastError() ); if (!req) goto done; ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); @@ -5110,17 +5106,17 @@ static void test_chunked_read(void) skip("connection failed, skipping\n"); goto done; } - ok( ret, "WinHttpSendRequest failed with error %u\n", GetLastError() ); + ok( ret, "WinHttpSendRequest failed with error %lu\n", GetLastError() ); if (!ret) goto done; ret = WinHttpReceiveResponse( req, NULL ); - ok( ret, "WinHttpReceiveResponse failed with error %u\n", GetLastError() ); + ok( ret, "WinHttpReceiveResponse failed with error %lu\n", GetLastError() ); if (!ret) goto done; header[0] = 0; len = sizeof(header); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_TRANSFER_ENCODING, NULL, header, &len, 0 ); - ok( ret, "failed to get TRANSFER_ENCODING header (error %u)\n", GetLastError() ); + ok( ret, "failed to get TRANSFER_ENCODING header (error %lu\n", GetLastError() ); ok( !lstrcmpW( header, L"chunked" ), "wrong transfer encoding %s\n", wine_dbgstr_w(header) ); trace( "transfer encoding: %s\n", wine_dbgstr_w(header) ); @@ -5129,27 +5125,27 @@ static void test_chunked_read(void) SetLastError( 0xdeadbeef ); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_CONTENT_LENGTH, NULL, &header, &len, 0 ); ok( !ret, "unexpected CONTENT_LENGTH header %s\n", wine_dbgstr_w(header) ); - ok( GetLastError() == ERROR_WINHTTP_HEADER_NOT_FOUND, "wrong error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_WINHTTP_HEADER_NOT_FOUND, "wrong error %lu\n", GetLastError() ); trace( "entering query loop\n" ); for (;;) { len = 0xdeadbeef; ret = WinHttpQueryDataAvailable( req, &len ); - ok( ret, "WinHttpQueryDataAvailable failed with error %u\n", GetLastError() ); + ok( ret, "WinHttpQueryDataAvailable failed with error %lu\n", GetLastError() ); if (ret) ok( len != 0xdeadbeef, "WinHttpQueryDataAvailable return wrong length\n" ); - trace( "got %u available\n", len ); + trace( "got %lu available\n", len ); if (len) { DWORD bytes_read; char *buf = HeapAlloc( GetProcessHeap(), 0, len + 1 ); ret = WinHttpReadData( req, buf, len, &bytes_read ); - ok(ret, "WinHttpReadData failed: %u.\n", GetLastError()); + ok(ret, "WinHttpReadData failed: %lu\n", GetLastError()); buf[bytes_read] = 0; - trace( "WinHttpReadData -> %d %u\n", ret, bytes_read ); - ok( len == bytes_read, "only got %u of %u available\n", bytes_read, len ); + trace( "WinHttpReadData -> %d %lu\n", ret, bytes_read ); + ok( len == bytes_read, "only got %lu of %lu available\n", bytes_read, len ); ok( buf[bytes_read - 1] == '\n', "received partial line '%s'\n", buf ); HeapFree( GetProcessHeap(), 0, buf ); @@ -5176,7 +5172,7 @@ static void test_max_http_automatic_redirects (void) ok(session != NULL, "WinHttpOpen failed to open session.\n"); connection = WinHttpConnect (session, L"test.winehq.org", INTERNET_DEFAULT_HTTP_PORT, 0); - ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %u.\n", GetLastError()); + ok(connection != NULL, "WinHttpConnect failed to open a connection, error: %lu\n", GetLastError()); /* Test with 2 redirects (page will try to redirect 3 times) */ request = WinHttpOpenRequest(connection, L"GET", L"tests/redirecttest.php?max=3", NULL, WINHTTP_NO_REFERER, @@ -5186,12 +5182,12 @@ static void test_max_http_automatic_redirects (void) skip("Network unreachable, skipping.\n"); goto done; } - ok(request != NULL, "WinHttpOpenRequest failed to open a request, error: %u.\n", GetLastError()); + ok(request != NULL, "WinHttpOpenRequest failed to open a request, error: %lu\n", GetLastError()); if (!request) goto done; max_redirects = 2; ret = WinHttpSetOption(request, WINHTTP_OPTION_MAX_HTTP_AUTOMATIC_REDIRECTS, &max_redirects, sizeof(max_redirects)); - ok(ret, "WinHttpSetOption failed: %u\n", GetLastError()); + ok(ret, "WinHttpSetOption failed: %lu\n", GetLastError()); ret = WinHttpSendRequest(request, WINHTTP_NO_ADDITIONAL_HEADERS, 0, WINHTTP_NO_REQUEST_DATA, 0, 0, 0); err = GetLastError(); @@ -5200,12 +5196,12 @@ static void test_max_http_automatic_redirects (void) skip("connection failed, skipping\n"); goto done; } - ok(ret == TRUE, "WinHttpSendRequest failed: %u\n", GetLastError()); + ok(ret == TRUE, "WinHttpSendRequest failed: %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = WinHttpReceiveResponse(request, NULL); ok(!ret, "WinHttpReceiveResponse succeeded, expected failure\n"); - ok(GetLastError() == ERROR_WINHTTP_REDIRECT_FAILED, "Expected ERROR_WINHTTP_REDIRECT_FAILED, got %u.\n", GetLastError()); + ok(GetLastError() == ERROR_WINHTTP_REDIRECT_FAILED, "Expected ERROR_WINHTTP_REDIRECT_FAILED, got %lu\n", GetLastError()); done: ret = WinHttpCloseHandle(request); @@ -5468,7 +5464,7 @@ static void test_client_cert_authentication(void) const CERT_CONTEXT *cert; ses = WinHttpOpen( L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ); - ok( ses != NULL, "failed to open session %u\n", GetLastError() ); + ok( ses != NULL, "failed to open session %lu\n", GetLastError() ); protocols = WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_1; ret = WinHttpSetOption( ses, WINHTTP_OPTION_SECURE_PROTOCOLS, &protocols, sizeof(protocols) ); @@ -5478,38 +5474,38 @@ static void test_client_cert_authentication(void) WinHttpCloseHandle( ses ); return; } - ok( ret, "failed to set protocols %u\n", GetLastError() ); + ok( ret, "failed to set protocols %lu\n", GetLastError() ); con = WinHttpConnect( ses, L"test.winehq.org", 443, 0 ); - ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + ok( con != NULL, "failed to open a connection %lu\n", GetLastError() ); req = WinHttpOpenRequest( con, NULL, L"/tests/clientcert/", NULL, NULL, NULL, WINHTTP_FLAG_SECURE ); - ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + ok( req != NULL, "failed to open a request %lu\n", GetLastError() ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); - ok( ret, "failed to send request %u\n", GetLastError() ); + ok( ret, "failed to send request %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); ret = WinHttpReceiveResponse( req, NULL ); ok( !ret, "unexpected success\n" ); - ok( GetLastError() == ERROR_WINHTTP_CLIENT_AUTH_CERT_NEEDED, "got %u\n", GetLastError() ); + ok( GetLastError() == ERROR_WINHTTP_CLIENT_AUTH_CERT_NEEDED, "got %lu\n", GetLastError() ); pfx.pbData = (BYTE *)pfxdata; pfx.cbData = sizeof(pfxdata); store = PFXImportCertStore( &pfx, NULL, CRYPT_EXPORTABLE|CRYPT_USER_KEYSET|PKCS12_NO_PERSIST_KEY ); - ok( store != NULL, "got %u\n", GetLastError() ); + ok( store != NULL, "got %lu\n", GetLastError() ); cert = CertFindCertificateInStore( store, X509_ASN_ENCODING, 0, CERT_FIND_ANY, NULL, NULL ); - ok( cert != NULL, "got %u\n", GetLastError() ); + ok( cert != NULL, "got %lu\n", GetLastError() ); ret = WinHttpSetOption( req, WINHTTP_OPTION_CLIENT_CERT_CONTEXT, (void *)cert, sizeof(*cert) ); - ok( ret, "failed to set client cert %u\n", GetLastError() ); + ok( ret, "failed to set client cert %lu\n", GetLastError() ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); - ok( ret, "failed to send request %u\n", GetLastError() ); + ok( ret, "failed to send request %lu\n", GetLastError() ); ret = WinHttpReceiveResponse( req, NULL ); - ok( ret, "failed to receive response %u\n", GetLastError() ); + ok( ret, "failed to receive response %lu\n", GetLastError() ); CertFreeCertificateContext( cert ); CertCloseStore( store, 0 ); @@ -5557,10 +5553,10 @@ START_TEST (winhttp) si.port = 7532; thread = CreateThread(NULL, 0, server_thread, &si, 0, NULL); - ok(thread != NULL, "failed to create thread %u\n", GetLastError()); + ok(thread != NULL, "failed to create thread %lu\n", GetLastError()); ret = WaitForSingleObject(si.event, 10000); - ok(ret == WAIT_OBJECT_0, "failed to start winhttp test server %u\n", GetLastError()); + ok(ret == WAIT_OBJECT_0, "failed to start winhttp test server %lu\n", GetLastError()); if (ret != WAIT_OBJECT_0) { CloseHandle(thread); -- 2.30.2

1 0

[PATCH] msi/tests: Correctly free usersid.
by Hans Leidekker 08 Feb '22

08 Feb '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/tests/action.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 7de4fb7c52c..224637eb286 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -3022,7 +3022,7 @@ error: DeleteFileA(msifile); DeleteFileA("msitest\\maximus"); RemoveDirectoryA("msitest"); - free(usersid); + LocalFree(usersid); } static void test_publish_product(void) @@ -3259,7 +3259,7 @@ error: DeleteFileA(msifile); DeleteFileA("msitest\\maximus"); RemoveDirectoryA("msitest"); - free(usersid); + LocalFree(usersid); } static void test_publish_features(void) @@ -3384,7 +3384,7 @@ error: DeleteFileA(msifile); DeleteFileA("msitest\\maximus"); RemoveDirectoryA("msitest"); - free(usersid); + LocalFree(usersid); } static LPSTR reg_get_val_str(HKEY hkey, LPCSTR name) -- 2.30.2

1 0

[PATCH 1/5] dinput: Rename IDirectInputImpl to struct dinput.
by Rémi Bernon 08 Feb '22

08 Feb '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/ansi.c | 54 ++++++++--------- dlls/dinput/device.c | 4 +- dlls/dinput/device_private.h | 4 +- dlls/dinput/dinput_main.c | 111 +++++++++++++++++------------------ dlls/dinput/dinput_private.h | 29 +++++---- dlls/dinput/joystick_hid.c | 2 +- dlls/dinput/keyboard.c | 2 +- dlls/dinput/mouse.c | 2 +- 8 files changed, 103 insertions(+), 105 deletions(-) diff --git a/dlls/dinput/ansi.c b/dlls/dinput/ansi.c index b7ec426b2e0..99ec3c73327 100644 --- a/dlls/dinput/ansi.c +++ b/dlls/dinput/ansi.c @@ -54,22 +54,22 @@ static inline IDirectInputDeviceA *IDirectInputDeviceA_from_IDirectInputDeviceW( return (IDirectInputDeviceA *)IDirectInputDevice8A_from_IDirectInputDevice8W( (IDirectInputDevice8W *)iface ); } -static IDirectInputImpl *impl_from_IDirectInput7A( IDirectInput7A *iface ) +static struct dinput *impl_from_IDirectInput7A( IDirectInput7A *iface ) { - return CONTAINING_RECORD( iface, IDirectInputImpl, IDirectInput7A_iface ); + return CONTAINING_RECORD( iface, struct dinput, IDirectInput7A_iface ); } -static IDirectInput7W *IDirectInput7W_from_impl( IDirectInputImpl *impl ) +static IDirectInput7W *IDirectInput7W_from_impl( struct dinput *impl ) { return &impl->IDirectInput7W_iface; } -static IDirectInputImpl *impl_from_IDirectInput8A( IDirectInput8A *iface ) +static struct dinput *impl_from_IDirectInput8A( IDirectInput8A *iface ) { - return CONTAINING_RECORD( iface, IDirectInputImpl, IDirectInput8A_iface ); + return CONTAINING_RECORD( iface, struct dinput, IDirectInput8A_iface ); } -static IDirectInput8W *IDirectInput8W_from_impl( IDirectInputImpl *impl ) +static IDirectInput8W *IDirectInput8W_from_impl( struct dinput *impl ) { return &impl->IDirectInput8W_iface; } @@ -678,28 +678,28 @@ const IDirectInputDevice8AVtbl dinput_device_a_vtbl = static HRESULT WINAPI dinput8_a_QueryInterface( IDirectInput8A *iface_a, REFIID iid, void **out ) { - IDirectInputImpl *impl = impl_from_IDirectInput8A( iface_a ); + struct dinput *impl = impl_from_IDirectInput8A( iface_a ); IDirectInput8W *iface_w = IDirectInput8W_from_impl( impl ); return IDirectInput8_QueryInterface( iface_w, iid, out ); } static ULONG WINAPI dinput8_a_AddRef( IDirectInput8A *iface_a ) { - IDirectInputImpl *impl = impl_from_IDirectInput8A( iface_a ); + struct dinput *impl = impl_from_IDirectInput8A( iface_a ); IDirectInput8W *iface_w = IDirectInput8W_from_impl( impl ); return IDirectInput8_AddRef( iface_w ); } static ULONG WINAPI dinput8_a_Release( IDirectInput8A *iface_a ) { - IDirectInputImpl *impl = impl_from_IDirectInput8A( iface_a ); + struct dinput *impl = impl_from_IDirectInput8A( iface_a ); IDirectInput8W *iface_w = IDirectInput8W_from_impl( impl ); return IDirectInput8_Release( iface_w ); } static HRESULT WINAPI dinput8_a_CreateDevice( IDirectInput8A *iface_a, REFGUID guid, IDirectInputDevice8A **out, IUnknown *outer ) { - IDirectInputImpl *impl = impl_from_IDirectInput8A( iface_a ); + struct dinput *impl = impl_from_IDirectInput8A( iface_a ); IDirectInput8W *iface_w = IDirectInput8W_from_impl( impl ); IDirectInputDevice8W *outw; HRESULT hr; @@ -730,7 +730,7 @@ static HRESULT WINAPI dinput8_a_EnumDevices( IDirectInput8A *iface_a, DWORD type void *ref, DWORD flags ) { struct enum_devices_wtoa_params params = {callback, ref}; - IDirectInputImpl *impl = impl_from_IDirectInput8A( iface_a ); + struct dinput *impl = impl_from_IDirectInput8A( iface_a ); IDirectInput8W *iface_w = IDirectInput8W_from_impl( impl ); if (!callback) return DIERR_INVALIDPARAM; @@ -740,28 +740,28 @@ static HRESULT WINAPI dinput8_a_EnumDevices( IDirectInput8A *iface_a, DWORD type static HRESULT WINAPI dinput8_a_GetDeviceStatus( IDirectInput8A *iface_a, REFGUID instance_guid ) { - IDirectInputImpl *impl = impl_from_IDirectInput8A( iface_a ); + struct dinput *impl = impl_from_IDirectInput8A( iface_a ); IDirectInput8W *iface_w = IDirectInput8W_from_impl( impl ); return IDirectInput8_GetDeviceStatus( iface_w, instance_guid ); } static HRESULT WINAPI dinput8_a_RunControlPanel( IDirectInput8A *iface_a, HWND owner, DWORD flags ) { - IDirectInputImpl *impl = impl_from_IDirectInput8A( iface_a ); + struct dinput *impl = impl_from_IDirectInput8A( iface_a ); IDirectInput8W *iface_w = IDirectInput8W_from_impl( impl ); return IDirectInput8_RunControlPanel( iface_w, owner, flags ); } static HRESULT WINAPI dinput8_a_Initialize( IDirectInput8A *iface_a, HINSTANCE instance, DWORD version ) { - IDirectInputImpl *impl = impl_from_IDirectInput8A( iface_a ); + struct dinput *impl = impl_from_IDirectInput8A( iface_a ); IDirectInput8W *iface_w = IDirectInput8W_from_impl( impl ); return IDirectInput8_Initialize( iface_w, instance, version ); } static HRESULT WINAPI dinput8_a_FindDevice( IDirectInput8A *iface_a, REFGUID guid, const char *name_a, GUID *instance_guid ) { - IDirectInputImpl *impl = impl_from_IDirectInput8A( iface_a ); + struct dinput *impl = impl_from_IDirectInput8A( iface_a ); IDirectInput8W *iface_w = IDirectInput8W_from_impl( impl ); HRESULT hr; WCHAR *name_w; @@ -794,7 +794,7 @@ static HRESULT WINAPI dinput8_a_EnumDevicesBySemantics( IDirectInput8A *iface_a, LPDIENUMDEVICESBYSEMANTICSCBA callback, void *ref, DWORD flags ) { struct enum_devices_by_semantics_wtoa_params params = {callback, ref}; - IDirectInputImpl *impl = impl_from_IDirectInput8A( iface_a ); + struct dinput *impl = impl_from_IDirectInput8A( iface_a ); DIACTIONFORMATW format_w = {sizeof(format_w), sizeof(DIACTIONW)}; IDirectInput8W *iface_w = IDirectInput8W_from_impl( impl ); HRESULT hr; @@ -821,7 +821,7 @@ static HRESULT WINAPI dinput8_a_EnumDevicesBySemantics( IDirectInput8A *iface_a, static HRESULT WINAPI dinput8_a_ConfigureDevices( IDirectInput8A *iface_a, LPDICONFIGUREDEVICESCALLBACK callback, DICONFIGUREDEVICESPARAMSA *params_a, DWORD flags, void *ref ) { - IDirectInputImpl *impl = impl_from_IDirectInput8A( iface_a ); + struct dinput *impl = impl_from_IDirectInput8A( iface_a ); IDirectInput8W *iface_w = IDirectInput8W_from_impl( impl ); DICONFIGUREDEVICESPARAMSW params_w = {sizeof(params_w)}; DIACTIONFORMATA *format_a = params_a->lprgFormats; @@ -873,28 +873,28 @@ const IDirectInput8AVtbl dinput8_a_vtbl = static HRESULT WINAPI dinput7_a_QueryInterface( IDirectInput7A *iface_a, REFIID iid, void **out ) { - IDirectInputImpl *impl = impl_from_IDirectInput7A( iface_a ); + struct dinput *impl = impl_from_IDirectInput7A( iface_a ); IDirectInput7W *iface_w = IDirectInput7W_from_impl( impl ); return IDirectInput7_QueryInterface( iface_w, iid, out ); } static ULONG WINAPI dinput7_a_AddRef( IDirectInput7A *iface_a ) { - IDirectInputImpl *impl = impl_from_IDirectInput7A( iface_a ); + struct dinput *impl = impl_from_IDirectInput7A( iface_a ); IDirectInput7W *iface_w = IDirectInput7W_from_impl( impl ); return IDirectInput7_AddRef( iface_w ); } static ULONG WINAPI dinput7_a_Release( IDirectInput7A *iface_a ) { - IDirectInputImpl *impl = impl_from_IDirectInput7A( iface_a ); + struct dinput *impl = impl_from_IDirectInput7A( iface_a ); IDirectInput7W *iface_w = IDirectInput7W_from_impl( impl ); return IDirectInput7_Release( iface_w ); } static HRESULT WINAPI dinput7_a_CreateDevice( IDirectInput7A *iface_a, REFGUID guid, IDirectInputDeviceA **out_a, IUnknown *outer ) { - IDirectInputImpl *impl = impl_from_IDirectInput7A( iface_a ); + struct dinput *impl = impl_from_IDirectInput7A( iface_a ); IDirectInput7W *iface_w = IDirectInput7W_from_impl( impl ); IDirectInputDeviceW *out_w; HRESULT hr; @@ -910,7 +910,7 @@ static HRESULT WINAPI dinput7_a_EnumDevices( IDirectInput7A *iface_a, DWORD type void *ref, DWORD flags ) { struct enum_devices_wtoa_params params = {callback, ref}; - IDirectInputImpl *impl = impl_from_IDirectInput7A( iface_a ); + struct dinput *impl = impl_from_IDirectInput7A( iface_a ); IDirectInput7W *iface_w = IDirectInput7W_from_impl( impl ); if (!callback) return DIERR_INVALIDPARAM; @@ -920,28 +920,28 @@ static HRESULT WINAPI dinput7_a_EnumDevices( IDirectInput7A *iface_a, DWORD type static HRESULT WINAPI dinput7_a_GetDeviceStatus( IDirectInput7A *iface_a, REFGUID instance_guid ) { - IDirectInputImpl *impl = impl_from_IDirectInput7A( iface_a ); + struct dinput *impl = impl_from_IDirectInput7A( iface_a ); IDirectInput7W *iface_w = IDirectInput7W_from_impl( impl ); return IDirectInput7_GetDeviceStatus( iface_w, instance_guid ); } static HRESULT WINAPI dinput7_a_RunControlPanel( IDirectInput7A *iface_a, HWND owner, DWORD flags ) { - IDirectInputImpl *impl = impl_from_IDirectInput7A( iface_a ); + struct dinput *impl = impl_from_IDirectInput7A( iface_a ); IDirectInput7W *iface_w = IDirectInput7W_from_impl( impl ); return IDirectInput7_RunControlPanel( iface_w, owner, flags ); } static HRESULT WINAPI dinput7_a_Initialize( IDirectInput7A *iface_a, HINSTANCE instance, DWORD version ) { - IDirectInputImpl *impl = impl_from_IDirectInput7A( iface_a ); + struct dinput *impl = impl_from_IDirectInput7A( iface_a ); IDirectInput7W *iface_w = IDirectInput7W_from_impl( impl ); return IDirectInput7_Initialize( iface_w, instance, version ); } static HRESULT WINAPI dinput7_a_FindDevice( IDirectInput7A *iface_a, REFGUID guid, const char *name_a, GUID *instance_guid ) { - IDirectInputImpl *impl = impl_from_IDirectInput7A( iface_a ); + struct dinput *impl = impl_from_IDirectInput7A( iface_a ); IDirectInput7W *iface_w = IDirectInput7W_from_impl( impl ); HRESULT hr; WCHAR *name_w; @@ -955,7 +955,7 @@ static HRESULT WINAPI dinput7_a_FindDevice( IDirectInput7A *iface_a, REFGUID gui static HRESULT WINAPI dinput7_a_CreateDeviceEx( IDirectInput7A *iface_a, REFGUID guid, REFIID iid, void **out, IUnknown *outer ) { - IDirectInputImpl *impl = impl_from_IDirectInput7A( iface_a ); + struct dinput *impl = impl_from_IDirectInput7A( iface_a ); IDirectInput7W *iface_w = IDirectInput7W_from_impl( impl ); return IDirectInput7_CreateDeviceEx( iface_w, guid, iid, out, outer ); } diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index ff8e2252a40..8c48fa7b53b 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -2153,8 +2153,8 @@ static const IDirectInputDevice8WVtbl dinput_device_w_vtbl = dinput_device_GetImageInfo, }; -HRESULT dinput_device_alloc( SIZE_T size, const struct dinput_device_vtbl *vtbl, - const GUID *guid, IDirectInputImpl *dinput, void **out ) +HRESULT dinput_device_alloc( SIZE_T size, const struct dinput_device_vtbl *vtbl, const GUID *guid, + struct dinput *dinput, void **out ) { struct dinput_device *This; DIDATAFORMAT *format; diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 15a8a6f83b5..4e76d1ba738 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -84,7 +84,7 @@ struct dinput_device LONG ref; GUID guid; CRITICAL_SECTION crit; - IDirectInputImpl *dinput; + struct dinput *dinput; struct list entry; /* entry into acquired device list */ HANDLE hEvent; DIDEVICEINSTANCEW instance; @@ -124,7 +124,7 @@ struct dinput_device }; extern HRESULT dinput_device_alloc( SIZE_T size, const struct dinput_device_vtbl *vtbl, const GUID *guid, - IDirectInputImpl *dinput, void **out ) DECLSPEC_HIDDEN; + struct dinput *dinput, void **out ) DECLSPEC_HIDDEN; extern HRESULT dinput_device_init( IDirectInputDevice8W *iface ); extern void dinput_device_destroy( IDirectInputDevice8W *iface ); diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index d3d5206a1e4..b9d44f140c8 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -59,14 +59,14 @@ static const IDirectInput7WVtbl dinput7_vtbl; static const IDirectInput8WVtbl dinput8_vtbl; static const IDirectInputJoyConfig8Vtbl joy_config_vtbl; -static inline IDirectInputImpl *impl_from_IDirectInput7W( IDirectInput7W *iface ) +static inline struct dinput *impl_from_IDirectInput7W( IDirectInput7W *iface ) { - return CONTAINING_RECORD( iface, IDirectInputImpl, IDirectInput7W_iface ); + return CONTAINING_RECORD( iface, struct dinput, IDirectInput7W_iface ); } -static inline IDirectInputImpl *impl_from_IDirectInput8W( IDirectInput8W *iface ) +static inline struct dinput *impl_from_IDirectInput8W( IDirectInput8W *iface ) { - return CONTAINING_RECORD( iface, IDirectInputImpl, IDirectInput8W_iface ); + return CONTAINING_RECORD( iface, struct dinput, IDirectInput8W_iface ); } static inline struct dinput_device *impl_from_IDirectInputDevice8W( IDirectInputDevice8W *iface ) @@ -95,8 +95,8 @@ static struct list acquired_rawmouse_list = LIST_INIT( acquired_rawmouse_list ); static struct list acquired_keyboard_list = LIST_INIT( acquired_keyboard_list ); static struct list acquired_device_list = LIST_INIT( acquired_device_list ); -static HRESULT initialize_directinput_instance(IDirectInputImpl *This, DWORD dwVersion); -static void uninitialize_directinput_instance(IDirectInputImpl *This); +static HRESULT initialize_directinput_instance( struct dinput *impl, DWORD version ); +static void uninitialize_directinput_instance( struct dinput *impl ); void dinput_hooks_acquire_device( IDirectInputDevice8W *iface ) { @@ -137,28 +137,27 @@ static void dinput_device_internal_unacquire( IDirectInputDevice8W *iface ) LeaveCriticalSection( &impl->crit ); } -static HRESULT create_directinput_instance(REFIID riid, LPVOID *ppDI, IDirectInputImpl **out) +static HRESULT dinput_create( REFIID riid, LPVOID *ppDI, struct dinput **out ) { - IDirectInputImpl *This = calloc( 1, sizeof(IDirectInputImpl) ); + struct dinput *impl = calloc( 1, sizeof(struct dinput) ); HRESULT hr; - if (!This) - return E_OUTOFMEMORY; + if (!impl) return E_OUTOFMEMORY; - This->IDirectInput7A_iface.lpVtbl = &dinput7_a_vtbl; - This->IDirectInput7W_iface.lpVtbl = &dinput7_vtbl; - This->IDirectInput8A_iface.lpVtbl = &dinput8_a_vtbl; - This->IDirectInput8W_iface.lpVtbl = &dinput8_vtbl; - This->IDirectInputJoyConfig8_iface.lpVtbl = &joy_config_vtbl; + impl->IDirectInput7A_iface.lpVtbl = &dinput7_a_vtbl; + impl->IDirectInput7W_iface.lpVtbl = &dinput7_vtbl; + impl->IDirectInput8A_iface.lpVtbl = &dinput8_a_vtbl; + impl->IDirectInput8W_iface.lpVtbl = &dinput8_vtbl; + impl->IDirectInputJoyConfig8_iface.lpVtbl = &joy_config_vtbl; - hr = IDirectInput_QueryInterface( &This->IDirectInput7A_iface, riid, ppDI ); + hr = IDirectInput_QueryInterface( &impl->IDirectInput7A_iface, riid, ppDI ); if (FAILED(hr)) { - free( This ); + free( impl ); return hr; } - if (out) *out = This; + if (out) *out = impl; return DI_OK; } @@ -169,7 +168,7 @@ HRESULT WINAPI DirectInputCreateEx( HINSTANCE hinst, DWORD dwVersion, REFIID riid, LPVOID *ppDI, LPUNKNOWN punkOuter) { - IDirectInputImpl *This; + struct dinput *impl; HRESULT hr; TRACE("(%p,%04x,%s,%p,%p)\n", hinst, dwVersion, debugstr_guid(riid), ppDI, punkOuter); @@ -181,17 +180,17 @@ HRESULT WINAPI DirectInputCreateEx( IsEqualGUID( &IID_IDirectInput2W, riid ) || IsEqualGUID( &IID_IDirectInput7W, riid )) { - hr = create_directinput_instance(riid, ppDI, &This); + hr = dinput_create( riid, ppDI, &impl ); if (FAILED(hr)) return hr; } else return DIERR_NOINTERFACE; - hr = IDirectInput_Initialize( &This->IDirectInput7A_iface, hinst, dwVersion ); + hr = IDirectInput_Initialize( &impl->IDirectInput7A_iface, hinst, dwVersion ); if (FAILED(hr)) { - IDirectInput_Release( &This->IDirectInput7A_iface ); + IDirectInput_Release( &impl->IDirectInput7A_iface ); *ppDI = NULL; return hr; } @@ -205,7 +204,7 @@ HRESULT WINAPI DirectInputCreateEx( HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, DWORD version, REFIID iid, void **out, IUnknown *outer) { - IDirectInputImpl *This; + struct dinput *impl; HRESULT hr; TRACE("hinst %p, version %#x, iid %s, out %p, outer %p.\n", @@ -222,7 +221,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, return DIERR_NOINTERFACE; } - hr = create_directinput_instance(iid, out, &This); + hr = dinput_create( iid, out, &impl ); if (FAILED(hr)) { @@ -233,10 +232,10 @@ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, /* When aggregation is used, the application needs to manually call Initialize(). */ if (!outer && IsEqualGUID(&IID_IDirectInput8A, iid)) { - hr = IDirectInput8_Initialize(&This->IDirectInput8A_iface, hinst, version); + hr = IDirectInput8_Initialize( &impl->IDirectInput8A_iface, hinst, version ); if (FAILED(hr)) { - IDirectInput8_Release(&This->IDirectInput8A_iface); + IDirectInput8_Release( &impl->IDirectInput8A_iface ); *out = NULL; return hr; } @@ -244,10 +243,10 @@ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, if (!outer && IsEqualGUID(&IID_IDirectInput8W, iid)) { - hr = IDirectInput8_Initialize(&This->IDirectInput8W_iface, hinst, version); + hr = IDirectInput8_Initialize( &impl->IDirectInput8W_iface, hinst, version ); if (FAILED(hr)) { - IDirectInput8_Release(&This->IDirectInput8W_iface); + IDirectInput8_Release( &impl->IDirectInput8W_iface ); *out = NULL; return hr; } @@ -324,7 +323,7 @@ __ASM_GLOBAL_FUNC( enum_callback_wrapper, static HRESULT WINAPI dinput7_EnumDevices( IDirectInput7W *iface, DWORD type, LPDIENUMDEVICESCALLBACKW callback, void *context, DWORD flags ) { - IDirectInputImpl *impl = impl_from_IDirectInput7W( iface ); + struct dinput *impl = impl_from_IDirectInput7W( iface ); TRACE( "iface %p, type %#x, callback %p, context %p, flags %#x.\n", iface, type, callback, context, flags ); @@ -339,7 +338,7 @@ static HRESULT WINAPI dinput7_EnumDevices( IDirectInput7W *iface, DWORD type, LP static ULONG WINAPI dinput7_AddRef( IDirectInput7W *iface ) { - IDirectInputImpl *impl = impl_from_IDirectInput7W( iface ); + struct dinput *impl = impl_from_IDirectInput7W( iface ); ULONG ref = InterlockedIncrement( &impl->ref ); TRACE( "iface %p increasing refcount to %u.\n", iface, ref ); return ref; @@ -347,7 +346,7 @@ static ULONG WINAPI dinput7_AddRef( IDirectInput7W *iface ) static ULONG WINAPI dinput7_Release( IDirectInput7W *iface ) { - IDirectInputImpl *impl = impl_from_IDirectInput7W( iface ); + struct dinput *impl = impl_from_IDirectInput7W( iface ); ULONG ref = InterlockedDecrement( &impl->ref ); TRACE( "iface %p decreasing refcount to %u.\n", iface, ref ); @@ -363,7 +362,7 @@ static ULONG WINAPI dinput7_Release( IDirectInput7W *iface ) static HRESULT WINAPI dinput7_QueryInterface( IDirectInput7W *iface, REFIID iid, void **out ) { - IDirectInputImpl *impl = impl_from_IDirectInput7W( iface ); + struct dinput *impl = impl_from_IDirectInput7W( iface ); TRACE( "iface %p, iid %s, out %p.\n", iface, debugstr_guid( iid ), out ); @@ -450,7 +449,7 @@ static void unregister_di_em_win_class(void) WARN( "Unable to unregister message window class\n" ); } -static HRESULT initialize_directinput_instance( IDirectInputImpl *impl, DWORD version ) +static HRESULT initialize_directinput_instance( struct dinput *impl, DWORD version ) { if (!impl->initialized) { @@ -465,7 +464,7 @@ static HRESULT initialize_directinput_instance( IDirectInputImpl *impl, DWORD ve return DI_OK; } -static void uninitialize_directinput_instance( IDirectInputImpl *impl ) +static void uninitialize_directinput_instance( struct dinput *impl ) { if (impl->initialized) { @@ -491,7 +490,7 @@ enum directinput_versions static HRESULT WINAPI dinput7_Initialize( IDirectInput7W *iface, HINSTANCE hinst, DWORD version ) { - IDirectInputImpl *impl = impl_from_IDirectInput7W( iface ); + struct dinput *impl = impl_from_IDirectInput7W( iface ); TRACE( "iface %p, hinst %p, version %#x.\n", iface, hinst, version ); @@ -512,7 +511,7 @@ static HRESULT WINAPI dinput7_Initialize( IDirectInput7W *iface, HINSTANCE hinst static HRESULT WINAPI dinput7_GetDeviceStatus( IDirectInput7W *iface, const GUID *guid ) { - IDirectInputImpl *impl = impl_from_IDirectInput7W( iface ); + struct dinput *impl = impl_from_IDirectInput7W( iface ); HRESULT hr; IDirectInputDeviceW *device; @@ -531,7 +530,7 @@ static HRESULT WINAPI dinput7_GetDeviceStatus( IDirectInput7W *iface, const GUID static HRESULT WINAPI dinput7_RunControlPanel( IDirectInput7W *iface, HWND owner, DWORD flags ) { - IDirectInputImpl *impl = impl_from_IDirectInput7W( iface ); + struct dinput *impl = impl_from_IDirectInput7W( iface ); WCHAR control_exe[] = {L"control.exe"}; STARTUPINFOW si = {0}; PROCESS_INFORMATION pi; @@ -558,7 +557,7 @@ static HRESULT WINAPI dinput7_FindDevice( IDirectInput7W *iface, const GUID *gui static HRESULT WINAPI dinput7_CreateDeviceEx( IDirectInput7W *iface, const GUID *guid, REFIID iid, void **out, IUnknown *outer ) { - IDirectInputImpl *impl = impl_from_IDirectInput7W( iface ); + struct dinput *impl = impl_from_IDirectInput7W( iface ); IDirectInputDevice8W *device; HRESULT hr; @@ -593,26 +592,26 @@ static HRESULT WINAPI dinput7_CreateDevice( IDirectInput7W *iface, const GUID *g static ULONG WINAPI dinput8_AddRef( IDirectInput8W *iface ) { - IDirectInputImpl *impl = impl_from_IDirectInput8W( iface ); + struct dinput *impl = impl_from_IDirectInput8W( iface ); return IDirectInput7_AddRef( &impl->IDirectInput7W_iface ); } static HRESULT WINAPI dinput8_QueryInterface( IDirectInput8W *iface, REFIID iid, void **out ) { - IDirectInputImpl *impl = impl_from_IDirectInput8W( iface ); + struct dinput *impl = impl_from_IDirectInput8W( iface ); return IDirectInput7_QueryInterface( &impl->IDirectInput7W_iface, iid, out ); } static ULONG WINAPI dinput8_Release( IDirectInput8W *iface ) { - IDirectInputImpl *impl = impl_from_IDirectInput8W( iface ); + struct dinput *impl = impl_from_IDirectInput8W( iface ); return IDirectInput7_Release( &impl->IDirectInput7W_iface ); } static HRESULT WINAPI dinput8_CreateDevice( IDirectInput8W *iface, const GUID *guid, IDirectInputDevice8W **out, IUnknown *outer ) { - IDirectInputImpl *impl = impl_from_IDirectInput8W( iface ); + struct dinput *impl = impl_from_IDirectInput8W( iface ); return IDirectInput7_CreateDeviceEx( &impl->IDirectInput7W_iface, guid, &IID_IDirectInputDevice8W, (void **)out, outer ); } @@ -630,7 +629,7 @@ static HRESULT WINAPI dinput8_EnumDevices( IDirectInput8W *iface, DWORD type, LP DWORD flags ) { DIDEVICEINSTANCEW instance = {.dwSize = sizeof(DIDEVICEINSTANCEW)}; - IDirectInputImpl *impl = impl_from_IDirectInput8W( iface ); + struct dinput *impl = impl_from_IDirectInput8W( iface ); DWORD device_class = 0, device_type = 0; unsigned int i = 0; HRESULT hr; @@ -679,19 +678,19 @@ static HRESULT WINAPI dinput8_EnumDevices( IDirectInput8W *iface, DWORD type, LP static HRESULT WINAPI dinput8_GetDeviceStatus( IDirectInput8W *iface, const GUID *guid ) { - IDirectInputImpl *impl = impl_from_IDirectInput8W( iface ); + struct dinput *impl = impl_from_IDirectInput8W( iface ); return IDirectInput7_GetDeviceStatus( &impl->IDirectInput7W_iface, guid ); } static HRESULT WINAPI dinput8_RunControlPanel( IDirectInput8W *iface, HWND owner, DWORD flags ) { - IDirectInputImpl *impl = impl_from_IDirectInput8W( iface ); + struct dinput *impl = impl_from_IDirectInput8W( iface ); return IDirectInput7_RunControlPanel( &impl->IDirectInput7W_iface, owner, flags ); } static HRESULT WINAPI dinput8_Initialize( IDirectInput8W *iface, HINSTANCE hinst, DWORD version ) { - IDirectInputImpl *impl = impl_from_IDirectInput8W( iface ); + struct dinput *impl = impl_from_IDirectInput8W( iface ); TRACE( "iface %p, hinst %p, version %#x.\n", iface, hinst, version ); @@ -709,7 +708,7 @@ static HRESULT WINAPI dinput8_Initialize( IDirectInput8W *iface, HINSTANCE hinst static HRESULT WINAPI dinput8_FindDevice( IDirectInput8W *iface, const GUID *guid, const WCHAR *name, GUID *instance_guid ) { - IDirectInputImpl *impl = impl_from_IDirectInput8W( iface ); + struct dinput *impl = impl_from_IDirectInput8W( iface ); return IDirectInput7_FindDevice( &impl->IDirectInput7W_iface, guid, name, instance_guid ); } @@ -767,7 +766,7 @@ struct enum_device_by_semantics_params static BOOL CALLBACK enum_device_by_semantics( const DIDEVICEINSTANCEW *instance, void *context ) { struct enum_device_by_semantics_params *params = context; - IDirectInputImpl *impl = impl_from_IDirectInput8W( params->iface ); + struct dinput *impl = impl_from_IDirectInput8W( params->iface ); if (should_enumerate_device( params->username, params->flags, &impl->device_players, &instance->guidInstance )) { @@ -786,7 +785,7 @@ static HRESULT WINAPI dinput8_EnumDevicesBySemantics( IDirectInput8W *iface, con DWORD callbackFlags, enum_flags = DIEDFL_ATTACHEDONLY | (flags & DIEDFL_FORCEFEEDBACK); static const GUID *guids[2] = {&GUID_SysKeyboard, &GUID_SysMouse}; static const DWORD actionMasks[] = { DIKEYBOARD_MASK, DIMOUSE_MASK }; - IDirectInputImpl *impl = impl_from_IDirectInput8W( iface ); + struct dinput *impl = impl_from_IDirectInput8W( iface ); DIDEVICEINSTANCEW didevi; IDirectInputDevice8W *lpdid; unsigned int i = 0; @@ -870,26 +869,26 @@ static HRESULT WINAPI dinput8_ConfigureDevices( IDirectInput8W *iface, LPDICONFI * IDirectInputJoyConfig8 interface */ -static inline IDirectInputImpl *impl_from_IDirectInputJoyConfig8(IDirectInputJoyConfig8 *iface) +static inline struct dinput *impl_from_IDirectInputJoyConfig8( IDirectInputJoyConfig8 *iface ) { - return CONTAINING_RECORD( iface, IDirectInputImpl, IDirectInputJoyConfig8_iface ); + return CONTAINING_RECORD( iface, struct dinput, IDirectInputJoyConfig8_iface ); } static HRESULT WINAPI joy_config_QueryInterface( IDirectInputJoyConfig8 *iface, REFIID iid, void **out ) { - IDirectInputImpl *impl = impl_from_IDirectInputJoyConfig8( iface ); + struct dinput *impl = impl_from_IDirectInputJoyConfig8( iface ); return IDirectInput7_QueryInterface( &impl->IDirectInput7W_iface, iid, out ); } static ULONG WINAPI joy_config_AddRef( IDirectInputJoyConfig8 *iface ) { - IDirectInputImpl *impl = impl_from_IDirectInputJoyConfig8( iface ); + struct dinput *impl = impl_from_IDirectInputJoyConfig8( iface ); return IDirectInput7_AddRef( &impl->IDirectInput7W_iface ); } static ULONG WINAPI joy_config_Release( IDirectInputJoyConfig8 *iface ) { - IDirectInputImpl *impl = impl_from_IDirectInputJoyConfig8( iface ); + struct dinput *impl = impl_from_IDirectInputJoyConfig8( iface ); return IDirectInput7_Release( &impl->IDirectInput7W_iface ); } @@ -960,7 +959,7 @@ static BOOL CALLBACK find_device_from_index( const DIDEVICEINSTANCEW *instance, static HRESULT WINAPI joy_config_GetConfig( IDirectInputJoyConfig8 *iface, UINT id, DIJOYCONFIG *info, DWORD flags ) { - IDirectInputImpl *impl = impl_from_IDirectInputJoyConfig8( iface ); + struct dinput *impl = impl_from_IDirectInputJoyConfig8( iface ); struct find_device_from_index_params params = {.index = id}; HRESULT hr; @@ -1124,7 +1123,7 @@ static HRESULT WINAPI class_factory_CreateInstance( IClassFactory *iface, IUnkno if (outer) return CLASS_E_NOAGGREGATION; - if (FAILED(hr = create_directinput_instance( &IID_IUnknown, (void **)&unknown, NULL ))) return hr; + if (FAILED(hr = dinput_create( &IID_IUnknown, (void **)&unknown, NULL ))) return hr; hr = IUnknown_QueryInterface( unknown, iid, out ); IUnknown_Release( unknown ); diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index 4b36a69c0e1..de48c4c5298 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -30,31 +30,30 @@ extern HINSTANCE DINPUT_instance; /* Implementation specification */ -typedef struct IDirectInputImpl IDirectInputImpl; -struct IDirectInputImpl +struct dinput { - IDirectInput7A IDirectInput7A_iface; - IDirectInput7W IDirectInput7W_iface; - IDirectInput8A IDirectInput8A_iface; - IDirectInput8W IDirectInput8W_iface; - IDirectInputJoyConfig8 IDirectInputJoyConfig8_iface; + IDirectInput7A IDirectInput7A_iface; + IDirectInput7W IDirectInput7W_iface; + IDirectInput8A IDirectInput8A_iface; + IDirectInput8W IDirectInput8W_iface; + IDirectInputJoyConfig8 IDirectInputJoyConfig8_iface; + LONG ref; - LONG ref; - BOOL initialized; - DWORD evsequence; /* unique sequence number for events */ - DWORD dwVersion; /* direct input version number */ - struct list device_players; /* device instance guid to player name */ + BOOL initialized; + DWORD dwVersion; /* direct input version number */ + DWORD evsequence; /* unique sequence number for events */ + struct list device_players; /* device instance guid to player name */ }; extern const IDirectInput7AVtbl dinput7_a_vtbl DECLSPEC_HIDDEN; extern const IDirectInput8AVtbl dinput8_a_vtbl DECLSPEC_HIDDEN; extern HRESULT mouse_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instance, DWORD version ); -extern HRESULT mouse_create_device( IDirectInputImpl *dinput, const GUID *guid, IDirectInputDevice8W **out ); +extern HRESULT mouse_create_device( struct dinput *dinput, const GUID *guid, IDirectInputDevice8W **out ); extern HRESULT keyboard_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instance, DWORD version ); -extern HRESULT keyboard_create_device( IDirectInputImpl *dinput, const GUID *guid, IDirectInputDevice8W **out ); +extern HRESULT keyboard_create_device( struct dinput *dinput, const GUID *guid, IDirectInputDevice8W **out ); extern HRESULT hid_joystick_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instance, DWORD version, int index ); -extern HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID *guid, IDirectInputDevice8W **out ); +extern HRESULT hid_joystick_create_device( struct dinput *dinput, const GUID *guid, IDirectInputDevice8W **out ); struct DevicePlayer { GUID instance_guid; diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 597a3da4ef8..067ffabaaa9 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1964,7 +1964,7 @@ static BOOL init_pid_caps( struct hid_joystick *impl, struct hid_value_caps *cap return DIENUM_CONTINUE; } -HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID *guid, IDirectInputDevice8W **out ) +HRESULT hid_joystick_create_device( struct dinput *dinput, const GUID *guid, IDirectInputDevice8W **out ) { static const DIPROPHEADER filter = { diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 1421e56ac3a..c483fb6e66a 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -164,7 +164,7 @@ HRESULT keyboard_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instan return DI_OK; } -HRESULT keyboard_create_device( IDirectInputImpl *dinput, const GUID *guid, IDirectInputDevice8W **out ) +HRESULT keyboard_create_device( struct dinput *dinput, const GUID *guid, IDirectInputDevice8W **out ) { struct keyboard *impl; HRESULT hr; diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 64b2c30008d..43f3a6ad334 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -91,7 +91,7 @@ HRESULT mouse_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instance, return DI_OK; } -HRESULT mouse_create_device( IDirectInputImpl *dinput, const GUID *guid, IDirectInputDevice8W **out ) +HRESULT mouse_create_device( struct dinput *dinput, const GUID *guid, IDirectInputDevice8W **out ) { struct mouse *impl; HKEY hkey, appkey; -- 2.34.1

1 4

[PATCH] kernelbase: Partially implement SetCurrentConsoleFontEx
by Hugh McMaster 08 Feb '22

08 Feb '22

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- dlls/kernel32/console.c | 7 ------- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/tests/console.c | 30 +++++++++++++------------- dlls/kernelbase/console.c | 37 +++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 1 + include/wine/condrv.h | 6 ++++++ programs/conhost/conhost.c | 9 +++++++- programs/conhost/conhost.h | 14 ++++++++----- programs/conhost/window.c | 5 +++-- 9 files changed, 80 insertions(+), 31 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 80f3419cd7a..58bd18d2a5f 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -480,10 +480,3 @@ BOOL WINAPI GetConsoleFontInfo(HANDLE hConsole, BOOL maximize, DWORD numfonts, C SetLastError(LOWORD(E_NOTIMPL) /* win10 1709+ */); return FALSE; } - -BOOL WINAPI SetCurrentConsoleFontEx(HANDLE hConsole, BOOL maxwindow, CONSOLE_FONT_INFOEX *cfix) -{ - FIXME("(%p %d %p): stub!\n", hConsole, maxwindow, cfix); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 87fa0c39381..6e063bfaa7b 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1390,7 +1390,7 @@ @ stdcall -import SetConsoleTitleW(wstr) @ stdcall -import SetConsoleWindowInfo(long long ptr) @ stdcall SetCriticalSectionSpinCount(ptr long) NTDLL.RtlSetCriticalSectionSpinCount -@ stdcall SetCurrentConsoleFontEx(long long ptr) +@ stdcall -import SetCurrentConsoleFontEx(long long ptr) @ stdcall -import SetCurrentDirectoryA(str) @ stdcall -import SetCurrentDirectoryW(wstr) @ stub SetDaylightFlag diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index e4d9d43f4c4..0943a318f6a 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3576,18 +3576,18 @@ static void test_SetCurrentConsoleFontEx(HANDLE std_output) SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(NULL, FALSE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(NULL, TRUE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); CreatePipe(&pipe1, &pipe2, NULL, 0); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(pipe1, FALSE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); CloseHandle(pipe1); CloseHandle(pipe2); @@ -3595,36 +3595,36 @@ static void test_SetCurrentConsoleFontEx(HANDLE std_output) SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(pipe1, TRUE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); CloseHandle(pipe1); CloseHandle(pipe2); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_input, FALSE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_input, TRUE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, TRUE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); cfix = orig_cfix; SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(NULL, FALSE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(NULL, TRUE, &cfix); @@ -3635,7 +3635,7 @@ static void test_SetCurrentConsoleFontEx(HANDLE std_output) SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(pipe1, FALSE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); CloseHandle(pipe1); CloseHandle(pipe2); @@ -3650,7 +3650,7 @@ static void test_SetCurrentConsoleFontEx(HANDLE std_output) SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_input, FALSE, &cfix); ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_input, TRUE, &cfix); @@ -3659,8 +3659,8 @@ static void test_SetCurrentConsoleFontEx(HANDLE std_output) SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); - todo_wine ok(ret, "got %d, expected non-zero\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + ok(ret, "got %d, expected non-zero\n", ret); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, TRUE, &cfix); @@ -3670,8 +3670,8 @@ static void test_SetCurrentConsoleFontEx(HANDLE std_output) /* Restore original console font parameters */ SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, FALSE, &orig_cfix); - todo_wine ok(ret, "got %d, expected non-zero\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + ok(ret, "got %d, expected non-zero\n", ret); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); } static void test_GetConsoleFontSize(HANDLE std_output) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index a7eeb439232..0501e140a03 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1303,6 +1303,43 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleWindowInfo( HANDLE handle, BOOL absolute } +/****************************************************************************** + * SetCurrentConsoleFontEx (kernelbase.@) + */ +BOOL WINAPI SetCurrentConsoleFontEx(HANDLE hConsole, BOOL maxwindow, CONSOLE_FONT_INFOEX *cfix) +{ + struct condrv_output_info_params_font data; + + TRACE( "(%p %d %p)\n", hConsole, maxwindow, cfix ); + + if (cfix->cbSize != sizeof(CONSOLE_FONT_INFOEX)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (maxwindow) + { + FIXME( "(%p %d %p): semi-stub\n", hConsole, maxwindow, cfix); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + } + + data.params.mask = SET_CONSOLE_OUTPUT_INFO_FONT; + + data.params.info.font_width = cfix->dwFontSize.X; + data.params.info.font_height = cfix->dwFontSize.Y; + data.params.info.font_pitch_family = cfix->FontFamily; + data.params.info.font_weight = cfix->FontWeight; + + memcpy( data.face_name, cfix->FaceName, sizeof(cfix->FaceName) ); + data.face_name[ LF_FACESIZE - 1 ] = 0; + + return console_ioctl( hConsole, IOCTL_CONDRV_SET_OUTPUT_INFO, + &data, sizeof(data), NULL, 0, NULL ); +} + + /*********************************************************************** * ReadConsoleInputA (kernelbase.@) */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 01135d6250a..91c4909e006 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1422,6 +1422,7 @@ @ stdcall SetConsoleTitleW(wstr) @ stdcall SetConsoleWindowInfo(long long ptr) @ stdcall SetCriticalSectionSpinCount(ptr long) ntdll.RtlSetCriticalSectionSpinCount +@ stdcall SetCurrentConsoleFontEx(long long ptr) @ stdcall SetCurrentDirectoryA(str) @ stdcall SetCurrentDirectoryW(wstr) @ stdcall SetDefaultDllDirectories(long) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 4d2332a1ee9..605e6f2c2fe 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -148,6 +148,11 @@ struct condrv_output_info_params struct condrv_output_info info; /* output info */ }; +struct condrv_output_info_params_font { + struct condrv_output_info_params params; + WCHAR face_name[LF_FACESIZE]; +}; + #define SET_CONSOLE_OUTPUT_INFO_CURSOR_GEOM 0x0001 #define SET_CONSOLE_OUTPUT_INFO_CURSOR_POS 0x0002 #define SET_CONSOLE_OUTPUT_INFO_SIZE 0x0004 @@ -155,6 +160,7 @@ struct condrv_output_info_params #define SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW 0x0010 #define SET_CONSOLE_OUTPUT_INFO_MAX_SIZE 0x0020 #define SET_CONSOLE_OUTPUT_INFO_POPUP_ATTR 0x0040 +#define SET_CONSOLE_OUTPUT_INFO_FONT 0x0080 /* IOCTL_CONDRV_FILL_OUTPUT params */ struct condrv_fill_output_params diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 78f6e345170..456f3a4889e 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1913,6 +1913,13 @@ static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, screen_buffer->max_width = info->max_width; screen_buffer->max_height = info->max_height; } + if (params->mask & SET_CONSOLE_OUTPUT_INFO_FONT) + { + WCHAR *face_name = (WCHAR *)(params + 1); + + update_console_font( screen_buffer->console, face_name, + info->font_height, info->font_weight ); + } if (is_active( screen_buffer )) { @@ -2425,7 +2432,7 @@ static NTSTATUS screen_buffer_ioctl( struct screen_buffer *screen_buffer, unsign return get_output_info( screen_buffer, out_size ); case IOCTL_CONDRV_SET_OUTPUT_INFO: - if (in_size != sizeof(struct condrv_output_info_params) || *out_size) return STATUS_INVALID_PARAMETER; + if (in_size < sizeof(struct condrv_output_info) || *out_size) return STATUS_INVALID_PARAMETER; return set_output_info( screen_buffer, in_data ); case IOCTL_CONDRV_FILL_OUTPUT: diff --git a/programs/conhost/conhost.h b/programs/conhost/conhost.h index 5e9b999380c..88a26f70fd0 100644 --- a/programs/conhost/conhost.h +++ b/programs/conhost/conhost.h @@ -130,17 +130,21 @@ struct screen_buffer struct wine_rb_entry entry; /* map entry */ }; -BOOL init_window( struct console *console ); -void init_message_window( struct console *console ); -void update_window_region( struct console *console, const RECT *update ); -void update_window_config( struct console *console, BOOL delay ); - +/* conhost.c */ NTSTATUS write_console_input( struct console *console, const INPUT_RECORD *records, unsigned int count, BOOL flush ); void notify_screen_buffer_size( struct screen_buffer *screen_buffer ); NTSTATUS change_screen_buffer_size( struct screen_buffer *screen_buffer, int new_width, int new_height ); +/* window.c */ +void update_console_font( struct console *console, const WCHAR *font, + unsigned int height, unsigned int weight ); +BOOL init_window( struct console *console ); +void init_message_window( struct console *console ); +void update_window_region( struct console *console, const RECT *update ); +void update_window_config( struct console *console, BOOL delay ); + static inline void empty_update_rect( struct screen_buffer *screen_buffer, RECT *rect ) { SetRect( rect, screen_buffer->width, screen_buffer->height, 0, 0 ); diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 7ad0d48effd..0d450774d23 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -705,6 +705,7 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) font_info->width = tm.tmAveCharWidth; font_info->height = tm.tmHeight + tm.tmExternalLeading; + font_info->pitch_family = tm.tmPitchAndFamily; font_info->weight = tm.tmWeight; free( font_info->face_name ); @@ -851,8 +852,8 @@ static int WINAPI get_first_font_enum( const LOGFONTW *lf, const TEXTMETRICW *tm /* sets logfont as the new font for the console */ -static void update_console_font( struct console *console, const WCHAR *font, - unsigned int height, unsigned int weight ) +void update_console_font( struct console *console, const WCHAR *font, + unsigned int height, unsigned int weight ) { struct font_chooser fc; LOGFONTW lf; -- 2.34.1

2 2

[PATCH] comctl32: Send EVENT_OBJECT_STATECHANGE when checking a checkbox
by Alex Henrie 08 Feb '22

08 Feb '22

The NVDA screen reader needs this. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/comctl32/button.c | 1 + dlls/user32/tests/msg.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 88b48a4a5c0..faf0212b256 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -656,6 +656,7 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L break; } SendMessageW( hWnd, BM_SETSTATE, FALSE, 0 ); + NotifyWinEvent( EVENT_OBJECT_STATECHANGE, hWnd, OBJID_CLIENT, 0 ); GetClientRect( hWnd, &rect ); if (uMsg == WM_KEYUP || PtInRect( &rect, pt )) { diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f0e0d0fba76..cb8d4f07fe7 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1774,7 +1774,7 @@ static const struct message WmModalDialogSeq[] = { { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_KILLFOCUS, sent|parent }, { WM_IME_SETCONTEXT, sent|parent|wparam|optional, 0 }, - { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, 0, 0 }, { WM_ENABLE, sent|parent|wparam, 0 }, { HCBT_CREATEWND, hook }, { EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Not sent on Win10. */ @@ -1829,7 +1829,7 @@ static const struct message WmModalDialogSeq[] = { { WM_ENTERIDLE, sent|parent|optional }, { WM_ENTERIDLE, sent|parent|optional }, { WM_TIMER, sent }, - { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, 0, 0 }, { WM_ENABLE, sent|parent|wparam, 1 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE }, { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, @@ -1860,14 +1860,14 @@ static const struct message WmModalDialogSeq_2[] = { { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_KILLFOCUS, sent }, { WM_IME_SETCONTEXT, sent|parent|wparam|optional, 0 }, - { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, 0, 0 }, { WM_ENABLE, sent|wparam, 0 }, { HCBT_CREATEWND, hook }, { EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam|optional, 0, 0 }, { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_SETFONT, sent }, { WM_INITDIALOG, sent }, - { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, 0, 0 }, { WM_CHANGEUISTATE, sent|optional }, { WM_UPDATEUISTATE, sent|optional }, { WM_ENABLE, sent|wparam, 1 }, @@ -7297,24 +7297,24 @@ static const struct message auto_radio_button_VK_DOWN_dialog[] = { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { BM_SETSTATE, sent|wparam|lparam|defwinproc, BST_CHECKED, ID_RADIO1 }, { WM_CTLCOLORSTATIC, sent|parent }, - { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_LBUTTONUP, sent|wparam|lparam|defwinproc, 0, 0 }, { BM_SETSTATE, sent|wparam|lparam|defwinproc, BST_UNCHECKED, ID_RADIO1 }, { WM_CTLCOLORSTATIC, sent|parent }, - { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, ID_RADIO1, 0 }, { BM_SETCHECK, sent|wparam|lparam|defwinproc, BST_CHECKED, ID_RADIO1 }, { WM_CTLCOLORSTATIC, sent|parent }, - { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, ID_RADIO3, 0 }, { BM_SETCHECK, sent|wparam|lparam|defwinproc, BST_UNCHECKED, ID_RADIO3 }, { WM_CTLCOLORSTATIC, sent|parent }, - { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, ID_TEXT, 0 }, { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, ID_RADIO2, 0 }, { BM_SETCHECK, sent|wparam|lparam|defwinproc, BST_UNCHECKED, ID_RADIO2 }, { WM_CTLCOLORSTATIC, sent|parent }, - { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_CAPTURECHANGED, sent|wparam|lparam|defwinproc, 0, 0 }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_RADIO1, BN_CLICKED) }, -- 2.35.1

3 6

[PATCH] wusa: Use case insensitive comparison for expressions.
by Mohamad Al-Jaf 08 Feb '22

08 Feb '22

Some update packages use both lowercase and uppercase names for expressions. For example, Microsoft-Windows-MediaFeaturePack-OOB-Package_x64.msu uses both Runtime and runtime for expressions. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- programs/wusa/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/wusa/main.c b/programs/wusa/main.c index bcb795a80fa..db745edbe5a 100644 --- a/programs/wusa/main.c +++ b/programs/wusa/main.c @@ -480,10 +480,10 @@ static WCHAR *lookup_expression(struct assembly_entry *assembly, const WCHAR *ke { WCHAR path[MAX_PATH]; - if (!wcscmp(key, L"runtime.system32")) + if (!wcsicmp(key, L"runtime.system32")) { #ifdef __x86_64__ - if (!wcscmp(assembly->identity.architecture, L"x86")) + if (!wcsicmp(assembly->identity.architecture, L"x86")) { GetSystemWow64DirectoryW(path, ARRAY_SIZE(path)); return strdupW(path); @@ -492,7 +492,7 @@ static WCHAR *lookup_expression(struct assembly_entry *assembly, const WCHAR *ke GetSystemDirectoryW(path, ARRAY_SIZE(path)); return strdupW(path); } - if (!wcscmp(key, L"runtime.windows")) + if (!wcsicmp(key, L"runtime.windows")) { GetWindowsDirectoryW(path, ARRAY_SIZE(path)); return strdupW(path); -- 2.34.1

1 1

[PATCH 1/4] dpinst: New stub program.
by Zebediah Figura 08 Feb '22

08 Feb '22

This program is not shipped by Windows. Rather, it is a redistributable component shipped with some drivers, which appears to be a thin wrapper over the undocumented DriverStore* APIs exported from setupapi. Since the behaviour of this program is much easier to determine and implement, it seems much more worthwhile to do so despite not being an OS component. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42424 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- There is a snag, though, which is that Wine's default load order is "native,builtin" for the main EXE when loaded with an absolute path, as will pretty much always be the case for dpinst.exe. As such anyone who intends to install a package that requires it will need to manually set the program to prefer builtin. Ideally this wouldn't be necessary, but it's not clear to me how to avoid it: * Set *dpinst.exe to have a default override of builtin,native in the DllOverrides key? There's no precedent for this, though. * Introduce an analog of the --prefer-native switch? Seems excessive for something that would so rarely useful. configure.ac | 2 ++ loader/wine.inf.in | 1 + programs/dpinst/Makefile.in | 4 ++++ programs/dpinst/dpinst.c | 35 +++++++++++++++++++++++++++++++++++ programs/dpinst64/Makefile.in | 5 +++++ 5 files changed, 47 insertions(+) create mode 100644 programs/dpinst/Makefile.in create mode 100644 programs/dpinst/dpinst.c create mode 100644 programs/dpinst64/Makefile.in diff --git a/configure.ac b/configure.ac index e51e114c45e..33d2ba15ebf 100644 --- a/configure.ac +++ b/configure.ac @@ -3547,6 +3547,8 @@ WINE_CONFIG_MAKEFILE(programs/conhost/tests) WINE_CONFIG_MAKEFILE(programs/control) WINE_CONFIG_MAKEFILE(programs/cscript) WINE_CONFIG_MAKEFILE(programs/dism) +WINE_CONFIG_MAKEFILE(programs/dpinst,,[test "x$enable_win64" = xyes]) +WINE_CONFIG_MAKEFILE(programs/dpinst64,enable_dpinst,[test "x$enable_win64" = xno]) WINE_CONFIG_MAKEFILE(programs/dplaysvr) WINE_CONFIG_MAKEFILE(programs/dpnsvr) WINE_CONFIG_MAKEFILE(programs/dpvsetup) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 0e488d87dcb..4ad9dc09efd 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2646,6 +2646,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,services.exe,- 11,,spoolsv.exe,- 11,,winemenubuilder.exe,- +11,,dpinst.exe,- ; registration order matters for these 11,,msxml.dll 11,,msxml2.dll diff --git a/programs/dpinst/Makefile.in b/programs/dpinst/Makefile.in new file mode 100644 index 00000000000..bd97b860ce7 --- /dev/null +++ b/programs/dpinst/Makefile.in @@ -0,0 +1,4 @@ +MODULE = dpinst.exe +EXTRADLLFLAGS = -mconsole -municode + +C_SRCS = dpinst.c diff --git a/programs/dpinst/dpinst.c b/programs/dpinst/dpinst.c new file mode 100644 index 00000000000..52b4119760b --- /dev/null +++ b/programs/dpinst/dpinst.c @@ -0,0 +1,35 @@ +/* + * Driver Store installer replacement + * + * Copyright 2022 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dpinst); + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + int i; + + for (i = 0; i < argc; i++) + FIXME(" %s", debugstr_w(argv[i])); + FIXME("\n"); + + return 0; +} diff --git a/programs/dpinst64/Makefile.in b/programs/dpinst64/Makefile.in new file mode 100644 index 00000000000..f79ed3e0dba --- /dev/null +++ b/programs/dpinst64/Makefile.in @@ -0,0 +1,5 @@ +MODULE = dpinst64.exe +EXTRADLLFLAGS = -mconsole -municode +PARENTSRC = ../dpinst + +C_SRCS = dpinst.c -- 2.34.1

1 3

[PATCH 1/5] qcap: Use CoCreateInstance() directly instead of BaseOutputPinImpl_InitAllocator().
by Zebediah Figura 08 Feb '22

08 Feb '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/qcap/avimux.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index fe4add83b7c..45b995cc2ff 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1177,9 +1177,12 @@ static HRESULT WINAPI AviMuxOut_DecideAllocator(struct strmbase_source *base, TRACE("(%p)->(%p %p)\n", base, pPin, pAlloc); - hr = BaseOutputPinImpl_InitAllocator(base, pAlloc); - if(FAILED(hr)) + if (FAILED(hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, + CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (void **)pAlloc))) + { + ERR("Failed to create allocator, hr %#x.\n", hr); return hr; + } hr = IMemInputPin_GetAllocatorRequirements(pPin, &req); if(FAILED(hr)) -- 2.34.1

1 4

[PATCH vkd3d] vkd3d-shader/hlsl: Fix floating point literals matching.
by Nikolay Sivov 08 Feb '22

08 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Immediate issue was that constants like 1e1 were not parsed without a suffix. libs/vkd3d-shader/hlsl.l | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index e9281ec..60aca79 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -188,11 +188,7 @@ row_major {return KW_ROW_MAJOR; } yylval->floatval = atof(yytext); return C_FLOAT; } -[0-9]+\.([eE][+-]?[0-9]+)?[h|H|f|F]? { - yylval->floatval = atof(yytext); - return C_FLOAT; - } -[0-9]+([eE][+-]?[0-9]+)?[h|H|f|F] { +[0-9]+(\.)?([eE][+-]?[0-9]+)?[h|H|f|F]? { yylval->floatval = atof(yytext); return C_FLOAT; } -- 2.34.1

2 2

[PATCH v2] user32/tests: Expect DialogBoxParam to set ERROR_CANNOT_FIND_WND_CLASS
by Alex Henrie 08 Feb '22

08 Feb '22

Fixes a testbot failure. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Avoid "misleading indentation" warning --- dlls/user32/tests/dialog.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 24aced8e192..f2bc30ff921 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1851,7 +1851,10 @@ static void test_DialogBoxParam(void) SetLastError(0xdeadbeef); ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_DIALOG_INVALID_CLASS", 0, DestroyDlgWinProc, 0); ok(ret == -1, "DialogBoxParamA returned %ld, expected -1\n", ret); - ok(GetLastError() == 0, "got %d\n", GetLastError()); + todo_wine + ok(GetLastError() == ERROR_CANNOT_FIND_WND_CLASS || + broken(GetLastError() == ERROR_SUCCESS) /* < win10 21H1 */, + "got %u, expected ERROR_CANNOT_FIND_WND_CLASS\n", GetLastError()); SetLastError(0xdeadbeef); ret = DefDlgProcA(0, WM_ERASEBKGND, 0, 0); -- 2.35.1

1 0

[PATCH 4/4] dmsynth/tests: Add some synth Open/Close tests
by Michael Stefaniuc 07 Feb '22

07 Feb '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmsynth/tests/dmsynth.c | 69 ++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index 5f2e9e95364..93212c0ae9f 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -65,6 +65,9 @@ static void test_dmsynth(void) ULONG value; ULONG bytes; DMUS_PORTCAPS caps; + DMUS_PORTPARAMS params; + const DWORD all_params = DMUS_PORTPARAMS_VOICES|DMUS_PORTPARAMS_CHANNELGROUPS|DMUS_PORTPARAMS_AUDIOCHANNELS| + DMUS_PORTPARAMS_SAMPLERATE|DMUS_PORTPARAMS_EFFECTS|DMUS_PORTPARAMS_SHARE|DMUS_PORTPARAMS_FEATURES; hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth, (LPVOID*)&dmsynth); ok(hr == S_OK, "CoCreateInstance returned: %#lx\n", hr); @@ -121,6 +124,72 @@ static void test_dmsynth(void) hr = IDirectMusicSynth_Activate(dmsynth, TRUE); ok(hr == DMUS_E_NOSYNTHSINK, "IDirectMusicSynth_Activate returned: %#lx\n", hr); + /* Open / Close */ + hr = IDirectMusicSynth_Open(dmsynth, NULL); + ok(hr == S_OK, "Open failed: %#lx\n", hr); + hr = IDirectMusicSynth_Open(dmsynth, NULL); + ok(hr == DMUS_E_ALREADYOPEN, "Open failed: %#lx\n", hr); + hr = IDirectMusicSynth_Close(dmsynth); + ok(hr == S_OK, "Close failed: %#lx\n", hr); + hr = IDirectMusicSynth_Close(dmsynth); + ok(hr == DMUS_E_ALREADYCLOSED, "Close failed: %#lx\n", hr); + memset(&params, 0, sizeof(params)); + hr = IDirectMusicSynth_Open(dmsynth, &params); + ok(hr == E_INVALIDARG, "Open failed: %#lx\n", hr); + params.dwSize = sizeof(DMUS_PORTPARAMS7); + hr = IDirectMusicSynth_Open(dmsynth, &params); + ok(hr == S_OK, "Open failed: %#lx\n", hr); + IDirectMusicSynth_Close(dmsynth); + /* All params supported and set to 0 */ + params.dwSize = sizeof(params); + params.dwValidParams = all_params; + hr = IDirectMusicSynth_Open(dmsynth, &params); + ok(hr == S_OK, "Open failed: %#lx\n", hr); + ok(params.dwSize == sizeof(params), "dwSize: %ld\n", params.dwSize); + ok(params.dwValidParams == all_params, "dwValidParams: %#lx\n", params.dwValidParams); + ok(params.dwVoices == 32, "dwVoices: %ld\n", params.dwVoices); + ok(params.dwChannelGroups == 2, "dwChannelGroups: %ld\n", params.dwChannelGroups); + ok(params.dwAudioChannels == 2, "dwAudioChannels: %ld\n", params.dwAudioChannels); + ok(params.dwSampleRate == 22050, "dwSampleRate: %ld\n", params.dwSampleRate); + ok(params.dwEffectFlags == DMUS_EFFECT_REVERB, "params.dwEffectFlags: %#lx\n", params.dwEffectFlags); + ok(params.fShare == FALSE, "fShare: %d\n", params.fShare); + ok(params.dwFeatures == 0, "dwFeatures: %#lx\n", params.dwFeatures); + IDirectMusicSynth_Close(dmsynth); + /* Requesting more than supported */ + params.dwValidParams = DMUS_PORTPARAMS_SAMPLERATE; + params.dwSampleRate = 100003; + hr = IDirectMusicSynth_Open(dmsynth, &params); + ok(hr == S_FALSE, "Open failed: %#lx\n", hr); + ok(params.dwValidParams == all_params, "dwValidParams: %#lx\n", params.dwValidParams); + ok(params.dwSampleRate == 96000, "dwSampleRate: %ld\n", params.dwSampleRate); + IDirectMusicSynth_Close(dmsynth); + /* Minimums */ + params.dwValidParams = DMUS_PORTPARAMS_VOICES|DMUS_PORTPARAMS_CHANNELGROUPS|DMUS_PORTPARAMS_AUDIOCHANNELS| + DMUS_PORTPARAMS_SAMPLERATE; + params.dwVoices = 1; + params.dwChannelGroups = 1; + params.dwAudioChannels = 1; + params.dwSampleRate = 1; + hr = IDirectMusicSynth_Open(dmsynth, &params); + ok(hr == S_FALSE, "Open failed: %#lx\n", hr); + ok(params.dwValidParams == all_params, "dwValidParams: %#lx\n", params.dwValidParams); + ok(params.dwVoices == 1, "dwVoices: %ld\n", params.dwVoices); + ok(params.dwChannelGroups == 1, "dwChannelGroups: %ld\n", params.dwChannelGroups); + ok(params.dwAudioChannels == 1, "dwAudioChannels: %ld\n", params.dwAudioChannels); + ok(params.dwSampleRate == 11025, "dwSampleRate: %ld\n", params.dwSampleRate); + IDirectMusicSynth_Close(dmsynth); + /* Test share and features */ + params.dwValidParams = DMUS_PORTPARAMS_SHARE|DMUS_PORTPARAMS_FEATURES; + params.fShare = TRUE; + params.dwFeatures = DMUS_PORT_FEATURE_AUDIOPATH|DMUS_PORT_FEATURE_STREAMING; + hr = IDirectMusicSynth_Open(dmsynth, &params); + ok(hr == S_FALSE, "Open failed: %#lx\n", hr); + ok(params.dwValidParams == all_params, "dwValidParams: %#lx\n", params.dwValidParams); + ok(params.fShare == FALSE, "fShare: %d\n", params.fShare); + ok(params.dwFeatures == (DMUS_PORT_FEATURE_AUDIOPATH|DMUS_PORT_FEATURE_STREAMING), + "dwFeatures: %#lx\n", params.dwFeatures); + IDirectMusicSynth_Close(dmsynth); + /* Synth has no default clock */ hr = IDirectMusicSynth_GetLatencyClock(dmsynth, &clock_synth); ok(hr == DMUS_E_NOSYNTHSINK, "IDirectMusicSynth_GetLatencyClock returned: %#lx\n", hr); -- 2.34.1

1 0

[PATCH 3/4] dmsynth: Implement the synth's Open and Close methods
by Michael Stefaniuc 07 Feb '22

07 Feb '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/tests/performance.c | 4 +- dlls/dmsynth/dmsynth_private.h | 5 +- dlls/dmsynth/synth.c | 91 ++++++++++++++++++++++++++++++++-- 3 files changed, 90 insertions(+), 10 deletions(-) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index cec89ca80aa..d09d0120023 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -286,7 +286,7 @@ static void test_createport(void) hr = IDirectMusic_CreatePort(music, &CLSID_DirectMusicSynth, &portparams, &port, NULL); ok(hr == S_OK, "CreatePort failed: %08x\n", hr); ok(port != NULL, "Didn't get IDirectMusicPort pointer\n"); - todo_wine ok(portparams.dwValidParams, "portparams struct was not filled in\n"); + ok(portparams.dwValidParams, "portparams struct was not filled in\n"); IDirectMusicPort_Release(port); port = NULL; @@ -312,7 +312,7 @@ static void test_createport(void) hr = IDirectMusic_CreatePort(music, &GUID_NULL, &portparams, &port, NULL); ok(hr == S_OK, "CreatePort failed: %08x\n", hr); ok(port != NULL, "Didn't get IDirectMusicPort pointer\n"); - todo_wine ok(portparams.dwValidParams, "portparams struct was not filled in\n"); + ok(portparams.dwValidParams, "portparams struct was not filled in\n"); IDirectMusicPort_Release(port); port = NULL; diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index aabf1f56904..0058ce04d3a 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -56,14 +56,13 @@ extern HRESULT WINAPI DMUSIC_CreateDirectMusicSynthSinkImpl(REFIID riid, void ** * IDirectMusicSynth8Impl implementation structure */ struct IDirectMusicSynth8Impl { - /* IUnknown fields */ IDirectMusicSynth8 IDirectMusicSynth8_iface; IKsControl IKsControl_iface; LONG ref; - - /* IDirectMusicSynth8 fields */ DMUS_PORTCAPS caps; + DMUS_PORTPARAMS params; BOOL active; + BOOL open; IReferenceClock *latency_clock; IDirectMusicSynthSink *sink; }; diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index c69d7a340b1..2db80726408 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -94,21 +94,102 @@ static ULONG WINAPI IDirectMusicSynth8Impl_Release(IDirectMusicSynth8 *iface) } /* IDirectMusicSynth8Impl IDirectMusicSynth part: */ -static HRESULT WINAPI IDirectMusicSynth8Impl_Open(IDirectMusicSynth8 *iface, - DMUS_PORTPARAMS *pPortParams) +static HRESULT WINAPI IDirectMusicSynth8Impl_Open(IDirectMusicSynth8 *iface, DMUS_PORTPARAMS *params) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); + BOOL modified = FALSE; + const DMUS_PORTPARAMS def = { + .dwValidParams = DMUS_PORTPARAMS_VOICES|DMUS_PORTPARAMS_CHANNELGROUPS| + DMUS_PORTPARAMS_AUDIOCHANNELS|DMUS_PORTPARAMS_SAMPLERATE|DMUS_PORTPARAMS_EFFECTS| + DMUS_PORTPARAMS_SHARE|DMUS_PORTPARAMS_FEATURES, + .dwSize = sizeof(def), .dwVoices = 32, .dwChannelGroups = 2, .dwAudioChannels = 2, + .dwSampleRate = 22050, .dwEffectFlags = DMUS_EFFECT_REVERB + }; + + TRACE("(%p, %p)\n", This, params); + + if (This->open) + return DMUS_E_ALREADYOPEN; + if (params && params->dwSize < sizeof(DMUS_PORTPARAMS7)) + return E_INVALIDARG; - FIXME("(%p)->(%p): stub\n", This, pPortParams); + This->open = TRUE; - return S_OK; + if (!params) { + memcpy(&This->params, &def, sizeof(This->params)); + return S_OK; + } + + if (params->dwValidParams & DMUS_PORTPARAMS_VOICES && params->dwVoices) { + if (params->dwVoices > This->caps.dwMaxVoices) { + modified = TRUE; + params->dwVoices = This->caps.dwMaxVoices; + } + } else + params->dwVoices = def.dwVoices; + + if (params->dwValidParams & DMUS_PORTPARAMS_CHANNELGROUPS && params->dwChannelGroups) { + if (params->dwChannelGroups > This->caps.dwMaxChannelGroups) { + modified = TRUE; + params->dwChannelGroups = This->caps.dwMaxChannelGroups; + } + } else + params->dwChannelGroups = def.dwChannelGroups; + + if (params->dwValidParams & DMUS_PORTPARAMS_AUDIOCHANNELS && params->dwAudioChannels) { + if (params->dwAudioChannels > This->caps.dwMaxAudioChannels) { + modified = TRUE; + params->dwAudioChannels = This->caps.dwMaxAudioChannels; + } + } else + params->dwAudioChannels = def.dwAudioChannels; + + if (params->dwValidParams & DMUS_PORTPARAMS_SAMPLERATE && params->dwSampleRate) { + if (params->dwSampleRate > 96000) { + modified = TRUE; + params->dwSampleRate = 96000; + } else if (params->dwSampleRate < 11025) { + modified = TRUE; + params->dwSampleRate = 11025; + } + } else + params->dwSampleRate = def.dwSampleRate; + + if (params->dwValidParams & DMUS_PORTPARAMS_EFFECTS && params->dwEffectFlags != def.dwEffectFlags) + modified = TRUE; + params->dwEffectFlags = def.dwEffectFlags; + + if (params->dwValidParams & DMUS_PORTPARAMS_SHARE && params->fShare) + modified = TRUE; + params->fShare = FALSE; + + if (params->dwSize >= sizeof(params)) { + if (params->dwValidParams & DMUS_PORTPARAMS_FEATURES && params->dwFeatures) { + if (params->dwFeatures & ~(DMUS_PORT_FEATURE_AUDIOPATH|DMUS_PORT_FEATURE_STREAMING)) { + modified = TRUE; + params->dwFeatures &= DMUS_PORT_FEATURE_AUDIOPATH|DMUS_PORT_FEATURE_STREAMING; + } + } else + params->dwFeatures = def.dwFeatures; + params->dwValidParams = def.dwValidParams; + } else + params->dwValidParams = def.dwValidParams & ~DMUS_PORTPARAMS_FEATURES; + + memcpy(&This->params, params, min(params->dwSize, sizeof(This->params))); + + return modified ? S_FALSE : S_OK; } static HRESULT WINAPI IDirectMusicSynth8Impl_Close(IDirectMusicSynth8 *iface) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); - FIXME("(%p)->(): stub\n", This); + TRACE("(%p)\n", This); + + if (!This->open) + return DMUS_E_ALREADYCLOSED; + + This->open = FALSE; return S_OK; } -- 2.34.1

1 0

[PATCH 2/4] dmime: The soft synth doesn't supports sharing the channel groups
by Michael Stefaniuc 07 Feb '22

07 Feb '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/performance.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 554518c5d5b..58d16de234d 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -643,9 +643,6 @@ static HRESULT perf_dmport_create(IDirectMusicPerformance8Impl *perf, DMUS_PORTP if (FAILED(hr = IDirectMusic8_GetDefaultPort(perf->dmusic, &guid))) return hr; - params->dwValidParams |= DMUS_PORTPARAMS_SHARE; - params->fShare = TRUE; - if (FAILED(hr = IDirectMusic8_CreatePort(perf->dmusic, &guid, params, &port, NULL))) return hr; if (FAILED(hr = IDirectMusicPort_Activate(port, TRUE))) { -- 2.34.1

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel