September 2016 - Wine-commits

Bruno Jesus : xinput1_3/tests: Cope with XInputGetStateEx not being present by name.
by Alexandre Julliard 02 Sep '16

02 Sep '16

Module: wine Branch: master Commit: e3cda2c45d22f76d309675ffa33c525c4e13ccba URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3cda2c45d22f76d309675ffa… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Sep 1 16:26:12 2016 -0300 xinput1_3/tests: Cope with XInputGetStateEx not being present by name. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/tests/xinput.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index 5261425..fadacae 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -238,10 +238,10 @@ START_TEST(xinput) pXInputGetDSoundAudioDeviceGuids = (void*)GetProcAddress(hXinput, "XInputGetDSoundAudioDeviceGuids"); pXInputGetBatteryInformation = (void*)GetProcAddress(hXinput, "XInputGetBatteryInformation"); - if (pXInputGetStateEx_Ordinal) - ok (pXInputGetStateEx_Ordinal == pXInputGetStateEx, "XInputGetStateEx in the wrong ordinal\n"); - else - ok (broken(1), "XInputGetStateEx not found in this dll version\n"); + /* XInputGetStateEx may not be present by name, use ordinal in this case */ + if (!pXInputGetStateEx) + pXInputGetStateEx = pXInputGetStateEx_Ordinal; + ok (pXInputGetStateEx != NULL, "XInputGetStateEx not found in this dll version\n"); test_set_state(); test_get_state();

1 0

Sebastian Lackner : schedsvc: Avoid deadlock when scheduler service starts rpcss.
by Alexandre Julliard 02 Sep '16

02 Sep '16

Module: wine Branch: master Commit: bd31e320ddbeddd7d6948839fb5db786b0659b8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd31e320ddbeddd7d6948839f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 1 21:44:24 2016 +0200 schedsvc: Avoid deadlock when scheduler service starts rpcss. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/svc_main.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index b559311..45496c9 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -175,8 +175,6 @@ void WINAPI ServiceMain(DWORD argc, LPWSTR *argv) { TRACE("starting Task Scheduler Service\n"); - if (RPC_init() != RPC_S_OK) return; - schedsvc_handle = RegisterServiceCtrlHandlerW(scheduleW, schedsvc_handler); if (!schedsvc_handle) { @@ -186,11 +184,15 @@ void WINAPI ServiceMain(DWORD argc, LPWSTR *argv) done_event = CreateEventW(NULL, TRUE, FALSE, NULL); - schedsvc_update_status(SERVICE_RUNNING); + schedsvc_update_status(SERVICE_START_PENDING); - WaitForSingleObject(done_event, INFINITE); + if (RPC_init() == RPC_S_OK) + { + schedsvc_update_status(SERVICE_RUNNING); + WaitForSingleObject(done_event, INFINITE); + RPC_finish(); + } - RPC_finish(); schedsvc_update_status(SERVICE_STOPPED); TRACE("exiting Task Scheduler Service\n");

1 0

Sebastian Lackner : ntoskrnl.exe: Use the same timeout for service startup like in other wine modules.
by Alexandre Julliard 02 Sep '16

02 Sep '16

Module: wine Branch: master Commit: b1c36e7583f790569234a16226da51fd81843ee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1c36e7583f790569234a1622… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 1 21:46:13 2016 +0200 ntoskrnl.exe: Use the same timeout for service startup like in other wine modules. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 507ffdd..b671e81 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2701,9 +2701,9 @@ NTSTATUS WINAPI ZwLoadDriver( const UNICODE_STRING *service_name ) { SERVICE_STATUS_PROCESS service_status; SC_HANDLE service_handle; + ULONGLONG start_time; NTSTATUS status; DWORD bytes; - int i; TRACE( "(%s)\n", debugstr_us(service_name) ); @@ -2712,21 +2712,24 @@ NTSTATUS WINAPI ZwLoadDriver( const UNICODE_STRING *service_name ) TRACE( "trying to start %s\n", debugstr_us(service_name) ); - for (i = 0; i < 100; i++) /* 10 sec timeout */ + start_time = GetTickCount64(); + for (;;) { if (StartServiceW( service_handle, 0, NULL )) break; if (GetLastError() == ERROR_SERVICE_ALREADY_RUNNING) break; if (GetLastError() != ERROR_SERVICE_DATABASE_LOCKED) goto error; - Sleep(100); + if (GetTickCount64() - start_time > 30000) goto error; + Sleep( 100 ); } - if (i == 100) goto error; - for (i = 0; i < 100; i++) /* 10 sec timeout */ + start_time = GetTickCount64(); + for (;;) { if (!QueryServiceStatusEx( service_handle, SC_STATUS_PROCESS_INFO, (BYTE *)&service_status, sizeof(service_status), &bytes )) goto error; if (service_status.dwCurrentState != SERVICE_START_PENDING) break; - Sleep(100); + if (GetTickCount64() - start_time > 30000) goto error; + Sleep( 100 ); } if (service_status.dwCurrentState == SERVICE_RUNNING) @@ -2756,8 +2759,8 @@ NTSTATUS WINAPI ZwUnloadDriver( const UNICODE_STRING *service_name ) { SERVICE_STATUS service_status; SC_HANDLE service_handle; + ULONGLONG start_time; NTSTATUS status; - int i; TRACE( "(%s)\n", debugstr_us(service_name) ); @@ -2767,11 +2770,13 @@ NTSTATUS WINAPI ZwUnloadDriver( const UNICODE_STRING *service_name ) if (!ControlService( service_handle, SERVICE_CONTROL_STOP, &service_status )) goto error; - for (i = 0; i < 100; i++) /* 10 sec timeout */ + start_time = GetTickCount64(); + for (;;) { if (!QueryServiceStatus( service_handle, &service_status )) goto error; if (service_status.dwCurrentState != SERVICE_STOP_PENDING) break; - Sleep(100); + if (GetTickCount64() - start_time > 30000) goto error; + Sleep( 100 ); } if (service_status.dwCurrentState == SERVICE_STOPPED)

1 0

Andrew Eikum : qcap: Use HRESULT correctly.
by Alexandre Julliard 02 Sep '16

02 Sep '16

Module: wine Branch: master Commit: d6afd45e71c134367a5fb8cbd331d17aaccc41a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6afd45e71c134367a5fb8cbd… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Sep 1 15:11:31 2016 -0500 qcap: Use HRESULT correctly. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/qcap_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qcap/qcap_main.c b/dlls/qcap/qcap_main.c index b379850..bc0b903 100644 --- a/dlls/qcap/qcap_main.c +++ b/dlls/qcap/qcap_main.c @@ -185,7 +185,7 @@ HRESULT WINAPI DllCanUnloadNow(void) { TRACE("\n"); - if (STRMBASE_DllCanUnloadNow() && objects_ref == 0) + if (STRMBASE_DllCanUnloadNow() == S_OK && objects_ref == 0) return S_OK; return S_FALSE; }

1 0

Andrew Eikum : quartz: Implement IClassFactory::LockServer.
by Alexandre Julliard 02 Sep '16

02 Sep '16

Module: wine Branch: master Commit: b0534c12c0a8b7a526aef04f23f67a33abd3a455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0534c12c0a8b7a526aef04f2… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Sep 1 15:11:43 2016 -0500 quartz: Implement IClassFactory::LockServer. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/main.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 32865f3..7c2accb 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -29,6 +29,8 @@ extern HRESULT WINAPI QUARTZ_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLS extern HRESULT WINAPI QUARTZ_DllCanUnloadNow(void) DECLSPEC_HIDDEN; extern BOOL WINAPI QUARTZ_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN; +static LONG server_locks = 0; + /* For the moment, do nothing here. */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { @@ -142,6 +144,10 @@ static HRESULT WINAPI DSCF_LockServer(IClassFactory *iface, BOOL dolock) { IClassFactoryImpl *This = impl_from_IClassFactory(iface); FIXME("(%p)->(%d),stub!\n",This,dolock); + if(dolock) + InterlockedIncrement(&server_locks); + else + InterlockedDecrement(&server_locks); return S_OK; } @@ -204,7 +210,9 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) */ HRESULT WINAPI DllCanUnloadNow(void) { - return QUARTZ_DllCanUnloadNow(); + if(server_locks == 0 && QUARTZ_DllCanUnloadNow() == S_OK) + return S_OK; + return S_FALSE; }

1 0

Sebastian Lackner : ntdll: Simplify RtlFormatCurrentUserKeyPath using GetCurrentThreadEffectiveToken.
by Alexandre Julliard 02 Sep '16

02 Sep '16

Module: wine Branch: master Commit: be74d3a5d52c713af061ea9030889345c887bcc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be74d3a5d52c713af061ea903… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 1 23:52:27 2016 +0200 ntdll: Simplify RtlFormatCurrentUserKeyPath using GetCurrentThreadEffectiveToken. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/reg.c | 47 +++++++++++++++++++---------------------------- 1 file changed, 19 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 0d03300..6dc5d61 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -911,42 +911,33 @@ NTSTATUS WINAPI NtUnloadKey(IN POBJECT_ATTRIBUTES attr) NTSTATUS WINAPI RtlFormatCurrentUserKeyPath( IN OUT PUNICODE_STRING KeyPath) { static const WCHAR pathW[] = {'\\','R','e','g','i','s','t','r','y','\\','U','s','e','r','\\'}; - HANDLE token; + char buffer[sizeof(TOKEN_USER) + sizeof(SID) + sizeof(DWORD)*SID_MAX_SUB_AUTHORITIES]; + DWORD len = sizeof(buffer); NTSTATUS status; - status = NtOpenThreadToken(GetCurrentThread(), TOKEN_READ, TRUE, &token); - if (status == STATUS_NO_TOKEN) - status = NtOpenProcessToken(GetCurrentProcess(), TOKEN_READ, &token); + status = NtQueryInformationToken(GetCurrentThreadEffectiveToken(), TokenUser, buffer, len, &len); if (status == STATUS_SUCCESS) { - char buffer[sizeof(TOKEN_USER) + sizeof(SID) + sizeof(DWORD)*SID_MAX_SUB_AUTHORITIES]; - DWORD len = sizeof(buffer); - - status = NtQueryInformationToken(token, TokenUser, buffer, len, &len); - if (status == STATUS_SUCCESS) + KeyPath->MaximumLength = 0; + status = RtlConvertSidToUnicodeString(KeyPath, ((TOKEN_USER *)buffer)->User.Sid, FALSE); + if (status == STATUS_BUFFER_OVERFLOW) { - KeyPath->MaximumLength = 0; - status = RtlConvertSidToUnicodeString(KeyPath, ((TOKEN_USER *)buffer)->User.Sid, FALSE); - if (status == STATUS_BUFFER_OVERFLOW) + PWCHAR buf = RtlAllocateHeap(GetProcessHeap(), 0, + sizeof(pathW) + KeyPath->Length + sizeof(WCHAR)); + if (buf) { - PWCHAR buf = RtlAllocateHeap(GetProcessHeap(), 0, - sizeof(pathW) + KeyPath->Length + sizeof(WCHAR)); - if (buf) - { - memcpy(buf, pathW, sizeof(pathW)); - KeyPath->MaximumLength = KeyPath->Length + sizeof(WCHAR); - KeyPath->Buffer = (PWCHAR)((LPBYTE)buf + sizeof(pathW)); - status = RtlConvertSidToUnicodeString(KeyPath, - ((TOKEN_USER *)buffer)->User.Sid, FALSE); - KeyPath->Buffer = buf; - KeyPath->Length += sizeof(pathW); - KeyPath->MaximumLength += sizeof(pathW); - } - else - status = STATUS_NO_MEMORY; + memcpy(buf, pathW, sizeof(pathW)); + KeyPath->MaximumLength = KeyPath->Length + sizeof(WCHAR); + KeyPath->Buffer = (PWCHAR)((LPBYTE)buf + sizeof(pathW)); + status = RtlConvertSidToUnicodeString(KeyPath, + ((TOKEN_USER *)buffer)->User.Sid, FALSE); + KeyPath->Buffer = buf; + KeyPath->Length += sizeof(pathW); + KeyPath->MaximumLength += sizeof(pathW); } + else + status = STATUS_NO_MEMORY; } - NtClose(token); } return status; }

1 0

Julian Rüger : German translation for release 1.8.4
by Jeremy Newman 02 Sep '16

02 Sep '16

Module: website Branch: master Commit: 3da3dbd836642338166f6322e8a0ed0b9856bf32 URL: http://source.winehq.org/git/website.git/?a=commit;h=3da3dbd836642338166f63… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Sep 2 14:00:29 2016 +0200 German translation for release 1.8.4 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016082201.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/de/2016082201.xml b/news/de/2016082201.xml new file mode 100644 index 0000000..e1c217b --- /dev/null +++ b/news/de/2016082201.xml @@ -0,0 +1,13 @@ +<news> +<date>22. August 2016</date> +<title>Wine 1.8.4 freigegeben</title> +<body> + Die Wartungsversion 1.8.4 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.8.4">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Diverse Fehlerkorrekturen.</li> + <li>Einige zusätzliche Grafikkarten wurden zur GPU-Beschreibungstabelle hinzugefügt.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.8/wine-1.8.4.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 1.9.15
by Jeremy Newman 02 Sep '16

02 Sep '16

Module: website Branch: master Commit: 8cb55aa8ebd38da5d61ee18d5533cee3d7bf66a6 URL: http://source.winehq.org/git/website.git/?a=commit;h=8cb55aa8ebd38da5d61ee1… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Sep 2 13:43:31 2016 +0200 German translation for release 1.9.15 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016072201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2016072201.xml b/news/de/2016072201.xml new file mode 100644 index 0000000..3f12668 --- /dev/null +++ b/news/de/2016072201.xml @@ -0,0 +1,17 @@ +<news> +<date>22. Juli 2016</date> +<title>Wine 1.9.15 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.15 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.15">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Mehr Shader-Anweisungen Direct3D.</li> + <li>Performance-Verbesserungen in GDI.</li> + <li>Bessere Multi-Joystick-Unterstützung unter MacOS.</li> + <li>Active-Scripting-Verbesserungen.</li> + <li>Zusätzliche Stream-Unterstützung in der C++-Laufzeit.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.15.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 1.9.16
by Jeremy Newman 02 Sep '16

02 Sep '16

Module: website Branch: master Commit: 157241528a2fab8d3ac847aca1b5da791c67641f URL: http://source.winehq.org/git/website.git/?a=commit;h=157241528a2fab8d3ac847… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Sep 2 13:47:53 2016 +0200 German translation for release 1.9.16 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016080501.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2016080501.xml b/news/de/2016080501.xml new file mode 100644 index 0000000..2d5a77c --- /dev/null +++ b/news/de/2016080501.xml @@ -0,0 +1,17 @@ +<news> +<date>5. August 2016</date> +<title>Wine 1.9.16 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.16 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.16">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Bessere 64-Bit Binärkompatibilität unter MacOS.</li> + <li>Performance-Verbesserungen in JavaScript.</li> + <li>Fortschritt in Richtung des Direct3D-Command-Stream.</li> + <li>Weitere Shader-Anweisungen in Direct3D.</li> + <li>Performance-Verbesserungen in GDI.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.16.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 1.9.17
by Jeremy Newman 02 Sep '16

02 Sep '16

Module: website Branch: master Commit: bd53fb9bf0b201ee74e57697d2439c70063e684e URL: http://source.winehq.org/git/website.git/?a=commit;h=bd53fb9bf0b201ee74e576… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Sep 2 13:51:48 2016 +0200 German translation for release 1.9.17 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016081901.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2016081901.xml b/news/de/2016081901.xml new file mode 100644 index 0000000..b666ec3 --- /dev/null +++ b/news/de/2016081901.xml @@ -0,0 +1,17 @@ +<news> +<date>19. August 2016</date> +<title>Wine 1.9.17 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.17 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.17">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Verbesserte Ausnahmenbehandlung unter 64-Bit.</li> + <li>Diverse Verbesserungen an der Joystick-Unterstützung.</li> + <li>Ein wenig mehr Stream-Unterstützung in der C++-Laufzeit.</li> + <li>Verbesserungen an der Schriftarten-Einbettung.</li> + <li>Mehr Metafile-Unterstützung in GDI+.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.17.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