- wine-devel - winehq.org

[PATCH] bthprops.cpl: Add BluetoothFindNextRadio stub.
by Esdras Tarsis 03 Jul '21

03 Jul '21

For GangV Battle Royale Signed-off-by: Esdras Tarsis <esdrastarsis(a)gmail.com> --- dlls/bthprops.cpl/bthprops.cpl.spec | 2 +- dlls/bthprops.cpl/main.c | 10 ++++++++++ dlls/irprops.cpl/irprops.cpl.spec | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/bthprops.cpl/bthprops.cpl.spec b/dlls/bthprops.cpl/bthprops.cpl.spec index 26d2429c6ba..49b181763ee 100644 --- a/dlls/bthprops.cpl/bthprops.cpl.spec +++ b/dlls/bthprops.cpl/bthprops.cpl.spec @@ -27,7 +27,7 @@ @ stub BluetoothFindNextProfileDescriptor @ stub BluetoothFindNextProtocolDescriptorStack @ stub BluetoothFindNextProtocolEntry -@ stub BluetoothFindNextRadio +@ stdcall BluetoothFindNextRadio(ptr ptr) @ stub BluetoothFindNextService @ stub BluetoothFindProfileDescriptorClose @ stub BluetoothFindProtocolDescriptorStackClose diff --git a/dlls/bthprops.cpl/main.c b/dlls/bthprops.cpl/main.c index 60a781ef840..943c9dcb764 100644 --- a/dlls/bthprops.cpl/main.c +++ b/dlls/bthprops.cpl/main.c @@ -70,3 +70,13 @@ BOOL WINAPI BluetoothFindDeviceClose(HBLUETOOTH_DEVICE_FIND find) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/********************************************************************* + * BluetoothFindNextRadio + */ +BOOL WINAPI BluetoothFindNextRadio(HBLUETOOTH_RADIO_FIND find, HANDLE *radio) +{ + FIXME("(%p, %p): stub!\n", find, radio); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/irprops.cpl/irprops.cpl.spec b/dlls/irprops.cpl/irprops.cpl.spec index ca24b49dd47..f2fa18aab89 100644 --- a/dlls/irprops.cpl/irprops.cpl.spec +++ b/dlls/irprops.cpl/irprops.cpl.spec @@ -23,7 +23,7 @@ @ stub BluetoothFindNextProfileDescriptor @ stub BluetoothFindNextProtocolDescriptorStack @ stub BluetoothFindNextProtocolEntry -@ stub BluetoothFindNextRadio +@ stdcall BluetoothFindNextRadio(ptr ptr) bthprops.cpl.BluetoothFindNextRadio @ stub BluetoothFindNextService @ stub BluetoothFindProfileDescriptorClose @ stub BluetoothFindProtocolDescriptorStackClose -- 2.32.0

3 2

[PATCH] include/d3d12: add missing enum/structures/defines needed to use d3d12x.h
by Steve Lhomme 03 Jul '21

03 Jul '21

d3dx12.h is a useful MIT licensed header from Microsoft to help do regular things with D3D12 (in C++). It's usable with mingw (and thus wine) with these additions. Signed-off-by: Steve Lhomme <robux4(a)ycbcr.xyz> --- include/d3d12.idl | 77 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/include/d3d12.idl b/include/d3d12.idl index 42f33a06e40..056e078ab9d 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -75,6 +75,9 @@ const UINT D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT = 4096; const UINT D3D12_VS_INPUT_REGISTER_COUNT = 32; const UINT D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE = 16; +cpp_quote("#define D3D12_MIN_DEPTH ( 0.0f )") +cpp_quote("#define D3D12_MAX_DEPTH ( 1.0f )") + cpp_quote("#endif") const UINT D3D12_SHADER_COMPONENT_MAPPING_MASK = 0x7; @@ -2005,6 +2008,80 @@ typedef enum D3D12_PREDICATION_OP D3D12_PREDICATION_OP_NOT_EQUAL_ZERO = 1, } D3D12_PREDICATION_OP; +typedef enum D3D12_VIEW_INSTANCING_FLAGS +{ + D3D12_VIEW_INSTANCING_FLAG_NONE, + D3D12_VIEW_INSTANCING_FLAG_ENABLE_VIEW_INSTANCE_MASKING +} D3D12_VIEW_INSTANCING_FLAGS; + +typedef enum D3D12_PIPELINE_STATE_SUBOBJECT_TYPE +{ + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_ROOT_SIGNATURE, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_VS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_PS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_HS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_GS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_CS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_STREAM_OUTPUT, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_BLEND, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_SAMPLE_MASK, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_RASTERIZER, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DEPTH_STENCIL, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_INPUT_LAYOUT, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_IB_STRIP_CUT_VALUE, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_PRIMITIVE_TOPOLOGY, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_RENDER_TARGET_FORMATS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DEPTH_STENCIL_FORMAT, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_SAMPLE_DESC, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_NODE_MASK, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_CACHED_PSO, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_FLAGS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DEPTH_STENCIL1, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_VIEW_INSTANCING, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_AS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_MS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_MAX_VALID +} D3D12_PIPELINE_STATE_SUBOBJECT_TYPE; + +typedef struct D3D12_DEPTH_STENCIL_DESC1 +{ + BOOL DepthEnable; + D3D12_DEPTH_WRITE_MASK DepthWriteMask; + D3D12_COMPARISON_FUNC DepthFunc; + BOOL StencilEnable; + UINT8 StencilReadMask; + UINT8 StencilWriteMask; + D3D12_DEPTH_STENCILOP_DESC FrontFace; + D3D12_DEPTH_STENCILOP_DESC BackFace; + BOOL DepthBoundsTestEnable; +} D3D12_DEPTH_STENCIL_DESC1; + +typedef struct D3D12_VIEW_INSTANCE_LOCATION +{ + UINT ViewportArrayIndex; + UINT RenderTargetArrayIndex; +} D3D12_VIEW_INSTANCE_LOCATION; + +typedef struct D3D12_VIEW_INSTANCING_DESC +{ + UINT ViewInstanceCount; + const D3D12_VIEW_INSTANCE_LOCATION *pViewInstanceLocations; + D3D12_VIEW_INSTANCING_FLAGS Flags; +} D3D12_VIEW_INSTANCING_DESC; + +typedef struct D3D12_RT_FORMAT_ARRAY +{ + DXGI_FORMAT RTFormats[8]; + UINT NumRenderTargets; +} D3D12_RT_FORMAT_ARRAY; + +typedef struct D3D12_PIPELINE_STATE_STREAM_DESC +{ + SIZE_T SizeInBytes; + void *pPipelineStateSubobjectStream; +} D3D12_PIPELINE_STATE_STREAM_DESC; + [ uuid(8efb471d-616c-4f49-90f7-127bb763fa51), object, -- 2.29.2

1 1

[PATCH] include/d3d12: add missing enum/structures/defines needed to use d3d12x.h
by Steve Lhomme 03 Jul '21

03 Jul '21

d3dx12.h is a useful MIT licensed header from Microsoft to help do regular things with D3D12 (in C++). It's usable with mingw (and thus wine) with these additions. Signed-off-by: Steve Lhomme <robux4(a)ycbcr.xyz> --- include/d3d12.idl | 77 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/include/d3d12.idl b/include/d3d12.idl index 42f33a06e40..056e078ab9d 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -75,6 +75,9 @@ const UINT D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT = 4096; const UINT D3D12_VS_INPUT_REGISTER_COUNT = 32; const UINT D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE = 16; +cpp_quote("#define D3D12_MIN_DEPTH ( 0.0f )") +cpp_quote("#define D3D12_MAX_DEPTH ( 1.0f )") + cpp_quote("#endif") const UINT D3D12_SHADER_COMPONENT_MAPPING_MASK = 0x7; @@ -2005,6 +2008,80 @@ typedef enum D3D12_PREDICATION_OP D3D12_PREDICATION_OP_NOT_EQUAL_ZERO = 1, } D3D12_PREDICATION_OP; +typedef enum D3D12_VIEW_INSTANCING_FLAGS +{ + D3D12_VIEW_INSTANCING_FLAG_NONE, + D3D12_VIEW_INSTANCING_FLAG_ENABLE_VIEW_INSTANCE_MASKING +} D3D12_VIEW_INSTANCING_FLAGS; + +typedef enum D3D12_PIPELINE_STATE_SUBOBJECT_TYPE +{ + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_ROOT_SIGNATURE, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_VS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_PS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_HS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_GS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_CS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_STREAM_OUTPUT, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_BLEND, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_SAMPLE_MASK, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_RASTERIZER, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DEPTH_STENCIL, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_INPUT_LAYOUT, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_IB_STRIP_CUT_VALUE, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_PRIMITIVE_TOPOLOGY, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_RENDER_TARGET_FORMATS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DEPTH_STENCIL_FORMAT, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_SAMPLE_DESC, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_NODE_MASK, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_CACHED_PSO, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_FLAGS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DEPTH_STENCIL1, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_VIEW_INSTANCING, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_AS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_MS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_MAX_VALID +} D3D12_PIPELINE_STATE_SUBOBJECT_TYPE; + +typedef struct D3D12_DEPTH_STENCIL_DESC1 +{ + BOOL DepthEnable; + D3D12_DEPTH_WRITE_MASK DepthWriteMask; + D3D12_COMPARISON_FUNC DepthFunc; + BOOL StencilEnable; + UINT8 StencilReadMask; + UINT8 StencilWriteMask; + D3D12_DEPTH_STENCILOP_DESC FrontFace; + D3D12_DEPTH_STENCILOP_DESC BackFace; + BOOL DepthBoundsTestEnable; +} D3D12_DEPTH_STENCIL_DESC1; + +typedef struct D3D12_VIEW_INSTANCE_LOCATION +{ + UINT ViewportArrayIndex; + UINT RenderTargetArrayIndex; +} D3D12_VIEW_INSTANCE_LOCATION; + +typedef struct D3D12_VIEW_INSTANCING_DESC +{ + UINT ViewInstanceCount; + const D3D12_VIEW_INSTANCE_LOCATION *pViewInstanceLocations; + D3D12_VIEW_INSTANCING_FLAGS Flags; +} D3D12_VIEW_INSTANCING_DESC; + +typedef struct D3D12_RT_FORMAT_ARRAY +{ + DXGI_FORMAT RTFormats[8]; + UINT NumRenderTargets; +} D3D12_RT_FORMAT_ARRAY; + +typedef struct D3D12_PIPELINE_STATE_STREAM_DESC +{ + SIZE_T SizeInBytes; + void *pPipelineStateSubobjectStream; +} D3D12_PIPELINE_STATE_STREAM_DESC; + [ uuid(8efb471d-616c-4f49-90f7-127bb763fa51), object, -- 2.29.2

1 0

[PATCH] include/d3d12: add interfaces to support D3D12 video decoding
by Steve Lhomme 03 Jul '21

03 Jul '21

--- include/d3d12.idl | 3 + include/d3d12video.idl | 378 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 381 insertions(+) create mode 100644 include/d3d12video.idl diff --git a/include/d3d12.idl b/include/d3d12.idl index 056e078ab9d..08ec5b9e2d3 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -1633,6 +1633,9 @@ typedef enum D3D12_COMMAND_LIST_TYPE D3D12_COMMAND_LIST_TYPE_BUNDLE = 1, D3D12_COMMAND_LIST_TYPE_COMPUTE = 2, D3D12_COMMAND_LIST_TYPE_COPY = 3, + D3D12_COMMAND_LIST_TYPE_VIDEO_DECODE = 4, + D3D12_COMMAND_LIST_TYPE_VIDEO_PROCESS = 5, + D3D12_COMMAND_LIST_TYPE_VIDEO_ENCODE = 6 } D3D12_COMMAND_LIST_TYPE; typedef enum D3D12_COMMAND_QUEUE_PRIORITY diff --git a/include/d3d12video.idl b/include/d3d12video.idl new file mode 100644 index 00000000000..49aa8eea8d8 --- /dev/null +++ b/include/d3d12video.idl @@ -0,0 +1,378 @@ +import "d3d12.idl"; + +typedef enum D3D12_FEATURE_VIDEO +{ + D3D12_FEATURE_VIDEO_DECODE_SUPPORT = 0, + D3D12_FEATURE_VIDEO_DECODE_PROFILES = 1, + D3D12_FEATURE_VIDEO_DECODE_FORMATS = 2, + D3D12_FEATURE_VIDEO_DECODE_CONVERSION_SUPPORT = 3, + D3D12_FEATURE_VIDEO_PROCESS_SUPPORT = 5, + D3D12_FEATURE_VIDEO_PROCESS_MAX_INPUT_STREAMS = 6, + D3D12_FEATURE_VIDEO_PROCESS_REFERENCE_INFO = 7, + D3D12_FEATURE_VIDEO_DECODER_HEAP_SIZE = 8, + D3D12_FEATURE_VIDEO_PROCESSOR_SIZE = 9, + D3D12_FEATURE_VIDEO_DECODE_PROFILE_COUNT = 10, + D3D12_FEATURE_VIDEO_DECODE_FORMAT_COUNT = 11, + D3D12_FEATURE_VIDEO_ARCHITECTURE = 17, + D3D12_FEATURE_VIDEO_DECODE_HISTOGRAM = 18, + D3D12_FEATURE_VIDEO_FEATURE_AREA_SUPPORT = 19, + D3D12_FEATURE_VIDEO_MOTION_ESTIMATOR = 20, + D3D12_FEATURE_VIDEO_MOTION_ESTIMATOR_SIZE = 21, + D3D12_FEATURE_VIDEO_EXTENSION_COMMAND_COUNT = 22, + D3D12_FEATURE_VIDEO_EXTENSION_COMMANDS = 23, + D3D12_FEATURE_VIDEO_EXTENSION_COMMAND_PARAMETER_COUNT = 24, + D3D12_FEATURE_VIDEO_EXTENSION_COMMAND_PARAMETERS = 25, + D3D12_FEATURE_VIDEO_EXTENSION_COMMAND_SUPPORT = 26, + D3D12_FEATURE_VIDEO_EXTENSION_COMMAND_SIZE = 27, + D3D12_FEATURE_VIDEO_DECODE_PROTECTED_RESOURCES = 28, + D3D12_FEATURE_VIDEO_PROCESS_PROTECTED_RESOURCES = 29, + D3D12_FEATURE_VIDEO_MOTION_ESTIMATOR_PROTECTED_RESOURCES = 30, + D3D12_FEATURE_VIDEO_DECODER_HEAP_SIZE1 = 31, + D3D12_FEATURE_VIDEO_PROCESSOR_SIZE1 = 32 +} D3D12_FEATURE_VIDEO; + +typedef enum D3D12_BITSTREAM_ENCRYPTION_TYPE +{ + D3D12_BITSTREAM_ENCRYPTION_TYPE_NONE +} D3D12_BITSTREAM_ENCRYPTION_TYPE; + +typedef enum D3D12_VIDEO_FRAME_CODED_INTERLACE_TYPE +{ + D3D12_VIDEO_FRAME_CODED_INTERLACE_TYPE_NONE, + D3D12_VIDEO_FRAME_CODED_INTERLACE_TYPE_FIELD_BASED +} D3D12_VIDEO_FRAME_CODED_INTERLACE_TYPE; + +typedef enum D3D12_VIDEO_PROCESS_ALPHA_FILL_MODE +{ + D3D12_VIDEO_PROCESS_ALPHA_FILL_MODE_OPAQUE, + D3D12_VIDEO_PROCESS_ALPHA_FILL_MODE_BACKGROUND, + D3D12_VIDEO_PROCESS_ALPHA_FILL_MODE_DESTINATION, + D3D12_VIDEO_PROCESS_ALPHA_FILL_MODE_SOURCE_STREAM +} D3D12_VIDEO_PROCESS_ALPHA_FILL_MODE; + +typedef enum D3D12_VIDEO_PROCESS_FILTER_FLAGS +{ + D3D12_VIDEO_PROCESS_FILTER_FLAG_NONE, + D3D12_VIDEO_PROCESS_FILTER_FLAG_BRIGHTNESS, + D3D12_VIDEO_PROCESS_FILTER_FLAG_CONTRAST, + D3D12_VIDEO_PROCESS_FILTER_FLAG_HUE, + D3D12_VIDEO_PROCESS_FILTER_FLAG_SATURATION, + D3D12_VIDEO_PROCESS_FILTER_FLAG_NOISE_REDUCTION, + D3D12_VIDEO_PROCESS_FILTER_FLAG_EDGE_ENHANCEMENT, + D3D12_VIDEO_PROCESS_FILTER_FLAG_ANAMORPHIC_SCALING, + D3D12_VIDEO_PROCESS_FILTER_FLAG_STEREO_ADJUSTMENT +} D3D12_VIDEO_PROCESS_FILTER_FLAGS; + +typedef enum D3D12_VIDEO_FRAME_STEREO_FORMAT +{ + D3D12_VIDEO_FRAME_STEREO_FORMAT_NONE, + D3D12_VIDEO_FRAME_STEREO_FORMAT_MONO, + D3D12_VIDEO_FRAME_STEREO_FORMAT_HORIZONTAL, + D3D12_VIDEO_FRAME_STEREO_FORMAT_VERTICAL, + D3D12_VIDEO_FRAME_STEREO_FORMAT_SEPARATE +} D3D12_VIDEO_FRAME_STEREO_FORMAT; + +typedef enum D3D12_VIDEO_FIELD_TYPE +{ + D3D12_VIDEO_FIELD_TYPE_NONE, + D3D12_VIDEO_FIELD_TYPE_INTERLACED_TOP_FIELD_FIRST, + D3D12_VIDEO_FIELD_TYPE_INTERLACED_BOTTOM_FIELD_FIRST +} D3D12_VIDEO_FIELD_TYPE; + +typedef enum D3D12_VIDEO_PROCESS_DEINTERLACE_FLAGS +{ + D3D12_VIDEO_PROCESS_DEINTERLACE_FLAG_NONE, + D3D12_VIDEO_PROCESS_DEINTERLACE_FLAG_BOB, + D3D12_VIDEO_PROCESS_DEINTERLACE_FLAG_CUSTOM +} D3D12_VIDEO_PROCESS_DEINTERLACE_FLAGS; + +typedef enum D3D12_VIDEO_DECODE_ARGUMENT_TYPE +{ + D3D12_VIDEO_DECODE_ARGUMENT_TYPE_PICTURE_PARAMETERS, + D3D12_VIDEO_DECODE_ARGUMENT_TYPE_INVERSE_QUANTIZATION_MATRIX, + D3D12_VIDEO_DECODE_ARGUMENT_TYPE_SLICE_CONTROL, + D3D12_VIDEO_DECODE_ARGUMENT_TYPE_MAX_VALID +} D3D12_VIDEO_DECODE_ARGUMENT_TYPE; + +typedef enum D3D12_VIDEO_DECODE_SUPPORT_FLAGS +{ + D3D12_VIDEO_DECODE_SUPPORT_FLAG_NONE = 0x0, + D3D12_VIDEO_DECODE_SUPPORT_FLAG_SUPPORTED = 0x1, +} D3D12_VIDEO_DECODE_SUPPORT_FLAGS; + +typedef enum D3D12_VIDEO_DECODE_CONFIGURATION_FLAGS +{ + D3D12_VIDEO_DECODE_CONFIGURATION_FLAG_NONE = 0x0, + D3D12_VIDEO_DECODE_CONFIGURATION_FLAG_HEIGHT_ALIGNMENT_MULTIPLE_32_REQUIRED = 0x1, + D3D12_VIDEO_DECODE_CONFIGURATION_FLAG_POST_PROCESSING_SUPPORTED = 0x2, + D3D12_VIDEO_DECODE_CONFIGURATION_FLAG_REFERENCE_ONLY_ALLOCATIONS_REQUIRED = 0x4, + D3D12_VIDEO_DECODE_CONFIGURATION_FLAG_ALLOW_RESOLUTION_CHANGE_ON_NON_KEY_FRAME = 0x8, +} D3D12_VIDEO_DECODE_CONFIGURATION_FLAGS; + +typedef enum D3D12_VIDEO_DECODE_TIER +{ + D3D12_VIDEO_DECODE_TIER_NOT_SUPPORTED, + D3D12_VIDEO_DECODE_TIER_1, + D3D12_VIDEO_DECODE_TIER_2, + D3D12_VIDEO_DECODE_TIER_3, +} D3D12_VIDEO_DECODE_TIER; + + +interface ID3D12VideoDecoderHeap; + + +typedef struct D3D12_VIDEO_DECODE_CONFIGURATION +{ + GUID DecodeProfile; + D3D12_BITSTREAM_ENCRYPTION_TYPE BitstreamEncryption; + D3D12_VIDEO_FRAME_CODED_INTERLACE_TYPE InterlaceType; +} D3D12_VIDEO_DECODE_CONFIGURATION; + +typedef struct D3D12_VIDEO_DECODER_DESC +{ + UINT NodeMask; + D3D12_VIDEO_DECODE_CONFIGURATION Configuration; +} D3D12_VIDEO_DECODER_DESC; + +typedef struct D3D12_VIDEO_DECODER_HEAP_DESC +{ + UINT NodeMask; + D3D12_VIDEO_DECODE_CONFIGURATION Configuration; + UINT DecodeWidth; + UINT DecodeHeight; + DXGI_FORMAT Format; + DXGI_RATIONAL FrameRate; + UINT BitRate; + UINT MaxDecodePictureBufferCount; +} D3D12_VIDEO_DECODER_HEAP_DESC; + +typedef struct D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC +{ + DXGI_FORMAT Format; + DXGI_COLOR_SPACE_TYPE ColorSpace; + D3D12_VIDEO_PROCESS_ALPHA_FILL_MODE AlphaFillMode; + UINT AlphaFillModeSourceStreamIndex; + FLOAT BackgroundColor[4]; + DXGI_RATIONAL FrameRate; + BOOL EnableStereo; +} D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC; + +typedef struct D3D12_VIDEO_SIZE_RANGE +{ + UINT MaxWidth; + UINT MaxHeight; + UINT MinWidth; + UINT MinHeight; +} D3D12_VIDEO_SIZE_RANGE; + +typedef struct D3D12_VIDEO_PROCESS_LUMA_KEY +{ + BOOL Enable; + FLOAT Lower; + FLOAT Upper; +} D3D12_VIDEO_PROCESS_LUMA_KEY; + +typedef struct D3D12_VIDEO_PROCESS_INPUT_STREAM_DESC +{ + DXGI_FORMAT Format; + DXGI_COLOR_SPACE_TYPE ColorSpace; + DXGI_RATIONAL SourceAspectRatio; + DXGI_RATIONAL DestinationAspectRatio; + DXGI_RATIONAL FrameRate; + D3D12_VIDEO_SIZE_RANGE SourceSizeRange; + D3D12_VIDEO_SIZE_RANGE DestinationSizeRange; + BOOL EnableOrientation; + D3D12_VIDEO_PROCESS_FILTER_FLAGS FilterFlags; + D3D12_VIDEO_FRAME_STEREO_FORMAT StereoFormat; + D3D12_VIDEO_FIELD_TYPE FieldType; + D3D12_VIDEO_PROCESS_DEINTERLACE_FLAGS DeinterlaceMode; + BOOL EnableAlphaBlending; + D3D12_VIDEO_PROCESS_LUMA_KEY LumaKey; + UINT NumPastFrames; + UINT NumFutureFrames; + BOOL EnableAutoProcessing; +} D3D12_VIDEO_PROCESS_INPUT_STREAM_DESC; + +typedef struct D3D12_FEATURE_DATA_VIDEO_DECODE_PROFILE_COUNT +{ + UINT NodeIndex; + UINT ProfileCount; +} D3D12_FEATURE_DATA_VIDEO_DECODE_PROFILE_COUNT; + +typedef struct D3D12_FEATURE_DATA_VIDEO_DECODE_PROFILES +{ + UINT NodeIndex; + UINT ProfileCount; + GUID *pProfiles; +} D3D12_FEATURE_DATA_VIDEO_DECODE_PROFILES; + +typedef struct D3D12_FEATURE_DATA_VIDEO_DECODE_FORMAT_COUNT +{ + UINT NodeIndex; + D3D12_VIDEO_DECODE_CONFIGURATION Configuration; + UINT FormatCount; +} D3D12_FEATURE_DATA_VIDEO_DECODE_FORMAT_COUNT; + +typedef struct D3D12_FEATURE_DATA_VIDEO_DECODE_FORMATS +{ + UINT NodeIndex; + D3D12_VIDEO_DECODE_CONFIGURATION Configuration; + UINT FormatCount; + DXGI_FORMAT *pOutputFormats; +} D3D12_FEATURE_DATA_VIDEO_DECODE_FORMATS; + +typedef struct D3D12_FEATURE_DATA_VIDEO_DECODE_SUPPORT +{ + UINT NodeIndex; + D3D12_VIDEO_DECODE_CONFIGURATION Configuration; + UINT Width; + UINT Height; + DXGI_FORMAT DecodeFormat; + DXGI_RATIONAL FrameRate; + UINT BitRate; + D3D12_VIDEO_DECODE_SUPPORT_FLAGS SupportFlags; + D3D12_VIDEO_DECODE_CONFIGURATION_FLAGS ConfigurationFlags; + D3D12_VIDEO_DECODE_TIER DecodeTier; +} D3D12_FEATURE_DATA_VIDEO_DECODE_SUPPORT; + +typedef struct D3D12_VIDEO_DECODE_CONVERSION_ARGUMENTS +{ + BOOL Enable; + ID3D12Resource *pReferenceTexture2D; + UINT ReferenceSubresource; + DXGI_COLOR_SPACE_TYPE OutputColorSpace; + DXGI_COLOR_SPACE_TYPE DecodeColorSpace; +} D3D12_VIDEO_DECODE_CONVERSION_ARGUMENTS; + +typedef struct D3D12_VIDEO_DECODE_OUTPUT_STREAM_ARGUMENTS +{ + ID3D12Resource *pOutputTexture2D; + UINT OutputSubresource; + D3D12_VIDEO_DECODE_CONVERSION_ARGUMENTS ConversionArguments; +} D3D12_VIDEO_DECODE_OUTPUT_STREAM_ARGUMENTS; + +typedef struct D3D12_VIDEO_DECODE_FRAME_ARGUMENT +{ + D3D12_VIDEO_DECODE_ARGUMENT_TYPE Type; + UINT Size; + void *pData; +} D3D12_VIDEO_DECODE_FRAME_ARGUMENT; + +typedef struct D3D12_VIDEO_DECODE_REFERENCE_FRAMES +{ + UINT NumTexture2Ds; + ID3D12Resource **ppTexture2Ds; + UINT *pSubresources; + ID3D12VideoDecoderHeap **ppHeaps; +} D3D12_VIDEO_DECODE_REFERENCE_FRAMES; + +typedef struct D3D12_VIDEO_DECODE_COMPRESSED_BITSTREAM +{ + ID3D12Resource *pBuffer; + UINT64 Offset; + UINT64 Size; +} D3D12_VIDEO_DECODE_COMPRESSED_BITSTREAM; + +typedef struct D3D12_VIDEO_DECODE_INPUT_STREAM_ARGUMENTS +{ + UINT NumFrameArguments; + D3D12_VIDEO_DECODE_FRAME_ARGUMENT FrameArguments[10]; + D3D12_VIDEO_DECODE_REFERENCE_FRAMES ReferenceFrames; + D3D12_VIDEO_DECODE_COMPRESSED_BITSTREAM CompressedBitstream; + ID3D12VideoDecoderHeap *pHeap; +} D3D12_VIDEO_DECODE_INPUT_STREAM_ARGUMENTS; + + +[ + uuid(1F052807-0B46-4ACC-8A89-364F793718A4), + object, + local, + pointer_default(unique) +] +interface ID3D12VideoDevice : IUnknown +{ + HRESULT CheckFeatureSupport(D3D12_FEATURE_VIDEO FeatureVideo, + void *pFeatureSupportData, + UINT FeatureSupportDataSize); + + HRESULT CreateVideoDecoder(const D3D12_VIDEO_DECODER_DESC *pDesc, + REFIID riid, + void **ppVideoDecoder); + + HRESULT CreateVideoDecoderHeap(const D3D12_VIDEO_DECODER_HEAP_DESC *pVideoDecoderHeapDesc, + REFIID riid, + void **ppVideoDecoderHeap); + + HRESULT CreateVideoProcessor(UINT NodeMask, + const D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC *pOutputStreamDesc, + UINT NumInputStreamDescs, + const D3D12_VIDEO_PROCESS_INPUT_STREAM_DESC *pInputStreamDescs, + REFIID riid, + void **ppVideoProcessor); +} + +[ + uuid(C59B6BDC-7720-4074-A136-17A156037470), + object, + local, + pointer_default(unique) +] +interface ID3D12VideoDecoder : ID3D12Pageable +{ + D3D12_VIDEO_DECODER_DESC GetDesc(); +} + +[ + uuid(0946B7C9-EBF6-4047-BB73-8683E27DBB1F), + object, + local, + pointer_default(unique) +] +interface ID3D12VideoDecoderHeap : ID3D12Pageable +{ + D3D12_VIDEO_DECODER_HEAP_DESC GetDesc(); +} + +[ + uuid(3B60536E-AD29-4E64-A269-F853837E5E53), + object, + local, + pointer_default(unique) +] +interface ID3D12VideoDecodeCommandList : ID3D12CommandList +{ + HRESULT Close(); + + HRESULT Reset(ID3D12CommandAllocator *pAllocator); + + void ClearState(); + + void ResourceBarrier(UINT NumBarriers, const D3D12_RESOURCE_BARRIER *pBarriers); + + void DiscardResource(ID3D12Resource *pResource, const D3D12_DISCARD_REGION *pRegion); + + void BeginQuery(ID3D12QueryHeap *pQueryHeap, D3D12_QUERY_TYPE Type, UINT Index); + + void EndQuery(ID3D12QueryHeap *pQueryHeap, D3D12_QUERY_TYPE Type, UINT Index); + + void ResolveQueryData(ID3D12QueryHeap *pQueryHeap, D3D12_QUERY_TYPE Type, UINT StartIndex, + UINT NumQueries, ID3D12Resource *pDestinationBuffer, + UINT64 AlignedDestinationBufferOffset); + + void SetPredication(ID3D12Resource *pBuffer, UINT64 AlignedBufferOffset, + D3D12_PREDICATION_OP Operation); + + void SetMarker(UINT Metadata, const void *pData, UINT Size); + + void BeginEvent(UINT Metadata, const void *pData, UINT Size); + + void EndEvent(); + + void DecodeFrame(ID3D12VideoDecoder *pDecoder, + const D3D12_VIDEO_DECODE_OUTPUT_STREAM_ARGUMENTS *pOutputArguments, + const D3D12_VIDEO_DECODE_INPUT_STREAM_ARGUMENTS *pInputArguments); + + void WriteBufferImmediate(UINT Count, + const D3D12_WRITEBUFFERIMMEDIATE_PARAMETER *pParams, + const D3D12_WRITEBUFFERIMMEDIATE_MODE *pModes); +} -- 2.29.2

1 2

[PATCH] msxml3: Fix crash when iterating through attributes with namespaces.
by Bernhard Übelacker 02 Jul '21

02 Jul '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50475 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- For an attribute xmlns without a :foo prefix, the function domelem_get_item gives a NULL xmlns->prefix into xmlNewNsProp, which therefore fails and leaves domelem_get_item without returning an item. Therefore the crash follows. --- dlls/msxml3/element.c | 5 ++- dlls/msxml3/tests/domdoc.c | 62 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 1a523798328..c11d28b066c 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1832,7 +1832,10 @@ static HRESULT domelem_get_item(const xmlNodePtr node, LONG index, IXMLDOMNode * if (!xmlns) return E_OUTOFMEMORY; - curr = xmlNewNsProp(NULL, xmlns, ns->prefix, ns->href); + if (ns->prefix) + curr = xmlNewNsProp(NULL, xmlns, ns->prefix, ns->href); + else + curr = xmlNewProp(NULL, xmlns->prefix, ns->href); if (!curr) { xmlFreeNs(xmlns); return E_OUTOFMEMORY; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index df30104a156..8faf5b59be5 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13628,6 +13628,67 @@ todo_wine DeleteFileA(path); } +static const char svg[] = + "<svg version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\"></svg>"; + +static void test_prefixless_namespace(void) +{ + HRESULT hr; + IXMLDOMDocument *doc; + VARIANT_BOOL b; + BSTR str; + IXMLDOMNodeList *node_list; + LONG length; + IXMLDOMNode *node1; + IXMLDOMNode *node2; + IXMLDOMNamedNodeMap *node_map; + int found; + + doc = create_document(&IID_IXMLDOMDocument); + EXPECT_REF(doc, 1); + + hr = IXMLDOMDocument_loadXML(doc, _bstr_(svg), &b); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_get_childNodes(doc, &node_list); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMNodeList_get_item(node_list, 0, &node1); + EXPECT_HR(hr, S_OK); + + node_map = (void *)0xdeadbeef; + hr = IXMLDOMNode_get_attributes(node1, &node_map); + EXPECT_HR(hr, S_OK); + + length = 0xdeadbeef; + hr = IXMLDOMNamedNodeMap_get_length(node_map, &length); + EXPECT_HR(hr, S_OK); + ok(length == 3, "expected length=%d, got %d\n", 3, length); + + found = 0; + for (int i = 0; i < length; i++) + { + hr = IXMLDOMNamedNodeMap_get_item(node_map, i, &node2); + EXPECT_HR(hr, S_OK); + + str = (void *)0xdeadbeef; + hr = IXMLDOMNode_get_xml(node2, &str); + EXPECT_HR(hr, S_OK); + if (lstrcmpW(str, L"version=\"1.1\"") == 0) found++; + if (lstrcmpW(str, L"xmlns=\"http://www.w3.org/2000/svg\"") == 0) found++; + if (lstrcmpW(str, L"xmlns:xlink=\"http://www.w3.org/1999/xlink\"") == 0) found++; + SysFreeString(str); + + IXMLDOMNode_Release(node2); + } + ok(found == 3, "expected to find %d elements, found %d\n", 3, found); + + IXMLDOMNamedNodeMap_Release(node_map); + IXMLDOMNode_Release(node1); + IXMLDOMNodeList_Release(node_list); + IXMLDOMDocument_Release(doc); +} + START_TEST(domdoc) { HRESULT hr; @@ -13723,6 +13784,7 @@ START_TEST(domdoc) test_mxnamespacemanager(); test_mxnamespacemanager_override(); } + test_prefixless_namespace(); CoUninitialize(); } -- 2.30.2

1 0

[PATCH 1/3] wininet/tests: Test InternetCrackUrl when given a bogus length
by Tim Clem 02 Jul '21

02 Jul '21

Windows will stop processing at the first null, even when given an explicit length. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> --- dlls/wininet/tests/url.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index bce7dc76c59..681b6ef0b32 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -653,6 +653,15 @@ static void InternetCrackUrl_test(void) GLE = GetLastError(); ok(ret == FALSE, "Expected InternetCrackUrl to fail\n"); ok(GLE == ERROR_INTERNET_UNRECOGNIZED_SCHEME, "Expected GLE to represent a failure\n"); + + /* Windows treats dwUrlLength as a maximum - if there is a null before + * that length, it stops there. */ + copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 1024, 1024, 1024); + ret = InternetCrackUrlA("http://x.org", 13 /* includes the nul */, 0, &urlComponents); + ok(ret, "InternetCrackUrlA failed with error %d\n", GetLastError()); + todo_wine + ok(urlComponents.dwHostNameLength == 5, + "Expected dwHostNameLength of 5, got %d\n", urlComponents.dwHostNameLength); } static void InternetCrackUrlW_test(void) @@ -825,6 +834,19 @@ static void InternetCrackUrlW_test(void) ok(r, "InternetCrackUrlW failed unexpectedly\n"); ok(!strcmp_wa(host, "x.org"), "host is %s, should be x.org\n", wine_dbgstr_w(host)); todo_wine ok(urlpart[0] == 0, "urlpart should be empty\n"); + + /* Windows treats dwUrlLength as a maximum - if there is a null before + * that length, it stops there. */ + host[0] = 0; + memset(&comp, 0, sizeof(comp)); + comp.dwStructSize = sizeof(comp); + comp.lpszHostName = host; + comp.dwHostNameLength = ARRAY_SIZE(host); + r = InternetCrackUrlW(url3, 13 /* includes the nul */, 0, &comp); + ok(r, "InternetCrackUrlW failed with error %d\n", GetLastError()); + todo_wine + ok(comp.dwHostNameLength == 5, + "Expected dwHostNameLength of 5, got %d\n", comp.dwHostNameLength); } static void fill_url_components(URL_COMPONENTSA *lpUrlComponents) -- 2.32.0

2 7

[PATCH v2] wined3d: Pass a wined3d_device pointer to wined3d_from_cs().
by Zebediah Figura 02 Jul '21

02 Jul '21

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: Remove an assertion from wined3d_cs_queue_is_empty(). dlls/wined3d/adapter_vk.c | 2 +- dlls/wined3d/context_gl.c | 4 ++-- dlls/wined3d/cs.c | 1 - dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 2 +- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/wined3d_private.h | 8 ++++---- 7 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 850e2a6dfdb..d5001c1296b 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -541,7 +541,7 @@ static struct wined3d_context *adapter_vk_acquire_context(struct wined3d_device { TRACE("device %p, texture %p, sub_resource_idx %u.\n", device, texture, sub_resource_idx); - wined3d_from_cs(device->cs); + wined3d_from_cs(device); if (!device->context_count) return NULL; diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 474003d7553..33cb76343cd 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2295,7 +2295,7 @@ void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) TRACE("Destroying context %p.\n", context_gl); - wined3d_from_cs(device->cs); + wined3d_from_cs(device); /* We delay destroying a context when it is active. The context_release() * function invokes wined3d_context_gl_destroy() again while leaving the @@ -4229,7 +4229,7 @@ struct wined3d_context_gl *wined3d_context_gl_reacquire(struct wined3d_context_g return NULL; device = context_gl->c.device; - wined3d_from_cs(device->cs); + wined3d_from_cs(device); if (context_gl->c.current_rt.texture) { diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ce0417c9f71..c5fc8fbb7a6 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3047,7 +3047,6 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) { - wined3d_from_cs(cs); return *(volatile LONG *)&queue->head == queue->tail; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5a2a95ebe96..55879e546f2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5765,7 +5765,7 @@ void device_invalidate_state(const struct wined3d_device *device, unsigned int s unsigned int representative, i, idx, shift; struct wined3d_context *context; - wined3d_from_cs(device->cs); + wined3d_from_cs(device); if (STATE_IS_COMPUTE(state_id)) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a39c6d75750..b87efaddaff 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2694,7 +2694,7 @@ static struct wined3d_context *adapter_no3d_acquire_context(struct wined3d_devic { TRACE("device %p, texture %p, sub_resource_idx %u.\n", device, texture, sub_resource_idx); - wined3d_from_cs(device->cs); + wined3d_from_cs(device); if (!device->context_count) return NULL; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 693557448fe..fe1bcb3824a 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1783,7 +1783,7 @@ static struct wined3d_context_gl *wined3d_swapchain_gl_create_context(struct win TRACE("Creating a new context for swapchain %p, thread %u.\n", swapchain_gl, GetCurrentThreadId()); - wined3d_from_cs(device->cs); + wined3d_from_cs(device); if (!(context_gl = heap_alloc_zero(sizeof(*context_gl)))) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 80e03ad9212..36e1fa4ec7a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -6034,10 +6034,10 @@ static inline void wined3d_insert_bits(DWORD *bitstream, } } -static inline void wined3d_from_cs(const struct wined3d_cs *cs) +static inline void wined3d_from_cs(const struct wined3d_device *device) { - if (cs->thread) - assert(cs->thread_id == GetCurrentThreadId()); + if (device->cs->thread) + assert(device->cs->thread_id == GetCurrentThreadId()); } static inline void wined3d_not_from_cs(const struct wined3d_device *device) @@ -6103,7 +6103,7 @@ void compute_normal_matrix(float *normal_matrix, BOOL legacy_lighting, static inline struct wined3d_context *context_acquire(struct wined3d_device *device, struct wined3d_texture *texture, unsigned int sub_resource_idx) { - wined3d_from_cs(device->cs); + wined3d_from_cs(device); return device->adapter->adapter_ops->adapter_acquire_context(device, texture, sub_resource_idx); } -- 2.30.2

1 0

[PATCH 2/5] wininet: validate InternetGetLastResponseInfo() parameters
by Damjan Jovanovic 02 Jul '21

02 Jul '21

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/wininet/internet.c | 10 ++++++++++ dlls/wininet/tests/ftp.c | 7 +++++++ 2 files changed, 17 insertions(+)

2 1

[PATCH 1/5] wininet: improve InternetGetLastResponseInfo() logging
by Damjan Jovanovic 02 Jul '21

02 Jul '21

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/wininet/internet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

2 1

[PATCH 4/5] wininet: return the required buffer size from InternetGetLastResponseInfo() when it's too small
by Damjan Jovanovic 02 Jul '21

02 Jul '21

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/wininet/internet.c | 17 +++++++++++++++-- dlls/wininet/tests/ftp.c | 28 +++++++++++++++++++++++++++- 2 files changed, 42 insertions(+), 3 deletions(-)

2 1

[PATCH 3/5] wininet: InternetGetLastResponseInfoW() returns wide chars, not ASCII
by Damjan Jovanovic 02 Jul '21

02 Jul '21

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/wininet/internet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH resend] uiribbon: Add stubs for IUIImageFromBitmap.
by Vijay Kiran Kamuju 02 Jul '21

02 Jul '21

This is resend of an earlier patch, which received no comments and dropped off the list. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/2] reg/tests: Check all error codes in delete_tree() before returning
by Hugh McMaster 02 Jul '21

02 Jul '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/tests/add.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index 2c1a2cf35e3..1be34602408 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -194,9 +194,8 @@ LONG delete_tree_(const char *file, unsigned line, HKEY root, const char *path, else ret = RegDeleteKeyExA(hkey, empty, sam, 0); - lok(!ret, "Failed to delete registry key, got error %d\n", ret); - cleanup: + lok(!ret, "Failed to delete registry key, got error %d\n", ret); HeapFree(GetProcessHeap(), 0, subkey_name); RegCloseKey(hkey); return ret; -- 2.32.0

1 1

[PATCH 8/8] gdi32/tests: Add more SelectObject tests.
by Jacek Caban 02 Jul '21

02 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/tests/bitmap.c | 6 ++++++ dlls/gdi32/tests/font.c | 27 +++++++++++++++++++++++++++ 2 files changed, 33 insertions(+)

2 1

[PATCH 7/8] gdi32: Directly use ntgdi interface to select objects.
by Jacek Caban 02 Jul '21

02 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 30 +++++++++++++++--------------- dlls/gdi32/dc.c | 26 +++++++++++++------------- dlls/gdi32/dib.c | 6 +++--- dlls/gdi32/font.c | 16 ++++++++-------- dlls/gdi32/painting.c | 8 ++++---- 5 files changed, 43 insertions(+), 43 deletions(-)

2 1

[PATCH 6/8] gdi32: Use get_object_type for GetObjectType implementation.
by Jacek Caban 02 Jul '21

02 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdiobj.c | 17 ----------------- dlls/gdi32/objects.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 17 deletions(-)

2 1

[PATCH 5/8] gdi32: Reimplement SelectObject on top of ntgdi interface.
by Jacek Caban 02 Jul '21

02 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- It adds a new file. The idea is that this file does not depend on internals that will be private to win32u/ntgdi, but uses the public interface instead. It will eventually be a collection of win32u wrappers. dlls/gdi32/Makefile.in | 1 + dlls/gdi32/bitmap.c | 10 ---- dlls/gdi32/brush.c | 13 ----- dlls/gdi32/dc.c | 1 - dlls/gdi32/dib.c | 11 ----- dlls/gdi32/font.c | 11 ----- dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/gdiobj.c | 36 -------------- dlls/gdi32/objects.c | 102 +++++++++++++++++++++++++++++++++++++++ dlls/gdi32/palette.c | 1 - dlls/gdi32/pen.c | 12 ----- dlls/gdi32/region.c | 10 ---- 12 files changed, 103 insertions(+), 106 deletions(-) create mode 100644 dlls/gdi32/objects.c

2 1

[PATCH 4/8] gdi32: Introduce NtGdiSelectFont.
by Jacek Caban 02 Jul '21

02 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)

2 1

[PATCH 3/8] gdi32: Introduce NtGdiSelectBrush.
by Jacek Caban 02 Jul '21

02 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/brush.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-)

2 1

[PATCH 2/8] gdi32: Introduce NtGdiSelectBitmap.
by Jacek Caban 02 Jul '21

02 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitmap.c | 15 ++++++++++--- dlls/gdi32/dib.c | 54 +-------------------------------------------- 2 files changed, 13 insertions(+), 56 deletions(-)

2 1

[PATCH 1/8] gdi32: Introduce NtGdiSelectPen.
by Jacek Caban 02 Jul '21

02 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- The plan is that it will ultimately live in win32u. Before moving that, a fair amount of caricaturization is needed in gdi32. The idea is to first use ntgdi interface internally in gdi32, so that the move will be easy. dlls/gdi32/pen.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)

2 2

[PATCH vkd3d v2] vkd3d-shader: Introduce shader_sm4_error() for reporting via vkd3d_shader_verror().
by Conor McCarthy 02 Jul '21

02 Jul '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 20 +++++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 5 ++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 2ec2bcac..4bc62014 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -489,6 +489,8 @@ struct vkd3d_sm4_data struct list src_free; struct list src; struct vkd3d_shader_immediate_constant_buffer icb; + + struct vkd3d_shader_message_context *message_context; }; struct vkd3d_sm4_opcode_info @@ -561,6 +563,16 @@ static bool shader_is_sm_5_1(const struct vkd3d_sm4_data *priv) return version->major >= 5 && version->minor >= 1; } +static void VKD3D_PRINTF_FUNC(3, 4) shader_sm4_error(struct vkd3d_sm4_data *priv, + enum vkd3d_shader_error error, const char *format, ...) +{ + va_list args; + + va_start(args, format); + vkd3d_shader_verror(priv->message_context, NULL, error, format, args); + va_end(args); +} + static bool shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, enum vkd3d_data_type data_type, struct vkd3d_shader_src_param *src_param); static bool shader_sm4_read_dst_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, @@ -628,7 +640,11 @@ static void shader_sm4_set_descriptor_register_range(struct vkd3d_sm4_data *priv range->first = reg->idx[shader_is_sm_5_1(priv) ? 1 : 0].offset; range->last = reg->idx[shader_is_sm_5_1(priv) ? 2 : 0].offset; if (range->last < range->first) + { FIXME("Invalid register range [%u:%u].\n", range->first, range->last); + shader_sm4_error(priv, VKD3D_SHADER_ERROR_TPF_INVALID_REGISTER_RANGE, + "Last register %u must not be less than first register %u in range.\n", range->last, range->first); + } } static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, @@ -1343,7 +1359,7 @@ static enum vkd3d_data_type map_data_type(char t) } void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, - const struct vkd3d_shader_signature *output_signature) + const struct vkd3d_shader_signature *output_signature, struct vkd3d_shader_message_context *message_context) { DWORD version_token, token_count; struct vkd3d_sm4_data *priv; @@ -1424,6 +1440,8 @@ void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, list_init(&priv->src_free); list_init(&priv->src); + priv->message_context = message_context; + return priv; } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 40d55b70..54654f3f 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -344,7 +344,7 @@ static int vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, } if (!(parser->data = shader_sm4_init(shader_desc->byte_code, - shader_desc->byte_code_size, &shader_desc->output_signature))) + shader_desc->byte_code_size, &shader_desc->output_signature, message_context))) { WARN("Failed to initialize shader parser.\n"); free_shader_desc(shader_desc); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index c61b3773..c5d1372a 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -69,6 +69,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_DXBC_INVALID_CHUNK_SIZE = 6, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF = 1000, + VKD3D_SHADER_ERROR_TPF_INVALID_REGISTER_RANGE = 1001, VKD3D_SHADER_ERROR_SPV_DESCRIPTOR_BINDING_NOT_FOUND = 2000, VKD3D_SHADER_ERROR_SPV_INVALID_REGISTER_TYPE = 2001, @@ -861,8 +862,10 @@ void vkd3d_shader_trace(void *data) DECLSPEC_HIDDEN; const char *shader_get_type_prefix(enum vkd3d_shader_type type) DECLSPEC_HIDDEN; +struct vkd3d_shader_message_context; + void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, - const struct vkd3d_shader_signature *output_signature) DECLSPEC_HIDDEN; + const struct vkd3d_shader_signature *output_signature, struct vkd3d_shader_message_context *message_context) DECLSPEC_HIDDEN; void shader_sm4_free(void *data) DECLSPEC_HIDDEN; void shader_sm4_read_header(void *data, const DWORD **ptr, struct vkd3d_shader_version *shader_version) DECLSPEC_HIDDEN; -- 2.31.1

2 1

[PATCH vkd3d v2 1/7] vkd3d-shader: Introduce shader_sm4_set_descriptor_register_range().
by Conor McCarthy 02 Jul '21

02 Jul '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 70ab70aa..9b6956ca 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -630,6 +630,15 @@ static unsigned int shader_sm4_map_resource_idx(struct vkd3d_shader_register *re return reg->idx[0].offset; } +static void shader_sm4_set_descriptor_register_range(struct vkd3d_sm4_data *priv, + struct vkd3d_shader_register *reg, struct vkd3d_shader_register_range *range) +{ + range->first = reg->idx[shader_is_sm_5_1(priv) ? 1 : 0].offset; + range->last = reg->idx[shader_is_sm_5_1(priv) ? 2 : 0].offset; + if (range->last < range->first) + FIXME("Invalid register range [%u:%u].\n", range->first, range->last); +} + static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct vkd3d_sm4_data *priv) @@ -654,8 +663,7 @@ static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, } reg_data_type = opcode == VKD3D_SM4_OP_DCL_RESOURCE ? VKD3D_DATA_RESOURCE : VKD3D_DATA_UAV; shader_sm4_read_dst_param(priv, &tokens, end, reg_data_type, &semantic->resource.reg); - semantic->resource.range.first = shader_sm4_map_resource_idx(&semantic->resource.reg.reg, priv); - semantic->resource.range.last = semantic->resource.range.first; + shader_sm4_set_descriptor_register_range(priv, &semantic->resource.reg.reg, &semantic->resource.range); components = *tokens++; for (i = 0; i < VKD3D_VEC4_SIZE; i++) -- 2.31.1

2 13

Students Selected for OSPP Summer 2021
by Zhenbo Li 02 Jul '21

02 Jul '21

Hi All, I'm excited to announce that we have three students participating in OSPP Summer 2021. Welcome! Florian Eder: Implement robocopy.exe. Mentored by Zebediah Figura Atharva Nimbalkar: Port wined3d's GLSL generator to vkd3d-shader. Mentored by Henri Verbeet Qingyi Wang: Documentation improvements for vkd3d-shaders. Mentored by Henri Verbeet Wish you enjoy wine coding this summer :) -- Sincerely, Zhenbo Li

1 0

[PATCH] crypt32: Grow item size buffer by more than 1 at a time.
by Rémi Bernon 02 Jul '21

02 Jul '21

When Steam starts and connects, it sometimes does some crypt32 processing and ends up spending a huge amount of time in ntdll memcpy, reallocating buffers, effectively getting stuck while connecting to the user account. This is mainly caused by the growth of the item size array which is only done one item at a time, and allocating a bigger buffer initially and growing it by bigger steps solves the problem. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/crypt32/decode.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 5d195d42f7b..a0e78d62b4d 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -628,7 +628,7 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, if ((ret = CRYPT_GetLengthIndefinite(pbEncoded, cbEncoded, &dataLen))) { - DWORD bytesNeeded = arrayDesc->minArraySize, cItems = 0, decoded; + DWORD bytesNeeded = arrayDesc->minArraySize, cItems = 0, capacity = 0, decoded; BYTE lenBytes = GET_LEN_BYTES(pbEncoded[1]); /* There can be arbitrarily many items, but there is often only one. */ @@ -687,17 +687,18 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, continue; } - cItems++; - if (itemSizes != &itemSize) - itemSizes = CryptMemRealloc(itemSizes, - cItems * sizeof(struct AsnArrayItemSize)); - else if (cItems > 1) + if (++cItems <= 1) + itemSizes = &itemSize; + else if (itemSizes == &itemSize) { - itemSizes = - CryptMemAlloc( - cItems * sizeof(struct AsnArrayItemSize)); - if (itemSizes) - *itemSizes = itemSize; + capacity = 1024; + itemSizes = CryptMemAlloc(capacity * sizeof(struct AsnArrayItemSize)); + if (itemSizes) *itemSizes = itemSize; + } + else if (cItems > capacity) + { + capacity = capacity * 3 / 2; + itemSizes = CryptMemRealloc(itemSizes, capacity * sizeof(struct AsnArrayItemSize)); } if (itemSizes) { -- 2.32.0

1 0

[PATCH 1/4] winegcc: Recognize .obj files as objects
by Connor Abbott 02 Jul '21

02 Jul '21

For more compatibility with mingw-gcc. Since meson always names object files with a .obj extension when using mingw, this improves compatibility with meson. Signed-off-by: Connor Abbott <cwabbott0(a)gmail.com> --- tools/winegcc/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index 0b82af90683..63d675122c0 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -230,6 +230,7 @@ file_type get_file_type(const char* filename) if (cnt == sizeof(res_sig) && !memcmp(buf, res_sig, sizeof(res_sig))) return file_res; if (strendswith(filename, ".o")) return file_obj; + if (strendswith(filename, ".obj")) return file_obj; if (strendswith(filename, ".a")) return file_arh; if (strendswith(filename, ".res")) return file_res; if (strendswith(filename, ".so")) return file_so; -- 2.31.1

1 3

[PATCH v4] dinput: Introduce new HID joystick backend.
by Rémi Bernon 02 Jul '21

02 Jul '21

This adds a new joystick backend, implemented on top of HID and without any host dependencies. This will be progressively implementated, and it's not going to be usable until at least a few more patches. Because of that, and because it may also introduce regressions compared to the existing backends, it is disabled by default and is optionally enabled using the following global registry key: [HKCU\\Software\\Wine\\DirectInput\\Joysticks] "HID"="enabled" Or using the corresponding AppDefaults registry key: [HKCU\\Software\\Wine\\AppDefaults\\<app.exe>\\DirectInput\\Joysticks] "HID"="enabled" This setting will be removed later, when it becomes usable enough, to use the individual device disable mechanism available in joy.cpl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v4: * Fill instance fields and GUIDs in hid_joystick_device_try_open. * Use invalid index value when opening device by GUID, and match the instance GUIDs against the provided one instead of passing handle and pid_vid parameters. dlls/dinput/Makefile.in | 3 +- dlls/dinput/dinput_main.c | 3 +- dlls/dinput/dinput_private.h | 1 + dlls/dinput/joystick.c | 17 +- dlls/dinput/joystick_hid.c | 497 ++++++++++++++++++++++++++++++ dlls/dinput/joystick_linux.c | 2 +- dlls/dinput/joystick_linuxinput.c | 2 +- dlls/dinput/joystick_private.h | 2 +- dlls/dinput8/Makefile.in | 3 +- 9 files changed, 519 insertions(+), 11 deletions(-) create mode 100644 dlls/dinput/joystick_hid.c diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in index a22c8a72180..29d3e8ece65 100644 --- a/dlls/dinput/Makefile.in +++ b/dlls/dinput/Makefile.in @@ -1,6 +1,6 @@ MODULE = dinput.dll IMPORTLIB = dinput -IMPORTS = dinput dxguid uuid comctl32 ole32 user32 advapi32 +IMPORTS = dinput dxguid uuid comctl32 ole32 user32 advapi32 hid setupapi EXTRADEFS = -DDIRECTINPUT_VERSION=0x0700 EXTRALIBS = $(IOKIT_LIBS) $(FORCEFEEDBACK_LIBS) @@ -12,6 +12,7 @@ C_SRCS = \ dinput_main.c \ effect_linuxinput.c \ joystick.c \ + joystick_hid.c \ joystick_linux.c \ joystick_linuxinput.c \ joystick_osx.c \ diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index c7b932aca44..88ee1855675 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -80,7 +80,8 @@ static const struct dinput_device *dinput_devices[] = &keyboard_device, &joystick_linuxinput_device, &joystick_linux_device, - &joystick_osx_device + &joystick_osx_device, + &joystick_hid_device, }; HINSTANCE DINPUT_instance; diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index 7e0f56c68df..c11b64585d9 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -67,6 +67,7 @@ struct DevicePlayer { extern const struct dinput_device mouse_device DECLSPEC_HIDDEN; extern const struct dinput_device keyboard_device DECLSPEC_HIDDEN; +extern const struct dinput_device joystick_hid_device DECLSPEC_HIDDEN; extern const struct dinput_device joystick_linux_device DECLSPEC_HIDDEN; extern const struct dinput_device joystick_linuxinput_device DECLSPEC_HIDDEN; extern const struct dinput_device joystick_osx_device DECLSPEC_HIDDEN; diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 8ea7850621c..60153d0d0f3 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -271,13 +271,13 @@ void dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid, DWORD dwFlags) } } -BOOL device_disabled_registry(const char* name) +BOOL device_disabled_registry(const char* name, BOOL disable) { static const char disabled_str[] = "disabled"; + static const char enabled_str[] = "enabled"; static const char joystick_key[] = "Joysticks"; char buffer[MAX_PATH]; HKEY hkey, appkey, temp; - BOOL do_disable = FALSE; get_app_key(&hkey, &appkey); @@ -297,16 +297,23 @@ BOOL device_disabled_registry(const char* name) /* Look for the "controllername"="disabled" key */ if (!get_config_key(hkey, appkey, name, buffer, sizeof(buffer))) - if (!strcmp(disabled_str, buffer)) + { + if (!disable && !strcmp(disabled_str, buffer)) { TRACE("Disabling joystick '%s' based on registry key.\n", name); - do_disable = TRUE; + disable = TRUE; + } + else if (disable && !strcmp(enabled_str, buffer)) + { + TRACE("Enabling joystick '%s' based on registry key.\n", name); + disable = FALSE; } + } if (appkey) RegCloseKey(appkey); if (hkey) RegCloseKey(hkey); - return do_disable; + return disable; } BOOL is_xinput_device(const DIDEVCAPS *devcaps, WORD vid, WORD pid) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c new file mode 100644 index 00000000000..90362da1e1a --- /dev/null +++ b/dlls/dinput/joystick_hid.c @@ -0,0 +1,497 @@ +/* DirectInput HID Joystick device + * + * Copyright 2021 Rémi Bernon 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 + */ + +#include <assert.h> +#include <stdarg.h> +#include <string.h> + +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winuser.h" +#include "winerror.h" +#include "winreg.h" + +#include "ddk/hidsdi.h" +#include "setupapi.h" +#include "devguid.h" +#include "dinput.h" +#include "setupapi.h" + +#include "wine/debug.h" + +#include "dinput_private.h" +#include "device_private.h" +#include "joystick_private.h" + +#include "initguid.h" +#include "devpkey.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dinput); + +DEFINE_GUID( hid_joystick_guid, 0x9e573edb, 0x7734, 0x11d2, 0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7 ); +DEFINE_DEVPROPKEY( DEVPROPKEY_HID_HANDLE, 0xbc62e415, 0xf4fe, 0x405c, 0x8e, 0xda, 0x63, 0x6f, 0xb5, 0x9f, 0x08, 0x98, 2 ); + +struct hid_joystick +{ + IDirectInputDeviceImpl base; + + HANDLE device; + PHIDP_PREPARSED_DATA preparsed; +}; + +static inline struct hid_joystick *impl_from_IDirectInputDevice8W( IDirectInputDevice8W *iface ) +{ + return CONTAINING_RECORD( CONTAINING_RECORD( iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface ), + struct hid_joystick, base ); +} + +static ULONG WINAPI hid_joystick_Release( IDirectInputDevice8W *iface ) +{ + struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); + struct hid_joystick tmp = *impl; + ULONG res; + + if (!(res = IDirectInputDevice2WImpl_Release( iface ))) + { + HidD_FreePreparsedData( tmp.preparsed ); + CloseHandle( tmp.device ); + } + + return res; +} + +static HRESULT WINAPI hid_joystick_GetCapabilities( IDirectInputDevice8W *iface, DIDEVCAPS *caps ) +{ + FIXME( "iface %p, caps %p stub!\n", iface, caps ); + + if (!caps) return E_POINTER; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_EnumObjects( IDirectInputDevice8W *iface, LPDIENUMDEVICEOBJECTSCALLBACKW callback, + void *ref, DWORD flags ) +{ + FIXME( "iface %p, callback %p, ref %p, flags %#x stub!\n", iface, callback, ref, flags ); + + if (!callback) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetProperty( IDirectInputDevice8W *iface, REFGUID guid, DIPROPHEADER *header ) +{ + FIXME( "iface %p, guid %s, header %p stub!\n", iface, debugstr_guid( guid ), header ); + + if (!header) return DIERR_INVALIDPARAM; + if (!IS_DIPROP( guid )) return DI_OK; + + switch (LOWORD( guid )) + { + default: return IDirectInputDevice2WImpl_GetProperty( iface, guid, header ); + } +} + +static HRESULT WINAPI hid_joystick_SetProperty( IDirectInputDevice8W *iface, REFGUID guid, const DIPROPHEADER *header ) +{ + FIXME( "iface %p, guid %s, header %p stub!\n", iface, debugstr_guid( guid ), header ); + + if (!header) return DIERR_INVALIDPARAM; + if (!IS_DIPROP( guid )) return DI_OK; + + switch (LOWORD( guid )) + { + default: return IDirectInputDevice2WImpl_SetProperty( iface, guid, header ); + } +} + +static HRESULT WINAPI hid_joystick_Acquire( IDirectInputDevice8W *iface ) +{ + HRESULT hr; + + TRACE( "iface %p.\n", iface ); + + if ((hr = IDirectInputDevice2WImpl_Acquire( iface )) != DI_OK) return hr; + + return DI_OK; +} + +static HRESULT WINAPI hid_joystick_Unacquire( IDirectInputDevice8W *iface ) +{ + HRESULT hr; + + TRACE( "iface %p.\n", iface ); + + if ((hr = IDirectInputDevice2WImpl_Unacquire( iface )) != DI_OK) return hr; + + return DI_OK; +} + +static HRESULT WINAPI hid_joystick_GetDeviceState( IDirectInputDevice8W *iface, DWORD len, void *ptr ) +{ + FIXME( "iface %p, len %u, ptr %p stub!\n", iface, len, ptr ); + + if (!ptr) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetObjectInfo( IDirectInputDevice8W *iface, DIDEVICEOBJECTINSTANCEW *instance, + DWORD obj, DWORD how ) +{ + FIXME( "iface %p, instance %p, obj %#x, how %#x stub!\n", iface, instance, obj, how ); + + if (!instance) return E_POINTER; + if (instance->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3W) && + instance->dwSize != sizeof(DIDEVICEOBJECTINSTANCEW)) + return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetDeviceInfo( IDirectInputDevice8W *iface, DIDEVICEINSTANCEW *instance ) +{ + FIXME( "iface %p, instance %p stub!\n", iface, instance ); + + if (!instance) return E_POINTER; + if (instance->dwSize != sizeof(DIDEVICEINSTANCE_DX3W) && + instance->dwSize != sizeof(DIDEVICEINSTANCEW)) + return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_CreateEffect( IDirectInputDevice8W *iface, REFGUID rguid, + const DIEFFECT *effect, IDirectInputEffect **out, + IUnknown *outer ) +{ + FIXME( "iface %p, rguid %s, effect %p, out %p, outer %p stub!\n", iface, debugstr_guid( rguid ), + effect, out, outer ); + + if (!out) return E_POINTER; + if (!rguid || !effect) return DI_NOEFFECT; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_EnumEffects( IDirectInputDevice8W *iface, LPDIENUMEFFECTSCALLBACKW callback, + void *ref, DWORD type ) +{ + FIXME( "iface %p, callback %p, ref %p, type %#x stub!\n", iface, callback, ref, type ); + + if (!callback) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetEffectInfo( IDirectInputDevice8W *iface, DIEFFECTINFOW *info, REFGUID guid ) +{ + FIXME( "iface %p, info %p, guid %s stub!\n", iface, info, debugstr_guid( guid ) ); + + if (!info) return E_POINTER; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetForceFeedbackState( IDirectInputDevice8W *iface, DWORD *out ) +{ + FIXME( "iface %p, out %p stub!\n", iface, out ); + + if (!out) return E_POINTER; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_SendForceFeedbackCommand( IDirectInputDevice8W *iface, DWORD flags ) +{ + FIXME( "iface %p, flags %x stub!\n", iface, flags ); + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_EnumCreatedEffectObjects( IDirectInputDevice8W *iface, + LPDIENUMCREATEDEFFECTOBJECTSCALLBACK callback, + void *ref, DWORD flags ) +{ + FIXME( "iface %p, callback %p, ref %p, flags %#x stub!\n", iface, callback, ref, flags ); + + if (!callback) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_BuildActionMap( IDirectInputDevice8W *iface, DIACTIONFORMATW *format, + const WCHAR *username, DWORD flags ) +{ + FIXME( "iface %p, format %p, username %s, flags %#x stub!\n", iface, format, debugstr_w(username), flags ); + + if (!format) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_SetActionMap( IDirectInputDevice8W *iface, DIACTIONFORMATW *format, + const WCHAR *username, DWORD flags ) +{ + struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); + + TRACE( "iface %p, format %p, username %s, flags %#x.\n", iface, format, debugstr_w(username), flags ); + + if (!format) return DIERR_INVALIDPARAM; + + return _set_action_map( iface, format, username, flags, impl->base.data_format.wine_df ); +} + +static const IDirectInputDevice8WVtbl hid_joystick_vtbl = +{ + /*** IUnknown methods ***/ + IDirectInputDevice2WImpl_QueryInterface, + IDirectInputDevice2WImpl_AddRef, + hid_joystick_Release, + /*** IDirectInputDevice methods ***/ + hid_joystick_GetCapabilities, + hid_joystick_EnumObjects, + hid_joystick_GetProperty, + hid_joystick_SetProperty, + hid_joystick_Acquire, + hid_joystick_Unacquire, + hid_joystick_GetDeviceState, + IDirectInputDevice2WImpl_GetDeviceData, + IDirectInputDevice2WImpl_SetDataFormat, + IDirectInputDevice2WImpl_SetEventNotification, + IDirectInputDevice2WImpl_SetCooperativeLevel, + hid_joystick_GetObjectInfo, + hid_joystick_GetDeviceInfo, + IDirectInputDevice2WImpl_RunControlPanel, + IDirectInputDevice2WImpl_Initialize, + /*** IDirectInputDevice2 methods ***/ + hid_joystick_CreateEffect, + hid_joystick_EnumEffects, + hid_joystick_GetEffectInfo, + hid_joystick_GetForceFeedbackState, + hid_joystick_SendForceFeedbackCommand, + hid_joystick_EnumCreatedEffectObjects, + IDirectInputDevice2WImpl_Escape, + IDirectInputDevice2WImpl_Poll, + IDirectInputDevice2WImpl_SendDeviceData, + /*** IDirectInputDevice7 methods ***/ + IDirectInputDevice7WImpl_EnumEffectsInFile, + IDirectInputDevice7WImpl_WriteEffectToFile, + /*** IDirectInputDevice8 methods ***/ + hid_joystick_BuildActionMap, + hid_joystick_SetActionMap, + IDirectInputDevice8WImpl_GetImageInfo, +}; + +static BOOL hid_joystick_device_try_open( UINT32 handle, const WCHAR *path, HANDLE *device, + PHIDP_PREPARSED_DATA *preparsed, HIDD_ATTRIBUTES *attrs, + HIDP_CAPS *caps, DIDEVICEINSTANCEW *instance, DWORD version ) +{ + PHIDP_PREPARSED_DATA preparsed_data = NULL; + HANDLE device_file; + + device_file = CreateFileW( path, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, 0 ); + if (device_file == INVALID_HANDLE_VALUE) return FALSE; + + if (!HidD_GetPreparsedData( device_file, &preparsed_data )) goto failed; + if (!HidD_GetAttributes( device_file, attrs )) goto failed; + if (HidP_GetCaps( preparsed_data, caps ) != HIDP_STATUS_SUCCESS) goto failed; + + if (caps->UsagePage == HID_USAGE_PAGE_GAME) FIXME( "Unimplemented HID game usage page!\n" ); + if (caps->UsagePage == HID_USAGE_PAGE_SIMULATION) FIXME( "Unimplemented HID simulation usage page!\n" ); + if (caps->UsagePage != HID_USAGE_PAGE_GENERIC) goto failed; + if (caps->Usage != HID_USAGE_GENERIC_GAMEPAD && caps->Usage != HID_USAGE_GENERIC_JOYSTICK) goto failed; + + if (!HidD_GetProductString( device_file, instance->tszInstanceName, MAX_PATH )) goto failed; + if (!HidD_GetProductString( device_file, instance->tszProductName, MAX_PATH )) goto failed; + + instance->guidInstance = hid_joystick_guid; + instance->guidInstance.Data1 ^= handle; + instance->guidProduct = DInput_PIDVID_Product_GUID; + instance->guidProduct.Data1 = MAKELONG( attrs->VendorID, attrs->ProductID ); + instance->dwDevType = get_device_type( version, caps->Usage != HID_USAGE_GENERIC_GAMEPAD ) | DIDEVTYPE_HID; + instance->guidFFDriver = GUID_NULL; + instance->wUsagePage = caps->UsagePage; + instance->wUsage = caps->Usage; + + *device = device_file; + *preparsed = preparsed_data; + return TRUE; + +failed: + CloseHandle( device_file ); + HidD_FreePreparsedData( preparsed_data ); + return FALSE; +} + +static HRESULT hid_joystick_device_open( int index, DIDEVICEINSTANCEW *filter, WCHAR *device_path, + HANDLE *device, PHIDP_PREPARSED_DATA *preparsed, + HIDD_ATTRIBUTES *attrs, HIDP_CAPS *caps, DWORD version ) +{ + char buffer[sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + MAX_PATH * sizeof(WCHAR)]; + SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail = (void *)buffer; + SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; + SP_DEVINFO_DATA devinfo = {sizeof(devinfo)}; + DIDEVICEINSTANCEW instance = *filter; + UINT32 i = 0, handle; + HDEVINFO set; + DWORD type; + GUID hid; + + TRACE( "index %d, product %s, instance %s\n", index, debugstr_guid( &filter->guidProduct ), + debugstr_guid( &filter->guidInstance ) ); + + HidD_GetHidGuid( &hid ); + + set = SetupDiGetClassDevsW( &hid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT ); + if (set == INVALID_HANDLE_VALUE) return DIERR_DEVICENOTREG; + + *device = NULL; + *preparsed = NULL; + while (SetupDiEnumDeviceInterfaces( set, NULL, &hid, i++, &iface )) + { + detail->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W); + if (!SetupDiGetDeviceInterfaceDetailW( set, &iface, detail, sizeof(buffer), NULL, &devinfo )) + continue; + if (!SetupDiGetDevicePropertyW( set, &devinfo, &DEVPROPKEY_HID_HANDLE, &type, + (BYTE *)&handle, sizeof(handle), NULL, 0 ) || + type != DEVPROP_TYPE_UINT32) + continue; + if (!hid_joystick_device_try_open( handle, detail->DevicePath, device, preparsed, + attrs, caps, &instance, version )) + continue; + + /* enumerate device by GUID */ + if (index < 0 && IsEqualGUID( &filter->guidProduct, &instance.guidProduct )) break; + if (index < 0 && IsEqualGUID( &filter->guidInstance, &instance.guidInstance )) break; + + /* enumerate all devices */ + if (index >= 0 && !index--) break; + + CloseHandle( *device ); + HidD_FreePreparsedData( *preparsed ); + *device = NULL; + *preparsed = NULL; + } + + SetupDiDestroyDeviceInfoList( set ); + if (!*device || !*preparsed) return DIERR_DEVICENOTREG; + + lstrcpynW( device_path, detail->DevicePath, MAX_PATH ); + *filter = instance; + return DI_OK; +} + +static HRESULT hid_joystick_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instance, + DWORD version, int index ) +{ + HIDD_ATTRIBUTES attrs = {sizeof(attrs)}; + PHIDP_PREPARSED_DATA preparsed; + WCHAR device_path[MAX_PATH]; + HIDP_CAPS caps; + HANDLE device; + HRESULT hr; + + TRACE( "type %x, flags %#x, instance %p, version %04x, index %d\n", type, flags, instance, version, index ); + + hr = hid_joystick_device_open( index, instance, device_path, &device, &preparsed, + &attrs, &caps, version ); + if (hr != DI_OK) return hr; + + HidD_FreePreparsedData( preparsed ); + CloseHandle( device ); + + if (instance->dwSize != sizeof(DIDEVICEINSTANCEW)) + return S_FALSE; + if (version < 0x0800 && type != DIDEVTYPE_JOYSTICK) + return S_FALSE; + if (version >= 0x0800 && type != DI8DEVCLASS_ALL && type != DI8DEVCLASS_GAMECTRL) + return S_FALSE; + + if (device_disabled_registry( "HID", TRUE )) + return DIERR_DEVICENOTREG; + + TRACE( "Found device %s, usage %04x:%04x, product %s, instance %s, name %s\n", debugstr_w(device_path), + instance->wUsagePage, instance->wUsage, debugstr_guid( &instance->guidProduct ), + debugstr_guid( &instance->guidInstance ), debugstr_w(instance->tszInstanceName) ); + + return DI_OK; +} + +static HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, REFGUID guid, IDirectInputDevice8W **out ) +{ + DIDEVICEINSTANCEW instance = {.dwSize = sizeof(instance), .guidProduct = *guid, .guidInstance = *guid}; + DWORD size = sizeof(struct hid_joystick); + HIDD_ATTRIBUTES attrs = {sizeof(attrs)}; + struct hid_joystick *impl = NULL; + PHIDP_PREPARSED_DATA preparsed; + DIDATAFORMAT *format = NULL; + WCHAR device_path[MAX_PATH]; + HIDP_CAPS caps; + HANDLE device; + HRESULT hr; + + TRACE( "dinput %p, guid %s, out %p\n", dinput, debugstr_guid( guid ), out ); + + *out = NULL; + instance.guidProduct.Data1 = DInput_PIDVID_Product_GUID.Data1; + instance.guidInstance.Data1 = hid_joystick_guid.Data1; + if (IsEqualGUID( &DInput_PIDVID_Product_GUID, &instance.guidProduct )) + instance.guidProduct = *guid; + else if (IsEqualGUID( &hid_joystick_guid, &instance.guidInstance )) + instance.guidInstance = *guid; + else + return DIERR_DEVICENOTREG; + + hr = hid_joystick_device_open( -1, &instance, device_path, &device, &preparsed, + &attrs, &caps, dinput->dwVersion ); + if (hr != DI_OK) return hr; + + hr = direct_input_device_alloc( size, &hid_joystick_vtbl, guid, dinput, (void **)&impl ); + if (FAILED(hr)) goto failed; + + impl->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": hid_joystick.base.crit"); + impl->base.dwCoopLevel = DISCL_NONEXCLUSIVE | DISCL_BACKGROUND; + + impl->device = device; + impl->preparsed = preparsed; + + if (!(format = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*format) ))) goto failed; + impl->base.data_format.wine_df = format; + + TRACE( "Created %p\n", impl ); + + *out = &impl->base.IDirectInputDevice8W_iface; + return DI_OK; + +failed: + HeapFree( GetProcessHeap(), 0, format ); + HeapFree( GetProcessHeap(), 0, impl ); + HidD_FreePreparsedData( preparsed ); + CloseHandle( device ); + return hr; +} + +const struct dinput_device joystick_hid_device = +{ + "Wine HID joystick driver", + hid_joystick_enum_device, + hid_joystick_create_device, +}; diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 3215978c995..312ef3d9c42 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -175,7 +175,7 @@ static INT find_joystick_devices(void) /* Append driver name */ strcat(joydev.name, JOYDEVDRIVER); - if (device_disabled_registry(joydev.name)) { + if (device_disabled_registry(joydev.name, FALSE)) { close(fd); continue; } diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 2b970271ec3..558c8cc19e5 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -264,7 +264,7 @@ static void find_joydevs(void) else joydev.name = joydev.device; - if (device_disabled_registry(joydev.name)) { + if (device_disabled_registry(joydev.name, FALSE)) { close(fd); HeapFree(GetProcessHeap(), 0, joydev.name); if (joydev.name != joydev.device) diff --git a/dlls/dinput/joystick_private.h b/dlls/dinput/joystick_private.h index 874bf3e69a7..9cc30605234 100644 --- a/dlls/dinput/joystick_private.h +++ b/dlls/dinput/joystick_private.h @@ -57,7 +57,7 @@ HRESULT setup_dinput_options(JoystickGenericImpl *This, const int *default_axis_ DWORD joystick_map_pov(const POINTL *p) DECLSPEC_HIDDEN; -BOOL device_disabled_registry(const char* name) DECLSPEC_HIDDEN; +BOOL device_disabled_registry(const char* name, BOOL disable) DECLSPEC_HIDDEN; ULONG WINAPI JoystickWGenericImpl_Release(LPDIRECTINPUTDEVICE8W iface); diff --git a/dlls/dinput8/Makefile.in b/dlls/dinput8/Makefile.in index 35b3bfb75f5..5032c7689bc 100644 --- a/dlls/dinput8/Makefile.in +++ b/dlls/dinput8/Makefile.in @@ -1,6 +1,6 @@ MODULE = dinput8.dll IMPORTLIB = dinput8 -IMPORTS = dinput8 dxguid uuid comctl32 ole32 user32 advapi32 +IMPORTS = dinput8 dxguid uuid comctl32 ole32 user32 advapi32 hid setupapi EXTRADEFS = -DDIRECTINPUT_VERSION=0x0800 EXTRALIBS = $(IOKIT_LIBS) $(FORCEFEEDBACK_LIBS) PARENTSRC = ../dinput @@ -13,6 +13,7 @@ C_SRCS = \ dinput_main.c \ effect_linuxinput.c \ joystick.c \ + joystick_hid.c \ joystick_linux.c \ joystick_linuxinput.c \ joystick_osx.c \ -- 2.32.0

1 0

[PATCH website] winehq: Announcement for OSPP Summer 2021
by Zhenbo Li 02 Jul '21

02 Jul '21

-- Sincerely, Zhenbo Li

1 0

[PATCH 1/6] ntoskrnl.exe/tests: Sync test utils with wine/test.h.
by Rémi Bernon 02 Jul '21

02 Jul '21

Adding support for thread local test data and context. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntoskrnl.exe/tests/Makefile.in | 10 +- dlls/ntoskrnl.exe/tests/driver.c | 32 +-- dlls/ntoskrnl.exe/tests/driver.h | 4 +- dlls/ntoskrnl.exe/tests/driver_netio.c | 2 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 3 + dlls/ntoskrnl.exe/tests/utils.h | 349 +++++++++++++++++++------ 6 files changed, 294 insertions(+), 106 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/Makefile.in b/dlls/ntoskrnl.exe/tests/Makefile.in index 863fad30f63..85a6925138a 100644 --- a/dlls/ntoskrnl.exe/tests/Makefile.in +++ b/dlls/ntoskrnl.exe/tests/Makefile.in @@ -1,15 +1,15 @@ TESTDLL = ntoskrnl.exe IMPORTS = advapi32 crypt32 newdev setupapi user32 wintrust ws2_32 hid -driver_IMPORTS = winecrt0 ntoskrnl +driver_IMPORTS = winecrt0 ntoskrnl hal driver_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native -driver2_IMPORTS = winecrt0 ntoskrnl +driver2_IMPORTS = winecrt0 ntoskrnl hal driver2_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native -driver3_IMPORTS = winecrt0 ntoskrnl +driver3_IMPORTS = winecrt0 ntoskrnl hal driver3_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native -driver_hid_IMPORTS = winecrt0 ntoskrnl hidclass +driver_hid_IMPORTS = winecrt0 ntoskrnl hal hidclass driver_hid_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native -driver_netio_IMPORTS = winecrt0 ntoskrnl netio +driver_netio_IMPORTS = winecrt0 ntoskrnl hal netio driver_netio_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native driver_pnp_IMPORTS = winecrt0 ntoskrnl hal driver_pnp_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 94139b4b654..1fe3ec2e558 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -999,41 +999,41 @@ static void test_call_driver(DEVICE_OBJECT *device) irp = IoBuildAsynchronousFsdRequest(IRP_MJ_FLUSH_BUFFERS, device, NULL, 0, NULL, &iosb); ok(irp->UserIosb == &iosb, "unexpected UserIosb\n"); ok(!irp->Cancel, "Cancel = %x\n", irp->Cancel); - ok(!irp->CancelRoutine, "CancelRoutine = %x\n", irp->CancelRoutine); + ok(!irp->CancelRoutine, "CancelRoutine = %p\n", irp->CancelRoutine); ok(!irp->UserEvent, "UserEvent = %p\n", irp->UserEvent); ok(irp->CurrentLocation == 2, "CurrentLocation = %u\n", irp->CurrentLocation); ok(irp->Tail.Overlay.Thread == (PETHREAD)KeGetCurrentThread(), "IRP thread is not the current thread\n"); ok(!irp->IoStatus.Status, "got status %#x\n", irp->IoStatus.Status); - ok(!irp->IoStatus.Information, "got information %#x\n", irp->IoStatus.Information); + ok(!irp->IoStatus.Information, "got information %#I64x\n", (UINT64)irp->IoStatus.Information); ok(iosb.Status == 0xdeadbeef, "got status %#x\n", iosb.Status); - ok(iosb.Information == 0xdeadbeef, "got information %#x\n", iosb.Information); + ok(iosb.Information == 0xdeadbeef, "got information %#I64x\n", (UINT64)iosb.Information); irpsp = IoGetNextIrpStackLocation(irp); ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); - ok(!irpsp->DeviceObject, "DeviceObject = %u\n", irpsp->DeviceObject); - ok(!irpsp->FileObject, "FileObject = %u\n", irpsp->FileObject); + ok(!irpsp->DeviceObject, "DeviceObject = %p\n", irpsp->DeviceObject); + ok(!irpsp->FileObject, "FileObject = %p\n", irpsp->FileObject); ok(!irpsp->CompletionRoutine, "CompletionRoutine = %p\n", irpsp->CompletionRoutine); status = IoCallDriver(device, irp); ok(status == STATUS_PENDING, "IoCallDriver returned %#x\n", status); ok(!irp->IoStatus.Status, "got status %#x\n", irp->IoStatus.Status); - ok(!irp->IoStatus.Information, "got information %#x\n", irp->IoStatus.Information); + ok(!irp->IoStatus.Information, "got information %#I64x\n", (UINT64)irp->IoStatus.Information); ok(iosb.Status == 0xdeadbeef, "got status %#x\n", iosb.Status); - ok(iosb.Information == 0xdeadbeef, "got information %#x\n", iosb.Information); + ok(iosb.Information == 0xdeadbeef, "got information %#I64x\n", (UINT64)iosb.Information); irp->IoStatus.Status = STATUS_SUCCESS; irp->IoStatus.Information = 123; IoCompleteRequest(irp, IO_NO_INCREMENT); ok(iosb.Status == STATUS_SUCCESS, "got status %#x\n", iosb.Status); - ok(iosb.Information == 123, "got information %#x\n", iosb.Information); + ok(iosb.Information == 123, "got information %#I64x\n", (UINT64)iosb.Information); KeInitializeEvent(&event, NotificationEvent, FALSE); irp = IoBuildSynchronousFsdRequest(IRP_MJ_FLUSH_BUFFERS, device, NULL, 0, NULL, &event, &iosb); ok(irp->UserIosb == &iosb, "unexpected UserIosb\n"); ok(!irp->Cancel, "Cancel = %x\n", irp->Cancel); - ok(!irp->CancelRoutine, "CancelRoutine = %x\n", irp->CancelRoutine); + ok(!irp->CancelRoutine, "CancelRoutine = %p\n", irp->CancelRoutine); ok(irp->UserEvent == &event, "UserEvent = %p\n", irp->UserEvent); ok(irp->CurrentLocation == 2, "CurrentLocation = %u\n", irp->CurrentLocation); ok(irp->Tail.Overlay.Thread == (PETHREAD)KeGetCurrentThread(), @@ -1041,8 +1041,8 @@ static void test_call_driver(DEVICE_OBJECT *device) irpsp = IoGetNextIrpStackLocation(irp); ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); - ok(!irpsp->DeviceObject, "DeviceObject = %u\n", irpsp->DeviceObject); - ok(!irpsp->FileObject, "FileObject = %u\n", irpsp->FileObject); + ok(!irpsp->DeviceObject, "DeviceObject = %p\n", irpsp->DeviceObject); + ok(!irpsp->FileObject, "FileObject = %p\n", irpsp->FileObject); ok(!irpsp->CompletionRoutine, "CompletionRoutine = %p\n", irpsp->CompletionRoutine); status = wait_single(&event, 0); @@ -1118,7 +1118,7 @@ static void test_cancel_irp(DEVICE_OBJECT *device) ok(irp->CurrentLocation == 1, "CurrentLocation = %u\n", irp->CurrentLocation); irpsp = IoGetCurrentIrpStackLocation(irp); - ok(irpsp->DeviceObject == device, "DeviceObject = %u\n", irpsp->DeviceObject); + ok(irpsp->DeviceObject == device, "DeviceObject = %p\n", irpsp->DeviceObject); IoSetCancelRoutine(irp, cancel_irp); cancel_cnt = 0; @@ -1432,16 +1432,16 @@ static void check_resource_(int line, ERESOURCE *resource, ULONG exclusive_waite ULONG count; count = ExGetExclusiveWaiterCount(resource); - ok_(__FILE__, line, count == exclusive_waiters, + ok_(__FILE__, line)(count == exclusive_waiters, "expected %u exclusive waiters, got %u\n", exclusive_waiters, count); count = ExGetSharedWaiterCount(resource); - ok_(__FILE__, line, count == shared_waiters, + ok_(__FILE__, line)(count == shared_waiters, "expected %u shared waiters, got %u\n", shared_waiters, count); ret = ExIsResourceAcquiredExclusiveLite(resource); - ok_(__FILE__, line, ret == exclusive, + ok_(__FILE__, line)(ret == exclusive, "expected exclusive %u, got %u\n", exclusive, ret); count = ExIsResourceAcquiredSharedLite(resource); - ok_(__FILE__, line, count == shared_count, + ok_(__FILE__, line)(count == shared_count, "expected shared %u, got %u\n", shared_count, count); } #define check_resource(a,b,c,d,e) check_resource_(__LINE__,a,b,c,d,e) diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index 455695ad36b..b0c7cab0252 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -51,10 +51,12 @@ static const char teststr[] = "Wine is not an emulator"; struct test_data { + char winetest_platform[256]; int running_under_wine; int winetest_report_success; int winetest_debug; - int successes, failures, skipped, todo_successes, todo_failures; + int failures; + int todo_failures; }; struct main_test_input diff --git a/dlls/ntoskrnl.exe/tests/driver_netio.c b/dlls/ntoskrnl.exe/tests/driver_netio.c index ea9cfd1a4c5..4ebacc7cf14 100644 --- a/dlls/ntoskrnl.exe/tests/driver_netio.c +++ b/dlls/ntoskrnl.exe/tests/driver_netio.c @@ -141,7 +141,7 @@ static void test_wsk_get_address_info(void) { struct sockaddr_in *addr = (struct sockaddr_in *)addr_info->ai_addr; - ok(addr_info->ai_addrlen == sizeof(*addr), "Got unexpected ai_addrlen %u.\n", addr_info->ai_addrlen); + ok(addr_info->ai_addrlen == sizeof(*addr), "Got unexpected ai_addrlen %I64u.\n", (UINT64)addr_info->ai_addrlen); ok(addr->sin_family == AF_INET, "Got unexpected sin_family %u.\n", addr->sin_family); ok(ntohs(addr->sin_port) == 12345, "Got unexpected sin_port %u.\n", ntohs(addr->sin_port)); ok(ntohl(addr->sin_addr.s_addr) == 0x7f000001, "Got unexpected sin_addr %#x.\n", diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 71dbfe1a5e9..57c1bdd17fd 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -386,6 +386,7 @@ static void cat_okfile(void) SetEndOfFile(okfile); winetest_add_failures(InterlockedExchange(&test_data->failures, 0)); + winetest_add_failures(InterlockedExchange(&test_data->todo_failures, 0)); } static ULONG64 modified_value; @@ -2598,6 +2599,8 @@ START_TEST(ntoskrnl) 0, sizeof(*test_data), "Global\\winetest_ntoskrnl_section"); ok(!!mapping, "got error %u\n", GetLastError()); test_data = MapViewOfFile(mapping, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 1024); + ok(strlen(winetest_platform) < 256, "winetest_platform expectedly large!\n"); + strcpy(test_data->winetest_platform, winetest_platform); test_data->running_under_wine = !strcmp(winetest_platform, "wine"); test_data->winetest_report_success = winetest_report_success; test_data->winetest_debug = winetest_debug; diff --git a/dlls/ntoskrnl.exe/tests/utils.h b/dlls/ntoskrnl.exe/tests/utils.h index 6a0e00428a5..6c6a8f20aeb 100644 --- a/dlls/ntoskrnl.exe/tests/utils.h +++ b/dlls/ntoskrnl.exe/tests/utils.h @@ -22,18 +22,115 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -static HANDLE okfile; -static LONG successes; -static LONG failures; -static LONG skipped; -static LONG todo_successes; -static LONG todo_failures; -static int todo_level, todo_do_loop; +#include <stdarg.h> +#include <stdlib.h> +#include <windef.h> +#include <winbase.h> +#include <winternl.h> + +#include <ddk/wdm.h> +#include <wine/test.h> + +#if (defined(__x86_64__) || defined(__aarch64__)) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) +# define __winetest_va_start(list,arg) __builtin_ms_va_start(list,arg) +# define __winetest_va_end(list) __builtin_ms_va_end(list) +#else +# define __winetest_va_start(list,arg) va_start(list,arg) +# define __winetest_va_end(list) va_end(list) +#endif + static int running_under_wine; -static int winetest_debug; -static int winetest_report_success; -static inline void kvprintf(const char *format, __ms_va_list ap) +/* debug level */ +int winetest_debug = 1; + +/* trace timing information */ +int winetest_time = 0; +DWORD winetest_start_time, winetest_last_time; + +/* interactive mode? */ +int winetest_interactive = 0; + +/* current platform */ +static char winetest_platform_buf[256] = "windows"; +const char *winetest_platform = winetest_platform_buf; + +/* report successful tests (BOOL) */ +int winetest_report_success = 0; + +/* silence todos and skips above this threshold */ +int winetest_mute_threshold = 42; + +static LONG successes; /* number of successful tests */ +static LONG failures; /* number of failures */ +static LONG skipped; /* number of skipped test chunks */ +static LONG todo_successes; /* number of successful tests inside todo block */ +static LONG todo_failures; /* number of failures inside todo block */ +static LONG muted_traces; /* number of silenced traces */ +static LONG muted_skipped; /* same as skipped but silent */ +static LONG muted_todo_successes; /* same as todo_successes but silent */ + +/* counts how many times a given line printed a message */ +static LONG line_counters[16384]; + +/* output file for driver tests */ +HANDLE okfile; + +/* The following data must be kept track of on a per-thread basis */ +struct tls_data +{ + HANDLE thread; + const char* current_file; /* file of current check */ + int current_line; /* line of current check */ + unsigned int todo_level; /* current todo nesting level */ + int todo_do_loop; + char *str_pos; /* position in debug buffer */ + char strings[2000]; /* buffer for debug strings */ + char context[8][128]; /* data to print before messages */ + unsigned int context_count; /* number of context prefixes */ +}; + +static KSPIN_LOCK tls_data_lock; +static struct tls_data tls_data_pool[128]; +static DWORD tls_data_count; + +static struct tls_data *get_tls_data(void) +{ + static struct tls_data tls_overflow; + struct tls_data *data; + HANDLE thread = PsGetCurrentThreadId(); + KIRQL irql; + + KeAcquireSpinLock(&tls_data_lock, &irql); + for (data = tls_data_pool; data != tls_data_pool + tls_data_count; ++data) + if (data->thread == thread) break; + if (data == tls_data_pool + ARRAY_SIZE(tls_data_pool)) + data = &tls_overflow; + else if (data == tls_data_pool + tls_data_count) + { + data->thread = thread; + data->str_pos = data->strings; + tls_data_count++; + } + KeReleaseSpinLock(&tls_data_lock, irql); + + return data; +} + +void winetest_set_location( const char* file, int line ) +{ + struct tls_data *data = get_tls_data(); + data->current_file=strrchr(file,'/'); + if (data->current_file==NULL) + data->current_file=strrchr(file,'\\'); + if (data->current_file==NULL) + data->current_file=file; + else + data->current_file++; + data->current_line=line; +} + +static inline void kvprintf(const char *format, __winetest_va_list ap) { static char buffer[512]; IO_STATUS_BLOCK io; @@ -43,11 +140,11 @@ static inline void kvprintf(const char *format, __ms_va_list ap) static inline void WINAPIV kprintf(const char *format, ...) { - __ms_va_list valist; + __winetest_va_list valist; - __ms_va_start(valist, format); + __winetest_va_start(valist, format); kvprintf(format, valist); - __ms_va_end(valist); + __winetest_va_end(valist); } static inline NTSTATUS winetest_init(void) @@ -61,6 +158,8 @@ static inline NTSTATUS winetest_init(void) HANDLE section; NTSTATUS ret; + KeInitializeSpinLock(&tls_data_lock); + RtlInitUnicodeString(&string, L"\\BaseNamedObjects\\winetest_ntoskrnl_section"); /* OBJ_KERNEL_HANDLE is necessary for the file to be accessible from system threads */ InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, 0, NULL); @@ -77,6 +176,7 @@ static inline NTSTATUS winetest_init(void) running_under_wine = data->running_under_wine; winetest_debug = data->winetest_debug; winetest_report_success = data->winetest_report_success; + strcpy(winetest_platform_buf, data->winetest_platform); ZwUnmapViewOfSection(NtCurrentProcess(), addr); ZwClose(section); @@ -114,10 +214,7 @@ static inline void winetest_cleanup(void) { data = addr; - InterlockedExchangeAdd(&data->successes, successes); InterlockedExchangeAdd(&data->failures, failures); - InterlockedExchangeAdd(&data->skipped, skipped); - InterlockedExchangeAdd(&data->todo_successes, todo_successes); InterlockedExchangeAdd(&data->todo_failures, todo_failures); ZwUnmapViewOfSection(NtCurrentProcess(), addr); @@ -128,130 +225,216 @@ static inline void winetest_cleanup(void) ZwClose(okfile); } -static inline void WINAPIV vok_(const char *file, int line, int condition, const char *msg, __ms_va_list args) +static void __winetest_cdecl winetest_printf( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); +static void __winetest_cdecl winetest_printf( const char *msg, ... ) { - const char *current_file; + struct tls_data *data = get_tls_data(); + __winetest_va_list valist; - if (!(current_file = drv_strrchr(file, '/')) && - !(current_file = drv_strrchr(file, '\\'))) - current_file = file; - else - current_file++; + kprintf( "%s:%d: ", data->current_file, data->current_line ); + __winetest_va_start( valist, msg ); + kvprintf( msg, valist ); + __winetest_va_end( valist ); +} +static void __winetest_cdecl winetest_print_context( const char *msgtype ) +{ + struct tls_data *data = get_tls_data(); + unsigned int i; + + winetest_printf( "%s", msgtype ); + for (i = 0; i < data->context_count; ++i) + kprintf( "%s: ", data->context[i] ); +} - if (todo_level) +int broken( int condition ) +{ + return (strcmp(winetest_platform, "windows") == 0) && condition; +} + +static LONG winetest_add_line( void ) +{ + struct tls_data *data; + int index, count; + + if (winetest_debug > 1) + return 0; + + data = get_tls_data(); + index = data->current_line % ARRAY_SIZE(line_counters); + count = InterlockedIncrement(line_counters + index) - 1; + if (count == winetest_mute_threshold) + winetest_printf( "Line has been silenced after %d occurrences\n", winetest_mute_threshold ); + + return count; +} + +/* + * Checks condition. + * Parameters: + * - condition - condition to check; + * - msg test description; + * - file - test application source code file name of the check + * - line - test application source code file line number of the check + * Return: + * 0 if condition does not have the expected value, 1 otherwise + */ +int winetest_vok( int condition, const char *msg, __winetest_va_list args ) +{ + struct tls_data *data = get_tls_data(); + + if (data->todo_level) { if (condition) { - kprintf("%s:%d: Test succeeded inside todo block: ", current_file, line); + winetest_print_context( "Test succeeded inside todo block: " ); kvprintf(msg, args); InterlockedIncrement(&todo_failures); + return 0; } else { - if (winetest_debug > 0) + if (!winetest_debug || + winetest_add_line() < winetest_mute_threshold) { - kprintf("%s:%d: Test marked todo: ", current_file, line); - kvprintf(msg, args); + if (winetest_debug > 0) + { + winetest_print_context( "Test marked todo: " ); + kvprintf(msg, args); + } + InterlockedIncrement(&todo_successes); } - InterlockedIncrement(&todo_successes); + else + InterlockedIncrement(&muted_todo_successes); + return 1; } } else { if (!condition) { - kprintf("%s:%d: Test failed: ", current_file, line); + winetest_print_context( "Test failed: " ); kvprintf(msg, args); InterlockedIncrement(&failures); + return 0; } else { if (winetest_report_success) - kprintf("%s:%d: Test succeeded\n", current_file, line); + winetest_printf("Test succeeded\n"); InterlockedIncrement(&successes); + return 1; } } } -static inline void WINAPIV ok_(const char *file, int line, int condition, const char *msg, ...) +void __winetest_cdecl winetest_ok( int condition, const char *msg, ... ) { - __ms_va_list args; - __ms_va_start(args, msg); - vok_(file, line, condition, msg, args); - __ms_va_end(args); + __winetest_va_list valist; + + __winetest_va_start(valist, msg); + winetest_vok(condition, msg, valist); + __winetest_va_end(valist); } -static inline void vskip_(const char *file, int line, const char *msg, __ms_va_list args) +void __winetest_cdecl winetest_trace( const char *msg, ... ) { - const char *current_file; + __winetest_va_list valist; - if (!(current_file = drv_strrchr(file, '/')) && - !(current_file = drv_strrchr(file, '\\'))) - current_file = file; + if (!winetest_debug) + return; + if (winetest_add_line() < winetest_mute_threshold) + { + winetest_print_context( "" ); + __winetest_va_start(valist, msg); + kvprintf( msg, valist ); + __winetest_va_end(valist); + } else - current_file++; - - kprintf("%s:%d: Tests skipped: ", current_file, line); - kvprintf(msg, args); - skipped++; + InterlockedIncrement(&muted_traces); } -static inline void WINAPIV win_skip_(const char *file, int line, const char *msg, ...) +void winetest_vskip( const char *msg, __winetest_va_list args ) { - __ms_va_list args; - __ms_va_start(args, msg); - if (running_under_wine) - vok_(file, line, 0, msg, args); + if (winetest_add_line() < winetest_mute_threshold) + { + winetest_print_context( "Tests skipped: " ); + kvprintf(msg, args); + InterlockedIncrement(&skipped); + } else - vskip_(file, line, msg, args); - __ms_va_end(args); + InterlockedIncrement(&muted_skipped); } -static inline void WINAPIV trace_(const char *file, int line, const char *msg, ...) +void __winetest_cdecl winetest_skip( const char *msg, ... ) { - const char *current_file; - __ms_va_list args; + __winetest_va_list valist; + __winetest_va_start(valist, msg); + winetest_vskip(msg, valist); + __winetest_va_end(valist); +} - if (!(current_file = drv_strrchr(file, '/')) && - !(current_file = drv_strrchr(file, '\\'))) - current_file = file; +void __winetest_cdecl winetest_win_skip( const char *msg, ... ) +{ + __winetest_va_list valist; + __winetest_va_start(valist, msg); + if (strcmp(winetest_platform, "windows") == 0) + winetest_vskip(msg, valist); else - current_file++; - - __ms_va_start(args, msg); - kprintf("%s:%d: ", current_file, line); - kvprintf(msg, args); - __ms_va_end(args); + winetest_vok(0, msg, valist); + __winetest_va_end(valist); } -static inline void winetest_start_todo( int is_todo ) +void winetest_start_todo( int is_todo ) { - todo_level = (todo_level << 1) | (is_todo != 0); - todo_do_loop=1; + struct tls_data *data = get_tls_data(); + data->todo_level = (data->todo_level << 1) | (is_todo != 0); + data->todo_do_loop=1; } -static inline int winetest_loop_todo(void) +int winetest_loop_todo(void) { - int do_loop=todo_do_loop; - todo_do_loop=0; + struct tls_data *data = get_tls_data(); + int do_loop=data->todo_do_loop; + data->todo_do_loop=0; return do_loop; } -static inline void winetest_end_todo(void) +void winetest_end_todo(void) { - todo_level >>= 1; + struct tls_data *data = get_tls_data(); + data->todo_level >>= 1; } -static inline int broken(int condition) +void __winetest_cdecl winetest_push_context( const char *fmt, ... ) { - return !running_under_wine && condition; + struct tls_data *data = get_tls_data(); + __winetest_va_list valist; + + if (data->context_count < ARRAY_SIZE(data->context)) + { + __winetest_va_start(valist, fmt); + vsnprintf( data->context[data->context_count], sizeof(data->context[data->context_count]), fmt, valist ); + __winetest_va_end(valist); + data->context[data->context_count][sizeof(data->context[data->context_count]) - 1] = 0; + } + ++data->context_count; } -#define ok(condition, ...) ok_(__FILE__, __LINE__, condition, __VA_ARGS__) -#define todo_if(is_todo) for (winetest_start_todo(is_todo); \ - winetest_loop_todo(); \ - winetest_end_todo()) -#define todo_wine todo_if(running_under_wine) -#define todo_wine_if(is_todo) todo_if((is_todo) && running_under_wine) -#define win_skip(...) win_skip_(__FILE__, __LINE__, __VA_ARGS__) -#define trace(...) trace_(__FILE__, __LINE__, __VA_ARGS__) +void winetest_pop_context(void) +{ + struct tls_data *data = get_tls_data(); + + if (data->context_count) + --data->context_count; +} + +LONG winetest_get_failures(void) +{ + return failures; +} + +void winetest_add_failures( LONG new_failures ) +{ + while (new_failures-- > 0) + InterlockedIncrement( &failures ); +} -- 2.32.0

2 6

[PATCH] dbghelp/tests: try to fix failure in current dbghelp tests
by Eric Pouech 02 Jul '21

02 Jul '21

Testbot failures in previous SymGetTypeFromName patch have nothing to do with that former patch. Trying to address errouneous test. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/tests/dbghelp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 7be58c55b91..7fd1f6fb883 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -108,7 +108,7 @@ static void test_stack_walk(void) addr = (void *)(DWORD_PTR)frame.AddrPC.Offset; - if (addr > (char *)stack_walk_thread && addr < (char *)stack_walk_thread + 0x100) + if (!found_our_frame && addr > (char *)stack_walk_thread && addr < (char *)stack_walk_thread + 0x100) { found_our_frame = TRUE;

1 0

[PATCH 5/5] iphlpapi: Rewrite ConvertInterfaceLuidToNameA/NameToLuidA() to call their unicode equivalents.
by Huw Davies 02 Jul '21

02 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 38 ++++++++++++++--------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 8540b594e53..b6b96165027 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3244,21 +3244,20 @@ DWORD WINAPI ConvertInterfaceLuidToIndex(const NET_LUID *luid, NET_IFINDEX *inde */ DWORD WINAPI ConvertInterfaceLuidToNameA(const NET_LUID *luid, char *name, SIZE_T len) { - DWORD ret; - MIB_IFROW row; + DWORD err; + WCHAR nameW[IF_MAX_STRING_SIZE + 1]; - TRACE("(%p %p %u)\n", luid, name, (DWORD)len); + TRACE( "(%p %p %u)\n", luid, name, (DWORD)len ); if (!luid) return ERROR_INVALID_PARAMETER; + if (!name || !len) return ERROR_NOT_ENOUGH_MEMORY; - row.dwIndex = luid->Info.NetLuidIndex; - if ((ret = GetIfEntry( &row ))) return ret; - - if (!name || len < WideCharToMultiByte( CP_UNIXCP, 0, row.wszName, -1, NULL, 0, NULL, NULL )) - return ERROR_NOT_ENOUGH_MEMORY; + err = ConvertInterfaceLuidToNameW( luid, nameW, ARRAY_SIZE(nameW) ); + if (err) return err; - WideCharToMultiByte( CP_UNIXCP, 0, row.wszName, -1, name, len, NULL, NULL ); - return NO_ERROR; + if (!WideCharToMultiByte( CP_UNIXCP, 0, nameW, -1, name, len, NULL, NULL )) + err = GetLastError(); + return err; } /****************************************************************** @@ -3286,22 +3285,15 @@ DWORD WINAPI ConvertInterfaceLuidToNameW(const NET_LUID *luid, WCHAR *name, SIZE */ DWORD WINAPI ConvertInterfaceNameToLuidA(const char *name, NET_LUID *luid) { - DWORD ret; - IF_INDEX index; - MIB_IFROW row; - - TRACE("(%s %p)\n", debugstr_a(name), luid); + WCHAR nameW[IF_MAX_STRING_SIZE]; - if ((ret = getInterfaceIndexByName( name, &index ))) return ERROR_INVALID_NAME; - if (!luid) return ERROR_INVALID_PARAMETER; + TRACE( "(%s %p)\n", debugstr_a(name), luid ); - row.dwIndex = index; - if ((ret = GetIfEntry( &row ))) return ret; + if (!name) return ERROR_INVALID_NAME; + if (!MultiByteToWideChar( CP_UNIXCP, 0, name, -1, nameW, ARRAY_SIZE(nameW) )) + return GetLastError(); - luid->Info.Reserved = 0; - luid->Info.NetLuidIndex = index; - luid->Info.IfType = row.dwType; - return NO_ERROR; + return ConvertInterfaceNameToLuidW( nameW, luid ); } /****************************************************************** -- 2.23.0

1 0

[PATCH 4/5] iphlpapi: Implement if_indextoname() using the ConvertInterface* functions.
by Huw Davies 02 Jul '21

02 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index aaa6a80c19e..8540b594e53 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3374,11 +3374,19 @@ IF_INDEX WINAPI IPHLP_if_nametoindex(const char *name) /****************************************************************** * if_indextoname (IPHLPAPI.@) */ -PCHAR WINAPI IPHLP_if_indextoname(NET_IFINDEX index, PCHAR name) +char *WINAPI IPHLP_if_indextoname( NET_IFINDEX index, char *name ) { - TRACE("(%u, %p)\n", index, name); + NET_LUID luid; + DWORD err; + + TRACE( "(%u, %p)\n", index, name ); + + err = ConvertInterfaceIndexToLuid( index, &luid ); + if (err) return NULL; - return getInterfaceNameByIndex(index, name); + err = ConvertInterfaceLuidToNameA( &luid, name, IF_MAX_STRING_SIZE ); + if (err) return NULL; + return name; } /****************************************************************** -- 2.23.0

1 0

[PATCH 3/5] iphlpapi: Implement if_nametoindex() using the ConvertInterface* functions.
by Huw Davies 02 Jul '21

02 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index a774e60c3d9..aaa6a80c19e 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3357,13 +3357,18 @@ DWORD WINAPI ConvertLengthToIpv4Mask(ULONG mask_len, ULONG *mask) */ IF_INDEX WINAPI IPHLP_if_nametoindex(const char *name) { - IF_INDEX idx; + IF_INDEX index; + NET_LUID luid; + DWORD err; - TRACE("(%s)\n", name); - if (getInterfaceIndexByName(name, &idx) == NO_ERROR) - return idx; + TRACE( "(%s)\n", name ); - return 0; + err = ConvertInterfaceNameToLuidA( name, &luid ); + if (err) return 0; + + err = ConvertInterfaceLuidToIndex( &luid, &index ); + if (err) index = 0; + return index; } /****************************************************************** -- 2.23.0

1 0

[PATCH 2/5] iphlpapi: Use ConvertInterfaceIndexToLuid() where possible.
by Huw Davies 02 Jul '21

02 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 7b104330ba7..a774e60c3d9 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1052,8 +1052,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index aa->PhysicalAddressLength = buflen; aa->IfType = typeFromMibType(type); aa->ConnectionType = connectionTypeFromMibType(type); - aa->Luid.Info.NetLuidIndex = index; - aa->Luid.Info.IfType = aa->IfType; + ConvertInterfaceIndexToLuid( index, &aa->Luid ); if (output_gateways && num_v4_gateways) { @@ -1796,10 +1795,8 @@ DWORD WINAPI GetIfEntry2( MIB_IF_ROW2 *row2 ) if ((ret = getInterfaceStatsByName( name, &row ))) return ret; memset( row2, 0, sizeof(*row2) ); - row2->InterfaceLuid.Info.Reserved = 0; - row2->InterfaceLuid.Info.NetLuidIndex = row.dwIndex; - row2->InterfaceLuid.Info.IfType = row.dwType; row2->InterfaceIndex = row.dwIndex; + ConvertInterfaceIndexToLuid( row2->InterfaceIndex, &row2->InterfaceLuid ); ConvertInterfaceLuidToGuid( &row2->InterfaceLuid, &row2->InterfaceGuid ); row2->Type = row.dwType; row2->Mtu = row.dwMtu; -- 2.23.0

1 0

[PATCH 1/5] nsiproxy: Implement NDIS index to luid get_parameter.
by Huw Davies 02 Jul '21

02 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/tests/nsi.c | 30 ++++++++++++++++++++++++++++++ dlls/nsiproxy.sys/ndis.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index d7f6ac9c739..cefd42983d4 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -382,9 +382,39 @@ static void test_ndis_ifinfo( void ) NsiFreeTable( luid_tbl, rw_tbl, dyn_tbl, stat_tbl ); } +static void test_ndis_index_luid( void ) +{ + DWORD err, count, i; + NET_LUID *luids, luid; + DWORD index; + + /* index -> luid map. NsiAllocateAndGetTable and NsiGetAllParameters fail */ + + /* first get the luids */ + err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, (void **)&luids, sizeof(*luids), + NULL, 0, NULL, 0, NULL, 0, &count, 0 ); + ok( !err, "got %d\n", err ); + + for (i = 0; i < count; i++) + { + ConvertInterfaceLuidToIndex( luids + i, &index ); + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_INDEX_LUID_TABLE, &index, sizeof(index), + NSI_PARAM_TYPE_STATIC, &luid, sizeof(luid), 0 ); + ok( !err, "got %d\n", err ); + ok( luid.Value == luids[i].Value, "%d: luid mismatch\n", i ); + } + NsiFreeTable( luids, NULL, NULL, NULL ); + + index = ~0u; + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_INDEX_LUID_TABLE, &index, sizeof(index), + NSI_PARAM_TYPE_STATIC, &luid, sizeof(luid), 0 ); + ok( err == ERROR_FILE_NOT_FOUND, "got %d\n", err ); +} + START_TEST( nsi ) { test_nsi_api(); test_ndis_ifinfo(); + test_ndis_index_luid(); } diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 647fd650cd3..38e6802e3bd 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -584,6 +584,31 @@ static NTSTATUS ifinfo_get_parameter( const void *key, DWORD key_size, DWORD par return status; } +static NTSTATUS index_luid_get_parameter( const void *key, DWORD key_size, DWORD param_type, + void *data, DWORD data_size, DWORD data_offset ) +{ + struct if_entry *entry; + NTSTATUS status = STATUS_OBJECT_NAME_NOT_FOUND; + + TRACE( "%p %d %d %p %d %d\n", key, key_size, param_type, data, data_size, data_offset ); + + if (param_type != NSI_PARAM_TYPE_STATIC || data_size != sizeof(NET_LUID) || data_offset != 0) + return STATUS_INVALID_PARAMETER; + + EnterCriticalSection( &if_list_cs ); + + update_if_table(); + + entry = find_entry_from_index( *(DWORD *)key ); + if (entry) + { + *(NET_LUID *)data = entry->if_luid; + status = STATUS_SUCCESS; + } + LeaveCriticalSection( &if_list_cs ); + return status; +} + static const struct module_table tables[] = { { @@ -596,6 +621,16 @@ static const struct module_table tables[] = ifinfo_get_all_parameters, ifinfo_get_parameter }, + { + NSI_NDIS_INDEX_LUID_TABLE, + { + sizeof(DWORD), 0, + 0, sizeof(NET_LUID) + }, + NULL, + NULL, + index_luid_get_parameter + }, { ~0u } }; -- 2.23.0

1 0

[PATCH] dbghelp: fix SymGetTypeFromName
by Eric Pouech 02 Jul '21

02 Jul '21

Correctly initialize the module_pair structure Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/type.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index c322157d57d..be7c8378e8c 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -924,12 +924,12 @@ BOOL WINAPI SymGetTypeInfo(HANDLE hProcess, DWORD64 ModBase, BOOL WINAPI SymGetTypeFromName(HANDLE hProcess, ULONG64 BaseOfDll, PCSTR Name, PSYMBOL_INFO Symbol) { - struct process* pcs = process_find_by_handle(hProcess); struct module_pair pair; struct symt* type; - if (!pcs) return FALSE; - pair.requested = module_find_by_addr(pcs, BaseOfDll, DMT_UNKNOWN); + pair.pcs = process_find_by_handle(hProcess); + if (!pair.pcs) return FALSE; + pair.requested = module_find_by_addr(pair.pcs, BaseOfDll, DMT_UNKNOWN); if (!module_get_debug(&pair)) return FALSE; type = symt_find_type_by_name(pair.effective, SymTagNull, Name); if (!type) return FALSE;

1 0

[PATCH] winedbg: gdb proxy's exec-file:read command
by Eric Pouech 02 Jul '21

02 Jul '21

Added support for qXfer:exec-file:read command in gdb proxy. This removes lots of garbage spitted by gdb. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/gdbproxy.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index b8a8a1da2f8..04f1dabd312 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1850,6 +1850,7 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) packet_reply_add(gdbctx, "qXfer:libraries:read+;"); packet_reply_add(gdbctx, "qXfer:threads:read+;"); packet_reply_add(gdbctx, "qXfer:features:read+;"); + packet_reply_add(gdbctx, "qXfer:exec-file:read+;"); packet_reply_close(gdbctx); return packet_done; } @@ -1910,6 +1911,25 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) packet_reply_close_xfer(gdbctx, off, len); return packet_done; } + + if (sscanf(gdbctx->in_packet, "Xfer:exec-file:read::%x,%x", &off, &len) == 2) + { + BOOL is_wow64; + char* unix_path; + char* tmp; + + if (!gdbctx->process || !gdbctx->process->imageName) return packet_error; + if (!(unix_path = wine_get_unix_file_name(gdbctx->process->imageName))) return packet_error; + + if (IsWow64Process(gdbctx->process->handle, &is_wow64) && + is_wow64 && (tmp = strstr(unix_path, "system32"))) + memcpy(tmp, "syswow64", 8); + packet_reply_open_xfer(gdbctx); + packet_reply_add(gdbctx, unix_path); + packet_reply_close_xfer(gdbctx, off, len); + HeapFree(GetProcessHeap(), 0, unix_path); + return packet_done; + } break; } ERR("Unhandled query %s\n", debugstr_an(gdbctx->in_packet, gdbctx->in_packet_len));

1 0

[PATCH] winedbg: Added helper in gdbproxy mode to get proper address width information
by Eric Pouech 02 Jul '21

02 Jul '21

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/gdbproxy.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 19fa86d44da..89dcc14dcf6 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -702,6 +702,13 @@ static void get_thread_info(struct gdb_context* gdbctx, unsigned tid, * =============================================== * */ +static int addr_width(struct gdb_context* gdbctx) +{ + int sz = (gdbctx && gdbctx->process && gdbctx->process->be_cpu) ? + gdbctx->process->be_cpu->pointer_size : (int)sizeof(void*); + return sz * 2; +} + enum packet_return {packet_error = 0x00, packet_ok = 0x01, packet_done = 0x02, packet_last_f = 0x80}; @@ -1343,7 +1350,7 @@ static void packet_query_monitor_wnd_helper(struct gdb_context* gdbctx, HWND hWn "%*s%04lx%*s%-17.17s %08x %0*lx %.14s\n", indent, "", (ULONG_PTR)hWnd, 13 - indent, "", clsName, GetWindowLongW(hWnd, GWL_STYLE), - ADDRWIDTH, (ULONG_PTR)GetWindowLongPtrW(hWnd, GWLP_WNDPROC), + addr_width(gdbctx), (ULONG_PTR)GetWindowLongPtrW(hWnd, GWLP_WNDPROC), wndName); packet_reply_hex_to_str(gdbctx, buffer); packet_reply_close(gdbctx); @@ -1468,8 +1475,8 @@ static void packet_query_monitor_mem(struct gdb_context* gdbctx, int len, const } packet_reply_open(gdbctx); snprintf(buffer, sizeof(buffer), "%0*lx %0*lx %s %s %s\n", - (unsigned)sizeof(void*), (DWORD_PTR)addr, - (unsigned)sizeof(void*), mbi.RegionSize, state, type, prot); + addr_width(gdbctx), (DWORD_PTR)addr, + addr_width(gdbctx), mbi.RegionSize, state, type, prot); packet_reply_add(gdbctx, "O"); packet_reply_hex_to_str(gdbctx, buffer); packet_reply_close(gdbctx);

1 0

[PATCH] To: wine-devel@winehq.org
by Eric Pouech 02 Jul '21

02 Jul '21

winedbg: Added helper in gdbproxy mode to get proper address width information Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/gdbproxy.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 19fa86d44da..89dcc14dcf6 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -702,6 +702,13 @@ static void get_thread_info(struct gdb_context* gdbctx, unsigned tid, * =============================================== * */ +static int addr_width(struct gdb_context* gdbctx) +{ + int sz = (gdbctx && gdbctx->process && gdbctx->process->be_cpu) ? + gdbctx->process->be_cpu->pointer_size : (int)sizeof(void*); + return sz * 2; +} + enum packet_return {packet_error = 0x00, packet_ok = 0x01, packet_done = 0x02, packet_last_f = 0x80}; @@ -1343,7 +1350,7 @@ static void packet_query_monitor_wnd_helper(struct gdb_context* gdbctx, HWND hWn "%*s%04lx%*s%-17.17s %08x %0*lx %.14s\n", indent, "", (ULONG_PTR)hWnd, 13 - indent, "", clsName, GetWindowLongW(hWnd, GWL_STYLE), - ADDRWIDTH, (ULONG_PTR)GetWindowLongPtrW(hWnd, GWLP_WNDPROC), + addr_width(gdbctx), (ULONG_PTR)GetWindowLongPtrW(hWnd, GWLP_WNDPROC), wndName); packet_reply_hex_to_str(gdbctx, buffer); packet_reply_close(gdbctx); @@ -1468,8 +1475,8 @@ static void packet_query_monitor_mem(struct gdb_context* gdbctx, int len, const } packet_reply_open(gdbctx); snprintf(buffer, sizeof(buffer), "%0*lx %0*lx %s %s %s\n", - (unsigned)sizeof(void*), (DWORD_PTR)addr, - (unsigned)sizeof(void*), mbi.RegionSize, state, type, prot); + addr_width(gdbctx), (DWORD_PTR)addr, + addr_width(gdbctx), mbi.RegionSize, state, type, prot); packet_reply_add(gdbctx, "O"); packet_reply_hex_to_str(gdbctx, buffer); packet_reply_close(gdbctx);

1 0

[PATCH] include/d3d12: add missing enum/structures/defines needed to use d3d12x.h
by Steve Lhomme 02 Jul '21

02 Jul '21

d3dx12.h is a useful MIT licensed header from Microsoft to help do regular things with D3D12 (in C++). It's usable with mingw (and thus wine) with these additions. --- include/d3d12.idl | 77 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/include/d3d12.idl b/include/d3d12.idl index 42f33a06e40..056e078ab9d 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -75,6 +75,9 @@ const UINT D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT = 4096; const UINT D3D12_VS_INPUT_REGISTER_COUNT = 32; const UINT D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE = 16; +cpp_quote("#define D3D12_MIN_DEPTH ( 0.0f )") +cpp_quote("#define D3D12_MAX_DEPTH ( 1.0f )") + cpp_quote("#endif") const UINT D3D12_SHADER_COMPONENT_MAPPING_MASK = 0x7; @@ -2005,6 +2008,80 @@ typedef enum D3D12_PREDICATION_OP D3D12_PREDICATION_OP_NOT_EQUAL_ZERO = 1, } D3D12_PREDICATION_OP; +typedef enum D3D12_VIEW_INSTANCING_FLAGS +{ + D3D12_VIEW_INSTANCING_FLAG_NONE, + D3D12_VIEW_INSTANCING_FLAG_ENABLE_VIEW_INSTANCE_MASKING +} D3D12_VIEW_INSTANCING_FLAGS; + +typedef enum D3D12_PIPELINE_STATE_SUBOBJECT_TYPE +{ + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_ROOT_SIGNATURE, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_VS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_PS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_HS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_GS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_CS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_STREAM_OUTPUT, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_BLEND, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_SAMPLE_MASK, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_RASTERIZER, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DEPTH_STENCIL, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_INPUT_LAYOUT, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_IB_STRIP_CUT_VALUE, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_PRIMITIVE_TOPOLOGY, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_RENDER_TARGET_FORMATS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DEPTH_STENCIL_FORMAT, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_SAMPLE_DESC, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_NODE_MASK, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_CACHED_PSO, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_FLAGS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DEPTH_STENCIL1, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_VIEW_INSTANCING, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_AS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_MS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_MAX_VALID +} D3D12_PIPELINE_STATE_SUBOBJECT_TYPE; + +typedef struct D3D12_DEPTH_STENCIL_DESC1 +{ + BOOL DepthEnable; + D3D12_DEPTH_WRITE_MASK DepthWriteMask; + D3D12_COMPARISON_FUNC DepthFunc; + BOOL StencilEnable; + UINT8 StencilReadMask; + UINT8 StencilWriteMask; + D3D12_DEPTH_STENCILOP_DESC FrontFace; + D3D12_DEPTH_STENCILOP_DESC BackFace; + BOOL DepthBoundsTestEnable; +} D3D12_DEPTH_STENCIL_DESC1; + +typedef struct D3D12_VIEW_INSTANCE_LOCATION +{ + UINT ViewportArrayIndex; + UINT RenderTargetArrayIndex; +} D3D12_VIEW_INSTANCE_LOCATION; + +typedef struct D3D12_VIEW_INSTANCING_DESC +{ + UINT ViewInstanceCount; + const D3D12_VIEW_INSTANCE_LOCATION *pViewInstanceLocations; + D3D12_VIEW_INSTANCING_FLAGS Flags; +} D3D12_VIEW_INSTANCING_DESC; + +typedef struct D3D12_RT_FORMAT_ARRAY +{ + DXGI_FORMAT RTFormats[8]; + UINT NumRenderTargets; +} D3D12_RT_FORMAT_ARRAY; + +typedef struct D3D12_PIPELINE_STATE_STREAM_DESC +{ + SIZE_T SizeInBytes; + void *pPipelineStateSubobjectStream; +} D3D12_PIPELINE_STATE_STREAM_DESC; + [ uuid(8efb471d-616c-4f49-90f7-127bb763fa51), object, -- 2.29.2

1 0

[PATCH] To: wine-devel@winehq.org
by Eric Pouech 02 Jul '21

02 Jul '21

To: wine-devel(a)winehq.org winedbg: Added helper in gdbproxy mode to get proper address width information Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/gdbproxy.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 19fa86d44da..89dcc14dcf6 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -702,6 +702,13 @@ static void get_thread_info(struct gdb_context* gdbctx, unsigned tid, * =============================================== * */ +static int addr_width(struct gdb_context* gdbctx) +{ + int sz = (gdbctx && gdbctx->process && gdbctx->process->be_cpu) ? + gdbctx->process->be_cpu->pointer_size : (int)sizeof(void*); + return sz * 2; +} + enum packet_return {packet_error = 0x00, packet_ok = 0x01, packet_done = 0x02, packet_last_f = 0x80}; @@ -1343,7 +1350,7 @@ static void packet_query_monitor_wnd_helper(struct gdb_context* gdbctx, HWND hWn "%*s%04lx%*s%-17.17s %08x %0*lx %.14s\n", indent, "", (ULONG_PTR)hWnd, 13 - indent, "", clsName, GetWindowLongW(hWnd, GWL_STYLE), - ADDRWIDTH, (ULONG_PTR)GetWindowLongPtrW(hWnd, GWLP_WNDPROC), + addr_width(gdbctx), (ULONG_PTR)GetWindowLongPtrW(hWnd, GWLP_WNDPROC), wndName); packet_reply_hex_to_str(gdbctx, buffer); packet_reply_close(gdbctx); @@ -1468,8 +1475,8 @@ static void packet_query_monitor_mem(struct gdb_context* gdbctx, int len, const } packet_reply_open(gdbctx); snprintf(buffer, sizeof(buffer), "%0*lx %0*lx %s %s %s\n", - (unsigned)sizeof(void*), (DWORD_PTR)addr, - (unsigned)sizeof(void*), mbi.RegionSize, state, type, prot); + addr_width(gdbctx), (DWORD_PTR)addr, + addr_width(gdbctx), mbi.RegionSize, state, type, prot); packet_reply_add(gdbctx, "O"); packet_reply_hex_to_str(gdbctx, buffer); packet_reply_close(gdbctx);

1 0

[PATCH] winedbg: correct mapping read/write/execute information
by Eric Pouech 02 Jul '21

02 Jul '21

When processing memory related commands in winedbg, correctly report the bits from VirtualQueryEx. In details, + PAGE_WRITECOPY and PAGE_EXECUTE_WRITECOPY include read only access to the page. + PAGE_EXECUTE_WRITECOPY should report execution for the page. This patch covers 'info mem' in standard mode, and 'monitor mem' in gdbproxy mode. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/gdbproxy.c | 4 ++-- programs/winedbg/info.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 4aef27c3204..2fa88b612ff 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1459,13 +1459,13 @@ static void packet_query_monitor_mem(struct gdb_context* gdbctx, int len, const } memset(prot, ' ' , sizeof(prot)-1); prot[sizeof(prot)-1] = '\0'; - if (mbi.AllocationProtect & (PAGE_READONLY|PAGE_READWRITE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE)) + if (mbi.AllocationProtect & (PAGE_READONLY|PAGE_READWRITE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE|PAGE_WRITECOPY|PAGE_EXECUTE_WRITECOPY)) prot[0] = 'R'; if (mbi.AllocationProtect & (PAGE_READWRITE|PAGE_EXECUTE_READWRITE)) prot[1] = 'W'; if (mbi.AllocationProtect & (PAGE_WRITECOPY|PAGE_EXECUTE_WRITECOPY)) prot[1] = 'C'; - if (mbi.AllocationProtect & (PAGE_EXECUTE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE)) + if (mbi.AllocationProtect & (PAGE_EXECUTE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE|PAGE_EXECUTE_WRITECOPY)) prot[2] = 'X'; } else diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index e1f3d269649..a6335092d84 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -769,13 +769,13 @@ void info_win32_virtual(DWORD pid) } memset(prot, ' ' , sizeof(prot) - 1); prot[sizeof(prot) - 1] = '\0'; - if (mbi.AllocationProtect & (PAGE_READONLY|PAGE_READWRITE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE)) + if (mbi.AllocationProtect & (PAGE_READONLY|PAGE_READWRITE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE|PAGE_WRITECOPY|PAGE_EXECUTE_WRITECOPY)) prot[0] = 'R'; if (mbi.AllocationProtect & (PAGE_READWRITE|PAGE_EXECUTE_READWRITE)) prot[1] = 'W'; if (mbi.AllocationProtect & (PAGE_WRITECOPY|PAGE_EXECUTE_WRITECOPY)) prot[1] = 'C'; - if (mbi.AllocationProtect & (PAGE_EXECUTE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE)) + if (mbi.AllocationProtect & (PAGE_EXECUTE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE|PAGE_EXECUTE_WRITECOPY)) prot[2] = 'X'; } else

1 0

[PATCH] winedbg: Fix crash when no process attached in 'info wnd' command
by Eric Pouech 02 Jul '21

02 Jul '21

Ensure that ADDRSIZE and ADDRWIDTH macros can be used even when WineDbg isn't attached to any process, by providing a default value. Use case: wine programs/winedbg/winedbg.exe.so info wnd was simply crashing. (fixes #BZ49625 https://bugs.winehq.org/show_bug.cgi?id=49625) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/debugger.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index b7c765ac545..3733e1b410f 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -39,7 +39,7 @@ #include "oaidl.h" #include <wine/list.h> -#define ADDRSIZE (dbg_curr_process->be_cpu->pointer_size) +#define ADDRSIZE (dbg_curr_process ? dbg_curr_process->be_cpu->pointer_size : (int)sizeof(void*)) #define ADDRWIDTH (ADDRSIZE * 2) /* the debugger uses these exceptions for its internal use */

1 0

[PATCH] api-ms-win-core-featurestaging-l1-1-0: Add DLL
by Alex Henrie 02 Jul '21

02 Jul '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51329 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- configure.ac | 1 + dlls/api-ms-win-core-featurestaging-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-featurestaging-l1-1-0.spec | 5 +++++ tools/make_specfiles | 4 ++++ 4 files changed, 11 insertions(+) create mode 100644 dlls/api-ms-win-core-featurestaging-l1-1-0/Makefile.in create mode 100644 dlls/api-ms-win-core-featurestaging-l1-1-0/api-ms-win-core-featurestaging-l1-1-0.spec diff --git a/configure.ac b/configure.ac index f0a42cf3b0a..7102e95d2be 100644 --- a/configure.ac +++ b/configure.ac @@ -2762,6 +2762,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-errorhandling-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-errorhandling-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-errorhandling-l1-1-2) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-errorhandling-l1-1-3) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-featurestaging-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-fibers-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-fibers-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-file-ansi-l2-1-0) diff --git a/dlls/api-ms-win-core-featurestaging-l1-1-0/Makefile.in b/dlls/api-ms-win-core-featurestaging-l1-1-0/Makefile.in new file mode 100644 index 00000000000..cb2eb1c8d56 --- /dev/null +++ b/dlls/api-ms-win-core-featurestaging-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-featurestaging-l1-1-0.dll diff --git a/dlls/api-ms-win-core-featurestaging-l1-1-0/api-ms-win-core-featurestaging-l1-1-0.spec b/dlls/api-ms-win-core-featurestaging-l1-1-0/api-ms-win-core-featurestaging-l1-1-0.spec new file mode 100644 index 00000000000..ab5127b7dfd --- /dev/null +++ b/dlls/api-ms-win-core-featurestaging-l1-1-0/api-ms-win-core-featurestaging-l1-1-0.spec @@ -0,0 +1,5 @@ +@ stub GetFeatureEnabledState +@ stub RecordFeatureError +@ stub RecordFeatureUsage +@ stub SubscribeFeatureStateChangeNotification +@ stub UnsubscribeFeatureStateChangeNotification diff --git a/tools/make_specfiles b/tools/make_specfiles index e6a831025c6..d782beb27d7 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -355,6 +355,10 @@ my @dll_groups = "secur32", "sspicli", ], + [ + "shcore", + "api-ms-win-core-featurestaging-l1-1-0", + ], [ "shcore", "shell32", -- 2.32.0.94.ge083fb24f6

1 0

[PATCH] winecfg: Don't convert font height to points when saving system font metrics.
by Zhiyi Zhang 02 Jul '21

02 Jul '21

Fix tooltip font size becomes smaller after clicking the apply button in Desktop Integration tab. For example, the original non-client area tooltip font lfHeight is -11. 11 pixels is 8 points in 96 DPI. Setting font size to 8 points to SPI_SETNONCLIENTMETRICS will make SPI_GETNONCLIENTMETRICS report lfHeight as 8. With lfHeight being 8, CreateFontIndirectW() creates a smaller font. This behavior is added by 5b8fdb9. I assume the intention was to save font size in a DPI-independent way. However, when lfHeight is negative, lfHeight will still be scaled back to 96 DPI before saving it to registry and scaled to system DPI when it's read from registry. So I think converting to points is unnecessary. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/winecfg/theme.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 687ea571311..e204a911516 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -1035,12 +1035,6 @@ static void apply_sysparams(void) ncm.lfStatusFont = metrics[IDC_SYSPARAMS_TOOLTIP_TEXT - IDC_SYSPARAMS_BUTTON].lf; ncm.lfMessageFont = metrics[IDC_SYSPARAMS_MSGBOX_TEXT - IDC_SYSPARAMS_BUTTON].lf; - ncm.lfMenuFont.lfHeight = MulDiv( ncm.lfMenuFont.lfHeight, -72, dpi ); - ncm.lfCaptionFont.lfHeight = MulDiv( ncm.lfCaptionFont.lfHeight, -72, dpi ); - ncm.lfStatusFont.lfHeight = MulDiv( ncm.lfStatusFont.lfHeight, -72, dpi ); - ncm.lfMessageFont.lfHeight = MulDiv( ncm.lfMessageFont.lfHeight, -72, dpi ); - ncm.lfSmCaptionFont.lfHeight = MulDiv( ncm.lfSmCaptionFont.lfHeight, -72, dpi ); - SystemParametersInfoW(SPI_SETNONCLIENTMETRICS, sizeof(ncm), &ncm, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); -- 2.30.2

1 0

[PATCH 2/2] uxtheme: Send WM_THEMECHANGED instead of posting it in SetWindowTheme().
by Zhiyi Zhang 02 Jul '21

02 Jul '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51348 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/system.c | 2 +- dlls/uxtheme/tests/system.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 33e407fdf82..b18794740a8 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -698,7 +698,7 @@ HRESULT WINAPI SetWindowTheme(HWND hwnd, LPCWSTR pszSubAppName, if(SUCCEEDED(hr)) hr = UXTHEME_SetWindowProperty(hwnd, atSubIdList, pszSubIdList); if(SUCCEEDED(hr)) - UXTHEME_broadcast_msg (hwnd, WM_THEMECHANGED); + SendMessageW(hwnd, WM_THEMECHANGED, 0, 0); return hr; } diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 38cccb3ec6f..7f2e6d04aa4 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -233,8 +233,8 @@ static void test_SetWindowTheme(void) } DispatchMessageA(&msg); } - ok_sequence(sequences, PARENT_SEQ_INDEX, SetWindowThemeSeq, "SetWindowTheme parent", TRUE); - ok_sequence(sequences, CHILD_SEQ_INDEX, EmptySeq, "SetWindowTheme child", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, SetWindowThemeSeq, "SetWindowTheme parent", FALSE); + ok_sequence(sequences, CHILD_SEQ_INDEX, EmptySeq, "SetWindowTheme child", FALSE); DestroyWindow(hWnd); UnregisterClassA("TestSetWindowThemeParentClass", GetModuleHandleA(0)); UnregisterClassA("TestSetWindowThemeChildClass", GetModuleHandleA(0)); -- 2.30.2

1 0

[PATCH 1/2] uxtheme: Test that SetWindowTheme() should send WM_THEMECHANGED instead of posting it.
by Zhiyi Zhang 02 Jul '21

02 Jul '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/tests/msg.h | 409 ++++++++++++++++++++++++++++++++++++ dlls/uxtheme/tests/system.c | 138 +++++++++++- 2 files changed, 545 insertions(+), 2 deletions(-) create mode 100644 dlls/uxtheme/tests/msg.h diff --git a/dlls/uxtheme/tests/msg.h b/dlls/uxtheme/tests/msg.h new file mode 100644 index 00000000000..1be05499fd4 --- /dev/null +++ b/dlls/uxtheme/tests/msg.h @@ -0,0 +1,409 @@ +/* Message Sequence Testing Code + * + * Copyright (C) 2007 James Hawkins + * Copyright (C) 2007 Lei Zhang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> +#include <windows.h> +#include "wine/heap.h" +#include "wine/test.h" + +/* undocumented SWP flags - from SDK 3.1 */ +#define SWP_NOCLIENTSIZE 0x0800 +#define SWP_NOCLIENTMOVE 0x1000 + +typedef enum +{ + sent = 0x1, + posted = 0x2, + parent = 0x4, + wparam = 0x8, + lparam = 0x10, + defwinproc = 0x20, + beginpaint = 0x40, + optional = 0x80, + hook = 0x100, + winevent_hook =0x200, + id = 0x400, + custdraw = 0x800 +} msg_flags_t; + +struct message +{ + UINT message; /* the WM_* code */ + msg_flags_t flags; /* message props */ + WPARAM wParam; /* expected value of wParam */ + LPARAM lParam; /* expected value of lParam */ + UINT id; /* extra message data: id of the window, + notify code etc. */ + DWORD stage; /* custom draw stage */ +}; + +struct msg_sequence +{ + int count; + int size; + struct message *sequence; +}; + +static void add_message(struct msg_sequence **seq, int sequence_index, + const struct message *msg) +{ + struct msg_sequence *msg_seq = seq[sequence_index]; + + if (!msg_seq->sequence) + { + msg_seq->size = 10; + msg_seq->sequence = heap_alloc(msg_seq->size * sizeof (*msg_seq->sequence)); + } + + if (msg_seq->count == msg_seq->size) + { + msg_seq->size *= 2; + msg_seq->sequence = heap_realloc(msg_seq->sequence, msg_seq->size * sizeof (*msg_seq->sequence)); + } + + assert(msg_seq->sequence); + + msg_seq->sequence[msg_seq->count] = *msg; + msg_seq->count++; +} + +static inline void flush_sequence(struct msg_sequence **seg, int sequence_index) +{ + struct msg_sequence *msg_seq = seg[sequence_index]; + heap_free(msg_seq->sequence); + msg_seq->sequence = NULL; + msg_seq->count = msg_seq->size = 0; +} + +static inline void flush_sequences(struct msg_sequence **seq, int n) +{ + int i; + + for (i = 0; i < n; i++) + flush_sequence(seq, i); +} + +static void dump_sequence( struct msg_sequence **seq, int sequence_index, + const struct message *expected, const char *context, + const char *file, int line ) +{ + struct msg_sequence *msg_seq = seq[sequence_index]; + const struct message *actual, *sequence; + unsigned int count = 0; + + sequence = msg_seq->sequence; + actual = sequence; + + trace_(file, line)("Failed sequence %s:\n", context ); + while (expected->message && actual->message) + { + trace_(file, line)( " %u: expected: %04x - actual: %04x wp %08lx lp %08lx\n", + count, expected->message, actual->message, actual->wParam, actual->lParam ); + + if (expected->message == actual->message) + { + if ((expected->flags & defwinproc) != (actual->flags & defwinproc) && + (expected->flags & optional)) + { + /* don't match messages if their defwinproc status differs */ + expected++; + } + else + { + expected++; + actual++; + } + } + else + { + expected++; + actual++; + } + count++; + } + + /* optional trailing messages */ + while (expected->message && expected->flags & optional) + { + trace_(file, line)( " %u: expected: msg %04x - actual: nothing\n", count, expected->message ); + expected++; + count++; + } + + if (expected->message) + { + trace_(file, line)( " %u: expected: msg %04x - actual: nothing\n", count, expected->message ); + return; + } + + while (actual->message) + { + trace_(file, line)( " %u: expected: nothing - actual: %04x wp %08lx lp %08lx\n", + count, actual->message, actual->wParam, actual->lParam ); + actual++; + count++; + } +} + +static void ok_sequence_(struct msg_sequence **seq, int sequence_index, + const struct message *expected_list, const char *context, BOOL todo, + const char *file, int line) +{ + static const struct message end_of_sequence = {0, 0, 0, 0}; + struct msg_sequence *msg_seq = seq[sequence_index]; + const struct message *expected = expected_list; + const struct message *actual, *sequence; + int failcount = 0, dump = 0; + + add_message(seq, sequence_index, &end_of_sequence); + + sequence = msg_seq->sequence; + actual = sequence; + + while (expected->message && actual->message) + { + if (expected->message == actual->message) + { + if (expected->flags & wparam) + { + if (expected->wParam != actual->wParam && todo) + { + todo_wine + { + failcount++; + dump++; + ok_(file, line) (FALSE, + "%s: in msg 0x%04x expecting wParam 0x%lx got 0x%lx\n", + context, expected->message, expected->wParam, actual->wParam); + } + } + else + { + ok_(file, line) (expected->wParam == actual->wParam, + "%s: in msg 0x%04x expecting wParam 0x%lx got 0x%lx\n", + context, expected->message, expected->wParam, actual->wParam); + if (expected->wParam != actual->wParam) dump++; + } + } + + if (expected->flags & lparam) + { + if (expected->lParam != actual->lParam && todo) + { + todo_wine + { + failcount++; + dump++; + ok_(file, line) (FALSE, + "%s: in msg 0x%04x expecting lParam 0x%lx got 0x%lx\n", + context, expected->message, expected->lParam, actual->lParam); + } + } + else + { + ok_(file, line) (expected->lParam == actual->lParam, + "%s: in msg 0x%04x expecting lParam 0x%lx got 0x%lx\n", + context, expected->message, expected->lParam, actual->lParam); + if (expected->lParam != actual->lParam) dump++; + } + } + + if (expected->flags & custdraw) + { + if (expected->stage != actual->stage && todo) + { + todo_wine + { + failcount++; + dump++; + ok_(file, line) (FALSE, + "%s: in msg 0x%04x expecting cd stage 0x%08x got 0x%08x\n", + context, expected->message, expected->stage, actual->stage); + } + } + else + { + ok_(file, line) (expected->stage == actual->stage, + "%s: in msg 0x%04x expecting cd stage 0x%08x got 0x%08x\n", + context, expected->message, expected->stage, actual->stage); + if (expected->stage != actual->stage) dump++; + } + } + + if (expected->flags & id) + { + if (expected->id != actual->id && expected->flags & optional) + { + expected++; + continue; + } + if (expected->id != actual->id && todo) + { + todo_wine + { + failcount++; + dump++; + ok_(file, line) (FALSE, + "%s: in msg 0x%04x expecting id 0x%x got 0x%x\n", + context, expected->message, expected->id, actual->id); + } + } + else + { + ok_(file, line) (expected->id == actual->id, + "%s: in msg 0x%04x expecting id 0x%x got 0x%x\n", + context, expected->message, expected->id, actual->id); + if (expected->id != actual->id) dump++; + } + } + + if ((expected->flags & defwinproc) != (actual->flags & defwinproc) && todo) + { + todo_wine + { + failcount++; + dump++; + ok_(file, line) (FALSE, + "%s: the msg 0x%04x should %shave been sent by DefWindowProc\n", + context, expected->message, (expected->flags & defwinproc) ? "" : "NOT "); + } + } + else + { + ok_(file, line) ((expected->flags & defwinproc) == (actual->flags & defwinproc), + "%s: the msg 0x%04x should %shave been sent by DefWindowProc\n", + context, expected->message, (expected->flags & defwinproc) ? "" : "NOT "); + if ((expected->flags & defwinproc) != (actual->flags & defwinproc)) dump++; + } + + ok_(file, line) ((expected->flags & beginpaint) == (actual->flags & beginpaint), + "%s: the msg 0x%04x should %shave been sent by BeginPaint\n", + context, expected->message, (expected->flags & beginpaint) ? "" : "NOT "); + if ((expected->flags & beginpaint) != (actual->flags & beginpaint)) dump++; + + if (((expected->flags & (sent|posted)) != (actual->flags & (sent|posted))) && todo) + { + todo_wine + { + failcount++; + dump++; + ok_(file, line) (FALSE, + "%s: the msg 0x%04x should have been %s\n", + context, expected->message, (expected->flags & posted) ? "posted" : "sent"); + } + } + else + { + ok_(file, line) ((expected->flags & (sent|posted)) == (actual->flags & (sent|posted)), + "%s: the msg 0x%04x should have been %s\n", + context, expected->message, (expected->flags & posted) ? "posted" : "sent"); + if ((expected->flags & (sent|posted)) != (actual->flags & (sent|posted))) dump++; + } + + ok_(file, line) ((expected->flags & parent) == (actual->flags & parent), + "%s: the msg 0x%04x was expected in %s\n", + context, expected->message, (expected->flags & parent) ? "parent" : "child"); + if ((expected->flags & parent) != (actual->flags & parent)) dump++; + + ok_(file, line) ((expected->flags & hook) == (actual->flags & hook), + "%s: the msg 0x%04x should have been sent by a hook\n", + context, expected->message); + if ((expected->flags & hook) != (actual->flags & hook)) dump++; + + ok_(file, line) ((expected->flags & winevent_hook) == (actual->flags & winevent_hook), + "%s: the msg 0x%04x should have been sent by a winevent hook\n", + context, expected->message); + if ((expected->flags & winevent_hook) != (actual->flags & winevent_hook)) dump++; + + expected++; + actual++; + } + else if (expected->flags & optional) + expected++; + else if (todo) + { + failcount++; + dump++; + todo_wine + { + ok_(file, line) (FALSE, "%s: the msg 0x%04x was expected, but got msg 0x%04x instead\n", + context, expected->message, actual->message); + } + goto done; + } + else + { + ok_(file, line) (FALSE, "%s: the msg 0x%04x was expected, but got msg 0x%04x instead\n", + context, expected->message, actual->message); + dump++; + expected++; + actual++; + } + } + + /* skip all optional trailing messages */ + while (expected->message && ((expected->flags & optional))) + expected++; + + if (todo) + { + todo_wine + { + if (expected->message || actual->message) + { + failcount++; + dump++; + ok_(file, line) (FALSE, "%s: the msg sequence is not complete: expected %04x - actual %04x\n", + context, expected->message, actual->message); + } + } + } + else if (expected->message || actual->message) + { + dump++; + ok_(file, line) (FALSE, "%s: the msg sequence is not complete: expected %04x - actual %04x\n", + context, expected->message, actual->message); + } + + if(todo && !failcount) /* succeeded yet marked todo */ + { + if (!strcmp(winetest_platform, "wine")) dump++; + todo_wine + { + ok_(file, line)(TRUE, "%s: marked \"todo_wine\" but succeeds\n", context); + } + } + +done: + if (dump) dump_sequence( seq, sequence_index, expected_list, context, file, line ); + flush_sequence(seq, sequence_index); +} + +#define ok_sequence(seq, index, exp, contx, todo) \ + ok_sequence_(seq, index, (exp), (contx), (todo), __FILE__, __LINE__) + + +static void init_msg_sequences(struct msg_sequence **seq, int n) +{ + int i; + + for (i = 0; i < n; i++) + seq[i] = heap_alloc_zero(sizeof(*seq[i])); +} diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 869dbe2cdc9..38cccb3ec6f 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -24,6 +24,7 @@ #include "vfwmsgs.h" #include "uxtheme.h" +#include "msg.h" #include "wine/test.h" static HTHEME (WINAPI * pOpenThemeDataEx)(HWND, LPCWSTR, DWORD); @@ -35,6 +36,16 @@ static HDC (WINAPI *pGetBufferedPaintDC)(HPAINTBUFFER); static HDC (WINAPI *pGetBufferedPaintTargetDC)(HPAINTBUFFER); static HRESULT (WINAPI *pGetBufferedPaintTargetRect)(HPAINTBUFFER, RECT *); +/* For message tests */ +enum seq_index +{ + PARENT_SEQ_INDEX, + CHILD_SEQ_INDEX, + NUM_MSG_SEQUENCES +}; + +static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; + static void init_funcs(void) { HMODULE hUxtheme = GetModuleHandleA("uxtheme.dll"); @@ -53,6 +64,72 @@ static void init_funcs(void) #undef UXTHEME_GET_PROC } +/* Try to make sure pending X events have been processed before continuing */ +static void flush_events(void) +{ + MSG msg; + int diff = 200; + int min_timeout = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects(0, NULL, FALSE, min_timeout, QS_ALLINPUT) == WAIT_TIMEOUT) + break; + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + diff = time - GetTickCount(); + } +} + +static LRESULT WINAPI TestSetWindowThemeParentProcA(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + static LONG defwndproc_counter; + struct message msg = {0}; + LRESULT ret; + + /* Only care about WM_THEMECHANGED */ + if (message != WM_THEMECHANGED) + return DefWindowProcA(hwnd, message, wParam, lParam); + + msg.message = message; + msg.flags = sent | wparam | lparam; + if (defwndproc_counter) + msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + add_message(sequences, PARENT_SEQ_INDEX, &msg); + + InterlockedIncrement(&defwndproc_counter); + ret = DefWindowProcA(hwnd, message, wParam, lParam); + InterlockedDecrement(&defwndproc_counter); + return ret; +} + +static LRESULT WINAPI TestSetWindowThemeChildProcA(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + static LONG defwndproc_counter; + struct message msg = {0}; + LRESULT ret; + + /* Only care about WM_THEMECHANGED */ + if (message != WM_THEMECHANGED) + return DefWindowProcA(hwnd, message, wParam, lParam); + + msg.message = message; + msg.flags = sent | wparam | lparam; + if (defwndproc_counter) + msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + add_message(sequences, CHILD_SEQ_INDEX, &msg); + + InterlockedIncrement(&defwndproc_counter); + ret = DefWindowProcA(hwnd, message, wParam, lParam); + InterlockedDecrement(&defwndproc_counter); + return ret; +} + static void test_IsThemed(void) { BOOL bThemeActive; @@ -97,15 +174,71 @@ static void test_GetWindowTheme(void) DestroyWindow(hWnd); } +static const struct message SetWindowThemeSeq[] = +{ + {WM_THEMECHANGED, sent}, + {0} +}; + +static const struct message EmptySeq[] = +{ + {0} +}; + static void test_SetWindowTheme(void) { - HTHEME hTheme; + WNDCLASSA cls = {0}; + HWND hWnd, child; + HTHEME hTheme; HRESULT hRes; - HWND hWnd; + MSG msg; hRes = SetWindowTheme(NULL, NULL, NULL); ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes); + /* Test that WM_THEMECHANGED is sent and not posted to windows */ + cls.hInstance = GetModuleHandleA(0); + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpfnWndProc = TestSetWindowThemeParentProcA; + cls.lpszClassName = "TestSetWindowThemeParentClass"; + RegisterClassA(&cls); + + cls.lpfnWndProc = TestSetWindowThemeChildProcA; + cls.lpszClassName = "TestSetWindowThemeChildClass"; + RegisterClassA(&cls); + + hWnd = CreateWindowA("TestSetWindowThemeParentClass", "parent", + WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 200, 200, 0, 0, 0, NULL); + ok(!!hWnd, "Failed to create a parent window.\n"); + child = CreateWindowA("TestSetWindowThemeChildClass", "child", WS_CHILD | WS_VISIBLE, 0, 0, 50, + 50, hWnd, 0, 0, NULL); + ok(!!child, "Failed to create a child window.\n"); + flush_events(); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + hRes = SetWindowTheme(hWnd, NULL, NULL); + ok(hRes == S_OK, "Expected %#x, got %#x.\n", S_OK, hRes); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + struct message recv_msg = {0}; + + if (msg.message == WM_THEMECHANGED) + { + recv_msg.message = msg.message; + recv_msg.flags = posted | wparam | lparam; + recv_msg.wParam = msg.wParam; + recv_msg.lParam = msg.lParam; + add_message(sequences, msg.hwnd == hWnd ? PARENT_SEQ_INDEX : CHILD_SEQ_INDEX, &recv_msg); + } + DispatchMessageA(&msg); + } + ok_sequence(sequences, PARENT_SEQ_INDEX, SetWindowThemeSeq, "SetWindowTheme parent", TRUE); + ok_sequence(sequences, CHILD_SEQ_INDEX, EmptySeq, "SetWindowTheme child", TRUE); + DestroyWindow(hWnd); + UnregisterClassA("TestSetWindowThemeParentClass", GetModuleHandleA(0)); + UnregisterClassA("TestSetWindowThemeChildClass", GetModuleHandleA(0)); + /* Only do the bare minimum to get a valid hwnd */ hWnd = CreateWindowExA(0, "button", "test", WS_POPUP, 0, 0, 100, 100, 0, 0, 0, NULL); ok(hWnd != NULL, "Failed to create a test window.\n"); @@ -697,6 +830,7 @@ todo_wine START_TEST(system) { init_funcs(); + init_msg_sequences(sequences, NUM_MSG_SEQUENCES); /* No real functional theme API tests will be done (yet). The current tests * only show input/return behaviour -- 2.30.2

1 0

[PATCH 1/5] include: Add a helper macro to define wine AFD control codes.
by Zebediah Figura 01 Jul '21

01 Jul '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/wine/afd.h | 82 ++++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 40 deletions(-) diff --git a/include/wine/afd.h b/include/wine/afd.h index c672168bc6a..5db8fb1f4de 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -140,46 +140,48 @@ struct afd_get_events_params NTSTATUS status[13]; }; -#define IOCTL_AFD_WINE_CREATE CTL_CODE(FILE_DEVICE_NETWORK, 200, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_ACCEPT CTL_CODE(FILE_DEVICE_NETWORK, 201, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_ACCEPT_INTO CTL_CODE(FILE_DEVICE_NETWORK, 202, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_CONNECT CTL_CODE(FILE_DEVICE_NETWORK, 203, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SHUTDOWN CTL_CODE(FILE_DEVICE_NETWORK, 204, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_RECVMSG CTL_CODE(FILE_DEVICE_NETWORK, 205, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SENDMSG CTL_CODE(FILE_DEVICE_NETWORK, 206, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_TRANSMIT CTL_CODE(FILE_DEVICE_NETWORK, 207, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE CTL_CODE(FILE_DEVICE_NETWORK, 208, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_FIONBIO CTL_CODE(FILE_DEVICE_NETWORK, 209, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_COMPLETE_ASYNC CTL_CODE(FILE_DEVICE_NETWORK, 210, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_FIONREAD CTL_CODE(FILE_DEVICE_NETWORK, 211, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SIOCATMARK CTL_CODE(FILE_DEVICE_NETWORK, 212, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_INTERFACE_LIST CTL_CODE(FILE_DEVICE_NETWORK, 213, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_KEEPALIVE_VALS CTL_CODE(FILE_DEVICE_NETWORK, 214, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_MESSAGE_SELECT CTL_CODE(FILE_DEVICE_NETWORK, 215, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GETPEERNAME CTL_CODE(FILE_DEVICE_NETWORK, 216, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_DEFER CTL_CODE(FILE_DEVICE_NETWORK, 217, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_INFO CTL_CODE(FILE_DEVICE_NETWORK, 218, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_SO_ACCEPTCONN CTL_CODE(FILE_DEVICE_NETWORK, 219, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_SO_BROADCAST CTL_CODE(FILE_DEVICE_NETWORK, 220, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SET_SO_BROADCAST CTL_CODE(FILE_DEVICE_NETWORK, 221, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_SO_ERROR CTL_CODE(FILE_DEVICE_NETWORK, 222, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_SO_KEEPALIVE CTL_CODE(FILE_DEVICE_NETWORK, 223, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SET_SO_KEEPALIVE CTL_CODE(FILE_DEVICE_NETWORK, 224, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_SO_LINGER CTL_CODE(FILE_DEVICE_NETWORK, 225, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SET_SO_LINGER CTL_CODE(FILE_DEVICE_NETWORK, 226, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_SO_OOBINLINE CTL_CODE(FILE_DEVICE_NETWORK, 227, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SET_SO_OOBINLINE CTL_CODE(FILE_DEVICE_NETWORK, 228, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SET_SO_RCVBUF CTL_CODE(FILE_DEVICE_NETWORK, 229, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_SO_RCVBUF CTL_CODE(FILE_DEVICE_NETWORK, 230, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SET_SO_RCVTIMEO CTL_CODE(FILE_DEVICE_NETWORK, 231, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_SO_RCVTIMEO CTL_CODE(FILE_DEVICE_NETWORK, 232, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_SO_REUSEADDR CTL_CODE(FILE_DEVICE_NETWORK, 233, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SET_SO_REUSEADDR CTL_CODE(FILE_DEVICE_NETWORK, 234, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SET_SO_SNDBUF CTL_CODE(FILE_DEVICE_NETWORK, 235, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_SO_SNDBUF CTL_CODE(FILE_DEVICE_NETWORK, 236, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_GET_SO_SNDTIMEO CTL_CODE(FILE_DEVICE_NETWORK, 237, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SET_SO_SNDTIMEO CTL_CODE(FILE_DEVICE_NETWORK, 238, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_SET_IP_ADD_MEMBERSHIP CTL_CODE(FILE_DEVICE_NETWORK, 239, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define WINE_AFD_IOC(x) CTL_CODE(FILE_DEVICE_NETWORK, x, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define IOCTL_AFD_WINE_CREATE WINE_AFD_IOC(200) +#define IOCTL_AFD_WINE_ACCEPT WINE_AFD_IOC(201) +#define IOCTL_AFD_WINE_ACCEPT_INTO WINE_AFD_IOC(202) +#define IOCTL_AFD_WINE_CONNECT WINE_AFD_IOC(203) +#define IOCTL_AFD_WINE_SHUTDOWN WINE_AFD_IOC(204) +#define IOCTL_AFD_WINE_RECVMSG WINE_AFD_IOC(205) +#define IOCTL_AFD_WINE_SENDMSG WINE_AFD_IOC(206) +#define IOCTL_AFD_WINE_TRANSMIT WINE_AFD_IOC(207) +#define IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE WINE_AFD_IOC(208) +#define IOCTL_AFD_WINE_FIONBIO WINE_AFD_IOC(209) +#define IOCTL_AFD_WINE_COMPLETE_ASYNC WINE_AFD_IOC(210) +#define IOCTL_AFD_WINE_FIONREAD WINE_AFD_IOC(211) +#define IOCTL_AFD_WINE_SIOCATMARK WINE_AFD_IOC(212) +#define IOCTL_AFD_WINE_GET_INTERFACE_LIST WINE_AFD_IOC(213) +#define IOCTL_AFD_WINE_KEEPALIVE_VALS WINE_AFD_IOC(214) +#define IOCTL_AFD_WINE_MESSAGE_SELECT WINE_AFD_IOC(215) +#define IOCTL_AFD_WINE_GETPEERNAME WINE_AFD_IOC(216) +#define IOCTL_AFD_WINE_DEFER WINE_AFD_IOC(217) +#define IOCTL_AFD_WINE_GET_INFO WINE_AFD_IOC(218) +#define IOCTL_AFD_WINE_GET_SO_ACCEPTCONN WINE_AFD_IOC(219) +#define IOCTL_AFD_WINE_GET_SO_BROADCAST WINE_AFD_IOC(220) +#define IOCTL_AFD_WINE_SET_SO_BROADCAST WINE_AFD_IOC(221) +#define IOCTL_AFD_WINE_GET_SO_ERROR WINE_AFD_IOC(222) +#define IOCTL_AFD_WINE_GET_SO_KEEPALIVE WINE_AFD_IOC(223) +#define IOCTL_AFD_WINE_SET_SO_KEEPALIVE WINE_AFD_IOC(224) +#define IOCTL_AFD_WINE_GET_SO_LINGER WINE_AFD_IOC(225) +#define IOCTL_AFD_WINE_SET_SO_LINGER WINE_AFD_IOC(226) +#define IOCTL_AFD_WINE_GET_SO_OOBINLINE WINE_AFD_IOC(227) +#define IOCTL_AFD_WINE_SET_SO_OOBINLINE WINE_AFD_IOC(228) +#define IOCTL_AFD_WINE_SET_SO_RCVBUF WINE_AFD_IOC(229) +#define IOCTL_AFD_WINE_GET_SO_RCVBUF WINE_AFD_IOC(230) +#define IOCTL_AFD_WINE_SET_SO_RCVTIMEO WINE_AFD_IOC(231) +#define IOCTL_AFD_WINE_GET_SO_RCVTIMEO WINE_AFD_IOC(232) +#define IOCTL_AFD_WINE_GET_SO_REUSEADDR WINE_AFD_IOC(233) +#define IOCTL_AFD_WINE_SET_SO_REUSEADDR WINE_AFD_IOC(234) +#define IOCTL_AFD_WINE_SET_SO_SNDBUF WINE_AFD_IOC(235) +#define IOCTL_AFD_WINE_GET_SO_SNDBUF WINE_AFD_IOC(236) +#define IOCTL_AFD_WINE_GET_SO_SNDTIMEO WINE_AFD_IOC(237) +#define IOCTL_AFD_WINE_SET_SO_SNDTIMEO WINE_AFD_IOC(238) +#define IOCTL_AFD_WINE_SET_IP_ADD_MEMBERSHIP WINE_AFD_IOC(239) struct afd_create_params { -- 2.30.2

2 8

[PATCH v5 1/3] advapi32/tests: Add some test for perflib keys.
by Zebediah Figura 01 Jul '21

01 Jul '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/advapi32/tests/registry.c | 139 +++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 72423eae94c..cdf9b18f5d1 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -99,6 +99,11 @@ static void InitFunctionPtrs(void) pNtUnloadKey = (void *)GetProcAddress( hntdll, "NtUnloadKey" ); } +static BOOL is_special_key(HKEY key) +{ + return !!((ULONG_PTR)key & 0x80000000); +} + /* delete key and all its subkeys */ static DWORD delete_key( HKEY hkey ) { @@ -3809,6 +3814,139 @@ todo_wine ok(dwret == ERROR_SUCCESS, "got %u\n", dwret); } +static void test_perflib_key(void) +{ + unsigned int primary_lang = PRIMARYLANGID(GetUserDefaultLangID()); + unsigned int buffer_size = 1024 * 1024; + OBJECT_NAME_INFORMATION *name_info; + HKEY perflib_key, key, key2; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING string; + char lang_name[4]; + char *buffer; + DWORD size; + LONG ret; + + ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, + "Software\\Microsoft\\Windows NT\\CurrentVersion\\Perflib", 0, KEY_READ, &perflib_key); + ok(!ret, "got %u\n", ret); + + ret = RegOpenKeyExA(perflib_key, "009", 0, KEY_READ, &key); + todo_wine ok(!ret, "got %u\n", ret); + /* English always returns TEXT; most other languages return NLSTEXT, but + * some (e.g. Hindi) return TEXT */ + todo_wine ok(key == HKEY_PERFORMANCE_TEXT || key == HKEY_PERFORMANCE_NLSTEXT, "got key %p\n", key); + + ret = RegCloseKey(key); + todo_wine ok(!ret, "got %u\n", ret); + + RtlInitUnicodeString(&string, L"009"); + InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE, perflib_key, NULL); + ret = NtOpenKey((HANDLE *)&key, KEY_ALL_ACCESS, &attr); + todo_wine ok(ret == STATUS_PREDEFINED_HANDLE || ret == STATUS_ACCESS_DENIED + || ret == STATUS_SUCCESS /* Win < 7 */, "got %#x\n", ret); + if (ret == STATUS_PREDEFINED_HANDLE) + ok(!is_special_key(key), "expected a normal handle, got %p\n", key); + else if (ret == STATUS_SUCCESS) + ok(key == HKEY_PERFORMANCE_TEXT, "got key %p\n", key); + else + { + skip("Not enough permissions to test the perflib key.\n"); + RegCloseKey(perflib_key); + return; + } + + buffer = malloc(buffer_size); + + ret = NtQueryKey(key, KeyFullInformation, buffer, buffer_size, &size); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + ret = NtEnumerateKey(key, 0, KeyFullInformation, buffer, buffer_size, &size); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + RtlInitUnicodeString(&string, L"counter"); + ret = NtQueryValueKey(key, &string, KeyValuePartialInformation, buffer, buffer_size, &size); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + ret = NtEnumerateValueKey(key, 0, KeyValuePartialInformation, buffer, buffer_size, &size); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + ret = NtSetValueKey(key, &string, 0, REG_SZ, "test", 5); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + ret = NtDeleteValueKey(key, &string); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + ret = NtDeleteKey(key); + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + + RtlInitUnicodeString(&string, L"subkey"); + InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE, key, NULL); + ret = NtOpenKey((HANDLE *)&key2, KEY_READ, &attr); + if (is_special_key(key)) + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + else + ok(ret == STATUS_OBJECT_NAME_NOT_FOUND + || broken(ret == STATUS_INVALID_HANDLE) /* WoW64 */, "got %#x\n", ret); + + ret = NtCreateKey((HANDLE *)&key2, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL); + if (is_special_key(key)) + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + else + ok(!ret || broken(ret == STATUS_ACCESS_DENIED) /* w8adm */ + || broken(ret == STATUS_INVALID_HANDLE) /* WoW64 */, "got %#x\n", ret); + if (!ret) + { + NtDeleteKey(key2); + NtClose(key2); + } + + /* it's a real handle, though */ + ret = NtQueryObject(key, ObjectNameInformation, buffer, buffer_size, &size); + if (is_special_key(key)) + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + else + ok(!ret, "got %#x\n", ret); + if (!ret) + { + name_info = (OBJECT_NAME_INFORMATION *)buffer; + ok(!wcsicmp(name_info->Name.Buffer, L"\\REGISTRY\\MACHINE\\SOFTWARE\\Microsoft\\Windows NT" + "\\CurrentVersion\\Perflib\\009"), "got name %s\n", debugstr_w(name_info->Name.Buffer)); + } + + ret = NtClose(key); + if (is_special_key(key)) + ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); + else + ok(!ret, "got %#x\n", ret); + + /* multilingual support was not really completely thought through */ + + sprintf(lang_name, "%03x", primary_lang); + if (primary_lang != LANG_ENGLISH) + { + ret = RegOpenKeyExA(perflib_key, lang_name, 0, KEY_READ, &key); + todo_wine ok(!ret, "got %u\n", ret); + ok(!is_special_key(key), "expected a normal handle, got %p\n", key); + + ret = RegQueryValueExA(key, "counter", NULL, NULL, (BYTE *)buffer, &size); + todo_wine ok(ret == ERROR_FILE_NOT_FOUND, "got %u\n", ret); + + ret = RegCloseKey(key); + todo_wine ok(!ret, "got %u\n", ret); + } + + ret = RegCloseKey(perflib_key); + ok(!ret, "got %u\n", ret); + + RtlInitUnicodeString(&string, L"\\Registry\\PerfData"); + InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE, NULL, NULL); + ret = NtOpenKey((HANDLE *)&key, KEY_READ, &attr); + todo_wine ok(ret == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", ret); + + free(buffer); +} + static void test_RegLoadMUIString(void) { HMODULE hUser32, hResDll, hFile; @@ -4213,6 +4351,7 @@ START_TEST(registry) test_RegQueryValueExPerformanceData(); test_RegLoadMUIString(); test_EnumDynamicTimeZoneInformation(); + test_perflib_key(); /* cleanup */ delete_key( hkey_main ); -- 2.30.2

1 2

Why did hid:device start timing out on May 24th?
by Francois Gouget 01 Jul '21

01 Jul '21

The failure pattern shows that hid:device started timing out about 20% of the time on the debiant2 VM on or about the 24th of May: https://test.winehq.org/data/patterns.html#hid:device debiant2 was last modified on 2021-05-11 so that's not it. There is no obviously related commit on that date. I tried bisecting for a commit by considering a commit good only if the test succeeds 25 times in a row. But that was inconclusive. Similarly I looked for another test interfering with hid:device (with the same repeat count), but that was inconclusive too. So does anyone have any idea what could have changed? Or better yet, have a fix for it? Note that the timeout seems to only impact the tests running in a non-English locale or a WoW Wine build. In other words anything that's not the plain 32-bit English Wine. That's strange too. -- Francois Gouget <fgouget(a)codeweavers.com>

2 2

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