- wine-devel - winehq.org

[PATCH vkd3d v2 1/7] vkd3d: Do not ignore "src_box" in d3d12_command_list_CopyTextureRegion().
by Józef Kucia 15 Mar '19

15 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 2: Take the block height into account. --- libs/vkd3d/command.c | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 872504df760a..2594d036fca3 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2492,23 +2492,38 @@ static void vk_extent_3d_from_d3d12_miplevel(VkExtent3D *extent, extent->depth = d3d12_resource_desc_get_depth(resource_desc, miplevel_idx); } -static void vk_buffer_image_copy_from_d3d12(VkBufferImageCopy *buffer_image_copy, +static void vk_buffer_image_copy_from_d3d12(VkBufferImageCopy *copy, const D3D12_PLACED_SUBRESOURCE_FOOTPRINT *footprint, unsigned int sub_resource_idx, const D3D12_RESOURCE_DESC *image_desc, const struct vkd3d_format *format, - unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) + const D3D12_BOX *src_box, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) { - buffer_image_copy->bufferOffset = footprint->Offset; - buffer_image_copy->bufferRowLength = footprint->Footprint.RowPitch / + copy->bufferOffset = footprint->Offset; + if (src_box) + { + copy->bufferOffset += src_box->left / format->block_width * format->byte_count * format->block_byte_count; + copy->bufferOffset += src_box->top / format->block_height * footprint->Footprint.RowPitch; + copy->bufferOffset += src_box->front * footprint->Footprint.RowPitch * footprint->Footprint.Depth; + } + copy->bufferRowLength = footprint->Footprint.RowPitch / (format->byte_count * format->block_byte_count) * format->block_width; - buffer_image_copy->bufferImageHeight = 0; - vk_image_subresource_layers_from_d3d12(&buffer_image_copy->imageSubresource, + copy->bufferImageHeight = footprint->Footprint.Height; + vk_image_subresource_layers_from_d3d12(&copy->imageSubresource, format, sub_resource_idx, image_desc->MipLevels); - buffer_image_copy->imageOffset.x = dst_x; - buffer_image_copy->imageOffset.y = dst_y; - buffer_image_copy->imageOffset.z = dst_z; - buffer_image_copy->imageExtent.width = footprint->Footprint.Width; - buffer_image_copy->imageExtent.height = footprint->Footprint.Height; - buffer_image_copy->imageExtent.depth = footprint->Footprint.Depth; + copy->imageOffset.x = dst_x; + copy->imageOffset.y = dst_y; + copy->imageOffset.z = dst_z; + if (src_box) + { + copy->imageExtent.width = src_box->right - src_box->left; + copy->imageExtent.height = src_box->bottom - src_box->top; + copy->imageExtent.depth = src_box->back - src_box->front; + } + else + { + copy->imageExtent.width = footprint->Footprint.Width; + copy->imageExtent.height = footprint->Footprint.Height; + copy->imageExtent.depth = footprint->Footprint.Depth; + } } static void vk_image_copy_from_d3d12(VkImageCopy *image_copy, @@ -2709,7 +2724,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic FIXME("Depth-stencil format %#x not fully supported yet.\n", dst_format->dxgi_format); vk_buffer_image_copy_from_d3d12(&buffer_image_copy, &dst->u.PlacedFootprint, - src->u.SubresourceIndex, &src_resource->desc, dst_format, dst_x, dst_y, dst_z); + src->u.SubresourceIndex, &src_resource->desc, dst_format, src_box, dst_x, dst_y, dst_z); VK_CALL(vkCmdCopyImageToBuffer(list->vk_command_buffer, src_resource->u.vk_image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, dst_resource->u.vk_buffer, 1, &buffer_image_copy)); @@ -2732,7 +2747,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic FIXME("Depth-stencil format %#x not fully supported yet.\n", src_format->dxgi_format); vk_buffer_image_copy_from_d3d12(&buffer_image_copy, &src->u.PlacedFootprint, - dst->u.SubresourceIndex, &dst_resource->desc, src_format, dst_x, dst_y, dst_z); + dst->u.SubresourceIndex, &dst_resource->desc, src_format, src_box, dst_x, dst_y, dst_z); VK_CALL(vkCmdCopyBufferToImage(list->vk_command_buffer, src_resource->u.vk_buffer, dst_resource->u.vk_image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &buffer_image_copy)); -- 2.19.2

1 0

[PATCH] mferror: Add error messages dll.
by Nikolay Sivov 15 Mar '19

15 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Some applications try to load this. configure | 2 + configure.ac | 1 + dlls/mferror/Makefile.in | 4 + dlls/mferror/mferror.mc | 542 ++++++++++++++++++++++++++++++++++++++ dlls/mferror/mferror.spec | 1 + include/mferror.h | 2 + 6 files changed, 552 insertions(+) create mode 100644 dlls/mferror/Makefile.in create mode 100644 dlls/mferror/mferror.mc create mode 100644 dlls/mferror/mferror.spec diff --git a/configure b/configure index 4597eae4d1..0885b4979b 100755 --- a/configure +++ b/configure @@ -1374,6 +1374,7 @@ enable_mciseq enable_mciwave enable_mf enable_mf3216 +enable_mferror enable_mfplat enable_mfplay enable_mfreadwrite @@ -19672,6 +19673,7 @@ wine_fn_config_makefile dlls/mciwave enable_mciwave wine_fn_config_makefile dlls/mf enable_mf wine_fn_config_makefile dlls/mf/tests enable_tests wine_fn_config_makefile dlls/mf3216 enable_mf3216 +wine_fn_config_makefile dlls/mferror enable_mferror wine_fn_config_makefile dlls/mfplat enable_mfplat wine_fn_config_makefile dlls/mfplat/tests enable_tests wine_fn_config_makefile dlls/mfplay enable_mfplay diff --git a/configure.ac b/configure.ac index 744bf61ec9..d5640ed0e9 100644 --- a/configure.ac +++ b/configure.ac @@ -3394,6 +3394,7 @@ WINE_CONFIG_MAKEFILE(dlls/mciwave) WINE_CONFIG_MAKEFILE(dlls/mf) WINE_CONFIG_MAKEFILE(dlls/mf/tests) WINE_CONFIG_MAKEFILE(dlls/mf3216) +WINE_CONFIG_MAKEFILE(dlls/mferror) WINE_CONFIG_MAKEFILE(dlls/mfplat) WINE_CONFIG_MAKEFILE(dlls/mfplat/tests) WINE_CONFIG_MAKEFILE(dlls/mfplay) diff --git a/dlls/mferror/Makefile.in b/dlls/mferror/Makefile.in new file mode 100644 index 0000000000..25cbdf6172 --- /dev/null +++ b/dlls/mferror/Makefile.in @@ -0,0 +1,4 @@ +MODULE = mferror.dll + +MC_SRCS = \ + mferror.mc diff --git a/dlls/mferror/mferror.mc b/dlls/mferror/mferror.mc new file mode 100644 index 0000000000..89672c9c31 --- /dev/null +++ b/dlls/mferror/mferror.mc @@ -0,0 +1,542 @@ +; +; Copyright 2019 Nikolay Sivov for CodeWeavers +; +; 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 +; + +LanguageNames=(ENU=0x409:mferror) + +SeverityNames=(Error=0x3:STATUS_SEVERITY_ERROR +Success=0x0:STATUS_SEVERITY_SUCCESS) +FacilityNames=(MF=0xd:FACILITY_MF) + +MessageId=14000 +Severity=Error +Facility=MF +SymbolicName=MF_E_PLATFORM_NOT_INITIALIZED +Language=ENU +Media Foundation platform is not initialized. +. +MessageId=14001 +Severity=Error +Facility=MF +SymbolicName=MF_E_BUFFERTOOSMALL +Language=ENU +Buffer is too small. +. +MessageId=14002 +Severity=Error +Facility=MF +SymbolicName=MF_E_INVALIDREQUEST +Language=ENU +Invalid request. +. +MessageId=14003 +Severity=Error +Facility=MF +SymbolicName=MF_E_INVALIDSTREAMNUMBER +Language=ENU +Invalid stream number. +. +MessageId=14004 +Severity=Error +Facility=MF +SymbolicName=MF_E_INVALIDMEDIATYPE +Language=ENU +Invalid media type. +. +MessageId=14005 +Severity=Error +Facility=MF +SymbolicName=MF_E_NOTACCEPTING +Language=ENU +No more input is accepted. +. +MessageId=14006 +Severity=Error +Facility=MF +SymbolicName=MF_E_NOT_INITIALIZED +Language=ENU +Object is not initialized. +. +MessageId=14007 +Severity=Error +Facility=MF +SymbolicName=MF_E_UNSUPPORTED_REPRESENTATION +Language=ENU +Representation is not supported. +. +MessageId=14009 +Severity=Error +Facility=MF +SymbolicName=MF_E_NO_MORE_TYPES +Language=ENU +No more types in the list of suggested media types. +. +MessageId=14010 +Severity=Error +Facility=MF +SymbolicName=MF_E_UNSUPPORTED_SERVICE +Language=ENU +Unsupported service. +. +MessageId=14011 +Severity=Error +Facility=MF +SymbolicName=MF_E_UNEXPECTED +Language=ENU +Unexpected error. +. +MessageId=14012 +Severity=Error +Facility=MF +SymbolicName=MF_E_INVALIDNAME +Language=ENU +Invalid name. +. +MessageId=14013 +Severity=Error +Facility=MF +SymbolicName=MF_E_INVALIDTYPE +Language=ENU +Invalid type. +. +MessageId=14014 +Severity=Error +Facility=MF +SymbolicName=MF_E_INVALID_FILE_FORMAT +Language=ENU +Invalid file format. +. +MessageId=14015 +Severity=Error +Facility=MF +SymbolicName=MF_E_INVALIDINDEX +Language=ENU +Invalid index. +. +MessageId=14016 +Severity=Error +Facility=MF +SymbolicName=MF_E_INVALID_TIMESTAMP +Language=ENU +Invalid timestamp. +. +MessageId=14019 +Severity=Error +Facility=MF +SymbolicName=MF_E_UNSUPPORTED_SCHEME +Language=ENU +Unsupported scheme. +. +MessageId=14020 +Severity=Error +Facility=MF +SymbolicName=MF_E_UNSUPPORTED_BYTESTREAM_TYPE +Language=ENU +Unsupported bytestream type. +. +MessageId=14021 +Severity=Error +Facility=MF +SymbolicName=MF_E_UNSUPPORTED_TIME_FORMAT +Language=ENU +Unsupported time format. +. +MessageId=14024 +Severity=Error +Facility=MF +SymbolicName=MF_E_NO_SAMPLE_TIMESTAMP +Language=ENU +Timestamp is not set for the sample. +. +MessageId=14025 +Severity=Error +Facility=MF +SymbolicName=MF_E_NO_SAMPLE_DURATION +Language=ENU +No duration set for the sample. +. +MessageId=14027 +Severity=Error +Facility=MF +SymbolicName=MF_E_INVALID_STREAM_DATA +Language=ENU +Invalid stream data. +. +MessageId=14031 +Severity=Error +Facility=MF +SymbolicName=MF_E_RT_UNAVAILABLE +Language=ENU +Realtime support is not available. +. +MessageId=14032 +Severity=Error +Facility=MF +SymbolicName=MF_E_UNSUPPORTED_RATE +Language=ENU +Unsupported rate. +. +MessageId=14033 +Severity=Error +Facility=MF +SymbolicName=MF_E_THINNING_UNSUPPORTED +Language=ENU +Unsupported thinning. +. +MessageId=14034 +Severity=Error +Facility=MF +SymbolicName=MF_E_REVERSE_UNSUPPORTED +Language=ENU +Reversing is not supported. +. +MessageId=14035 +Severity=Error +Facility=MF +SymbolicName=MF_E_UNSUPPORTED_RATE_TRANSITION +Language=ENU +Unsupported rate transition. +. +MessageId=14036 +Severity=Error +Facility=MF +SymbolicName=MF_E_RATE_CHANGE_PREEMPTED +Language=ENU +Rate change was preempted. +. +MessageId=14037 +Severity=Error +Facility=MF +SymbolicName=MF_E_NOT_FOUND +Language=ENU +Object or value wasn't found. +. +MessageId=14038 +Severity=Error +Facility=MF +SymbolicName=MF_E_NOT_AVAILABLE +Language=ENU +Value is not available. +. +MessageId=14039 +Severity=Error +Facility=MF +SymbolicName=MF_E_NO_CLOCK +Language=ENU +Clock is not available. +. +MessageId=14040 +Severity=Success +Facility=MF +SymbolicName=MF_S_MULTIPLE_BEGIN +Language=ENU +Begin request has already been made. +. +MessageId=14041 +Severity=Error +Facility=MF +SymbolicName=MF_E_MULTIPLE_BEGIN +Language=ENU +Begin request has already been made. +. +MessageId=14042 +Severity=Error +Facility=MF +SymbolicName=MF_E_MULTIPLE_SUBSCRIBERS +Language=ENU +Multiple subscribers are not supported. +. +MessageId=14043 +Severity=Error +Facility=MF +SymbolicName=MF_E_TIMER_ORPHANED +Language=ENU +The timer was orphaned. +. +MessageId=14044 +Severity=Error +Facility=MF +SymbolicName=MF_E_STATE_TRANSITION_PENDING +Language=ENU +State transition is pending. +. +MessageId=14045 +Severity=Error +Facility=MF +SymbolicName=MF_E_UNSUPPORTED_STATE_TRANSITION +Language=ENU +Unsupported state transition. +. +MessageId=14046 +Severity=Error +Facility=MF +SymbolicName=MF_E_UNRECOVERABLE_ERROR_OCCURRED +Language=ENU +Unrecoverable error occurred. +. +MessageId=14047 +Severity=Error +Facility=MF +SymbolicName=MF_E_SAMPLE_HAS_TOO_MANY_BUFFERS +Language=ENU +Sample has too many buffers. +. +MessageId=14048 +Severity=Error +Facility=MF +SymbolicName=MF_E_SAMPLE_NOT_WRITABLE +Language=ENU +Sample is not writable. +. +MessageId=14050 +Severity=Error +Facility=MF +SymbolicName=MF_E_INVALID_KEY +Language=ENU +Key is invalid. +. +MessageId=14051 +Severity=Error +Facility=MF +SymbolicName=MF_E_BAD_STARTUP_VERSION +Language=ENU +Bad startup version. +. +MessageId=14052 +Severity=Error +Facility=MF +SymbolicName=MF_E_UNSUPPORTED_CAPTION +Language=ENU +Unsupported caption. +. +MessageId=14053 +Severity=Error +Facility=MF +SymbolicName=MF_E_INVALID_POSITION +Language=ENU +Invalid position. +. +MessageId=14054 +Severity=Error +Facility=MF +SymbolicName=MF_E_ATTRIBUTENOTFOUND +Language=ENU +Attribute is not found. +. +MessageId=14055 +Severity=Error +Facility=MF +SymbolicName=MF_E_PROPERTY_TYPE_NOT_ALLOWED +Language=ENU +Property type is not allowed. +. +MessageId=14056 +Severity=Error +Facility=MF +SymbolicName=MF_E_PROPERTY_TYPE_NOT_SUPPORTED +Language=ENU +Property type is not supported. +. +MessageId=14057 +Severity=Error +Facility=MF +SymbolicName=MF_E_PROPERTY_EMPTY +Language=ENU +Property is empty. +. +MessageId=14058 +Severity=Error +Facility=MF +SymbolicName=MF_E_PROPERTY_NOT_EMPTY +Language=ENU +Property is not empty. +. +MessageId=14059 +Severity=Error +Facility=MF +SymbolicName=MF_E_PROPERTY_VECTOR_NOT_ALLOWED +Language=ENU +Vector property is not allowed. +. +MessageId=14060 +Severity=Error +Facility=MF +SymbolicName=MF_E_PROPERTY_VECTOR_REQUIRED +Language=ENU +Vector property is required. +. +MessageId=14061 +Severity=Error +Facility=MF +SymbolicName=MF_E_OPERATION_CANCELLED +Language=ENU +Operation was cancelled. +. +MessageId=14062 +Severity=Error +Facility=MF +SymbolicName=MF_E_BYTESTREAM_NOT_SEEKABLE +Language=ENU +Bytestream is not seekable. +. +MessageId=14063 +Severity=Error +Facility=MF +SymbolicName=MF_E_DISABLED_IN_SAFEMODE +Language=ENU +Platform is disabled in safe mode. +. +MessageId=14064 +Severity=Error +Facility=MF +SymbolicName=MF_E_CANNOT_PARSE_BYTESTREAM +Language=ENU +Cannot parse bytestream. +. +MessageId=14065 +Severity=Error +Facility=MF +SymbolicName=MF_E_SOURCERESOLVER_MUTUALLY_EXCLUSIVE_FLAGS +Language=ENU +Mutually exclusive flags passed to source resolver. +. +MessageId=14075 +Severity=Error +Facility=MF +SymbolicName=MF_E_BYTESTREAM_UNKNOWN_LENGTH +Language=ENU +Unknown bytestream length. +. +MessageId=14079 +Severity=Error +Facility=MF +SymbolicName=MF_E_INVALID_WORKQUEUE +Language=ENU +Invalid work queue index. +. +MessageId=16000 +Severity=Error +Facility=MF +SymbolicName=MF_E_NO_EVENTS_AVAILABLE +Language=ENU +No events available. +. +MessageId=16005 +Severity=Error +Facility=MF +SymbolicName=MF_E_SHUTDOWN +Language=ENU +Shutdown() was called. +. +MessageId=21006 +Severity=Error +Facility=MF +SymbolicName=MF_E_TOPO_INVALID_OPTIONAL_NODE +Language=ENU +Optional node is invalid. +. +MessageId=21009 +Severity=Error +Facility=MF +SymbolicName=MF_E_TOPO_CANNOT_FIND_DECRYPTOR +Language=ENU +Cannot find decryptor. +. +MessageId=21010 +Severity=Error +Facility=MF +SymbolicName=MF_E_TOPO_CODEC_NOT_FOUND +Language=ENU +Codec was not found. +. +MessageId=21011 +Severity=Error +Facility=MF +SymbolicName=MF_E_TOPO_CANNOT_CONNECT +Language=ENU +Cannot connect topology nodes. +. +MessageId=21012 +Severity=Error +Facility=MF +SymbolicName=MF_E_TOPO_UNSUPPORTED +Language=ENU +Topology request is not supported. +. +MessageId=21013 +Severity=Error +Facility=MF +SymbolicName=MF_E_TOPO_INVALID_TIME_ATTRIBUTES +Language=ENU +Invalid topology time attributes. +. +MessageId=21014 +Severity=Error +Facility=MF +SymbolicName=MF_E_TOPO_LOOPS_IN_TOPOLOGY +Language=ENU +Found loops in topology. +. +MessageId=21015 +Severity=Error +Facility=MF +SymbolicName=MF_E_TOPO_MISSING_PRESENTATION_DESCRIPTOR +Language=ENU +Presentation descriptor is missing. +. +MessageId=21016 +Severity=Error +Facility=MF +SymbolicName=MF_E_TOPO_MISSING_STREAM_DESCRIPTOR +Language=ENU +Stream descriptor is missing. +. +MessageId=21017 +Severity=Error +Facility=MF +SymbolicName=MF_E_TOPO_STREAM_DESCRIPTOR_NOT_SELECTED +Language=ENU +Stream descriptor is not selected. +. +MessageId=21018 +Severity=Error +Facility=MF +SymbolicName=MF_E_TOPO_MISSING_SOURCE +Language=ENU +Source is missing. +. +MessageId=21019 +Severity=Error +Facility=MF +SymbolicName=MF_E_TOPO_SINK_ACTIVATES_UNSUPPORTED +Language=ENU +Topology loader does not support sink activates. +. +MessageId=40001 +Severity=Error +Facility=MF +SymbolicName=MF_E_CLOCK_NO_TIME_SOURCE +Language=ENU +Clock has no time source set. +. +MessageId=40002 +Severity=Error +Facility=MF +SymbolicName=MF_E_CLOCK_STATE_ALREADY_SET +Language=ENU +Clock state was already set. +. diff --git a/dlls/mferror/mferror.spec b/dlls/mferror/mferror.spec new file mode 100644 index 0000000000..2792acf360 --- /dev/null +++ b/dlls/mferror/mferror.spec @@ -0,0 +1 @@ +# This is resource dll diff --git a/include/mferror.h b/include/mferror.h index 17a006c96d..46d25b6a31 100644 --- a/include/mferror.h +++ b/include/mferror.h @@ -19,6 +19,8 @@ #ifndef __WINE_MFERROR_H #define __WINE_MFERROR_H +#define FACILITY_MF 0xd + #define MF_E_PLATFORM_NOT_INITIALIZED _HRESULT_TYPEDEF_(0xc00d36b0) #define MF_E_BUFFERTOOSMALL _HRESULT_TYPEDEF_(0xc00d36b1) #define MF_E_INVALIDREQUEST _HRESULT_TYPEDEF_(0xc00d36b2) -- 2.20.1

2 1

[v2 PATCH 1/8] propsys: Add support for VT_CLSID in PropVariantCompareEx().
by Nikolay Sivov 15 Mar '19

15 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: should fix test failures on wine. dlls/propsys/propvar.c | 9 ++++++++- dlls/propsys/tests/propsys.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index c56a737ede..1b2cb157a4 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -807,6 +807,9 @@ static BOOL isemptyornull(const PROPVARIANT *propvar) } return i == propvar->u.parray->cDims; } + if (propvar->vt == VT_CLSID) + return !propvar->u.puuid; + /* FIXME: vectors, byrefs, errors? */ return FALSE; } @@ -893,8 +896,12 @@ INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2 else res = lstrcmpA(propvar1->u.pszVal, propvar2_converted->u.pszVal); break; + case VT_CLSID: + res = memcmp(propvar1->u.puuid, propvar2->u.puuid, sizeof(*propvar1->u.puuid)); + if (res) res = res > 0 ? 1 : -1; + break; default: - FIXME("vartype %d not handled\n", propvar1->vt); + FIXME("vartype %#x not handled\n", propvar1->vt); res = -1; break; } diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index c47729ea97..fab2d5e89e 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -660,6 +660,7 @@ static void test_PropVariantToStringAlloc(void) static void test_PropVariantCompare(void) { PROPVARIANT empty, null, emptyarray, i2_0, i2_2, i4_large, i4_largeneg, i4_2, str_2, str_02, str_b; + PROPVARIANT clsid_null, clsid, clsid2; INT res; static const WCHAR str_2W[] = {'2', 0}; static const WCHAR str_02W[] = {'0', '2', 0}; @@ -704,6 +705,12 @@ static void test_PropVariantCompare(void) str_02.u.bstrVal = SysAllocString(str_02W); str_b.vt = VT_BSTR; str_b.u.bstrVal = SysAllocString(str_bW); + clsid_null.vt = VT_CLSID; + clsid_null.u.puuid = NULL; + clsid.vt = VT_CLSID; + clsid.u.puuid = (GUID *)&dummy_guid; + clsid2.vt = VT_CLSID; + clsid2.u.puuid = (GUID *)&GUID_NULL; res = PropVariantCompareEx(&empty, &empty, 0, 0); ok(res == 0, "res=%i\n", res); @@ -772,6 +779,34 @@ static void test_PropVariantCompare(void) res = PropVariantCompareEx(&i4_large, &str_b, 0, 0); todo_wine ok(res == -5 /* ??? */, "res=%i\n", res); + /* VT_CLSID */ + res = PropVariantCompareEx(&clsid_null, &clsid_null, 0, 0); + ok(res == 0, "res=%i\n", res); + + res = PropVariantCompareEx(&clsid_null, &clsid_null, 0, PVCF_TREATEMPTYASGREATERTHAN); + ok(res == 0, "res=%i\n", res); + + res = PropVariantCompareEx(&clsid, &clsid, 0, 0); + ok(res == 0, "res=%i\n", res); + + res = PropVariantCompareEx(&clsid, &clsid2, 0, 0); + ok(res == 1, "res=%i\n", res); + + res = PropVariantCompareEx(&clsid2, &clsid, 0, 0); + ok(res == -1, "res=%i\n", res); + + res = PropVariantCompareEx(&clsid_null, &clsid, 0, 0); + ok(res == -1, "res=%i\n", res); + + res = PropVariantCompareEx(&clsid, &clsid_null, 0, 0); + ok(res == 1, "res=%i\n", res); + + res = PropVariantCompareEx(&clsid_null, &clsid, 0, PVCF_TREATEMPTYASGREATERTHAN); + ok(res == 1, "res=%i\n", res); + + res = PropVariantCompareEx(&clsid, &clsid_null, 0, PVCF_TREATEMPTYASGREATERTHAN); + ok(res == -1, "res=%i\n", res); + SysFreeString(str_2.u.bstrVal); SysFreeString(str_02.u.bstrVal); SysFreeString(str_b.u.bstrVal); -- 2.20.1

2 15

[PATCH 9/9] msidb: Add support for wildcard (full database) export.
by Hans Leidekker 15 Mar '19

15 Mar '19

From: "Erich E. Hoover" <erich.e.hoover(a)gmail.com> msidb allows a full database export with the special "*" database name. Note: It does not support true wildcards, just this special indication that you wish to export all the tables in the database. v2: Use Unicode functions, ARRAY_SIZE macro. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- programs/msidb/main.c | 82 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 80 insertions(+), 2 deletions(-) diff --git a/programs/msidb/main.c b/programs/msidb/main.c index 3916e0d721..4bd065abe0 100644 --- a/programs/msidb/main.c +++ b/programs/msidb/main.c @@ -439,7 +439,7 @@ static int import_table( struct msidb_state *state, const WCHAR *table_name ) WCHAR table_path[MAX_PATH]; UINT ret; - snprintfW( table_path, sizeof(table_path)/sizeof(WCHAR), format, table_name ); + snprintfW( table_path, ARRAY_SIZE(table_path), format, table_name ); ret = MsiDatabaseImportW( state->database_handle, state->table_folder, table_path ); if (ret != ERROR_SUCCESS) { @@ -469,7 +469,7 @@ static int export_table( struct msidb_state *state, const WCHAR *table_name ) WCHAR table_path[MAX_PATH]; UINT ret; - snprintfW( table_path, sizeof(table_path)/sizeof(WCHAR), format, table_name ); + snprintfW( table_path, ARRAY_SIZE(table_path), format, table_name ); ret = MsiDatabaseExportW( state->database_handle, table_name, state->table_folder, table_path ); if (ret != ERROR_SUCCESS) { @@ -479,12 +479,90 @@ static int export_table( struct msidb_state *state, const WCHAR *table_name ) return 1; } +static int export_all_tables( struct msidb_state *state ) +{ + static const WCHAR summary_information[] = + {'_','S','u','m','m','a','r','y','I','n','f','o','r','m','a','t','i','o','n',0}; + static const WCHAR query_command[] = + {'S','E','L','E','C','T',' ','N','a','m','e',' ','F','R','O','M',' ','_','T','a','b','l','e','s',0}; + MSIHANDLE view = 0; + UINT ret; + + ret = MsiDatabaseOpenViewW( state->database_handle, query_command, &view ); + if (ret != ERROR_SUCCESS) + { + ERR( "Failed to open _Tables table.\n" ); + goto cleanup; + } + ret = MsiViewExecute( view, 0 ); + if (ret != ERROR_SUCCESS) + { + ERR( "Failed to query list from _Tables table.\n" ); + goto cleanup; + } + while( 1 ) + { + MSIHANDLE record = 0; + WCHAR table[256]; + DWORD size; + + ret = MsiViewFetch( view, &record ); + if (ret == ERROR_NO_MORE_ITEMS) + break; + if (ret != ERROR_SUCCESS) + { + ERR( "Failed to query row from _Tables table.\n" ); + goto cleanup; + } + size = ARRAY_SIZE(table); + ret = MsiRecordGetStringW( record, 1, table, &size ); + if (ret != ERROR_SUCCESS) + { + ERR( "Failed to retrieve name string.\n" ); + goto cleanup; + } + if (!export_table( state, table )) + { + ret = ERROR_FUNCTION_FAILED; + goto cleanup; + } + ret = MsiCloseHandle( record ); + if (ret != ERROR_SUCCESS) + { + ERR( "Failed to close record handle.\n" ); + goto cleanup; + } + } + ret = ERROR_SUCCESS; + /* the _SummaryInformation table is not listed in _Tables */ + if (!export_table( state, summary_information )) + { + ret = ERROR_FUNCTION_FAILED; + goto cleanup; + } + +cleanup: + if (view && MsiViewClose( view ) != ERROR_SUCCESS) + { + ERR( "Failed to close _Streams table.\n" ); + return 0; + } + return (ret == ERROR_SUCCESS); +} + static int export_tables( struct msidb_state *state ) { + const WCHAR wildcard[] = { '*',0 }; struct msidb_listentry *data; LIST_FOR_EACH_ENTRY( data, &state->table_list, struct msidb_listentry, entry ) { + if (strcmpW( data->name, wildcard ) == 0) + { + if (!export_all_tables( state )) + return 0; /* failed, do not commit changes */ + continue; + } if (!export_table( state, data->name )) return 0; /* failed, do not commit changes */ } -- 2.20.1

1 0

[PATCH 8/9] msidb: Add support for exporting with short (DOS) filenames.
by Hans Leidekker 15 Mar '19

15 Mar '19

From: "Erich E. Hoover" <erich.e.hoover(a)gmail.com> msidb's "-s" flag modifies the database export to use short (DOS) filenames instead of full table names. This flag is convenient because it uses the same filenames that the import (-i) option expects. For example, the InstallExecuteSequence table gets imported (or exported with this flag) as InstallE.idt where the normal export option uses InstallExecuteSequence.idt. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- programs/msidb/main.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/programs/msidb/main.c b/programs/msidb/main.c index 1cb16df788..3916e0d721 100644 --- a/programs/msidb/main.c +++ b/programs/msidb/main.c @@ -48,6 +48,7 @@ struct msidb_state BOOL create_database; BOOL import_tables; BOOL export_tables; + BOOL short_filenames; struct list add_stream_list; struct list extract_stream_list; struct list kill_stream_list; @@ -92,6 +93,7 @@ static void show_usage( void ) " -f folder Folder in which to open/save the tables.\n" " -i Import tables into database.\n" " -k file.cab Kill (remove) stream/cabinet file from _Streams table.\n" + " -s Export with short filenames (eight character max).\n" " -x file.cab Extract stream/cabinet file from _Streams table.\n" ); } @@ -163,6 +165,9 @@ static int process_argument( struct msidb_state *state, int i, int argc, WCHAR * state->kill_streams = TRUE; list_append( &state->kill_stream_list, argv[i + 1] ); return 2; + case 's': + state->short_filenames = TRUE; + return 1; case 'x': if (i + 1 >= argc) return 0; state->extract_streams = TRUE; @@ -458,7 +463,9 @@ static int import_tables( struct msidb_state *state ) static int export_table( struct msidb_state *state, const WCHAR *table_name ) { - const WCHAR format[] = { '%','s','.','i','d','t',0 }; + const WCHAR format_dos[] = { '%','.','8','s','.','i','d','t',0 }; /* truncate to 8 characters */ + const WCHAR format_full[] = { '%','s','.','i','d','t',0 }; + const WCHAR *format = (state->short_filenames ? format_dos : format_full); WCHAR table_path[MAX_PATH]; UINT ret; -- 2.20.1

1 0

[PATCH 7/9] msidb: Add support for exporting database tables.
by Hans Leidekker 15 Mar '19

15 Mar '19

From: "Erich E. Hoover" <erich.e.hoover(a)gmail.com> msidb allows developers to export tables from a database with the "-e" mode flag followed by a list of tables. For example, this call would export three tables to the current directory: msidb -d package.msi -f . -e ActionText Component InstallExecuteSequence Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- programs/msidb/main.c | 41 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/programs/msidb/main.c b/programs/msidb/main.c index ee79b5c196..1cb16df788 100644 --- a/programs/msidb/main.c +++ b/programs/msidb/main.c @@ -47,6 +47,7 @@ struct msidb_state BOOL kill_streams; BOOL create_database; BOOL import_tables; + BOOL export_tables; struct list add_stream_list; struct list extract_stream_list; struct list kill_stream_list; @@ -87,6 +88,7 @@ static void show_usage( void ) " -a file.cab Add stream/cabinet file to _Streams table.\n" " -c Create database file (instead of opening existing file).\n" " -d package.msi Path to the database file.\n" + " -e Export tables from database.\n" " -f folder Folder in which to open/save the tables.\n" " -i Import tables into database.\n" " -k file.cab Kill (remove) stream/cabinet file from _Streams table.\n" @@ -108,10 +110,10 @@ static int valid_state( struct msidb_state *state ) show_usage(); return 0; } - if (!state->create_database && !state->import_tables && !state->add_streams - && !state->kill_streams && !state->extract_streams) + if (!state->create_database && !state->import_tables && !state->export_tables + && !state->add_streams&& !state->kill_streams && !state->extract_streams) { - ERR( "No mode flag specified (-a, -c, -i, -k, -x).\n" ); + ERR( "No mode flag specified (-a, -c, -e, -i, -k, -x).\n" ); show_usage(); return 0; } @@ -146,6 +148,9 @@ static int process_argument( struct msidb_state *state, int i, int argc, WCHAR * if (i + 1 >= argc) return 0; state->database_file = argv[i + 1]; return 2; + case 'e': + state->export_tables = TRUE; + return 1; case 'f': if (i + 1 >= argc) return 0; state->table_folder = argv[i + 1]; @@ -451,6 +456,34 @@ static int import_tables( struct msidb_state *state ) return 1; } +static int export_table( struct msidb_state *state, const WCHAR *table_name ) +{ + const WCHAR format[] = { '%','s','.','i','d','t',0 }; + WCHAR table_path[MAX_PATH]; + UINT ret; + + snprintfW( table_path, sizeof(table_path)/sizeof(WCHAR), format, table_name ); + ret = MsiDatabaseExportW( state->database_handle, table_name, state->table_folder, table_path ); + if (ret != ERROR_SUCCESS) + { + ERR( "Failed to export table '%s', error %d.\n", wine_dbgstr_w(table_name), ret ); + return 0; + } + return 1; +} + +static int export_tables( struct msidb_state *state ) +{ + struct msidb_listentry *data; + + LIST_FOR_EACH_ENTRY( data, &state->table_list, struct msidb_listentry, entry ) + { + if (!export_table( state, data->name )) + return 0; /* failed, do not commit changes */ + } + return 1; +} + int wmain( int argc, WCHAR *argv[] ) { struct msidb_state state; @@ -479,6 +512,8 @@ int wmain( int argc, WCHAR *argv[] ) } if (state.add_streams && !add_streams( &state )) goto cleanup; /* failed, do not commit changes */ + if (state.export_tables && !export_tables( &state )) + goto cleanup; /* failed, do not commit changes */ if (state.extract_streams && !extract_streams( &state )) goto cleanup; /* failed, do not commit changes */ if (state.import_tables && !import_tables( &state )) -- 2.20.1

1 0

[PATCH 6/9] msidb: Add support for extracting stream/cabinet files from MSI databases.
by Hans Leidekker 15 Mar '19

15 Mar '19

From: "Erich E. Hoover" <erich.e.hoover(a)gmail.com> msidb allows developers to extract "streams" (cabinet files) from a database with the "-x" mode flag followed by the filename for the stream in the database, example: msidb -d package.msi -x cabinet.cab v2: Use Unicode functions. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- programs/msidb/main.c | 113 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 109 insertions(+), 4 deletions(-) diff --git a/programs/msidb/main.c b/programs/msidb/main.c index e2e4e77ce1..ee79b5c196 100644 --- a/programs/msidb/main.c +++ b/programs/msidb/main.c @@ -43,10 +43,12 @@ struct msidb_state WCHAR *table_folder; MSIHANDLE database_handle; BOOL add_streams; + BOOL extract_streams; BOOL kill_streams; BOOL create_database; BOOL import_tables; struct list add_stream_list; + struct list extract_stream_list; struct list kill_stream_list; struct list table_list; }; @@ -88,6 +90,7 @@ static void show_usage( void ) " -f folder Folder in which to open/save the tables.\n" " -i Import tables into database.\n" " -k file.cab Kill (remove) stream/cabinet file from _Streams table.\n" + " -x file.cab Extract stream/cabinet file from _Streams table.\n" ); } @@ -98,20 +101,22 @@ static int valid_state( struct msidb_state *state ) FIXME( "GUI operation is not currently supported.\n" ); return 0; } - if (state->table_folder == NULL && !state->add_streams && !state->kill_streams) + if (state->table_folder == NULL && !state->add_streams && !state->kill_streams + && !state->extract_streams) { ERR( "No table folder specified (-f option).\n" ); show_usage(); return 0; } if (!state->create_database && !state->import_tables && !state->add_streams - && !state->kill_streams) + && !state->kill_streams && !state->extract_streams) { - ERR( "No mode flag specified (-a, -c, -i, -k).\n" ); + ERR( "No mode flag specified (-a, -c, -i, -k, -x).\n" ); show_usage(); return 0; } - if (list_empty( &state->table_list ) && !state->add_streams && !state->kill_streams) + if (list_empty( &state->table_list ) && !state->add_streams && !state->kill_streams + && !state->extract_streams) { ERR( "No tables specified.\n" ); return 0; @@ -153,6 +158,11 @@ static int process_argument( struct msidb_state *state, int i, int argc, WCHAR * state->kill_streams = TRUE; list_append( &state->kill_stream_list, argv[i + 1] ); return 2; + case 'x': + if (i + 1 >= argc) return 0; + state->extract_streams = TRUE; + list_append( &state->extract_stream_list, argv[i + 1] ); + return 2; default: break; } @@ -322,6 +332,97 @@ static int kill_streams( struct msidb_state *state ) return 1; } +static int extract_stream( struct msidb_state *state, const WCHAR *stream_filename ) +{ + static const WCHAR select_command[] = + {'S','E','L','E','C','T',' ','D','a','t','a',' ','F','R','O','M',' ','_','S','t','r','e','a','m','s',' ', + 'W','H','E','R','E',' ','N','a','m','e',' ','=',' ','?',0}; + HANDLE file = INVALID_HANDLE_VALUE; + MSIHANDLE view = 0, record = 0; + DWORD read_size, write_size; + char buffer[1024]; + UINT ret; + + file = CreateFileW( stream_filename, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL ); + if (file == INVALID_HANDLE_VALUE) + { + ret = ERROR_FILE_NOT_FOUND; + ERR( "Failed to open destination file %s.\n", wine_dbgstr_w(stream_filename) ); + goto cleanup; + } + ret = MsiDatabaseOpenViewW( state->database_handle, select_command, &view ); + if (ret != ERROR_SUCCESS) + { + ERR( "Failed to open _Streams table.\n" ); + goto cleanup; + } + record = MsiCreateRecord( 1 ); + if (record == 0) + { + ERR( "Failed to create MSI record.\n" ); + ret = ERROR_OUTOFMEMORY; + goto cleanup; + } + ret = MsiRecordSetStringW( record, 1, stream_filename ); + if (ret != ERROR_SUCCESS) + { + ERR( "Failed to add stream filename to MSI record.\n" ); + goto cleanup; + } + ret = MsiViewExecute( view, record ); + if (ret != ERROR_SUCCESS) + { + ERR( "Failed to query stream from _Streams table.\n" ); + goto cleanup; + } + MsiCloseHandle( record ); + record = 0; + ret = MsiViewFetch( view, &record ); + if (ret != ERROR_SUCCESS) + { + ERR( "Failed to query row from _Streams table.\n" ); + goto cleanup; + } + read_size = sizeof(buffer); + while (read_size == sizeof(buffer)) + { + ret = MsiRecordReadStream( record, 1, buffer, &read_size ); + if (ret != ERROR_SUCCESS) + { + ERR( "Failed to read stream from _Streams table.\n" ); + goto cleanup; + } + if (!WriteFile( file, buffer, read_size, &write_size, NULL ) || read_size != write_size) + { + ret = ERROR_WRITE_FAULT; + ERR( "Failed to write stream to destination file.\n" ); + goto cleanup; + } + } + +cleanup: + if (record) + MsiCloseHandle( record ); + if (view) + MsiViewClose( view ); + if (file != INVALID_HANDLE_VALUE) + CloseHandle( file ); + return (ret == ERROR_SUCCESS); +} + +static int extract_streams( struct msidb_state *state ) +{ + struct msidb_listentry *data; + + LIST_FOR_EACH_ENTRY( data, &state->extract_stream_list, struct msidb_listentry, entry ) + { + if (!extract_stream( state, data->name )) + return 0; /* failed, do not commit changes */ + } + return 1; +} + static int import_table( struct msidb_state *state, const WCHAR *table_name ) { const WCHAR format[] = { '%','.','8','s','.','i','d','t',0 }; /* truncate to 8 characters */ @@ -358,6 +459,7 @@ int wmain( int argc, WCHAR *argv[] ) memset( &state, 0x0, sizeof(state) ); list_init( &state.add_stream_list ); + list_init( &state.extract_stream_list ); list_init( &state.kill_stream_list ); list_init( &state.table_list ); /* process and validate all the command line flags */ @@ -377,6 +479,8 @@ int wmain( int argc, WCHAR *argv[] ) } if (state.add_streams && !add_streams( &state )) goto cleanup; /* failed, do not commit changes */ + if (state.extract_streams && !extract_streams( &state )) + goto cleanup; /* failed, do not commit changes */ if (state.import_tables && !import_tables( &state )) goto cleanup; /* failed, do not commit changes */ if (state.kill_streams && !kill_streams( &state )) @@ -386,6 +490,7 @@ int wmain( int argc, WCHAR *argv[] ) cleanup: close_database( &state, ret == 0 ); list_free( &state.add_stream_list ); + list_free( &state.extract_stream_list ); list_free( &state.kill_stream_list ); list_free( &state.table_list ); return ret; -- 2.20.1

1 0

[PATCH 5/9] msidb: Add support for removing stream/cabinet files from MSI databases.
by Hans Leidekker 15 Mar '19

15 Mar '19

From: "Erich E. Hoover" <erich.e.hoover(a)gmail.com> msidb allows developers to remove "streams" (cabinet files) from a database with the "-k" mode flag followed by the filename for the stream in the database, example: msidb -d package.msi -k cabinet.cab v2: Use Unicode functions. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- programs/msidb/main.c | 82 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 76 insertions(+), 6 deletions(-) diff --git a/programs/msidb/main.c b/programs/msidb/main.c index d8372994a6..e2e4e77ce1 100644 --- a/programs/msidb/main.c +++ b/programs/msidb/main.c @@ -43,9 +43,11 @@ struct msidb_state WCHAR *table_folder; MSIHANDLE database_handle; BOOL add_streams; + BOOL kill_streams; BOOL create_database; BOOL import_tables; struct list add_stream_list; + struct list kill_stream_list; struct list table_list; }; @@ -85,6 +87,7 @@ static void show_usage( void ) " -d package.msi Path to the database file.\n" " -f folder Folder in which to open/save the tables.\n" " -i Import tables into database.\n" + " -k file.cab Kill (remove) stream/cabinet file from _Streams table.\n" ); } @@ -95,19 +98,20 @@ static int valid_state( struct msidb_state *state ) FIXME( "GUI operation is not currently supported.\n" ); return 0; } - if (state->table_folder == NULL && !state->add_streams) + if (state->table_folder == NULL && !state->add_streams && !state->kill_streams) { ERR( "No table folder specified (-f option).\n" ); show_usage(); return 0; } - if (!state->create_database && !state->import_tables && !state->add_streams) + if (!state->create_database && !state->import_tables && !state->add_streams + && !state->kill_streams) { - ERR( "No mode flag specified (-a, -c, -i).\n" ); + ERR( "No mode flag specified (-a, -c, -i, -k).\n" ); show_usage(); return 0; } - if (list_empty( &state->table_list ) && !state->add_streams) + if (list_empty( &state->table_list ) && !state->add_streams && !state->kill_streams) { ERR( "No tables specified.\n" ); return 0; @@ -144,6 +148,11 @@ static int process_argument( struct msidb_state *state, int i, int argc, WCHAR * case 'i': state->import_tables = TRUE; return 1; + case 'k': + if (i + 1 >= argc) return 0; + state->kill_streams = TRUE; + list_append( &state->kill_stream_list, argv[i + 1] ); + return 2; default: break; } @@ -199,11 +208,13 @@ static const WCHAR *basenameW( const WCHAR *filename ) static int add_stream( struct msidb_state *state, const WCHAR *stream_filename ) { - static const char insert_command[] = "INSERT INTO _Streams (Name, Data) VALUES (?, ?)"; + static const WCHAR insert_command[] = + {'I','N','S','E','R','T',' ','I','N','T','O',' ','_','S','t','r','e','a','m','s',' ', + '(','N','a','m','e',',',' ','D','a','t','a',')',' ','V','A','L','U','E','S',' ','(','?',',',' ','?',')',0}; MSIHANDLE view = 0, record = 0; UINT ret; - ret = MsiDatabaseOpenViewA( state->database_handle, insert_command, &view ); + ret = MsiDatabaseOpenViewW( state->database_handle, insert_command, &view ); if (ret != ERROR_SUCCESS) { ERR( "Failed to open _Streams table.\n" ); @@ -256,6 +267,61 @@ static int add_streams( struct msidb_state *state ) return 1; } +static int kill_stream( struct msidb_state *state, const WCHAR *stream_filename ) +{ + static const WCHAR delete_command[] = + {'D','E','L','E','T','E',' ','F','R','O','M',' ','_','S','t','r','e','a','m','s',' ', + 'W','H','E','R','E',' ','N','a','m','e',' ','=',' ','?',0}; + MSIHANDLE view = 0, record = 0; + UINT ret; + + ret = MsiDatabaseOpenViewW( state->database_handle, delete_command, &view ); + if (ret != ERROR_SUCCESS) + { + ERR( "Failed to open _Streams table.\n" ); + goto cleanup; + } + record = MsiCreateRecord( 1 ); + if (record == 0) + { + ERR( "Failed to create MSI record.\n" ); + ret = ERROR_OUTOFMEMORY; + goto cleanup; + } + ret = MsiRecordSetStringW( record, 1, stream_filename ); + if (ret != ERROR_SUCCESS) + { + ERR( "Failed to add stream filename to MSI record.\n" ); + goto cleanup; + } + ret = MsiViewExecute( view, record ); + if (ret != ERROR_SUCCESS) + { + ERR( "Failed to delete stream from _Streams table.\n" ); + goto cleanup; + } + +cleanup: + if (record) + MsiCloseHandle( record ); + if (view) + MsiViewClose( view ); + + return (ret == ERROR_SUCCESS); +} + +static int kill_streams( struct msidb_state *state ) +{ + struct msidb_listentry *data; + + LIST_FOR_EACH_ENTRY( data, &state->kill_stream_list, struct msidb_listentry, entry ) + { + if (!kill_stream( state, data->name )) + return 0; /* failed, do not commit changes */ + } + return 1; +} + static int import_table( struct msidb_state *state, const WCHAR *table_name ) { const WCHAR format[] = { '%','.','8','s','.','i','d','t',0 }; /* truncate to 8 characters */ @@ -292,6 +358,7 @@ int wmain( int argc, WCHAR *argv[] ) memset( &state, 0x0, sizeof(state) ); list_init( &state.add_stream_list ); + list_init( &state.kill_stream_list ); list_init( &state.table_list ); /* process and validate all the command line flags */ for (i = 1; n && i < argc; i += n) @@ -312,11 +379,14 @@ int wmain( int argc, WCHAR *argv[] ) goto cleanup; /* failed, do not commit changes */ if (state.import_tables && !import_tables( &state )) goto cleanup; /* failed, do not commit changes */ + if (state.kill_streams && !kill_streams( &state )) + goto cleanup; /* failed, do not commit changes */ ret = 0; cleanup: close_database( &state, ret == 0 ); list_free( &state.add_stream_list ); + list_free( &state.kill_stream_list ); list_free( &state.table_list ); return ret; } -- 2.20.1

1 0

[PATCH 4/9] msi: Add support for exporting binary streams (Binary/Icon tables).
by Hans Leidekker 15 Mar '19

15 Mar '19

From: "Erich E. Hoover" <erich.e.hoover(a)gmail.com> The Binary and Icon tables store their data in a different format from other tables, one column of the data is stored as a "stream" instead of a normal text field. With this patch those tables can now be exported properly by the MSI export functionality. v2: Avoid fixed size path buffers. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/database.c | 85 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 79 insertions(+), 6 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index f302610771..4537ed5836 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -961,8 +961,68 @@ static UINT msi_export_field( HANDLE handle, MSIRECORD *row, UINT field ) return ret ? ERROR_SUCCESS : ERROR_FUNCTION_FAILED; } -static UINT msi_export_record( HANDLE handle, MSIRECORD *row, UINT start ) +static UINT msi_export_stream( const WCHAR *folder, const WCHAR *table, MSIRECORD *row, UINT field, UINT start ) { + static const WCHAR fmt[] = {'%','s','\\','%','s',0}; + WCHAR stream[MAX_STREAM_NAME_LEN + 1], *path; + DWORD sz, read_size, write_size; + char buffer[1024]; + HANDLE file; + UINT len, r; + + sz = ARRAY_SIZE( stream ); + r = MSI_RecordGetStringW( row, start, stream, &sz ); + if (r != ERROR_SUCCESS) + return r; + + len = (sz + strlenW( folder ) + strlenW( table ) + ARRAY_SIZE( fmt ) + 1) * sizeof(WCHAR); + if (!(path = msi_alloc( len ))) + return ERROR_OUTOFMEMORY; + + len = sprintfW( path, fmt, folder, table ); + if (!CreateDirectoryW( path, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) + { + msi_free( path ); + return ERROR_FUNCTION_FAILED; + } + + path[len++] = '\\'; + strcpyW( path + len, stream ); + file = CreateFileW( path, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); + msi_free( path ); + if (file == INVALID_HANDLE_VALUE) + return ERROR_FUNCTION_FAILED; + + read_size = sizeof(buffer); + while (read_size == sizeof(buffer)) + { + r = MSI_RecordReadStream( row, field, buffer, &read_size ); + if (r != ERROR_SUCCESS) + { + CloseHandle( file ); + return r; + } + if (!WriteFile( file, buffer, read_size, &write_size, NULL ) || read_size != write_size) + { + CloseHandle( file ); + return ERROR_WRITE_FAULT; + } + } + CloseHandle( file ); + return r; +} + +struct row_export_info +{ + HANDLE handle; + const WCHAR *folder; + const WCHAR *table; +}; + +static UINT msi_export_record( struct row_export_info *row_export_info, MSIRECORD *row, UINT start ) +{ + HANDLE handle = row_export_info->handle; UINT i, count, r = ERROR_SUCCESS; const char *sep; DWORD sz; @@ -971,7 +1031,18 @@ static UINT msi_export_record( HANDLE handle, MSIRECORD *row, UINT start ) for (i = start; i <= count; i++) { r = msi_export_field( handle, row, i ); - if (r != ERROR_SUCCESS) + if (r == ERROR_INVALID_PARAMETER) + { + r = msi_export_stream( row_export_info->folder, row_export_info->table, row, i, start ); + if (r != ERROR_SUCCESS) + return r; + + /* exporting a binary stream, repeat the "Name" field */ + r = msi_export_field( handle, row, start ); + if (r != ERROR_SUCCESS) + return r; + } + else if (r != ERROR_SUCCESS) return r; sep = (i < count) ? "\t" : "\r\n"; @@ -1062,11 +1133,13 @@ static UINT MSI_DatabaseExport( MSIDATABASE *db, LPCWSTR table, LPCWSTR folder, r = MSI_OpenQuery( db, &view, query, table ); if (r == ERROR_SUCCESS) { + struct row_export_info row_export_info = { handle, folder, table }; + /* write out row 1, the column names */ r = MSI_ViewGetColumnInfo(view, MSICOLINFO_NAMES, &rec); if (r == ERROR_SUCCESS) { - msi_export_record( handle, rec, 1 ); + msi_export_record( &row_export_info, rec, 1 ); msiobj_release( &rec->hdr ); } @@ -1074,7 +1147,7 @@ static UINT MSI_DatabaseExport( MSIDATABASE *db, LPCWSTR table, LPCWSTR folder, r = MSI_ViewGetColumnInfo(view, MSICOLINFO_TYPES, &rec); if (r == ERROR_SUCCESS) { - msi_export_record( handle, rec, 1 ); + msi_export_record( &row_export_info, rec, 1 ); msiobj_release( &rec->hdr ); } @@ -1083,12 +1156,12 @@ static UINT MSI_DatabaseExport( MSIDATABASE *db, LPCWSTR table, LPCWSTR folder, if (r == ERROR_SUCCESS) { MSI_RecordSetStringW( rec, 0, table ); - msi_export_record( handle, rec, 0 ); + msi_export_record( &row_export_info, rec, 0 ); msiobj_release( &rec->hdr ); } /* write out row 4 onwards, the data */ - r = MSI_IterateRecords( view, 0, msi_export_row, handle ); + r = MSI_IterateRecords( view, 0, msi_export_row, &row_export_info ); msiobj_release( &view->hdr ); } -- 2.20.1

1 0

[PATCH 3/9] msi: Break out field exporting into a separate routine.
by Hans Leidekker 15 Mar '19

15 Mar '19

From: "Erich E. Hoover" <erich.e.hoover(a)gmail.com> msi_export_record is a lot more complicated than necessary, this patch splits out the field export part of that functionality as msi_export_field. This also needs to be separate for exporting binary stream data (next patch). v2: Fix memory leak on error path. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/database.c | 74 +++++++++++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 29 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 589dce510d..f302610771 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -918,50 +918,66 @@ end: return r; } -static UINT msi_export_record( HANDLE handle, MSIRECORD *row, UINT start ) +static UINT msi_export_field( HANDLE handle, MSIRECORD *row, UINT field ) { - UINT i, count, len, r = ERROR_SUCCESS; - const char *sep; char *buffer; - DWORD sz; + BOOL ret; + DWORD sz = 0x100; + UINT r; - len = 0x100; - buffer = msi_alloc( len ); - if ( !buffer ) + buffer = msi_alloc( sz ); + if (!buffer) return ERROR_OUTOFMEMORY; - count = MSI_RecordGetFieldCount( row ); - for ( i=start; i<=count; i++ ) + r = MSI_RecordGetStringA( row, field, buffer, &sz ); + if (r == ERROR_MORE_DATA) { - sz = len; - r = MSI_RecordGetStringA( row, i, buffer, &sz ); - if (r == ERROR_MORE_DATA) + char *tmp; + + sz++; /* leave room for NULL terminator */ + tmp = msi_realloc( buffer, sz ); + if (!tmp) { - char *p = msi_realloc( buffer, sz + 1 ); - if (!p) - break; - len = sz + 1; - buffer = p; + msi_free( buffer ); + return ERROR_OUTOFMEMORY; } - sz = len; - r = MSI_RecordGetStringA( row, i, buffer, &sz ); - if (r != ERROR_SUCCESS) - break; + buffer = tmp; - if (!WriteFile( handle, buffer, sz, &sz, NULL )) + r = MSI_RecordGetStringA( row, field, buffer, &sz ); + if (r != ERROR_SUCCESS) { - r = ERROR_FUNCTION_FAILED; - break; + msi_free( buffer ); + return r; } + } + else if (r != ERROR_SUCCESS) + { + msi_free( buffer ); + return r; + } + + ret = WriteFile( handle, buffer, sz, &sz, NULL ); + msi_free( buffer ); + return ret ? ERROR_SUCCESS : ERROR_FUNCTION_FAILED; +} + +static UINT msi_export_record( HANDLE handle, MSIRECORD *row, UINT start ) +{ + UINT i, count, r = ERROR_SUCCESS; + const char *sep; + DWORD sz; + + count = MSI_RecordGetFieldCount( row ); + for (i = start; i <= count; i++) + { + r = msi_export_field( handle, row, i ); + if (r != ERROR_SUCCESS) + return r; sep = (i < count) ? "\t" : "\r\n"; if (!WriteFile( handle, sep, strlen(sep), &sz, NULL )) - { - r = ERROR_FUNCTION_FAILED; - break; - } + return ERROR_FUNCTION_FAILED; } - msi_free( buffer ); return r; } -- 2.20.1

1 0

[PATCH 2/9] msi: Add support for exporting the _SummaryInformation table.
by Hans Leidekker 15 Mar '19

15 Mar '19

From: "Erich E. Hoover" <erich.e.hoover(a)gmail.com> The _SummaryInformation table stores a lot of important information about an MSI database. This patch adds the ability to export that table since, like _ForceCodepage, it is stored in a different format than the other tables. v2: Avoid lstrlenA calls. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/database.c | 29 +++++++++--- dlls/msi/msipriv.h | 1 + dlls/msi/suminfo.c | 109 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 133 insertions(+), 6 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index b8ec39322b..589dce510d 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -974,24 +974,35 @@ static UINT msi_export_forcecodepage( HANDLE handle, UINT codepage ) { static const char fmt[] = "\r\n\r\n%u\t_ForceCodepage\r\n"; char data[sizeof(fmt) + 10]; - DWORD sz; - - sprintf( data, fmt, codepage ); + DWORD sz = sprintf( data, fmt, codepage ); - sz = lstrlenA(data) + 1; if (!WriteFile(handle, data, sz, &sz, NULL)) return ERROR_FUNCTION_FAILED; return ERROR_SUCCESS; } -static UINT MSI_DatabaseExport( MSIDATABASE *db, LPCWSTR table, - LPCWSTR folder, LPCWSTR file ) +static UINT msi_export_summaryinformation( MSIDATABASE *db, HANDLE handle ) +{ + static const char header[] = "PropertyId\tValue\r\n" + "i2\tl255\r\n" + "_SummaryInformation\tPropertyId\r\n"; + DWORD sz = ARRAY_SIZE(header) - 1; + + if (!WriteFile(handle, header, sz, &sz, NULL)) + return ERROR_WRITE_FAULT; + + return msi_export_suminfo( db, handle ); +} + +static UINT MSI_DatabaseExport( MSIDATABASE *db, LPCWSTR table, LPCWSTR folder, LPCWSTR file ) { static const WCHAR query[] = { 's','e','l','e','c','t',' ','*',' ','f','r','o','m',' ','%','s',0 }; static const WCHAR forcecodepage[] = { '_','F','o','r','c','e','C','o','d','e','p','a','g','e',0 }; + static const WCHAR summaryinformation[] = { + '_','S','u','m','m','a','r','y','I','n','f','o','r','m','a','t','i','o','n',0 }; MSIRECORD *rec = NULL; MSIQUERY *view = NULL; LPWSTR filename; @@ -1026,6 +1037,12 @@ static UINT MSI_DatabaseExport( MSIDATABASE *db, LPCWSTR table, goto done; } + if (!strcmpW( table, summaryinformation )) + { + r = msi_export_summaryinformation( db, handle ); + goto done; + } + r = MSI_OpenQuery( db, &view, query, table ); if (r == ERROR_SUCCESS) { diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 4b2b65a13b..39219a646f 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -961,6 +961,7 @@ extern LPWSTR msi_suminfo_dup_string( MSISUMMARYINFO *si, UINT uiProperty ) DECL extern INT msi_suminfo_get_int32( MSISUMMARYINFO *si, UINT uiProperty ) DECLSPEC_HIDDEN; extern LPWSTR msi_get_suminfo_product( IStorage *stg ) DECLSPEC_HIDDEN; extern UINT msi_add_suminfo( MSIDATABASE *db, LPWSTR **records, int num_records, int num_columns ) DECLSPEC_HIDDEN; +extern UINT msi_export_suminfo( MSIDATABASE *db, HANDLE handle ) DECLSPEC_HIDDEN; extern UINT msi_load_suminfo_properties( MSIPACKAGE *package ) DECLSPEC_HIDDEN; /* undocumented functions */ diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index 98f6330d9f..c812ae09a4 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -23,6 +23,7 @@ #define COBJMACROS #define NONAMELESSUNION +#include "stdio.h" #include "windef.h" #include "winbase.h" #include "winreg.h" @@ -1096,6 +1097,114 @@ end: return r; } +static UINT save_prop( MSISUMMARYINFO *si, HANDLE handle, UINT row ) +{ + static const char fmt_systemtime[] = "%04u/%02u/%02u %02u:%02u:%02u"; + char data[36]; /* largest string: YYYY/MM/DD hh:mm:ss */ + static const char fmt_begin[] = "%u\t"; + static const char data_end[] = "\r\n"; + static const char fmt_int[] = "%u"; + UINT r, data_type, len; + SYSTEMTIME system_time; + FILETIME file_time; + INT int_value; + awstring str; + DWORD sz; + + str.unicode = FALSE; + str.str.a = NULL; + len = 0; + r = get_prop( si, row, &data_type, &int_value, &file_time, &str, &len ); + if (r != ERROR_SUCCESS && r != ERROR_MORE_DATA) + return r; + if (data_type == VT_EMPTY) + return ERROR_SUCCESS; /* property not set */ + sz = sprintf( data, fmt_begin, row ); + if (!WriteFile( handle, data, sz, &sz, NULL )) + return ERROR_WRITE_FAULT; + + switch( data_type ) + { + case VT_I2: + case VT_I4: + sz = sprintf( data, fmt_int, int_value ); + if (!WriteFile( handle, data, sz, &sz, NULL )) + return ERROR_WRITE_FAULT; + break; + case VT_LPSTR: + len++; + if (!(str.str.a = msi_alloc( len ))) + return ERROR_OUTOFMEMORY; + r = get_prop( si, row, NULL, NULL, NULL, &str, &len ); + if (r != ERROR_SUCCESS) + { + msi_free( str.str.a ); + return r; + } + sz = len; + if (!WriteFile( handle, str.str.a, sz, &sz, NULL )) + { + msi_free( str.str.a ); + return ERROR_WRITE_FAULT; + } + msi_free( str.str.a ); + break; + case VT_FILETIME: + if (!FileTimeToSystemTime( &file_time, &system_time )) + return ERROR_FUNCTION_FAILED; + sz = sprintf( data, fmt_systemtime, system_time.wYear, system_time.wMonth, + system_time.wDay, system_time.wHour, system_time.wMinute, + system_time.wSecond ); + if (!WriteFile( handle, data, sz, &sz, NULL )) + return ERROR_WRITE_FAULT; + break; + case VT_EMPTY: + /* cannot reach here, property not set */ + break; + default: + FIXME( "Unknown property variant type\n" ); + return ERROR_FUNCTION_FAILED; + } + + sz = ARRAY_SIZE(data_end) - 1; + if (!WriteFile( handle, data_end, sz, &sz, NULL )) + return ERROR_WRITE_FAULT; + + return ERROR_SUCCESS; +} + +UINT msi_export_suminfo( MSIDATABASE *db, HANDLE handle ) +{ + UINT i, r, num_rows; + MSISUMMARYINFO *si; + + r = msi_get_suminfo( db->storage, 0, &si ); + if (r != ERROR_SUCCESS) + r = msi_get_db_suminfo( db, 0, &si ); + if (r != ERROR_SUCCESS) + return r; + + num_rows = get_property_count( si->property ); + if (!num_rows) + { + msiobj_release( &si->hdr ); + return ERROR_FUNCTION_FAILED; + } + + for (i = 0; i < num_rows; i++) + { + r = save_prop( si, handle, i ); + if (r != ERROR_SUCCESS) + { + msiobj_release( &si->hdr ); + return r; + } + } + + msiobj_release( &si->hdr ); + return ERROR_SUCCESS; +} + UINT WINAPI MsiSummaryInfoPersist( MSIHANDLE handle ) { MSISUMMARYINFO *si; -- 2.20.1

1 0

[PATCH 1/9] msi: Add support for deleting streams from an MSI database.
by Hans Leidekker 15 Mar '19

15 Mar '19

From: "Erich E. Hoover" <erich.e.hoover(a)gmail.com> msidb allows developers to remove "streams" (cabinet files) from a database with the "-k" mode flag. To support that feature we need MSIMODIFY_DELETE support in the underlying MSI implementation. Per Hans' request, this version has been updated with additional error checking, unconditionally releasing the stream (see tests), and added tests for the strange behavior that occurs when deleting in-use streams. v3: Avoid potential double free. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/streams.c | 29 +++++++++++++++-- dlls/msi/tests/db.c | 78 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+), 3 deletions(-) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index cfce816ea0..777eb98cff 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -218,8 +218,28 @@ static UINT STREAMS_insert_row(struct tagMSIVIEW *view, MSIRECORD *rec, UINT row static UINT STREAMS_delete_row(struct tagMSIVIEW *view, UINT row) { - FIXME("(%p %d): stub!\n", view, row); - return ERROR_SUCCESS; + MSIDATABASE *db = ((MSISTREAMSVIEW *)view)->db; + UINT i, num_rows = db->num_streams - 1; + const WCHAR *name; + WCHAR *encname; + HRESULT hr; + + TRACE("(%p %d)\n", view, row); + + if (!db->num_streams || row > num_rows) + return ERROR_FUNCTION_FAILED; + + name = msi_string_lookup( db->strings, db->streams[row].str_index, NULL ); + if (!(encname = encode_streamname( FALSE, name ))) return ERROR_OUTOFMEMORY; + IStream_Release( db->streams[row].stream ); + + for (i = row; i < num_rows; i++) + db->streams[i] = db->streams[i + 1]; + db->num_streams = num_rows; + + hr = IStorage_DestroyElement( db->storage, encname ); + msi_free( encname ); + return FAILED( hr ) ? ERROR_FUNCTION_FAILED : ERROR_SUCCESS; } static UINT STREAMS_execute(struct tagMSIVIEW *view, MSIRECORD *record) @@ -317,12 +337,15 @@ static UINT STREAMS_modify(struct tagMSIVIEW *view, MSIMODIFY eModifyMode, MSIRE r = streams_modify_update(view, rec); break; + case MSIMODIFY_DELETE: + r = STREAMS_delete_row(view, row - 1); + break; + case MSIMODIFY_VALIDATE_NEW: case MSIMODIFY_INSERT_TEMPORARY: case MSIMODIFY_REFRESH: case MSIMODIFY_REPLACE: case MSIMODIFY_MERGE: - case MSIMODIFY_DELETE: case MSIMODIFY_VALIDATE: case MSIMODIFY_VALIDATE_FIELD: case MSIMODIFY_VALIDATE_DELETE: diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 0382e5454f..9fbf43eaee 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1779,6 +1779,84 @@ static void test_streamtable(void) MsiCloseHandle( view ); MsiCloseHandle( hdb ); DeleteFileA(msifile); + + /* insert a file into the _Streams table */ + r = MsiOpenDatabaseW(msifileW, MSIDBOPEN_CREATEDIRECT, &hdb); + ok(r == ERROR_SUCCESS, "Failed to create database\n"); + ok( hdb, "failed to create db\n"); + create_file( "test.txt" ); + rec = MsiCreateRecord( 2 ); + MsiRecordSetStringA( rec, 1, "data" ); + r = MsiRecordSetStreamA( rec, 2, "test.txt" ); + ok( r == ERROR_SUCCESS, "Failed to add stream data to the record: %d\n", r); + DeleteFileA("test.txt"); + r = MsiDatabaseOpenViewA( hdb, + "INSERT INTO `_Streams` ( `Name`, `Data` ) VALUES ( ?, ? )", &view ); + ok( r == ERROR_SUCCESS, "Failed to open database view: %d\n", r); + r = MsiViewExecute( view, rec ); + ok( r == ERROR_SUCCESS, "Failed to execute view: %d\n", r); + MsiCloseHandle( rec ); + MsiViewClose( view ); + MsiCloseHandle( view ); + r = MsiDatabaseCommit( hdb ); + ok( r == ERROR_SUCCESS , "Failed to commit database\n" ); + + /* open a handle to the "data" stream */ + r = MsiDatabaseOpenViewA( hdb, + "SELECT `Name`, `Data` FROM `_Streams` WHERE `Name` = 'data'", &view ); + ok( r == ERROR_SUCCESS, "Failed to open database view: %d\n", r); + r = MsiViewExecute( view, 0 ); + ok( r == ERROR_SUCCESS, "Failed to execute view: %d\n", r); + r = MsiViewFetch( view, &rec ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + MsiViewClose( view ); + MsiCloseHandle( view ); + /* read the stream while it still exists (normal case) */ + size = MAX_PATH; + r = MsiRecordGetStringA( rec, 1, file, &size ); + ok( r == ERROR_SUCCESS, "Failed to get string: %d\n", r); + ok( !lstrcmpA(file, "data"), "Expected 'data', got %s\n", file); + size = MAX_PATH; + memset(buf, 0, MAX_PATH); + r = MsiRecordReadStream( rec, 2, buf, &size ); + ok( r == ERROR_SUCCESS, "Failed to get stream: %d\n", r); + ok( !lstrcmpA(buf, "test.txt\n"), "Expected 'test.txt\\n', got '%s' (%d)\n", buf, size); + MsiCloseHandle( rec ); + + /* open a handle to the "data" stream (and keep it open during removal) */ + r = MsiDatabaseOpenViewA( hdb, + "SELECT `Name`, `Data` FROM `_Streams` WHERE `Name` = 'data'", &view ); + ok( r == ERROR_SUCCESS, "Failed to open database view: %d\n", r); + r = MsiViewExecute( view, 0 ); + ok( r == ERROR_SUCCESS, "Failed to execute view: %d\n", r); + r = MsiViewFetch( view, &rec ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + MsiViewClose( view ); + MsiCloseHandle( view ); + + /* remove the stream */ + r = MsiDatabaseOpenViewA( hdb, + "DELETE FROM `_Streams` WHERE `Name` = 'data'", &view ); + ok( r == ERROR_SUCCESS, "Failed to open database view: %d\n", r); + r = MsiViewExecute( view, 0 ); + ok( r == ERROR_SUCCESS, "Failed to execute view: %d\n", r); + MsiViewClose( view ); + MsiCloseHandle( view ); + + /* attempt to read the stream that no longer exists (abnormal case) */ + size = MAX_PATH; + r = MsiRecordGetStringA( rec, 1, file, &size ); + ok( r == ERROR_SUCCESS, "Failed to get string: %d\n", r); + ok( !lstrcmpA(file, "data"), "Expected 'data', got %s\n", file); + size = MAX_PATH; + memset(buf, 0, MAX_PATH); + r = MsiRecordReadStream( rec, 2, buf, &size ); + ok( r == ERROR_SUCCESS, "Failed to get stream: %d\n", r); + todo_wine ok( size == 0, "Expected empty buffer, got %d bytes\n", size); + MsiCloseHandle( rec ); + + MsiCloseHandle( hdb ); + DeleteFileA(msifile); } static void test_binary(void) -- 2.20.1

1 0

[PATCH] msvcp90: Fix vtable alignment on macOS.
by Ken Thomases 15 Mar '19

15 Mar '19

On macOS, the .align <n> directive aligns to 2^n, not just n. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- dlls/msvcp90/cxx.h | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index 917d814..86295cd 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -43,9 +43,15 @@ #define VTABLE_ADD_FUNC(name) "\t.quad " THISCALL_NAME(name) "\n" +#ifdef __APPLE__ +#define __ASM_VTABLE_ALIGN ".align 3" +#else +#define __ASM_VTABLE_ALIGN ".align 8" +#endif + #define __ASM_VTABLE(name,funcs) \ __asm__(".data\n" \ - "\t.align 8\n" \ + "\t" __ASM_VTABLE_ALIGN "\n" \ "\t.quad " __ASM_NAME(#name "_rtti") "\n" \ "\t.globl " __ASM_NAME("MSVCP_" #name "_vtable") "\n" \ __ASM_NAME("MSVCP_" #name "_vtable") ":\n" \ @@ -55,9 +61,15 @@ #define VTABLE_ADD_FUNC(name) "\t.long " THISCALL_NAME(name) "\n" +#ifdef __APPLE__ +#define __ASM_VTABLE_ALIGN ".align 2" +#else +#define __ASM_VTABLE_ALIGN ".align 4" +#endif + #define __ASM_VTABLE(name,funcs) \ __asm__(".data\n" \ - "\t.align 4\n" \ + "\t" __ASM_VTABLE_ALIGN "\n" \ "\t.long " __ASM_NAME(#name "_rtti") "\n" \ "\t.globl " __ASM_NAME("MSVCP_" #name "_vtable") "\n" \ __ASM_NAME("MSVCP_" #name "_vtable") ":\n" \ -- 2.10.2

6 7

[PATCH] advapi32: add AuditQuerySystemPolicy stub
by Louis Lenders 15 Mar '19

15 Mar '19

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=46643 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/lsa.c | 12 ++++++++++++ .../api-ms-win-security-audit-l1-1-1.spec | 2 +- include/ntsecapi.h | 9 +++++++++ 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index eb1f546335..e996bd2017 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -51,7 +51,7 @@ # @ stub AuditQueryGlobalSaclW # @ stub AuditQueryPerUserPolicy # @ stub AuditQuerySecurity -# @ stub AuditQuerySystemPolicy +@ stdcall AuditQuerySystemPolicy(ptr long ptr) # @ stub AuditSetGlobalSaclA # @ stub AuditSetGlobalSaclW # @ stub AuditSetPerUserPolicy diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 354db65929..592876a97f 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -1072,3 +1072,15 @@ NTSTATUS WINAPI LsaLookupPrivilegeDisplayName(LSA_HANDLE handle, LSA_UNICODE_STR return STATUS_NO_SUCH_PRIVILEGE; } + +/****************************************************************************** + * AuditQuerySystemPolicy [ADVAPI32.@] + * + */ +BOOLEAN WINAPI AuditQuerySystemPolicy(const GUID* guids, ULONG count, AUDIT_POLICY_INFORMATION** policy) +{ + + FIXME("(%p, %d, %p)\n", guids, count, policy); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/api-ms-win-security-audit-l1-1-1/api-ms-win-security-audit-l1-1-1.spec b/dlls/api-ms-win-security-audit-l1-1-1/api-ms-win-security-audit-l1-1-1.spec index 1e677eda9b..2283eafa81 100644 --- a/dlls/api-ms-win-security-audit-l1-1-1/api-ms-win-security-audit-l1-1-1.spec +++ b/dlls/api-ms-win-security-audit-l1-1-1/api-ms-win-security-audit-l1-1-1.spec @@ -8,7 +8,7 @@ @ stub AuditQueryGlobalSaclW @ stub AuditQueryPerUserPolicy @ stub AuditQuerySecurity -@ stub AuditQuerySystemPolicy +@ stdcall AuditQuerySystemPolicy(ptr long ptr) advapi32.AuditQuerySystemPolicy @ stub AuditSetGlobalSaclW @ stub AuditSetPerUserPolicy @ stub AuditSetSecurity diff --git a/include/ntsecapi.h b/include/ntsecapi.h index 6d5e01d675..729a89c86b 100644 --- a/include/ntsecapi.h +++ b/include/ntsecapi.h @@ -349,6 +349,13 @@ typedef enum _POLICY_NOTIFICATION_INFORMATION_CLASS PolicyNotifyMachineAccountPasswordInformation } POLICY_NOTIFICATION_INFORMATION_CLASS, *PPOLICY_NOTIFICATION_INFORMATION_CLASS; +typedef struct _AUDIT_POLICY_INFORMATION +{ + GUID AuditSubCategoryGuid; + ULONG AuditingInformation; + GUID AuditCategoryGuid; +} AUDIT_POLICY_INFORMATION, *PAUDIT_POLICY_INFORMATION; + #define MICROSOFT_KERBEROS_NAME_A "Kerberos" #if defined(_MSC_VER) #define MICROSOFT_KERBEROS_NAME_W L"Kerberos" @@ -458,6 +465,8 @@ typedef struct _KERB_PURGE_TKT_CACHE_REQUEST #define RtlEncryptMemory SystemFunction040 #define RtlDecryptMemory SystemFunction041 +BOOLEAN WINAPI AuditQuerySystemPolicy(const GUID*,ULONG,AUDIT_POLICY_INFORMATION**); + BOOLEAN WINAPI RtlGenRandom(PVOID,ULONG); NTSTATUS WINAPI RtlEncryptMemory(PVOID,ULONG,ULONG); NTSTATUS WINAPI RtlDecryptMemory(PVOID,ULONG,ULONG); -- 2.20.1

1 0

[PATCH 1/8] propsys: Add support for VT_CLSID in PropVariantCompareEx().
by Nikolay Sivov 15 Mar '19

15 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/propsys/propvar.c | 8 +++++++- dlls/propsys/tests/propsys.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index c56a737ede..76b1e53fb4 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -807,6 +807,9 @@ static BOOL isemptyornull(const PROPVARIANT *propvar) } return i == propvar->u.parray->cDims; } + if (propvar->vt == VT_CLSID) + return !propvar->u.puuid; + /* FIXME: vectors, byrefs, errors? */ return FALSE; } @@ -893,8 +896,11 @@ INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2 else res = lstrcmpA(propvar1->u.pszVal, propvar2_converted->u.pszVal); break; + case VT_CLSID: + res = memcmp(propvar1->u.puuid, propvar2->u.puuid, sizeof(*propvar1->u.puuid)); + break; default: - FIXME("vartype %d not handled\n", propvar1->vt); + FIXME("vartype %#x not handled\n", propvar1->vt); res = -1; break; } diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index c47729ea97..fab2d5e89e 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -660,6 +660,7 @@ static void test_PropVariantToStringAlloc(void) static void test_PropVariantCompare(void) { PROPVARIANT empty, null, emptyarray, i2_0, i2_2, i4_large, i4_largeneg, i4_2, str_2, str_02, str_b; + PROPVARIANT clsid_null, clsid, clsid2; INT res; static const WCHAR str_2W[] = {'2', 0}; static const WCHAR str_02W[] = {'0', '2', 0}; @@ -704,6 +705,12 @@ static void test_PropVariantCompare(void) str_02.u.bstrVal = SysAllocString(str_02W); str_b.vt = VT_BSTR; str_b.u.bstrVal = SysAllocString(str_bW); + clsid_null.vt = VT_CLSID; + clsid_null.u.puuid = NULL; + clsid.vt = VT_CLSID; + clsid.u.puuid = (GUID *)&dummy_guid; + clsid2.vt = VT_CLSID; + clsid2.u.puuid = (GUID *)&GUID_NULL; res = PropVariantCompareEx(&empty, &empty, 0, 0); ok(res == 0, "res=%i\n", res); @@ -772,6 +779,34 @@ static void test_PropVariantCompare(void) res = PropVariantCompareEx(&i4_large, &str_b, 0, 0); todo_wine ok(res == -5 /* ??? */, "res=%i\n", res); + /* VT_CLSID */ + res = PropVariantCompareEx(&clsid_null, &clsid_null, 0, 0); + ok(res == 0, "res=%i\n", res); + + res = PropVariantCompareEx(&clsid_null, &clsid_null, 0, PVCF_TREATEMPTYASGREATERTHAN); + ok(res == 0, "res=%i\n", res); + + res = PropVariantCompareEx(&clsid, &clsid, 0, 0); + ok(res == 0, "res=%i\n", res); + + res = PropVariantCompareEx(&clsid, &clsid2, 0, 0); + ok(res == 1, "res=%i\n", res); + + res = PropVariantCompareEx(&clsid2, &clsid, 0, 0); + ok(res == -1, "res=%i\n", res); + + res = PropVariantCompareEx(&clsid_null, &clsid, 0, 0); + ok(res == -1, "res=%i\n", res); + + res = PropVariantCompareEx(&clsid, &clsid_null, 0, 0); + ok(res == 1, "res=%i\n", res); + + res = PropVariantCompareEx(&clsid_null, &clsid, 0, PVCF_TREATEMPTYASGREATERTHAN); + ok(res == 1, "res=%i\n", res); + + res = PropVariantCompareEx(&clsid, &clsid_null, 0, PVCF_TREATEMPTYASGREATERTHAN); + ok(res == -1, "res=%i\n", res); + SysFreeString(str_2.u.bstrVal); SysFreeString(str_02.u.bstrVal); SysFreeString(str_b.u.bstrVal); -- 2.20.1

4 17

[PATCH 3/8] setupapi: Implement SetupDiOpenDeviceInfoW().
by Zhiyi Zhang 15 Mar '19

15 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/devinst.c | 86 +++++++++++++++++++++++++++++++++++++++++ dlls/setupapi/stubs.c | 11 ------ 2 files changed, 86 insertions(+), 11 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 331db87d06..41d10d7e40 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3316,6 +3316,92 @@ HKEY WINAPI SetupDiOpenClassRegKeyExW( return key; } +/*********************************************************************** + * SetupDiOpenDeviceInfoW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiOpenDeviceInfoW(HDEVINFO devinfo, PCWSTR instance_id, HWND hwnd_parent, DWORD flags, + PSP_DEVINFO_DATA device_data) +{ + struct DeviceInfoSet *set; + struct device *device = NULL, *enum_device; + WCHAR classW[40]; + GUID guid; + HKEY enumKey = NULL; + HKEY instanceKey = NULL; + DWORD phantom; + DWORD size; + DWORD error = ERROR_NO_SUCH_DEVINST; + + TRACE("%p %s %p 0x%08x %p\n", devinfo, debugstr_w(instance_id), hwnd_parent, flags, device_data); + + if (!(set = get_device_set(devinfo))) + return FALSE; + + if (!instance_id) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (hwnd_parent) + FIXME("hwnd_parent unsupported\n"); + + if (flags) + FIXME("flags unsupported: 0x%08x\n", flags); + + RegCreateKeyExW(HKEY_LOCAL_MACHINE, Enum, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &enumKey, NULL); + /* Instance needs to be already existent in registry, if not, report ERROR_NO_SUCH_DEVINST */ + if (RegOpenKeyExW(enumKey, instance_id, 0, KEY_READ, &instanceKey)) + goto done; + + /* If it's an unregistered instance, aka phantom instance, report ERROR_NO_SUCH_DEVINST */ + size = sizeof(phantom); + if (!RegQueryValueExW(instanceKey, Phantom, NULL, NULL, (BYTE *)&phantom, &size)) + goto done; + + /* Check class GUID */ + size = sizeof(classW); + if (RegQueryValueExW(instanceKey, ClassGUID, NULL, NULL, (BYTE *)classW, &size)) + goto done; + + classW[37] = 0; + UuidFromStringW(&classW[1], &guid); + + if (!IsEqualGUID(&guid, &set->ClassGuid)) + { + error = ERROR_CLASS_MISMATCH; + goto done; + } + + /* If current set already contains a same instance, don't create new ones */ + LIST_FOR_EACH_ENTRY(enum_device, &set->devices, struct device, entry) + { + if (!strcmpiW(instance_id, enum_device->instanceId)) + { + device = enum_device; + break; + } + } + + if (!device && !(device = SETUPDI_CreateDeviceInfo(set, &set->ClassGuid, instance_id, FALSE))) + goto done; + + if (!device_data || device_data->cbSize == sizeof(SP_DEVINFO_DATA)) + { + if (device_data) + copy_device_data(device_data, device); + error = NO_ERROR; + } + else + error = ERROR_INVALID_USER_BUFFER; + +done: + RegCloseKey(instanceKey); + RegCloseKey(enumKey); + SetLastError(error); + return !error; +} + /*********************************************************************** * SetupDiOpenDeviceInterfaceW (SETUPAPI.@) */ diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 4db32dd51c..b64c1a1316 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -322,17 +322,6 @@ BOOL WINAPI SetupDiOpenDeviceInfoA(HDEVINFO DeviceInfoSet, PCSTR DeviceInstanceI return FALSE; } -/*********************************************************************** - * SetupDiOpenDeviceInfoW (SETUPAPI.@) - */ -BOOL WINAPI SetupDiOpenDeviceInfoW(HDEVINFO DeviceInfoSet, PCWSTR DeviceInstanceId, - HWND hwndParent, DWORD OpenFlags, PSP_DEVINFO_DATA DeviceInfoData) -{ - FIXME("%p %s %p 0x%08x %p: stub\n", DeviceInfoSet, debugstr_w(DeviceInstanceId), - hwndParent, OpenFlags, DeviceInfoData); - return FALSE; -} - /*********************************************************************** * CM_Locate_DevNodeA (SETUPAPI.@) */ -- 2.19.2

2 2

[PATCH v2 8/8] include: Add more SetupAPI property keys.
by Zhiyi Zhang 15 Mar '19

15 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- include/devpkey.h | 172 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 170 insertions(+), 2 deletions(-) diff --git a/include/devpkey.h b/include/devpkey.h index 648ef42869..4d01c7b7ce 100644 --- a/include/devpkey.h +++ b/include/devpkey.h @@ -18,8 +18,6 @@ #include <devpropdef.h> -/* TODO: Not all DEVPROPKEYS have been defined here */ - DEFINE_DEVPROPKEY(DEVPKEY_NAME, 0xb725f130,0x47ef,0x101a,0xa5,0xf1,0x02,0x60,0x8c,0x9e,0xeb,0xac, 10); DEFINE_DEVPROPKEY(DEVPKEY_Device_DeviceDesc, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 2); @@ -56,7 +54,177 @@ DEFINE_DEVPROPKEY(DEVPKEY_Device_RemovalPolicyOverride, 0xa45c254e,0xdf1c,0x4efd DEFINE_DEVPROPKEY(DEVPKEY_Device_InstallState, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 36); DEFINE_DEVPROPKEY(DEVPKEY_Device_LocationPaths, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 37); DEFINE_DEVPROPKEY(DEVPKEY_Device_BaseContainerId, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 38); +DEFINE_DEVPROPKEY(DEVPKEY_Device_InstanceId, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 256); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DevNodeStatus, 0x4340a6c5,0x93fa,0x4706,0x97,0x2c,0x7b,0x64,0x80,0x08,0xa5,0xa7, 2); +DEFINE_DEVPROPKEY(DEVPKEY_Device_ProblemCode, 0x4340a6c5,0x93fa,0x4706,0x97,0x2c,0x7b,0x64,0x80,0x08,0xa5,0xa7, 3); +DEFINE_DEVPROPKEY(DEVPKEY_Device_EjectionRelations, 0x4340a6c5,0x93fa,0x4706,0x97,0x2c,0x7b,0x64,0x80,0x08,0xa5,0xa7, 4); +DEFINE_DEVPROPKEY(DEVPKEY_Device_RemovalRelations, 0x4340a6c5,0x93fa,0x4706,0x97,0x2c,0x7b,0x64,0x80,0x08,0xa5,0xa7, 5); +DEFINE_DEVPROPKEY(DEVPKEY_Device_PowerRelations, 0x4340a6c5,0x93fa,0x4706,0x97,0x2c,0x7b,0x64,0x80,0x08,0xa5,0xa7, 6); +DEFINE_DEVPROPKEY(DEVPKEY_Device_BusRelations, 0x4340a6c5,0x93fa,0x4706,0x97,0x2c,0x7b,0x64,0x80,0x08,0xa5,0xa7, 7); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Parent, 0x4340a6c5,0x93fa,0x4706,0x97,0x2c,0x7b,0x64,0x80,0x08,0xa5,0xa7, 8); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Children, 0x4340a6c5,0x93fa,0x4706,0x97,0x2c,0x7b,0x64,0x80,0x08,0xa5,0xa7, 9); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Siblings, 0x4340a6c5,0x93fa,0x4706,0x97,0x2c,0x7b,0x64,0x80,0x08,0xa5,0xa7, 10); +DEFINE_DEVPROPKEY(DEVPKEY_Device_TransportRelations, 0x4340a6c5,0x93fa,0x4706,0x97,0x2c,0x7b,0x64,0x80,0x08,0xa5,0xa7, 11); +DEFINE_DEVPROPKEY(DEVPKEY_Device_ProblemStatus, 0x4340a6c5,0x93fa,0x4706,0x97,0x2c,0x7b,0x64,0x80,0x08,0xa5,0xa7, 12); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Reported, 0x80497100,0x8c73,0x48b9,0xaa,0xd9,0xce,0x38,0x7e,0x19,0xc5,0x6e, 2); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Legacy, 0x80497100,0x8c73,0x48b9,0xaa,0xd9,0xce,0x38,0x7e,0x19,0xc5,0x6e, 3); +DEFINE_DEVPROPKEY(DEVPKEY_Device_ContainerId, 0x8c7ed206,0x3f8a,0x4827,0xb3,0xab,0xae,0x9e,0x1f,0xae,0xfc,0x6c, 2); +DEFINE_DEVPROPKEY(DEVPKEY_Device_InLocalMachineContainer, 0x8c7ed206,0x3f8a,0x4827,0xb3,0xab,0xae,0x9e,0x1f,0xae,0xfc,0x6c, 4); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Model, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 39); +DEFINE_DEVPROPKEY(DEVPKEY_Device_ModelId, 0x80d81ea6,0x7473,0x4b0c,0x82,0x16,0xef,0xc1,0x1a,0x2c,0x4c,0x8b, 2); +DEFINE_DEVPROPKEY(DEVPKEY_Device_FriendlyNameAttributes, 0x80d81ea6,0x7473,0x4b0c,0x82,0x16,0xef,0xc1,0x1a,0x2c,0x4c,0x8b, 3); +DEFINE_DEVPROPKEY(DEVPKEY_Device_ManufacturerAttributes, 0x80d81ea6,0x7473,0x4b0c,0x82,0x16,0xef,0xc1,0x1a,0x2c,0x4c,0x8b, 4); +DEFINE_DEVPROPKEY(DEVPKEY_Device_PresenceNotForDevice, 0x80d81ea6,0x7473,0x4b0c,0x82,0x16,0xef,0xc1,0x1a,0x2c,0x4c,0x8b, 5); +DEFINE_DEVPROPKEY(DEVPKEY_Device_SignalStrength, 0x80d81ea6,0x7473,0x4b0c,0x82,0x16,0xef,0xc1,0x1a,0x2c,0x4c,0x8b, 6); +DEFINE_DEVPROPKEY(DEVPKEY_Device_IsAssociateableByUserAction, 0x80d81ea6,0x7473,0x4b0c,0x82,0x16,0xef,0xc1,0x1a,0x2c,0x4c,0x8b, 7); +DEFINE_DEVPROPKEY(DEVPKEY_Device_ShowInUninstallUI, 0x80d81ea6,0x7473,0x4b0c,0x82,0x16,0xef,0xc1,0x1a,0x2c,0x4c,0x8b, 8); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Numa_Proximity_Domain, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 1); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DHP_Rebalance_Policy, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 2); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Numa_Node, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 3); +DEFINE_DEVPROPKEY(DEVPKEY_Device_BusReportedDeviceDesc, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 4); +DEFINE_DEVPROPKEY(DEVPKEY_Device_IsPresent, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 5); +DEFINE_DEVPROPKEY(DEVPKEY_Device_HasProblem, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 6); +DEFINE_DEVPROPKEY(DEVPKEY_Device_ConfigurationId, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 7); +DEFINE_DEVPROPKEY(DEVPKEY_Device_ReportedDeviceIdsHash, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 8); +DEFINE_DEVPROPKEY(DEVPKEY_Device_PhysicalDeviceLocation, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 9); +DEFINE_DEVPROPKEY(DEVPKEY_Device_BiosDeviceName, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 10); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DriverProblemDesc, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 11); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DebuggerSafe, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 12); +DEFINE_DEVPROPKEY(DEVPKEY_Device_PostInstallInProgress, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 13); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Stack, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 14); +DEFINE_DEVPROPKEY(DEVPKEY_Device_ExtendedConfigurationIds, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 15); +DEFINE_DEVPROPKEY(DEVPKEY_Device_IsRebootRequired, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 16); +DEFINE_DEVPROPKEY(DEVPKEY_Device_FirmwareDate, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 17); +DEFINE_DEVPROPKEY(DEVPKEY_Device_FirmwareVersion, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 18); +DEFINE_DEVPROPKEY(DEVPKEY_Device_FirmwareRevision, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 19); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DependencyProviders, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 20); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DependencyDependents, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 21); +DEFINE_DEVPROPKEY(DEVPKEY_Device_SoftRestartSupported, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 22); +DEFINE_DEVPROPKEY(DEVPKEY_Device_ExtendedAddress, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 23); +DEFINE_DEVPROPKEY(DEVPKEY_Device_SessionId, 0x83da6326,0x97a6,0x4088,0x94,0x53,0xa1,0x92,0x3f,0x57,0x3b,0x29, 6); +DEFINE_DEVPROPKEY(DEVPKEY_Device_InstallDate, 0x83da6326,0x97a6,0x4088,0x94,0x53,0xa1,0x92,0x3f,0x57,0x3b,0x29, 100); +DEFINE_DEVPROPKEY(DEVPKEY_Device_FirstInstallDate, 0x83da6326,0x97a6,0x4088,0x94,0x53,0xa1,0x92,0x3f,0x57,0x3b,0x29, 101); +DEFINE_DEVPROPKEY(DEVPKEY_Device_LastArrivalDate, 0x83da6326,0x97a6,0x4088,0x94,0x53,0xa1,0x92,0x3f,0x57,0x3b,0x29, 102); +DEFINE_DEVPROPKEY(DEVPKEY_Device_LastRemovalDate, 0x83da6326,0x97a6,0x4088,0x94,0x53,0xa1,0x92,0x3f,0x57,0x3b,0x29, 103); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DriverDate, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 2); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DriverVersion, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 3); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DriverDesc, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 4); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DriverInfPath, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 5); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DriverInfSection, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 6); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DriverInfSectionExt, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 7); +DEFINE_DEVPROPKEY(DEVPKEY_Device_MatchingDeviceId, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 8); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DriverProvider, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 9); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DriverPropPageProvider, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 10); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DriverCoInstallers, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 11); +DEFINE_DEVPROPKEY(DEVPKEY_Device_ResourcePickerTags, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 12); +DEFINE_DEVPROPKEY(DEVPKEY_Device_ResourcePickerExceptions, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 13); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DriverRank, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 14); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DriverLogoLevel, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 15); +DEFINE_DEVPROPKEY(DEVPKEY_Device_NoConnectSound, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 17); +DEFINE_DEVPROPKEY(DEVPKEY_Device_GenericDriverInstalled, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 18); +DEFINE_DEVPROPKEY(DEVPKEY_Device_AdditionalSoftwareRequested, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 19); +DEFINE_DEVPROPKEY(DEVPKEY_Device_SafeRemovalRequired, 0xafd97640,0x86a3,0x4210,0xb6,0x7c,0x28,0x9c,0x41,0xaa,0xbe,0x55, 2); +DEFINE_DEVPROPKEY(DEVPKEY_Device_SafeRemovalRequiredOverride, 0xafd97640,0x86a3,0x4210,0xb6,0x7c,0x28,0x9c,0x41,0xaa,0xbe,0x55, 3); + +DEFINE_DEVPROPKEY(DEVPKEY_DrvPkg_Model, 0xcf73bb51,0x3abf,0x44a2,0x85,0xe0,0x9a,0x3d,0xc7,0xa1,0x21,0x32, 2); +DEFINE_DEVPROPKEY(DEVPKEY_DrvPkg_VendorWebSite, 0xcf73bb51,0x3abf,0x44a2,0x85,0xe0,0x9a,0x3d,0xc7,0xa1,0x21,0x32, 3); +DEFINE_DEVPROPKEY(DEVPKEY_DrvPkg_DetailedDescription, 0xcf73bb51,0x3abf,0x44a2,0x85,0xe0,0x9a,0x3d,0xc7,0xa1,0x21,0x32, 4); +DEFINE_DEVPROPKEY(DEVPKEY_DrvPkg_DocumentationLink, 0xcf73bb51,0x3abf,0x44a2,0x85,0xe0,0x9a,0x3d,0xc7,0xa1,0x21,0x32, 5); +DEFINE_DEVPROPKEY(DEVPKEY_DrvPkg_Icon, 0xcf73bb51,0x3abf,0x44a2,0x85,0xe0,0x9a,0x3d,0xc7,0xa1,0x21,0x32, 6); +DEFINE_DEVPROPKEY(DEVPKEY_DrvPkg_BrandingIcon, 0xcf73bb51,0x3abf,0x44a2,0x85,0xe0,0x9a,0x3d,0xc7,0xa1,0x21,0x32, 7); + +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_UpperFilters, 0x4321918b,0xf69e,0x470d,0xa5,0xde,0x4d,0x88,0xc7,0x5a,0xd2,0x4b, 19); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_LowerFilters, 0x4321918b,0xf69e,0x470d,0xa5,0xde,0x4d,0x88,0xc7,0x5a,0xd2,0x4b, 20); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_Security, 0x4321918b,0xf69e,0x470d,0xa5,0xde,0x4d,0x88,0xc7,0x5a,0xd2,0x4b, 25); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_SecuritySDS, 0x4321918b,0xf69e,0x470d,0xa5,0xde,0x4d,0x88,0xc7,0x5a,0xd2,0x4b, 26); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_DevType, 0x4321918b,0xf69e,0x470d,0xa5,0xde,0x4d,0x88,0xc7,0x5a,0xd2,0x4b, 27); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_Exclusive, 0x4321918b,0xf69e,0x470d,0xa5,0xde,0x4d,0x88,0xc7,0x5a,0xd2,0x4b, 28); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_Characteristics, 0x4321918b,0xf69e,0x470d,0xa5,0xde,0x4d,0x88,0xc7,0x5a,0xd2,0x4b, 29); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_Name, 0x259abffc,0x50a7,0x47ce,0xaf,0x8,0x68,0xc9,0xa7,0xd7,0x33,0x66, 2); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_ClassName, 0x259abffc,0x50a7,0x47ce,0xaf,0x8,0x68,0xc9,0xa7,0xd7,0x33,0x66, 3); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_Icon, 0x259abffc,0x50a7,0x47ce,0xaf,0x8,0x68,0xc9,0xa7,0xd7,0x33,0x66, 4); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_ClassInstaller, 0x259abffc,0x50a7,0x47ce,0xaf,0x8,0x68,0xc9,0xa7,0xd7,0x33,0x66, 5); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_PropPageProvider, 0x259abffc,0x50a7,0x47ce,0xaf,0x8,0x68,0xc9,0xa7,0xd7,0x33,0x66, 6); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_NoInstallClass, 0x259abffc,0x50a7,0x47ce,0xaf,0x8,0x68,0xc9,0xa7,0xd7,0x33,0x66, 7); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_NoDisplayClass, 0x259abffc,0x50a7,0x47ce,0xaf,0x8,0x68,0xc9,0xa7,0xd7,0x33,0x66, 8); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_SilentInstall, 0x259abffc,0x50a7,0x47ce,0xaf,0x8,0x68,0xc9,0xa7,0xd7,0x33,0x66, 9); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_NoUseClass, 0x259abffc,0x50a7,0x47ce,0xaf,0x8,0x68,0xc9,0xa7,0xd7,0x33,0x66, 10); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_DefaultService, 0x259abffc,0x50a7,0x47ce,0xaf,0x8,0x68,0xc9,0xa7,0xd7,0x33,0x66, 11); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_IconPath, 0x259abffc,0x50a7,0x47ce,0xaf,0x8,0x68,0xc9,0xa7,0xd7,0x33,0x66, 12); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_DHPRebalanceOptOut, 0xd14d3ef3,0x66cf,0x4ba2,0x9d,0x38,0x0d,0xdb,0x37,0xab,0x47,0x01, 2); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_ClassCoInstallers, 0x713d1703,0xa2e2,0x49f5,0x92,0x14,0x56,0x47,0x2e,0xf3,0xda,0x5c, 2); DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_FriendlyName, 0x026e516e,0xb814,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 2); DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_Enabled, 0x026e516e,0xb814,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 3); DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_ClassGuid, 0x026e516e,0xb814,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 4); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_ReferenceString, 0x026e516e,0xb814,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 5); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_Restricted, 0x026e516e,0xb814,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 6); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_UnrestrictedAppCapabilities, 0x026e516e,0xb814,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 8); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_SchematicName, 0x026e516e,0xb814,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 9); + +DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterfaceClass_DefaultInterface, 0x14c83a99,0x0b3f,0x44b7,0xbe,0x4c,0xa1,0x78,0xd3,0x99,0x05,0x64, 2); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterfaceClass_Name, 0x14c83a99,0x0b3f,0x44b7,0xbe,0x4c,0xa1,0x78,0xd3,0x99,0x05,0x64, 3); + +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_Address, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 51); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_DiscoveryMethod, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 52); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_IsEncrypted, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 53); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_IsAuthenticated, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 54); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_IsConnected, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 55); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_IsPaired, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 56); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_Icon, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 57); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_Version, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 65); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_Last_Seen, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 66); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_Last_Connected, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 67); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_IsShowInDisconnectedState, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 68); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_IsLocalMachine, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 70); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_MetadataPath, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 71); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_IsMetadataSearchInProgress, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 72); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_MetadataChecksum, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 73); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_IsNotInterestingForDisplay, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 74); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_LaunchDeviceStageOnDeviceConnect, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 76); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_LaunchDeviceStageFromExplorer, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 77); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_BaselineExperienceId, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 78); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_IsDeviceUniquelyIdentifiable, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 79); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_AssociationArray, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 80); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_DeviceDescription1, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 81); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_DeviceDescription2, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 82); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_HasProblem, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 83); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_IsSharedDevice, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 84); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_IsNetworkDevice, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 85); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_IsDefaultDevice, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 86); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_MetadataCabinet, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 87); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_RequiresPairingElevation, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 88); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_ExperienceId, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 89); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_Category, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 90); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_Category_Desc_Singular, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 91); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_Category_Desc_Plural, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 92); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_Category_Icon, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 93); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_CategoryGroup_Desc, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 94); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_CategoryGroup_Icon, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 95); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_PrimaryCategory, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 97); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_UnpairUninstall, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 98); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_RequiresUninstallElevation, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 99); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_DeviceFunctionSubRank, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 100); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_AlwaysShowDeviceAsConnected, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 101); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_ConfigFlags, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 105); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_PrivilegedPackageFamilyNames, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 106); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_CustomPrivilegedPackageFamilyNames, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 107); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_IsRebootRequired, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 108); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_FriendlyName, 0x656A3BB3,0xECC0,0x43FD,0x84,0x77,0x4A,0xE0,0x40,0x4A,0x96,0xCD, 12288); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_Manufacturer, 0x656A3BB3,0xECC0,0x43FD,0x84,0x77,0x4A,0xE0,0x40,0x4A,0x96,0xCD, 8192); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_ModelName, 0x656A3BB3,0xECC0,0x43FD,0x84,0x77,0x4A,0xE0,0x40,0x4A,0x96,0xCD, 8194); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_ModelNumber, 0x656A3BB3,0xECC0,0x43FD,0x84,0x77,0x4A,0xE0,0x40,0x4A,0x96,0xCD, 8195); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_InstallInProgress, 0x83da6326,0x97a6,0x4088,0x94,0x53,0xa1,0x92,0x3f,0x57,0x3b,0x29, 9); + +DEFINE_DEVPROPKEY(DEVPKEY_DevQuery_ObjectType, 0x13673f42,0xa3d6,0x49f6,0xb4,0xda,0xae,0x46,0xe0,0xc5,0x23,0x7c, 2); + +#define DEVPKEY_Numa_Proximity_DomainDEVPKEY_Device_Numa_Proximity_Domain + +#define DEVPKEY_DeviceDisplay_DiscoveryMethod DEVPKEY_DeviceContainer_DiscoveryMethod +#define DEVPKEY_DeviceDisplay_IsShowInDisconnectedState DEVPKEY_DeviceContainer_IsShowInDisconnectedState +#define DEVPKEY_DeviceDisplay_IsNotInterestingForDisplay DEVPKEY_DeviceContainer_IsNotInterestingForDisplay +#define DEVPKEY_DeviceDisplay_IsNetworkDevice DEVPKEY_DeviceContainer_IsNetworkDevice +#define DEVPKEY_DeviceDisplay_Category DEVPKEY_DeviceContainer_Category +#define DEVPKEY_DeviceDisplay_UnpairUninstall DEVPKEY_DeviceContainer_UnpairUninstall +#define DEVPKEY_DeviceDisplay_RequiresUninstallElevation DEVPKEY_DeviceContainer_RequiresUninstallElevation +#define DEVPKEY_DeviceDisplay_AlwaysShowDeviceAsConnected DEVPKEY_DeviceContainer_AlwaysShowDeviceAsConnected \ No newline at end of file -- 2.19.2

1 0

[PATCH v2 7/8] setupapi: Check registered device duplicate in SetupDiCreateDeviceInfo().
by Zhiyi Zhang 15 Mar '19

15 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/devinst.c | 14 ++++++++++++++ dlls/setupapi/tests/devinst.c | 6 +++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index cdad889212..ab7eeebe70 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1510,6 +1510,8 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO devinfo, const WCHAR *name, const { WCHAR id[MAX_DEVICE_ID_LEN]; struct DeviceInfoSet *set; + HKEY enum_hkey; + HKEY instance_hkey; struct device *device; TRACE("devinfo %p, name %s, class %s, description %s, hwnd %p, flags %#x, device_data %p.\n", @@ -1570,6 +1572,18 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO devinfo, const WCHAR *name, const } else { + /* Check if instance is already in registry */ + RegCreateKeyExW(HKEY_LOCAL_MACHINE, Enum, 0, NULL, 0, KEY_READ, NULL, &enum_hkey, NULL); + if (!RegOpenKeyExW(enum_hkey, name, 0, KEY_READ, &instance_hkey)) + { + RegCloseKey(instance_hkey); + RegCloseKey(enum_hkey); + SetLastError(ERROR_DEVINST_ALREADY_EXISTS); + return FALSE; + } + RegCloseKey(enum_hkey); + + /* Check if instance is already in set */ strcpyW(id, name); LIST_FOR_EACH_ENTRY(device, &set->devices, struct device, entry) { diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 01891b16c2..2355f30a35 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -358,9 +358,9 @@ static void test_device_info(void) set = SetupDiCreateDeviceInfoList(&guid, NULL); ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device); - todo_wine ok(!ret, "Expect failure\n"); - todo_wine ok(GetLastError() == ERROR_DEVINST_ALREADY_EXISTS, "Got error %#x\n", GetLastError()); - todo_wine check_device_info(set, 0, NULL, NULL); + ok(!ret, "Expect failure\n"); + ok(GetLastError() == ERROR_DEVINST_ALREADY_EXISTS, "Got error %#x\n", GetLastError()); + check_device_info(set, 0, NULL, NULL); SetupDiDestroyDeviceInfoList(set); set = SetupDiGetClassDevsA(&guid, NULL, NULL, 0); -- 2.19.2

1 0

[PATCH v2 6/8] setupapi/tests: Add more SetupDiCreateDeviceInfo() tests.
by Zhiyi Zhang 15 Mar '19

15 Mar '19

SetupDiCreateDeviceInfo() should report last error ERROR_DEVINST_ALREADY_EXISTS when an registered instance exists when creating a device for an empty set. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/tests/devinst.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index de4d00e81d..01891b16c2 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -212,6 +212,7 @@ static void test_device_info(void) char id[MAX_DEVICE_ID_LEN + 2]; HDEVINFO set; BOOL ret; + INT i = 0; SetLastError(0xdeadbeef); ret = SetupDiCreateDeviceInfoA(NULL, NULL, NULL, NULL, NULL, 0, NULL); @@ -344,6 +345,31 @@ static void test_device_info(void) ok(ret, "Failed to create device, error %#x.\n", GetLastError()); SetupDiDestroyDeviceInfoList(set); + + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device info list, error %#x.\n", GetLastError()); + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + ret = SetupDiRegisterDeviceInfo(set , &device, 0, NULL, NULL, NULL); + ok(ret, "Failed to register device, error %#x.\n", GetLastError()); + check_device_info(set, 0, &guid, "ROOT\\LEGACY_BOGUS\\0000"); + check_device_info(set, 1, NULL, NULL); + SetupDiDestroyDeviceInfoList(set); + + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device); + todo_wine ok(!ret, "Expect failure\n"); + todo_wine ok(GetLastError() == ERROR_DEVINST_ALREADY_EXISTS, "Got error %#x\n", GetLastError()); + todo_wine check_device_info(set, 0, NULL, NULL); + SetupDiDestroyDeviceInfoList(set); + + set = SetupDiGetClassDevsA(&guid, NULL, NULL, 0); + while (SetupDiEnumDeviceInfo(set, i++, &device)) + { + ret = SetupDiRemoveDevice(set, &device); + ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); + } + SetupDiDestroyDeviceInfoList(set); } static void test_device_property(void) -- 2.19.2

1 0

[PATCH v2 5/8] setupapi/tests: Add SetupDiOpenDeviceInfo() tests.
by Zhiyi Zhang 15 Mar '19

15 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/tests/devinst.c | 148 ++++++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 75ac8fef5a..de4d00e81d 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -737,6 +737,153 @@ static void test_get_device_instance_id(void) SetupDiDestroyDeviceInfoList(set); } +static void test_open_device_info(void) +{ + SP_DEVINFO_DATA device = {sizeof(device)}; + CHAR id[MAX_DEVICE_ID_LEN + 2]; + HDEVINFO set; + DWORD i = 0; + BOOL ret; + + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device info, error %#x.\n", GetLastError()); + + /* Open non-existent device */ + SetLastError(0xdeadbeef); + ret = SetupDiOpenDeviceInfoA(set, "Root\\LEGACY_BOGUS\\FFFF", NULL, 0, &device); + ok(GetLastError() == ERROR_NO_SUCH_DEVINST, "Got unexpected error %#x.\n", GetLastError()); + ok(!ret, "Expected failure.\n"); + check_device_info(set, 0, NULL, NULL); + + /* Open unregistered device */ + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\1000", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = SetupDiOpenDeviceInfoA(set, "Root\\LEGACY_BOGUS\\1000", NULL, 0, &device); + ok(GetLastError() == ERROR_NO_SUCH_DEVINST, "Got unexpected error %#x.\n", GetLastError()); + ok(!ret, "Expected failure.\n"); + check_device_info(set, 0, &guid, "Root\\LEGACY_BOGUS\\1000"); + check_device_info(set, 1, NULL, NULL); + + /* Open registered device */ + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\1001", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); + ok(ret, "Failed to register device, error %#x.\n", GetLastError()); + check_device_info(set, 0, &guid, "Root\\LEGACY_BOGUS\\1000"); + check_device_info(set, 1, &guid, "Root\\LEGACY_BOGUS\\1001"); + check_device_info(set, 2, NULL, NULL); + + SetLastError(0xdeadbeef); + ret = SetupDiOpenDeviceInfoA(set, "Root\\LEGACY_BOGUS\\1001", NULL, 0, &device); + ok(GetLastError() == NO_ERROR, "Got unexpected error %#x.\n", GetLastError()); + ok(ret, "Failed to open device info\n"); + ret = SetupDiGetDeviceInstanceIdA(set, &device, id, sizeof(id), NULL); + ok(ret, "Got unexpected error %#x.\n", GetLastError()); + ok(!strcasecmp(id, "Root\\LEGACY_BOGUS\\1001"), "Got unexpected id %s.\n", id); + check_device_info(set, 0, &guid, "Root\\LEGACY_BOGUS\\1000"); + check_device_info(set, 1, &guid, "Root\\LEGACY_BOGUS\\1001"); + check_device_info(set, 2, NULL, NULL); + + /* Open registered device in an empty device info set */ + SetupDiDestroyDeviceInfoList(set); + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device info list, error %#x.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupDiOpenDeviceInfoA(set, "Root\\LEGACY_BOGUS\\1001", NULL, 0, &device); + ok(GetLastError() == NO_ERROR, "Got unexpected error %#x.\n", GetLastError()); + ok(ret, "Failed to open device info\n"); + ret = SetupDiGetDeviceInstanceIdA(set, &device, id, sizeof(id), NULL); + ok(ret, "Got unexpected error %#x.\n", GetLastError()); + ok(!strcasecmp(id, "Root\\LEGACY_BOGUS\\1001"), "Got unexpected id %s.\n", id); + check_device_info(set, 0, &guid, "Root\\LEGACY_BOGUS\\1001"); + check_device_info(set, 1, NULL, NULL); + + /* Open registered device again */ + SetLastError(0xdeadbeef); + ret = SetupDiOpenDeviceInfoA(set, "Root\\LEGACY_BOGUS\\1001", NULL, 0, &device); + ok(GetLastError() == NO_ERROR, "Got unexpected error %#x.\n", GetLastError()); + ok(ret, "Failed to open device info\n"); + ret = SetupDiGetDeviceInstanceIdA(set, &device, id, sizeof(id), NULL); + ok(ret, "Got unexpected error %#x.\n", GetLastError()); + ok(!strcasecmp(id, "Root\\LEGACY_BOGUS\\1001"), "Got unexpected id %s.\n", id); + check_device_info(set, 0, &guid, "Root\\LEGACY_BOGUS\\1001"); + check_device_info(set, 1, NULL, NULL); + + /* Open registered device in a new device info set with wrong GUID */ + SetupDiDestroyDeviceInfoList(set); + set = SetupDiCreateDeviceInfoList(&guid2, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device info list, error %#x.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupDiOpenDeviceInfoA(set, "Root\\LEGACY_BOGUS\\1001", NULL, 0, &device); + ok(GetLastError() == ERROR_CLASS_MISMATCH, "Got unexpected error %#x.\n", GetLastError()); + ok(!ret, "Expected failure.\n"); + check_device_info(set, 0, NULL, NULL); + + /* Open registered device in a new device info set with NULL GUID */ + SetupDiDestroyDeviceInfoList(set); + set = SetupDiCreateDeviceInfoList(NULL, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device info list, error %#x.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupDiOpenDeviceInfoA(set, "Root\\LEGACY_BOGUS\\1001", NULL, 0, &device); + ok(GetLastError() == NO_ERROR, "Got unexpected error %#x.\n", GetLastError()); + ok(ret, "Failed to open device info\n"); + check_device_info(set, 0, &guid, "Root\\LEGACY_BOGUS\\1001"); + check_device_info(set, 1, NULL, NULL); + + SetupDiDestroyDeviceInfoList(set); + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device info list, error %#x.\n", GetLastError()); + + /* NULL set */ + SetLastError(0xdeadbeef); + ret = SetupDiOpenDeviceInfoA(NULL, "Root\\LEGACY_BOGUS\\1001", NULL, 0, &device); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected error %#x.\n", GetLastError()); + ok(!ret, "Expected failure.\n"); + + /* NULL instance id */ + SetLastError(0xdeadbeef); + ret = SetupDiOpenDeviceInfoA(set, NULL, NULL, 0, &device); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError()); + ok(!ret, "Expected failure.\n"); + check_device_info(set, 0, NULL, NULL); + + /* Invalid SP_DEVINFO_DATA cbSize, device will be added despite failure */ + SetLastError(0xdeadbeef); + device.cbSize = 0; + ret = SetupDiOpenDeviceInfoA(set, "Root\\LEGACY_BOGUS\\1001", NULL, 0, &device); + device.cbSize = sizeof(device); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "Got unexpected error %#x.\n", GetLastError()); + ok(!ret, "Expected failure.\n"); + check_device_info(set, 0, &guid, "Root\\LEGACY_BOGUS\\1001"); + check_device_info(set, 1, NULL, NULL); + + SetupDiDestroyDeviceInfoList(set); + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device info list, error %#x.\n", GetLastError()); + + /* NULL device */ + SetLastError(0xdeadbeef); + ret = SetupDiOpenDeviceInfoA(set, "Root\\LEGACY_BOGUS\\1001", NULL, 0, NULL); + ok(GetLastError() == NO_ERROR, "Got unexpected error %#x.\n", GetLastError()); + ok(ret, "Failed to open device info\n"); + check_device_info(set, 0, &guid, "Root\\LEGACY_BOGUS\\1001"); + check_device_info(set, 1, NULL, NULL); + + /* Clean up */ + SetupDiDestroyDeviceInfoList(set); + set = SetupDiGetClassDevsA(&guid, NULL, NULL, 0); + while (SetupDiEnumDeviceInfo(set, i++, &device)) + { + ret = SetupDiRemoveDevice(set, &device); + ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); + } + SetupDiDestroyDeviceInfoList(set); +} + static void test_register_device_info(void) { SP_DEVINFO_DATA device = {0}; @@ -1725,6 +1872,7 @@ START_TEST(devinst) test_device_info(); test_device_property(); test_get_device_instance_id(); + test_open_device_info(); test_register_device_info(); test_device_iface(); test_device_iface_detail(); -- 2.19.2

1 0

[PATCH v2 4/8] setupapi: Implement SetupDiOpenDeviceInfoA().
by Zhiyi Zhang 15 Mar '19

15 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/devinst.c | 20 ++++++++++++++++++++ dlls/setupapi/stubs.c | 11 ----------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 81b6e354a3..cdad889212 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3316,6 +3316,26 @@ HKEY WINAPI SetupDiOpenClassRegKeyExW( return key; } +/*********************************************************************** + * SetupDiOpenDeviceInfoA (SETUPAPI.@) + */ +BOOL WINAPI SetupDiOpenDeviceInfoA(HDEVINFO devinfo, PCSTR instance_id, HWND hwnd_parent, DWORD flags, + PSP_DEVINFO_DATA device_data) +{ + WCHAR instance_idW[MAX_DEVICE_ID_LEN]; + + TRACE("%p %s %p 0x%08x %p\n", devinfo, debugstr_a(instance_id), hwnd_parent, flags, device_data); + + if (!instance_id || strlen(instance_id) >= MAX_DEVICE_ID_LEN) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + MultiByteToWideChar(CP_ACP, 0, instance_id, -1, instance_idW, ARRAY_SIZE(instance_idW)); + return SetupDiOpenDeviceInfoW(devinfo, instance_idW, hwnd_parent, flags, device_data); +} + /*********************************************************************** * SetupDiOpenDeviceInfoW (SETUPAPI.@) */ diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index b64c1a1316..ede878f1de 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -311,17 +311,6 @@ BOOL WINAPI SetupDiGetClassImageIndex(PSP_CLASSIMAGELIST_DATA ClassImageListData return FALSE; } -/*********************************************************************** - * SetupDiOpenDeviceInfoA (SETUPAPI.@) - */ -BOOL WINAPI SetupDiOpenDeviceInfoA(HDEVINFO DeviceInfoSet, PCSTR DeviceInstanceId, - HWND hwndParent, DWORD OpenFlags, PSP_DEVINFO_DATA DeviceInfoData) -{ - FIXME("%p %s %p 0x%08x %p: stub\n", DeviceInfoSet, debugstr_a(DeviceInstanceId), - hwndParent, OpenFlags, DeviceInfoData); - return FALSE; -} - /*********************************************************************** * CM_Locate_DevNodeA (SETUPAPI.@) */ -- 2.19.2

1 0

[PATCH v2 3/8] setupapi: Implement SetupDiOpenDeviceInfoW().
by Zhiyi Zhang 15 Mar '19

15 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/devinst.c | 86 +++++++++++++++++++++++++++++++++++++++++ dlls/setupapi/stubs.c | 11 ------ 2 files changed, 86 insertions(+), 11 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 331db87d06..81b6e354a3 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3316,6 +3316,92 @@ HKEY WINAPI SetupDiOpenClassRegKeyExW( return key; } +/*********************************************************************** + * SetupDiOpenDeviceInfoW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiOpenDeviceInfoW(HDEVINFO devinfo, PCWSTR instance_id, HWND hwnd_parent, DWORD flags, + PSP_DEVINFO_DATA device_data) +{ + struct DeviceInfoSet *set; + struct device *device = NULL, *enum_device; + WCHAR classW[40]; + GUID guid; + HKEY enumKey = NULL; + HKEY instanceKey = NULL; + DWORD phantom; + DWORD size; + DWORD error = ERROR_NO_SUCH_DEVINST; + + TRACE("%p %s %p 0x%08x %p\n", devinfo, debugstr_w(instance_id), hwnd_parent, flags, device_data); + + if (!(set = get_device_set(devinfo))) + return FALSE; + + if (!instance_id) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (hwnd_parent) + FIXME("hwnd_parent unsupported\n"); + + if (flags) + FIXME("flags unsupported: 0x%08x\n", flags); + + RegCreateKeyExW(HKEY_LOCAL_MACHINE, Enum, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &enumKey, NULL); + /* Instance needs to be already existent in registry, if not, report ERROR_NO_SUCH_DEVINST */ + if (RegOpenKeyExW(enumKey, instance_id, 0, KEY_READ, &instanceKey)) + goto done; + + /* If it's an unregistered instance, aka phantom instance, report ERROR_NO_SUCH_DEVINST */ + size = sizeof(phantom); + if (!RegQueryValueExW(instanceKey, Phantom, NULL, NULL, (BYTE *)&phantom, &size)) + goto done; + + /* Check class GUID */ + size = sizeof(classW); + if (RegQueryValueExW(instanceKey, ClassGUID, NULL, NULL, (BYTE *)classW, &size)) + goto done; + + classW[37] = 0; + UuidFromStringW(&classW[1], &guid); + + if (!IsEqualGUID(&set->ClassGuid, &GUID_NULL) && !IsEqualGUID(&guid, &set->ClassGuid)) + { + error = ERROR_CLASS_MISMATCH; + goto done; + } + + /* If current set already contains a same instance, don't create new ones */ + LIST_FOR_EACH_ENTRY(enum_device, &set->devices, struct device, entry) + { + if (!strcmpiW(instance_id, enum_device->instanceId)) + { + device = enum_device; + break; + } + } + + if (!device && !(device = SETUPDI_CreateDeviceInfo(set, &guid, instance_id, FALSE))) + goto done; + + if (!device_data || device_data->cbSize == sizeof(SP_DEVINFO_DATA)) + { + if (device_data) + copy_device_data(device_data, device); + error = NO_ERROR; + } + else + error = ERROR_INVALID_USER_BUFFER; + +done: + RegCloseKey(instanceKey); + RegCloseKey(enumKey); + SetLastError(error); + return !error; +} + /*********************************************************************** * SetupDiOpenDeviceInterfaceW (SETUPAPI.@) */ diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 4db32dd51c..b64c1a1316 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -322,17 +322,6 @@ BOOL WINAPI SetupDiOpenDeviceInfoA(HDEVINFO DeviceInfoSet, PCSTR DeviceInstanceI return FALSE; } -/*********************************************************************** - * SetupDiOpenDeviceInfoW (SETUPAPI.@) - */ -BOOL WINAPI SetupDiOpenDeviceInfoW(HDEVINFO DeviceInfoSet, PCWSTR DeviceInstanceId, - HWND hwndParent, DWORD OpenFlags, PSP_DEVINFO_DATA DeviceInfoData) -{ - FIXME("%p %s %p 0x%08x %p: stub\n", DeviceInfoSet, debugstr_w(DeviceInstanceId), - hwndParent, OpenFlags, DeviceInfoData); - return FALSE; -} - /*********************************************************************** * CM_Locate_DevNodeA (SETUPAPI.@) */ -- 2.19.2

1 0

[PATCH v2 2/8] setupapi: Set phantom value after device creation.
by Zhiyi Zhang 15 Mar '19

15 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/devinst.c | 4 ++++ dlls/setupapi/tests/devinst.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 2c95b5cfb9..331db87d06 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -723,6 +723,7 @@ static void delete_device(struct device *device) static struct device *SETUPDI_CreateDeviceInfo(struct DeviceInfoSet *set, const GUID *class, const WCHAR *instanceid, BOOL phantom) { + const DWORD one = 1; struct device *device; WCHAR guidstr[39]; @@ -752,6 +753,9 @@ static struct device *SETUPDI_CreateDeviceInfo(struct DeviceInfoSet *set, device->removed = FALSE; list_add_tail(&set->devices, &device->entry); + if (phantom) + RegSetValueExW(device->key, Phantom, 0, REG_DWORD, (const BYTE *)&one, sizeof(one)); + SETUPDI_GuidToString(class, guidstr); SETUPDI_SetDeviceRegistryPropertyW(device, SPDRP_CLASSGUID, (const BYTE *)guidstr, sizeof(guidstr)); diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 3add9b2502..75ac8fef5a 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -778,9 +778,9 @@ static void test_register_device_info(void) RegOpenKeyA(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Enum\\ROOT\\LEGACY_BOGUS\\0000", &hkey); size = sizeof(phantom); ls = RegQueryValueExA(hkey, "Phantom", NULL, &type, (BYTE *)&phantom, &size); - todo_wine ok(ls == ERROR_SUCCESS, "Got wrong error code %#x\n", ls); - todo_wine ok(phantom == 1, "Got wrong phantom value %d\n", phantom); - todo_wine ok(type == REG_DWORD, "Got wrong phantom type %#x\n", type); + ok(ls == ERROR_SUCCESS, "Got wrong error code %#x\n", ls); + ok(phantom == 1, "Got wrong phantom value %d\n", phantom); + ok(type == REG_DWORD, "Got wrong phantom type %#x\n", type); ok(size == sizeof(phantom), "Got wrong phantom size %d\n", size); ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); ok(ret, "Failed to register device, error %#x.\n", GetLastError()); -- 2.19.2

1 0

[PATCH v2 1/8] setupapi/tests: Test phantom value after device creation.
by Zhiyi Zhang 15 Mar '19

15 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 160879~160886. Add handling device set with null GUID and tests. dlls/setupapi/tests/devinst.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 004a956401..3add9b2502 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -742,6 +742,11 @@ static void test_register_device_info(void) SP_DEVINFO_DATA device = {0}; BOOL ret; HDEVINFO set; + HKEY hkey; + LSTATUS ls; + DWORD type = 0; + DWORD phantom = 0; + DWORD size; int i = 0; SetLastError(0xdeadbeef); @@ -770,8 +775,19 @@ static void test_register_device_info(void) ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device); ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + RegOpenKeyA(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Enum\\ROOT\\LEGACY_BOGUS\\0000", &hkey); + size = sizeof(phantom); + ls = RegQueryValueExA(hkey, "Phantom", NULL, &type, (BYTE *)&phantom, &size); + todo_wine ok(ls == ERROR_SUCCESS, "Got wrong error code %#x\n", ls); + todo_wine ok(phantom == 1, "Got wrong phantom value %d\n", phantom); + todo_wine ok(type == REG_DWORD, "Got wrong phantom type %#x\n", type); + ok(size == sizeof(phantom), "Got wrong phantom size %d\n", size); ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); ok(ret, "Failed to register device, error %#x.\n", GetLastError()); + size = sizeof(phantom); + ls = RegQueryValueExA(hkey, "Phantom", NULL, NULL, (BYTE *)&phantom, &size); + ok(ls == ERROR_FILE_NOT_FOUND, "Got wrong error code %#x\n", ls); + RegCloseKey(hkey); ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0001", &guid, NULL, NULL, 0, &device); ok(ret, "Failed to create device, error %#x.\n", GetLastError()); -- 2.19.2

1 0

[PATCH] d3dx9: Merge the d3dx_effect_SetValue() helper
by Michael Stefaniuc 15 Mar '19

15 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 147 +++++++++++++++++++---------------------- 1 file changed, 69 insertions(+), 78 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index d2a4804de2..6e2e453bc5 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1177,83 +1177,6 @@ static HRESULT set_string(char **param_data, const char *string) return D3D_OK; } -static HRESULT d3dx9_base_effect_set_value(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const void *data, UINT bytes) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - unsigned int i; - - if (!param) - { - WARN("Invalid parameter %p specified\n", parameter); - return D3DERR_INVALIDCALL; - } - - /* samplers don't touch data */ - if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) - { - TRACE("Sampler: returning E_FAIL\n"); - return E_FAIL; - } - - if (data && param->bytes <= bytes) - { - switch (param->type) - { - case D3DXPT_TEXTURE: - case D3DXPT_TEXTURE1D: - case D3DXPT_TEXTURE2D: - case D3DXPT_TEXTURE3D: - case D3DXPT_TEXTURECUBE: - for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) - { - IUnknown *old_texture = ((IUnknown **)param->data)[i]; - IUnknown *new_texture = ((IUnknown **)data)[i]; - - if (new_texture == old_texture) - continue; - - if (new_texture) - IUnknown_AddRef(new_texture); - if (old_texture) - IUnknown_Release(old_texture); - } - /* fallthrough */ - case D3DXPT_VOID: - case D3DXPT_BOOL: - case D3DXPT_INT: - case D3DXPT_FLOAT: - TRACE("Copy %u bytes.\n", param->bytes); - memcpy(param->data, data, param->bytes); - set_dirty(param); - break; - - case D3DXPT_STRING: - { - HRESULT hr; - - set_dirty(param); - for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) - { - if (FAILED(hr = set_string(&((char **)param->data)[i], ((const char **)data)[i]))) - return hr; - } - break; - } - - default: - FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(param->type)); - break; - } - - return D3D_OK; - } - - WARN("Invalid argument specified\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXVECTOR4 *vector) { @@ -2542,10 +2465,78 @@ static HRESULT WINAPI d3dx_effect_SetValue(ID3DXEffect *iface, D3DXHANDLE parame const void *data, UINT bytes) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + unsigned int i; TRACE("iface %p, parameter %p, data %p, bytes %u.\n", iface, parameter, data, bytes); - return d3dx9_base_effect_set_value(&effect->base_effect, parameter, data, bytes); + if (!param) + { + WARN("Invalid parameter %p specified.\n", parameter); + return D3DERR_INVALIDCALL; + } + + /* samplers don't touch data */ + if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) + { + TRACE("Sampler: returning E_FAIL.\n"); + return E_FAIL; + } + + if (data && param->bytes <= bytes) + { + switch (param->type) + { + case D3DXPT_TEXTURE: + case D3DXPT_TEXTURE1D: + case D3DXPT_TEXTURE2D: + case D3DXPT_TEXTURE3D: + case D3DXPT_TEXTURECUBE: + for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) + { + IUnknown *old_texture = ((IUnknown **)param->data)[i]; + IUnknown *new_texture = ((IUnknown **)data)[i]; + + if (new_texture == old_texture) + continue; + + if (new_texture) + IUnknown_AddRef(new_texture); + if (old_texture) + IUnknown_Release(old_texture); + } + /* fallthrough */ + case D3DXPT_VOID: + case D3DXPT_BOOL: + case D3DXPT_INT: + case D3DXPT_FLOAT: + TRACE("Copy %u bytes.\n", param->bytes); + memcpy(param->data, data, param->bytes); + set_dirty(param); + break; + + case D3DXPT_STRING: + { + HRESULT hr; + + set_dirty(param); + for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) + if (FAILED(hr = set_string(&((char **)param->data)[i], ((const char **)data)[i]))) + return hr; + break; + } + + default: + FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(param->type)); + break; + } + + return D3D_OK; + } + + WARN("Invalid argument specified.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetValue(ID3DXEffect *iface, D3DXHANDLE parameter, void *data, UINT bytes) -- 2.20.1

2 1

[PATCH 1/5] quartz/systemclock: Use the standard linked list implementation.
by Zebediah Figura 15 Mar '19

15 Mar '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/systemclock.c | 258 +++++++++++++++++++------------------- 1 file changed, 128 insertions(+), 130 deletions(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index e9f13b5130..d95bd3ab3a 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -26,14 +26,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); -typedef struct SystemClockAdviseEntry SystemClockAdviseEntry; -struct SystemClockAdviseEntry { - SystemClockAdviseEntry* next; - SystemClockAdviseEntry* prev; - - HANDLE hEvent; - REFERENCE_TIME rtBaseTime; - REFERENCE_TIME rtIntervalTime; +struct advise_sink +{ + struct list entry; + HANDLE hEvent; + REFERENCE_TIME rtBaseTime, rtIntervalTime; }; typedef struct SystemClockImpl { @@ -47,8 +44,8 @@ typedef struct SystemClockImpl { REFERENCE_TIME last_time; CRITICAL_SECTION safe; - SystemClockAdviseEntry* pSingleShotAdvise; - SystemClockAdviseEntry* pPeriodicAdvise; + /* These lists are ordered by expiration time (soonest first). */ + struct list single_sinks, periodic_sinks; } SystemClockImpl; static inline SystemClockImpl *impl_from_IReferenceClock(IReferenceClock *iface) @@ -56,34 +53,21 @@ static inline SystemClockImpl *impl_from_IReferenceClock(IReferenceClock *iface) return CONTAINING_RECORD(iface, SystemClockImpl, IReferenceClock_iface); } +static void insert_advise_sink(struct advise_sink *sink, struct list *queue) +{ + REFERENCE_TIME due_time = sink->rtBaseTime + sink->rtIntervalTime; + struct advise_sink *cursor; -static void QUARTZ_RemoveAviseEntryFromQueue(SystemClockImpl* This, SystemClockAdviseEntry* pEntry) { - if (pEntry->prev) pEntry->prev->next = pEntry->next; - if (pEntry->next) pEntry->next->prev = pEntry->prev; - if (This->pSingleShotAdvise == pEntry) This->pSingleShotAdvise = pEntry->next; - if (This->pPeriodicAdvise == pEntry) This->pPeriodicAdvise = pEntry->next; -} + LIST_FOR_EACH_ENTRY(cursor, queue, struct advise_sink, entry) + { + if (cursor->rtBaseTime + cursor->rtIntervalTime > due_time) + { + list_add_before(&cursor->entry, &sink->entry); + return; + } + } -static void QUARTZ_InsertAviseEntryFromQueue(SystemClockImpl* This, SystemClockAdviseEntry* pEntry, SystemClockAdviseEntry** pQueue) { - SystemClockAdviseEntry* prev_it = NULL; - SystemClockAdviseEntry* it = NULL; - REFERENCE_TIME bornTime = pEntry->rtBaseTime + pEntry->rtIntervalTime; - - for (it = *pQueue; NULL != it && (it->rtBaseTime + it->rtIntervalTime) < bornTime; it = it->next) { - prev_it = it; - } - if (NULL == prev_it) { - pEntry->prev = NULL; - if (NULL != (*pQueue)) pEntry->next = (*pQueue)->next; - /*assert( NULL == pEntry->next->prev );*/ - if (NULL != pEntry->next) pEntry->next->prev = pEntry; - (*pQueue) = pEntry; - } else { - pEntry->prev = prev_it; - pEntry->next = prev_it->next; - prev_it->next = pEntry; - if (NULL != pEntry->next) pEntry->next->prev = pEntry; - } + list_add_tail(queue, &sink->entry); } #define MAX_REFTIME (REFERENCE_TIME)(0x7FFFFFFFFFFFFFFF) @@ -94,12 +78,12 @@ static void QUARTZ_InsertAviseEntryFromQueue(SystemClockImpl* This, SystemClockA static DWORD WINAPI SystemClockAdviseThread(LPVOID lpParam) { SystemClockImpl* This = lpParam; + struct advise_sink *sink, *cursor; + struct list *entry; DWORD timeOut = INFINITE; - DWORD tmpTimeOut; MSG msg; HRESULT hr; REFERENCE_TIME curTime; - SystemClockAdviseEntry* it = NULL; TRACE("(%p): Main Loop\n", This); @@ -115,31 +99,33 @@ static DWORD WINAPI SystemClockAdviseThread(LPVOID lpParam) { } /** First SingleShots Advice: sorted list */ - it = This->pSingleShotAdvise; - while ((NULL != it) && (it->rtBaseTime + it->rtIntervalTime) <= curTime) { - SystemClockAdviseEntry* nextit = it->next; - /** send event ... */ - SetEvent(it->hEvent); - /** ... and Release it */ - QUARTZ_RemoveAviseEntryFromQueue(This, it); - heap_free(it); - it = nextit; + LIST_FOR_EACH_ENTRY_SAFE(sink, cursor, &This->single_sinks, struct advise_sink, entry) + { + if (sink->rtBaseTime + sink->rtIntervalTime > curTime) + break; + + SetEvent(sink->hEvent); + list_remove(&sink->entry); + heap_free(sink); + } + + if ((entry = list_head(&This->single_sinks))) + { + sink = LIST_ENTRY(entry, struct advise_sink, entry); + timeOut = (sink->rtBaseTime + sink->rtIntervalTime - curTime) / 10000; } - if (NULL != it) timeOut = (DWORD) ((it->rtBaseTime + it->rtIntervalTime) - curTime) / (REFERENCE_TIME)10000; else timeOut = INFINITE; /** Now Periodics Advice: semi sorted list (sort cannot be used) */ - for (it = This->pPeriodicAdvise; NULL != it; it = it->next) { - if (it->rtBaseTime <= curTime) { - DWORD nPeriods = (DWORD) ((curTime - it->rtBaseTime) / it->rtIntervalTime); - /** Release the semaphore ... */ - ReleaseSemaphore(it->hEvent, nPeriods, NULL); - /** ... and refresh time */ - it->rtBaseTime += nPeriods * it->rtIntervalTime; - /*assert( it->rtBaseTime + it->rtIntervalTime < curTime );*/ + LIST_FOR_EACH_ENTRY(sink, &This->periodic_sinks, struct advise_sink, entry) + { + if (sink->rtBaseTime <= curTime) + { + DWORD periods = (curTime - sink->rtBaseTime) / sink->rtIntervalTime; + ReleaseSemaphore(sink->hEvent, periods, NULL); + sink->rtBaseTime += periods * sink->rtIntervalTime; } - tmpTimeOut = (DWORD) ((it->rtBaseTime + it->rtIntervalTime) - curTime) / (REFERENCE_TIME)10000; - if (timeOut > tmpTimeOut) timeOut = tmpTimeOut; + timeOut = min(timeOut, ((sink->rtBaseTime + sink->rtIntervalTime) - curTime) / 10000); } outrefresh: @@ -263,101 +249,112 @@ static HRESULT WINAPI SystemClockImpl_GetTime(IReferenceClock *iface, REFERENCE_ return hr; } -static HRESULT WINAPI SystemClockImpl_AdviseTime(IReferenceClock* iface, REFERENCE_TIME rtBaseTime, REFERENCE_TIME rtStreamTime, HEVENT hEvent, DWORD_PTR* pdwAdviseCookie) { - SystemClockImpl *This = impl_from_IReferenceClock(iface); - SystemClockAdviseEntry* pEntry = NULL; +static HRESULT WINAPI SystemClockImpl_AdviseTime(IReferenceClock *iface, + REFERENCE_TIME base, REFERENCE_TIME offset, HEVENT event, DWORD_PTR *cookie) +{ + SystemClockImpl *clock = impl_from_IReferenceClock(iface); + struct advise_sink *sink; - TRACE("(%p, 0x%s, 0x%s, %ld, %p)\n", This, wine_dbgstr_longlong(rtBaseTime), - wine_dbgstr_longlong(rtStreamTime), hEvent, pdwAdviseCookie); + TRACE("clock %p, base %s, offset %s, event %#lx, cookie %p.\n", + clock, wine_dbgstr_longlong(base), wine_dbgstr_longlong(offset), event, cookie); - if (!hEvent) { - return E_INVALIDARG; - } - if (0 >= rtBaseTime + rtStreamTime) { - return E_INVALIDARG; - } - if (NULL == pdwAdviseCookie) { - return E_POINTER; - } + if (!event) + return E_INVALIDARG; - if (!(pEntry = heap_alloc_zero(sizeof(*pEntry)))) - return E_OUTOFMEMORY; + if (base + offset <= 0) + return E_INVALIDARG; - pEntry->hEvent = (HANDLE) hEvent; - pEntry->rtBaseTime = rtBaseTime + rtStreamTime; - pEntry->rtIntervalTime = 0; + if (!cookie) + return E_POINTER; - EnterCriticalSection(&This->safe); - QUARTZ_InsertAviseEntryFromQueue(This, pEntry, &This->pSingleShotAdvise); - LeaveCriticalSection(&This->safe); + if (!(sink = heap_alloc_zero(sizeof(*sink)))) + return E_OUTOFMEMORY; - SystemClockPostMessageToAdviseThread(This, ADVISE_ADD_SINGLESHOT); + sink->hEvent = (HANDLE)event; + sink->rtBaseTime = base + offset; + sink->rtIntervalTime = 0; - *pdwAdviseCookie = (DWORD_PTR) (pEntry); - return S_OK; + EnterCriticalSection(&clock->safe); + insert_advise_sink(sink, &clock->single_sinks); + LeaveCriticalSection(&clock->safe); + + SystemClockPostMessageToAdviseThread(clock, ADVISE_ADD_SINGLESHOT); + + *cookie = (DWORD_PTR)sink; + return S_OK; } -static HRESULT WINAPI SystemClockImpl_AdvisePeriodic(IReferenceClock* iface, REFERENCE_TIME rtStartTime, REFERENCE_TIME rtPeriodTime, HSEMAPHORE hSemaphore, DWORD_PTR* pdwAdviseCookie) { - SystemClockImpl *This = impl_from_IReferenceClock(iface); - SystemClockAdviseEntry* pEntry = NULL; +static HRESULT WINAPI SystemClockImpl_AdvisePeriodic(IReferenceClock* iface, + REFERENCE_TIME start, REFERENCE_TIME period, HSEMAPHORE semaphore, DWORD_PTR *cookie) +{ + SystemClockImpl *clock = impl_from_IReferenceClock(iface); + struct advise_sink *sink; - TRACE("(%p, 0x%s, 0x%s, %ld, %p)\n", This, wine_dbgstr_longlong(rtStartTime), - wine_dbgstr_longlong(rtPeriodTime), hSemaphore, pdwAdviseCookie); + TRACE("clock %p, start %s, period %s, semaphore %#lx, cookie %p.\n", + clock, wine_dbgstr_longlong(start), wine_dbgstr_longlong(period), semaphore, cookie); - if (!hSemaphore) { - return E_INVALIDARG; - } - if (0 >= rtStartTime || 0 >= rtPeriodTime) { - return E_INVALIDARG; - } - if (NULL == pdwAdviseCookie) { - return E_POINTER; - } + if (!semaphore) + return E_INVALIDARG; - if (!(pEntry = heap_alloc_zero(sizeof(*pEntry)))) - return E_OUTOFMEMORY; + if (start <= 0 || period <= 0) + return E_INVALIDARG; - pEntry->hEvent = (HANDLE) hSemaphore; - pEntry->rtBaseTime = rtStartTime; - pEntry->rtIntervalTime = rtPeriodTime; + if (!cookie) + return E_POINTER; - EnterCriticalSection(&This->safe); - QUARTZ_InsertAviseEntryFromQueue(This, pEntry, &This->pPeriodicAdvise); - LeaveCriticalSection(&This->safe); + if (!(sink = heap_alloc_zero(sizeof(*sink)))) + return E_OUTOFMEMORY; - SystemClockPostMessageToAdviseThread(This, ADVISE_ADD_PERIODIC); + sink->hEvent = (HANDLE)semaphore; + sink->rtBaseTime = start; + sink->rtIntervalTime = period; - *pdwAdviseCookie = (DWORD_PTR) (pEntry); - return S_OK; + EnterCriticalSection(&clock->safe); + insert_advise_sink(sink, &clock->periodic_sinks); + LeaveCriticalSection(&clock->safe); + + SystemClockPostMessageToAdviseThread(clock, ADVISE_ADD_PERIODIC); + + *cookie = (DWORD_PTR)sink; + return S_OK; } -static HRESULT WINAPI SystemClockImpl_Unadvise(IReferenceClock* iface, DWORD_PTR dwAdviseCookie) { - SystemClockImpl *This = impl_from_IReferenceClock(iface); - SystemClockAdviseEntry* pEntry = NULL; - SystemClockAdviseEntry* it = NULL; - HRESULT ret = S_OK; - TRACE("(%p, %lu)\n", This, dwAdviseCookie); +static HRESULT WINAPI SystemClockImpl_Unadvise(IReferenceClock *iface, DWORD_PTR cookie) +{ + SystemClockImpl *clock = impl_from_IReferenceClock(iface); + struct advise_sink *sink; - pEntry = (SystemClockAdviseEntry*) dwAdviseCookie; + TRACE("clock %p, cookie %#lx.\n", clock, cookie); - EnterCriticalSection(&This->safe); - for (it = This->pPeriodicAdvise; NULL != it && it != pEntry; it = it->next) ; - if (it != pEntry) { - for (it = This->pSingleShotAdvise; NULL != it && it != pEntry; it = it->next) ; - if (it != pEntry) { - ret = S_FALSE; - goto out; + EnterCriticalSection(&clock->safe); + + LIST_FOR_EACH_ENTRY(sink, &clock->single_sinks, struct advise_sink, entry) + { + if (sink == (struct advise_sink *)cookie) + { + list_remove(&sink->entry); + heap_free(sink); + SystemClockPostMessageToAdviseThread(clock, ADVISE_REMOVE); + LeaveCriticalSection(&clock->safe); + return S_OK; + } } - } - QUARTZ_RemoveAviseEntryFromQueue(This, pEntry); - heap_free(pEntry); + LIST_FOR_EACH_ENTRY(sink, &clock->periodic_sinks, struct advise_sink, entry) + { + if (sink == (struct advise_sink *)cookie) + { + list_remove(&sink->entry); + heap_free(sink); + SystemClockPostMessageToAdviseThread(clock, ADVISE_REMOVE); + LeaveCriticalSection(&clock->safe); + return S_OK; + } + } - SystemClockPostMessageToAdviseThread(This, ADVISE_REMOVE); + LeaveCriticalSection(&clock->safe); -out: - LeaveCriticalSection(&This->safe); - return ret; + return S_FALSE; } static const IReferenceClockVtbl SystemClock_Vtbl = @@ -384,7 +381,8 @@ HRESULT QUARTZ_CreateSystemClock(IUnknown *outer, void **out) } object->IReferenceClock_iface.lpVtbl = &SystemClock_Vtbl; - + list_init(&object->single_sinks); + list_init(&object->periodic_sinks); InitializeCriticalSection(&object->safe); object->safe.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SystemClockImpl.safe"); -- 2.20.1

2 5

[PATCH 2/6] d3dx9: Merge the d3dx_effect_SetValue() helper
by Michael Stefaniuc 15 Mar '19

15 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 147 +++++++++++++++++++---------------------- 1 file changed, 69 insertions(+), 78 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index d2a4804de2..6e2e453bc5 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1177,83 +1177,6 @@ static HRESULT set_string(char **param_data, const char *string) return D3D_OK; } -static HRESULT d3dx9_base_effect_set_value(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const void *data, UINT bytes) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - unsigned int i; - - if (!param) - { - WARN("Invalid parameter %p specified\n", parameter); - return D3DERR_INVALIDCALL; - } - - /* samplers don't touch data */ - if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) - { - TRACE("Sampler: returning E_FAIL\n"); - return E_FAIL; - } - - if (data && param->bytes <= bytes) - { - switch (param->type) - { - case D3DXPT_TEXTURE: - case D3DXPT_TEXTURE1D: - case D3DXPT_TEXTURE2D: - case D3DXPT_TEXTURE3D: - case D3DXPT_TEXTURECUBE: - for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) - { - IUnknown *old_texture = ((IUnknown **)param->data)[i]; - IUnknown *new_texture = ((IUnknown **)data)[i]; - - if (new_texture == old_texture) - continue; - - if (new_texture) - IUnknown_AddRef(new_texture); - if (old_texture) - IUnknown_Release(old_texture); - } - /* fallthrough */ - case D3DXPT_VOID: - case D3DXPT_BOOL: - case D3DXPT_INT: - case D3DXPT_FLOAT: - TRACE("Copy %u bytes.\n", param->bytes); - memcpy(param->data, data, param->bytes); - set_dirty(param); - break; - - case D3DXPT_STRING: - { - HRESULT hr; - - set_dirty(param); - for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) - { - if (FAILED(hr = set_string(&((char **)param->data)[i], ((const char **)data)[i]))) - return hr; - } - break; - } - - default: - FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(param->type)); - break; - } - - return D3D_OK; - } - - WARN("Invalid argument specified\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXVECTOR4 *vector) { @@ -2542,10 +2465,78 @@ static HRESULT WINAPI d3dx_effect_SetValue(ID3DXEffect *iface, D3DXHANDLE parame const void *data, UINT bytes) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + unsigned int i; TRACE("iface %p, parameter %p, data %p, bytes %u.\n", iface, parameter, data, bytes); - return d3dx9_base_effect_set_value(&effect->base_effect, parameter, data, bytes); + if (!param) + { + WARN("Invalid parameter %p specified.\n", parameter); + return D3DERR_INVALIDCALL; + } + + /* samplers don't touch data */ + if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) + { + TRACE("Sampler: returning E_FAIL.\n"); + return E_FAIL; + } + + if (data && param->bytes <= bytes) + { + switch (param->type) + { + case D3DXPT_TEXTURE: + case D3DXPT_TEXTURE1D: + case D3DXPT_TEXTURE2D: + case D3DXPT_TEXTURE3D: + case D3DXPT_TEXTURECUBE: + for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) + { + IUnknown *old_texture = ((IUnknown **)param->data)[i]; + IUnknown *new_texture = ((IUnknown **)data)[i]; + + if (new_texture == old_texture) + continue; + + if (new_texture) + IUnknown_AddRef(new_texture); + if (old_texture) + IUnknown_Release(old_texture); + } + /* fallthrough */ + case D3DXPT_VOID: + case D3DXPT_BOOL: + case D3DXPT_INT: + case D3DXPT_FLOAT: + TRACE("Copy %u bytes.\n", param->bytes); + memcpy(param->data, data, param->bytes); + set_dirty(param); + break; + + case D3DXPT_STRING: + { + HRESULT hr; + + set_dirty(param); + for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) + if (FAILED(hr = set_string(&((char **)param->data)[i], ((const char **)data)[i]))) + return hr; + break; + } + + default: + FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(param->type)); + break; + } + + return D3D_OK; + } + + WARN("Invalid argument specified.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetValue(ID3DXEffect *iface, D3DXHANDLE parameter, void *data, UINT bytes) -- 2.20.1

1 0

[PATCH 1/6] d3dx9: Merge the d3dx_effect_GetValue() helper
by Michael Stefaniuc 15 Mar '19

15 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Resending as patch series dlls/d3dx9_36/effect.c | 124 ++++++++++++++++++++--------------------- 1 file changed, 59 insertions(+), 65 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 68714f7ebb..d2a4804de2 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1254,70 +1254,6 @@ static HRESULT d3dx9_base_effect_set_value(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_value(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, void *data, UINT bytes) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (!param) - { - WARN("Invalid parameter %p specified\n", parameter); - return D3DERR_INVALIDCALL; - } - - /* samplers don't touch data */ - if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) - { - TRACE("Sampler: returning E_FAIL\n"); - return E_FAIL; - } - - if (data && param->bytes <= bytes) - { - TRACE("Type %s\n", debug_d3dxparameter_type(param->type)); - - switch (param->type) - { - case D3DXPT_VOID: - case D3DXPT_BOOL: - case D3DXPT_INT: - case D3DXPT_FLOAT: - case D3DXPT_STRING: - break; - - case D3DXPT_VERTEXSHADER: - case D3DXPT_PIXELSHADER: - case D3DXPT_TEXTURE: - case D3DXPT_TEXTURE1D: - case D3DXPT_TEXTURE2D: - case D3DXPT_TEXTURE3D: - case D3DXPT_TEXTURECUBE: - { - UINT i; - - for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) - { - IUnknown *unk = ((IUnknown **)param->data)[i]; - if (unk) IUnknown_AddRef(unk); - } - break; - } - - default: - FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type)); - break; - } - - TRACE("Copy %u bytes\n", param->bytes); - memcpy(data, param->data, param->bytes); - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXVECTOR4 *vector) { @@ -2615,10 +2551,68 @@ static HRESULT WINAPI d3dx_effect_SetValue(ID3DXEffect *iface, D3DXHANDLE parame static HRESULT WINAPI d3dx_effect_GetValue(ID3DXEffect *iface, D3DXHANDLE parameter, void *data, UINT bytes) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, data %p, bytes %u.\n", iface, parameter, data, bytes); - return d3dx9_base_effect_get_value(&effect->base_effect, parameter, data, bytes); + if (!param) + { + WARN("Invalid parameter %p specified.\n", parameter); + return D3DERR_INVALIDCALL; + } + + /* samplers don't touch data */ + if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) + { + TRACE("Sampler: returning E_FAIL.\n"); + return E_FAIL; + } + + if (data && param->bytes <= bytes) + { + TRACE("Type %s.\n", debug_d3dxparameter_type(param->type)); + + switch (param->type) + { + case D3DXPT_VOID: + case D3DXPT_BOOL: + case D3DXPT_INT: + case D3DXPT_FLOAT: + case D3DXPT_STRING: + break; + + case D3DXPT_VERTEXSHADER: + case D3DXPT_PIXELSHADER: + case D3DXPT_TEXTURE: + case D3DXPT_TEXTURE1D: + case D3DXPT_TEXTURE2D: + case D3DXPT_TEXTURE3D: + case D3DXPT_TEXTURECUBE: + { + unsigned int i; + + for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) + { + IUnknown *unk = ((IUnknown **)param->data)[i]; + if (unk) + IUnknown_AddRef(unk); + } + break; + } + + default: + FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(param->type)); + break; + } + + TRACE("Copy %u bytes.\n", param->bytes); + memcpy(data, param->data, param->bytes); + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL b) -- 2.20.1

1 0

[PATCH] d3dx9: Merge the d3dx_effect_GetVector() helper
by Michael Stefaniuc 15 Mar '19

15 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 77 +++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 42 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 6e2e453bc5..9e5da7fe98 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1229,47 +1229,6 @@ static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_vector(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, D3DXVECTOR4 *vector) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (vector && param && !param->element_count) - { - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - if (param->type == D3DXPT_INT && param->bytes == 4) - { - TRACE("INT fixup\n"); - vector->x = (((*(INT *)param->data) & 0xff0000) >> 16) * INT_FLOAT_MULTI_INVERSE; - vector->y = (((*(INT *)param->data) & 0xff00) >> 8) * INT_FLOAT_MULTI_INVERSE; - vector->z = ((*(INT *)param->data) & 0xff) * INT_FLOAT_MULTI_INVERSE; - vector->w = (((*(INT *)param->data) & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE; - return D3D_OK; - } - get_vector(param, vector); - return D3D_OK; - - case D3DXPC_MATRIX_ROWS: - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_vector_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXVECTOR4 *vector, UINT count) { @@ -2970,10 +2929,44 @@ static HRESULT WINAPI d3dx_effect_SetVector(ID3DXEffect *iface, D3DXHANDLE param static HRESULT WINAPI d3dx_effect_GetVector(ID3DXEffect *iface, D3DXHANDLE parameter, D3DXVECTOR4 *vector) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, vector %p.\n", iface, parameter, vector); - return d3dx9_base_effect_get_vector(&effect->base_effect, parameter, vector); + if (vector && param && !param->element_count) + { + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + if (param->type == D3DXPT_INT && param->bytes == 4) + { + TRACE("INT fixup.\n"); + vector->x = (((*(int *)param->data) & 0xff0000) >> 16) * INT_FLOAT_MULTI_INVERSE; + vector->y = (((*(int *)param->data) & 0xff00) >> 8) * INT_FLOAT_MULTI_INVERSE; + vector->z = ((*(int *)param->data) & 0xff) * INT_FLOAT_MULTI_INVERSE; + vector->w = (((*(int *)param->data) & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE; + return D3D_OK; + } + get_vector(param, vector); + return D3D_OK; + + case D3DXPC_MATRIX_ROWS: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetVectorArray(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

1 0

[PATCH] d3dx9: Merge the d3dx_effect_GetValue() helper
by Michael Stefaniuc 15 Mar '19

15 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 124 ++++++++++++++++++++--------------------- 1 file changed, 59 insertions(+), 65 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 68714f7ebb..d2a4804de2 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1254,70 +1254,6 @@ static HRESULT d3dx9_base_effect_set_value(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_value(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, void *data, UINT bytes) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (!param) - { - WARN("Invalid parameter %p specified\n", parameter); - return D3DERR_INVALIDCALL; - } - - /* samplers don't touch data */ - if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) - { - TRACE("Sampler: returning E_FAIL\n"); - return E_FAIL; - } - - if (data && param->bytes <= bytes) - { - TRACE("Type %s\n", debug_d3dxparameter_type(param->type)); - - switch (param->type) - { - case D3DXPT_VOID: - case D3DXPT_BOOL: - case D3DXPT_INT: - case D3DXPT_FLOAT: - case D3DXPT_STRING: - break; - - case D3DXPT_VERTEXSHADER: - case D3DXPT_PIXELSHADER: - case D3DXPT_TEXTURE: - case D3DXPT_TEXTURE1D: - case D3DXPT_TEXTURE2D: - case D3DXPT_TEXTURE3D: - case D3DXPT_TEXTURECUBE: - { - UINT i; - - for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) - { - IUnknown *unk = ((IUnknown **)param->data)[i]; - if (unk) IUnknown_AddRef(unk); - } - break; - } - - default: - FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type)); - break; - } - - TRACE("Copy %u bytes\n", param->bytes); - memcpy(data, param->data, param->bytes); - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXVECTOR4 *vector) { @@ -2615,10 +2551,68 @@ static HRESULT WINAPI d3dx_effect_SetValue(ID3DXEffect *iface, D3DXHANDLE parame static HRESULT WINAPI d3dx_effect_GetValue(ID3DXEffect *iface, D3DXHANDLE parameter, void *data, UINT bytes) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, data %p, bytes %u.\n", iface, parameter, data, bytes); - return d3dx9_base_effect_get_value(&effect->base_effect, parameter, data, bytes); + if (!param) + { + WARN("Invalid parameter %p specified.\n", parameter); + return D3DERR_INVALIDCALL; + } + + /* samplers don't touch data */ + if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) + { + TRACE("Sampler: returning E_FAIL.\n"); + return E_FAIL; + } + + if (data && param->bytes <= bytes) + { + TRACE("Type %s.\n", debug_d3dxparameter_type(param->type)); + + switch (param->type) + { + case D3DXPT_VOID: + case D3DXPT_BOOL: + case D3DXPT_INT: + case D3DXPT_FLOAT: + case D3DXPT_STRING: + break; + + case D3DXPT_VERTEXSHADER: + case D3DXPT_PIXELSHADER: + case D3DXPT_TEXTURE: + case D3DXPT_TEXTURE1D: + case D3DXPT_TEXTURE2D: + case D3DXPT_TEXTURE3D: + case D3DXPT_TEXTURECUBE: + { + unsigned int i; + + for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) + { + IUnknown *unk = ((IUnknown **)param->data)[i]; + if (unk) + IUnknown_AddRef(unk); + } + break; + } + + default: + FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(param->type)); + break; + } + + TRACE("Copy %u bytes.\n", param->bytes); + memcpy(data, param->data, param->bytes); + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL b) -- 2.20.1

1 0

[PATCH] cmd: Remove useless cast to self
by Michael Stefaniuc 14 Mar '19

14 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/directory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 435e0f36ed..1576ab7de5 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -337,7 +337,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le /* Work out the number of columns */ WINE_TRACE("%d entries, maxwidth=%d, widest=%d\n", entry_count, max_width, widest); if (wide || orderByCol) { - numCols = max(1, (int)max_width / widest); + numCols = max(1, max_width / widest); numRows = entry_count / numCols; if (entry_count % numCols) numRows++; } else { -- 2.20.1

1 0

[PATCH] mfreadwrite: Remove useless cast to self
by Michael Stefaniuc 14 Mar '19

14 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mfreadwrite/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index f3fd3b293d..034d5f8960 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -318,7 +318,7 @@ static HRESULT create_source_reader_from_url(const WCHAR *url, IMFAttributes *at return hr; hr = IMFSourceResolver_CreateObjectFromURL(resolver, url, MF_RESOLUTION_MEDIASOURCE, NULL, &obj_type, - (IUnknown **)&object); + &object); if (SUCCEEDED(hr)) { switch (obj_type) -- 2.20.1

1 0

[PATCH v2 1/5] d3d9/tests: Fix test_window_style() D3D9Ex test on current Windows 10.
by Matteo Bruni 14 Mar '19

14 Mar '19

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Update todo_wine(). dlls/d3d9/tests/d3d9ex.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 7f46ced137d..306241a7118 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -3519,10 +3519,12 @@ static void test_window_style(void) } style = GetWindowLongA(device_window, GWL_STYLE); - todo_wine ok(style == device_style, "Expected device window style %#x, got %#x, i=%u.\n", + todo_wine ok((style & ~WS_OVERLAPPEDWINDOW) == (device_style & ~WS_OVERLAPPEDWINDOW), + "Expected device window style %#x, got %#x, i=%u.\n", device_style, style, i); style = GetWindowLongA(device_window, GWL_EXSTYLE); - todo_wine ok(style == device_exstyle, "Expected device window extended style %#x, got %#x, i=%u.\n", + todo_wine ok((style & ~WS_EX_OVERLAPPEDWINDOW) == (device_exstyle & ~WS_EX_OVERLAPPEDWINDOW), + "Expected device window extended style %#x, got %#x, i=%u.\n", device_exstyle, style, i); style = GetWindowLongA(focus_window, GWL_STYLE); @@ -3540,7 +3542,8 @@ static void test_window_style(void) ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s, i=%u.\n", wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r), i); GetClientRect(device_window, &r2); - todo_wine ok(!EqualRect(&r, &r2), "Client rect and window rect are equal, i=%u.\n", i); + if (!(device_style & WS_OVERLAPPEDWINDOW)) + ok(!EqualRect(&r, &r2), "Client rect and window rect are equal, i=%u.\n", i); GetWindowRect(focus_window, &r); ok(EqualRect(&r, &focus_rect), "Expected %s, got %s, i=%u.\n", wine_dbgstr_rect(&focus_rect), wine_dbgstr_rect(&r), i); @@ -3589,11 +3592,14 @@ static void test_window_style(void) ok(!!device, "Failed to create a D3D device.\n"); style = GetWindowLongA(device_window, GWL_STYLE); expected_style = device_style | tests[i].create2_style; - todo_wine ok(style == expected_style, "Expected device window style %#x, got %#x, i=%u.\n", + todo_wine ok((style & ~WS_OVERLAPPEDWINDOW) == (expected_style & ~WS_OVERLAPPEDWINDOW), + "Expected device window style %#x, got %#x, i=%u.\n", expected_style, style, i); expected_style = device_exstyle | tests[i].create2_exstyle; style = GetWindowLongA(device_window, GWL_EXSTYLE); - todo_wine ok(style == expected_style, "Expected device window extended style %#x, got %#x, i=%u.\n", + todo_wine_if (tests[i].device_flags & CREATE_DEVICE_NOWINDOWCHANGES) + ok((style & ~WS_EX_OVERLAPPEDWINDOW) == (expected_style & ~WS_EX_OVERLAPPEDWINDOW), + "Expected device window extended style %#x, got %#x, i=%u.\n", expected_style, style, i); style = GetWindowLongA(focus_window, GWL_STYLE); -- 2.19.2

3 12

[PATCH v3 8/8] user32/tests: Use calculated EC_USEFONTINFO margins in the CJK case.
by Akihiro Sagawa 14 Mar '19

14 Mar '19

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

2 1

[PATCH v3 6/8] user32/tests: Tests default margin size with various font face.
by Akihiro Sagawa 14 Mar '19

14 Mar '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/edit.c | 71 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 47 insertions(+), 24 deletions(-)

2 1

[PATCH v3 5/8] user32/tests: Add Unicode version tests for Edit control margins.
by Akihiro Sagawa 14 Mar '19

14 Mar '19

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

2 1

[PATCH v3 4/8] user32/tests: Move the default margin size tests into a separate function.
by Akihiro Sagawa 14 Mar '19

14 Mar '19

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

2 1

[PATCH 2/2] configure: Require libvkd3d 1.1.
by Józef Kucia 14 Mar '19

14 Mar '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46835 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 87d8bf582bb9..744bf61ec98c 100644 --- a/configure.ac +++ b/configure.ac @@ -1873,10 +1873,10 @@ dnl **** Check for vkd3d **** if test "x$with_vkd3d" != "xno" then WINE_PACKAGE_FLAGS(VKD3D,[libvkd3d],,,, - [WINE_CHECK_SONAME(vkd3d,vkd3d_create_device,,,[$VKD3D_LIBS])]) + [WINE_CHECK_SONAME(vkd3d,vkd3d_get_dxgi_format,,,[$VKD3D_LIBS])]) fi WINE_NOTICE_WITH(vkd3d,[test "x$ac_cv_lib_soname_vkd3d" = "x"], - [vkd3d ${notice_platform}development files not found, Direct3D 12 won't be supported.]) + [vkd3d ${notice_platform}development files not found (or too old), Direct3D 12 won't be supported.]) test "x$ac_cv_lib_soname_vkd3d" != "x" || enable_d3d12=${enable_d3d12:-no} dnl **** Check for gcc specific options **** -- 2.19.2

3 2

[PATCH 1/2] dxgi: Do not forward d3d12_swapchain_Present() to d3d12_swapchain_Present1().
by Józef Kucia 14 Mar '19

14 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 343 +++++++++++++++++++++--------------------- 1 file changed, 175 insertions(+), 168 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 704b03c8a6ea..4c6217e52a15 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1799,13 +1799,186 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetDevice(IDXGISwapChain3 *ifac /* IDXGISwapChain methods */ +static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapchain, + unsigned int sync_interval) +{ + VkPresentModeKHR present_mode; + + switch (sync_interval) + { + case 0: + present_mode = VK_PRESENT_MODE_IMMEDIATE_KHR; + break; + default: + FIXME("Unsupported sync interval %u.\n", sync_interval); + case 1: + present_mode = VK_PRESENT_MODE_FIFO_KHR; + break; + } + + if (swapchain->present_mode == present_mode) + return S_OK; + + /* + * We recreate the swapchain only when the current buffer index is 0, in order to preserve the + * expected back buffer index sequence. + */ + if (swapchain->current_buffer_index) + { + WARN("Skipping sync interval change, current buffer index %u.\n", swapchain->current_buffer_index); + return S_OK; + } + + if (!d3d12_swapchain_has_user_images(swapchain)) + { + FIXME("Cannot recreate swapchain without user images.\n"); + return S_OK; + } + + if (!d3d12_swapchain_is_present_mode_supported(swapchain, present_mode)) + { + FIXME("Vulkan present mode %#x is not supported.\n", present_mode); + return S_OK; + } + + d3d12_swapchain_destroy_buffers(swapchain, FALSE); + swapchain->present_mode = present_mode; + return d3d12_swapchain_recreate_vulkan_swapchain(swapchain); +} + +static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, VkQueue vk_queue) +{ + const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; + VkPresentInfoKHR present_info; + VkSubmitInfo submit_info; + VkResult vr; + + present_info.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR; + present_info.pNext = NULL; + present_info.waitSemaphoreCount = 0; + present_info.pWaitSemaphores = NULL; + present_info.swapchainCount = 1; + present_info.pSwapchains = &swapchain->vk_swapchain; + present_info.pImageIndices = &swapchain->current_buffer_index; + present_info.pResults = NULL; + + if (d3d12_swapchain_has_user_images(swapchain)) + { + /* blit */ + submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; + submit_info.pNext = NULL; + submit_info.waitSemaphoreCount = 0; + submit_info.pWaitSemaphores = NULL; + submit_info.pWaitDstStageMask = NULL; + submit_info.commandBufferCount = 1; + submit_info.pCommandBuffers = &swapchain->vk_cmd_buffers[swapchain->current_buffer_index]; + submit_info.signalSemaphoreCount = 1; + submit_info.pSignalSemaphores = &swapchain->vk_semaphores[swapchain->current_buffer_index]; + + if ((vr = vk_funcs->p_vkQueueSubmit(vk_queue, 1, &submit_info, VK_NULL_HANDLE)) < 0) + { + ERR("Failed to blit swapchain buffer, vr %d.\n", vr); + return vr; + } + + present_info.waitSemaphoreCount = 1; + present_info.pWaitSemaphores = &swapchain->vk_semaphores[swapchain->current_buffer_index]; + } + + return vk_funcs->p_vkQueuePresentKHR(vk_queue, &present_info); +} + +static HRESULT d3d12_swapchain_present(struct d3d12_swapchain *swapchain, + unsigned int sync_interval, unsigned int flags) +{ + VkQueue vk_queue; + VkResult vr; + HRESULT hr; + + if (sync_interval > 4) + { + WARN("Invalid sync interval %u.\n", sync_interval); + return DXGI_ERROR_INVALID_CALL; + } + + if (flags & ~DXGI_PRESENT_TEST) + FIXME("Unimplemented flags %#x.\n", flags); + if (flags & DXGI_PRESENT_TEST) + { + WARN("Returning S_OK for DXGI_PRESENT_TEST.\n"); + return S_OK; + } + + if (FAILED(hr = d3d12_swapchain_set_sync_interval(swapchain, sync_interval))) + return hr; + + if (!(vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue))) + { + ERR("Failed to acquire Vulkan queue.\n"); + return E_FAIL; + } + + vr = d3d12_swapchain_queue_present(swapchain, vk_queue); + if (vr == VK_ERROR_OUT_OF_DATE_KHR) + { + vkd3d_release_vk_queue(swapchain->command_queue); + + if (!d3d12_swapchain_has_user_images(swapchain)) + { + FIXME("Cannot recreate swapchain without user images.\n"); + return DXGI_STATUS_MODE_CHANGED; + } + + TRACE("Recreating Vulkan swapchain.\n"); + + d3d12_swapchain_destroy_buffers(swapchain, FALSE); + if (FAILED(hr = d3d12_swapchain_recreate_vulkan_swapchain(swapchain))) + return hr; + + if (!(vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue))) + { + ERR("Failed to acquire Vulkan queue.\n"); + return E_FAIL; + } + + if ((vr = d3d12_swapchain_queue_present(swapchain, vk_queue)) < 0) + ERR("Failed to present after recreating swapchain, vr %d.\n", vr); + } + + vkd3d_release_vk_queue(swapchain->command_queue); + + if (vr < 0) + { + ERR("Failed to queue present, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + + vr = d3d12_swapchain_acquire_next_image(swapchain); + if (vr == VK_ERROR_OUT_OF_DATE_KHR) + { + if (!d3d12_swapchain_has_user_images(swapchain)) + { + FIXME("Cannot recreate swapchain without user images.\n"); + return DXGI_STATUS_MODE_CHANGED; + } + + TRACE("Recreating Vulkan swapchain.\n"); + + d3d12_swapchain_destroy_buffers(swapchain, FALSE); + return d3d12_swapchain_recreate_vulkan_swapchain(swapchain); + } + if (vr < 0) + ERR("Failed to acquire next Vulkan image, vr %d.\n", vr); + return hresult_from_vk_result(vr); +} + static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present(IDXGISwapChain3 *iface, UINT sync_interval, UINT flags) { struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); TRACE("iface %p, sync_interval %u, flags %#x.\n", iface, sync_interval, flags); - return IDXGISwapChain3_Present1(&swapchain->IDXGISwapChain3_iface, sync_interval, flags, NULL); + return d3d12_swapchain_present(swapchain, sync_interval, flags); } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetBuffer(IDXGISwapChain3 *iface, @@ -2045,184 +2218,18 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetCoreWindow(IDXGISwapChain3 * return DXGI_ERROR_INVALID_CALL; } -static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapchain, - unsigned int sync_interval) -{ - VkPresentModeKHR present_mode; - - switch (sync_interval) - { - case 0: - present_mode = VK_PRESENT_MODE_IMMEDIATE_KHR; - break; - default: - FIXME("Unsupported sync interval %u.\n", sync_interval); - case 1: - present_mode = VK_PRESENT_MODE_FIFO_KHR; - break; - } - - if (swapchain->present_mode == present_mode) - return S_OK; - - /* - * We recreate the swapchain only when the current buffer index is 0, in order to preserve the - * expected back buffer index sequence. - */ - if (swapchain->current_buffer_index) - { - WARN("Skipping sync interval change, current buffer index %u.\n", swapchain->current_buffer_index); - return S_OK; - } - - if (!d3d12_swapchain_has_user_images(swapchain)) - { - FIXME("Cannot recreate swapchain without user images.\n"); - return S_OK; - } - - if (!d3d12_swapchain_is_present_mode_supported(swapchain, present_mode)) - { - FIXME("Vulkan present mode %#x is not supported.\n", present_mode); - return S_OK; - } - - d3d12_swapchain_destroy_buffers(swapchain, FALSE); - swapchain->present_mode = present_mode; - return d3d12_swapchain_recreate_vulkan_swapchain(swapchain); -} - -static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, VkQueue vk_queue) -{ - const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; - VkPresentInfoKHR present_info; - VkSubmitInfo submit_info; - VkResult vr; - - present_info.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR; - present_info.pNext = NULL; - present_info.waitSemaphoreCount = 0; - present_info.pWaitSemaphores = NULL; - present_info.swapchainCount = 1; - present_info.pSwapchains = &swapchain->vk_swapchain; - present_info.pImageIndices = &swapchain->current_buffer_index; - present_info.pResults = NULL; - - if (d3d12_swapchain_has_user_images(swapchain)) - { - /* blit */ - submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; - submit_info.pNext = NULL; - submit_info.waitSemaphoreCount = 0; - submit_info.pWaitSemaphores = NULL; - submit_info.pWaitDstStageMask = NULL; - submit_info.commandBufferCount = 1; - submit_info.pCommandBuffers = &swapchain->vk_cmd_buffers[swapchain->current_buffer_index]; - submit_info.signalSemaphoreCount = 1; - submit_info.pSignalSemaphores = &swapchain->vk_semaphores[swapchain->current_buffer_index]; - - if ((vr = vk_funcs->p_vkQueueSubmit(vk_queue, 1, &submit_info, VK_NULL_HANDLE)) < 0) - { - ERR("Failed to blit swapchain buffer, vr %d.\n", vr); - return vr; - } - - present_info.waitSemaphoreCount = 1; - present_info.pWaitSemaphores = &swapchain->vk_semaphores[swapchain->current_buffer_index]; - } - - return vk_funcs->p_vkQueuePresentKHR(vk_queue, &present_info); -} - static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface, UINT sync_interval, UINT flags, const DXGI_PRESENT_PARAMETERS *present_parameters) { struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); - VkQueue vk_queue; - VkResult vr; - HRESULT hr; TRACE("iface %p, sync_interval %u, flags %#x, present_parameters %p.\n", iface, sync_interval, flags, present_parameters); - if (sync_interval > 4) - { - WARN("Invalid sync interval %u.\n", sync_interval); - return DXGI_ERROR_INVALID_CALL; - } - - if (flags & ~DXGI_PRESENT_TEST) - FIXME("Unimplemented flags %#x.\n", flags); - if (flags & DXGI_PRESENT_TEST) - { - WARN("Returning S_OK for DXGI_PRESENT_TEST.\n"); - return S_OK; - } - if (present_parameters) FIXME("Ignored present parameters %p.\n", present_parameters); - if (FAILED(hr = d3d12_swapchain_set_sync_interval(swapchain, sync_interval))) - return hr; - - if (!(vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue))) - { - ERR("Failed to acquire Vulkan queue.\n"); - return E_FAIL; - } - - vr = d3d12_swapchain_queue_present(swapchain, vk_queue); - if (vr == VK_ERROR_OUT_OF_DATE_KHR) - { - vkd3d_release_vk_queue(swapchain->command_queue); - - if (!d3d12_swapchain_has_user_images(swapchain)) - { - FIXME("Cannot recreate swapchain without user images.\n"); - return DXGI_STATUS_MODE_CHANGED; - } - - TRACE("Recreating Vulkan swapchain.\n"); - - d3d12_swapchain_destroy_buffers(swapchain, FALSE); - if (FAILED(hr = d3d12_swapchain_recreate_vulkan_swapchain(swapchain))) - return hr; - - if (!(vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue))) - { - ERR("Failed to acquire Vulkan queue.\n"); - return E_FAIL; - } - - if ((vr = d3d12_swapchain_queue_present(swapchain, vk_queue)) < 0) - ERR("Failed to present after recreating swapchain, vr %d.\n", vr); - } - - vkd3d_release_vk_queue(swapchain->command_queue); - - if (vr < 0) - { - ERR("Failed to queue present, vr %d.\n", vr); - return hresult_from_vk_result(vr); - } - - vr = d3d12_swapchain_acquire_next_image(swapchain); - if (vr == VK_ERROR_OUT_OF_DATE_KHR) - { - if (!d3d12_swapchain_has_user_images(swapchain)) - { - FIXME("Cannot recreate swapchain without user images.\n"); - return DXGI_STATUS_MODE_CHANGED; - } - - TRACE("Recreating Vulkan swapchain.\n"); - - d3d12_swapchain_destroy_buffers(swapchain, FALSE); - return d3d12_swapchain_recreate_vulkan_swapchain(swapchain); - } - if (vr < 0) - ERR("Failed to acquire next Vulkan image, vr %d.\n", vr); - return hresult_from_vk_result(vr); + return d3d12_swapchain_present(swapchain, sync_interval, flags); } static BOOL STDMETHODCALLTYPE d3d12_swapchain_IsTemporaryMonoSupported(IDXGISwapChain3 *iface) -- 2.19.2

3 2

[PATCH v3 3/8] user32: Fix minimum control size conditions when using EC_USEFONTINFO.
by Akihiro Sagawa 14 Mar '19

14 Mar '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/edit.c | 47 +++++++++++++---------------------------------- dlls/user32/tests/edit.c | 13 +------------ 2 files changed, 14 insertions(+), 46 deletions(-)

2 1

[PATCH v3 1/4] quartz/tests: Fix static link to GetTickCount64().
by Zebediah Figura 14 Mar '19

14 Mar '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/systemclock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/tests/systemclock.c b/dlls/quartz/tests/systemclock.c index 258e19808f..9dae754b58 100644 --- a/dlls/quartz/tests/systemclock.c +++ b/dlls/quartz/tests/systemclock.c @@ -74,7 +74,7 @@ static void test_get_time(void) hr = IReferenceClock_GetTime(clock, &time1); if (pGetTickCount64) - time2 = GetTickCount64() * 10000; + time2 = pGetTickCount64() * 10000; else time2 = GetTickCount() * 10000; ok(hr == S_OK, "Got hr %#x.\n", hr); -- 2.20.1

1 3

[PATCH v2 1/4] quartz/tests: Fix static link to GetTickCount64().
by Zebediah Figura 14 Mar '19

14 Mar '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/systemclock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/tests/systemclock.c b/dlls/quartz/tests/systemclock.c index 258e19808f..9dae754b58 100644 --- a/dlls/quartz/tests/systemclock.c +++ b/dlls/quartz/tests/systemclock.c @@ -74,7 +74,7 @@ static void test_get_time(void) hr = IReferenceClock_GetTime(clock, &time1); if (pGetTickCount64) - time2 = GetTickCount64() * 10000; + time2 = pGetTickCount64() * 10000; else time2 = GetTickCount() * 10000; ok(hr == S_OK, "Got hr %#x.\n", hr); -- 2.20.1

2 4

[PATCH] jscript: Add Array.prototype.map implementation.
by Jacek Caban 14 Mar '19

14 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/array.c | 63 +++++++++++++++++++++++++++++++ dlls/mshtml/tests/documentmode.js | 1 + dlls/mshtml/tests/es5.js | 45 ++++++++++++++++++++++ 3 files changed, 109 insertions(+)

2 1

[PATCH 8/8] include: Add more SetupAPI property keys.
by Zhiyi Zhang 14 Mar '19

14 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- include/devpkey.h | 172 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 170 insertions(+), 2 deletions(-) diff --git a/include/devpkey.h b/include/devpkey.h index 648ef42869..4d01c7b7ce 100644 --- a/include/devpkey.h +++ b/include/devpkey.h @@ -18,8 +18,6 @@ #include <devpropdef.h> -/* TODO: Not all DEVPROPKEYS have been defined here */ - DEFINE_DEVPROPKEY(DEVPKEY_NAME, 0xb725f130,0x47ef,0x101a,0xa5,0xf1,0x02,0x60,0x8c,0x9e,0xeb,0xac, 10); DEFINE_DEVPROPKEY(DEVPKEY_Device_DeviceDesc, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 2); @@ -56,7 +54,177 @@ DEFINE_DEVPROPKEY(DEVPKEY_Device_RemovalPolicyOverride, 0xa45c254e,0xdf1c,0x4efd DEFINE_DEVPROPKEY(DEVPKEY_Device_InstallState, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 36); DEFINE_DEVPROPKEY(DEVPKEY_Device_LocationPaths, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 37); DEFINE_DEVPROPKEY(DEVPKEY_Device_BaseContainerId, 0xa45c254e,0xdf1c,0x4efd,0x80,0x20,0x67,0xd1,0x46,0xa8,0x50,0xe0, 38); +DEFINE_DEVPROPKEY(DEVPKEY_Device_InstanceId, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 256); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DevNodeStatus, 0x4340a6c5,0x93fa,0x4706,0x97,0x2c,0x7b,0x64,0x80,0x08,0xa5,0xa7, 2); +DEFINE_DEVPROPKEY(DEVPKEY_Device_ProblemCode, 0x4340a6c5,0x93fa,0x4706,0x97,0x2c,0x7b,0x64,0x80,0x08,0xa5,0xa7, 3); +DEFINE_DEVPROPKEY(DEVPKEY_Device_EjectionRelations, 0x4340a6c5,0x93fa,0x4706,0x97,0x2c,0x7b,0x64,0x80,0x08,0xa5,0xa7, 4); +DEFINE_DEVPROPKEY(DEVPKEY_Device_RemovalRelations, 0x4340a6c5,0x93fa,0x4706,0x97,0x2c,0x7b,0x64,0x80,0x08,0xa5,0xa7, 5); +DEFINE_DEVPROPKEY(DEVPKEY_Device_PowerRelations, 0x4340a6c5,0x93fa,0x4706,0x97,0x2c,0x7b,0x64,0x80,0x08,0xa5,0xa7, 6); +DEFINE_DEVPROPKEY(DEVPKEY_Device_BusRelations, 0x4340a6c5,0x93fa,0x4706,0x97,0x2c,0x7b,0x64,0x80,0x08,0xa5,0xa7, 7); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Parent, 0x4340a6c5,0x93fa,0x4706,0x97,0x2c,0x7b,0x64,0x80,0x08,0xa5,0xa7, 8); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Children, 0x4340a6c5,0x93fa,0x4706,0x97,0x2c,0x7b,0x64,0x80,0x08,0xa5,0xa7, 9); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Siblings, 0x4340a6c5,0x93fa,0x4706,0x97,0x2c,0x7b,0x64,0x80,0x08,0xa5,0xa7, 10); +DEFINE_DEVPROPKEY(DEVPKEY_Device_TransportRelations, 0x4340a6c5,0x93fa,0x4706,0x97,0x2c,0x7b,0x64,0x80,0x08,0xa5,0xa7, 11); +DEFINE_DEVPROPKEY(DEVPKEY_Device_ProblemStatus, 0x4340a6c5,0x93fa,0x4706,0x97,0x2c,0x7b,0x64,0x80,0x08,0xa5,0xa7, 12); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Reported, 0x80497100,0x8c73,0x48b9,0xaa,0xd9,0xce,0x38,0x7e,0x19,0xc5,0x6e, 2); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Legacy, 0x80497100,0x8c73,0x48b9,0xaa,0xd9,0xce,0x38,0x7e,0x19,0xc5,0x6e, 3); +DEFINE_DEVPROPKEY(DEVPKEY_Device_ContainerId, 0x8c7ed206,0x3f8a,0x4827,0xb3,0xab,0xae,0x9e,0x1f,0xae,0xfc,0x6c, 2); +DEFINE_DEVPROPKEY(DEVPKEY_Device_InLocalMachineContainer, 0x8c7ed206,0x3f8a,0x4827,0xb3,0xab,0xae,0x9e,0x1f,0xae,0xfc,0x6c, 4); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Model, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 39); +DEFINE_DEVPROPKEY(DEVPKEY_Device_ModelId, 0x80d81ea6,0x7473,0x4b0c,0x82,0x16,0xef,0xc1,0x1a,0x2c,0x4c,0x8b, 2); +DEFINE_DEVPROPKEY(DEVPKEY_Device_FriendlyNameAttributes, 0x80d81ea6,0x7473,0x4b0c,0x82,0x16,0xef,0xc1,0x1a,0x2c,0x4c,0x8b, 3); +DEFINE_DEVPROPKEY(DEVPKEY_Device_ManufacturerAttributes, 0x80d81ea6,0x7473,0x4b0c,0x82,0x16,0xef,0xc1,0x1a,0x2c,0x4c,0x8b, 4); +DEFINE_DEVPROPKEY(DEVPKEY_Device_PresenceNotForDevice, 0x80d81ea6,0x7473,0x4b0c,0x82,0x16,0xef,0xc1,0x1a,0x2c,0x4c,0x8b, 5); +DEFINE_DEVPROPKEY(DEVPKEY_Device_SignalStrength, 0x80d81ea6,0x7473,0x4b0c,0x82,0x16,0xef,0xc1,0x1a,0x2c,0x4c,0x8b, 6); +DEFINE_DEVPROPKEY(DEVPKEY_Device_IsAssociateableByUserAction, 0x80d81ea6,0x7473,0x4b0c,0x82,0x16,0xef,0xc1,0x1a,0x2c,0x4c,0x8b, 7); +DEFINE_DEVPROPKEY(DEVPKEY_Device_ShowInUninstallUI, 0x80d81ea6,0x7473,0x4b0c,0x82,0x16,0xef,0xc1,0x1a,0x2c,0x4c,0x8b, 8); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Numa_Proximity_Domain, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 1); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DHP_Rebalance_Policy, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 2); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Numa_Node, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 3); +DEFINE_DEVPROPKEY(DEVPKEY_Device_BusReportedDeviceDesc, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 4); +DEFINE_DEVPROPKEY(DEVPKEY_Device_IsPresent, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 5); +DEFINE_DEVPROPKEY(DEVPKEY_Device_HasProblem, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 6); +DEFINE_DEVPROPKEY(DEVPKEY_Device_ConfigurationId, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 7); +DEFINE_DEVPROPKEY(DEVPKEY_Device_ReportedDeviceIdsHash, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 8); +DEFINE_DEVPROPKEY(DEVPKEY_Device_PhysicalDeviceLocation, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 9); +DEFINE_DEVPROPKEY(DEVPKEY_Device_BiosDeviceName, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 10); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DriverProblemDesc, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 11); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DebuggerSafe, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 12); +DEFINE_DEVPROPKEY(DEVPKEY_Device_PostInstallInProgress, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 13); +DEFINE_DEVPROPKEY(DEVPKEY_Device_Stack, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 14); +DEFINE_DEVPROPKEY(DEVPKEY_Device_ExtendedConfigurationIds, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 15); +DEFINE_DEVPROPKEY(DEVPKEY_Device_IsRebootRequired, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 16); +DEFINE_DEVPROPKEY(DEVPKEY_Device_FirmwareDate, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 17); +DEFINE_DEVPROPKEY(DEVPKEY_Device_FirmwareVersion, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 18); +DEFINE_DEVPROPKEY(DEVPKEY_Device_FirmwareRevision, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 19); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DependencyProviders, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 20); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DependencyDependents, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 21); +DEFINE_DEVPROPKEY(DEVPKEY_Device_SoftRestartSupported, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 22); +DEFINE_DEVPROPKEY(DEVPKEY_Device_ExtendedAddress, 0x540b947e,0x8b40,0x45bc,0xa8,0xa2,0x6a,0x0b,0x89,0x4c,0xbd,0xa2, 23); +DEFINE_DEVPROPKEY(DEVPKEY_Device_SessionId, 0x83da6326,0x97a6,0x4088,0x94,0x53,0xa1,0x92,0x3f,0x57,0x3b,0x29, 6); +DEFINE_DEVPROPKEY(DEVPKEY_Device_InstallDate, 0x83da6326,0x97a6,0x4088,0x94,0x53,0xa1,0x92,0x3f,0x57,0x3b,0x29, 100); +DEFINE_DEVPROPKEY(DEVPKEY_Device_FirstInstallDate, 0x83da6326,0x97a6,0x4088,0x94,0x53,0xa1,0x92,0x3f,0x57,0x3b,0x29, 101); +DEFINE_DEVPROPKEY(DEVPKEY_Device_LastArrivalDate, 0x83da6326,0x97a6,0x4088,0x94,0x53,0xa1,0x92,0x3f,0x57,0x3b,0x29, 102); +DEFINE_DEVPROPKEY(DEVPKEY_Device_LastRemovalDate, 0x83da6326,0x97a6,0x4088,0x94,0x53,0xa1,0x92,0x3f,0x57,0x3b,0x29, 103); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DriverDate, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 2); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DriverVersion, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 3); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DriverDesc, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 4); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DriverInfPath, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 5); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DriverInfSection, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 6); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DriverInfSectionExt, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 7); +DEFINE_DEVPROPKEY(DEVPKEY_Device_MatchingDeviceId, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 8); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DriverProvider, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 9); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DriverPropPageProvider, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 10); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DriverCoInstallers, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 11); +DEFINE_DEVPROPKEY(DEVPKEY_Device_ResourcePickerTags, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 12); +DEFINE_DEVPROPKEY(DEVPKEY_Device_ResourcePickerExceptions, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 13); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DriverRank, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 14); +DEFINE_DEVPROPKEY(DEVPKEY_Device_DriverLogoLevel, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 15); +DEFINE_DEVPROPKEY(DEVPKEY_Device_NoConnectSound, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 17); +DEFINE_DEVPROPKEY(DEVPKEY_Device_GenericDriverInstalled, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 18); +DEFINE_DEVPROPKEY(DEVPKEY_Device_AdditionalSoftwareRequested, 0xa8b865dd,0x2e3d,0x4094,0xad,0x97,0xe5,0x93,0xa7,0xc,0x75,0xd6, 19); +DEFINE_DEVPROPKEY(DEVPKEY_Device_SafeRemovalRequired, 0xafd97640,0x86a3,0x4210,0xb6,0x7c,0x28,0x9c,0x41,0xaa,0xbe,0x55, 2); +DEFINE_DEVPROPKEY(DEVPKEY_Device_SafeRemovalRequiredOverride, 0xafd97640,0x86a3,0x4210,0xb6,0x7c,0x28,0x9c,0x41,0xaa,0xbe,0x55, 3); + +DEFINE_DEVPROPKEY(DEVPKEY_DrvPkg_Model, 0xcf73bb51,0x3abf,0x44a2,0x85,0xe0,0x9a,0x3d,0xc7,0xa1,0x21,0x32, 2); +DEFINE_DEVPROPKEY(DEVPKEY_DrvPkg_VendorWebSite, 0xcf73bb51,0x3abf,0x44a2,0x85,0xe0,0x9a,0x3d,0xc7,0xa1,0x21,0x32, 3); +DEFINE_DEVPROPKEY(DEVPKEY_DrvPkg_DetailedDescription, 0xcf73bb51,0x3abf,0x44a2,0x85,0xe0,0x9a,0x3d,0xc7,0xa1,0x21,0x32, 4); +DEFINE_DEVPROPKEY(DEVPKEY_DrvPkg_DocumentationLink, 0xcf73bb51,0x3abf,0x44a2,0x85,0xe0,0x9a,0x3d,0xc7,0xa1,0x21,0x32, 5); +DEFINE_DEVPROPKEY(DEVPKEY_DrvPkg_Icon, 0xcf73bb51,0x3abf,0x44a2,0x85,0xe0,0x9a,0x3d,0xc7,0xa1,0x21,0x32, 6); +DEFINE_DEVPROPKEY(DEVPKEY_DrvPkg_BrandingIcon, 0xcf73bb51,0x3abf,0x44a2,0x85,0xe0,0x9a,0x3d,0xc7,0xa1,0x21,0x32, 7); + +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_UpperFilters, 0x4321918b,0xf69e,0x470d,0xa5,0xde,0x4d,0x88,0xc7,0x5a,0xd2,0x4b, 19); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_LowerFilters, 0x4321918b,0xf69e,0x470d,0xa5,0xde,0x4d,0x88,0xc7,0x5a,0xd2,0x4b, 20); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_Security, 0x4321918b,0xf69e,0x470d,0xa5,0xde,0x4d,0x88,0xc7,0x5a,0xd2,0x4b, 25); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_SecuritySDS, 0x4321918b,0xf69e,0x470d,0xa5,0xde,0x4d,0x88,0xc7,0x5a,0xd2,0x4b, 26); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_DevType, 0x4321918b,0xf69e,0x470d,0xa5,0xde,0x4d,0x88,0xc7,0x5a,0xd2,0x4b, 27); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_Exclusive, 0x4321918b,0xf69e,0x470d,0xa5,0xde,0x4d,0x88,0xc7,0x5a,0xd2,0x4b, 28); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_Characteristics, 0x4321918b,0xf69e,0x470d,0xa5,0xde,0x4d,0x88,0xc7,0x5a,0xd2,0x4b, 29); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_Name, 0x259abffc,0x50a7,0x47ce,0xaf,0x8,0x68,0xc9,0xa7,0xd7,0x33,0x66, 2); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_ClassName, 0x259abffc,0x50a7,0x47ce,0xaf,0x8,0x68,0xc9,0xa7,0xd7,0x33,0x66, 3); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_Icon, 0x259abffc,0x50a7,0x47ce,0xaf,0x8,0x68,0xc9,0xa7,0xd7,0x33,0x66, 4); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_ClassInstaller, 0x259abffc,0x50a7,0x47ce,0xaf,0x8,0x68,0xc9,0xa7,0xd7,0x33,0x66, 5); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_PropPageProvider, 0x259abffc,0x50a7,0x47ce,0xaf,0x8,0x68,0xc9,0xa7,0xd7,0x33,0x66, 6); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_NoInstallClass, 0x259abffc,0x50a7,0x47ce,0xaf,0x8,0x68,0xc9,0xa7,0xd7,0x33,0x66, 7); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_NoDisplayClass, 0x259abffc,0x50a7,0x47ce,0xaf,0x8,0x68,0xc9,0xa7,0xd7,0x33,0x66, 8); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_SilentInstall, 0x259abffc,0x50a7,0x47ce,0xaf,0x8,0x68,0xc9,0xa7,0xd7,0x33,0x66, 9); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_NoUseClass, 0x259abffc,0x50a7,0x47ce,0xaf,0x8,0x68,0xc9,0xa7,0xd7,0x33,0x66, 10); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_DefaultService, 0x259abffc,0x50a7,0x47ce,0xaf,0x8,0x68,0xc9,0xa7,0xd7,0x33,0x66, 11); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_IconPath, 0x259abffc,0x50a7,0x47ce,0xaf,0x8,0x68,0xc9,0xa7,0xd7,0x33,0x66, 12); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_DHPRebalanceOptOut, 0xd14d3ef3,0x66cf,0x4ba2,0x9d,0x38,0x0d,0xdb,0x37,0xab,0x47,0x01, 2); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceClass_ClassCoInstallers, 0x713d1703,0xa2e2,0x49f5,0x92,0x14,0x56,0x47,0x2e,0xf3,0xda,0x5c, 2); DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_FriendlyName, 0x026e516e,0xb814,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 2); DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_Enabled, 0x026e516e,0xb814,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 3); DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_ClassGuid, 0x026e516e,0xb814,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 4); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_ReferenceString, 0x026e516e,0xb814,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 5); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_Restricted, 0x026e516e,0xb814,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 6); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_UnrestrictedAppCapabilities, 0x026e516e,0xb814,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 8); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterface_SchematicName, 0x026e516e,0xb814,0x414b,0x83,0xcd,0x85,0x6d,0x6f,0xef,0x48,0x22, 9); + +DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterfaceClass_DefaultInterface, 0x14c83a99,0x0b3f,0x44b7,0xbe,0x4c,0xa1,0x78,0xd3,0x99,0x05,0x64, 2); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceInterfaceClass_Name, 0x14c83a99,0x0b3f,0x44b7,0xbe,0x4c,0xa1,0x78,0xd3,0x99,0x05,0x64, 3); + +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_Address, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 51); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_DiscoveryMethod, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 52); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_IsEncrypted, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 53); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_IsAuthenticated, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 54); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_IsConnected, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 55); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_IsPaired, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 56); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_Icon, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 57); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_Version, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 65); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_Last_Seen, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 66); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_Last_Connected, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 67); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_IsShowInDisconnectedState, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 68); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_IsLocalMachine, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 70); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_MetadataPath, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 71); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_IsMetadataSearchInProgress, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 72); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_MetadataChecksum, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 73); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_IsNotInterestingForDisplay, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 74); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_LaunchDeviceStageOnDeviceConnect, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 76); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_LaunchDeviceStageFromExplorer, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 77); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_BaselineExperienceId, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 78); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_IsDeviceUniquelyIdentifiable, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 79); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_AssociationArray, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 80); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_DeviceDescription1, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 81); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_DeviceDescription2, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 82); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_HasProblem, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 83); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_IsSharedDevice, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 84); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_IsNetworkDevice, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 85); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_IsDefaultDevice, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 86); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_MetadataCabinet, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 87); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_RequiresPairingElevation, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 88); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_ExperienceId, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 89); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_Category, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 90); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_Category_Desc_Singular, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 91); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_Category_Desc_Plural, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 92); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_Category_Icon, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 93); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_CategoryGroup_Desc, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 94); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_CategoryGroup_Icon, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 95); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_PrimaryCategory, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 97); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_UnpairUninstall, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 98); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_RequiresUninstallElevation, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 99); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_DeviceFunctionSubRank, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 100); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_AlwaysShowDeviceAsConnected, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 101); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_ConfigFlags, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 105); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_PrivilegedPackageFamilyNames, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 106); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_CustomPrivilegedPackageFamilyNames, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 107); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_IsRebootRequired, 0x78c34fc8,0x104a,0x4aca,0x9e,0xa4,0x52,0x4d,0x52,0x99,0x6e,0x57, 108); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_FriendlyName, 0x656A3BB3,0xECC0,0x43FD,0x84,0x77,0x4A,0xE0,0x40,0x4A,0x96,0xCD, 12288); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_Manufacturer, 0x656A3BB3,0xECC0,0x43FD,0x84,0x77,0x4A,0xE0,0x40,0x4A,0x96,0xCD, 8192); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_ModelName, 0x656A3BB3,0xECC0,0x43FD,0x84,0x77,0x4A,0xE0,0x40,0x4A,0x96,0xCD, 8194); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_ModelNumber, 0x656A3BB3,0xECC0,0x43FD,0x84,0x77,0x4A,0xE0,0x40,0x4A,0x96,0xCD, 8195); +DEFINE_DEVPROPKEY(DEVPKEY_DeviceContainer_InstallInProgress, 0x83da6326,0x97a6,0x4088,0x94,0x53,0xa1,0x92,0x3f,0x57,0x3b,0x29, 9); + +DEFINE_DEVPROPKEY(DEVPKEY_DevQuery_ObjectType, 0x13673f42,0xa3d6,0x49f6,0xb4,0xda,0xae,0x46,0xe0,0xc5,0x23,0x7c, 2); + +#define DEVPKEY_Numa_Proximity_DomainDEVPKEY_Device_Numa_Proximity_Domain + +#define DEVPKEY_DeviceDisplay_DiscoveryMethod DEVPKEY_DeviceContainer_DiscoveryMethod +#define DEVPKEY_DeviceDisplay_IsShowInDisconnectedState DEVPKEY_DeviceContainer_IsShowInDisconnectedState +#define DEVPKEY_DeviceDisplay_IsNotInterestingForDisplay DEVPKEY_DeviceContainer_IsNotInterestingForDisplay +#define DEVPKEY_DeviceDisplay_IsNetworkDevice DEVPKEY_DeviceContainer_IsNetworkDevice +#define DEVPKEY_DeviceDisplay_Category DEVPKEY_DeviceContainer_Category +#define DEVPKEY_DeviceDisplay_UnpairUninstall DEVPKEY_DeviceContainer_UnpairUninstall +#define DEVPKEY_DeviceDisplay_RequiresUninstallElevation DEVPKEY_DeviceContainer_RequiresUninstallElevation +#define DEVPKEY_DeviceDisplay_AlwaysShowDeviceAsConnected DEVPKEY_DeviceContainer_AlwaysShowDeviceAsConnected \ No newline at end of file -- 2.19.2

1 0

[PATCH 7/8] setupapi: Check registered device duplicate in SetupDiCreateDeviceInfo().
by Zhiyi Zhang 14 Mar '19

14 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/devinst.c | 14 ++++++++++++++ dlls/setupapi/tests/devinst.c | 6 +++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index ab85474c7e..d7698e94b9 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1510,6 +1510,8 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO devinfo, const WCHAR *name, const { WCHAR id[MAX_DEVICE_ID_LEN]; struct DeviceInfoSet *set; + HKEY enum_hkey; + HKEY instance_hkey; struct device *device; TRACE("devinfo %p, name %s, class %s, description %s, hwnd %p, flags %#x, device_data %p.\n", @@ -1570,6 +1572,18 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO devinfo, const WCHAR *name, const } else { + /* Check if instance is already in registry */ + RegCreateKeyExW(HKEY_LOCAL_MACHINE, Enum, 0, NULL, 0, KEY_READ, NULL, &enum_hkey, NULL); + if (!RegOpenKeyExW(enum_hkey, name, 0, KEY_READ, &instance_hkey)) + { + RegCloseKey(instance_hkey); + RegCloseKey(enum_hkey); + SetLastError(ERROR_DEVINST_ALREADY_EXISTS); + return FALSE; + } + RegCloseKey(enum_hkey); + + /* Check if instance is already in set */ strcpyW(id, name); LIST_FOR_EACH_ENTRY(device, &set->devices, struct device, entry) { diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index dce06e62b9..c0ee699840 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -358,9 +358,9 @@ static void test_device_info(void) set = SetupDiCreateDeviceInfoList(&guid, NULL); ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device); - todo_wine ok(!ret, "Expect failure\n"); - todo_wine ok(GetLastError() == ERROR_DEVINST_ALREADY_EXISTS, "Got error %#x\n", GetLastError()); - todo_wine check_device_info(set, 0, NULL, NULL); + ok(!ret, "Expect failure\n"); + ok(GetLastError() == ERROR_DEVINST_ALREADY_EXISTS, "Got error %#x\n", GetLastError()); + check_device_info(set, 0, NULL, NULL); SetupDiDestroyDeviceInfoList(set); set = SetupDiGetClassDevsA(&guid, NULL, NULL, 0); -- 2.19.2

1 0

[PATCH 6/8] setupapi/tests: Add more SetupDiCreateDeviceInfo() tests.
by Zhiyi Zhang 14 Mar '19

14 Mar '19

SetupDiCreateDeviceInfo() should report last error ERROR_DEVINST_ALREADY_EXISTS when an registered instance exists when creating a device for an empty set. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/tests/devinst.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 4285fe6fbe..dce06e62b9 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -212,6 +212,7 @@ static void test_device_info(void) char id[MAX_DEVICE_ID_LEN + 2]; HDEVINFO set; BOOL ret; + INT i = 0; SetLastError(0xdeadbeef); ret = SetupDiCreateDeviceInfoA(NULL, NULL, NULL, NULL, NULL, 0, NULL); @@ -344,6 +345,31 @@ static void test_device_info(void) ok(ret, "Failed to create device, error %#x.\n", GetLastError()); SetupDiDestroyDeviceInfoList(set); + + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device info list, error %#x.\n", GetLastError()); + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + ret = SetupDiRegisterDeviceInfo(set , &device, 0, NULL, NULL, NULL); + ok(ret, "Failed to register device, error %#x.\n", GetLastError()); + check_device_info(set, 0, &guid, "ROOT\\LEGACY_BOGUS\\0000"); + check_device_info(set, 1, NULL, NULL); + SetupDiDestroyDeviceInfoList(set); + + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device); + todo_wine ok(!ret, "Expect failure\n"); + todo_wine ok(GetLastError() == ERROR_DEVINST_ALREADY_EXISTS, "Got error %#x\n", GetLastError()); + todo_wine check_device_info(set, 0, NULL, NULL); + SetupDiDestroyDeviceInfoList(set); + + set = SetupDiGetClassDevsA(&guid, NULL, NULL, 0); + while (SetupDiEnumDeviceInfo(set, i++, &device)) + { + ret = SetupDiRemoveDevice(set, &device); + ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); + } + SetupDiDestroyDeviceInfoList(set); } static void test_device_property(void) -- 2.19.2

1 0

[PATCH 5/8] setupapi/tests: Add SetupDiOpenDeviceInfo() tests.
by Zhiyi Zhang 14 Mar '19

14 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/tests/devinst.c | 136 ++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index c28ce0e6d0..4285fe6fbe 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -737,6 +737,141 @@ static void test_get_device_instance_id(void) SetupDiDestroyDeviceInfoList(set); } +static void test_open_device_info(void) +{ + SP_DEVINFO_DATA device = {sizeof(device)}; + CHAR id[MAX_DEVICE_ID_LEN + 2]; + HDEVINFO set; + INT i = 0; + BOOL ret; + + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device info, error %#x.\n", GetLastError()); + + /* Open non-existent device */ + SetLastError(0xdeadbeef); + ret = SetupDiOpenDeviceInfoA(set, "Root\\LEGACY_BOGUS\\FFFF", NULL, 0, &device); + ok(GetLastError() == ERROR_NO_SUCH_DEVINST, "Got unexpected error %#x.\n", GetLastError()); + ok(!ret, "Expected failure.\n"); + check_device_info(set, 0, NULL, NULL); + + /* Open unregistered device */ + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\1000", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = SetupDiOpenDeviceInfoA(set, "Root\\LEGACY_BOGUS\\1000", NULL, 0, &device); + ok(GetLastError() == ERROR_NO_SUCH_DEVINST, "Got unexpected error %#x.\n", GetLastError()); + ok(!ret, "Expected failure.\n"); + check_device_info(set, 0, &guid, "Root\\LEGACY_BOGUS\\1000"); + check_device_info(set, 1, NULL, NULL); + + /* Open registered device */ + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\1001", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); + ok(ret, "Failed to register device, error %#x.\n", GetLastError()); + check_device_info(set, 0, &guid, "Root\\LEGACY_BOGUS\\1000"); + check_device_info(set, 1, &guid, "Root\\LEGACY_BOGUS\\1001"); + check_device_info(set, 2, NULL, NULL); + + SetLastError(0xdeadbeef); + ret = SetupDiOpenDeviceInfoA(set, "Root\\LEGACY_BOGUS\\1001", NULL, 0, &device); + ok(GetLastError() == NO_ERROR, "Got unexpected error %#x.\n", GetLastError()); + ok(ret, "Failed to open device info\n"); + ret = SetupDiGetDeviceInstanceIdA(set, &device, id, sizeof(id), NULL); + ok(ret, "Got unexpected error %#x.\n", GetLastError()); + ok(!strcasecmp(id, "Root\\LEGACY_BOGUS\\1001"), "Got unexpected id %s.\n", id); + check_device_info(set, 0, &guid, "Root\\LEGACY_BOGUS\\1000"); + check_device_info(set, 1, &guid, "Root\\LEGACY_BOGUS\\1001"); + check_device_info(set, 2, NULL, NULL); + + /* Open registered device in an empty device info set */ + SetupDiDestroyDeviceInfoList(set); + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device info list, error %#x.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupDiOpenDeviceInfoA(set, "Root\\LEGACY_BOGUS\\1001", NULL, 0, &device); + ok(GetLastError() == NO_ERROR, "Got unexpected error %#x.\n", GetLastError()); + ok(ret, "Failed to open device info\n"); + ret = SetupDiGetDeviceInstanceIdA(set, &device, id, sizeof(id), NULL); + ok(ret, "Got unexpected error %#x.\n", GetLastError()); + ok(!strcasecmp(id, "Root\\LEGACY_BOGUS\\1001"), "Got unexpected id %s.\n", id); + check_device_info(set, 0, &guid, "Root\\LEGACY_BOGUS\\1001"); + check_device_info(set, 1, NULL, NULL); + + /* Open registered device again */ + SetLastError(0xdeadbeef); + ret = SetupDiOpenDeviceInfoA(set, "Root\\LEGACY_BOGUS\\1001", NULL, 0, &device); + ok(GetLastError() == NO_ERROR, "Got unexpected error %#x.\n", GetLastError()); + ok(ret, "Failed to open device info\n"); + ret = SetupDiGetDeviceInstanceIdA(set, &device, id, sizeof(id), NULL); + ok(ret, "Got unexpected error %#x.\n", GetLastError()); + ok(!strcasecmp(id, "Root\\LEGACY_BOGUS\\1001"), "Got unexpected id %s.\n", id); + check_device_info(set, 0, &guid, "Root\\LEGACY_BOGUS\\1001"); + check_device_info(set, 1, NULL, NULL); + + /* Open registered device in a new device info set with wrong GUID */ + SetupDiDestroyDeviceInfoList(set); + set = SetupDiCreateDeviceInfoList(&guid2, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device info list, error %#x.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupDiOpenDeviceInfoA(set, "Root\\LEGACY_BOGUS\\1001", NULL, 0, &device); + ok(GetLastError() == ERROR_CLASS_MISMATCH, "Got unexpected error %#x.\n", GetLastError()); + ok(!ret, "Expected failure.\n"); + check_device_info(set, 0, NULL, NULL); + + SetupDiDestroyDeviceInfoList(set); + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device info list, error %#x.\n", GetLastError()); + + /* NULL set */ + SetLastError(0xdeadbeef); + ret = SetupDiOpenDeviceInfoA(NULL, "Root\\LEGACY_BOGUS\\1001", NULL, 0, &device); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected error %#x.\n", GetLastError()); + ok(!ret, "Expected failure.\n"); + + /* NULL instance id */ + SetLastError(0xdeadbeef); + ret = SetupDiOpenDeviceInfoA(set, NULL, NULL, 0, &device); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError()); + ok(!ret, "Expected failure.\n"); + check_device_info(set, 0, NULL, NULL); + + /* Invalid SP_DEVINFO_DATA cbSize, device will be added despite failure */ + SetLastError(0xdeadbeef); + device.cbSize = 0; + ret = SetupDiOpenDeviceInfoA(set, "Root\\LEGACY_BOGUS\\1001", NULL, 0, &device); + device.cbSize = sizeof(device); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "Got unexpected error %#x.\n", GetLastError()); + ok(!ret, "Expected failure.\n"); + check_device_info(set, 0, &guid, "Root\\LEGACY_BOGUS\\1001"); + check_device_info(set, 1, NULL, NULL); + + SetupDiDestroyDeviceInfoList(set); + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device info list, error %#x.\n", GetLastError()); + + /* NULL device */ + SetLastError(0xdeadbeef); + ret = SetupDiOpenDeviceInfoA(set, "Root\\LEGACY_BOGUS\\1001", NULL, 0, NULL); + ok(GetLastError() == NO_ERROR, "Got unexpected error %#x.\n", GetLastError()); + ok(ret, "Failed to open device info\n"); + check_device_info(set, 0, &guid, "Root\\LEGACY_BOGUS\\1001"); + check_device_info(set, 1, NULL, NULL); + + /* Clean up */ + SetupDiDestroyDeviceInfoList(set); + set = SetupDiGetClassDevsA(&guid, NULL, NULL, 0); + while (SetupDiEnumDeviceInfo(set, i++, &device)) + { + ret = SetupDiRemoveDevice(set, &device); + ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); + } + SetupDiDestroyDeviceInfoList(set); +} + static void test_register_device_info(void) { SP_DEVINFO_DATA device = {0}; @@ -1725,6 +1860,7 @@ START_TEST(devinst) test_device_info(); test_device_property(); test_get_device_instance_id(); + test_open_device_info(); test_register_device_info(); test_device_iface(); test_device_iface_detail(); -- 2.19.2

1 0

[PATCH 4/8] setupapi: Implement SetupDiOpenDeviceInfoA().
by Zhiyi Zhang 14 Mar '19

14 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/devinst.c | 20 ++++++++++++++++++++ dlls/setupapi/stubs.c | 11 ----------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 41d10d7e40..ab85474c7e 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3316,6 +3316,26 @@ HKEY WINAPI SetupDiOpenClassRegKeyExW( return key; } +/*********************************************************************** + * SetupDiOpenDeviceInfoA (SETUPAPI.@) + */ +BOOL WINAPI SetupDiOpenDeviceInfoA(HDEVINFO devinfo, PCSTR instance_id, HWND hwnd_parent, DWORD flags, + PSP_DEVINFO_DATA device_data) +{ + WCHAR instance_idW[MAX_DEVICE_ID_LEN]; + + TRACE("%p %s %p 0x%08x %p\n", devinfo, debugstr_a(instance_id), hwnd_parent, flags, device_data); + + if (!instance_id || strlen(instance_id) >= MAX_DEVICE_ID_LEN) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + MultiByteToWideChar(CP_ACP, 0, instance_id, -1, instance_idW, ARRAY_SIZE(instance_idW)); + return SetupDiOpenDeviceInfoW(devinfo, instance_idW, hwnd_parent, flags, device_data); +} + /*********************************************************************** * SetupDiOpenDeviceInfoW (SETUPAPI.@) */ diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index b64c1a1316..ede878f1de 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -311,17 +311,6 @@ BOOL WINAPI SetupDiGetClassImageIndex(PSP_CLASSIMAGELIST_DATA ClassImageListData return FALSE; } -/*********************************************************************** - * SetupDiOpenDeviceInfoA (SETUPAPI.@) - */ -BOOL WINAPI SetupDiOpenDeviceInfoA(HDEVINFO DeviceInfoSet, PCSTR DeviceInstanceId, - HWND hwndParent, DWORD OpenFlags, PSP_DEVINFO_DATA DeviceInfoData) -{ - FIXME("%p %s %p 0x%08x %p: stub\n", DeviceInfoSet, debugstr_a(DeviceInstanceId), - hwndParent, OpenFlags, DeviceInfoData); - return FALSE; -} - /*********************************************************************** * CM_Locate_DevNodeA (SETUPAPI.@) */ -- 2.19.2

1 0

[PATCH 2/8] setupapi: Set phantom value after device creation.
by Zhiyi Zhang 14 Mar '19

14 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/devinst.c | 4 ++++ dlls/setupapi/tests/devinst.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 2c95b5cfb9..331db87d06 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -723,6 +723,7 @@ static void delete_device(struct device *device) static struct device *SETUPDI_CreateDeviceInfo(struct DeviceInfoSet *set, const GUID *class, const WCHAR *instanceid, BOOL phantom) { + const DWORD one = 1; struct device *device; WCHAR guidstr[39]; @@ -752,6 +753,9 @@ static struct device *SETUPDI_CreateDeviceInfo(struct DeviceInfoSet *set, device->removed = FALSE; list_add_tail(&set->devices, &device->entry); + if (phantom) + RegSetValueExW(device->key, Phantom, 0, REG_DWORD, (const BYTE *)&one, sizeof(one)); + SETUPDI_GuidToString(class, guidstr); SETUPDI_SetDeviceRegistryPropertyW(device, SPDRP_CLASSGUID, (const BYTE *)guidstr, sizeof(guidstr)); diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 9474d149dd..c28ce0e6d0 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -778,9 +778,9 @@ static void test_register_device_info(void) RegOpenKeyA(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Enum\\ROOT\\LEGACY_BOGUS\\0000", &hkey); size = sizeof(phantom); ls = RegQueryValueExA(hkey, "Phantom", NULL, &type, (BYTE *)&phantom, &size); - todo_wine ok(ls == ERROR_SUCCESS, "Got wrong error code %#x\n", ls); - todo_wine ok(phantom == 1, "Got wrong phantom value %d\n", phantom); - todo_wine ok(type == REG_DWORD, "Got wrong phantom type %#x\n", type); + ok(ls == ERROR_SUCCESS, "Got wrong error code %#x\n", ls); + ok(phantom == 1, "Got wrong phantom value %d\n", phantom); + ok(type == REG_DWORD, "Got wrong phantom type %#x\n", type); ok(size == sizeof(phantom), "Got wrong phantom size %d\n", size); ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); ok(ret, "Failed to register device, error %#x.\n", GetLastError()); -- 2.19.2

1 0

[PATCH 1/8] setupapi/tests: Test phantom value after device creation.
by Zhiyi Zhang 14 Mar '19

14 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/tests/devinst.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 0f27783d87..9474d149dd 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -742,6 +742,11 @@ static void test_register_device_info(void) SP_DEVINFO_DATA device = {0}; BOOL ret; HDEVINFO set; + HKEY hkey; + LSTATUS ls; + DWORD type = 0; + DWORD phantom = 0; + DWORD size; int i = 0; SetLastError(0xdeadbeef); @@ -770,8 +775,19 @@ static void test_register_device_info(void) ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device); ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + RegOpenKeyA(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Enum\\ROOT\\LEGACY_BOGUS\\0000", &hkey); + size = sizeof(phantom); + ls = RegQueryValueExA(hkey, "Phantom", NULL, &type, (BYTE *)&phantom, &size); + todo_wine ok(ls == ERROR_SUCCESS, "Got wrong error code %#x\n", ls); + todo_wine ok(phantom == 1, "Got wrong phantom value %d\n", phantom); + todo_wine ok(type == REG_DWORD, "Got wrong phantom type %#x\n", type); + ok(size == sizeof(phantom), "Got wrong phantom size %d\n", size); ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); ok(ret, "Failed to register device, error %#x.\n", GetLastError()); + size = sizeof(phantom); + ls = RegQueryValueExA(hkey, "Phantom", NULL, NULL, (BYTE *)&phantom, &size); + ok(ls == ERROR_FILE_NOT_FOUND, "Got wrong error code %#x\n", ls); + RegCloseKey(hkey); ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0001", &guid, NULL, NULL, 0, &device); ok(ret, "Failed to create device, error %#x.\n", GetLastError()); -- 2.19.2

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel