March 2017 - Wine-commits - list.winehq.org

Julian Rüger : po: Update German translation.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: 856805b2269aa497820971d213f683bc4d716681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=856805b2269aa497820971d21… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Mar 6 16:05:25 2017 +0100 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 | 82 ++++++++++++++++++++++------------------------------------------ 1 file changed, 28 insertions(+), 54 deletions(-) diff --git a/po/de.po b/po/de.po index ff7265c..e9c89f2 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-11-22 12:35+0100\n" +"PO-Revision-Date: 2017-03-06 16:05+0100\n" "Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" @@ -8376,10 +8376,8 @@ msgid "Wine Control Panel" msgstr "Wine-Systemsteuerung" #: shell32.rc:195 -#, fuzzy -#| msgid "Unable to display Run File dialog box (internal error)" msgid "Unable to display Run dialog box (internal error)" -msgstr "Konnte Ausführen-Dialog nicht anzeigen (interner Fehler)" +msgstr "Ausführen-Dialog konnte nicht angezeigt werden (interner Fehler)" #: shell32.rc:196 msgid "Unable to display Browse dialog box (internal error)" @@ -9398,10 +9396,8 @@ msgid "Confidentiality Required" msgstr "Vertraulichkeit erforderlich" #: wldap32.rc:46 -#, fuzzy -#| msgid "Shutdown in progress.\n" msgid "SASL Bind in Progress" -msgstr "Herunterfahren im Gange.\n" +msgstr "SASL-Bindung im Gange" #: wldap32.rc:48 msgid "No Such Attribute" @@ -11980,67 +11976,57 @@ msgid "(unknown %d)" msgstr "(unbekannt %d)" #: regedit.rc:214 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to modify the selected registry value." -msgstr "regedit: Der Schlüssel '%1' konnte nicht geöffnet werden.\n" +msgstr "Der ausgewählte Wert konnte nicht geändert werden." #: regedit.rc:215 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to create a new registry key." -msgstr "regedit: Der Schlüssel '%1' konnte nicht geöffnet werden.\n" +msgstr "Es konnte kein neuer Schlüssel angelegt werden." #: regedit.rc:216 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to create a new registry value." -msgstr "regedit: Der Schlüssel '%1' konnte nicht geöffnet werden.\n" +msgstr "Es konnte kein neuer Wert angelegt werden." #: regedit.rc:217 msgid "" "Unable to rename the key '%1'.\n" "The specified key name already exists." msgstr "" +"Der Schlüssel '%1' konnte nicht umbenannt werden.\n" +"Der angegebene Schlüsselname ist bereits vorhanden." #: regedit.rc:218 msgid "" "Unable to rename the value '%1'.\n" "The specified value name already exists." msgstr "" +"Der Wert '%1' konnte nicht umbenannt werden.\n" +"Der angegebene Name ist bereits vorhanden." #: regedit.rc:219 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to delete the selected registry key." -msgstr "regedit: Der Schlüssel '%1' konnte nicht geöffnet werden.\n" +msgstr "Der ausgewählte Schlüssel konnte nicht gelöscht werden." #: regedit.rc:220 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to rename the selected registry key." -msgstr "regedit: Der Schlüssel '%1' konnte nicht geöffnet werden.\n" +msgstr "Der ausgewählte Schlüssel konnte nicht umbenannt werden." #: regedit.rc:221 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to rename the selected registry value." -msgstr "regedit: Der Schlüssel '%1' konnte nicht geöffnet werden.\n" +msgstr "Der ausgewählte Wert konnte nicht umbenannt werden." #: regedit.rc:222 msgid "" "The keys and values contained in %1 were successfully added to the registry." msgstr "" +"Die in %1 enthaltenen Schlüssel und Werte wurden erfolgreich zur " +"Registrierung hinzugefügt." #: regedit.rc:223 -#, fuzzy -#| msgid "" -#| "regedit: Unable to export '%1'. The specified registry key was not " -#| "found.\n" msgid "Unable to import %1. The specified file is not a valid registry file." msgstr "" -"regedit: '%1' konnte nicht exportiert werden. Der angegebene Schlüssel wurde " -"nicht gefunden.\n" +"%1 konnte nicht importiert werden. Die angegebene Datei ist keine gültige " +"Registrierungsdatei." #: regedit.rc:375 msgid "" @@ -12274,32 +12260,24 @@ msgid "Displays program information, version number and copyright" msgstr "Zeigt Programminformationen, Version und Copyright an" #: regedit.rc:181 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to query the registry value '%1'." -msgstr "regedit: Der Schlüssel '%1' konnte nicht geöffnet werden.\n" +msgstr "Der Wert '%1' konnte nicht abgefragt werden." #: regedit.rc:182 -#, fuzzy -#| msgid "Can't edit keys of this type (%u)" msgid "Unable to edit registry keys of this type (%1!u!)." -msgstr "Schlüssel von diesem Typ (%u) können nicht geändert werden" +msgstr "Schlüssel von diesem Typ (%1!u!) können nicht bearbeitet werden." #: regedit.rc:183 -#, fuzzy -#| msgid "Value is too big (%u)" msgid "The value is too big (%1!u!)." -msgstr "Der Wert ist zu groß (%u)" +msgstr "Der Wert ist zu groß (%1!u!)." #: regedit.rc:184 msgid "Confirm Value Delete" -msgstr "Bitte bestätigen" +msgstr "Löschen des Wertes bestätigen" #: regedit.rc:191 -#, fuzzy -#| msgid "Search string '%s' not found" msgid "Search complete. The string '%1' was not found." -msgstr "Suchfolge '%s' wurde nicht gefunden" +msgstr "Suche abgeschlossen. Die Zeichenfolge '%1' wurde nicht gefunden." #: regedit.rc:186 msgid "Are you sure you want to delete these values?" @@ -12314,10 +12292,8 @@ msgid "New Value #%d" msgstr "Neuer Wert #%d" #: regedit.rc:180 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to query the registry key '%1'." -msgstr "regedit: Der Schlüssel '%1' konnte nicht geöffnet werden.\n" +msgstr "Der Schlüssel '%1' konnte nicht abgefragt werden." #: regedit.rc:152 msgid "Adds a new multi-string value" @@ -12325,20 +12301,18 @@ msgstr "Fügt eine neue mehrteilige Zeichenfolge hinzu" #: regedit.rc:174 msgid "Exports selected branch of the registry to a text file" -msgstr "Exportiert den ausgewählten Zweig der Registry in eine Textdatei" +msgstr "Exportiert den ausgewählten Zweig der Registrierung in eine Textdatei" #: regedit.rc:187 -#, fuzzy -#| msgid "Confirm Value Delete" msgid "Confirm Key Delete" -msgstr "Bitte bestätigen" +msgstr "Löschen des Schlüssels bestätigen" #: regedit.rc:188 -#, fuzzy -#| msgid "Are you sure you want to delete the registry key '%1'?" msgid "" "Are you sure you want to delete the registry key '%1' and all of its subkeys?" -msgstr "Sind Sie sicher, dass Sie den Schlüssel '%1' löschen möchten?" +msgstr "" +"Sind Sie sicher, dass Sie den Schlüssel '%1' und alle Unterschlüssel löschen " +"möchten?" #: regsvr32.rc:32 msgid ""

1 0

Julian Rüger : German translation for release 1.8.7
by Jeremy Newman 06 Mar '17

06 Mar '17

Module: website Branch: master Commit: fa04f111079dab83678741127bb40b4487dab13b URL: http://source.winehq.org/git/website.git/?a=commit;h=fa04f111079dab83678741… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Mar 6 11:19:51 2017 +0100 German translation for release 1.8.7 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017022801.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/de/2017022801.xml b/news/de/2017022801.xml new file mode 100644 index 0000000..f937eec --- /dev/null +++ b/news/de/2017022801.xml @@ -0,0 +1,14 @@ +<news> +<date>28. Februar 2017</date> +<title>Wine 1.8.7 freigegeben</title> +<body> + Die Wartungsversion 1.8.7 von Wine ist jetzt verfügbar. Dies ist das letzte Release der 1.8.x-Serie. + <a href="{$root}/announce/1.8.7">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Diverse Fehlerkorrekturen.</li> + <li>Einige weitere Grafikkarten zur GPU-Beschreibungstabelle hinzugefügt.</li> + <li>Aktualiserung der türkischen Übersetzung.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.8/wine-1.8.7.tar.bz2">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

Julian Rüger : German translation for release 2.1
by Jeremy Newman 06 Mar '17

06 Mar '17

Module: website Branch: master Commit: a52ed14ba76dd19936fa6043e098bed613d4e886 URL: http://source.winehq.org/git/website.git/?a=commit;h=a52ed14ba76dd19936fa60… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Mar 6 11:06:57 2017 +0100 German translation for release 2.1 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017020301.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/news/de/2017020301.xml b/news/de/2017020301.xml new file mode 100644 index 0000000..3bb61cb --- /dev/null +++ b/news/de/2017020301.xml @@ -0,0 +1,19 @@ +<news> +<date>3. Februar 2017</date> +<title>Wine 2.1 freigegeben</title> +<body> + Die Entwicklungsversion 2.1 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/2.1">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Viele Korrekturen, die aufgrund des Code-freezes aufgeschoben wurden.</li> + <li>Weitere Shader-Model-5-Befehle.</li> + <li>Verbesserungen bei der Verarbeitung von MIME-Nachrichten.</li> + <li>Verbesserungen am Verhalten von Zeilenumbrüchen in DirectWrite.</li> + <li>Der HID-Busdienst läuft nun standardmäßig.</li> + <li>Direct2D Rendering-Verbesserungen.</li> + <li>Diverse Fehlerkorrekturen.</li> + <li>XZ-Komprimierung für Tarballs der Quelltextveröffentlichungen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.x/wine-2.1.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

Julian Rüger : German translation for release 2.2
by Jeremy Newman 06 Mar '17

06 Mar '17

Module: website Branch: master Commit: aca400f81113d46a8f9358463e8aea577b0bf7a4 URL: http://source.winehq.org/git/website.git/?a=commit;h=aca400f81113d46a8f9358… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Mar 6 11:14:15 2017 +0100 German translation for release 2.2 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017021701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2017021701.xml b/news/de/2017021701.xml new file mode 100644 index 0000000..c8d062c --- /dev/null +++ b/news/de/2017021701.xml @@ -0,0 +1,16 @@ +<news> +<date>17. Februar 2017</date> +<title>Wine 2.2 freigegeben</title> +<body> + Die Entwicklungsversion 2.2 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/2.2">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Windows-Version wird für neue Präfixe nun auf Windows 7 gesetzt.</li> + <li>Weitere Schritte in Richtung Direct3D-Commandstream.</li> + <li>Noch weitere Shader-Model-5-Befehle.</li> + <li>Anfängliche Unterstützung des doppelt gepuffertem Zeichnen von Themes.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.x/wine-2.2.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

Julian Rüger : German translation for release 2.3
by Jeremy Newman 06 Mar '17

06 Mar '17

Module: website Branch: master Commit: 4c5c330a0fa8b295407c686380fddf0a6ba4165a URL: http://source.winehq.org/git/website.git/?a=commit;h=4c5c330a0fa8b295407c68… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Mar 6 11:29:35 2017 +0100 German translation for release 2.3 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017030301.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2017030301.xml b/news/de/2017030301.xml new file mode 100644 index 0000000..e2d7ed5 --- /dev/null +++ b/news/de/2017030301.xml @@ -0,0 +1,17 @@ +<news> +<date>3. März 2017</date> +<title>Wine 2.3 freigegeben</title> +<body> + Die Entwicklungsversion 2.3 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/2.3">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Obsoletes Wineinstall-Script entfernt.</li> + <li>Weitere Arbeit am Direct3D-Command-Stream.</li> + <li>Wenige weitere Shader-Model-5-Befehle.</li> + <li>Besseres Rendern von Unterstreichungen in DirectWrite.</li> + <li>Verbesserte Unterstützung von ODBC unter 64-Bit.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.x/wine-2.3.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

Alexandre Julliard : Wine release 2.3
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: website Branch: master Commit: 4939301251b08b91749893ba3a342202a80d40f4 URL: http://source.winehq.org/git/website.git/?a=commit;h=4939301251b08b91749893… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 3 21:20:46 2017 +0100 Wine release 2.3 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017030301.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2017030301.xml b/news/en/2017030301.xml new file mode 100644 index 0000000..d75ef9b --- /dev/null +++ b/news/en/2017030301.xml @@ -0,0 +1,17 @@ +<news> +<date>March 3, 2017</date> +<title>Wine 2.3 Released</title> +<body> + The Wine development release 2.3 is now available. + <a href="{$root}/announce/2.3">What's new</a> in this release: +<ul> + <li>Obsolete wineinstall script removed.</li> + <li>More Direct3D command stream work.</li> + <li>A few more Shader Model 5 instructions.</li> + <li>Better underline rendering in DirectWrite.</li> + <li>Improved ODBC support on 64-bit.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.x/wine-2.3.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Jetro Jormalainen : dinput: Keep username same between device objects.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: 967399eba07c33548c7bb941371d03c18547517c URL: http://source.winehq.org/git/wine.git/?a=commit;h=967399eba07c33548c7bb9413… Author: Jetro Jormalainen <jje-wine(a)jv.jetro.fi> Date: Thu Mar 2 20:51:40 2017 +0200 dinput: Keep username same between device objects. Signed-off-by: Jetro Jormalainen <jje-wine(a)jv.jetro.fi> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 38 +++++++++++++++++++++++++++++++++++--- dlls/dinput/device_private.h | 1 - dlls/dinput/dinput_main.c | 6 ++++++ dlls/dinput/dinput_private.h | 7 +++++++ dlls/dinput8/tests/device.c | 11 +++++++++++ 5 files changed, 59 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index a9ef2d4..7b83a39 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1308,11 +1308,24 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, case (DWORD_PTR) DIPROP_USERNAME: { LPDIPROPSTRING ps = (LPDIPROPSTRING)pdiph; + struct DevicePlayer *device_player; if (pdiph->dwSize != sizeof(DIPROPSTRING)) return DIERR_INVALIDPARAM; - lstrcpynW(ps->wsz, This->username, sizeof(ps->wsz)/sizeof(WCHAR)); - break; + LIST_FOR_EACH_ENTRY(device_player, &This->dinput->device_players, + struct DevicePlayer, entry) + { + if (IsEqualGUID(&device_player->instance_guid, &This->guid)) + { + if (*device_player->username) + { + lstrcpynW(ps->wsz, device_player->username, sizeof(ps->wsz)/sizeof(WCHAR)); + return DI_OK; + } + else break; + } + } + return S_FALSE; } case (DWORD_PTR) DIPROP_VIDPID: FIXME("DIPROP_VIDPID not implemented\n"); @@ -1390,10 +1403,29 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( case (DWORD_PTR) DIPROP_USERNAME: { LPCDIPROPSTRING ps = (LPCDIPROPSTRING)pdiph; + struct DevicePlayer *device_player; + BOOL found = FALSE; if (pdiph->dwSize != sizeof(DIPROPSTRING)) return DIERR_INVALIDPARAM; - lstrcpynW(This->username, ps->wsz, sizeof(This->username)/sizeof(WCHAR)); + LIST_FOR_EACH_ENTRY(device_player, &This->dinput->device_players, + struct DevicePlayer, entry) + { + if (IsEqualGUID(&device_player->instance_guid, &This->guid)) + { + found = TRUE; + break; + } + } + if (!found && (device_player = + HeapAlloc(GetProcessHeap(), 0, sizeof(struct DevicePlayer)))) + { + list_add_tail(&This->dinput->device_players, &device_player->entry); + device_player->instance_guid = This->guid; + } + if (device_player) + lstrcpynW(device_player->username, ps->wsz, + sizeof(device_player->username)/sizeof(WCHAR)); break; } default: diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index c4fbe85..52bbec4 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -81,7 +81,6 @@ struct IDirectInputDeviceImpl /* Action mapping */ int num_actions; /* number of actions mapped */ ActionMap *action_map; /* array of mappings */ - WCHAR username[MAX_PATH]; }; extern BOOL get_app_key(HKEY*, HKEY*) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index ab6a2e8..2bf9f38 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -577,6 +577,7 @@ static HRESULT initialize_directinput_instance(IDirectInputImpl *This, DWORD dwV This->crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectInputImpl*->crit"); list_init( &This->devices_list ); + list_init( &This->device_players ); /* Add self to the list of the IDirectInputs */ EnterCriticalSection( &dinput_hook_crit ); @@ -599,11 +600,16 @@ static void uninitialize_directinput_instance(IDirectInputImpl *This) { if (This->initialized) { + struct DevicePlayer *device_player, *device_player2; /* Remove self from the list of the IDirectInputs */ EnterCriticalSection( &dinput_hook_crit ); list_remove( &This->entry ); LeaveCriticalSection( &dinput_hook_crit ); + LIST_FOR_EACH_ENTRY_SAFE( device_player, device_player2, + &This->device_players, struct DevicePlayer, entry ) + HeapFree(GetProcessHeap(), 0, device_player); + check_hook_thread(); This->crit.DebugInfo->Spare[0] = 0; diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index 176c0e0..6c93e16 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -46,6 +46,7 @@ struct IDirectInputImpl DWORD evsequence; /* unique sequence number for events */ DWORD dwVersion; /* direct input version number */ struct list devices_list; /* list of all created dinput devices */ + struct list device_players; /* device instance guid to player name */ }; /* Function called by all devices that Wine supports */ @@ -56,6 +57,12 @@ struct dinput_device { HRESULT (*create_device)(IDirectInputImpl *dinput, REFGUID rguid, REFIID riid, LPVOID *pdev, int unicode); }; +struct DevicePlayer { + GUID instance_guid; + WCHAR username[MAX_PATH]; + struct list entry; +}; + extern const struct dinput_device mouse_device DECLSPEC_HIDDEN; extern const struct dinput_device keyboard_device DECLSPEC_HIDDEN; extern const struct dinput_device joystick_linux_device DECLSPEC_HIDDEN; diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 6753b73..2b06f62 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -174,6 +174,7 @@ static BOOL CALLBACK enumeration_callback(const DIDEVICEINSTANCEA *lpddi, IDirec struct enum_data *data = pvRef; DWORD cnt; DIDEVICEOBJECTDATA buffer[5]; + IDirectInputDevice8A *lpdid2; if (!data) return DIENUM_CONTINUE; @@ -205,6 +206,10 @@ static BOOL CALLBACK enumeration_callback(const DIDEVICEINSTANCEA *lpddi, IDirec ok (dwFlags & DIEDBS_MAPPEDPRI1, "Mouse should be mapped as pri1 dwFlags=%08x\n", dwFlags); } + /* Creating second device object to check if it has the same username */ + hr = IDirectInput_CreateDevice(data->pDI, &lpddi->guidInstance, &lpdid2, NULL); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); + /* Building and setting an action map */ /* It should not use any pre-stored mappings so we use DIDBAM_HWDEFAULTS */ hr = IDirectInputDevice8_BuildActionMap(lpdid, data->lpdiaf, NULL, DIDBAM_HWDEFAULTS); @@ -231,6 +236,11 @@ static BOOL CALLBACK enumeration_callback(const DIDEVICEINSTANCEA *lpddi, IDirec ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr); ok (!lstrcmpW(usernameW, dps.wsz), "Username not set correctly expected=%s, got=%s\n", wine_dbgstr_w(usernameW), wine_dbgstr_w(dps.wsz)); + dps.wsz[0] = '\0'; + hr = IDirectInputDevice_GetProperty(lpdid2, DIPROP_USERNAME, &dps.diph); + ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr); + ok (!lstrcmpW(usernameW, dps.wsz), "Username not set correctly expected=%s, got=%s\n", wine_dbgstr_w(usernameW), wine_dbgstr_w(dps.wsz)); + /* Test buffer size */ memset(&dp, 0, sizeof(dp)); dp.diph.dwSize = sizeof(dp); @@ -315,6 +325,7 @@ static void test_action_mapping(void) af.dwBufferSize = 32; /* This enumeration builds and sets the action map for all devices */ + data.pDI = pDI; hr = IDirectInput8_EnumDevicesBySemantics(pDI, 0, &af, enumeration_callback, &data, DIEDBSFL_ATTACHEDONLY); ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed: hr=%08x\n", hr);

1 0

Jetro Jormalainen : dinput: Handle username in EnumDevicesBySemantics.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: 41b126b5fcf2a8c7b4c36afda3fb15f549d42bad URL: http://source.winehq.org/git/wine.git/?a=commit;h=41b126b5fcf2a8c7b4c36afda… Author: Jetro Jormalainen <jje-wine(a)jv.jetro.fi> Date: Thu Mar 2 20:51:41 2017 +0200 dinput: Handle username in EnumDevicesBySemantics. EnumDevicesBySemantics enums only devices with given username when DIEDBSFL_THISUSER is set and only unowned devices when DIEDBSFL_AVAILABLEDEVICES is set. Signed-off-by: Jetro Jormalainen <jje-wine(a)jv.jetro.fi> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 111 ++++++++++++++++++++++++++++++++++++++------ dlls/dinput8/tests/dinput.c | 11 ++++- 2 files changed, 105 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=41b126b5fcf2a8c7b4c36…

1 0

Józef Kucia : ntdll/tests: Add test for flushing file with FILE_APPEND_DATA access.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: a0aac4959166d4c01a787bef348e62b8ccf18972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0aac4959166d4c01a787bef3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 3 16:21:07 2017 +0100 ntdll/tests: Add test for flushing file with FILE_APPEND_DATA access. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 3d91cb1..5e7e1ee 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4436,6 +4436,15 @@ static void test_flush_buffers_file(void) CloseHandle(hfileread); CloseHandle(hfile); + hfile = CreateFileA(buffer, FILE_APPEND_DATA, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + ok(hfile != INVALID_HANDLE_VALUE, "could not open temp file, error %d.\n", GetLastError()); + + status = pNtFlushBuffersFile(hfile, &io_status_block); + todo_wine + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x.\n", status); + + CloseHandle(hfile); DeleteFileA(buffer); }

1 0

Józef Kucia : ntdll: Fix NtFlushBuffersFile() for files with FILE_APPEND_DATA access.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: c530fb9e28208db784f70b3794cbb16f2ce56ca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c530fb9e28208db784f70b379… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 3 16:21:08 2017 +0100 ntdll: Fix NtFlushBuffersFile() for files with FILE_APPEND_DATA access. Fixes a regression introduced by commit f7d40d45da7a1bc0accd58bca6d6da4e34861937. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 2 ++ dlls/ntdll/tests/file.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 3f38c6f..e2cfe7f 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3418,6 +3418,8 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE hFile, IO_STATUS_BLOCK* IoStatusBlock int fd, needs_close; ret = server_get_unix_fd( hFile, FILE_WRITE_DATA, &fd, &needs_close, &type, NULL ); + if (ret == STATUS_ACCESS_DENIED) + ret = server_get_unix_fd( hFile, FILE_APPEND_DATA, &fd, &needs_close, &type, NULL ); if (!ret && type == FD_TYPE_SERIAL) { diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 5e7e1ee..09bf688 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4441,7 +4441,6 @@ static void test_flush_buffers_file(void) ok(hfile != INVALID_HANDLE_VALUE, "could not open temp file, error %d.\n", GetLastError()); status = pNtFlushBuffersFile(hfile, &io_status_block); - todo_wine ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x.\n", status); CloseHandle(hfile);

1 0