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

Nikolay Sivov : combase: Move core apartment and activation functionality.
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: wine Branch: master Commit: ae969df3bc992a6c1c0084cd6eb30c68a2fd6d04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae969df3bc992a6c1c0084cd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 25 18:18:16 2020 +0300 combase: Move core apartment and activation functionality. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/Makefile.in | 1 + dlls/{ole32 => combase}/apartment.c | 94 ++++++++++++++++++++++--------------- dlls/combase/combase.c | 19 ++++++++ dlls/combase/combase.spec | 16 +++++++ dlls/combase/combase_private.h | 42 +++++++++++++++++ dlls/ole32/Makefile.in | 1 - dlls/ole32/compobj.c | 10 ++-- dlls/ole32/compobj_private.h | 31 ++++++------ dlls/ole32/marshal.c | 2 +- dlls/ole32/ole32.spec | 5 ++ dlls/ole32/rpc.c | 4 +- dlls/ole32/stubmanager.c | 5 ++ 12 files changed, 165 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ae969df3bc992a6c1c00…

1 0

Nikolay Sivov : combase: Move CoFreeUnusedLibrariesEx().
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: wine Branch: master Commit: e540630750e9b2cd9b219cbd27b937c070f5388a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e540630750e9b2cd9b219cbd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 25 18:18:17 2020 +0300 combase: Move CoFreeUnusedLibrariesEx(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/apartment.c | 2 +- dlls/combase/combase.c | 15 +++++++++++++++ dlls/combase/combase.spec | 3 +-- dlls/combase/combase_private.h | 1 + dlls/ole32/compobj.c | 29 ----------------------------- dlls/ole32/compobj_private.h | 1 - dlls/ole32/ole32.spec | 2 +- 7 files changed, 19 insertions(+), 34 deletions(-) diff --git a/dlls/combase/apartment.c b/dlls/combase/apartment.c index dbf4553fa4..81071563c0 100644 --- a/dlls/combase/apartment.c +++ b/dlls/combase/apartment.c @@ -426,7 +426,7 @@ static struct apartment *apartment_construct(DWORD model) } /* Frees unused libraries loaded into apartment */ -void WINAPI apartment_freeunusedlibraries(struct apartment *apt, DWORD delay) +void apartment_freeunusedlibraries(struct apartment *apt, DWORD delay) { struct apartment_loaded_dll *entry, *next; diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 286b7be8b8..4ce43717fb 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -2252,6 +2252,21 @@ DWORD WINAPI CoGetCurrentProcess(void) return tlsdata->thread_seqid; } +/*********************************************************************** + * CoFreeUnusedLibrariesEx (combase.@) + */ +void WINAPI DECLSPEC_HOTPATCH CoFreeUnusedLibrariesEx(DWORD unload_delay, DWORD reserved) +{ + struct apartment *apt = com_get_current_apt(); + if (!apt) + { + ERR("apartment not initialised\n"); + return; + } + + apartment_freeunusedlibraries(apt, unload_delay); +} + /*********************************************************************** * DllMain (combase.@) */ diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 980ffa820c..00aea556d9 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -93,7 +93,7 @@ @ stdcall CoEnableCallCancellation(ptr) ole32.CoEnableCallCancellation @ stdcall CoFileTimeNow(ptr) @ stdcall CoFreeUnusedLibraries() -@ stdcall CoFreeUnusedLibrariesEx(long long) ole32.CoFreeUnusedLibrariesEx +@ stdcall CoFreeUnusedLibrariesEx(long long) @ stdcall CoGetActivationState(int128 long ptr) @ stub CoGetApartmentID @ stdcall CoGetApartmentType(ptr ptr) ole32.CoGetApartmentType @@ -357,7 +357,6 @@ @ stdcall enter_apartment(ptr long) @ stdcall leave_apartment(ptr) @ stdcall apartment_get_inproc_class_object(ptr ptr ptr ptr long ptr) -@ stdcall apartment_freeunusedlibraries(ptr long) @ stdcall apartment_get_mta() @ stdcall apartment_decrement_mta_usage(ptr) @ stdcall apartment_increment_mta_usage(ptr) diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h index 16d926d13b..7fe548af59 100644 --- a/dlls/combase/combase_private.h +++ b/dlls/combase/combase_private.h @@ -98,6 +98,7 @@ static inline struct apartment* com_get_current_apt(void) HWND WINAPI apartment_getwindow(const struct apartment *apt) DECLSPEC_HIDDEN; HRESULT WINAPI apartment_createwindowifneeded(struct apartment *apt) DECLSPEC_HIDDEN; +void apartment_freeunusedlibraries(struct apartment *apt, DWORD unload_delay) DECLSPEC_HIDDEN; /* RpcSs interface */ HRESULT rpcss_get_next_seqid(DWORD *id) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 8451953baa..55d06f197f 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1449,35 +1449,6 @@ void WINAPI CoFreeAllLibraries(void) /* NOP */ } -/*********************************************************************** - * CoFreeUnusedLibrariesEx [OLE32.@] - * - * Frees any previously unused libraries whose delay has expired and marks - * currently unused libraries for unloading. Unused are identified as those that - * return S_OK from their DllCanUnloadNow function. - * - * PARAMS - * dwUnloadDelay [I] Unload delay in milliseconds. - * dwReserved [I] Reserved. Set to 0. - * - * RETURNS - * Nothing. - * - * SEE ALSO - * CoLoadLibrary, CoFreeAllLibraries, CoFreeLibrary - */ -void WINAPI DECLSPEC_HOTPATCH CoFreeUnusedLibrariesEx(DWORD dwUnloadDelay, DWORD dwReserved) -{ - struct apartment *apt = COM_CurrentApt(); - if (!apt) - { - ERR("apartment not initialised\n"); - return; - } - - apartment_freeunusedlibraries(apt, dwUnloadDelay); -} - /****************************************************************************** * CoLockObjectExternal [OLE32.@] * diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 34fe1e7a38..29e4cac362 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -267,7 +267,6 @@ extern void WINAPI apartment_decrement_mta_usage(CO_MTA_USAGE_COOKIE cookie) DEC extern HRESULT WINAPI apartment_increment_mta_usage(CO_MTA_USAGE_COOKIE *cookie) DECLSPEC_HIDDEN; extern struct apartment * WINAPI apartment_get_mta(void) DECLSPEC_HIDDEN; extern HRESULT WINAPI apartment_get_local_server_stream(struct apartment *apt, IStream **ret) DECLSPEC_HIDDEN; -extern void WINAPI apartment_freeunusedlibraries(struct apartment *apt, DWORD delay) DECLSPEC_HIDDEN; extern void WINAPI apartment_global_cleanup(void) DECLSPEC_HIDDEN; HRESULT COM_GetRegisteredClassObject(const struct apartment *apt, REFCLSID rclsid, diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 4a2e6b531a..4908729d1f 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -24,7 +24,7 @@ @ stdcall CoFreeAllLibraries() @ stdcall CoFreeLibrary(long) @ stdcall CoFreeUnusedLibraries() combase.CoFreeUnusedLibraries -@ stdcall CoFreeUnusedLibrariesEx(long long) +@ stdcall CoFreeUnusedLibrariesEx(long long) combase.CoFreeUnusedLibrariesEx @ stdcall CoGetActivationState(int128 long ptr) combase.CoGetActivationState @ stdcall CoGetApartmentType(ptr ptr) @ stdcall CoGetCallContext(ptr ptr) combase.CoGetCallContext

1 0

Jacek Caban : conhost: Implement IOCTL_CONDRV_READ_INPUT.
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: wine Branch: master Commit: e703e2da39a411e1f0aaf6d5ff7a1fa36edb87cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=e703e2da39a411e1f0aaf6d5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 25 14:52:58 2020 +0200 conhost: Implement IOCTL_CONDRV_READ_INPUT. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 1 + programs/conhost/conhost.c | 53 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index afc91ecfce..09c48ee705 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3968,6 +3968,7 @@ static void test_pseudo_console_child(HANDLE input) ok(ret, "SetConsoleMode failed: %u\n", GetLastError()); test_console_title(); + test_WriteConsoleInputW(input); } static DWORD WINAPI read_pipe_proc( void *handle ) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 525ca9058e..d65a605f04 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -48,6 +48,7 @@ struct console INPUT_RECORD *records; /* input records */ unsigned int record_count; /* number of input records */ unsigned int record_size; /* size of input records buffer */ + size_t pending_read; /* size of pending read buffer */ WCHAR *title; /* console title */ size_t title_len; /* length of console title */ struct history_line **history; /* lines history */ @@ -75,6 +76,36 @@ static void *alloc_ioctl_buffer( size_t size ) return ioctl_buffer; } +static NTSTATUS read_console_input( struct console *console, size_t out_size ) +{ + size_t count = min( out_size / sizeof(INPUT_RECORD), console->record_count ); + NTSTATUS status; + + TRACE("count %u\n", count); + + SERVER_START_REQ( get_next_console_request ) + { + req->handle = wine_server_obj_handle( console->server ); + req->signal = count < console->record_count; + req->read = 1; + req->status = STATUS_SUCCESS; + wine_server_add_data( req, console->records, count * sizeof(*console->records) ); + status = wine_server_call( req ); + } + SERVER_END_REQ; + if (status) + { + ERR( "failed: %#x\n", status ); + return status; + } + + if (count < console->record_count) + memmove( console->records, console->records + count, + (console->record_count - count) * sizeof(*console->records) ); + console->record_count -= count; + return STATUS_SUCCESS; +} + /* add input events to a console input queue */ static NTSTATUS write_console_input( struct console *console, const INPUT_RECORD *records, unsigned int count ) @@ -115,6 +146,11 @@ static NTSTATUS write_console_input( struct console *console, const INPUT_RECORD } } console->record_count += count; + if (count && console->pending_read) + { + read_console_input( console, console->pending_read ); + console->pending_read = 0; + } return STATUS_SUCCESS; } @@ -156,6 +192,23 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, TRACE( "set %x mode\n", console->mode ); return STATUS_SUCCESS; + case IOCTL_CONDRV_READ_INPUT: + { + unsigned int blocking; + NTSTATUS status; + if (in_size && in_size != sizeof(blocking)) return STATUS_INVALID_PARAMETER; + blocking = in_size && *(unsigned int *)in_data; + if (blocking && !console->record_count && *out_size) + { + TRACE( "pending read" ); + console->pending_read = *out_size; + return STATUS_PENDING; + } + status = read_console_input( console, *out_size ); + *out_size = 0; + return status; + } + case IOCTL_CONDRV_WRITE_INPUT: if (in_size % sizeof(INPUT_RECORD) || *out_size) return STATUS_INVALID_PARAMETER; return write_console_input( console, in_data, in_size / sizeof(INPUT_RECORD) );

1 0

Zebediah Figura : vkd3d-shader: Do not check for NULL in vkd3d_shader_free_scan_descriptor_info().
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: vkd3d Branch: master Commit: 6c10b5280444d5c6219d3c557a3d6f1c994a33eb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6c10b5280444d5c6219d3c5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 25 10:22:28 2020 -0500 vkd3d-shader: Do not check for NULL in vkd3d_shader_free_scan_descriptor_info(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index e0a04fc..68e23da 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -884,14 +884,16 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char if (instruction.handler_idx == VKD3DSIH_INVALID) { WARN("Encountered unrecognized or invalid instruction.\n"); - vkd3d_shader_free_scan_descriptor_info(scan_descriptor_info); + if (scan_descriptor_info) + vkd3d_shader_free_scan_descriptor_info(scan_descriptor_info); ret = VKD3D_ERROR_INVALID_SHADER; goto done; } if ((ret = vkd3d_shader_scan_instruction(&context, &instruction)) < 0) { - vkd3d_shader_free_scan_descriptor_info(scan_descriptor_info); + if (scan_descriptor_info) + vkd3d_shader_free_scan_descriptor_info(scan_descriptor_info); goto done; } ++message_context->line; @@ -910,9 +912,6 @@ done: void vkd3d_shader_free_scan_descriptor_info(struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info) { - if (!scan_descriptor_info) - return; - vkd3d_free(scan_descriptor_info->descriptors); }

1 0

Zebediah Figura : vkd3d-shader: Do not check for NULL in vkd3d_shader_free_shader_code().
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: vkd3d Branch: master Commit: f895f0dce6149b2c9aa0b386aeb70f8eae633d8d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f895f0dce6149b2c9aa0b38… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 24 11:16:45 2020 -0500 vkd3d-shader: Do not check for NULL in vkd3d_shader_free_shader_code(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_main.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 68e23da..e3abaf7 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -917,9 +917,6 @@ void vkd3d_shader_free_scan_descriptor_info(struct vkd3d_shader_scan_descriptor_ void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *shader_code) { - if (!shader_code) - return; - vkd3d_free((void *)shader_code->code); }

1 0

Paul Gofman : kernel32: Add string for E_NOTIMPL error.
by Alexandre Julliard 25 Aug '20

25 Aug '20

1 0

Ziqing Hui : windowscodecs: Add WIC pixel format information to struct dds_format.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: 79e6c5d8a1f5a3e18a2033be501c54fb0bcc2556 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79e6c5d8a1f5a3e18a2033be… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Aug 25 22:00:38 2020 +0800 windowscodecs: Add WIC pixel format information to struct dds_format. 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 | 107 +++++++++++++++++++++++++++-------------- 1 file changed, 72 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=79e6c5d8a1f5a3e18a20…

1 0

Ziqing Hui : windowscodecs: Introduce get_dds_format() to replace get_dxgi_format().
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: a017f701f3bc60e66dcd46c8f6d0127c13331ddf URL: https://source.winehq.org/git/wine.git/?a=commit;h=a017f701f3bc60e66dcd46c8… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Aug 25 22:00:47 2020 +0800 windowscodecs: Introduce get_dds_format() to replace get_dxgi_format(). 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 | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 75fa911797..d16fc9700d 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -166,7 +166,7 @@ static struct dds_format { const GUID *wic_format; UINT wic_format_bpp; DXGI_FORMAT dxgi_format; -} dds_formats[] = { +} dds_format_table[] = { { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('D', 'X', 'T', '1'), 0, 0, 0, 0, 0 }, &GUID_WICPixelFormat32bppPBGRA, 32, DXGI_FORMAT_BC1_UNORM }, { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('D', 'X', 'T', '2'), 0, 0, 0, 0, 0 }, @@ -239,7 +239,8 @@ static struct dds_format { { { sizeof(DDS_PIXELFORMAT), DDPF_LUMINANCE, 0, 16, 0xFF,0,0,0xFF00 }, &GUID_WICPixelFormatUndefined, 0, DXGI_FORMAT_R8G8_UNORM }, { { sizeof(DDS_PIXELFORMAT), DDPF_LUMINANCE, 0, 8, 0xFF,0,0,0 }, - &GUID_WICPixelFormat8bppGray, 8, DXGI_FORMAT_R8_UNORM } + &GUID_WICPixelFormat8bppGray, 8, DXGI_FORMAT_R8_UNORM }, + { { 0 }, &GUID_WICPixelFormatUndefined, 0, DXGI_FORMAT_UNKNOWN } }; static DXGI_FORMAT compressed_formats[] = { @@ -289,23 +290,23 @@ static WICDdsDimension get_dimension(DDS_HEADER *header, DDS_HEADER_DXT10 *heade } } -static DXGI_FORMAT get_dxgi_format(DDS_PIXELFORMAT *pixel_format) +static struct dds_format *get_dds_format(DDS_PIXELFORMAT *pixel_format) { UINT i; - for (i = 0; i < ARRAY_SIZE(dds_formats); i++) + for (i = 0; i < ARRAY_SIZE(dds_format_table); i++) { - if ((pixel_format->flags & dds_formats[i].pixel_format.flags) && - (pixel_format->fourCC == dds_formats[i].pixel_format.fourCC) && - (pixel_format->rgbBitCount == dds_formats[i].pixel_format.rgbBitCount) && - (pixel_format->rBitMask == dds_formats[i].pixel_format.rBitMask) && - (pixel_format->gBitMask == dds_formats[i].pixel_format.gBitMask) && - (pixel_format->bBitMask == dds_formats[i].pixel_format.bBitMask) && - (pixel_format->aBitMask == dds_formats[i].pixel_format.aBitMask)) - return dds_formats[i].dxgi_format; + if ((pixel_format->flags & dds_format_table[i].pixel_format.flags) && + (pixel_format->fourCC == dds_format_table[i].pixel_format.fourCC) && + (pixel_format->rgbBitCount == dds_format_table[i].pixel_format.rgbBitCount) && + (pixel_format->rBitMask == dds_format_table[i].pixel_format.rBitMask) && + (pixel_format->gBitMask == dds_format_table[i].pixel_format.gBitMask) && + (pixel_format->bBitMask == dds_format_table[i].pixel_format.bBitMask) && + (pixel_format->aBitMask == dds_format_table[i].pixel_format.aBitMask)) + return dds_format_table + i; } - return DXGI_FORMAT_UNKNOWN; + return dds_format_table + ARRAY_SIZE(dds_format_table) - 1; } static WICDdsAlphaMode get_alpha_mode_from_fourcc(DWORD fourcc) @@ -452,6 +453,7 @@ static void get_dds_info(dds_info* info, DDS_HEADER *header, DDS_HEADER_DXT10 *h { int i; UINT depth; + struct dds_format *format_info; info->width = header->width; info->height = header->height; @@ -461,6 +463,7 @@ static void get_dds_info(dds_info* info, DDS_HEADER *header, DDS_HEADER_DXT10 *h if (header->depth) info->depth = header->depth; if (header->mipMapCount) info->mip_levels = header->mipMapCount; + format_info = get_dds_format(&header->ddspf); if (has_extended_header(header)) { if (header_dxt10->arraySize) info->array_size = header_dxt10->arraySize; info->format = header_dxt10->dxgiFormat; @@ -468,7 +471,7 @@ static void get_dds_info(dds_info* info, DDS_HEADER *header, DDS_HEADER_DXT10 *h info->alpha_mode = header_dxt10->miscFlags2 & 0x00000008; info->data_offset = sizeof(DWORD) + sizeof(*header) + sizeof(*header_dxt10); } else { - info->format = get_dxgi_format(&header->ddspf); + info->format = format_info->dxgi_format; info->dimension = get_dimension(header, NULL); info->alpha_mode = get_alpha_mode_from_fourcc(header->ddspf.fourCC); info->data_offset = sizeof(DWORD) + sizeof(*header);

1 0

Ziqing Hui : windowscodecs/tests: Expect actual WIC formats for uncompressed image.
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: 6c0c5e9c5bd18b5ee0056432497635dc218e7010 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c0c5e9c5bd18b5ee0056432… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Aug 25 22:00:56 2020 +0800 windowscodecs/tests: Expect actual WIC formats for uncompressed image. 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 | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 43f266d392..2d78319375 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -394,23 +394,23 @@ static struct test_data { WICDdsParameters expected_parameters; BOOL wine_init; } test_data[] = { - { test_dds_alpha, sizeof(test_dds_alpha), WINCODEC_ERR_BADHEADER, 1, 1, &GUID_WICPixelFormat32bppBGRA, + { test_dds_alpha, sizeof(test_dds_alpha), WINCODEC_ERR_BADHEADER, 1, 1, &GUID_WICPixelFormat8bppAlpha, { 1, 1, 1, 1, 1, DXGI_FORMAT_A8_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, - { test_dds_luminance, sizeof(test_dds_luminance), WINCODEC_ERR_BADHEADER, 1, 1, &GUID_WICPixelFormat32bppBGRA, + { test_dds_luminance, sizeof(test_dds_luminance), WINCODEC_ERR_BADHEADER, 1, 1, &GUID_WICPixelFormat8bppGray, { 1, 1, 1, 1, 1, DXGI_FORMAT_R8_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, - { test_dds_rgb565, sizeof(test_dds_rgb565), WINCODEC_ERR_BADHEADER, 1, 2, &GUID_WICPixelFormat32bppBGRA, + { test_dds_rgb565, sizeof(test_dds_rgb565), WINCODEC_ERR_BADHEADER, 1, 2, &GUID_WICPixelFormat16bppBGR565, { 4, 4, 1, 1, 1, DXGI_FORMAT_B5G6R5_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, - { test_dds_24bpp, sizeof(test_dds_24bpp), WINCODEC_ERR_BADHEADER, 1, 3, &GUID_WICPixelFormat32bppBGRA, + { test_dds_24bpp, sizeof(test_dds_24bpp), WINCODEC_ERR_BADHEADER, 1, 3, &GUID_WICPixelFormat24bppBGR, { 1, 1, 1, 1, 1, DXGI_FORMAT_UNKNOWN, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, - { test_dds_32bpp_xrgb, sizeof(test_dds_32bpp_xrgb), WINCODEC_ERR_BADHEADER, 1, 4, &GUID_WICPixelFormat32bppBGRA, + { test_dds_32bpp_xrgb, sizeof(test_dds_32bpp_xrgb), WINCODEC_ERR_BADHEADER, 1, 4, &GUID_WICPixelFormat32bppBGR, { 1, 1, 1, 1, 1, DXGI_FORMAT_B8G8R8X8_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, { test_dds_32bpp_argb, sizeof(test_dds_32bpp_argb), WINCODEC_ERR_BADHEADER, 1, 4, &GUID_WICPixelFormat32bppBGRA, { 1, 1, 1, 1, 1, DXGI_FORMAT_B8G8R8A8_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, - { test_dds_64bpp, sizeof(test_dds_64bpp), WINCODEC_ERR_BADHEADER, 1, 8, &GUID_WICPixelFormat32bppBGRA, + { test_dds_64bpp, sizeof(test_dds_64bpp), WINCODEC_ERR_BADHEADER, 1, 8, &GUID_WICPixelFormat64bppBGRA, { 1, 1, 1, 1, 1, DXGI_FORMAT_R16G16B16A16_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, - { test_dds_96bpp, sizeof(test_dds_96bpp), WINCODEC_ERR_BADHEADER, 1, 12, &GUID_WICPixelFormat32bppBGRA, + { test_dds_96bpp, sizeof(test_dds_96bpp), WINCODEC_ERR_BADHEADER, 1, 12, &GUID_WICPixelFormat96bppRGBFloat, { 1, 1, 1, 1, 1, DXGI_FORMAT_R32G32B32_FLOAT, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, - { test_dds_128bpp, sizeof(test_dds_128bpp), WINCODEC_ERR_BADHEADER, 1, 16, &GUID_WICPixelFormat32bppBGRA, + { test_dds_128bpp, sizeof(test_dds_128bpp), WINCODEC_ERR_BADHEADER, 1, 16, &GUID_WICPixelFormat128bppRGBAFloat, { 1, 1, 1, 1, 1, DXGI_FORMAT_R32G32B32A32_FLOAT, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, { test_dds_cube, sizeof(test_dds_cube), WINCODEC_ERR_BADHEADER, 18, 8, &GUID_WICPixelFormat32bppPBGRA, { 4, 4, 1, 3, 1, DXGI_FORMAT_BC1_UNORM, WICDdsTextureCube, WICDdsAlphaModePremultiplied }, TRUE }, @@ -936,6 +936,8 @@ static void test_dds_decoder_frame_properties(IWICBitmapFrameDecode *frame_decod hr = IWICBitmapFrameDecode_GetPixelFormat(frame_decode, &pixel_format); ok(hr == S_OK, "Test %u, frame %u: GetPixelFormat failed, hr %#x\n", i, frame_index, hr); if (hr != S_OK) return; + todo_wine_if(!IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat32bppBGRA) && + !IsEqualGUID(test_data[i].expected_pixel_format, &GUID_WICPixelFormat32bppPBGRA)) ok(IsEqualGUID(&pixel_format, test_data[i].expected_pixel_format), "Test %u, frame %u: Expected pixel format %s, got %s\n", i, frame_index, debugstr_guid(test_data[i].expected_pixel_format), debugstr_guid(&pixel_format));

1 0

Ziqing Hui : windowscodecs/tests: Introduce is_compressed().
by Alexandre Julliard 25 Aug '20

25 Aug '20

Module: wine Branch: master Commit: adef0fc9718bfae0d0b0a1574d20ba4aae4c0648 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adef0fc9718bfae0d0b0a157… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Aug 25 22:01:08 2020 +0800 windowscodecs/tests: Introduce is_compressed(). 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 | 38 ++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 2d78319375..9e8c015a58 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -445,6 +445,16 @@ static struct test_data { { test_qword_b, sizeof(test_qword_b), WINCODEC_ERR_STREAMREAD }, }; +static DXGI_FORMAT compressed_formats[] = { + DXGI_FORMAT_BC1_TYPELESS, DXGI_FORMAT_BC1_UNORM, DXGI_FORMAT_BC1_UNORM_SRGB, + DXGI_FORMAT_BC2_TYPELESS, DXGI_FORMAT_BC2_UNORM, DXGI_FORMAT_BC2_UNORM_SRGB, + DXGI_FORMAT_BC3_TYPELESS, DXGI_FORMAT_BC3_UNORM, DXGI_FORMAT_BC3_UNORM_SRGB, + DXGI_FORMAT_BC4_TYPELESS, DXGI_FORMAT_BC4_UNORM, DXGI_FORMAT_BC4_SNORM, + DXGI_FORMAT_BC5_TYPELESS, DXGI_FORMAT_BC5_UNORM, DXGI_FORMAT_BC5_SNORM, + DXGI_FORMAT_BC6H_TYPELESS, DXGI_FORMAT_BC6H_UF16, DXGI_FORMAT_BC6H_SF16, + DXGI_FORMAT_BC7_TYPELESS, DXGI_FORMAT_BC7_UNORM, DXGI_FORMAT_BC7_UNORM_SRGB +}; + static IWICImagingFactory *factory = NULL; static IWICStream *create_stream(const void *image_data, UINT image_size) @@ -510,6 +520,16 @@ static HRESULT init_decoder(IWICBitmapDecoder *decoder, IWICStream *stream, HRES return hr; } +static BOOL is_compressed(DXGI_FORMAT format) +{ + UINT i; + for (i = 0; i < ARRAY_SIZE(compressed_formats); i++) + { + if (format == compressed_formats[i]) return TRUE; + } + return FALSE; +} + static BOOL has_extended_header(const BYTE *data) { return data[84] == 'D' && data[85] == 'X' && data[86] == '1' && data[87] == '0'; @@ -876,18 +896,12 @@ static void test_dds_decoder_frame_properties(IWICBitmapFrameDecode *frame_decod /* frame format information tests */ - if (test_data[i].expected_parameters.DxgiFormat != DXGI_FORMAT_BC1_UNORM && - test_data[i].expected_parameters.DxgiFormat != DXGI_FORMAT_BC2_UNORM && - test_data[i].expected_parameters.DxgiFormat != DXGI_FORMAT_BC3_UNORM && - test_data[i].expected_parameters.DxgiFormat != DXGI_FORMAT_BC4_UNORM && - test_data[i].expected_parameters.DxgiFormat != DXGI_FORMAT_BC4_SNORM && - test_data[i].expected_parameters.DxgiFormat != DXGI_FORMAT_BC5_UNORM && - test_data[i].expected_parameters.DxgiFormat != DXGI_FORMAT_BC5_SNORM) { - expected_block_width = 1; - expected_block_height = 1; - } else { + if (is_compressed(test_data[i].expected_parameters.DxgiFormat)) { expected_block_width = BLOCK_WIDTH; expected_block_height = BLOCK_HEIGHT; + } else { + expected_block_width = 1; + expected_block_height = 1; } hr = IWICDdsFrameDecode_GetFormatInfo(dds_frame, NULL); @@ -1108,9 +1122,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); - if (format_info.DxgiFormat == DXGI_FORMAT_BC1_UNORM || - format_info.DxgiFormat == DXGI_FORMAT_BC2_UNORM || - format_info.DxgiFormat == DXGI_FORMAT_BC3_UNORM ) { + 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, pixels);

1 0