April 2019 - Wine-commits - list.winehq.org

Damjan Jovanovic : qcap/tests: Fix a COM reference leak in the audiorecord test.
by Alexandre Julliard 22 Apr '19

22 Apr '19

Module: wine Branch: master Commit: 9d75caf4e1deea0ec8d5ad3f829e7218bc1e3c16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d75caf4e1deea0ec8d5ad3f… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Apr 22 12:49:53 2019 -0500 qcap/tests: Fix a COM reference leak in the audiorecord test. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/audiorecord.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/qcap/tests/audiorecord.c b/dlls/qcap/tests/audiorecord.c index 5de0198..af27017 100644 --- a/dlls/qcap/tests/audiorecord.c +++ b/dlls/qcap/tests/audiorecord.c @@ -152,6 +152,7 @@ START_TEST(audiorecord) IMoniker *mon; WCHAR *name; HRESULT hr; + ULONG ref; CoInitialize(NULL); @@ -182,6 +183,8 @@ START_TEST(audiorecord) test_interfaces(filter); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); IMoniker_Release(mon); }

1 0

Jacek Caban : msvcp140: Add _Resize implementation.
by Alexandre Julliard 22 Apr '19

22 Apr '19

Module: wine Branch: master Commit: e8f083bd37becffdc8d41cb76e7189d194bf48d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8f083bd37becffdc8d41cb7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 22 14:13:21 2019 +0200 msvcp140: Add _Resize implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 22 ++++++++++++++++++++++ dlls/msvcp90/ios.c | 20 ++++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 5bd627c..8d2f43b 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3695,7 +3695,7 @@ @ cdecl _Read_dir(ptr ptr ptr) tr2_sys__Read_dir_wchar @ cdecl _Remove_dir(wstr) tr2_sys__Remove_dir_wchar @ cdecl _Rename(wstr wstr) tr2_sys__Rename_wchar -@ stub _Resize +@ cdecl _Resize(wstr int64) @ cdecl _Set_last_write_time(wstr int64) @ stub _Sinh @ extern _Snan _Snan diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 2f9cb6b..0440624 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -178,6 +178,7 @@ static MSVCP_bool (__cdecl *p_Current_get)(WCHAR *); static MSVCP_bool (__cdecl *p_Current_set)(WCHAR const *); static int (__cdecl *p_Equivalent)(WCHAR const*, WCHAR const*); static ULONGLONG (__cdecl *p_File_size)(WCHAR const *); +static int (__cdecl *p_Resize)(const WCHAR *, UINT64); static __int64 (__cdecl *p_Last_write_time)(WCHAR const*); static void (__cdecl *p_Set_last_write_time)(WCHAR const*, __int64); static int (__cdecl *p_Link)(WCHAR const*, WCHAR const*); @@ -270,6 +271,7 @@ static BOOL init(void) SET(p_Current_set, "_Current_set"); SET(p_Equivalent, "_Equivalent"); SET(p_File_size, "_File_size"); + SET(p_Resize, "_Resize"); SET(p_Last_write_time, "_Last_write_time"); SET(p_Set_last_write_time, "_Set_last_write_time"); SET(p_Link, "_Link"); @@ -657,6 +659,7 @@ static void test_File_size(void) WCHAR test_dir_W[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r',0}; WCHAR test_ne_W[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r','/','n','e',0}; WCHAR temp_path[MAX_PATH], origin_path[MAX_PATH]; + int r; GetCurrentDirectoryW(MAX_PATH, origin_path); GetTempPathW(MAX_PATH, temp_path); @@ -692,7 +695,26 @@ static void test_File_size(void) ok(val == ~(ULONGLONG)0, "file_size is %s\n", wine_dbgstr_longlong(val)); ok(errno == 0xdeadbeef, "errno = %d\n", errno); + r = p_Resize(test_f1_W, 1000); + ok(!r, "p_Resize returned %d\n", r); + val = p_File_size(test_f1_W); + ok(val == 1000, "file_size is %s\n", wine_dbgstr_longlong(val)); + + r = p_Resize(test_f1_W, 100); + ok(!r, "p_Resize returned %d\n", r); + val = p_File_size(test_f1_W); + ok(val == 100, "file_size is %s\n", wine_dbgstr_longlong(val)); + + r = p_Resize(test_f1_W, 0); + ok(!r, "p_Resize returned %d\n", r); + val = p_File_size(test_f1_W); + ok(val == 0, "file_size is %s\n", wine_dbgstr_longlong(val)); + ok(DeleteFileW(test_f1_W), "expect wine_test_dir/f1 to exist\n"); + + r = p_Resize(test_f1_W, 0); + ok(r == ERROR_FILE_NOT_FOUND, "p_Resize returned %d\n", r); + ok(DeleteFileW(test_f2_W), "expect wine_test_dir/f2 to exist\n"); ok(RemoveDirectoryW(test_dir_W), "expect wine_test_dir to exist\n"); ok(SetCurrentDirectoryW(origin_path), "SetCurrentDirectoryW to origin_path failed\n"); diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 6b94737..94d43cb 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15593,6 +15593,26 @@ ULONGLONG __cdecl _File_size(WCHAR const* path) return ((ULONGLONG)(fad.nFileSizeHigh) << 32) + fad.nFileSizeLow; } +int __cdecl _Resize(const WCHAR *path, UINT64 size) +{ + LARGE_INTEGER offset; + HANDLE file; + BOOL ret; + + TRACE("(%s %s)\n", debugstr_w(path), wine_dbgstr_longlong(size)); + + file = CreateFileW(path, FILE_GENERIC_WRITE, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, 0); + if(file == INVALID_HANDLE_VALUE) + return GetLastError(); + + offset.QuadPart = size; + if((ret = SetFilePointerEx(file, offset, NULL, FILE_BEGIN))) + ret = SetEndOfFile(file); + CloseHandle(file); + return ret ? 0 : GetLastError(); +} + /* ?_Equivalent(a)sys@tr2(a)std@@YAHPB_W0(a)Z */ /* ?_Equivalent(a)sys@tr2(a)std@@YAHPEB_W0(a)Z */ int __cdecl tr2_sys__Equivalent_wchar(WCHAR const* path1, WCHAR const* path2)

1 0

Vijay Kiran Kamuju : kernel/nls: Fix country name in Tatar locale.
by Alexandre Julliard 22 Apr '19

22 Apr '19

Module: wine Branch: master Commit: 3c45bfc7da6a1ff5bea1cfe5372c5eeacf6e0edb URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c45bfc7da6a1ff5bea1cfe5… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Apr 20 10:59:16 2019 +0200 kernel/nls: Fix country name in Tatar locale. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/ttt.nls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/nls/ttt.nls b/dlls/kernel32/nls/ttt.nls index 43b6fe5..86236d9 100644 --- a/dlls/kernel32/nls/ttt.nls +++ b/dlls/kernel32/nls/ttt.nls @@ -102,7 +102,7 @@ STRINGTABLE LANGUAGE LANG_TATAR, SUBLANG_DEFAULT LOCALE_SENGLANGUAGE "Tatar" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "RUR" - LOCALE_SISO3166CTRYNAME "TA" + LOCALE_SISO3166CTRYNAME "RU" LOCALE_SISO639LANGNAME "tt" LOCALE_SLANGUAGE "Tatar" LOCALE_SLIST ";" @@ -123,7 +123,7 @@ STRINGTABLE LANGUAGE LANG_TATAR, SUBLANG_DEFAULT LOCALE_SMONTHNAME12 "Декабрь" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP " " - LOCALE_SNAME "tt-TA" + LOCALE_SNAME "tt-RU" LOCALE_SNAN "NaN" LOCALE_SNATIVECTRYNAME "Татарстан" LOCALE_SNATIVECURRNAME "рубль"

1 0

Vijay Kiran Kamuju : kernel/nls: Fix LOCALE_SNAME for Azeri (Cyrillic).
by Alexandre Julliard 22 Apr '19

22 Apr '19

Module: wine Branch: master Commit: ba7144bfae205b4c8a4cd8442eaf31bfea5dbd0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba7144bfae205b4c8a4cd844… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Apr 20 11:27:55 2019 +0200 kernel/nls: Fix LOCALE_SNAME for Azeri (Cyrillic). Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/aze.nls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/aze.nls b/dlls/kernel32/nls/aze.nls index cb8d384..bc2db0d 100644 --- a/dlls/kernel32/nls/aze.nls +++ b/dlls/kernel32/nls/aze.nls @@ -123,7 +123,7 @@ STRINGTABLE LANGUAGE LANG_AZERI, SUBLANG_AZERI_CYRILLIC LOCALE_SMONTHNAME12 "Декабр" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP " " - LOCALE_SNAME "az-AZ" + LOCALE_SNAME "az-Cyrl-AZ" LOCALE_SNAN "NaN" LOCALE_SNATIVECTRYNAME L"\x0410\x0437\x04d9\x0440\x0431\x0430\x0458\x04b9\x0430\x043d" LOCALE_SNATIVECURRNAME "рубль"

1 0

Vijay Kiran Kamuju : kernel/nls: Fix LOCALE_SNAME for Uzbek (Cyrillic).
by Alexandre Julliard 22 Apr '19

22 Apr '19

Module: wine Branch: master Commit: 1a759b792a26f99ed6a48d56eb01f18aba49254f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a759b792a26f99ed6a48d56… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Apr 20 11:32:31 2019 +0200 kernel/nls: Fix LOCALE_SNAME for Uzbek (Cyrillic). Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/uzb.nls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/uzb.nls b/dlls/kernel32/nls/uzb.nls index 2d4cf3f..7d0b4a8 100644 --- a/dlls/kernel32/nls/uzb.nls +++ b/dlls/kernel32/nls/uzb.nls @@ -123,7 +123,7 @@ STRINGTABLE LANGUAGE LANG_UZBEK, SUBLANG_UZBEK_CYRILLIC LOCALE_SMONTHNAME12 "Декабр" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP " " - LOCALE_SNAME "uz-UZ" + LOCALE_SNAME "uz-Cyrl-UZ" LOCALE_SNAN "ҳақиқий сон эмас" LOCALE_SNATIVECTRYNAME "Ўзбекистон" LOCALE_SNATIVECURRNAME "рубль"

1 0

Vijay Kiran Kamuju : kernel/nls: Fix LOCALE_SNAME for Serbian (Cyrillic).
by Alexandre Julliard 22 Apr '19

22 Apr '19

Module: wine Branch: master Commit: 982ec5fcd6ec77e5dbd0933ae320d3faea4a4e92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=982ec5fcd6ec77e5dbd0933a… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Apr 20 12:37:51 2019 +0200 kernel/nls: Fix LOCALE_SNAME for Serbian (Cyrillic). Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/srb.nls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/srb.nls b/dlls/kernel32/nls/srb.nls index 4a3e006..348cf40 100644 --- a/dlls/kernel32/nls/srb.nls +++ b/dlls/kernel32/nls/srb.nls @@ -123,7 +123,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC LOCALE_SMONTHNAME12 "децембар" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "." - LOCALE_SNAME "sr-RS" + LOCALE_SNAME "sr-Cyrl-RS" LOCALE_SNAN "NaN" LOCALE_SNATIVECTRYNAME "Југославија" LOCALE_SNATIVECURRNAME "динар"

1 0

Vijay Kiran Kamuju : kernel/nls: Fix country name and sname in English-Caribbean locale.
by Alexandre Julliard 22 Apr '19

22 Apr '19

Module: wine Branch: master Commit: d3cdff985fd836c8bea714860c1c27c48ab77704 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3cdff985fd836c8bea71486… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Apr 20 12:37:52 2019 +0200 kernel/nls: Fix country name and sname in English-Caribbean locale. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/enb.nls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/nls/enb.nls b/dlls/kernel32/nls/enb.nls index fb79284..7aa6fac 100644 --- a/dlls/kernel32/nls/enb.nls +++ b/dlls/kernel32/nls/enb.nls @@ -102,7 +102,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CARIBBEAN LOCALE_SENGLANGUAGE "English" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "USD" - LOCALE_SISO3166CTRYNAME "CB" + LOCALE_SISO3166CTRYNAME "029" LOCALE_SISO639LANGNAME "en" LOCALE_SLANGUAGE "English (Caribbean)" LOCALE_SLIST "," @@ -123,7 +123,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CARIBBEAN LOCALE_SMONTHNAME12 "December" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "," - LOCALE_SNAME "en-CB" + LOCALE_SNAME "en-029" LOCALE_SNAN "NaN" LOCALE_SNATIVECTRYNAME "Caribbean" LOCALE_SNATIVECURRNAME "US Dollar"

1 0

Vijay Kiran Kamuju : kernel/nls: Fix country name in Manx Gaelic locale.
by Alexandre Julliard 22 Apr '19

22 Apr '19

Module: wine Branch: master Commit: b2433315501901031105914ebaea664e50f8ee80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2433315501901031105914e… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Apr 20 12:37:53 2019 +0200 kernel/nls: Fix country name in Manx Gaelic locale. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/gdv.nls | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/nls/gdv.nls b/dlls/kernel32/nls/gdv.nls index 5410325..51e9ad0 100644 --- a/dlls/kernel32/nls/gdv.nls +++ b/dlls/kernel32/nls/gdv.nls @@ -103,7 +103,8 @@ STRINGTABLE LANGUAGE LANG_MANX_GAELIC, SUBLANG_MANX_GAELIC LOCALE_SENGLANGUAGE "Manx Gaelic" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "GBP" - LOCALE_SISO3166CTRYNAME "GB" + LOCALE_SISO3166CTRYNAME "IM" + LOCALE_SISO639LANGNAME "gv" LOCALE_SLANGUAGE "Gaelg (Manninn)" LOCALE_SLIST "," @@ -124,7 +125,7 @@ STRINGTABLE LANGUAGE LANG_MANX_GAELIC, SUBLANG_MANX_GAELIC LOCALE_SMONTHNAME12 "Mee ny Nollick" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "," - LOCALE_SNAME "gv-GB" + LOCALE_SNAME "gv-IM" LOCALE_SNAN "NaN" LOCALE_SNATIVECTRYNAME "Manninn" LOCALE_SNATIVECURRNAME "Punt Manninagh"

1 0

Vijay Kiran Kamuju : kernel32: Add implementation of CAL_SSHORTESTDAYNAME*.
by Alexandre Julliard 22 Apr '19

22 Apr '19

Module: wine Branch: master Commit: ded7efd27cae89a0f1bebd05dcf2e8a0ef71e2dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=ded7efd27cae89a0f1bebd05… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Apr 19 22:14:37 2019 +0200 kernel32: Add implementation of CAL_SSHORTESTDAYNAME*. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/time.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index c425eb8..7807f99 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -1068,6 +1068,13 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, case CAL_SABBREVMONTHNAME12: case CAL_SABBREVMONTHNAME13: case CAL_SYEARMONTH: + case CAL_SSHORTESTDAYNAME1: + case CAL_SSHORTESTDAYNAME2: + case CAL_SSHORTESTDAYNAME3: + case CAL_SSHORTESTDAYNAME4: + case CAL_SSHORTESTDAYNAME5: + case CAL_SSHORTESTDAYNAME6: + case CAL_SSHORTESTDAYNAME7: return GetLocaleInfoW(Locale, caltype_lctype_map[calinfo] | localeflags, lpCalData, cchData); case CAL_ITWODIGITYEARMAX: if (CalType & CAL_RETURN_NUMBER) @@ -1090,6 +1097,12 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, return 0; } break; + case CAL_SMONTHDAY: + FIXME("Unimplemented caltype %d\n", calinfo); + return 0; + case CAL_SABBREVERASTRING: + FIXME("Unimplemented caltype %d\n", calinfo); + return 0; default: FIXME("Unknown caltype %d\n", calinfo); SetLastError(ERROR_INVALID_FLAGS);

1 0

Gabriel Ivăncescu : comctl32/tests: Avoid leaks by moving creation calls outside the loop.
by Alexandre Julliard 22 Apr '19

22 Apr '19

Module: wine Branch: master Commit: 83503d04d4ebd77b2b6b03b1b4e2e0ff3cce8445 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83503d04d4ebd77b2b6b03b1… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Apr 19 15:13:57 2019 +0300 comctl32/tests: Avoid leaks by moving creation calls outside the loop. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/button.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index f31f526..e0c4736 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -1908,7 +1908,7 @@ static void test_bcm_get_ideal_size(void) { BS_SPLITBUTTON, extra_width * 2 + GetSystemMetrics(SM_CXEDGE) }, { BS_DEFSPLITBUTTON, extra_width * 2 + GetSystemMetrics(SM_CXEDGE) } }; - LONG image_width, height, line_count, text_width; + LONG image_width = 48, height = 48, line_count, text_width; HFONT hfont, prev_font; DWORD style, type; BOOL ret; @@ -1964,6 +1964,14 @@ static void test_bcm_get_ideal_size(void) return; } + /* Tests for image placements */ + /* Prepare bitmap */ + hdc = GetDC(0); + hmask = CreateCompatibleBitmap(hdc, image_width, height); + hbmp = CreateCompatibleBitmap(hdc, image_width, height); + himl = pImageList_Create(image_width, height, ILC_COLOR, 1, 1); + pImageList_Add(himl, hbmp, 0); + #define set_split_info(hwnd) do { \ BUTTON_SPLITINFO _info; \ int _ret; \ @@ -1976,14 +1984,6 @@ static void test_bcm_get_ideal_size(void) for (k = 0; k < ARRAY_SIZE(pushtype); k++) { - /* Tests for image placements */ - /* Prepare bitmap */ - image_width = 48; - height = 48; - hdc = GetDC(0); - hmask = CreateCompatibleBitmap(hdc, image_width, height); - hbmp = CreateCompatibleBitmap(hdc, image_width, height); - /* Only bitmap for push button, ideal size should be enough for image and text */ hwnd = CreateWindowA(WC_BUTTONA, button_text, pushtype[k].style | BS_BITMAP | default_style, 0, 0, client_width, client_height, NULL, NULL, 0, NULL); @@ -2028,8 +2028,6 @@ static void test_bcm_get_ideal_size(void) } /* Image list alignments */ - himl = pImageList_Create(image_width, height, ILC_COLOR, 1, 1); - pImageList_Add(himl, hbmp, 0); biml.himl = himl; for (i = 0; i < ARRAY_SIZE(imagelist_aligns); i++) { @@ -2099,6 +2097,7 @@ static void test_bcm_get_ideal_size(void) image_width + text_width + pushtype[k].extra_width, size.cy, max(height, tm.tmHeight)); ok(size.cy < large_height, "Expect ideal cy %d < %d\n", size.cy, large_height); DestroyWindow(hwnd); + DestroyIcon(hicon); } #undef set_split_info @@ -2215,7 +2214,6 @@ static void test_bcm_get_ideal_size(void) } pImageList_Destroy(himl); - DestroyIcon(hicon); DeleteObject(hbmp); DeleteObject(hmask); ReleaseDC(0, hdc);

1 0