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