May 2018 - Wine-Commits - list.winehq.org

Zebediah Figura : msi/tests: Test deferral of StartServices and StopServices.
by Alexandre Julliard May 18, 2018

May 18, 2018

Module: wine Branch: master Commit: 7f0c8b3c6130bf1181e83bcdd9ab6b71583208f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f0c8b3c6130bf1181e83bcd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 17 22:26:12 2018 -0500 msi/tests: Test deferral of StartServices and StopServices. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 12 ++++++++++++ dlls/msi/tests/custom.c | 35 +++++++++++++++++++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 3 files changed, 49 insertions(+) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 4abf867..70baaa3 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -259,16 +259,27 @@ static const char sss_install_exec_seq_dat[] = "InstallValidate\t\t1400\n" "InstallInitialize\t\t1500\n" "StopServices\t\t4000\n" + "stop_immediate\tNOT REMOVE\t4001\n" + "stop_deferred\tNOT REMOVE\t4002\n" "DeleteServices\t\t5000\n" "MoveFiles\t\t5100\n" "InstallFiles\t\t5200\n" "DuplicateFiles\t\t5300\n" "StartServices\t\t5400\n" + "start_deferred\tNOT REMOVE\t5401\n" "RegisterProduct\t\t5500\n" "PublishFeatures\t\t5600\n" "PublishProduct\t\t5700\n" "InstallFinalize\t\t6000\n"; +static const char sss_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "stop_immediate\t1\tcustom.dll\tsss_started\n" + "stop_deferred\t1025\tcustom.dll\tsss_stopped\n" + "start_deferred\t1025\tcustom.dll\tsss_started\n"; + static const char sds_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "s72\tS255\tI2\n" @@ -1848,6 +1859,7 @@ static const msi_table sss_tables[] = ADD_TABLE(file), ADD_TABLE(sss_install_exec_seq), ADD_TABLE(sss_service_control), + ADD_TABLE(sss_custom_action), ADD_TABLE(media), ADD_TABLE(property) }; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 4336504..9c9966c 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1239,3 +1239,38 @@ todo_wine CloseServiceHandle(manager); return ERROR_SUCCESS; } + +UINT WINAPI sss_started(MSIHANDLE hinst) +{ + SC_HANDLE manager, service; + SERVICE_STATUS status; + BOOL ret; + + manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); + service = OpenServiceA(manager, "Spooler", SC_MANAGER_ALL_ACCESS); + ret = QueryServiceStatus(service, &status); + ok(hinst, ret, "QueryServiceStatus failed: %u\n", GetLastError()); +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) + ok(hinst, status.dwCurrentState == SERVICE_RUNNING, "got %u\n", status.dwCurrentState); + + CloseServiceHandle(service); + CloseServiceHandle(manager); + return ERROR_SUCCESS; +} + +UINT WINAPI sss_stopped(MSIHANDLE hinst) +{ + SC_HANDLE manager, service; + SERVICE_STATUS status; + BOOL ret; + + manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); + service = OpenServiceA(manager, "Spooler", SC_MANAGER_ALL_ACCESS); + ret = QueryServiceStatus(service, &status); + ok(hinst, ret, "QueryServiceStatus failed: %u\n", GetLastError()); + ok(hinst, status.dwCurrentState == SERVICE_STOPPED, "got %u\n", status.dwCurrentState); + + CloseServiceHandle(service); + CloseServiceHandle(manager); + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index 471f956..01b95e9 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -11,3 +11,5 @@ @ stdcall sds_absent(long) @ stdcall sis_present(long) @ stdcall sis_absent(long) +@ stdcall sss_started(long) +@ stdcall sss_stopped(long)

1 0

Michael Müller : ntdll: Return success for TokenSessionId in NtSetInformationToken.
by Alexandre Julliard May 18, 2018

May 18, 2018

Module: wine Branch: master Commit: de8d20436905a7394fd6fbbe1f312ffac7c2db2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=de8d20436905a7394fd6fbbe… Author: Michael Müller <michael(a)fds-team.de> Date: Fri May 18 04:51:00 2018 +0000 ntdll: Return success for TokenSessionId in NtSetInformationToken. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index c3f5df3..4ff9880 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -624,6 +624,20 @@ NTSTATUS WINAPI NtSetInformationToken( } SERVER_END_REQ; break; + case TokenSessionId: + if (TokenInformationLength < sizeof(DWORD)) + { + ret = STATUS_INFO_LENGTH_MISMATCH; + break; + } + if (!TokenInformation) + { + ret = STATUS_ACCESS_VIOLATION; + break; + } + FIXME("TokenSessionId stub!\n"); + ret = STATUS_SUCCESS; + break; default: FIXME("unimplemented class %u\n", TokenInformationClass); break;

1 0

Józef Kucia : winevulkan: Trace unsupported instance extensions.
by Alexandre Julliard May 18, 2018

May 18, 2018

Module: wine Branch: master Commit: fa786955f11cdc255d73d10e4a74d6a31e0e8d6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa786955f11cdc255d73d10e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 18 12:49:18 2018 +0200 winevulkan: Trace unsupported instance extensions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index ef9f095..53d7a11 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -730,9 +730,10 @@ VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_na { if (wine_vk_instance_extension_supported(host_properties[i].extensionName)) num_properties++; + else + TRACE("Instance extension '%s' is not supported.\n", host_properties[i].extensionName); } - /* We only have to count. */ if (!properties) { TRACE("Returning %u extensions\n", num_properties);

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard May 18, 2018

May 18, 2018

Module: wine Branch: master Commit: 4df43166f786cef4cc9fe26621694bcc2e29cc09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4df43166f786cef4cc9fe266… Author: Kim Malmo <berencamlost(a)msn.com> Date: Fri May 18 11:52:59 2018 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 64 +++++++++++++++++-------------------------------------------- 1 file changed, 18 insertions(+), 46 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index b0912a7..ada37a6 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.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: 2018-03-01 23:15+0100\n" +"PO-Revision-Date: 2018-05-18 13:47+0200\n" "Last-Translator: Kim Malmo <berencamlost(a)msn.com>\n" "Language-Team: Norwegian Bokmål <alexsornes(a)gmail.com>\n" "Language: nb_NO\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.0.4\n" +"X-Generator: Poedit 2.0.6\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -8514,10 +8514,8 @@ msgid "&Browse..." msgstr "&Bla..." #: shell32.rc:355 shell32.rc:384 -#, fuzzy -#| msgid "File type" msgid "File type:" -msgstr "Filtype" +msgstr "Filtype:" #: shell32.rc:359 shell32.rc:392 urlmon.rc:37 explorer.rc:32 msgid "Location:" @@ -8528,16 +8526,12 @@ msgid "Size:" msgstr "Størrelse:" #: shell32.rc:365 shell32.rc:398 -#, fuzzy -#| msgid "Creation date" msgid "Creation date:" -msgstr "Dato opprettet" +msgstr "Dato opprettet:" #: shell32.rc:369 shell32.rc:406 -#, fuzzy -#| msgid "&Attributes:" msgid "Attributes:" -msgstr "&Attributter:" +msgstr "Attributter:" #: shell32.rc:371 shell32.rc:408 winefile.rc:174 msgid "H&idden" @@ -8548,28 +8542,20 @@ msgid "&Archive" msgstr "&Arkiv" #: shell32.rc:386 -#, fuzzy -#| msgid "Open:" msgid "Open with:" -msgstr "Åpne:" +msgstr "Åpne med:" #: shell32.rc:389 -#, fuzzy -#| msgid "Change &Icon..." msgid "&Change..." -msgstr "Endre &ikon..." +msgstr "&Endre..." #: shell32.rc:400 -#, fuzzy -#| msgid "Modified" msgid "Last modified:" -msgstr "Endret" +msgstr "Sist endret:" #: shell32.rc:402 -#, fuzzy -#| msgid "Last Change:" msgid "Last accessed:" -msgstr "Sist endret:" +msgstr "Siste tilgang:" #: shell32.rc:138 shell32.rc:142 winefile.rc:108 msgid "Size" @@ -9181,38 +9167,28 @@ msgstr "" "Det er minst ett uspesifisert sikkerhetsproblem med dette sertifikatet." #: winineterror.mc:26 -#, fuzzy -#| msgid "Service request timeout.\n" msgid "The request has timed out.\n" -msgstr "Tidsavbrudd for tjenesteforespørsel.\n" +msgstr "Forespørselen ble tidsavbrutt.\n" #: winineterror.mc:31 -#, fuzzy -#| msgid "A printer error occurred." msgid "An internal error has occurred.\n" -msgstr "En skriverfeil har oppstått." +msgstr "En intern feil har oppstått.\n" #: winineterror.mc:36 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "The URL is invalid.\n" -msgstr "Stien er ugyldig.\n" +msgstr "URL'en er ugyldig.\n" #: winineterror.mc:41 msgid "The URL scheme could not be recognized or is not supported.\n" -msgstr "" +msgstr "URL-skjemaet ble ikke gjenkjent eller er ikke støttet.\n" #: winineterror.mc:46 -#, fuzzy -#| msgid "The username could not be found.\n" msgid "The server name could not be resolved.\n" -msgstr "Brukernavnet finnes ikke.\n" +msgstr "Tjenernavnet kunne ikke slåes opp.\n" #: winineterror.mc:51 -#, fuzzy -#| msgid "The user profile is invalid.\n" msgid "The requested operation is invalid.\n" -msgstr "Brukerprofilen er ugyldig.\n" +msgstr "Den forespurte operasjonen er ugyldig.\n" #: winineterror.mc:56 msgid "" @@ -9221,20 +9197,16 @@ msgid "" msgstr "" #: winineterror.mc:61 -#, fuzzy -#| msgid "The profile could not be added.\n" msgid "The requested item could not be located.\n" -msgstr "Klarte ikke legge til profilen.\n" +msgstr "Det forespurte elementet kunne ikke lokaliseres.\n" #: winineterror.mc:66 -#, fuzzy -#| msgid "Can't connect to the LDAP server" msgid "The attempt to connect to the server failed.\n" -msgstr "Kan ikke koble til LDAP-tjeneren" +msgstr "Tilkoblingsforsøk til tjeneren mislyktes.\n" #: winineterror.mc:71 msgid "The connection with the server has been terminated.\n" -msgstr "" +msgstr "Tilkoblingen til tjeneren har blitt terminert.\n" #: winineterror.mc:76 msgid ""

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard May 18, 2018

May 18, 2018

Module: wine Branch: master Commit: 3c6a5a71599f56eb968f0427bc614e4eabb88c03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c6a5a71599f56eb968f0427… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri May 18 15:24:18 2018 +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 | 77 +++++++++++++++++++++++----------------------------------------- 1 file changed, 28 insertions(+), 49 deletions(-) diff --git a/po/de.po b/po/de.po index b703717..01139cd 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: 2018-03-07 15:56+0100\n" +"PO-Revision-Date: 2018-05-18 15:21+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" @@ -3698,18 +3698,21 @@ msgid "" "'writable' attribute on the property descriptor cannot be set to 'true' on " "this object" msgstr "" +"'writable'-Attribut des Eigenschaftendeskriptors kann bei diesem Objekt " +"nicht auf 'true' gesetzt werden" #: jscript.rc:70 msgid "Cannot redefine non-configurable property '|'" msgstr "" +"Nicht-konfigurierbare Eigenschaft '|' kann nicht erneut definiert werden" #: jscript.rc:71 msgid "Cannot modify non-writable property '|'" -msgstr "" +msgstr "Nicht-schreibbare Eigenschaft '|' kann nicht geändert werden" #: jscript.rc:72 msgid "Property cannot have both accessors and a value" -msgstr "" +msgstr "Eigenschaft kann nicht sowohl Accessoren als auch einen Wert haben" #: ../../include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" @@ -8522,10 +8525,8 @@ msgid "&Browse..." msgstr "&Durchsuchen..." #: shell32.rc:355 shell32.rc:384 -#, fuzzy -#| msgid "File type" msgid "File type:" -msgstr "Dateityp" +msgstr "Dateityp:" #: shell32.rc:359 shell32.rc:392 urlmon.rc:37 explorer.rc:32 msgid "Location:" @@ -8533,19 +8534,15 @@ msgstr "Ort:" #: shell32.rc:361 shell32.rc:394 winefile.rc:170 msgid "Size:" -msgstr "&Größe:" +msgstr "Größe:" #: shell32.rc:365 shell32.rc:398 -#, fuzzy -#| msgid "Creation date" msgid "Creation date:" -msgstr "Erstellungsdatum" +msgstr "Erstellungsdatum:" #: shell32.rc:369 shell32.rc:406 -#, fuzzy -#| msgid "&Attributes:" msgid "Attributes:" -msgstr "&Attribute:" +msgstr "Attribute:" #: shell32.rc:371 shell32.rc:408 winefile.rc:174 msgid "H&idden" @@ -8556,28 +8553,20 @@ msgid "&Archive" msgstr "&Archiv" #: shell32.rc:386 -#, fuzzy -#| msgid "Open:" msgid "Open with:" -msgstr "Öffnen:" +msgstr "Öffnen mit:" #: shell32.rc:389 -#, fuzzy -#| msgid "Change &Icon..." msgid "&Change..." -msgstr "&Symbol ändern..." +msgstr "&Ändern..." #: shell32.rc:400 -#, fuzzy -#| msgid "Modified" msgid "Last modified:" -msgstr "Geändert" +msgstr "Zuletzt geändert:" #: shell32.rc:402 -#, fuzzy -#| msgid "Last Change:" msgid "Last accessed:" -msgstr "Letzte &Änderung:" +msgstr "Letzter Zugriff:" #: shell32.rc:138 shell32.rc:142 winefile.rc:108 msgid "Size" @@ -9198,70 +9187,60 @@ msgstr "" "Es gibt mindestens ein unbekanntes Sicherheitsproblem mit diesem Zertifikat." #: winineterror.mc:26 -#, fuzzy -#| msgid "Service request timeout.\n" msgid "The request has timed out.\n" -msgstr "Zeitüberschreitung der Dienstanfrage.\n" +msgstr "Zeitüberschreitung der Anfrage.\n" #: winineterror.mc:31 -#, fuzzy -#| msgid "A printer error occurred." msgid "An internal error has occurred.\n" -msgstr "Ein Druckerfehler ist aufgetreten." +msgstr "Ein interner Fehler ist aufgetreten.\n" #: winineterror.mc:36 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "The URL is invalid.\n" -msgstr "Pfad ist ungültig.\n" +msgstr "Die URL ist ungültig.\n" #: winineterror.mc:41 msgid "The URL scheme could not be recognized or is not supported.\n" -msgstr "" +msgstr "Das URL-Format wurde nicht erkannt oder wird nicht unterstützt.\n" #: winineterror.mc:46 -#, fuzzy -#| msgid "The username could not be found.\n" msgid "The server name could not be resolved.\n" -msgstr "Der Benutzername konnte nicht gefunden werden.\n" +msgstr "Der Servername konnte nicht aufgelöst werden.\n" #: winineterror.mc:51 -#, fuzzy -#| msgid "The user profile is invalid.\n" msgid "The requested operation is invalid.\n" -msgstr "Das Benutzerprofil ist ungültig.\n" +msgstr "Die angeforderte Operation ist ungültig.\n" #: winineterror.mc:56 msgid "" "The operation was canceled, usually because the handle on which the request " "was operating was closed before the operation completed.\n" msgstr "" +"Die Operation wurde abgebrochen, üblicherweise weil das Handle, auf dem die " +"Anfrage ausgeführt wurde, vorzeitig geschlossen wurde.\n" #: winineterror.mc:61 -#, fuzzy -#| msgid "The profile could not be added.\n" msgid "The requested item could not be located.\n" -msgstr "Das Profil konnte nicht hinzugefügt werden.\n" +msgstr "Das angeforderte Objekt konnte nicht gefunden werden.\n" #: winineterror.mc:66 -#, fuzzy -#| msgid "Can't connect to the LDAP server" msgid "The attempt to connect to the server failed.\n" -msgstr "Kann nicht zum LDAP-Server verbinden" +msgstr "Der Verbindungsversuch zum Server ist fehlgeschlagen.\n" #: winineterror.mc:71 msgid "The connection with the server has been terminated.\n" -msgstr "" +msgstr "Die Verbindung zum Server wurde unterbrochen.\n" #: winineterror.mc:76 msgid "" "SSL certificate date that was received from the server is bad. The " "certificate is expired.\n" msgstr "" +"Das Datum des empfangenen SSL-Zertifikats ist ungültig. Das Zertifikat ist " +"abgelaufen.\n" #: winineterror.mc:81 msgid "SSL certificate common name (host name field) is incorrect.\n" -msgstr "" +msgstr "Das Feld 'Common name' (Hostname) des SSL-Zertifikats ist inkorrekt.\n" #: winmm.rc:32 msgid "The specified command was carried out."

1 0

Michael Stefaniuc : winecfg: Remove an ARRAY_SIZE()-like macro.
by Alexandre Julliard May 18, 2018

May 18, 2018

Module: wine Branch: master Commit: 8f420443d798ddf53cdcd253829807c09f498490 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f420443d798ddf53cdcd253… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri May 18 00:17:05 2018 +0200 winecfg: Remove an ARRAY_SIZE()-like macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/appdefaults.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index a08542a..61d515c 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -72,8 +72,6 @@ static const struct #endif }; -#define NB_VERSIONS (sizeof(win_versions)/sizeof(win_versions[0])) - static const char szKey9x[] = "Software\\Microsoft\\Windows\\CurrentVersion"; static const char szKeyNT[] = "Software\\Microsoft\\Windows NT\\CurrentVersion"; static const char szKeyProdNT[] = "System\\CurrentControlSet\\Control\\ProductOptions"; @@ -113,7 +111,7 @@ static int get_registry_version(void) } major = atoi(ver); - for (i = 0; i < NB_VERSIONS; i++) + for (i = 0; i < ARRAY_SIZE(win_versions); i++) { if (win_versions[i].dwPlatformId != platform) continue; if (win_versions[i].dwMajorVersion != major) continue; @@ -151,7 +149,7 @@ static void update_comboboxes(HWND dialog) WINE_TRACE("winver is %s\n", winver); /* normalize the version strings */ - for (i = 0; i < NB_VERSIONS; i++) + for (i = 0; i < ARRAY_SIZE(win_versions); i++) { if (!strcasecmp (win_versions[i].szVersion, winver)) { @@ -181,7 +179,7 @@ init_comboboxes (HWND dialog) SendDlgItemMessageW (dialog, IDC_WINVER, CB_ADDSTRING, 0, (LPARAM)str); } - for (i = 0; i < NB_VERSIONS; i++) + for (i = 0; i < ARRAY_SIZE(win_versions); i++) { SendDlgItemMessageA(dialog, IDC_WINVER, CB_ADDSTRING, 0, (LPARAM) win_versions[i].szDescription);

1 0

Michael Stefaniuc : winecfg: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard May 18, 2018

May 18, 2018

Module: wine Branch: master Commit: 7fdb828abf6324c80fba7e0b62498912fe4b5f17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fdb828abf6324c80fba7e0b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri May 18 00:17:06 2018 +0200 winecfg: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/appdefaults.c | 18 +++++++-------- programs/winecfg/audio.c | 37 ++++++++++++++---------------- programs/winecfg/drive.c | 2 +- programs/winecfg/drivedetect.c | 3 +-- programs/winecfg/driveui.c | 12 ++++------ programs/winecfg/libraries.c | 4 ++-- programs/winecfg/theme.c | 51 +++++++++++++++++------------------------- programs/winecfg/winecfg.c | 10 ++++----- 8 files changed, 58 insertions(+), 79 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7fdb828abf6324c80fba…

1 0

Zebediah Figura : msi/tests: Test deferral of CreateShorcuts and RemoveShortcuts.
by Alexandre Julliard May 18, 2018

May 18, 2018

Module: wine Branch: master Commit: ab9ab2a8f701064af3212a91ecd89ffa6a4a331b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab9ab2a8f701064af3212a91… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 17 22:26:09 2018 -0500 msi/tests: Test deferral of CreateShorcuts and RemoveShortcuts. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 14 ++++++++++++++ dlls/msi/tests/custom.c | 14 ++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 3 files changed, 30 insertions(+) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index ae1b47b..ce36eda 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -917,12 +917,25 @@ static const char crs_install_exec_seq_dat[] = "RemoveFiles\t\t1700\n" "InstallFiles\t\t2000\n" "RemoveShortcuts\t\t3000\n" + "rs_immediate\tREMOVE\t3001\n" + "rs_deferred\tREMOVE\t3002\n" "CreateShortcuts\t\t3100\n" + "cs_immediate\tNOT REMOVE\t3101\n" + "cs_deferred\tNOT REMOVE\t3102\n" "RegisterProduct\t\t5000\n" "PublishFeatures\t\t5100\n" "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const char crs_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "cs_immediate\t1\tcustom.dll\tcrs_absent\n" + "cs_deferred\t1025\tcustom.dll\tcrs_present\n" + "rs_immediate\t1\tcustom.dll\tcrs_present\n" + "rs_deferred\t1025\tcustom.dll\tcrs_absent\n"; + static const char pub_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" @@ -1905,6 +1918,7 @@ static const msi_table crs_tables[] = ADD_TABLE(crs_file), ADD_TABLE(crs_shortcut), ADD_TABLE(crs_install_exec_seq), + ADD_TABLE(crs_custom_action), ADD_TABLE(media), ADD_TABLE(property) }; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index aeee98e..db6d612 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1178,3 +1178,17 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { } return ERROR_SUCCESS; } + +UINT WINAPI crs_present(MSIHANDLE hinst) +{ +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) + ok(hinst, pf_exists("msitest\\shortcut.lnk"), "shortcut absent\n"); + return ERROR_SUCCESS; +} + +UINT WINAPI crs_absent(MSIHANDLE hinst) +{ +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) + ok(hinst, !pf_exists("msitest\\shortcut.lnk"), "shortcut present\n"); + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index cac0f85..774f77b 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -5,3 +5,5 @@ @ stdcall nested(long) @ stdcall cf_present(long) @ stdcall cf_absent(long) +@ stdcall crs_present(long) +@ stdcall crs_absent(long)

1 0

Zebediah Figura : msi/tests: Test deferral of CreateFolders and RemoveFolders.
by Alexandre Julliard May 18, 2018

May 18, 2018

Module: wine Branch: master Commit: 0f7d50c02ea301ceebf0c18c1a49797ae9a93788 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f7d50c02ea301ceebf0c18c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 17 22:26:08 2018 -0500 msi/tests: Test deferral of CreateFolders and RemoveFolders. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/Makefile.in | 2 +- dlls/msi/tests/action.c | 14 ++++++++ dlls/msi/tests/custom.c | 87 ++++++++++++++++++++++++++++++++++++++++------ dlls/msi/tests/custom.spec | 2 ++ 4 files changed, 93 insertions(+), 12 deletions(-) diff --git a/dlls/msi/tests/Makefile.in b/dlls/msi/tests/Makefile.in index 9c991d6..248439a 100644 --- a/dlls/msi/tests/Makefile.in +++ b/dlls/msi/tests/Makefile.in @@ -1,7 +1,7 @@ TESTDLL = msi.dll IMPORTS = cabinet msi shell32 ole32 oleaut32 user32 advapi32 version -custom_IMPORTS = uuid msi ole32 +custom_IMPORTS = uuid msi ole32 shell32 SOURCES = \ action.c \ diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 849975d..ae1b47b 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -596,7 +596,11 @@ static const char cf_install_exec_seq_dat[] = "FileCost\t\t900\n" "RemoveFiles\t\t3500\n" "CreateFolders\t\t3700\n" + "cf_immediate\tNOT REMOVE\t3701\n" + "cf_deferred\tNOT REMOVE\t3702\n" "RemoveFolders\t\t3800\n" + "rf_immediate\tREMOVE\t3801\n" + "rf_deferred\tREMOVE\t3802\n" "InstallFiles\t\t4000\n" "RegisterUser\t\t6000\n" "RegisterProduct\t\t6100\n" @@ -609,6 +613,15 @@ static const char cf_install_exec_seq_dat[] = "InstallValidate\t\t1400\n" "LaunchConditions\t\t100\n"; +static const char cf_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "cf_immediate\t1\tcustom.dll\tcf_absent\n" + "cf_deferred\t1025\tcustom.dll\tcf_present\n" + "rf_immediate\t1\tcustom.dll\tcf_present\n" + "rf_deferred\t1025\tcustom.dll\tcf_absent\n"; + static const char sr_selfreg_dat[] = "File_\tCost\n" "s72\tI2\n" @@ -1771,6 +1784,7 @@ static const msi_table cf_tables[] = ADD_TABLE(cf_file), ADD_TABLE(cf_create_folders), ADD_TABLE(cf_install_exec_seq), + ADD_TABLE(cf_custom_action), ADD_TABLE(media), ADD_TABLE(property) }; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index ff1be9b..aeee98e 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -24,10 +24,13 @@ #include <windef.h> #include <winbase.h> #define COBJMACROS +#include <shlobj.h> #include <msxml.h> #include <msi.h> #include <msiquery.h> +static int todo_level, todo_do_loop; + static void ok_(MSIHANDLE hinst, int todo, const char *file, int line, int condition, const char *msg, ...) { static char buffer[2000]; @@ -47,8 +50,30 @@ static void ok_(MSIHANDLE hinst, int todo, const char *file, int line, int condi MsiProcessMessage(hinst, INSTALLMESSAGE_USER, record); MsiCloseHandle(record); } -#define ok(hinst, condition, ...) ok_(hinst, 0, __FILE__, __LINE__, condition, __VA_ARGS__) -#define todo_wine_ok(hinst, condition, ...) ok_(hinst, 1, __FILE__, __LINE__, condition, __VA_ARGS__) + +static void winetest_start_todo( int is_todo ) +{ + todo_level = (todo_level << 1) | (is_todo != 0); + todo_do_loop=1; +} + +static int winetest_loop_todo(void) +{ + int do_loop=todo_do_loop; + todo_do_loop=0; + return do_loop; +} + +static void winetest_end_todo(void) +{ + todo_level >>= 1; +} + +#define ok(hinst, condition, ...) ok_(hinst, todo_level, __FILE__, __LINE__, condition, __VA_ARGS__) +#define todo_wine_if(is_todo) for (winetest_start_todo(is_todo); \ + winetest_loop_todo(); \ + winetest_end_todo()) +#define todo_wine todo_wine_if(1) static const char *dbgstr_w(WCHAR *str) { @@ -886,7 +911,8 @@ static void test_costs(MSIHANDLE hinst) cost = 0xdead; r = MsiGetFeatureCostA(hinst, NULL, MSICOSTTREE_CHILDREN, INSTALLSTATE_LOCAL, &cost); ok(hinst, r == ERROR_INVALID_PARAMETER, "got %u\n", r); - todo_wine_ok(hinst, !cost, "got %d\n", cost); + todo_wine + ok(hinst, !cost, "got %d\n", cost); r = MsiGetFeatureCostA(hinst, "One", MSICOSTTREE_CHILDREN, INSTALLSTATE_LOCAL, NULL); ok(hinst, r == RPC_X_NULL_REF_POINTER, "got %u\n", r); @@ -894,7 +920,8 @@ static void test_costs(MSIHANDLE hinst) cost = 0xdead; r = MsiGetFeatureCostA(hinst, "One", MSICOSTTREE_CHILDREN, INSTALLSTATE_LOCAL, &cost); ok(hinst, !r, "got %u\n", r); - todo_wine_ok(hinst, cost == 8, "got %d\n", cost); + todo_wine + ok(hinst, cost == 8, "got %d\n", cost); sz = cost = temp = 0xdead; r = MsiEnumComponentCostsA(hinst, "One", 0, INSTALLSTATE_LOCAL, NULL, &sz, &cost, &temp); @@ -946,7 +973,8 @@ static void test_costs(MSIHANDLE hinst) r = MsiEnumComponentCostsA(hinst, "One", 0, INSTALLSTATE_LOCAL, buffer, &sz, &cost, &temp); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); ok(hinst, !strcmp(buffer, "q"), "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == 4, "got size %u\n", sz); + todo_wine + ok(hinst, sz == 4, "got size %u\n", sz); ok(hinst, cost == 8, "got cost %d\n", cost); ok(hinst, !temp, "got temp %d\n", temp); @@ -954,15 +982,19 @@ static void test_costs(MSIHANDLE hinst) strcpy(buffer,"x"); r = MsiEnumComponentCostsA(hinst, "One", 0, INSTALLSTATE_LOCAL, buffer, &sz, &cost, &temp); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); - todo_wine_ok(hinst, !buffer[0], "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == 4, "got size %u\n", sz); + todo_wine { + ok(hinst, !buffer[0], "got \"%s\"\n", buffer); + ok(hinst, sz == 4, "got size %u\n", sz); + } sz = 2; strcpy(buffer,"x"); r = MsiEnumComponentCostsA(hinst, "One", 0, INSTALLSTATE_LOCAL, buffer, &sz, &cost, &temp); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); - todo_wine_ok(hinst, !strcmp(buffer, "C"), "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == 4, "got size %u\n", sz); + todo_wine { + ok(hinst, !strcmp(buffer, "C"), "got \"%s\"\n", buffer); + ok(hinst, sz == 4, "got size %u\n", sz); + } sz = 3; strcpy(buffer,"x"); @@ -1021,7 +1053,8 @@ UINT WINAPI main_test(MSIHANDLE hinst) /* Test MsiGetDatabaseState() */ res = MsiGetDatabaseState(hinst); - todo_wine_ok(hinst, res == MSIDBSTATE_ERROR, "expected MSIDBSTATE_ERROR, got %u\n", res); + todo_wine + ok(hinst, res == MSIDBSTATE_ERROR, "expected MSIDBSTATE_ERROR, got %u\n", res); test_props(hinst); test_db(hinst); @@ -1101,7 +1134,8 @@ UINT WINAPI da_deferred(MSIHANDLE hinst) len = sizeof(prop); r = MsiGetPropertyA(hinst, "TESTPATH", prop, &len); ok(hinst, r == ERROR_SUCCESS, "got %u\n", r); - todo_wine_ok(hinst, !prop[0], "got %s\n", prop); + todo_wine + ok(hinst, !prop[0], "got %s\n", prop); /* Test modes */ ok(hinst, MsiGetMode(hinst, MSIRUNMODE_SCHEDULED), "should be scheduled\n"); @@ -1113,3 +1147,34 @@ UINT WINAPI da_deferred(MSIHANDLE hinst) return ERROR_SUCCESS; } + +static BOOL pf_exists(const char *file) +{ + char path[MAX_PATH]; + + if (FAILED(SHGetFolderPathA(NULL, CSIDL_PROGRAM_FILESX86, NULL, 0, path))) + SHGetFolderPathA(NULL, CSIDL_PROGRAM_FILES, NULL, 0, path); + strcat(path, "\\"); + strcat(path, file); + return GetFileAttributesA(path) != INVALID_FILE_ATTRIBUTES; +} + +UINT WINAPI cf_present(MSIHANDLE hinst) +{ +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + ok(hinst, pf_exists("msitest\\first"), "folder absent\n"); + ok(hinst, pf_exists("msitest\\second"), "folder absent\n"); + ok(hinst, pf_exists("msitest\\third"), "folder absent\n"); +} + return ERROR_SUCCESS; +} + +UINT WINAPI cf_absent(MSIHANDLE hinst) +{ +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + ok(hinst, !pf_exists("msitest\\first"), "folder present\n"); + ok(hinst, !pf_exists("msitest\\second"), "folder present\n"); + ok(hinst, !pf_exists("msitest\\third"), "folder present\n"); +} + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index 51bb60e..cac0f85 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -3,3 +3,5 @@ @ stdcall da_immediate(long) @ stdcall da_deferred(long) @ stdcall nested(long) +@ stdcall cf_present(long) +@ stdcall cf_absent(long)

1 0

Julian Rüger : German translation for release 3.8
by Jeremy Newman May 18, 2018

May 18, 2018

Module: website Branch: master Commit: be058eb3462ecc979245d9f20d2f0c97d9c9803e URL: https://source.winehq.org/git/website.git/?a=commit;h=be058eb3462ecc979245d… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri May 18 14:54:21 2018 +0200 German translation for release 3.8 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018051101.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2018051101.xml b/news/de/2018051101.xml new file mode 100644 index 0000000..15f3d7b --- /dev/null +++ b/news/de/2018051101.xml @@ -0,0 +1,17 @@ +<news> +<date>11. Mai 2018</date> +<title>Wine 3.8 freigegeben</title> +<body> + Die Entwicklungsversion 3.8 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/3.8">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Infrastruktur zum Schreiben von Kerneltreibertests.</li> + <li>Unterstützung für die Anzeige von Dateieigenschaften im Shell-Browser.</li> + <li>MP3-Dekoder als DirectX-Medienobjekt.</li> + <li>Weitere Unterstützung des Taskplaners.</li> + <li>Unterstützung von COM-Aggregation in UrlMon.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/3.x/wine-3.8.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0