February 2021 - Wine-commits

Zhiyi Zhang : comctl32/button: Turn off themed painting if parts are unavailable for Command Links.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: b08c622e22428effc4c0e47446a06e12d3532f40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b08c622e22428effc4c0e474… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Feb 22 22:32:28 2021 +0800 comctl32/button: Turn off themed painting if parts are unavailable for Command Links. Themed painting for Command Links requires BP_COMMANDLINK and BP_COMMANDLINKGLYPH to be defined in the theme. However, Wine currently only supports the v3 theme file format used by XP, which doesn't support Command Links. So turn off themed painting for Command Links if user uses a third party theme that doesn't have the required parts. Otherwise, only plain text is drawn. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 67bf5ceae48..0dcbb38d202 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -276,6 +276,20 @@ static LONG get_default_glyph_size(const BUTTON_INFO *infoPtr) return GetSystemMetrics(SM_CYMENUCHECK); } +static BOOL is_themed_paint_supported(HTHEME theme, UINT btn_type) +{ + if (!theme || !btnThemedPaintFunc[btn_type]) + return FALSE; + + if (btn_type == BS_COMMANDLINK || btn_type == BS_DEFCOMMANDLINK) + { + if (!IsThemePartDefined(theme, BP_COMMANDLINK, 0)) + return FALSE; + } + + return TRUE; +} + static void init_custom_draw(NMCUSTOMDRAW *nmcd, const BUTTON_INFO *infoPtr, HDC hdc, const RECT *rc) { nmcd->hdr.hwndFrom = infoPtr->hwnd; @@ -548,7 +562,7 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L theme = GetWindowTheme( hWnd ); hdc = wParam ? (HDC)wParam : BeginPaint( hWnd, &ps ); - if (theme && btnThemedPaintFunc[btn_type]) + if (is_themed_paint_supported(theme, btn_type)) { int drawState = get_draw_state(infoPtr); UINT dtflags = BUTTON_BStoDT(style, GetWindowLongW(hWnd, GWL_EXSTYLE));

1 0

Zhiyi Zhang : uxtheme: Add Command Link part and state definitions.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: 061ac08d6b5710db43cccaba3226c0d185e8ff6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=061ac08d6b5710db43cccaba… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Feb 22 22:32:36 2021 +0800 uxtheme: Add Command Link part and state definitions. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/stylemap.c | 13 +++++++++++++ include/tmschema.h | 21 +++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index b38b18b623d..1949028581c 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -374,6 +374,19 @@ static const MSSTYLES_CLASS_MAP classButton[] = { {BP_RADIOBUTTON, GBS_NORMAL, L"NORMAL"}, {BP_RADIOBUTTON, GBS_DISABLED, L"DISABLED"}, {BP_USERBUTTON, 0, L"USERBUTTON"}, + {BP_COMMANDLINK, 0, L"COMMANDLINK"}, + {BP_COMMANDLINK, CMDLS_NORMAL, L"NORMAL"}, + {BP_COMMANDLINK, CMDLS_HOT, L"HOT"}, + {BP_COMMANDLINK, CMDLS_PRESSED, L"PRESSED"}, + {BP_COMMANDLINK, CMDLS_DISABLED, L"DISABLED"}, + {BP_COMMANDLINK, CMDLS_DEFAULTED, L"DEFAULTED"}, + {BP_COMMANDLINK, CMDLS_DEFAULTED_ANIMATING, L"DEFAULTED_ANIMATING"}, + {BP_COMMANDLINKGLYPH, 0, L"COMMANDLINKGLYPH"}, + {BP_COMMANDLINKGLYPH, CMDLGS_NORMAL, L"NORMAL"}, + {BP_COMMANDLINKGLYPH, CMDLGS_HOT, L"HOT"}, + {BP_COMMANDLINKGLYPH, CMDLGS_PRESSED, L"PRESSED"}, + {BP_COMMANDLINKGLYPH, CMDLGS_DISABLED, L"DISABLED"}, + {BP_COMMANDLINKGLYPH, CMDLGS_DEFAULTED, L"DEFAULTED"}, {0, 0, L""} }; diff --git a/include/tmschema.h b/include/tmschema.h index 910de19e2a6..15afc48d5cc 100644 --- a/include/tmschema.h +++ b/include/tmschema.h @@ -411,6 +411,8 @@ BEGIN_TM_CLASS_PARTS(BUTTON) TM_PART(3, BP, CHECKBOX) TM_PART(4, BP, GROUPBOX) TM_PART(5, BP, USERBUTTON) + TM_PART(6, BP, COMMANDLINK) + TM_PART(7, BP, COMMANDLINKGLYPH) END_TM_CLASS_PARTS() /* BUTTON - PUSHBUTTON states */ @@ -456,6 +458,25 @@ BEGIN_TM_PART_STATES(GROUPBOX) TM_STATE(2, GBS, DISABLED) END_TM_PART_STATES() +/* BUTTON - COMMANDLINK states */ +BEGIN_TM_PART_STATES(COMMANDLINK) + TM_STATE(1, CMDLS, NORMAL) + TM_STATE(2, CMDLS, HOT) + TM_STATE(3, CMDLS, PRESSED) + TM_STATE(4, CMDLS, DISABLED) + TM_STATE(5, CMDLS, DEFAULTED) + TM_STATE(6, CMDLS, DEFAULTED_ANIMATING) +END_TM_PART_STATES() + +/* BUTTON - COMMANDLINKGLYPH states */ +BEGIN_TM_PART_STATES(COMMANDLINKGLYPH) + TM_STATE(1, CMDLGS, NORMAL) + TM_STATE(2, CMDLGS, HOT) + TM_STATE(3, CMDLGS, PRESSED) + TM_STATE(4, CMDLGS, DISABLED) + TM_STATE(5, CMDLGS, DEFAULTED) +END_TM_PART_STATES() + /* CLOCK parts */ BEGIN_TM_CLASS_PARTS(CLOCK) TM_PART(1, CLP, TIME)

1 0

Zhiyi Zhang : uxtheme: Support more font properties.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: a18df3a412095344ffdc65d21c6198d858be960a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a18df3a412095344ffdc65d2… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Feb 22 22:32:44 2021 +0800 uxtheme: Support more font properties. Add support for TMT_HEADING1FONT, TMT_HEADING2FONT and TMT_BODYFONT. TMT_BODYFONT is used by Command Links. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/stylemap.c | 3 +++ include/tmschema.h | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 1949028581c..20ed1305da8 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -83,6 +83,9 @@ static const MSSTYLES_PROPERTY_MAP mapProperty[] = { {TMT_FONT, TMT_STATUSFONT, L"STATUSFONT"}, {TMT_FONT, TMT_MSGBOXFONT, L"MSGBOXFONT"}, {TMT_FONT, TMT_ICONTITLEFONT, L"ICONTITLEFONT"}, + {TMT_FONT, TMT_HEADING1FONT, L"HEADING1FONT"}, + {TMT_FONT, TMT_HEADING2FONT, L"HEADING2FONT"}, + {TMT_FONT, TMT_BODYFONT, L"BODYFONT"}, {TMT_BOOL, TMT_FLATMENUS, L"FLATMENUS"}, {TMT_SIZE, TMT_SIZINGBORDERWIDTH, L"SIZINGBORDERWIDTH"}, {TMT_SIZE, TMT_SCROLLBARWIDTH, L"SCROLLBARWIDTH"}, diff --git a/include/tmschema.h b/include/tmschema.h index 15afc48d5cc..2d2eccce11e 100644 --- a/include/tmschema.h +++ b/include/tmschema.h @@ -188,8 +188,11 @@ BEGIN_TM_PROPS() TM_PROP(804, TMT, STATUSFONT, FONT) TM_PROP(805, TMT, MSGBOXFONT, FONT) TM_PROP(806, TMT, ICONTITLEFONT, FONT) + TM_PROP(807, TMT, HEADING1FONT, FONT) + TM_PROP(808, TMT, HEADING2FONT, FONT) + TM_PROP(809, TMT, BODYFONT, FONT) # define TMT_FIRSTFONT TMT_CAPTIONFONT -# define TMT_LASTFONT TMT_ICONTITLEFONT +# define TMT_LASTFONT TMT_BODYFONT /* Bool theme metric properties */ TM_PROP(1001, TMT, FLATMENUS, BOOL)

1 0

Zhiyi Zhang : uxtheme: Support DTT_FONTPROP for DrawThemeTextEx().
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: 300ecff14545a508d42f97406c5ba5130a5d9c76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=300ecff14545a508d42f9740… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Feb 22 22:32:56 2021 +0800 uxtheme: Support DTT_FONTPROP for DrawThemeTextEx(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/draw.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 023b2dfd61b..8c3c4ae2218 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -1660,6 +1660,7 @@ HRESULT WINAPI DrawThemeTextEx(HTHEME hTheme, HDC hdc, int iPartId, int iStateId COLORREF textColor; COLORREF oldTextColor; int oldBkMode; + int fontProp; TRACE("%p %p %d %d %s:%d 0x%08x %p %p\n", hTheme, hdc, iPartId, iStateId, debugstr_wn(pszText, iCharCount), iCharCount, flags, rect, options); @@ -1667,10 +1668,15 @@ HRESULT WINAPI DrawThemeTextEx(HTHEME hTheme, HDC hdc, int iPartId, int iStateId if(!hTheme) return E_HANDLE; - if (options->dwFlags & ~DTT_TEXTCOLOR) + if (options->dwFlags & ~(DTT_TEXTCOLOR | DTT_FONTPROP)) FIXME("unsupported flags 0x%08x\n", options->dwFlags); - - hr = GetThemeFont(hTheme, hdc, iPartId, iStateId, TMT_FONT, &logfont); + + if (options->dwFlags & DTT_FONTPROP) + fontProp = options->iFontPropId; + else + fontProp = TMT_FONT; + + hr = GetThemeFont(hTheme, hdc, iPartId, iStateId, fontProp, &logfont); if(SUCCEEDED(hr)) { hFont = CreateFontIndirectW(&logfont); if(!hFont)

1 0

Zhiyi Zhang : uxtheme: Remove unused code.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: c6b100ef98a48585214b501aa93b2cc5c46f1057 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6b100ef98a48585214b501a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Feb 22 22:33:08 2021 +0800 uxtheme: Remove unused code. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/buffer.c | 2 -- dlls/uxtheme/msstyles.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/dlls/uxtheme/buffer.c b/dlls/uxtheme/buffer.c index b07284f8e06..f159d5c1be0 100644 --- a/dlls/uxtheme/buffer.c +++ b/dlls/uxtheme/buffer.c @@ -52,8 +52,6 @@ static void free_paintbuffer(struct paintbuffer *buffer) static struct paintbuffer *get_buffer_obj(HPAINTBUFFER handle) { - if (!handle) - return NULL; return handle; } diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index cd7677e5783..ed22d923250 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -46,8 +46,6 @@ static BOOL MSSTYLES_GetNextToken(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LP static void MSSTYLES_ParseThemeIni(PTHEME_FILE tf, BOOL setMetrics); static HRESULT MSSTYLES_GetFont (LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LOGFONTW* logfont); -extern int alphaBlendMode; - #define MSSTYLES_VERSION 0x0003 static PTHEME_FILE tfActiveTheme;

1 0

Hugh McMaster : reg/tests: Add tests for forward and back slashes in key and value names.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: 3fd57fd995c1af3770fd72effcec874529f17b6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fd57fd995c1af3770fd72ef… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 22 19:42:34 2021 +1100 reg/tests: Add tests for forward and back slashes in key and value names. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 89 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 77 insertions(+), 12 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index db02fc770e2..538a274d54f 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -578,6 +578,19 @@ static void test_add(void) ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); verify_reg(hkey, NULL, REG_MULTI_SZ, buffer, 1, 0); + /* Test forward and back slashes */ + run_reg_exe("reg add HKCU\\" KEY_BASE "\\https://winehq.org /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key(hkey, "https://winehq.org"); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v count/up /d one/two/three /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "count/up", REG_SZ, "one/two/three", 14, 0); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v \\foo\\bar /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "\\foo\\bar", REG_SZ, "", 1, 0); + close_key(hkey); /* Test duplicate switches */ @@ -615,7 +628,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v invalid4 -", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); } static void test_delete(void) @@ -681,6 +694,24 @@ static void test_delete(void) verify_reg_nonexist(hkey, "foo"); verify_key(hkey, "subkey"); + /* Test forward and back slashes */ + add_key(hkey, "https://winehq.org", &hsubkey); + close_key(hsubkey); + add_value(hkey, "count/up", REG_SZ, "one/two/three", 14); + add_value(hkey, "\\foo\\bar", REG_SZ, "", 1); + + run_reg_exe("reg delete HKCU\\" KEY_BASE "\\https://winehq.org /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "https://winehq.org"); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v count/up /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "count/up"); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v \\foo\\bar /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "\\foo\\bar"); + close_key(hkey); run_reg_exe("reg delete HKCU\\" KEY_BASE " /f", &r); @@ -2385,9 +2416,20 @@ static void test_import(void) todo_wine verify_reg_nonexist(hkey, "Wine70e"); todo_wine verify_reg_nonexist(hkey, "Wine70f"); + /* Test forward and back slashes */ + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"count/up\"=\"one/two/three\"\n" + "\"\\\\foo\\\\bar\"=\"\"\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\https://winehq.org]\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "count/up", REG_SZ, "one/two/three", 14, 0); + verify_reg(hkey, "\\foo\\bar", REG_SZ, "", 1, 0); + verify_key(hkey, "https://winehq.org"); + close_key(hkey); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); } static void test_unicode_import(void) @@ -3923,9 +3965,20 @@ static void test_unicode_import(void) todo_wine verify_reg_nonexist(hkey, "Wine70e"); todo_wine verify_reg_nonexist(hkey, "Wine70f"); + /* Test forward and back slashes */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"count/up\"=\"one/two/three\"\n" + "\"\\\\foo\\\\bar\"=\"\"\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\https://winehq.org]\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "count/up", REG_SZ, "one/two/three", 14, 0); + verify_reg(hkey, "\\foo\\bar", REG_SZ, "", 1, 0); + verify_key(hkey, "https://winehq.org"); + close_key(hkey); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); } static void test_import_with_whitespace(void) @@ -4473,6 +4526,13 @@ static void test_export(void) "\"Wine4g\"=\"Value2\"\r\n" "\"Wine4h\"=\"abc\"\r\n\r\n"; + const char *slashes_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"count/up\"=\"one/two/three\"\r\n" + "\"\\\\foo\\\\bar\"=\"\"\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\https://winehq.org]\r\n\r\n"; + delete_tree(HKEY_CURRENT_USER, KEY_BASE); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); @@ -4579,9 +4639,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", complex_test, 0), "compare_export() failed\n"); - - err = delete_tree(HKEY_CURRENT_USER, KEY_BASE); - ok(err == ERROR_SUCCESS, "delete_tree() failed: %d\n", err); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); /* Test the export order of registry keys */ add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); @@ -4593,7 +4651,6 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", key_order_test, 0), "compare_export() failed\n"); - delete_key(hkey, "Subkey1"); delete_key(hkey, "Subkey2"); @@ -4607,7 +4664,6 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", value_order_test, TODO_REG_COMPARE), "compare_export() failed\n"); - delete_key(HKEY_CURRENT_USER, KEY_BASE); /* Test registry export with empty hex data */ @@ -4625,7 +4681,6 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", empty_hex_test, 0), "compare_export() failed\n"); - delete_key(HKEY_CURRENT_USER, KEY_BASE); /* Test registry export after importing alternative registry data types */ @@ -4643,7 +4698,6 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", empty_hex_test2, 0), "compare_export() failed\n"); - delete_key(HKEY_CURRENT_USER, KEY_BASE); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" @@ -4662,7 +4716,6 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", hex_types_test, 0), "compare_export() failed\n"); - delete_key(HKEY_CURRENT_USER, KEY_BASE); /* Test registry export with embedded null characters */ @@ -4700,8 +4753,20 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", embedded_null_test, 0), "compare_export() failed\n"); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + + /* Test registry export with forward and back slashes */ + add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); + add_key(hkey, "https://winehq.org", &subkey); + close_key(subkey); + add_value(hkey, "count/up", REG_SZ, "one/two/three", 14); + add_value(hkey, "\\foo\\bar", REG_SZ, "", 1); + close_key(hkey); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", slashes_test, TODO_REG_COMPARE), "compare_export() failed\n"); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); } #define COPY_DEST KEY_WINE "\\reg_copy"

1 0

Alexandre Julliard : acledit: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: 18f0627a42d9a0e762fc0e1d8338f0a521d90fe7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18f0627a42d9a0e762fc0e1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:23:41 2021 +0100 acledit: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/acledit/Makefile.in | 2 +- dlls/acledit/main.c | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/dlls/acledit/Makefile.in b/dlls/acledit/Makefile.in index 941eb0772df..cd026549e6e 100644 --- a/dlls/acledit/Makefile.in +++ b/dlls/acledit/Makefile.in @@ -1,6 +1,6 @@ MODULE = acledit.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/acledit/main.c b/dlls/acledit/main.c index 50797c074cd..314fa4ab0c6 100644 --- a/dlls/acledit/main.c +++ b/dlls/acledit/main.c @@ -29,24 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(acledit); -/***************************************************** - * DllMain - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinstDLL ); - break; - } - return TRUE; -} - /*********************************************************************** * FMExtensionProcW (acledit.@) *

1 0

Alexandre Julliard : aclui: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: bad1ff15fee5de6290bb8011ebdfc9ff4734e95c URL: https://source.winehq.org/git/wine.git/?a=commit;h=bad1ff15fee5de6290bb8011… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:23:45 2021 +0100 aclui: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/aclui/Makefile.in | 2 +- dlls/aclui/aclui_main.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/aclui/Makefile.in b/dlls/aclui/Makefile.in index 83bd379c1ba..e79b3fe9e33 100644 --- a/dlls/aclui/Makefile.in +++ b/dlls/aclui/Makefile.in @@ -1,6 +1,6 @@ MODULE = aclui.dll IMPORTLIB = aclui -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = aclui_main.c diff --git a/dlls/aclui/aclui_main.c b/dlls/aclui/aclui_main.c index 033a47191cb..1a03f30df24 100644 --- a/dlls/aclui/aclui_main.c +++ b/dlls/aclui/aclui_main.c @@ -31,21 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(aclui); -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - return TRUE; -} - HPROPSHEETPAGE WINAPI CreateSecurityPage(LPSECURITYINFO psi) { FIXME("(%p): stub\n", psi);

1 0

Alexandre Julliard : activeds: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: 93c551abd6c206b68119113b8adf0db66fd96179 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93c551abd6c206b68119113b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:23:49 2021 +0100 activeds: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/activeds/Makefile.in | 2 +- dlls/activeds/activeds_main.c | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/dlls/activeds/Makefile.in b/dlls/activeds/Makefile.in index e76db4f7bcd..6a64ec541b9 100644 --- a/dlls/activeds/Makefile.in +++ b/dlls/activeds/Makefile.in @@ -2,7 +2,7 @@ MODULE = activeds.dll IMPORTLIB = activeds IMPORTS = advapi32 ole32 oleaut32 uuid -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ activeds_main.c \ diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index 1b22da67653..9a8bb3b0e73 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -40,24 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(activeds); -/***************************************************** - * DllMain - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(%p, %d, %p)\n",hinstDLL, fdwReason, lpvReserved); - - switch(fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinstDLL ); - break; - } - return TRUE; -} - /***************************************************** * ADsGetObject [ACTIVEDS.3] */

1 0

Alexandre Julliard : apphelp: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 22 Feb '21

22 Feb '21

Module: wine Branch: master Commit: 7d60c2576067829b50ca954a8419925d9c66fa59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d60c2576067829b50ca954a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:23:54 2021 +0100 apphelp: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/apphelp/Makefile.in | 2 +- dlls/apphelp/apphelp.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/apphelp/Makefile.in b/dlls/apphelp/Makefile.in index b3c4de763a4..ec247c845c7 100644 --- a/dlls/apphelp/Makefile.in +++ b/dlls/apphelp/Makefile.in @@ -1,5 +1,5 @@ MODULE = apphelp.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = apphelp.c diff --git a/dlls/apphelp/apphelp.c b/dlls/apphelp/apphelp.c index 0ff74aa5847..a603a044b94 100644 --- a/dlls/apphelp/apphelp.c +++ b/dlls/apphelp/apphelp.c @@ -39,21 +39,6 @@ typedef DWORD TAGID; /* FIXME: don't know where to place that define */ #define TAGID_NULL 0x0 -BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) -{ - TRACE("%p, %u, %p\n", hinst, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinst ); - break; - } - return TRUE; -} - BOOL WINAPI ApphelpCheckInstallShieldPackage( void* ptr, LPCWSTR path ) { FIXME("stub: %p %s\n", ptr, debugstr_w(path));

1 0