April 2022 - Wine-Commits - list.winehq.org

Francois Gouget : comctl32/tests: Use winetest_push_context() in test_combo_dropdown_size().
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: b6b0bc7c9f4b7e8aabad83712de112f1ecc206aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6b0bc7c9f4b7e8aabad8371… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 27 15:20:41 2022 +0200 comctl32/tests: Use winetest_push_context() in test_combo_dropdown_size(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/combo.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 0dd05befa06..3eceeb55bd5 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -1272,6 +1272,7 @@ static void test_combo_dropdown_size(DWORD style) RECT rect_list_client; int min_visible_expected; + winetest_push_context("Test %d", test); hCombo = CreateWindowA(WC_COMBOBOXA, "Combo", CBS_DROPDOWN | WS_VISIBLE | WS_CHILD | style, 5, 5, 100, info_test->height_combo, hMainWnd, (HMENU)COMBO_ID, NULL, 0); @@ -1297,8 +1298,8 @@ static void test_combo_dropdown_size(DWORD style) ret = SendMessageA(hCombo, CB_SETMINVISIBLE, min_visible_expected, 0); ok(ret, "Failed to set visible limit.\n"); min_visible_actual = SendMessageA(hCombo, CB_GETMINVISIBLE, 0, 0); - ok(min_visible_expected == min_visible_actual, "test %d: unexpected number of items %d.\n", - test, min_visible_actual); + ok(min_visible_expected == min_visible_actual, "unexpected number of items %d.\n", + min_visible_actual); } ret = SendMessageA(hCombo, CB_SHOWDROPDOWN, TRUE,0); @@ -1333,18 +1334,19 @@ static void test_combo_dropdown_size(DWORD style) if (expected_height_list < 0) expected_height_list = 0; - ok(expected_height_list == height_list, "Test %d, expected list height to be %d, got %d\n", - test, expected_height_list, height_list); + ok(expected_height_list == height_list, "expected list height to be %d, got %d\n", + expected_height_list, height_list); } else { expected_height_list = min(info_test->num_items, min_visible_expected) * height_item; - ok(expected_height_list == height_list, "Test %d, expected list height to be %d, got %d\n", - test, expected_height_list, height_list); + ok(expected_height_list == height_list, "expected list height to be %d, got %d\n", + expected_height_list, height_list); } DestroyWindow(hCombo); + winetest_pop_context(); } }

1 0

Francois Gouget : po: Fix trailing full stop inconsistencies in the Turkish translation.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: 89459ff147614eedd3e407981c75bf1e8e267812 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89459ff147614eedd3e40798… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 27 15:43:28 2022 +0200 po: Fix trailing full stop inconsistencies in the Turkish translation. The translation's trailing full stop use should match the English version. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/tr.po | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/po/tr.po b/po/tr.po index 840f61846cc..da6e89a5ce3 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8306,7 +8306,7 @@ msgstr "Kısayol oluşturuluyor" #: dlls/msi/msi.rc:99 msgid "Deleting services" -msgstr "Hizmetler siliniyor." +msgstr "Hizmetler siliniyor" #: dlls/msi/msi.rc:100 msgid "Creating duplicate files" @@ -8330,7 +8330,7 @@ msgstr "ODBC bileşenleri yükleniyor" #: dlls/msi/msi.rc:106 msgid "Installing new services" -msgstr "Yeni hizmetler yükleniyor." +msgstr "Yeni hizmetler yükleniyor" #: dlls/msi/msi.rc:107 msgid "Installing system catalog" @@ -12643,11 +12643,11 @@ msgstr "Bu dizi sabit veya geçici olarak kilitli" #: dlls/vbscript/vbscript.rc:34 msgid "Type mismatch" -msgstr "Tür eşleşmiyor." +msgstr "Tür eşleşmiyor" #: dlls/vbscript/vbscript.rc:36 msgid "Device I/O error" -msgstr "Aygıt G/Ç hatası." +msgstr "Aygıt G/Ç hatası" #: dlls/vbscript/vbscript.rc:37 msgid "File already exists" @@ -12663,7 +12663,7 @@ msgstr "Çok fazla dosya" #: dlls/vbscript/vbscript.rc:40 msgid "Permission denied" -msgstr "İzin engellendi." +msgstr "İzin engellendi" #: dlls/vbscript/vbscript.rc:41 msgid "Path/File access error" @@ -17101,43 +17101,43 @@ msgstr "" #: programs/regsvr32/regsvr32.rc:43 msgid "regsvr32: Failed to load DLL '%1'\n" -msgstr "regsvr32: '%1' DLL dosyası yüklenemedi.\n" +msgstr "regsvr32: '%1' DLL dosyası yüklenemedi\n" #: programs/regsvr32/regsvr32.rc:44 msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n" -msgstr "regsvr32: '%1!S!', '%2% DLL dosyasında yok.\n" +msgstr "regsvr32: '%1!S!', '%2% DLL dosyasında yok\n" #: programs/regsvr32/regsvr32.rc:45 msgid "regsvr32: Failed to register DLL '%1'\n" -msgstr "regsvr32: '%1' DLL dosyası kaydedilemedi.\n" +msgstr "regsvr32: '%1' DLL dosyası kaydedilemedi\n" #: programs/regsvr32/regsvr32.rc:46 msgid "regsvr32: Successfully registered DLL '%1'\n" -msgstr "regsvr32: '%1' DLL dosyası başarıyla kaydedildi.\n" +msgstr "regsvr32: '%1' DLL dosyası başarıyla kaydedildi\n" #: programs/regsvr32/regsvr32.rc:47 msgid "regsvr32: Failed to unregister DLL '%1'\n" -msgstr "regsvr32: '%1' DLL dosyası kayıttan kaldırılamadı.\n" +msgstr "regsvr32: '%1' DLL dosyası kayıttan kaldırılamadı\n" #: programs/regsvr32/regsvr32.rc:48 msgid "regsvr32: Successfully unregistered DLL '%1'\n" -msgstr "regsvr32: '%1' DLL dosyası başarıyla kayıttan kaldırıldı.\n" +msgstr "regsvr32: '%1' DLL dosyası başarıyla kayıttan kaldırıldı\n" #: programs/regsvr32/regsvr32.rc:49 msgid "regsvr32: Failed to install DLL '%1'\n" -msgstr "regsvr32: '%1' DLL dosyası yüklenemedi.\n" +msgstr "regsvr32: '%1' DLL dosyası yüklenemedi\n" #: programs/regsvr32/regsvr32.rc:50 msgid "regsvr32: Successfully installed DLL '%1'\n" -msgstr "regsvr32: '%1' DLL dosyası başarıyla yüklendi.\n" +msgstr "regsvr32: '%1' DLL dosyası başarıyla yüklendi\n" #: programs/regsvr32/regsvr32.rc:51 msgid "regsvr32: Failed to uninstall DLL '%1'\n" -msgstr "regsvr32: '%1' DLL dosyası kaldırılamadı.\n" +msgstr "regsvr32: '%1' DLL dosyası kaldırılamadı\n" #: programs/regsvr32/regsvr32.rc:52 msgid "regsvr32: Successfully uninstalled DLL '%1'\n" -msgstr "regsvr32: '%1' DLL dosyası başarıyla kaldırıldı.\n" +msgstr "regsvr32: '%1' DLL dosyası başarıyla kaldırıldı\n" #: programs/start/start.rc:57 #, fuzzy @@ -18127,7 +18127,7 @@ msgstr "" #: programs/uninstaller/uninstaller.rc:33 msgid "uninstaller: Invalid option [%1]\n" -msgstr "uninstaller: '%1' geçersiz seçenek.\n" +msgstr "uninstaller: '%1' geçersiz seçenek\n" #: programs/uninstaller/uninstaller.rc:35 msgid ""

1 0

Dmitry Timoshkov : ieframe: Initialize new history log entry.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: 732f281570e3d33508c4619b160ea9d655a93a9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=732f281570e3d33508c4619b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 26 20:40:20 2022 +0300 ieframe: Initialize new history log entry. In addition to 41cfc86d8dd65c71a7c81b826d02ac0a99050d6a. This fixes another crash when browsing help file that I have here. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/dochost.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 7717f786d52..e73659f1736 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -469,6 +469,8 @@ static void update_travellog(DocHost *This) if(This->travellog.loading_pos == -1) { This->travellog.position++; + This->travellog.log[This->travellog.position].stream = NULL; + This->travellog.log[This->travellog.position].url = NULL; }else { This->travellog.position = This->travellog.loading_pos; This->travellog.loading_pos = -1;

1 0

Paul Gofman : msvcp140/tests: Add a broken last error result in test_Copy_file().
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: ae48b2c9ee70df5b8cd765ab28845aa2581c8149 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae48b2c9ee70df5b8cd765ab… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Apr 27 09:03:33 2022 -0500 msvcp140/tests: Add a broken last error result in test_Copy_file(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52857 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/tests/msvcp140.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 1df2f058424..640e44e5b7c 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -1614,12 +1614,14 @@ static void test_Copy_file(void) SetLastError(0xdeadbeef); ret = p_Copy_file(L"wine_test_dir/f1", L"wine_test_dir/f3"); ok(ret == ERROR_SUCCESS, "Got unexpected ret %lu.\n", ret); - ok(GetLastError() == ret, "Got unexpected err %lu.\n", GetLastError()); + ok(GetLastError() == ret || broken(GetLastError() == ERROR_INVALID_PARAMETER) /* some win8 machines */, + "Got unexpected err %lu.\n", GetLastError()); SetLastError(0xdeadbeef); ret = p_Copy_file(L"wine_test_dir/f1", L"wine_test_dir/f3"); ok(ret == ERROR_SUCCESS, "Got unexpected ret %lu.\n", ret); - ok(GetLastError() == ret, "Got unexpected err %lu.\n", GetLastError()); + ok(GetLastError() == ret || broken(GetLastError() == ERROR_INVALID_PARAMETER) /* some win8 machines */, + "Got unexpected err %lu.\n", GetLastError()); SetLastError(0xdeadbeef); ret = p_Copy_file(L"wine_test_dir/missing", L"wine_test_dir/f3");

1 0

Paul Gofman : kernel32/tests: Add a broken last error result in test_CopyFileW().
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: e015409e743df36b8e08e08eeb77773d9cb3bb8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e015409e743df36b8e08e08e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Apr 27 09:03:34 2022 -0500 kernel32/tests: Add a broken last error result in test_CopyFileW(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52858 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 1fb9e98cf41..378078c20d5 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -902,12 +902,14 @@ static void test_CopyFileW(void) SetLastError(0xdeadbeef); ret = CopyFileW(source, dest, FALSE); ok(ret, "CopyFileW: error %ld\n", GetLastError()); - ok(GetLastError() == ERROR_SUCCESS, "Unexpected error %lu.\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS || broken(GetLastError() == ERROR_INVALID_PARAMETER) /* some win8 machines */, + "Unexpected error %lu.\n", GetLastError()); SetLastError(0xdeadbeef); ret = CopyFileExW(source, dest, NULL, NULL, NULL, 0 ); ok(ret, "CopyFileExW: error %ld\n", GetLastError()); - ok(GetLastError() == ERROR_SUCCESS, "Unexpected error %lu.\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS || broken(GetLastError() == ERROR_INVALID_PARAMETER) /* some win8 machines */, + "Unexpected error %lu.\n", GetLastError()); ret = DeleteFileW(source); ok(ret, "DeleteFileW: error %ld\n", GetLastError());

1 0

Francois Gouget : oleaut32/tests: The EUR abbreviation is not recognized as a currency.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: 7d2eecd341f54b016da67a37292960fabd3cef79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d2eecd341f54b016da67a37… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 27 15:21:35 2022 +0200 oleaut32/tests: The EUR abbreviation is not recognized as a currency. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 4fc0e4e0221..cdbb836b041 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2151,6 +2151,12 @@ static void test_VarParseNumFromStrFr(void) EXPECT2(1,2); EXPECTRGB(2,FAILDIG); + /* The three-letter Euro abbreviation is not allowed */ + WCONVERT(L"12EUR", NUMPRS_CURRENCY); + EXPECT(2,NUMPRS_CURRENCY,0,2,0,0); + EXPECT2(1,2); + EXPECTRGB(2,FAILDIG); + /* With flag and decimal flag, consumes decimal point and following digits */ WCONVERT(L"12,1\x20ac", NUMPRS_CURRENCY|NUMPRS_DECIMAL|NUMPRS_USE_ALL); EXPECT(3,NUMPRS_CURRENCY|NUMPRS_DECIMAL|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_DECIMAL,5,0,-1);

1 0

Francois Gouget : po: Fix trailing full stop inconsistencies in the Czech translation.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: 8c68e19364ebbcfedf1e16400ef98a6141e9135a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c68e19364ebbcfedf1e1640… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 27 15:39:40 2022 +0200 po: Fix trailing full stop inconsistencies in the Czech translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/cs.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/cs.po b/po/cs.po index 25edfee3c2b..09d7730cff4 100644 --- a/po/cs.po +++ b/po/cs.po @@ -2951,7 +2951,7 @@ msgstr "" #: dlls/cryptui/cryptui.rc:125 msgid "Proves your identity to a remote computer" -msgstr "Je Vaším ověřením vůči vzdálenému počítači." +msgstr "Je Vaším ověřením vůči vzdálenému počítači" #: dlls/cryptui/cryptui.rc:126 msgid "" @@ -2977,7 +2977,7 @@ msgstr "" #: dlls/cryptui/cryptui.rc:131 msgid "Allows data on disk to be encrypted" -msgstr "Umožní, aby data na disku byla šifrována." +msgstr "Umožní, aby data na disku byla šifrována" #: dlls/cryptui/cryptui.rc:147 msgid "Private Key Archival" @@ -19707,7 +19707,7 @@ msgstr "Chyba: příkazová řádka není podporovaná\n" #: programs/wmic/wmic.rc:29 msgid "Error: Alias not found\n" -msgstr "Chyba: alternativní název nenalezen.\n" +msgstr "Chyba: alternativní název nenalezen\n" #: programs/wmic/wmic.rc:30 msgid "Error: Invalid query\n"

1 0

Huw Davies : wineoss: Move MIDM_STOP to the unixlib.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: 38e3f3f3eb60fc319b1726e3acfcd9b756ed5519 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38e3f3f3eb60fc319b1726e3… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 27 08:03:20 2022 +0100 wineoss: Move MIDM_STOP to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/midi.c | 16 ---------------- dlls/wineoss.drv/ossmidi.c | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 9df97530865..fe73d97f5ab 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -490,20 +490,6 @@ static DWORD midClose(WORD wDevID) return ret; } -/************************************************************************** - * midStop [internal] - */ -static DWORD midStop(WORD wDevID) -{ - TRACE("(%04X);\n", wDevID); - - if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID; - if (MidiInDev[wDevID].state == -1) return MIDIERR_NODEVICE; - - MidiInDev[wDevID].state = 0; - return MMSYSERR_NOERROR; -} - /*======================================================================* * MIDI entry points * *======================================================================*/ @@ -529,8 +515,6 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return midOpen(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2); case MIDM_CLOSE: return midClose(wDevID); - case MIDM_STOP: - return midStop(wDevID); } params.dev_id = wDevID; diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index 091eccd6d53..86d766eceaf 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -1225,6 +1225,20 @@ static UINT midi_in_start(WORD dev_id) return MMSYSERR_NOERROR; } +static UINT midi_in_stop(WORD dev_id) +{ + struct midi_src *src; + + TRACE("(%04X);\n", dev_id); + + if (dev_id >= num_srcs) return MMSYSERR_BADDEVICEID; + src = srcs + dev_id; + if (src->state == -1) return MIDIERR_NODEVICE; + + src->state = 0; + return MMSYSERR_NOERROR; +} + static UINT midi_in_reset(WORD dev_id, struct notify_context *notify) { UINT cur_time = NtGetTickCount(); @@ -1340,6 +1354,9 @@ NTSTATUS midi_in_message(void *args) case MIDM_START: *params->err = midi_in_start(params->dev_id); break; + case MIDM_STOP: + *params->err = midi_in_stop(params->dev_id); + break; case MIDM_RESET: *params->err = midi_in_reset(params->dev_id, params->notify); break;

1 0

Francois Gouget : kernel32/tests: Remove a couple of unnecessary NULL casts.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: 84bce45eba46e91d13c8f4808276cabd52a97936 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84bce45eba46e91d13c8f480… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 27 15:20:13 2022 +0200 kernel32/tests: Remove a couple of unnecessary NULL casts. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index e3c75fbfe0a..36649e901a1 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -1915,7 +1915,7 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags tmp_flags = 0xdeadbeef; ret = pRtlGetUserInfoHeap( heap, 0, ptr0, (void **)&tmp_ptr, &tmp_flags ); ok( ret, "RtlGetUserInfoHeap failed, error %lu\n", GetLastError() ); - ok( tmp_ptr == (void *)NULL, "got ptr %p\n", tmp_ptr ); + ok( tmp_ptr == NULL, "got ptr %p\n", tmp_ptr ); todo_wine ok( tmp_flags == 0xc00, "got flags %#lx\n", tmp_flags ); @@ -1923,7 +1923,7 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags tmp_flags = 0xdeadbeef; ret = pRtlGetUserInfoHeap( heap, 0, ptr1, (void **)&tmp_ptr, &tmp_flags ); ok( ret, "RtlGetUserInfoHeap failed, error %lu\n", GetLastError() ); - ok( tmp_ptr == (void *)NULL, "got ptr %p\n", tmp_ptr ); + ok( tmp_ptr == NULL, "got ptr %p\n", tmp_ptr ); todo_wine ok( tmp_flags == 0x200, "got flags %#lx\n", tmp_flags );

1 0

Joachim Priesner : windowscodecs: BitmapScaler_CopyPixels: Do not demand a larger buffer than necessary.
by Alexandre Julliard April 27, 2022

April 27, 2022

Module: wine Branch: master Commit: cdb9a2748ba62891bfcd342cb3da82c204f896d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdb9a2748ba62891bfcd342c… Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Tue Apr 26 19:16:15 2022 +0200 windowscodecs: BitmapScaler_CopyPixels: Do not demand a larger buffer than necessary. Only `bytesperrow` bytes are written to each row of the output rect. Therefore the last row need not be padded to `cbStride` bytes. Signed-off-by: Joachim Priesner <joachim.priesner(a)web.de> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/scaler.c | 2 +- dlls/windowscodecs/tests/bitmap.c | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/scaler.c b/dlls/windowscodecs/scaler.c index f8f81c0a990..c31aac79861 100644 --- a/dlls/windowscodecs/scaler.c +++ b/dlls/windowscodecs/scaler.c @@ -251,7 +251,7 @@ static HRESULT WINAPI BitmapScaler_CopyPixels(IWICBitmapScaler *iface, goto end; } - if ((cbStride * dest_rect.Height) > cbBufferSize) + if (cbStride * (dest_rect.Height - 1) + bytesperrow > cbBufferSize) { hr = E_INVALIDARG; goto end; diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 0d0d27e2707..3ddd3bbdbae 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -1151,7 +1151,7 @@ static void test_bitmap_scaler(void) double res_x, res_y; IWICBitmap *bitmap; UINT width, height; - BYTE buf[16]; + BYTE buf[93]; /* capable of holding a 7*4px, 24bpp image with stride 24 -> buffer size = 3*24+21 */ HRESULT hr; hr = IWICImagingFactory_CreateBitmap(factory, 4, 2, &GUID_WICPixelFormat24bppBGR, WICBitmapCacheOnLoad, &bitmap); @@ -1243,7 +1243,7 @@ static void test_bitmap_scaler(void) WICBitmapInterpolationModeNearestNeighbor); ok(hr == E_INVALIDARG, "Failed to initialize bitmap scaler, hr %#lx.\n", hr); - hr = IWICBitmapScaler_Initialize(scaler, (IWICBitmapSource *)bitmap, 8, 4, + hr = IWICBitmapScaler_Initialize(scaler, (IWICBitmapSource *)bitmap, 7, 4, WICBitmapInterpolationModeNearestNeighbor); ok(hr == S_OK, "Failed to initialize bitmap scaler, hr %#lx.\n", hr); @@ -1251,20 +1251,20 @@ static void test_bitmap_scaler(void) WICBitmapInterpolationModeNearestNeighbor); ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); - hr = IWICBitmapScaler_Initialize(scaler, (IWICBitmapSource *)bitmap, 8, 0, + hr = IWICBitmapScaler_Initialize(scaler, (IWICBitmapSource *)bitmap, 7, 0, WICBitmapInterpolationModeNearestNeighbor); ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IWICBitmapScaler_Initialize(scaler, NULL, 8, 4, WICBitmapInterpolationModeNearestNeighbor); ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); - hr = IWICBitmapScaler_Initialize(scaler, (IWICBitmapSource *)bitmap, 8, 4, + hr = IWICBitmapScaler_Initialize(scaler, (IWICBitmapSource *)bitmap, 7, 4, WICBitmapInterpolationModeNearestNeighbor); ok(hr == WINCODEC_ERR_WRONGSTATE, "Unexpected hr %#lx.\n", hr); hr = IWICBitmapScaler_GetSize(scaler, &width, &height); ok(hr == S_OK, "Failed to get scaler size, hr %#lx.\n", hr); - ok(width == 8, "Unexpected width %u.\n", width); + ok(width == 7, "Unexpected width %u.\n", width); ok(height == 4, "Unexpected height %u.\n", height); hr = IWICBitmapScaler_GetSize(scaler, NULL, &height); @@ -1307,6 +1307,9 @@ static void test_bitmap_scaler(void) ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "Unexpected hr %#lx.\n", hr); IWICPalette_Release(palette); + hr = IWICBitmapScaler_CopyPixels(scaler, NULL, /*cbStride=*/24, sizeof(buf), buf); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IWICBitmapScaler_Release(scaler); IWICBitmap_Release(bitmap);

1 0