June 2020 - Wine-Commits - list.winehq.org

Ziqing Hui : windowscodecs/tests: Add tests for DdsFrameDecode_Dds_GetFormatInfo().
by Alexandre Julliard June 1, 2020

June 1, 2020

Module: wine Branch: master Commit: febf29ba9d1590042631c408c786e2c4823fe3f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=febf29ba9d1590042631c408… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Jun 1 12:59:07 2020 +0800 windowscodecs/tests: Add tests for DdsFrameDecode_Dds_GetFormatInfo(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 55 +++++++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index be7bb0a0e6..32ea1e2774 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -192,6 +192,26 @@ static HRESULT init_decoder(IWICBitmapDecoder *decoder, IWICStream *stream, HRES return hr; } +static UINT get_bytes_per_block(DXGI_FORMAT format) +{ + switch(format) + { + case DXGI_FORMAT_BC1_UNORM: + case DXGI_FORMAT_BC1_TYPELESS: + case DXGI_FORMAT_BC1_UNORM_SRGB: + return 8; + case DXGI_FORMAT_BC2_UNORM: + case DXGI_FORMAT_BC2_TYPELESS: + case DXGI_FORMAT_BC2_UNORM_SRGB: + case DXGI_FORMAT_BC3_UNORM: + case DXGI_FORMAT_BC3_TYPELESS: + case DXGI_FORMAT_BC3_UNORM_SRGB: + return 16; + default: + return 0; + } +} + static void test_dds_decoder_initialize(void) { static BYTE test_dds_bad_magic[sizeof(test_dds_image)]; @@ -367,21 +387,28 @@ static void test_dds_decoder_image_parameters(void) } } -static void test_dds_decoder_frame_size(IWICBitmapDecoder *decoder, IWICBitmapFrameDecode *frame_decode, - UINT frame_count, int i, int frame_index) +static void test_dds_decoder_frame_properties(IWICBitmapDecoder *decoder, IWICBitmapFrameDecode *frame_decode, + UINT frame_count, int i, int frame_index) { HRESULT hr; WICDdsParameters params; - IWICDdsDecoder *dds_decoder; + IWICDdsDecoder *dds_decoder = NULL; + IWICDdsFrameDecode *dds_frame = NULL; UINT width, height ,expected_width, expected_height, slice_index, depth; + WICDdsFormatInfo format_info; hr = IWICBitmapDecoder_QueryInterface(decoder, &IID_IWICDdsDecoder, (void **)&dds_decoder); ok(hr == S_OK, "%d: QueryInterface failed, hr=%x\n", i, hr); if (hr != S_OK) goto end; + hr = IWICBitmapFrameDecode_QueryInterface(frame_decode, &IID_IWICDdsFrameDecode, (void **)&dds_frame); + ok(hr == S_OK, "%d: [frame %d] QueryInterface failed, hr=%x\n", i, frame_index, hr); + if (hr != S_OK) goto end; hr = IWICDdsDecoder_GetParameters(dds_decoder, &params); ok (hr == S_OK, "%d: GetParameters failed, hr=%x\n", i, hr); if (hr != S_OK) goto end; + /* frame size tests */ + hr = IWICBitmapFrameDecode_GetSize(frame_decode, NULL, NULL); ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); hr = IWICBitmapFrameDecode_GetSize(frame_decode, NULL, &height); @@ -406,8 +433,28 @@ static void test_dds_decoder_frame_size(IWICBitmapDecoder *decoder, IWICBitmapFr ok (width == expected_width, "%d: Expected width %d for frame %d, got %d\n", i, expected_width, frame_index, width); ok (height == expected_height, "%d: Expected height %d for frame %d, got %d\n", i, expected_height, frame_index, height); + /* frame format information tests */ + + hr = IWICDdsFrameDecode_GetFormatInfo(dds_frame, NULL); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICDdsFrameDecode_GetFormatInfo(dds_frame, &format_info); + todo_wine ok (hr == S_OK, "%d: [frame %d] GetFormatInfo failed, hr=%x\n", i, frame_index, hr); + if (hr != S_OK) goto end; + + ok (format_info.DxgiFormat == test_data[i].expected_parameters.DxgiFormat, + "%d: [frame %d] Expected DXGI format 0x%x, got 0x%x\n", + i, frame_index, test_data[i].expected_parameters.DxgiFormat, format_info.DxgiFormat); + ok (format_info.BytesPerBlock == get_bytes_per_block(format_info.DxgiFormat), + "%d: [frame %d] Expected bytes per block %d, got %d\n", + i, frame_index, get_bytes_per_block(format_info.DxgiFormat), format_info.BytesPerBlock); + ok (format_info.BlockWidth == 4 || format_info.BlockWidth == 1, + "%d: [frame %d] Got unexpected block width %d\n", i, frame_index, format_info.BlockWidth); + ok (format_info.BlockHeight == 4 || format_info.BlockHeight == 1, + "%d: [frame %d] Got unexpected block height %d\n", i, frame_index, format_info.BlockHeight); + end: if (dds_decoder) IWICDdsDecoder_Release(dds_decoder); + if (dds_frame) IWICDdsFrameDecode_Release(dds_frame); } static void test_dds_decoder_frame(IWICBitmapDecoder *decoder, int i) @@ -430,7 +477,7 @@ static void test_dds_decoder_frame(IWICBitmapDecoder *decoder, int i) continue; } - test_dds_decoder_frame_size(decoder, frame_decode, frame_count, i, j); + test_dds_decoder_frame_properties(decoder, frame_decode, frame_count, i, j); } }

1 0

Vijay Kiran Kamuju : msasn1: Add stub for ASN1_Decode function.
by Alexandre Julliard June 1, 2020

June 1, 2020

Module: wine Branch: master Commit: d2f3f3aaa831fa9c5b14dac82427283365da8f8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2f3f3aaa831fa9c5b14dac8… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun May 31 10:44:23 2020 +0200 msasn1: Add stub for ASN1_Decode function. ASN1decoding_t and ASN1encoding_t are implemented as linked lists. Current implementation does not properly emulate the linked list, as we need to identify where the next link pointers are stored. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38020 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msasn1/main.c | 18 ++++++++++++++++++ dlls/msasn1/msasn1.spec | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c index c96be7d07d..d151362905 100644 --- a/dlls/msasn1/main.c +++ b/dlls/msasn1/main.c @@ -190,3 +190,21 @@ void WINAPI ASN1_CloseDecoder(ASN1decoding_t decoder) { FIXME("(%p): Stub!\n", decoder); } + +ASN1error_e WINAPI ASN1_Decode(ASN1decoding_t decoder, void **outdata, ASN1uint32_t pdunum, + ASN1uint32_t flags, ASN1octet_t *buf, ASN1uint32_t bufsize) +{ + FIXME("(%p %p %u %08x %p %u): Stub!\n", decoder, outdata, pdunum, flags, buf, bufsize); + + if (!decoder) + return ASN1_ERR_BADARGS; + + if (!buf || !bufsize) + { + decoder->err = ASN1_ERR_BADARGS; + return ASN1_ERR_BADARGS; + } + + decoder->err = ASN1_ERR_BADPDU; + return ASN1_ERR_BADPDU; +} diff --git a/dlls/msasn1/msasn1.spec b/dlls/msasn1/msasn1.spec index f98a4a62d7..ab823b03c3 100644 --- a/dlls/msasn1/msasn1.spec +++ b/dlls/msasn1/msasn1.spec @@ -224,7 +224,7 @@ @ stub ASN1_CreateDecoderEx @ stdcall ASN1_CreateEncoder(ptr ptr ptr long ptr) @ stdcall ASN1_CreateModule(long long long long ptr ptr ptr ptr long) -@ stub ASN1_Decode +@ stdcall ASN1_Decode(ptr ptr long long ptr long) @ stub ASN1_Encode @ stub ASN1_FreeDecoded @ stub ASN1_FreeEncoded

1 0

Alexandre Julliard : ntdll: Properly reset the stack environment at thread exit on ARM64.
by Alexandre Julliard June 1, 2020

June 1, 2020

Module: wine Branch: master Commit: 87fa906a84621295a76035d73dd6305c9cd2ea4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=87fa906a84621295a76035d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 1 17:50:02 2020 +0200 ntdll: Properly reset the stack environment at thread exit on ARM64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49301 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm64.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 6a407c63d9..9cfb4eaa05 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -238,11 +238,13 @@ void signal_init_thread( TEB *teb ) extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int), TEB *teb ); __ASM_GLOBAL_FUNC( call_thread_exit_func, + "stp x29, x30, [sp,#-16]!\n\t" "ldr x3, [x2, #0x300]\n\t" /* arm64_thread_data()->exit_frame */ "str xzr, [x2, #0x300]\n\t" "cbz x3, 1f\n\t" "mov sp, x3\n" - "1:\tblr x1" ) + "1:\tldp x29, x30, [sp], #16\n\t" + "br x1" ) /*********************************************************************** * signal_exit_thread

1 0

Gijs Vermeulen : winemac: Cast buffer to const WCHAR* in insert_clipboard_format.
by Alexandre Julliard June 1, 2020

June 1, 2020

Module: wine Branch: master Commit: 3c86adab766e3bc7c91da088c2dd6bc41a917055 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c86adab766e3bc7c91da088… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Jun 1 11:31:53 2020 -0500 winemac: Cast buffer to const WCHAR* in insert_clipboard_format. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 65fb3cc8ec..9c00930705 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -288,7 +288,7 @@ static WINE_CLIPFORMAT *insert_clipboard_format(UINT id, CFStringRef type) } format->type = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@%S"), - registered_name_type_prefix, buffer); + registered_name_type_prefix, (const WCHAR*)buffer); } list_add_tail(&format_list, &format->entry);

1 0

Ziqing Hui : windowscodecs: Implement DdsFrameDecode_Dds_GetSizeInBlocks().
by Alexandre Julliard June 1, 2020

June 1, 2020

Module: wine Branch: master Commit: a31cadae42293a4c0da7553d4a00533c8c63c437 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a31cadae42293a4c0da7553d… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Jun 1 12:59:48 2020 +0800 windowscodecs: Implement DdsFrameDecode_Dds_GetSizeInBlocks(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 15 +++++++++++++-- dlls/windowscodecs/tests/ddsformat.c | 8 ++++---- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 7b0817e738..ce6cb9794c 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -112,6 +112,8 @@ typedef struct dds_frame_info { UINT bytes_per_block; UINT block_width; UINT block_height; + UINT width_in_blocks; + UINT height_in_blocks; } dds_frame_info; typedef struct DdsDecoder { @@ -432,9 +434,16 @@ static ULONG WINAPI DdsFrameDecode_Dds_Release(IWICDdsFrameDecode *iface) static HRESULT WINAPI DdsFrameDecode_Dds_GetSizeInBlocks(IWICDdsFrameDecode *iface, UINT *widthInBlocks, UINT *heightInBlocks) { - FIXME("(%p,%p,%p): stub.\n", iface, widthInBlocks, heightInBlocks); + DdsFrameDecode *This = impl_from_IWICDdsFrameDecode(iface); - return E_NOTIMPL; + if (!widthInBlocks || !heightInBlocks) return E_INVALIDARG; + + *widthInBlocks = This->info.width_in_blocks; + *heightInBlocks = This->info.height_in_blocks; + + TRACE("(%p,%p,%p) -> (%d,%d)\n", iface, widthInBlocks, heightInBlocks, *widthInBlocks, *heightInBlocks); + + return S_OK; } static HRESULT WINAPI DdsFrameDecode_Dds_GetFormatInfo(IWICDdsFrameDecode *iface, @@ -839,6 +848,8 @@ static HRESULT WINAPI DdsDecoder_Dds_GetFrame(IWICDdsDecoder *iface, frame_decode->info.bytes_per_block = get_bytes_per_block(This->info.format); frame_decode->info.block_width = 4; frame_decode->info.block_height = 4; + frame_decode->info.width_in_blocks = (width + frame_decode->info.block_width - 1) / frame_decode->info.block_width; + frame_decode->info.height_in_blocks = (width + frame_decode->info.block_height - 1) / frame_decode->info.block_height; *bitmapFrame = &frame_decode->IWICBitmapFrameDecode_iface; hr = S_OK; diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index d1f9b40ff2..9b14bed52c 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -456,13 +456,13 @@ static void test_dds_decoder_frame_properties(IWICBitmapDecoder *decoder, IWICBi /* size in blocks tests */ hr = IWICDdsFrameDecode_GetSizeInBlocks(dds_frame, NULL, NULL); - todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); hr = IWICDdsFrameDecode_GetSizeInBlocks(dds_frame, NULL, &height_in_blocks); - todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); hr = IWICDdsFrameDecode_GetSizeInBlocks(dds_frame, &width_in_blocks, NULL); - todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); hr = IWICDdsFrameDecode_GetSizeInBlocks(dds_frame, &width_in_blocks, &height_in_blocks); - todo_wine ok (hr == S_OK, "%d: [frame %d] GetSizeInBlocks failed, hr=%x\n", i, frame_index, hr); + ok (hr == S_OK, "%d: [frame %d] GetSizeInBlocks failed, hr=%x\n", i, frame_index, hr); if (hr != S_OK) goto end; expected_width_in_blocks = (expected_width + format_info.BlockWidth - 1) / format_info.BlockWidth;

1 0

Ziqing Hui : windowscodecs/tests: Add tests for DdsFrameDecode_Dds_GetSizeInBlocks().
by Alexandre Julliard June 1, 2020

June 1, 2020

Module: wine Branch: master Commit: 81da1f6b5daf2454018689ee51b511ff6d83db43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81da1f6b5daf2454018689ee… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Jun 1 12:59:32 2020 +0800 windowscodecs/tests: Add tests for DdsFrameDecode_Dds_GetSizeInBlocks(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 7d001e6338..d1f9b40ff2 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -395,6 +395,7 @@ static void test_dds_decoder_frame_properties(IWICBitmapDecoder *decoder, IWICBi IWICDdsDecoder *dds_decoder = NULL; IWICDdsFrameDecode *dds_frame = NULL; UINT width, height ,expected_width, expected_height, slice_index, depth; + UINT width_in_blocks, height_in_blocks, expected_width_in_blocks, expected_height_in_blocks; WICDdsFormatInfo format_info; hr = IWICBitmapDecoder_QueryInterface(decoder, &IID_IWICDdsDecoder, (void **)&dds_decoder); @@ -452,6 +453,25 @@ static void test_dds_decoder_frame_properties(IWICBitmapDecoder *decoder, IWICBi ok (format_info.BlockHeight == 4 || format_info.BlockHeight == 1, "%d: [frame %d] Got unexpected block height %d\n", i, frame_index, format_info.BlockHeight); + /* size in blocks tests */ + + hr = IWICDdsFrameDecode_GetSizeInBlocks(dds_frame, NULL, NULL); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICDdsFrameDecode_GetSizeInBlocks(dds_frame, NULL, &height_in_blocks); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICDdsFrameDecode_GetSizeInBlocks(dds_frame, &width_in_blocks, NULL); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICDdsFrameDecode_GetSizeInBlocks(dds_frame, &width_in_blocks, &height_in_blocks); + todo_wine ok (hr == S_OK, "%d: [frame %d] GetSizeInBlocks failed, hr=%x\n", i, frame_index, hr); + if (hr != S_OK) goto end; + + expected_width_in_blocks = (expected_width + format_info.BlockWidth - 1) / format_info.BlockWidth; + expected_height_in_blocks = (expected_height + format_info.BlockHeight - 1) / format_info.BlockHeight; + ok (width_in_blocks == expected_width_in_blocks, + "%d: [frame %d] Expected width in blocks %d, got %d\n", i, frame_index, expected_width_in_blocks, width_in_blocks); + ok (height_in_blocks == expected_height_in_blocks, + "%d: [frame %d] Expected height in blocks %d, got %d\n", i, frame_index, expected_height_in_blocks, height_in_blocks); + end: if (dds_decoder) IWICDdsDecoder_Release(dds_decoder); if (dds_frame) IWICDdsFrameDecode_Release(dds_frame);

1 0

Alexandre Julliard : ntdll: Use the actual zero_bits parameter in the server requests.
by Alexandre Julliard June 1, 2020

June 1, 2020

Module: wine Branch: master Commit: b925dd78b813decf386139a15aa7bc6863ee7ae5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b925dd78b813decf386139a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 1 13:27:40 2020 +0200 ntdll: Use the actual zero_bits parameter in the server requests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 2 -- dlls/ntdll/server.c | 27 ++++++++++++++------------- dlls/ntdll/virtual.c | 29 +++++++---------------------- include/wine/server_protocol.h | 10 +++++----- server/protocol.def | 6 +++--- server/request.h | 8 ++++---- server/trace.c | 9 ++++----- tools/make_requests | 2 +- 8 files changed, 38 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b925dd78b813decf3861…

1 0

Alexandre Julliard : ntdll: Move the threading initialization functions to the Unix library.
by Alexandre Julliard June 1, 2020

June 1, 2020

Module: wine Branch: master Commit: 3e9f8c87e5a2acaa80f8bbb1d50fa82147942143 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e9f8c87e5a2acaa80f8bbb1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 1 12:52:05 2020 +0200 ntdll: Move the threading initialization functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/selector.c | 4 +- dlls/ntdll/Makefile.in | 6 + dlls/ntdll/ntdll_misc.h | 9 - dlls/ntdll/server.c | 10 +- dlls/ntdll/signal_arm.c | 90 +------ dlls/ntdll/signal_arm64.c | 93 +------ dlls/ntdll/signal_i386.c | 380 +---------------------------- dlls/ntdll/signal_powerpc.c | 75 +----- dlls/ntdll/signal_x86_64.c | 205 +--------------- dlls/ntdll/thread.c | 51 ++-- dlls/ntdll/unix/loader.c | 10 + dlls/ntdll/unix/server.c | 12 +- dlls/ntdll/unix/signal_arm.c | 157 ++++++++++++ dlls/ntdll/unix/signal_arm64.c | 166 +++++++++++++ dlls/ntdll/unix/signal_i386.c | 508 +++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_powerpc.c | 140 +++++++++++ dlls/ntdll/unix/signal_x86_64.c | 278 +++++++++++++++++++++ dlls/ntdll/unix/thread.c | 150 ++++++++++++ dlls/ntdll/unix/unix_private.h | 19 ++ dlls/ntdll/unix/virtual.c | 22 +- dlls/ntdll/unixlib.h | 16 +- dlls/ntdll/virtual.c | 7 +- 22 files changed, 1521 insertions(+), 887 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3e9f8c87e5a2acaa80f8…

1 0

Ziqing Hui : windowscodecs: Check NULL parameters for DdsFrameDecode_GetSize().
by Alexandre Julliard June 1, 2020

June 1, 2020

Module: wine Branch: master Commit: 0d263f9fdaac21e51844376da5cfa054ee7fc520 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d263f9fdaac21e51844376d… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Jun 1 12:58:52 2020 +0800 windowscodecs: Check NULL parameters for DdsFrameDecode_GetSize(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 2 ++ dlls/windowscodecs/tests/ddsformat.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 20017788a0..9446c7e8e6 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -301,6 +301,8 @@ static HRESULT WINAPI DdsFrameDecode_GetSize(IWICBitmapFrameDecode *iface, { DdsFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); + if (!puiWidth || !puiHeight) return E_INVALIDARG; + *puiWidth = This->width; *puiHeight = This->height; diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index c7f56307d7..be7bb0a0e6 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -382,6 +382,12 @@ static void test_dds_decoder_frame_size(IWICBitmapDecoder *decoder, IWICBitmapFr ok (hr == S_OK, "%d: GetParameters failed, hr=%x\n", i, hr); if (hr != S_OK) goto end; + hr = IWICBitmapFrameDecode_GetSize(frame_decode, NULL, NULL); + ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICBitmapFrameDecode_GetSize(frame_decode, NULL, &height); + ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICBitmapFrameDecode_GetSize(frame_decode, &width, NULL); + ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); hr = IWICBitmapFrameDecode_GetSize(frame_decode, &width, &height); ok (hr == S_OK, "%d: GetSize failed for frame %d, hr=%x\n", i, frame_index, hr); if (hr != S_OK) goto end;

1 0

Anton Baskanov : amstream: Allow AMAudioStream and AMDirectDrawStream to be created by CoCreateInstance.
by Alexandre Julliard June 1, 2020

June 1, 2020

Module: wine Branch: master Commit: 7d07142b1f2664ef6cd0939ddc8a40894f97d702 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d07142b1f2664ef6cd0939d… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu May 28 02:05:51 2020 +0700 amstream: Allow AMAudioStream and AMDirectDrawStream to be created by CoCreateInstance. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/amstream_classes.idl | 7 +++++++ dlls/amstream/main.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/amstream/amstream_classes.idl b/dlls/amstream/amstream_classes.idl index e6bda830b4..2251bf734e 100644 --- a/dlls/amstream/amstream_classes.idl +++ b/dlls/amstream/amstream_classes.idl @@ -34,6 +34,13 @@ coclass MediaStreamFilter { interface IMediaStreamFilter; } ] coclass AMDirectDrawStream { interface IAMMultiMediaStream; } +[ + helpstring("AuStream Class"), + threading(both), + uuid(8496e040-af4c-11d0-8212-00c04fc32c45) +] +coclass AMAudioStream { interface IAMMediaStream; } + [ helpstring("MMStream Class"), threading(both), diff --git a/dlls/amstream/main.c b/dlls/amstream/main.c index c718f42448..c581e516bd 100644 --- a/dlls/amstream/main.c +++ b/dlls/amstream/main.c @@ -74,7 +74,8 @@ struct object_creation_info static const struct object_creation_info object_creation[] = { { &CLSID_AMMultiMediaStream, multimedia_stream_create }, - { &CLSID_AMDirectDrawStream, multimedia_stream_create }, + { &CLSID_AMDirectDrawStream, ddraw_stream_create }, + { &CLSID_AMAudioStream, audio_stream_create }, { &CLSID_AMAudioData, AMAudioData_create }, { &CLSID_MediaStreamFilter, filter_create } };

1 0