October 2020 - Wine-Commits

Julian Rüger : po: Update German translation.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: ed377c99e72ecd31333f7a01c4a4b7d3e17422f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed377c99e72ecd31333f7a01… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Oct 5 12:12:35 2020 +0200 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 124 ++++++++++++++++++++------------------------------------------- 1 file changed, 39 insertions(+), 85 deletions(-) diff --git a/po/de.po b/po/de.po index 0e8542265b..3f8f78b6ba 100644 --- a/po/de.po +++ b/po/de.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: 2020-08-28 14:28+0200\n" +"PO-Revision-Date: 2020-10-05 12:12+0200\n" "Last-Translator: Julian Rüger <jr98(a)gmx.net>\n" "Language-Team: German\n" "Language: de\n" @@ -6942,16 +6942,12 @@ msgid "No Signature found in file.\n" msgstr "Keine Signatur in Datei gefunden.\n" #: dlls/kernel32/winerror.mc:3774 -#, fuzzy -#| msgid "Invalid level.\n" msgid "Invalid call.\n" -msgstr "Ungültige Ebene.\n" +msgstr "Ungültiger Aufruf.\n" #: dlls/kernel32/winerror.mc:3781 -#, fuzzy -#| msgid "Value is not available.\n" msgid "Resource is not currently available.\n" -msgstr "Wert nicht verfügbar.\n" +msgstr "Ressource ist zur Zeit nicht verfügbar.\n" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 @@ -10775,153 +10771,116 @@ msgstr "&Mehr Fenster..." #: dlls/vbscript/vbscript.rc:30 msgid "Overflow" -msgstr "" +msgstr "Überlauf" #: dlls/vbscript/vbscript.rc:31 -#, fuzzy -#| msgid "Out of memory." msgid "Out of memory" -msgstr "Kein freier Speicher mehr." +msgstr "Speicher voll" #: dlls/vbscript/vbscript.rc:33 msgid "This array is fixed or temporarily locked" -msgstr "" +msgstr "Array ist fixiert oder temporär gesperrt" #: dlls/vbscript/vbscript.rc:34 -#, fuzzy -#| msgid "Data type mismatch.\n" msgid "Type mismatch" -msgstr "Datentypen stimmen nicht überein.\n" +msgstr "Datentypen inkongruent" #: dlls/vbscript/vbscript.rc:36 -#, fuzzy -#| msgid "I/O device error.\n" msgid "Device I/O error" -msgstr "E/A-Gerätefehler.\n" +msgstr "E/A-Gerätefehler" #: dlls/vbscript/vbscript.rc:37 -#, fuzzy -#| msgid "File already exists.\n" msgid "File already exists" -msgstr "Datei existiert bereits.\n" +msgstr "Datei existiert bereits" #: dlls/vbscript/vbscript.rc:38 -#, fuzzy -#| msgid "Disk full.\n" msgid "Disk full" -msgstr "Datenträger voll.\n" +msgstr "Datenträger voll" #: dlls/vbscript/vbscript.rc:39 -#, fuzzy -#| msgid "Too many open files.\n" msgid "Too many files" -msgstr "Zu viele geöffnete Dateien.\n" +msgstr "Zu viele Dateien" #: dlls/vbscript/vbscript.rc:40 -#, fuzzy -#| msgid "Access denied.\n" msgid "Permission denied" -msgstr "Zugriff verweigert.\n" +msgstr "Keine Berechtigung" #: dlls/vbscript/vbscript.rc:41 msgid "Path/File access error" -msgstr "" +msgstr "Pfad-/Dateizugriffsfehler" #: dlls/vbscript/vbscript.rc:42 -#, fuzzy -#| msgid "Path not found.\n" msgid "Path not found" -msgstr "Pfad nicht gefunden.\n" +msgstr "Pfad nicht gefunden" #: dlls/vbscript/vbscript.rc:43 -#, fuzzy -#| msgid "(value not set)" msgid "Object variable not set" -msgstr "(Wert nicht gesetzt)" +msgstr "Objektvariable nicht gesetzt" #: dlls/vbscript/vbscript.rc:44 -#, fuzzy -#| msgid "Invalid user buffer.\n" msgid "Invalid use of Null" -msgstr "Ungültiger Benutzerpuffer.\n" +msgstr "Ungültige Verwendung von Null" #: dlls/vbscript/vbscript.rc:45 msgid "Can't create necessary temporary file" -msgstr "" +msgstr "Notwendige temporäre Datei konnte nicht erzeugt werden" #: dlls/vbscript/vbscript.rc:46 -#, fuzzy -#| msgid "Automation server can't create object" msgid "ActiveX component can't create object" -msgstr "Automatisierungsserver konnte das Objekt nicht erstellen" +msgstr "ActiveX-Komponente konnte Objekt nicht erstellen" #: dlls/vbscript/vbscript.rc:47 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Class doesn't support Automation" -msgstr "Das Objekt unterstützt diese Aktion nicht" +msgstr "Klasse unterstützt keine Automation" #: dlls/vbscript/vbscript.rc:48 msgid "File name or class name not found during Automation operation" -msgstr "" +msgstr "Datei- oder Klassenname nicht gefunden während Automationsablauf" #: dlls/vbscript/vbscript.rc:51 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Object doesn't support named arguments" -msgstr "Das Objekt unterstützt diese Aktion nicht" +msgstr "Objekt unterstützt keine benannten Argumente" #: dlls/vbscript/vbscript.rc:52 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Object doesn't support current locale setting" -msgstr "Das Objekt unterstützt diese Aktion nicht" +msgstr "Objekt unterstützt aktuelle Regionseinstellung nicht" #: dlls/vbscript/vbscript.rc:53 dlls/vbscript/vbscript.rc:54 -#, fuzzy -#| msgid "Element not found.\n" msgid "Named argument not found" -msgstr "Element nicht gefunden.\n" +msgstr "Benanntes Argument nicht gefunden" #: dlls/vbscript/vbscript.rc:55 msgid "Wrong number of arguments or invalid property assignment" -msgstr "" +msgstr "Falsche Anzahl an Argumenten oder ungültige Merkmalszuweisung" #: dlls/vbscript/vbscript.rc:56 -#, fuzzy -#| msgid "Object Class Violation" msgid "Object not a collection" -msgstr "Objektklasse verletzt" +msgstr "Objekt ist keine Kollektion" #: dlls/vbscript/vbscript.rc:57 -#, fuzzy -#| msgid "Specified control was not found in message" msgid "Specified DLL function not found" -msgstr "Angegebenes Steuerobjekt wurde in der Meldung nicht gefunden" +msgstr "Angegebene DLL-Funktion nicht gefunden" #: dlls/vbscript/vbscript.rc:58 msgid "Variable uses an Automation type not supported in VBScript" msgstr "" +"Variable verwendet einen in VBScript nicht unterstützten Automationstyp" #: dlls/vbscript/vbscript.rc:59 msgid "The remote server machine does not exist or is unavailable" -msgstr "" +msgstr "Remoteserver existiert nicht oder ist nicht verfügbar" #: dlls/vbscript/vbscript.rc:60 msgid "Invalid or unqualified reference" -msgstr "" +msgstr "Ungültige oder unqualifizierte Referenz" #: dlls/vbscript/vbscript.rc:62 -#, fuzzy -#| msgid "Microsoft JScript compilation error" msgid "Microsoft VBScript compilation error" -msgstr "Microsoft JScript Übersetzungsfehler" +msgstr "Microsoft VBScript Übersetzungsfehler" #: dlls/vbscript/vbscript.rc:63 -#, fuzzy -#| msgid "Microsoft JScript runtime error" msgid "Microsoft VBScript runtime error" -msgstr "Microsoft JScript Laufzeitfehler" +msgstr "Microsoft VBScript Laufzeitfehler" #: dlls/winemac.drv/winemac.rc:33 msgid "Hide %@" @@ -11017,37 +10976,32 @@ msgstr "Der Name auf dem Zertifikat entspricht nicht dem der Seite." msgid "" "There is at least one unspecified security problem with this certificate." msgstr "" -"Es gibt mindestens ein unbekanntes Sicherheitsproblem mit diesem Zertifikat." +"Es gibt mindestens ein unspezifisches Sicherheitsproblem mit diesem " +"Zertifikat." #: dlls/wininet/wininet.rc:35 msgid "Effective Date" -msgstr "" +msgstr "Effektives Datum" #: dlls/wininet/wininet.rc:37 -#, fuzzy -#| msgid "Security" msgid "Security Protocol" -msgstr "Sicherheit" +msgstr "Sicherheitsprotokoll" #: dlls/wininet/wininet.rc:38 -#, fuzzy -#| msgid "Signature" msgid "Signature Type" -msgstr "Signatur" +msgstr "Signaturtyp" #: dlls/wininet/wininet.rc:39 -#, fuzzy -#| msgid "Encrypting File System" msgid "Encryption Type" -msgstr "Verschlüsseltes Dateisystem" +msgstr "Art der Verschlüsselung" #: dlls/wininet/wininet.rc:40 msgid "Privacy Strength" -msgstr "" +msgstr "Privatsphäre" #: dlls/wininet/wininet.rc:43 msgid "bits" -msgstr "" +msgstr "Bit" #: dlls/wininet/winineterror.mc:26 msgid "The request has timed out.\n"

1 0

Michael Stefaniuc : hlink: Use wide-char string literals.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: d9e109fd9249ab8fad697988f3edd8b57646bf50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9e109fd9249ab8fad697988… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:12 2020 +0200 hlink: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/browse_ctx.c | 6 ++---- dlls/hlink/extserv.c | 5 ++--- dlls/hlink/hlink_main.c | 29 +++++++++-------------------- dlls/hlink/link.c | 3 +-- 4 files changed, 14 insertions(+), 29 deletions(-) diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index 2038768be4..3fe6885422 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -98,8 +98,6 @@ static ULONG WINAPI IHlinkBC_fnRelease (IHlinkBrowseContext* iface) return ref; } -static const WCHAR szIdent[] = {'W','I','N','E','H','L','I','N','K',0}; - static HRESULT WINAPI IHlinkBC_Register(IHlinkBrowseContext* iface, DWORD dwReserved, IUnknown *piunk, IMoniker *pimk, DWORD *pdwRegister) { @@ -111,7 +109,7 @@ static HRESULT WINAPI IHlinkBC_Register(IHlinkBrowseContext* iface, FIXME("(%p)->(%i %p %p %p)\n", This, dwReserved, piunk, pimk, pdwRegister); - hr = CreateItemMoniker(NULL, szIdent, &mon); + hr = CreateItemMoniker(NULL, L"WINEHLINK", &mon); if (FAILED(hr)) return hr; CreateGenericComposite(mon, pimk, &composite); @@ -137,7 +135,7 @@ static HRESULT WINAPI IHlinkBC_GetObject(IHlinkBrowseContext* iface, TRACE("(%p)->(%p, %d, %p)\n", This, pimk, fBindifRootRegistered, ppiunk); - hr = CreateItemMoniker(NULL, szIdent, &mon); + hr = CreateItemMoniker(NULL, L"WINEHLINK", &mon); if (FAILED(hr)) return hr; CreateGenericComposite(mon, pimk, &composite); diff --git a/dlls/hlink/extserv.c b/dlls/hlink/extserv.c index 98af4c1aec..c9154e95c2 100644 --- a/dlls/hlink/extserv.c +++ b/dlls/hlink/extserv.c @@ -245,10 +245,9 @@ static HRESULT ExtServ_ImplSetAdditionalHeaders(ExtensionService* This, LPCWSTR len = lstrlenW(pwzAdditionalHeaders); if(len && pwzAdditionalHeaders[len-1] != '\n' && pwzAdditionalHeaders[len-1] != '\r') { - static const WCHAR endlW[] = {'\r','\n',0}; - This->headers = heap_alloc(len*sizeof(WCHAR) + sizeof(endlW)); + This->headers = heap_alloc(len*sizeof(WCHAR) + sizeof(L"\r\n")); memcpy(This->headers, pwzAdditionalHeaders, len*sizeof(WCHAR)); - memcpy(This->headers+len, endlW, sizeof(endlW)); + memcpy(This->headers+len, L"\r\n", sizeof(L"\r\n")); }else { This->headers = hlink_strdupW(pwzAdditionalHeaders); } diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index be639363a8..a9f907fa07 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -273,8 +273,6 @@ HRESULT WINAPI HlinkIsShortcut(LPCWSTR pwzFileName) { int len; - static const WCHAR url_ext[] = {'.','u','r','l',0}; - TRACE("(%s)\n", debugstr_w(pwzFileName)); if(!pwzFileName) @@ -284,7 +282,7 @@ HRESULT WINAPI HlinkIsShortcut(LPCWSTR pwzFileName) if(len < 0) return S_FALSE; - return wcsicmp(pwzFileName+len, url_ext) ? S_FALSE : S_OK; + return wcsicmp(pwzFileName+len, L".url") ? S_FALSE : S_OK; } /*********************************************************************** @@ -297,25 +295,16 @@ HRESULT WINAPI HlinkGetSpecialReference(ULONG uReference, LPWSTR *ppwzReference) WCHAR *buf; HKEY hkey; - static const WCHAR start_pageW[] = {'S','t','a','r','t',' ','P','a','g','e',0}; - static const WCHAR search_pageW[] = {'S','e','a','r','c','h',' ','P','a','g','e',0}; - - static const WCHAR ie_main_keyW[] = - {'S','o','f','t','w','a','r','e', - '\\','M','i','c','r','o','s','o','f','t','\\', - 'I','n','t','e','r','n','e','t',' ','E','x','p','l','o','r','e','r', - '\\','M','a','i','n',0}; - TRACE("(%u %p)\n", uReference, ppwzReference); *ppwzReference = NULL; switch(uReference) { case HLSR_HOME: - value_name = start_pageW; + value_name = L"Start Page"; break; case HLSR_SEARCHPAGE: - value_name = search_pageW; + value_name = L"Search Page"; break; case HLSR_HISTORYFOLDER: return E_NOTIMPL; @@ -323,7 +312,7 @@ HRESULT WINAPI HlinkGetSpecialReference(ULONG uReference, LPWSTR *ppwzReference) return E_INVALIDARG; } - res = RegOpenKeyW(HKEY_CURRENT_USER, ie_main_keyW, &hkey); + res = RegOpenKeyW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Internet Explorer\\Main", &hkey); if(res != ERROR_SUCCESS) { WARN("Could not open key: %u\n", res); return HRESULT_FROM_WIN32(res); @@ -380,8 +369,7 @@ HRESULT WINAPI HlinkUpdateStackItem(IHlinkFrame *frame, IHlinkBrowseContext *bc, HRESULT WINAPI HlinkParseDisplayName(LPBC pibc, LPCWSTR pwzDisplayName, BOOL fNoForceAbs, ULONG *pcchEaten, IMoniker **ppimk) { - static const WCHAR file_colonW[] = {'f','i','l','e',':'}; - ULONG eaten = 0; + ULONG eaten = 0, len; HRESULT hres; TRACE("(%p %s %x %p %p)\n", pibc, debugstr_w(pwzDisplayName), fNoForceAbs, pcchEaten, ppimk); @@ -389,9 +377,10 @@ HRESULT WINAPI HlinkParseDisplayName(LPBC pibc, LPCWSTR pwzDisplayName, BOOL fNo if(fNoForceAbs) FIXME("Unsupported fNoForceAbs\n"); - if(!wcsnicmp(pwzDisplayName, file_colonW, ARRAY_SIZE(file_colonW))) { - pwzDisplayName += ARRAY_SIZE(file_colonW); - eaten += ARRAY_SIZE(file_colonW); + len = ARRAY_SIZE(L"file:") - 1; + if(!wcsnicmp(pwzDisplayName, L"file:", len)) { + pwzDisplayName += len; + eaten += len; while(*pwzDisplayName == '/') { pwzDisplayName++; diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index e11db12516..134f3aefd8 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -537,13 +537,12 @@ static HRESULT WINAPI IHlink_fnNavigate(IHlink *iface, DWORD flags, IBindCtx *us } else { - static const WCHAR szOpen[] = {'o','p','e','n',0}; LPWSTR target = NULL; r = IHlink_GetStringReference(iface, HLINKGETREF_DEFAULT, &target, NULL); if (SUCCEEDED(r) && target) { - ShellExecuteW(NULL, szOpen, target, NULL, NULL, SW_SHOW); + ShellExecuteW(NULL, L"open", target, NULL, NULL, SW_SHOW); CoTaskMemFree(target); r = DRAGDROP_S_DROP; }

1 0

Michael Stefaniuc : slc/tests: Use wide-char string literals.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 7fa86c9b92b6fbab25053793a7a000d348de38fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fa86c9b92b6fbab25053793… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:25 2020 +0200 slc/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/slc/tests/slc.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/slc/tests/slc.c b/dlls/slc/tests/slc.c index b9296b2da1..fc0b1c84ad 100644 --- a/dlls/slc/tests/slc.c +++ b/dlls/slc/tests/slc.c @@ -29,40 +29,33 @@ static void test_SLGetWindowsInformationDWORD(void) { - static const WCHAR NonexistentLicenseValueW[] = {'N','o','n','e','x','i','s','t','e','n','t','-', - 'L','i','c','e','n','s','e','-','V','a','l','u','e',0}; - static const WCHAR KernelMUILanguageAllowedW[] = {'K','e','r','n','e','l','-','M','U','I','-', - 'L','a','n','g','u','a','g','e','-','A','l','l','o','w','e','d',0}; - static const WCHAR KernelMUINumberAllowedW[] = {'K','e','r','n','e','l','-','M','U','I','-', - 'N','u','m','b','e','r','-','A','l','l','o','w','e','d',0}; - static const WCHAR emptyW[] = {0}; DWORD value; HRESULT res; - res = SLGetWindowsInformationDWORD(NonexistentLicenseValueW, NULL); + res = SLGetWindowsInformationDWORD(L"Nonexistent-License-Value", NULL); ok(res == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", res); res = SLGetWindowsInformationDWORD(NULL, &value); ok(res == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", res); value = 0xdeadbeef; - res = SLGetWindowsInformationDWORD(NonexistentLicenseValueW, &value); + res = SLGetWindowsInformationDWORD(L"Nonexistent-License-Value", &value); ok(res == SL_E_VALUE_NOT_FOUND, "expected SL_E_VALUE_NOT_FOUND, got %08x\n", res); ok(value == 0xdeadbeef, "expected value = 0xdeadbeef, got %u\n", value); value = 0xdeadbeef; - res = SLGetWindowsInformationDWORD(emptyW, &value); + res = SLGetWindowsInformationDWORD(L"", &value); ok(res == SL_E_RIGHT_NOT_GRANTED || broken(res == 0xd000000d) /* Win 8 */, "expected SL_E_RIGHT_NOT_GRANTED, got %08x\n", res); ok(value == 0xdeadbeef, "expected value = 0xdeadbeef, got %u\n", value); value = 0xdeadbeef; - res = SLGetWindowsInformationDWORD(KernelMUILanguageAllowedW, &value); + res = SLGetWindowsInformationDWORD(L"Kernel-MUI-Language-Allowed", &value); ok(res == SL_E_DATATYPE_MISMATCHED, "expected SL_E_DATATYPE_MISMATCHED, got %08x\n", res); ok(value == 0xdeadbeef, "expected value = 0xdeadbeef, got %u\n", value); value = 0xdeadbeef; - res = SLGetWindowsInformationDWORD(KernelMUINumberAllowedW, &value); + res = SLGetWindowsInformationDWORD(L"Kernel-MUI-Number-Allowed", &value); ok(res == S_OK, "expected S_OK, got %u\n", res); ok(value != 0xdeadbeef, "expected value != 0xdeadbeef\n"); }

1 0

Michael Stefaniuc : dxdiagn/tests: Use wide-char string literals.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 521f954d3cf1be2dd41e6cc2eeb4e11c510c10b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=521f954d3cf1be2dd41e6cc2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:13 2020 +0200 dxdiagn/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxdiagn/tests/container.c | 205 ++++++++++++++--------------------------- 1 file changed, 67 insertions(+), 138 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=521f954d3cf1be2dd41e…

1 0

Roberto Pungartnik : po: Update Spanish translation.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 38fbd058a0970faae9bf76fae5d7475dcd8a883e URL: https://source.winehq.org/git/wine.git/?a=commit;h=38fbd058a0970faae9bf76fa… Author: Roberto Pungartnik <rpungartnik(a)gmail.com> Date: Fri Oct 2 21:32:24 2020 -0300 po: Update Spanish translation. Signed-off-by: Roberto Pungartnik <rpungartnik(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/es.po | 364 +++++++++++++++++++++++++-------------------------------------- 1 file changed, 143 insertions(+), 221 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=38fbd058a0970faae9bf…

1 0

Piotr Caban : msvcrt: Terminate on noexcept function trying to propagate exception (x86_64).
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 8468a3ed77ba22d9a33b2251240e2a4e5462e1b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8468a3ed77ba22d9a33b2251… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 2 22:27:20 2020 +0200 msvcrt: Terminate on noexcept function trying to propagate exception (x86_64). Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 42283131e8..b7e77f7949 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -499,6 +499,18 @@ static LONG CALLBACK se_translation_filter(EXCEPTION_POINTERS *ep, void *c) return ExceptionContinueSearch; } +static void check_noexcept( PEXCEPTION_RECORD rec, + const cxx_function_descr *descr, BOOL nested ) +{ + if (!nested && rec->ExceptionCode == CXX_EXCEPTION && + descr->magic >= CXX_FRAME_MAGIC_VC8 && + (descr->flags & FUNC_DESCR_NOEXCEPT)) + { + ERR("noexcept function propagating exception\n"); + MSVCRT_terminate(); + } +} + static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, CONTEXT *context, DISPATCHER_CONTEXT *dispatch, const cxx_function_descr *descr) @@ -562,7 +574,11 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, cxx_local_unwind(orig_frame, dispatch, descr, unwindlevel); return ExceptionContinueSearch; } - if (!descr->tryblock_count) return ExceptionContinueSearch; + if (!descr->tryblock_count) + { + check_noexcept(rec, descr, orig_frame != frame); + return ExceptionContinueSearch; + } if (rec->ExceptionCode == CXX_EXCEPTION) { @@ -612,6 +628,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, } find_catch_block(rec, context, NULL, frame, dispatch, descr, exc_type, orig_frame); + check_noexcept(rec, descr, orig_frame != frame); return ExceptionContinueSearch; }

1 0

Dmitry Timoshkov : sxs: Fix off by 1 error when allocating memory.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 9ba6e5c2ab4c4d113e9d98454afcdfd9fc30dbf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ba6e5c2ab4c4d113e9d9845… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sat Oct 3 10:57:13 2020 +0300 sxs: Fix off by 1 error when allocating memory. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sxs/cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/sxs/cache.c b/dlls/sxs/cache.c index bb203f50c0..0acf012032 100644 --- a/dlls/sxs/cache.c +++ b/dlls/sxs/cache.c @@ -129,7 +129,7 @@ static WCHAR *build_dll_path( const WCHAR *arch, const WCHAR *name, const WCHAR unsigned int len; if (!(path = build_assembly_name( arch, name, token, version, &len ))) return NULL; - len += build_sxs_path( sxsdir ) + 1; + len += build_sxs_path( sxsdir ) + 2; if (!(ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) { HeapFree( GetProcessHeap(), 0, path );

1 0

Daniel Lehman : vcruntime140_1: Terminate on noexcept function trying to propagate exception.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 649072d1c8aebe9c4b2b952e58ae25c52e666589 URL: https://source.winehq.org/git/wine.git/?a=commit;h=649072d1c8aebe9c4b2b952e… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Fri Oct 2 22:27:24 2020 +0200 vcruntime140_1: Terminate on noexcept function trying to propagate exception. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140_1/except_x86_64.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c index f66ae43721..a5a760b7b0 100644 --- a/dlls/vcruntime140_1/except_x86_64.c +++ b/dlls/vcruntime140_1/except_x86_64.c @@ -657,6 +657,17 @@ static inline _se_translator_function get_se_translator(void) return __current_exception()[-2]; } +static void check_noexcept( PEXCEPTION_RECORD rec, const cxx_function_descr *descr ) +{ + if (!(descr->header & FUNC_DESCR_IS_CATCH) && + rec->ExceptionCode == CXX_EXCEPTION && + (descr->header & FUNC_DESCR_NO_EXCEPT)) + { + ERR("noexcept function propagating exception\n"); + terminate(); + } +} + static DWORD cxx_frame_handler4(EXCEPTION_RECORD *rec, ULONG64 frame, CONTEXT *context, DISPATCHER_CONTEXT *dispatch, const cxx_function_descr *descr, int trylevel) @@ -683,7 +694,11 @@ static DWORD cxx_frame_handler4(EXCEPTION_RECORD *rec, ULONG64 frame, cxx_local_unwind4(orig_frame, dispatch, descr, trylevel, last_level); return ExceptionContinueSearch; } - if (!descr->tryblock_map) return ExceptionContinueSearch; + if (!descr->tryblock_map) + { + check_noexcept(rec, descr); + return ExceptionContinueSearch; + } if (rec->ExceptionCode == CXX_EXCEPTION) { @@ -733,6 +748,7 @@ static DWORD cxx_frame_handler4(EXCEPTION_RECORD *rec, ULONG64 frame, } find_catch_block4(rec, context, NULL, frame, dispatch, descr, exc_type, orig_frame, trylevel); + check_noexcept(rec, descr); return ExceptionContinueSearch; } @@ -759,7 +775,7 @@ EXCEPTION_DISPOSITION __cdecl __CxxFrameHandler4(EXCEPTION_RECORD *rec, return ExceptionContinueSearch; /* handle only c++ exceptions */ if (descr.header & ~(FUNC_DESCR_IS_CATCH | FUNC_DESCR_UNWIND_MAP | - FUNC_DESCR_TRYBLOCK_MAP | FUNC_DESCR_EHS)) + FUNC_DESCR_TRYBLOCK_MAP | FUNC_DESCR_EHS | FUNC_DESCR_NO_EXCEPT)) { FIXME("unsupported flags: %x\n", descr.header); return ExceptionContinueSearch;

1 0

Piotr Caban : msvcrt: Terminate on noexcept function trying to propagate exception (i386).
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 26c1f8fb07790f51c0fbe0012144e213edccd8ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=26c1f8fb07790f51c0fbe001… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 2 22:27:16 2020 +0200 msvcrt: Terminate on noexcept function trying to propagate exception (i386). Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cppexcept.h | 1 + dlls/msvcrt/except_i386.c | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/cppexcept.h b/dlls/msvcrt/cppexcept.h index 69fb3c5eed..7efb099cca 100644 --- a/dlls/msvcrt/cppexcept.h +++ b/dlls/msvcrt/cppexcept.h @@ -29,6 +29,7 @@ #define CXX_EXCEPTION 0xe06d7363 #define FUNC_DESCR_SYNCHRONOUS 1 /* synchronous exceptions only (built with /EHs and /EHsc) */ +#define FUNC_DESCR_NOEXCEPT 4 /* noexcept function */ typedef void (*vtable_ptr)(void); diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index ea5634aefb..45054d885c 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -551,6 +551,18 @@ static LONG CALLBACK se_translation_filter( EXCEPTION_POINTERS *ep, void *c ) return ExceptionContinueSearch; } +static void check_noexcept( PEXCEPTION_RECORD rec, + const cxx_function_descr *descr, BOOL nested ) +{ + if (!nested && rec->ExceptionCode == CXX_EXCEPTION && + descr->magic >= CXX_FRAME_MAGIC_VC8 && + (descr->flags & FUNC_DESCR_NOEXCEPT)) + { + ERR("noexcept function propagating exception\n"); + MSVCRT_terminate(); + } +} + /********************************************************************* * cxx_frame_handler * @@ -578,7 +590,11 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame if (descr->unwind_count && !nested_frame) cxx_local_unwind( frame, descr, -1 ); return ExceptionContinueSearch; } - if (!descr->tryblock_count) return ExceptionContinueSearch; + if (!descr->tryblock_count) + { + check_noexcept(rec, descr, nested_frame != NULL); + return ExceptionContinueSearch; + } if(rec->ExceptionCode == CXX_EXCEPTION && rec->ExceptionInformation[1] == 0 && rec->ExceptionInformation[2] == 0) @@ -643,6 +659,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame call_catch_block( rec, context, frame, descr, nested_frame, exc_type ); + check_noexcept(rec, descr, nested_frame != NULL); return ExceptionContinueSearch; }

1 0

Zebediah Figura : tests: Import HLSL struct assignment tests from Wine.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: vkd3d Branch: master Commit: ce7c9649357aeceeaab5eb027603ed1da6912d57 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ce7c9649357aeceeaab5eb0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Oct 3 16:24:23 2020 -0500 tests: Import HLSL struct assignment tests from Wine. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ tests/hlsl-struct-assignment.shader_test | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/Makefile.am b/Makefile.am index 415e686..f3a5967 100644 --- a/Makefile.am +++ b/Makefile.am @@ -57,6 +57,7 @@ vkd3d_shader_tests = \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ + tests/hlsl-struct-assignment.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ @@ -195,6 +196,7 @@ XFAIL_TESTS = \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ + tests/hlsl-struct-assignment.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ diff --git a/tests/hlsl-struct-assignment.shader_test b/tests/hlsl-struct-assignment.shader_test new file mode 100644 index 0000000..ea55b9a --- /dev/null +++ b/tests/hlsl-struct-assignment.shader_test @@ -0,0 +1,23 @@ +[pixel shader] +struct apple +{ + struct + { + float4 a; + } m; + float4 b; +}; + +float4 main() : sv_target +{ + struct apple q, r, s; + + q.m.a = float4(0.1, 0.2, 0.3, 0.4); + q.b = float4(0.5, 0.1, 0.4, 0.5); + s = r = q; + return s.m.a + s.b; +} + +[test] +draw quad +probe all rgba (0.6, 0.3, 0.7, 0.9) 1

1 0

Zebediah Figura : tests: Import HLSL static initializer tests from Wine.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: vkd3d Branch: master Commit: 57a8a908568bb267d3c8012016031b268169359e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=57a8a908568bb267d3c8012… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Oct 3 16:24:25 2020 -0500 tests: Import HLSL static initializer tests from Wine. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ tests/hlsl-static-initializer.shader_test | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/Makefile.am b/Makefile.am index ce0d193..15be137 100644 --- a/Makefile.am +++ b/Makefile.am @@ -57,6 +57,7 @@ vkd3d_shader_tests = \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ + tests/hlsl-static-initializer.shader_test \ tests/hlsl-struct-assignment.shader_test \ tests/hlsl-struct-varying.shader_test \ tests/hlsl-vector-indexing.shader_test \ @@ -197,6 +198,7 @@ XFAIL_TESTS = \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ + tests/hlsl-static-initializer.shader_test \ tests/hlsl-struct-assignment.shader_test \ tests/hlsl-struct-varying.shader_test \ tests/hlsl-vector-indexing.shader_test \ diff --git a/tests/hlsl-static-initializer.shader_test b/tests/hlsl-static-initializer.shader_test new file mode 100644 index 0000000..9b9d000 --- /dev/null +++ b/tests/hlsl-static-initializer.shader_test @@ -0,0 +1,15 @@ +[pixel shader] +float myfunc() +{ + return 0.6; +} +static float a = myfunc() + 0.2; +static float b; +float4 main() : sv_target +{ + return float4(a, b, 0, 0); +} + +[test] +draw quad +probe all rgba (0.8, 0.0, 0.0, 0.0)

1 0

Zebediah Figura : tests: Import invalid HLSL shader tests from Wine.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: vkd3d Branch: master Commit: ce4c7a16347bd71310aa40e40657f7c15ddb48ac URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ce4c7a16347bd71310aa40e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Oct 3 16:24:26 2020 -0500 tests: Import invalid HLSL shader tests from Wine. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 + tests/hlsl-invalid.shader_test | 117 +++++++++++++++++++++++++++++++++++++++++ tests/shader_runner_d3d12.c | 47 ++++++++++++++--- 3 files changed, 159 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index 15be137..93289a2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -53,6 +53,7 @@ vkd3d_shader_tests = \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-comma.shader_test \ + tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ @@ -194,6 +195,7 @@ XFAIL_TESTS = \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-comma.shader_test \ + tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ diff --git a/tests/hlsl-invalid.shader_test b/tests/hlsl-invalid.shader_test new file mode 100644 index 0000000..16e75d0 --- /dev/null +++ b/tests/hlsl-invalid.shader_test @@ -0,0 +1,117 @@ +[pixel shader fail] +float4 main() : sv_target +{ + return y; +} + +[pixel shader fail] +float4 main() : sv_target +{ + float4 x = float4(0, 0, 0, 0); + x.xzzx = float4(1, 2, 3, 4); + return x; +} + +[pixel shader fail] +float4 main(float2 pos : TEXCOORD0) : sv_target +{ + float4 x = pos; + return x; +} + +[pixel shader fail] +float4 563r(float2 45s : TEXCOORD0) : sv_target +{ + float4 x = 45s; + return float4(x.x, x.y, 0, 0); +} + +[pixel shader fail] +float4 main() : sv_target +{ + struct { int b,c; } x = {0}; + return x; +} + +[pixel shader fail] +float4 main() : sv_target +{ + struct {} x = {}; + return x; +} + +[pixel shader fail] +float4 main(float2 pos : TEXCOORD0) : sv_target +{ + return; +} + +[pixel shader fail] +void main(float2 pos : TEXCOORD0) +{ + return pos; +} + +[pixel shader fail] +float4 main(float2 pos : TEXCOORD0) : sv_target +{ + return pos; +} + +[pixel shader fail] +float4 main() : sv_target +{ + float a[0]; + return 0; +} + +[pixel shader fail] +float4 main() : sv_target +{ + float a[65537]; + return 0; +} + +[pixel shader fail] +float4 main() : sv_target +{ + int x; + float a[(x = 2)]; + return 0; +} + +[pixel shader fail] +uniform float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail] +typedef row_major float4x4 matrix_t; +typedef column_major matrix_t matrix2_t; + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail] +float4 main() +{ + return 0; +} + +[pixel shader fail] +float4 main(out float4 o : sv_target) +{ + o = 1; + return 0; +} + +[pixel shader fail] +struct {float4 a;}; + +float4 main() : sv_target +{ + return 0; +} diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 0e9694a..df7076c 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -102,6 +102,7 @@ static ID3D10Blob *compile_shader(const char *source, const char *target) enum parse_state { STATE_NONE, + STATE_SHADER_INVALID_PIXEL, STATE_SHADER_PIXEL, STATE_TEST, }; @@ -269,10 +270,10 @@ START_TEST(shader_runner_d3d12) }; size_t shader_source_size = 0, shader_source_len = 0; enum parse_state state = STATE_NONE; + unsigned int i, line_number = 0; struct shader_context context; const char *filename = NULL; char *shader_source = NULL; - unsigned int i; char line[256]; FILE *f; @@ -304,12 +305,13 @@ START_TEST(shader_runner_d3d12) memset(&context, 0, sizeof(context)); init_test_context(&context.c, &desc); - while (fgets(line, sizeof(line), f)) + for (;;) { - if (line[0] == '\n') - continue; + char *ret = fgets(line, sizeof(line), f); - if (line[0] == '[') + ++line_number; + + if (!ret || line[0] == '[') { switch (state) { @@ -322,14 +324,43 @@ START_TEST(shader_runner_d3d12) return; shader_source_len = 0; break; + + case STATE_SHADER_INVALID_PIXEL: + { + ID3D10Blob *blob = NULL, *errors = NULL; + HRESULT hr; + + hr = D3DCompile(shader_source, strlen(shader_source), NULL, + NULL, NULL, "main", "ps_4_0", 0, 0, &blob, &errors); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!blob, "Expected no compiled shader blob.\n"); + ok(!!errors, "Expected non-NULL error blob.\n"); + + if (vkd3d_test_state.debug_level) + trace("%s\n", (char *)ID3D10Blob_GetBufferPointer(errors)); + ID3D10Blob_Release(errors); + + shader_source_len = 0; + break; + } } + } + + if (!ret) + break; + if (line[0] == '[') + { if (!strcmp(line, "[pixel shader]\n")) state = STATE_SHADER_PIXEL; + else if (!strcmp(line, "[pixel shader fail]\n")) + state = STATE_SHADER_INVALID_PIXEL; else if (!strcmp(line, "[test]\n")) state = STATE_TEST; + + vkd3d_test_set_context("Section %.*s, line %u", strlen(line) - 1, line, line_number); } - else + else if (line[0] != '\n') { switch (state) { @@ -338,6 +369,7 @@ START_TEST(shader_runner_d3d12) fprintf(stderr, "Ignoring line '%s' in %s.\n", line, argv[1]); break; + case STATE_SHADER_INVALID_PIXEL: case STATE_SHADER_PIXEL: { size_t len = strlen(line); @@ -356,7 +388,8 @@ START_TEST(shader_runner_d3d12) } } - ID3D10Blob_Release(context.ps_code); + if (context.ps_code) + ID3D10Blob_Release(context.ps_code); destroy_test_context(&context.c); fclose(f);

1 0

Zebediah Figura : tests: Import HLSL struct varying tests from Wine.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: vkd3d Branch: master Commit: 2c4d4277dd1fdaaf3939cb3a696832d4e942d720 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2c4d4277dd1fdaaf3939cb3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Oct 3 16:24:24 2020 -0500 tests: Import HLSL struct varying tests from Wine. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ tests/hlsl-struct-varying.shader_test | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/Makefile.am b/Makefile.am index f3a5967..ce0d193 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,6 +58,7 @@ vkd3d_shader_tests = \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ tests/hlsl-struct-assignment.shader_test \ + tests/hlsl-struct-varying.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ @@ -197,6 +198,7 @@ XFAIL_TESTS = \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ tests/hlsl-struct-assignment.shader_test \ + tests/hlsl-struct-varying.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ diff --git a/tests/hlsl-struct-varying.shader_test b/tests/hlsl-struct-varying.shader_test new file mode 100644 index 0000000..b623a99 --- /dev/null +++ b/tests/hlsl-struct-varying.shader_test @@ -0,0 +1,29 @@ +[pixel shader] +struct input +{ + struct + { + float4 pos : sv_position; + } m; +}; + +struct output +{ + struct + { + float4 color : sv_target; + } m; +}; + +struct output main(struct input i) +{ + struct output o; + o.m.color = i.m.pos; + return o; +} + +[test] +draw quad +probe rgba (0, 1) (0.5, 1.5, 0.0, 1.0) +probe rgba (1, 0) (1.5, 0.5, 0.0, 1.0) +probe rgba (3, 5) (3.5, 5.5, 0.0, 1.0)

1 0

Zebediah Figura : vkd3d-common: Correctly escape whitespace characters in debugstr_*().
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: vkd3d Branch: master Commit: 0c6cd3ba21ccdbb934dae16713b4fb2c6988ff0f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0c6cd3ba21ccdbb934dae16… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Oct 3 16:25:11 2020 -0500 vkd3d-common: Correctly escape whitespace characters in debugstr_*(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-common/debug.c | 66 +++++++++++++++-------------------------------- 1 file changed, 21 insertions(+), 45 deletions(-) diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c index 33deed6..5e49cf1 100644 --- a/libs/vkd3d-common/debug.c +++ b/libs/vkd3d-common/debug.c @@ -114,6 +114,24 @@ const char *vkd3d_dbg_sprintf(const char *fmt, ...) return buffer; } +static int get_escape_char(int c) +{ + switch (c) + { + case '"': + case '\\': + return c; + case '\t': + return 't'; + case '\n': + return 'n'; + case '\r': + return 'r'; + default: + return 0; + } +} + const char *debugstr_a(const char *str) { char *buffer, *ptr; @@ -127,21 +145,7 @@ const char *debugstr_a(const char *str) *ptr++ = '"'; while ((c = *str++) && ptr <= buffer + VKD3D_DEBUG_BUFFER_SIZE - 8) { - int escape_char; - - switch (c) - { - case '"': - case '\\': - case '\n': - case '\r': - case '\t': - escape_char = c; - break; - default: - escape_char = 0; - break; - } + int escape_char = get_escape_char(c); if (escape_char) { @@ -187,21 +191,7 @@ static const char *debugstr_w16(const uint16_t *wstr) *ptr++ = '"'; while ((c = *wstr++) && ptr <= buffer + VKD3D_DEBUG_BUFFER_SIZE - 10) { - int escape_char; - - switch (c) - { - case '"': - case '\\': - case '\n': - case '\r': - case '\t': - escape_char = c; - break; - default: - escape_char = 0; - break; - } + int escape_char = get_escape_char(c); if (escape_char) { @@ -247,21 +237,7 @@ static const char *debugstr_w32(const uint32_t *wstr) *ptr++ = '"'; while ((c = *wstr++) && ptr <= buffer + VKD3D_DEBUG_BUFFER_SIZE - 10) { - int escape_char; - - switch (c) - { - case '"': - case '\\': - case '\n': - case '\r': - case '\t': - escape_char = c; - break; - default: - escape_char = 0; - break; - } + int escape_char = get_escape_char(c); if (escape_char) {

1 0

Andrew Eikum : mmdevapi: Stub implement IAudioClient2.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: wine Branch: master Commit: 370a538e54bc7d2b97c8f845f702adfc51902862 URL: https://source.winehq.org/git/wine.git/?a=commit;h=370a538e54bc7d2b97c8f845… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 1 14:31:22 2020 -0500 mmdevapi: Stub implement IAudioClient2. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/devenum.c | 3 +- dlls/mmdevapi/tests/render.c | 11 +++ dlls/winealsa.drv/mmdevdrv.c | 144 +++++++++++++++++++++++-------------- dlls/wineandroid.drv/mmdevdrv.c | 147 +++++++++++++++++++++++--------------- dlls/winecoreaudio.drv/mmdevdrv.c | 144 +++++++++++++++++++++++-------------- dlls/wineoss.drv/mmdevdrv.c | 145 +++++++++++++++++++++++-------------- dlls/winepulse.drv/mmdevdrv.c | 142 ++++++++++++++++++++++-------------- 7 files changed, 463 insertions(+), 273 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=370a538e54bc7d2b97c8…

1 0

Andrew Eikum : mmdevapi: Stub implement IAudioClient3.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: wine Branch: master Commit: 6314a75006d1cfb86c1fb3da71be037fe646437c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6314a75006d1cfb86c1fb3da… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 1 15:23:05 2020 -0500 mmdevapi: Stub implement IAudioClient3. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/devenum.c | 3 +- dlls/mmdevapi/tests/render.c | 17 +++++ dlls/winealsa.drv/mmdevdrv.c | 155 +++++++++++++++++++++++-------------- dlls/wineandroid.drv/mmdevdrv.c | 157 +++++++++++++++++++++++--------------- dlls/winecoreaudio.drv/mmdevdrv.c | 155 +++++++++++++++++++++++-------------- dlls/wineoss.drv/mmdevdrv.c | 155 +++++++++++++++++++++++-------------- dlls/winepulse.drv/mmdevdrv.c | 153 +++++++++++++++++++++++-------------- 7 files changed, 499 insertions(+), 296 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6314a75006d1cfb86c1f…

1 0

Zebediah Figura : server: Introduce IOCTL_AFD_ACCEPT.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: wine Branch: master Commit: 5474c035e7dca04b0c9c2abba9d208c18e839b26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5474c035e7dca04b0c9c2abb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 1 23:13:57 2020 -0500 server: Introduce IOCTL_AFD_ACCEPT. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/afd.h | 1 + server/sock.c | 50 +++++++++++++++++++++++++++++++------------------- 2 files changed, 32 insertions(+), 19 deletions(-) diff --git a/include/wine/afd.h b/include/wine/afd.h index 24e6c31f22..9ca03039f8 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -24,6 +24,7 @@ #include <winioctl.h> #define IOCTL_AFD_CREATE CTL_CODE(FILE_DEVICE_NETWORK, 200, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_AFD_ACCEPT CTL_CODE(FILE_DEVICE_NETWORK, 201, METHOD_BUFFERED, FILE_WRITE_ACCESS) #define IOCTL_AFD_ADDRESS_LIST_CHANGE CTL_CODE(FILE_DEVICE_NETWORK, 323, METHOD_BUFFERED, 0) diff --git a/server/sock.c b/server/sock.c index f165e86b12..f66fe09117 100644 --- a/server/sock.c +++ b/server/sock.c @@ -851,16 +851,11 @@ static int accept_new_fd( struct sock *sock ) } /* accept a socket (creates a new fd) */ -static struct sock *accept_socket( obj_handle_t handle ) +static struct sock *accept_socket( struct sock *sock ) { struct sock *acceptsock; - struct sock *sock; int acceptfd; - sock = (struct sock *)get_handle_obj( current->process, handle, FILE_READ_DATA, &sock_ops ); - if (!sock) - return NULL; - if (get_unix_fd( sock->fd ) == -1) return NULL; if ( sock->deferred ) @@ -870,15 +865,10 @@ static struct sock *accept_socket( obj_handle_t handle ) } else { - if ((acceptfd = accept_new_fd( sock )) == -1) - { - release_object( sock ); - return NULL; - } + if ((acceptfd = accept_new_fd( sock )) == -1) return NULL; if (!(acceptsock = create_socket())) { close( acceptfd ); - release_object( sock ); return NULL; } @@ -899,7 +889,6 @@ static struct sock *accept_socket( obj_handle_t handle ) get_fd_options( sock->fd ) ))) { release_object( acceptsock ); - release_object( sock ); return NULL; } } @@ -907,7 +896,6 @@ static struct sock *accept_socket( obj_handle_t handle ) sock->pmask &= ~FD_ACCEPT; sock->hmask &= ~FD_ACCEPT; sock_reselect( sock ); - release_object( sock ); return acceptsock; } @@ -1100,6 +1088,26 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } + case IOCTL_AFD_ACCEPT: + { + struct sock *acceptsock; + obj_handle_t handle; + + if (get_reply_max_size() != sizeof(handle)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + + if (!(acceptsock = accept_socket( sock ))) return 0; + handle = alloc_handle( current->process, &acceptsock->obj, + GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, OBJ_INHERIT ); + acceptsock->wparam = handle; + release_object( acceptsock ); + set_reply_data( &handle, sizeof(handle) ); + return 0; + } + case IOCTL_AFD_ADDRESS_LIST_CHANGE: if ((sock->state & FD_WINE_NONBLOCKING) && async_is_blocking( async )) { @@ -1420,15 +1428,19 @@ struct object *create_socket_device( struct object *root, const struct unicode_s /* accept a socket */ DECL_HANDLER(accept_socket) { - struct sock *sock; + struct sock *sock, *acceptsock; + + if (!(sock = (struct sock *)get_handle_obj( current->process, req->lhandle, FILE_READ_DATA, &sock_ops ))) + return; reply->handle = 0; - if ((sock = accept_socket( req->lhandle )) != NULL) + if ((acceptsock = accept_socket( sock )) != NULL) { - reply->handle = alloc_handle( current->process, &sock->obj, req->access, req->attributes ); - sock->wparam = reply->handle; /* wparam for message is the socket handle */ - release_object( &sock->obj ); + reply->handle = alloc_handle( current->process, &acceptsock->obj, req->access, req->attributes ); + acceptsock->wparam = reply->handle; /* wparam for message is the socket handle */ + release_object( acceptsock ); } + release_object( sock ); } /* accept a socket into an initialized socket */

1 0

Zebediah Figura : ws2_32: Use IOCTL_AFD_ACCEPT.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: wine Branch: master Commit: c46ab05e55860a6c2ea774495c9da8adff3eea00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c46ab05e55860a6c2ea77449… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 1 23:13:58 2020 -0500 ws2_32: Use IOCTL_AFD_ACCEPT. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index bc61b56667..031688b2d9 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2771,9 +2771,11 @@ static int WS2_register_async_shutdown( SOCKET s, int type ) SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr, int *addrlen32) { DWORD err; - SOCKET as; int fd; BOOL is_blocking; + IO_STATUS_BLOCK io; + NTSTATUS status; + obj_handle_t accept_handle; TRACE("socket %04lx\n", s ); err = sock_is_blocking(s, &is_blocking); @@ -2782,18 +2784,12 @@ SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr, int *addrlen32) for (;;) { - /* try accepting first (if there is a deferred connection) */ - SERVER_START_REQ( accept_socket ) - { - req->lhandle = wine_server_obj_handle( SOCKET2HANDLE(s) ); - req->access = GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE; - req->attributes = OBJ_INHERIT; - err = NtStatusToWSAError( wine_server_call( req )); - as = HANDLE2SOCKET( wine_server_ptr_handle( reply->handle )); - } - SERVER_END_REQ; - if (!err) + status = NtDeviceIoControlFile( SOCKET2HANDLE(s), NULL, NULL, NULL, &io, IOCTL_AFD_ACCEPT, + NULL, 0, &accept_handle, sizeof(accept_handle) ); + if (!status) { + SOCKET as = HANDLE2SOCKET(wine_server_ptr_handle( accept_handle )); + if (!socket_list_add(as)) { CloseHandle(SOCKET2HANDLE(as)); @@ -2807,6 +2803,7 @@ SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr, int *addrlen32) TRACE("\taccepted %04lx\n", as); return as; } + err = NtStatusToWSAError( status ); if (!is_blocking) break; if (err != WSAEWOULDBLOCK) break; fd = get_sock_fd( s, FILE_READ_DATA, NULL );

1 0

Zebediah Figura : server: Remove the no longer used accept_socket request.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: wine Branch: master Commit: cb1594cf4ff9eef0a5b5d80dc7c47da9e27a5821 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb1594cf4ff9eef0a5b5d80d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 1 23:13:59 2020 -0500 server: Remove the no longer used accept_socket request. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 21 +-------------------- server/protocol.def | 10 ---------- server/request.h | 8 -------- server/sock.c | 18 ------------------ server/trace.c | 15 --------------- 5 files changed, 1 insertion(+), 71 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index ea62e73f63..8c7ab39146 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1695,22 +1695,6 @@ struct unlock_file_reply -struct accept_socket_request -{ - struct request_header __header; - obj_handle_t lhandle; - unsigned int access; - unsigned int attributes; -}; -struct accept_socket_reply -{ - struct reply_header __header; - obj_handle_t handle; - char __pad_12[4]; -}; - - - struct accept_into_socket_request { struct request_header __header; @@ -5497,7 +5481,6 @@ enum request REQ_get_volume_info, REQ_lock_file, REQ_unlock_file, - REQ_accept_socket, REQ_accept_into_socket, REQ_set_socket_event, REQ_get_socket_event, @@ -5785,7 +5768,6 @@ union generic_request struct get_volume_info_request get_volume_info_request; struct lock_file_request lock_file_request; struct unlock_file_request unlock_file_request; - struct accept_socket_request accept_socket_request; struct accept_into_socket_request accept_into_socket_request; struct set_socket_event_request set_socket_event_request; struct get_socket_event_request get_socket_event_request; @@ -6071,7 +6053,6 @@ union generic_reply struct get_volume_info_reply get_volume_info_reply; struct lock_file_reply lock_file_reply; struct unlock_file_reply unlock_file_reply; - struct accept_socket_reply accept_socket_reply; struct accept_into_socket_reply accept_into_socket_reply; struct set_socket_event_reply set_socket_event_reply; struct get_socket_event_reply get_socket_event_reply; @@ -6302,7 +6283,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 647 +#define SERVER_PROTOCOL_VERSION 648 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index f538c6dcf5..6534092f2c 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1383,16 +1383,6 @@ enum server_fd_type @END -/* Accept a socket */ -(a)REQ(accept_socket) - obj_handle_t lhandle; /* handle to the listening socket */ - unsigned int access; /* wanted access rights */ - unsigned int attributes; /* object attributes */ -(a)REPLY - obj_handle_t handle; /* handle to the new socket */ -(a)END - - /* Accept into an initialized socket */ @REQ(accept_into_socket) obj_handle_t lhandle; /* handle to the listening socket */ diff --git a/server/request.h b/server/request.h index bc6f29f211..c02b616d75 100644 --- a/server/request.h +++ b/server/request.h @@ -173,7 +173,6 @@ DECL_HANDLER(get_file_info); DECL_HANDLER(get_volume_info); DECL_HANDLER(lock_file); DECL_HANDLER(unlock_file); -DECL_HANDLER(accept_socket); DECL_HANDLER(accept_into_socket); DECL_HANDLER(set_socket_event); DECL_HANDLER(get_socket_event); @@ -460,7 +459,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_get_volume_info, (req_handler)req_lock_file, (req_handler)req_unlock_file, - (req_handler)req_accept_socket, (req_handler)req_accept_into_socket, (req_handler)req_set_socket_event, (req_handler)req_get_socket_event, @@ -1054,12 +1052,6 @@ C_ASSERT( FIELD_OFFSET(struct unlock_file_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct unlock_file_request, offset) == 16 ); C_ASSERT( FIELD_OFFSET(struct unlock_file_request, count) == 24 ); C_ASSERT( sizeof(struct unlock_file_request) == 32 ); -C_ASSERT( FIELD_OFFSET(struct accept_socket_request, lhandle) == 12 ); -C_ASSERT( FIELD_OFFSET(struct accept_socket_request, access) == 16 ); -C_ASSERT( FIELD_OFFSET(struct accept_socket_request, attributes) == 20 ); -C_ASSERT( sizeof(struct accept_socket_request) == 24 ); -C_ASSERT( FIELD_OFFSET(struct accept_socket_reply, handle) == 8 ); -C_ASSERT( sizeof(struct accept_socket_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct accept_into_socket_request, lhandle) == 12 ); C_ASSERT( FIELD_OFFSET(struct accept_into_socket_request, ahandle) == 16 ); C_ASSERT( sizeof(struct accept_into_socket_request) == 24 ); diff --git a/server/sock.c b/server/sock.c index f66fe09117..26a2c4fa66 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1425,24 +1425,6 @@ struct object *create_socket_device( struct object *root, const struct unicode_s return create_named_object( root, &socket_device_ops, name, attr, sd ); } -/* accept a socket */ -DECL_HANDLER(accept_socket) -{ - struct sock *sock, *acceptsock; - - if (!(sock = (struct sock *)get_handle_obj( current->process, req->lhandle, FILE_READ_DATA, &sock_ops ))) - return; - - reply->handle = 0; - if ((acceptsock = accept_socket( sock )) != NULL) - { - reply->handle = alloc_handle( current->process, &acceptsock->obj, req->access, req->attributes ); - acceptsock->wparam = reply->handle; /* wparam for message is the socket handle */ - release_object( acceptsock ); - } - release_object( sock ); -} - /* accept a socket into an initialized socket */ DECL_HANDLER(accept_into_socket) { diff --git a/server/trace.c b/server/trace.c index ffe9d6e19c..5f8981cddf 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1948,18 +1948,6 @@ static void dump_unlock_file_request( const struct unlock_file_request *req ) dump_uint64( ", count=", &req->count ); } -static void dump_accept_socket_request( const struct accept_socket_request *req ) -{ - fprintf( stderr, " lhandle=%04x", req->lhandle ); - fprintf( stderr, ", access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); -} - -static void dump_accept_socket_reply( const struct accept_socket_reply *req ) -{ - fprintf( stderr, " handle=%04x", req->handle ); -} - static void dump_accept_into_socket_request( const struct accept_into_socket_request *req ) { fprintf( stderr, " lhandle=%04x", req->lhandle ); @@ -4479,7 +4467,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_volume_info_request, (dump_func)dump_lock_file_request, (dump_func)dump_unlock_file_request, - (dump_func)dump_accept_socket_request, (dump_func)dump_accept_into_socket_request, (dump_func)dump_set_socket_event_request, (dump_func)dump_get_socket_event_request, @@ -4763,7 +4750,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_volume_info_reply, (dump_func)dump_lock_file_reply, NULL, - (dump_func)dump_accept_socket_reply, NULL, NULL, (dump_func)dump_get_socket_event_reply, @@ -5047,7 +5033,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "get_volume_info", "lock_file", "unlock_file", - "accept_socket", "accept_into_socket", "set_socket_event", "get_socket_event",

1 0

Nikolay Sivov : evr/presenter: Create d3d device on presenter creation.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: wine Branch: master Commit: 164c3b7f2ba5e98a3096ef9de37fc7cede9e7e68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=164c3b7f2ba5e98a3096ef9d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 2 14:01:09 2020 +0300 evr/presenter: Create d3d device on presenter creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/Makefile.in | 2 +- dlls/evr/presenter.c | 47 +++++++++++++++++++++++++++++++++++++++----- dlls/evr/tests/evr.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 92 insertions(+), 12 deletions(-) diff --git a/dlls/evr/Makefile.in b/dlls/evr/Makefile.in index 6d936d65b7..02cdb9b820 100644 --- a/dlls/evr/Makefile.in +++ b/dlls/evr/Makefile.in @@ -1,6 +1,6 @@ MODULE = evr.dll IMPORTLIB = evr -IMPORTS = mfuuid strmiids strmbase uuid dxguid ole32 oleaut32 dxva2 +IMPORTS = mfuuid strmiids strmbase uuid dxguid ole32 oleaut32 user32 d3d9 dxva2 DELAYIMPORTS = mfplat EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index b60de4b82a..04653ff67a 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -643,11 +643,47 @@ HRESULT WINAPI MFCreateVideoPresenter(IUnknown *owner, REFIID riid_device, REFII return CoCreateInstance(&CLSID_MFVideoPresenter9, owner, CLSCTX_INPROC_SERVER, riid, obj); } +static HRESULT video_presenter_init_d3d(struct video_presenter *presenter) +{ + D3DPRESENT_PARAMETERS present_params = { 0 }; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + HRESULT hr; + + d3d = Direct3DCreate9(D3D_SDK_VERSION); + + present_params.BackBufferCount = 1; + present_params.SwapEffect = D3DSWAPEFFECT_COPY; + present_params.hDeviceWindow = GetDesktopWindow(); + present_params.Windowed = TRUE; + present_params.Flags = D3DPRESENTFLAG_VIDEO; + present_params.PresentationInterval = D3DPRESENT_INTERVAL_IMMEDIATE; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, GetDesktopWindow(), + 0, &present_params, &device); + + IDirect3D9_Release(d3d); + + if (FAILED(hr)) + { + WARN("Failed to create d3d device, hr %#x.\n", hr); + return hr; + } + + hr = IDirect3DDeviceManager9_ResetDevice(presenter->device_manager, device, presenter->reset_token); + IDirect3DDevice9_Release(device); + if (FAILED(hr)) + WARN("Failed to set new device for the manager, hr %#x.\n", hr); + + return hr; +} + HRESULT evr_presenter_create(IUnknown *outer, void **out) { struct video_presenter *object; HRESULT hr; + *out = NULL; + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; @@ -663,12 +699,13 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out) InitializeCriticalSection(&object->cs); if (FAILED(hr = DXVA2CreateDirect3DDeviceManager9(&object->reset_token, &object->device_manager))) - { IUnknown_Release(&object->IUnknown_inner); - return hr; - } - *out = &object->IUnknown_inner; + if (FAILED(hr = video_presenter_init_d3d(object))) + IUnknown_Release(&object->IUnknown_inner); - return S_OK; + if (SUCCEEDED(hr)) + *out = &object->IUnknown_inner; + + return hr; } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 0dff691b59..c2e1759555 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -39,7 +39,7 @@ static HWND create_window(void) AdjustWindowRect(&r, WS_OVERLAPPEDWINDOW | WS_VISIBLE, FALSE); - return CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + return CreateWindowA("static", "evr_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, r.right - r.left, r.bottom - r.top, NULL, NULL, NULL, NULL); } @@ -967,12 +967,16 @@ done: static void test_default_presenter(void) { D3DDEVICE_CREATION_PARAMETERS device_params = { 0 }; + D3DPRESENT_PARAMETERS present_params = { 0 }; + IMFVideoDisplayControl *display_control; + IDirect3DSwapChain9 *swapchain; IMFVideoPresenter *presenter; IMFRateSupport *rate_support; IDirect3DDevice9 *d3d_device; IDirect3DDeviceManager9 *dm; IMFVideoDeviceID *deviceid; IMFGetService *gs; + HWND hwnd, hwnd2; HANDLE handle; IUnknown *unk; float rate; @@ -1010,33 +1014,70 @@ static void test_default_presenter(void) hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFGetService, (void **)&gs); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFGetService_GetService(gs, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, (void **)&display_control); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IMFVideoDisplayControl_Release(display_control); + hr = IMFGetService_GetService(gs, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, (void **)&dm); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDisplayControl, (void **)&display_control); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IDirect3DDeviceManager9_OpenDeviceHandle(dm, &handle); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IDirect3DDeviceManager9_LockDevice(dm, handle, &d3d_device, FALSE); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -if (SUCCEEDED(hr)) -{ hr = IDirect3DDevice9_GetCreationParameters(d3d_device, &device_params); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(device_params.hFocusWindow == GetDesktopWindow(), "Unexpected window %p.\n", device_params.hFocusWindow); + hr = IDirect3DDevice9_GetSwapChain(d3d_device, 0, &swapchain); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DSwapChain9_GetPresentParameters(swapchain, &present_params); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + ok(present_params.hDeviceWindow == GetDesktopWindow(), "Unexpected device window.\n"); + ok(present_params.Windowed, "Unexpected windowed mode.\n"); + ok(present_params.SwapEffect == D3DSWAPEFFECT_COPY, "Unexpected swap effect.\n"); + ok(present_params.Flags == D3DPRESENTFLAG_VIDEO, "Unexpected flags.\n"); + ok(present_params.PresentationInterval == D3DPRESENT_INTERVAL_IMMEDIATE, "Unexpected present interval.\n"); + IDirect3DDevice9_Release(d3d_device); hr = IDirect3DDeviceManager9_UnlockDevice(dm, handle, FALSE); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = IDirect3DDeviceManager9_CloseDeviceHandle(dm, handle); + hwnd = create_window(); + ok(!!hwnd, "Failed to create a test window.\n"); + + hwnd2 = hwnd; + hr = IMFVideoDisplayControl_GetVideoWindow(display_control, &hwnd2); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hwnd2 == NULL, "Unexpected window %p.\n", hwnd2); +} + hr = IMFVideoDisplayControl_SetVideoWindow(display_control, hwnd); +todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hwnd2 = NULL; + hr = IMFVideoDisplayControl_GetVideoWindow(display_control, &hwnd2); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hwnd2 == hwnd, "Unexpected window %p.\n", hwnd2); } + hr = IDirect3DDeviceManager9_CloseDeviceHandle(dm, handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IDirect3DDeviceManager9_Release(dm); + IMFVideoDisplayControl_Release(display_control); IMFGetService_Release(gs); /* Rate support. */ @@ -1066,6 +1107,8 @@ if (SUCCEEDED(hr)) IMFRateSupport_Release(rate_support); IMFVideoPresenter_Release(presenter); + + DestroyWindow(hwnd); } static void test_MFCreateVideoMixerAndPresenter(void)

1 0

Nikolay Sivov : evr/presenter: Maintain video position rectangles.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: wine Branch: master Commit: 3981be41287c799e43693d80a9c0f4d34d2c0135 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3981be41287c799e43693d80… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 2 14:01:12 2020 +0300 evr/presenter: Maintain video position rectangles. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 43 ++++++++++++++++++++++++++++------ dlls/evr/tests/evr.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 7 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index a8e9a50792..0663383b14 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -59,6 +59,8 @@ struct video_presenter IDirect3DDeviceManager9 *device_manager; UINT reset_token; HWND video_window; + MFVideoNormalizedRect src_rect; + RECT dst_rect; unsigned int state; CRITICAL_SECTION cs; }; @@ -467,19 +469,45 @@ static HRESULT WINAPI video_presenter_control_GetIdealVideoSize(IMFVideoDisplayC } static HRESULT WINAPI video_presenter_control_SetVideoPosition(IMFVideoDisplayControl *iface, - const MFVideoNormalizedRect *source, const RECT *dest) + const MFVideoNormalizedRect *src_rect, const RECT *dst_rect) { - FIXME("%p, %p, %p.\n", iface, source, dest); + struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); - return E_NOTIMPL; + TRACE("%p, %p, %s.\n", iface, src_rect, wine_dbgstr_rect(dst_rect)); + + if (!src_rect && !dst_rect) + return E_POINTER; + + if (src_rect && (src_rect->left < 0.0f || src_rect->top < 0.0f || + src_rect->right > 1.0f || src_rect->bottom > 1.0f)) + return E_INVALIDARG; + + EnterCriticalSection(&presenter->cs); + if (src_rect) + presenter->src_rect = *src_rect; + if (dst_rect) + presenter->dst_rect = *dst_rect; + LeaveCriticalSection(&presenter->cs); + + return S_OK; } -static HRESULT WINAPI video_presenter_control_GetVideoPosition(IMFVideoDisplayControl *iface, MFVideoNormalizedRect *source, - RECT *dest) +static HRESULT WINAPI video_presenter_control_GetVideoPosition(IMFVideoDisplayControl *iface, MFVideoNormalizedRect *src_rect, + RECT *dst_rect) { - FIXME("%p, %p, %p.\n", iface, source, dest); + struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, src_rect, dst_rect); + + if (!src_rect || !dst_rect) + return E_POINTER; + + EnterCriticalSection(&presenter->cs); + *src_rect = presenter->src_rect; + *dst_rect = presenter->dst_rect; + LeaveCriticalSection(&presenter->cs); + + return S_OK; } static HRESULT WINAPI video_presenter_control_SetAspectRatioMode(IMFVideoDisplayControl *iface, DWORD mode) @@ -718,6 +746,7 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out) object->IUnknown_inner.lpVtbl = &video_presenter_inner_vtbl; object->outer_unk = outer ? outer : &object->IUnknown_inner; object->refcount = 1; + object->src_rect.right = object->src_rect.bottom = 1.0f; InitializeCriticalSection(&object->cs); if (FAILED(hr = DXVA2CreateDirect3DDeviceManager9(&object->reset_token, &object->device_manager))) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index d77703b6c1..48bf01a2ef 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -970,6 +970,7 @@ static void test_default_presenter(void) D3DPRESENT_PARAMETERS present_params = { 0 }; IMFVideoDisplayControl *display_control; IDirect3DSwapChain9 *swapchain; + MFVideoNormalizedRect src_rect; IMFVideoPresenter *presenter; IMFRateSupport *rate_support; IDirect3DDevice9 *d3d_device; @@ -977,6 +978,7 @@ static void test_default_presenter(void) IMFVideoDeviceID *deviceid; IMFGetService *gs; HWND hwnd, hwnd2; + RECT dst_rect; HANDLE handle; IUnknown *unk; float rate; @@ -1051,6 +1053,7 @@ static void test_default_presenter(void) hr = IDirect3DDeviceManager9_UnlockDevice(dm, handle, FALSE); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + /* Video window */ hwnd = create_window(); ok(!!hwnd, "Failed to create a test window.\n"); @@ -1067,6 +1070,69 @@ static void test_default_presenter(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(hwnd2 == hwnd, "Unexpected window %p.\n", hwnd2); + /* Video position */ + hr = IMFVideoDisplayControl_GetVideoPosition(display_control, NULL, &dst_rect); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_GetVideoPosition(display_control, &src_rect, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + SetRect(&dst_rect, 1, 2, 3, 4); + hr = IMFVideoDisplayControl_GetVideoPosition(display_control, &src_rect, &dst_rect); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(src_rect.left == 0.0f && src_rect.top == 0.0f && src_rect.right == 1.0f && + src_rect.bottom == 1.0f, "Unexpected source rectangle.\n"); + ok(dst_rect.left == 0 && dst_rect.right == 0 && dst_rect.top == 0 && dst_rect.bottom == 0, + "Unexpected destination rectangle %s.\n", wine_dbgstr_rect(&dst_rect)); + + hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + SetRect(&dst_rect, 0, 0, 10, 10); + hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, &dst_rect); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + SetRect(&dst_rect, 1, 2, 3, 4); + hr = IMFVideoDisplayControl_GetVideoPosition(display_control, &src_rect, &dst_rect); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(dst_rect.left == 0 && dst_rect.right == 10 && dst_rect.top == 0 && dst_rect.bottom == 10, + "Unexpected destination rectangle %s.\n", wine_dbgstr_rect(&dst_rect)); + + src_rect.left = src_rect.top = 0.0f; + src_rect.right = 2.0f; + src_rect.bottom = 1.0f; + hr = IMFVideoDisplayControl_SetVideoPosition(display_control, &src_rect, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + src_rect.left = -0.1f; + src_rect.top = 0.0f; + src_rect.right = 0.9f; + src_rect.bottom = 1.0f; + hr = IMFVideoDisplayControl_SetVideoPosition(display_control, &src_rect, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + src_rect.left = 0.1f; + src_rect.top = 0.2f; + src_rect.right = 0.8f; + src_rect.bottom = 0.9f; + hr = IMFVideoDisplayControl_SetVideoPosition(display_control, &src_rect, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_GetVideoPosition(display_control, &src_rect, &dst_rect); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(src_rect.left == 0.1f && src_rect.top == 0.2f && src_rect.right == 0.8f && + src_rect.bottom == 0.9f, "Unexpected source rectangle.\n"); + + SetRect(&dst_rect, 1, 2, 999, 1000); + hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, &dst_rect); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + SetRect(&dst_rect, 0, 1, 3, 4); + hr = IMFVideoDisplayControl_GetVideoPosition(display_control, &src_rect, &dst_rect); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(dst_rect.left == 1 && dst_rect.right == 999 && dst_rect.top == 2 && dst_rect.bottom == 1000, + "Unexpected destination rectangle %s.\n", wine_dbgstr_rect(&dst_rect)); + hr = IDirect3DDeviceManager9_CloseDeviceHandle(dm, handle); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Józef Kucia : include: Move the ID3D12Debug interface to d3d12sdklayers.idl.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: wine Branch: master Commit: 99f2a5cd9fa363d659acabc9440b44f8dd38b51c URL: https://source.winehq.org/git/wine.git/?a=commit;h=99f2a5cd9fa363d659acabc9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 2 19:43:59 2020 +0330 include: Move the ID3D12Debug interface to d3d12sdklayers.idl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/tests/d3d12.c | 1 + dlls/dxgi/tests/dxgi.c | 1 + include/Makefile.in | 1 + include/d3d12.idl | 11 ----------- include/d3d12sdklayers.idl | 30 ++++++++++++++++++++++++++++++ 5 files changed, 33 insertions(+), 11 deletions(-) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 8c57f07357..f5a4c2ba11 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -21,6 +21,7 @@ #define COBJMACROS #include "initguid.h" #include "d3d12.h" +#include "d3d12sdklayers.h" #include "dxgi1_6.h" #include "wine/test.h" diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index ce1aee5ee3..bee2163843 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -24,6 +24,7 @@ #include "dxgi1_6.h" #include "d3d11.h" #include "d3d12.h" +#include "d3d12sdklayers.h" #include "winternl.h" #include "ddk/d3dkmthk.h" #include "wine/heap.h" diff --git a/include/Makefile.in b/include/Makefile.in index 91a02645c3..10a9bd7aa8 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -110,6 +110,7 @@ SOURCES = \ d3d11sdklayers.idl \ d3d11shader.h \ d3d12.idl \ + d3d12sdklayers.idl \ d3d12shader.idl \ d3d8.h \ d3d8caps.h \ diff --git a/include/d3d12.idl b/include/d3d12.idl index 201e01f07e..8b1e85fcef 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -2138,17 +2138,6 @@ interface ID3D12Device : ID3D12Object LUID GetAdapterLuid(); } -[ - uuid(344488b7-6846-474b-b989-f027448245e0), - object, - local, - pointer_default(unique) -] -interface ID3D12Debug : IUnknown -{ - void EnableDebugLayer(); -} - [ uuid(34ab647b-3cc8-46ac-841b-c0965645c046), object, diff --git a/include/d3d12sdklayers.idl b/include/d3d12sdklayers.idl new file mode 100644 index 0000000000..dfbb738217 --- /dev/null +++ b/include/d3d12sdklayers.idl @@ -0,0 +1,30 @@ +/* + * Copyright 2016-2019 Józef Kucia for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "d3d12.idl"; + +[ + uuid(344488b7-6846-474b-b989-f027448245e0), + object, + local, + pointer_default(unique) +] +interface ID3D12Debug : IUnknown +{ + void EnableDebugLayer(); +}

1 0

Rémi Bernon : dxgi/tests: Check that the last adapter is always WARP.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: wine Branch: master Commit: cce4f36e214125173a8df84d27ba5b33df8d1434 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cce4f36e214125173a8df84d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 2 19:44:01 2020 +0330 dxgi/tests: Check that the last adapter is always WARP. Some games specifically ignore the last adapter from the adapter list, as it's always WARP on Windows. This makes them fail to detect GPUs correctly on Wine, as they drop one of the reported adapters. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index bee2163843..a34f574236 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5327,9 +5327,12 @@ static void test_multi_adapter(void) unsigned int output_count = 0, expected_output_count = 0; unsigned int adapter_index, output_index, device_index; DXGI_OUTPUT_DESC old_output_desc, output_desc; + DXGI_ADAPTER_DESC1 adapter_desc1; + DXGI_ADAPTER_DESC adapter_desc; DISPLAY_DEVICEW display_device; MONITORINFO monitor_info; DEVMODEW old_mode, mode; + IDXGIAdapter1 *adapter1; IDXGIFactory *factory; IDXGIAdapter *adapter; IDXGIOutput *output; @@ -5531,6 +5534,48 @@ static void test_multi_adapter(void) IDXGIAdapter_Release(adapter); } + /* Windows 8+ always have a WARP adapter present at the end. */ + todo_wine ok(adapter_index >= 2 || broken(adapter_index < 2) /* Windows 7 and before */, + "Got unexpected adapter count %u.\n", adapter_index); + if (adapter_index < 2) + { + todo_wine win_skip("WARP adapter missing, skipping tests.\n"); + goto done; + } + + hr = IDXGIFactory_EnumAdapters(factory, adapter_index - 1, &adapter); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGIAdapter_GetDesc(adapter, &adapter_desc); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!lstrcmpW(adapter_desc.Description, L"Microsoft Basic Render Driver"), + "Got unexpected description %s.\n", wine_dbgstr_w(adapter_desc.Description)); + todo_wine ok(adapter_desc.VendorId == 0x1414, + "Got unexpected vendor ID %#x.\n", adapter_desc.VendorId); + todo_wine ok(adapter_desc.DeviceId == 0x008c, + "Got unexpected device ID %#x.\n", adapter_desc.DeviceId); + ok(adapter_desc.SubSysId == 0x0000, + "Got unexpected sub-system ID %#x.\n", adapter_desc.SubSysId); + ok(adapter_desc.Revision == 0x0000, + "Got unexpected revision %#x.\n", adapter_desc.Revision); + todo_wine ok(!adapter_desc.DedicatedVideoMemory, + "Got unexpected DedicatedVideoMemory %#lx.\n", adapter_desc.DedicatedVideoMemory); + ok(!adapter_desc.DedicatedSystemMemory, + "Got unexpected DedicatedSystemMemory %#lx.\n", adapter_desc.DedicatedSystemMemory); + + hr = IDXGIAdapter_QueryInterface(adapter, &IID_IDXGIAdapter1, (void **)&adapter1); + ok(hr == S_OK || broken(hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + hr = IDXGIAdapter1_GetDesc1(adapter1, &adapter_desc1); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(adapter_desc1.Flags == DXGI_ADAPTER_FLAG_SOFTWARE, + "Got unexpected flags %#x.\n", adapter_desc1.Flags); + IDXGIAdapter1_Release(adapter1); + } + + IDXGIAdapter_Release(adapter); + +done: IDXGIFactory_Release(factory); expected_output_count = GetSystemMetrics(SM_CMONITORS);

1 0

Biswapriyo Nath : include: Add the D3D12_SHADER_VERSION_TYPE enumeration.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: wine Branch: master Commit: 1f85606e6b1893611f1513340b520399d29849d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f85606e6b1893611f151334… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Oct 2 19:44:00 2020 +0330 include: Add the D3D12_SHADER_VERSION_TYPE enumeration. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d12shader.idl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/d3d12shader.idl b/include/d3d12shader.idl index 9cf39c6cc3..f6cc35a843 100644 --- a/include/d3d12shader.idl +++ b/include/d3d12shader.idl @@ -20,6 +20,17 @@ import "oaidl.idl"; import "ocidl.idl"; import "d3dcommon.idl"; +typedef enum D3D12_SHADER_VERSION_TYPE +{ + D3D12_SHVER_PIXEL_SHADER = 0x0, + D3D12_SHVER_VERTEX_SHADER = 0x1, + D3D12_SHVER_GEOMETRY_SHADER = 0x2, + D3D12_SHVER_HULL_SHADER = 0x3, + D3D12_SHVER_DOMAIN_SHADER = 0x4, + D3D12_SHVER_COMPUTE_SHADER = 0x5, + D3D12_SHVER_RESERVED0 = 0xfff0, +} D3D12_SHADER_VERSION_TYPE; + typedef struct _D3D12_SHADER_DESC { UINT Version;

1 0

Zebediah Figura : server: Introduce IOCTL_AFD_ACCEPT_INTO.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: wine Branch: master Commit: ea038894a6aa4b034e151e4f2af42da36710e180 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea038894a6aa4b034e151e4f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 1 23:14:00 2020 -0500 server: Introduce IOCTL_AFD_ACCEPT_INTO. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/afd.h | 1 + server/sock.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/include/wine/afd.h b/include/wine/afd.h index 9ca03039f8..5a994084e1 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -25,6 +25,7 @@ #define IOCTL_AFD_CREATE CTL_CODE(FILE_DEVICE_NETWORK, 200, METHOD_BUFFERED, FILE_WRITE_ACCESS) #define IOCTL_AFD_ACCEPT CTL_CODE(FILE_DEVICE_NETWORK, 201, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_AFD_ACCEPT_INTO CTL_CODE(FILE_DEVICE_NETWORK, 202, METHOD_BUFFERED, FILE_WRITE_ACCESS) #define IOCTL_AFD_ADDRESS_LIST_CHANGE CTL_CODE(FILE_DEVICE_NETWORK, 323, METHOD_BUFFERED, 0) diff --git a/server/sock.c b/server/sock.c index 26a2c4fa66..360bf756f9 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1108,6 +1108,27 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } + case IOCTL_AFD_ACCEPT_INTO: + { + static const int access = FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES | FILE_READ_DATA; + struct sock *acceptsock; + obj_handle_t handle; + + if (get_req_data_size() != sizeof(handle)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + handle = *(obj_handle_t *)get_req_data(); + + if (!(acceptsock = (struct sock *)get_handle_obj( current->process, handle, access, &sock_ops ))) + return 0; + if (accept_into_socket( sock, acceptsock )) + acceptsock->wparam = handle; + release_object( acceptsock ); + return 0; + } + case IOCTL_AFD_ADDRESS_LIST_CHANGE: if ((sock->state & FD_WINE_NONBLOCKING) && async_is_blocking( async )) {

1 0