November 2022 - Wine-Commits

Zhiyi Zhang : light.msstyles: Add nonclient metrics.
by Alexandre Julliard Nov. 9, 2022

Nov. 9, 2022

Module: wine Branch: master Commit: 9f3138b0ea41d89db916c713f8652c80d5dd66df URL: https://gitlab.winehq.org/wine/wine/-/commit/9f3138b0ea41d89db916c713f8652c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Oct 17 23:14:20 2022 +0800 light.msstyles: Add nonclient metrics. --- dlls/light.msstyles/light.rc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index be8b1dfda57..3a374f5416d 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -128,6 +128,17 @@ BLUE_INI TEXTFILE "MenuHilight = 48 150 250\r\n" "MenuBar = 255 255 255\r\n" +"\r\n; Nonclient metrics\r\n" +"CaptionFont = Tahoma, 10, bold\r\n" +"CaptionBarHeight = 25\r\n" +"SmallCaptionFont = Tahoma, 8, bold\r\n" +"SMCaptionBarHeight = 17\r\n" +"SMCaptionBarWidth = 17\r\n" +"MenuFont = Tahoma, 8\r\n" +"StatusFont = Tahoma, 8\r\n" +"MsgBoxFont = Tahoma, 8\r\n" +"IconTitleFont = Tahoma, 8\r\n" + "\r\n; Flat menus\r\n" "FlatMenus = true\r\n"

1 0

Alex Henrie : include: Define PROPSHEETPAGE[AW]_V[1-4].
by Alexandre Julliard Nov. 9, 2022

Nov. 9, 2022

Module: wine Branch: master Commit: f7e1bb9f36b579a500cac1b480aed2faf6d65a2b URL: https://gitlab.winehq.org/wine/wine/-/commit/f7e1bb9f36b579a500cac1b480aed2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 7 21:25:05 2022 -0700 include: Define PROPSHEETPAGE[AW]_V[1-4]. Needed to compile Tera Term. --- include/prsht.h | 170 +++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 118 insertions(+), 52 deletions(-) diff --git a/include/prsht.h b/include/prsht.h index a88351701ed..f1ab90b02cc 100644 --- a/include/prsht.h +++ b/include/prsht.h @@ -61,79 +61,133 @@ typedef LPCDLGTEMPLATEA PROPSHEETPAGE_RESOURCEA; typedef LPCDLGTEMPLATEW PROPSHEETPAGE_RESOURCEW; DECL_WINELIB_TYPE_AW(PROPSHEETPAGE_RESOURCE) +#define PROPSHEETPAGEA_V1_FIELDS \ + DWORD dwSize; \ + DWORD dwFlags; \ + HINSTANCE hInstance; \ + union \ + { \ + const char *pszTemplate; \ + PROPSHEETPAGE_RESOURCEA pResource; \ + } DUMMYUNIONNAME; \ + union \ + { \ + HICON hIcon; \ + const char *pszIcon; \ + } DUMMYUNIONNAME2; \ + const char *pszTitle; \ + DLGPROC pfnDlgProc; \ + LPARAM lParam; \ + LPFNPSPCALLBACKA pfnCallback; \ + UINT *pcRefParent; + +typedef struct _PROPSHEETPAGEA_V1 +{ + PROPSHEETPAGEA_V1_FIELDS +} PROPSHEETPAGEA_V1, *LPPROPSHEETPAGEA_V1; + +typedef struct _PROPSHEETPAGEA_V2 +{ + PROPSHEETPAGEA_V1_FIELDS + const char *pszHeaderTitle; + const char *pszHeaderSubTitle; +} PROPSHEETPAGEA_V2, *LPPROPSHEETPAGEA_V2; + +typedef struct _PROPSHEETPAGEA_V3 +{ + PROPSHEETPAGEA_V1_FIELDS + const char *pszHeaderTitle; + const char *pszHeaderSubTitle; + HANDLE hActCtx; +} PROPSHEETPAGEA_V3, *LPPROPSHEETPAGEA_V3; + typedef struct _PROPSHEETPAGEA { - DWORD dwSize; - DWORD dwFlags; - HINSTANCE hInstance; - union - { - LPCSTR pszTemplate; - PROPSHEETPAGE_RESOURCEA pResource; - } DUMMYUNIONNAME; - union - { - HICON hIcon; - LPCSTR pszIcon; - } DUMMYUNIONNAME2; - LPCSTR pszTitle; - DLGPROC pfnDlgProc; - LPARAM lParam; - LPFNPSPCALLBACKA pfnCallback; - UINT* pcRefParent; - LPCSTR pszHeaderTitle; - LPCSTR pszHeaderSubTitle; + PROPSHEETPAGEA_V1_FIELDS + const char *pszHeaderTitle; + const char *pszHeaderSubTitle; HANDLE hActCtx; union { HBITMAP hbmHeader; - LPCSTR pszbmHeader; + const char *pszbmHeader; } DUMMYUNIONNAME3; } PROPSHEETPAGEA, *LPPROPSHEETPAGEA, + PROPSHEETPAGEA_V4, *LPPROPSHEETPAGEA_V4, PROPSHEETPAGEA_LATEST, *LPPROPSHEETPAGEA_LATEST; -typedef const PROPSHEETPAGEA *LPCPROPSHEETPAGEA, *LPCPROPSHEETPAGEA_LATEST; -#define PROPSHEETPAGEA_V1_SIZE CCSIZEOF_STRUCT(PROPSHEETPAGEA, pcRefParent) -#define PROPSHEETPAGEA_V2_SIZE CCSIZEOF_STRUCT(PROPSHEETPAGEA, pszHeaderSubTitle) -#define PROPSHEETPAGEA_V3_SIZE CCSIZEOF_STRUCT(PROPSHEETPAGEA, hActCtx) -#define PROPSHEETPAGEA_V4_SIZE sizeof(PROPSHEETPAGEA) +typedef const PROPSHEETPAGEA_V1 *LPCPROPSHEETPAGEA_V1; +typedef const PROPSHEETPAGEA_V2 *LPCPROPSHEETPAGEA_V2; +typedef const PROPSHEETPAGEA_V3 *LPCPROPSHEETPAGEA_V3; +typedef const PROPSHEETPAGEA_V4 *LPCPROPSHEETPAGEA, *LPCPROPSHEETPAGEA_V4, *LPCPROPSHEETPAGEA_LATEST; +#define PROPSHEETPAGEA_V1_SIZE sizeof(PROPSHEETPAGEA_V1) +#define PROPSHEETPAGEA_V2_SIZE sizeof(PROPSHEETPAGEA_V2) +#define PROPSHEETPAGEA_V3_SIZE sizeof(PROPSHEETPAGEA_V3) +#define PROPSHEETPAGEA_V4_SIZE sizeof(PROPSHEETPAGEA_V4) + +#define PROPSHEETPAGEW_V1_FIELDS \ + DWORD dwSize; \ + DWORD dwFlags; \ + HINSTANCE hInstance; \ + union \ + { \ + const WCHAR *pszTemplate; \ + PROPSHEETPAGE_RESOURCEW pResource; \ + } DUMMYUNIONNAME; \ + union \ + { \ + HICON hIcon; \ + const WCHAR *pszIcon; \ + } DUMMYUNIONNAME2; \ + const WCHAR *pszTitle; \ + DLGPROC pfnDlgProc; \ + LPARAM lParam; \ + LPFNPSPCALLBACKW pfnCallback; \ + UINT *pcRefParent; + +typedef struct _PROPSHEETPAGEW_V1 +{ + PROPSHEETPAGEW_V1_FIELDS +} PROPSHEETPAGEW_V1, *LPPROPSHEETPAGEW_V1; + +typedef struct _PROPSHEETPAGEW_V2 +{ + PROPSHEETPAGEW_V1_FIELDS + const WCHAR *pszHeaderTitle; + const WCHAR *pszHeaderSubTitle; +} PROPSHEETPAGEW_V2, *LPPROPSHEETPAGEW_V2; + +typedef struct _PROPSHEETPAGEW_V3 +{ + PROPSHEETPAGEW_V1_FIELDS + const WCHAR *pszHeaderTitle; + const WCHAR *pszHeaderSubTitle; + HANDLE hActCtx; +} PROPSHEETPAGEW_V3, *LPPROPSHEETPAGEW_V3; typedef struct _PROPSHEETPAGEW { - DWORD dwSize; - DWORD dwFlags; - HINSTANCE hInstance; - union - { - LPCWSTR pszTemplate; - PROPSHEETPAGE_RESOURCEW pResource; - } DUMMYUNIONNAME; - union - { - HICON hIcon; - LPCWSTR pszIcon; - } DUMMYUNIONNAME2; - LPCWSTR pszTitle; - DLGPROC pfnDlgProc; - LPARAM lParam; - LPFNPSPCALLBACKW pfnCallback; - UINT* pcRefParent; - LPCWSTR pszHeaderTitle; - LPCWSTR pszHeaderSubTitle; + PROPSHEETPAGEW_V1_FIELDS + const WCHAR *pszHeaderTitle; + const WCHAR *pszHeaderSubTitle; HANDLE hActCtx; union { HBITMAP hbmHeader; - LPCWSTR pszbmHeader; + const WCHAR *pszbmHeader; } DUMMYUNIONNAME3; } PROPSHEETPAGEW, *LPPROPSHEETPAGEW, + PROPSHEETPAGEW_V4, *LPPROPSHEETPAGEW_V4, PROPSHEETPAGEW_LATEST, *LPPROPSHEETPAGEW_LATEST; -typedef const PROPSHEETPAGEW *LPCPROPSHEETPAGEW, *LPCPROPSHEETPAGEW_LATEST; -#define PROPSHEETPAGEW_V1_SIZE CCSIZEOF_STRUCT(PROPSHEETPAGEW, pcRefParent) -#define PROPSHEETPAGEW_V2_SIZE CCSIZEOF_STRUCT(PROPSHEETPAGEW, pszHeaderSubTitle) -#define PROPSHEETPAGEW_V3_SIZE CCSIZEOF_STRUCT(PROPSHEETPAGEW, hActCtx) -#define PROPSHEETPAGEW_V4_SIZE sizeof(PROPSHEETPAGEW) +typedef const PROPSHEETPAGEW_V1 *LPCPROPSHEETPAGEW_V1; +typedef const PROPSHEETPAGEW_V2 *LPCPROPSHEETPAGEW_V2; +typedef const PROPSHEETPAGEW_V3 *LPCPROPSHEETPAGEW_V3; +typedef const PROPSHEETPAGEW *LPCPROPSHEETPAGEW, *LPCPROPSHEETPAGEW_V4, *LPCPROPSHEETPAGEW_LATEST; +#define PROPSHEETPAGEW_V1_SIZE sizeof(PROPSHEETPAGEW_V1) +#define PROPSHEETPAGEW_V2_SIZE sizeof(PROPSHEETPAGEW_V2) +#define PROPSHEETPAGEW_V3_SIZE sizeof(PROPSHEETPAGEW_V3) +#define PROPSHEETPAGEW_V4_SIZE sizeof(PROPSHEETPAGEW_V4) typedef struct _PROPSHEETHEADERA @@ -256,6 +310,18 @@ DECL_WINELIB_TYPE_AW(LPFNPSPCALLBACK) # define DECL_PRSHT_TYPE_AW(base, suffix) typedef PRSHT_NAME_AW(base, suffix) base##_##suffix; #endif /* WINE_NO_UNICODE_MACROS */ +DECL_PRSHT_TYPE_AW(PROPSHEETPAGE, V1) +DECL_PRSHT_TYPE_AW(LPPROPSHEETPAGE, V1) +DECL_PRSHT_TYPE_AW(LPCPROPSHEETPAGE, V1) +DECL_PRSHT_TYPE_AW(PROPSHEETPAGE, V2) +DECL_PRSHT_TYPE_AW(LPPROPSHEETPAGE, V2) +DECL_PRSHT_TYPE_AW(LPCPROPSHEETPAGE, V2) +DECL_PRSHT_TYPE_AW(PROPSHEETPAGE, V3) +DECL_PRSHT_TYPE_AW(LPPROPSHEETPAGE, V3) +DECL_PRSHT_TYPE_AW(LPCPROPSHEETPAGE, V3) +DECL_PRSHT_TYPE_AW(PROPSHEETPAGE, V4) +DECL_PRSHT_TYPE_AW(LPPROPSHEETPAGE, V4) +DECL_PRSHT_TYPE_AW(LPCPROPSHEETPAGE, V4) DECL_PRSHT_TYPE_AW(PROPSHEETPAGE, LATEST) DECL_PRSHT_TYPE_AW(LPPROPSHEETPAGE, LATEST) DECL_PRSHT_TYPE_AW(LPCPROPSHEETPAGE, LATEST)

1 0

Brendan Shanks : ntdll: Stop using deprecated kIOMasterPortDefault constant.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: master Commit: 13cc08e32d6c04f8f915d07cda39638ee99c3d43 URL: https://gitlab.winehq.org/wine/wine/-/commit/13cc08e32d6c04f8f915d07cda3963… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Nov 8 10:47:23 2022 -0800 ntdll: Stop using deprecated kIOMasterPortDefault constant. --- dlls/ntdll/unix/cdrom.c | 2 +- dlls/ntdll/unix/system.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/cdrom.c b/dlls/ntdll/unix/cdrom.c index a9385daf099..a4a9400a518 100644 --- a/dlls/ntdll/unix/cdrom.c +++ b/dlls/ntdll/unix/cdrom.c @@ -367,7 +367,7 @@ static NTSTATUS get_parent_device( int fd, char *name, size_t len ) CFDictionaryAddValue( dict, CFSTR("Removable"), kCFBooleanTrue ); - service = IOServiceGetMatchingService( kIOMasterPortDefault, dict ); + service = IOServiceGetMatchingService( 0, dict ); /* now look for the parent that has the "Whole" attribute set to TRUE */ diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 4ca07c2e34c..ba2051da65e 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -1632,7 +1632,7 @@ static NTSTATUS get_smbios_from_iokit( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, struct smbios_prologue *prologue; BYTE major_version = 2, minor_version = 0; - if (!(service = IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("AppleSMBIOS")))) + if (!(service = IOServiceGetMatchingService(0, IOServiceMatching("AppleSMBIOS")))) { WARN("can't find AppleSMBIOS service\n"); return STATUS_NO_MEMORY; @@ -1727,7 +1727,7 @@ static NTSTATUS generate_smbios( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG struct smbios_board_args board_args; struct smbios_chassis_args chassis_args; - platform_expert = IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("IOPlatformExpertDevice")); + platform_expert = IOServiceGetMatchingService(0, IOServiceMatching("IOPlatformExpertDevice")); if (!platform_expert) return STATUS_NO_MEMORY; @@ -3493,7 +3493,7 @@ static NTSTATUS fill_battery_state( SYSTEM_BATTERY_STATE *bs ) uint32_t value, voltage; CFTimeInterval remain; - if (IOPMCopyBatteryInfo( kIOMasterPortDefault, &batteries ) != kIOReturnSuccess) + if (IOPMCopyBatteryInfo( 0, &batteries ) != kIOReturnSuccess) return STATUS_ACCESS_DENIED; if (CFArrayGetCount( batteries ) == 0)

1 0

Brendan Shanks : ntdll: Suppress deprecation warnings when calling MPTaskIsPreemptive().
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: master Commit: 3873d434616067e6219bf5969d4da27db8e0c9ac URL: https://gitlab.winehq.org/wine/wine/-/commit/3873d434616067e6219bf5969d4da2… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Nov 8 10:45:40 2022 -0800 ntdll: Suppress deprecation warnings when calling MPTaskIsPreemptive(). --- dlls/ntdll/unix/loader.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 306f73dff4f..896247e109a 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -2358,10 +2358,13 @@ static void apple_main_thread(void) if (!pthread_main_np()) return; +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" /* Multi-processing Services can get confused about the main thread if the * first time it's used is on a secondary thread. Use it here to make sure * that doesn't happen. */ MPTaskIsPreemptive(MPCurrentTaskID()); +#pragma clang diagnostic pop /* Give ourselves the best chance of having the distributed notification * center scheduled on this thread's run loop. In theory, it's scheduled

1 0

Brendan Shanks : ntdll: Fix runtime availability check for pthread_attr_set_qos_class_np.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: master Commit: e605bc17a5657814a8f9a99e2a94d3222e03ba9d URL: https://gitlab.winehq.org/wine/wine/-/commit/e605bc17a5657814a8f9a99e2a94d3… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Nov 8 09:52:10 2022 -0800 ntdll: Fix runtime availability check for pthread_attr_set_qos_class_np. --- dlls/ntdll/unix/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 3295f7f918b..306f73dff4f 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -2336,7 +2336,7 @@ static void apple_create_wine_thread( void *arg ) pthread_attr_init( &attr ); pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_JOINABLE ); /* Use the same QoS class as the process main thread (user-interactive). */ - if (pthread_attr_set_qos_class_np) + if (&pthread_attr_set_qos_class_np) pthread_attr_set_qos_class_np( &attr, QOS_CLASS_USER_INTERACTIVE, 0 ); if (pthread_create( &thread, &attr, apple_wine_thread, NULL )) exit(1); pthread_attr_destroy( &attr );

1 0

Gabriel Ivăncescu : include: Add CLSID_XHTMLDocument and CLSID_SVGDocument.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: master Commit: 4bd8339de9775c91e04d90c268812282a17b79fd URL: https://gitlab.winehq.org/wine/wine/-/commit/4bd8339de9775c91e04d90c2688122… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 8 20:50:35 2022 +0200 include: Add CLSID_XHTMLDocument and CLSID_SVGDocument. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- include/mshtml.idl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/mshtml.idl b/include/mshtml.idl index 372089223fe..8c5fa25f75b 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -34,6 +34,8 @@ import "dispex.idl"; cpp_quote("#include <olectl.h>") cpp_quote("DEFINE_GUID(CLSID_MHTMLDocument, 0x3050f3d9,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd,0xce,0x0b);") +cpp_quote("DEFINE_GUID(CLSID_XHTMLDocument, 0x30590067,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd,0xce,0x0b);") +cpp_quote("DEFINE_GUID(CLSID_SVGDocument, 0x30590066,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd,0xce,0x0b);") cpp_quote("DEFINE_GUID(SID_SEditCommandTarget, 0x3050f4b5,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd,0xce,0x0b);") cpp_quote("DEFINE_GUID(SID_SHTMLEditHost, 0x3050f6a0,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd,0xce,0x0b);")

1 0

Evan Tang : riched20: Move test class creation to a helper function.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: master Commit: f9083961ed187777d660796f7136addc04fff8b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/f9083961ed187777d660796f7136ad… Author: Evan Tang <etang(a)codeweavers.com> Date: Mon Nov 7 11:07:45 2022 -0600 riched20: Move test class creation to a helper function. --- dlls/riched20/tests/editor.c | 71 +++++++++++++------------------------------- 1 file changed, 21 insertions(+), 50 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 9551f490a2d..b72c8b89528 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -110,6 +110,22 @@ static HWND new_richeditW(HWND parent) { return new_windowW(RICHEDIT_CLASS20W, ES_MULTILINE, parent); } +static WNDCLASSA make_simple_class(WNDPROC wndproc, LPCSTR lpClassName) +{ + WNDCLASSA cls; + cls.style = 0; + cls.lpfnWndProc = wndproc; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(0); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = lpClassName; + return cls; +} + /* Keeps the window reponsive for the deley_time in seconds. * This is useful for debugging a test to see what is happening. */ static void keep_responsive(time_t delay_time) @@ -4070,16 +4086,7 @@ static void test_EM_SETTEXTEX(void) * For some reason the scroll position is 0 after EM_SETTEXTEX * with the ST_SELECTION flag only when the control has a parent * window, even though the selection is at the end. */ - cls.style = 0; - cls.lpfnWndProc = DefWindowProcA; - cls.cbClsExtra = 0; - cls.cbWndExtra = 0; - cls.hInstance = GetModuleHandleA(0); - cls.hIcon = 0; - cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); - cls.hbrBackground = GetStockObject(WHITE_BRUSH); - cls.lpszMenuName = NULL; - cls.lpszClassName = "ParentTestClass"; + cls = make_simple_class(DefWindowProcA, "ParentTestClass"); if(!RegisterClassA(&cls)) assert(0); parent = CreateWindowA(cls.lpszClassName, NULL, WS_POPUP|WS_VISIBLE, @@ -6599,16 +6606,7 @@ static void test_eventMask(void) int eventMask; /* register class to capture WM_COMMAND */ - cls.style = 0; - cls.lpfnWndProc = ParentMsgCheckProcA; - cls.cbClsExtra = 0; - cls.cbWndExtra = 0; - cls.hInstance = GetModuleHandleA(0); - cls.hIcon = 0; - cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); - cls.hbrBackground = GetStockObject(WHITE_BRUSH); - cls.lpszMenuName = NULL; - cls.lpszClassName = "EventMaskParentClass"; + cls = make_simple_class(ParentMsgCheckProcA, "EventMaskParentClass"); if(!RegisterClassA(&cls)) assert(0); parent = CreateWindowA(cls.lpszClassName, NULL, WS_POPUP|WS_VISIBLE, @@ -6692,16 +6690,7 @@ static void test_WM_NOTIFY(void) int sel_start, sel_end; /* register class to capture WM_NOTIFY */ - cls.style = 0; - cls.lpfnWndProc = WM_NOTIFY_ParentMsgCheckProcA; - cls.cbClsExtra = 0; - cls.cbWndExtra = 0; - cls.hInstance = GetModuleHandleA(0); - cls.hIcon = 0; - cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); - cls.hbrBackground = GetStockObject(WHITE_BRUSH); - cls.lpszMenuName = NULL; - cls.lpszClassName = "WM_NOTIFY_ParentClass"; + cls = make_simple_class(WM_NOTIFY_ParentMsgCheckProcA, "WM_NOTIFY_ParentClass"); if(!RegisterClassA(&cls)) assert(0); parent = CreateWindowA(cls.lpszClassName, NULL, WS_POPUP|WS_VISIBLE, @@ -6927,16 +6916,7 @@ static void test_EN_LINK(void) }; /* register class to capture WM_NOTIFY */ - cls.style = 0; - cls.lpfnWndProc = EN_LINK_ParentMsgCheckProcA; - cls.cbClsExtra = 0; - cls.cbWndExtra = 0; - cls.hInstance = GetModuleHandleA(0); - cls.hIcon = 0; - cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); - cls.hbrBackground = GetStockObject(WHITE_BRUSH); - cls.lpszMenuName = NULL; - cls.lpszClassName = "EN_LINK_ParentClass"; + cls = make_simple_class(EN_LINK_ParentMsgCheckProcA, "EN_LINK_ParentClass"); if(!RegisterClassA(&cls)) assert(0); parent = CreateWindowA(cls.lpszClassName, NULL, WS_POPUP|WS_VISIBLE, @@ -7973,16 +7953,7 @@ static void test_dialogmode(void) int lcount, r; WNDCLASSA cls; - cls.style = 0; - cls.lpfnWndProc = dialog_mode_wnd_proc; - cls.cbClsExtra = 0; - cls.cbWndExtra = 0; - cls.hInstance = GetModuleHandleA(0); - cls.hIcon = 0; - cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); - cls.hbrBackground = GetStockObject(WHITE_BRUSH); - cls.lpszMenuName = NULL; - cls.lpszClassName = "DialogModeParentClass"; + cls = make_simple_class(dialog_mode_wnd_proc, "DialogModeParentClass"); if(!RegisterClassA(&cls)) assert(0); hwParent = CreateWindowA("DialogModeParentClass", NULL, WS_OVERLAPPEDWINDOW,

1 0

Evan Tang : riched20: Don't emit EN_CHANGE events during window creation.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: master Commit: 5c997de8dc1e4885266fa884a2fb74f840e3bedc URL: https://gitlab.winehq.org/wine/wine/-/commit/5c997de8dc1e4885266fa884a2fb74… Author: Evan Tang <etang(a)codeweavers.com> Date: Mon Nov 7 10:43:22 2022 -0600 riched20: Don't emit EN_CHANGE events during window creation. --- dlls/riched20/tests/editor.c | 2 +- dlls/riched20/txthost.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 226c8eb7eea..0474121182a 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8949,7 +8949,7 @@ static void test_init_messages(void) ok(parent != 0, "Failed to create parent window\n"); change_received = FALSE; edit = new_window("RichEditWithEvents", 0, parent); - todo_wine ok(change_received == FALSE, "Creating a RichEdit should not make any EN_CHANGE events\n"); + ok(change_received == FALSE, "Creating a RichEdit should not make any EN_CHANGE events\n"); DestroyWindow(edit); DestroyWindow(parent); } diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index c53aa0a3e05..cb008f19c21 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -1142,6 +1142,7 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, WCHAR *textW = NULL; LONG codepage = unicode ? CP_UNICODE : CP_ACP; int len; + LRESULT evmask; ITextServices_OnTxInPlaceActivate( host->text_srv, NULL ); @@ -1150,7 +1151,10 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, text = unicode ? (void *)createW->lpszName : (void *)createA->lpszName; textW = ME_ToUnicode( codepage, text, &len ); } + ITextServices_TxSendMessage( host->text_srv, EM_GETEVENTMASK, 0, 0, &evmask ); + ITextServices_TxSendMessage( host->text_srv, EM_SETEVENTMASK, 0, evmask & ~ENM_CHANGE, &evmask ); ITextServices_TxSetText( host->text_srv, textW ); + ITextServices_TxSendMessage( host->text_srv, EM_SETEVENTMASK, 0, evmask, NULL ); if (lparam) ME_EndToUnicode( codepage, textW ); break; }

1 0

Evan Tang : riched20: Add test for EN_CHANGE events during window creation.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: master Commit: 0b069106b0e0f141d6925d3e10166be89fc59145 URL: https://gitlab.winehq.org/wine/wine/-/commit/0b069106b0e0f141d6925d3e10166b… Author: Evan Tang <etang(a)codeweavers.com> Date: Fri Nov 4 16:08:46 2022 -0500 riched20: Add test for EN_CHANGE events during window creation. GenoPro isn't very happy if it receives one --- dlls/riched20/tests/editor.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index b72c8b89528..226c8eb7eea 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8913,6 +8913,47 @@ static void fill_reobject_struct(REOBJECT *reobj, LONG cp, LPOLEOBJECT poleobj, reobj->dwUser = user; } +static BOOL change_received = FALSE; + +static LRESULT WINAPI ChangeWatcherWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + if (message == WM_COMMAND && (wParam >> 16) == EN_CHANGE) change_received = TRUE; + return DefWindowProcA(hwnd, message, wParam, lParam); +} + +static LRESULT WINAPI RichEditWithEventsWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + if (message == WM_CREATE) + SendMessageA(hwnd, EM_SETEVENTMASK, 0, ENM_CHANGE); + return CallWindowProcA(richeditProc, hwnd, message, wParam, lParam); +} + +static void test_init_messages(void) +{ + WNDCLASSA cls; + HWND parent, edit; + + /* register class to capture EN_CHANGE */ + cls = make_simple_class(ChangeWatcherWndProc, "ChangeWatcherClass"); + if (!RegisterClassA(&cls)) assert(0); + + /* and a class that sets ENM_CHANGE during WM_CREATE */ + if (!GetClassInfoA(hmoduleRichEdit, RICHEDIT_CLASS20A, &cls)) return; + richeditProc = cls.lpfnWndProc; + cls.lpfnWndProc = RichEditWithEventsWndProc; + cls.lpszClassName = "RichEditWithEvents"; + if (!RegisterClassA(&cls)) assert(0); + + parent = CreateWindowA("ChangeWatcherClass", NULL, WS_POPUP|WS_VISIBLE, + 0, 0, 200, 60, NULL, NULL, NULL, NULL); + ok(parent != 0, "Failed to create parent window\n"); + change_received = FALSE; + edit = new_window("RichEditWithEvents", 0, parent); + todo_wine ok(change_received == FALSE, "Creating a RichEdit should not make any EN_CHANGE events\n"); + DestroyWindow(edit); + DestroyWindow(parent); +} + static void test_EM_SELECTIONTYPE(void) { HWND hwnd = new_richedit(NULL); @@ -9091,6 +9132,7 @@ START_TEST( editor ) test_background(); test_eop_char_fmt(); test_para_numbering(); + test_init_messages(); test_EM_SELECTIONTYPE(); /* Set the environment variable WINETEST_RICHED20 to keep windows

1 0

Gabriel Ivăncescu : include: Add IDOMParser interface, dispinterface, and coclass.
by Alexandre Julliard Nov. 8, 2022

Nov. 8, 2022

Module: wine Branch: master Commit: 2a5d096f2c9fe65f3c59c38f4f675916a75daa23 URL: https://gitlab.winehq.org/wine/wine/-/commit/2a5d096f2c9fe65f3c59c38f4f6759… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 8 20:50:35 2022 +0200 include: Add IDOMParser interface, dispinterface, and coclass. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- include/mshtmdid.h | 4 ++++ include/mshtml.idl | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 4e25ad8036b..6260083aaf4 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -105,6 +105,7 @@ #define DISPID_NAMESPACE DISPID_NORMAL_FIRST #define DISPID_TAGNAMES_COLLECTION DISPID_NORMAL_FIRST #define DISPID_XMLHTTPREQUEST DISPID_NORMAL_FIRST +#define DISPID_DOMPARSER DISPID_NORMAL_FIRST #define DISPID_DOCUMENTCOMPATIBLEINFO_COLLECTION DISPID_NORMAL_FIRST #define DISPID_DOCUMENTCOMPATIBLEINFO DISPID_NORMAL_FIRST #define DISPID_XDOMAINREQUEST DISPID_NORMAL_FIRST @@ -4631,6 +4632,9 @@ #define DISPID_IHTMLDOMCONSTRUCTORCOLLECTION_XDOMAINREQUEST DISPID_WINDOW+8001+DomConstructorXDomainRequest #define DISPID_IHTMLDOMCONSTRUCTORCOLLECTION_XMLHTTPREQUEST DISPID_WINDOW+8001+DomConstructorXMLHttpRequest +/* IDOMParser */ +#define DISPID_IDOMPARSER_PARSEFROMSTRING DISPID_DOMPARSER + /* IEventTarget */ #define DISPID_IEVENTTARGET_ADDEVENTLISTENER DISPID_HTMLOBJECT+10 #define DISPID_IEVENTTARGET_REMOVEEVENTLISTENER DISPID_HTMLOBJECT+11 diff --git a/include/mshtml.idl b/include/mshtml.idl index 1abd3e99f77..372089223fe 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -29588,6 +29588,46 @@ interface IHTMLDOMConstructorCollection : IDispatch HRESULT XMLHttpRequest([out, retval] IDispatch **p); } +/***************************************************************************** + * IDOMParser interface + */ +[ + odl, + oleautomation, + dual, + uuid(30510781-98b5-11cf-bb82-00aa00bdce0b) +] +interface IDOMParser : IDispatch +{ + [id(DISPID_IDOMPARSER_PARSEFROMSTRING)] + HRESULT parseFromString([in] BSTR string, [in] BSTR mimeType, [retval, out] IHTMLDocument2 **ppNode); +} + +/***************************************************************************** + * DispDOMParser dispinterface + */ +[ + hidden, + uuid(305900ae-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispDOMParser +{ +properties: +methods: + [id(DISPID_IDOMPARSER_PARSEFROMSTRING)] + IHTMLDocument2 *parseFromString([in] BSTR string, [in] BSTR mimeType); +} + +[ + noncreatable, + uuid(30510782-98b5-11cf-bb82-00aa00bdce0b) +] +coclass DOMParser +{ + [default] dispinterface DispDOMParser; + interface IDOMParser; +} + /***************************************************************************** * IXMLGenericParse interface */

1 0