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

Brendan Shanks : user32: Create separate FIXME() messages for each packet type in DisplayConfigGetDeviceInfo().
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 27ed9c95a2bbdbf7d86309cf1b9c9fefc157a0fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=27ed9c95a2bbdbf7d86309cf… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Jul 14 13:34:23 2020 -0700 user32: Create separate FIXME() messages for each packet type in DisplayConfigGetDeviceInfo(). Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 8b2b3381dc..3ec6c54023 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -4815,7 +4815,7 @@ done: */ LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) { - FIXME("stub: %p\n", packet); + TRACE("(%p)\n", packet); if (!packet || packet->size < sizeof(*packet)) return ERROR_GEN_FAILURE; @@ -4825,6 +4825,9 @@ LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) case DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME: { DISPLAYCONFIG_SOURCE_DEVICE_NAME *source_name = (DISPLAYCONFIG_SOURCE_DEVICE_NAME *)packet; + + FIXME("DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME: stub\n"); + if (packet->size < sizeof(*source_name)) return ERROR_INVALID_PARAMETER; @@ -4833,6 +4836,9 @@ LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) case DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME: { DISPLAYCONFIG_TARGET_DEVICE_NAME *target_name = (DISPLAYCONFIG_TARGET_DEVICE_NAME *)packet; + + FIXME("DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME: stub\n"); + if (packet->size < sizeof(*target_name)) return ERROR_INVALID_PARAMETER; @@ -4841,6 +4847,9 @@ LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) case DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_PREFERRED_MODE: { DISPLAYCONFIG_TARGET_PREFERRED_MODE *preferred_mode = (DISPLAYCONFIG_TARGET_PREFERRED_MODE *)packet; + + FIXME("DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_PREFERRED_MODE: stub\n"); + if (packet->size < sizeof(*preferred_mode)) return ERROR_INVALID_PARAMETER; @@ -4849,6 +4858,9 @@ LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) case DISPLAYCONFIG_DEVICE_INFO_GET_ADAPTER_NAME: { DISPLAYCONFIG_ADAPTER_NAME *adapter_name = (DISPLAYCONFIG_ADAPTER_NAME *)packet; + + FIXME("DISPLAYCONFIG_DEVICE_INFO_GET_ADAPTER_NAME: stub\n"); + if (packet->size < sizeof(*adapter_name)) return ERROR_INVALID_PARAMETER;

1 0

Brendan Shanks : user32: Handle GET_SOURCE_NAME in DisplayConfigGetDeviceInfo().
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 8949f570865fe72e28b4b7ef57c5c903d9a711b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8949f570865fe72e28b4b7ef… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Jul 14 13:34:24 2020 -0700 user32: Handle GET_SOURCE_NAME in DisplayConfigGetDeviceInfo(). Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 48 +++++++++++++++++++++++++++++++++++++++++++-- dlls/user32/tests/monitor.c | 2 -- 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 3ec6c54023..6c0c3e76db 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -4815,23 +4815,67 @@ done: */ LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) { + LONG ret = ERROR_GEN_FAILURE; + HANDLE mutex; + HDEVINFO devinfo; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + DWORD index = 0, type; + LUID gpu_luid; + TRACE("(%p)\n", packet); if (!packet || packet->size < sizeof(*packet)) return ERROR_GEN_FAILURE; + wait_graphics_driver_ready(); switch (packet->type) { case DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME: { DISPLAYCONFIG_SOURCE_DEVICE_NAME *source_name = (DISPLAYCONFIG_SOURCE_DEVICE_NAME *)packet; + WCHAR device_name[CCHDEVICENAME]; + LONG source_id; - FIXME("DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME: stub\n"); + TRACE("DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME\n"); if (packet->size < sizeof(*source_name)) return ERROR_INVALID_PARAMETER; - return ERROR_NOT_SUPPORTED; + mutex = get_display_device_init_mutex(); + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, DISPLAY, NULL, DIGCF_PRESENT); + if (devinfo == INVALID_HANDLE_VALUE) + { + release_display_device_init_mutex(mutex); + return ret; + } + + while (SetupDiEnumDeviceInfo(devinfo, index++, &device_data)) + { + if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_MONITOR_GPU_LUID, + &type, (BYTE *)&gpu_luid, sizeof(gpu_luid), NULL, 0)) + continue; + + if ((source_name->header.adapterId.LowPart != gpu_luid.LowPart) || + (source_name->header.adapterId.HighPart != gpu_luid.HighPart)) + continue; + + /* QueryDisplayConfig() derives the source ID from the adapter name. */ + if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, + &type, (BYTE *)device_name, sizeof(device_name), NULL, 0)) + continue; + + source_id = strtolW(device_name + ARRAY_SIZE(ADAPTER_PREFIX), NULL, 10); + source_id--; + if (source_name->header.id != source_id) + continue; + + lstrcpyW(source_name->viewGdiDeviceName, device_name); + ret = ERROR_SUCCESS; + break; + } + SetupDiDestroyDeviceInfoList(devinfo); + release_display_device_init_mutex(mutex); + return ret; } case DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME: { diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index f469111a26..8fe4701d00 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1300,7 +1300,6 @@ static void test_QueryDisplayConfig_result(UINT32 flags, for (i = 0; i < paths; i++) { - todo_wine { source_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME; source_name.header.size = sizeof(source_name); source_name.header.adapterId = pi[i].sourceInfo.adapterId; @@ -1309,7 +1308,6 @@ static void test_QueryDisplayConfig_result(UINT32 flags, ret = pDisplayConfigGetDeviceInfo(&source_name.header); ok(!ret, "Expected 0, got %d\n", ret); ok(source_name.viewGdiDeviceName[0] != '\0', "Expected GDI device name, got empty string\n"); - } todo_wine { target_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME;

1 0

Brendan Shanks : user32/tests: Test DisplayConfigGetDeviceInfo() GET_SOURCE_NAME with valid ID and invalid LUID.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 894c6566ab25d0fb4a1a6d7e061041fc14906662 URL: https://source.winehq.org/git/wine.git/?a=commit;h=894c6566ab25d0fb4a1a6d7e… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Jul 14 13:34:25 2020 -0700 user32/tests: Test DisplayConfigGetDeviceInfo() GET_SOURCE_NAME with valid ID and invalid LUID. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 8fe4701d00..6e8c9a275d 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1309,6 +1309,15 @@ static void test_QueryDisplayConfig_result(UINT32 flags, ok(!ret, "Expected 0, got %d\n", ret); ok(source_name.viewGdiDeviceName[0] != '\0', "Expected GDI device name, got empty string\n"); + /* Test with an invalid adapter LUID */ + source_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME; + source_name.header.size = sizeof(source_name); + source_name.header.adapterId.LowPart = 0xFFFF; + source_name.header.adapterId.HighPart = 0xFFFF; + source_name.header.id = pi[i].sourceInfo.id; + ret = pDisplayConfigGetDeviceInfo(&source_name.header); + ok(ret == ERROR_GEN_FAILURE, "Expected GEN_FAILURE, got %d\n", ret); + todo_wine { target_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME; target_name.header.size = sizeof(target_name);

1 0

Zebediah Figura : ntdll/tests: Remove some workarounds for no longer supported versions of Windows.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: d7e12831b04ed6645558bdeec41e09311200d7f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7e12831b04ed6645558bdee… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 16 20:00:34 2020 -0500 ntdll/tests: Remove some workarounds for no longer supported versions of Windows. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 387 +++++++++++++++++++------------------------------- 1 file changed, 149 insertions(+), 238 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d7e12831b04ed6645558…

1 0

Zebediah Figura : ntdll/tests: Convert DIR_TEST_CREATE_OPEN into a function.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 5e240cdf50dc10003a8663ec9be51f9d8bb42634 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e240cdf50dc10003a8663ec… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 16 20:00:35 2020 -0500 ntdll/tests: Convert DIR_TEST_CREATE_OPEN into a function. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 53 +++++++++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 5d7e400785..313fb1160a 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -199,18 +199,25 @@ static void test_namespace_pipe(void) #define DIRECTORY_QUERY (0x0001) #define SYMBOLIC_LINK_QUERY 0x0001 -#define DIR_TEST_CREATE_OPEN(n,e) \ - do { \ - HANDLE h; \ - pRtlCreateUnicodeStringFromAsciiz(&str, n); \ - status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr ); \ - ok( status == e, "NtCreateDirectoryObject(%s) got %08x\n", n, status ); \ - if (!status) pNtClose( h ); \ - status = pNtOpenDirectoryObject( &h, DIRECTORY_QUERY, &attr ); \ - ok( status == e, "NtOpenDirectoryObject(%s) got %08x\n", n, status ); \ - if (!status) pNtClose( h ); \ - pRtlFreeUnicodeString(&str); \ - } while(0) +#define check_create_open_dir(parent, name, status) check_create_open_dir_(__LINE__, parent, name, status) +static void check_create_open_dir_( int line, HANDLE parent, const char *name, NTSTATUS expect ) +{ + OBJECT_ATTRIBUTES attr; + UNICODE_STRING str; + NTSTATUS status; + HANDLE h; + + pRtlCreateUnicodeStringFromAsciiz( &str, name ); + InitializeObjectAttributes( &attr, &str, 0, parent, NULL ); + status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr ); + ok_(__FILE__, line)( status == expect, "NtCreateDirectoryObject(%s) got %08x\n", debugstr_a(name), status ); + if (!status) pNtClose( h ); + + status = pNtOpenDirectoryObject( &h, DIRECTORY_QUERY, &attr ); + ok_(__FILE__, line)( status == expect, "NtOpenDirectoryObject(%s) got %08x\n", debugstr_a(name), status ); + if (!status) pNtClose( h ); + pRtlFreeUnicodeString( &str ); +} static BOOL is_correct_dir( HANDLE dir, const char *name ) { @@ -906,11 +913,11 @@ static void test_directory(void) pRtlFreeUnicodeString(&str); pNtClose(dir); - DIR_TEST_CREATE_OPEN( "BaseNamedObjects", STATUS_OBJECT_PATH_SYNTAX_BAD ); - DIR_TEST_CREATE_OPEN( "\\BaseNamedObjects\\", STATUS_OBJECT_NAME_INVALID ); - DIR_TEST_CREATE_OPEN( "\\\\BaseNamedObjects", STATUS_OBJECT_NAME_INVALID ); - DIR_TEST_CREATE_OPEN( "\\BaseNamedObjects\\\\om.c-test", STATUS_OBJECT_NAME_INVALID ); - DIR_TEST_CREATE_OPEN( "\\BaseNamedObjects\\om.c-test\\", STATUS_OBJECT_PATH_NOT_FOUND ); + check_create_open_dir( NULL, "BaseNamedObjects", STATUS_OBJECT_PATH_SYNTAX_BAD ); + check_create_open_dir( NULL, "\\BaseNamedObjects\\", STATUS_OBJECT_NAME_INVALID ); + check_create_open_dir( NULL, "\\\\BaseNamedObjects", STATUS_OBJECT_NAME_INVALID ); + check_create_open_dir( NULL, "\\BaseNamedObjects\\\\om.c-test", STATUS_OBJECT_NAME_INVALID ); + check_create_open_dir( NULL, "\\BaseNamedObjects\\om.c-test\\", STATUS_OBJECT_PATH_NOT_FOUND ); pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects\\om.c-test"); status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr ); @@ -1009,13 +1016,13 @@ static void test_directory(void) status = pNtOpenDirectoryObject( &h, DIRECTORY_QUERY, &attr ); ok( status == STATUS_OBJECT_NAME_INVALID, "NtOpenDirectoryObject got %08x\n", status ); - InitializeObjectAttributes(&attr, &str, 0, dir, NULL); - DIR_TEST_CREATE_OPEN( "", STATUS_SUCCESS ); - DIR_TEST_CREATE_OPEN( "\\", STATUS_OBJECT_PATH_SYNTAX_BAD ); - DIR_TEST_CREATE_OPEN( "\\om.c-test", STATUS_OBJECT_PATH_SYNTAX_BAD ); - DIR_TEST_CREATE_OPEN( "\\om.c-test\\", STATUS_OBJECT_PATH_SYNTAX_BAD ); - DIR_TEST_CREATE_OPEN( "om.c-test\\", STATUS_OBJECT_PATH_NOT_FOUND ); + check_create_open_dir( dir, "", STATUS_SUCCESS ); + check_create_open_dir( dir, "\\", STATUS_OBJECT_PATH_SYNTAX_BAD ); + check_create_open_dir( dir, "\\om.c-test", STATUS_OBJECT_PATH_SYNTAX_BAD ); + check_create_open_dir( dir, "\\om.c-test\\", STATUS_OBJECT_PATH_SYNTAX_BAD ); + check_create_open_dir( dir, "om.c-test\\", STATUS_OBJECT_PATH_NOT_FOUND ); + InitializeObjectAttributes(&attr, &str, 0, dir, NULL); pRtlCreateUnicodeStringFromAsciiz(&str, "om.c-test"); status = pNtCreateDirectoryObject( &dir1, DIRECTORY_QUERY, &attr ); ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status );

1 0

Zebediah Figura : ntdll/tests: Use wide character string literals in om.c.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 2a539470287005b51e2e72f27026fde26691ba65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a539470287005b51e2e72f2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 16 20:00:36 2020 -0500 ntdll/tests: Use wide character string literals in om.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 308 +++++++++++++++++++------------------------------- 1 file changed, 119 insertions(+), 189 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2a539470287005b51e2e…

1 0

Zebediah Figura : ntdll/tests: Fix a copy-paste error.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: de1eaee4804ffbeb0917b139638adb19c2106936 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de1eaee4804ffbeb0917b139… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 16 20:00:37 2020 -0500 ntdll/tests: Fix a copy-paste error. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 03d97b2143..f68827c718 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1040,7 +1040,7 @@ static void test_directory(void) pNtClose(h); InitializeObjectAttributes(&attr, &str, 0, dir, NULL); RtlInitUnicodeString(&str, L"one more level"); - status = pNtCreateDirectoryObject( &dir, DIRECTORY_QUERY, &attr ); + status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr ); ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status ); pNtClose(h); pNtClose(dir); @@ -1157,9 +1157,9 @@ static void test_symboliclink(void) RtlInitUnicodeString( &str, L"\\BaseNamedObjects\\om.c-test\\" ); status = pNtCreateSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr, &target ); - ok( status == STATUS_OBJECT_NAME_INVALID, "got %#x\n", status ); + ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "got %#x\n", status ); status = pNtOpenSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr ); - ok( status == STATUS_OBJECT_NAME_INVALID, "got %#x\n", status ); + ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "got %#x\n", status ); /* Compound test */ dir = get_base_dir();

1 0

Ziqing Hui : windowscodecs: Implement DdsDecoder_Wine_Initialize().
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 9ac21b7e1e10fad8ef4f2f7e87cc4bf7912eec7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ac21b7e1e10fad8ef4f2f7e… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jul 15 22:00:21 2020 +0800 windowscodecs: Implement DdsDecoder_Wine_Initialize(). Code in DdsDecoder_Initialize() are moved to DdsDecoder_Wine_Initialize(). And DdsDecoder_Initialize() are implemented on top of DdsDecoder_Wine_Initialize(). 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 | 126 +++++++++++++++++++++-------------------- 1 file changed, 66 insertions(+), 60 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 295b935a26..f7b5201321 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -104,6 +104,7 @@ typedef struct dds_info { UINT array_size; UINT frame_count; UINT data_offset; + BOOL compressed; DXGI_FORMAT format; WICDdsDimension dimension; WICDdsAlphaMode alpha_mode; @@ -213,6 +214,8 @@ static void get_dds_info(dds_info* info, DDS_HEADER *header, DDS_HEADER_DXT10 *h int i; UINT depth; + info->compressed = !(header->ddspf.flags & (DDPF_RGB | DDPF_LUMINANCE)); + info->width = header->width; info->height = header->height; info->depth = 1; @@ -623,67 +626,10 @@ static HRESULT WINAPI DdsDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p WICDecodeOptions cacheOptions) { DdsDecoder *This = impl_from_IWICBitmapDecoder(iface); - DDS_HEADER_DXT10 header_dxt10; - DDS_HEADER header; - HRESULT hr; - LARGE_INTEGER seek; - DWORD magic; - ULONG bytesread; TRACE("(%p,%p,%x)\n", iface, pIStream, cacheOptions); - EnterCriticalSection(&This->lock); - - if (This->initialized) { - hr = WINCODEC_ERR_WRONGSTATE; - goto end; - } - - seek.QuadPart = 0; - hr = IStream_Seek(pIStream, seek, SEEK_SET, NULL); - if (FAILED(hr)) goto end; - - hr = IStream_Read(pIStream, &magic, sizeof(magic), &bytesread); - if (FAILED(hr)) goto end; - if (bytesread != sizeof(magic)) { - hr = WINCODEC_ERR_STREAMREAD; - goto end; - } - if (magic != DDS_MAGIC) { - hr = WINCODEC_ERR_UNKNOWNIMAGEFORMAT; - goto end; - } - - hr = IStream_Read(pIStream, &header, sizeof(header), &bytesread); - if (FAILED(hr)) goto end; - if (bytesread != sizeof(header)) { - hr = WINCODEC_ERR_STREAMREAD; - goto end; - } - if (header.size != sizeof(header)) { - hr = WINCODEC_ERR_BADHEADER; - goto end; - } - - if (has_extended_header(&header)) { - hr = IStream_Read(pIStream, &header_dxt10, sizeof(header_dxt10), &bytesread); - if (FAILED(hr)) goto end; - if (bytesread != sizeof(header_dxt10)) { - hr = WINCODEC_ERR_STREAMREAD; - goto end; - } - } - - get_dds_info(&This->info, &header, &header_dxt10); - - This->initialized = TRUE; - This->stream = pIStream; - IStream_AddRef(pIStream); - -end: - LeaveCriticalSection(&This->lock); - - return hr; + return IWICWineDecoder_Initialize(&This->IWICWineDecoder_iface, pIStream, cacheOptions); } static HRESULT WINAPI DdsDecoder_GetContainerFormat(IWICBitmapDecoder *iface, @@ -987,8 +933,68 @@ static ULONG WINAPI DdsDecoder_Wine_Release(IWICWineDecoder *iface) static HRESULT WINAPI DdsDecoder_Wine_Initialize(IWICWineDecoder *iface, IStream *stream, WICDecodeOptions options) { - FIXME("(This %p, stream %p, options %#x)\n", iface, stream, options); - return E_NOTIMPL; + DdsDecoder *This = impl_from_IWICWineDecoder(iface); + DDS_HEADER_DXT10 header_dxt10; + LARGE_INTEGER seek; + DDS_HEADER header; + ULONG bytesread; + DWORD magic; + HRESULT hr; + + TRACE("(This %p, stream %p, options %#x)\n", iface, stream, options); + + EnterCriticalSection(&This->lock); + + if (This->initialized) { + hr = WINCODEC_ERR_WRONGSTATE; + goto end; + } + + seek.QuadPart = 0; + hr = IStream_Seek(stream, seek, SEEK_SET, NULL); + if (FAILED(hr)) goto end; + + hr = IStream_Read(stream, &magic, sizeof(magic), &bytesread); + if (FAILED(hr)) goto end; + if (bytesread != sizeof(magic)) { + hr = WINCODEC_ERR_STREAMREAD; + goto end; + } + if (magic != DDS_MAGIC) { + hr = WINCODEC_ERR_UNKNOWNIMAGEFORMAT; + goto end; + } + + hr = IStream_Read(stream, &header, sizeof(header), &bytesread); + if (FAILED(hr)) goto end; + if (bytesread != sizeof(header)) { + hr = WINCODEC_ERR_STREAMREAD; + goto end; + } + if (header.size != sizeof(header)) { + hr = WINCODEC_ERR_BADHEADER; + goto end; + } + + if (has_extended_header(&header)) { + hr = IStream_Read(stream, &header_dxt10, sizeof(header_dxt10), &bytesread); + if (FAILED(hr)) goto end; + if (bytesread != sizeof(header_dxt10)) { + hr = WINCODEC_ERR_STREAMREAD; + goto end; + } + } + + get_dds_info(&This->info, &header, &header_dxt10); + + This->initialized = TRUE; + This->stream = stream; + IStream_AddRef(stream); + +end: + LeaveCriticalSection(&This->lock); + + return hr; } static const IWICWineDecoderVtbl DdsDecoder_Wine_Vtbl = {

1 0

Ziqing Hui : windowscodecs: Use IWICWineDecoder_Initialize() to initialize decoders in find_decoder().
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 81405aa86d736c52afbc12919428ffa2d8634e93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81405aa86d736c52afbc1291… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jul 15 22:00:55 2020 +0800 windowscodecs: Use IWICWineDecoder_Initialize() to initialize decoders in find_decoder(). 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/imgfactory.c | 94 ++++++++++++++++++++--------------------- 1 file changed, 46 insertions(+), 48 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index e7c61cff70..0ad8bc6ee1 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -134,76 +134,74 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromFilename( static HRESULT find_decoder(IStream *pIStream, const GUID *pguidVendor, WICDecodeOptions metadataOptions, IWICBitmapDecoder **decoder) { - IEnumUnknown *enumdecoders; - IUnknown *unkdecoderinfo; - IWICBitmapDecoderInfo *decoderinfo; + IEnumUnknown *enumdecoders = NULL; + IUnknown *unkdecoderinfo = NULL; GUID vendor; - HRESULT res; + HRESULT res, res_wine; ULONG num_fetched; - BOOL matches; + BOOL matches, found; *decoder = NULL; res = CreateComponentEnumerator(WICDecoder, WICComponentEnumerateDefault, &enumdecoders); if (FAILED(res)) return res; - while (!*decoder) + found = FALSE; + while (IEnumUnknown_Next(enumdecoders, 1, &unkdecoderinfo, &num_fetched) == S_OK) { - res = IEnumUnknown_Next(enumdecoders, 1, &unkdecoderinfo, &num_fetched); + IWICBitmapDecoderInfo *decoderinfo = NULL; + IWICWineDecoder *wine_decoder = NULL; - if (res == S_OK) - { - res = IUnknown_QueryInterface(unkdecoderinfo, &IID_IWICBitmapDecoderInfo, (void**)&decoderinfo); + res = IUnknown_QueryInterface(unkdecoderinfo, &IID_IWICBitmapDecoderInfo, (void**)&decoderinfo); + if (FAILED(res)) goto next; - if (SUCCEEDED(res)) - { - if (pguidVendor) - { - res = IWICBitmapDecoderInfo_GetVendorGUID(decoderinfo, &vendor); - if (FAILED(res) || !IsEqualIID(&vendor, pguidVendor)) - { - IWICBitmapDecoderInfo_Release(decoderinfo); - IUnknown_Release(unkdecoderinfo); - continue; - } - } - - res = IWICBitmapDecoderInfo_MatchesPattern(decoderinfo, pIStream, &matches); + if (pguidVendor) + { + res = IWICBitmapDecoderInfo_GetVendorGUID(decoderinfo, &vendor); + if (FAILED(res) || !IsEqualIID(&vendor, pguidVendor)) goto next; + } - if (SUCCEEDED(res) && matches) - { - res = IWICBitmapDecoderInfo_CreateInstance(decoderinfo, decoder); + res = IWICBitmapDecoderInfo_MatchesPattern(decoderinfo, pIStream, &matches); + if (FAILED(res) || !matches) goto next; - /* FIXME: should use QueryCapability to choose a decoder */ + res = IWICBitmapDecoderInfo_CreateInstance(decoderinfo, decoder); + if (FAILED(res)) goto next; - if (SUCCEEDED(res)) - { - res = IWICBitmapDecoder_Initialize(*decoder, pIStream, metadataOptions); + /* FIXME: should use QueryCapability to choose a decoder */ - if (FAILED(res)) - { - IWICBitmapDecoder_Release(*decoder); - IWICBitmapDecoderInfo_Release(decoderinfo); - IUnknown_Release(unkdecoderinfo); - IEnumUnknown_Release(enumdecoders); - *decoder = NULL; - return res; - } - } - } + found = TRUE; + res = IWICBitmapDecoder_Initialize(*decoder, pIStream, metadataOptions); + if (FAILED(res)) + { + res_wine = IWICBitmapDecoder_QueryInterface(*decoder, &IID_IWICWineDecoder, (void **)&wine_decoder); + if (FAILED(res_wine)) + { + IWICBitmapDecoder_Release(*decoder); + *decoder = NULL; + goto next; + } - IWICBitmapDecoderInfo_Release(decoderinfo); + res_wine = IWICWineDecoder_Initialize(wine_decoder, pIStream, metadataOptions); + if (FAILED(res_wine)) + { + IWICBitmapDecoder_Release(*decoder); + *decoder = NULL; + goto next; } - IUnknown_Release(unkdecoderinfo); + res = res_wine; } - else - break; + + next: + if (wine_decoder) IWICWineDecoder_Release(wine_decoder); + if (decoderinfo) IWICBitmapDecoderInfo_Release(decoderinfo); + IUnknown_Release(unkdecoderinfo); + if (found) break; } IEnumUnknown_Release(enumdecoders); - - return WINCODEC_ERR_COMPONENTNOTFOUND; + if (!found) res = WINCODEC_ERR_COMPONENTNOTFOUND; + return res; } static HRESULT WINAPI ImagingFactory_CreateDecoderFromStream(

1 0

Ziqing Hui : windowscodecs: Return fail for unsupported format in DdsDecoder_Initialize().
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: f98a32ad471e95ab2c70563b24d5a0a1368439ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=f98a32ad471e95ab2c70563b… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jul 15 22:01:14 2020 +0800 windowscodecs: Return fail for unsupported format in DdsDecoder_Initialize(). 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 | 18 +++++++++++++++++- dlls/windowscodecs/tests/ddsformat.c | 3 --- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index f7b5201321..bbd30a90d2 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -626,10 +626,26 @@ static HRESULT WINAPI DdsDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p WICDecodeOptions cacheOptions) { DdsDecoder *This = impl_from_IWICBitmapDecoder(iface); + HRESULT hr; TRACE("(%p,%p,%x)\n", iface, pIStream, cacheOptions); - return IWICWineDecoder_Initialize(&This->IWICWineDecoder_iface, pIStream, cacheOptions); + EnterCriticalSection(&This->lock); + + hr = IWICWineDecoder_Initialize(&This->IWICWineDecoder_iface, pIStream, cacheOptions); + if (FAILED(hr)) goto end; + + if (!This->info.compressed || This->info.dimension == WICDdsTextureCube) { + IStream_Release(pIStream); + This->stream = NULL; + This->initialized = FALSE; + hr = WINCODEC_ERR_BADHEADER; + } + +end: + LeaveCriticalSection(&This->lock); + + return hr; } static HRESULT WINAPI DdsDecoder_GetContainerFormat(IWICBitmapDecoder *iface, diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index ecf7de0bc4..32a854fbb0 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -237,7 +237,6 @@ static HRESULT init_decoder(IWICBitmapDecoder *decoder, IWICStream *stream, HRES if (index == -1) { ok(hr == S_OK, "Decoder initialize failed, hr %#x\n", hr); } else { - todo_wine_if(wine_init) ok(hr == expected, "Test %u: Expected hr %#x, got %#x\n", index, expected, hr); } @@ -251,10 +250,8 @@ static HRESULT init_decoder(IWICBitmapDecoder *decoder, IWICStream *stream, HRES if (hr == S_OK) { hr = IWICWineDecoder_Initialize(wine_decoder, (IStream*)stream, WICDecodeMetadataCacheOnDemand); if (index == -1) { - todo_wine ok(hr == S_OK, "Initialize failed, hr %#x\n", hr); } else { - todo_wine ok(hr == S_OK, "Test %u: Initialize failed, hr %#x\n", index, hr); }

1 0