March 2021 - Wine-Commits - list.winehq.org

Jacek Caban : iphlpapi: Use nameless unions.
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: 1fe893a9efa09c194bcc832864d94684d7e70e06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fe893a9efa09c194bcc8328… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 25 21:40:09 2021 +0100 iphlpapi: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/Makefile.in | 1 - dlls/iphlpapi/ipstats.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/iphlpapi/Makefile.in b/dlls/iphlpapi/Makefile.in index e65e9c7e474..3a2227f5ebb 100644 --- a/dlls/iphlpapi/Makefile.in +++ b/dlls/iphlpapi/Makefile.in @@ -2,7 +2,6 @@ MODULE = iphlpapi.dll IMPORTLIB = iphlpapi IMPORTS = advapi32 EXTRALIBS = $(RESOLV_LIBS) $(KSTAT_LIBS) $(PROCSTAT_LIBS) -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION C_SRCS = \ icmp.c \ diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 36f90f2c3a8..a15a0abad22 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -2437,7 +2437,7 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE if (class >= UDP_TABLE_OWNER_MODULE) { row.liCreateTimestamp.QuadPart = 0; /* FIXME */ - row.u.dwFlags = 0; + row.dwFlags = 0; memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); } if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) @@ -2547,8 +2547,8 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE if (class >= UDP_TABLE_OWNER_MODULE) { row.liCreateTimestamp.QuadPart = 0; /* FIXME */ - row.u.dwFlags = 0; - row.u.SpecificPortBind = !(pINData->inp_flags & INP_ANONPORT); + row.dwFlags = 0; + row.SpecificPortBind = !(pINData->inp_flags & INP_ANONPORT); memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); } if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) @@ -3087,7 +3087,7 @@ DWORD build_udp6_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE if (class >= UDP_TABLE_OWNER_MODULE) { row.liCreateTimestamp.QuadPart = 0; /* FIXME */ - row.u.dwFlags = 0; + row.dwFlags = 0; memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); } if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) @@ -3185,8 +3185,8 @@ DWORD build_udp6_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE if (class >= UDP_TABLE_OWNER_MODULE) { row.liCreateTimestamp.QuadPart = 0; /* FIXME */ - row.u.dwFlags = 0; - row.u.SpecificPortBind = !(in->inp_flags & INP_ANONPORT); + row.dwFlags = 0; + row.SpecificPortBind = !(in->inp_flags & INP_ANONPORT); memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); } if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size )))

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: 34652f37e443a9e7698f66d13df3b4811b1c0cc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34652f37e443a9e7698f66d1… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu Mar 25 21:27:52 2021 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 159 insertions(+), 16 deletions(-) diff --git a/po/lt.po b/po/lt.po index 1b5f22f4feb..ca0c71b8f3d 100644 --- a/po/lt.po +++ b/po/lt.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-03-05 09:05+0200\n" +"PO-Revision-Date: 2021-03-25 21:21+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -14224,17 +14224,6 @@ msgid "Icons (*.ico)" msgstr "Piktogramos (*.ico)" #: programs/reg/reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | IMPORT | EXPORT | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -14250,7 +14239,7 @@ msgstr "" " REG [operacija] [parametrai]\n" "\n" "Palaikomos operacijos:\n" -" ADD | DELETE | IMPORT | EXPORT | QUERY\n" +" ADD | DELETE | EXPORT | IMPORT | QUERY\n" "\n" "Pagalbai apie specifinę operaciją, įrašykite:\n" " REG [operacija] /?\n" @@ -14305,6 +14294,55 @@ msgid "" " Modify the registry without prompting for confirmation.\n" "\n" msgstr "" +"REG ADD <raktas> [/v reikšmės_vardas | /ve] [/t tipas] [/s skirtukas] [/d " +"duomenys] [/f]\n" +"\n" +" Prideda raktą į registrą arba prideda naują reikšmę į duotą registro " +"raktą.\n" +"\n" +" <raktas>\n" +" Registro raktas pridėjimui, arba, jei nurodytas bet kuris iš [/v] ar [/" +"ve],\n" +" raktas, į kurį pridėti naujus registro duomenis.\n" +"\n" +" Formatas: ŠAKNIS\\Poraktis\n" +"\n" +" ŠAKNIS: Numatytasis registro raktas. Privalo būti vienas iš:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Poraktis: Pilnas kelias iki registro rakto po nurodytu ŠAKNIES raktu.\n" +"\n" +" /v <reikšmės_vardas>\n" +" Pridedamos registro reikšmės vardas.\n" +"\n" +" /ve\n" +" Pridėti bevardę registro reikšmę. Šis parametras modifikuoja registro\n" +" reikšmę (numatytoji).\n" +"\n" +" /t <tipas>\n" +" Į registrą pridedamų duomenų tipas. Jei nurodytas [/t],\n" +" <tipas> privalo būti vienas iš:\n" +"\n" +" REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" +" REG_DWORD | REG_BINARY | REG_NONE\n" +"\n" +" Jei [/t] nenurodytas, numatytasis duomenų tipas yra REG_SZ.\n" +"\n" +" /s <skirtukas>\n" +" Simbolis naudojamas eilutėms REG_MULTI_SZ duomenyse atskirti.\n" +" Jei [/s] nenurodytas, numatytasis skirtukas yra \\0.\n" +"\n" +" /d <duomenys>\n" +" Duomenys pridėjimui į naują registro reikšmę.\n" +"\n" +" /f\n" +" Modifikuoti registrą be patvirtinimo klausimo.\n" +"\n" #: programs/reg/reg.rc:92 msgid "" @@ -14344,6 +14382,43 @@ msgid "" " prompting for confirmation.\n" "\n" msgstr "" +"REG DELETE <raktas> [/v reikšmės_vardas | /ve | /va] [/f]\n" +"\n" +" Pašalina registro raktą (įskaitant visus porakčius ir reikšmes), arba " +"pašalina\n" +" vieną ar daugiau reikšmių duotame registro rakte.\n" +"\n" +" <raktas>\n" +" Registro raktas pašalinimui, arba, jei nurodytas bet kuris iš [/v], [/" +"ve] ar [/va],\n" +" raktas, kuriame pašalinti vieną ar daugiau reikšmių.\n" +"\n" +" Formatas: ŠAKNIS\\Poraktis\n" +"\n" +" ŠAKNIS: Numatytasis registro raktas. Privalo būti vienas iš:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Poraktis: Pilnas kelias iki registro rakto po nurodytu ŠAKNIES raktu.\n" +"\n" +" /v <reikšmės_vardas>\n" +" Šalinamos registro reikšmės vardas.\n" +"\n" +" /ve\n" +" Pašalinti bevardę registro reikšmę. Šis parametras pašalina registro\n" +" reikšmę (numatytoji).\n" +"\n" +" /va\n" +" Pašalinti visas registro rakto reikšmes.\n" +"\n" +" /f\n" +" Pašalinti registro raktą (įskaitant visus porakčius ir reikšmes) be\n" +" patvirtinimo klausimo.\n" +"\n" #: programs/reg/reg.rc:114 msgid "" @@ -14379,16 +14454,49 @@ msgid "" " List all registry entries under <key> and its subkeys.\n" "\n" msgstr "" +"REG QUERY <raktas> [/v reikšmės_vardas | /ve] [/s]\n" +"\n" +" Užklausia nurodyto registro rakto ir išveda visus tiesioginius porakčius, " +"reikšmes\n" +" ir duomenis tame rakte. Naudokite [/s] rekursyviai užklausti kiekvieno " +"porakčio.\n" +"\n" +" <raktas>\n" +" Registro raktas užklausimui.\n" +"\n" +" Formatas: ŠAKNIS\\Poraktis\n" +"\n" +" ŠAKNIS: Numatytasis registro raktas. Privalo būti vienas iš:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Poraktis: Pilnas kelias iki registro rakto po nurodytu ŠAKNIES raktu.\n" +"\n" +" /v <reikšmės_vardas>\n" +" Užklausiamos registro reikšmės vardas. Jei nenurodytas nei [/v], nei [/" +"ve],\n" +" išvedamos visos rakto <raktas> reikšmės.\n" +"\n" +" /ve\n" +" Užklausti bevardės registro reikšmės. Šis parametras užklausia " +"registro\n" +" reikšmės (numatytoji).\n" +"\n" +" /s\n" +" Išvesti visus registro įrašus po raktu <raktas> ir jo porakčiais.\n" +"\n" #: programs/reg/reg.rc:116 msgid "The operation completed successfully\n" msgstr "Operacija sėkmingai įvykdyta\n" #: programs/reg/reg.rc:117 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid registry key\n" -msgstr "reg: Netinkamas rakto vardas\n" +msgstr "reg: Netinkamas registro raktas\n" #: programs/reg/reg.rc:118 msgid "reg: Invalid command line parameters\n" @@ -14494,6 +14602,13 @@ msgid "" " The name and path of the registry file to import.\n" "\n" msgstr "" +"REG IMPORT <failas>\n" +"\n" +" Importuoja raktus, reikšmes ir duomenis iš nurodyto failo į registrą.\n" +"\n" +" <failas>\n" +" Registro failo, kuris bus importuotas, pavadinimas ir kelias.\n" +"\n" #: programs/reg/reg.rc:149 msgid "reg: The file '%1' was not found.\n" @@ -14537,6 +14652,34 @@ msgid "" " Overwrite <file> without prompting for confirmation.\n" "\n" msgstr "" +"REG EXPORT <raktas> <failas> [/y]\n" +"\n" +" Eksportuoja nurodytą registro raktą (įskaitant visus porakčius ir " +"reikšmes)\n" +" į failą\n" +"\n" +" <raktas>\n" +" Registro raktas eksportui.\n" +"\n" +" Formatas: ŠAKNIS\\Poraktis\n" +"\n" +" ŠAKNIS: Numatytasis registro raktas. Privalo būti vienas iš:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Poraktis: Pilnas kelias iki registro rakto po nurodytu ŠAKNIES raktu.\n" +"\n" +" <failas>\n" +" Registro failo, kuris bus sukurtas, pavadinimas ir kelias.\n" +" Failas privalo turėti plėtinį .reg.\n" +"\n" +" /y\n" +" Perrašyti <failas> be patvirtinimo klausimo.\n" +"\n" #: programs/reg/reg.rc:172 msgid "reg: Invalid system key [%1]\n"

1 0

Jacek Caban : mshtml: Block load event until dynamically created script elements that are part of the document are loaded.
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: e5da8dbfb78c0f19b22af4f4406ad837b43b9f2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5da8dbfb78c0f19b22af4f4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 25 19:28:36 2021 +0100 mshtml: Block load event until dynamically created script elements that are part of the document are loaded. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/binding.h | 1 + dlls/mshtml/nsio.c | 18 ++++++++++++++++ dlls/mshtml/script.c | 42 ++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/asyncscriptload.js | 16 ++++++++++++++ 4 files changed, 77 insertions(+) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 3d1ea6ecc8d..26a337fe470 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -154,6 +154,7 @@ HRESULT create_channelbsc(IMoniker*,const WCHAR*,BYTE*,DWORD,BOOL,nsChannelBSC** HRESULT channelbsc_load_stream(HTMLInnerWindow*,IMoniker*,IStream*) DECLSPEC_HIDDEN; void channelbsc_set_channel(nsChannelBSC*,nsChannel*,nsIStreamListener*,nsISupports*) DECLSPEC_HIDDEN; IUri *nsuri_get_uri(nsWineURI*) DECLSPEC_HIDDEN; +nsresult create_onload_blocker_request(nsIRequest**) DECLSPEC_HIDDEN; HRESULT read_stream(BSCallback*,IStream*,void*,DWORD,DWORD*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 1ffc6325725..ea8eae2007d 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -3980,3 +3980,21 @@ void release_nsio(void) nsio = NULL; } } + +nsresult create_onload_blocker_request(nsIRequest **ret) +{ + nsIChannel *channel; + nsACString spec; + nsresult nsres; + + nsACString_InitDepend(&spec, "about:wine-script-onload-blocker"); + nsres = nsIIOService_NewChannel(nsio, &spec, NULL, NULL, &channel); + nsACString_Finish(&spec); + if(NS_FAILED(nsres)) { + ERR("Failed to create channel: %08x\n", nsres); + return nsres; + } + + *ret = (nsIRequest *)channel; + return NS_OK; +} diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index c52c62f56d9..ec739c4777f 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -822,6 +822,8 @@ typedef struct { BSCallback bsc; HTMLScriptElement *script_elem; + nsILoadGroup *load_group; + nsIRequest *request; DWORD scheme; DWORD size; @@ -945,6 +947,13 @@ static void ScriptBSC_destroy(BSCallback *bsc) This->script_elem = NULL; } + if(This->request) { + ERR("Unfinished request\n"); + nsIRequest_Release(This->request); + } + if(This->load_group) + nsILoadGroup_Release(This->load_group); + heap_free(This->buf); heap_free(This); } @@ -957,9 +966,19 @@ static HRESULT ScriptBSC_init_bindinfo(BSCallback *bsc) static HRESULT ScriptBSC_start_binding(BSCallback *bsc) { ScriptBSC *This = impl_from_BSCallback(bsc); + nsresult nsres; This->script_elem->binding = &This->bsc; + if(This->load_group) { + nsres = create_onload_blocker_request(&This->request); + if(NS_SUCCEEDED(nsres)) { + nsres = nsILoadGroup_AddRequest(This->load_group, This->request, NULL); + if(NS_FAILED(nsres)) + ERR("AddRequest failed: %08x\n", nsres); + } + } + /* FIXME: We should find a better to decide if 'loading' state is supposed to be used by the protocol. */ if(This->scheme == URL_SCHEME_HTTPS || This->scheme == URL_SCHEME_HTTP) set_script_elem_readystate(This->script_elem, READYSTATE_LOADING); @@ -970,6 +989,7 @@ static HRESULT ScriptBSC_start_binding(BSCallback *bsc) static HRESULT ScriptBSC_stop_binding(BSCallback *bsc, HRESULT result) { ScriptBSC *This = impl_from_BSCallback(bsc); + nsresult nsres; if(SUCCEEDED(result) && !This->script_elem) result = E_UNEXPECTED; @@ -989,6 +1009,14 @@ static HRESULT ScriptBSC_stop_binding(BSCallback *bsc, HRESULT result) This->size = 0; } + if(This->request) { + nsres = nsILoadGroup_RemoveRequest(This->load_group, This->request, NULL, NS_OK); + if(NS_FAILED(nsres)) + ERR("RemoveRequest failed: %08x\n", nsres); + nsIRequest_Release(This->request); + This->request = NULL; + } + IHTMLScriptElement_Release(&This->script_elem->IHTMLScriptElement_iface); This->script_elem = NULL; return S_OK; @@ -1099,6 +1127,20 @@ HRESULT load_script(HTMLScriptElement *script_elem, const WCHAR *src, BOOL async IHTMLScriptElement_AddRef(&script_elem->IHTMLScriptElement_iface); bsc->script_elem = script_elem; + if(window->bscallback && window->bscallback->nschannel && + window->bscallback->nschannel->load_group) { + cpp_bool contains; + nsresult nsres; + + nsres = nsIDOMNode_Contains(script_elem->element.node.doc->node.nsnode, + script_elem->element.node.nsnode, &contains); + if(NS_SUCCEEDED(nsres) && contains) { + TRACE("script %p will block load event\n", script_elem); + bsc->load_group = window->bscallback->nschannel->load_group; + nsILoadGroup_AddRef(bsc->load_group); + } + } + hres = start_binding(window, &bsc->bsc, NULL); IBindStatusCallback_Release(&bsc->bsc.IBindStatusCallback_iface); diff --git a/dlls/mshtml/tests/asyncscriptload.js b/dlls/mshtml/tests/asyncscriptload.js index 6dc333afdf4..207df133e91 100644 --- a/dlls/mshtml/tests/asyncscriptload.js +++ b/dlls/mshtml/tests/asyncscriptload.js @@ -90,3 +90,19 @@ async_test("append_script", function() { elem.src = "jsstream.php?simple"; external.writeStream("simple", " "); }); + +function unexpected_load(e) { + ok(false, "onload event before executing script"); +} + +guard(function() { + var elem = document.createElement("script"); + document.head.appendChild(elem); + elem.src = "jsstream.php?blockload"; + + window.addEventListener("load", unexpected_load, true); + + setTimeout(guard(function() { + external.writeStream("blockload", "window.removeEventListener('load', unexpected_load, true);"); + }), 100); +})();

1 0

Jacek Caban : urlmon: Factor out obtain_user_agent.
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: 16a7293f37a807cb8160053dbf2987964f2c8438 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16a7293f37a807cb8160053d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 25 19:34:00 2021 +0100 urlmon: Factor out obtain_user_agent. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/session.c | 60 +++++++++++++++++++++++---------------------------- 1 file changed, 27 insertions(+), 33 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index 764f52c5630..6084ae94b11 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -505,19 +505,15 @@ static BOOL get_url_encoding(HKEY root, DWORD *encoding) static LPWSTR user_agent; -static void ensure_useragent(void) +static size_t obtain_user_agent(WCHAR *ret, size_t size) { OSVERSIONINFOW info = {sizeof(info)}; const WCHAR *os_type, *is_nt; - WCHAR buf[512], *ret, *tmp; DWORD res, idx=0; - size_t len, size; BOOL is_wow; + size_t len; HKEY key; - if(user_agent) - return; - GetVersionExW(&info); is_nt = info.dwPlatformId == VER_PLATFORM_WIN32_NT ? L"NT " : L""; @@ -528,16 +524,9 @@ static void ensure_useragent(void) else os_type = L""; - swprintf(buf, ARRAY_SIZE(buf), L"Mozilla/4.0 (compatible; MSIE 7.0; Windows %s%d.%d; %sTrident/7.0", + swprintf(ret, size, L"Mozilla/4.0 (compatible; MSIE 7.0; Windows %s%d.%d; %sTrident/7.0", is_nt, info.dwMajorVersion, info.dwMinorVersion, os_type); - len = lstrlenW(buf); - - size = len+40; - ret = heap_alloc(size * sizeof(WCHAR)); - if(!ret) - return; - - memcpy(ret, buf, len*sizeof(WCHAR)); + len = lstrlenW(ret); res = RegOpenKeyW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\" "Internet Settings\\5.0\\User Agent\\Post Platform", &key); @@ -545,23 +534,16 @@ static void ensure_useragent(void) DWORD value_len; while(1) { - value_len = ARRAY_SIZE(buf); - res = RegEnumValueW(key, idx, buf, &value_len, NULL, NULL, NULL, NULL); + if(idx) { + ret[len++] = ';'; + ret[len++] = ' '; + } + value_len = size - len - 2; + res = RegEnumValueW(key, idx, ret + len, &value_len, NULL, NULL, NULL, NULL); if(res != ERROR_SUCCESS) break; idx++; - if(len + value_len + 2 /* strlen("; ") */ + 1 /* trailing ')' */ >= size) { - tmp = heap_realloc(ret, (size*2+value_len)*sizeof(WCHAR)); - if(!tmp) - break; - ret = tmp; - size = size*2+value_len; - } - - ret[len++] = ';'; - ret[len++] = ' '; - memcpy(ret+len, buf, value_len*sizeof(WCHAR)); len += value_len; } @@ -570,16 +552,28 @@ static void ensure_useragent(void) ret[len++] = ')'; ret[len++] = 0; + TRACE("Using user agent %s\n", debugstr_w(ret)); + return len; +} + +static void ensure_user_agent(void) +{ + EnterCriticalSection(&session_cs); - user_agent = ret; - TRACE("Using user agent %s\n", debugstr_w(user_agent)); + if(!user_agent) { + WCHAR buf[1024]; + obtain_user_agent(buf, ARRAY_SIZE(buf)); + user_agent = heap_strdupW(buf); + } + + LeaveCriticalSection(&session_cs); } LPWSTR get_useragent(void) { LPWSTR ret; - ensure_useragent(); + ensure_user_agent(); EnterCriticalSection(&session_cs); ret = heap_strdupW(user_agent); @@ -606,7 +600,7 @@ HRESULT WINAPI UrlMkGetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBuf EnterCriticalSection(&session_cs); - ensure_useragent(); + ensure_user_agent(); if(user_agent) { size = WideCharToMultiByte(CP_ACP, 0, user_agent, -1, NULL, 0, NULL, NULL); *pdwBufferLength = size; @@ -703,7 +697,7 @@ HRESULT WINAPI ObtainUserAgentString(DWORD dwOption, LPSTR pcszUAOut, DWORD *cbS EnterCriticalSection(&session_cs); - ensure_useragent(); + ensure_user_agent(); if(user_agent) { size = WideCharToMultiByte(CP_ACP, 0, user_agent, -1, NULL, 0, NULL, NULL);

1 0

Jacek Caban : urlmon: Support version option in ObtainUserAgentString.
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: 3d95eef66f75a5c933666d8face08b7073733a17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d95eef66f75a5c933666d8f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 25 19:34:22 2021 +0100 urlmon: Support version option in ObtainUserAgentString. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/session.c | 96 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 65 insertions(+), 31 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index b74d56166d9..0a1be0ba367 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -505,61 +505,95 @@ static BOOL get_url_encoding(HKEY root, DWORD *encoding) static LPWSTR user_agent; -static size_t obtain_user_agent(WCHAR *ret, size_t size) +static size_t obtain_user_agent(unsigned int version, WCHAR *ret, size_t size) { OSVERSIONINFOW info = {sizeof(info)}; const WCHAR *os_type, *is_nt; - DWORD res, idx=0; + BOOL is_wow, quirks = FALSE; + DWORD res; size_t len = 0; - BOOL is_wow; HKEY key; - EnterCriticalSection(&session_cs); - if(user_agent) { - len = wcslen(user_agent) + 1; - memcpy(ret, user_agent, min(size, len) * sizeof(WCHAR)); + if(version & 0x1000) { + version &= ~0x1000; + if(version == 7) + quirks = TRUE; + else + version = 7; + }else if(version < 7) { + version = 7; + } + if(version > 11) { + FIXME("Unsupported version %u\n", version); + version = 11; + } + + if(version < 7 || (version == 7 && !quirks)) { + EnterCriticalSection(&session_cs); + if(user_agent) { + len = wcslen(user_agent) + 1; + memcpy(ret, user_agent, min(size, len) * sizeof(WCHAR)); + } + LeaveCriticalSection(&session_cs); + if(len) return len; + } + + swprintf(ret, size, L"Mozilla/%s (", version < 9 ? L"4.0" : L"5.0"); + len = lstrlenW(ret); + if(version < 11) { + swprintf(ret + len, size - len, L"compatible; MSIE %u.0; ", version); + len += wcslen(ret + len); } - LeaveCriticalSection(&session_cs); - if(len) return len; GetVersionExW(&info); is_nt = info.dwPlatformId == VER_PLATFORM_WIN32_NT ? L"NT " : L""; if(sizeof(void*) == 8) +#ifdef __x86_64__ os_type = L"Win64; x64; "; +#else + os_type = L"Win64; "; +#endif else if(IsWow64Process(GetCurrentProcess(), &is_wow) && is_wow) os_type = L"WOW64; "; else os_type = L""; - swprintf(ret, size, L"Mozilla/4.0 (compatible; MSIE 7.0; Windows %s%d.%d; %sTrident/7.0", - is_nt, info.dwMajorVersion, info.dwMinorVersion, os_type); + swprintf(ret + len, size - len, L"Windows %s%d.%d; %s", is_nt, info.dwMajorVersion, + info.dwMinorVersion, os_type); len = lstrlenW(ret); - res = RegOpenKeyW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\" - "Internet Settings\\5.0\\User Agent\\Post Platform", &key); - if(res == ERROR_SUCCESS) { - DWORD value_len; + if(!quirks) { + wcscpy(ret + len, L"Trident/7.0"); + len += ARRAY_SIZE(L"Trident/7.0") - 1; + } - while(1) { - if(idx) { - ret[len++] = ';'; - ret[len++] = ' '; + if(version < 9) { + res = RegOpenKeyW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\" + "Internet Settings\\5.0\\User Agent\\Post Platform", &key); + if(res == ERROR_SUCCESS) { + DWORD value_len, idx; + + for(idx = 0;; idx++) { + if(idx) { + ret[len++] = ';'; + ret[len++] = ' '; + } + value_len = size - len - 2; + res = RegEnumValueW(key, idx, ret + len, &value_len, NULL, NULL, NULL, NULL); + if(res != ERROR_SUCCESS) + break; + + len += value_len; } - value_len = size - len - 2; - res = RegEnumValueW(key, idx, ret + len, &value_len, NULL, NULL, NULL, NULL); - if(res != ERROR_SUCCESS) - break; - idx++; - len += value_len; + RegCloseKey(key); + if(idx) len -= 2; } - - RegCloseKey(key); } + wcscpy(ret + len, version >= 11 ? L"; rv:11.0) like Gecko" : L")"); + len += wcslen(ret + len) + 1; - ret[len++] = ')'; - ret[len++] = 0; TRACE("Using user agent %s\n", debugstr_w(ret)); return len; } @@ -570,7 +604,7 @@ static void ensure_user_agent(void) if(!user_agent) { WCHAR buf[1024]; - obtain_user_agent(buf, ARRAY_SIZE(buf)); + obtain_user_agent(0, buf, ARRAY_SIZE(buf)); user_agent = heap_strdupW(buf); } @@ -704,7 +738,7 @@ HRESULT WINAPI ObtainUserAgentString(DWORD option, char *ret, DWORD *ret_size) if(!ret || !ret_size) return E_INVALIDARG; - len = obtain_user_agent(buf, ARRAY_SIZE(buf)); + len = obtain_user_agent(option, buf, ARRAY_SIZE(buf)); size = WideCharToMultiByte(CP_ACP, 0, buf, len, NULL, 0, NULL, NULL); if(size <= *ret_size) WideCharToMultiByte(CP_ACP, 0, buf, len, ret, *ret_size+1, NULL, NULL);

1 0

Jacek Caban : urlmon/tests: Add more user agent string tests.
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: b599464326b72f35959e1458f7baa3e5cd973bdd URL: https://source.winehq.org/git/wine.git/?a=commit;h=b599464326b72f35959e1458… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 25 19:34:36 2021 +0100 urlmon/tests: Add more user agent string tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/misc.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index abe77ac7eaf..5f468b80286 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1448,13 +1448,27 @@ static void test_UrlMkGetSessionOption(void) ok(encoding == 0xdeadbeef, "encoding = %08x, exepcted 0xdeadbeef\n", encoding); } +static size_t check_prefix(const char *str, const char *prefix) +{ + size_t len = strlen(prefix); + if(memcmp(str, prefix, len)) { + ok(0, "no %s prefix in %s\n", wine_dbgstr_a(prefix), wine_dbgstr_a(str)); + return 0; + } + return len; +} + static void test_user_agent(void) { static const CHAR expected[] = "Mozilla/4.0 (compatible; MSIE "; static char test_str[] = "test"; static char test2_str[] = "test\0test"; static CHAR str[3]; + OSVERSIONINFOW os_info = {sizeof(os_info)}; + char ua[1024], buf[64]; + unsigned int i; LPSTR str2 = NULL; + BOOL is_wow = FALSE; HRESULT hres; DWORD size, saved; @@ -1493,6 +1507,67 @@ static void test_user_agent(void) "user agent was \"%s\", expected to start with \"%s\"\n", str2, expected); + GetVersionExW(&os_info); + if (sizeof(void*) == 4) IsWow64Process(GetCurrentProcess(), &is_wow); + + for(i = 1; i < 12; i++) { + const char *p = ua; + + if (i != 7) { + size = sizeof(ua); + hres = pObtainUserAgentString(i | 0x1000, ua, &size); + ok(hres == S_OK, "ObtainUserAgentString failed: %08x\n", hres); + ok(size == strlen(ua) + 1, "unexpected size %u, expected %u\n", size, strlen(ua) + 1); + ok(!strcmp(ua, str2), "unexpected UA for version %u %s, expected %s\n", + i, wine_dbgstr_a(ua), wine_dbgstr_a(str2)); + } + + size = sizeof(ua); + hres = pObtainUserAgentString(i != 1 ? i : 0x1007, ua, &size); + ok(hres == S_OK, "ObtainUserAgentString failed: %08x\n", hres); + ok(size == strlen(ua) + 1, "unexpected size %u, expected %u\n", size, strlen(ua) + 1); + if(i < 8 && i != 1) + ok(!strcmp(ua, str2), "unexpected UA for version %u %s, expected %s\n", + i, wine_dbgstr_a(ua), wine_dbgstr_a(str2)); + + p += check_prefix(p, "Mozilla/"); + p += check_prefix(p, i < 9 ? "4.0 (" : "5.0 ("); + if(i < 11) { + p += check_prefix(p, "compatible; "); + sprintf(buf, "MSIE %u.0; ", max(i, 7)); + p += check_prefix(p, buf); + } + sprintf(buf, "Windows NT %u.%u; ", os_info.dwMajorVersion, os_info.dwMinorVersion); + p += check_prefix(p, buf); + if(is_wow) { + p += check_prefix(p, "WOW64; "); + }else if(sizeof(void*) == 8) { + p += check_prefix(p, "Win64; "); +#ifdef __x86_64__ + p += check_prefix(p, "x64; "); +#endif + } + if(i != 1) { + p += check_prefix(p, "Trident/"); + ok('5' <= *p && *p <= '8', "unexpected version '%c'\n", *p); + if(*p < '7') { + win_skip("skipping UA tests, too old IE\n"); + break; + } + p++; /* skip version number */ + p += check_prefix(p, ".0"); + } + if(i == 11) { + p += check_prefix(p, "; rv:11.0) like Gecko"); + }else { + if(i < 9) + p = strchr(p, ')'); + p += check_prefix(p, ")"); + } + + ok(!*p, "unexpected suffix %s for version %u\n", wine_dbgstr_a(p), i); + } + size = saved+10; hres = pObtainUserAgentString(0, str2, &size); ok(hres == S_OK, "ObtainUserAgentString failed: %08x\n", hres);

1 0

Gijs Vermeulen : wineqtdecoder: Use nameless unions.
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: 596fa641c61e20448371801f5abe248da7493224 URL: https://source.winehq.org/git/wine.git/?a=commit;h=596fa641c61e20448371801f… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Mar 25 22:23:11 2021 +0100 wineqtdecoder: Use nameless unions. Fixes a regression caused by b39b9eea39b19a8f91543b8350ed822d0fd9eef0. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineqtdecoder/main.c b/dlls/wineqtdecoder/main.c index 435951ba933..82563989192 100644 --- a/dlls/wineqtdecoder/main.c +++ b/dlls/wineqtdecoder/main.c @@ -27,6 +27,7 @@ #define COBJMACROS #define NONAMELESSSTRUCT #define NONAMELESSUNION +#define WINE_NO_NAMELESS_EXTENSION #include "windef.h" #include "winbase.h"

1 0

Henri Verbeet : wined3d: Implement wined3d_swapchain_set_gamma_ramp() on top of wined3d_output_set_gamma_ramp().
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: bd9aca2cc8066c4a2abeeda458ce43c044f4c5ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd9aca2cc8066c4a2abeeda4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 25 16:46:44 2021 +0100 wined3d: Implement wined3d_swapchain_set_gamma_ramp() on top of wined3d_output_set_gamma_ramp(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 13 +++++++++++++ dlls/wined3d/swapchain.c | 24 ++++++++++++++---------- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 95fa744d64d..7287b333f97 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1509,6 +1509,19 @@ HRESULT CDECL wined3d_output_set_gamma_ramp(struct wined3d_output *output, const return WINED3D_OK; } +HRESULT wined3d_output_get_gamma_ramp(struct wined3d_output *output, struct wined3d_gamma_ramp *ramp) +{ + HDC dc; + + TRACE("output %p, ramp %p.\n", output, ramp); + + dc = CreateDCW(output->device_name, NULL, NULL, NULL); + GetDeviceGammaRamp(dc, ramp); + DeleteDC(dc); + + return WINED3D_OK; +} + HRESULT CDECL wined3d_adapter_get_identifier(const struct wined3d_adapter *adapter, DWORD flags, struct wined3d_adapter_identifier *identifier) { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 95db586c697..b575baa19ef 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -363,18 +363,20 @@ void CDECL wined3d_swapchain_get_desc(const struct wined3d_swapchain *swapchain, HRESULT CDECL wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *swapchain, DWORD flags, const struct wined3d_gamma_ramp *ramp) { - HDC dc; + struct wined3d_output *output; TRACE("swapchain %p, flags %#x, ramp %p.\n", swapchain, flags, ramp); if (flags) FIXME("Ignoring flags %#x.\n", flags); - dc = GetDCEx(swapchain->state.device_window, 0, DCX_USESTYLE | DCX_CACHE); - SetDeviceGammaRamp(dc, (void *)ramp); - ReleaseDC(swapchain->state.device_window, dc); + if (!(output = wined3d_swapchain_get_output(swapchain))) + { + ERR("Failed to get output from swapchain %p.\n", swapchain); + return E_FAIL; + } - return WINED3D_OK; + return wined3d_output_set_gamma_ramp(output, ramp); } void CDECL wined3d_swapchain_set_palette(struct wined3d_swapchain *swapchain, struct wined3d_palette *palette) @@ -389,15 +391,17 @@ void CDECL wined3d_swapchain_set_palette(struct wined3d_swapchain *swapchain, st HRESULT CDECL wined3d_swapchain_get_gamma_ramp(const struct wined3d_swapchain *swapchain, struct wined3d_gamma_ramp *ramp) { - HDC dc; + struct wined3d_output *output; TRACE("swapchain %p, ramp %p.\n", swapchain, ramp); - dc = GetDCEx(swapchain->state.device_window, 0, DCX_USESTYLE | DCX_CACHE); - GetDeviceGammaRamp(dc, ramp); - ReleaseDC(swapchain->state.device_window, dc); + if (!(output = wined3d_swapchain_get_output(swapchain))) + { + ERR("Failed to get output from swapchain %p.\n", swapchain); + return E_FAIL; + } - return WINED3D_OK; + return wined3d_output_get_gamma_ramp(output, ramp); } /* The is a fallback for cases where we e.g. can't create a GL context or diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c15765af0e8..4c15f6ab178 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3367,6 +3367,8 @@ struct wined3d_output D3DDDI_VIDEO_PRESENT_SOURCE_ID vidpn_source_id; }; +HRESULT wined3d_output_get_gamma_ramp(struct wined3d_output *output, struct wined3d_gamma_ramp *ramp) DECLSPEC_HIDDEN; + /* The adapter structure */ struct wined3d_adapter {

1 0

Zebediah Figura : wined3d: Implement zero step rate for instanced attributes.
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: 4d345a78bf1fad113e73f80a739eadfbc4babe62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d345a78bf1fad113e73f80a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 23 15:52:50 2021 -0500 wined3d: Implement zero step rate for instanced attributes. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 5 +++-- dlls/wined3d/context_gl.c | 6 +++++- dlls/wined3d/context_vk.c | 4 ++-- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 118ac2aad8a..2debf50de7f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -238,16 +238,17 @@ void wined3d_stream_info_from_declaration(struct wined3d_stream_info *stream_inf if (stream->flags & WINED3DSTREAMSOURCE_INSTANCEDATA) { stream_info->elements[idx].divisor = 1; + stream_info->elements[idx].instanced = true; } else if (element->input_slot_class == WINED3D_INPUT_PER_INSTANCE_DATA) { stream_info->elements[idx].divisor = element->instance_data_step_rate; - if (!element->instance_data_step_rate) - FIXME("Instance step rate 0 not implemented.\n"); + stream_info->elements[idx].instanced = true; } else { stream_info->elements[idx].divisor = 0; + stream_info->elements[idx].instanced = false; } if (!d3d_info->vertex_bgra && element->format->id == WINED3DFMT_B8G8R8A8_UNORM) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index a51e5ec9095..fa61b70f525 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -5378,7 +5378,11 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c if (gl_info->supported[ARB_INSTANCED_ARRAYS]) { - GL_EXTCALL(glVertexAttribDivisor(i, element->divisor)); + unsigned int divisor = 0; + + if (element->instanced) + divisor = element->divisor ? element->divisor : UINT_MAX; + GL_EXTCALL(glVertexAttribDivisor(i, divisor)); } else if (element->divisor) { diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index eedfed315ce..45133eabb69 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2061,9 +2061,9 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte b = &key->bindings[binding_count++]; b->binding = binding; b->stride = e->stride; - b->inputRate = e->divisor ? VK_VERTEX_INPUT_RATE_INSTANCE : VK_VERTEX_INPUT_RATE_VERTEX; + b->inputRate = e->instanced ? VK_VERTEX_INPUT_RATE_INSTANCE : VK_VERTEX_INPUT_RATE_VERTEX; - if (e->divisor > 1) + if (e->instanced) { d = &key->divisors[divisor_count++]; d->binding = binding; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ba86cb7ebdb..c15765af0e8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1665,6 +1665,7 @@ struct wined3d_stream_info_element GLsizei stride; unsigned int stream_idx; unsigned int divisor; + bool instanced; }; struct wined3d_stream_info

1 0

Zebediah Figura : wined3d: Require vertexAttributeInstanceRateZeroDivisor.
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: 1eff85d2f718e92f5fcb6e876f94a20d13ef7d3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1eff85d2f718e92f5fcb6e87… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 23 15:52:49 2021 -0500 wined3d: Require vertexAttributeInstanceRateZeroDivisor. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index b784be6ab04..7303c994eb4 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -319,11 +319,8 @@ struct wined3d_physical_device_info static void wined3d_disable_vulkan_features(struct wined3d_physical_device_info *info) { - VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *vertex_divisor_features = &info->vertex_divisor_features; VkPhysicalDeviceFeatures *features = &info->features2.features; - vertex_divisor_features->vertexAttributeInstanceRateZeroDivisor = VK_FALSE; - features->depthBounds = VK_FALSE; features->alphaToOne = VK_FALSE; features->textureCompressionETC2 = VK_FALSE; @@ -447,7 +444,8 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi else VK_CALL(vkGetPhysicalDeviceFeatures(physical_device, &features2->features)); - if (!vertex_divisor_features->vertexAttributeInstanceRateDivisor) + if (!vertex_divisor_features->vertexAttributeInstanceRateDivisor + || !vertex_divisor_features->vertexAttributeInstanceRateZeroDivisor) { WARN("Vertex attribute divisors not supported.\n"); hr = E_FAIL;

1 0