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

Jiajin Cui : gdiplus: Fix crash if failed to create bitmap.
by Alexandre Julliard July 20, 2020

July 20, 2020

Module: wine Branch: master Commit: f992bc77c87889c37cbd80aced707e6d1a537c8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f992bc77c87889c37cbd80ac… Author: Jiajin Cui <cuijiajin(a)uniontech.com> Date: Fri Jul 17 17:34:09 2020 +0800 gdiplus: Fix crash if failed to create bitmap. Signed-off-by: Jiajin Cui <cuijiajin(a)uniontech.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5194719fd6..1307bdc1ef 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -459,6 +459,9 @@ static GpStatus alpha_blend_hdc_pixels(GpGraphics *graphics, INT dst_x, INT dst_ hbitmap = CreateDIBSection(hdc, (BITMAPINFO*)&bih, DIB_RGB_COLORS, (void**)&temp_bits, NULL, 0); + if(!hbitmap || !temp_bits) + goto done; + if ((GetDeviceCaps(graphics->hdc, TECHNOLOGY) == DT_RASPRINTER && GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE) || fmt & PixelFormatPAlpha) @@ -470,9 +473,12 @@ static GpStatus alpha_blend_hdc_pixels(GpGraphics *graphics, INT dst_x, INT dst_ SelectObject(hdc, hbitmap); gdi_alpha_blend(graphics, dst_x, dst_y, src_width, src_height, hdc, 0, 0, src_width, src_height); - DeleteDC(hdc); + DeleteObject(hbitmap); +done: + DeleteDC(hdc); + return Ok; }

1 0

Alex Henrie : kernel32: Stub SetFirmwareEnvironmentVariableW.
by Alexandre Julliard July 20, 2020

July 20, 2020

Module: wine Branch: master Commit: f189bd4ba860c7467ddd841dc81be779db3329bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f189bd4ba860c7467ddd841d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jul 19 22:57:22 2020 -0600 kernel32: Stub SetFirmwareEnvironmentVariableW. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49581 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-downlevel-kernel32-l2-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-downlevel-kernel32-l2-1-0/api-ms-win-downlevel-kernel32-l2-1-0.spec b/dlls/api-ms-win-downlevel-kernel32-l2-1-0/api-ms-win-downlevel-kernel32-l2-1-0.spec index c007021e3e..750badec24 100644 --- a/dlls/api-ms-win-downlevel-kernel32-l2-1-0/api-ms-win-downlevel-kernel32-l2-1-0.spec +++ b/dlls/api-ms-win-downlevel-kernel32-l2-1-0/api-ms-win-downlevel-kernel32-l2-1-0.spec @@ -94,7 +94,7 @@ @ stdcall RegisterWaitForSingleObject(ptr long ptr ptr long long) kernel32.RegisterWaitForSingleObject @ stdcall SetConsoleTitleA(str) kernel32.SetConsoleTitleA @ stdcall SetFileCompletionNotificationModes(long long) kernel32.SetFileCompletionNotificationModes -@ stub SetFirmwareEnvironmentVariableW +@ stdcall SetFirmwareEnvironmentVariableW(wstr wstr ptr long) kernel32.SetFirmwareEnvironmentVariableW @ stdcall SetHandleCount(long) kernel32.SetHandleCount @ stdcall SetMailslotInfo(long long) kernel32.SetMailslotInfo @ stdcall SetProcessAffinityMask(long long) kernel32.SetProcessAffinityMask diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 0c64144d7f..7b89d19c2d 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1414,7 +1414,7 @@ @ stdcall -import SetFileTime(long ptr ptr ptr) @ stdcall -import SetFileValidData(ptr int64) # @ stub SetFirmwareEnvironmentVariableA -# @ stub SetFirmwareEnvironmentVariableW +@ stdcall SetFirmwareEnvironmentVariableW(wstr wstr ptr long) @ stdcall SetHandleContext(long long) @ stdcall SetHandleCount(long) @ stdcall -import SetHandleInformation(long long long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index cfc11c867a..b2bd5980fd 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -770,6 +770,16 @@ DWORD WINAPI GetFirmwareEnvironmentVariableW(LPCWSTR name, LPCWSTR guid, PVOID b return 0; } +/*********************************************************************** + * SetFirmwareEnvironmentVariableW (KERNEL32.@) + */ +BOOL WINAPI SetFirmwareEnvironmentVariableW(const WCHAR *name, const WCHAR *guid, void *buffer, DWORD size) +{ + FIXME("stub: %s %s %p %u\n", debugstr_w(name), debugstr_w(guid), buffer, size); + SetLastError(ERROR_INVALID_FUNCTION); + return FALSE; +} + /********************************************************************** * GetNumaNodeProcessorMask (KERNEL32.@) */

1 0

Alexandre Julliard : ntdll: Move the locale system calls to the Unix library.
by Alexandre Julliard July 20, 2020

July 20, 2020

Module: wine Branch: master Commit: 9def213de32a80fcfb05a7474be42f44d7a0c939 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9def213de32a80fcfb05a747… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 20 12:26:08 2020 +0200 ntdll: Move the locale system calls to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 79 ++++++++++++--------------------------------------- dlls/ntdll/ntdll.spec | 20 ++++++------- dlls/ntdll/unix/env.c | 58 +++++++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+), 71 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9def213de32a80fcfb05…

1 0

Zebediah Figura : quartz/vmr9: Render preroll samples.
by Alexandre Julliard July 20, 2020

July 20, 2020

Module: wine Branch: master Commit: b9063c4b7e73d5fad19741c3ec0c485ca0e5b499 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9063c4b7e73d5fad19741c3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 20 10:25:28 2020 -0500 quartz/vmr9: Render preroll samples. The documentation specifies that preroll samples shouldn't be rendered, but the VMR9 renders them anyway. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 3 +++ dlls/quartz/tests/vmr9.c | 3 +++ dlls/quartz/vmr9.c | 16 ---------------- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index cf4675ce06..f1b19aa663 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -983,6 +983,9 @@ static HANDLE send_frame(IMemInputPin *sink) hr = IMediaSample_SetTime(sample, &start_time, &end_time); ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaSample_SetPreroll(sample, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + params->sink = sink; params->sample = sample; thread = CreateThread(NULL, 0, frame_thread, params, 0, NULL); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index cd4df58f79..e630deb8d7 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -1011,6 +1011,9 @@ static HANDLE send_frame_time(IMemInputPin *sink, REFERENCE_TIME start_time, DWO hr = IMediaSample_SetTime(sample, &start_time, &end_time); ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaSample_SetPreroll(sample, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + params->sink = sink; params->sample = sample; thread = CreateThread(NULL, 0, frame_thread, params, 0, NULL); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index aeaefd52c6..a3f5501106 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -244,12 +244,6 @@ static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMedi if (IMediaSample_IsSyncPoint(sample) == S_OK) info.dwFlags |= VMR9Sample_SyncPoint; - /* If we render ourselves, and this is a preroll sample, discard it */ - if (info.dwFlags & VMR9Sample_Preroll) - { - return S_OK; - } - if (FAILED(hr = IMediaSample_GetPointer(sample, &data))) { ERR("Failed to get pointer to sample data, hr %#x.\n", hr); @@ -504,15 +498,6 @@ static void vmr_stop_stream(struct strmbase_renderer *iface) ResetEvent(This->run_event); } -static HRESULT WINAPI VMR9_ShouldDrawSampleNow(struct strmbase_renderer *iface, - IMediaSample *pSample, REFERENCE_TIME *start, REFERENCE_TIME *end) -{ - /* Preroll means the sample isn't shown, this is used for key frames and things like that */ - if (IMediaSample_IsPreroll(pSample) == S_OK) - return E_FAIL; - return S_FALSE; -} - static HRESULT vmr_connect(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) { struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); @@ -668,7 +653,6 @@ static const struct strmbase_renderer_ops renderer_ops = .renderer_init_stream = vmr_init_stream, .renderer_start_stream = vmr_start_stream, .renderer_stop_stream = vmr_stop_stream, - .pfnShouldDrawSampleNow = VMR9_ShouldDrawSampleNow, .renderer_connect = vmr_connect, .pfnBreakConnect = VMR9_BreakConnect, .renderer_destroy = vmr_destroy,

1 0

Jacek Caban : wineconsole: Use IOCTL_CONDRV_SET_INPUT_INFO to set console window handle.
by Alexandre Julliard July 20, 2020

July 20, 2020

Module: wine Branch: master Commit: 2fc11e8952bff715115425346d0ccbaed146bcd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fc11e8952bff71511542534… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 20 15:38:50 2020 +0200 wineconsole: Use IOCTL_CONDRV_SET_INPUT_INFO to set console window handle. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 1fad63d72c..eaf67f8875 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -613,6 +613,7 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna enum init_return (*backend)(struct inner_data*), INT nCmdShow) { + struct condrv_input_info_params input_params; OBJECT_ATTRIBUTES attr = {sizeof(attr)}; struct inner_data* data = NULL; DWORD ret; @@ -719,12 +720,18 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna WINECON_SetConfig(data, &cfg); data->curcfg.registry = cfg.registry; WINECON_DumpConfig("fint", &data->curcfg); + + memset(&input_params, 0, sizeof(input_params)); + input_params.mask = SET_CONSOLE_INPUT_INFO_WIN; + input_params.info.win = condrv_handle(data->hWnd); + ret = DeviceIoControl(data->hConIn, IOCTL_CONDRV_SET_INPUT_INFO, &input_params, sizeof(input_params), + NULL, 0, NULL, NULL); + if (!ret) goto error; + SERVER_START_REQ( set_console_input_info ) { req->handle = wine_server_obj_handle( data->hConIn ); - req->win = wine_server_user_handle( data->hWnd ); - req->mask = SET_CONSOLE_INPUT_INFO_TITLE | - SET_CONSOLE_INPUT_INFO_WIN; + req->mask = SET_CONSOLE_INPUT_INFO_TITLE; wine_server_add_data( req, appname, lstrlenW(appname) * sizeof(WCHAR) ); ret = !wine_server_call_err( req ); }

1 0

Jacek Caban : include: Add missing PROC_THREAD_ATTRIBUTE defines.
by Alexandre Julliard July 20, 2020

July 20, 2020

Module: wine Branch: master Commit: e5851ce93724040de842149d6724be96dbf6733b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5851ce93724040de842149d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 20 15:35:47 2020 +0200 include: Add missing PROC_THREAD_ATTRIBUTE defines. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/winbase.h b/include/winbase.h index 981d4ea76a..319423b572 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1691,6 +1691,8 @@ typedef enum _PROC_THREAD_ATTRIBUTE_NUM ProcThreadAttributeAllApplicationPackagesPolicy = 15, ProcThreadAttributeWin32kFilter = 16, ProcThreadAttributeSafeOpenPromptOriginClaim = 17, + ProcThreadAttributeDesktopAppPolicy = 18, + ProcThreadAttributePseudoConsole = 22, } PROC_THREAD_ATTRIBUTE_NUM; #define PROC_THREAD_ATTRIBUTE_PARENT_PROCESS (ProcThreadAttributeParentProcess | PROC_THREAD_ATTRIBUTE_INPUT) @@ -1706,6 +1708,8 @@ typedef enum _PROC_THREAD_ATTRIBUTE_NUM #define PROC_THREAD_ATTRIBUTE_CHILD_PROCESS_POLICY (ProcThreadAttributeChildProcessPolicy | PROC_THREAD_ATTRIBUTE_INPUT) #define PROC_THREAD_ATTRIBUTE_ALL_APPLICATION_PACKAGES_POLICY (ProcThreadAttributeAllApplicationPackagesPolicy | PROC_THREAD_ATTRIBUTE_INPUT) #define PROC_THREAD_ATTRIBUTE_WIN32K_FILTER (ProcThreadAttributeWin32kFilter | PROC_THREAD_ATTRIBUTE_INPUT) +#define PROC_THREAD_ATTRIBUTE_DESKTOP_APP_POLICY (ProcThreadAttributeDesktopAppPolicy | PROC_THREAD_ATTRIBUTE_INPUT) +#define PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE (ProcThreadAttributePseudoConsole | PROC_THREAD_ATTRIBUTE_INPUT) #define SYMBOLIC_LINK_FLAG_DIRECTORY (0x1) #define VALID_SYMBOLIC_LINK_FLAGS SYMBOLIC_LINK_FLAG_DIRECTORY

1 0

Zebediah Figura : ntdll/tests: Make info.c less verbose by default.
by Alexandre Julliard July 20, 2020

July 20, 2020

Module: wine Branch: master Commit: ff9ce43c0127bd23d5aaf9cb6bbb28fcbe729fac URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff9ce43c0127bd23d5aaf9cb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 17 19:12:34 2020 -0500 ntdll/tests: Make info.c less verbose by default. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 230 +++++++++++------------------------------------- 1 file changed, 53 insertions(+), 177 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ff9ce43c0127bd23d5aa…

1 0

Ziqing Hui : windowscodecs: Add more supported DXGI formats for DDS decoder. And return the actual formats for uncompressed DDS images.
by Alexandre Julliard July 20, 2020

July 20, 2020

Module: wine Branch: master Commit: 0b676b55cc45e6b0c2045a78190154580c85de00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b676b55cc45e6b0c2045a78… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat Jul 18 11:14:48 2020 +0800 windowscodecs: Add more supported DXGI formats for DDS decoder. And return the actual formats for uncompressed DDS images. 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 | 80 ++++++++++++++++++++++++++---------- dlls/windowscodecs/tests/ddsformat.c | 16 +++++--- 2 files changed, 70 insertions(+), 26 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 527da1d6b3..41e92a2b48 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -143,6 +143,50 @@ typedef struct DdsFrameDecode { dds_frame_info info; } DdsFrameDecode; +static struct dds_format { + DDS_PIXELFORMAT pixel_format; + DXGI_FORMAT dxgi_format; +} dds_formats[] = { + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('D', 'X', 'T', '1'), 0, 0, 0, 0, 0 }, DXGI_FORMAT_BC1_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('D', 'X', 'T', '2'), 0, 0, 0, 0, 0 }, DXGI_FORMAT_BC2_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('D', 'X', 'T', '3'), 0, 0, 0, 0, 0 }, DXGI_FORMAT_BC2_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('D', 'X', 'T', '4'), 0, 0, 0, 0, 0 }, DXGI_FORMAT_BC3_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('D', 'X', 'T', '5'), 0, 0, 0, 0, 0 }, DXGI_FORMAT_BC3_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('B', 'C', '4', 'U'), 0, 0, 0, 0, 0 }, DXGI_FORMAT_BC4_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('B', 'C', '4', 'S'), 0, 0, 0, 0, 0 }, DXGI_FORMAT_BC4_SNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('B', 'C', '5', 'U'), 0, 0, 0, 0, 0 }, DXGI_FORMAT_BC5_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('B', 'C', '5', 'S'), 0, 0, 0, 0, 0 }, DXGI_FORMAT_BC5_SNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('A', 'T', 'I', '1'), 0, 0, 0, 0, 0 }, DXGI_FORMAT_BC4_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('A', 'T', 'I', '2'), 0, 0, 0, 0, 0 }, DXGI_FORMAT_BC5_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('R', 'G', 'B', 'G'), 0, 0, 0, 0, 0 }, DXGI_FORMAT_R8G8_B8G8_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('G', 'R', 'G', 'B'), 0, 0, 0, 0, 0 }, DXGI_FORMAT_G8R8_G8B8_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('D', 'X', '1', '0'), 0, 0, 0, 0, 0 }, DXGI_FORMAT_UNKNOWN }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, 0x24, 0, 0, 0, 0, 0 }, DXGI_FORMAT_R16G16B16A16_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, 0x6E, 0, 0, 0, 0, 0 }, DXGI_FORMAT_R16G16B16A16_SNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, 0x6F, 0, 0, 0, 0, 0 }, DXGI_FORMAT_R16_FLOAT }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, 0x70, 0, 0, 0, 0, 0 }, DXGI_FORMAT_R16G16_FLOAT }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, 0x71, 0, 0, 0, 0, 0 }, DXGI_FORMAT_R16G16B16A16_FLOAT }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, 0x72, 0, 0, 0, 0, 0 }, DXGI_FORMAT_R32_FLOAT }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, 0x73, 0, 0, 0, 0, 0 }, DXGI_FORMAT_R32G32_FLOAT }, + { { sizeof(DDS_PIXELFORMAT), DDPF_FOURCC, 0x74, 0, 0, 0, 0, 0 }, DXGI_FORMAT_R32G32B32A32_FLOAT }, + { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 32, 0xFF,0xFF00,0xFF0000,0xFF000000 }, DXGI_FORMAT_R8G8B8A8_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 32, 0xFF0000,0xFF00,0xFF,0xFF000000 }, DXGI_FORMAT_B8G8R8A8_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 32, 0xFF0000,0xFF00,0xFF,0 }, DXGI_FORMAT_B8G8R8X8_UNORM }, + /* The red and blue masks are swapped for DXGI_FORMAT_R10G10B10A2_UNORM. + * For "correct" one, the RGB masks should be 0x3FF00000,0xFFC00,0x3FF. + * see: https://walbourn.github.io/dds-update-and-1010102-problems */ + { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 32, 0x3FF,0xFFC00,0x3FF00000,0xC0000000 }, DXGI_FORMAT_R10G10B10A2_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_RGB , 0, 32, 0xFFFF,0xFFFF0000,0,0 }, DXGI_FORMAT_R16G16_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_RGB , 0, 32, 0xFFFFFFFF,0,0,0 }, DXGI_FORMAT_R32_FLOAT }, + { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 16, 0xF800,0x7E0,0x1F,0 }, DXGI_FORMAT_B5G6R5_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 16, 0x7C00,0x3E0,0x1F,0x8000 }, DXGI_FORMAT_B5G5R5A1_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_RGB, 0, 16, 0xF00,0xF0,0xF,0xF000 }, DXGI_FORMAT_B4G4R4A4_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_ALPHA, 0, 8, 0,0,0,0xFF }, DXGI_FORMAT_A8_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_LUMINANCE, 0, 16, 0xFFFF,0,0,0 }, DXGI_FORMAT_R16_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_LUMINANCE, 0, 16, 0xFF,0,0,0xFF00 }, DXGI_FORMAT_R8G8_UNORM }, + { { sizeof(DDS_PIXELFORMAT), DDPF_LUMINANCE, 0, 8, 0xFF,0,0,0 }, DXGI_FORMAT_R8_UNORM } +}; + static HRESULT WINAPI DdsDecoder_Dds_GetFrame(IWICDdsDecoder *, UINT, UINT, UINT, IWICBitmapFrameDecode **); static inline BOOL has_extended_header(DDS_HEADER *header) @@ -173,25 +217,23 @@ static WICDdsDimension get_dimension(DDS_HEADER *header, DDS_HEADER_DXT10 *heade } } -static DXGI_FORMAT get_format_from_fourcc(DWORD fourcc) +static DXGI_FORMAT get_dxgi_format(DDS_PIXELFORMAT *pixel_format) { - switch (fourcc) + UINT i; + + for (i = 0; i < ARRAY_SIZE(dds_formats); i++) { - case MAKEFOURCC('D', 'X', 'T', '1'): - return DXGI_FORMAT_BC1_UNORM; - case MAKEFOURCC('D', 'X', 'T', '2'): - case MAKEFOURCC('D', 'X', 'T', '3'): - return DXGI_FORMAT_BC2_UNORM; - case MAKEFOURCC('D', 'X', 'T', '4'): - case MAKEFOURCC('D', 'X', 'T', '5'): - return DXGI_FORMAT_BC3_UNORM; - case MAKEFOURCC('D', 'X', '1', '0'): - /* format is indicated in extended header */ - return DXGI_FORMAT_UNKNOWN; - default: - /* there are DDS files where fourCC is set directly to DXGI_FORMAT enumeration value */ - return fourcc; + 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; } + + return DXGI_FORMAT_UNKNOWN; } static WICDdsAlphaMode get_alpha_mode_from_fourcc(DWORD fourcc) @@ -253,11 +295,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 { - if (info->compressed) { - info->format = get_format_from_fourcc(header->ddspf.fourCC); - } else { - info->format = DXGI_FORMAT_R8G8B8A8_UNORM; - } + info->format = get_dxgi_format(&header->ddspf); info->dimension = get_dimension(header, NULL); info->alpha_mode = get_alpha_mode_from_fourcc(header->ddspf.fourCC); info->data_offset = sizeof(DWORD) + sizeof(*header); diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index d6b1e174c6..90333dee40 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -213,13 +213,13 @@ static struct test_data { BOOL wine_init; } test_data[] = { { test_dds_bgr565, sizeof(test_dds_bgr565), 1, 2, &GUID_WICPixelFormat32bppBGRA, - { 4, 4, 1, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, + { 4, 4, 1, 1, 1, DXGI_FORMAT_B5G6R5_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, { test_dds_24bpp, sizeof(test_dds_24bpp), 1, 3, &GUID_WICPixelFormat32bppBGRA, - { 1, 1, 1, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, + { 1, 1, 1, 1, 1, DXGI_FORMAT_UNKNOWN, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, { test_dds_32bpp_xrgb, sizeof(test_dds_32bpp_xrgb), 1, 4, &GUID_WICPixelFormat32bppBGRA, - { 1, 1, 1, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, + { 1, 1, 1, 1, 1, DXGI_FORMAT_B8G8R8X8_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, { test_dds_32bpp_argb, sizeof(test_dds_32bpp_argb), 1, 4, &GUID_WICPixelFormat32bppBGRA, - { 1, 1, 1, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, + { 1, 1, 1, 1, 1, DXGI_FORMAT_B8G8R8A8_UNORM, WICDdsTexture2D, WICDdsAlphaModeUnknown }, TRUE }, { test_dds_dxt1, sizeof(test_dds_dxt1), 1, 8, &GUID_WICPixelFormat32bppPBGRA, { 4, 4, 1, 1, 1, DXGI_FORMAT_BC1_UNORM, WICDdsTexture2D, WICDdsAlphaModePremultiplied } }, { test_dds_mipmaps, sizeof(test_dds_mipmaps), 3, 8, &GUID_WICPixelFormat32bppPBGRA, @@ -535,7 +535,13 @@ static void test_dds_decoder_frame_properties(IWICBitmapFrameDecode *frame_decod /* frame format information tests */ - if (test_data[i].expected_parameters.DxgiFormat == DXGI_FORMAT_R8G8B8A8_UNORM) { + 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 {

1 0

Ziqing Hui : windowscodecs/tests: Add more RGB images for DDS tests.
by Alexandre Julliard July 20, 2020

July 20, 2020

Module: wine Branch: master Commit: c801bde2f0c592c39c00ac60960c23397310d7e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c801bde2f0c592c39c00ac60… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat Jul 18 11:14:22 2020 +0800 windowscodecs/tests: Add more RGB images for DDS tests. 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 | 136 +++++++++++++++++++++++------------ 1 file changed, 92 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c801bde2f0c592c39c00…

1 0

Ziqing Hui : windowscodecs: Introduce is_compressed(). And fix some format checks.
by Alexandre Julliard July 20, 2020

July 20, 2020

Module: wine Branch: master Commit: e74d39c32d4f49d9b983811772f3324bcbe3ce55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e74d39c32d4f49d9b9838117… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat Jul 18 11:15:38 2020 +0800 windowscodecs: Introduce is_compressed(). And fix some format checks. 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 | 37 ++++++++++++++++++++++++++++-------- dlls/windowscodecs/tests/ddsformat.c | 5 ++--- 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 41e92a2b48..5de3759527 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -105,7 +105,6 @@ typedef struct dds_info { UINT frame_count; UINT data_offset; UINT bytes_per_block; - BOOL compressed; DXGI_FORMAT format; WICDdsDimension dimension; WICDdsAlphaMode alpha_mode; @@ -187,6 +186,16 @@ static struct dds_format { { { sizeof(DDS_PIXELFORMAT), DDPF_LUMINANCE, 0, 8, 0xFF,0,0,0 }, DXGI_FORMAT_R8_UNORM } }; +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 HRESULT WINAPI DdsDecoder_Dds_GetFrame(IWICDdsDecoder *, UINT, UINT, UINT, IWICBitmapFrameDecode **); static inline BOOL has_extended_header(DDS_HEADER *header) @@ -273,13 +282,22 @@ static UINT get_bytes_per_block_from_format(DXGI_FORMAT format) } } +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 void get_dds_info(dds_info* info, DDS_HEADER *header, DDS_HEADER_DXT10 *header_dxt10) { int i; UINT depth; - info->compressed = !(header->ddspf.flags & (DDPF_RGB | DDPF_LUMINANCE)); - info->width = header->width; info->height = header->height; info->depth = 1; @@ -303,10 +321,10 @@ static void get_dds_info(dds_info* info, DDS_HEADER *header, DDS_HEADER_DXT10 *h info->pixel_format = (info->alpha_mode == WICDdsAlphaModePremultiplied) ? &GUID_WICPixelFormat32bppPBGRA : &GUID_WICPixelFormat32bppBGRA; - if (info->compressed) { - info->bytes_per_block = get_bytes_per_block_from_format(info->format); - } else { + if (header->ddspf.flags & (DDPF_RGB | DDPF_ALPHA | DDPF_LUMINANCE)) { info->bytes_per_block = header->ddspf.rgbBitCount / 8; + } else { + info->bytes_per_block = get_bytes_per_block_from_format(info->format); } /* get frame count */ @@ -685,7 +703,10 @@ static HRESULT WINAPI DdsDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p hr = IWICWineDecoder_Initialize(&This->IWICWineDecoder_iface, pIStream, cacheOptions); if (FAILED(hr)) goto end; - if (!This->info.compressed || This->info.dimension == WICDdsTextureCube) { + if (This->info.dimension == WICDdsTextureCube || + (This->info.format != DXGI_FORMAT_BC1_UNORM && + This->info.format != DXGI_FORMAT_BC2_UNORM && + This->info.format != DXGI_FORMAT_BC3_UNORM)) { IStream_Release(pIStream); This->stream = NULL; This->initialized = FALSE; @@ -911,7 +932,7 @@ static HRESULT WINAPI DdsDecoder_Dds_GetFrame(IWICDdsDecoder *iface, } bytes_per_block = This->info.bytes_per_block; - if (This->info.compressed) { + if (is_compressed(This->info.format)) { block_width = DDS_BLOCK_WIDTH; block_height = DDS_BLOCK_HEIGHT; } else { diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index f1141c15a0..c5147c3327 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -331,7 +331,6 @@ static HRESULT init_decoder(IWICBitmapDecoder *decoder, IWICStream *stream, HRES if (index == -1) { ok(hr == S_OK || wine_init, "Decoder initialize failed, hr %#x\n", hr); } else { - todo_wine_if(index == 9 || index == 10 || index == 11) ok(hr == expected, "Test %u: Expected hr %#x, got %#x\n", index, expected, hr); } @@ -608,7 +607,7 @@ static void test_dds_decoder_frame_properties(IWICBitmapFrameDecode *frame_decod ok(format_info.DxgiFormat == test_data[i].expected_parameters.DxgiFormat, "Test %u, frame %u: Expected DXGI format %#x, got %#x\n", i, frame_index, test_data[i].expected_parameters.DxgiFormat, format_info.DxgiFormat); - todo_wine_if(i == 4 || i == 5 || i == 6) { + todo_wine_if(i == 4 || i == 5 || i == 6) ok(format_info.BytesPerBlock == test_data[i].expected_bytes_per_block, "Test %u, frame %u: Expected bytes per block %u, got %u\n", i, frame_index, test_data[i].expected_bytes_per_block, format_info.BytesPerBlock); @@ -618,7 +617,7 @@ static void test_dds_decoder_frame_properties(IWICBitmapFrameDecode *frame_decod ok(format_info.BlockHeight == expected_block_height, "Test %u, frame %u: Expected block height %u, got %u\n", i, frame_index, expected_block_height, format_info.BlockHeight); - } + /* size in blocks tests */

1 0