wine-commits April 2022

wine-commits@winehq.org

2 participants
1024 discussions

Anton Baskanov : quartz/tests: Add tests for MPEG audio decoder accepted media types.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: f7668a85d152604b9c176621b96b3ef1031506ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7668a85d152604b9c176621… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Apr 27 13:42:19 2022 +0700 quartz/tests: Add tests for MPEG audio decoder accepted media types. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/mpegaudio.c | 192 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 192 insertions(+) diff --git a/dlls/quartz/tests/mpegaudio.c b/dlls/quartz/tests/mpegaudio.c index 5f851cb5973..cbf8ef393d2 100644 --- a/dlls/quartz/tests/mpegaudio.c +++ b/dlls/quartz/tests/mpegaudio.c @@ -21,8 +21,134 @@ #define COBJMACROS #include "dshow.h" +#include "mmreg.h" #include "wine/test.h" +static const MPEG1WAVEFORMAT mp1_format = +{ + .wfx.wFormatTag = WAVE_FORMAT_MPEG, + .wfx.nChannels = 1, + .wfx.nSamplesPerSec = 32000, + .wfx.nBlockAlign = 48, + .wfx.nAvgBytesPerSec = 4000, + .wfx.cbSize = sizeof(MPEG1WAVEFORMAT) - sizeof(WAVEFORMATEX), + .fwHeadLayer = ACM_MPEG_LAYER1, + .dwHeadBitrate = 32000, + .fwHeadMode = ACM_MPEG_SINGLECHANNEL, + .fwHeadFlags = ACM_MPEG_ID_MPEG1, +}; + +static const AM_MEDIA_TYPE mp1_mt = +{ + /* MEDIATYPE_Audio, MEDIASUBTYPE_MPEG1AudioPayload, FORMAT_WaveFormatEx */ + .majortype = {0x73647561, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .subtype = {0x00000050, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .bFixedSizeSamples = TRUE, + .lSampleSize = 1, + .formattype = {0x05589f81, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}, + .cbFormat = sizeof(MPEG1WAVEFORMAT), + .pbFormat = (BYTE *)&mp1_format, +}; + +static const MPEG1WAVEFORMAT mp2_format = +{ + .wfx.wFormatTag = WAVE_FORMAT_MPEG, + .wfx.nChannels = 1, + .wfx.nSamplesPerSec = 32000, + .wfx.nBlockAlign = 144, + .wfx.nAvgBytesPerSec = 4000, + .wfx.cbSize = sizeof(MPEG1WAVEFORMAT) - sizeof(WAVEFORMATEX), + .fwHeadLayer = ACM_MPEG_LAYER2, + .dwHeadBitrate = 32000, + .fwHeadMode = ACM_MPEG_SINGLECHANNEL, + .fwHeadFlags = ACM_MPEG_ID_MPEG1, +}; + +static const AM_MEDIA_TYPE mp2_mt = +{ + /* MEDIATYPE_Audio, MEDIASUBTYPE_MPEG1AudioPayload, FORMAT_WaveFormatEx */ + .majortype = {0x73647561, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .subtype = {0x00000050, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .bFixedSizeSamples = TRUE, + .lSampleSize = 1, + .formattype = {0x05589f81, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}, + .cbFormat = sizeof(MPEG1WAVEFORMAT), + .pbFormat = (BYTE *)&mp2_format, +}; + +static const MPEG1WAVEFORMAT mp3_format0 = +{ + .wfx.wFormatTag = WAVE_FORMAT_MPEG, + .wfx.nChannels = 1, + .wfx.nSamplesPerSec = 32000, + .wfx.nBlockAlign = 144, + .wfx.nAvgBytesPerSec = 4000, + .wfx.cbSize = sizeof(MPEG1WAVEFORMAT) - sizeof(WAVEFORMATEX), + .fwHeadLayer = ACM_MPEG_LAYER3, + .dwHeadBitrate = 32000, + .fwHeadMode = ACM_MPEG_SINGLECHANNEL, + .fwHeadFlags = ACM_MPEG_ID_MPEG1, +}; + +static const AM_MEDIA_TYPE mp3_mt0 = +{ + /* MEDIATYPE_Audio, MEDIASUBTYPE_MPEG1AudioPayload, FORMAT_WaveFormatEx */ + .majortype = {0x73647561, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .subtype = {0x00000050, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .bFixedSizeSamples = TRUE, + .lSampleSize = 1, + .formattype = {0x05589f81, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}, + .cbFormat = sizeof(MPEG1WAVEFORMAT), + .pbFormat = (BYTE *)&mp3_format0, +}; + +static const MPEGLAYER3WAVEFORMAT mp3_format1 = +{ + .wfx.wFormatTag = WAVE_FORMAT_MPEGLAYER3, + .wfx.nChannels = 1, + .wfx.nSamplesPerSec = 32000, + .wfx.nBlockAlign = 144, + .wfx.nAvgBytesPerSec = 4000, + .wfx.cbSize = sizeof(MPEGLAYER3WAVEFORMAT) - sizeof(WAVEFORMATEX), + .wID = MPEGLAYER3_ID_MPEG, + .nBlockSize = 144, + .nFramesPerBlock = 1, +}; + +static const AM_MEDIA_TYPE mp3_mt1 = +{ + /* MEDIATYPE_Audio, MEDIASUBTYPE_MPEG1AudioPayload, FORMAT_WaveFormatEx */ + .majortype = {0x73647561, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .subtype = {0x00000050, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .bFixedSizeSamples = TRUE, + .lSampleSize = 1, + .formattype = {0x05589f81, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}, + .cbFormat = sizeof(MPEGLAYER3WAVEFORMAT), + .pbFormat = (BYTE *)&mp3_format1, +}; + +static const WAVEFORMATEX pcm16_format = +{ + .wFormatTag = WAVE_FORMAT_PCM, + .nChannels = 1, + .nSamplesPerSec = 32000, + .wBitsPerSample = 16, + .nBlockAlign = 2, + .nAvgBytesPerSec = 64000, +}; + +static const AM_MEDIA_TYPE pcm16_mt = +{ + /* MEDIATYPE_Audio, MEDIASUBTYPE_PCM, FORMAT_WaveFormatEx */ + .majortype = {0x73647561, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .subtype = {0x00000001, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .bFixedSizeSamples = TRUE, + .lSampleSize = 2, + .formattype = {0x05589f81, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}, + .cbFormat = sizeof(WAVEFORMATEX), + .pbFormat = (BYTE *)&pcm16_format, +}; + static IBaseFilter *create_mpeg_audio_codec(void) { IBaseFilter *filter = NULL; @@ -601,6 +727,71 @@ static void test_enum_media_types(void) ok(!ref, "Got outstanding refcount %ld.\n", ref); } +static void test_media_types(void) +{ + IBaseFilter *filter = create_mpeg_audio_codec(); + AM_MEDIA_TYPE mt; + HRESULT hr; + ULONG ref; + IPin *pin; + + IBaseFilter_FindPin(filter, L"In", &pin); + + hr = IPin_QueryAccept(pin, &mp1_mt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IPin_QueryAccept(pin, &mp2_mt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + mt = mp2_mt; + mt.subtype = MEDIASUBTYPE_MPEG1Packet; + hr = IPin_QueryAccept(pin, &mp2_mt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + mt = mp2_mt; + mt.subtype = MEDIASUBTYPE_MPEG1Payload; + hr = IPin_QueryAccept(pin, &mp2_mt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + mt = mp2_mt; + mt.subtype = GUID_NULL; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IPin_QueryAccept(pin, &mp3_mt0); + todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + hr = IPin_QueryAccept(pin, &mp3_mt1); + todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + mt = mp2_mt; + mt.majortype = GUID_NULL; + hr = IPin_QueryAccept(pin, &mt); + todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + mt = mp2_mt; + mt.subtype = MEDIASUBTYPE_PCM; + hr = IPin_QueryAccept(pin, &mt); + todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + mt = mp2_mt; + mt.formattype = GUID_NULL; + hr = IPin_QueryAccept(pin, &mt); + todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + IPin_Release(pin); + + IBaseFilter_FindPin(filter, L"Out", &pin); + + hr = IPin_QueryAccept(pin, &pcm16_mt); + todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + IPin_Release(pin); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %ld.\n", ref); +} + START_TEST(mpegaudio) { CoInitialize(NULL); @@ -612,6 +803,7 @@ START_TEST(mpegaudio) test_find_pin(); test_pin_info(); test_enum_media_types(); + test_media_types(); CoUninitialize(); }

1 0

Anton Baskanov : quartz/tests: Add tests for MPEG audio decoder IEnumMediaTypes.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: c63b53326ced532e855a418e6c1b5ad22f1d3ade URL: https://source.winehq.org/git/wine.git/?a=commit;h=c63b53326ced532e855a418e… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Apr 27 13:42:18 2022 +0700 quartz/tests: Add tests for MPEG audio decoder IEnumMediaTypes. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/mpegaudio.c | 76 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/dlls/quartz/tests/mpegaudio.c b/dlls/quartz/tests/mpegaudio.c index 44e1a9ad2e6..5f851cb5973 100644 --- a/dlls/quartz/tests/mpegaudio.c +++ b/dlls/quartz/tests/mpegaudio.c @@ -526,6 +526,81 @@ static void test_pin_info(void) ok(!ref, "Got outstanding refcount %ld.\n", ref); } +static void test_enum_media_types(void) +{ + IBaseFilter *filter = create_mpeg_audio_codec(); + IEnumMediaTypes *enum1, *enum2; + AM_MEDIA_TYPE *mts[1]; + ULONG ref, count; + HRESULT hr; + IPin *pin; + + IBaseFilter_FindPin(filter, L"In", &pin); + + hr = IPin_EnumMediaTypes(pin, &enum1); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, &count); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(!count, "Got count %lu.\n", count); + + hr = IEnumMediaTypes_Reset(enum1); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Next(enum2, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + IEnumMediaTypes_Release(enum1); + IEnumMediaTypes_Release(enum2); + IPin_Release(pin); + + IBaseFilter_FindPin(filter, L"Out", &pin); + + hr = IPin_EnumMediaTypes(pin, &enum1); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, &count); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(!count, "Got count %lu.\n", count); + + hr = IEnumMediaTypes_Reset(enum1); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Next(enum2, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + IEnumMediaTypes_Release(enum1); + IEnumMediaTypes_Release(enum2); + IPin_Release(pin); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %ld.\n", ref); +} + START_TEST(mpegaudio) { CoInitialize(NULL); @@ -536,6 +611,7 @@ START_TEST(mpegaudio) test_enum_pins(); test_find_pin(); test_pin_info(); + test_enum_media_types(); CoUninitialize(); }

1 0

Ziqing Hui : include: Add defines for ID2D1EffectImpl.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: 932731233f6d201869fded12a1ea5fb7b8602341 URL: https://source.winehq.org/git/wine.git/?a=commit;h=932731233f6d201869fded12… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Apr 27 12:24:40 2022 +0800 include: Add defines for ID2D1EffectImpl. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1effectauthor.idl | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/include/d2d1effectauthor.idl b/include/d2d1effectauthor.idl index 60cff9cc277..b53aa515e85 100644 --- a/include/d2d1effectauthor.idl +++ b/include/d2d1effectauthor.idl @@ -47,6 +47,15 @@ typedef enum D2D1_CHANNEL_DEPTH D2D1_CHANNEL_DEPTH_FORCE_DWORD = 0xffffffff } D2D1_CHANNEL_DEPTH; +typedef enum D2D1_CHANGE_TYPE +{ + D2D1_CHANGE_TYPE_NONE = 0x0, + D2D1_CHANGE_TYPE_PROPERTIES = 0x1, + D2D1_CHANGE_TYPE_CONTEXT = 0x2, + D2D1_CHANGE_TYPE_GRAPH = 0x3, + D2D1_CHANGE_TYPE_FORCE_DWORD = 0xffffffff +} D2D1_CHANGE_TYPE; + typedef enum D2D1_PIXEL_OPTIONS { D2D1_PIXEL_OPTIONS_NONE = 0x0, @@ -576,3 +585,22 @@ interface ID2D1EffectContext : IUnknown [in] D2D1_BUFFER_PRECISION precision ); } + +[ + object, + uuid(a248fd3f-3e6c-4e63-9f03-7f68ecc91db9), + local, +] +interface ID2D1EffectImpl : IUnknown +{ + HRESULT Initialize( + [in] ID2D1EffectContext *context, + [in] ID2D1TransformGraph *graph + ); + HRESULT PrepareForRender( + [in] D2D1_CHANGE_TYPE type + ); + HRESULT SetGraph( + [in] ID2D1TransformGraph *graph + ); +}

1 0

Ziqing Hui : include: Add defines for ID2D1EffectContext.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: c6bf391030d1274a0be9927b5e67ac667ad5b7cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6bf391030d1274a0be9927b… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Apr 27 12:24:39 2022 +0800 include: Add defines for ID2D1EffectContext. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1effectauthor.idl | 156 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 156 insertions(+) diff --git a/include/d2d1effectauthor.idl b/include/d2d1effectauthor.idl index 6838492c498..60cff9cc277 100644 --- a/include/d2d1effectauthor.idl +++ b/include/d2d1effectauthor.idl @@ -32,6 +32,13 @@ typedef enum D2D1_FILTER D2D1_FILTER_FORCE_DWORD = 0xffffffff } D2D1_FILTER; +typedef enum D2D1_FEATURE +{ + D2D1_FEATURE_DOUBLES = 0x0, + D2D1_FEATURE_D3D10_X_HARDWARE_OPTIONS = 0x1, + D2D1_FEATURE_FORCE_DWORD = 0xffffffff +} D2D1_FEATURE; + typedef enum D2D1_CHANNEL_DEPTH { D2D1_CHANNEL_DEPTH_DEFAULT = 0x0, @@ -56,6 +63,13 @@ typedef enum D2D1_VERTEX_OPTIONS D2D1_VERTEX_OPTIONS_FORCE_DWORD = 0xffffffff } D2D1_VERTEX_OPTIONS; +typedef enum D2D1_VERTEX_USAGE +{ + D2D1_VERTEX_USAGE_STATIC = 0x0, + D2D1_VERTEX_USAGE_DYNAMIC = 0x1, + D2D1_VERTEX_USAGE_FORCE_DWORD = 0xffffffff +} D2D1_VERTEX_USAGE; + typedef enum D2D1_BLEND_OPERATION { D2D1_BLEND_OPERATION_ADD = 0x1, @@ -107,6 +121,42 @@ typedef struct D2D1_BLEND_DESCRIPTION float blendFactor[4]; } D2D1_BLEND_DESCRIPTION; +typedef struct D2D1_RESOURCE_TEXTURE_PROPERTIES +{ + const UINT32 *extents; + UINT32 dimensions; + D2D1_BUFFER_PRECISION bufferPrecision; + D2D1_CHANNEL_DEPTH channelDepth; + D2D1_FILTER filter; + const D2D1_EXTEND_MODE *extendModes; +} D2D1_RESOURCE_TEXTURE_PROPERTIES; + +typedef struct D2D1_INPUT_ELEMENT_DESC +{ + const char *semanticName; + UINT32 semanticIndex; + DXGI_FORMAT format; + UINT32 inputSlot; + UINT32 alignedByteOffset; +} D2D1_INPUT_ELEMENT_DESC; + +typedef struct D2D1_VERTEX_BUFFER_PROPERTIES +{ + UINT32 inputCount; + D2D1_VERTEX_USAGE usage; + const BYTE *data; + UINT32 byteWidth; +} D2D1_VERTEX_BUFFER_PROPERTIES; + +typedef struct D2D1_CUSTOM_VERTEX_BUFFER_PROPERTIES +{ + const BYTE *shaderBufferWithInputSignature; + UINT32 shaderBufferSize; + const D2D1_INPUT_ELEMENT_DESC *inputElements; + UINT32 elementCount; + UINT32 stride; +} D2D1_CUSTOM_VERTEX_BUFFER_PROPERTIES; + [ object, uuid(9b8b1336-00a5-4668-92b7-ced5d8bf9b7b), @@ -420,3 +470,109 @@ interface ID2D1BoundsAdjustmentTransform : ID2D1TransformNode [out] D2D1_RECT_L *bounds ); } + +[ + object, + uuid(3d9f916b-27dc-4ad7-b4f1-64945340f563), + local, +] +interface ID2D1EffectContext : IUnknown +{ + void GetDpi( + [out] float *dpi_x, + [out] float *dpi_y + ); + HRESULT CreateEffect( + [in] REFCLSID clsid, + [out] ID2D1Effect **effect + ); + HRESULT GetMaximumSupportedFeatureLevel( + [in] const D3D_FEATURE_LEVEL *levels, + [in] UINT32 level_count, + [out] D3D_FEATURE_LEVEL *max_level + ); + HRESULT CreateTransformNodeFromEffect( + [in] ID2D1Effect *effect, + [out] ID2D1TransformNode **node + ); + HRESULT CreateBlendTransform( + [in] UINT32 num_inputs, + [in] const D2D1_BLEND_DESCRIPTION *description, + [out] ID2D1BlendTransform **transform + ); + HRESULT CreateBorderTransform( + [in] D2D1_EXTEND_MODE mode_x, + [in] D2D1_EXTEND_MODE mode_y, + [out] ID2D1BorderTransform **transform + ); + HRESULT CreateOffsetTransform( + [in] D2D1_POINT_2L offset, + [out] ID2D1OffsetTransform **transform + ); + HRESULT CreateBoundsAdjustmentTransform( + [in] const D2D1_RECT_L *output_rect, + [out] ID2D1BoundsAdjustmentTransform **transform + ); + HRESULT LoadPixelShader( + [in] REFGUID shader_id, + [in] const BYTE *buffer, + [in] UINT32 buffer_size + ); + HRESULT LoadVertexShader( + [in] REFGUID shader_id, + [in] const BYTE *buffer, + [in] UINT32 buffer_size + ); + HRESULT LoadComputeShader( + [in] REFGUID shader_id, + [in] const BYTE *buffer, + [in] UINT32 buffer_size + ); + BOOL IsShaderLoaded( + [in] REFGUID shader_id + ); + HRESULT CreateResourceTexture( + [in, optional] const GUID *id, + [in] const D2D1_RESOURCE_TEXTURE_PROPERTIES *texture_properties, + [in] const BYTE *data, + [in] const UINT32 *strides, + [in] UINT32 data_size, + [out] ID2D1ResourceTexture **texture + ); + HRESULT FindResourceTexture( + [in] const GUID *id, + [out] ID2D1ResourceTexture **texture + ); + HRESULT CreateVertexBuffer( + [in] const D2D1_VERTEX_BUFFER_PROPERTIES *buffer_properties, + [in, optional] const GUID *id, + [in, optional] const D2D1_CUSTOM_VERTEX_BUFFER_PROPERTIES *custom_buffer_properties, + [out] ID2D1VertexBuffer **buffer + ); + HRESULT FindVertexBuffer( + [in] const GUID *id, + [out] ID2D1VertexBuffer **buffer + ); + HRESULT CreateColorContext( + [in] D2D1_COLOR_SPACE space, + [in] const BYTE *profile, + [in] UINT32 profile_size, + [out] ID2D1ColorContext **color_context + ); + HRESULT CreateColorContextFromFilename( + [in] const WCHAR *filename, + [out] ID2D1ColorContext **color_context + ); + HRESULT CreateColorContextFromWicColorContext( + [in] IWICColorContext *wic_color_context, + [out] ID2D1ColorContext **color_context + ); + HRESULT CheckFeatureSupport( + [in] D2D1_FEATURE feature, + [out] void *data, + [in] UINT32 data_size + ); + BOOL IsBufferPrecisionSupported( + [in] D2D1_BUFFER_PRECISION precision + ); +}

1 0

Ziqing Hui : include: Add defines for ID2D1Transform.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: 6b77ceee871e8b1174debdf8ee58f614eb19a551 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b77ceee871e8b1174debdf8… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Apr 27 12:24:38 2022 +0800 include: Add defines for ID2D1Transform. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1effectauthor.idl | 162 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 162 insertions(+) diff --git a/include/d2d1effectauthor.idl b/include/d2d1effectauthor.idl index cec7de8c311..6838492c498 100644 --- a/include/d2d1effectauthor.idl +++ b/include/d2d1effectauthor.idl @@ -258,3 +258,165 @@ interface ID2D1TransformGraph : IUnknown [in] UINT32 index ); } + +[ + object, + uuid(ef1a287d-342a-4f76-8fdb-da0d6ea9f92b), + local, +] +interface ID2D1Transform : ID2D1TransformNode +{ + HRESULT MapOutputRectToInputRects( + [in] const D2D1_RECT_L *output_rect, + [out] D2D1_RECT_L *input_rects, + [in] UINT32 input_rects_count + ); + HRESULT MapInputRectsToOutputRect( + [in] const D2D1_RECT_L *input_rects, + [in] const D2D1_RECT_L *input_opaque_rects, + [in] UINT32 input_rect_count, + [out] D2D1_RECT_L *output_rect, + [out] D2D1_RECT_L *output_opaque_rect + ); + HRESULT MapInvalidRect( + [in] UINT32 index, + [in] D2D1_RECT_L input_rect, + [out] D2D1_RECT_L *output_rect + ); +} + +[ + object, + uuid(36bfdcb6-9739-435d-a30d-a653beff6a6f), + local, +] +interface ID2D1DrawTransform : ID2D1Transform +{ + HRESULT SetDrawInfo( + [in] ID2D1DrawInfo *info + ); +} + +[ + object, + uuid(0d85573c-01e3-4f7d-bfd9-0d60608bf3c3), + local, +] +interface ID2D1ComputeTransform : ID2D1Transform +{ + HRESULT SetComputeInfo( + [in] ID2D1ComputeInfo *info + ); + HRESULT CalculateThreadgroups( + [in] const D2D1_RECT_L *output_rect, + [out] UINT32 *dimension_x, + [out] UINT32 *dimension_y, + [out] UINT32 *dimension_z + ); +} + +[ + object, + uuid(0359dc30-95e6-4568-9055-27720d130e93), + local, +] +interface ID2D1AnalysisTransform : IUnknown +{ + HRESULT ProcessAnalysisResults( + [in] const BYTE *data, + [in] UINT32 size + ); +} + +[ + object, + uuid(db1800dd-0c34-4cf9-be90-31cc0a5653e1), + local, +] +interface ID2D1SourceTransform : ID2D1Transform +{ + HRESULT SetRenderInfo( + [in] ID2D1RenderInfo *info + ); + HRESULT Draw( + [in] ID2D1Bitmap1 *target, + [in] const D2D1_RECT_L *draw_rect, + [in] D2D1_POINT_2U target_origin + ); +} + +[ + object, + uuid(1a799d8a-69f7-4e4c-9fed-437ccc6684cc), + local, +] +interface ID2D1ConcreteTransform : ID2D1TransformNode +{ + HRESULT SetOutputBuffer( + [in] D2D1_BUFFER_PRECISION precision, + [in] D2D1_CHANNEL_DEPTH depth + ); + void SetCached( + [in] BOOL is_cached + ); +} + +[ + object, + uuid(63ac0b32-ba44-450f-8806-7f4ca1ff2f1b), + local, +] +interface ID2D1BlendTransform : ID2D1ConcreteTransform +{ + void SetDescription( + [in] const D2D1_BLEND_DESCRIPTION *description + ); + void GetDescription( + [out] D2D1_BLEND_DESCRIPTION *description + ); +} + +[ + object, + uuid(4998735c-3a19-473c-9781-656847e3a347), + local, +] +interface ID2D1BorderTransform : ID2D1ConcreteTransform +{ + void SetExtendModeX( + [in] D2D1_EXTEND_MODE mode + ); + void SetExtendModeY( + [in] D2D1_EXTEND_MODE mode + ); + D2D1_EXTEND_MODE GetExtendModeX(); + D2D1_EXTEND_MODE GetExtendModeY(); +} + +[ + object, + uuid(3fe6adea-7643-4f53-bd14-a0ce63f24042), + local, +] +interface ID2D1OffsetTransform : ID2D1TransformNode +{ + void SetOffset( + [in] D2D1_POINT_2L offset + ); + D2D1_POINT_2L GetOffset(); +} + +[ + object, + uuid(90f732e2-5092-4606-a819-8651970baccd), + local, +] +interface ID2D1BoundsAdjustmentTransform : ID2D1TransformNode +{ + void SetOutputBounds( + [in] const D2D1_RECT_L *bounds + ); + void GetOutputBounds( + [out] D2D1_RECT_L *bounds + ); +}

1 0

Dmitry Timoshkov : ieframe: Initialize new history log entry.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: 732f281570e3d33508c4619b160ea9d655a93a9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=732f281570e3d33508c4619b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 26 20:40:20 2022 +0300 ieframe: Initialize new history log entry. In addition to 41cfc86d8dd65c71a7c81b826d02ac0a99050d6a. This fixes another crash when browsing help file that I have here. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/dochost.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 7717f786d52..e73659f1736 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -469,6 +469,8 @@ static void update_travellog(DocHost *This) if(This->travellog.loading_pos == -1) { This->travellog.position++; + This->travellog.log[This->travellog.position].stream = NULL; + This->travellog.log[This->travellog.position].url = NULL; }else { This->travellog.position = This->travellog.loading_pos; This->travellog.loading_pos = -1;

1 0

Paul Gofman : kernel32/tests: Add a broken last error result in test_CopyFileW().
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: e015409e743df36b8e08e08eeb77773d9cb3bb8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e015409e743df36b8e08e08e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Apr 27 09:03:34 2022 -0500 kernel32/tests: Add a broken last error result in test_CopyFileW(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52858 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 1fb9e98cf41..378078c20d5 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -902,12 +902,14 @@ static void test_CopyFileW(void) SetLastError(0xdeadbeef); ret = CopyFileW(source, dest, FALSE); ok(ret, "CopyFileW: error %ld\n", GetLastError()); - ok(GetLastError() == ERROR_SUCCESS, "Unexpected error %lu.\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS || broken(GetLastError() == ERROR_INVALID_PARAMETER) /* some win8 machines */, + "Unexpected error %lu.\n", GetLastError()); SetLastError(0xdeadbeef); ret = CopyFileExW(source, dest, NULL, NULL, NULL, 0 ); ok(ret, "CopyFileExW: error %ld\n", GetLastError()); - ok(GetLastError() == ERROR_SUCCESS, "Unexpected error %lu.\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS || broken(GetLastError() == ERROR_INVALID_PARAMETER) /* some win8 machines */, + "Unexpected error %lu.\n", GetLastError()); ret = DeleteFileW(source); ok(ret, "DeleteFileW: error %ld\n", GetLastError());

1 0

Paul Gofman : msvcp140/tests: Add a broken last error result in test_Copy_file().
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: ae48b2c9ee70df5b8cd765ab28845aa2581c8149 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae48b2c9ee70df5b8cd765ab… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Apr 27 09:03:33 2022 -0500 msvcp140/tests: Add a broken last error result in test_Copy_file(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52857 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/tests/msvcp140.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 1df2f058424..640e44e5b7c 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -1614,12 +1614,14 @@ static void test_Copy_file(void) SetLastError(0xdeadbeef); ret = p_Copy_file(L"wine_test_dir/f1", L"wine_test_dir/f3"); ok(ret == ERROR_SUCCESS, "Got unexpected ret %lu.\n", ret); - ok(GetLastError() == ret, "Got unexpected err %lu.\n", GetLastError()); + ok(GetLastError() == ret || broken(GetLastError() == ERROR_INVALID_PARAMETER) /* some win8 machines */, + "Got unexpected err %lu.\n", GetLastError()); SetLastError(0xdeadbeef); ret = p_Copy_file(L"wine_test_dir/f1", L"wine_test_dir/f3"); ok(ret == ERROR_SUCCESS, "Got unexpected ret %lu.\n", ret); - ok(GetLastError() == ret, "Got unexpected err %lu.\n", GetLastError()); + ok(GetLastError() == ret || broken(GetLastError() == ERROR_INVALID_PARAMETER) /* some win8 machines */, + "Got unexpected err %lu.\n", GetLastError()); SetLastError(0xdeadbeef); ret = p_Copy_file(L"wine_test_dir/missing", L"wine_test_dir/f3");

1 0

Floris Renaud : po: Add missing examples in Dutch translation.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: c68bd28981b5f3a389e64d7e718e6da944ba878f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c68bd28981b5f3a389e64d7e… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Wed Apr 27 16:46:04 2022 +0200 po: Add missing examples in Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/po/nl.po b/po/nl.po index 8318d5fc54c..c1c3f35c650 100644 --- a/po/nl.po +++ b/po/nl.po @@ -16761,6 +16761,10 @@ msgstr "" " plek aan waar het register informatie wordt geëxporteerd.\n" " [sleutel] De te wijzigen registersleutel.\n" "\n" +"Bijvoorbeeld:\n" +" regedit \"import.reg\"\n" +" regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Sleutel\\Pad\"\n" #: programs/regedit/regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n"

1 0

Francois Gouget : po: Fix trailing full stop inconsistencies in the Turkish translation.
by Alexandre Julliard 27 Apr '22

27 Apr '22

Module: wine Branch: master Commit: 89459ff147614eedd3e407981c75bf1e8e267812 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89459ff147614eedd3e40798… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 27 15:43:28 2022 +0200 po: Fix trailing full stop inconsistencies in the Turkish translation. The translation's trailing full stop use should match the English version. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/tr.po | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/po/tr.po b/po/tr.po index 840f61846cc..da6e89a5ce3 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8306,7 +8306,7 @@ msgstr "Kısayol oluşturuluyor" #: dlls/msi/msi.rc:99 msgid "Deleting services" -msgstr "Hizmetler siliniyor." +msgstr "Hizmetler siliniyor" #: dlls/msi/msi.rc:100 msgid "Creating duplicate files" @@ -8330,7 +8330,7 @@ msgstr "ODBC bileşenleri yükleniyor" #: dlls/msi/msi.rc:106 msgid "Installing new services" -msgstr "Yeni hizmetler yükleniyor." +msgstr "Yeni hizmetler yükleniyor" #: dlls/msi/msi.rc:107 msgid "Installing system catalog" @@ -12643,11 +12643,11 @@ msgstr "Bu dizi sabit veya geçici olarak kilitli" #: dlls/vbscript/vbscript.rc:34 msgid "Type mismatch" -msgstr "Tür eşleşmiyor." +msgstr "Tür eşleşmiyor" #: dlls/vbscript/vbscript.rc:36 msgid "Device I/O error" -msgstr "Aygıt G/Ç hatası." +msgstr "Aygıt G/Ç hatası" #: dlls/vbscript/vbscript.rc:37 msgid "File already exists" @@ -12663,7 +12663,7 @@ msgstr "Çok fazla dosya" #: dlls/vbscript/vbscript.rc:40 msgid "Permission denied" -msgstr "İzin engellendi." +msgstr "İzin engellendi" #: dlls/vbscript/vbscript.rc:41 msgid "Path/File access error" @@ -17101,43 +17101,43 @@ msgstr "" #: programs/regsvr32/regsvr32.rc:43 msgid "regsvr32: Failed to load DLL '%1'\n" -msgstr "regsvr32: '%1' DLL dosyası yüklenemedi.\n" +msgstr "regsvr32: '%1' DLL dosyası yüklenemedi\n" #: programs/regsvr32/regsvr32.rc:44 msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n" -msgstr "regsvr32: '%1!S!', '%2% DLL dosyasında yok.\n" +msgstr "regsvr32: '%1!S!', '%2% DLL dosyasında yok\n" #: programs/regsvr32/regsvr32.rc:45 msgid "regsvr32: Failed to register DLL '%1'\n" -msgstr "regsvr32: '%1' DLL dosyası kaydedilemedi.\n" +msgstr "regsvr32: '%1' DLL dosyası kaydedilemedi\n" #: programs/regsvr32/regsvr32.rc:46 msgid "regsvr32: Successfully registered DLL '%1'\n" -msgstr "regsvr32: '%1' DLL dosyası başarıyla kaydedildi.\n" +msgstr "regsvr32: '%1' DLL dosyası başarıyla kaydedildi\n" #: programs/regsvr32/regsvr32.rc:47 msgid "regsvr32: Failed to unregister DLL '%1'\n" -msgstr "regsvr32: '%1' DLL dosyası kayıttan kaldırılamadı.\n" +msgstr "regsvr32: '%1' DLL dosyası kayıttan kaldırılamadı\n" #: programs/regsvr32/regsvr32.rc:48 msgid "regsvr32: Successfully unregistered DLL '%1'\n" -msgstr "regsvr32: '%1' DLL dosyası başarıyla kayıttan kaldırıldı.\n" +msgstr "regsvr32: '%1' DLL dosyası başarıyla kayıttan kaldırıldı\n" #: programs/regsvr32/regsvr32.rc:49 msgid "regsvr32: Failed to install DLL '%1'\n" -msgstr "regsvr32: '%1' DLL dosyası yüklenemedi.\n" +msgstr "regsvr32: '%1' DLL dosyası yüklenemedi\n" #: programs/regsvr32/regsvr32.rc:50 msgid "regsvr32: Successfully installed DLL '%1'\n" -msgstr "regsvr32: '%1' DLL dosyası başarıyla yüklendi.\n" +msgstr "regsvr32: '%1' DLL dosyası başarıyla yüklendi\n" #: programs/regsvr32/regsvr32.rc:51 msgid "regsvr32: Failed to uninstall DLL '%1'\n" -msgstr "regsvr32: '%1' DLL dosyası kaldırılamadı.\n" +msgstr "regsvr32: '%1' DLL dosyası kaldırılamadı\n" #: programs/regsvr32/regsvr32.rc:52 msgid "regsvr32: Successfully uninstalled DLL '%1'\n" -msgstr "regsvr32: '%1' DLL dosyası başarıyla kaldırıldı.\n" +msgstr "regsvr32: '%1' DLL dosyası başarıyla kaldırıldı\n" #: programs/start/start.rc:57 #, fuzzy @@ -18127,7 +18127,7 @@ msgstr "" #: programs/uninstaller/uninstaller.rc:33 msgid "uninstaller: Invalid option [%1]\n" -msgstr "uninstaller: '%1' geçersiz seçenek.\n" +msgstr "uninstaller: '%1' geçersiz seçenek\n" #: programs/uninstaller/uninstaller.rc:35 msgid ""

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
103
Older →

Jump to page:

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-commits April 2022