- wine-devel - winehq.org

[PATCH vkd3d 1/6] tests: Add tests for root signature 1.1 bytecode.
by Józef Kucia 25 Apr '19

25 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 638 +++++++++++++++++++++++++++++++++++----- tests/d3d12_crosstest.h | 8 + 2 files changed, 578 insertions(+), 68 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index d37223855a7c..6cc6771a8e2b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -18,6 +18,9 @@ #include "d3d12_crosstest.h" +static PFN_D3D12_CREATE_VERSIONED_ROOT_SIGNATURE_DESERIALIZER pfn_D3D12CreateVersionedRootSignatureDeserializer; +static PFN_D3D12_SERIALIZE_VERSIONED_ROOT_SIGNATURE pfn_D3D12SerializeVersionedRootSignature; + struct vec2 { float x, y; @@ -9769,6 +9772,29 @@ static void check_descriptor_range_(unsigned int line, const D3D12_DESCRIPTOR_RA expected_range->OffsetInDescriptorsFromTableStart); } +static void check_descriptor_range1_(unsigned int line, const D3D12_DESCRIPTOR_RANGE1 *range, + const D3D12_DESCRIPTOR_RANGE1 *expected_range, bool converted) +{ + unsigned int expected_flags = converted + ? D3D12_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE | D3D12_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE + : expected_range->Flags; + + ok_(line)(range->RangeType == expected_range->RangeType, + "Got range type %#x, expected %#x.\n", range->RangeType, expected_range->RangeType); + ok_(line)(range->NumDescriptors == expected_range->NumDescriptors, + "Got descriptor count %u, expected %u.\n", range->NumDescriptors, expected_range->NumDescriptors); + ok_(line)(range->BaseShaderRegister == expected_range->BaseShaderRegister, + "Got base shader register %u, expected %u.\n", + range->BaseShaderRegister, expected_range->BaseShaderRegister); + ok_(line)(range->RegisterSpace == expected_range->RegisterSpace, + "Got register space %u, expected %u.\n", range->RegisterSpace, expected_range->RegisterSpace); + ok_(line)(range->Flags == expected_flags, + "Got descriptor range flags %#x, expected %#x.\n", range->Flags, expected_flags); + ok_(line)(range->OffsetInDescriptorsFromTableStart == expected_range->OffsetInDescriptorsFromTableStart, + "Got offset %u, expected %u.\n", range->OffsetInDescriptorsFromTableStart, + expected_range->OffsetInDescriptorsFromTableStart); +} + static void check_root_parameter_(unsigned int line, const D3D12_ROOT_PARAMETER *parameter, const D3D12_ROOT_PARAMETER *expected_parameter) { @@ -9831,6 +9857,73 @@ static void check_root_parameter_(unsigned int line, const D3D12_ROOT_PARAMETER parameter->ShaderVisibility, expected_parameter->ShaderVisibility); } +static void check_root_parameter1_(unsigned int line, const D3D12_ROOT_PARAMETER1 *parameter, + const D3D12_ROOT_PARAMETER1 *expected_parameter, bool converted) +{ + const D3D12_ROOT_DESCRIPTOR1 *descriptor, *expected_descriptor; + const D3D12_ROOT_DESCRIPTOR_TABLE1 *table, *expected_table; + const D3D12_ROOT_CONSTANTS *constants, *expected_constants; + unsigned int expected_flags; + unsigned int i; + + ok_(line)(parameter->ParameterType == expected_parameter->ParameterType, + "Got type %#x, expected %#x.\n", parameter->ParameterType, expected_parameter->ParameterType); + if (parameter->ParameterType != expected_parameter->ParameterType) + return; + + switch (parameter->ParameterType) + { + case D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: + table = &parameter->DescriptorTable; + expected_table = &expected_parameter->DescriptorTable; + ok_(line)(table->NumDescriptorRanges == expected_table->NumDescriptorRanges, + "Got range count %u, expected %u.\n", + table->NumDescriptorRanges, expected_table->NumDescriptorRanges); + if (table->NumDescriptorRanges == expected_table->NumDescriptorRanges) + { + for (i = 0; i < table->NumDescriptorRanges; ++i) + check_descriptor_range1_(line, &table->pDescriptorRanges[i], + &expected_table->pDescriptorRanges[i], converted); + } + break; + case D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS: + constants = &parameter->Constants; + expected_constants = &expected_parameter->Constants; + ok_(line)(constants->ShaderRegister == expected_constants->ShaderRegister, + "Got shader register %u, expected %u.\n", + constants->ShaderRegister, expected_constants->ShaderRegister); + ok_(line)(constants->RegisterSpace == expected_constants->RegisterSpace, + "Got register space %u, expected %u.\n", + constants->RegisterSpace, expected_constants->RegisterSpace); + ok_(line)(constants->Num32BitValues == expected_constants->Num32BitValues, + "Got 32-bit value count %u, expected %u.\n", + constants->Num32BitValues, expected_constants->Num32BitValues); + break; + case D3D12_ROOT_PARAMETER_TYPE_CBV: + case D3D12_ROOT_PARAMETER_TYPE_SRV: + case D3D12_ROOT_PARAMETER_TYPE_UAV: + descriptor = &parameter->Descriptor; + expected_descriptor = &expected_parameter->Descriptor; + ok_(line)(descriptor->ShaderRegister == expected_descriptor->ShaderRegister, + "Got shader register %u, expected %u.\n", + descriptor->ShaderRegister, expected_descriptor->ShaderRegister); + ok_(line)(descriptor->RegisterSpace == expected_descriptor->RegisterSpace, + "Got register space %u, expected %u.\n", + descriptor->RegisterSpace, expected_descriptor->RegisterSpace); + expected_flags = converted ? D3D12_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE : expected_descriptor->Flags; + ok_(line)(descriptor->Flags == expected_flags, + "Got root descriptor flags %#x, expected %#x.\n", + descriptor->Flags, expected_flags); + break; + default: + trace("Unhandled type %#x.\n", parameter->ParameterType); + } + + ok_(line)(parameter->ShaderVisibility == expected_parameter->ShaderVisibility, + "Got shader visibility %#x, expected %#x.\n", + parameter->ShaderVisibility, expected_parameter->ShaderVisibility); +} + static void check_static_sampler_(unsigned int line, const D3D12_STATIC_SAMPLER_DESC *sampler, const D3D12_STATIC_SAMPLER_DESC *expected_sampler) { @@ -9897,16 +9990,126 @@ static void check_root_signature_desc_(unsigned int line, const D3D12_ROOT_SIGNA desc->Flags, expected_desc->Flags); } -#define test_root_signature_deserialization(a, b, c) test_root_signature_deserialization_(__LINE__, a, b, c) -static void test_root_signature_deserialization_(unsigned int line, const DWORD *code, size_t code_size, - const D3D12_ROOT_SIGNATURE_DESC *expected_desc) +#define check_root_signature_desc1(a, b, c) check_root_signature_desc1_(__LINE__, a, b, c) +static void check_root_signature_desc1_(unsigned int line, const D3D12_ROOT_SIGNATURE_DESC1 *desc, + const D3D12_ROOT_SIGNATURE_DESC1 *expected_desc, bool converted) +{ + unsigned int i; + + ok_(line)(desc->NumParameters == expected_desc->NumParameters, + "Got parameter count %u, expected %u.\n", + desc->NumParameters, expected_desc->NumParameters); + if (!expected_desc->pParameters) + { + ok_(line)(!desc->pParameters, "Got unexpected parameters %p.\n", desc->pParameters); + } + else if (desc->NumParameters == expected_desc->NumParameters) + { + for (i = 0; i < desc->NumParameters; ++i) + check_root_parameter1_(line, &desc->pParameters[i], &expected_desc->pParameters[i], converted); + } + ok_(line)(desc->NumStaticSamplers == expected_desc->NumStaticSamplers, + "Got static sampler count %u, expected %u.\n", + desc->NumStaticSamplers, expected_desc->NumStaticSamplers); + if (!expected_desc->pStaticSamplers) + { + ok_(line)(!desc->pStaticSamplers, "Got unexpected static samplers %p.\n", desc->pStaticSamplers); + } + else if (desc->NumStaticSamplers == expected_desc->NumStaticSamplers) + { + for (i = 0; i < desc->NumStaticSamplers; ++i) + check_static_sampler_(line, &desc->pStaticSamplers[i], &expected_desc->pStaticSamplers[i]); + } + ok_(line)(desc->Flags == expected_desc->Flags, "Got flags %#x, expected %#x.\n", + desc->Flags, expected_desc->Flags); +} + +#define check_root_signature_deserialization(a, b, c) check_root_signature_deserialization_(__LINE__, a, b, c) +static void check_root_signature_deserialization_(unsigned int line, const D3D12_SHADER_BYTECODE *code, + const D3D12_ROOT_SIGNATURE_DESC *expected_desc, const D3D12_ROOT_SIGNATURE_DESC1 *expected_desc1) +{ + const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *versioned_desc, *versioned_desc2; + ID3D12VersionedRootSignatureDeserializer *versioned_deserializer; + ID3D12RootSignatureDeserializer *deserializer; + const D3D12_ROOT_SIGNATURE_DESC *desc; + ULONG refcount; + HRESULT hr; + + hr = D3D12CreateRootSignatureDeserializer(code->pShaderBytecode, code->BytecodeLength, + &IID_ID3D12RootSignatureDeserializer, (void **)&deserializer); + ok_(line)(hr == S_OK, "Failed to create deserializer, hr %#x.\n", hr); + + desc = ID3D12RootSignatureDeserializer_GetRootSignatureDesc(deserializer); + ok(desc, "Got NULL root signature desc.\n"); + check_root_signature_desc_(line, desc, expected_desc); + + refcount = ID3D12RootSignatureDeserializer_Release(deserializer); + ok_(line)(!refcount, "ID3D12RootSignatureDeserializer has %u references left.\n", (unsigned int)refcount); + + if (!pfn_D3D12CreateVersionedRootSignatureDeserializer) + return; + + hr = pfn_D3D12CreateVersionedRootSignatureDeserializer(code->pShaderBytecode, code->BytecodeLength, + &IID_ID3D12VersionedRootSignatureDeserializer, (void **)&versioned_deserializer); + ok_(line)(hr == S_OK, "Failed to create versioned deserializer, hr %#x.\n", hr); + + versioned_desc = ID3D12VersionedRootSignatureDeserializer_GetUnconvertedRootSignatureDesc(versioned_deserializer); + ok(versioned_desc, "Got NULL root signature desc.\n"); + ok(versioned_desc->Version == D3D_ROOT_SIGNATURE_VERSION_1_0, "Got unexpected version %#x.\n", versioned_desc->Version); + check_root_signature_desc_(line, &versioned_desc->Desc_1_0, expected_desc); + + hr = ID3D12VersionedRootSignatureDeserializer_GetRootSignatureDescAtVersion(versioned_deserializer, + D3D_ROOT_SIGNATURE_VERSION_1_0, &versioned_desc2); + ok_(line)(hr == S_OK, "Failed to get root signature 1.0, hr %#x.\n", hr); + ok_(line)(versioned_desc2 == versioned_desc, "Got unexpected pointer %p.\n", versioned_desc2); + + hr = ID3D12VersionedRootSignatureDeserializer_GetRootSignatureDescAtVersion(versioned_deserializer, + D3D_ROOT_SIGNATURE_VERSION_1_1, &versioned_desc); + ok_(line)(hr == S_OK, "Failed to get root signature 1.0, hr %#x.\n", hr); + ok(versioned_desc, "Got NULL root signature desc.\n"); + ok(versioned_desc->Version == D3D_ROOT_SIGNATURE_VERSION_1_1, "Got unexpected version %#x.\n", versioned_desc->Version); + check_root_signature_desc1_(line, &versioned_desc->Desc_1_1, expected_desc1, true); + + refcount = ID3D12VersionedRootSignatureDeserializer_Release(versioned_deserializer); + ok_(line)(!refcount, "ID3D12VersionedRootSignatureDeserializer has %u references left.\n", (unsigned int)refcount); +} + +#define check_root_signature_deserialization1(a, b, c) check_root_signature_deserialization1_(__LINE__, a, b, c) +static void check_root_signature_deserialization1_(unsigned int line, const D3D12_SHADER_BYTECODE *code, + const D3D12_ROOT_SIGNATURE_DESC *expected_desc, const D3D12_ROOT_SIGNATURE_DESC1 *expected_desc1) { + const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *versioned_desc, *versioned_desc2; + ID3D12VersionedRootSignatureDeserializer *versioned_deserializer; ID3D12RootSignatureDeserializer *deserializer; const D3D12_ROOT_SIGNATURE_DESC *desc; ULONG refcount; HRESULT hr; - hr = D3D12CreateRootSignatureDeserializer(code, code_size, + hr = pfn_D3D12CreateVersionedRootSignatureDeserializer(code->pShaderBytecode, code->BytecodeLength, + &IID_ID3D12VersionedRootSignatureDeserializer, (void **)&versioned_deserializer); + ok_(line)(hr == S_OK, "Failed to create deserializer, hr %#x.\n", hr); + + versioned_desc = ID3D12VersionedRootSignatureDeserializer_GetUnconvertedRootSignatureDesc(versioned_deserializer); + ok(versioned_desc, "Got NULL root signature desc.\n"); + ok(versioned_desc->Version == D3D_ROOT_SIGNATURE_VERSION_1_1, "Got unexpected version %#x.\n", versioned_desc->Version); + check_root_signature_desc1_(line, &versioned_desc->Desc_1_1, expected_desc1, false); + + hr = ID3D12VersionedRootSignatureDeserializer_GetRootSignatureDescAtVersion(versioned_deserializer, + D3D_ROOT_SIGNATURE_VERSION_1_1, &versioned_desc2); + ok_(line)(hr == S_OK, "Failed to get root signature 1.1, hr %#x.\n", hr); + ok_(line)(versioned_desc2 == versioned_desc, "Got unexpected pointer %p.\n", versioned_desc2); + + hr = ID3D12VersionedRootSignatureDeserializer_GetRootSignatureDescAtVersion(versioned_deserializer, + D3D_ROOT_SIGNATURE_VERSION_1_0, &versioned_desc); + ok_(line)(hr == S_OK, "Failed to get root signature 1.0, hr %#x.\n", hr); + ok(versioned_desc, "Got NULL root signature desc.\n"); + ok(versioned_desc->Version == D3D_ROOT_SIGNATURE_VERSION_1_0, "Got unexpected version %#x.\n", versioned_desc->Version); + check_root_signature_desc_(line, &versioned_desc->Desc_1_0, expected_desc); + + refcount = ID3D12VersionedRootSignatureDeserializer_Release(versioned_deserializer); + ok_(line)(!refcount, "ID3D12VersionedRootSignatureDeserializer has %u references left.\n", (unsigned int)refcount); + + hr = D3D12CreateRootSignatureDeserializer(code->pShaderBytecode, code->BytecodeLength, &IID_ID3D12RootSignatureDeserializer, (void **)&deserializer); ok_(line)(hr == S_OK, "Failed to create deserializer, hr %#x.\n", hr); @@ -9918,10 +10121,11 @@ static void test_root_signature_deserialization_(unsigned int line, const DWORD ok_(line)(!refcount, "ID3D12RootSignatureDeserializer has %u references left.\n", (unsigned int)refcount); } -#define test_root_signature_serialization(a, b, c) test_root_signature_serialization_(__LINE__, a, b, c) -static void test_root_signature_serialization_(unsigned int line, const DWORD *code, size_t code_size, +#define check_root_signature_serialization(a, b) check_root_signature_serialization_(__LINE__, a, b) +static void check_root_signature_serialization_(unsigned int line, const D3D12_SHADER_BYTECODE *bytecode, const D3D12_ROOT_SIGNATURE_DESC *desc) { + const DWORD *code = bytecode->pShaderBytecode; ID3DBlob *blob, *error_blob; DWORD *blob_buffer; size_t blob_size; @@ -9935,10 +10139,44 @@ static void test_root_signature_serialization_(unsigned int line, const DWORD *c blob_buffer = ID3D10Blob_GetBufferPointer(blob); blob_size = ID3D10Blob_GetBufferSize(blob); - ok_(line)(blob_size == code_size, "Got size %u, expected %u.\n", - (unsigned int)blob_size, (unsigned int)code_size); + ok_(line)(blob_size == bytecode->BytecodeLength, "Got size %u, expected %u.\n", + (unsigned int)blob_size, (unsigned int)bytecode->BytecodeLength); - for (i = 0; i < code_size / sizeof(DWORD); ++i) + for (i = 0; i < bytecode->BytecodeLength / sizeof(*code); ++i) + { + ok_(line)(blob_buffer[i] == code[i], "Got dword %#x, expected %#x at %u.\n", + (unsigned int)blob_buffer[i], (unsigned int)code[i], i); + } + + ID3D10Blob_Release(blob); +} + +#define check_root_signature_serialization1(a, b) check_root_signature_serialization1_(__LINE__, a, b) +static void check_root_signature_serialization1_(unsigned int line, const D3D12_SHADER_BYTECODE *bytecode, + const D3D12_ROOT_SIGNATURE_DESC1 *desc) +{ + D3D12_VERSIONED_ROOT_SIGNATURE_DESC versioned_desc; + const DWORD *code = bytecode->pShaderBytecode; + ID3DBlob *blob, *error_blob; + DWORD *blob_buffer; + size_t blob_size; + unsigned int i; + HRESULT hr; + + versioned_desc.Version = D3D_ROOT_SIGNATURE_VERSION_1_1; + versioned_desc.Desc_1_1 = *desc; + + error_blob = (ID3DBlob *)0xdeadbeef; + hr = pfn_D3D12SerializeVersionedRootSignature(&versioned_desc, &blob, &error_blob); + ok_(line)(hr == S_OK, "Failed to serialize root signature, hr %#x.\n", hr); + ok_(line)(!error_blob, "Got unexpected error blob %p.\n", error_blob); + + blob_buffer = ID3D10Blob_GetBufferPointer(blob); + blob_size = ID3D10Blob_GetBufferSize(blob); + ok_(line)(blob_size == bytecode->BytecodeLength, "Got size %u, expected %u.\n", + (unsigned int)blob_size, (unsigned int)bytecode->BytecodeLength); + + for (i = 0; i < bytecode->BytecodeLength / sizeof(*code); ++i) { ok_(line)(blob_buffer[i] == code[i], "Got dword %#x, expected %#x at %u.\n", (unsigned int)blob_buffer[i], (unsigned int)code[i], i); @@ -9949,60 +10187,103 @@ static void test_root_signature_serialization_(unsigned int line, const DWORD *c static void test_root_signature_byte_code(void) { + ID3D12VersionedRootSignatureDeserializer *versioned_deserializer; ID3D12RootSignatureDeserializer *deserializer; + ID3DBlob *blob; + unsigned int i; ULONG refcount; HRESULT hr; +#if 0 + #define RS "" +#endif /* /T rootsig_1_0 /E RS */ static const DWORD empty_rootsig[] = { -#if 0 - #define RS "" -#endif 0x43425844, 0xd64afc1d, 0x5dc27735, 0x9edacb4a, 0x6bd8a7fa, 0x00000001, 0x00000044, 0x00000001, 0x00000024, 0x30535452, 0x00000018, 0x00000001, 0x00000000, 0x00000018, 0x00000000, 0x00000018, 0x00000000, }; + /* /T rootsig_1_1 /E RS */ + static const DWORD empty_rootsig1[] = + { + 0x43425844, 0x791882cb, 0x83c1db39, 0x327edc93, 0x3163085b, 0x00000001, 0x00000044, 0x00000001, + 0x00000024, 0x30535452, 0x00000018, 0x00000002, 0x00000000, 0x00000018, 0x00000000, 0x00000018, + 0x00000000, + }; static const D3D12_ROOT_SIGNATURE_DESC empty_rootsig_desc = { .Flags = 0, }; - static const DWORD ia_rootsig[] = + static const D3D12_ROOT_SIGNATURE_DESC1 empty_rootsig_desc1 = { + .Flags = 0, + }; + #if 0 - #define RS "RootFlags(ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT)" + #define RS "RootFlags(ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT)" #endif + static const DWORD ia_rootsig[] = + { 0x43425844, 0x05bbd62e, 0xc74d3646, 0xde1407a5, 0x0d99273d, 0x00000001, 0x00000044, 0x00000001, 0x00000024, 0x30535452, 0x00000018, 0x00000001, 0x00000000, 0x00000018, 0x00000000, 0x00000018, 0x00000001, }; + static const DWORD ia_rootsig1[] = + { + 0x43425844, 0x1e922238, 0xa7743a59, 0x652c0188, 0xe999b061, 0x00000001, 0x00000044, 0x00000001, + 0x00000024, 0x30535452, 0x00000018, 0x00000002, 0x00000000, 0x00000018, 0x00000000, 0x00000018, + 0x00000001, + }; static const D3D12_ROOT_SIGNATURE_DESC ia_rootsig_desc = { .Flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT, }; - static const DWORD deny_ps_rootsig[] = + static const D3D12_ROOT_SIGNATURE_DESC1 ia_rootsig_desc1 = { + .Flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT, + }; + #if 0 - #define RS "RootFlags(DENY_PIXEL_SHADER_ROOT_ACCESS)" + #define RS "RootFlags(DENY_PIXEL_SHADER_ROOT_ACCESS)" #endif + static const DWORD deny_ps_rootsig[] = + { 0x43425844, 0xfad3a4ce, 0xf246286e, 0xeaa9e176, 0x278d5137, 0x00000001, 0x00000044, 0x00000001, 0x00000024, 0x30535452, 0x00000018, 0x00000001, 0x00000000, 0x00000018, 0x00000000, 0x00000018, 0x00000020, }; + static const DWORD deny_ps_rootsig1[] = + { + 0x43425844, 0xca541ae8, 0x791dbcaa, 0xe8a61219, 0x697a84c7, 0x00000001, 0x00000044, 0x00000001, + 0x00000024, 0x30535452, 0x00000018, 0x00000002, 0x00000000, 0x00000018, 0x00000000, 0x00000018, + 0x00000020, + }; static const D3D12_ROOT_SIGNATURE_DESC deny_ps_rootsig_desc = { .Flags = D3D12_ROOT_SIGNATURE_FLAG_DENY_PIXEL_SHADER_ROOT_ACCESS, }; - static const DWORD cbv_rootsig[] = + static const D3D12_ROOT_SIGNATURE_DESC1 deny_ps_rootsig_desc1 = { + .Flags = D3D12_ROOT_SIGNATURE_FLAG_DENY_PIXEL_SHADER_ROOT_ACCESS, + }; + #if 0 - #define RS "CBV(b3, space = 0)" + #define RS "CBV(b3, space = 0)" #endif + static const DWORD cbv_rootsig[] = + { 0x43425844, 0x8dc5087e, 0x5cb9bf0d, 0x2e465ae3, 0x6291e0e0, 0x00000001, 0x00000058, 0x00000001, 0x00000024, 0x30535452, 0x0000002c, 0x00000001, 0x00000001, 0x00000018, 0x00000000, 0x0000002c, 0x00000000, 0x00000002, 0x00000000, 0x00000024, 0x00000003, 0x00000000, }; + static const DWORD cbv_rootsig1[] = + { + 0x43425844, 0x66f3e4ad, 0x9938583c, 0x4eaf4733, 0x7940ab73, 0x00000001, 0x0000005c, 0x00000001, + 0x00000024, 0x30535452, 0x00000030, 0x00000002, 0x00000001, 0x00000018, 0x00000000, 0x00000030, + 0x00000000, 0x00000002, 0x00000000, 0x00000024, 0x00000003, 0x00000000, 0x00000000, + }; static const D3D12_ROOT_PARAMETER cbv_parameters[] = { {D3D12_ROOT_PARAMETER_TYPE_CBV, .Descriptor = {3, 0}}, @@ -10012,15 +10293,31 @@ static void test_root_signature_byte_code(void) .NumParameters = ARRAY_SIZE(cbv_parameters), .pParameters = cbv_parameters, }; - static const DWORD cbv2_rootsig[] = + static const D3D12_ROOT_PARAMETER1 cbv_parameters1[] = + { + {D3D12_ROOT_PARAMETER_TYPE_CBV, .Descriptor = {3, 0}}, + }; + static const D3D12_ROOT_SIGNATURE_DESC1 cbv_rootsig_desc1 = { + .NumParameters = ARRAY_SIZE(cbv_parameters1), + .pParameters = cbv_parameters1, + }; + #if 0 - #define RS "CBV(b4, space = 1, visibility = SHADER_VISIBILITY_GEOMETRY)" + #define RS "CBV(b4, space = 1, visibility = SHADER_VISIBILITY_GEOMETRY)" #endif + static const DWORD cbv2_rootsig[] = + { 0x43425844, 0x6d4cfb48, 0xbfecaa8d, 0x379ff9c3, 0x0cc56997, 0x00000001, 0x00000058, 0x00000001, 0x00000024, 0x30535452, 0x0000002c, 0x00000001, 0x00000001, 0x00000018, 0x00000000, 0x0000002c, 0x00000000, 0x00000002, 0x00000004, 0x00000024, 0x00000004, 0x00000001, }; + static DWORD cbv2_rootsig1[] = + { + 0x43425844, 0x8450397e, 0x4e136d61, 0xb4fe3b44, 0xc7223872, 0x00000001, 0x0000005c, 0x00000001, + 0x00000024, 0x30535452, 0x00000030, 0x00000002, 0x00000001, 0x00000018, 0x00000000, 0x00000030, + 0x00000000, 0x00000002, 0x00000004, 0x00000024, 0x00000004, 0x00000001, 0x00000000, + }; static const D3D12_ROOT_PARAMETER cbv2_parameters[] = { {D3D12_ROOT_PARAMETER_TYPE_CBV, .Descriptor = {4, 1}, D3D12_SHADER_VISIBILITY_GEOMETRY}, @@ -10030,15 +10327,31 @@ static void test_root_signature_byte_code(void) .NumParameters = ARRAY_SIZE(cbv2_parameters), .pParameters = cbv2_parameters, }; - static const DWORD srv_rootsig[] = + static const D3D12_ROOT_PARAMETER1 cbv2_parameters1[] = + { + {D3D12_ROOT_PARAMETER_TYPE_CBV, .Descriptor = {4, 1}, D3D12_SHADER_VISIBILITY_GEOMETRY}, + }; + static const D3D12_ROOT_SIGNATURE_DESC1 cbv2_rootsig_desc1 = { + .NumParameters = ARRAY_SIZE(cbv2_parameters1), + .pParameters = cbv2_parameters1, + }; + #if 0 - #define RS "RootFlags(DENY_VERTEX_SHADER_ROOT_ACCESS), SRV(t13)" + #define RS "RootFlags(DENY_VERTEX_SHADER_ROOT_ACCESS), SRV(t13)" #endif + static const DWORD srv_rootsig[] = + { 0x43425844, 0xbc00e5e0, 0xffff2fd3, 0x85c2d405, 0xa61db5e5, 0x00000001, 0x00000058, 0x00000001, 0x00000024, 0x30535452, 0x0000002c, 0x00000001, 0x00000001, 0x00000018, 0x00000000, 0x0000002c, 0x00000002, 0x00000003, 0x00000000, 0x00000024, 0x0000000d, 0x00000000, }; + static const DWORD srv_rootsig1[] = + { + 0x43425844, 0xe79f4ac0, 0x1ac0829e, 0x94fddf9d, 0xd83d8bbf, 0x00000001, 0x0000005c, 0x00000001, + 0x00000024, 0x30535452, 0x00000030, 0x00000002, 0x00000001, 0x00000018, 0x00000000, 0x00000030, + 0x00000002, 0x00000003, 0x00000000, 0x00000024, 0x0000000d, 0x00000000, 0x00000000, + }; static const D3D12_ROOT_PARAMETER srv_parameters[] = { {D3D12_ROOT_PARAMETER_TYPE_SRV, .Descriptor = {13}}, @@ -10049,15 +10362,32 @@ static void test_root_signature_byte_code(void) .pParameters = srv_parameters, .Flags = D3D12_ROOT_SIGNATURE_FLAG_DENY_VERTEX_SHADER_ROOT_ACCESS, }; - static const DWORD uav_rootsig[] = + static const D3D12_ROOT_PARAMETER1 srv_parameters1[] = + { + {D3D12_ROOT_PARAMETER_TYPE_SRV, .Descriptor = {13}}, + }; + static const D3D12_ROOT_SIGNATURE_DESC1 srv_rootsig_desc1 = { + .NumParameters = ARRAY_SIZE(srv_parameters1), + .pParameters = srv_parameters1, + .Flags = D3D12_ROOT_SIGNATURE_FLAG_DENY_VERTEX_SHADER_ROOT_ACCESS, + }; + #if 0 - #define RS "UAV(u6)" + #define RS "UAV(u6)" #endif + static const DWORD uav_rootsig[] = + { 0x43425844, 0xf873c52c, 0x69f5cbea, 0xaf6bc9f4, 0x2ccf8b54, 0x00000001, 0x00000058, 0x00000001, 0x00000024, 0x30535452, 0x0000002c, 0x00000001, 0x00000001, 0x00000018, 0x00000000, 0x0000002c, 0x00000000, 0x00000004, 0x00000000, 0x00000024, 0x00000006, 0x00000000, }; + static const DWORD uav_rootsig1[] = + { + 0x43425844, 0xbd670c62, 0x5c35651b, 0xfb9b9bd1, 0x8a4dddde, 0x00000001, 0x0000005c, 0x00000001, + 0x00000024, 0x30535452, 0x00000030, 0x00000002, 0x00000001, 0x00000018, 0x00000000, 0x00000030, + 0x00000000, 0x00000004, 0x00000000, 0x00000024, 0x00000006, 0x00000000, 0x00000000, + }; static const D3D12_ROOT_PARAMETER uav_parameters[] = { {D3D12_ROOT_PARAMETER_TYPE_UAV, .Descriptor = {6}}, @@ -10067,17 +10397,34 @@ static void test_root_signature_byte_code(void) .NumParameters = ARRAY_SIZE(uav_parameters), .pParameters = uav_parameters, }; - static const DWORD constants_rootsig[] = + static const D3D12_ROOT_PARAMETER1 uav_parameters1[] = + { + {D3D12_ROOT_PARAMETER_TYPE_UAV, .Descriptor = {6}}, + }; + static const D3D12_ROOT_SIGNATURE_DESC1 uav_rootsig_desc1 = { + .NumParameters = ARRAY_SIZE(uav_parameters1), + .pParameters = uav_parameters1, + }; + #if 0 - #define RS "RootConstants(num32BitConstants=3, b4), " \ - "RootConstants(num32BitConstants=4, b5, space = 3)" + #define RS "RootConstants(num32BitConstants=3, b4), " \ + "RootConstants(num32BitConstants=4, b5, space = 3)" #endif + static const DWORD constants_rootsig[] = + { 0x43425844, 0xbc015590, 0xa9a4a345, 0x7e446850, 0x2be05281, 0x00000001, 0x00000074, 0x00000001, 0x00000024, 0x30535452, 0x00000048, 0x00000001, 0x00000002, 0x00000018, 0x00000000, 0x00000048, 0x00000000, 0x00000001, 0x00000000, 0x00000030, 0x00000001, 0x00000000, 0x0000003c, 0x00000004, 0x00000000, 0x00000003, 0x00000005, 0x00000003, 0x00000004, }; + static const DWORD constants_rootsig1[] = + { + 0x43425844, 0xaa6e3eb1, 0x092b0bd3, 0x63af9657, 0xa97a0fe4, 0x00000001, 0x00000074, 0x00000001, + 0x00000024, 0x30535452, 0x00000048, 0x00000002, 0x00000002, 0x00000018, 0x00000000, 0x00000048, + 0x00000000, 0x00000001, 0x00000000, 0x00000030, 0x00000001, 0x00000000, 0x0000003c, 0x00000004, + 0x00000000, 0x00000003, 0x00000005, 0x00000003, 0x00000004, + }; static const D3D12_ROOT_PARAMETER constants_parameters[] = { {D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS, .Constants = {4, 0, 3}}, @@ -10088,19 +10435,38 @@ static void test_root_signature_byte_code(void) .NumParameters = ARRAY_SIZE(constants_parameters), .pParameters = constants_parameters, }; - static const DWORD descriptor_table_rootsig[] = + static const D3D12_ROOT_PARAMETER1 constants_parameters1[] = { + {D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS, .Constants = {4, 0, 3}}, + {D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS, .Constants = {5, 3, 4}}, + }; + static const D3D12_ROOT_SIGNATURE_DESC1 constants_rootsig_desc1 = + { + .NumParameters = ARRAY_SIZE(constants_parameters1), + .pParameters = constants_parameters1, + }; + #if 0 - #define RS "DescriptorTable(CBV(b1, space = 7), " \ - "SRV(t16, numDescriptors = 8), " \ - "UAV(u3, numDescriptors = unbounded, offset = 44))" + #define RS "DescriptorTable(CBV(b1, space = 7), " \ + "SRV(t16, numDescriptors = 8), " \ + "UAV(u3, numDescriptors = unbounded, offset = 44))" #endif + static const DWORD descriptor_table_rootsig[] = + { 0x43425844, 0x0f92e563, 0x4766993f, 0x2304e283, 0x14f0d8dc, 0x00000001, 0x00000094, 0x00000001, 0x00000024, 0x30535452, 0x00000068, 0x00000001, 0x00000001, 0x00000018, 0x00000000, 0x00000068, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000003, 0x0000002c, 0x00000002, 0x00000001, 0x00000001, 0x00000007, 0xffffffff, 0x00000000, 0x00000008, 0x00000010, 0x00000000, 0xffffffff, 0x00000001, 0xffffffff, 0x00000003, 0x00000000, 0x0000002c, }; + static const DWORD descriptor_table_rootsig1[] = + { + 0x43425844, 0x739302ac, 0x9db37f96, 0x1ad9eec8, 0x7a5d08cb, 0x00000001, 0x000000a0, 0x00000001, + 0x00000024, 0x30535452, 0x00000074, 0x00000002, 0x00000001, 0x00000018, 0x00000000, 0x00000074, + 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000003, 0x0000002c, 0x00000002, 0x00000001, + 0x00000001, 0x00000007, 0x00000000, 0xffffffff, 0x00000000, 0x00000008, 0x00000010, 0x00000000, + 0x00000000, 0xffffffff, 0x00000001, 0xffffffff, 0x00000003, 0x00000000, 0x00000000, 0x0000002c, + }; static const D3D12_DESCRIPTOR_RANGE descriptor_ranges[] = { {D3D12_DESCRIPTOR_RANGE_TYPE_CBV, 1, 1, 7, D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND}, @@ -10117,16 +10483,40 @@ static void test_root_signature_byte_code(void) .NumParameters = ARRAY_SIZE(descriptor_table_parameters), .pParameters = descriptor_table_parameters, }; - static const DWORD default_static_sampler_rootsig[] = + static const D3D12_DESCRIPTOR_RANGE1 descriptor_ranges1[] = + { + {D3D12_DESCRIPTOR_RANGE_TYPE_CBV, 1, 1, 7, 0, D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND}, + {D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 8, 16, 0, 0, D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND}, + {D3D12_DESCRIPTOR_RANGE_TYPE_UAV, UINT_MAX, 3, 0, 0, 44}, + }; + static const D3D12_ROOT_PARAMETER1 descriptor_table_parameters1[] = + { + {D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE, + .DescriptorTable = {ARRAY_SIZE(descriptor_ranges1), descriptor_ranges1}}, + }; + static const D3D12_ROOT_SIGNATURE_DESC1 descriptor_table_rootsig_desc1 = { + .NumParameters = ARRAY_SIZE(descriptor_table_parameters1), + .pParameters = descriptor_table_parameters1, + }; + #if 0 - #define RS "StaticSampler(s4)" + #define RS "StaticSampler(s4)" #endif + static const DWORD default_static_sampler_rootsig[] = + { 0x43425844, 0x2876b8ff, 0x935aaa0d, 0x5d2d344a, 0xe002147c, 0x00000001, 0x00000078, 0x00000001, 0x00000024, 0x30535452, 0x0000004c, 0x00000001, 0x00000000, 0x00000018, 0x00000001, 0x00000018, 0x00000000, 0x00000055, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000010, 0x00000004, 0x00000002, 0x00000000, 0x7f7fffff, 0x00000004, 0x00000000, 0x00000000, }; + static const DWORD default_static_sampler_rootsig1[] = + { + 0x43425844, 0x52b07945, 0x997c0a1e, 0xe4efb9e9, 0x0378e2d4, 0x00000001, 0x00000078, 0x00000001, + 0x00000024, 0x30535452, 0x0000004c, 0x00000002, 0x00000000, 0x00000018, 0x00000001, 0x00000018, + 0x00000000, 0x00000055, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000010, 0x00000004, + 0x00000002, 0x00000000, 0x7f7fffff, 0x00000004, 0x00000000, 0x00000000, + }; static const D3D12_STATIC_SAMPLER_DESC default_static_sampler_desc = { .Filter = D3D12_FILTER_ANISOTROPIC, @@ -10144,15 +10534,21 @@ static void test_root_signature_byte_code(void) .NumStaticSamplers = 1, .pStaticSamplers = &default_static_sampler_desc, }; - static const DWORD static_samplers_rootsig[] = + static const D3D12_ROOT_SIGNATURE_DESC1 default_static_sampler_rootsig_desc1 = { + .NumStaticSamplers = 1, + .pStaticSamplers = &default_static_sampler_desc, + }; + #if 0 - #define RS "StaticSampler(s0, filter = FILTER_MIN_MAG_MIP_POINT, " \ - "addressV = TEXTURE_ADDRESS_CLAMP, visibility = SHADER_VISIBILITY_PIXEL), " \ - "StaticSampler(s0, filter = FILTER_MIN_MAG_POINT_MIP_LINEAR, " \ - "AddressW = TEXTURE_ADDRESS_BORDER, MipLODBias = 1, maxLod = 10, " \ - "borderColor = STATIC_BORDER_COLOR_OPAQUE_BLACK, space = 3)" + #define RS "StaticSampler(s0, filter = FILTER_MIN_MAG_MIP_POINT, " \ + "addressV = TEXTURE_ADDRESS_CLAMP, visibility = SHADER_VISIBILITY_PIXEL), " \ + "StaticSampler(s0, filter = FILTER_MIN_MAG_POINT_MIP_LINEAR, " \ + "AddressW = TEXTURE_ADDRESS_BORDER, MipLODBias = 1, maxLod = 10, " \ + "borderColor = STATIC_BORDER_COLOR_OPAQUE_BLACK, space = 3)" #endif + static const DWORD static_samplers_rootsig[] = + { 0x43425844, 0x52ed526c, 0x892c2d7c, 0xb8ab1123, 0x7e3a727d, 0x00000001, 0x000000ac, 0x00000001, 0x00000024, 0x30535452, 0x00000080, 0x00000001, 0x00000000, 0x00000018, 0x00000002, 0x00000018, 0x00000000, 0x00000000, 0x00000001, 0x00000003, 0x00000001, 0x00000000, 0x00000010, 0x00000004, @@ -10160,6 +10556,15 @@ static void test_root_signature_byte_code(void) 0x00000001, 0x00000004, 0x3f800000, 0x00000010, 0x00000004, 0x00000001, 0x00000000, 0x41200000, 0x00000000, 0x00000003, 0x00000000, }; + static const DWORD static_samplers_rootsig1[] = + { + 0x43425844, 0xcf44eb9e, 0xdbeaed6b, 0xb8d52b6f, 0x0be01c3b, 0x00000001, 0x000000ac, 0x00000001, + 0x00000024, 0x30535452, 0x00000080, 0x00000002, 0x00000000, 0x00000018, 0x00000002, 0x00000018, + 0x00000000, 0x00000000, 0x00000001, 0x00000003, 0x00000001, 0x00000000, 0x00000010, 0x00000004, + 0x00000002, 0x00000000, 0x7f7fffff, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x00000001, + 0x00000001, 0x00000004, 0x3f800000, 0x00000010, 0x00000004, 0x00000001, 0x00000000, 0x41200000, + 0x00000000, 0x00000003, 0x00000000, + }; static const D3D12_STATIC_SAMPLER_DESC static_sampler_descs[] = { { @@ -10191,10 +10596,84 @@ static void test_root_signature_byte_code(void) .NumStaticSamplers = ARRAY_SIZE(static_sampler_descs), .pStaticSamplers = static_sampler_descs, }; + static const D3D12_ROOT_SIGNATURE_DESC1 static_samplers_rootsig_desc1 = + { + .NumStaticSamplers = ARRAY_SIZE(static_sampler_descs), + .pStaticSamplers = static_sampler_descs, + }; + + static const struct test + { + D3D12_SHADER_BYTECODE code; + D3D12_SHADER_BYTECODE code1; + const D3D12_ROOT_SIGNATURE_DESC *desc; + const D3D12_ROOT_SIGNATURE_DESC1 *desc1; + } + tests[] = + { + { + {empty_rootsig, sizeof(empty_rootsig)}, + {empty_rootsig1, sizeof(empty_rootsig1)}, + &empty_rootsig_desc, &empty_rootsig_desc1, + }, + { + {ia_rootsig, sizeof(ia_rootsig)}, + {ia_rootsig1, sizeof(ia_rootsig1)}, + &ia_rootsig_desc, &ia_rootsig_desc1, + }, + { + {deny_ps_rootsig, sizeof(deny_ps_rootsig)}, + {deny_ps_rootsig1, sizeof(deny_ps_rootsig1)}, + &deny_ps_rootsig_desc, &deny_ps_rootsig_desc1, + }, + { + {cbv_rootsig, sizeof(cbv_rootsig)}, + {cbv_rootsig1, sizeof(cbv_rootsig1)}, + &cbv_rootsig_desc, &cbv_rootsig_desc1, + }, + { + {cbv2_rootsig, sizeof(cbv2_rootsig)}, + {cbv2_rootsig1, sizeof(cbv2_rootsig1)}, + &cbv2_rootsig_desc, &cbv2_rootsig_desc1, + }, + { + {srv_rootsig, sizeof(srv_rootsig)}, + {srv_rootsig1, sizeof(srv_rootsig1)}, + &srv_rootsig_desc, &srv_rootsig_desc1, + }, + { + {uav_rootsig, sizeof(uav_rootsig)}, + {uav_rootsig1, sizeof(uav_rootsig1)}, + &uav_rootsig_desc, &uav_rootsig_desc1, + }, + { + {constants_rootsig, sizeof(constants_rootsig)}, + {constants_rootsig1, sizeof(constants_rootsig1)}, + &constants_rootsig_desc, &constants_rootsig_desc1, + }, + { + {descriptor_table_rootsig, sizeof(descriptor_table_rootsig)}, + {descriptor_table_rootsig1, sizeof(descriptor_table_rootsig1)}, + &descriptor_table_rootsig_desc, &descriptor_table_rootsig_desc1, + }, + { + {default_static_sampler_rootsig, sizeof(default_static_sampler_rootsig)}, + {default_static_sampler_rootsig1, sizeof(default_static_sampler_rootsig1)}, + &default_static_sampler_rootsig_desc, &default_static_sampler_rootsig_desc1, + }, + { + {static_samplers_rootsig, sizeof(static_samplers_rootsig)}, + {static_samplers_rootsig1, sizeof(static_samplers_rootsig1)}, + &static_samplers_rootsig_desc, &static_samplers_rootsig_desc1, + }, + }; hr = D3D12CreateRootSignatureDeserializer(empty_rootsig, sizeof(empty_rootsig), &IID_IUnknown, (void **)&deserializer); ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + hr = D3D12CreateRootSignatureDeserializer(empty_rootsig, sizeof(empty_rootsig), + &IID_ID3D12VersionedRootSignatureDeserializer, (void **)&deserializer); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); hr = D3D12CreateRootSignatureDeserializer(empty_rootsig, sizeof(empty_rootsig), &IID_ID3D12RootSignatureDeserializer, (void **)&deserializer); @@ -10202,6 +10681,7 @@ static void test_root_signature_byte_code(void) check_interface(deserializer, &IID_IUnknown, FALSE); check_interface(deserializer, &IID_ID3D12RootSignatureDeserializer, TRUE); + check_interface(deserializer, &IID_ID3D12VersionedRootSignatureDeserializer, FALSE); check_interface(deserializer, &IID_ID3D12Object, FALSE); check_interface(deserializer, &IID_ID3D12DeviceChild, FALSE); check_interface(deserializer, &IID_ID3D12Pageable, FALSE); @@ -10209,35 +10689,54 @@ static void test_root_signature_byte_code(void) refcount = ID3D12RootSignatureDeserializer_Release(deserializer); ok(!refcount, "ID3D12RootSignatureDeserializer has %u references left.\n", (unsigned int)refcount); - test_root_signature_deserialization(empty_rootsig, sizeof(empty_rootsig), &empty_rootsig_desc); - test_root_signature_deserialization(ia_rootsig, sizeof(ia_rootsig), &ia_rootsig_desc); - test_root_signature_deserialization(deny_ps_rootsig, sizeof(deny_ps_rootsig), &deny_ps_rootsig_desc); - test_root_signature_deserialization(cbv_rootsig, sizeof(cbv_rootsig), &cbv_rootsig_desc); - test_root_signature_deserialization(cbv2_rootsig, sizeof(cbv2_rootsig), &cbv2_rootsig_desc); - test_root_signature_deserialization(srv_rootsig, sizeof(srv_rootsig), &srv_rootsig_desc); - test_root_signature_deserialization(uav_rootsig, sizeof(uav_rootsig), &uav_rootsig_desc); - test_root_signature_deserialization(constants_rootsig, sizeof(constants_rootsig), &constants_rootsig_desc); - test_root_signature_deserialization(descriptor_table_rootsig, sizeof(descriptor_table_rootsig), - &descriptor_table_rootsig_desc); - test_root_signature_deserialization(default_static_sampler_rootsig, sizeof(default_static_sampler_rootsig), - &default_static_sampler_rootsig_desc); - test_root_signature_deserialization(static_samplers_rootsig, sizeof(static_samplers_rootsig), - &static_samplers_rootsig_desc); - - test_root_signature_serialization(empty_rootsig, sizeof(empty_rootsig), &empty_rootsig_desc); - test_root_signature_serialization(ia_rootsig, sizeof(ia_rootsig), &ia_rootsig_desc); - test_root_signature_serialization(deny_ps_rootsig, sizeof(deny_ps_rootsig), &deny_ps_rootsig_desc); - test_root_signature_serialization(cbv_rootsig, sizeof(cbv_rootsig), &cbv_rootsig_desc); - test_root_signature_serialization(cbv2_rootsig, sizeof(cbv2_rootsig), &cbv2_rootsig_desc); - test_root_signature_serialization(srv_rootsig, sizeof(srv_rootsig), &srv_rootsig_desc); - test_root_signature_serialization(uav_rootsig, sizeof(uav_rootsig), &uav_rootsig_desc); - test_root_signature_serialization(constants_rootsig, sizeof(constants_rootsig), &constants_rootsig_desc); - test_root_signature_serialization(descriptor_table_rootsig, sizeof(descriptor_table_rootsig), - &descriptor_table_rootsig_desc); - test_root_signature_serialization(default_static_sampler_rootsig, sizeof(default_static_sampler_rootsig), - &default_static_sampler_rootsig_desc); - test_root_signature_serialization(static_samplers_rootsig, sizeof(static_samplers_rootsig), - &static_samplers_rootsig_desc); + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + const struct test *t = &tests[i]; + + vkd3d_test_set_context("Test %u", i); + + check_root_signature_deserialization(&t->code, t->desc, t->desc1); + check_root_signature_serialization(&t->code, t->desc); + + blob = (ID3DBlob *)0xdeadbeef; + hr = D3D12SerializeRootSignature(t->desc, D3D_ROOT_SIGNATURE_VERSION_1_1, &blob, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(blob == (ID3DBlob *)0xdeadbeef, "Got unexpected blob %p.\n", blob); + + if (!pfn_D3D12CreateVersionedRootSignatureDeserializer) + continue; + + check_root_signature_deserialization1(&t->code1, t->desc, t->desc1); + check_root_signature_serialization1(&t->code1, t->desc1); + } + vkd3d_test_set_context(NULL); + + if (!pfn_D3D12CreateVersionedRootSignatureDeserializer) + { + skip("D3D12CreateVersionedRootSignatureDeserializer is not available.\n"); + return; + } + + hr = pfn_D3D12CreateVersionedRootSignatureDeserializer(empty_rootsig, sizeof(empty_rootsig), + &IID_IUnknown, (void **)&versioned_deserializer); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + hr = pfn_D3D12CreateVersionedRootSignatureDeserializer(empty_rootsig, sizeof(empty_rootsig), + &IID_ID3D12RootSignatureDeserializer, (void **)&versioned_deserializer); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + + hr = pfn_D3D12CreateVersionedRootSignatureDeserializer(empty_rootsig, sizeof(empty_rootsig), + &IID_ID3D12VersionedRootSignatureDeserializer, (void **)&versioned_deserializer); + ok(hr == S_OK, "Failed to create deserializer, hr %#x.\n", hr); + + check_interface(versioned_deserializer, &IID_IUnknown, FALSE); + check_interface(versioned_deserializer, &IID_ID3D12RootSignatureDeserializer, FALSE); + check_interface(versioned_deserializer, &IID_ID3D12VersionedRootSignatureDeserializer, TRUE); + check_interface(versioned_deserializer, &IID_ID3D12Object, FALSE); + check_interface(versioned_deserializer, &IID_ID3D12DeviceChild, FALSE); + check_interface(versioned_deserializer, &IID_ID3D12Pageable, FALSE); + + refcount = ID3D12VersionedRootSignatureDeserializer_Release(versioned_deserializer); + ok(!refcount, "ID3D12VersionedRootSignatureDeserializer has %u references left.\n", (unsigned int)refcount); } static void test_cs_constant_buffer(void) @@ -27836,6 +28335,9 @@ START_TEST(d3d12) enable_d3d12_debug_layer(argc, argv); init_adapter_info(); + pfn_D3D12CreateVersionedRootSignatureDeserializer = get_d3d12_pfn(D3D12CreateVersionedRootSignatureDeserializer); + pfn_D3D12SerializeVersionedRootSignature = get_d3d12_pfn(D3D12SerializeVersionedRootSignature); + run_test(test_create_device); run_test(test_node_count); run_test(test_check_feature_support); diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 171c23418028..5df0b3225d1c 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -81,6 +81,12 @@ static inline void destroy_event(HANDLE event) { CloseHandle(event); } + +#define get_d3d12_pfn(name) get_d3d12_pfn_(#name) +static inline void *get_d3d12_pfn_(const char *name) +{ + return GetProcAddress(GetModuleHandleA("d3d12.dll"), name); +} #else #define INFINITE VKD3D_INFINITE #define WAIT_OBJECT_0 VKD3D_WAIT_OBJECT_0 @@ -105,6 +111,8 @@ static inline void destroy_event(HANDLE event) { vkd3d_destroy_event(event); } + +#define get_d3d12_pfn(name) (name) #endif typedef void (*thread_main_pfn)(void *data); -- 2.21.0

2 1

[PATCH vkd3d 2/6] tests: Add tests for root signature 1.1 descriptor flags.
by Józef Kucia 25 Apr '19

25 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 6cc6771a8e2b..199a86ffac1c 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -10035,6 +10035,9 @@ static void check_root_signature_deserialization_(unsigned int line, const D3D12 ULONG refcount; HRESULT hr; + if (!code->BytecodeLength) + return; + hr = D3D12CreateRootSignatureDeserializer(code->pShaderBytecode, code->BytecodeLength, &IID_ID3D12RootSignatureDeserializer, (void **)&deserializer); ok_(line)(hr == S_OK, "Failed to create deserializer, hr %#x.\n", hr); @@ -10132,6 +10135,9 @@ static void check_root_signature_serialization_(unsigned int line, const D3D12_S unsigned int i; HRESULT hr; + if (!bytecode->BytecodeLength) + return; + error_blob = (ID3DBlob *)0xdeadbeef; hr = D3D12SerializeRootSignature(desc, D3D_ROOT_SIGNATURE_VERSION_1_0, &blob, &error_blob); ok_(line)(hr == S_OK, "Failed to serialize root signature, hr %#x.\n", hr); @@ -10407,6 +10413,42 @@ static void test_root_signature_byte_code(void) .pParameters = uav_parameters1, }; +#if 0 + #define RS "CBV(b4, space = 1, visibility = SHADER_VISIBILITY_VERTEX), " \ + "SRV(t13, flags = DATA_STATIC), " \ + "UAV(u6, flags = DATA_STATIC_WHILE_SET_AT_EXECUTE)" +#endif + static const DWORD root_descriptors_rootsig1[] = + { + 0x43425844, 0x8ddedbbe, 0xbcfea259, 0x6b35bfbb, 0x23e1de24, 0x00000001, 0x0000008c, 0x00000001, + 0x00000024, 0x30535452, 0x00000060, 0x00000002, 0x00000003, 0x00000018, 0x00000000, 0x00000060, + 0x00000000, 0x00000002, 0x00000001, 0x0000003c, 0x00000003, 0x00000000, 0x00000048, 0x00000004, + 0x00000000, 0x00000054, 0x00000004, 0x00000001, 0x00000000, 0x0000000d, 0x00000000, 0x00000008, + 0x00000006, 0x00000000, 0x00000004, + }; + static const D3D12_ROOT_PARAMETER root_descriptors_parameters[] = + { + {D3D12_ROOT_PARAMETER_TYPE_CBV, .Descriptor = {4, 1}, D3D12_SHADER_VISIBILITY_VERTEX}, + {D3D12_ROOT_PARAMETER_TYPE_SRV, .Descriptor = {13}}, + {D3D12_ROOT_PARAMETER_TYPE_UAV, .Descriptor = {6}}, + }; + static const D3D12_ROOT_SIGNATURE_DESC root_descriptors_desc = + { + .NumParameters = ARRAY_SIZE(root_descriptors_parameters), + .pParameters = root_descriptors_parameters, + }; + static const D3D12_ROOT_PARAMETER1 root_descriptors_parameters1[] = + { + {D3D12_ROOT_PARAMETER_TYPE_CBV, .Descriptor = {4, 1}, D3D12_SHADER_VISIBILITY_VERTEX}, + {D3D12_ROOT_PARAMETER_TYPE_SRV, .Descriptor = {13, 0, D3D12_ROOT_DESCRIPTOR_FLAG_DATA_STATIC}}, + {D3D12_ROOT_PARAMETER_TYPE_UAV, .Descriptor = {6, 0, D3D12_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE}}, + }; + static const D3D12_ROOT_SIGNATURE_DESC1 root_descriptors_desc1 = + { + .NumParameters = ARRAY_SIZE(root_descriptors_parameters1), + .pParameters = root_descriptors_parameters1, + }; + #if 0 #define RS "RootConstants(num32BitConstants=3, b4), " \ "RootConstants(num32BitConstants=4, b5, space = 3)" @@ -10500,6 +10542,40 @@ static void test_root_signature_byte_code(void) .pParameters = descriptor_table_parameters1, }; +#if 0 + #define RS "DescriptorTable(CBV(b1, space = 7, flags = DESCRIPTORS_VOLATILE), " \ + "SRV(t16, numDescriptors = 8, flags = DESCRIPTORS_VOLATILE | DATA_VOLATILE), " \ + "UAV(u3, numDescriptors = unbounded, offset = 44, flags = DATA_STATIC))" +#endif + static const DWORD descriptor_table_flags_rootsig1[] = + { + 0x43425844, 0xe77ffa8f, 0xfab552d5, 0x586e15d4, 0x4c186c26, 0x00000001, 0x000000a0, 0x00000001, + 0x00000024, 0x30535452, 0x00000074, 0x00000002, 0x00000001, 0x00000018, 0x00000000, 0x00000074, + 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000003, 0x0000002c, 0x00000002, 0x00000001, + 0x00000001, 0x00000007, 0x00000001, 0xffffffff, 0x00000000, 0x00000008, 0x00000010, 0x00000000, + 0x00000003, 0xffffffff, 0x00000001, 0xffffffff, 0x00000003, 0x00000000, 0x00000008, 0x0000002c, + }; + static const D3D12_DESCRIPTOR_RANGE1 descriptor_ranges1_flags[] = + { + {D3D12_DESCRIPTOR_RANGE_TYPE_CBV, 1, 1, 7, + D3D12_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE, D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND}, + {D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 8, 16, 0, + D3D12_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE | D3D12_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE, + D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND}, + {D3D12_DESCRIPTOR_RANGE_TYPE_UAV, UINT_MAX, 3, 0, + D3D12_DESCRIPTOR_RANGE_FLAG_DATA_STATIC, 44}, + }; + static const D3D12_ROOT_PARAMETER1 descriptor_table_parameters1_flags[] = + { + {D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE, + .DescriptorTable = {ARRAY_SIZE(descriptor_ranges1_flags), descriptor_ranges1_flags}}, + }; + static const D3D12_ROOT_SIGNATURE_DESC1 descriptor_table_flags_rootsig_desc1 = + { + .NumParameters = ARRAY_SIZE(descriptor_table_parameters1_flags), + .pParameters = descriptor_table_parameters1_flags, + }; + #if 0 #define RS "StaticSampler(s4)" #endif @@ -10646,6 +10722,11 @@ static void test_root_signature_byte_code(void) {uav_rootsig1, sizeof(uav_rootsig1)}, &uav_rootsig_desc, &uav_rootsig_desc1, }, + { + {NULL}, + {root_descriptors_rootsig1, sizeof(root_descriptors_rootsig1)}, + &root_descriptors_desc, &root_descriptors_desc1, + }, { {constants_rootsig, sizeof(constants_rootsig)}, {constants_rootsig1, sizeof(constants_rootsig1)}, @@ -10656,6 +10737,11 @@ static void test_root_signature_byte_code(void) {descriptor_table_rootsig1, sizeof(descriptor_table_rootsig1)}, &descriptor_table_rootsig_desc, &descriptor_table_rootsig_desc1, }, + { + {NULL}, + {descriptor_table_flags_rootsig1, sizeof(descriptor_table_flags_rootsig1)}, + &descriptor_table_rootsig_desc, &descriptor_table_flags_rootsig_desc1, + }, { {default_static_sampler_rootsig, sizeof(default_static_sampler_rootsig)}, {default_static_sampler_rootsig1, sizeof(default_static_sampler_rootsig1)}, -- 2.21.0

2 1

[PATCH 3/3] user32: Make the second parameter of get_font_margins const.
by Akihiro Sagawa 25 Apr '19

25 Apr '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 2/3] comctl32/edit: Implement WM_SETFONT margins in the CJK case.
by Akihiro Sagawa 25 Apr '19

25 Apr '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/comctl32/edit.c | 30 ++++++++++++++++++++++++++++-- dlls/comctl32/tests/edit.c | 2 -- 2 files changed, 28 insertions(+), 4 deletions(-)

1 0

[PATCH 1/3] comctl32/tests: Use calculated WM_SETFONT margins in the CJK case.
by Akihiro Sagawa 25 Apr '19

25 Apr '19

In comctl32, ANSI version control also uses GetCharABCWidthsW(). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/comctl32/tests/edit.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-)

1 0

[PATCH] kernel32/tests: Add a test for critical section DebugInfo initial value.
by Nikolay Sivov 25 Apr '19

25 Apr '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- That was originally reported as https://bugs.winehq.org/show_bug.cgi?id=39614. Workaround was applied later to apitrace, still would be good to get debug info handling sorted. dlls/kernel32/tests/sync.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index f7be51e972..8dea3b30c3 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -2636,6 +2636,26 @@ static void test_apc_deadlock(void) CloseHandle(pi.hProcess); } +static void test_crit_section(void) +{ + CRITICAL_SECTION cs; + BOOL ret; + + /* Win8+ does not initialize debug info, one has to use RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO + to override that. */ + memset(&cs, 0, sizeof(cs)); + InitializeCriticalSection(&cs); + ok(cs.DebugInfo != NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); + DeleteCriticalSection(&cs); + + memset(&cs, 0, sizeof(cs)); + ret = InitializeCriticalSectionEx(&cs, 0, CRITICAL_SECTION_NO_DEBUG_INFO); + ok(ret, "Failed to initialize critical section.\n"); +todo_wine + ok(cs.DebugInfo == (void *)(ULONG_PTR)-1, "Unexpected debug info pointer %p.\n", cs.DebugInfo); + DeleteCriticalSection(&cs); +} + START_TEST(sync) { char **argv; @@ -2694,4 +2714,5 @@ START_TEST(sync) test_srwlock_example(); test_alertable_wait(); test_apc_deadlock(); + test_crit_section(); } -- 2.20.1

2 1

[PATCH 1/2] advapi32: Move the DACL combining code into a separate routine.
by Vijay Kiran Kamuju 25 Apr '19

25 Apr '19

From: "Erich E. Hoover" <erich.e.hoover(a)wine-staging.com> From: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/advapi32/security.c | 79 +++++++++++++++++++++++----------------- 1 file changed, 45 insertions(+), 34 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 6891feea2a0..c2c45aca4ae 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -5964,6 +5964,48 @@ BOOL WINAPI FileEncryptionStatusA(LPCSTR lpFileName, LPDWORD lpStatus) return TRUE; } +static NTSTATUS combine_dacls(ACL *parent, ACL *child, ACL **result) +{ + ACL *combined; + int i; + + /* initialize a combined DACL containing both inherited and new ACEs */ + combined = heap_alloc_zero(child->AclSize+parent->AclSize); + if (!combined) + return STATUS_NO_MEMORY; + + memcpy(combined, child, child->AclSize); + combined->AclSize = child->AclSize+parent->AclSize; + + /* copy the inherited ACEs */ + for (i=0; i<parent->AceCount; i++) + { + ACE_HEADER *ace; + + if (!GetAce(parent, i, (void*)&ace)) + continue; + if (!(ace->AceFlags & (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE))) + continue; + if ((ace->AceFlags & (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE)) != + (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE)) + { + FIXME("unsupported flags: %x\n", ace->AceFlags); + continue; + } + + if (ace->AceFlags & NO_PROPAGATE_INHERIT_ACE) + ace->AceFlags &= ~(OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE|NO_PROPAGATE_INHERIT_ACE); + ace->AceFlags &= ~INHERIT_ONLY_ACE; + ace->AceFlags |= INHERITED_ACE; + + if (!AddAce(combined, ACL_REVISION, MAXDWORD, ace, ace->AceSize)) + WARN("error adding inherited ACE\n"); + } + + *result = combined; + return STATUS_SUCCESS; +} + /****************************************************************************** * SetSecurityInfo [ADVAPI32.@] */ @@ -6063,41 +6105,10 @@ DWORD WINAPI SetSecurityInfo(HANDLE handle, SE_OBJECT_TYPE ObjectType, if (!err) { - int i; - - dacl = heap_alloc_zero(pDacl->AclSize+parent_dacl->AclSize); - if (!dacl) - { - LocalFree(parent_sd); - return ERROR_NOT_ENOUGH_MEMORY; - } - memcpy(dacl, pDacl, pDacl->AclSize); - dacl->AclSize = pDacl->AclSize+parent_dacl->AclSize; - - for (i=0; i<parent_dacl->AceCount; i++) - { - ACE_HEADER *ace; - - if (!GetAce(parent_dacl, i, (void*)&ace)) - continue; - if (!(ace->AceFlags & (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE))) - continue; - if ((ace->AceFlags & (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE)) != - (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE)) - { - FIXME("unsupported flags: %x\n", ace->AceFlags); - continue; - } - - if (ace->AceFlags & NO_PROPAGATE_INHERIT_ACE) - ace->AceFlags &= ~(OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE|NO_PROPAGATE_INHERIT_ACE); - ace->AceFlags &= ~INHERIT_ONLY_ACE; - ace->AceFlags |= INHERITED_ACE; - - if(!AddAce(dacl, ACL_REVISION, MAXDWORD, ace, ace->AceSize)) - WARN("error adding inherited ACE\n"); - } + status = combine_dacls(parent_dacl, pDacl, &dacl); LocalFree(parent_sd); + if (status != STATUS_SUCCESS) + return RtlNtStatusToDosError(status); } } else -- 2.17.0

1 1

[PATCH] advapi32/tests: Test prefix and use of TokenPrimaryGroup Sid.
by Vijay Kiran Kamuju 25 Apr '19

25 Apr '19

From: Qian Hong <qhong(a)codeweavers.com> From: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/advapi32/tests/security.c | 35 +++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 1c26228046e..0ceb71fb832 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2876,19 +2876,21 @@ static void test_granted_access(HANDLE handle, ACCESS_MASK access, static void test_process_security(void) { BOOL res; + PTOKEN_USER user; PTOKEN_OWNER owner; PTOKEN_PRIMARY_GROUP group; - PSID AdminSid = NULL, UsersSid = NULL; + PSID AdminSid = NULL, UsersSid = NULL, UserSid = NULL; PACL Acl = NULL, ThreadAcl = NULL; SECURITY_DESCRIPTOR *SecurityDescriptor = NULL, *ThreadSecurityDescriptor = NULL; - char buffer[MAX_PATH]; + char buffer[MAX_PATH], account[MAX_PATH], domain[MAX_PATH]; PROCESS_INFORMATION info; STARTUPINFOA startup; SECURITY_ATTRIBUTES psa, tsa; HANDLE token, event; - DWORD size; + DWORD size, acc_size, dom_size, ret; SID_IDENTIFIER_AUTHORITY SIDAuthWorld = { SECURITY_WORLD_SID_AUTHORITY }; PSID EveryoneSid = NULL; + SID_NAME_USE use; Acl = HeapAlloc(GetProcessHeap(), 0, 256); res = InitializeAcl(Acl, 256, ACL_REVISION); @@ -2920,7 +2922,8 @@ static void test_process_security(void) owner = HeapAlloc(GetProcessHeap(), 0, size); res = GetTokenInformation( token, TokenOwner, owner, size, &size ); ok(res, "GetTokenInformation failed with error %d\n", GetLastError()); - AdminSid = ((TOKEN_OWNER*)owner)->Owner; + AdminSid = owner->Owner; + test_sid_str(AdminSid); res = GetTokenInformation( token, TokenPrimaryGroup, NULL, 0, &size ); ok(!res, "Expected failure, got %d\n", res); @@ -2930,13 +2933,34 @@ static void test_process_security(void) group = HeapAlloc(GetProcessHeap(), 0, size); res = GetTokenInformation( token, TokenPrimaryGroup, group, size, &size ); ok(res, "GetTokenInformation failed with error %d\n", GetLastError()); - UsersSid = ((TOKEN_PRIMARY_GROUP*)group)->PrimaryGroup; + UsersSid = group->PrimaryGroup; + test_sid_str(UsersSid); + + acc_size = sizeof(account); + dom_size = sizeof(domain); + ret = LookupAccountSidA( NULL, UsersSid, account, &acc_size, domain, &dom_size, &use ); + ok(ret, "LookupAccountSid failed with %d\n", ret); + todo_wine ok(use == SidTypeGroup, "expect SidTypeGroup, got %d\n", use); + todo_wine ok(!strcmp(account, "None"), "expect None, got %s\n", account); + + res = GetTokenInformation( token, TokenUser, NULL, 0, &size ); + ok(!res, "Expected failure, got %d\n", res); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + + user = HeapAlloc(GetProcessHeap(), 0, size); + res = GetTokenInformation( token, TokenUser, user, size, &size ); + ok(res, "GetTokenInformation failed with error %d\n", GetLastError()); + UserSid = user->User.Sid; + test_sid_str(UserSid); + todo_wine ok(EqualPrefixSid(UsersSid, UserSid), "TokenPrimaryGroup Sid and TokenUser Sid don't match.\n"); CloseHandle( token ); if (!res) { HeapFree(GetProcessHeap(), 0, group); HeapFree(GetProcessHeap(), 0, owner); + HeapFree(GetProcessHeap(), 0, user); HeapFree(GetProcessHeap(), 0, Acl); return; } @@ -3043,6 +3067,7 @@ static void test_process_security(void) CloseHandle( event ); HeapFree(GetProcessHeap(), 0, group); HeapFree(GetProcessHeap(), 0, owner); + HeapFree(GetProcessHeap(), 0, user); HeapFree(GetProcessHeap(), 0, Acl); HeapFree(GetProcessHeap(), 0, SecurityDescriptor); HeapFree(GetProcessHeap(), 0, ThreadAcl); -- 2.17.0

1 0

[PATCH 1/2] avifile.dll16: Correctly convert result of AVIStreamGetFrame to a segptr.
by Vijay Kiran Kamuju 25 Apr '19

25 Apr '19

From: Michael Müller <michael(a)fds-team.de> From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/avifile.dll16/Makefile.in | 3 + dlls/avifile.dll16/avifile.dll16.spec | 6 +- dlls/avifile.dll16/main.c | 133 ++++++++++++++++++++++++++ 3 files changed, 139 insertions(+), 3 deletions(-) create mode 100644 dlls/avifile.dll16/main.c diff --git a/dlls/avifile.dll16/Makefile.in b/dlls/avifile.dll16/Makefile.in index 6050c6c52dc..4152c2f9f2a 100644 --- a/dlls/avifile.dll16/Makefile.in +++ b/dlls/avifile.dll16/Makefile.in @@ -1,3 +1,6 @@ MODULE = avifile.dll16 IMPORTS = avifil32 EXTRADLLFLAGS = -m16 -Wb,--main-module,avifil32.dll + +C_SRCS = \ + main.c diff --git a/dlls/avifile.dll16/avifile.dll16.spec b/dlls/avifile.dll16/avifile.dll16.spec index 239d3a4a48f..2b5fb910342 100644 --- a/dlls/avifile.dll16/avifile.dll16.spec +++ b/dlls/avifile.dll16/avifile.dll16.spec @@ -20,9 +20,9 @@ 105 stub AVIMAKECOMPRESSEDSTREAM 106 stub AVIMAKEFILEFROMSTREAMS 107 stub AVIMAKESTREAMFROMCLIPBOARD -110 pascal AVIStreamGetFrame(long long) AVIStreamGetFrame -111 pascal AVIStreamGetFrameClose(long) AVIStreamGetFrameClose -112 pascal AVIStreamGetFrameOpen(long ptr) AVIStreamGetFrameOpen +110 pascal AVIStreamGetFrame(long long) AVIStreamGetFrame16 +111 pascal AVIStreamGetFrameClose(long) AVIStreamGetFrameClose16 +112 pascal AVIStreamGetFrameOpen(long ptr) AVIStreamGetFrameOpen16 120 stub _AVISAVE 121 stub AVISAVEV 122 stub AVISAVEOPTIONS diff --git a/dlls/avifile.dll16/main.c b/dlls/avifile.dll16/main.c new file mode 100644 index 00000000000..9e1faac2295 --- /dev/null +++ b/dlls/avifile.dll16/main.c @@ -0,0 +1,133 @@ +/* + * Wrapper for 16 bit avifile functions + * + * Copyright 2016 Michael Müller + * + * 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 "wine/winbase16.h" +#include "winternl.h" +#include "wingdi.h" +#include "vfw.h" + +struct frame_wrapper16 +{ + PGETFRAME pg; + PVOID ptr; + DWORD size; + WORD sel; + WORD count; +}; + +static void free_segptr_frame(struct frame_wrapper16 *wrapper) +{ + int i; + + if (!wrapper->sel) + return; + + for (i = 0; i < wrapper->count; i++) + FreeSelector16(wrapper->sel + (i << __AHSHIFT)); + + wrapper->sel = 0; +} + +static SEGPTR alloc_segptr_frame(struct frame_wrapper16 *wrapper, void *ptr, DWORD size) +{ + int i; + + if (wrapper->sel) + { + if (wrapper->ptr == ptr && wrapper->size == size) + return MAKESEGPTR(wrapper->sel, 0); + free_segptr_frame(wrapper); + } + + wrapper->ptr = ptr; + wrapper->size = size; + wrapper->count = (size + 0xffff) / 0x10000; + wrapper->sel = AllocSelectorArray16(wrapper->count); + if (!wrapper->sel) + return 0; + + for (i = 0; i < wrapper->count; i++) + { + SetSelectorBase(wrapper->sel + (i << __AHSHIFT), (DWORD)ptr + i * 0x10000); + SetSelectorLimit16(wrapper->sel + (i << __AHSHIFT), size - 1); + size -= 0x10000; + } + + return MAKESEGPTR(wrapper->sel, 0); +} + +/*********************************************************************** + * AVIStreamGetFrameOpen (AVIFILE.112) + */ +PGETFRAME WINAPI AVIStreamGetFrameOpen16(PAVISTREAM pstream, LPBITMAPINFOHEADER lpbiWanted) +{ + struct frame_wrapper16 *wrapper; + PGETFRAME pg; + + pg = AVIStreamGetFrameOpen(pstream, lpbiWanted); + if (!pg) return NULL; + + wrapper = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wrapper)); + if (!wrapper) + { + AVIStreamGetFrameClose(pg); + return NULL; + } + + wrapper->pg = pg; + return (PGETFRAME)wrapper; +} + +/*********************************************************************** + * AVIStreamGetFrame (AVIFILE.110) + */ +SEGPTR WINAPI AVIStreamGetFrame16(PGETFRAME pg, LONG pos) +{ + struct frame_wrapper16 *wrapper = (void *)pg; + BITMAPINFOHEADER *bih; + + if (!pg) return 0; + + bih = AVIStreamGetFrame(wrapper->pg, pos); + if (bih) + { + DWORD size = bih->biSize + bih->biSizeImage; + return alloc_segptr_frame(wrapper, bih, size); + } + + return 0; +} + + +/*********************************************************************** + * AVIStreamGetFrameClose (AVIFILE.111) + */ +HRESULT WINAPI AVIStreamGetFrameClose16(PGETFRAME pg) +{ + struct frame_wrapper16 *wrapper = (void *)pg; + HRESULT hr; + + if (!pg) return S_OK; + + hr = AVIStreamGetFrameClose(wrapper->pg); + free_segptr_frame(wrapper); + HeapFree(GetProcessHeap(), 0, wrapper); + return hr; +} -- 2.17.0

1 1

[PATCH v2] kernel32: Add MapUserPhysicalPages stub.
by Dmitry Timoshkov 25 Apr '19

25 Apr '19

This time adding to the appropriate file with other similar stubs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/heap.c | 8 ++++++++ dlls/kernel32/kernel32.spec | 2 +- include/winbase.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index e68420a55b..202051dd17 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1491,3 +1491,11 @@ BOOL WINAPI FreeUserPhysicalPages(HANDLE process, ULONG_PTR *pages, ULONG_PTR *u SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +BOOL WINAPI MapUserPhysicalPages(PVOID addr, ULONG_PTR page_count, PULONG_PTR pages) +{ + FIXME("(%p, %lu, %p): stub\n", addr, page_count, pages); + *pages = 0; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 75e7cc57e7..295a4dbab6 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1076,7 +1076,7 @@ @ stdcall -i386 -private MapLS(ptr) krnl386.exe16.MapLS @ stdcall -i386 -private MapSL(long) krnl386.exe16.MapSL @ stdcall -i386 -private MapSLFix(long) krnl386.exe16.MapSLFix -# @ stub MapUserPhysicalPages +@ stdcall MapUserPhysicalPages(ptr long ptr) # @ stub MapUserPhysicalPagesScatter @ stdcall MapViewOfFile(long long long long long) @ stdcall MapViewOfFileEx(long long long long long ptr) diff --git a/include/winbase.h b/include/winbase.h index c2e216cb91..6c97afe9fd 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2435,6 +2435,7 @@ WINADVAPI BOOL WINAPI MakeSelfRelativeSD(PSECURITY_DESCRIPTOR,PSECURITY_ WINADVAPI VOID WINAPI MapGenericMask(PDWORD,PGENERIC_MAPPING); WINBASEAPI HMODULE WINAPI MapHModuleSL(WORD); WINBASEAPI WORD WINAPI MapHModuleLS(HMODULE); +WINBASEAPI BOOL WINAPI MapUserPhysicalPages(PVOID,ULONG_PTR,PULONG_PTR); WINBASEAPI LPVOID WINAPI MapViewOfFile(HANDLE,DWORD,DWORD,DWORD,SIZE_T); WINBASEAPI LPVOID WINAPI MapViewOfFileEx(HANDLE,DWORD,DWORD,DWORD,SIZE_T,LPVOID); WINBASEAPI BOOL WINAPI MoveFileA(LPCSTR,LPCSTR); -- 2.20.1

1 0

[PATCH] kernel32: Add MapUserPhysicalPages stub.
by Dmitry Timoshkov 25 Apr '19

25 Apr '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/virtual.c | 10 ++++++++++ include/winbase.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 75e7cc57e7..295a4dbab6 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1076,7 +1076,7 @@ @ stdcall -i386 -private MapLS(ptr) krnl386.exe16.MapLS @ stdcall -i386 -private MapSL(long) krnl386.exe16.MapSL @ stdcall -i386 -private MapSLFix(long) krnl386.exe16.MapSLFix -# @ stub MapUserPhysicalPages +@ stdcall MapUserPhysicalPages(ptr long ptr) # @ stub MapUserPhysicalPagesScatter @ stdcall MapViewOfFile(long long long long long) @ stdcall MapViewOfFileEx(long long long long long ptr) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 59c96bd215..da4345c706 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -733,3 +733,13 @@ BOOL WINAPI K32InitializeProcessForWsWatch(HANDLE process) return TRUE; } + +/*********************************************************************** + * MapUserPhysicalPages (KERNEL32.@) + */ +BOOL WINAPI MapUserPhysicalPages(PVOID addr, ULONG_PTR page_count, PULONG_PTR pages) +{ + FIXME_(file)("(%p, %08lx, %p): stub\n", addr, page_count, pages); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/include/winbase.h b/include/winbase.h index c2e216cb91..6c97afe9fd 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2435,6 +2435,7 @@ WINADVAPI BOOL WINAPI MakeSelfRelativeSD(PSECURITY_DESCRIPTOR,PSECURITY_ WINADVAPI VOID WINAPI MapGenericMask(PDWORD,PGENERIC_MAPPING); WINBASEAPI HMODULE WINAPI MapHModuleSL(WORD); WINBASEAPI WORD WINAPI MapHModuleLS(HMODULE); +WINBASEAPI BOOL WINAPI MapUserPhysicalPages(PVOID,ULONG_PTR,PULONG_PTR); WINBASEAPI LPVOID WINAPI MapViewOfFile(HANDLE,DWORD,DWORD,DWORD,SIZE_T); WINBASEAPI LPVOID WINAPI MapViewOfFileEx(HANDLE,DWORD,DWORD,DWORD,SIZE_T,LPVOID); WINBASEAPI BOOL WINAPI MoveFileA(LPCSTR,LPCSTR); -- 2.20.1

1 0

[PATCH V3] advapi32/tests: Add additional tests for NtAccessCheck
by Vijay Kiran Kamuju 24 Apr '19

24 Apr '19

Add todo_wine for failing tests From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/advapi32/tests/security.c | 65 +++++++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index d9cae64da8b..a7f5704d26a 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1343,11 +1343,13 @@ static void test_AccessCheck(void) if(pNtAccessCheck) { + DWORD ntPrivSetLen = sizeof(PRIVILEGE_SET); + /* Generic access mask - no privilegeset buffer */ SetLastError(0xdeadbeef); Access = ntAccessStatus = 0x1abe11ed; ntret = pNtAccessCheck(SecurityDescriptor, Token, GENERIC_READ, &Mapping, - NULL, &PrivSetLen, &Access, &ntAccessStatus); + NULL, &ntPrivSetLen, &Access, &ntAccessStatus); err = GetLastError(); ok(ntret == STATUS_ACCESS_VIOLATION, "NtAccessCheck should have failed with STATUS_ACCESS_VIOLATION, got %x\n", ntret); @@ -1355,6 +1357,7 @@ static void test_AccessCheck(void) "NtAccessCheck shouldn't set last error, got %d\n", err); ok(Access == 0x1abe11ed && ntAccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); + ok(ntPrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", ntPrivSetLen); /* Generic access mask - no returnlength */ SetLastError(0xdeadbeef); @@ -1381,6 +1384,66 @@ static void test_AccessCheck(void) "NtAccessCheck shouldn't set last error, got %d\n", err); ok(Access == 0x1abe11ed && ntAccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); + + /* Generic access mask - zero returnlength */ + SetLastError(0xdeadbeef); + Access = ntAccessStatus = 0x1abe11ed; + ntPrivSetLen = 0; + ntret = pNtAccessCheck(SecurityDescriptor, Token, GENERIC_READ, &Mapping, + PrivSet, &ntPrivSetLen, &Access, &ntAccessStatus); + err = GetLastError(); + ok(ntret == STATUS_GENERIC_NOT_MAPPED, + "NtAccessCheck should have failed with STATUS_GENERIC_NOT_MAPPED, got %x\n", ntret); + ok(err == 0xdeadbeef, + "NtAccessCheck shouldn't set last error, got %d\n", err); + ok(Access == 0x1abe11ed && ntAccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + todo_wine ok(ntPrivSetLen == 0, "PrivSetLen returns %d\n", ntPrivSetLen); + + /* Generic access mask - insufficient returnlength */ + SetLastError(0xdeadbeef); + Access = ntAccessStatus = 0x1abe11ed; + ntPrivSetLen = sizeof(PRIVILEGE_SET)-1; + ntret = pNtAccessCheck(SecurityDescriptor, Token, GENERIC_READ, &Mapping, + PrivSet, &ntPrivSetLen, &Access, &ntAccessStatus); + err = GetLastError(); + ok(ntret == STATUS_GENERIC_NOT_MAPPED, + "NtAccessCheck should have failed with STATUS_GENERIC_NOT_MAPPED, got %x\n", ntret); + ok(err == 0xdeadbeef, + "NtAccessCheck shouldn't set last error, got %d\n", err); + ok(Access == 0x1abe11ed && ntAccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + todo_wine ok(ntPrivSetLen == sizeof(PRIVILEGE_SET)-1, "PrivSetLen returns %d\n", ntPrivSetLen); + + /* Key access mask - zero returnlength */ + SetLastError(0xdeadbeef); + Access = ntAccessStatus = 0x1abe11ed; + ntPrivSetLen = 0; + ntret = pNtAccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + PrivSet, &ntPrivSetLen, &Access, &ntAccessStatus); + err = GetLastError(); + todo_wine ok(ntret == STATUS_BUFFER_TOO_SMALL, + "NtAccessCheck should have failed with STATUS_BUFFER_TOO_SMALL, got %x\n", ntret); + ok(err == 0xdeadbeef, + "NtAccessCheck shouldn't set last error, got %d\n", err); + todo_wine ok(Access == 0x1abe11ed && ntAccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + todo_wine ok(ntPrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", ntPrivSetLen); + + /* Key access mask - insufficient returnlength */ + SetLastError(0xdeadbeef); + Access = ntAccessStatus = 0x1abe11ed; + ntPrivSetLen = sizeof(PRIVILEGE_SET)-1; + ntret = pNtAccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + PrivSet, &ntPrivSetLen, &Access, &ntAccessStatus); + err = GetLastError(); + todo_wine ok(ntret == STATUS_BUFFER_TOO_SMALL, + "NtAccessCheck should have failed with STATUS_BUFFER_TOO_SMALL, got %x\n", ntret); + ok(err == 0xdeadbeef, + "NtAccessCheck shouldn't set last error, got %d\n", err); + todo_wine ok(Access == 0x1abe11ed && ntAccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + todo_wine ok(ntPrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", ntPrivSetLen); } else win_skip("NtAccessCheck unavailable. Skipping.\n"); -- 2.17.0

1 0

[PATCH] winemac: Add +fps support for Vulkan.
by Stefan Dösinger 24 Apr '19

24 Apr '19

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- I guess we could also move this to winevulkan by moving the vkQueuePresentKHR thunk out of the autogenerated .c file. I am not 100% sure if that works in all cases though, like using a different loader. --- dlls/winemac.drv/vulkan.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index d49c9a1ab2..ea785c992d 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -45,6 +45,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); #ifdef SONAME_LIBMOLTENVK +WINE_DECLARE_DEBUG_CHANNEL(fps); + typedef VkFlags VkMacOSSurfaceCreateFlagsMVK; #define VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK 1000123000 @@ -463,7 +465,30 @@ static VkResult macdrv_vkGetSwapchainImagesKHR(VkDevice device, static VkResult macdrv_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR *present_info) { TRACE("%p, %p\n", queue, present_info); - return pvkQueuePresentKHR(queue, present_info); + VkResult res = pvkQueuePresentKHR(queue, present_info); + + if (TRACE_ON(fps)) + { + static unsigned long frames, frames_total; + static long prev_time, start_time; + DWORD time; + + time = GetTickCount(); + frames++; + frames_total++; + if (time - prev_time > 1500) + { + TRACE_(fps)("%p @ approx %.2ffps, total %.2ffps\n", + queue, 1000.0 * frames / (time - prev_time), + 1000.0 * frames_total / (time - start_time)); + prev_time = time; + frames = 0; + if (!start_time) + start_time = time; + } + } + + return res; } static const struct vulkan_funcs vulkan_funcs = -- 2.20.1 (Apple Git-117)

2 1

Re: Alexandre Julliard : widl: Use %define parse.error verbose instead of %error-verbose.
by Ken Thomases 24 Apr '19

24 Apr '19

This breaks with the version of bison that comes with Xcode: $ bison --version bison (GNU Bison) 2.3 […] $ bison -p parser_ -o parser.tab.c -d ../../../tools/widl/parser.y ../../../tools/widl/parser.y:321.9-19: syntax error, unexpected identifier, expecting string Installing a newer version of Bison (e.g. via MacPorts) does work around it. Maybe there should be a configure check? -Ken > On Apr 23, 2019, at 5:39 PM, Alexandre Julliard <julliard(a)winehq.org> wrote: > > Module: wine > Branch: master > Commit: 5ea4d5971bff3430c29f1da31166b0a2565347ab > URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ea4d5971bff3430c29f1da3… > > Author: Alexandre Julliard <julliard(a)winehq.org> > Date: Tue Apr 23 11:47:22 2019 +0200 > > widl: Use %define parse.error verbose instead of %error-verbose. > > The latter is deprecated and causes warnings. > > Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> > > --- > > tools/widl/parser.y | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/widl/parser.y b/tools/widl/parser.y > index 5156dce..dd676e9 100644 > --- a/tools/widl/parser.y > +++ b/tools/widl/parser.y > @@ -318,7 +318,7 @@ static typelib_t *current_typelib; > %right '!' '~' CAST PPTR POS NEG ADDRESSOF tSIZEOF > %left '.' MEMBERPTR '[' ']' > > -%error-verbose > +%define parse.error verbose > > %% > > > >

1 0

[PATCH] comctl32/header: Mark other timeout values as broken.
by Detlef Riekenberg 24 Apr '19

24 Apr '19

The default timeout for the header-filter is not always 1000 (Mark the other values as brocken() seems resonable) Example failures: comctl32 (5.82.9600.17810): 680 http://test.winehq.org/data/75aa4ab16b03a11464ab0d3e4c4cfbff0180c269/win8_d… comctl32 (5.82.17763.1): 1100 http://test.winehq.org/data/f9301c2b66450a1cdd986e9052fcaa76535ba8b7/win10_… Patch tested: https://testbot.winehq.org/JobDetails.pl?Key=51459 -- bye bye ... ... Detlef Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> --- dlls/comctl32/tests/header.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 3428936cd7..206e4c02d9 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1017,13 +1017,13 @@ static void test_hdm_filterMessages(HWND hParent) "adder header control to parent", FALSE); timeout = SendMessageA(hChild, HDM_SETFILTERCHANGETIMEOUT, 0, 0); - ok(timeout == 1000, "got %d\n", timeout); + ok((timeout == 1000) || broken((timeout == 1100) || (timeout == 680)), "got %d\n", timeout); timeout = SendMessageA(hChild, HDM_SETFILTERCHANGETIMEOUT, 0, 0); - ok(timeout == 1000, "got %d\n", timeout); + ok((timeout == 1000) || broken((timeout == 1100) || (timeout == 680)), "got %d\n", timeout); timeout = SendMessageA(hChild, HDM_SETFILTERCHANGETIMEOUT, 0, -100); - ok(timeout == 1000, "got %d\n", timeout); + ok((timeout == 1000) || broken((timeout == 1100) || (timeout == 680)), "got %d\n", timeout); timeout = SendMessageA(hChild, HDM_SETFILTERCHANGETIMEOUT, 1, 100); ok(timeout == -100, "got %d\n", timeout); -- 2.21.0.windows.1

2 1

[PATCH 1/7] winemac.drv: Add macdrv_get_gpus() helper.
by Zhiyi Zhang 24 Apr '19

24 Apr '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Maybe Mac driver would draw more attention :) dlls/winemac.drv/cocoa_display.m | 168 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 17 ++++ 2 files changed, 185 insertions(+) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index 93a0fbca35..569cd32352 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -19,6 +19,7 @@ */ #import <AppKit/AppKit.h> +#import <Metal/Metal.h> #include "macdrv_cocoa.h" @@ -103,3 +104,170 @@ void macdrv_free_displays(struct macdrv_display* displays) { free(displays); } + +/*********************************************************************** + * get_entry_property_uint32 + * + * Get an IO registry entry property of type uint32 and store it in value parameter. + * + * Return 0 on failure. + */ +static uint32_t get_entry_property_uint32(io_registry_entry_t entry, CFStringRef property_name, uint32_t* value) +{ + CFDataRef data = IORegistryEntrySearchCFProperty(entry, kIOServicePlane, property_name, kCFAllocatorDefault, + kIORegistryIterateRecursively | kIORegistryIterateParents); + if (!data) + return 0; + + const uint32_t* bytes = (const uint32_t*)(CFDataGetBytePtr(data)); + *value = *bytes; + + CFRelease(data); + return 1; +} + +/*********************************************************************** + * get_entry_property_string + * + * Get an IO registry entry property of type string and write it in buffer parameter. + * + * Return the size written into the buffer. + */ +static size_t get_entry_property_string(io_registry_entry_t entry, CFStringRef property_name, char* buffer, + size_t buffer_size) +{ + size_t length; + + CFDataRef data = IORegistryEntrySearchCFProperty(entry, kIOServicePlane, property_name, kCFAllocatorDefault, + kIORegistryIterateRecursively | kIORegistryIterateParents); + if (!data) + return 0; + + length = CFDataGetLength(data); + if (length > buffer_size) + return 0; + + memcpy(buffer, CFDataGetBytePtr(data), length); + CFRelease(data); + return length; +} + +/*********************************************************************** + * macdrv_get_gpu_info_from_entry + * + * Get GPU information from an IO registry entry. + */ +static void macdrv_get_gpu_info_from_entry(struct macdrv_gpu* gpu, io_registry_entry_t entry) +{ + get_entry_property_uint32(entry, CFSTR("vendor-id"), &gpu->vendor_id); + get_entry_property_uint32(entry, CFSTR("device-id"), &gpu->device_id); + get_entry_property_uint32(entry, CFSTR("subsystem-id"), &gpu->subsys_id); + get_entry_property_uint32(entry, CFSTR("revision-id"), &gpu->revision_id); + get_entry_property_string(entry, CFSTR("model"), gpu->name, sizeof(gpu->name)); +} + +/*********************************************************************** + * macdrv_get_gpu_info_from_display_id + * + * Get GPU information from a display id. + * + * This is a fallback for 32bit build since Metal doesn't support 32bit. + * Thus registryID can't be used. + */ +void macdrv_get_gpu_info_from_display_id(struct macdrv_gpu* gpu, CGDirectDisplayID display_id) +{ + io_registry_entry_t entry = CGDisplayIOServicePort(display_id); + macdrv_get_gpu_info_from_entry(gpu, entry); +} + +/*********************************************************************** + * macdrv_get_gpu_info_from_registry_id + * + * Get GPU information from a Metal device registry id. + */ +void macdrv_get_gpu_info_from_registry_id(struct macdrv_gpu* gpu, uint64_t registry_id) +{ + /* entry is IOGraphicsAccelerator. Parent of the entry is the GPU */ + io_registry_entry_t entry = + IOServiceGetMatchingService(kIOMasterPortDefault, IORegistryEntryIDMatching(registry_id)); + if (!entry) + return; + + io_registry_entry_t parent; + if (IORegistryEntryGetParentEntry(entry, kIOServicePlane, &parent) == kIOReturnSuccess) + { + macdrv_get_gpu_info_from_entry(gpu, entry); + IOObjectRelease(parent); + } + IOObjectRelease(entry); +} + +/*********************************************************************** + * macdrv_get_gpus + * + * Get a list of GPU currently in the system. The first GPU is primary. + * Call macdrv_free_gpus() when you are done using the data. + * + * Return -1 on failure with parameters unchanged. + */ +int macdrv_get_gpus(struct macdrv_gpu** new_gpus, int* count) +{ + struct macdrv_gpu* gpus; + CGDirectDisplayID primary_display; + id<MTLDevice> primary_device; + int primary_index = 0; + int gpu_count; + int i; + NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + + NSArray<id<MTLDevice>>* devices = MTLCopyAllDevices(); + gpu_count = devices.count ? devices.count : 1; + gpus = calloc(gpu_count, sizeof(*gpus)); + if (!gpus) + return -1; + + primary_display = CGMainDisplayID(); + primary_device = CGDirectDisplayCopyCurrentMetalDevice(primary_display); + + /* 32bit build. Metal is unsupported. Report only one GPU. Use the primary display to get GPU info */ + if (!devices.count) + { + gpus[0].id = 0; + macdrv_get_gpu_info_from_display_id(&gpus[0], primary_display); + } + else + { + for (i = 0; i < devices.count; i++) + { + gpus[i].id = devices[i].registryID; + macdrv_get_gpu_info_from_registry_id(&gpus[i], gpus[i].id); + + if (gpus[i].id == primary_device.registryID) + primary_index = i; + } + + /* Make sure the first GPU is primary */ + if (primary_index) + { + struct macdrv_gpu tmp; + tmp = gpus[0]; + gpus[0] = gpus[primary_index]; + gpus[primary_index] = tmp; + } + } + + [pool release]; + *new_gpus = gpus; + *count = gpu_count; + return 0; +} + +/*********************************************************************** + * macdrv_free_gpus + * + * Free a GPU list allocated from macdrv_get_gpus() + */ +void macdrv_free_gpus(struct macdrv_gpu* gpus) +{ + free(gpus); +} diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 6165dc5874..a6d8ec91d4 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -257,10 +257,27 @@ static inline CGPoint cgpoint_win_from_mac(CGPoint point) /* display */ + +/* Represent a physical GPU in the PCI slots */ +struct macdrv_gpu +{ + /* Metal device registry id. Zero on 32bit build */ + uint64_t id; + /* Name, in UTF-8 encoding */ + char name[128]; + /* PCI ID */ + uint32_t vendor_id; + uint32_t device_id; + uint32_t subsys_id; + uint32_t revision_id; +}; + extern int macdrv_get_displays(struct macdrv_display** displays, int* count) DECLSPEC_HIDDEN; extern void macdrv_free_displays(struct macdrv_display* displays) DECLSPEC_HIDDEN; extern int macdrv_set_display_mode(const struct macdrv_display* display, CGDisplayModeRef display_mode) DECLSPEC_HIDDEN; +extern int macdrv_get_gpus(struct macdrv_gpu** gpus, int* count) DECLSPEC_HIDDEN; +extern void macdrv_free_gpus(struct macdrv_gpu* gpus) DECLSPEC_HIDDEN; /* event */ -- 2.15.2 (Apple Git-101.1)

4 12

[PATCH V2] advapi32/tests: Add additional tests for NtAccessCheck
by Vijay Kiran Kamuju 24 Apr '19

24 Apr '19

Add todo_wine for failing tests From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/advapi32/tests/security.c | 35 +++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index d9cae64da8b..7534e007915 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1343,11 +1343,13 @@ static void test_AccessCheck(void) if(pNtAccessCheck) { + DWORD ntPrivSetLen = sizeof(PRIVILEGE_SET); + /* Generic access mask - no privilegeset buffer */ SetLastError(0xdeadbeef); Access = ntAccessStatus = 0x1abe11ed; ntret = pNtAccessCheck(SecurityDescriptor, Token, GENERIC_READ, &Mapping, - NULL, &PrivSetLen, &Access, &ntAccessStatus); + NULL, &ntPrivSetLen, &Access, &ntAccessStatus); err = GetLastError(); ok(ntret == STATUS_ACCESS_VIOLATION, "NtAccessCheck should have failed with STATUS_ACCESS_VIOLATION, got %x\n", ntret); @@ -1355,6 +1357,7 @@ static void test_AccessCheck(void) "NtAccessCheck shouldn't set last error, got %d\n", err); ok(Access == 0x1abe11ed && ntAccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); + ok(ntPrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", ntPrivSetLen); /* Generic access mask - no returnlength */ SetLastError(0xdeadbeef); @@ -1381,6 +1384,36 @@ static void test_AccessCheck(void) "NtAccessCheck shouldn't set last error, got %d\n", err); ok(Access == 0x1abe11ed && ntAccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); + + /* Generic access mask - zero returnlength */ + SetLastError(0xdeadbeef); + Access = ntAccessStatus = 0x1abe11ed; + ntPrivSetLen = 0; + ntret = pNtAccessCheck(SecurityDescriptor, Token, GENERIC_READ, &Mapping, + PrivSet, &ntPrivSetLen, &Access, &ntAccessStatus); + err = GetLastError(); + ok(ntret == STATUS_GENERIC_NOT_MAPPED, + "NtAccessCheck should have failed with STATUS_GENERIC_NOT_MAPPED, got %x\n", ntret); + ok(err == 0xdeadbeef, + "NtAccessCheck shouldn't set last error, got %d\n", err); + ok(Access == 0x1abe11ed && ntAccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + todo_wine ok(ntPrivSetLen == 0, "PrivSetLen returns %d\n", ntPrivSetLen); + + /* Generic access mask - insufficient returnlength */ + SetLastError(0xdeadbeef); + Access = ntAccessStatus = 0x1abe11ed; + ntPrivSetLen = sizeof(PRIVILEGE_SET)-1; + ntret = pNtAccessCheck(SecurityDescriptor, Token, GENERIC_READ, &Mapping, + PrivSet, &ntPrivSetLen, &Access, &ntAccessStatus); + err = GetLastError(); + ok(ntret == STATUS_GENERIC_NOT_MAPPED, + "NtAccessCheck should have failed with STATUS_GENERIC_NOT_MAPPED, got %x\n", ntret); + ok(err == 0xdeadbeef, + "NtAccessCheck shouldn't set last error, got %d\n", err); + ok(Access == 0x1abe11ed && ntAccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + todo_wine ok(ntPrivSetLen == sizeof(PRIVILEGE_SET)-1, "PrivSetLen returns %d\n", ntPrivSetLen); } else win_skip("NtAccessCheck unavailable. Skipping.\n"); -- 2.17.0

2 2

[PATCH] advapi32/tests: Add additional tests for NtAccessCheck
by Vijay Kiran Kamuju 24 Apr '19

24 Apr '19

From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/advapi32/tests/security.c | 35 +++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index d9cae64da8b..8a4777ff275 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1343,11 +1343,13 @@ static void test_AccessCheck(void) if(pNtAccessCheck) { + DWORD ntPrivSetLen = sizeof(PRIVILEGE_SET); + /* Generic access mask - no privilegeset buffer */ SetLastError(0xdeadbeef); Access = ntAccessStatus = 0x1abe11ed; ntret = pNtAccessCheck(SecurityDescriptor, Token, GENERIC_READ, &Mapping, - NULL, &PrivSetLen, &Access, &ntAccessStatus); + NULL, &ntPrivSetLen, &Access, &ntAccessStatus); err = GetLastError(); ok(ntret == STATUS_ACCESS_VIOLATION, "NtAccessCheck should have failed with STATUS_ACCESS_VIOLATION, got %x\n", ntret); @@ -1355,6 +1357,7 @@ static void test_AccessCheck(void) "NtAccessCheck shouldn't set last error, got %d\n", err); ok(Access == 0x1abe11ed && ntAccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); + ok(ntPrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", ntPrivSetLen); /* Generic access mask - no returnlength */ SetLastError(0xdeadbeef); @@ -1381,6 +1384,36 @@ static void test_AccessCheck(void) "NtAccessCheck shouldn't set last error, got %d\n", err); ok(Access == 0x1abe11ed && ntAccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); + + /* Generic access mask - zero returnlength */ + SetLastError(0xdeadbeef); + Access = ntAccessStatus = 0x1abe11ed; + ntPrivSetLen = 0; + ntret = pNtAccessCheck(SecurityDescriptor, Token, GENERIC_READ, &Mapping, + PrivSet, &ntPrivSetLen, &Access, &ntAccessStatus); + err = GetLastError(); + ok(ntret == STATUS_GENERIC_NOT_MAPPED, + "NtAccessCheck should have failed with STATUS_GENERIC_NOT_MAPPED, got %x\n", ntret); + ok(err == 0xdeadbeef, + "NtAccessCheck shouldn't set last error, got %d\n", err); + ok(Access == 0x1abe11ed && ntAccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + ok(ntPrivSetLen == 0, "PrivSetLen returns %d\n", ntPrivSetLen); + + /* Generic access mask - insufficient returnlength */ + SetLastError(0xdeadbeef); + Access = ntAccessStatus = 0x1abe11ed; + ntPrivSetLen = sizeof(PRIVILEGE_SET)-1; + ntret = pNtAccessCheck(SecurityDescriptor, Token, GENERIC_READ, &Mapping, + PrivSet, &ntPrivSetLen, &Access, &ntAccessStatus); + err = GetLastError(); + ok(ntret == STATUS_GENERIC_NOT_MAPPED, + "NtAccessCheck should have failed with STATUS_GENERIC_NOT_MAPPED, got %x\n", ntret); + ok(err == 0xdeadbeef, + "NtAccessCheck shouldn't set last error, got %d\n", err); + ok(Access == 0x1abe11ed && ntAccessStatus == 0x1abe11ed, + "Access and/or AccessStatus were changed!\n"); + ok(ntPrivSetLen == sizeof(PRIVILEGE_SET)-1, "PrivSetLen returns %d\n", ntPrivSetLen); } else win_skip("NtAccessCheck unavailable. Skipping.\n"); -- 2.17.0

2 1

[PATCH] ntdll: Improve invalid paramater handling in NtAccessCheck.
by Vijay Kiran Kamuju 24 Apr '19

24 Apr '19

From: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/advapi32/tests/security.c | 8 -------- dlls/ntdll/sec.c | 6 ++++++ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index d9cae64da8b..d886ab713f3 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1454,10 +1454,8 @@ static void test_AccessCheck(void) ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, 0, &PrivSetLen, &Access, &AccessStatus); err = GetLastError(); -todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); -todo_wine ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); @@ -1508,12 +1506,9 @@ todo_wine ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, PrivSet, &PrivSetLen, &Access, &AccessStatus); err = GetLastError(); -todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); -todo_wine ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); -todo_wine ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); @@ -1625,12 +1620,9 @@ todo_wine ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, PrivSet, &PrivSetLen, &Access, &AccessStatus); err = GetLastError(); - todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); - todo_wine ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); - todo_wine ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 02fc77dc1cc..f7f1a925770 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1670,6 +1670,12 @@ NtAccessCheck( if (!PrivilegeSet || !ReturnLength) return STATUS_ACCESS_VIOLATION; + if (*ReturnLength == 0) + { + *ReturnLength = sizeof(PRIVILEGE_SET); + return STATUS_BUFFER_TOO_SMALL; + } + SERVER_START_REQ( access_check ) { struct security_descriptor sd; -- 2.17.0

3 6

[PATCH 1/5] ntoskrnl.exe: Implement KeAreApcsDisabled using critical region functions.
by Derek Lesho 24 Apr '19

24 Apr '19

Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 16 ++++++++++++++-- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/ntoskrnl_private.h | 1 + dlls/ntoskrnl.exe/tests/driver.c | 17 +++++++++++++++++ include/ddk/ntddk.h | 1 + 5 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c1e6a9cf02..76046c8d90 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2515,6 +2515,8 @@ static void *create_thread_object( HANDLE handle ) if (!NtQueryInformationThread( handle, ThreadBasicInformation, &info, sizeof(info), NULL )) thread->id = info.ClientId; + thread->critical_region_count = 0; + return thread; } @@ -3417,7 +3419,8 @@ NTSTATUS WINAPI IoCsqInitialize(PIO_CSQ csq, PIO_CSQ_INSERT_IRP insert_irp, PIO_ */ void WINAPI KeEnterCriticalRegion(void) { - FIXME(": stub\n"); + TRACE(": semi-stub\n"); + KeGetCurrentThread()->critical_region_count++; } /*********************************************************************** @@ -3425,7 +3428,8 @@ void WINAPI KeEnterCriticalRegion(void) */ void WINAPI KeLeaveCriticalRegion(void) { - FIXME(": stub\n"); + TRACE(": semi-stub\n"); + KeGetCurrentThread()->critical_region_count--; } /*********************************************************************** @@ -4357,3 +4361,11 @@ ULONG WINAPI ExSetTimerResolution(ULONG time, BOOLEAN set_resolution) FIXME("stub: %u %d\n", time, set_resolution); return KeQueryTimeIncrement(); } + +/********************************************************************* + * KeAreApcsDisabled (NTOSKRNL.@) + */ +BOOLEAN WINAPI KeAreApcsDisabled(void) +{ + return !!KeGetCurrentThread()->critical_region_count; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 633a8c4b6c..97fc4ec0db 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -521,7 +521,7 @@ @ stdcall KeAcquireSpinLockAtDpcLevel(ptr) @ stdcall -arch=arm,arm64,x86_64 KeAcquireSpinLockRaiseToDpc(ptr) @ stub KeAddSystemServiceTable -@ stub KeAreApcsDisabled +@ stdcall KeAreApcsDisabled() @ stub KeAttachProcess @ stub KeBugCheck @ stub KeBugCheckEx diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index 5f309616d3..4f5ae14cfb 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -36,6 +36,7 @@ struct _KTHREAD { DISPATCHER_HEADER header; CLIENT_ID id; + unsigned int critical_region_count; }; void *alloc_kernel_object( POBJECT_TYPE type, HANDLE handle, SIZE_T size, LONG ref ) DECLSPEC_HIDDEN; diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 030c95507c..f70f865c40 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1187,6 +1187,22 @@ static void test_lookup_thread(void) "PsLookupThreadByThreadId returned %#x\n", status); } +static void test_critical_regions(void) +{ + BOOLEAN result; + + result = KeAreApcsDisabled(); + ok(!result, "got %u, expected 0\n", result); + + KeEnterCriticalRegion(); + + result = KeAreApcsDisabled(); + + KeLeaveCriticalRegion(); + + ok(result, "got %u, expected 1\n", result); +} + static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -1231,6 +1247,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st test_ob_reference(test_input->path); test_resource(); test_lookup_thread(); + test_critical_regions(); /* print process report */ if (winetest_debug) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 719ba67c6a..f09f879032 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -213,6 +213,7 @@ NTSTATUS WINAPI IoQueryDeviceDescription(PINTERFACE_TYPE,PULONG,PCONFIGURATION_ PCONFIGURATION_TYPE,PULONG,PIO_QUERY_DEVICE_ROUTINE,PVOID); void WINAPI IoRegisterDriverReinitialization(PDRIVER_OBJECT,PDRIVER_REINITIALIZE,PVOID); NTSTATUS WINAPI IoRegisterShutdownNotification(PDEVICE_OBJECT); +BOOLEAN WINAPI KeAreApcsDisabled(void); NTSTATUS WINAPI KeExpandKernelStackAndCallout(PEXPAND_STACK_CALLOUT,void*,SIZE_T); void WINAPI KeSetTargetProcessorDpc(PRKDPC,CCHAR); BOOLEAN WINAPI MmIsAddressValid(void *); -- 2.20.1

3 10

[PATCH 3/7] winemac.drv: Add macdrv_get_adapters() helper.
by Zhiyi Zhang 24 Apr '19

24 Apr '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/cocoa_display.m | 72 ++++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 15 +++++++++ 2 files changed, 87 insertions(+) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index 569cd32352..d95cda59c9 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -271,3 +271,75 @@ void macdrv_free_gpus(struct macdrv_gpu* gpus) { free(gpus); } + +/*********************************************************************** + * macdrv_get_adapters + * + * Get a list of adapters under gpu_id. The first adapter is primary if GPU is primary. + * Call macdrv_free_adapters() when you are done using the data. + * + * Return -1 on failure with parameters unchanged. + */ +int macdrv_get_adapters(uint64_t gpu_id, struct macdrv_adapter** new_adapters, int* count) +{ + struct macdrv_adapter* adapters; + CGDirectDisplayID display_ids[16]; + uint32_t display_id_count; + uint32_t i; + int primary_index = 0; + int adapter_count = 0; + + if (CGGetOnlineDisplayList(sizeof(display_ids) / sizeof(display_ids[0]), display_ids, &display_id_count) + != kCGErrorSuccess) + return -1; + + /* Actual adapter count may be less */ + adapters = calloc(display_id_count, sizeof(*adapters)); + if (!adapters) + return -1; + + for (i = 0; i < display_id_count; i++) + { + /* Mirrored displays are under the same adapter with primary display, so they doesn't increase adapter count */ + if (CGDisplayMirrorsDisplay(display_ids[i]) != kCGNullDirectDisplay) + continue; + + id<MTLDevice> device = CGDirectDisplayCopyCurrentMetalDevice(display_ids[i]); + if (!device || device.registryID == gpu_id) + { + adapters[adapter_count].id = display_ids[i]; + if (CGDisplayIsMain(display_ids[i])) + { + adapters[adapter_count].state_flags |= DISPLAY_DEVICE_PRIMARY_DEVICE; + primary_index = adapter_count; + } + if (CGDisplayIsActive(display_ids[i]) || CGDisplayIsInMirrorSet(display_ids[i])) + adapters[adapter_count].state_flags |= DISPLAY_DEVICE_ATTACHED_TO_DESKTOP; + + adapter_count++; + } + } + + /* Make sure the first adapter is primary if the GPU is primary */ + if (primary_index) + { + struct macdrv_adapter tmp; + tmp = adapters[0]; + adapters[0] = adapters[primary_index]; + adapters[primary_index] = tmp; + } + + *new_adapters = adapters; + *count = adapter_count; + return 0; +} + +/*********************************************************************** + * macdrv_free_adapters + * + * Free an adapter list allocated from macdrv_get_adapters() + */ +void macdrv_free_adapters(struct macdrv_adapter* adapters) +{ + free(adapters); +} diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index a6d8ec91d4..a57b94c125 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -258,6 +258,10 @@ static inline CGPoint cgpoint_win_from_mac(CGPoint point) /* display */ +/* Used DISPLAY_DEVICE.StateFlags for adapters */ +#define DISPLAY_DEVICE_ATTACHED_TO_DESKTOP 0x00000001 +#define DISPLAY_DEVICE_PRIMARY_DEVICE 0x00000004 + /* Represent a physical GPU in the PCI slots */ struct macdrv_gpu { @@ -272,12 +276,23 @@ static inline CGPoint cgpoint_win_from_mac(CGPoint point) uint32_t revision_id; }; +/* Represent an adapter in EnumDisplayDevices context */ +struct macdrv_adapter +{ + /* ID to uniquely identify an adapter. Currently it's a CGDirectDisplayID */ + uint32_t id; + /* as StateFlags in DISPLAY_DEVICE struct */ + uint32_t state_flags; +}; + extern int macdrv_get_displays(struct macdrv_display** displays, int* count) DECLSPEC_HIDDEN; extern void macdrv_free_displays(struct macdrv_display* displays) DECLSPEC_HIDDEN; extern int macdrv_set_display_mode(const struct macdrv_display* display, CGDisplayModeRef display_mode) DECLSPEC_HIDDEN; extern int macdrv_get_gpus(struct macdrv_gpu** gpus, int* count) DECLSPEC_HIDDEN; extern void macdrv_free_gpus(struct macdrv_gpu* gpus) DECLSPEC_HIDDEN; +extern int macdrv_get_adapters(uint64_t gpu_id, struct macdrv_adapter** adapters, int* count) DECLSPEC_HIDDEN; +extern void macdrv_free_adapters(struct macdrv_adapter* adapters) DECLSPEC_HIDDEN; /* event */ -- 2.15.2 (Apple Git-101.1)

2 3

[PATCH v2 4/4] dxgi/tests: Add factory window association tests.
by Zhiyi Zhang 24 Apr '19

24 Apr '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/Makefile.in | 2 +- dlls/dxgi/tests/dxgi.c | 250 +++++++++++++++++++++++++++++++++++- 2 files changed, 250 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/tests/Makefile.in b/dlls/dxgi/tests/Makefile.in index 1c99d70957..fbce9d3dd0 100644 --- a/dlls/dxgi/tests/Makefile.in +++ b/dlls/dxgi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dxgi.dll -IMPORTS = d3d10_1 dxgi user32 +IMPORTS = d3d10_1 d3d11 dxgi user32 C_SRCS = \ dxgi.c diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 79e4bc0c15..b73f9319c6 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -40,9 +40,16 @@ static PFN_D3D12_CREATE_DEVICE pD3D12CreateDevice; static PFN_D3D12_GET_DEBUG_INTERFACE pD3D12GetDebugInterface; static unsigned int use_adapter_idx; +static BOOL enable_debug_layer; static BOOL use_warp_adapter; static BOOL use_mt = TRUE; +struct device_desc +{ + const D3D_FEATURE_LEVEL *feature_level; + UINT flags; +}; + static struct test_entry { void (*test)(void); @@ -539,6 +546,56 @@ success: return dxgi_device; } +static ID3D11Device *create_d3d11_device(const struct device_desc *desc) +{ + static const D3D_FEATURE_LEVEL default_feature_level[] = + { + D3D_FEATURE_LEVEL_11_0, + D3D_FEATURE_LEVEL_10_1, + D3D_FEATURE_LEVEL_10_0, + }; + const D3D_FEATURE_LEVEL *feature_level; + UINT flags = desc ? desc->flags : 0; + unsigned int feature_level_count; + IDXGIAdapter *adapter; + ID3D11Device *device; + HRESULT hr; + + if (desc && desc->feature_level) + { + feature_level = desc->feature_level; + feature_level_count = 1; + } + else + { + feature_level = default_feature_level; + feature_level_count = ARRAY_SIZE(default_feature_level); + } + + if (enable_debug_layer) + flags |= D3D11_CREATE_DEVICE_DEBUG; + + if ((adapter = create_adapter())) + { + hr = D3D11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, NULL, flags, feature_level, feature_level_count, + D3D11_SDK_VERSION, &device, NULL, NULL); + IDXGIAdapter_Release(adapter); + return SUCCEEDED(hr) ? device : NULL; + } + + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, flags, feature_level, feature_level_count, + D3D11_SDK_VERSION, &device, NULL, NULL))) + return device; + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, flags, feature_level, feature_level_count, + D3D11_SDK_VERSION, &device, NULL, NULL))) + return device; + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, flags, feature_level, feature_level_count, + D3D11_SDK_VERSION, &device, NULL, NULL))) + return device; + + return NULL; +} + static ID3D12Device *create_d3d12_device(void) { IDXGIAdapter *adapter; @@ -4985,6 +5042,197 @@ done: ok(!refcount, "Factory has %u references left.\n", refcount); } +static void test_window_association(void) +{ + DXGI_SWAP_CHAIN_DESC swapchain_desc; + IDXGIFactory *factory, *factory2; + IDXGIDevice *devices[2] = {0}; + ID3D11Device *d3d11_device; + IDXGISwapChain *swapchain; + IDXGIAdapter *adapter; + HWND hwnd, hwnd2; + LONG_PTR wndproc; + BOOL fullscreen; + ULONG refcount; + HRESULT hr; + INT i, j; + + static const struct + { + UINT flag; + BOOL expect_fullscreen; + BOOL broken_d3d10; + } + tests[] = + { + /* There are two reasons why VK_TAB and VK_ESC are not tested here. + * 1. Posting them to the window doesn't exit fullscreen like Alt+Enter does. + * Alt+Tab and Alt+Esc are handled somewhere else, e.g., not calling IDXGISwapChain::Present + * will break Alt+Tab and Alt+Esc while Alt+Enter will still function. + * 2. Posting them hangs the posting thread. Another thread keep sending input is needed to avoid the hang. + * The hang is not because of flush_events. */ + {0, TRUE}, + {0, FALSE}, + {DXGI_MWA_NO_WINDOW_CHANGES, FALSE}, + {DXGI_MWA_NO_WINDOW_CHANGES, FALSE}, + {DXGI_MWA_NO_ALT_ENTER, FALSE, TRUE}, + {DXGI_MWA_NO_ALT_ENTER, FALSE}, + {DXGI_MWA_NO_PRINT_SCREEN, TRUE}, + {DXGI_MWA_NO_PRINT_SCREEN, FALSE}, + {0, TRUE}, + {0, FALSE} + }; + + /* d3d10 */ + devices[0] = create_device(0); + + /* d3d11 */ + d3d11_device = create_d3d11_device(NULL); + if (d3d11_device) + { + hr = ID3D11Device_QueryInterface(d3d11_device, &IID_IDXGIDevice, (void **)&devices[1]); + ok(SUCCEEDED(hr), "Created device does not implement IDXGIDevice\n"); + ID3D11Device_Release(d3d11_device); + } + + swapchain_desc.BufferDesc.Width = 800; + swapchain_desc.BufferDesc.Height = 600; + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; + swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 1; + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + swapchain_desc.Windowed = TRUE; + swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.Flags = 0; + + /* Get pointer to original WNDPROC */ + wndproc = GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC); + + hwnd2 = CreateWindowA("static", "dxgi_test2", 0, 0, 0, 400, 200, 0, 0, 0, 0); + hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory2); + ok(hr == S_OK, "Failed to create DXGI factory, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(devices); i++) + { + if (!devices[i]) + { + skip("Create device failed. Skipping IDXGIFactory window association test.\n"); + continue; + } + + hr = IDXGIDevice_GetAdapter(devices[i], &adapter); + ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); + + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); + + /* Parameter check */ + hr = IDXGIFactory_GetWindowAssociation(factory, NULL); + ok(hr == DXGI_ERROR_INVALID_CALL, "GetWindowAssociation failed, hr %#x.\n", hr); + + for (j = 0; j <= DXGI_MWA_VALID; j++) + { + hr = IDXGIFactory_MakeWindowAssociation(factory, NULL, j); + ok(SUCCEEDED(hr), "MakeWindowAssociation failed, flags %#x, hr %#x.\n", j, hr); + + hr = IDXGIFactory_MakeWindowAssociation(factory, swapchain_desc.OutputWindow, j); + ok(SUCCEEDED(hr), "MakeWindowAssociation failed, flags %#x, hr %#x.\n", j, hr); + + /* Verify WNDPROC unmodified */ + ok(wndproc == GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC), + "Expect WNDPROC not modified\n"); + + hwnd = (HWND)0xdeadbeef; + hr = IDXGIFactory_GetWindowAssociation(factory, &hwnd); + ok(SUCCEEDED(hr), "GetWindowAssociation failed, flags %#x, hr %#x.\n", j, hr); + /* Yes, GetWindowAssociation always return NULL for hwnd even though MakeWindowAssociation and + * GetWindowAssociation are successfully called. I wonder why. */ + ok(!hwnd, "Expect null associated window.\n"); + } + + hr = IDXGIFactory_MakeWindowAssociation(factory, swapchain_desc.OutputWindow, DXGI_MWA_VALID + 1); + ok(hr == DXGI_ERROR_INVALID_CALL, "MakeWindowAssociation succeeded, hr %#x.\n", hr); + + /* Alt+Enter tests */ + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)devices[i], &swapchain_desc, &swapchain); + ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + + /* Verify WNDPROC unmodified */ + ok(wndproc == GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC), + "Expect WNDPROC not modified\n"); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(SUCCEEDED(hr) || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE + || broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */ + "SetFullscreenState failed, hr %#x.\n", hr); + if (FAILED(hr)) + skip("Could not change fullscreen state.\n"); + else + { + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + for (j = 0; j < ARRAY_SIZE(tests); j++) + { + /* Associate a window first with opposite flags */ + hr = IDXGIFactory_MakeWindowAssociation(factory, hwnd2, (~tests[j].flag) & DXGI_MWA_VALID); + ok(SUCCEEDED(hr), "Test %d: MakeWindowAssociation failed, hr %#x.\n", j, hr); + + /* Associate current test window */ + hwnd = tests[j].flag ? swapchain_desc.OutputWindow : NULL; + hr = IDXGIFactory_MakeWindowAssociation(factory, hwnd, tests[j].flag); + ok(SUCCEEDED(hr), "Test %d: MakeWindowAssociation failed, hr %#x.\n", j, hr); + + /* Associate a new test window doesn't override old window */ + hr = IDXGIFactory_MakeWindowAssociation(factory, hwnd2, (~tests[j].flag) & DXGI_MWA_VALID); + ok(SUCCEEDED(hr), "Test %d: MakeWindowAssociation failed, hr %#x.\n", j, hr); + + /* Wrong factory doesn't affect current test window */ + hr = IDXGIFactory_MakeWindowAssociation(factory2, hwnd, (~tests[j].flag) & DXGI_MWA_VALID); + ok(SUCCEEDED(hr), "Test %d: MakeWindowAssociation failed, hr %#x.\n", j, hr); + + /* Post synthesized Alt + VK_RETURN WM_SYSKEYDOWN */ + PostMessageA(swapchain_desc.OutputWindow, WM_SYSKEYDOWN, VK_RETURN, + (MapVirtualKeyA(VK_RETURN, MAPVK_VK_TO_VSC) << 16) | 0x20000001); + flush_events(); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(SUCCEEDED(hr), "Test %d: GetFullscreenState failed, hr %#x.\n", j, hr); + ok(fullscreen == tests[j].expect_fullscreen || broken(tests[j].broken_d3d10 && i == 0 && fullscreen), + "Test %d: got unexpected fullscreen %#x.\n", j, fullscreen); + + /* Verify WNDPROC unmodified. Currently Wine modifies WNPPROC during after fullscreen transition */ + todo_wine_if(tests[j].expect_fullscreen) + ok(wndproc == GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC), + "Expect WNDPROC not modified\n"); + } + } + + /* Set to windowed mode before releasing resources, otherwise there might be unhandled exceptions */ + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + refcount = IDXGIDevice_Release(devices[i]); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDXGIAdapter_Release(adapter); + ok(!refcount, "IDXGIAdapter has %u references left.\n", refcount); + refcount = IDXGIFactory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); + } + + refcount = IDXGIFactory_Release(factory2); + ok(!refcount, "Factory has %u references left.\n", refcount); + DestroyWindow(hwnd2); + DestroyWindow(swapchain_desc.OutputWindow); +} + static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12)) { IDXGIDevice *device; @@ -5029,7 +5277,6 @@ static void run_on_d3d12(void (*test_func)(IUnknown *device, BOOL is_d3d12)) START_TEST(dxgi) { HMODULE dxgi_module, d3d12_module; - BOOL enable_debug_layer = FALSE; unsigned int argc, i; ID3D12Debug *debug; char **argv; @@ -5084,6 +5331,7 @@ START_TEST(dxgi) test_swapchain_parameters(); test_swapchain_window_messages(); test_swapchain_window_styles(); + test_window_association(); run_on_d3d10(test_swapchain_resize); run_on_d3d10(test_swapchain_present); run_on_d3d10(test_swapchain_backbuffer_index); -- 2.20.1

1 0

[PATCH v2 3/4] dxgi: Implement Alt+Enter handling.
by Zhiyi Zhang 24 Apr '19

24 Apr '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 163 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 163 insertions(+) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index a859baffc8..759d697915 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -39,6 +39,159 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxgi); WINE_DECLARE_DEBUG_CHANNEL(winediag); +extern const WCHAR wine_dxgi_associated_factory_propW[]; +extern const WCHAR wine_dxgi_associated_flags_propW[]; + +static struct list dxgi_swapchain_list = LIST_INIT(dxgi_swapchain_list); +static struct list dxgi_hook_list = LIST_INIT(dxgi_hook_list); + +struct dxgi_swapchain_entry +{ + IDXGISwapChain1 *swapchain; + DWORD thread_id; + struct list entry; +}; + +struct dxgi_hook_entry +{ + HHOOK hook; + DWORD thread_id; + struct list entry; +}; + +static LRESULT CALLBACK associated_window_hook_proc(int code, WPARAM wparam, LPARAM lparam) +{ + struct dxgi_swapchain_entry *swapchain_entry; + IDXGIFactory *dxgi_factory; + MSG *msg = (MSG *)lparam; + HANDLE factory_handle; + BOOL skip = FALSE; + BOOL fullscreen; + DWORD flags; + HWND hwnd; + + if (code == HC_ACTION && msg->message == WM_SYSKEYDOWN && msg->wParam == VK_RETURN && (msg->lParam & (KF_ALTDOWN << 16))) + { + wined3d_mutex_lock(); + LIST_FOR_EACH_ENTRY(swapchain_entry, &dxgi_swapchain_list, struct dxgi_swapchain_entry, entry) + { + if (FAILED(IDXGISwapChain1_GetHwnd(swapchain_entry->swapchain, &hwnd)) || hwnd != msg->hwnd) + continue; + + if (FAILED(IDXGISwapChain1_GetParent(swapchain_entry->swapchain, &IID_IDXGIFactory, (void **)&dxgi_factory))) + continue; + IDXGIFactory_Release(dxgi_factory); + + factory_handle = GetPropW(hwnd, wine_dxgi_associated_factory_propW); + flags = (DWORD)(UINT_PTR)GetPropW(hwnd, wine_dxgi_associated_flags_propW); + + if (factory_handle && factory_handle != dxgi_factory) + continue; + + if (flags & (DXGI_MWA_NO_WINDOW_CHANGES | DXGI_MWA_NO_ALT_ENTER)) + break; + + if (SUCCEEDED(IDXGISwapChain1_GetFullscreenState(swapchain_entry->swapchain, &fullscreen, NULL))) + IDXGISwapChain1_SetFullscreenState(swapchain_entry->swapchain, !fullscreen, NULL); + skip = TRUE; + break; + } + wined3d_mutex_unlock(); + } + + return skip ? 1 : CallNextHookEx(0, code, wparam, lparam); +} + +static void add_associated_window_hook(IDXGISwapChain1 *swapchain, HWND hwnd) +{ + struct dxgi_swapchain_entry *swapchain_entry; + struct dxgi_hook_entry *hook_entry; + BOOL has_hook = FALSE; + + if (!hwnd) + return; + + if (!(swapchain_entry = heap_alloc_zero(sizeof(*swapchain_entry)))) + return; + + swapchain_entry->swapchain = swapchain; + swapchain_entry->thread_id = GetWindowThreadProcessId(hwnd, NULL); + wined3d_mutex_lock(); + list_add_head(&dxgi_swapchain_list, &swapchain_entry->entry); + /* Add hook for current thread if needed */ + LIST_FOR_EACH_ENTRY(hook_entry, &dxgi_hook_list, struct dxgi_hook_entry, entry) + { + if (hook_entry->thread_id == swapchain_entry->thread_id) + { + has_hook = TRUE; + break; + } + } + wined3d_mutex_unlock(); + + if (!has_hook) + { + if (!(hook_entry = heap_alloc_zero(sizeof(*hook_entry)))) + { + wined3d_mutex_lock(); + list_remove(&swapchain_entry->entry); + wined3d_mutex_unlock(); + heap_free(swapchain_entry); + return; + } + + hook_entry->thread_id = swapchain_entry->thread_id; + hook_entry->hook = SetWindowsHookExW(WH_GETMESSAGE, associated_window_hook_proc, 0, hook_entry->thread_id); + wined3d_mutex_lock(); + list_add_head(&dxgi_hook_list, &hook_entry->entry); + wined3d_mutex_unlock(); + } +} + +static void remove_associated_window_hook(IDXGISwapChain1 *swapchain) +{ + struct dxgi_swapchain_entry *swapchain_entry, *swapchain_entry2; + struct dxgi_hook_entry *hook_entry, *hook_entry2; + BOOL hook_in_use = FALSE; + DWORD thread_id = 0; + + wined3d_mutex_lock(); + LIST_FOR_EACH_ENTRY_SAFE(swapchain_entry, swapchain_entry2, &dxgi_swapchain_list, struct dxgi_swapchain_entry, entry) + { + if (swapchain_entry->swapchain == swapchain) + { + thread_id = swapchain_entry->thread_id; + list_remove(&swapchain_entry->entry); + heap_free(swapchain_entry); + break; + } + } + /* Check if hook is still used by other swapchains */ + LIST_FOR_EACH_ENTRY(swapchain_entry, &dxgi_swapchain_list, struct dxgi_swapchain_entry, entry) + { + if (swapchain_entry->thread_id == thread_id) + { + hook_in_use = TRUE; + break; + } + } + /* Remove hook if it's not longer used by any thread */ + if (!hook_in_use) + { + LIST_FOR_EACH_ENTRY_SAFE(hook_entry, hook_entry2, &dxgi_hook_list, struct dxgi_hook_entry, entry) + { + if (hook_entry->thread_id == thread_id) + { + list_remove(&hook_entry->entry); + UnhookWindowsHookEx(hook_entry->hook); + heap_free(hook_entry); + break; + } + } + } + wined3d_mutex_unlock(); +} + static DXGI_SWAP_EFFECT dxgi_swap_effect_from_wined3d(enum wined3d_swap_effect swap_effect) { switch (swap_effect) @@ -214,6 +367,9 @@ static ULONG STDMETHODCALLTYPE d3d11_swapchain_Release(IDXGISwapChain1 *iface) if (!refcount) { IWineDXGIDevice *device = swapchain->device; + + remove_associated_window_hook(iface); + if (swapchain->target) { WARN("Releasing fullscreen swapchain.\n"); @@ -842,8 +998,11 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi goto cleanup; } } + wined3d_mutex_unlock(); + add_associated_window_hook(&swapchain->IDXGISwapChain1_iface, desc->device_window); + return S_OK; cleanup: @@ -1770,6 +1929,8 @@ static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; void *vulkan_module = vk_funcs->vulkan_module; + remove_associated_window_hook((IDXGISwapChain1*)&swapchain->IDXGISwapChain3_iface); + d3d12_swapchain_destroy_buffers(swapchain, TRUE); if (swapchain->command_queue) @@ -2731,6 +2892,8 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI IWineDXGIFactory_AddRef(swapchain->factory = factory); + add_associated_window_hook((IDXGISwapChain1*)&swapchain->IDXGISwapChain3_iface, window); + return S_OK; } -- 2.20.1

1 0

[PATCH v2 2/4] dxgi: Implement dxgi_factory_GetWindowAssociation().
by Zhiyi Zhang 24 Apr '19

24 Apr '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/factory.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 5aadef62e4..65783237e7 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -248,9 +248,18 @@ done: static HRESULT STDMETHODCALLTYPE dxgi_factory_GetWindowAssociation(IWineDXGIFactory *iface, HWND *window) { - FIXME("iface %p, window %p stub!\n", iface, window); + TRACE("iface %p, window %p.\n", iface, window); - return E_NOTIMPL; + if (!window) + { + WARN("Invalid pointer.\n"); + return DXGI_ERROR_INVALID_CALL; + } + + /* Yes, tests show that it always return NULL for unknown reason. */ + *window = NULL; + + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IWineDXGIFactory *iface, -- 2.20.1

1 0

[PATCH v2 1/4] dxgi: Implement dxgi_factory_MakeWindowAssociation().
by Zhiyi Zhang 24 Apr '19

24 Apr '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Add tests to show that window association doesn't modify WNDPROC. dlls/dxgi/dxgi_private.h | 1 + dlls/dxgi/factory.c | 74 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 72 insertions(+), 3 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index b6999c729a..7fb28287ad 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -115,6 +115,7 @@ struct dxgi_factory struct wined3d *wined3d; BOOL extended; HWND device_window; + struct list associated_windows; }; HRESULT dxgi_factory_create(REFIID riid, void **factory, BOOL extended) DECLSPEC_HIDDEN; diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 52c145bc6a..5aadef62e4 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -24,6 +24,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxgi); +const WCHAR wine_dxgi_associated_factory_propW[] = + {'W','i','n','e','D','X','G','I','A','s','s','o','c','i','a','t','e','d','F','a','c','t','o','r','y',0}; +const WCHAR wine_dxgi_associated_flags_propW[] = + {'W','i','n','e','D','X','G','I','A','s','s','o','c','i','a','t','e','d','F','l','a','g','s',0}; + +struct dxgi_associated_window +{ + HWND hwnd; + struct list entry; +}; + static inline struct dxgi_factory *impl_from_IWineDXGIFactory(IWineDXGIFactory *iface) { return CONTAINING_RECORD(iface, struct dxgi_factory, IWineDXGIFactory_iface); @@ -70,11 +81,20 @@ static ULONG STDMETHODCALLTYPE dxgi_factory_Release(IWineDXGIFactory *iface) { struct dxgi_factory *factory = impl_from_IWineDXGIFactory(iface); ULONG refcount = InterlockedDecrement(&factory->refcount); + struct dxgi_associated_window *window, *window2; TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) { + LIST_FOR_EACH_ENTRY_SAFE(window, window2, &factory->associated_windows, struct dxgi_associated_window, entry) + { + RemovePropW(window->hwnd, wine_dxgi_associated_factory_propW); + RemovePropW(window->hwnd, wine_dxgi_associated_flags_propW); + list_remove(&window->entry); + heap_free(window); + } + if (factory->device_window) DestroyWindow(factory->device_window); @@ -172,11 +192,58 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapters(IWineDXGIFactory *ifa } static HRESULT STDMETHODCALLTYPE dxgi_factory_MakeWindowAssociation(IWineDXGIFactory *iface, - HWND window, UINT flags) + HWND hwnd, UINT flags) { - FIXME("iface %p, window %p, flags %#x stub!\n", iface, window, flags); + struct dxgi_factory *factory = impl_from_IWineDXGIFactory(iface); + struct dxgi_associated_window *window, *window2; + HANDLE handle; + HRESULT hr = S_OK; - return S_OK; + TRACE("iface %p, window %p, flags %#x.\n", iface, hwnd, flags); + + if (flags > DXGI_MWA_VALID) + return DXGI_ERROR_INVALID_CALL; + + wined3d_mutex_lock(); + + /* Delete all associated windows from this factory */ + if (!hwnd) + { + LIST_FOR_EACH_ENTRY_SAFE(window, window2, &factory->associated_windows, struct dxgi_associated_window, entry) + { + RemovePropW(window->hwnd, wine_dxgi_associated_factory_propW); + RemovePropW(window->hwnd, wine_dxgi_associated_flags_propW); + list_remove(&window->entry); + heap_free(window); + } + } + /* Add a new window association */ + else + { + handle = GetPropW(hwnd, wine_dxgi_associated_factory_propW); + if (!handle) + { + window = heap_alloc_zero(sizeof(struct dxgi_associated_window)); + if (!window) + { + hr = E_OUTOFMEMORY; + goto done; + } + + SetPropW(hwnd, wine_dxgi_associated_factory_propW, iface); + SetPropW(hwnd, wine_dxgi_associated_flags_propW, (HANDLE)(UINT_PTR)flags); + window->hwnd = hwnd; + list_add_head(&factory->associated_windows, &window->entry); + } + else if (handle == iface) + SetPropW(hwnd, wine_dxgi_associated_flags_propW, (HANDLE)(UINT_PTR)flags); + else + WARN("Window is already associated to another factory.\n"); + } + +done: + wined3d_mutex_unlock(); + return hr; } static HRESULT STDMETHODCALLTYPE dxgi_factory_GetWindowAssociation(IWineDXGIFactory *iface, HWND *window) @@ -501,6 +568,7 @@ static HRESULT dxgi_factory_init(struct dxgi_factory *factory, BOOL extended) } factory->extended = extended; + list_init(&factory->associated_windows); return S_OK; } -- 2.20.1

1 0

[PATCH] include: Add CAL_UMALQURA definition to winnls.h
by Vijay Kiran Kamuju 24 Apr '19

24 Apr '19

From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/winnls.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winnls.h b/include/winnls.h index c8580bd67c2..2e9869b22f2 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -553,6 +553,7 @@ static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e',' #define CAL_GREGORIAN_ARABIC 10 #define CAL_GREGORIAN_XLIT_ENGLISH 11 #define CAL_GREGORIAN_XLIT_FRENCH 12 +#define CAL_UMALQURA 23 /* EnumCalendarInfo Flags */ #define ENUM_ALL_CALENDARS 0xffffffff /* Enumerate all calendars within a locale */ -- 2.17.0

1 0

[PATCH 5/5] comctl32/edit: Implement EC_USEFONTINFO margins in the CJK case.
by Akihiro Sagawa 24 Apr '19

24 Apr '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/comctl32/edit.c | 45 ++++++++++++++++++++++++++++++++++++++++++--- dlls/comctl32/tests/edit.c | 2 -- 2 files changed, 42 insertions(+), 5 deletions(-)

1 0

[PATCH 4/5] comctl32/tests: Use calculated EC_USEFONTINFO margins in the CJK case.
by Akihiro Sagawa 24 Apr '19

24 Apr '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/comctl32/tests/edit.c | 46 +++++++++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 15 deletions(-)

1 0

[PATCH 3/5] comctl32/tests: Tests default margin size with various font face and charset.
by Akihiro Sagawa 24 Apr '19

24 Apr '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/comctl32/tests/edit.c | 100 ++++++++++++++++++++++++++++++--------------- 1 file changed, 66 insertions(+), 34 deletions(-)

1 0

[PATCH 2/5] comctl32/tests: Add Unicode version tests for Edit control margins.
by Akihiro Sagawa 24 Apr '19

24 Apr '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/comctl32/tests/edit.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-)

1 0

[PATCH 1/5] comctl32/tests: Move the default margin size tests into a separate function.
by Akihiro Sagawa 24 Apr '19

24 Apr '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/comctl32/tests/edit.c | 93 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 76 insertions(+), 17 deletions(-)

1 0

[PATCH 1/5] dxgi: Implement dxgi_factory_MakeWindowAssociation().
by Zhiyi Zhang 24 Apr '19

24 Apr '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/dxgi_private.h | 1 + dlls/dxgi/factory.c | 74 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 72 insertions(+), 3 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index b6999c729a..7fb28287ad 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -115,6 +115,7 @@ struct dxgi_factory struct wined3d *wined3d; BOOL extended; HWND device_window; + struct list associated_windows; }; HRESULT dxgi_factory_create(REFIID riid, void **factory, BOOL extended) DECLSPEC_HIDDEN; diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 52c145bc6a..5aadef62e4 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -24,6 +24,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxgi); +const WCHAR wine_dxgi_associated_factory_propW[] = + {'W','i','n','e','D','X','G','I','A','s','s','o','c','i','a','t','e','d','F','a','c','t','o','r','y',0}; +const WCHAR wine_dxgi_associated_flags_propW[] = + {'W','i','n','e','D','X','G','I','A','s','s','o','c','i','a','t','e','d','F','l','a','g','s',0}; + +struct dxgi_associated_window +{ + HWND hwnd; + struct list entry; +}; + static inline struct dxgi_factory *impl_from_IWineDXGIFactory(IWineDXGIFactory *iface) { return CONTAINING_RECORD(iface, struct dxgi_factory, IWineDXGIFactory_iface); @@ -70,11 +81,20 @@ static ULONG STDMETHODCALLTYPE dxgi_factory_Release(IWineDXGIFactory *iface) { struct dxgi_factory *factory = impl_from_IWineDXGIFactory(iface); ULONG refcount = InterlockedDecrement(&factory->refcount); + struct dxgi_associated_window *window, *window2; TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) { + LIST_FOR_EACH_ENTRY_SAFE(window, window2, &factory->associated_windows, struct dxgi_associated_window, entry) + { + RemovePropW(window->hwnd, wine_dxgi_associated_factory_propW); + RemovePropW(window->hwnd, wine_dxgi_associated_flags_propW); + list_remove(&window->entry); + heap_free(window); + } + if (factory->device_window) DestroyWindow(factory->device_window); @@ -172,11 +192,58 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapters(IWineDXGIFactory *ifa } static HRESULT STDMETHODCALLTYPE dxgi_factory_MakeWindowAssociation(IWineDXGIFactory *iface, - HWND window, UINT flags) + HWND hwnd, UINT flags) { - FIXME("iface %p, window %p, flags %#x stub!\n", iface, window, flags); + struct dxgi_factory *factory = impl_from_IWineDXGIFactory(iface); + struct dxgi_associated_window *window, *window2; + HANDLE handle; + HRESULT hr = S_OK; - return S_OK; + TRACE("iface %p, window %p, flags %#x.\n", iface, hwnd, flags); + + if (flags > DXGI_MWA_VALID) + return DXGI_ERROR_INVALID_CALL; + + wined3d_mutex_lock(); + + /* Delete all associated windows from this factory */ + if (!hwnd) + { + LIST_FOR_EACH_ENTRY_SAFE(window, window2, &factory->associated_windows, struct dxgi_associated_window, entry) + { + RemovePropW(window->hwnd, wine_dxgi_associated_factory_propW); + RemovePropW(window->hwnd, wine_dxgi_associated_flags_propW); + list_remove(&window->entry); + heap_free(window); + } + } + /* Add a new window association */ + else + { + handle = GetPropW(hwnd, wine_dxgi_associated_factory_propW); + if (!handle) + { + window = heap_alloc_zero(sizeof(struct dxgi_associated_window)); + if (!window) + { + hr = E_OUTOFMEMORY; + goto done; + } + + SetPropW(hwnd, wine_dxgi_associated_factory_propW, iface); + SetPropW(hwnd, wine_dxgi_associated_flags_propW, (HANDLE)(UINT_PTR)flags); + window->hwnd = hwnd; + list_add_head(&factory->associated_windows, &window->entry); + } + else if (handle == iface) + SetPropW(hwnd, wine_dxgi_associated_flags_propW, (HANDLE)(UINT_PTR)flags); + else + WARN("Window is already associated to another factory.\n"); + } + +done: + wined3d_mutex_unlock(); + return hr; } static HRESULT STDMETHODCALLTYPE dxgi_factory_GetWindowAssociation(IWineDXGIFactory *iface, HWND *window) @@ -501,6 +568,7 @@ static HRESULT dxgi_factory_init(struct dxgi_factory *factory, BOOL extended) } factory->extended = extended; + list_init(&factory->associated_windows); return S_OK; } -- 2.20.1

3 5

[PATCH 2/2] wbemprox/tests: Introduce a helper to check properties.
by Hans Leidekker 24 Apr '19

24 Apr '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/tests/query.c | 609 +++++++------------------------------------- 1 file changed, 88 insertions(+), 521 deletions(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 3453358ee5..052e8a2778 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -277,6 +277,32 @@ out: SysFreeString( class ); } +static void _check_property( ULONG line, IWbemClassObject *obj, const WCHAR *prop, VARTYPE vartype, CIMTYPE cimtype ) +{ + CIMTYPE type = 0xdeadbeef; + VARIANT val; + HRESULT hr; + + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, prop, 0, &val, &type, NULL ); + ok( hr == S_OK, "%u: failed to get description %08x\n", line, hr ); + ok( V_VT( &val ) == vartype, "%u: unexpected variant type 0x%x\n", line, V_VT(&val) ); + ok( type == cimtype, "%u: unexpected type 0x%x\n", line, type ); + switch (V_VT(&val)) + { + case VT_BSTR: + trace( "%s: %s\n", wine_dbgstr_w(prop), wine_dbgstr_w(V_BSTR(&val)) ); + break; + case VT_I4: + trace( "%s: %d\n", wine_dbgstr_w(prop), V_I4(&val) ); + break; + default: + break; + } + VariantClear( &val ); +} +#define check_property(a,b,c,d) _check_property(__LINE__,a,b,c,d) + static void test_Win32_Bios( IWbemServices *services ) { static const WCHAR queryW[] = @@ -305,49 +331,11 @@ static void test_Win32_Bios( IWbemServices *services ) hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); ok( hr == S_OK, "IEnumWbemClassObject_Next failed %08x\n", hr ); - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, descriptionW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get description %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace( "description: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); - VariantClear( &val ); - - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, identificationcodeW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get identication code %08x\n", hr ); - ok( V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - VariantClear( &val ); - - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, manufacturerW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get manufacturer %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace( "manufacturer: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); - VariantClear( &val ); - - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, nameW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get name %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace( "name: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); - VariantClear( &val ); - - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, releasedateW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get release date %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_DATETIME, "unexpected type 0x%x\n", type ); - trace( "release date: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); - VariantClear( &val ); + check_property( obj, descriptionW, VT_BSTR, CIM_STRING ); + check_property( obj, identificationcodeW, VT_NULL, CIM_STRING ); + check_property( obj, manufacturerW, VT_BSTR, CIM_STRING ); + check_property( obj, nameW, VT_BSTR, CIM_STRING ); + check_property( obj, releasedateW, VT_BSTR, CIM_DATETIME ); type = 0xdeadbeef; VariantInit( &val ); @@ -358,39 +346,10 @@ static void test_Win32_Bios( IWbemServices *services ) ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); VariantClear( &val ); - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, smbiosbiosversionW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get bios version %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace( "bios version: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); - VariantClear( &val ); - - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, smbiosmajorversionW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get bios major version %08x\n", hr ); - ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_UINT16, "unexpected type 0x%x\n", type ); - trace( "bios major version: %u\n", V_I4( &val ) ); - - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, smbiosminorversionW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get bios minor version %08x\n", hr ); - ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_UINT16, "unexpected type 0x%x\n", type ); - trace( "bios minor version: %u\n", V_I4( &val ) ); - - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, versionW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get version %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace( "version: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); - VariantClear( &val ); + check_property( obj, smbiosbiosversionW, VT_BSTR, CIM_STRING ); + check_property( obj, smbiosmajorversionW, VT_I4, CIM_UINT16 ); + check_property( obj, smbiosminorversionW, VT_I4, CIM_UINT16 ); + check_property( obj, versionW, VT_BSTR, CIM_STRING ); IWbemClassObject_Release( obj ); IEnumWbemClassObject_Release( result ); @@ -417,7 +376,7 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) BSTR class, method; IWbemClassObject *process, *sig_in, *out; IWbemQualifierSet *qualifiers; - VARIANT user, domain, retval, val; + VARIANT retval, val; DWORD full_path_len = 0; LONG flavor; CIMTYPE type; @@ -466,21 +425,8 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) ok( !V_I4( &retval ), "unexpected error %u\n", V_I4( &retval ) ); ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); - type = 0xdeadbeef; - VariantInit( &user ); - hr = IWbemClassObject_Get( out, userW, 0, &user, &type, NULL ); - ok( hr == S_OK, "failed to get user %08x\n", hr ); - ok( V_VT( &user ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &user ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace("%s\n", wine_dbgstr_w(V_BSTR(&user))); - - type = 0xdeadbeef; - VariantInit( &domain ); - hr = IWbemClassObject_Get( out, domainW, 0, &domain, &type, NULL ); - ok( hr == S_OK, "failed to get domain %08x\n", hr ); - ok( V_VT( &domain ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &domain ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace("%s\n", wine_dbgstr_w(V_BSTR(&domain))); + check_property( out, userW, VT_BSTR, CIM_STRING ); + check_property( out, domainW, VT_BSTR, CIM_STRING ); hr = IWbemClassObject_GetPropertyQualifierSet( out, userW, &qualifiers ); ok( hr == S_OK, "failed to get qualifier set %08x\n", hr ); @@ -517,8 +463,6 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) ok( hr == WBEM_E_NOT_FOUND, "got %08x\n", hr ); IWbemQualifierSet_Release( qualifiers ); - VariantClear( &user ); - VariantClear( &domain ); IWbemClassObject_Release( out ); } @@ -577,14 +521,7 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) hr = IWbemClassObject_Get( obj, memorytypeW, 0, &value, &type, NULL ); ok( hr == WBEM_E_NOT_FOUND, "got %08x\n", hr ); - type = 0xdeadbeef; - VariantInit( &value ); - hr = IWbemClassObject_Get( obj, modelW, 0, &value, &type, NULL ); - ok( hr == S_OK, "failed to get model %08x\n", hr ); - ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace( "model: %s\n", wine_dbgstr_w(V_BSTR( &value )) ); - VariantClear( &value ); + check_property( obj, modelW, VT_BSTR, CIM_STRING ); type = 0xdeadbeef; VariantInit( &value ); @@ -606,13 +543,7 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) trace( "numlogicalprocessors %u\n", V_I4( &value ) ); } - type = 0xdeadbeef; - VariantInit( &value ); - hr = IWbemClassObject_Get( obj, numprocessorsW, 0, &value, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &value ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &value ) ); - ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); - trace( "numprocessors %u\n", V_I4( &value ) ); + check_property( obj, numprocessorsW, VT_I4, CIM_UINT32 ); type = 0xdeadbeef; VariantInit( &value ); @@ -657,14 +588,7 @@ static void test_Win32_SystemEnclosure( IWbemServices *services ) hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); ok( hr == S_OK, "IEnumWbemClassObject_Next failed %08x\n", hr ); - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, captionW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get caption %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace( "caption: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); - VariantClear( &val ); + check_property( obj, captionW, VT_BSTR, CIM_STRING ); type = 0xdeadbeef; VariantInit( &val ); @@ -692,50 +616,11 @@ static void test_Win32_SystemEnclosure( IWbemServices *services ) } VariantClear( &val ); - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, descriptionW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get description %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace( "description: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); - VariantClear( &val ); - - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, lockpresentW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get lockpresent %08x\n", hr ); - ok( V_VT( &val ) == VT_BOOL, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_BOOLEAN, "unexpected type 0x%x\n", type ); - trace( "lockpresent: %u\n", V_BOOL( &val ) ); - VariantClear( &val ); - - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, manufacturerW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get manufacturer %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace( "manufacturer: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); - VariantClear( &val ); - - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, nameW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get name %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace( "name: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); - VariantClear( &val ); - - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, tagW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get tag %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace( "tag: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); - VariantClear( &val ); + check_property( obj, descriptionW, VT_BSTR, CIM_STRING ); + check_property( obj, lockpresentW, VT_BOOL, CIM_BOOLEAN ); + check_property( obj, manufacturerW, VT_BSTR, CIM_STRING ); + check_property( obj, nameW, VT_BSTR, CIM_STRING ); + check_property( obj, tagW, VT_BSTR, CIM_STRING ); IWbemClassObject_Release( obj ); IEnumWbemClassObject_Release( result ); @@ -867,12 +752,7 @@ static void test_StdRegProv( IWbemServices *services ) ok( !V_I4( &retval ), "unexpected error %u\n", V_UI4( &retval ) ); ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); - type = 0xdeadbeef; - VariantInit( &names ); - hr = IWbemClassObject_Get( out, namesW, 0, &names, &type, NULL ); - ok( hr == S_OK, "failed to get names %08x\n", hr ); - ok( V_VT( &names ) == (VT_BSTR|VT_ARRAY), "unexpected variant type 0x%x\n", V_VT( &names ) ); - ok( type == (CIM_STRING|CIM_FLAG_ARRAY), "unexpected type 0x%x\n", type ); + check_property( out, namesW, VT_BSTR|VT_ARRAY, CIM_STRING|CIM_FLAG_ARRAY ); VariantClear( &names ); VariantClear( &subkey ); @@ -910,19 +790,8 @@ static void test_StdRegProv( IWbemServices *services ) ok( !V_I4( &retval ), "unexpected error %u\n", V_I4( &retval ) ); ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); - type = 0xdeadbeef; - VariantInit( &names ); - hr = IWbemClassObject_Get( out, namesW, 0, &names, &type, NULL ); - ok( hr == S_OK, "failed to get names %08x\n", hr ); - ok( V_VT( &names ) == (VT_BSTR|VT_ARRAY), "unexpected variant type 0x%x\n", V_VT( &names ) ); - ok( type == (CIM_STRING|CIM_FLAG_ARRAY), "unexpected type 0x%x\n", type ); - - type = 0xdeadbeef; - VariantInit( &types ); - hr = IWbemClassObject_Get( out, typesW, 0, &types, &type, NULL ); - ok( hr == S_OK, "failed to get names %08x\n", hr ); - ok( V_VT( &types ) == (VT_I4|VT_ARRAY), "unexpected variant type 0x%x\n", V_VT( &types ) ); - ok( type == (CIM_SINT32|CIM_FLAG_ARRAY), "unexpected type 0x%x\n", type ); + check_property( out, namesW, VT_BSTR|VT_ARRAY, CIM_STRING|CIM_FLAG_ARRAY ); + check_property( out, typesW, VT_I4|VT_ARRAY, CIM_SINT32|CIM_FLAG_ARRAY ); VariantClear( &types ); VariantClear( &names ); @@ -966,12 +835,7 @@ static void test_StdRegProv( IWbemServices *services ) ok( !V_I4( &retval ), "unexpected error %u\n", V_I4( &retval ) ); ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); - type = 0xdeadbeef; - VariantInit( &value ); - hr = IWbemClassObject_Get( out, valueW, 0, &value, &type, NULL ); - ok( hr == S_OK, "failed to get value %08x\n", hr ); - ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + check_property( out, valueW, VT_BSTR, CIM_STRING ); VariantClear( &value ); VariantClear( &valuename ); @@ -1271,23 +1135,8 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) hr = IWbemClassObject_EndEnumeration( obj ); ok( hr == S_OK, "got %08x\n", hr ); - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, buildnumberW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get buildnumber %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace( "buildnumber: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); - VariantClear( &val ); - - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, captionW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get caption %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace( "caption: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); - VariantClear( &val ); + check_property( obj, buildnumberW, VT_BSTR, CIM_STRING ); + check_property( obj, captionW, VT_BSTR, CIM_STRING ); type = 0xdeadbeef; VariantInit( &val ); @@ -1298,23 +1147,8 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) trace( "csdversion: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); VariantClear( &val ); - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, freephysicalmemoryW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get free physical memory size %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_UINT64, "unexpected type 0x%x\n", type ); - trace( "freephysicalmemory %s\n", wine_dbgstr_w(V_BSTR(&val)) ); - VariantClear( &val ); - - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, nameW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get name %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace( "name: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); - VariantClear( &val ); + check_property( obj, freephysicalmemoryW, VT_BSTR, CIM_UINT64 ); + check_property( obj, nameW, VT_BSTR, CIM_STRING ); type = 0xdeadbeef; VariantInit( &val ); @@ -1337,77 +1171,14 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) trace( "osproductsuite: %d (%08x)\n", V_I4( &val ), V_I4( &val ) ); VariantClear( &val ); - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, ostypeW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get ostype %08x\n", hr ); - ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_UINT16, "unexpected type 0x%x\n", type ); - trace( "ostype: %d\n", V_I4( &val ) ); - VariantClear( &val ); - - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, servicepackmajorW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get servicepackmajor %08x\n", hr ); - ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_UINT16, "unexpected type 0x%x\n", type ); - trace( "servicepackmajor: %d\n", V_I4( &val ) ); - VariantClear( &val ); - - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, servicepackminorW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get servicepackminor %08x\n", hr ); - ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_UINT16, "unexpected type 0x%x\n", type ); - trace( "servicepackminor: %d\n", V_I4( &val ) ); - VariantClear( &val ); - - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, suitemaskW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get suitemask %08x\n", hr ); - ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); - trace( "suitemask: %d (%08x)\n", V_I4( &val ), V_I4( &val ) ); - VariantClear( &val ); - - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, versionW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get version %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace( "version: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); - VariantClear( &val ); - - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, totalvisiblememorysizeW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get visible memory size %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_UINT64, "unexpected type 0x%x\n", type ); - trace( "totalvisiblememorysize %s\n", wine_dbgstr_w(V_BSTR(&val)) ); - VariantClear( &val ); - - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, totalvirtualmemorysizeW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get virtual memory size %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_UINT64, "unexpected type 0x%x\n", type ); - trace( "totalvirtualmemorysize %s\n", wine_dbgstr_w(V_BSTR(&val)) ); - VariantClear( &val ); - - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, systemdriveW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get version %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace( "systemdrive: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); - VariantClear( &val ); + check_property( obj, ostypeW, VT_I4, CIM_UINT16 ); + check_property( obj, servicepackmajorW, VT_I4, CIM_UINT16 ); + check_property( obj, servicepackminorW, VT_I4, CIM_UINT16 ); + check_property( obj, suitemaskW, VT_I4, CIM_UINT32 ); + check_property( obj, versionW, VT_BSTR, CIM_STRING ); + check_property( obj, totalvisiblememorysizeW, VT_BSTR, CIM_UINT64 ); + check_property( obj, totalvirtualmemorysizeW, VT_BSTR, CIM_UINT64 ); + check_property( obj, systemdriveW, VT_BSTR, CIM_STRING ); IWbemClassObject_Release( obj ); IEnumWbemClassObject_Release( result ); @@ -1435,8 +1206,6 @@ static void test_Win32_ComputerSystemProduct( IWbemServices *services ) BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); IEnumWbemClassObject *result; IWbemClassObject *obj; - VARIANT value; - CIMTYPE type; HRESULT hr; DWORD count; @@ -1450,58 +1219,12 @@ static void test_Win32_ComputerSystemProduct( IWbemServices *services ) hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); ok( hr == S_OK, "got %08x\n", hr ); - type = 0xdeadbeef; - VariantInit( &value ); - hr = IWbemClassObject_Get( obj, identifyingnumberW, 0, &value, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace( "identifyingnumber %s\n", wine_dbgstr_w(V_BSTR(&value)) ); - VariantClear( &value ); - - type = 0xdeadbeef; - VariantInit( &value ); - hr = IWbemClassObject_Get( obj, nameW, 0, &value, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace( "name %s\n", wine_dbgstr_w(V_BSTR(&value)) ); - VariantClear( &value ); - - type = 0xdeadbeef; - VariantInit( &value ); - hr = IWbemClassObject_Get( obj, skunumberW, 0, &value, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &value ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &value ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - VariantClear( &value ); - - type = 0xdeadbeef; - VariantInit( &value ); - hr = IWbemClassObject_Get( obj, uuidW, 0, &value, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace( "uuid %s\n", wine_dbgstr_w(V_BSTR(&value)) ); - VariantClear( &value ); - - type = 0xdeadbeef; - VariantInit( &value ); - hr = IWbemClassObject_Get( obj, vendorW, 0, &value, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace( "vendor %s\n", wine_dbgstr_w(V_BSTR(&value)) ); - VariantClear( &value ); - - type = 0xdeadbeef; - VariantInit( &value ); - hr = IWbemClassObject_Get( obj, versionW, 0, &value, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace( "version %s\n", wine_dbgstr_w(V_BSTR(&value)) ); - VariantClear( &value ); + check_property( obj, identifyingnumberW, VT_BSTR, CIM_STRING ); + check_property( obj, nameW, VT_BSTR, CIM_STRING ); + check_property( obj, skunumberW, VT_NULL, CIM_STRING ); + check_property( obj, uuidW, VT_BSTR, CIM_STRING ); + check_property( obj, vendorW, VT_BSTR, CIM_STRING ); + check_property( obj, versionW, VT_BSTR, CIM_STRING ); IWbemClassObject_Release( obj ); IEnumWbemClassObject_Release( result ); @@ -1520,8 +1243,6 @@ static void test_Win32_PhysicalMemory( IWbemServices *services ) BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); IEnumWbemClassObject *result; IWbemClassObject *obj; - VARIANT val; - CIMTYPE type; HRESULT hr; DWORD count; @@ -1537,33 +1258,9 @@ static void test_Win32_PhysicalMemory( IWbemServices *services ) if (count > 0) { - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, capacityW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get capacity %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_UINT64, "unexpected type 0x%x\n", type ); - trace( "capacity %s\n", wine_dbgstr_w(V_BSTR( &val )) ); - VariantClear( &val ); - - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, devicelocatorW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get devicelocator %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace( "devicelocator %s\n", wine_dbgstr_w(V_BSTR( &val )) ); - VariantClear( &val ); - - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, memorytypeW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get memory type %08x\n", hr ); - ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_UINT16, "unexpected type 0x%x\n", type ); - trace( "memorytype %u\n", V_I4( &val ) ); - VariantClear( &val ); - + check_property( obj, capacityW, VT_BSTR, CIM_UINT64 ); + check_property( obj, devicelocatorW, VT_BSTR, CIM_STRING ); + check_property( obj, memorytypeW, VT_I4, CIM_UINT16 ); IWbemClassObject_Release( obj ); } IEnumWbemClassObject_Release( result ); @@ -1582,8 +1279,6 @@ static void test_Win32_IP4RouteTable( IWbemServices *services ) BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); IEnumWbemClassObject *result; IWbemClassObject *obj; - VARIANT val; - CIMTYPE type; HRESULT hr; DWORD count; @@ -1599,33 +1294,9 @@ static void test_Win32_IP4RouteTable( IWbemServices *services ) hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); if (hr != S_OK) break; - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, destinationW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get destination %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace( "destination %s\n", wine_dbgstr_w(V_BSTR( &val )) ); - VariantClear( &val ); - - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, interfaceindexW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get interface index %08x\n", hr ); - ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_SINT32, "unexpected type 0x%x\n", type ); - trace( "interfaceindex %d\n", V_I4( &val ) ); - VariantClear( &val ); - - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, nexthopW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get nexthop %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace( "nexthop %s\n", wine_dbgstr_w(V_BSTR( &val )) ); - VariantClear( &val ); - + check_property( obj, destinationW, VT_BSTR, CIM_STRING ); + check_property( obj, interfaceindexW, VT_I4, CIM_SINT32 ); + check_property( obj, nexthopW, VT_BSTR, CIM_STRING ); IWbemClassObject_Release( obj ); } @@ -1677,82 +1348,15 @@ static void test_Win32_Processor( IWbemServices *services ) hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); if (hr != S_OK) break; - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, captionW, 0, &val, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace( "caption %s\n", wine_dbgstr_w(V_BSTR( &val )) ); - VariantClear( &val ); - - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, architectureW, 0, &val, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_UINT16, "unexpected type 0x%x\n", type ); - trace( "architecture %u\n", V_I4( &val ) ); - - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, familyW, 0, &val, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_UINT16, "unexpected type 0x%x\n", type ); - trace( "family %u\n", V_I4( &val ) ); - - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, levelW, 0, &val, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_UINT16, "unexpected type 0x%x\n", type ); - trace( "level %u\n", V_I4( &val ) ); - - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, manufacturerW, 0, &val, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace( "manufacturer %s\n", wine_dbgstr_w(V_BSTR( &val )) ); - VariantClear( &val ); - - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, nameW, 0, &val, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace( "name %s\n", wine_dbgstr_w(V_BSTR( &val )) ); - VariantClear( &val ); - - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, processoridW, 0, &val, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace( "processorid %s\n", wine_dbgstr_w(V_BSTR( &val )) ); - VariantClear( &val ); - - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, revisionW, 0, &val, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_UINT16, "unexpected type 0x%x\n", type ); - trace( "revision %u\n", V_I4( &val ) ); - - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, versionW, 0, &val, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace( "version %s\n", wine_dbgstr_w(V_BSTR( &val )) ); - VariantClear( &val ); + check_property( obj, captionW, VT_BSTR, CIM_STRING ); + check_property( obj, architectureW, VT_I4, CIM_UINT16 ); + check_property( obj, familyW, VT_I4, CIM_UINT16 ); + check_property( obj, levelW, VT_I4, CIM_UINT16 ); + check_property( obj, manufacturerW, VT_BSTR, CIM_STRING ); + check_property( obj, nameW, VT_BSTR, CIM_STRING ); + check_property( obj, processoridW, VT_BSTR, CIM_STRING ); + check_property( obj, revisionW, VT_I4, CIM_UINT16 ); + check_property( obj, versionW, VT_BSTR, CIM_STRING ); type = 0xdeadbeef; VariantInit( &val ); @@ -1817,22 +1421,8 @@ static void test_Win32_VideoController( IWbemServices *services ) hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); if (hr != S_OK) break; - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, configmanagererrorcodeW, 0, &val, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); - trace( "configmanagererrorcode %d\n", V_I4( &val ) ); - - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, driverdateW, 0, &val, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_DATETIME, "unexpected type 0x%x\n", type ); - trace( "driverdate %s\n", wine_dbgstr_w(V_BSTR( &val )) ); - VariantClear( &val ); + check_property( obj, configmanagererrorcodeW, VT_I4, CIM_UINT32 ); + check_property( obj, driverdateW, VT_BSTR, CIM_DATETIME ); type = 0xdeadbeef; VariantInit( &val ); @@ -1843,15 +1433,7 @@ static void test_Win32_VideoController( IWbemServices *services ) trace( "installeddisplaydrivers %s\n", wine_dbgstr_w(V_BSTR( &val )) ); VariantClear( &val ); - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, statusW, 0, &val, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace( "status %s\n", wine_dbgstr_w(V_BSTR( &val )) ); - VariantClear( &val ); - + check_property( obj, statusW, VT_BSTR, CIM_STRING ); IWbemClassObject_Release( obj ); } @@ -1891,14 +1473,7 @@ static void test_Win32_Printer( IWbemServices *services ) hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); if (hr != S_OK) break; - type = 0xdeadbeef; - memset( &val, 0, sizeof(val) ); - hr = IWbemClassObject_Get( obj, deviceidW, 0, &val, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace( "deviceid %s\n", wine_dbgstr_w(V_BSTR( &val )) ); - VariantClear( &val ); + check_property( obj, deviceidW, VT_BSTR, CIM_STRING ); type = 0xdeadbeef; memset( &val, 0, sizeof(val) ); @@ -1909,15 +1484,7 @@ static void test_Win32_Printer( IWbemServices *services ) trace( "location %s\n", wine_dbgstr_w(V_BSTR( &val )) ); VariantClear( &val ); - type = 0xdeadbeef; - memset( &val, 0, sizeof(val) ); - hr = IWbemClassObject_Get( obj, portnameW, 0, &val, &type, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); - trace( "portname %s\n", wine_dbgstr_w(V_BSTR( &val )) ); - VariantClear( &val ); - + check_property( obj, portnameW, VT_BSTR, CIM_STRING ); IWbemClassObject_Release( obj ); } -- 2.11.0

1 0

[PATCH 1/2] wbemprox: Implement Win32_OperatingSystem.SystemDrive.
by Hans Leidekker 24 Apr '19

24 Apr '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47065 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 12 ++++++++++++ dlls/wbemprox/tests/query.c | 11 +++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index d4c263078e..862e17fe62 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -396,6 +396,8 @@ static const WCHAR prop_suitemaskW[] = {'S','u','i','t','e','M','a','s','k',0}; static const WCHAR prop_systemdirectoryW[] = {'S','y','s','t','e','m','D','i','r','e','c','t','o','r','y',0}; +static const WCHAR prop_systemdriveW[] = + {'S','y','s','t','e','m','D','r','i','v','e',0}; static const WCHAR prop_systemnameW[] = {'S','y','s','t','e','m','N','a','m','e',0}; static const WCHAR prop_tagW[] = @@ -601,6 +603,7 @@ static const struct column col_os[] = { prop_servicepackminorW, CIM_UINT16, VT_I4 }, { prop_suitemaskW, CIM_UINT32, VT_I4 }, { prop_systemdirectoryW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_systemdriveW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_totalvirtualmemorysizeW, CIM_UINT64 }, { prop_totalvisiblememorysizeW, CIM_UINT64 }, { prop_versionW, CIM_STRING|COL_FLAG_DYNAMIC } @@ -1029,6 +1032,7 @@ struct record_operatingsystem UINT16 servicepackminor; UINT32 suitemask; const WCHAR *systemdirectory; + const WCHAR *systemdrive; UINT64 totalvirtualmemorysize; UINT64 totalvisiblememorysize; const WCHAR *version; @@ -3102,6 +3106,13 @@ static WCHAR *get_systemdirectory(void) Wow64RevertWow64FsRedirection( redir ); return ret; } +static WCHAR *get_systemdrive(void) +{ + WCHAR *ret = heap_alloc( 3 * sizeof(WCHAR) ); /* "c:" */ + if (ret && GetEnvironmentVariableW( prop_systemdriveW, ret, 3 )) return ret; + heap_free( ret ); + return NULL; +} static WCHAR *get_codeset(void) { static const WCHAR fmtW[] = {'%','u',0}; @@ -3243,6 +3254,7 @@ static enum fill_status fill_os( struct table *table, const struct expr *cond ) rec->servicepackminor = ver.wServicePackMinor; rec->suitemask = 272; /* Single User + Terminal */ rec->systemdirectory = get_systemdirectory(); + rec->systemdrive = get_systemdrive(); rec->totalvirtualmemorysize = get_total_physical_memory() / 1024; rec->totalvisiblememorysize = rec->totalvirtualmemorysize; rec->version = get_osversion( &ver ); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 510e7aad70..3453358ee5 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1243,6 +1243,8 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) {'S','e','r','v','i','c','e','P','a','c','k','M','a','j','o','r','V','e','r','s','i','o','n',0}; static const WCHAR servicepackminorW[] = {'S','e','r','v','i','c','e','P','a','c','k','M','i','n','o','r','V','e','r','s','i','o','n',0}; + static const WCHAR systemdriveW[] = + {'S','y','s','t','e','m','D','r','i','v','e',0}; static const WCHAR totalvisiblememorysizeW[] = {'T','o','t','a','l','V','i','s','i','b','l','e','M','e','m','o','r','y','S','i','z','e',0}; static const WCHAR totalvirtualmemorysizeW[] = @@ -1398,6 +1400,15 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) trace( "totalvirtualmemorysize %s\n", wine_dbgstr_w(V_BSTR(&val)) ); VariantClear( &val ); + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, systemdriveW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get version %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "systemdrive: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + IWbemClassObject_Release( obj ); IEnumWbemClassObject_Release( result ); SysFreeString( query ); -- 2.11.0

1 0

[PATCH 5/5] dxgi: Implement fullscreen window occlusion detection.
by Zhiyi Zhang 24 Apr '19

24 Apr '19

When Windows detected a fullscreen window occlusion, it will set the fullscreen window to windowed and return DXGI_STATUS_OCCLUDED in IDXGISwapChain::Present. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 64 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 9f8539fd28..d1df1ad726 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -265,6 +265,42 @@ BOOL dxgi_validate_swapchain_desc(const DXGI_SWAP_CHAIN_DESC1 *desc) return TRUE; } +/* A correct occlusion detection method must consider following scenarios: + * + * 1. On multiple monitors system. For example, the full-screen is on primary display, any window on + * on secondary monitor shouldn't be able to occlude the full-screen window, regardless being foreground or active. + * 2. A non-Wine window, e.g., a X window occludes the full-screen window should be detected. + * + * Current method will incorrectly report occluded status where a window on a secondary monitor becomes foreground, + * which shouldn't be too harmful though. The actual implementation on Window probably has help from DWM. + * + * X11 VisibilityNotify is not useful here. The events doesn't work as expected. + */ +static BOOL dxgi_is_window_occluded(HWND hwnd) +{ + RECT fullscreen_rect; + RECT intersect_rect; + RECT window_rect; + HWND previous_hwnd; + + if (GetForegroundWindow() != hwnd) + return TRUE; + + /* Check if windows with higher z-order intersect with the full-screen window */ + GetWindowRect(hwnd, &fullscreen_rect); + previous_hwnd = GetWindow(hwnd, GW_HWNDPREV); + while (previous_hwnd) + { + GetWindowRect(previous_hwnd, &window_rect); + if (IntersectRect(&intersect_rect, &window_rect, &fullscreen_rect)) + return TRUE; + + previous_hwnd = GetWindow(previous_hwnd, GW_HWNDPREV); + } + + return FALSE; +} + static HRESULT dxgi_get_output_from_window(IDXGIAdapter *adapter, HWND window, IDXGIOutput **dxgi_output) { DXGI_OUTPUT_DESC desc; @@ -456,12 +492,27 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetDevice(IDXGISwapChain1 *ifac static HRESULT d3d11_swapchain_present(struct d3d11_swapchain *swapchain, unsigned int sync_interval, unsigned int flags) { + BOOL fullscreen = FALSE; + HRESULT hr; + HWND hwnd; + if (sync_interval > 4) { WARN("Invalid sync interval %u.\n", sync_interval); return DXGI_ERROR_INVALID_CALL; } + hr = IDXGISwapChain1_GetFullscreenState(&swapchain->IDXGISwapChain1_iface, &fullscreen, NULL); + if (SUCCEEDED(hr) && fullscreen) + { + hr = IDXGISwapChain1_GetHwnd(&swapchain->IDXGISwapChain1_iface, &hwnd); + if (SUCCEEDED(hr) && dxgi_is_window_occluded(hwnd)) + { + IDXGISwapChain1_SetFullscreenState(&swapchain->IDXGISwapChain1_iface, FALSE, NULL); + return DXGI_STATUS_OCCLUDED; + } + } + if (flags & ~DXGI_PRESENT_TEST) FIXME("Unimplemented flags %#x.\n", flags); if (flags & DXGI_PRESENT_TEST) @@ -2118,8 +2169,10 @@ static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, static HRESULT d3d12_swapchain_present(struct d3d12_swapchain *swapchain, unsigned int sync_interval, unsigned int flags) { + BOOL fullscreen = FALSE; VkQueue vk_queue; VkResult vr; + HWND hwnd; HRESULT hr; if (sync_interval > 4) @@ -2128,6 +2181,17 @@ static HRESULT d3d12_swapchain_present(struct d3d12_swapchain *swapchain, return DXGI_ERROR_INVALID_CALL; } + hr = IDXGISwapChain3_GetFullscreenState(&swapchain->IDXGISwapChain3_iface, &fullscreen, NULL); + if (SUCCEEDED(hr) && fullscreen) + { + hr = IDXGISwapChain3_GetHwnd(&swapchain->IDXGISwapChain3_iface, &hwnd); + if (SUCCEEDED(hr) && dxgi_is_window_occluded(hwnd)) + { + IDXGISwapChain3_SetFullscreenState(&swapchain->IDXGISwapChain3_iface, FALSE, NULL); + return DXGI_STATUS_OCCLUDED; + } + } + if (flags & ~DXGI_PRESENT_TEST) FIXME("Unimplemented flags %#x.\n", flags); if (flags & DXGI_PRESENT_TEST) -- 2.20.1

2 3

TestBot news
by Francois Gouget 24 Apr '19

24 Apr '19

It's been a bad month for the TestBot. * The first issue was not with the TestBot itself but with cw1-hd6800 which provides the 'real hardware' WineTest results for the AMD HD 6800 graphics card. Its hard drive just died. Newman promptly replaced it and I restored that system from backups (linux + windows). The good thing that came out of it is that I added the 1809 Windows 10 build to the mix and did so for the cw2-gtx560 system while I was at it. Unfortunately that's pretty much all for nothing right now since Windows 10 1809 has over 70 failures and all the WineTest reports just end up being thrown away :-( * Then roughly a week later one of the hard drives on vm2 died. vm2 is one of the machines that run the TestBot VMs. That should not have been an issue except the harddrive did not outright die and caused the hardware RAID controller to keep trying to write things to it, tying it up in the process. Eventually the Linux kernel got fed up with the controller building a backlog of writes and turned all filesystems read-only. Things don't work very well after that! So I proceeded to restore the VMs from backups on the other hosts so the TestBot could work again. Then Newman again promptly replaced the harddrive, the controller slowly rebuilt the array, and I moved the VMs back to vm2. But the TestBot had built quite a backlog by then and it took time for it to catch up. * One issue is that vm4 was kept pretty busy by the Linux tests: win32 + various locale tests; then wow32 and wow64. So I duplicated the wtbdebian9 VM to vm3 and split the tasks between them: win32 + locales on vm4 and wow32 + wow64 on vm3. Unfortunately the 'Submit job' page is pretty primitive and systematically creates tasks that do all 3 builds: win32, wow32 and wow64. Since none of the wtbdabian9 VMs had all three, one Wine build was always way out of date resulting in long build times and timeouts. So I had to go back to a single Linux VM until I can send a better submit jobs page. * The next issue came when a security update on winehq.org broke Net::SSH2, thus preventing the TestBot from connecting to the VMs and sending the patches or executables to test. After some investigation I decided that Net::SSH2 is a lost cause (to be polite) and I switched the TestBot to Net:OpenSSH. * At about the same time the commit 47242d25f5b2 moved string.c to libwine_port and somehow that broke the 64 bit reg.exe. reg.exe is the first call the TestBot makes to create a new WinePrefix to disable the crash dialog. So of course when reg.exe crashes the crash dialog pops up and the WinePrefix creation remains stuck. This means the Linux 'Update Wine' tasks remain stuck too, for 1h15 a piece, three times, and eventually Wine remains out of date :-( So there we are. The TestBot is slowly catching up on its backlog (120 tasks to go) and hopefully, once the reg.exe issue is solved, the next month will see fewer crises. -- Francois Gouget <fgouget(a)codeweavers.com>

2 5

[PATCH 1/5] vkd3d: Implement d3d12_versioned_root_signature_deserializer_GetRootSignatureDescAtVersion().
by Józef Kucia 24 Apr '19

24 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/vkd3d_main.c | 51 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 47 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index e074d1cdbca9..913c9f50c5f9 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -248,7 +248,7 @@ struct d3d12_versioned_root_signature_deserializer { D3D12_VERSIONED_ROOT_SIGNATURE_DESC d3d12; struct vkd3d_versioned_root_signature_desc vkd3d; - } desc; + } desc, other_desc; }; STATIC_ASSERT(sizeof(D3D12_VERSIONED_ROOT_SIGNATURE_DESC) == sizeof(struct vkd3d_versioned_root_signature_desc)); @@ -301,20 +301,61 @@ static ULONG STDMETHODCALLTYPE d3d12_versioned_root_signature_deserializer_Relea if (!refcount) { vkd3d_shader_free_versioned_root_signature(&deserializer->desc.vkd3d); + vkd3d_shader_free_versioned_root_signature(&deserializer->other_desc.vkd3d); vkd3d_free(deserializer); } return refcount; } +static enum vkd3d_root_signature_version vkd3d_root_signature_version_from_d3d12(D3D_ROOT_SIGNATURE_VERSION version) +{ + switch (version) + { + case D3D_ROOT_SIGNATURE_VERSION_1_0: + return VKD3D_ROOT_SIGNATURE_VERSION_1_0; + case D3D_ROOT_SIGNATURE_VERSION_1_1: + return VKD3D_ROOT_SIGNATURE_VERSION_1_1; + default: + WARN("Unknown root signature version %#x.\n", version); + return 0; + } +} + static HRESULT STDMETHODCALLTYPE d3d12_versioned_root_signature_deserializer_GetRootSignatureDescAtVersion( ID3D12VersionedRootSignatureDeserializer *iface, D3D_ROOT_SIGNATURE_VERSION version, const D3D12_VERSIONED_ROOT_SIGNATURE_DESC **desc) { - FIXME("iface %p, version %#x, desc %p stub!\n", iface, version, desc); + struct d3d12_versioned_root_signature_deserializer *deserializer = impl_from_ID3D12VersionedRootSignatureDeserializer(iface); + int ret; - *desc = NULL; - return E_NOTIMPL; + TRACE("iface %p, version %#x, desc %p.\n", iface, version, desc); + + if (version != D3D_ROOT_SIGNATURE_VERSION_1_0 && version != D3D_ROOT_SIGNATURE_VERSION_1_1) + { + WARN("Root signature version %#x not supported.\n", version); + return E_INVALIDARG; + } + + if (deserializer->desc.d3d12.Version == version) + { + *desc = &deserializer->desc.d3d12; + return S_OK; + } + + if (!deserializer->other_desc.d3d12.Version) + { + if ((ret = vkd3d_shader_convert_root_signature(&deserializer->other_desc.vkd3d, + vkd3d_root_signature_version_from_d3d12(version), &deserializer->desc.vkd3d)) < 0) + { + WARN("Failed to convert versioned root signature, vkd3d result %d.\n", ret); + return hresult_from_vkd3d_result(ret); + } + } + + assert(deserializer->other_desc.d3d12.Version == version); + *desc = &deserializer->other_desc.d3d12; + return S_OK; } static const D3D12_VERSIONED_ROOT_SIGNATURE_DESC * STDMETHODCALLTYPE @@ -352,6 +393,8 @@ static HRESULT d3d12_versioned_root_signature_deserializer_init(struct d3d12_ver return hresult_from_vkd3d_result(ret); } + memset(&deserializer->other_desc, 0, sizeof(deserializer->other_desc)); + return S_OK; } -- 2.21.0

3 14

[PATCH] qcap: implement VfwPin_CheckMediaType(), and test connecting to a NullRenderer
by Damjan Jovanovic 24 Apr '19

24 Apr '19

Currently a video capture device cannot even connect to a NullRenderer, as VfwPin_CheckMediaType() always return a hardcoded E_NOTIMPL, preventing any media format from being negotiated. Implement it and test. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/qcap/capture.h | 1 + dlls/qcap/tests/Makefile.in | 3 +- dlls/qcap/tests/videocapture.c | 172 +++++++++++++++++++++++++++++++++ dlls/qcap/v4l.c | 47 +++++++-- dlls/qcap/vfwcapture.c | 4 +- 5 files changed, 218 insertions(+), 9 deletions(-) create mode 100644 dlls/qcap/tests/videocapture.c

2 2

[PATCH 1/4] dbgeng: Improve GetDebuggeeType() stub.
by Nikolay Sivov 24 Apr '19

24 Apr '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dbgeng/dbgeng.c | 19 ++++++++++++++++--- include/dbgeng.h | 21 +++++++++++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index 287e0d84f7..569b824e1d 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -2525,11 +2525,24 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_OutputStackTrace(IDebugControl2 *i return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE debugcontrol_GetDebuggeeType(IDebugControl2 *iface, ULONG *_class, ULONG *qualifier) +static HRESULT STDMETHODCALLTYPE debugcontrol_GetDebuggeeType(IDebugControl2 *iface, ULONG *debug_class, + ULONG *qualifier) { - FIXME("%p, %p, %p stub.\n", iface, _class, qualifier); + struct debug_client *debug_client = impl_from_IDebugControl2(iface); + static struct target_process *target; - return E_NOTIMPL; + FIXME("%p, %p, %p stub.\n", iface, debug_class, qualifier); + + *debug_class = DEBUG_CLASS_UNINITIALIZED; + *qualifier = 0; + + if (!(target = debug_client_get_target(debug_client))) + return E_UNEXPECTED; + + *debug_class = DEBUG_CLASS_USER_WINDOWS; + *qualifier = DEBUG_USER_WINDOWS_PROCESS; + + return S_OK; } static HRESULT STDMETHODCALLTYPE debugcontrol_GetActualProcessorType(IDebugControl2 *iface, ULONG *type) diff --git a/include/dbgeng.h b/include/dbgeng.h index 3017edac55..0c97d2c9a7 100644 --- a/include/dbgeng.h +++ b/include/dbgeng.h @@ -169,6 +169,27 @@ DEFINE_GUID(IID_IDebugSystemObjects3, 0xe9676e2f, 0xe286, 0x4ea3, 0xb0, 0xf9 #define DEBUG_MODNAME_SYMBOL_FILE 3 #define DEBUG_MODNAME_MAPPED_IMAGE 4 +#define DEBUG_CLASS_UNINITIALIZED 0 +#define DEBUG_CLASS_KERNEL 1 +#define DEBUG_CLASS_USER_WINDOWS 2 +#define DEBUG_CLASS_IMAGE_FILE 3 + +#define DEBUG_DUMP_SMALL 1024 +#define DEBUG_DUMP_DEFAULT 1025 +#define DEBUG_DUMP_FULL 1026 +#define DEBUG_DUMP_IMAGE_FILE 1027 +#define DEBUG_DUMP_TRACE_LOG 1028 +#define DEBUG_DUMP_WINDOWS_CE 1029 +#define DEBUG_DUMP_ACTIVE 1030 + +#define DEBUG_USER_WINDOWS_PROCESS 0 +#define DEBUG_USER_WINDOWS_PROCESS_SERVER 1 +#define DEBUG_USER_WINDOWS_IDNA 2 +#define DEBUG_USER_WINDOWS_REPT 3 +#define DEBUG_USER_WINDOWS_SMALL_DUMP DEBUG_DUMP_SMALL +#define DEBUG_USER_WINDOWS_DUMP DEBUG_DUMP_DEFAULT +#define DEBUG_USER_WINDOWS_DUMP_WINDOWS_CE DEBUG_DUMP_WINDOWS_CE + #define DEBUG_INVALID_OFFSET ((ULONG64)-1) #define DEBUG_ANY_ID 0xffffffff -- 2.20.1

1 3

[PATCH] xinput: Check we actually received a value before assignment
by Alistair Leslie-Hughes 24 Apr '19

24 Apr '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46999 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- Another approach would be to insert into scale_short/scale_byte if(!axis->range) return 0; dlls/xinput1_3/hid.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index c0c405f..d0bec70 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -388,23 +388,29 @@ void HID_update_state(xinput_controller* device) } } - HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.sThumbLX = scale_short(value, &private->lx); + if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, &value, + private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS) + device->state.Gamepad.sThumbLX = scale_short(value, &private->lx); - HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Y, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.sThumbLY = -scale_short(value, &private->ly) - 1; + if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Y, &value, + private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS) + device->state.Gamepad.sThumbLY = -scale_short(value, &private->ly) - 1; - HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RX, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.sThumbRX = scale_short(value, &private->rx); + if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RX, &value, + private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS) + device->state.Gamepad.sThumbRX = scale_short(value, &private->rx); - HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.sThumbRY = -scale_short(value, &private->ry) - 1; + if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, &value, + private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS) + device->state.Gamepad.sThumbRY = -scale_short(value, &private->ry) - 1; - HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RZ, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.bRightTrigger = scale_byte(value, &private->rtrigger); + if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RZ, &value, + private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS) + device->state.Gamepad.bRightTrigger = scale_byte(value, &private->rtrigger); - HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.bLeftTrigger = scale_byte(value, &private->ltrigger); + if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, &value, + private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS) + device->state.Gamepad.bLeftTrigger = scale_byte(value, &private->ltrigger); LeaveCriticalSection(&private->crit); } -- 1.9.1

1 0

[PATCH 2/2] po: Update French translation.
by Isira Seneviratne 23 Apr '19

23 Apr '19

1 0

[PATCH 1/2] po: Update Sinhala translation.
by Isira Seneviratne 23 Apr '19

23 Apr '19

1 0

[PATCH 1/5] quartz: Get rid of register_coclasses().
by Zebediah Figura 23 Apr '19

23 Apr '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/regsvr.c | 236 ------------------------------------------- 1 file changed, 236 deletions(-) diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c index 196e0649d8..e5b3f2f329 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.c @@ -61,21 +61,6 @@ struct regsvr_interface static HRESULT register_interfaces(struct regsvr_interface const *list); static HRESULT unregister_interfaces(struct regsvr_interface const *list); -struct regsvr_coclass -{ - CLSID const *clsid; /* NULL for end of list */ - LPCSTR name; /* can be NULL to omit */ - LPCSTR ips; /* can be NULL to omit */ - LPCSTR ips32; /* can be NULL to omit */ - LPCSTR ips32_tmodel; /* can be NULL to omit */ - LPCSTR progid; /* can be NULL to omit */ - LPCSTR viprogid; /* can be NULL to omit */ - LPCSTR progid_extra; /* can be NULL to omit */ -}; - -static HRESULT register_coclasses(struct regsvr_coclass const *list); -static HRESULT unregister_coclasses(struct regsvr_coclass const *list); - struct regsvr_mediatype_parsing { CLSID const *majortype; /* NULL for end of list */ @@ -137,23 +122,6 @@ static const WCHAR ps_clsid_keyname[] = { static const WCHAR ps_clsid32_keyname[] = { 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', 'i', 'd', '3', '2', 0 }; -static const WCHAR clsid_keyname[] = { - 'C', 'L', 'S', 'I', 'D', 0 }; -static const WCHAR curver_keyname[] = { - 'C', 'u', 'r', 'V', 'e', 'r', 0 }; -static const WCHAR ips_keyname[] = { - 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', - 0 }; -static const WCHAR ips32_keyname[] = { - 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', - '3', '2', 0 }; -static const WCHAR progid_keyname[] = { - 'P', 'r', 'o', 'g', 'I', 'D', 0 }; -static const WCHAR viprogid_keyname[] = { - 'V', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'd', 'e', 'p', - 'e', 'n', 'd', 'e', 'n', 't', 'P', 'r', 'o', 'g', 'I', 'D', - 0 }; -static const char tmodel_valuename[] = "ThreadingModel"; static const WCHAR mediatype_name[] = { 'M', 'e', 'd', 'i', 'a', ' ', 'T', 'y', 'p', 'e', 0 }; static const WCHAR subtype_valuename[] = { @@ -169,11 +137,6 @@ static const WCHAR extensions_keyname[] = { static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid); static LONG register_key_defvalueW(HKEY base, WCHAR const *name, WCHAR const *value); -static LONG register_key_defvalueA(HKEY base, WCHAR const *name, - char const *value); -static LONG register_progid(WCHAR const *clsid, - char const *progid, char const *curver_progid, - char const *name, char const *extra); /*********************************************************************** * register_interfaces @@ -269,126 +232,6 @@ error_return: return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; } -/*********************************************************************** - * register_coclasses - */ -static HRESULT register_coclasses(struct regsvr_coclass const *list) -{ - LONG res = ERROR_SUCCESS; - HKEY coclass_key; - - res = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &coclass_key, NULL); - if (res != ERROR_SUCCESS) goto error_return; - - for (; res == ERROR_SUCCESS && list->clsid; ++list) { - WCHAR buf[39]; - HKEY clsid_key; - - StringFromGUID2(list->clsid, buf, 39); - res = RegCreateKeyExW(coclass_key, buf, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &clsid_key, NULL); - if (res != ERROR_SUCCESS) goto error_close_coclass_key; - - if (list->name) { - res = RegSetValueExA(clsid_key, NULL, 0, REG_SZ, (const BYTE*)list->name, - strlen(list->name) + 1); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - if (list->ips) { - res = register_key_defvalueA(clsid_key, ips_keyname, list->ips); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - if (list->ips32) { - HKEY ips32_key; - - res = RegCreateKeyExW(clsid_key, ips32_keyname, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, - &ips32_key, NULL); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - - res = RegSetValueExA(ips32_key, NULL, 0, REG_SZ, (const BYTE*)list->ips32, - lstrlenA(list->ips32) + 1); - if (res == ERROR_SUCCESS && list->ips32_tmodel) - res = RegSetValueExA(ips32_key, tmodel_valuename, 0, REG_SZ, - (const BYTE*)list->ips32_tmodel, - strlen(list->ips32_tmodel) + 1); - RegCloseKey(ips32_key); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - if (list->progid) { - res = register_key_defvalueA(clsid_key, progid_keyname, - list->progid); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - - res = register_progid(buf, list->progid, NULL, - list->name, list->progid_extra); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - if (list->viprogid) { - res = register_key_defvalueA(clsid_key, viprogid_keyname, - list->viprogid); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - - res = register_progid(buf, list->viprogid, list->progid, - list->name, list->progid_extra); - if (res != ERROR_SUCCESS) goto error_close_clsid_key; - } - - error_close_clsid_key: - RegCloseKey(clsid_key); - } - -error_close_coclass_key: - RegCloseKey(coclass_key); -error_return: - return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; -} - -/*********************************************************************** - * unregister_coclasses - */ -static HRESULT unregister_coclasses(struct regsvr_coclass const *list) -{ - LONG res = ERROR_SUCCESS; - HKEY coclass_key; - - res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, - KEY_READ | KEY_WRITE, &coclass_key); - if (res == ERROR_FILE_NOT_FOUND) return S_OK; - if (res != ERROR_SUCCESS) goto error_return; - - for (; res == ERROR_SUCCESS && list->clsid; ++list) { - WCHAR buf[39]; - - StringFromGUID2(list->clsid, buf, 39); - res = RegDeleteTreeW(coclass_key, buf); - if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; - if (res != ERROR_SUCCESS) goto error_close_coclass_key; - - if (list->progid) { - res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); - if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; - if (res != ERROR_SUCCESS) goto error_close_coclass_key; - } - - if (list->viprogid) { - res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); - if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; - if (res != ERROR_SUCCESS) goto error_close_coclass_key; - } - } - -error_close_coclass_key: - RegCloseKey(coclass_key); -error_return: - return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; -} - /*********************************************************************** * register_mediatypes_parsing */ @@ -704,81 +547,6 @@ static LONG register_key_defvalueW( return res; } -/*********************************************************************** - * regsvr_key_defvalueA - */ -static LONG register_key_defvalueA( - HKEY base, - WCHAR const *name, - char const *value) -{ - LONG res; - HKEY key; - - res = RegCreateKeyExW(base, name, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &key, NULL); - if (res != ERROR_SUCCESS) return res; - res = RegSetValueExA(key, NULL, 0, REG_SZ, (const BYTE*)value, lstrlenA(value) + 1); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * regsvr_progid - */ -static LONG register_progid( - WCHAR const *clsid, - char const *progid, - char const *curver_progid, - char const *name, - char const *extra) -{ - LONG res; - HKEY progid_key; - - res = RegCreateKeyExA(HKEY_CLASSES_ROOT, progid, 0, - NULL, 0, KEY_READ | KEY_WRITE, NULL, - &progid_key, NULL); - if (res != ERROR_SUCCESS) return res; - - if (name) { - res = RegSetValueExA(progid_key, NULL, 0, REG_SZ, (const BYTE*)name, strlen(name) + 1); - if (res != ERROR_SUCCESS) goto error_close_progid_key; - } - - if (clsid) { - res = register_key_defvalueW(progid_key, clsid_keyname, clsid); - if (res != ERROR_SUCCESS) goto error_close_progid_key; - } - - if (curver_progid) { - res = register_key_defvalueA(progid_key, curver_keyname, - curver_progid); - if (res != ERROR_SUCCESS) goto error_close_progid_key; - } - - if (extra) { - HKEY extra_key; - - res = RegCreateKeyExA(progid_key, extra, 0, - NULL, 0, KEY_READ | KEY_WRITE, NULL, - &extra_key, NULL); - if (res == ERROR_SUCCESS) - RegCloseKey(extra_key); - } - -error_close_progid_key: - RegCloseKey(progid_key); - return res; -} - -/*********************************************************************** - * coclass list - */ -static struct regsvr_coclass const coclass_list[] = { - { NULL } /* list terminator */ -}; - /*********************************************************************** * interface list */ @@ -1088,8 +856,6 @@ HRESULT WINAPI DllRegisterServer(void) TRACE("\n"); hr = QUARTZ_DllRegisterServer(); - if (SUCCEEDED(hr)) - hr = register_coclasses(coclass_list); if (SUCCEEDED(hr)) hr = register_interfaces(interface_list); if (SUCCEEDED(hr)) @@ -1111,8 +877,6 @@ HRESULT WINAPI DllUnregisterServer(void) TRACE("\n"); hr = unregister_filters(filter_list); - if (SUCCEEDED(hr)) - hr = unregister_coclasses(coclass_list); if (SUCCEEDED(hr)) hr = unregister_interfaces(interface_list); if (SUCCEEDED(hr)) -- 2.21.0

2 9

[PATCH] kernel32: Add DECLSPEC_HOTPATCH to CreateActCtx
by Louis Lenders 23 Apr '19

23 Apr '19

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=47051 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/kernel32/actctx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/actctx.c b/dlls/kernel32/actctx.c index 17067ed1b4..bd2345dee5 100644 --- a/dlls/kernel32/actctx.c +++ b/dlls/kernel32/actctx.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(actctx); * * Create an activation context. */ -HANDLE WINAPI CreateActCtxA(PCACTCTXA pActCtx) +HANDLE WINAPI DECLSPEC_HOTPATCH CreateActCtxA(PCACTCTXA pActCtx) { ACTCTXW actw; SIZE_T len; @@ -114,7 +114,7 @@ done: * * Create an activation context. */ -HANDLE WINAPI CreateActCtxW(PCACTCTXW pActCtx) +HANDLE WINAPI DECLSPEC_HOTPATCH CreateActCtxW(PCACTCTXW pActCtx) { NTSTATUS status; HANDLE hActCtx; -- 2.20.1

1 0

[PATCH 1/2] dxgi: Add DECLSPEC_HOTPATCH to d3d11_swapchain_Present().
by Andrey Gusev 23 Apr '19

23 Apr '19

Supersedes 162857 Follow games require this function to be hotpatchable Banished, Hitman: Sniper Challenge, Sniper Elite V2, Sniper Elite 3, Watch_Dogs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46953 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46971 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/dxgi/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 53da2081e8..a859baffc8 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -317,7 +317,7 @@ static HRESULT d3d11_swapchain_present(struct d3d11_swapchain *swapchain, return wined3d_swapchain_present(swapchain->wined3d_swapchain, NULL, NULL, NULL, sync_interval, 0); } -static HRESULT STDMETHODCALLTYPE d3d11_swapchain_Present(IDXGISwapChain1 *iface, UINT sync_interval, UINT flags) +static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_Present(IDXGISwapChain1 *iface, UINT sync_interval, UINT flags) { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); -- 2.20.1

2 1

[PATCH v2] wined3d: Use intBitsToFloat() instead of uintBitsToFloat().
by Paul Gofman 23 Apr '19

23 Apr '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47039 There is no uint type in GLSL version < 1.3, while ARB_shader_bit_encoding may still be supported. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v2: - Use %#x instead of %d. dlls/wined3d/glsl_shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7d4678965d..303669852a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -446,7 +446,7 @@ static void shader_glsl_append_imm_vec4(struct wined3d_string_buffer *buffer, co { const unsigned int *uint_values = (const unsigned int *)values; - shader_addline(buffer, "uintBitsToFloat(uvec4(%#xu, %#xu, %#xu, %#xu))\n" + shader_addline(buffer, "intBitsToFloat(ivec4(%#x, %#x, %#x, %#x))\n" " /* %s, %s, %s, %s */", uint_values[0], uint_values[1], uint_values[2], uint_values[3], str[0], str[1], str[2], str[3]); } @@ -3288,7 +3288,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3D_DATA_FLOAT: if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) { - string_buffer_sprintf(register_name, "uintBitsToFloat(%#xu)", reg->u.immconst_data[0]); + string_buffer_sprintf(register_name, "intBitsToFloat(%#x)", reg->u.immconst_data[0]); } else { @@ -3318,7 +3318,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3D_DATA_FLOAT: if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) { - string_buffer_sprintf(register_name, "uintBitsToFloat(uvec4(%#xu, %#xu, %#xu, %#xu))", + string_buffer_sprintf(register_name, "intBitsToFloat(ivec4(%#x, %#x, %#x, %#x))", reg->u.immconst_data[0], reg->u.immconst_data[1], reg->u.immconst_data[2], reg->u.immconst_data[3]); } -- 2.20.1

2 1

[PATCH] kernel32/pipe: Avoid a crash in a test
by Detlef Riekenberg 23 Apr '19

23 Apr '19

Recent Windows versions crash on the NULL parameter in the test Examples: http://test.winehq.org/data/75aa4ab16b03a11464ab0d3e4c4cfbff0180c269/win8_d… http://test.winehq.org/data/75aa4ab16b03a11464ab0d3e4c4cfbff0180c269/win8_d… http://test.winehq.org/data/f9301c2b66450a1cdd986e9052fcaa76535ba8b7/win10_… patch tested: https://testbot.winehq.org/JobDetails.pl?Key=51469 https://testbot.winehq.org/GetFile.pl?JobKey=51469&StepKey=2 and https://testbot.winehq.org/GetFile.pl?JobKey=51469&StepKey=3 are working on dr-RS740-* -- bye bye ... ... Detlef Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> --- dlls/kernel32/tests/pipe.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 3f30cce535..cb41bc6a60 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -3572,10 +3572,13 @@ static void test_namedpipe_session_id(void) create_overlapped_pipe(PIPE_TYPE_BYTE, &client, &server); - SetLastError(0xdeadbeef); - ret = pGetNamedPipeClientSessionId(server, NULL); - ok(!ret, "success\n"); - todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + /* This crash on recent Windows */ + if (0) + { + SetLastError(0xdeadbeef); + ret = pGetNamedPipeClientSessionId(server, NULL); + ok(!ret, "success\n"); + } id = 0; ret = pGetNamedPipeClientSessionId(server, &id); -- 2.21.0.windows.1

1 0

[PATCH v2 1/6] user32/focus: Prevent a recursive loop with the activation messages
by Gabriel Ivăncescu 23 Apr '19

23 Apr '19

When activating a window and sending activation messages to the window procedure, we have to avoid a recursive loop by not sending more of these messages or hooks while we are still activating the window. Some applications actually depend on this behavior. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46274 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Turns out that this patch also fixes an existing TODO wine in tests. Can someone please take a look at these patches and provide feedback if possible? The behavior is very consistent and the tests are pretty much reliable as far as I can see, so it is indeed Windows' behavior on which some apps do rely on (since it fixes an annoying issue in Total Commander's Multi-rename function). I understand it touches a sensitive part of Wine, but I think the tests are pretty conclusive. If not, I'd like some feedback on how to solve it better. Of course, I've been running with this patch for some months now and didn't find anything wrong with activation or focus. dlls/user32/focus.c | 44 +++++++++++++++++++++++++++-------------- dlls/user32/tests/msg.c | 2 +- dlls/user32/win.h | 1 + 3 files changed, 31 insertions(+), 16 deletions(-) diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index f1c8831..0d32d00 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -78,7 +78,7 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) { HWND previous = GetActiveWindow(); BOOL ret; - DWORD old_thread, new_thread; + DWORD winflags, old_thread, new_thread; CBTACTIVATESTRUCT cbt; if (previous == hwnd) @@ -87,16 +87,24 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) return TRUE; } - /* call CBT hook chain */ - cbt.fMouse = mouse; - cbt.hWndActive = previous; - if (HOOK_CallHooks( WH_CBT, HCBT_ACTIVATE, (WPARAM)hwnd, (LPARAM)&cbt, TRUE )) return FALSE; - - if (IsWindow(previous)) + /* Prevent a recursive activation loop with the activation messages */ + winflags = win_set_flags(hwnd, WIN_IS_IN_ACTIVATION, 0); + if (!(winflags & WIN_IS_IN_ACTIVATION)) { - SendMessageW( previous, WM_NCACTIVATE, FALSE, (LPARAM)hwnd ); - SendMessageW( previous, WM_ACTIVATE, - MAKEWPARAM( WA_INACTIVE, IsIconic(previous) ), (LPARAM)hwnd ); + ret = FALSE; + + /* call CBT hook chain */ + cbt.fMouse = mouse; + cbt.hWndActive = previous; + if (HOOK_CallHooks( WH_CBT, HCBT_ACTIVATE, (WPARAM)hwnd, (LPARAM)&cbt, TRUE )) + goto clear_flags; + + if (IsWindow(previous)) + { + SendMessageW( previous, WM_NCACTIVATE, FALSE, (LPARAM)hwnd ); + SendMessageW( previous, WM_ACTIVATE, + MAKEWPARAM( WA_INACTIVE, IsIconic(previous) ), (LPARAM)hwnd ); + } } SERVER_START_REQ( set_active_window ) @@ -106,9 +114,9 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) previous = wine_server_ptr_handle( reply->previous ); } SERVER_END_REQ; - if (!ret) return FALSE; + if (!ret) goto clear_flags; if (prev) *prev = previous; - if (previous == hwnd) return TRUE; + if (previous == hwnd) goto clear_flags; if (hwnd) { @@ -116,7 +124,11 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) if (SendMessageW( hwnd, WM_QUERYNEWPALETTE, 0, 0 )) SendMessageTimeoutW( HWND_BROADCAST, WM_PALETTEISCHANGING, (WPARAM)hwnd, 0, SMTO_ABORTIFHUNG, 2000, NULL ); - if (!IsWindow(hwnd)) return FALSE; + if (!IsWindow(hwnd)) + { + ret = FALSE; + goto clear_flags; + } } old_thread = previous ? GetWindowThreadProcessId( previous, NULL ) : 0; @@ -148,7 +160,7 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) } } - if (IsWindow(hwnd)) + if (!(winflags & WIN_IS_IN_ACTIVATION) && IsWindow(hwnd)) { SendMessageW( hwnd, WM_NCACTIVATE, (hwnd == GetForegroundWindow()), (LPARAM)previous ); SendMessageW( hwnd, WM_ACTIVATE, @@ -173,7 +185,9 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) } } - return TRUE; +clear_flags: + win_set_flags(hwnd, 0, WIN_IS_IN_ACTIVATION); + return ret; } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6d0f063..ef75d55 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5142,7 +5142,7 @@ static void test_messages(void) ShowWindow(hwnd, SW_MINIMIZE); flush_events(); - ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped", TRUE); + ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped", FALSE); flush_sequence(); if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_MINIMIZE) diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 81b08fc..d53e1a5 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -79,6 +79,7 @@ typedef struct tagWND #define WIN_NEEDS_SHOW_OWNEDPOPUP 0x0020 /* WM_SHOWWINDOW:SC_SHOW must be sent in the next ShowOwnedPopup call */ #define WIN_CHILDREN_MOVED 0x0040 /* children may have moved, ignore stored positions */ #define WIN_HAS_IME_WIN 0x0080 /* the window has been registered with imm32 */ +#define WIN_IS_IN_ACTIVATION 0x0100 /* the window is in an activation process */ /* Window functions */ extern HWND get_hwnd_message_parent(void) DECLSPEC_HIDDEN; -- 2.21.0

2 10

[PATCH 4/4] server: Allow creating file kernel objects.
by Jacek Caban 23 Apr '19

23 Apr '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/tests/driver.c | 1 - server/file.c | 23 +++++++++++++++++------ 2 files changed, 17 insertions(+), 7 deletions(-)

2 1

[PATCH 2/4] ntoskrnl.exe: Return error codes compatible with recent Windows versions in PsLookupThreadByThreadId.
by Jacek Caban 23 Apr '19

23 Apr '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++-- dlls/ntoskrnl.exe/tests/driver.c | 8 +++++++- 2 files changed, 14 insertions(+), 3 deletions(-)

2 1

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