wine-commits July 2020

wine-commits@winehq.org

1 participants
826 discussions

Zebediah Figura : winegstreamer: Release the IAsyncReader on disconnection.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: e7075780077cbbcb9d994f4a4cdbba6cc88b2d01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7075780077cbbcb9d994f4a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 23 19:29:22 2020 -0500 winegstreamer: Release the IAsyncReader on disconnection. This allows "Zero Escape: Nine Hours, Nine Persons, Nine Doors" to start. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/mediadet.c | 4 ++-- dlls/winegstreamer/gstdemux.c | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 9bf6c43a2a..dc83bb9a0a 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -1147,9 +1147,9 @@ START_TEST(mediadet) test_COM_sg_enumpins(); ret = DeleteFileW(test_avi_filename); - todo_wine ok(ret, "Failed to delete file, error %u.\n", GetLastError()); + ok(ret, "Failed to delete file, error %u.\n", GetLastError()); ret = DeleteFileW(test_sound_avi_filename); - todo_wine ok(ret, "Failed to delete file, error %u.\n", GetLastError()); + ok(ret, "Failed to delete file, error %u.\n", GetLastError()); CoUninitialize(); } diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 9de1b16411..fe5fe0e60d 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1598,6 +1598,9 @@ static void gstdemux_sink_disconnect(struct strmbase_sink *iface) mark_wine_thread(); GST_RemoveOutputPins(filter); + + IAsyncReader_Release(filter->reader); + filter->reader = NULL; } static const struct strmbase_sink_ops sink_ops =

1 0

Zebediah Figura : winegstreamer: Preserve the frame rate when converting video formats.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: 5ea1287e08a78e182bfca19d0d1069ca0408bb95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ea1287e08a78e182bfca19d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 23 19:29:21 2020 -0500 winegstreamer: Preserve the frame rate when converting video formats. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 1aa564f212..9de1b16411 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1718,13 +1718,18 @@ static HRESULT gstdecoder_source_get_media_type(struct gstdemux_source *pin, if (!strcmp(type, "video/x-raw") && index < ARRAY_SIZE(video_formats)) { - gint width, height; + gint width, height, fps_n, fps_d; GstVideoInfo info; gst_caps_unref(caps); gst_structure_get_int(structure, "width", &width); gst_structure_get_int(structure, "height", &height); gst_video_info_set_format(&info, video_formats[index], width, height); + if (gst_structure_get_fraction(structure, "framerate", &fps_n, &fps_d) && fps_n) + { + info.fps_n = fps_n; + info.fps_d = fps_d; + } if (!amt_from_gst_video_info(&info, mt)) return E_OUTOFMEMORY; return S_OK;

1 0

Zebediah Figura : wine.inf: Map the Sounds section of win.ini to the registry.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: 90ed63618a5733b10e8e9855833d80fce96270b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90ed63618a5733b10e8e9855… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 23 18:40:59 2020 -0500 wine.inf: Map the Sounds section of win.ini to the registry. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 9f612cdc76..35992a01df 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -569,6 +569,7 @@ HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"desktop",,"USR:Control Panel\Des HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"devices",,"USR:Software\Microsoft\Windows NT\CurrentVersion\Devices" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"extensions",,"USR:Software\Microsoft\Windows NT\CurrentVersion\Extensions" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"printerports",,"USR:Software\Microsoft\Windows NT\CurrentVersion\PrinterPorts" +HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"sounds",,"USR:Control Panel\Sounds" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini\windows,,,"USR:Software\Microsoft\Windows NT\CurrentVersion\Windows" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini\windows,"CursorBlinkRate",,"USR:Control Panel\Desktop" HKLM,%CurrentVersionNT%\LanguagePack,,16

1 0

Zebediah Figura : winspool: Stop setting the PrinterPorts profile section.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: 8337533675eb8ffed946a919a945f92e1f4e69d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8337533675eb8ffed946a919… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 23 18:40:58 2020 -0500 winspool: Stop setting the PrinterPorts profile section. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index f9c10f3de1..fb9c1599d3 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -259,7 +259,6 @@ static const WCHAR Previous_NamesW[] = {'P','r','e','v','i','o','u','s',' ','N', static const WCHAR Print_ProcessorW[] = {'P','r','i','n','t',' ','P','r','o','c','e','s','s','o','r',0}; static const WCHAR Printer_DriverW[] = {'P','r','i','n','t','e','r',' ','D','r','i','v','e','r',0}; static const WCHAR PrinterDriverDataW[] = {'P','r','i','n','t','e','r','D','r','i','v','e','r','D','a','t','a',0}; -static const WCHAR PrinterPortsW[] = {'P','r','i','n','t','e','r','P','o','r','t','s',0}; static const WCHAR PriorityW[] = {'P','r','i','o','r','i','t','y',0}; static const WCHAR ProviderW[] = {'P','r','o','v','i','d','e','r',0}; static const WCHAR Separator_FileW[] = {'S','e','p','a','r','a','t','o','r',' ','F','i','l','e',0}; @@ -3171,7 +3170,6 @@ static void set_devices_and_printerports(PRINTER_INFO_2W *pi) } lstrcatW(devline, timeout_15_45); - WriteProfileStringW(PrinterPortsW, pi->pPrinterName, devline); if (!RegCreateKeyW(HKEY_CURRENT_USER, WinNT_CV_PrinterPortsW, &hkey)) { RegSetValueExW(hkey, pi->pPrinterName, 0, REG_SZ, (LPBYTE)devline, (lstrlenW(devline) + 1) * sizeof(WCHAR)); @@ -3427,7 +3425,6 @@ BOOL WINAPI DeletePrinter(HANDLE hPrinter) RegDeleteTreeW(hkeyPrinters, lpNameW); RegCloseKey(hkeyPrinters); } - WriteProfileStringW(PrinterPortsW, lpNameW, NULL); if(RegCreateKeyW(HKEY_CURRENT_USER, user_printers_reg_key, &hkey) == ERROR_SUCCESS) { RegDeleteValueW(hkey, lpNameW);

1 0

Zebediah Figura : wine.inf: Map the PrinterPorts section of win.ini to the registry.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: d6a6d6a60ee1a0e43f1b734a39afdd525fc5a640 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6a6d6a60ee1a0e43f1b734a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 23 18:40:57 2020 -0500 wine.inf: Map the PrinterPorts section of win.ini to the registry. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 34d0696388..9f612cdc76 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -568,6 +568,7 @@ HKLM,%CurrentVersionNT%\Image File Execution Options,,16 HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"desktop",,"USR:Control Panel\Desktop" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"devices",,"USR:Software\Microsoft\Windows NT\CurrentVersion\Devices" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"extensions",,"USR:Software\Microsoft\Windows NT\CurrentVersion\Extensions" +HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"printerports",,"USR:Software\Microsoft\Windows NT\CurrentVersion\PrinterPorts" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini\windows,,,"USR:Software\Microsoft\Windows NT\CurrentVersion\Windows" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini\windows,"CursorBlinkRate",,"USR:Control Panel\Desktop" HKLM,%CurrentVersionNT%\LanguagePack,,16

1 0

Zebediah Figura : wine.inf: Map the Extensions section of win.ini to the registry.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: 73cd65fe8ef63a4eff26e1e211aac5c508080070 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73cd65fe8ef63a4eff26e1e2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 23 18:40:56 2020 -0500 wine.inf: Map the Extensions section of win.ini to the registry. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 82a6888643..34d0696388 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -567,6 +567,7 @@ HKLM,%CurrentVersionNT%\Hotfix\Q246009,"Installed",,"1" HKLM,%CurrentVersionNT%\Image File Execution Options,,16 HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"desktop",,"USR:Control Panel\Desktop" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"devices",,"USR:Software\Microsoft\Windows NT\CurrentVersion\Devices" +HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"extensions",,"USR:Software\Microsoft\Windows NT\CurrentVersion\Extensions" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini\windows,,,"USR:Software\Microsoft\Windows NT\CurrentVersion\Windows" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini\windows,"CursorBlinkRate",,"USR:Control Panel\Desktop" HKLM,%CurrentVersionNT%\LanguagePack,,16

1 0

Zebediah Figura : wine.inf: Map the Desktop section of win.ini to the registry.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: 13adddc0718a2e337d53f63a8d441db9653e7a67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13adddc0718a2e337d53f63a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 23 18:40:55 2020 -0500 wine.inf: Map the Desktop section of win.ini to the registry. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 65b224c37f..82a6888643 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -565,6 +565,7 @@ HKLM,%CurrentVersionNT%\FontSubstitutes,,16 HKLM,%CurrentVersionNT%\Gre_Initialize,,16 HKLM,%CurrentVersionNT%\Hotfix\Q246009,"Installed",,"1" HKLM,%CurrentVersionNT%\Image File Execution Options,,16 +HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"desktop",,"USR:Control Panel\Desktop" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"devices",,"USR:Software\Microsoft\Windows NT\CurrentVersion\Devices" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini\windows,,,"USR:Software\Microsoft\Windows NT\CurrentVersion\Windows" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini\windows,"CursorBlinkRate",,"USR:Control Panel\Desktop"

1 0

Ziqing Hui : windowscodecs: Fix alpha mode of DXT3 and DXT5 image.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: 72ad4e7dc18446b83d193dc293d0e59a5adaf4a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72ad4e7dc18446b83d193dc2… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Jul 23 14:03:00 2020 +0800 windowscodecs: Fix alpha mode of DXT3 and DXT5 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/ddsformat.c | 15 ++++++--------- dlls/windowscodecs/tests/ddsformat.c | 1 - 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 447eaf4178..87cbf4df91 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -259,15 +259,12 @@ static WICDdsAlphaMode get_alpha_mode_from_fourcc(DWORD fourcc) { switch (fourcc) { - case MAKEFOURCC('D', 'X', 'T', '1'): - case MAKEFOURCC('D', 'X', 'T', '2'): - case MAKEFOURCC('D', 'X', 'T', '4'): - return WICDdsAlphaModePremultiplied; - case MAKEFOURCC('D', 'X', 'T', '3'): - case MAKEFOURCC('D', 'X', 'T', '5'): - return WICDdsAlphaModeStraight; - default: - return WICDdsAlphaModeUnknown; + case MAKEFOURCC('D', 'X', 'T', '1'): + case MAKEFOURCC('D', 'X', 'T', '2'): + case MAKEFOURCC('D', 'X', 'T', '4'): + return WICDdsAlphaModePremultiplied; + default: + return WICDdsAlphaModeUnknown; } } diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 4d42cd3c2d..49de7e566e 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -650,7 +650,6 @@ static void test_dds_decoder_image_parameters(void) "Test %u: Expected DxgiFormat %#x, got %#x\n", i, test_data[i].expected_parameters.DxgiFormat, parameters.DxgiFormat); ok(parameters.Dimension == test_data[i].expected_parameters.Dimension, "Test %u: Expected Dimension %#x, got %#x\n", i, test_data[i].expected_parameters.Dimension, parameters.Dimension); - todo_wine_if(test_data[i].data == test_dds_dxt5 || test_data[i].data == test_dds_dxt3) ok(parameters.AlphaMode == test_data[i].expected_parameters.AlphaMode, "Test %u: Expected AlphaMode %#x, got %#x\n", i, test_data[i].expected_parameters.AlphaMode, parameters.AlphaMode); }

1 0

Ziqing Hui : windowscodecs/tests: Add more compressed test DDS images.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: 2d0480ecc39574cb65de1b92e49fddd9c018fd6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d0480ecc39574cb65de1b92… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Jul 23 14:02:36 2020 +0800 windowscodecs/tests: Add more compressed test 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/tests/ddsformat.c | 128 +++++++++++++++++++++++++++++------ 1 file changed, 107 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2d0480ecc39574cb65de…

1 0

Ziqing Hui : windowscodecs/tests: Add tests for alpha and luminance image.
by Alexandre Julliard 24 Jul '20

24 Jul '20

Module: wine Branch: master Commit: da0fc290424fe01b5e4cf9bbdb86fccfd0bcc4f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da0fc290424fe01b5e4cf9bb… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Jul 23 14:01:40 2020 +0800 windowscodecs/tests: Add tests for alpha and luminance 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 | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 31b65f73ca..85ffc7416a 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -24,6 +24,32 @@ #include "wincodec.h" #include "wine/test.h" +/* 1x1 uncompressed(Alpha) DDS image */ +static BYTE test_dds_alpha[] = { + 'D', 'D', 'S', ' ', 0x7C, 0x00, 0x00, 0x00, 0x07, 0x10, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xFF +}; + +/* 1x1 uncompressed(Luminance) DDS image */ +static BYTE test_dds_luminance[] = { + 'D', 'D', 'S', ' ', 0x7C, 0x00, 0x00, 0x00, 0x07, 0x10, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x82 +}; + /* 4x4 uncompressed(16bpp RGB565) DDS image */ static BYTE test_dds_rgb565[] = { 'D', 'D', 'S', ' ', 0x7C, 0x00, 0x00, 0x00, 0x07, 0x10, 0x08, 0x00, 0x04, 0x00, 0x00, 0x00, @@ -284,6 +310,10 @@ 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, + { 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, + { 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, { 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, @@ -708,7 +738,8 @@ static void test_dds_decoder_frame_data(IWICDdsFrameDecode *dds_frame, UINT fram hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride, 0, buffer); ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyBlocks got unexpected hr %#x\n", i, frame_index, hr); hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride, 1, buffer); - ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyBlocks got unexpected hr %#x\n", i, frame_index, hr); + ok(hr == E_INVALIDARG || (hr == S_OK && test_data[i].expected_bytes_per_block == 1), + "Test %u, frame %u: CopyBlocks got unexpected hr %#x\n", i, frame_index, hr); hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride, stride * rect.Height - 1, buffer); ok(hr == E_INVALIDARG, "Test %u, frame %u: CopyBlocks got unexpected hr %#x\n", i, frame_index, hr); hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, &rect, stride, stride * rect.Height, buffer);

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2020