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

Andrew Eikum : mmdevapi: Implement IsOffloadCapable.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: wine Branch: master Commit: 530c79fba272219e9ed7bc1ebf309fe7163ac8ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=530c79fba272219e9ed7bc1e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 1 14:31:27 2020 -0500 mmdevapi: Implement IsOffloadCapable. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/render.c | 7 +++++++ dlls/winealsa.drv/mmdevdrv.c | 9 +++++++-- dlls/wineandroid.drv/mmdevdrv.c | 9 +++++++-- dlls/winecoreaudio.drv/mmdevdrv.c | 9 +++++++-- dlls/wineoss.drv/mmdevdrv.c | 9 +++++++-- dlls/winepulse.drv/mmdevdrv.c | 9 +++++++-- 6 files changed, 42 insertions(+), 10 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 8d52f48333..e58cc449d8 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -140,6 +140,7 @@ static void test_audioclient(void) WAVEFORMATEX *pwfx, *pwfx2; REFERENCE_TIME t1, t2; HANDLE handle; + BOOL offload_capable; hr = IMMDevice_Activate(dev, &IID_IAudioClient2, CLSCTX_INPROC_SERVER, NULL, (void**)&ac2); @@ -253,6 +254,12 @@ static void test_audioclient(void) hr = IAudioClient_QueryInterface(ac, &IID_IAudioClient2, (void**)&ac2); ok(hr == S_OK, "Failed to query IAudioClient2 interface: %08x\n", hr); + hr = IAudioClient2_IsOffloadCapable(ac2, AudioCategory_BackgroundCapableMedia, NULL); + ok(hr == E_INVALIDARG, "IsOffloadCapable gave wrong error: %08x\n", hr); + + hr = IAudioClient2_IsOffloadCapable(ac2, AudioCategory_BackgroundCapableMedia, &offload_capable); + ok(hr == S_OK, "IsOffloadCapable failed: %08x\n", hr); + IAudioClient2_Release(ac2); test_uninitialized(ac); diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 2c3165385e..233b0dfda1 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -2661,9 +2661,14 @@ static HRESULT WINAPI AudioClient_IsOffloadCapable(IAudioClient2 *iface, { ACImpl *This = impl_from_IAudioClient2(iface); - FIXME("(%p)->(0x%x, %p)\n", This, category, offload_capable); + TRACE("(%p)->(0x%x, %p)\n", This, category, offload_capable); - return E_NOTIMPL; + if(!offload_capable) + return E_INVALIDARG; + + *offload_capable = FALSE; + + return S_OK; } static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface, diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index 4e9ada3f55..8ee1bb12d3 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -1620,9 +1620,14 @@ static HRESULT WINAPI AudioClient_IsOffloadCapable(IAudioClient2 *iface, { ACImpl *This = impl_from_IAudioClient2(iface); - FIXME("(%p)->(0x%x, %p)\n", This, category, offload_capable); + TRACE("(%p)->(0x%x, %p)\n", This, category, offload_capable); - return E_NOTIMPL; + if(!offload_capable) + return E_INVALIDARG; + + *offload_capable = FALSE; + + return S_OK; } static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface, diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index dd2ad916f8..f32c1d5e41 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -2228,9 +2228,14 @@ static HRESULT WINAPI AudioClient_IsOffloadCapable(IAudioClient2 *iface, { ACImpl *This = impl_from_IAudioClient2(iface); - FIXME("(%p)->(0x%x, %p)\n", This, category, offload_capable); + TRACE("(%p)->(0x%x, %p)\n", This, category, offload_capable); - return E_NOTIMPL; + if(!offload_capable) + return E_INVALIDARG; + + *offload_capable = FALSE; + + return S_OK; } static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface, diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 50c7db2c7c..9b1cdf3fa7 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1785,9 +1785,14 @@ static HRESULT WINAPI AudioClient_IsOffloadCapable(IAudioClient2 *iface, { ACImpl *This = impl_from_IAudioClient2(iface); - FIXME("(%p)->(0x%x, %p)\n", This, category, offload_capable); + TRACE("(%p)->(0x%x, %p)\n", This, category, offload_capable); - return E_NOTIMPL; + if(!offload_capable) + return E_INVALIDARG; + + *offload_capable = FALSE; + + return S_OK; } static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface, diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index b8386cfe55..e384955b01 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -2233,9 +2233,14 @@ static HRESULT WINAPI AudioClient_IsOffloadCapable(IAudioClient2 *iface, { ACImpl *This = impl_from_IAudioClient2(iface); - FIXME("(%p)->(0x%x, %p)\n", This, category, offload_capable); + TRACE("(%p)->(0x%x, %p)\n", This, category, offload_capable); - return E_NOTIMPL; + if(!offload_capable) + return E_INVALIDARG; + + *offload_capable = FALSE; + + return S_OK; } static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface,

1 0

Nikolay Sivov : evr/presenter: Keep video window handle.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: wine Branch: master Commit: 77e04e221a609cb4b45625ccbc743d322a14189e URL: https://source.winehq.org/git/wine.git/?a=commit;h=77e04e221a609cb4b45625cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 2 14:01:11 2020 +0300 evr/presenter: Keep video window handle. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 19 +++++++++++++++---- dlls/evr/tests/evr.c | 7 ++----- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 8b5a7dd46a..a8e9a50792 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -58,6 +58,7 @@ struct video_presenter IDirect3DDeviceManager9 *device_manager; UINT reset_token; + HWND video_window; unsigned int state; CRITICAL_SECTION cs; }; @@ -497,16 +498,26 @@ static HRESULT WINAPI video_presenter_control_GetAspectRatioMode(IMFVideoDisplay static HRESULT WINAPI video_presenter_control_SetVideoWindow(IMFVideoDisplayControl *iface, HWND window) { - FIXME("%p, %p.\n", iface, window); + struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, window); + + EnterCriticalSection(&presenter->cs); + presenter->video_window = window; + LeaveCriticalSection(&presenter->cs); + + return S_OK; } static HRESULT WINAPI video_presenter_control_GetVideoWindow(IMFVideoDisplayControl *iface, HWND *window) { - FIXME("%p, %p.\n", iface, window); + struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, window); + + *window = presenter->video_window; + + return S_OK; } static HRESULT WINAPI video_presenter_control_RepaintVideo(IMFVideoDisplayControl *iface) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 9665e2683d..d77703b6c1 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1056,20 +1056,17 @@ static void test_default_presenter(void) 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);

1 0

Nikolay Sivov : evr/presenter: Add missing method stubs.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: wine Branch: master Commit: 82c64b9c951777b0143e3125f4b95a3ac6e091c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82c64b9c951777b0143e3125… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 2 14:01:13 2020 +0300 evr/presenter: Add missing method stubs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 0663383b14..04e9a55684 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -563,6 +563,48 @@ static HRESULT WINAPI video_presenter_control_GetCurrentImage(IMFVideoDisplayCon return E_NOTIMPL; } +static HRESULT WINAPI video_presenter_control_SetBorderColor(IMFVideoDisplayControl *iface, COLORREF color) +{ + FIXME("%p, %#x.\n", iface, color); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_control_GetBorderColor(IMFVideoDisplayControl *iface, COLORREF *color) +{ + FIXME("%p, %p.\n", iface, color); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_control_SetRenderingPrefs(IMFVideoDisplayControl *iface, DWORD flags) +{ + FIXME("%p, %#x.\n", iface, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_control_GetRenderingPrefs(IMFVideoDisplayControl *iface, DWORD *flags) +{ + FIXME("%p, %p.\n", iface, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_control_SetFullscreen(IMFVideoDisplayControl *iface, BOOL fullscreen) +{ + FIXME("%p, %d.\n", iface, fullscreen); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_control_GetFullscreen(IMFVideoDisplayControl *iface, BOOL *fullscreen) +{ + FIXME("%p, %p.\n", iface, fullscreen); + + return E_NOTIMPL; +} + static const IMFVideoDisplayControlVtbl video_presenter_control_vtbl = { video_presenter_control_QueryInterface, @@ -578,6 +620,12 @@ static const IMFVideoDisplayControlVtbl video_presenter_control_vtbl = video_presenter_control_GetVideoWindow, video_presenter_control_RepaintVideo, video_presenter_control_GetCurrentImage, + video_presenter_control_SetBorderColor, + video_presenter_control_GetBorderColor, + video_presenter_control_SetRenderingPrefs, + video_presenter_control_GetRenderingPrefs, + video_presenter_control_SetFullscreen, + video_presenter_control_GetFullscreen, }; static HRESULT WINAPI video_presenter_rate_support_QueryInterface(IMFRateSupport *iface, REFIID riid, void **obj)

1 0

Hans Leidekker : dssenh/tests: Get rid of workarounds for old Windows versions.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: wine Branch: master Commit: 2e11036feb02913100dc7d2fa40b5fcd18c90dba URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e11036feb02913100dc7d2f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 2 16:56:44 2020 +0200 dssenh/tests: Get rid of workarounds for old Windows versions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/tests/dssenh.c | 204 ++++++++++++++++++--------------------------- 1 file changed, 81 insertions(+), 123 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2e11036feb02913100dc…

1 0

Nikolay Sivov : evr/presenter: Expose IMFVideoDisplayControl as a service.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: wine Branch: master Commit: 69e777c804e9803bef3e151fc20a363f699692ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=69e777c804e9803bef3e151f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 2 14:01:10 2020 +0300 evr/presenter: Expose IMFVideoDisplayControl as a service. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 11 +++++++++++ dlls/evr/tests/evr.c | 4 +--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 04653ff67a..8b5a7dd46a 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -618,6 +618,17 @@ static HRESULT WINAPI video_presenter_getservice_GetService(IMFGetService *iface if (IsEqualGUID(&MR_VIDEO_ACCELERATION_SERVICE, service)) return IDirect3DDeviceManager9_QueryInterface(presenter->device_manager, riid, obj); + if (IsEqualGUID(&MR_VIDEO_RENDER_SERVICE, service)) + { + if (IsEqualIID(riid, &IID_IMFVideoDisplayControl)) + return IMFVideoPresenter_QueryInterface(&presenter->IMFVideoPresenter_iface, riid, obj); + else + { + FIXME("Unsupported interface %s.\n", debugstr_guid(riid)); + return E_NOTIMPL; + } + } + FIXME("Unimplemented service %s.\n", debugstr_guid(service)); return E_NOTIMPL; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index c2e1759555..9665e2683d 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1015,10 +1015,8 @@ static void test_default_presenter(void) 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); + 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);

1 0

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

Oct. 2, 2020

Module: wine Branch: master Commit: e3ea5278357698e75b6cd51627c30e84e16845ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3ea5278357698e75b6cd516… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 1 23:14:02 2020 -0500 server: Remove the no longer used accept_into_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 | 19 +------------------ server/protocol.def | 7 ------- server/request.h | 5 ----- server/sock.c | 23 ----------------------- server/trace.c | 9 --------- 5 files changed, 1 insertion(+), 62 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 8c7ab39146..751ca59ad6 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1695,20 +1695,6 @@ struct unlock_file_reply -struct accept_into_socket_request -{ - struct request_header __header; - obj_handle_t lhandle; - obj_handle_t ahandle; - char __pad_20[4]; -}; -struct accept_into_socket_reply -{ - struct reply_header __header; -}; - - - struct set_socket_event_request { struct request_header __header; @@ -5481,7 +5467,6 @@ enum request REQ_get_volume_info, REQ_lock_file, REQ_unlock_file, - REQ_accept_into_socket, REQ_set_socket_event, REQ_get_socket_event, REQ_get_socket_info, @@ -5768,7 +5753,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_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; struct get_socket_info_request get_socket_info_request; @@ -6053,7 +6037,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_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; struct get_socket_info_reply get_socket_info_reply; @@ -6283,7 +6266,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 648 +#define SERVER_PROTOCOL_VERSION 649 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 6534092f2c..16c0b93674 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1383,13 +1383,6 @@ enum server_fd_type @END -/* Accept into an initialized socket */ -(a)REQ(accept_into_socket) - obj_handle_t lhandle; /* handle to the listening socket */ - obj_handle_t ahandle; /* handle to the accepting socket */ -(a)END - - /* Set socket event parameters */ @REQ(set_socket_event) obj_handle_t handle; /* handle to the socket */ diff --git a/server/request.h b/server/request.h index c02b616d75..fc60aa1e8c 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_into_socket); DECL_HANDLER(set_socket_event); DECL_HANDLER(get_socket_event); DECL_HANDLER(get_socket_info); @@ -459,7 +458,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_into_socket, (req_handler)req_set_socket_event, (req_handler)req_get_socket_event, (req_handler)req_get_socket_info, @@ -1052,9 +1050,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_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 ); C_ASSERT( FIELD_OFFSET(struct set_socket_event_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_socket_event_request, mask) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_socket_event_request, event) == 20 ); diff --git a/server/sock.c b/server/sock.c index 360bf756f9..4f97fe7208 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1446,29 +1446,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 into an initialized socket */ -DECL_HANDLER(accept_into_socket) -{ - struct sock *sock, *acceptsock; - const int all_attributes = FILE_READ_ATTRIBUTES|FILE_WRITE_ATTRIBUTES|FILE_READ_DATA; - - if (!(sock = (struct sock *)get_handle_obj( current->process, req->lhandle, - all_attributes, &sock_ops))) - return; - - if (!(acceptsock = (struct sock *)get_handle_obj( current->process, req->ahandle, - all_attributes, &sock_ops))) - { - release_object( sock ); - return; - } - - if (accept_into_socket( sock, acceptsock )) - acceptsock->wparam = req->ahandle; /* wparam for message is the socket handle */ - release_object( acceptsock ); - release_object( sock ); -} - /* set socket event parameters */ DECL_HANDLER(set_socket_event) { diff --git a/server/trace.c b/server/trace.c index 5f8981cddf..17dd415b95 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1948,12 +1948,6 @@ static void dump_unlock_file_request( const struct unlock_file_request *req ) dump_uint64( ", count=", &req->count ); } -static void dump_accept_into_socket_request( const struct accept_into_socket_request *req ) -{ - fprintf( stderr, " lhandle=%04x", req->lhandle ); - fprintf( stderr, ", ahandle=%04x", req->ahandle ); -} - static void dump_set_socket_event_request( const struct set_socket_event_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); @@ -4467,7 +4461,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_into_socket_request, (dump_func)dump_set_socket_event_request, (dump_func)dump_get_socket_event_request, (dump_func)dump_get_socket_info_request, @@ -4751,7 +4744,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_lock_file_reply, NULL, NULL, - NULL, (dump_func)dump_get_socket_event_reply, (dump_func)dump_get_socket_info_reply, NULL, @@ -5033,7 +5025,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "get_volume_info", "lock_file", "unlock_file", - "accept_into_socket", "set_socket_event", "get_socket_event", "get_socket_info",

1 0

Andrew Eikum : audioclient.idl: Declare IAudioClient3.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: wine Branch: master Commit: 496a8c1cf55f3836260d5ca485c5c5753bad1d9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=496a8c1cf55f3836260d5ca4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 1 14:31:36 2020 -0500 audioclient.idl: Declare IAudioClient3. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/audioclient.idl | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/audioclient.idl b/include/audioclient.idl index 4759f3ef46..132e78a602 100644 --- a/include/audioclient.idl +++ b/include/audioclient.idl @@ -151,6 +151,35 @@ interface IAudioClient2 : IAudioClient ); } +[ + local, + pointer_default(unique), + uuid(7ed4ee07-8e67-4cd4-8c1a-2b7a5987ad42), + object, +] +interface IAudioClient3 : IAudioClient2 +{ + HRESULT GetSharedModeEnginePeriod( + [in] const WAVEFORMATEX *format, + [out] UINT32 *default_period_frames, + [out] UINT32 *unit_period_frames, + [out] UINT32 *min_period_frames, + [out] UINT32 *max_period_frames + ); + + HRESULT GetCurrentSharedModeEnginePeriod( + [out] WAVEFORMATEX **cur_format, + [out] UINT32 *cur_period_frames + ); + + HRESULT InitializeSharedAudioStream( + [in] DWORD flags, + [in] UINT32 period_frames, + [in] const WAVEFORMATEX *format, + [in] const GUID *session_guid + ); +} + [ local, pointer_default(unique),

1 0

Andrew Eikum : mmdevapi: Implement SetClientProperties.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: wine Branch: master Commit: d8ae98d4216b85b3da342ef71b28674996e5c9d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8ae98d4216b85b3da342ef7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 1 14:31:32 2020 -0500 mmdevapi: Implement SetClientProperties. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/render.c | 25 +++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 18 ++++++++++++++++-- dlls/wineandroid.drv/mmdevdrv.c | 18 ++++++++++++++++-- dlls/winecoreaudio.drv/mmdevdrv.c | 18 ++++++++++++++++-- dlls/wineoss.drv/mmdevdrv.c | 18 ++++++++++++++++-- dlls/winepulse.drv/mmdevdrv.c | 18 ++++++++++++++++-- 6 files changed, 105 insertions(+), 10 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index e58cc449d8..a4f271e557 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -141,6 +141,7 @@ static void test_audioclient(void) REFERENCE_TIME t1, t2; HANDLE handle; BOOL offload_capable; + AudioClientProperties client_props; hr = IMMDevice_Activate(dev, &IID_IAudioClient2, CLSCTX_INPROC_SERVER, NULL, (void**)&ac2); @@ -260,6 +261,30 @@ static void test_audioclient(void) hr = IAudioClient2_IsOffloadCapable(ac2, AudioCategory_BackgroundCapableMedia, &offload_capable); ok(hr == S_OK, "IsOffloadCapable failed: %08x\n", hr); + hr = IAudioClient2_SetClientProperties(ac2, NULL); + ok(hr == E_POINTER, "SetClientProperties with NULL props gave wrong error: %08x\n", hr); + + client_props.cbSize = 0; + client_props.bIsOffload = FALSE; + client_props.eCategory = AudioCategory_BackgroundCapableMedia; + client_props.Options = 0; + + hr = IAudioClient2_SetClientProperties(ac2, &client_props); + ok(hr == E_INVALIDARG, "SetClientProperties with invalid cbSize gave wrong error: %08x\n", hr); + + client_props.cbSize = sizeof(client_props); + client_props.bIsOffload = TRUE; + + hr = IAudioClient2_SetClientProperties(ac2, &client_props); + if(!offload_capable) + ok(hr == AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE, "SetClientProperties(offload) gave wrong error: %08x\n", hr); + else + ok(hr == S_OK, "SetClientProperties(offload) failed: %08x\n", hr); + + client_props.bIsOffload = FALSE; + hr = IAudioClient2_SetClientProperties(ac2, &client_props); + ok(hr == S_OK, "SetClientProperties failed: %08x\n", hr); + IAudioClient2_Release(ac2); test_uninitialized(ac); diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 233b0dfda1..04f90d0d16 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -2676,9 +2676,23 @@ static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface, { ACImpl *This = impl_from_IAudioClient2(iface); - FIXME("(%p)->(%p)\n", This, prop); + TRACE("(%p)->(%p)\n", This, prop); - return E_NOTIMPL; + if(!prop) + return E_POINTER; + + if(prop->cbSize != sizeof(*prop)) + return E_INVALIDARG; + + TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", + prop->bIsOffload, + prop->eCategory, + prop->Options); + + if(prop->bIsOffload) + return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE; + + return S_OK; } static HRESULT WINAPI AudioClient_GetBufferSizeLimits(IAudioClient2 *iface, diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index 8ee1bb12d3..aa32c49185 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -1635,9 +1635,23 @@ static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface, { ACImpl *This = impl_from_IAudioClient2(iface); - FIXME("(%p)->(%p)\n", This, prop); + TRACE("(%p)->(%p)\n", This, prop); - return E_NOTIMPL; + if(!prop) + return E_POINTER; + + if(prop->cbSize != sizeof(*prop)) + return E_INVALIDARG; + + TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", + prop->bIsOffload, + prop->eCategory, + prop->Options); + + if(prop->bIsOffload) + return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE; + + return S_OK; } static HRESULT WINAPI AudioClient_GetBufferSizeLimits(IAudioClient2 *iface, diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index f32c1d5e41..f065d5bc1e 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -2243,9 +2243,23 @@ static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface, { ACImpl *This = impl_from_IAudioClient2(iface); - FIXME("(%p)->(%p)\n", This, prop); + TRACE("(%p)->(%p)\n", This, prop); - return E_NOTIMPL; + if(!prop) + return E_POINTER; + + if(prop->cbSize != sizeof(*prop)) + return E_INVALIDARG; + + TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", + prop->bIsOffload, + prop->eCategory, + prop->Options); + + if(prop->bIsOffload) + return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE; + + return S_OK; } static HRESULT WINAPI AudioClient_GetBufferSizeLimits(IAudioClient2 *iface, diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 9b1cdf3fa7..3a3cb57b64 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1800,9 +1800,23 @@ static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface, { ACImpl *This = impl_from_IAudioClient2(iface); - FIXME("(%p)->(%p)\n", This, prop); + TRACE("(%p)->(%p)\n", This, prop); - return E_NOTIMPL; + if(!prop) + return E_POINTER; + + if(prop->cbSize != sizeof(*prop)) + return E_INVALIDARG; + + TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", + prop->bIsOffload, + prop->eCategory, + prop->Options); + + if(prop->bIsOffload) + return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE; + + return S_OK; } static HRESULT WINAPI AudioClient_GetBufferSizeLimits(IAudioClient2 *iface, diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index e384955b01..91b8230bd8 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -2248,9 +2248,23 @@ static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient2 *iface, { ACImpl *This = impl_from_IAudioClient2(iface); - FIXME("(%p)->(%p)\n", This, prop); + TRACE("(%p)->(%p)\n", This, prop); - return E_NOTIMPL; + if(!prop) + return E_POINTER; + + if(prop->cbSize != sizeof(*prop)) + return E_INVALIDARG; + + TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", + prop->bIsOffload, + prop->eCategory, + prop->Options); + + if(prop->bIsOffload) + return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE; + + return S_OK; } static HRESULT WINAPI AudioClient_GetBufferSizeLimits(IAudioClient2 *iface,

1 0

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

Oct. 2, 2020

Module: wine Branch: master Commit: 2600ccf27f9dfb6eadbb21c92b75618ccbd26e01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2600ccf27f9dfb6eadbb21c9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 1 23:14:01 2020 -0500 ws2_32: Use IOCTL_AFD_ACCEPT_INTO. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 031688b2d9..2eb1e1a730 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2517,13 +2517,11 @@ static NTSTATUS WS2_async_accept( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS st if (status == STATUS_ALERTED) { - SERVER_START_REQ( accept_into_socket ) - { - req->lhandle = wine_server_obj_handle( wsa->listen_socket ); - req->ahandle = wine_server_obj_handle( wsa->accept_socket ); - status = wine_server_call( req ); - } - SERVER_END_REQ; + obj_handle_t accept_handle = wine_server_obj_handle( wsa->accept_socket ); + IO_STATUS_BLOCK io; + + status = NtDeviceIoControlFile( wsa->listen_socket, NULL, NULL, NULL, &io, IOCTL_AFD_ACCEPT_INTO, + &accept_handle, sizeof(accept_handle), NULL, 0 ); if (NtStatusToWSAError( status ) == WSAEWOULDBLOCK) return STATUS_PENDING;

1 0

Michael Stefaniuc : http.sys: Use wide-char string literals.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: wine Branch: master Commit: cef48706eb3c5039e7fdcd1a7a48495ebc3608a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cef48706eb3c5039e7fdcd1a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 1 23:26:27 2020 +0200 http.sys: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 31c7fc0971..e655edfeea 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -977,8 +977,6 @@ static void WINAPI unload(DRIVER_OBJECT *driver) NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) { - static const WCHAR device_nameW[] = {'\\','D','e','v','i','c','e','\\','H','t','t','p','\\','R','e','q','Q','u','e','u','e',0}; - static const WCHAR directory_nameW[] = {'\\','D','e','v','i','c','e','\\','H','t','t','p',0}; OBJECT_ATTRIBUTES attr = {sizeof(attr)}; UNICODE_STRING string; WSADATA wsadata; @@ -986,12 +984,12 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) TRACE("driver %p, path %s.\n", driver, debugstr_w(path->Buffer)); - RtlInitUnicodeString(&string, directory_nameW); + RtlInitUnicodeString(&string, L"\\Device\\Http"); attr.ObjectName = &string; if ((ret = NtCreateDirectoryObject(&directory_obj, 0, &attr)) && ret != STATUS_OBJECT_NAME_COLLISION) ERR("Failed to create \\Device\\Http directory, status %#x.\n", ret); - RtlInitUnicodeString(&string, device_nameW); + RtlInitUnicodeString(&string, L"\\Device\\Http\\ReqQueue"); if ((ret = IoCreateDevice(driver, 0, &string, FILE_DEVICE_UNKNOWN, 0, FALSE, &device_obj))) { ERR("Failed to create request queue device, status %#x.\n", ret);

1 0

Michael Stefaniuc : imaadp32.acm: Use wide-char string literals.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: wine Branch: master Commit: aacc33ba9ed839d5cb3e993cc59dc8a39a62edfb URL: https://source.winehq.org/git/wine.git/?a=commit;h=aacc33ba9ed839d5cb3e993c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 1 23:26:28 2020 +0200 imaadp32.acm: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imaadp32.acm/imaadp32.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c index a93b5f6af7..b6d70dcbe2 100644 --- a/dlls/imaadp32.acm/imaadp32.c +++ b/dlls/imaadp32.acm/imaadp32.c @@ -548,9 +548,6 @@ static LRESULT ADPCM_DriverDetails(PACMDRIVERDETAILSW add) */ static LRESULT ADPCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) { - static const WCHAR szPcm[]={'P','C','M',0}; - static const WCHAR szImaAdPcm[]={'I','M','A',' ','A','D','P','C','M',0}; - switch (dwQuery) { case ACM_FORMATTAGDETAILSF_INDEX: @@ -583,13 +580,13 @@ static LRESULT ADPCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) aftd->dwFormatTag = WAVE_FORMAT_PCM; aftd->cbFormatSize = sizeof(PCMWAVEFORMAT); aftd->cStandardFormats = ARRAY_SIZE(PCM_Formats); - lstrcpyW(aftd->szFormatTag, szPcm); + lstrcpyW(aftd->szFormatTag, L"PCM"); break; case 1: aftd->dwFormatTag = WAVE_FORMAT_IMA_ADPCM; aftd->cbFormatSize = sizeof(IMAADPCMWAVEFORMAT); aftd->cStandardFormats = ARRAY_SIZE(ADPCM_Formats); - lstrcpyW(aftd->szFormatTag, szImaAdPcm); + lstrcpyW(aftd->szFormatTag, L"IMA ADPCM"); break; } return MMSYSERR_NOERROR;

1 0

Andrew Eikum : audioclient.idl: Declare IAudioClient2.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: wine Branch: master Commit: afd143228b6383d242888a8aeb90c8bedc584c0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=afd143228b6383d242888a8a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 1 14:31:17 2020 -0500 audioclient.idl: Declare IAudioClient2. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/audioclient.idl | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/include/audioclient.idl b/include/audioclient.idl index 0628444bef..4759f3ef46 100644 --- a/include/audioclient.idl +++ b/include/audioclient.idl @@ -111,6 +111,46 @@ interface IAudioClient : IUnknown ); } +typedef enum _AUDCLNT_STREAMOPTIONS +{ + AUDCLNT_STREAMOPTIONS_NONE = 0, + AUDCLNT_STREAMOPTIONS_RAW = 1, + AUDCLNT_STREAMOPTIONS_MATCH_FORMAT = 2, +} AUDCLNT_STREAMOPTIONS; + +typedef struct _AudioClientProperties +{ + UINT32 cbSize; + BOOL bIsOffload; + AUDIO_STREAM_CATEGORY eCategory; + AUDCLNT_STREAMOPTIONS Options; +} AudioClientProperties; + +[ + local, + pointer_default(unique), + uuid(726778cd-f60a-4eda-82de-e47610cd78aa), + object, +] +interface IAudioClient2 : IAudioClient +{ + HRESULT IsOffloadCapable( + AUDIO_STREAM_CATEGORY category, + [out] BOOL *offload_capable + ); + + HRESULT SetClientProperties( + [in] const AudioClientProperties *prop + ); + + HRESULT GetBufferSizeLimits( + [in] const WAVEFORMATEX *format, + BOOL event_driven, + [out] REFERENCE_TIME *min_duration, + [out] REFERENCE_TIME *max_duration + ); +} + [ local, pointer_default(unique),

1 0

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

Oct. 2, 2020

Module: wine Branch: master Commit: 586dbd1e1e75d5e92b6a48ddf9f9dd7baf16f613 URL: https://source.winehq.org/git/wine.git/?a=commit;h=586dbd1e1e75d5e92b6a48dd… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 1 23:26:31 2020 +0200 mciqtz32: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciqtz32/mciqtz.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index ec4a8b531a..487a0d820c 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -74,7 +74,6 @@ static WINE_MCIQTZ* MCIQTZ_mciGetOpenDev(UINT wDevID) static DWORD MCIQTZ_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp) { WINE_MCIQTZ* wma; - static const WCHAR mciAviWStr[] = {'M','C','I','A','V','I',0}; TRACE("(%s, %p)\n", debugstr_w(str), modp); @@ -89,7 +88,7 @@ static DWORD MCIQTZ_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp) wma->stop_event = CreateEventW(NULL, FALSE, FALSE, NULL); modp->wType = MCI_DEVTYPE_DIGITAL_VIDEO; wma->wDevID = modp->wDeviceID; - modp->wCustomCommandTable = wma->command_table = mciLoadCommandResource(MCIQTZ_hInstance, mciAviWStr, 0); + modp->wCustomCommandTable = wma->command_table = mciLoadCommandResource(MCIQTZ_hInstance, L"MCIAVI", 0); mciSetDriverData(wma->wDevID, (DWORD_PTR)wma); return modp->wDeviceID;

1 0

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

Oct. 2, 2020

Module: wine Branch: master Commit: 6c8fac7dfe8cfcbf7ad5b8b661f308cafa5a7127 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c8fac7dfe8cfcbf7ad5b8b6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 1 23:26:30 2020 +0200 jsproxy: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jsproxy/main.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c index 905d2d93c1..1fbaa5cccc 100644 --- a/dlls/jsproxy/main.c +++ b/dlls/jsproxy/main.c @@ -46,9 +46,6 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION cs_jsproxy = { &critsect_debug, -1, 0, 0, 0, 0 }; -static const WCHAR global_funcsW[] = {'g','l','o','b','a','l','_','f','u','n','c','s',0}; -static const WCHAR dns_resolveW[] = {'d','n','s','_','r','e','s','o','l','v','e',0}; - /****************************************************************** * DllMain (jsproxy.@) */ @@ -271,7 +268,7 @@ static HRESULT WINAPI dispex_GetNameSpaceParent( static HRESULT WINAPI dispex_GetDispID( IDispatchEx *iface, BSTR name, DWORD flags, DISPID *id ) { - if (!lstrcmpW( name, dns_resolveW )) + if (!lstrcmpW( name, L"dns_resolve" )) { *id = DISPID_GLOBAL_DNSRESOLVE; return S_OK; @@ -306,7 +303,6 @@ static void printf_addr( const WCHAR *fmt, WCHAR *buf, SIZE_T size, struct socka static HRESULT dns_resolve( const WCHAR *hostname, VARIANT *result ) { - static const WCHAR fmtW[] = {'%','u','.','%','u','.','%','u','.','%','u',0}; WCHAR addr[16]; struct addrinfo *ai, *elem; char *hostnameA; @@ -329,7 +325,7 @@ static HRESULT dns_resolve( const WCHAR *hostname, VARIANT *result ) freeaddrinfo( ai ); return S_FALSE; } - printf_addr( fmtW, addr, ARRAY_SIZE(addr), (struct sockaddr_in *)elem->ai_addr ); + printf_addr( L"%u.%u.%u.%u", addr, ARRAY_SIZE(addr), (struct sockaddr_in *)elem->ai_addr ); freeaddrinfo( ai ); V_VT( result ) = VT_BSTR; V_BSTR( result ) = SysAllocString( addr ); @@ -408,7 +404,7 @@ static HRESULT WINAPI site_GetItemInfo( IActiveScriptSite *iface, LPCOLESTR name, DWORD mask, IUnknown **item, ITypeInfo **type_info ) { - if (!lstrcmpW( name, global_funcsW ) && mask == SCRIPTINFO_IUNKNOWN) + if (!lstrcmpW( name, L"global_funcs" ) && mask == SCRIPTINFO_IUNKNOWN) { *item = (IUnknown *)&global_dispex; return S_OK; @@ -471,7 +467,6 @@ static IActiveScriptSite script_site = { &site_vtbl }; static BSTR include_pac_utils( const WCHAR *script ) { - static const WCHAR pacjsW[] = {'p','a','c','.','j','s',0}; HMODULE hmod = GetModuleHandleA( "jsproxy.dll" ); HRSRC rsrc; DWORD size; @@ -479,7 +474,7 @@ static BSTR include_pac_utils( const WCHAR *script ) BSTR ret; int len; - if (!(rsrc = FindResourceW( hmod, pacjsW, (LPCWSTR)40 ))) return NULL; + if (!(rsrc = FindResourceW( hmod, L"pac.js", (LPCWSTR)40 ))) return NULL; size = SizeofResource( hmod, rsrc ); data = LoadResource( hmod, rsrc ); @@ -502,8 +497,6 @@ static BSTR include_pac_utils( const WCHAR *script ) static BOOL run_script( const WCHAR *script, const WCHAR *url, const WCHAR *hostname, char **result_str, DWORD *result_len ) { - static const WCHAR jscriptW[] = {'J','S','c','r','i','p','t',0}; - static const WCHAR findproxyW[] = {'F','i','n','d','P','r','o','x','y','F','o','r','U','R','L',0}; IActiveScriptParse *parser = NULL; IActiveScript *engine = NULL; IDispatch *dispatch = NULL; @@ -516,7 +509,7 @@ static BOOL run_script( const WCHAR *script, const WCHAR *url, const WCHAR *host HRESULT hr, init; init = CoInitialize( NULL ); - hr = CLSIDFromProgID( jscriptW, &clsid ); + hr = CLSIDFromProgID( L"JScript", &clsid ); if (hr != S_OK) goto done; hr = CoCreateInstance( &clsid, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -532,7 +525,7 @@ static BOOL run_script( const WCHAR *script, const WCHAR *url, const WCHAR *host hr = IActiveScript_SetScriptSite( engine, &script_site ); if (hr != S_OK) goto done; - hr = IActiveScript_AddNamedItem( engine, global_funcsW, SCRIPTITEM_GLOBALMEMBERS ); + hr = IActiveScript_AddNamedItem( engine, L"global_funcs", SCRIPTITEM_GLOBALMEMBERS ); if (hr != S_OK) goto done; if (!(full_script = include_pac_utils( script ))) goto done; @@ -546,7 +539,7 @@ static BOOL run_script( const WCHAR *script, const WCHAR *url, const WCHAR *host hr = IActiveScript_GetScriptDispatch( engine, NULL, &dispatch ); if (hr != S_OK) goto done; - if (!(func = SysAllocString( findproxyW ))) goto done; + if (!(func = SysAllocString( L"FindProxyForURL" ))) goto done; hr = IDispatch_GetIDsOfNames( dispatch, &IID_NULL, &func, 1, LOCALE_SYSTEM_DEFAULT, &dispid ); if (hr != S_OK) goto done;

1 0

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

Oct. 2, 2020

Module: wine Branch: master Commit: 449d269470a21d32bfe73958899bfad794e69e17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=449d269470a21d32bfe73958… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 1 23:26:29 2020 +0200 infosoft/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/infosoft/tests/infosoft.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/infosoft/tests/infosoft.c b/dlls/infosoft/tests/infosoft.c index 1e2792f19a..12bf65a56d 100644 --- a/dlls/infosoft/tests/infosoft.c +++ b/dlls/infosoft/tests/infosoft.c @@ -32,12 +32,7 @@ DEFINE_GUID(CLSID_wb_neutral, 0x369647e0,0x17b0,0x11ce,0x99,0x50,0x00,0xaa,0x00,0x4b,0xbb,0x1f); DEFINE_GUID(_IID_IWordBreaker, 0xD53552C8,0x77E3,0x101A,0xB5,0x52,0x08,0x00,0x2B,0x33,0xB0,0xE6); -static const WCHAR teststring[] = { - 's','q','u','a','r','e',' ', - 'c','i','r','c','l','e',' ', - 't','r','i','a','n','g','l','e',' ', - 'b','o','x',0 -}; +static const WCHAR teststring[] = L"square circle triangle box"; struct expected { UINT ofs; @@ -48,10 +43,10 @@ struct expected { static int wordnum; static struct expected testres[] = { - { 0, 6, {'s','q','u','a','r','e',0 }}, - { 7, 6, {'c','i','r','c','l','e',0 }}, - { 14, 8, {'t','r','i','a','n','g','l','e',0 }}, - { 23, 3, {'b','o','x',0}}, + { 0, 6, L"square" }, + { 7, 6, L"circle" }, + { 14, 8, L"triangle" }, + { 23, 3, L"box" }, }; static HRESULT WINAPI ws_QueryInterface(IWordSink *iface, REFIID riid, void **ppvObject)

1 0

Anton Baskanov : amstream: Implement IDirectDrawStreamSample::CompletionStatus.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: wine Branch: master Commit: 29a4921278b2675f47c60a4a90788a2ea90d7e3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=29a4921278b2675f47c60a4a… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Fri Oct 2 00:57:19 2020 +0700 amstream: Implement IDirectDrawStreamSample::CompletionStatus. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 53 ++++++-- dlls/amstream/tests/amstream.c | 292 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 335 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=29a4921278b2675f47c6…

1 0

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

Oct. 2, 2020

Module: wine Branch: master Commit: 21a4bd7b4890269852357793db9d245333ecba2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=21a4bd7b4890269852357793… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 1 23:26:26 2020 +0200 httpapi: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi_main.c | 9 +++------ dlls/httpapi/tests/httpapi.c | 31 ++++++++++++------------------- 2 files changed, 15 insertions(+), 25 deletions(-) diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 6be4d11d35..52fa6cc1d8 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -27,8 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(http); -static const WCHAR device_nameW[] = {'\\','D','e','v','i','c','e','\\','H','t','t','p','\\','R','e','q','Q','u','e','u','e',0}; - static WCHAR *heap_strdupW(const WCHAR *str) { int len = wcslen(str) + 1; @@ -53,7 +51,6 @@ static WCHAR *heap_strdupW(const WCHAR *str) */ ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved) { - static const WCHAR httpW[] = {'h','t','t','p',0}; SC_HANDLE manager, service; TRACE("version %u.%u, flags %#x, reserved %p.\n", version.HttpApiMajorVersion, @@ -68,7 +65,7 @@ ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved if (!(manager = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT))) return GetLastError(); - if (!(service = OpenServiceW(manager, httpW, SERVICE_START))) + if (!(service = OpenServiceW(manager, L"http", SERVICE_START))) { ERR("Failed to open HTTP service, error %u.\n", GetLastError()); CloseServiceHandle(manager); @@ -205,7 +202,7 @@ ULONG WINAPI HttpCreateHttpHandle(HANDLE *handle, ULONG reserved) if (!handle) return ERROR_INVALID_PARAMETER; - RtlInitUnicodeString(&string, device_nameW); + RtlInitUnicodeString(&string, L"\\Device\\Http\\ReqQueue"); attr.ObjectName = &string; return RtlNtStatusToDosError(NtCreateFile(handle, 0, &attr, &iosb, NULL, FILE_ATTRIBUTE_NORMAL, 0, FILE_OPEN, FILE_NON_DIRECTORY_FILE, NULL, 0)); @@ -752,7 +749,7 @@ ULONG WINAPI HttpCreateRequestQueue(HTTPAPI_VERSION version, const WCHAR *name, if (flags) FIXME("Unhandled flags %#x.\n", flags); - RtlInitUnicodeString(&string, device_nameW); + RtlInitUnicodeString(&string, L"\\Device\\Http\\ReqQueue"); attr.ObjectName = &string; if (sa && sa->bInheritHandle) attr.Attributes |= OBJ_INHERIT; diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index b6bfbbccf0..c54158d45a 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -33,13 +33,6 @@ #include "wine/test.h" -static const WCHAR invalid_url1[] = {'h','t','t','p',':','/','/','l','o','c','a','l','h','o','s','t',':','5','0','0','0','0',0}; -static const WCHAR invalid_url2[] = {'l','o','c','a','l','h','o','s','t',':','5','0','0','0','0',0}; -static const WCHAR invalid_url3[] = {'l','o','c','a','l','h','o','s','t',':','5','0','0','0','0','/',0}; -static const WCHAR invalid_url4[] = {'h','t','t','p',':','/','/','l','o','c','a','l','h','o','s','t','/',0}; -static const WCHAR invalid_url5[] = {'h','t','t','p',':','/','/','l','o','c','a','l','h','o','s','t',':','/',0}; -static const WCHAR invalid_url6[] = {'h','t','t','p',':','/','/','l','o','c','a','l','h','o','s','t',':','0','/',0}; - static ULONG (WINAPI *pHttpAddUrlToUrlGroup)(HTTP_URL_GROUP_ID id, const WCHAR *url, HTTP_URL_CONTEXT context, ULONG reserved); static ULONG (WINAPI *pHttpCreateServerSession)(HTTPAPI_VERSION version, HTTP_SERVER_SESSION_ID *session_id, ULONG reserved); static ULONG (WINAPI *pHttpCreateRequestQueue)(HTTPAPI_VERSION version, const WCHAR *name, SECURITY_ATTRIBUTES *sa, ULONG flags, HANDLE *handle); @@ -205,17 +198,17 @@ static void test_v1_server(void) ret = HttpAddUrl(NULL, L"http://localhost:50000/", NULL); ok(ret == ERROR_INVALID_HANDLE || ret == ERROR_INVALID_PARAMETER /* < Vista */, "Got error %u.\n", ret); - ret = HttpAddUrl(queue, invalid_url1, NULL); + ret = HttpAddUrl(queue, L"http://localhost:50000", NULL); ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); - ret = HttpAddUrl(queue, invalid_url2, NULL); + ret = HttpAddUrl(queue, L"localhost:50000", NULL); ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); - ret = HttpAddUrl(queue, invalid_url3, NULL); + ret = HttpAddUrl(queue, L"localhost:50000/", NULL); ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); - ret = HttpAddUrl(queue, invalid_url4, NULL); + ret = HttpAddUrl(queue, L"http://localhost/", NULL); ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); - ret = HttpAddUrl(queue, invalid_url5, NULL); + ret = HttpAddUrl(queue, L"http://localhost:/", NULL); ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); - ret = HttpAddUrl(queue, invalid_url6, NULL); + ret = HttpAddUrl(queue, L"http://localhost:0/", NULL); ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); port = add_url_v1(queue); swprintf(url, ARRAY_SIZE(url), L"http://localhost:%u/", port); @@ -1273,17 +1266,17 @@ static void test_v2_server(void) port = add_url_v2(group); - ret = pHttpAddUrlToUrlGroup(group, invalid_url1, 0xdeadbeef, 0); + ret = pHttpAddUrlToUrlGroup(group, L"http://localhost:50000", 0xdeadbeef, 0); todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); - ret = pHttpAddUrlToUrlGroup(group, invalid_url2, 0xdeadbeef, 0); + ret = pHttpAddUrlToUrlGroup(group, L"localhost:50000", 0xdeadbeef, 0); todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); - ret = pHttpAddUrlToUrlGroup(group, invalid_url3, 0xdeadbeef, 0); + ret = pHttpAddUrlToUrlGroup(group, L"localhost:50000/", 0xdeadbeef, 0); todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); - ret = pHttpAddUrlToUrlGroup(group, invalid_url4, 0xdeadbeef, 0); + ret = pHttpAddUrlToUrlGroup(group, L"http://localhost/", 0xdeadbeef, 0); todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); - ret = pHttpAddUrlToUrlGroup(group, invalid_url5, 0xdeadbeef, 0); + ret = pHttpAddUrlToUrlGroup(group, L"http://localhost:/", 0xdeadbeef, 0); todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); - ret = pHttpAddUrlToUrlGroup(group, invalid_url6, 0xdeadbeef, 0); + ret = pHttpAddUrlToUrlGroup(group, L"http://localhost:0/", 0xdeadbeef, 0); todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Got error %u.\n", ret); swprintf(url, ARRAY_SIZE(url), L"http://localhost:%u/", port); ret = pHttpAddUrlToUrlGroup(group, url, 0xdeadbeef, 0);

1 0

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

Oct. 2, 2020

Module: wine Branch: master Commit: 403b51279677788effc8fc7d6b8697fcaa300901 URL: https://source.winehq.org/git/wine.git/?a=commit;h=403b51279677788effc8fc7d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 1 23:26:25 2020 +0200 fntcache: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fntcache/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/fntcache/main.c b/dlls/fntcache/main.c index 8de84b262e..f579c4ebf3 100644 --- a/dlls/fntcache/main.c +++ b/dlls/fntcache/main.c @@ -83,14 +83,13 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, void *event_d */ VOID WINAPI ServiceMain(DWORD argc, LPWSTR *argv) { - static const WCHAR fontcacheW[] = {'F','o','n','t','C','a','c','h','e',0}; SERVICE_STATUS status; TRACE( "starting service\n" ); stop_event = CreateEventW( NULL, TRUE, FALSE, NULL ); - service_handle = RegisterServiceCtrlHandlerExW( fontcacheW, service_handler, NULL ); + service_handle = RegisterServiceCtrlHandlerExW( L"FontCache", service_handler, NULL ); if (!service_handle) return;

1 0

Michael Stefaniuc : fltmgr.sys: Use wide-char string literals.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: wine Branch: master Commit: b231650925eeaf29062791919332f942b61a050b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b231650925eeaf2906279191… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 1 23:26:24 2020 +0200 fltmgr.sys: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fltmgr.sys/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c index a1b81e5a89..e1016a4989 100644 --- a/dlls/fltmgr.sys/main.c +++ b/dlls/fltmgr.sys/main.c @@ -82,8 +82,7 @@ void WINAPI FltUnregisterFilter( PFLT_FILTER filter ) void* WINAPI FltGetRoutineAddress(LPCSTR name) { - static const WCHAR fltmgrW[] = {'f','l','t','m','g','r','.','s','y','s',0}; - HMODULE mod = GetModuleHandleW(fltmgrW); + HMODULE mod = GetModuleHandleW(L"fltmgr.sys"); void *func; func = GetProcAddress(mod, name);

1 0

Anton Baskanov : amstream: Implement IDirectDrawStreamSample::GetSampleTimes.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: wine Branch: master Commit: e58b42d48d2d5e91b623abeb7c02187864321d23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e58b42d48d2d5e91b623abeb… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Fri Oct 2 00:57:20 2020 +0700 amstream: Implement IDirectDrawStreamSample::GetSampleTimes. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 28 ++++++-- dlls/amstream/tests/amstream.c | 155 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 177 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e58b42d48d2d5e91b623…

1 0

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

Oct. 2, 2020

Module: wine Branch: master Commit: 6d3d0884c0999da296d6a18b9033fb92ee087c99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d3d0884c0999da296d6a18b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 1 23:26:33 2020 +0200 msftedit: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msftedit/msftedit_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msftedit/msftedit_main.c b/dlls/msftedit/msftedit_main.c index c578efafda..fbad7182a5 100644 --- a/dlls/msftedit/msftedit_main.c +++ b/dlls/msftedit/msftedit_main.c @@ -42,7 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msftedit); */ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) { - static const WCHAR riched20W[] = {'r','i','c','h','e','d','2','0','.','d','l','l',0}; static HMODULE richedit; switch(reason) @@ -51,7 +50,7 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: /* explicitly load riched20 since it creates the window classes at dll attach time */ - richedit = LoadLibraryW( riched20W ); + richedit = LoadLibraryW( L"riched20.dll" ); DisableThreadLibraryCalls(inst); break; case DLL_PROCESS_DETACH:

1 0

Michael Stefaniuc : msadp32.acm: Use wide-char string literals.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: wine Branch: master Commit: 93a55831b2b677c3b10365de613f4693f7813d62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93a55831b2b677c3b10365de… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 1 23:26:32 2020 +0200 msadp32.acm: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msadp32.acm/msadp32.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/msadp32.acm/msadp32.c b/dlls/msadp32.acm/msadp32.c index 78d99a21de..8b83f69c00 100644 --- a/dlls/msadp32.acm/msadp32.c +++ b/dlls/msadp32.acm/msadp32.c @@ -404,9 +404,6 @@ static LRESULT ADPCM_DriverDetails(PACMDRIVERDETAILSW add) */ static LRESULT ADPCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) { - static const WCHAR szPcm[]={'P','C','M',0}; - static const WCHAR szMsAdPcm[]={'M','i','c','r','o','s','o','f','t',' ','A','D','P','C','M',0}; - switch (dwQuery) { case ACM_FORMATTAGDETAILSF_INDEX: @@ -439,13 +436,13 @@ static LRESULT ADPCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) aftd->dwFormatTag = WAVE_FORMAT_PCM; aftd->cbFormatSize = sizeof(PCMWAVEFORMAT); aftd->cStandardFormats = ARRAY_SIZE(PCM_Formats); - lstrcpyW(aftd->szFormatTag, szPcm); + lstrcpyW(aftd->szFormatTag, L"PCM"); break; case 1: aftd->dwFormatTag = WAVE_FORMAT_ADPCM; aftd->cbFormatSize = sizeof(ADPCMWAVEFORMAT) + (7 - 1) * sizeof(ADPCMCOEFSET); aftd->cStandardFormats = ARRAY_SIZE(ADPCM_Formats); - lstrcpyW(aftd->szFormatTag, szMsAdPcm); + lstrcpyW(aftd->szFormatTag, L"Microsoft ADPCM"); break; } return MMSYSERR_NOERROR;

1 0

Zebediah Figura : tests: Import HLSL majority tests from Wine.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: vkd3d Branch: master Commit: ec6fe1cc9dd31ed17d5c9818632ce9ab83d6c441 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ec6fe1cc9dd31ed17d5c981… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 1 23:09:48 2020 -0500 tests: Import HLSL majority 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 | 4 ++++ tests/hlsl-majority-pragma.shader_test | 21 +++++++++++++++++++++ tests/hlsl-majority-typedef.shader_test | 22 ++++++++++++++++++++++ 3 files changed, 47 insertions(+) diff --git a/Makefile.am b/Makefile.am index 7911a8e..415e686 100644 --- a/Makefile.am +++ b/Makefile.am @@ -53,6 +53,8 @@ vkd3d_shader_tests = \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-comma.shader_test \ + tests/hlsl-majority-pragma.shader_test \ + tests/hlsl-majority-typedef.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ tests/hlsl-vector-indexing.shader_test \ @@ -189,6 +191,8 @@ XFAIL_TESTS = \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-comma.shader_test \ + tests/hlsl-majority-pragma.shader_test \ + tests/hlsl-majority-typedef.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ tests/hlsl-vector-indexing.shader_test \ diff --git a/tests/hlsl-majority-pragma.shader_test b/tests/hlsl-majority-pragma.shader_test new file mode 100644 index 0000000..e7fc75c --- /dev/null +++ b/tests/hlsl-majority-pragma.shader_test @@ -0,0 +1,21 @@ +[pixel shader] +#pragma pack_matrix(row_major) +uniform float2x2 r; +#pragma pack_matrix(column_major) +uniform float2x2 c; + +float4 main() : sv_target +{ + float4 ret; + ret.xy = mul(r, float2(0.5, 0.6)); + ret.zw = mul(c, float2(0.5, 0.6)); + return ret; +} + +[test] +uniform 0 float4 0.1 0.2 0.0 0.0 +uniform 4 float4 0.3 0.4 0.0 0.0 +uniform 8 float4 0.1 0.3 0.0 0.0 +uniform 12 float4 0.2 0.4 0.0 0.0 +draw quad +probe all rgba (0.17, 0.39, 0.17, 0.39) 1 diff --git a/tests/hlsl-majority-typedef.shader_test b/tests/hlsl-majority-typedef.shader_test new file mode 100644 index 0000000..1460e9a --- /dev/null +++ b/tests/hlsl-majority-typedef.shader_test @@ -0,0 +1,22 @@ +[pixel shader] +typedef float2x2 matrix_t; +typedef row_major matrix_t row_matrix_t; +typedef column_major matrix_t col_matrix_t; +uniform row_matrix_t r; +uniform col_matrix_t c; + +float4 main() : sv_target +{ + float4 ret; + ret.xy = mul(r, float2(0.5, 0.6)); + ret.zw = mul(c, float2(0.5, 0.6)); + return ret; +} + +[test] +uniform 0 float4 0.1 0.2 0.0 0.0 +uniform 4 float4 0.3 0.4 0.0 0.0 +uniform 8 float4 0.1 0.3 0.0 0.0 +uniform 12 float4 0.2 0.4 0.0 0.0 +draw quad +probe all rgba (0.17, 0.39, 0.17, 0.39) 1

1 0

Zebediah Figura : tests: Import comma tests from Wine.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: vkd3d Branch: master Commit: fe6b9678d807e641c878edd7449553c2a03cf0d2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fe6b9678d807e641c878edd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 1 23:09:45 2020 -0500 tests: Import comma 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-comma.shader_test | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/Makefile.am b/Makefile.am index 2e286bc..c6d9b06 100644 --- a/Makefile.am +++ b/Makefile.am @@ -51,6 +51,7 @@ vkd3d_shader_runners = \ vkd3d_shader_tests = \ tests/conditional.shader_test \ + tests/hlsl-comma.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ @@ -183,6 +184,7 @@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la SHADER_TEST_LOG_COMPILER = tests/shader_runner_d3d12 XFAIL_TESTS = \ tests/conditional.shader_test \ + tests/hlsl-comma.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ diff --git a/tests/hlsl-comma.shader_test b/tests/hlsl-comma.shader_test new file mode 100644 index 0000000..23bee71 --- /dev/null +++ b/tests/hlsl-comma.shader_test @@ -0,0 +1,10 @@ +[pixel shader] +float4 main(): sv_target +{ + float4 ret; + return (ret = float4(0.1, 0.2, 0.3, 0.4)), ret + 0.5; +} + +[test] +draw quad +probe all rgba (0.6, 0.7, 0.8, 0.9)

1 0

Zebediah Figura : tests: Import trigonometry tests from Wine.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: vkd3d Branch: master Commit: c3ac07efa75a03bc45fa930189d27b7beb4d7d7d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c3ac07efa75a03bc45fa930… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 1 23:09:44 2020 -0500 tests: Import trigonometry 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 | 6 ++++-- tests/shader_runner_d3d12.c | 23 +++++++++++++++++++++++ tests/trigonometry.shader_test | 24 ++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 27bc00b..2e286bc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -61,7 +61,8 @@ vkd3d_shader_tests = \ tests/swizzle-4.shader_test \ tests/swizzle-5.shader_test \ tests/swizzle-6.shader_test \ - tests/swizzle-7.shader_test + tests/swizzle-7.shader_test \ + tests/trigonometry.shader_test vkd3d_test_headers = \ tests/d3d12_crosstest.h \ @@ -192,7 +193,8 @@ XFAIL_TESTS = \ tests/swizzle-4.shader_test \ tests/swizzle-5.shader_test \ tests/swizzle-6.shader_test \ - tests/swizzle-7.shader_test + tests/swizzle-7.shader_test \ + tests/trigonometry.shader_test endif if BUILD_DEMOS diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 709fc00..0e9694a 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -190,6 +190,29 @@ static void parse_test_directive(struct shader_context *context, const char *lin release_resource_readback(&rb); reset_command_list(context->c.list, context->c.allocator); } + else if (match_string(line, "probe rgba", &line)) + { + struct resource_readback rb; + unsigned int x, y, ulps; + struct vec4 v; + RECT rect; + int ret; + + ret = sscanf(line, "( %u , %u ) ( %f , %f , %f , %f ) %u", &x, &y, &v.x, &v.y, &v.z, &v.w, &ulps); + if (ret < 6) + goto err; + if (ret < 7) + ulps = 0; + + get_texture_readback_with_command_list(context->c.render_target, 0, &rb, context->c.queue, context->c.list); + rect.left = x; + rect.right = x + 1; + rect.top = y; + rect.bottom = y + 1; + check_readback_data_vec4(&rb, &rect, &v, ulps); + release_resource_readback(&rb); + reset_command_list(context->c.list, context->c.allocator); + } else if (match_string(line, "uniform", &line)) { unsigned int offset; diff --git a/tests/trigonometry.shader_test b/tests/trigonometry.shader_test new file mode 100644 index 0000000..07a280a --- /dev/null +++ b/tests/trigonometry.shader_test @@ -0,0 +1,24 @@ +[pixel shader] +float4 main(float4 pos : SV_POSITION) : SV_TARGET +{ + return float4(sin(pos.x - 0.5), cos(pos.x - 0.5), 0, 0); +} + +[test] +draw quad +probe rgba ( 0, 0) ( 0.00000000, 1.00000000, 0.0, 0.0) +probe rgba ( 1, 0) ( 0.84147098, 0.54030231, 0.0, 0.0) 1024 +probe rgba ( 2, 0) ( 0.90929743, -0.41614684, 0.0, 0.0) 1024 +probe rgba ( 3, 0) ( 0.14112001, -0.98999250, 0.0, 0.0) 1024 +probe rgba ( 4, 0) (-0.75680250, -0.65364362, 0.0, 0.0) 1024 +probe rgba ( 5, 0) (-0.95892427, 0.28366219, 0.0, 0.0) 1024 +probe rgba ( 6, 0) (-0.27941550, 0.96017029, 0.0, 0.0) 1024 +probe rgba ( 7, 0) ( 0.65698660, 0.75390225, 0.0, 0.0) 1024 +probe rgba ( 8, 0) ( 0.98935825, -0.14550003, 0.0, 0.0) 1024 +probe rgba ( 9, 0) ( 0.41211849, -0.91113026, 0.0, 0.0) 1024 +probe rgba (10, 0) (-0.54402111, -0.83907153, 0.0, 0.0) 1024 +probe rgba (11, 0) (-0.99999021, 0.00442570, 0.0, 0.0) 1024 +probe rgba (12, 0) (-0.53657292, 0.84385396, 0.0, 0.0) 1024 +probe rgba (13, 0) ( 0.42016704, 0.90744678, 0.0, 0.0) 1024 +probe rgba (14, 0) ( 0.99060736, 0.13673722, 0.0, 0.0) 1024 +probe rgba (15, 0) ( 0.65028784, -0.75968791, 0.0, 0.0) 1024

1 0

Biswapriyo Nath : include: Add enum flag operators for D3D12_MULTISAMPLE_QUALITY_LEVEL_FLAGS.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: vkd3d Branch: master Commit: a547196d303b6c8afafd36fd8fcc3b5752c3e0b2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a547196d303b6c8afafd36f… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Oct 2 00:10:19 2020 +0330 include: Add enum flag operators for D3D12_MULTISAMPLE_QUALITY_LEVEL_FLAGS. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 1 + 1 file changed, 1 insertion(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 7fc3ffc..41088d4 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -357,6 +357,7 @@ typedef enum D3D12_MULTISAMPLE_QUALITY_LEVEL_FLAGS D3D12_MULTISAMPLE_QUALITY_LEVELS_FLAG_NONE = 0x00000000, D3D12_MULTISAMPLE_QUALITY_LEVELS_FLAG_TILED_RESOURCE = 0x00000001, } D3D12_MULTISAMPLE_QUALITY_LEVEL_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_MULTISAMPLE_QUALITY_LEVEL_FLAGS);") typedef struct D3D12_FEATURE_DATA_MULTISAMPLE_QUALITY_LEVELS {

1 0

Zebediah Figura : tests: Import HLSL return statement tests from Wine.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: vkd3d Branch: master Commit: e04b917322bc0371404caaed946e49d8010ab18b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e04b917322bc0371404caae… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 1 23:09:46 2020 -0500 tests: Import HLSL return statement 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 | 4 ++++ tests/hlsl-return-implicit-conversion.shader_test | 9 +++++++++ tests/hlsl-return-void.shader_test | 11 +++++++++++ 3 files changed, 24 insertions(+) diff --git a/Makefile.am b/Makefile.am index c6d9b06..efe0c7c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,6 +52,8 @@ vkd3d_shader_runners = \ vkd3d_shader_tests = \ tests/conditional.shader_test \ tests/hlsl-comma.shader_test \ + tests/hlsl-return-implicit-conversion.shader_test \ + tests/hlsl-return-void.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ @@ -185,6 +187,8 @@ SHADER_TEST_LOG_COMPILER = tests/shader_runner_d3d12 XFAIL_TESTS = \ tests/conditional.shader_test \ tests/hlsl-comma.shader_test \ + tests/hlsl-return-implicit-conversion.shader_test \ + tests/hlsl-return-void.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ diff --git a/tests/hlsl-return-implicit-conversion.shader_test b/tests/hlsl-return-implicit-conversion.shader_test new file mode 100644 index 0000000..527387b --- /dev/null +++ b/tests/hlsl-return-implicit-conversion.shader_test @@ -0,0 +1,9 @@ +[pixel shader] +float4 main() : sv_target +{ + return float2x2(0.4, 0.3, 0.2, 0.1); +} + +[test] +draw quad +probe all rgba (0.4, 0.3, 0.2, 0.1) diff --git a/tests/hlsl-return-void.shader_test b/tests/hlsl-return-void.shader_test new file mode 100644 index 0000000..1948ec5 --- /dev/null +++ b/tests/hlsl-return-void.shader_test @@ -0,0 +1,11 @@ +[pixel shader] +void main(out float4 ret : sv_target) +{ + ret = float4(0.1, 0.2, 0.3, 0.4); + return; + ret = float4(0.5, 0.6, 0.7, 0.8); +} + +[test] +draw quad +probe all rgba (0.1, 0.2, 0.3, 0.4)

1 0

Biswapriyo Nath : include: Add more D3D12_FEATURE enum elements.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: vkd3d Branch: master Commit: 97af69bebda4003dca572bf7876b9253038ca705 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=97af69bebda4003dca572bf… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Oct 2 00:10:20 2020 +0330 include: Add more D3D12_FEATURE enum elements. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 41088d4..88ecba5 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -1765,6 +1765,7 @@ typedef enum D3D12_FEATURE D3D12_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT = 6, D3D12_FEATURE_SHADER_MODEL = 7, D3D12_FEATURE_D3D12_OPTIONS1 = 8, + D3D12_FEATURE_PROTECTED_RESOURCE_SESSION_SUPPORT = 10, D3D12_FEATURE_ROOT_SIGNATURE = 12, D3D12_FEATURE_ARCHITECTURE1 = 16, D3D12_FEATURE_D3D12_OPTIONS2 = 18, @@ -1776,6 +1777,11 @@ typedef enum D3D12_FEATURE D3D12_FEATURE_SERIALIZATION = 24, D3D12_FEATURE_CROSS_NODE = 25, D3D12_FEATURE_D3D12_OPTIONS5 = 27, + D3D12_FEATURE_D3D12_OPTIONS6 = 30, + D3D12_FEATURE_QUERY_META_COMMAND = 31, + D3D12_FEATURE_D3D12_OPTIONS7 = 32, + D3D12_FEATURE_PROTECTED_RESOURCE_SESSION_TYPE_COUNT = 33, + D3D12_FEATURE_PROTECTED_RESOURCE_SESSION_TYPES = 34, } D3D12_FEATURE; typedef struct D3D12_MEMCPY_DEST

1 0

Zebediah Figura : tests: Import HLSL array dimension tests from Wine.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: vkd3d Branch: master Commit: d0b13d51cacbb544b9208f0518cff4359801ec0d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d0b13d51cacbb544b9208f0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 1 23:09:47 2020 -0500 tests: Import HLSL array dimension 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-array-dimension.shader_test | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/Makefile.am b/Makefile.am index efe0c7c..7911a8e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -51,6 +51,7 @@ vkd3d_shader_runners = \ vkd3d_shader_tests = \ tests/conditional.shader_test \ + tests/hlsl-array-dimension.shader_test \ tests/hlsl-comma.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ @@ -186,6 +187,7 @@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la SHADER_TEST_LOG_COMPILER = tests/shader_runner_d3d12 XFAIL_TESTS = \ tests/conditional.shader_test \ + tests/hlsl-array-dimension.shader_test \ tests/hlsl-comma.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ diff --git a/tests/hlsl-array-dimension.shader_test b/tests/hlsl-array-dimension.shader_test new file mode 100644 index 0000000..fdb52b1 --- /dev/null +++ b/tests/hlsl-array-dimension.shader_test @@ -0,0 +1,16 @@ +# Test what kinds of expressions are valid array dimensions. +[pixel shader] +float4 main() : sv_target +{ + const int dim = 4; + float a[2 * 2] = {0.1, 0.2, 0.3, 0.4}; + float b[4.1] = a; + float c[dim] = b; + float d[true] = {c[0]}; + float e[65536]; + return float4(d[0], c[0], c[1], c[3]); +} + +[test] +draw quad +probe all rgba (0.1, 0.1, 0.2, 0.4)

1 0

Józef Kucia : include: Add the D3D12EnableExperimentalFeatures() prototype.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: vkd3d Branch: master Commit: abc4aa09ba1b4eb699f2980e8eb36e0a1a7bca48 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=abc4aa09ba1b4eb699f2980… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 2 00:10:18 2020 +0330 include: Add the D3D12EnableExperimentalFeatures() prototype. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 1a5e2f4..7fc3ffc 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -2545,3 +2545,6 @@ typedef HRESULT (__stdcall *PFN_D3D12_CREATE_DEVICE)(IUnknown *adapter, typedef HRESULT (__stdcall *PFN_D3D12_GET_DEBUG_INTERFACE)(REFIID iid, void **debug); [local] HRESULT __stdcall D3D12GetDebugInterface(REFIID iid, void **debug); + +[local] HRESULT __stdcall D3D12EnableExperimentalFeatures(UINT feature_count, + const IID *iids, void *configurations, UINT *configurations_sizes);

1 0

Stefan Dösinger : include: Remove backslashes from D3D12_COLOR_WRITE_ENABLE_ALL.
by Alexandre Julliard Oct. 2, 2020

Oct. 2, 2020

Module: vkd3d Branch: master Commit: 615b182846bd4d9ec02917dd9b51a215689e2023 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=615b182846bd4d9ec02917d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Oct 2 00:10:17 2020 +0330 include: Remove backslashes from D3D12_COLOR_WRITE_ENABLE_ALL. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 48b87f0..1a5e2f4 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -1438,8 +1438,8 @@ typedef enum D3D12_COLOR_WRITE_ENABLE D3D12_COLOR_WRITE_ENABLE_GREEN = 0x2, D3D12_COLOR_WRITE_ENABLE_BLUE = 0x4, D3D12_COLOR_WRITE_ENABLE_ALPHA = 0x8, - D3D12_COLOR_WRITE_ENABLE_ALL = (D3D12_COLOR_WRITE_ENABLE_RED\ - | D3D12_COLOR_WRITE_ENABLE_GREEN | D3D12_COLOR_WRITE_ENABLE_BLUE\ + D3D12_COLOR_WRITE_ENABLE_ALL = (D3D12_COLOR_WRITE_ENABLE_RED + | D3D12_COLOR_WRITE_ENABLE_GREEN | D3D12_COLOR_WRITE_ENABLE_BLUE | D3D12_COLOR_WRITE_ENABLE_ALPHA), } D3D12_COLOR_WRITE_ENABLE;

1 0

Nikolay Sivov : evr/presenter: Add IMFGetService stub.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: b21d2b7c9cd7ab319ff7781352dff998206bef44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b21d2b7c9cd7ab319ff77813… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 1 15:59:32 2020 +0300 evr/presenter: Add IMFGetService stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 4 ++++ 2 files changed, 48 insertions(+) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index a7da070492..5e458f72f1 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -46,6 +46,7 @@ struct video_presenter IMFTopologyServiceLookupClient IMFTopologyServiceLookupClient_iface; IMFVideoDisplayControl IMFVideoDisplayControl_iface; IMFRateSupport IMFRateSupport_iface; + IMFGetService IMFGetService_iface; IUnknown IUnknown_inner; IUnknown *outer_unk; LONG refcount; @@ -88,6 +89,11 @@ static struct video_presenter *impl_from_IMFRateSupport(IMFRateSupport *iface) return CONTAINING_RECORD(iface, struct video_presenter, IMFRateSupport_iface); } +static struct video_presenter *impl_from_IMFGetService(IMFGetService *iface) +{ + return CONTAINING_RECORD(iface, struct video_presenter, IMFGetService_iface); +} + static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { struct video_presenter *presenter = impl_from_IUnknown(iface); @@ -119,6 +125,10 @@ static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFI { *obj = &presenter->IMFRateSupport_iface; } + else if (IsEqualIID(riid, &IID_IMFGetService)) + { + *obj = &presenter->IMFGetService_iface; + } else { WARN("Unimplemented interface %s.\n", debugstr_guid(riid)); @@ -576,6 +586,39 @@ static const IMFRateSupportVtbl video_presenter_rate_support_vtbl = video_presenter_rate_support_IsRateSupported, }; +static HRESULT WINAPI video_presenter_getservice_QueryInterface(IMFGetService *iface, REFIID riid, void **obj) +{ + struct video_presenter *presenter = impl_from_IMFGetService(iface); + return IMFVideoPresenter_QueryInterface(&presenter->IMFVideoPresenter_iface, riid, obj); +} + +static ULONG WINAPI video_presenter_getservice_AddRef(IMFGetService *iface) +{ + struct video_presenter *presenter = impl_from_IMFGetService(iface); + return IMFVideoPresenter_AddRef(&presenter->IMFVideoPresenter_iface); +} + +static ULONG WINAPI video_presenter_getservice_Release(IMFGetService *iface) +{ + struct video_presenter *presenter = impl_from_IMFGetService(iface); + return IMFVideoPresenter_Release(&presenter->IMFVideoPresenter_iface); +} + +static HRESULT WINAPI video_presenter_getservice_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) +{ + FIXME("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + + return E_NOTIMPL; +} + +static const IMFGetServiceVtbl video_presenter_getservice_vtbl = +{ + video_presenter_getservice_QueryInterface, + video_presenter_getservice_AddRef, + video_presenter_getservice_Release, + video_presenter_getservice_GetService, +}; + HRESULT WINAPI MFCreateVideoPresenter(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -600,6 +643,7 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out) object->IMFTopologyServiceLookupClient_iface.lpVtbl = &video_presenter_service_client_vtbl; object->IMFVideoDisplayControl_iface.lpVtbl = &video_presenter_control_vtbl; object->IMFRateSupport_iface.lpVtbl = &video_presenter_rate_support_vtbl; + object->IMFGetService_iface.lpVtbl = &video_presenter_getservice_vtbl; object->IUnknown_inner.lpVtbl = &video_presenter_inner_vtbl; object->outer_unk = outer ? outer : &object->IUnknown_inner; object->refcount = 1; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 7fa28e7522..b59da51e47 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1002,6 +1002,10 @@ static void test_default_presenter(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFGetService, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + /* Rate support. */ hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFRateSupport, (void **)&rate_support); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Jacek Caban : conhost: Call ensure_tty_input_thread in IOCTL_CONDRV_PEEK implementation.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: 45b8489ba5a1726cb9d0e163de41cb1c0ddaa23b URL: https://source.winehq.org/git/wine.git/?a=commit;h=45b8489ba5a1726cb9d0e163… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 1 15:08:40 2020 +0200 conhost: Call ensure_tty_input_thread in IOCTL_CONDRV_PEEK implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index fadba2728d..86a400307d 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2476,6 +2476,7 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, void *result; TRACE( "peek\n "); if (in_size) return STATUS_INVALID_PARAMETER; + ensure_tty_input_thread( console ); *out_size = min( *out_size, console->record_count * sizeof(INPUT_RECORD) ); if (!(result = alloc_ioctl_buffer( *out_size ))) return STATUS_NO_MEMORY; if (*out_size) memcpy( result, console->records, *out_size );

1 0

Jacek Caban : server: Don't propagate STATUS_PENDING in get_next_console_request request.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: 95e1de8215ce8b0ece486dcf8c713e98d5dd3a0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=95e1de8215ce8b0ece486dcf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 1 15:10:09 2020 +0200 server: Don't propagate STATUS_PENDING in get_next_console_request request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/console.c b/server/console.c index b0b6de2eef..44cacfbb99 100644 --- a/server/console.c +++ b/server/console.c @@ -2715,10 +2715,11 @@ DECL_HANDLER(get_next_console_request) if (ioctl) { unsigned int status = req->status; + if (status == STATUS_PENDING) status = STATUS_INVALID_PARAMETER; if (ioctl->async) { iosb = async_get_iosb( ioctl->async ); - iosb->status = req->status; + iosb->status = status; iosb->out_size = min( iosb->out_size, get_req_data_size() ); if (iosb->out_size) {

1 0

Zebediah Figura : wined3d: Correct off-by-one errors when comparing against ARRAY_SIZE.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: 95ab7e8a0902acb736565092f00a43f6dcc2184e URL: https://source.winehq.org/git/wine.git/?a=commit;h=95ab7e8a0902acb736565092… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 30 15:27:37 2020 -0500 wined3d: Correct off-by-one errors when comparing against ARRAY_SIZE. Spotted by Alex Henrie. 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/shader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 0166746bfd..d3921d5a98 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2059,7 +2059,7 @@ static void shader_dump_resource_type(struct wined3d_string_buffer *buffer, enum /* WINED3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY */ "texturecubearray", }; - if (type <= ARRAY_SIZE(resource_type_names)) + if (type < ARRAY_SIZE(resource_type_names)) shader_addline(buffer, "%s", resource_type_names[type]); else shader_addline(buffer, "unknown"); @@ -2080,7 +2080,7 @@ static void shader_dump_data_type(struct wined3d_string_buffer *buffer, enum win /* WINED3D_DATA_OPAQUE */ "(opaque)", }; - if (type <= ARRAY_SIZE(data_type_names)) + if (type < ARRAY_SIZE(data_type_names)) shader_addline(buffer, "%s", data_type_names[type]); else shader_addline(buffer, "(unknown)");

1 0

Nikolay Sivov : evr/mixer: Add IMFQualityAdvise stub.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: c303b08ba065a6dc85e5e43d1fd1c4c24c3f5881 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c303b08ba065a6dc85e5e43d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 1 15:59:31 2020 +0300 evr/mixer: Add IMFQualityAdvise stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 4 +++ 2 files changed, 80 insertions(+) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 9227e6a177..4ada26d074 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -61,6 +61,7 @@ struct video_mixer IMFVideoPositionMapper IMFVideoPositionMapper_iface; IMFVideoProcessor IMFVideoProcessor_iface; IMFAttributes IMFAttributes_iface; + IMFQualityAdvise IMFQualityAdvise_iface; IUnknown IUnknown_inner; IUnknown *outer_unk; LONG refcount; @@ -129,6 +130,11 @@ static struct video_mixer *impl_from_IMFAttributes(IMFAttributes *iface) return CONTAINING_RECORD(iface, struct video_mixer, IMFAttributes_iface); } +static struct video_mixer *impl_from_IMFQualityAdvise(IMFQualityAdvise *iface) +{ + return CONTAINING_RECORD(iface, struct video_mixer, IMFQualityAdvise_iface); +} + static int video_mixer_compare_input_id(const void *a, const void *b) { const unsigned int *key = a; @@ -217,6 +223,10 @@ static HRESULT WINAPI video_mixer_inner_QueryInterface(IUnknown *iface, REFIID r { *obj = &mixer->IMFAttributes_iface; } + else if (IsEqualIID(riid, &IID_IMFQualityAdvise)) + { + *obj = &mixer->IMFQualityAdvise_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -1685,6 +1695,71 @@ static const IMFAttributesVtbl video_mixer_attributes_vtbl = video_mixer_attributes_CopyAllItems }; +static HRESULT WINAPI video_mixer_quality_advise_QueryInterface(IMFQualityAdvise *iface, REFIID riid, void **out) +{ + struct video_mixer *mixer = impl_from_IMFQualityAdvise(iface); + return IMFTransform_QueryInterface(&mixer->IMFTransform_iface, riid, out); +} + +static ULONG WINAPI video_mixer_quality_advise_AddRef(IMFQualityAdvise *iface) +{ + struct video_mixer *mixer = impl_from_IMFQualityAdvise(iface); + return IMFTransform_AddRef(&mixer->IMFTransform_iface); +} + +static ULONG WINAPI video_mixer_quality_Release(IMFQualityAdvise *iface) +{ + struct video_mixer *mixer = impl_from_IMFQualityAdvise(iface); + return IMFTransform_Release(&mixer->IMFTransform_iface); +} + +static HRESULT WINAPI video_mixer_quality_advise_SetDropMode(IMFQualityAdvise *iface, MF_QUALITY_DROP_MODE mode) +{ + FIXME("%p, %u.\n", iface, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_quality_advise_SetQualityLevel(IMFQualityAdvise *iface, MF_QUALITY_LEVEL level) +{ + FIXME("%p, %u.\n", iface, level); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_quality_advise_GetDropMode(IMFQualityAdvise *iface, MF_QUALITY_DROP_MODE *mode) +{ + FIXME("%p, %p.\n", iface, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_quality_advise_GetQualityLevel(IMFQualityAdvise *iface, MF_QUALITY_LEVEL *level) +{ + FIXME("%p, %p.\n", iface, level); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_quality_advise_DropTime(IMFQualityAdvise *iface, LONGLONG interval) +{ + FIXME("%p, %s.\n", iface, wine_dbgstr_longlong(interval)); + + return E_NOTIMPL; +} + +static const IMFQualityAdviseVtbl video_mixer_quality_advise_vtbl = +{ + video_mixer_quality_advise_QueryInterface, + video_mixer_quality_advise_AddRef, + video_mixer_quality_Release, + video_mixer_quality_advise_SetDropMode, + video_mixer_quality_advise_SetQualityLevel, + video_mixer_quality_advise_GetDropMode, + video_mixer_quality_advise_GetQualityLevel, + video_mixer_quality_advise_DropTime, +}; + HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -1715,6 +1790,7 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->IMFVideoPositionMapper_iface.lpVtbl = &video_mixer_position_mapper_vtbl; object->IMFVideoProcessor_iface.lpVtbl = &video_mixer_processor_vtbl; object->IMFAttributes_iface.lpVtbl = &video_mixer_attributes_vtbl; + object->IMFQualityAdvise_iface.lpVtbl = &video_mixer_quality_advise_vtbl; object->IUnknown_inner.lpVtbl = &video_mixer_inner_vtbl; object->outer_unk = outer ? outer : &object->IUnknown_inner; object->refcount = 1; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index e6f6251be6..7fa28e7522 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -438,6 +438,10 @@ static void test_default_mixer(void) hr = MFCreateVideoMixer(NULL, &IID_IDirect3DDevice9, &IID_IMFTransform, (void **)&transform); ok(hr == S_OK, "Failed to create default mixer, hr %#x.\n", hr); + hr = IMFTransform_QueryInterface(transform, &IID_IMFQualityAdvise, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + hr = IMFTransform_QueryInterface(transform, &IID_IMFTopologyServiceLookupClient, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk);

1 0

Jacek Caban : server: Use set_active_screen_buffer for consoles attached to server.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: fa9f4a20f5305b7cbcfe3a644d39d4b759f89203 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa9f4a20f5305b7cbcfe3a64… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 1 15:10:26 2020 +0200 server: Use set_active_screen_buffer for consoles attached to server. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/server/console.c b/server/console.c index 44cacfbb99..5f295d4184 100644 --- a/server/console.c +++ b/server/console.c @@ -2130,10 +2130,6 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * } case IOCTL_CONDRV_ACTIVATE: - if (screen_buffer->input && screen_buffer->input->server) - return queue_host_ioctl( screen_buffer->input->server, code, screen_buffer->id, - async, &screen_buffer->ioctl_q ); - if (!screen_buffer->input) { set_error( STATUS_INVALID_HANDLE );

1 0

Jacek Caban : conhost: Clear out_size in IOCTL_CONDRV_READ_CONSOLE implementation.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: c9e1b789d285fc43c1d8142eb8b4f2fe969c6c45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9e1b789d285fc43c1d8142e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 1 15:08:50 2020 +0200 conhost: Clear out_size in IOCTL_CONDRV_READ_CONSOLE implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 86a400307d..ac0e22b4c4 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2425,6 +2425,8 @@ static NTSTATUS screen_buffer_ioctl( struct screen_buffer *screen_buffer, unsign static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, const void *in_data, size_t in_size, size_t *out_size ) { + NTSTATUS status; + switch (code) { case IOCTL_CONDRV_GET_MODE: @@ -2446,12 +2448,13 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, case IOCTL_CONDRV_READ_CONSOLE: if (in_size || *out_size % sizeof(WCHAR)) return STATUS_INVALID_PARAMETER; ensure_tty_input_thread( console ); - return read_console( console, *out_size ); + status = read_console( console, *out_size ); + *out_size = 0; + return status; case IOCTL_CONDRV_READ_INPUT: { unsigned int blocking; - NTSTATUS status; if (in_size && in_size != sizeof(blocking)) return STATUS_INVALID_PARAMETER; ensure_tty_input_thread( console ); blocking = in_size && *(unsigned int *)in_data;

1 0

Nikolay Sivov : evr/presenter: Create device manager for the presenter.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: 2ff55d97d7e86fb80fa4f84a769523add3216ce8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ff55d97d7e86fb80fa4f84a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 1 15:59:33 2020 +0300 evr/presenter: Create device manager for the presenter. 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 | 21 ++++++++++++++++++++- dlls/evr/tests/evr.c | 37 +++++++++++++++++++++++++++++++++++-- 3 files changed, 56 insertions(+), 4 deletions(-) diff --git a/dlls/evr/Makefile.in b/dlls/evr/Makefile.in index c8178297da..6d936d65b7 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 +IMPORTS = mfuuid strmiids strmbase uuid dxguid ole32 oleaut32 dxva2 DELAYIMPORTS = mfplat EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 5e458f72f1..b60de4b82a 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -22,6 +22,7 @@ #include "d3d9.h" #include "mfapi.h" #include "mferror.h" +#include "dxva2api.h" #include "evr_classes.h" #include "evr_private.h" @@ -55,6 +56,8 @@ struct video_presenter IMFClock *clock; IMediaEventSink *event_sink; + IDirect3DDeviceManager9 *device_manager; + UINT reset_token; unsigned int state; CRITICAL_SECTION cs; }; @@ -174,6 +177,8 @@ static ULONG WINAPI video_presenter_inner_Release(IUnknown *iface) { video_presenter_clear_container(presenter); DeleteCriticalSection(&presenter->cs); + if (presenter->device_manager) + IDirect3DDeviceManager9_Release(presenter->device_manager); heap_free(presenter); } @@ -606,7 +611,14 @@ static ULONG WINAPI video_presenter_getservice_Release(IMFGetService *iface) static HRESULT WINAPI video_presenter_getservice_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) { - FIXME("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + struct video_presenter *presenter = impl_from_IMFGetService(iface); + + TRACE("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + + if (IsEqualGUID(&MR_VIDEO_ACCELERATION_SERVICE, service)) + return IDirect3DDeviceManager9_QueryInterface(presenter->device_manager, riid, obj); + + FIXME("Unimplemented service %s.\n", debugstr_guid(service)); return E_NOTIMPL; } @@ -634,6 +646,7 @@ HRESULT WINAPI MFCreateVideoPresenter(IUnknown *owner, REFIID riid_device, REFII HRESULT evr_presenter_create(IUnknown *outer, void **out) { struct video_presenter *object; + HRESULT hr; if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; @@ -649,6 +662,12 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out) object->refcount = 1; InitializeCriticalSection(&object->cs); + if (FAILED(hr = DXVA2CreateDirect3DDeviceManager9(&object->reset_token, &object->device_manager))) + { + IUnknown_Release(&object->IUnknown_inner); + return hr; + } + *out = &object->IUnknown_inner; return S_OK; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index b59da51e47..0dff691b59 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -966,9 +966,14 @@ done: static void test_default_presenter(void) { + D3DDEVICE_CREATION_PARAMETERS device_params = { 0 }; IMFVideoPresenter *presenter; IMFRateSupport *rate_support; + IDirect3DDevice9 *d3d_device; + IDirect3DDeviceManager9 *dm; IMFVideoDeviceID *deviceid; + IMFGetService *gs; + HANDLE handle; IUnknown *unk; float rate; HRESULT hr; @@ -1002,9 +1007,37 @@ static void test_default_presenter(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); - hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFGetService, (void **)&unk); + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFGetService, (void **)&gs); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); + + hr = IMFGetService_GetService(gs, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, (void **)&dm); + 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); + + IDirect3DDevice9_Release(d3d_device); + + hr = IDirect3DDeviceManager9_UnlockDevice(dm, handle, FALSE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_CloseDeviceHandle(dm, handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +} + IDirect3DDeviceManager9_Release(dm); + + IMFGetService_Release(gs); /* Rate support. */ hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFRateSupport, (void **)&rate_support);

1 0

Nikolay Sivov : evr/mixer: Store input type attributes.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: 5542942c8e1d7aee45121601fcdb1d7acfecf587 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5542942c8e1d7aee45121601… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 1 15:59:30 2020 +0300 evr/mixer: Store input type attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 11 ++++++++++- dlls/evr/tests/evr.c | 31 +++++++++++-------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index e19520fa7e..9227e6a177 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -686,7 +686,16 @@ static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DW &count, &guids))) { if (SUCCEEDED(hr = video_mixer_collect_output_types(mixer, &video_desc, service, count, guids))) - FIXME("Set input type.\n"); + { + GUID subtype = { 0 }; + + if (FAILED(hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &subtype))) + WARN("Failed to get subtype %#x.\n", hr); + + if (SUCCEEDED(hr = MFCreateVideoMediaTypeFromSubtype(&subtype, &mixer->inputs[0].media_type))) + hr = IMFMediaType_CopyAllItems(media_type, (IMFAttributes *)mixer->inputs[0].media_type); + + } CoTaskMemFree(guids); } } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index bf33051d6e..e6f6251be6 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -896,17 +896,15 @@ static void test_default_mixer_type_negotiation(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -if (hr == S_OK) -{ ok(media_type != (IMFMediaType *)video_type, "Unexpected media type instance.\n"); + hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type2); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(media_type == media_type2, "Unexpected media type instance.\n"); IMFMediaType_Release(media_type); IMFMediaType_Release(media_type2); -} + hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoProcessor, (void **)&processor); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -919,31 +917,24 @@ todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { - ok(media_type != (IMFMediaType *)video_type, "Unexpected pointer.\n"); - hr = IMFMediaType_QueryInterface(media_type, &IID_IMFVideoMediaType, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); - IMFMediaType_Release(media_type); - } + ok(media_type != (IMFMediaType *)video_type, "Unexpected pointer.\n"); + hr = IMFMediaType_QueryInterface(media_type, &IID_IMFVideoMediaType, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + IMFMediaType_Release(media_type); hr = IMFVideoProcessor_GetAvailableVideoProcessorModes(processor, &count, &guids); todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { - hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IMFMediaType_Release(media_type); - } + hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFMediaType_Release(media_type); hr = IMFVideoProcessor_GetVideoProcessorMode(processor, &guid); todo_wine

1 0

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

Oct. 1, 2020

Module: wine Branch: master Commit: bffe111672972cb26c319c029ca469520742c720 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bffe111672972cb26c319c02… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Sep 30 23:14:53 2020 +0200 d3dx9/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/asm.c | 6 ++---- dlls/d3dx9_36/tests/effect.c | 8 +++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 4087bd89b0..9b4e82f218 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -195,7 +195,6 @@ static void assembleshader_test(void) }; struct D3DXIncludeImpl include; char shader_vsh_path[MAX_PATH], shader3_vsh_path[MAX_PATH]; - static const WCHAR shader_filename_w[] = {'s','h','a','d','e','r','.','v','s','h',0}; /* pDefines test */ shader = NULL; @@ -356,7 +355,7 @@ static void assembleshader_test(void) shader = NULL; messages = NULL; - hr = D3DXAssembleShaderFromFileW(shader_filename_w, NULL, &include.ID3DXInclude_iface, + hr = D3DXAssembleShaderFromFileW(L"shader.vsh", NULL, &include.ID3DXInclude_iface, D3DXSHADER_SKIPVALIDATION, &shader, &messages); ok(hr == D3D_OK, "D3DXAssembleShaderFromFile + pInclude main shader test failed with error 0x%x - %d\n", hr, hr & 0x0000ffff); @@ -445,7 +444,6 @@ static void d3dxpreprocess_test(void) ID3DXBuffer *shader, *messages; char shader_vsh_path[MAX_PATH], shader3_vsh_path[MAX_PATH]; static struct D3DXIncludeImpl include = {{&D3DXInclude_Vtbl}}; - static const WCHAR shader_filename_w[] = {'s','h','a','d','e','r','.','v','s','h',0}; if (create_file("shader.vsh", testshader, sizeof(testshader) - 1, shader_vsh_path)) { @@ -520,7 +518,7 @@ static void d3dxpreprocess_test(void) shader = NULL; messages = NULL; - hr = D3DXPreprocessShaderFromFileW(shader_filename_w, NULL, &include.ID3DXInclude_iface, + hr = D3DXPreprocessShaderFromFileW(L"shader.vsh", NULL, &include.ID3DXInclude_iface, &shader, &messages); ok(hr == D3D_OK, "D3DXPreprocessShaderFromFile + pInclude main shader test failed with error 0x%x - %d\n", hr, hr & 0x0000ffff); diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index c72049d553..ae6f65d52d 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -7740,8 +7740,6 @@ static void test_create_effect_from_file(void) " VertexShader = compile vs_2_0 vs_main();\n" " }\n" "}\n"; - static const WCHAR effect1_filename_w[] = {'e','f','f','e','c','t','1','.','f','x',0}; - static const WCHAR effect2_filename_w[] = {'e','f','f','e','c','t','2','.','f','x',0}; WCHAR effect_path_w[MAX_PATH], filename_w[MAX_PATH]; char effect_path[MAX_PATH], filename[MAX_PATH]; D3DPRESENT_PARAMETERS present_parameters = {0}; @@ -7798,7 +7796,7 @@ static void test_create_effect_from_file(void) create_file("include1.h", include1_wrong, sizeof(include1_wrong) - 1, NULL); lstrcpyW(filename_w, effect_path_w); - lstrcatW(filename_w, effect1_filename_w); + lstrcatW(filename_w, L"effect1.fx"); effect = NULL; messages = NULL; hr = D3DXCreateEffectFromFileExW(device, filename_w, NULL, NULL, NULL, @@ -7813,7 +7811,7 @@ static void test_create_effect_from_file(void) effect->lpVtbl->Release(effect); lstrcpyW(filename_w, effect_path_w); - lstrcatW(filename_w, effect2_filename_w); + lstrcatW(filename_w, L"effect2.fx"); effect = NULL; messages = NULL; /* This is apparently broken on native, it ends up using the wrong include. */ @@ -7835,7 +7833,7 @@ static void test_create_effect_from_file(void) delete_file("include2.h"); delete_directory("include"); - lstrcpyW(filename_w, effect2_filename_w); + lstrcpyW(filename_w, L"effect2.fx"); effect = NULL; messages = NULL; include.ID3DXInclude_iface.lpVtbl = &d3dxinclude_vtbl;

1 0

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

Oct. 1, 2020

Module: wine Branch: master Commit: 6325887e3de4e96d2b7e173c878251a562a84a1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6325887e3de4e96d2b7e173c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Sep 30 23:14:51 2020 +0200 d3dx10/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 897c54249b..54cb4df3b7 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1340,7 +1340,6 @@ static void test_D3DX10CreateAsyncFileLoader(void) static void test_D3DX10CreateAsyncResourceLoader(void) { - static const WCHAR resource_name[] = {'n','o','n','a','m','e',0}; ID3DX10DataLoader *loader; HRESULT hr; @@ -1359,7 +1358,7 @@ static void test_D3DX10CreateAsyncResourceLoader(void) hr = D3DX10CreateAsyncResourceLoaderW(NULL, NULL, &loader); ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); - hr = D3DX10CreateAsyncResourceLoaderW(NULL, resource_name, &loader); + hr = D3DX10CreateAsyncResourceLoaderW(NULL, L"noname", &loader); ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); }

1 0

Alexandre Julliard : odbc32: Use the exported names for the implementation functions.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: ce557472e799d2bab05e1c090111d751b68a4ffd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce557472e799d2bab05e1c09… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 1 12:11:29 2020 +0200 odbc32: Use the exported names for the implementation functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbc32/odbc32.spec | 234 ++++++++++----------- dlls/odbc32/proxyodbc.c | 525 ++++++++++++++++++++++++------------------------ 2 files changed, 376 insertions(+), 383 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ce557472e799d2bab05e…

1 0

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

Oct. 1, 2020

Module: wine Branch: master Commit: 9ec0c082106418510231ae12da428f8789bfec4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ec0c082106418510231ae12… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Sep 30 23:14:49 2020 +0200 comcat/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/comcat/tests/comcat.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/dlls/comcat/tests/comcat.c b/dlls/comcat/tests/comcat.c index ff5b51a87b..97048cc46b 100644 --- a/dlls/comcat/tests/comcat.c +++ b/dlls/comcat/tests/comcat.c @@ -66,26 +66,10 @@ static void do_enum(void) GUID wanted_guid; ULONG fetched = -1; - static const WCHAR szCatID[] = { - '{', - 'd','e','a','d','c','a','f','e', - '-','0','0','0','0','-','0','0','0','0', - '-','0','0','0','0', - '-','0','0','0','0','0','0','0','0','0','0','0','0', - '}',0}; - static const WCHAR szGuid[] = { - '{', - 'd','e','a','d','c','a','f','e','-', - 'b','e','e','d','-', - 'b','e','a','d','-', - 'd','e','a','d','-', - 'c','a','f','e','b','e','a','d','d','e','a','d', - '}',0}; - IEnumCLSID *pIEnum =(IEnumCLSID*)0xdeadcafe; - CLSIDFromString(szCatID,the_cat); - CLSIDFromString(szGuid,&wanted_guid); + CLSIDFromString(L"{deadcafe-0000-0000-0000-000000000000}", the_cat); + CLSIDFromString(L"{deadcafe-beed-bead-dead-cafebeaddead}", &wanted_guid); OleInitialize(NULL);

1 0

Alexandre Julliard : odbc32: Build with msvcrt.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: da8e4d9cc98859d524924af11e1fe5ff00d43dc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da8e4d9cc98859d524924af1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 1 12:15:30 2020 +0200 odbc32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbc32/Makefile.in | 2 ++ dlls/odbc32/proxyodbc.c | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/odbc32/Makefile.in b/dlls/odbc32/Makefile.in index 2f11494020..74862b6788 100644 --- a/dlls/odbc32/Makefile.in +++ b/dlls/odbc32/Makefile.in @@ -2,6 +2,8 @@ MODULE = odbc32.dll IMPORTLIB = odbc32 IMPORTS = advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ proxyodbc.c \ unixlib.c diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index c2313a32d2..0c0b30f0be 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -25,9 +25,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #include <stdio.h> #include <stdlib.h> @@ -39,7 +36,6 @@ #include "winternl.h" #include "winreg.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "sql.h" #include "sqltypes.h"

1 0

Zebediah Figura : server: Return Win32 socket types from get_socket_info.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: b1f2b61be040cccaf6da6e6296bd38a24f05f55e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1f2b61be040cccaf6da6e62… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 30 10:37:52 2020 -0500 server: Return Win32 socket types from get_socket_info. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 6 +++--- server/sock.c | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a187d2de8e..bc61b56667 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2306,9 +2306,9 @@ static BOOL ws_protocol_info(SOCKET s, int unicode, WSAPROTOCOL_INFOW *buffer, i status = wine_server_call( req ); if (!status) { - address_family = convert_af_u2w(reply->family); - socket_type = convert_socktype_u2w(reply->type); - protocol = convert_proto_u2w(reply->protocol); + address_family = reply->family; + socket_type = reply->type; + protocol = reply->protocol; } } SERVER_END_REQ; diff --git a/server/sock.c b/server/sock.c index 52e85b1e51..4bafe35b89 100644 --- a/server/sock.c +++ b/server/sock.c @@ -456,7 +456,7 @@ static void sock_poll_event( struct fd *fd, int event ) else { /* normal data flow */ - if ( sock->type == SOCK_STREAM && ( event & POLLIN ) ) + if (sock->type == WS_SOCK_STREAM && (event & POLLIN)) { char dummy; int nr; @@ -546,8 +546,8 @@ static int sock_get_poll_events( struct fd *fd ) else if (smask & FD_READ || (sock->state & FD_WINE_LISTENING && mask & FD_ACCEPT)) ev |= POLLIN | POLLPRI; /* We use POLLIN with 0 bytes recv() as FD_CLOSE indication for stream sockets. */ - else if ( sock->type == SOCK_STREAM && sock->state & FD_READ && mask & FD_CLOSE && - !(sock->hmask & FD_READ) ) + else if (sock->type == WS_SOCK_STREAM && (sock->state & FD_READ) && (mask & FD_CLOSE) && + !(sock->hmask & FD_READ)) ev |= POLLIN; if (async_queued( &sock->write_q )) @@ -813,9 +813,9 @@ static int init_socket( struct sock *sock, int family, int type, int protocol, u sock->state = (type != SOCK_STREAM) ? (FD_READ|FD_WRITE) : 0; sock->flags = flags; - sock->proto = unix_protocol; - sock->type = unix_type; - sock->family = unix_family; + sock->proto = protocol; + sock->type = type; + sock->family = family; if (sock->fd) { @@ -1540,7 +1540,7 @@ DECL_HANDLER(enable_socket_event) sock->hmask &= ~req->mask; sock->state |= req->sstate; sock->state &= ~req->cstate; - if ( sock->type != SOCK_STREAM ) sock->state &= ~STREAM_FLAG_MASK; + if (sock->type != WS_SOCK_STREAM) sock->state &= ~STREAM_FLAG_MASK; sock_reselect( sock );

1 0

Nikolay Sivov : include: Add DWRITE_MAKE_FONT_AXIS_TAG macro.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: 6db24a2349417bef87862f743cc3e85536492184 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6db24a2349417bef87862f74… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 1 08:45:13 2020 +0300 include: Add DWRITE_MAKE_FONT_AXIS_TAG macro. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dwrite_3.idl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index f5ee6157cd..1b10454ec6 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -80,6 +80,12 @@ typedef struct DWRITE_FONT_PROPERTY WCHAR const *localeName; } DWRITE_FONT_PROPERTY; +cpp_quote("#ifdef __cplusplus") +cpp_quote("#define DWRITE_MAKE_FONT_AXIS_TAG(a,b,c,d) (static_cast<DWRITE_FONT_AXIS_TAG>(DWRITE_MAKE_OPENTYPE_TAG(a,b,c,d)))") +cpp_quote("#else") +cpp_quote("#define DWRITE_MAKE_FONT_AXIS_TAG(a,b,c,d) (DWRITE_MAKE_OPENTYPE_TAG(a,b,c,d))") +cpp_quote("#endif") + typedef enum DWRITE_FONT_AXIS_TAG { DWRITE_FONT_AXIS_TAG_WEIGHT = 0x74686777, /* 'wght' */

1 0

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

Oct. 1, 2020

Module: wine Branch: master Commit: 052d9e6f3dcabde95a74981f925a0ca066a591ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=052d9e6f3dcabde95a74981f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Sep 30 23:14:52 2020 +0200 d3dx11/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_43/tests/d3dx11.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx11_43/tests/d3dx11.c b/dlls/d3dx11_43/tests/d3dx11.c index db06c97144..06924877da 100644 --- a/dlls/d3dx11_43/tests/d3dx11.c +++ b/dlls/d3dx11_43/tests/d3dx11.c @@ -129,13 +129,12 @@ static void test_D3DX11CreateAsyncMemoryLoader(void) static void create_testfile(WCHAR *path, const void *data, int data_len) { - static const WCHAR test_filename[] = {'a','s','y','n','c','l','o','a','d','e','r','.','d','a','t','a',0}; DWORD written; HANDLE file; BOOL ret; GetTempPathW(MAX_PATH, path); - lstrcatW(path, test_filename); + lstrcatW(path, L"asyncloader.data"); file = CreateFileW(path, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); ok(file != INVALID_HANDLE_VALUE, "Test file creation failed, at %s, error %d.\n", @@ -240,7 +239,6 @@ static void test_D3DX11CreateAsyncFileLoader(void) static void test_D3DX11CreateAsyncResourceLoader(void) { - static const WCHAR resource_name[] = {'n','o','n','a','m','e',0}; ID3DX11DataLoader *loader; HRESULT hr; @@ -259,7 +257,7 @@ static void test_D3DX11CreateAsyncResourceLoader(void) hr = D3DX11CreateAsyncResourceLoaderW(NULL, NULL, &loader); ok(hr == D3DX11_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); - hr = D3DX11CreateAsyncResourceLoaderW(NULL, resource_name, &loader); + hr = D3DX11CreateAsyncResourceLoaderW(NULL, L"noname", &loader); ok(hr == D3DX11_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); }

1 0

Zebediah Figura : server: Remove redundant calls to sock_reselect().
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: cb5edb4b12eb4846df85de71b889959a96586720 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb5edb4b12eb4846df85de71… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 30 10:37:53 2020 -0500 server: Remove redundant calls to sock_reselect(). These are already done in accept_socket() and accept_into_socket() respectively. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/server/sock.c b/server/sock.c index 4bafe35b89..f165e86b12 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1427,7 +1427,6 @@ DECL_HANDLER(accept_socket) { reply->handle = alloc_handle( current->process, &sock->obj, req->access, req->attributes ); sock->wparam = reply->handle; /* wparam for message is the socket handle */ - sock_reselect( sock ); release_object( &sock->obj ); } } @@ -1450,10 +1449,7 @@ DECL_HANDLER(accept_into_socket) } if (accept_into_socket( sock, acceptsock )) - { acceptsock->wparam = req->ahandle; /* wparam for message is the socket handle */ - sock_reselect( acceptsock ); - } release_object( acceptsock ); release_object( sock ); }

1 0

Zebediah Figura : ws2_32: Set default socket options in the server.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: ac36b8ff01be8e6e6c8f46096b434f7048097559 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac36b8ff01be8e6e6c8f4609… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 30 10:37:51 2020 -0500 ws2_32: Set default socket options in the server. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 39 ------------------------------- server/sock.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 39 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d7802cc9cd..a187d2de8e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7519,7 +7519,6 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, HANDLE handle; SOCKET ret; DWORD err; - int unixaf, unixtype, ipxptype = -1; /* FIXME: The "advanced" parameters of WSASocketW (lpProtocolInfo, @@ -7590,18 +7589,6 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, } } - /* - Windows has an extension to the IPX protocol that allows one to create sockets - and set the IPX packet type at the same time, to do that a caller will use - a protocol like NSPROTO_IPX + <PACKET TYPE> - */ - if (IS_IPX_PROTO(protocol)) - ipxptype = protocol - WS_NSPROTO_IPX; - - /* convert the socket family, type and protocol */ - unixaf = convert_af_w2u(af); - unixtype = convert_socktype_w2u(type); - RtlInitUnicodeString(&string, afdW); InitializeObjectAttributes(&attr, &string, (flags & WSA_FLAG_NO_HANDLE_INHERIT) ? 0 : OBJ_INHERIT, NULL, NULL); if ((status = NtOpenFile(&handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, @@ -7636,32 +7623,6 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, ret = HANDLE2SOCKET(handle); TRACE("\tcreated %04lx\n", ret ); - if (ipxptype > 0) - set_ipx_packettype(ret, ipxptype); - - if (unixaf == AF_INET || unixaf == AF_INET6) - { - /* ensure IP_DONTFRAGMENT is disabled for SOCK_DGRAM and SOCK_RAW, enabled for SOCK_STREAM */ - if (unixtype == SOCK_DGRAM || unixtype == SOCK_RAW) /* in Linux the global default can be enabled */ - set_dont_fragment(ret, unixaf == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP, FALSE); - else if (unixtype == SOCK_STREAM) - set_dont_fragment(ret, unixaf == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP, TRUE); - } - -#ifdef IPV6_V6ONLY - if (unixaf == AF_INET6) - { - int fd = get_sock_fd(ret, 0, NULL); - if (fd != -1) - { - /* IPV6_V6ONLY is set by default on Windows */ - int enable = 1; - if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &enable, sizeof(enable))) - WARN("\tsetting IPV6_V6ONLY failed - errno = %i\n", errno); - release_sock_fd(ret, fd); - } - } -#endif if (!socket_list_add(ret)) { CloseHandle(handle); diff --git a/server/sock.c b/server/sock.c index f0227c5906..52e85b1e51 100644 --- a/server/sock.c +++ b/server/sock.c @@ -712,6 +712,36 @@ static int get_unix_protocol( int protocol ) } } +static void set_dont_fragment( int fd, int level, int value ) +{ + int optname; + + if (level == IPPROTO_IP) + { +#ifdef IP_DONTFRAG + optname = IP_DONTFRAG; +#elif defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DO) && defined(IP_PMTUDISC_DONT) + optname = IP_MTU_DISCOVER; + value = value ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; +#else + return; +#endif + } + else + { +#ifdef IPV6_DONTFRAG + optname = IPV6_DONTFRAG; +#elif defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DO) && defined(IPV6_PMTUDISC_DONT) + optname = IPV6_MTU_DISCOVER; + value = value ? IPV6_PMTUDISC_DO : IPV6_PMTUDISC_DONT; +#else + return; +#endif + } + + setsockopt( fd, level, optname, &value, sizeof(value) ); +} + static int init_socket( struct sock *sock, int family, int type, int protocol, unsigned int flags ) { unsigned int options = 0; @@ -746,6 +776,41 @@ static int init_socket( struct sock *sock, int family, int type, int protocol, u return -1; } fcntl(sockfd, F_SETFL, O_NONBLOCK); /* make socket nonblocking */ + + if (family == WS_AF_IPX && protocol >= WS_NSPROTO_IPX && protocol <= WS_NSPROTO_IPX + 255) + { +#ifdef HAS_IPX + int ipx_type = protocol - WS_NSPROTO_IPX; + +#ifdef SOL_IPX + setsockopt( sockfd, SOL_IPX, IPX_TYPE, &ipx_type, sizeof(ipx_type) ); +#else + struct ipx val; + /* Should we retrieve val using a getsockopt call and then + * set the modified one? */ + val.ipx_pt = ipx_type; + setsockopt( sockfd, 0, SO_DEFAULT_HEADERS, &val, sizeof(val) ); +#endif +#endif + } + + if (unix_family == AF_INET || unix_family == AF_INET6) + { + /* ensure IP_DONTFRAGMENT is disabled for SOCK_DGRAM and SOCK_RAW, enabled for SOCK_STREAM */ + if (unix_type == SOCK_DGRAM || unix_type == SOCK_RAW) /* in Linux the global default can be enabled */ + set_dont_fragment( sockfd, unix_family == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP, FALSE ); + else if (unix_type == SOCK_STREAM) + set_dont_fragment( sockfd, unix_family == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP, TRUE ); + } + +#ifdef IPV6_V6ONLY + if (unix_family == AF_INET6) + { + static const int enable = 1; + setsockopt( sockfd, IPPROTO_IPV6, IPV6_V6ONLY, &enable, sizeof(enable) ); + } +#endif + sock->state = (type != SOCK_STREAM) ? (FD_READ|FD_WRITE) : 0; sock->flags = flags; sock->proto = unix_protocol;

1 0

Zebediah Figura : ws2_32: Pass Win32 socket types to the server.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: abcc75cbcf57513f07ab8c008f66a19f142c5a7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=abcc75cbcf57513f07ab8c00… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 30 10:37:50 2020 -0500 ws2_32: Pass Win32 socket types to the server. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 39 +------------------ server/sock.c | 105 ++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 102 insertions(+), 42 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 36215cc6ef..d7802cc9cd 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7601,41 +7601,6 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, /* convert the socket family, type and protocol */ unixaf = convert_af_w2u(af); unixtype = convert_socktype_w2u(type); - protocol = convert_proto_w2u(protocol); - - /* filter invalid parameters */ - if (protocol < 0) - { - /* the type could not be converted */ - if (type && unixtype < 0) - { - err = WSAESOCKTNOSUPPORT; - goto done; - } - - err = WSAEPROTONOSUPPORT; - goto done; - } - if (unixaf < 0) - { - /* both family and protocol can't be invalid */ - if (protocol <= 0) - { - err = WSAEINVAL; - goto done; - } - - /* family could not be converted and neither socket type */ - if (unixtype < 0 && af >= 0) - { - - err = WSAESOCKTNOSUPPORT; - goto done; - } - - err = WSAEAFNOSUPPORT; - goto done; - } RtlInitUnicodeString(&string, afdW); InitializeObjectAttributes(&attr, &string, (flags & WSA_FLAG_NO_HANDLE_INHERIT) ? 0 : OBJ_INHERIT, NULL, NULL); @@ -7647,8 +7612,8 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, return INVALID_SOCKET; } - create_params.family = unixaf; - create_params.type = unixtype; + create_params.family = af; + create_params.type = type; create_params.protocol = protocol; create_params.flags = flags & ~(WSA_FLAG_NO_HANDLE_INHERIT | WSA_FLAG_OVERLAPPED); if ((status = NtDeviceIoControlFile(handle, NULL, NULL, NULL, &io, diff --git a/server/sock.c b/server/sock.c index 3bc4780f94..f0227c5906 100644 --- a/server/sock.c +++ b/server/sock.c @@ -30,6 +30,9 @@ #include <string.h> #include <stdlib.h> #include <errno.h> +#ifdef HAVE_NETINET_IN_H +# include <netinet/in.h> +#endif #ifdef HAVE_POLL_H # include <poll.h> #endif @@ -51,6 +54,29 @@ # include <linux/rtnetlink.h> #endif +#ifdef HAVE_NETIPX_IPX_H +# include <netipx/ipx.h> +#elif defined(HAVE_LINUX_IPX_H) +# ifdef HAVE_ASM_TYPES_H +# include <asm/types.h> +# endif +# ifdef HAVE_LINUX_TYPES_H +# include <linux/types.h> +# endif +# include <linux/ipx.h> +#endif +#if defined(SOL_IPX) || defined(SO_DEFAULT_HEADERS) +# define HAS_IPX +#endif + +#ifdef HAVE_LINUX_IRDA_H +# ifdef HAVE_LINUX_TYPES_H +# include <linux/types.h> +# endif +# include <linux/irda.h> +# define HAS_IRDA +#endif + #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -58,6 +84,7 @@ #include "winerror.h" #define USE_WS_PREFIX #include "winsock2.h" +#include "wsipx.h" #include "wine/afd.h" #include "process.h" @@ -638,12 +665,80 @@ static struct sock *create_socket(void) return sock; } +static int get_unix_family( int family ) +{ + switch (family) + { + case WS_AF_INET: return AF_INET; + case WS_AF_INET6: return AF_INET6; +#ifdef HAS_IPX + case WS_AF_IPX: return AF_IPX; +#endif +#ifdef AF_IRDA + case WS_AF_IRDA: return AF_IRDA; +#endif + case WS_AF_UNSPEC: return AF_UNSPEC; + default: return -1; + } +} + +static int get_unix_type( int type ) +{ + switch (type) + { + case WS_SOCK_DGRAM: return SOCK_DGRAM; + case WS_SOCK_RAW: return SOCK_RAW; + case WS_SOCK_STREAM: return SOCK_STREAM; + default: return -1; + } +} + +static int get_unix_protocol( int protocol ) +{ + if (protocol >= WS_NSPROTO_IPX && protocol <= WS_NSPROTO_IPX + 255) + return protocol; + + switch (protocol) + { + case WS_IPPROTO_ICMP: return IPPROTO_ICMP; + case WS_IPPROTO_IGMP: return IPPROTO_IGMP; + case WS_IPPROTO_IP: return IPPROTO_IP; + case WS_IPPROTO_IPIP: return IPPROTO_IPIP; + case WS_IPPROTO_IPV6: return IPPROTO_IPV6; + case WS_IPPROTO_RAW: return IPPROTO_RAW; + case WS_IPPROTO_TCP: return IPPROTO_TCP; + case WS_IPPROTO_UDP: return IPPROTO_UDP; + default: return -1; + } +} + static int init_socket( struct sock *sock, int family, int type, int protocol, unsigned int flags ) { unsigned int options = 0; - int sockfd; + int sockfd, unix_type, unix_family, unix_protocol; + + unix_family = get_unix_family( family ); + unix_type = get_unix_type( type ); + unix_protocol = get_unix_protocol( protocol ); + + if (unix_protocol < 0) + { + if (type && unix_type < 0) + set_win32_error( WSAESOCKTNOSUPPORT ); + else + set_win32_error( WSAEPROTONOSUPPORT ); + return -1; + } + if (unix_family < 0) + { + if (family >= 0 && unix_type < 0) + set_win32_error( WSAESOCKTNOSUPPORT ); + else + set_win32_error( WSAEAFNOSUPPORT ); + return -1; + } - sockfd = socket( family, type, protocol ); + sockfd = socket( unix_family, unix_type, unix_protocol ); if (sockfd == -1) { if (errno == EINVAL) set_win32_error( WSAESOCKTNOSUPPORT ); @@ -653,9 +748,9 @@ static int init_socket( struct sock *sock, int family, int type, int protocol, u fcntl(sockfd, F_SETFL, O_NONBLOCK); /* make socket nonblocking */ sock->state = (type != SOCK_STREAM) ? (FD_READ|FD_WRITE) : 0; sock->flags = flags; - sock->proto = protocol; - sock->type = type; - sock->family = family; + sock->proto = unix_protocol; + sock->type = unix_type; + sock->family = unix_family; if (sock->fd) {

1 0

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

Oct. 1, 2020

Module: wine Branch: master Commit: 33f1de3ed7e4300a2b936beafad76c96d97352d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33f1de3ed7e4300a2b936bea… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Sep 30 23:14:56 2020 +0200 dplayx: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/dplay.c | 18 +++++------------- dlls/dplayx/tests/dplayx.c | 14 +++----------- 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index e2464f8013..7a796735ce 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -5770,14 +5770,6 @@ static HRESULT DirectPlayEnumerateAW(LPDPENUMDPCALLBACKA lpEnumCallbackA, LPVOID lpContext) { HKEY hkResult; - static const WCHAR searchSubKey[] = { - 'S', 'O', 'F', 'T', 'W', 'A', 'R', 'E', '\\', - 'M', 'i', 'c', 'r', 'o', 's', 'o', 'f', 't', '\\', - 'D', 'i', 'r', 'e', 'c', 't', 'P', 'l', 'a', 'y', '\\', - 'S', 'e', 'r', 'v', 'i', 'c', 'e', ' ', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 's', 0 }; - static const WCHAR guidKey[] = { 'G', 'u', 'i', 'd', 0 }; - static const WCHAR descW[] = { 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'i', 'o', 'n', 'W', 0 }; - DWORD dwIndex; FILETIME filetime; @@ -5797,7 +5789,7 @@ static HRESULT DirectPlayEnumerateAW(LPDPENUMDPCALLBACKA lpEnumCallbackA, } /* Need to loop over the service providers in the registry */ - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, searchSubKey, + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\DirectPlay\\Service Providers", 0, KEY_READ, &hkResult) != ERROR_SUCCESS) { /* Hmmm. Does this mean that there are no service providers? */ @@ -5854,7 +5846,7 @@ static HRESULT DirectPlayEnumerateAW(LPDPENUMDPCALLBACKA lpEnumCallbackA, } /* Get the GUID from the registry */ - if (RegQueryValueExW(hkServiceProvider, guidKey, + if (RegQueryValueExW(hkServiceProvider, L"Guid", NULL, NULL, (LPBYTE) guidKeyContent, &sizeOfGuidKeyContent) != ERROR_SUCCESS) { ERR(": missing GUID registry data member for service provider %s.\n", debugstr_w(subKeyName)); @@ -5899,8 +5891,8 @@ static HRESULT DirectPlayEnumerateAW(LPDPENUMDPCALLBACKA lpEnumCallbackA, else { DWORD sizeOfDescription = 0; - - if (RegQueryValueExW(hkServiceProvider, descW, + + if (RegQueryValueExW(hkServiceProvider, L"DescriptionW", NULL, NULL, NULL, &sizeOfDescription) != ERROR_SUCCESS) { ERR(": missing 'DescriptionW' registry data member for service provider %s.\n", debugstr_w(subKeyName)); @@ -5912,7 +5904,7 @@ static HRESULT DirectPlayEnumerateAW(LPDPENUMDPCALLBACKA lpEnumCallbackA, max_sizeOfDescriptionW = sizeOfDescription; } descriptionW = HeapAlloc(GetProcessHeap(), 0, sizeOfDescription); - RegQueryValueExW(hkServiceProvider, descW, + RegQueryValueExW(hkServiceProvider, L"DescriptionW", NULL, NULL, (LPBYTE) descriptionW, &sizeOfDescription); if (!lpEnumCallbackW(&guid_cache[dwIndex], descriptionW, 6, 0, lpContext)) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index ea6525fa38..d71df8838f 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -6764,13 +6764,6 @@ done: static HRESULT set_firewall( enum firewall_op op ) { - static const WCHAR dplaysvrW[] = - {'d','p','l','a','y','s','v','r','.','e','x','e',0}; - static const WCHAR separator[] = {'\\',0}; - static const WCHAR clientW[] = - {'d','p','l','a','y','_','c','l','i','e','n','t',0}; - static const WCHAR serverW[] = - {'d','p','l','a','y','_','s','e','r','v','e','r',0}; HRESULT hr, init; INetFwMgr *mgr = NULL; INetFwPolicy *policy = NULL; @@ -6791,8 +6784,7 @@ static HRESULT set_firewall( enum firewall_op op ) SysFreeString( image ); return E_FAIL; } - lstrcatW(path, separator); - lstrcatW(path, dplaysvrW); + lstrcatW( path, L"\\dplaysvr.exe" ); init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); @@ -6820,7 +6812,7 @@ static HRESULT set_firewall( enum firewall_op op ) hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); if (hr != S_OK) goto done; - name = SysAllocString( clientW ); + name = SysAllocString( L"dplay_client" ); hr = INetFwAuthorizedApplication_put_Name( app, name ); SysFreeString( name ); ok( hr == S_OK, "got %08x\n", hr ); @@ -6845,7 +6837,7 @@ static HRESULT set_firewall( enum firewall_op op ) hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); if (hr != S_OK) goto done; - name = SysAllocString( serverW ); + name = SysAllocString( L"dplay_server" ); hr = INetFwAuthorizedApplication_put_Name( app, name ); SysFreeString( name ); ok( hr == S_OK, "got %08x\n", hr );

1 0

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

Oct. 1, 2020

Module: wine Branch: master Commit: d489c58e7ba77532a81357ad9d405099e8a2b4bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d489c58e7ba77532a81357ad… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Sep 30 23:14:55 2020 +0200 faultrep: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/faultrep/faultrep.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/faultrep/faultrep.c b/dlls/faultrep/faultrep.c index 3191659cd6..6d1aba9de8 100644 --- a/dlls/faultrep/faultrep.c +++ b/dlls/faultrep/faultrep.c @@ -29,13 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(faultrep); -static const WCHAR SZ_EXCLUSIONLIST_KEY[] = { - 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'P','C','H','e','a','l','t','h','\\', - 'E','r','r','o','r','R','e','p','o','r','t','i','n','g','\\', - 'E','x','c','l','u','s','i','o','n','L','i','s','t', 0}; - /************************************************************************* * AddERExcludedApplicationW [FAULTREP.@] * @@ -70,7 +63,8 @@ BOOL WINAPI AddERExcludedApplicationW(LPCWSTR lpAppFileName) return FALSE; } - res = RegCreateKeyW(HKEY_LOCAL_MACHINE, SZ_EXCLUSIONLIST_KEY, &hkey); + res = RegCreateKeyW(HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\PCHealth\\ErrorReporting\\ExclusionList", &hkey); if (!res) { RegSetValueExW(hkey, lpAppFileName, 0, REG_DWORD, (LPBYTE)&value, sizeof(value));

1 0

Zebediah Figura : d3d11/tests: Add a test for rendering with deferred contexts.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: 386e6799572296ac36d433b8fc37de5540a52f6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=386e6799572296ac36d433b8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 30 10:25:00 2020 -0500 d3d11/tests: Add a test for rendering with deferred contexts. 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/d3d11/tests/d3d11.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 82a165c62d..e1a6dd6159 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -30237,6 +30237,108 @@ static void test_deferred_context_state(void) release_test_context(&test_context); } +static void test_deferred_context_rendering(void) +{ + ID3D11DeviceContext *immediate, *deferred; + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11CommandList *list1, *list2; + ID3D11RenderTargetView *rtv; + ID3D11Texture2D *texture; + ID3D11Device *device; + DWORD color; + HRESULT hr; + + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; + static const float blue[] = {0.0f, 0.0f, 1.0f, 1.0f}; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + immediate = test_context.immediate_context; + + ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, white); + + hr = ID3D11Device_CreateDeferredContext(device, 0, &deferred); + todo_wine ok(hr == S_OK, "Failed to create deferred context, hr %#x.\n", hr); + if (hr != S_OK) + { + release_test_context(&test_context); + return; + } + + ID3D11DeviceContext_ClearRenderTargetView(deferred, test_context.backbuffer_rtv, green); + + hr = ID3D11DeviceContext_FinishCommandList(deferred, TRUE, &list1); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); + + hr = ID3D11DeviceContext_FinishCommandList(deferred, TRUE, &list2); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); + + color = get_texture_color(test_context.backbuffer, 320, 240); + ok(color == 0xffffffff, "Got unexpected color %#08x.\n", color); + + ID3D11DeviceContext_ExecuteCommandList(immediate, list1, TRUE); + color = get_texture_color(test_context.backbuffer, 320, 240); + ok(color == 0xff00ff00, "Got unexpected color %#08x.\n", color); + + ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, white); + ID3D11DeviceContext_ExecuteCommandList(immediate, list1, TRUE); + color = get_texture_color(test_context.backbuffer, 320, 240); + ok(color == 0xff00ff00, "Got unexpected color %#08x.\n", color); + + ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, white); + ID3D11DeviceContext_ExecuteCommandList(immediate, list2, TRUE); + color = get_texture_color(test_context.backbuffer, 320, 240); + ok(color == 0xffffffff, "Got unexpected color %#08x.\n", color); + + ID3D11CommandList_Release(list2); + + ID3D11DeviceContext_ExecuteCommandList(deferred, list1, TRUE); + hr = ID3D11DeviceContext_FinishCommandList(deferred, TRUE, &list2); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); + + ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, white); + ID3D11DeviceContext_ExecuteCommandList(immediate, list2, TRUE); + color = get_texture_color(test_context.backbuffer, 320, 240); + ok(color == 0xff00ff00, "Got unexpected color %#08x.\n", color); + + ID3D11CommandList_Release(list2); + ID3D11CommandList_Release(list1); + ID3D11DeviceContext_Release(deferred); + + ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtv); + ok(hr == S_OK, "Failed to create view, hr %#x.\n", hr); + + ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, white); + ID3D11DeviceContext_ClearRenderTargetView(immediate, rtv, green); + + hr = ID3D11Device_CreateDeferredContext(device, 0, &deferred); + ok(hr == S_OK, "Failed to create deferred context, hr %#x.\n", hr); + + ID3D11DeviceContext_CopyResource(deferred, (ID3D11Resource *)test_context.backbuffer, (ID3D11Resource *)texture); + + hr = ID3D11DeviceContext_FinishCommandList(deferred, TRUE, &list1); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); + + ID3D11DeviceContext_ClearRenderTargetView(immediate, rtv, blue); + ID3D11DeviceContext_ExecuteCommandList(immediate, list1, TRUE); + color = get_texture_color(test_context.backbuffer, 320, 240); + ok(color == 0xffff0000, "Got unexpected color %#08x.\n", color); + + ID3D11CommandList_Release(list1); + ID3D11DeviceContext_Release(deferred); + + ID3D11RenderTargetView_Release(rtv); + ID3D11Texture2D_Release(texture); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -30401,6 +30503,7 @@ START_TEST(d3d11) queue_test(test_independent_blend); queue_test(test_dual_source_blend); queue_test(test_deferred_context_state); + queue_test(test_deferred_context_rendering); run_queued_tests(); }

1 0

Zebediah Figura : msdmo: Also handle ERROR_SUCCESS with nonzero size from RegQueryValueExW().
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: 2d4e21d45e0bc17d40d2c91e649938ab4d69e786 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d4e21d45e0bc17d40d2c91e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 30 16:31:18 2020 -0500 msdmo: Also handle ERROR_SUCCESS with nonzero size from RegQueryValueExW(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49659 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdmo/dmoreg.c | 20 +++++++++++++++----- dlls/msdmo/tests/msdmo.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 5 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 8e0680931f..33caa6d0dc 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -526,11 +526,16 @@ static HRESULT WINAPI IEnumDMO_fnNext( if (This->pInTypes) { - DWORD size = types_size, i; + DWORD size, i; - while ((ret = RegQueryValueExW(hkey, L"InputTypes", NULL, NULL, - (BYTE *)types, &size)) == ERROR_MORE_DATA) + for (;;) { + size = types_size; + ret = RegQueryValueExW(hkey, L"InputTypes", NULL, NULL, (BYTE *)types, &size); + if (ret != ERROR_SUCCESS && ret != ERROR_MORE_DATA) + break; + if (size <= types_size) + break; if (!array_reserve((void **)&types, &types_size, size, 1)) { RegCloseKey(hkey); @@ -559,9 +564,14 @@ static HRESULT WINAPI IEnumDMO_fnNext( { DWORD size = types_size, i; - while ((ret = RegQueryValueExW(hkey, L"OutputTypes", NULL, NULL, - (BYTE *)types, &size)) == ERROR_MORE_DATA) + for (;;) { + size = types_size; + ret = RegQueryValueExW(hkey, L"OutputTypes", NULL, NULL, (BYTE *)types, &size); + if (ret != ERROR_SUCCESS && ret != ERROR_MORE_DATA) + break; + if (size <= types_size) + break; if (!array_reserve((void **)&types, &types_size, size, 1)) { RegCloseKey(hkey); diff --git a/dlls/msdmo/tests/msdmo.c b/dlls/msdmo/tests/msdmo.c index a1ab8ee00d..b1b2f544ce 100644 --- a/dlls/msdmo/tests/msdmo.c +++ b/dlls/msdmo/tests/msdmo.c @@ -88,6 +88,9 @@ static void test_DMOGetName(void) static void test_DMOEnum(void) { + static const DMO_PARTIAL_MEDIATYPE input_type = {{0x1111}, {0x2222}}; + static const DMO_PARTIAL_MEDIATYPE wrong_type = {{0x3333}, {0x4444}}; + IEnumDMO *enum_dmo; HRESULT hr; CLSID clsid; @@ -115,6 +118,47 @@ static void test_DMOEnum(void) ok(count == 0, "expected 0, got %d\n", count); IEnumDMO_Release(enum_dmo); + + hr = DMORegister(L"testdmo", &GUID_unknowndmo, &GUID_unknowncategory, 0, 1, &input_type, 0, NULL); + if (hr != S_OK) + return; + + hr = DMOEnum(&GUID_unknowncategory, 0, 0, NULL, 0, NULL, &enum_dmo); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&clsid, &GUID_unknowndmo), "Got clsid %s.\n", debugstr_guid(&clsid)); + ok(!wcscmp(name, L"testdmo"), "Got name %s.\n", debugstr_w(name)); + + hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumDMO_Release(enum_dmo); + + hr = DMOEnum(&GUID_unknowncategory, 0, 1, &input_type, 0, NULL, &enum_dmo); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&clsid, &GUID_unknowndmo), "Got clsid %s.\n", debugstr_guid(&clsid)); + ok(!wcscmp(name, L"testdmo"), "Got name %s.\n", debugstr_w(name)); + + hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumDMO_Release(enum_dmo); + + hr = DMOEnum(&GUID_unknowncategory, 0, 1, &wrong_type, 0, NULL, &enum_dmo); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumDMO_Release(enum_dmo); + + hr = DMOUnregister(&GUID_unknowndmo, &GUID_unknowncategory); + ok(hr == S_OK, "Got hr %#x.\n", hr); } static void test_DMOGetTypes(void)

1 0

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

Oct. 1, 2020

Module: wine Branch: master Commit: 1c2d53faa261e156bd220ff5161af6f5909e4884 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c2d53faa261e156bd220ff5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Sep 30 23:14:54 2020 +0200 dhcpcsvc/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/dhcpcsvc/tests/dhcpcsvc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dhcpcsvc/tests/dhcpcsvc.c b/dlls/dhcpcsvc/tests/dhcpcsvc.c index 8b47fe57d5..547fb51532 100644 --- a/dlls/dhcpcsvc/tests/dhcpcsvc.c +++ b/dlls/dhcpcsvc/tests/dhcpcsvc.c @@ -43,7 +43,7 @@ static IP_ADAPTER_ADDRESSES *get_adapters(void) static void test_DhcpRequestParams(void) { - static WCHAR nosuchW[] = {'n','o','s','u','c','h','a','d','a','p','t','e','r',0}; + static WCHAR nosuchW[] = L"nosuchadapter"; DHCPCAPI_PARAMS params[6]; DHCPCAPI_PARAMS_ARRAY send_params, recv_params; IP_ADAPTER_ADDRESSES *adapters, *ptr;

1 0

Alexandre Julliard : odbc32: Move the Unix functions interface to a new Unix library.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: 797f11612016205f78278f1e39f622e2f98d41b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=797f11612016205f78278f1e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 1 12:14:20 2020 +0200 odbc32: Move the Unix functions interface to a new Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbc32/Makefile.in | 3 +- dlls/odbc32/proxyodbc.c | 1801 +++++++++++++++++++++++++++-------------------- dlls/odbc32/unixlib.c | 1082 ++++++++++++++++++++++++++++ dlls/odbc32/unixlib.h | 155 ++++ 4 files changed, 2283 insertions(+), 758 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=797f11612016205f7827…

1 0

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

Oct. 1, 2020

Module: wine Branch: master Commit: eadbba41246d26523cef48323deea46f2a45b310 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eadbba41246d26523cef4832… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Sep 30 23:14:50 2020 +0200 comsvcs/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/comsvcs/tests/comsvcs.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index ca59951c81..4e9471e734 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -176,9 +176,6 @@ static DWORD WINAPI com_thread(void *arg) static void create_dispenser(void) { - static const WCHAR pool0[] = {'S','C','.','P','o','o','l',' ','0',' ','0',0}; - static const WCHAR pool1[] = {'S','C','.','P','o','o','l',' ','1',' ','1',0}; - static const WCHAR data[] = {'d','a','t','a','1',0}; HRESULT hr; IDispenserManager *dispenser = NULL; IHolder *holder1 = NULL, *holder2 = NULL, *holder3 = NULL; @@ -203,7 +200,7 @@ static void create_dispenser(void) init_test_driver(&driver); - hr = IDispenserManager_RegisterDispenser(dispenser, &driver.IDispenserDriver_iface, pool0, &holder1); + hr = IDispenserManager_RegisterDispenser(dispenser, &driver.IDispenserDriver_iface, L"SC.Pool 0 0", &holder1); ok(hr == S_OK, "got 0x%08x\n", hr); /* The above call creates an MTA thread, but we need to wait for it to @@ -214,11 +211,11 @@ static void create_dispenser(void) GetExitCodeThread(thread, &ret); ok(ret == S_OK, "got unexpected hr %#x\n", ret); - hr = IDispenserManager_RegisterDispenser(dispenser, &driver.IDispenserDriver_iface, pool0, &holder2); + hr = IDispenserManager_RegisterDispenser(dispenser, &driver.IDispenserDriver_iface, L"SC.Pool 0 0", &holder2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(holder1 != holder2, "same holder object returned\n"); - hr = IDispenserManager_RegisterDispenser(dispenser, &driver.IDispenserDriver_iface, pool1, &holder3); + hr = IDispenserManager_RegisterDispenser(dispenser, &driver.IDispenserDriver_iface, L"SC.Pool 1 1", &holder3); ok(hr == S_OK, "got 0x%08x\n", hr); if(holder1) @@ -226,7 +223,7 @@ static void create_dispenser(void) SET_EXPECT(driver_CreateResource); SET_EXPECT(driver_Release); - str = SysAllocString(data); + str = SysAllocString(L"data1"); hr = IHolder_AllocResource(holder1, (RESTYPID)str, &resid); ok(hr == S_OK, "got 0x%08x\n", hr); ok(resid == 10, "got %d\n", (int)resid); @@ -254,7 +251,7 @@ static void create_dispenser(void) SET_EXPECT(driver_CreateResource); SET_EXPECT(driver_Release); - str = SysAllocString(data); + str = SysAllocString(L"data1"); hr = IHolder_AllocResource(holder2, (RESTYPID)str, &resid); ok(hr == S_OK, "got 0x%08x\n", hr); ok(resid == 10, "got %d\n", (int)resid);

1 0

Esme Povirk : dism: Add version resource.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: a56b9733422ea6b276ae0a7e9bd6be0a4e641186 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a56b9733422ea6b276ae0a7e… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Sep 30 14:19:57 2020 -0500 dism: Add version resource. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49909 Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/dism/Makefile.in | 2 ++ programs/dism/version.rc | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/programs/dism/Makefile.in b/programs/dism/Makefile.in index 61d9fa4512..fed7a2d147 100644 --- a/programs/dism/Makefile.in +++ b/programs/dism/Makefile.in @@ -2,4 +2,6 @@ MODULE = dism.exe EXTRADLLFLAGS = -mconsole -municode -mno-cygwin +RC_SRCS = version.rc + C_SRCS = dism.c diff --git a/programs/dism/version.rc b/programs/dism/version.rc new file mode 100644 index 0000000000..d0021b9b40 --- /dev/null +++ b/programs/dism/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2020 Esme Povirk + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine dism" +#define WINE_FILENAME_STR "dism.exe" +#define WINE_FILETYPE VFT_APP +#define WINE_FILEVERSION 10,0,18362,900 +#define WINE_FILEVERSION_STR "10.0.18362.900" +#define WINE_PRODUCTVERSION 10,0,18362,900 +#define WINE_PRODUCTVERSION_STR "10.0.18362.900" + +#include "wine/wine_common_ver.rc"

1 0

Paul Gofman : kernelbase: Move FlsAlloc() implementation to ntdll.RtlFlsAlloc().
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: c955eee9e8ba92118f2192578128d4756030c7a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c955eee9e8ba92118f219257… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Sep 29 23:15:29 2020 +0300 kernelbase: Move FlsAlloc() implementation to ntdll.RtlFlsAlloc(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/fiber.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/thread.c | 32 +------------------------------- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/thread.c | 43 +++++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 1 + 5 files changed, 88 insertions(+), 31 deletions(-) diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c index db2bd0923b..b058dae749 100644 --- a/dlls/kernel32/tests/fiber.c +++ b/dlls/kernel32/tests/fiber.c @@ -18,6 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> + +#include <ntstatus.h> +#define WIN32_NO_STATUS +#include <winternl.h> #include "wine/test.h" static LPVOID (WINAPI *pCreateFiber)(SIZE_T,LPFIBER_START_ROUTINE,LPVOID); @@ -32,6 +37,7 @@ static DWORD (WINAPI *pFlsAlloc)(PFLS_CALLBACK_FUNCTION); static BOOL (WINAPI *pFlsFree)(DWORD); static PVOID (WINAPI *pFlsGetValue)(DWORD); static BOOL (WINAPI *pFlsSetValue)(DWORD,PVOID); +static NTSTATUS (WINAPI *pRtlFlsAlloc)(PFLS_CALLBACK_FUNCTION,DWORD*); static void *fibers[3]; static BYTE testparam = 185; @@ -44,6 +50,7 @@ static int cbCount = 0; static VOID init_funcs(void) { HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); + HMODULE hntdll = GetModuleHandleA("ntdll.dll"); #define X(f) p##f = (void*)GetProcAddress(hKernel32, #f); X(CreateFiber); @@ -59,6 +66,11 @@ static VOID init_funcs(void) X(FlsGetValue); X(FlsSetValue); #undef X + +#define X(f) p##f = (void*)GetProcAddress(hntdll, #f); + X(RtlFlsAlloc); +#undef X + } static VOID WINAPI FiberLocalStorageProc(PVOID lpFlsData) @@ -171,9 +183,14 @@ static void test_FiberHandling(void) if (pIsThreadAFiber) ok(!pIsThreadAFiber(), "IsThreadAFiber reported TRUE\n"); } +#define FLS_TEST_INDEX_COUNT 4096 + static void test_FiberLocalStorage(void) { + static DWORD fls_indices[FLS_TEST_INDEX_COUNT]; + unsigned int i, count; DWORD fls, fls_2; + NTSTATUS status; BOOL ret; void* val; @@ -183,6 +200,31 @@ static void test_FiberLocalStorage(void) return; } + if (pRtlFlsAlloc) + { + for (i = 0; i < FLS_TEST_INDEX_COUNT; ++i) + { + fls_indices[i] = 0xdeadbeef; + status = pRtlFlsAlloc(NULL, &fls_indices[i]); + ok(!status || status == STATUS_NO_MEMORY, "Got unexpected status %#x.\n", status); + if (status) + { + ok(fls_indices[i] == 0xdeadbeef, "Got unexpected index %#x.\n", fls_indices[i]); + break; + } + } + count = i; + /* FLS limits are increased since Win10 18312. */ + ok(count && (count <= 127 || (count > 4000 && count < 4096)), "Got unexpected count %u.\n", count); + + for (i = 0; i < count; ++i) + pFlsFree(fls_indices[i]); + } + else + { + win_skip("RtlFlsAlloc is not available.\n"); + } + /* Test an unallocated index * FlsFree should fail * FlsGetValue and FlsSetValue should succeed diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index f20d460d07..c302bbd1b8 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -1066,38 +1066,8 @@ void WINAPI DECLSPEC_HOTPATCH SwitchToFiber( LPVOID fiber ) DWORD WINAPI DECLSPEC_HOTPATCH FlsAlloc( PFLS_CALLBACK_FUNCTION callback ) { DWORD index; - PEB * const peb = NtCurrentTeb()->Peb; - RtlAcquirePebLock(); - if (!peb->FlsCallback && - !(peb->FlsCallback = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - 8 * sizeof(peb->FlsBitmapBits) * sizeof(void*) ))) - { - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); - index = FLS_OUT_OF_INDEXES; - } - else - { - index = RtlFindClearBitsAndSet( peb->FlsBitmap, 1, 1 ); - if (index != ~0U) - { - if (!NtCurrentTeb()->FlsSlots && - !(NtCurrentTeb()->FlsSlots = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - 8 * sizeof(peb->FlsBitmapBits) * sizeof(void*) ))) - { - RtlClearBits( peb->FlsBitmap, index, 1 ); - index = FLS_OUT_OF_INDEXES; - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); - } - else - { - NtCurrentTeb()->FlsSlots[index] = 0; /* clear the value */ - peb->FlsCallback[index] = callback; - } - } - else SetLastError( ERROR_NO_MORE_ITEMS ); - } - RtlReleasePebLock(); + if (!set_ntstatus( RtlFlsAlloc( callback, &index ))) return FLS_OUT_OF_INDEXES; return index; } diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0ec73d3d1d..aac2af26f3 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -666,6 +666,7 @@ @ stdcall RtlFindSetRuns(ptr ptr long long) @ stdcall RtlFirstEntrySList(ptr) @ stdcall RtlFirstFreeAce(ptr ptr) +@ stdcall RtlFlsAlloc(ptr ptr) @ stub RtlFlushPropertySet # @ stub RtlFlushSecureMemoryCache @ stdcall RtlFormatCurrentUserKeyPath(ptr) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 0f31fe18a7..f277a52dc0 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -246,3 +246,46 @@ TEB_ACTIVE_FRAME * WINAPI RtlGetFrame(void) { return NtCurrentTeb()->ActiveFrame; } + + +/*********************************************************************** + * Fibers + ***********************************************************************/ + + +/*********************************************************************** + * RtlFlsAlloc (NTDLL.@) + */ +NTSTATUS WINAPI DECLSPEC_HOTPATCH RtlFlsAlloc( PFLS_CALLBACK_FUNCTION callback, DWORD *ret_index ) +{ + PEB * const peb = NtCurrentTeb()->Peb; + NTSTATUS status = STATUS_NO_MEMORY; + DWORD index; + + RtlAcquirePebLock(); + if (peb->FlsCallback || + (peb->FlsCallback = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, + 8 * sizeof(peb->FlsBitmapBits) * sizeof(void*) ))) + { + index = RtlFindClearBitsAndSet( peb->FlsBitmap, 1, 1 ); + if (index != ~0U) + { + if (!NtCurrentTeb()->FlsSlots && + !(NtCurrentTeb()->FlsSlots = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, + 8 * sizeof(peb->FlsBitmapBits) * sizeof(void*) ))) + { + RtlClearBits( peb->FlsBitmap, index, 1 ); + } + else + { + NtCurrentTeb()->FlsSlots[index] = 0; /* clear the value */ + peb->FlsCallback[index] = callback; + status = STATUS_SUCCESS; + } + } + } + RtlReleasePebLock(); + if (!status) + *ret_index = index; + return status; +} diff --git a/include/winternl.h b/include/winternl.h index 7be69b2901..ba9d944259 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3371,6 +3371,7 @@ NTSYSAPI ULONG WINAPI RtlFindSetBits(PCRTL_BITMAP,ULONG,ULONG); NTSYSAPI ULONG WINAPI RtlFindSetBitsAndClear(PRTL_BITMAP,ULONG,ULONG); NTSYSAPI ULONG WINAPI RtlFindSetRuns(PCRTL_BITMAP,PRTL_BITMAP_RUN,ULONG,BOOLEAN); NTSYSAPI BOOLEAN WINAPI RtlFirstFreeAce(PACL,PACE_HEADER *); +NTSYSAPI NTSTATUS WINAPI RtlFlsAlloc(PFLS_CALLBACK_FUNCTION,ULONG *); NTSYSAPI NTSTATUS WINAPI RtlFormatCurrentUserKeyPath(PUNICODE_STRING); NTSYSAPI NTSTATUS WINAPI RtlFormatMessage(LPCWSTR,ULONG,BOOLEAN,BOOLEAN,BOOLEAN,__ms_va_list *,LPWSTR,ULONG,ULONG*); NTSYSAPI NTSTATUS WINAPI RtlFormatMessageEx(LPCWSTR,ULONG,BOOLEAN,BOOLEAN,BOOLEAN,__ms_va_list *,LPWSTR,ULONG,ULONG*,ULONG);

1 0

Robert Wilhelm : vbscript: Fix return value of lookup_identifier().
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: 26ad403cbd0b7faf4bec27f4c305594416e84fe8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26ad403cbd0b7faf4bec27f4… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Tue Sep 29 18:44:57 2020 +0200 vbscript: Fix return value of lookup_identifier(). Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 342b7820ec..f050b23c1c 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -146,7 +146,7 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ if(!wcsicmp(ctx->func->vars[i].name, name)) { ref->type = REF_VAR; ref->u.v = ctx->vars+i; - return TRUE; + return S_OK; } }

1 0

Paul Gofman : kernelbase: Move FlsFree() implementation to ntdll.RtlFlsFree().
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: 0627fa9d9217c18278c8ea9c96740815b70d850f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0627fa9d9217c18278c8ea9c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Sep 29 23:15:30 2020 +0300 kernelbase: Move FlsFree() implementation to ntdll.RtlFlsFree(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/fiber.c | 8 ++++++-- dlls/kernelbase/thread.c | 15 +-------------- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/thread.c | 24 +++++++++++++++++++++++- include/winternl.h | 1 + 5 files changed, 32 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c index b058dae749..0304dcfcde 100644 --- a/dlls/kernel32/tests/fiber.c +++ b/dlls/kernel32/tests/fiber.c @@ -38,7 +38,7 @@ static BOOL (WINAPI *pFlsFree)(DWORD); static PVOID (WINAPI *pFlsGetValue)(DWORD); static BOOL (WINAPI *pFlsSetValue)(DWORD,PVOID); static NTSTATUS (WINAPI *pRtlFlsAlloc)(PFLS_CALLBACK_FUNCTION,DWORD*); - +static NTSTATUS (WINAPI *pRtlFlsFree)(ULONG); static void *fibers[3]; static BYTE testparam = 185; static DWORD fls_index_to_set = FLS_OUT_OF_INDEXES; @@ -69,6 +69,7 @@ static VOID init_funcs(void) #define X(f) p##f = (void*)GetProcAddress(hntdll, #f); X(RtlFlsAlloc); + X(RtlFlsFree); #undef X } @@ -218,7 +219,10 @@ static void test_FiberLocalStorage(void) ok(count && (count <= 127 || (count > 4000 && count < 4096)), "Got unexpected count %u.\n", count); for (i = 0; i < count; ++i) - pFlsFree(fls_indices[i]); + { + status = pRtlFlsFree(fls_indices[i]); + ok(!status, "Got unexpected status %#x.\n", status); + } } else { diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index c302bbd1b8..bce77787ef 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -1077,20 +1077,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH FlsAlloc( PFLS_CALLBACK_FUNCTION callback ) */ BOOL WINAPI DECLSPEC_HOTPATCH FlsFree( DWORD index ) { - BOOL ret; - - RtlAcquirePebLock(); - ret = RtlAreBitsSet( NtCurrentTeb()->Peb->FlsBitmap, index, 1 ); - if (ret) RtlClearBits( NtCurrentTeb()->Peb->FlsBitmap, index, 1 ); - if (ret) - { - /* FIXME: call Fls callback */ - /* FIXME: add equivalent of ThreadZeroTlsCell here */ - if (NtCurrentTeb()->FlsSlots) NtCurrentTeb()->FlsSlots[index] = 0; - } - else SetLastError( ERROR_INVALID_PARAMETER ); - RtlReleasePebLock(); - return ret; + return set_ntstatus( RtlFlsFree( index )); } diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index aac2af26f3..5cf7e31b01 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -667,6 +667,7 @@ @ stdcall RtlFirstEntrySList(ptr) @ stdcall RtlFirstFreeAce(ptr ptr) @ stdcall RtlFlsAlloc(ptr ptr) +@ stdcall RtlFlsFree(long) @ stub RtlFlushPropertySet # @ stub RtlFlushSecureMemoryCache @ stdcall RtlFormatCurrentUserKeyPath(ptr) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index f277a52dc0..bbec1f9872 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -256,7 +256,7 @@ TEB_ACTIVE_FRAME * WINAPI RtlGetFrame(void) /*********************************************************************** * RtlFlsAlloc (NTDLL.@) */ -NTSTATUS WINAPI DECLSPEC_HOTPATCH RtlFlsAlloc( PFLS_CALLBACK_FUNCTION callback, DWORD *ret_index ) +NTSTATUS WINAPI DECLSPEC_HOTPATCH RtlFlsAlloc( PFLS_CALLBACK_FUNCTION callback, ULONG *ret_index ) { PEB * const peb = NtCurrentTeb()->Peb; NTSTATUS status = STATUS_NO_MEMORY; @@ -289,3 +289,25 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH RtlFlsAlloc( PFLS_CALLBACK_FUNCTION callback, *ret_index = index; return status; } + + +/*********************************************************************** + * RtlFlsFree (NTDLL.@) + */ +NTSTATUS WINAPI DECLSPEC_HOTPATCH RtlFlsFree( ULONG index ) +{ + NTSTATUS status; + + RtlAcquirePebLock(); + if (RtlAreBitsSet( NtCurrentTeb()->Peb->FlsBitmap, index, 1 )) + { + RtlClearBits( NtCurrentTeb()->Peb->FlsBitmap, index, 1 ); + /* FIXME: call Fls callback */ + /* FIXME: add equivalent of ThreadZeroTlsCell here */ + if (NtCurrentTeb()->FlsSlots) NtCurrentTeb()->FlsSlots[index] = 0; + status = STATUS_SUCCESS; + } + else status = STATUS_INVALID_PARAMETER; + RtlReleasePebLock(); + return status; +} diff --git a/include/winternl.h b/include/winternl.h index ba9d944259..117d34bbfd 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3372,6 +3372,7 @@ NTSYSAPI ULONG WINAPI RtlFindSetBitsAndClear(PRTL_BITMAP,ULONG,ULONG); NTSYSAPI ULONG WINAPI RtlFindSetRuns(PCRTL_BITMAP,PRTL_BITMAP_RUN,ULONG,BOOLEAN); NTSYSAPI BOOLEAN WINAPI RtlFirstFreeAce(PACL,PACE_HEADER *); NTSYSAPI NTSTATUS WINAPI RtlFlsAlloc(PFLS_CALLBACK_FUNCTION,ULONG *); +NTSYSAPI NTSTATUS WINAPI RtlFlsFree(ULONG); NTSYSAPI NTSTATUS WINAPI RtlFormatCurrentUserKeyPath(PUNICODE_STRING); NTSYSAPI NTSTATUS WINAPI RtlFormatMessage(LPCWSTR,ULONG,BOOLEAN,BOOLEAN,BOOLEAN,__ms_va_list *,LPWSTR,ULONG,ULONG*); NTSYSAPI NTSTATUS WINAPI RtlFormatMessageEx(LPCWSTR,ULONG,BOOLEAN,BOOLEAN,BOOLEAN,__ms_va_list *,LPWSTR,ULONG,ULONG*,ULONG);

1 0

Paul Gofman : kernel32/tests: Fix fiber test errors on newer Win10.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: d25854ad3167e98f703b60d32acf0e7d94d51be6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d25854ad3167e98f703b60d3… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Sep 29 23:15:28 2020 +0300 kernel32/tests: Fix fiber test errors on newer Win10. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/fiber.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c index 7501165dc8..db2bd0923b 100644 --- a/dlls/kernel32/tests/fiber.c +++ b/dlls/kernel32/tests/fiber.c @@ -217,13 +217,12 @@ static void test_FiberLocalStorage(void) SetLastError( 0xdeadbeef ); ret = pFlsSetValue( 128, (void*) 0x217 ); - ok( !ret, "setting fls index 128 (out of bounds) succeeded\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, + ok( ret || GetLastError() == ERROR_INVALID_PARAMETER, "setting fls index 128 (out of bounds) wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); val = pFlsGetValue( 128 ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, + ok( GetLastError() == ERROR_INVALID_PARAMETER || val == (void *)0x217, "getting fls index 128 (out of bounds) wrong error %u\n", GetLastError() ); /* Test index 0 */ @@ -276,7 +275,7 @@ static void test_FiberLocalStorage(void) SetLastError( 0xdeadbeef ); val = pFlsGetValue( fls_2 ); - ok( val == NULL, "fls index %u wrong value %p\n", fls, val ); + ok( val == NULL || val == (void *)0xdeadbabe, "fls index %u wrong value %p\n", fls, val ); ok( GetLastError() == ERROR_SUCCESS, "getting fls index %u failed with error %u\n", fls_2, GetLastError() ); pFlsFree( fls_2 );

1 0

Paul Gofman : kernelbase: Move FlsSetValue() implementation to ntdll.RtlFlsSetValue().
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: e596f4047ba5cc08a8324756f04851e09e8f629b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e596f4047ba5cc08a8324756… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Sep 29 23:15:31 2020 +0300 kernelbase: Move FlsSetValue() implementation to ntdll.RtlFlsSetValue(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/fiber.c | 14 ++++++++++++++ dlls/kernelbase/thread.c | 15 +-------------- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/thread.c | 18 ++++++++++++++++++ include/winternl.h | 1 + 5 files changed, 35 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c index 0304dcfcde..4ffbe8916d 100644 --- a/dlls/kernel32/tests/fiber.c +++ b/dlls/kernel32/tests/fiber.c @@ -39,6 +39,7 @@ static PVOID (WINAPI *pFlsGetValue)(DWORD); static BOOL (WINAPI *pFlsSetValue)(DWORD,PVOID); static NTSTATUS (WINAPI *pRtlFlsAlloc)(PFLS_CALLBACK_FUNCTION,DWORD*); static NTSTATUS (WINAPI *pRtlFlsFree)(ULONG); +static NTSTATUS (WINAPI *pRtlFlsSetValue)(ULONG,void *); static void *fibers[3]; static BYTE testparam = 185; static DWORD fls_index_to_set = FLS_OUT_OF_INDEXES; @@ -70,6 +71,7 @@ static VOID init_funcs(void) #define X(f) p##f = (void*)GetProcAddress(hntdll, #f); X(RtlFlsAlloc); X(RtlFlsFree); + X(RtlFlsSetValue); #undef X } @@ -213,6 +215,11 @@ static void test_FiberLocalStorage(void) ok(fls_indices[i] == 0xdeadbeef, "Got unexpected index %#x.\n", fls_indices[i]); break; } + if (pRtlFlsSetValue) + { + status = pRtlFlsSetValue(fls_indices[i], (void *)(ULONG_PTR)(i + 1)); + ok(!status, "Got unexpected status %#x.\n", status); + } } count = i; /* FLS limits are increased since Win10 18312. */ @@ -280,6 +287,11 @@ static void test_FiberLocalStorage(void) ret = pFlsSetValue( 0, (void *)0xdeadbeef ); ok( !ret, "setting fls index 0 succeeded\n" ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "setting fls index wrong error %u\n", GetLastError() ); + if (pRtlFlsSetValue) + { + status = pRtlFlsSetValue( 0, (void *)0xdeadbeef ); + ok( status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status ); + } SetLastError( 0xdeadbeef ); val = pFlsGetValue( 0 ); ok( !val, "fls index 0 wrong value %p\n", val ); @@ -291,8 +303,10 @@ static void test_FiberLocalStorage(void) ok( fls != 0, "fls index 0 allocated\n" ); val = pFlsGetValue( fls ); ok( !val, "fls index %u wrong value %p\n", fls, val ); + SetLastError( 0xdeadbeef ); ret = pFlsSetValue( fls, (void *)0xdeadbeef ); ok( ret, "setting fls index %u failed\n", fls ); + ok( GetLastError() == 0xdeadbeef, "setting fls index wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); val = pFlsGetValue( fls ); ok( val == (void *)0xdeadbeef, "fls index %u wrong value %p\n", fls, val ); diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index bce77787ef..0aacff4008 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -1101,20 +1101,7 @@ PVOID WINAPI DECLSPEC_HOTPATCH FlsGetValue( DWORD index ) */ BOOL WINAPI DECLSPEC_HOTPATCH FlsSetValue( DWORD index, PVOID data ) { - if (!index || index >= 8 * sizeof(NtCurrentTeb()->Peb->FlsBitmapBits)) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return FALSE; - } - if (!NtCurrentTeb()->FlsSlots && - !(NtCurrentTeb()->FlsSlots = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - 8 * sizeof(NtCurrentTeb()->Peb->FlsBitmapBits) * sizeof(void*) ))) - { - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); - return FALSE; - } - NtCurrentTeb()->FlsSlots[index] = data; - return TRUE; + return set_ntstatus( RtlFlsSetValue( index, data )); } diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 5cf7e31b01..87ac9c6cb2 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -668,6 +668,7 @@ @ stdcall RtlFirstFreeAce(ptr ptr) @ stdcall RtlFlsAlloc(ptr ptr) @ stdcall RtlFlsFree(long) +@ stdcall RtlFlsSetValue(long ptr) @ stub RtlFlushPropertySet # @ stub RtlFlushSecureMemoryCache @ stdcall RtlFormatCurrentUserKeyPath(ptr) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index bbec1f9872..15bfe4c304 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -311,3 +311,21 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH RtlFlsFree( ULONG index ) RtlReleasePebLock(); return status; } + + +/*********************************************************************** + * RtlFlsSetValue (NTDLL.@) + */ +NTSTATUS WINAPI DECLSPEC_HOTPATCH RtlFlsSetValue( ULONG index, void *data ) +{ + if (!index || index >= 8 * sizeof(NtCurrentTeb()->Peb->FlsBitmapBits)) + return STATUS_INVALID_PARAMETER; + + if (!NtCurrentTeb()->FlsSlots && + !(NtCurrentTeb()->FlsSlots = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, + 8 * sizeof(NtCurrentTeb()->Peb->FlsBitmapBits) * sizeof(void*) ))) + return STATUS_NO_MEMORY; + + NtCurrentTeb()->FlsSlots[index] = data; + return STATUS_SUCCESS; +} diff --git a/include/winternl.h b/include/winternl.h index 117d34bbfd..2e490dcfef 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3373,6 +3373,7 @@ NTSYSAPI ULONG WINAPI RtlFindSetRuns(PCRTL_BITMAP,PRTL_BITMAP_RUN,ULONG,BOOL NTSYSAPI BOOLEAN WINAPI RtlFirstFreeAce(PACL,PACE_HEADER *); NTSYSAPI NTSTATUS WINAPI RtlFlsAlloc(PFLS_CALLBACK_FUNCTION,ULONG *); NTSYSAPI NTSTATUS WINAPI RtlFlsFree(ULONG); +NTSYSAPI NTSTATUS WINAPI RtlFlsSetValue(ULONG,void *); NTSYSAPI NTSTATUS WINAPI RtlFormatCurrentUserKeyPath(PUNICODE_STRING); NTSYSAPI NTSTATUS WINAPI RtlFormatMessage(LPCWSTR,ULONG,BOOLEAN,BOOLEAN,BOOLEAN,__ms_va_list *,LPWSTR,ULONG,ULONG*); NTSYSAPI NTSTATUS WINAPI RtlFormatMessageEx(LPCWSTR,ULONG,BOOLEAN,BOOLEAN,BOOLEAN,__ms_va_list *,LPWSTR,ULONG,ULONG*,ULONG);

1 0

Paul Gofman : kernelbase: Move FlsGetValue() implementation to ntdll.RtlFlsGetValue().
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: wine Branch: master Commit: defcbc8b97e45d879deb366dc32a1c1c5f5fac8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=defcbc8b97e45d879deb366d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Sep 29 23:15:32 2020 +0300 kernelbase: Move FlsGetValue() implementation to ntdll.RtlFlsGetValue(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/fiber.c | 49 +++++++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/thread.c | 10 ++++----- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/thread.c | 14 +++++++++++++ include/winternl.h | 1 + 5 files changed, 69 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c index 4ffbe8916d..b15bf468ea 100644 --- a/dlls/kernel32/tests/fiber.c +++ b/dlls/kernel32/tests/fiber.c @@ -40,6 +40,7 @@ static BOOL (WINAPI *pFlsSetValue)(DWORD,PVOID); static NTSTATUS (WINAPI *pRtlFlsAlloc)(PFLS_CALLBACK_FUNCTION,DWORD*); static NTSTATUS (WINAPI *pRtlFlsFree)(ULONG); static NTSTATUS (WINAPI *pRtlFlsSetValue)(ULONG,void *); +static NTSTATUS (WINAPI *pRtlFlsGetValue)(ULONG,void **); static void *fibers[3]; static BYTE testparam = 185; static DWORD fls_index_to_set = FLS_OUT_OF_INDEXES; @@ -72,6 +73,7 @@ static VOID init_funcs(void) X(RtlFlsAlloc); X(RtlFlsFree); X(RtlFlsSetValue); + X(RtlFlsGetValue); #undef X } @@ -205,6 +207,16 @@ static void test_FiberLocalStorage(void) if (pRtlFlsAlloc) { + if (pRtlFlsGetValue) + { + status = pRtlFlsGetValue(0, NULL); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status); + } + else + { + win_skip("RtlFlsGetValue is not available.\n"); + } + for (i = 0; i < FLS_TEST_INDEX_COUNT; ++i) { fls_indices[i] = 0xdeadbeef; @@ -225,8 +237,21 @@ static void test_FiberLocalStorage(void) /* FLS limits are increased since Win10 18312. */ ok(count && (count <= 127 || (count > 4000 && count < 4096)), "Got unexpected count %u.\n", count); + if (0) + { + /* crashes on Windows. */ + pRtlFlsGetValue(fls_indices[0], NULL); + } + for (i = 0; i < count; ++i) { + if (pRtlFlsGetValue) + { + status = pRtlFlsGetValue(fls_indices[i], &val); + ok(!status, "Got unexpected status %#x.\n", status); + ok(val == (void *)(ULONG_PTR)(i + 1), "Got unexpected val %p.\n", val); + } + status = pRtlFlsFree(fls_indices[i]); ok(!status, "Got unexpected status %#x.\n", status); } @@ -250,6 +275,14 @@ static void test_FiberLocalStorage(void) ok( val == NULL, "getting fls index 127 (unallocated) failed with error %u\n", GetLastError() ); + if (pRtlFlsGetValue) + { + val = (void *)0xdeadbeef; + status = pRtlFlsGetValue(127, &val); + ok( !status, "Got unexpected status %#x.\n", status ); + ok( !val, "Got unexpected val %p.\n", val ); + } + ret = pFlsSetValue( 127, (void*) 0x217 ); ok( ret, "setting fls index 127 (unallocated) failed with error %u\n", GetLastError() ); @@ -259,6 +292,14 @@ static void test_FiberLocalStorage(void) ok( GetLastError() == ERROR_SUCCESS, "getting fls index 127 (unallocated) failed with error %u\n", GetLastError() ); + if (pRtlFlsGetValue) + { + val = (void *)0xdeadbeef; + status = pRtlFlsGetValue(127, &val); + ok( !status, "Got unexpected status %#x.\n", status ); + ok( val == (void*)0x217, "Got unexpected val %p.\n", val ); + } + /* FlsFree, FlsGetValue, and FlsSetValue out of bounds should return * ERROR_INVALID_PARAMETER */ @@ -283,6 +324,14 @@ static void test_FiberLocalStorage(void) val = pFlsGetValue( 0 ); ok( !val, "fls index 0 set to %p\n", val ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "setting fls index wrong error %u\n", GetLastError() ); + if (pRtlFlsGetValue) + { + val = (void *)0xdeadbeef; + status = pRtlFlsGetValue(0, &val); + ok( status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status ); + ok( val == (void*)0xdeadbeef, "Got unexpected val %p.\n", val ); + } + SetLastError( 0xdeadbeef ); ret = pFlsSetValue( 0, (void *)0xdeadbeef ); ok( !ret, "setting fls index 0 succeeded\n" ); diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index 0aacff4008..0bfef62a7d 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -1086,13 +1086,11 @@ BOOL WINAPI DECLSPEC_HOTPATCH FlsFree( DWORD index ) */ PVOID WINAPI DECLSPEC_HOTPATCH FlsGetValue( DWORD index ) { - if (!index || index >= 8 * sizeof(NtCurrentTeb()->Peb->FlsBitmapBits) || !NtCurrentTeb()->FlsSlots) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return NULL; - } + void *data; + + if (!set_ntstatus( RtlFlsGetValue( index, &data ))) return NULL; SetLastError( ERROR_SUCCESS ); - return NtCurrentTeb()->FlsSlots[index]; + return data; } diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 87ac9c6cb2..ce9f6281d5 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -668,6 +668,7 @@ @ stdcall RtlFirstFreeAce(ptr ptr) @ stdcall RtlFlsAlloc(ptr ptr) @ stdcall RtlFlsFree(long) +@ stdcall RtlFlsGetValue(long ptr) @ stdcall RtlFlsSetValue(long ptr) @ stub RtlFlushPropertySet # @ stub RtlFlushSecureMemoryCache diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 15bfe4c304..716ef3b61d 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -329,3 +329,17 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH RtlFlsSetValue( ULONG index, void *data ) NtCurrentTeb()->FlsSlots[index] = data; return STATUS_SUCCESS; } + + +/*********************************************************************** + * RtlFlsGetValue (NTDLL.@) + */ +NTSTATUS WINAPI DECLSPEC_HOTPATCH RtlFlsGetValue( ULONG index, void **data ) +{ + if (!index || index >= 8 * sizeof(NtCurrentTeb()->Peb->FlsBitmapBits) || !NtCurrentTeb()->FlsSlots) + return STATUS_INVALID_PARAMETER; + + *data = NtCurrentTeb()->FlsSlots[index]; + + return STATUS_SUCCESS; +} diff --git a/include/winternl.h b/include/winternl.h index 2e490dcfef..82328167c9 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3373,6 +3373,7 @@ NTSYSAPI ULONG WINAPI RtlFindSetRuns(PCRTL_BITMAP,PRTL_BITMAP_RUN,ULONG,BOOL NTSYSAPI BOOLEAN WINAPI RtlFirstFreeAce(PACL,PACE_HEADER *); NTSYSAPI NTSTATUS WINAPI RtlFlsAlloc(PFLS_CALLBACK_FUNCTION,ULONG *); NTSYSAPI NTSTATUS WINAPI RtlFlsFree(ULONG); +NTSYSAPI NTSTATUS WINAPI RtlFlsGetValue(ULONG,void **); NTSYSAPI NTSTATUS WINAPI RtlFlsSetValue(ULONG,void *); NTSYSAPI NTSTATUS WINAPI RtlFormatCurrentUserKeyPath(PUNICODE_STRING); NTSYSAPI NTSTATUS WINAPI RtlFormatMessage(LPCWSTR,ULONG,BOOLEAN,BOOLEAN,BOOLEAN,__ms_va_list *,LPWSTR,ULONG,ULONG*);

1 0

Zebediah Figura : tests: Import vector indexing tests from Wine.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: vkd3d Branch: master Commit: fd9a568b8ae975ca4cb261ae00294112ed7613d3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fd9a568b8ae975ca4cb261a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 30 21:01:22 2020 -0500 tests: Import vector indexing 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 | 6 ++++++ tests/hlsl-vector-indexing-uniform.shader_test | 16 ++++++++++++++++ tests/hlsl-vector-indexing.shader_test | 14 ++++++++++++++ tests/shader_runner_d3d12.c | 15 +++++++++++++++ 4 files changed, 51 insertions(+) diff --git a/Makefile.am b/Makefile.am index bb69078..27bc00b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,6 +50,9 @@ vkd3d_shader_runners = \ tests/shader_runner_d3d12 vkd3d_shader_tests = \ + tests/conditional.shader_test \ + tests/hlsl-vector-indexing.shader_test \ + tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ tests/swizzle-0.shader_test \ tests/swizzle-1.shader_test \ @@ -178,6 +181,9 @@ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la SHADER_TEST_LOG_COMPILER = tests/shader_runner_d3d12 XFAIL_TESTS = \ + tests/conditional.shader_test \ + tests/hlsl-vector-indexing.shader_test \ + tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ tests/swizzle-0.shader_test \ tests/swizzle-1.shader_test \ diff --git a/tests/hlsl-vector-indexing-uniform.shader_test b/tests/hlsl-vector-indexing-uniform.shader_test new file mode 100644 index 0000000..2556b58 --- /dev/null +++ b/tests/hlsl-vector-indexing-uniform.shader_test @@ -0,0 +1,16 @@ +# Use a uniform to prevent the compiler from optimizing. + +[pixel shader] +uniform int i; +float4 main() : SV_TARGET +{ + float4 color = float4(0.5, 0.4, 0.3, 0.2); + color.g = color[i]; + color.b = 0.8; + return color; +} + +[test] +uniform 0 uint 2 +draw quad +probe all rgba (0.5, 0.3, 0.8, 0.2) diff --git a/tests/hlsl-vector-indexing.shader_test b/tests/hlsl-vector-indexing.shader_test new file mode 100644 index 0000000..b641d7f --- /dev/null +++ b/tests/hlsl-vector-indexing.shader_test @@ -0,0 +1,14 @@ +[pixel shader] +float4 main() : SV_TARGET +{ + float4 color; + color[0] = 0.020; + color[1] = 0.245; + color[2] = 0.351; + color[3] = 1.0; + return color; +} + +[test] +draw quad +probe all rgba (0.02, 0.245, 0.351, 1.0) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index e429d38..709fc00 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -211,6 +211,18 @@ static void parse_test_directive(struct shader_context *context, const char *lin } memcpy(context->uniforms + offset, &v, sizeof(v)); } + else if (match_string(line, "uint", &line)) + { + unsigned int u; + + sscanf(line, "%u", &u); + if (offset + 1 > context->uniform_count) + { + context->uniform_count = offset + 1; + context->uniforms = realloc(context->uniforms, context->uniform_count * sizeof(*context->uniforms)); + } + memcpy(context->uniforms + offset, &u, sizeof(u)); + } } else { @@ -271,6 +283,9 @@ START_TEST(shader_runner_d3d12) while (fgets(line, sizeof(line), f)) { + if (line[0] == '\n') + continue; + if (line[0] == '[') { switch (state)

1 0

Zebediah Figura : tests: Import HLSL conditional tests from Wine.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: vkd3d Branch: master Commit: b64b3040612b3ba314900398710996d1c198a391 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b64b3040612b3ba31490039… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 30 21:01:21 2020 -0500 tests: Import HLSL conditional 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> --- tests/conditional.shader_test | 13 +++++++++++ tests/d3d12_test_utils.h | 51 ++++++++++++++++++++++++++----------------- tests/shader_runner_d3d12.c | 25 +++++++++++++++++++++ 3 files changed, 69 insertions(+), 20 deletions(-) diff --git a/tests/conditional.shader_test b/tests/conditional.shader_test new file mode 100644 index 0000000..70718f1 --- /dev/null +++ b/tests/conditional.shader_test @@ -0,0 +1,13 @@ +[pixel shader] +float4 main(float4 pos : SV_POSITION) : SV_TARGET +{ + if(pos.x > 200.0) + return float4(0.1, 0.2, 0.3, 0.4); + else + return float4(0.9, 0.8, 0.7, 0.6); +} + +[test] +draw quad +probe rect rgba (0, 0, 200, 480) (0.9, 0.8, 0.7, 0.6) +probe rect rgba (200, 0, 440, 480) (0.1, 0.2, 0.3, 0.4) diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index ece4896..a1e039d 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -585,6 +585,36 @@ static void check_readback_data_uint_(unsigned int line, struct resource_readbac ok_(line)(all_match, "Got 0x%08x, expected 0x%08x at (%u, %u, %u).\n", got, expected, x, y, z); } +#define check_readback_data_vec4(a, b, c, d) check_readback_data_vec4_(__LINE__, a, b, c, d) +static void check_readback_data_vec4_(unsigned int line, struct resource_readback *rb, + const RECT *rect, const struct vec4 *expected, unsigned int max_diff) +{ + RECT r = {0, 0, rb->width, rb->height}; + unsigned int x = 0, y = 0; + struct vec4 got = {0}; + bool all_match = true; + + if (rect) + r = *rect; + + for (y = r.top; y < r.bottom; ++y) + { + for (x = r.left; x < r.right; ++x) + { + got = *get_readback_vec4(rb, x, y); + if (!compare_vec4(&got, expected, max_diff)) + { + all_match = false; + break; + } + } + if (!all_match) + break; + } + ok_(line)(all_match, "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at (%u, %u).\n", + got.x, got.y, got.z, got.w, expected->x, expected->y, expected->z, expected->w, x, y); +} + #define check_sub_resource_uint(a, b, c, d, e, f) check_sub_resource_uint_(__LINE__, a, b, c, d, e, f) static inline void check_sub_resource_uint_(unsigned int line, ID3D12Resource *texture, unsigned int sub_resource_idx, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list, @@ -603,29 +633,10 @@ static inline void check_sub_resource_vec4_(unsigned int line, ID3D12Resource *t const struct vec4 *expected, unsigned int max_diff) { struct resource_readback rb; - unsigned int x = 0, y; - bool all_match = true; - struct vec4 got = {0}; get_texture_readback_with_command_list(texture, sub_resource_idx, &rb, queue, command_list); - for (y = 0; y < rb.height; ++y) - { - for (x = 0; x < rb.width; ++x) - { - got = *get_readback_vec4(&rb, x, y); - if (!compare_vec4(&got, expected, max_diff)) - { - all_match = false; - break; - } - } - if (!all_match) - break; - } + check_readback_data_vec4_(line, &rb, NULL, expected, max_diff); release_resource_readback(&rb); - - ok_(line)(all_match, "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at (%u, %u).\n", - got.x, got.y, got.z, got.w, expected->x, expected->y, expected->z, expected->w, x, y); } #define create_default_buffer(a, b, c, d) create_default_buffer_(__LINE__, a, b, c, d) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index f323a54..e429d38 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -167,6 +167,29 @@ static void parse_test_directive(struct shader_context *context, const char *lin check_sub_resource_vec4(context->c.render_target, 0, context->c.queue, context->c.list, &v, ulps); reset_command_list(context->c.list, context->c.allocator); } + else if (match_string(line, "probe rect rgba", &line)) + { + unsigned int x, y, w, h, ulps; + struct resource_readback rb; + struct vec4 v; + RECT rect; + int ret; + + ret = sscanf(line, "( %u , %u , %u , %u ) ( %f , %f , %f , %f )", &x, &y, &w, &h, &v.x, &v.y, &v.z, &v.w); + if (ret < 8) + goto err; + if (ret < 9) + ulps = 0; + + get_texture_readback_with_command_list(context->c.render_target, 0, &rb, context->c.queue, context->c.list); + rect.left = x; + rect.right = x + w; + rect.top = y; + rect.bottom = y + h; + check_readback_data_vec4(&rb, &rect, &v, ulps); + release_resource_readback(&rb); + reset_command_list(context->c.list, context->c.allocator); + } else if (match_string(line, "uniform", &line)) { unsigned int offset; @@ -204,6 +227,8 @@ START_TEST(shader_runner_d3d12) { static const struct test_context_desc desc = { + .rt_width = 640, + .rt_height = 480, .no_root_signature = true, .rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT, };

1 0

Zebediah Figura : tests: Introduce a custom format and parser for shader-based tests.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: vkd3d Branch: master Commit: 68ef1de6ec19a7db2db85d4d9e732b4522918d0f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=68ef1de6ec19a7db2db85d4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 30 21:01:18 2020 -0500 tests: Introduce a custom format and parser for shader-based tests. 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 | 18 ++- tests/.gitignore | 1 + tests/d3d12.c | 101 --------------- tests/d3d12_crosstest.h | 1 + tests/d3d12_test_utils.h | 103 ++++++++++++++- tests/shader_runner_d3d12.c | 300 ++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 417 insertions(+), 107 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=68ef1de6ec19a7db2db…

1 0

Zebediah Figura : tests: Import math tests from Wine.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: vkd3d Branch: master Commit: 2206e0c9bbbba953161857fa771b0b7eb2b414f7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2206e0c9bbbba953161857f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 30 21:01:20 2020 -0500 tests: Import math 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/math.shader_test | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/Makefile.am b/Makefile.am index 958be14..bb69078 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,6 +50,7 @@ vkd3d_shader_runners = \ tests/shader_runner_d3d12 vkd3d_shader_tests = \ + tests/math.shader_test \ tests/swizzle-0.shader_test \ tests/swizzle-1.shader_test \ tests/swizzle-2.shader_test \ @@ -177,6 +178,7 @@ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la SHADER_TEST_LOG_COMPILER = tests/shader_runner_d3d12 XFAIL_TESTS = \ + tests/math.shader_test \ tests/swizzle-0.shader_test \ tests/swizzle-1.shader_test \ tests/swizzle-2.shader_test \ diff --git a/tests/math.shader_test b/tests/math.shader_test new file mode 100644 index 0000000..2fe59a0 --- /dev/null +++ b/tests/math.shader_test @@ -0,0 +1,15 @@ +[pixel shader] +float4 main(uniform float u, uniform float v, uniform float w, uniform float x, + uniform float y, uniform float z) : SV_TARGET +{ + return float4(x * y - z / w + --u / -v, + z * x / y + w / -v, + u + v - w, + x / y / w); +} + +[test] +uniform 0 float4 2.5 0.3 0.2 0.7 +uniform 4 float4 0.1 1.5 0.0 0.0 +draw quad +probe all rgba (-12.43, 9.833333, 1.6, 35.0) 1

1 0

Zebediah Figura : tests: Import HLSL swizzle tests from Wine.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: vkd3d Branch: master Commit: e26a0f95d6cbc14db32a0d1724a199910564b3d1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e26a0f95d6cbc14db32a0d1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 30 21:01:19 2020 -0500 tests: Import HLSL swizzle 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 | 21 ++++++++++++++++++++- tests/swizzle-0.shader_test | 15 +++++++++++++++ tests/swizzle-1.shader_test | 11 +++++++++++ tests/swizzle-2.shader_test | 11 +++++++++++ tests/swizzle-3.shader_test | 14 ++++++++++++++ tests/swizzle-4.shader_test | 13 +++++++++++++ tests/swizzle-5.shader_test | 10 ++++++++++ tests/swizzle-6.shader_test | 12 ++++++++++++ tests/swizzle-7.shader_test | 11 +++++++++++ 9 files changed, 117 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 5e2ea3e..958be14 100644 --- a/Makefile.am +++ b/Makefile.am @@ -49,6 +49,16 @@ vkd3d_cross_tests = \ vkd3d_shader_runners = \ tests/shader_runner_d3d12 +vkd3d_shader_tests = \ + tests/swizzle-0.shader_test \ + tests/swizzle-1.shader_test \ + tests/swizzle-2.shader_test \ + tests/swizzle-3.shader_test \ + tests/swizzle-4.shader_test \ + tests/swizzle-5.shader_test \ + tests/swizzle-6.shader_test \ + tests/swizzle-7.shader_test + vkd3d_test_headers = \ tests/d3d12_crosstest.h \ tests/d3d12_test_utils.h @@ -159,13 +169,22 @@ TEST_EXTENSIONS = .shader_test if BUILD_TESTS check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests) $(vkd3d_shader_runners) -TESTS = $(vkd3d_tests) $(vkd3d_cross_tests) +TESTS = $(vkd3d_tests) $(vkd3d_cross_tests) $(vkd3d_shader_tests) tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ @VULKAN_LIBS@ tests_d3d12_invalid_usage_LDADD = $(LDADD) @VULKAN_LIBS@ tests_shader_runner_d3d12_LDADD = $(LDADD) @VULKAN_LIBS@ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la SHADER_TEST_LOG_COMPILER = tests/shader_runner_d3d12 +XFAIL_TESTS = \ + tests/swizzle-0.shader_test \ + tests/swizzle-1.shader_test \ + tests/swizzle-2.shader_test \ + tests/swizzle-3.shader_test \ + tests/swizzle-4.shader_test \ + tests/swizzle-5.shader_test \ + tests/swizzle-6.shader_test \ + tests/swizzle-7.shader_test endif if BUILD_DEMOS diff --git a/tests/swizzle-0.shader_test b/tests/swizzle-0.shader_test new file mode 100644 index 0000000..9be141c --- /dev/null +++ b/tests/swizzle-0.shader_test @@ -0,0 +1,15 @@ +[pixel shader] +uniform float4 color; + +float4 main() : sv_target +{ + float4 ret = color; + ret.gb = ret.ra; + ret.ra = float2(0.0101, 0.0404); + return ret; +} + +[test] +uniform 0 float4 0.0303 0.08 0.07 0.0202 +draw quad +probe all rgba (0.0101, 0.0303, 0.0202, 0.0404) diff --git a/tests/swizzle-1.shader_test b/tests/swizzle-1.shader_test new file mode 100644 index 0000000..40cdc01 --- /dev/null +++ b/tests/swizzle-1.shader_test @@ -0,0 +1,11 @@ +[pixel shader] +float4 main() : SV_target +{ + float4 ret = float4(0.1, 0.2, 0.3, 0.4); + ret.wyz.yx = float2(0.5, 0.6).yx; + return ret; +} + +[test] +draw quad +probe all rgba (0.1, 0.6, 0.3, 0.5) diff --git a/tests/swizzle-2.shader_test b/tests/swizzle-2.shader_test new file mode 100644 index 0000000..b07134c --- /dev/null +++ b/tests/swizzle-2.shader_test @@ -0,0 +1,11 @@ +[pixel shader] +float4 main() : SV_target +{ + float4 ret; + ret.zwyx = float4(0.1, 0.2, 0.3, 0.4); + return ret; +} + +[test] +draw quad +probe all rgba (0.4, 0.3, 0.1, 0.2) diff --git a/tests/swizzle-3.shader_test b/tests/swizzle-3.shader_test new file mode 100644 index 0000000..1ecf5a5 --- /dev/null +++ b/tests/swizzle-3.shader_test @@ -0,0 +1,14 @@ +[pixel shader] +float4 main() : SV_target +{ + float4 ret; + ret.yw.y = 0.1; + ret.xzy.yz.y.x = 0.2; + ret.yzwx.yzwx.wz.y = 0.3; + ret.zxy.xyz.zxy.xy.y = 0.4; + return ret; +} + +[test] +draw quad +probe all rgba (0.3, 0.2, 0.4, 0.1) diff --git a/tests/swizzle-4.shader_test b/tests/swizzle-4.shader_test new file mode 100644 index 0000000..c09fa51 --- /dev/null +++ b/tests/swizzle-4.shader_test @@ -0,0 +1,13 @@ +[pixel shader] +float4 main() : SV_target +{ + float4 ret; + ret.yxz.yx = float2(0.1, 0.2); + ret.w.x = 0.3; + ret.wzyx.zyx.yx.x = 0.4; + return ret; +} + +[test] +draw quad +probe all rgba (0.1, 0.2, 0.4, 0.3) diff --git a/tests/swizzle-5.shader_test b/tests/swizzle-5.shader_test new file mode 100644 index 0000000..5a3ee1d --- /dev/null +++ b/tests/swizzle-5.shader_test @@ -0,0 +1,10 @@ +[pixel shader] +float4 main() : SV_target +{ + float4 ret = float4(0.1, 0.2, 0.3, 0.4).ywxz.zyyz; + return ret; +} + +[test] +draw quad +probe all rgba (0.1, 0.4, 0.4, 0.1) diff --git a/tests/swizzle-6.shader_test b/tests/swizzle-6.shader_test new file mode 100644 index 0000000..04251c6 --- /dev/null +++ b/tests/swizzle-6.shader_test @@ -0,0 +1,12 @@ +[pixel shader] +float4 main() : SV_target +{ + float4 ret = float4(0.1, 0.2, 0.3, 0.4); + ret.yxwz = ret; + ret = ret.wyzx; + return ret; +} + +[test] +draw quad +probe all rgba (0.3, 0.1, 0.4, 0.2) diff --git a/tests/swizzle-7.shader_test b/tests/swizzle-7.shader_test new file mode 100644 index 0000000..15a4cd0 --- /dev/null +++ b/tests/swizzle-7.shader_test @@ -0,0 +1,11 @@ +[pixel shader] +float4 main() : SV_target +{ + float4 ret; + ret.xyzw.xyzw = float4(0.1, 0.2, 0.3, 0.4); + return ret; +} + +[test] +draw quad +probe all rgba (0.1, 0.2, 0.3, 0.4)

1 0

Zebediah Figura : vkd3d-shader: Correct an off-by-one error when comparing against ARRAY_SIZE.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: vkd3d Branch: master Commit: d64a42323381cb88824b374b677bdaf08e956b49 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d64a42323381cb88824b374… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 30 15:34:01 2020 -0500 vkd3d-shader: Correct an off-by-one error when comparing against ARRAY_SIZE. 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-shader/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 9ff18e7..a510f3a 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -520,7 +520,7 @@ static void shader_dump_resource_type(struct vkd3d_string_buffer *buffer, enum v /* VKD3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY */ "texturecubearray", }; - if (type <= ARRAY_SIZE(resource_type_names)) + if (type < ARRAY_SIZE(resource_type_names)) shader_addline(buffer, "%s", resource_type_names[type]); else shader_addline(buffer, "unknown");

1 0