November 2022 - Wine-commits

Gabriel Ivăncescu : jscript: Convert filetime to date properly using unsigned division.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 0c875dfa5fc34619777c5d9782e84cd9f82bbdc4 URL: https://gitlab.winehq.org/wine/wine/-/commit/0c875dfa5fc34619777c5d9782e84c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 8 20:50:35 2022 +0200 jscript: Convert filetime to date properly using unsigned division. Also, the result has to be signed type before converting to double, since it can be negative then (e.g. if system clock is set before 1970). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/date.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index bc09f05d4b9..f90a3eb052f 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -28,9 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); -/* 1601 to 1970 is 369 years plus 89 leap days */ -#define TIME_EPOCH ((ULONGLONG)(369 * 365 + 89) * 86400 * 1000) - typedef struct { jsdisp_t dispex; @@ -55,6 +52,16 @@ static inline DateInstance *date_this(jsval_t vthis) return (jsdisp && is_class(jsdisp, JSCLASS_DATE)) ? date_from_jsdisp(jsdisp) : NULL; } +static inline double file_time_to_date_time(const FILETIME *ftime) +{ + /* 1601 to 1970 is 369 years plus 89 leap days */ + const LONGLONG time_epoch = (LONGLONG)(369 * 365 + 89) * 86400 * 1000; + + LONGLONG time = (((ULONGLONG)ftime->dwHighDateTime << 32) | ftime->dwLowDateTime) / 10000; + + return time - time_epoch; +} + /*ECMA-262 3rd Edition 15.9.1.2 */ #define MS_PER_DAY 86400000 #define MS_PER_HOUR 3600000 @@ -406,12 +413,9 @@ static inline DOUBLE time_clip(DOUBLE time) static double date_now(void) { FILETIME ftime; - LONGLONG time; GetSystemTimeAsFileTime(&ftime); - time = ((LONGLONG)ftime.dwHighDateTime << 32) + ftime.dwLowDateTime; - - return time/10000 - TIME_EPOCH; + return file_time_to_date_time(&ftime); } static SYSTEMTIME create_systemtime(DOUBLE time) @@ -2410,14 +2414,11 @@ static HRESULT DateConstr_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, un case INVOKE_FUNC: { FILETIME system_time, local_time; - LONGLONG lltime; GetSystemTimeAsFileTime(&system_time); FileTimeToLocalFileTime(&system_time, &local_time); - lltime = ((LONGLONG)local_time.dwHighDateTime<<32) - + local_time.dwLowDateTime; - return date_to_string(lltime/10000-TIME_EPOCH, FALSE, 0, r); + return date_to_string(file_time_to_date_time(&local_time), FALSE, 0, r); } default:

1 0

Gabriel Ivăncescu : include: Add IDOMParser interface, dispinterface, and coclass.
by Alexandre Julliard 08 Nov '22

08 Nov '22

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

Gabriel Ivăncescu : include: Add CLSID_XHTMLDocument and CLSID_SVGDocument.
by Alexandre Julliard 08 Nov '22

08 Nov '22

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

Gabriel Ivăncescu : mshtml: Add SVG and XHTML document information to the registry.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 21219fa31584fadd978754a8fc82a0bbdc305cd8 URL: https://gitlab.winehq.org/wine/wine/-/commit/21219fa31584fadd978754a8fc82a0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 8 20:50:35 2022 +0200 mshtml: Add SVG and XHTML document information to the registry. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/mshtml.inf | 24 ++++++++++++++++++++++++ dlls/mshtml/mshtml_classes.idl | 18 ++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/dlls/mshtml/mshtml.inf b/dlls/mshtml/mshtml.inf index 4a650b444fc..fc010bcc593 100644 --- a/dlls/mshtml/mshtml.inf +++ b/dlls/mshtml/mshtml.inf @@ -49,6 +49,16 @@ HKCR,"CLSID\%CLSID_Scriptlet%\Programmable",,16 HKCR,"CLSID\%CLSID_Scriptlet%\ToolboxBitmap32",,,"%16422%\Internet Explorer\iexplore.exe,1" HKCR,"MIME\Database\Content Type\text/x-scriptlet","CLSID",,"%CLSID_Scriptlet%" +;; SVGDocument +HKCR,"CLSID\{30590066-98B5-11CF-BB82-00AA00BDCE0B}\BrowseInPlace",,16 +HKCR,"CLSID\{30590066-98B5-11CF-BB82-00AA00BDCE0B}\DefaultIcon",,0x00020000,"%16422%\Internet Explorer\iexplore.exe,1" +HKCR,"CLSID\{30590066-98B5-11CF-BB82-00AA00BDCE0B}\MiscStatus",,,"2228625" + +;; XHTMLDocument +HKCR,"CLSID\{30590067-98B5-11CF-BB82-00AA00BDCE0B}\BrowseInPlace",,16 +HKCR,"CLSID\{30590067-98B5-11CF-BB82-00AA00BDCE0B}\DefaultIcon",,0x00020000,"%16422%\Internet Explorer\iexplore.exe,1" +HKCR,"CLSID\{30590067-98B5-11CF-BB82-00AA00BDCE0B}\MiscStatus",,,"2228625" + [Protocols.Reg] HKCR,"PROTOCOLS\Handler\javascript","CLSID",,"%CLSID_JSProtocol%" @@ -241,6 +251,12 @@ HKCR,".ai","Content Type",,"application/postscript" HKCR,".eps","Content Type",,"application/postscript" HKCR,".ps","Content Type",,"application/postscript" +;; SVG +HKCR,"MIME\Database\Content Type\image/svg+xml","CLSID",,"{30590066-98B5-11CF-BB82-00AA00BDCE0B}" +HKCR,"MIME\Database\Content Type\image/svg+xml","Extension",,".svg" +HKCR,".svg",,,"svgfile" +HKCR,".svg","Content Type",,"image/svg+xml" + ;; TAR HKCR,"MIME\Database\Content Type\application/x-tar","Extension",,".tar" HKCR,".tar","Content Type",,"application/x-tar" @@ -278,6 +294,14 @@ HKCR,"xbmfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"xbmfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"xbmfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,9" +;; XHTML +HKCR,"MIME\Database\Content Type\application/xhtml+xml","CLSID",,"{30590067-98B5-11CF-BB82-00AA00BDCE0B}" +HKCR,"MIME\Database\Content Type\application/xhtml+xml","Extension",,".xht" +HKCR,".xht",,,"xhtmlfile" +HKCR,".xht","Content Type",,"application/xhtml+xml" +HKCR,".xhtml",,,"xhtmlfile" +HKCR,".xhtml","Content Type",,"application/xhtml+xml" + ;; XML HKCR,"MIME\Database\Content Type\application/xml","CLSID",,"{48123BC4-99D9-11D1-A6B3-00C04FD91555}" HKCR,"MIME\Database\Content Type\application/xml","Extension",,".xml" diff --git a/dlls/mshtml/mshtml_classes.idl b/dlls/mshtml/mshtml_classes.idl index b84a50f1cf1..13fe655b0c0 100644 --- a/dlls/mshtml/mshtml_classes.idl +++ b/dlls/mshtml/mshtml_classes.idl @@ -295,6 +295,15 @@ coclass ResProtocol { } ] coclass Scriptlet { } +[ + helpstring("SVG Document"), + progid("svgfile"), + threading(apartment), + version(1.0), + uuid(30590066-98b5-11cf-bb82-00aa00bdce0b) +] +coclass SVGDocumentClass { } + [ helpstring("Microsoft HTML Resource Pluggable Protocol"), threading(apartment), @@ -308,3 +317,12 @@ coclass SysimageProtocol { } uuid(429af92c-a51f-11d2-861e-00c04fa35c89) ] coclass TridentAPI { } + +[ + helpstring("XHTML Document"), + progid("xhtmlfile"), + threading(apartment), + version(1.0), + uuid(30590067-98b5-11cf-bb82-00aa00bdce0b) +] +coclass XHTMLDocumentClass { }

1 0

Evan Tang : riched20: Move test class creation to a helper function.
by Alexandre Julliard 08 Nov '22

08 Nov '22

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: Add test for EN_CHANGE events during window creation.
by Alexandre Julliard 08 Nov '22

08 Nov '22

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

Evan Tang : riched20: Don't emit EN_CHANGE events during window creation.
by Alexandre Julliard 08 Nov '22

08 Nov '22

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

Brendan Shanks : ntdll: Fix runtime availability check for pthread_attr_set_qos_class_np.
by Alexandre Julliard 08 Nov '22

08 Nov '22

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

Rémi Bernon : opengl32: Introduce new disabled_extensions_index helper.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 1001745dde5e78a5f832362d0154348efc7e3b3b URL: https://gitlab.winehq.org/wine/wine/-/commit/1001745dde5e78a5f832362d015434… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 7 11:46:56 2022 +0100 opengl32: Introduce new disabled_extensions_index helper. --- dlls/opengl32/wgl.c | 49 +++++++++++++++---------------------------------- 1 file changed, 15 insertions(+), 34 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index d5b0a78b916..a9039d606c1 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -455,39 +455,32 @@ static BOOL filter_extensions( const char *extensions, GLubyte **exts_list, GLui return (exts_list && *exts_list) || *disabled_exts; } +static const GLuint *disabled_extensions_index(void) +{ + struct wgl_handle *ptr = get_current_context_ptr(); + GLuint **disabled = &ptr->u.context->disabled_exts; + if (*disabled || filter_extensions( NULL, NULL, disabled )) return *disabled; + return NULL; +} + void WINAPI glGetIntegerv(GLenum pname, GLint *data) { struct glGetIntegerv_params args = { .pname = pname, .data = data, }; + const GLuint *disabled; NTSTATUS status; TRACE( "pname %d, data %p\n", pname, data ); - if (pname == GL_NUM_EXTENSIONS) - { - struct wgl_handle *ptr = get_current_context_ptr(); - GLuint **disabled = &ptr->u.context->disabled_exts; - - if (*disabled || filter_extensions( NULL, NULL, disabled )) - { - const GLuint *disabled_exts = *disabled; - GLint count, disabled_count = 0; - - args.data = &count; - if ((status = UNIX_CALL( glGetIntegerv, &args ))) WARN( "glGetIntegerv returned %#x\n", status ); - - while (*disabled_exts++ != ~0u) - disabled_count++; - *data = count - disabled_count; - return; - } - } - if ((status = UNIX_CALL( glGetIntegerv, &args ))) WARN( "glGetIntegerv returned %#x\n", status ); + + if (pname == GL_NUM_EXTENSIONS && (disabled = disabled_extensions_index())) + while (*disabled++ != ~0u) (*data)--; } const GLubyte * WINAPI glGetStringi(GLenum name, GLuint index) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; + const GLuint *disabled; TRACE("(%d, %d)\n", name, index); if (!funcs->ext.p_glGetStringi) @@ -497,21 +490,9 @@ const GLubyte * WINAPI glGetStringi(GLenum name, GLuint index) *func_ptr = funcs->wgl.p_wglGetProcAddress("glGetStringi"); } - if (name == GL_EXTENSIONS) - { - struct wgl_handle *ptr = get_current_context_ptr(); - - if (ptr->u.context->disabled_exts || - filter_extensions(NULL, NULL, &ptr->u.context->disabled_exts)) - { - const GLuint *disabled_exts = ptr->u.context->disabled_exts; - unsigned int disabled_count = 0; + if (name == GL_EXTENSIONS && (disabled = disabled_extensions_index())) + while (index >= *disabled++) index++; - while (index + disabled_count >= *disabled_exts++) - disabled_count++; - return funcs->ext.p_glGetStringi(name, index + disabled_count); - } - } return funcs->ext.p_glGetStringi(name, index); }

1 0

Rémi Bernon : opengl32: Move extension filtering helpers to unix_wgl.c.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 0ad02fca3d095780f7ff632132140ea4507cf644 URL: https://gitlab.winehq.org/wine/wine/-/commit/0ad02fca3d095780f7ff632132140e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 7 13:58:25 2022 +0100 opengl32: Move extension filtering helpers to unix_wgl.c. --- dlls/opengl32/opengl_ext.h | 4 + dlls/opengl32/unix_wgl.c | 181 +++++++++++++++++++++++++++++++++++++++++++++ dlls/opengl32/wgl.c | 178 -------------------------------------------- 3 files changed, 185 insertions(+), 178 deletions(-)

1 0