August 2020 - Wine-commits - list.winehq.org

Biswapriyo Nath : include/d3dcommon.idl: Add missing names in D3D_NAME enum.
by Alexandre Julliard 31 Aug '20

31 Aug '20

Module: wine Branch: master Commit: cc7d1f2672efab9a82885dfc0608fa0c4919d771 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc7d1f2672efab9a82885dfc… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Aug 28 00:14:25 2020 +0530 include/d3dcommon.idl: Add missing names in D3D_NAME enum. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3dcommon.idl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index 90243ebc2c..69e4143c40 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -648,6 +648,9 @@ typedef enum D3D_NAME D3D_NAME_FINAL_TRI_INSIDE_TESSFACTOR, D3D_NAME_FINAL_LINE_DETAIL_TESSFACTOR, D3D_NAME_FINAL_LINE_DENSITY_TESSFACTOR, + D3D_NAME_BARYCENTRICS = 23, + D3D_NAME_SHADINGRATE, + D3D_NAME_CULLPRIMITIVE, D3D_NAME_TARGET = 64, D3D_NAME_DEPTH, D3D_NAME_COVERAGE,

1 0

Biswapriyo Nath : include/d3dcommon.idl: Add missing names in D3D_SHADER_INPUT_TYPE enum.
by Alexandre Julliard 31 Aug '20

31 Aug '20

Module: wine Branch: master Commit: 9e59345fadb506ba24616f1ab3bb63db966d9cf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e59345fadb506ba24616f1a… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Aug 28 00:14:25 2020 +0530 include/d3dcommon.idl: Add missing names in D3D_SHADER_INPUT_TYPE enum. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3dcommon.idl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index 69e4143c40..05577d34da 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -694,6 +694,8 @@ typedef enum _D3D_SHADER_INPUT_TYPE D3D_SIT_UAV_APPEND_STRUCTURED, D3D_SIT_UAV_CONSUME_STRUCTURED, D3D_SIT_UAV_RWSTRUCTURED_WITH_COUNTER, + D3D_SIT_RTACCELERATIONSTRUCTURE, + D3D_SIT_UAV_FEEDBACKTEXTURE, D3D10_SIT_CBUFFER = 0, D3D10_SIT_TBUFFER, D3D10_SIT_TEXTURE,

1 0

Zebediah Figura : quartz/vmr9: Avoid leaking the presenter's reference to the d3d9 device.
by Alexandre Julliard 31 Aug '20

31 Aug '20

Module: wine Branch: master Commit: f4d66140ad61597e918b94077f18dbb98f524e66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4d66140ad61597e918b9407… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Aug 29 12:37:35 2020 -0500 quartz/vmr9: Avoid leaking the presenter's reference to the d3d9 device. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 28123dcf7d..5f95f547e3 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2622,6 +2622,8 @@ static ULONG WINAPI VMR9_ImagePresenter_Release(IVMRImagePresenter9 *iface) IDirect3DSurface9_Release(surface); } + if (This->d3d9_dev) + IDirect3DDevice9_Release(This->d3d9_dev); free(This->d3d9_surfaces); This->d3d9_surfaces = NULL; This->num_surfaces = 0;

1 0

Alexandre Julliard : Wine release 5.16
by Alexandre Julliard 28 Aug '20

28 Aug '20

Module: website Branch: master Commit: 012d08f2ce57382f4c429f306a8c026fe68a6394 URL: https://source.winehq.org/git/website.git/?a=commit;h=012d08f2ce57382f4c429… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 28 22:18:11 2020 +0200 Wine release 5.16 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020082801.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2020082801.xml b/news/en/2020082801.xml new file mode 100644 index 00000000..a8894390 --- /dev/null +++ b/news/en/2020082801.xml @@ -0,0 +1,15 @@ +<news> +<date>August 28, 2020</date> +<title>Wine 5.16 Released</title> +<body> + The Wine development release 5.16 is now available. + <a href="{$root}/announce/5.16">What's new</a> in this release: +<ul> + <li>Support for x86 AVX registers.</li> + <li>Some ARM64 fixes for macOS.</li> + <li>Still more restructuration of the console support.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.x/wine-5.16.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Revert "ntdll: Get rid of the server_init_process_done() Unix library callback."
by Alexandre Julliard 28 Aug '20

28 Aug '20

Module: wine Branch: master Commit: 2b9a0550bcda166afdf852370397e1041c096f5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b9a0550bcda166afdf85237… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 28 21:05:37 2020 +0200 Revert "ntdll: Get rid of the server_init_process_done() Unix library callback." This partially reverts commit 1581fb619b879b58a402bc64ad81bde265b926e8. Steam wants Eip to be valid even before LdrInitializeThunk. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 6 ++---- dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/server.c | 4 ++-- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unixlib.h | 5 ++++- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index d3ade9555b..8e76e39fa5 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3426,16 +3426,12 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR #ifdef __i386__ entry = (void **)&context->Eax; - if (!context->Eip) context->Eip = (DWORD_PTR)kernel32_start_process; #elif defined(__x86_64__) entry = (void **)&context->Rcx; - if (!context->Rip) context->Rip = (DWORD_PTR)kernel32_start_process; #elif defined(__arm__) entry = (void **)&context->R0; - if (!context->Pc) context->Pc = (DWORD_PTR)kernel32_start_process; #elif defined(__aarch64__) entry = (void **)&context->u.s.X0; - if (!context->Pc) context->Pc = (DWORD_PTR)kernel32_start_process; #endif if (process_detaching) NtTerminateThread( GetCurrentThread(), 0 ); @@ -4053,6 +4049,8 @@ static void process_init(void) teb->Tib.StackBase = stack.StackBase; teb->Tib.StackLimit = stack.StackLimit; teb->DeallocationStack = stack.DeallocationStack; + + unix_funcs->server_init_process_done( kernel32_start_process ); } /*********************************************************************** diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 6f25f4ae87..ff75581286 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1368,6 +1368,7 @@ static struct unix_funcs unix_funcs = get_locales, virtual_release_address_space, exec_process, + server_init_process_done, set_show_dot_files, load_so_dll, load_builtin_dll, @@ -1400,7 +1401,6 @@ static void start_main_thread(void) init_files(); NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); p__wine_set_unix_funcs( NTDLL_UNIXLIB_VERSION, &unix_funcs ); - server_init_process_done(); } diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index cc46b02bb7..6d96f581b7 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1453,7 +1453,7 @@ void server_init_process(void) /*********************************************************************** * server_init_process_done */ -void server_init_process_done(void) +void CDECL server_init_process_done( void *relay ) { PEB *peb = NtCurrentTeb()->Peb; IMAGE_NT_HEADERS *nt = get_exe_nt_header(); @@ -1486,7 +1486,7 @@ void server_init_process_done(void) SERVER_END_REQ; assert( !status ); - signal_start_thread( entry, peb, suspend, NULL, pLdrInitializeThunk, NtCurrentTeb() ); + signal_start_thread( entry, peb, suspend, relay, pLdrInitializeThunk, NtCurrentTeb() ); } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 813d65fc22..76410b0b2a 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -117,6 +117,7 @@ extern USHORT * CDECL get_unix_codepage_data(void) DECLSPEC_HIDDEN; extern void CDECL get_locales( WCHAR *sys, WCHAR *user ) DECLSPEC_HIDDEN; extern void CDECL virtual_release_address_space(void) DECLSPEC_HIDDEN; +extern void CDECL server_init_process_done( void *relay ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL exec_process( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTSTATUS status ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, CONTEXT *context ) DECLSPEC_HIDDEN; @@ -166,7 +167,6 @@ extern unsigned int server_queue_process_apc( HANDLE process, const apc_call_t * extern int server_get_unix_fd( HANDLE handle, unsigned int wanted_access, int *unix_fd, int *needs_close, enum server_fd_type *type, unsigned int *options ) DECLSPEC_HIDDEN; extern void server_init_process(void) DECLSPEC_HIDDEN; -extern void server_init_process_done(void) DECLSPEC_HIDDEN; extern size_t server_init_thread( void *entry_point, BOOL *suspend ) DECLSPEC_HIDDEN; extern int server_pipe( int fd[2] ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 0fa5bba4d8..4c352c0a4b 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -27,7 +27,7 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 100 +#define NTDLL_UNIXLIB_VERSION 101 struct unix_funcs { @@ -84,6 +84,9 @@ struct unix_funcs /* thread/process functions */ NTSTATUS (CDECL *exec_process)( UNICODE_STRING *path, UNICODE_STRING *cmdline, NTSTATUS status ); + /* server functions */ + void (CDECL *server_init_process_done)( void *relay ); + /* file functions */ void (CDECL *set_show_dot_files)( BOOL enable );

1 0

Alexandre Julliard : conhost: Fix some pointer cast warnings.
by Alexandre Julliard 28 Aug '20

28 Aug '20

Module: wine Branch: master Commit: 58f2326410dd5574e52ab3362b67ab345674c3b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58f2326410dd5574e52ab336… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 28 21:27:12 2020 +0200 conhost: Fix some pointer cast warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index d17a8f4e68..4853a6d8b2 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -115,7 +115,7 @@ static void *alloc_ioctl_buffer( size_t size ) static int screen_buffer_compare_id( const void *key, const struct wine_rb_entry *entry ) { struct screen_buffer *screen_buffer = WINE_RB_ENTRY_VALUE( entry, struct screen_buffer, entry ); - return (unsigned int)key - screen_buffer->id; + return PtrToLong(key) - screen_buffer->id; } static struct wine_rb_tree screen_buffer_map = { screen_buffer_compare_id }; @@ -165,7 +165,7 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int memcpy( &screen_buffer->data[i * screen_buffer->width], screen_buffer->data, screen_buffer->width * sizeof(char_info_t) ); - if (wine_rb_put( &screen_buffer_map, (const void *)id, &screen_buffer->entry )) + if (wine_rb_put( &screen_buffer_map, LongToPtr(id), &screen_buffer->entry )) { ERR( "id %x already exists\n", id ); return NULL; @@ -898,7 +898,7 @@ static NTSTATUS process_console_ioctls( struct console *console ) else { struct wine_rb_entry *entry; - if (!(entry = wine_rb_get( &screen_buffer_map, (const void *)output ))) + if (!(entry = wine_rb_get( &screen_buffer_map, LongToPtr(output) ))) { ERR( "invalid screen buffer id %x\n", output ); status = STATUS_INVALID_HANDLE;

1 0

Alexandre Julliard : Release 5.16.
by Alexandre Julliard 28 Aug '20

28 Aug '20

Module: wine Branch: master Commit: 5bb27d1edb2b6c8c04991cc88e54f161f0c41625 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bb27d1edb2b6c8c04991cc8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 28 22:16:24 2020 +0200 Release 5.16. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 712 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 337 insertions(+), 396 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5bb27d1edb2b6c8c0499…

1 0

Tag wine-5.16 : Alexandre Julliard : Release 5.16
by Alexandre Julliard 28 Aug '20

28 Aug '20

Module: wine Branch: refs/tags/wine-5.16 Tag: a21db066d8ff579bcc0d3dd6a06d03855b8fda26 URL: https://source.winehq.org/git/wine.git/?a=tag;h=a21db066d8ff579bcc0d3dd6a06… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 28 22:16:24 2020 +0200 Release 5.16

1 0

Ziqing Hui : windowscodecs/tests: Fix tests for CopyBlocks.
by Alexandre Julliard 28 Aug '20

28 Aug '20

Module: wine Branch: master Commit: 87ddb4ba37422726a1e3a5b08c852ac58d55a255 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87ddb4ba37422726a1e3a5b0… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Aug 27 13:35:01 2020 +0800 windowscodecs/tests: Fix tests for CopyBlocks. Using strncmp() to compare pixel data buffer leads to incorrect tests. Also, we should clear the pixel data buffer before editing and comparing them. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 1a7ef95ada..1ce249c4b4 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -678,6 +678,19 @@ static BOOL color_buffer_match(DWORD *color_buffer_a, DWORD *color_buffer_b, UIN return TRUE; } +static void copy_pixels(void *src_buffer, UINT src_stride, void *dst_buffer, UINT dst_stride, UINT size) +{ + char *src = src_buffer, *dst = dst_buffer; + UINT i; + + for (i = 0; i < size; i++) + { + *dst = src[i]; + if (i % src_stride == src_stride - 1) dst += dst_stride - src_stride; + dst ++; + } +} + static void test_dds_decoder_initialize(void) { int i; @@ -1031,22 +1044,28 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra if (depth > 1) depth /= 2; } + memset(buffer, 0, sizeof(buffer)); hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride, sizeof(buffer), buffer); ok(hr == S_OK, "Test %u, frame %u: CopyBlocks failed, hr %#x\n", i, frame_index, hr); if (hr != S_OK) return; - ok(!strncmp((const char *)test_data[i].data + block_offset, (const char *)buffer, format_info.BytesPerBlock), + ok(!memcmp(test_data[i].data + block_offset, buffer, format_info.BytesPerBlock), "Test %u, frame %u: Block data mismatch\n", i, frame_index); + memset(buffer, 0, sizeof(buffer)); hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, frame_stride, sizeof(buffer), buffer); ok(hr == S_OK, "Test %u, frame %u: CopyBlocks failed, hr %#x\n", i, frame_index, hr); if (hr != S_OK) return; - ok(!strncmp((const char *)test_data[i].data + block_offset, (const char *)buffer, frame_size), + ok(!memcmp(test_data[i].data + block_offset, buffer, frame_size), "Test %u, frame %u: Block data mismatch\n", i, frame_index); + memset(buffer, 0, sizeof(buffer)); + memset(pixels, 0, sizeof(pixels)); + copy_pixels(test_data[i].data + block_offset, frame_stride, pixels, frame_stride * 2, frame_size); hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, frame_stride * 2, sizeof(buffer), buffer); ok(hr == S_OK, "Test %u, frame %u: CopyBlocks failed, hr %#x\n", i, frame_index, hr); if (hr != S_OK) return; - ok(!strncmp((const char *)test_data[i].data + block_offset, (const char *)buffer, frame_size), + todo_wine_if(width_in_blocks > 1) + ok(!memcmp(pixels, buffer, frame_size), "Test %u, frame %u: Block data mismatch\n", i, frame_index); /* CopyPixels tests */ @@ -1104,6 +1123,7 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect, stride, sizeof(buffer), NULL); ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyBlocks got unexpected hr %#x\n", i, frame_index, hr); + memset(buffer, 0, sizeof(pixels)); if (is_compressed(format_info.DxgiFormat)) { decode_block(test_data[i].data + block_offset, width_in_blocks * height_in_blocks, format_info.DxgiFormat, frame_width, frame_height, (DWORD *)pixels); @@ -1111,6 +1131,7 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra memcpy(pixels, test_data[i].data + block_offset, frame_size); } + memset(buffer, 0, sizeof(buffer)); hr = IWICBitmapFrameDecode_CopyPixels(frame, &rect, stride, sizeof(buffer), buffer); ok(hr == S_OK, "Test %u, frame %u: CopyPixels failed, hr %#x\n", i, frame_index, hr); if (hr == S_OK) { @@ -1118,11 +1139,12 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra ok(color_buffer_match((DWORD *)pixels, (DWORD *)buffer, 1), "Test %u, frame %u: Pixels mismatch\n", i, frame_index); } else { - ok(!strncmp((const char *)pixels, (const char *)buffer, bpp / 8), + ok(!memcmp(pixels, buffer, bpp / 8), "Test %u, frame %u: Pixels mismatch\n", i, frame_index); } } + memset(buffer, 0, sizeof(buffer)); hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, frame_stride, sizeof(buffer), buffer); ok(hr == S_OK, "Test %u, frame %u: CopyPixels failed, hr %#x\n", i, frame_index, hr); if (hr == S_OK) { @@ -1130,7 +1152,7 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra ok(color_buffer_match((DWORD *)pixels, (DWORD *)buffer, frame_size / (bpp / 8)), "Test %u, frame %u: Pixels mismatch\n", i, frame_index); } else { - ok(!strncmp((const char *)pixels, (const char *)buffer, frame_size), + ok(!memcmp(pixels, buffer, frame_size), "Test %u, frame %u: Pixels mismatch\n", i, frame_index); }; }

1 0

Ziqing Hui : windowscodecs: Fix DdsFrameDecode_Dds_CopyBlocks().
by Alexandre Julliard 28 Aug '20

28 Aug '20

Module: wine Branch: master Commit: fa398d6ec0b2f9b7d4b6ed272b83bf2ee1c06a5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa398d6ec0b2f9b7d4b6ed27… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Aug 27 13:36:47 2020 +0800 windowscodecs: Fix DdsFrameDecode_Dds_CopyBlocks(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 42 ++++++++++++++---------------------- dlls/windowscodecs/tests/ddsformat.c | 1 - 2 files changed, 16 insertions(+), 27 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 72c884b0ed..7e3bd44bd8 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -891,8 +891,7 @@ static HRESULT WINAPI DdsFrameDecode_Dds_CopyBlocks(IWICDdsFrameDecode *iface, { DdsFrameDecode *This = impl_from_IWICDdsFrameDecode(iface); int x, y, width, height; - UINT bytes_per_block, frame_stride, frame_size, i; - BYTE *data, *dst_buffer; + UINT bytes_per_block, frame_stride, frame_size; TRACE("(%p,%p,%u,%u,%p)\n", iface, boundsInBlocks, stride, bufferSize, buffer); @@ -901,35 +900,26 @@ static HRESULT WINAPI DdsFrameDecode_Dds_CopyBlocks(IWICDdsFrameDecode *iface, bytes_per_block = This->info.bytes_per_block; frame_stride = This->info.width_in_blocks * bytes_per_block; frame_size = frame_stride * This->info.height_in_blocks; + if (!boundsInBlocks) { if (stride < frame_stride) return E_INVALIDARG; if (bufferSize < frame_size) return E_INVALIDARG; - memcpy(buffer, This->block_data, frame_size); - return S_OK; - } - - x = boundsInBlocks->X; - y = boundsInBlocks->Y; - width = boundsInBlocks->Width; - height = boundsInBlocks->Height; - if (x < 0 || y < 0 || width <= 0 || height <= 0 || - x + width > This->info.width_in_blocks || - y + height > This->info.height_in_blocks) { - return E_INVALIDARG; - } - if (stride < width * bytes_per_block) return E_INVALIDARG; - if (bufferSize < stride * height) return E_INVALIDARG; - - data = This->block_data + (x + y * This->info.width_in_blocks) * bytes_per_block; - dst_buffer = buffer; - for (i = 0; i < height; i++) - { - memcpy(dst_buffer, data, (size_t)width * bytes_per_block); - data += This->info.width_in_blocks * bytes_per_block; - dst_buffer += stride; + } else { + x = boundsInBlocks->X; + y = boundsInBlocks->Y; + width = boundsInBlocks->Width; + height = boundsInBlocks->Height; + if (x < 0 || y < 0 || width <= 0 || height <= 0 || + x + width > This->info.width_in_blocks || + y + height > This->info.height_in_blocks) { + return E_INVALIDARG; + } + if (stride < width * bytes_per_block) return E_INVALIDARG; + if (bufferSize < stride * height) return E_INVALIDARG; } - return S_OK; + return copy_pixels(This->info.bytes_per_block * 8, This->block_data, This->info.width_in_blocks, + This->info.height_in_blocks, frame_stride, boundsInBlocks, stride, bufferSize, buffer); } static const IWICDdsFrameDecodeVtbl DdsFrameDecode_Dds_Vtbl = { diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 1ce249c4b4..37ed17bd79 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -1064,7 +1064,6 @@ static void test_dds_decoder_frame_data(IWICBitmapFrameDecode* frame, IWICDdsFra hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, frame_stride * 2, sizeof(buffer), buffer); ok(hr == S_OK, "Test %u, frame %u: CopyBlocks failed, hr %#x\n", i, frame_index, hr); if (hr != S_OK) return; - todo_wine_if(width_in_blocks > 1) ok(!memcmp(pixels, buffer, frame_size), "Test %u, frame %u: Block data mismatch\n", i, frame_index);

1 0