June 2022 - Wine-commits - list.winehq.org

Alexandre Julliard : makefiles: Use the defined external lib variables also when building the libs themselves.
by Alexandre Julliard 29 Jun '22

29 Jun '22

Module: wine Branch: master Commit: e2d96342df3c4f7ae9d13a550a8a95ea94736cb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2d96342df3c4f7ae9d13a55… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 29 09:33:15 2022 +0200 makefiles: Use the defined external lib variables also when building the libs themselves. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + libs/faudio/Makefile.in | 2 +- libs/gsm/Makefile.in | 2 +- libs/jxr/Makefile.in | 3 ++- libs/lcms2/Makefile.in | 2 +- libs/mpg123/Makefile.in | 2 +- libs/tiff/Makefile.in | 2 +- libs/vkd3d/Makefile.in | 2 +- tools/makedep.c | 12 +++++++++++- 9 files changed, 20 insertions(+), 8 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index d03c6d9412a..d5f389b506a 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -429,6 +429,7 @@ SOURCES = \ mimeole.idl \ minidumpapiset.h \ minmax.h \ + minschannel.h \ mlang.idl \ mmc.idl \ mmddk.h \ diff --git a/libs/faudio/Makefile.in b/libs/faudio/Makefile.in index 3a9bb591227..639cd2cbff0 100644 --- a/libs/faudio/Makefile.in +++ b/libs/faudio/Makefile.in @@ -1,5 +1,5 @@ EXTLIB = libfaudio.a -EXTRAINCL = -I$(srcdir)/include +EXTRAINCL = $(FAUDIO_PE_CFLAGS) EXTRADEFS = -DFAUDIO_WIN32_PLATFORM -DHAVE_WMADEC -DNDEBUG C_SRCS = \ diff --git a/libs/gsm/Makefile.in b/libs/gsm/Makefile.in index 36c749aa60f..d2aefc937f9 100644 --- a/libs/gsm/Makefile.in +++ b/libs/gsm/Makefile.in @@ -1,5 +1,5 @@ EXTLIB = libgsm.a -EXTRAINCL = -I$(srcdir)/inc +EXTRAINCL = $(GSM_PE_CFLAGS) EXTRADEFS = -DWAV49 C_SRCS = \ diff --git a/libs/jxr/Makefile.in b/libs/jxr/Makefile.in index 5203dc970aa..3162cfca263 100644 --- a/libs/jxr/Makefile.in +++ b/libs/jxr/Makefile.in @@ -1,5 +1,6 @@ EXTLIB = libjxr.a -EXTRAINCL = -I$(srcdir)/jxrgluelib -I$(srcdir)/image/sys -DDISABLE_PERF_MEASUREMENT +EXTRAINCL = $(JXR_PE_CFLAGS) +EXTRADEFS = -DDISABLE_PERF_MEASUREMENT C_SRCS = \ image/decode/JXRTranscode.c \ diff --git a/libs/lcms2/Makefile.in b/libs/lcms2/Makefile.in index 6549d5718b5..c2aafa9c70a 100644 --- a/libs/lcms2/Makefile.in +++ b/libs/lcms2/Makefile.in @@ -1,5 +1,5 @@ EXTLIB = liblcms2.a -EXTRAINCL = -I$(srcdir)/include +EXTRAINCL = $(LCMS2_PE_CFLAGS) C_SRCS = \ src/cmsalpha.c \ diff --git a/libs/mpg123/Makefile.in b/libs/mpg123/Makefile.in index 6859f66f68a..7974c34ed91 100644 --- a/libs/mpg123/Makefile.in +++ b/libs/mpg123/Makefile.in @@ -1,5 +1,5 @@ EXTLIB = libmpg123.a -EXTRAINCL = -I$(srcdir)/src -I$(srcdir)/src/compat -I$(srcdir)/src/libmpg123 +EXTRAINCL = -I$(srcdir)/src -I$(srcdir)/src/compat $(MPG123_PE_CFLAGS) EXTRADEFS = -DOPT_GENERIC_DITHER -DREAL_IS_FLOAT -DNO_CATCHSIGNAL -DMPG123_NO_LARGENAME C_SRCS = \ diff --git a/libs/tiff/Makefile.in b/libs/tiff/Makefile.in index f8ceb5006d4..7c793f3e2f9 100644 --- a/libs/tiff/Makefile.in +++ b/libs/tiff/Makefile.in @@ -1,5 +1,5 @@ EXTLIB = libtiff.a -EXTRAINCL = -I$(srcdir)/libtiff $(JPEG_PE_CFLAGS) $(ZLIB_PE_CFLAGS) +EXTRAINCL = $(TIFF_PE_CFLAGS) $(JPEG_PE_CFLAGS) $(ZLIB_PE_CFLAGS) C_SRCS = \ libtiff/tif_aux.c \ diff --git a/libs/vkd3d/Makefile.in b/libs/vkd3d/Makefile.in index c912f97165e..0ed4e27ad83 100644 --- a/libs/vkd3d/Makefile.in +++ b/libs/vkd3d/Makefile.in @@ -1,5 +1,5 @@ EXTLIB = libvkd3d.a -EXTRAINCL = -I$(srcdir)/include -I$(srcdir)/include/private -I$(srcdir)/libs/vkd3d -I$(srcdir)/libs/vkd3d-shader +EXTRAINCL = $(VKD3D_PE_CFLAGS) -I$(srcdir)/include/private -I$(srcdir)/libs/vkd3d -I$(srcdir)/libs/vkd3d-shader EXTRADEFS = \ -DWINE_NO_NAMELESS_EXTENSION \ -DCONST_VTABLE \ diff --git a/tools/makedep.c b/tools/makedep.c index 81e9c20fd4f..fb09e6acc8a 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -4152,10 +4152,20 @@ static void load_sources( struct makefile *make ) value = get_expanded_make_var_array( make, "EXTRAINCL" ); for (i = 0; i < value.count; i++) + { if (!strncmp( value.str[i], "-I", 2 )) - strarray_add_uniq( &make->include_paths, value.str[i] + 2 ); + { + const char *dir = value.str[i] + 2; + if (!strncmp( dir, "./", 2 )) + { + dir += 2; + while (*dir == '/') dir++; + } + strarray_add_uniq( &make->include_paths, dir ); + } else if (!strncmp( value.str[i], "-D", 2 ) || !strncmp( value.str[i], "-U", 2 )) strarray_add_uniq( &make->define_args, value.str[i] ); + } strarray_addall( &make->define_args, get_expanded_make_var_array( make, "EXTRADEFS" )); strarray_add( &make->include_args, strmake( "-I%s", obj_dir_path( make, "" )));

1 0

Alexandre Julliard : makefiles: Add separate variables for Unix flags and libraries.
by Alexandre Julliard 29 Jun '22

29 Jun '22

Module: wine Branch: master Commit: 194e09baeca42b369b391d87c9605338b8fbc978 URL: https://source.winehq.org/git/wine.git/?a=commit;h=194e09baeca42b369b391d87… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 29 11:06:16 2022 +0200 makefiles: Add separate variables for Unix flags and libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/Makefile.in | 2 +- dlls/capi2032/Makefile.in | 4 ++-- dlls/crypt32/Makefile.in | 4 ++-- dlls/dnsapi/Makefile.in | 2 +- dlls/dwrite/Makefile.in | 2 +- dlls/gphoto2.ds/Makefile.in | 5 +++-- dlls/kerberos/Makefile.in | 2 +- dlls/mountmgr.sys/Makefile.in | 4 ++-- dlls/nsiproxy.sys/Makefile.in | 2 +- dlls/ntdll/Makefile.in | 4 ++-- dlls/openal32/Makefile.in | 2 +- dlls/opencl/Makefile.in | 2 +- dlls/sane.ds/Makefile.in | 4 ++-- dlls/secur32/Makefile.in | 2 +- dlls/win32u/Makefile.in | 4 ++-- dlls/winealsa.drv/Makefile.in | 2 +- dlls/wineandroid.drv/Makefile.in | 2 +- dlls/winebus.sys/Makefile.in | 4 ++-- dlls/winecoreaudio.drv/Makefile.in | 2 +- dlls/winegstreamer/Makefile.in | 4 ++-- dlls/winemac.drv/Makefile.in | 2 +- dlls/wineoss.drv/Makefile.in | 4 ++-- dlls/winepulse.drv/Makefile.in | 4 ++-- dlls/wineusb.sys/Makefile.in | 4 ++-- dlls/winevulkan/Makefile.in | 2 +- dlls/winex11.drv/Makefile.in | 4 ++-- dlls/winspool.drv/Makefile.in | 4 ++-- dlls/wldap32/Makefile.in | 4 ++-- dlls/wpcap/Makefile.in | 2 +- libs/wine/Makefile.in | 2 +- server/Makefile.in | 2 +- tools/makedep.c | 20 +++++++++++++------- tools/sfnt2fon/Makefile.in | 5 ++--- tools/wmc/Makefile.in | 3 +-- tools/wrc/Makefile.in | 2 +- 35 files changed, 64 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=194e09baeca42b369b39…

1 0

Zhiyi Zhang : uxtheme/tests: Add dialog procedure message tests.
by Alexandre Julliard 29 Jun '22

29 Jun '22

Module: wine Branch: master Commit: 2a6a2b04fe153e9327b588022b5d1c9334d6a0bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a6a2b04fe153e9327b58802… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 27 17:55:45 2022 +0800 uxtheme/tests: Add dialog procedure message tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/tests/system.c | 64 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index aa566f554ff..4301a0f76f2 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -1614,6 +1614,37 @@ static const struct message empty_seq[] = {0} }; +static const struct message wm_erasebkgnd_seq[] = +{ + {WM_ERASEBKGND, sent}, + {WM_CTLCOLORDLG, sent}, + {0} +}; + +static const struct message wm_ctlcolormsgbox_seq[] = +{ + {WM_CTLCOLORMSGBOX, sent}, + {0} +}; + +static const struct message wm_ctlcolorbtn_seq[] = +{ + {WM_CTLCOLORBTN, sent}, + {0} +}; + +static const struct message wm_ctlcolordlg_seq[] = +{ + {WM_CTLCOLORDLG, sent}, + {0} +}; + +static const struct message wm_ctlcolorstatic_seq[] = +{ + {WM_CTLCOLORSTATIC, sent}, + {0} +}; + static HWND dialog_child; static DWORD dialog_init_flag; static BOOL handle_WM_ERASEBKGND; @@ -1673,6 +1704,7 @@ static void test_EnableThemeDialogTexture(void) HBRUSH brush, brush2; HDC child_hdc, hdc; LOGBRUSH log_brush; + char buffer[32]; ULONG_PTR proc; WNDCLASSA cls; HTHEME theme; @@ -1779,6 +1811,20 @@ static void test_EnableThemeDialogTexture(void) {{WC_SCROLLBARA}}, }; + static const struct message_test + { + UINT msg; + const struct message *msg_seq; + } + message_tests[] = + { + {WM_ERASEBKGND, wm_erasebkgnd_seq}, + {WM_CTLCOLORMSGBOX, wm_ctlcolormsgbox_seq}, + {WM_CTLCOLORBTN, wm_ctlcolorbtn_seq}, + {WM_CTLCOLORDLG, wm_ctlcolordlg_seq}, + {WM_CTLCOLORSTATIC, wm_ctlcolorstatic_seq}, + }; + if (!IsThemeActive()) { skip("Theming is inactive.\n"); @@ -2260,6 +2306,24 @@ static void test_EnableThemeDialogTexture(void) DestroyWindow(hwnd2); DestroyWindow(hwnd); + /* Test that application dialog procedures should be called only once for each message */ + dialog = CreateDialogIndirectParamA(NULL, &temp.template, GetDesktopWindow(), + test_EnableThemeDialogTexture_proc, + (LPARAM)&param); + ok(dialog != NULL, "CreateDialogIndirectParamA failed, error %ld.\n", GetLastError()); + child = dialog_child; + ok(child != NULL, "Failed to get child control, error %ld.\n", GetLastError()); + child_hdc = GetDC(child); + for (i = 0; i < ARRAY_SIZE(message_tests); ++i) + { + sprintf(buffer, "message %#x\n", message_tests[i].msg); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + SendMessageW(dialog, message_tests[i].msg, (WPARAM)child_hdc, (LPARAM)child); + ok_sequence(sequences, PARENT_SEQ_INDEX, message_tests[i].msg_seq, buffer, TRUE); + } + ReleaseDC(child, child_hdc); + EndDialog(dialog, 0); + UnregisterClassA(cls.lpszClassName, GetModuleHandleA(NULL)); }

1 0

Zhiyi Zhang : uxtheme: Avoid calling application dialog procedures repeatedly.
by Alexandre Julliard 29 Jun '22

29 Jun '22

Module: wine Branch: master Commit: d461cca19a4a2883e5e3000afe79bc4e15626b5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d461cca19a4a2883e5e3000a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 27 17:13:56 2022 +0800 uxtheme: Avoid calling application dialog procedures repeatedly. Application dialog procedures are called in UXTHEME_DefDlgProc(), then may be called again in USER_DefDlgProcA/W(). Lotus Approach doesn't expect this and run into infinite recursion. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52586 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/dialog.c | 21 +++++++++++++++++---- dlls/uxtheme/tests/system.c | 2 +- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/uxtheme/dialog.c b/dlls/uxtheme/dialog.c index 13943d753bb..a27382af784 100644 --- a/dlls/uxtheme/dialog.c +++ b/dlls/uxtheme/dialog.c @@ -131,12 +131,25 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, BOO dlgproc = (WNDPROC)GetWindowLongPtrW(hwnd, DWLP_DLGPROC); SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, 0); lr = LOWORD(CallWindowProcW(dlgproc, hwnd, msg, wp, lp)); - if (lr) + if (lr || !IsWindow(hwnd)) return GetWindowLongPtrW(hwnd, DWLP_MSGRESULT); brush = get_dialog_background_brush(hwnd, TRUE); if (!brush) - break; + { + /* Copied from DEFDLG_Proc() */ + brush = (HBRUSH)SendMessageW(hwnd, WM_CTLCOLORDLG, wp, (LPARAM)hwnd); + if (!brush) + brush = (HBRUSH)DefWindowProcW(hwnd, WM_CTLCOLORDLG, wp, (LPARAM)hwnd); + if (brush) + { + hdc = (HDC)wp; + GetClientRect(hwnd, &rect); + DPtoLP(hdc, (LPPOINT)&rect, 2); + FillRect(hdc, &rect, brush); + } + return TRUE; + } /* Using FillRect() to draw background could introduce a tiling effect if the destination * rectangle is larger than the pattern brush size, which is usually 10x600. This bug is @@ -157,12 +170,12 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, BOO { dlgproc = (WNDPROC)GetWindowLongPtrW(hwnd, DWLP_DLGPROC); lr = CallWindowProcW(dlgproc, hwnd, msg, wp, lp); - if (lr) + if (lr || !IsWindow(hwnd)) return lr; brush = get_dialog_background_brush(hwnd, FALSE); if (!brush) - break; + return DefWindowProcW(hwnd, msg, wp, lp); hdc = (HDC)wp; SetBkColor(hdc, GetSysColor(COLOR_BTNFACE)); diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 4301a0f76f2..29fe5ec047d 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -2319,7 +2319,7 @@ static void test_EnableThemeDialogTexture(void) sprintf(buffer, "message %#x\n", message_tests[i].msg); flush_sequences(sequences, NUM_MSG_SEQUENCES); SendMessageW(dialog, message_tests[i].msg, (WPARAM)child_hdc, (LPARAM)child); - ok_sequence(sequences, PARENT_SEQ_INDEX, message_tests[i].msg_seq, buffer, TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, message_tests[i].msg_seq, buffer, FALSE); } ReleaseDC(child, child_hdc); EndDialog(dialog, 0);

1 0

Jinoh Kang : windowscodecs: Fix non-zero alpha detection in ImagingFactory_CreateBitmapFromHICON.
by Alexandre Julliard 29 Jun '22

29 Jun '22

Module: wine Branch: master Commit: e6155827e8b72be53fc0fa031347121ed8e73b26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6155827e8b72be53fc0fa03… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Jun 28 22:41:38 2022 +0900 windowscodecs: Fix non-zero alpha detection in ImagingFactory_CreateBitmapFromHICON. Increment pixel pointer for every *pixel*, not every *stride*. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/windowscodecs/imgfactory.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index c7e101e3d62..07f5b53fefd 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -901,16 +901,14 @@ static HRESULT WINAPI ImagingFactory_CreateBitmapFromHICON(IWICImagingFactory2 * if (bm.bmBitsPixel == 32) { /* If any pixel has a non-zero alpha, ignore hbmMask */ - bits = (DWORD *)buffer; - for (x = 0; x < width && !has_alpha; x++, bits++) + DWORD *ptr = (DWORD *)buffer; + DWORD *end = ptr + width * height; + while (ptr != end) { - for (y = 0; y < height; y++) + if (*ptr++ & 0xff000000) { - if (*bits & 0xff000000) - { - has_alpha = TRUE; - break; - } + has_alpha = TRUE; + break; } } }

1 0

Nikolay Sivov : advapi32: Implement RegRenameKey().
by Alexandre Julliard 28 Jun '22

28 Jun '22

Module: wine Branch: master Commit: ebbee24c5d493569f56a935251114a5f46a46a4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebbee24c5d493569f56a9352… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 9 22:54:16 2022 +0300 advapi32: Implement RegRenameKey(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/advapi32/registry.c | 22 +++++++++++++++++++--- dlls/advapi32/tests/registry.c | 14 -------------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 730ca850c2b..85e883bdcc9 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -510,10 +510,26 @@ LSTATUS WINAPI RegReplaceKeyW( HKEY hkey, LPCWSTR lpSubKey, LPCWSTR lpNewFile, * RegRenameKey [ADVAPI32.@] * */ -LSTATUS WINAPI RegRenameKey( HKEY hkey, LPCWSTR lpSubKey, LPCWSTR lpNewName ) +LSTATUS WINAPI RegRenameKey( HKEY hkey, LPCWSTR subkey_name, LPCWSTR new_name ) { - FIXME("(%p,%s,%s): stub\n", hkey, debugstr_w(lpSubKey), debugstr_w(lpNewName)); - return ERROR_CALL_NOT_IMPLEMENTED; + UNICODE_STRING str; + LSTATUS ret; + HKEY subkey; + + TRACE("%p, %s, %s.\n", hkey, debugstr_w(subkey_name), debugstr_w(new_name)); + + RtlInitUnicodeString(&str, new_name); + + if (!subkey_name) + return RtlNtStatusToDosError( NtRenameKey( hkey, &str )); + + if ((ret = RegOpenKeyExW( hkey, subkey_name, 0, KEY_WRITE, &subkey ))) + return ret; + + ret = RtlNtStatusToDosError( NtRenameKey( subkey, &str )); + RegCloseKey( subkey ); + + return ret; } diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index c2e78192f2e..cae9fc98734 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -4481,22 +4481,17 @@ static void test_RegRenameKey(void) LSTATUS ret; ret = RegRenameKey(NULL, NULL, NULL); - todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return value %ld.\n", ret); ret = RegRenameKey(NULL, NULL, L"newname"); - todo_wine ok(ret == ERROR_INVALID_HANDLE, "Unexpected return value %ld.\n", ret); ret = RegRenameKey(NULL, L"oldname", NULL); - todo_wine ok(ret == ERROR_INVALID_HANDLE, "Unexpected return value %ld.\n", ret); ret = RegRenameKey(NULL, L"oldname", L"newname"); - todo_wine ok(ret == ERROR_INVALID_HANDLE, "Unexpected return value %ld.\n", ret); ret = RegCreateKeyExA(hkey_main, "TestRenameKey", 0, NULL, 0, KEY_READ, NULL, &key, NULL); ok(!ret, "Unexpected return value %ld.\n", ret); ret = RegRenameKey(key, NULL, L"TestNewRenameKey"); - todo_wine ok(ret == ERROR_ACCESS_DENIED, "Unexpected return value %ld.\n", ret); RegCloseKey(key); @@ -4504,28 +4499,22 @@ static void test_RegRenameKey(void) ret = RegCreateKeyExA(hkey_main, "TestRenameKey", 0, NULL, 0, KEY_WRITE, NULL, &key, NULL); ok(!ret, "Unexpected return value %ld.\n", ret); ret = RegRenameKey(key, NULL, NULL); - todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return value %ld.\n", ret); ret = RegRenameKey(key, NULL, L"TestNewRenameKey"); - todo_wine ok(!ret, "Unexpected return value %ld.\n", ret); RegCloseKey(key); ret = RegDeleteKeyA(hkey_main, "TestNewRenameKey"); - todo_wine ok(!ret, "Unexpected return value %ld.\n", ret); ret = RegDeleteKeyA(hkey_main, "TestRenameKey"); - todo_wine ok(ret, "Unexpected return value %ld.\n", ret); /* Subkey does not exist. */ ret = RegCreateKeyExA(hkey_main, "TestRenameKey", 0, NULL, 0, KEY_WRITE, NULL, &key, NULL); ok(!ret, "Unexpected return value %ld.\n", ret); ret = RegRenameKey(key, L"unknown_subkey", NULL); - todo_wine ok(ret == ERROR_FILE_NOT_FOUND, "Unexpected return value %ld.\n", ret); ret = RegRenameKey(key, L"unknown_subkey", L"known_subkey"); - todo_wine ok(ret == ERROR_FILE_NOT_FOUND, "Unexpected return value %ld.\n", ret); /* Rename existing subkey. */ @@ -4534,14 +4523,11 @@ static void test_RegRenameKey(void) RegCloseKey(key2); ret = RegRenameKey(key, L"known_subkey", L"renamed_subkey"); - todo_wine ok(!ret, "Unexpected return value %ld.\n", ret); ret = RegDeleteKeyA(key, "renamed_subkey"); - todo_wine ok(!ret, "Unexpected return value %ld.\n", ret); ret = RegDeleteKeyA(key, "known_subkey"); - todo_wine ok(ret, "Unexpected return value %ld.\n", ret); RegCloseKey(key);

1 0

Dmitry Timoshkov : comctl32/listview: Add partial support for LVM_SETBKIMAGE.
by Alexandre Julliard 28 Jun '22

28 Jun '22

Module: wine Branch: master Commit: 905dbb8f8b2522b85446d9e18d7c7c77ffcef8de URL: https://source.winehq.org/git/wine.git/?a=commit;h=905dbb8f8b2522b85446d9e1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 14 10:51:24 2022 +0800 comctl32/listview: Add partial support for LVM_SETBKIMAGE. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 90 +++++++++++++++++++++++++++++++++++++----- dlls/comctl32/tests/listview.c | 78 ++++++++++++++++++++++++++++++++++++ 2 files changed, 158 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 730bf4aaddd..ab328b3e798 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -91,7 +91,7 @@ * * Messages: * -- LVM_ENABLEGROUPVIEW - * -- LVM_GETBKIMAGE, LVM_SETBKIMAGE + * -- LVM_GETBKIMAGE * -- LVM_GETGROUPINFO, LVM_SETGROUPINFO * -- LVM_GETGROUPMETRICS, LVM_SETGROUPMETRICS * -- LVM_GETINSERTMARK, LVM_SETINSERTMARK @@ -297,6 +297,7 @@ typedef struct tagLISTVIEW_INFO COLORREF clrBk; COLORREF clrText; COLORREF clrTextBk; + HBITMAP hBkBitmap; /* font */ HFONT hDefaultFont; @@ -4551,6 +4552,21 @@ static INT LISTVIEW_GetTopIndex(const LISTVIEW_INFO *infoPtr) return nItem; } +static void LISTVIEW_DrawBackgroundBitmap(const LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *lprcBox) +{ + HDC mem_hdc; + + if (!infoPtr->hBkBitmap) + return; + + TRACE("(hdc=%p, lprcBox=%s, hBkBitmap=%p)\n", hdc, wine_dbgstr_rect(lprcBox), infoPtr->hBkBitmap); + + mem_hdc = CreateCompatibleDC(hdc); + SelectObject(mem_hdc, infoPtr->hBkBitmap); + BitBlt(hdc, lprcBox->left, lprcBox->top, lprcBox->right - lprcBox->left, + lprcBox->bottom - lprcBox->top, mem_hdc, lprcBox->left, lprcBox->top, SRCCOPY); + DeleteDC(mem_hdc); +} /*** * DESCRIPTION: @@ -4565,13 +4581,17 @@ static INT LISTVIEW_GetTopIndex(const LISTVIEW_INFO *infoPtr) * Success: TRUE * Failure: FALSE */ -static inline BOOL LISTVIEW_FillBkgnd(const LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *lprcBox) +static BOOL LISTVIEW_FillBkgnd(const LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *lprcBox) { - if (!infoPtr->hBkBrush) return FALSE; + if (infoPtr->hBkBrush) + { + TRACE("(hdc=%p, lprcBox=%s, hBkBrush=%p)\n", hdc, wine_dbgstr_rect(lprcBox), infoPtr->hBkBrush); - TRACE("(hdc=%p, lprcBox=%s, hBkBrush=%p)\n", hdc, wine_dbgstr_rect(lprcBox), infoPtr->hBkBrush); + FillRect(hdc, lprcBox, infoPtr->hBkBrush); + } - return FillRect(hdc, lprcBox, infoPtr->hBkBrush); + LISTVIEW_DrawBackgroundBitmap(infoPtr, hdc, lprcBox); + return TRUE; } /* Draw main item or subitem */ @@ -8028,7 +8048,53 @@ static BOOL LISTVIEW_SetBkColor(LISTVIEW_INFO *infoPtr, COLORREF color) return TRUE; } -/* LISTVIEW_SetBkImage */ +static BOOL LISTVIEW_SetBkImage(LISTVIEW_INFO *infoPtr, const LVBKIMAGEW *image, BOOL isW) +{ + TRACE("%08lx, %p, %p, %u, %d, %d\n", image->ulFlags, image->hbm, image->pszImage, + image->cchImageMax, image->xOffsetPercent, image->yOffsetPercent); + + if (image->ulFlags & ~LVBKIF_SOURCE_MASK) + FIXME("unsupported flags %08lx\n", image->ulFlags & ~LVBKIF_SOURCE_MASK); + + if (image->xOffsetPercent || image->yOffsetPercent) + FIXME("unsupported offset %d,%d\n", image->xOffsetPercent, image->yOffsetPercent); + + switch (image->ulFlags & LVBKIF_SOURCE_MASK) + { + case LVBKIF_SOURCE_NONE: + if (infoPtr->hBkBitmap) + { + DeleteObject(infoPtr->hBkBitmap); + infoPtr->hBkBitmap = NULL; + } + InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); + break; + + case LVBKIF_SOURCE_HBITMAP: + { + BITMAP bm; + + if (infoPtr->hBkBitmap) + { + DeleteObject(infoPtr->hBkBitmap); + infoPtr->hBkBitmap = NULL; + } + InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); + if (GetObjectW(image->hbm, sizeof(bm), &bm) == sizeof(bm)) + { + infoPtr->hBkBitmap = image->hbm; + return TRUE; + } + break; + } + + case LVBKIF_SOURCE_URL: + FIXME("LVBKIF_SOURCE_URL: %s\n", isW ? debugstr_w(image->pszImage) : debugstr_a((LPCSTR)image->pszImage)); + break; + } + + return FALSE; +} /*** Helper for {Insert,Set}ColumnT *only* */ static void column_fill_hditem(const LISTVIEW_INFO *infoPtr, HDITEMW *lphdi, INT nColumn, @@ -9641,10 +9707,11 @@ static inline BOOL LISTVIEW_EraseBkgnd(const LISTVIEW_INFO *infoPtr, HDC hdc) if (infoPtr->clrBk == CLR_NONE) { if (infoPtr->dwLvExStyle & LVS_EX_TRANSPARENTBKGND) - return SendMessageW(infoPtr->hwndNotify, WM_PRINTCLIENT, - (WPARAM)hdc, PRF_ERASEBKGND); + SendMessageW(infoPtr->hwndNotify, WM_PRINTCLIENT, (WPARAM)hdc, PRF_ERASEBKGND); else - return SendMessageW(infoPtr->hwndNotify, WM_ERASEBKGND, (WPARAM)hdc, 0); + SendMessageW(infoPtr->hwndNotify, WM_ERASEBKGND, (WPARAM)hdc, 0); + LISTVIEW_DrawBackgroundBitmap(infoPtr, hdc, &rc); + return TRUE; } /* for double buffered controls we need to do this during refresh */ @@ -10406,6 +10473,7 @@ static LRESULT LISTVIEW_NCDestroy(LISTVIEW_INFO *infoPtr) infoPtr->hFont = 0; if (infoPtr->hDefaultFont) DeleteObject(infoPtr->hDefaultFont); if (infoPtr->clrBk != CLR_NONE) DeleteObject(infoPtr->hBkBrush); + if (infoPtr->hBkBitmap) DeleteObject(infoPtr->hBkBitmap); SetWindowLongPtrW(infoPtr->hwndSelf, 0, 0); @@ -11554,7 +11622,9 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case LVM_SETBKCOLOR: return LISTVIEW_SetBkColor(infoPtr, (COLORREF)lParam); - /* case LVM_SETBKIMAGE: */ + case LVM_SETBKIMAGEA: + case LVM_SETBKIMAGEW: + return LISTVIEW_SetBkImage(infoPtr, (LVBKIMAGEW *)lParam, uMsg == LVM_SETBKIMAGEW); case LVM_SETCALLBACKMASK: infoPtr->uCallbackMask = (UINT)wParam; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6ac7f53137d..ed5222a5ee8 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -23,6 +23,7 @@ #include <stdio.h> #include <windows.h> #include <commctrl.h> +#include <objbase.h> #include "wine/test.h" #include "v6util.h" @@ -6924,6 +6925,81 @@ static void test_LVM_GETNEXTITEMINDEX(void) DestroyWindow(hwnd); } +static void test_LVM_SETBKIMAGE(BOOL is_v6) +{ + LVBKIMAGEA image; + HBITMAP hbmp; + BITMAP bm; + HWND hwnd; + int ret; + + CoInitialize(NULL); + + hbmp = CreateBitmap(32, 32, 1, 1, NULL); + hwnd = create_listview_control(LVS_REPORT); + + image.ulFlags = LVBKIF_SOURCE_NONE; + image.hbm = 0; + image.pszImage = NULL; + image.cchImageMax = 0; + image.xOffsetPercent = 0; + image.yOffsetPercent = 0; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(ret == sizeof(bm), "got %d\n", ret); + + image.ulFlags = LVBKIF_SOURCE_HBITMAP; + image.hbm = hbmp; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + if (is_v6) + ok(ret, "got %d\n", ret); + else + todo_wine ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(ret == sizeof(bm), "got %d\n", ret); + + image.ulFlags = LVBKIF_SOURCE_NONE; + image.hbm = 0; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(!ret, "got %d\n", ret); + + hbmp = CreateBitmap(32, 32, 1, 1, NULL); + + image.ulFlags = LVBKIF_SOURCE_HBITMAP; + image.hbm = hbmp; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + if (is_v6) + ok(ret, "got %d\n", ret); + else + todo_wine ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(ret == sizeof(bm), "got %d\n", ret); + + image.ulFlags = LVBKIF_SOURCE_HBITMAP; + image.hbm = hbmp; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + ok(!ret, "got %d\n", ret); + + ret = GetObjectA(hbmp, sizeof(bm), &bm); + ok(!ret, "got %d\n", ret); + + image.ulFlags = LVBKIF_SOURCE_NONE; + image.hbm = 0; + ret = SendMessageA(hwnd, LVM_SETBKIMAGEA, 0, (LPARAM)&image); + ok(!ret, "got %d\n", ret); + + DestroyWindow(hwnd); + + CoUninitialize(); +} + START_TEST(listview) { ULONG_PTR ctx_cookie; @@ -6987,6 +7063,7 @@ START_TEST(listview) test_LVN_ENDLABELEDIT(); test_LVM_GETCOUNTPERPAGE(); test_item_state_change(); + test_LVM_SETBKIMAGE(FALSE); if (!load_v6_module(&ctx_cookie, &hCtx)) { @@ -7034,6 +7111,7 @@ START_TEST(listview) test_item_state_change(); test_selected_column(); test_LVM_GETNEXTITEMINDEX(); + test_LVM_SETBKIMAGE(TRUE); unload_v6_module(ctx_cookie, hCtx);

1 0

Stefan Dösinger : winecfg: Support color profiles larger than MAX_PATH chars.
by Alexandre Julliard 28 Jun '22

28 Jun '22

Module: wine Branch: master Commit: 021eefdee03ce3efc111039085789a6bbc59707f URL: https://source.winehq.org/git/wine.git/?a=commit;h=021eefdee03ce3efc1110390… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 28 13:55:00 2022 +0300 winecfg: Support color profiles larger than MAX_PATH chars. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- programs/winecfg/theme.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 9c8737caf64..78bbf71dbfa 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -22,6 +22,7 @@ * */ +#include <assert.h> #include <stdarg.h> #include <stdlib.h> #include <stdio.h> @@ -554,15 +555,25 @@ static void set_color_from_theme(const WCHAR *keyName, COLORREF color) static void do_parse_theme(WCHAR *file) { - WCHAR keyName[MAX_PATH], keyNameValue[MAX_PATH]; + WCHAR *keyName, keyNameValue[MAX_PATH]; + DWORD len, allocLen = 512; WCHAR *keyNamePtr = NULL; int red = 0, green = 0, blue = 0; COLORREF color; WINE_TRACE("%s\n", wine_dbgstr_w(file)); + keyName = malloc(sizeof(*keyName) * allocLen); + for (;;) + { + assert(keyName); + len = GetPrivateProfileStringW(L"Control Panel\\Colors", NULL, NULL, keyName, + allocLen, file); + if (len < allocLen - 2) + break; - GetPrivateProfileStringW(L"Control Panel\\Colors", NULL, NULL, keyName, - MAX_PATH, file); + allocLen *= 2; + keyName = realloc(keyName, sizeof(*keyName) * allocLen); + } keyNamePtr = keyName; while (*keyNamePtr!=0) { @@ -580,6 +591,7 @@ static void do_parse_theme(WCHAR *file) keyNamePtr+=lstrlenW(keyNamePtr); keyNamePtr++; } + free(keyName); } static void on_theme_install(HWND dialog)

1 0

Zebediah Figura : ntdll/tests: Fix test_user_apc() on i386.
by Alexandre Julliard 28 Jun '22

28 Jun '22

Module: wine Branch: master Commit: 6775a20f4e58d07e166438f99f92143b288e4967 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6775a20f4e58d07e166438f9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jun 25 20:05:54 2022 -0500 ntdll/tests: Fix test_user_apc() on i386. --- dlls/ntdll/tests/exception.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 820e435bc1b..86f2f5d6cb2 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -8784,7 +8784,27 @@ static void test_user_apc(void) pass = 0; InterlockedIncrement(&pass); +#ifdef __i386__ + { + /* RtlCaptureContext puts the return address of the caller's stack + * frame into %eip, so we need a thunk to get it to return here */ + static const BYTE code[] = + { + 0x55, /* pushl %ebp */ + 0x89, 0xe5, /* movl %esp, %ebp */ + 0xff, 0x75, 0x0c, /* pushl 0xc(%ebp) */ + 0xff, 0x55, 0x08, /* call *0x8(%ebp) */ + 0xc9, /* leave */ + 0xc3, /* ret */ + }; + void (__cdecl *func)(void *capture, CONTEXT *context) = code_mem; + + memcpy(code_mem, code, sizeof(code)); + func(RtlCaptureContext, &context); + } +#else RtlCaptureContext(&context); +#endif InterlockedIncrement(&pass); if (pass == 2)

1 0

Zebediah Figura : ntdll/tests: Fix test_user_apc() on Windows < 7.
by Alexandre Julliard 28 Jun '22

28 Jun '22

Module: wine Branch: master Commit: 1168dfc3c100a5074e8678b2e0c875d96c858f85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1168dfc3c100a5074e8678b2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 27 15:41:17 2022 -0500 ntdll/tests: Fix test_user_apc() on Windows < 7. --- dlls/ntdll/tests/exception.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 86f2f5d6cb2..748ee0e52ee 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -8801,6 +8801,9 @@ static void test_user_apc(void) memcpy(code_mem, code, sizeof(code)); func(RtlCaptureContext, &context); + /* work around broken RtlCaptureContext on Windows < 7 which doesn't set + * ContextFlags */ + context.ContextFlags = CONTEXT_FULL; } #else RtlCaptureContext(&context); @@ -8824,8 +8827,7 @@ static void test_user_apc(void) ok(!status, "Got unexpected status %#lx.\n", status); status = NtContinue(&c[0], TRUE ); - /* Broken before Win7, in that case NtContinue returns here instead of restoring context after calling APC. */ - ok(broken(TRUE), "Should not get here, status %#lx.\n", status); + ok(0, "Should not get here, status %#lx.\n", status); return; } ok(pass == 3, "Got unexpected pass %ld.\n", pass);

1 0