wine-devel November 2021

wine-devel@winehq.org

83 participants
756 discussions

[PATCH 2/5] user32: Use user_driver_funcs to expose user driver function from drivers.
by Jacek Caban 09 Nov '21

09 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- The ultimate plan is for driver to register themselves by a direct Unix call to win32u. dlls/user32/driver.c | 154 +++++++++-------- dlls/user32/user32.spec | 1 + dlls/wineandroid.drv/android.h | 27 +++ dlls/wineandroid.drv/init.c | 132 ++++----------- dlls/wineandroid.drv/wineandroid.drv.spec | 24 --- dlls/winemac.drv/gdi.c | 148 ++++++----------- dlls/winemac.drv/macdrv.h | 52 ++++++ dlls/winemac.drv/mouse.c | 2 +- dlls/winemac.drv/winemac.drv.spec | 39 ----- dlls/winex11.drv/display.c | 1 - dlls/winex11.drv/event.c | 2 - dlls/winex11.drv/init.c | 194 +++++++++++----------- dlls/winex11.drv/winex11.drv.spec | 41 ----- dlls/winex11.drv/x11drv.h | 50 ++++++ dlls/winex11.drv/x11drv_main.c | 1 + dlls/winex11.drv/xim.c | 2 - include/wine/gdi_driver.h | 2 + 17 files changed, 393 insertions(+), 479 deletions(-)

3 2

[PATCH] winecfg: Add the command line options to the man page.
by Floris Renaud 09 Nov '21

09 Nov '21

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- programs/winecfg/winecfg.man.in | 48 +++++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/winecfg.man.in b/programs/winecfg/winecfg.man.in index 522d2a0e812..2d2e89dfc9b 100644 --- a/programs/winecfg/winecfg.man.in +++ b/programs/winecfg/winecfg.man.in @@ -1,14 +1,58 @@ -.TH WINECFG 1 "November 2010" "@PACKAGE_STRING@" "Wine Programs" +.TH WINECFG 1 "November 2021" "@PACKAGE_STRING@" "Wine Programs" .SH NAME winecfg \- Wine Configuration Editor .SH SYNOPSIS -.BR "winecfg" +.B winecfg +.RI [ OPTION ] .SH DESCRIPTION .B winecfg is the Wine configuration editor. It allows you to change several settings, such as DLL load order (native versus builtin), enable a virtual desktop, setup disk drives, and change the Wine audio driver, among others. Many of these settings can be made on a per application basis, for example, preferring native riched20.dll for wordpad.exe, but not for notepad.exe. +.SH OPTIONS +.RS +.IP "\fB[no option]\fR" 16 +Launch the graphical version of this program. +.IP "\fB/v\fR, \fB-v\fR" +Display the current global Windows version. +.IP "\fB/v \fIversion\fR, \fB-v \fIversion\fR" +Set global Windows version to +.IR version . +.IP "\fB/?\fR, \fB-?\fR" +Display valid versions for +.I version +and available options. +.RE +.PP +Valid versions for +.I version +are: +.TS +l l r +--- +l l r. +version Mimic Windows version WINEARCH +win10 Windows 10 Ultimate N, Build 17763 win32 & win64 +win81 Windows 8.1 Ultimate N, Build 9600 win32 & win64 +win8 Windows 8 Ultimate N, Build 9200 win32 & win64 +win2008r2 Windows Server 2008 R2 Standard, Build 7601, Service Pack 1 win32 & win64 +win7 Windows 7 Ultimate N, Build 7601, Service Pack 1 win32 & win64 +win2008 Windows Server 2008 Standard, Build 6002, Service Pack 2 win32 & win64 +vista Windows Vista Ultimate N, Build 6002, Service Pack 2 win32 & win64 +win2003 Windows Server 2003 Standard Edition, Build 3790, Service Pack 2 win32 & win64 +winxp64 Windows XP Professional, Build 3790, Service Pack 2 win64 +winxp Windows XP Professional, Build 2600, Service Pack 3 win32 +win2k Windows 2000 Professional, Build 2195, Service Pack 4 win32 +winme Windows ME, V4.90, Build 3000 win32 +win98 Windows 98 Second Edition, V4.10, Build 2222 win32 +win95 Windows 95, V4.00, Build 950 win32 +nt40 Windows NT Workstation, V4.0, Build 1381, Service Pack 6a win32 +nt351 Windows NT Workstation, V3.51, Build 1057, Service pack 5 win32 +win31 Windows 3.1 win32 +win30 Windows 3.0 win32 +win20 Windows 2.0 win32 +.TE .SH BUGS Bugs can be reported on the .UR https://bugs.winehq.org -- 2.33.1

1 0

[PATCH] po: Update Dutch translation
by Floris Renaud 09 Nov '21

09 Nov '21

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- po/nl.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/nl.po b/po/nl.po index cfc51dc296f..c9be849321c 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-09-25 22:40+0200\n" +"PO-Revision-Date: 2021-11-10 00:03+0100\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -14442,7 +14442,7 @@ msgstr "IPv6-adres" #: programs/ipconfig/ipconfig.rc:38 msgid "Primary DNS suffix" -msgstr "" +msgstr "Primair DNS-achtervoegsel" #: programs/msinfo32/msinfo32.rc:28 msgid "System Information" -- 2.33.1

1 0

[PATCH 1/6] propsys: Fix VT_UI4 comparison, use ulVal instead of uiVal.
by Rémi Bernon 09 Nov '21

09 Nov '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Use a generic function to check media type items against expected items, instead of hardcoding attributes. dlls/propsys/propvar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 977fbebb918..be27c5cb641 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -865,7 +865,7 @@ INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2 CMP_NUM_VALUE(lVal); break; case VT_UI4: - CMP_NUM_VALUE(uiVal); + CMP_NUM_VALUE(ulVal); break; case VT_I8: CMP_NUM_VALUE(hVal.QuadPart); -- 2.33.1

2 9

[PATCH] xml2: Use MSVC constants for NaN and infinity.
by Bernhard Kölbl 09 Nov '21

09 Nov '21

Prevent division by zero exceptions from being thrown, if they are enabled and calls to xmlXPathInit() are being made. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52003 Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- I'm not really sure, if this change is really the correct solution to the attached bug. Something that's still really odd to me, is the huge amount of thrown exceptions. Also I wasn't able to create any test code to reproduce this properly. I only had the reported program to do testing and this change fixed the issue. --- libs/xml2/xpath.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libs/xml2/xpath.c b/libs/xml2/xpath.c index 7497ba07d6f..5fa3c72eb6c 100644 --- a/libs/xml2/xpath.c +++ b/libs/xml2/xpath.c @@ -497,14 +497,12 @@ double xmlXPathNINF; * * Initialize the XPath environment */ -ATTRIBUTE_NO_SANITIZE("float-divide-by-zero") void xmlXPathInit(void) { - /* MSVC doesn't allow division by zero in constant expressions. */ - double zero = 0.0; - xmlXPathNAN = 0.0 / zero; - xmlXPathPINF = 1.0 / zero; - xmlXPathNINF = -xmlXPathPINF; + /* Use MSVC definitions */ + xmlXPathNAN = NAN; + xmlXPathPINF = INFINITY; + xmlXPathNINF = -INFINITY; } /** -- 2.33.0

1 0

[PATCH v4 1/2] mshtml: Implement inline attributes parsing for createElement.
by Gabriel Ivăncescu 09 Nov '21

09 Nov '21

We let gecko parse a dummy unknown tag (after validation) using a contextual fragment, and then copy its attributes to the proper element with correct tag. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 134 +++++++++++++++++++++++++++++- dlls/mshtml/tests/documentmode.js | 63 ++++++++++++++ 2 files changed, 196 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index de69e2f..91ccfb9 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -355,6 +355,134 @@ static inline HTMLElement *impl_from_IHTMLElement(IHTMLElement *iface) return CONTAINING_RECORD(iface, HTMLElement, IHTMLElement_iface); } +static HRESULT copy_nselem_attrs(nsIDOMElement *nselem_with_attrs, nsIDOMElement *nselem) +{ + nsIDOMMozNamedAttrMap *attrs; + nsAString name_str, val_str; + nsresult nsres, nsres2; + nsIDOMAttr *attr; + UINT32 i, length; + + nsres = nsIDOMElement_GetAttributes(nselem_with_attrs, &attrs); + if(NS_FAILED(nsres)) + return E_FAIL; + + nsres = nsIDOMMozNamedAttrMap_GetLength(attrs, &length); + if(NS_FAILED(nsres)) { + nsIDOMMozNamedAttrMap_Release(attrs); + return E_FAIL; + } + + nsAString_Init(&name_str, NULL); + nsAString_Init(&val_str, NULL); + for(i = 0; i < length; i++) { + nsres = nsIDOMMozNamedAttrMap_Item(attrs, i, &attr); + if(NS_FAILED(nsres)) + continue; + + nsres = nsIDOMAttr_GetNodeName(attr, &name_str); + nsres2 = nsIDOMAttr_GetNodeValue(attr, &val_str); + nsIDOMAttr_Release(attr); + if(NS_FAILED(nsres) || NS_FAILED(nsres2)) + continue; + + nsIDOMElement_SetAttribute(nselem, &name_str, &val_str); + } + nsAString_Finish(&name_str); + nsAString_Finish(&val_str); + + nsIDOMMozNamedAttrMap_Release(attrs); + return S_OK; +} + +static HRESULT create_nselem_parse(HTMLDocumentNode *doc, const WCHAR *tag, nsIDOMElement **ret) +{ + static const WCHAR prefix[4] = L"<FOO"; + nsIDOMDocumentFragment *nsfragment; + WCHAR *p = wcschr(tag + 1, '>'); + UINT32 i, name_len, size; + nsIDOMElement *nselem; + nsIDOMRange *nsrange; + nsIDOMNode *nsnode; + nsresult nsres; + nsAString str; + HRESULT hres; + + if(!p || p[1] || wcschr(tag + 1, '<')) + return E_FAIL; + if(!doc->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; + } + + /* Ignore the starting token and > or /> end token */ + name_len = p - tag - 1 - (p[-1] == '/'); + + /* Get the tag name using HTML whitespace rules */ + for(i = 1; i <= name_len; i++) { + if((tag[i] >= 0x09 && tag[i] <= 0x0d) || tag[i] == ' ') { + name_len = i - 1; + break; + } + } + if(!name_len) + return E_FAIL; + size = (p + 2 - (tag + 1 + name_len)) * sizeof(WCHAR); + + /* Parse the input via a contextual fragment, using a dummy unknown tag */ + nsres = nsIDOMHTMLDocument_CreateRange(doc->nsdoc, &nsrange); + if(NS_FAILED(nsres)) + return map_nsresult(nsres); + + if(!(p = heap_alloc(sizeof(prefix) + size))) { + nsIDOMRange_Release(nsrange); + return E_OUTOFMEMORY; + } + memcpy(p, prefix, sizeof(prefix)); + memcpy(p + ARRAY_SIZE(prefix), tag + 1 + name_len, size); + + nsAString_InitDepend(&str, p); + nsIDOMRange_CreateContextualFragment(nsrange, &str, &nsfragment); + nsIDOMRange_Release(nsrange); + nsAString_Finish(&str); + heap_free(p); + if(NS_FAILED(nsres)) + return map_nsresult(nsres); + + /* Grab the parsed element and copy its attributes into the proper element */ + nsres = nsIDOMDocumentFragment_GetFirstChild(nsfragment, &nsnode); + nsIDOMDocumentFragment_Release(nsfragment); + if(NS_FAILED(nsres) || !nsnode) + return E_FAIL; + + nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMElement, (void**)&nselem); + nsIDOMNode_Release(nsnode); + if(NS_FAILED(nsres)) + return E_FAIL; + + if(!(p = heap_alloc((name_len + 1) * sizeof(WCHAR)))) + hres = E_OUTOFMEMORY; + else { + memcpy(p, tag + 1, name_len * sizeof(WCHAR)); + p[name_len] = '\0'; + + nsAString_InitDepend(&str, p); + nsres = nsIDOMHTMLDocument_CreateElement(doc->nsdoc, &str, ret); + nsAString_Finish(&str); + heap_free(p); + + if(NS_FAILED(nsres)) + hres = map_nsresult(nsres); + else { + hres = copy_nselem_attrs(nselem, *ret); + if(FAILED(hres)) + nsIDOMElement_Release(*ret); + } + } + nsIDOMElement_Release(nselem); + return hres; +} + HRESULT create_nselem(HTMLDocumentNode *doc, const WCHAR *tag, nsIDOMElement **ret) { nsAString tag_str; @@ -385,7 +513,11 @@ HRESULT create_element(HTMLDocumentNode *doc, const WCHAR *tag, HTMLElement **re if(!doc->nsdoc) doc = doc->node.doc; - hres = create_nselem(doc, tag, &nselem); + /* IE8 and below allow creating elements with attributes, such as <div class="a"> */ + if(tag[0] == '<' && dispex_compat_mode(&doc->node.event_target.dispex) <= COMPAT_MODE_IE8) + hres = create_nselem_parse(doc, tag, &nselem); + else + hres = create_nselem(doc, tag, &nselem); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 02a5f5f..1458068 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -488,6 +488,69 @@ sync_test("style_props", function() { } }); +sync_test("createElement_inline_attr", function() { + var v = document.documentMode, e, s; + + if(v < 9) { + s = document.createElement("<div>").tagName; + ok(s === "DIV", "<div>.tagName returned " + s); + s = document.createElement("<div >").tagName; + ok(s === "DIV", "<div >.tagName returned " + s); + s = document.createElement("<div/>").tagName; + ok(s === "DIV", "<div/>.tagName returned " + s); + e = 0; + try { + document.createElement("<div"); + }catch(ex) { + e = ex.number; + } + ok(e === 0x4005 - 0x80000000, "<div e = " + e); + e = 0; + try { + document.createElement("<div test=1"); + }catch(ex) { + e = ex.number; + } + ok(e === 0x4005 - 0x80000000, "<div test=1 e = " + e); + + var tags = [ "div", "template", "head", "body", "title", "html", "foo" ]; + + for(var i = 0; i < tags.length; i++) { + e = document.createElement("<" + tags[i] + " test='a\"' abcd=\""b"\">"); + ok(e.tagName === tags[i].toUpperCase(), "<" + tags[i] + " test=\"a\" abcd=\"b\">.tagName returned " + e.tagName); + todo_wine_if(v == 8). + ok(e.test === "a\"", "<" + tags[i] + " test='a\"' abcd=\""b"\">.test returned " + e.test); + todo_wine_if(v == 8). + ok(e.abcd === "\"b\"", "<" + tags[i] + " test='a\"' abcd=\""b"\">.abcd returned " + e.abcd); + } + }else { + s = ""; + e = 0; + try { + document.createElement("<div>"); + }catch(ex) { + s = ex.toString(); + e = ex.number; + } + todo_wine. + ok(e === undefined, "<div> e = " + e); + todo_wine. + ok(s === "InvalidCharacterError", "<div> s = " + s); + s = ""; + e = 0; + try { + document.createElement("<div test=\"a\">"); + }catch(ex) { + s = ex.toString(); + e = ex.number; + } + todo_wine. + ok(e === undefined, "<div test=\"a\"> e = " + e); + todo_wine. + ok(s === "InvalidCharacterError", "<div test=\"a\"> s = " + s); + } +}); + sync_test("JS objs", function() { var g = window; -- 2.31.1

2 4

[PATCH v5 1/2] ntdll: Allow loading system DLLs from a path specified at configure time.
by Zebediah Figura 09 Nov '21

09 Nov '21

Many distributions provide MinGW-compiled system DLLs which are currently bundled with Wine. Unfortunately, while MinGW pkg-config can be used to detect the linking path, there is no standardized runtime path, and many distributions in fact use different paths. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Makefile.in | 1 + configure.ac | 3 +++ dlls/ntdll/Makefile.in | 1 + dlls/ntdll/loader.c | 10 ++++++++-- dlls/ntdll/unix/env.c | 1 + dlls/ntdll/unix/loader.c | 3 +++ dlls/ntdll/unix/unix_private.h | 1 + 7 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 42f161e3af9..c4b0fbda616 100644 --- a/Makefile.in +++ b/Makefile.in @@ -32,6 +32,7 @@ nlsdir = ${datadir}/wine/nls dlldir = ${libdir}/wine srcdir = @srcdir@ host_cpu = @host_cpu@ +system_dlldir = @system_dlldir@ SHELL = /bin/sh CC = @CC@ CXX = @CXX@ diff --git a/configure.ac b/configure.ac index 39c8e3a2a4d..4ecc3cce05f 100644 --- a/configure.ac +++ b/configure.ac @@ -103,6 +103,7 @@ AC_ARG_WITH(xshm, AS_HELP_STRING([--without-xshm],[do not use XShm (shared AC_ARG_WITH(xxf86vm, AS_HELP_STRING([--without-xxf86vm],[do not use XFree video mode extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; ac_cv_header_X11_extensions_xf86vmproto_h=no; fi]) +AC_ARG_WITH(system-dlldir, AS_HELP_STRING([--with-system-dlldir=DIR],[load external PE dependencies from directory DIR])) AC_ARG_WITH(wine-tools,AS_HELP_STRING([--with-wine-tools=DIR],[use Wine tools from directory DIR])) AC_ARG_WITH(wine64, AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine in DIR for a Wow64 build])) @@ -256,6 +257,8 @@ then TARGETFLAGS="-b $host_alias $TARGETFLAGS" fi +AC_SUBST(system_dlldir,"$with_system_dlldir") + dnl Check for flex AC_CHECK_PROGS(FLEX,flex,none) if test "$FLEX" = "none" diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index d3be1fad0bc..bce141bc14b 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -72,5 +72,6 @@ EXTRA_OBJS = unix/version.o unix_loader_EXTRADEFS = \ -DBINDIR=\"${bindir}\" \ + -DSYSTEMDLLDIR=\"${system_dlldir}\" \ -DDLL_TO_BINDIR=\"`${MAKEDEP} -R ${dlldir} ${bindir}`\" \ -DBIN_TO_DATADIR=\"`${MAKEDEP} -R ${bindir} ${datadir}/wine`\" diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 255d5afef79..a9578ae86bf 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -95,6 +95,7 @@ static int free_lib_count; /* recursion depth of LdrUnloadDll calls */ static ULONG path_safe_mode; /* path mode set by RtlSetSearchPathMode */ static ULONG dll_safe_mode = 1; /* dll search mode */ static UNICODE_STRING dll_directory; /* extra path for LdrSetDllDirectory */ +static UNICODE_STRING system_dll_path; /* path to search for system dependency dlls */ static DWORD default_search_flags; /* default flags set by LdrSetDefaultDllDirectories */ static WCHAR *default_load_path; /* default dll search path */ @@ -2981,12 +2982,15 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WC struct file_id id; HANDLE mapping = 0; SECTION_IMAGE_INFORMATION image_info; - NTSTATUS nts; + NTSTATUS nts = STATUS_DLL_NOT_FOUND; ULONG64 prev; TRACE( "looking for %s in %s\n", debugstr_w(libname), debugstr_w(load_path) ); - nts = find_dll_file( load_path, libname, default_ext, &nt_name, pwm, &mapping, &image_info, &id ); + if (system_dll_path.Buffer) + nts = find_dll_file( system_dll_path.Buffer, libname, default_ext, &nt_name, pwm, &mapping, &image_info, &id ); + if (nts) + nts = find_dll_file( load_path, libname, default_ext, &nt_name, pwm, &mapping, &image_info, &id ); if (*pwm) /* found already loaded module */ { @@ -3997,6 +4001,8 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR load_global_options(); version_init(); + get_env_var( L"WINESYSTEMDLLDIR", 0, &system_dll_path ); + wm = build_main_module(); wm->ldr.LoadCount = -1; diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 24f4fa5a588..f9e6e625cbb 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1296,6 +1296,7 @@ static void add_dynamic_environment( WCHAR **env, SIZE_T *pos, SIZE_T *size ) add_path_var( env, pos, size, "WINEHOMEDIR", home_dir ); add_path_var( env, pos, size, "WINEBUILDDIR", build_dir ); add_path_var( env, pos, size, "WINECONFIGDIR", config_dir ); + add_path_var( env, pos, size, "WINESYSTEMDLLDIR", system_dll_path ); for (i = 0; dll_paths[i]; i++) { sprintf( str, "WINEDLLDIR%u", i ); diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index ea7f18602da..04e3dedc615 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -387,6 +387,7 @@ const char *data_dir = NULL; const char *build_dir = NULL; const char *config_dir = NULL; const char **dll_paths = NULL; +const char *system_dll_path = NULL; const char *user_name = NULL; SECTION_IMAGE_INFORMATION main_image_info = { NULL }; static HMODULE ntdll_module; @@ -618,6 +619,8 @@ static void init_paths( char *argv[] ) data_dir = build_path( bin_dir, BIN_TO_DATADIR ); } + if (strlen(SYSTEMDLLDIR)) system_dll_path = SYSTEMDLLDIR; + set_dll_path(); set_home_dir(); set_config_dir(); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 6b8835bcba0..15a3da9ce8e 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -127,6 +127,7 @@ extern const char *build_dir DECLSPEC_HIDDEN; extern const char *config_dir DECLSPEC_HIDDEN; extern const char *user_name DECLSPEC_HIDDEN; extern const char **dll_paths DECLSPEC_HIDDEN; +extern const char *system_dll_path DECLSPEC_HIDDEN; extern PEB *peb DECLSPEC_HIDDEN; extern USHORT *uctable DECLSPEC_HIDDEN; extern USHORT *lctable DECLSPEC_HIDDEN; -- 2.33.0

1 1

[PATCH v3 1/3] mshtml: Hold a ref to the location on the window side.
by Gabriel Ivăncescu 09 Nov '21

09 Nov '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlwindow.c | 5 ++--- dlls/mshtml/tests/dom.c | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 0b25e71..635b046 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -68,9 +68,7 @@ static inline BOOL is_outer_window(HTMLWindow *window) static HRESULT get_location(HTMLInnerWindow *This, HTMLLocation **ret) { - if(This->location) { - IHTMLLocation_AddRef(&This->location->IHTMLLocation_iface); - }else { + if(!This->location) { HRESULT hres; hres = HTMLLocation_Create(This, &This->location); @@ -78,6 +76,7 @@ static HRESULT get_location(HTMLInnerWindow *This, HTMLLocation **ret) return hres; } + IHTMLLocation_AddRef(&This->location->IHTMLLocation_iface); *ret = This->location; return S_OK; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 03f5c04..ea5b210 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6015,7 +6015,6 @@ static void test_location(IHTMLDocument2 *doc) IHTMLLocation *location, *location2; IHTMLWindow2 *window; BSTR str; - ULONG ref; HRESULT hres; hres = IHTMLDocument2_get_location(doc, &location); @@ -6051,8 +6050,7 @@ static void test_location(IHTMLDocument2 *doc) ok(!lstrcmpW(str, L"about:blank"), "unexpected href %s\n", wine_dbgstr_w(str)); SysFreeString(str); - ref = IHTMLLocation_Release(location); - ok(!ref, "location should be destroyed here\n"); + IHTMLLocation_Release(location); } static void test_plugins_col(IHTMLDocument2 *doc) -- 2.31.1

3 11

[PATCH 1/6] wined3d: Reference vertex buffer objects only after calling context_update_stream_info().
by Zebediah Figura 09 Nov '21

09 Nov '21

It may load buffers into a different location. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index d2dd9e0bd09..09c871efcd4 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3963,12 +3963,23 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, device_invalidate_state(device, STATE_STREAMSRC); else wined3d_buffer_load(&buffer_gl->b, context, state); - wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); } /* Loading the buffers above may have invalidated the stream info. */ if (wined3d_context_is_graphics_state_dirty(context, STATE_STREAMSRC)) context_update_stream_info(context, state); + map = context->stream_info.use_map; + while (map) + { + const struct wined3d_stream_info_element *e; + struct wined3d_buffer_gl *buffer_gl; + + e = &context->stream_info.elements[wined3d_bit_scan(&map)]; + buffer_gl = wined3d_buffer_gl(state->streams[e->stream_idx].buffer); + + wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); + } + if (indexed && state->index_buffer) { struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(state->index_buffer); -- 2.33.0

3 11

[PATCH] wined3d: Parse ISG1, PSG1 and OSG1 signatures.
by Zebediah Figura 09 Nov '21

09 Nov '21

These signatures extend the OSG5 format by a minimum precision hint, which gets ignored for now but could be implemented using 16-bit floats in the future. Fixes some shader parsing errors in Resident Evil 2. Based on a vkd3d patch by Philip Rebohle. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/shader_sm4.c | 21 ++++++++++++++++++--- include/wine/wined3d.h | 1 + 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 4635910269f..005be96a51f 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -1820,10 +1820,13 @@ const struct wined3d_shader_frontend sm4_shader_frontend = #define TAG_AON9 WINEMAKEFOURCC('A', 'o', 'n', '9') #define TAG_DXBC WINEMAKEFOURCC('D', 'X', 'B', 'C') +#define TAG_ISG1 WINEMAKEFOURCC('I', 'S', 'G', '1') #define TAG_ISGN WINEMAKEFOURCC('I', 'S', 'G', 'N') +#define TAG_OSG1 WINEMAKEFOURCC('O', 'S', 'G', '1') #define TAG_OSG5 WINEMAKEFOURCC('O', 'S', 'G', '5') #define TAG_OSGN WINEMAKEFOURCC('O', 'S', 'G', 'N') #define TAG_PCSG WINEMAKEFOURCC('P', 'C', 'S', 'G') +#define TAG_PSG1 WINEMAKEFOURCC('P', 'S', 'G', '1') #define TAG_SHDR WINEMAKEFOURCC('S', 'H', 'D', 'R') #define TAG_SHEX WINEMAKEFOURCC('S', 'H', 'E', 'X') @@ -1955,6 +1958,7 @@ static HRESULT shader_parse_signature(DWORD tag, const char *data, DWORD data_si struct wined3d_shader_signature *s) { struct wined3d_shader_signature_element *e; + bool has_stream_index, has_min_precision; const char *ptr = data; unsigned int i; DWORD count; @@ -1982,11 +1986,14 @@ static HRESULT shader_parse_signature(DWORD tag, const char *data, DWORD data_si return E_OUTOFMEMORY; } + has_min_precision = tag == TAG_OSG1 || tag == TAG_PSG1 || tag == TAG_ISG1; + has_stream_index = tag == TAG_OSG5 || has_min_precision; + for (i = 0; i < count; ++i) { DWORD name_offset; - if (tag == TAG_OSG5) + if (has_stream_index) read_dword(&ptr, &e[i].stream_idx); else e[i].stream_idx = 0; @@ -2003,10 +2010,15 @@ static HRESULT shader_parse_signature(DWORD tag, const char *data, DWORD data_si read_dword(&ptr, &e[i].register_idx); read_dword(&ptr, &e[i].mask); + if (has_min_precision) + read_dword(&ptr, &e[i].min_precision); + else + e[i].min_precision = 0; + TRACE("Stream: %u, semantic: %s, semantic idx: %u, sysval_semantic %#x, " - "type %u, register idx: %u, use_mask %#x, input_mask %#x.\n", + "type %u, register idx: %u, use_mask %#x, input_mask %#x, min_precision %u.\n", e[i].stream_idx, debugstr_a(e[i].semantic_name), e[i].semantic_idx, e[i].sysval_semantic, - e[i].component_type, e[i].register_idx, (e[i].mask >> 8) & 0xff, e[i].mask & 0xff); + e[i].component_type, e[i].register_idx, (e[i].mask >> 8) & 0xff, e[i].mask & 0xff, e[i].min_precision); } s->elements = e; @@ -2024,6 +2036,7 @@ static HRESULT shader_dxbc_chunk_handler(const char *data, DWORD data_size, DWOR switch (tag) { case TAG_ISGN: + case TAG_ISG1: if (ctx->max_version < 4) { TRACE("Skipping shader input signature.\n"); @@ -2039,6 +2052,7 @@ static HRESULT shader_dxbc_chunk_handler(const char *data, DWORD data_size, DWOR break; case TAG_OSGN: + case TAG_OSG1: case TAG_OSG5: if (ctx->max_version < 4) { @@ -2055,6 +2069,7 @@ static HRESULT shader_dxbc_chunk_handler(const char *data, DWORD data_size, DWOR break; case TAG_PCSG: + case TAG_PSG1: if (shader->patch_constant_signature.elements) { FIXME("Multiple patch constant signatures.\n"); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7a6588ea4f4..1fdbd105cc4 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2107,6 +2107,7 @@ struct wined3d_shader_signature_element enum wined3d_component_type component_type; unsigned int register_idx; DWORD mask; + unsigned int min_precision; }; struct wined3d_shader_signature -- 2.33.0

2 1

← Newer
1
...
53
54
55
56
57
58
59
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel November 2021