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

Alistair Leslie-Hughes : user32: Don't leak region on error.
by Alexandre Julliard 04 Mar '16

04 Mar '16

Module: wine Branch: master Commit: 5fa0422227027fd4be4d2967cbded9d210b10b17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fa0422227027fd4be4d2967c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Mar 4 17:38:17 2016 +1100 user32: Don't leak region on error. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/painting.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 1dea98d..5855314 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -1400,8 +1400,8 @@ INT WINAPI ExcludeUpdateRgn( HDC hdc, HWND hwnd ) MapWindowPoints( 0, hwnd, &pt, 1 ); OffsetRgn( update_rgn, -pt.x, -pt.y ); ret = ExtSelectClipRgn( hdc, update_rgn, RGN_DIFF ); - DeleteObject( update_rgn ); } + DeleteObject( update_rgn ); return ret; }

1 0

Julian Rüger : German translation for release 1.9.4
by Jeremy Newman 03 Mar '16

03 Mar '16

Module: website Branch: master Commit: a2720665d71f4595112b304371420ccfd6f55607 URL: http://source.winehq.org/git/website.git/?a=commit;h=a2720665d71f4595112b30… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Mar 3 09:11:11 2016 +0100 German translation for release 1.9.4 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016021901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2016021901.xml b/news/de/2016021901.xml new file mode 100644 index 0000000..fcc93e2 --- /dev/null +++ b/news/de/2016021901.xml @@ -0,0 +1,16 @@ +<news> +<date>19. Februar 2016</date> +<title>Wine 1.9.4 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.4 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.4">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung von Farbglyphen und Font-Fallbacks in DirectWrite.</li> + <li>Verbesserungen am WebServices Reader.</li> + <li>Unterstützung für zusätzliche Formate in Direct3D 11.</li> + <li>Vereinfachte Syntax und Aufräumarbeiten an "todo"-markierten Tests.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.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

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: 66b359a1378f1a5795df8d7b779c931a5e3ed11a URL: http://source.winehq.org/git/wine.git/?a=commit;h=66b359a1378f1a5795df8d7b7… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Mar 3 17:09:33 2016 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/fi.po b/po/fi.po index b8d19c7..293a509 100644 --- a/po/fi.po +++ b/po/fi.po @@ -11607,10 +11607,8 @@ msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Haluatko varmasti tuhota rekisteriavaimen '%1'?" #: reg.rc:52 -#, fuzzy -#| msgid "reg: The option [/d] must be followed by a valid integer\n" msgid "reg: The option [/d] must be followed by a valid string\n" -msgstr "reg: Valitsinta [/d] täytyy seurata kelpo kokonaisluku\n" +msgstr "reg: Valitsinta [/d] täytyy seurata kelpo merkkijono\n" #: regedit.rc:34 msgid "&Registry"

1 0

Lauri Kenttä : po: Update Swedish translation.
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: 6158405ffdb027fab10456087ee0846c36000a56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6158405ffdb027fab10456087… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Mar 3 17:12:03 2016 +0200 po: Update Swedish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/sv.po | 178 ++++++++++++++++++++++++--------------------------------------- 1 file changed, 68 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6158405ffdb027fab1045…

1 0

Nikolay Sivov : dwrite: Update to IDWriteFontFace3.
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: 77c5ed607aea965c1122f3a17124ea25c0ac6c4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=77c5ed607aea965c1122f3a17… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 3 08:16:25 2016 +0300 dwrite: Update to IDWriteFontFace3. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 24 +-- dlls/dwrite/font.c | 388 ++++++++++++++++++++++++++++--------------- dlls/dwrite/freetype.c | 44 ++--- dlls/dwrite/main.c | 4 +- include/dwrite_3.idl | 2 +- 5 files changed, 290 insertions(+), 172 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=77c5ed607aea965c1122f…

1 0

Nikolay Sivov : dwrite: Implement HasCharacter() for a fontface.
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: d27a792e486b40ea20d15ae60d8dfa1fc6ac086f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d27a792e486b40ea20d15ae60… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 3 08:16:26 2016 +0300 dwrite: Implement HasCharacter() for a fontface. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c57a6f3..0ebb49c 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1099,8 +1099,17 @@ static HRESULT WINAPI dwritefontface3_GetInformationalStrings(IDWriteFontFace3 * static BOOL WINAPI dwritefontface3_HasCharacter(IDWriteFontFace3 *iface, UINT32 ch) { struct dwrite_fontface *This = impl_from_IDWriteFontFace3(iface); - FIXME("(%p)->(0x%x): stub\n", This, ch); - return FALSE; + UINT16 index; + HRESULT hr; + + TRACE("(%p)->(0x%08x)\n", This, ch); + + index = 0; + hr = IDWriteFontFace3_GetGlyphIndices(iface, &ch, 1, &index); + if (FAILED(hr)) + return FALSE; + + return index != 0; } static HRESULT WINAPI dwritefontface3_GetRecommendedRenderingMode(IDWriteFontFace3 *iface, FLOAT emsize, FLOAT dpi_x, FLOAT dpi_y,

1 0

Sebastian Lackner : services/tests: Consistently terminate service_{ok, trace} strings with linebreak.
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: a80c0d3cf2efdaac3043c6603d0982daa3aa1434 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a80c0d3cf2efdaac3043c6603… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Mar 3 06:24:59 2016 +0100 services/tests: Consistently terminate service_{ok,trace} strings with linebreak. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/tests/service.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index 203882d..e228069 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -95,9 +95,9 @@ static void WINAPI service_main(DWORD argc, char **argv) SERVICE_STATUS status; BOOL res; - service_ok(argc == 1, "argc = %d", argc); + service_ok(argc == 1, "argc = %d\n", argc); if(argc) - service_ok(!strcmp(argv[0], service_name), "argv[0] = %s, expected %s", argv[0], service_name); + service_ok(!strcmp(argv[0], service_name), "argv[0] = %s, expected %s\n", argv[0], service_name); service_handle = pRegisterServiceCtrlHandlerExA(service_name, service_handler, NULL); service_ok(service_handle != NULL, "RegisterServiceCtrlHandlerEx failed: %u\n", GetLastError()); @@ -112,7 +112,7 @@ static void WINAPI service_main(DWORD argc, char **argv) status.dwCheckPoint = 0; status.dwWaitHint = 10000; res = SetServiceStatus(service_handle, &status); - service_ok(res, "SetServiceStatus(SERVICE_RUNNING) failed: %u", GetLastError()); + service_ok(res, "SetServiceStatus(SERVICE_RUNNING) failed: %u\n", GetLastError()); service_event("RUNNING"); @@ -121,7 +121,7 @@ static void WINAPI service_main(DWORD argc, char **argv) status.dwCurrentState = SERVICE_STOPPED; status.dwControlsAccepted = 0; res = SetServiceStatus(service_handle, &status); - service_ok(res, "SetServiceStatus(SERVICE_STOPPED) failed: %u", GetLastError()); + service_ok(res, "SetServiceStatus(SERVICE_STOPPED) failed: %u\n", GetLastError()); } static void service_process(void (WINAPI *p_service_main)(DWORD, char **)) @@ -141,7 +141,7 @@ static void service_process(void (WINAPI *p_service_main)(DWORD, char **)) if(pipe_handle == INVALID_HANDLE_VALUE) return; - service_trace("Starting..."); + service_trace("Starting...\n"); service_stop_event = CreateEventA(NULL, TRUE, FALSE, NULL); service_ok(service_stop_event != NULL, "Could not create event: %u\n", GetLastError()); @@ -191,9 +191,9 @@ static void WINAPI no_stop_main(DWORD argc, char **argv) SERVICE_STATUS status; BOOL res; - service_ok(argc == 1, "argc = %d", argc); + service_ok(argc == 1, "argc = %d\n", argc); if(argc) - service_ok(!strcmp(argv[0], service_name), "argv[0] = %s, expected %s", argv[0], service_name); + service_ok(!strcmp(argv[0], service_name), "argv[0] = %s, expected %s\n", argv[0], service_name); service_handle = pRegisterServiceCtrlHandlerExA(service_name, no_stop_handler, NULL); service_ok(service_handle != NULL, "RegisterServiceCtrlHandlerEx failed: %u\n", GetLastError()); @@ -208,7 +208,7 @@ static void WINAPI no_stop_main(DWORD argc, char **argv) status.dwCheckPoint = 0; status.dwWaitHint = 10000; res = SetServiceStatus(service_handle, &status); - service_ok(res, "SetServiceStatus(SERVICE_RUNNING) failed: %u", GetLastError()); + service_ok(res, "SetServiceStatus(SERVICE_RUNNING) failed: %u\n", GetLastError()); service_event("RUNNING"); } @@ -292,11 +292,11 @@ static DWORD WINAPI pipe_thread(void *arg) for(ptr = buf; ptr < buf+read; ptr += strlen(ptr)+1) { if(!strncmp(ptr, "TRACE:", 6)) { - trace("service trace: %s\n", ptr+6); + trace("service trace: %s", ptr+6); }else if(!strncmp(ptr, "OK:", 3)) { - ok(1, "service: %s\n", ptr+3); + ok(1, "service: %s", ptr+3); }else if(!strncmp(ptr, "FAIL:", 5)) { - ok(0, "service: %s\n", ptr+5); + ok(0, "service: %s", ptr+5); }else if(!strncmp(ptr, "EVENT:", 6)) { trace("service event: %s\n", ptr+6); EnterCriticalSection(&event_cs);

1 0

Sebastian Lackner : services/tests: Initialize critical section just once.
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: d98194e7917bd36dea232ef205c03a896c2fb8a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d98194e7917bd36dea232ef20… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Mar 3 06:25:16 2016 +0100 services/tests: Initialize critical section just once. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/tests/service.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index e228069..85b8e86 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -442,7 +442,6 @@ static void test_runner(void (*p_run_test)(void)) if(pipe_handle == INVALID_HANDLE_VALUE) return; - InitializeCriticalSection(&event_cs); event_handle = CreateEventA(NULL, FALSE, FALSE, NULL); ok(event_handle != INVALID_HANDLE_VALUE, "CreateEvent failed: %u\n", GetLastError()); if(event_handle == INVALID_HANDLE_VALUE) @@ -465,6 +464,8 @@ START_TEST(service) char **argv; int argc; + InitializeCriticalSection(&event_cs); + pRegisterServiceCtrlHandlerExA = (void*)GetProcAddress(GetModuleHandleA("advapi32.dll"), "RegisterServiceCtrlHandlerExA"); if(!pRegisterServiceCtrlHandlerExA) { win_skip("RegisterServiceCtrlHandlerExA not available, skipping tests\n");

1 0

Sebastian Lackner : services: Store a separate variable instead of clearing control_mutex.
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: 00b1184f1092ecc6ab6b7ef7a9e6213c4b6fc54c URL: http://source.winehq.org/git/wine.git/?a=commit;h=00b1184f1092ecc6ab6b7ef7a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Mar 3 06:26:26 2016 +0100 services: Store a separate variable instead of clearing control_mutex. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 53 ++++++++++++++++++-------------------------- programs/services/services.c | 1 + programs/services/services.h | 1 + 3 files changed, 24 insertions(+), 31 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 6951fb8..ece8dce 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1137,7 +1137,8 @@ DWORD __cdecl svcctl_ControlService( break; } - if (result==ERROR_SUCCESS && !service->service_entry->control_mutex) { + if (result == ERROR_SUCCESS && service->service_entry->force_shutdown) + { result = ERROR_SERVICE_CANNOT_ACCEPT_CTRL; service_terminate(service->service_entry); } @@ -1164,45 +1165,35 @@ DWORD __cdecl svcctl_ControlService( return ERROR_INVALID_SERVICE_CONTROL; } - /* prevent races by caching control_mutex and clearing it on - * stop instead of outside the services lock */ - control_mutex = service->service_entry->control_mutex; + /* Remember that we tried to shutdown this service. When the service is + * still running on the second invocation, it will be forcefully killed. */ if (dwControl == SERVICE_CONTROL_STOP) - service->service_entry->control_mutex = NULL; + service->service_entry->force_shutdown = TRUE; + control_mutex = service->service_entry->control_mutex; service_unlock(service->service_entry); ret = WaitForSingleObject(control_mutex, 30000); - if (ret == WAIT_OBJECT_0) - { - service_send_control(service->service_entry, dwControl, &result); - - if (lpServiceStatus) - { - service_lock(service->service_entry); - lpServiceStatus->dwServiceType = service->service_entry->status.dwServiceType; - lpServiceStatus->dwCurrentState = service->service_entry->status.dwCurrentState; - lpServiceStatus->dwControlsAccepted = service->service_entry->status.dwControlsAccepted; - lpServiceStatus->dwWin32ExitCode = service->service_entry->status.dwWin32ExitCode; - lpServiceStatus->dwServiceSpecificExitCode = service->service_entry->status.dwServiceSpecificExitCode; - lpServiceStatus->dwCheckPoint = service->service_entry->status.dwCheckPoint; - lpServiceStatus->dwWaitHint = service->service_entry->status.dwWaitHint; - service_unlock(service->service_entry); - } + if (ret != WAIT_OBJECT_0) + return ERROR_SERVICE_REQUEST_TIMEOUT; - if (dwControl == SERVICE_CONTROL_STOP) - CloseHandle(control_mutex); - else - ReleaseMutex(control_mutex); + service_send_control(service->service_entry, dwControl, &result); - return result; - } - else + if (lpServiceStatus) { - if (dwControl == SERVICE_CONTROL_STOP) - CloseHandle(control_mutex); - return ERROR_SERVICE_REQUEST_TIMEOUT; + service_lock(service->service_entry); + lpServiceStatus->dwServiceType = service->service_entry->status.dwServiceType; + lpServiceStatus->dwCurrentState = service->service_entry->status.dwCurrentState; + lpServiceStatus->dwControlsAccepted = service->service_entry->status.dwControlsAccepted; + lpServiceStatus->dwWin32ExitCode = service->service_entry->status.dwWin32ExitCode; + lpServiceStatus->dwServiceSpecificExitCode = service->service_entry->status.dwServiceSpecificExitCode; + lpServiceStatus->dwCheckPoint = service->service_entry->status.dwCheckPoint; + lpServiceStatus->dwWaitHint = service->service_entry->status.dwWaitHint; + service_unlock(service->service_entry); } + + ReleaseMutex(control_mutex); + return result; } DWORD __cdecl svcctl_CloseServiceHandle( diff --git a/programs/services/services.c b/programs/services/services.c index c45aed3..02a46f9 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -852,6 +852,7 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * CloseHandle(service->control_pipe); service->control_mutex = CreateMutexW(NULL, TRUE, NULL); + service->force_shutdown = FALSE; if (!service->status_changed_event) service->status_changed_event = CreateEventW(NULL, FALSE, FALSE, NULL); diff --git a/programs/services/services.h b/programs/services/services.h index a9e6313..7f43b22 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -48,6 +48,7 @@ struct service_entry HANDLE control_pipe; HANDLE overlapped_event; HANDLE status_changed_event; + BOOL force_shutdown; BOOL marked_for_delete; BOOL is_wow64; };

1 0

Sebastian Lackner : services: Move process related fields into a separate struct.
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: 7fc3f72de77d0ab69a91f9efc38c78956de7bffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fc3f72de77d0ab69a91f9efc… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Mar 3 06:28:16 2016 +0100 services: Move process related fields into a separate struct. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 28 ++++++------ programs/services/services.c | 100 +++++++++++++++++++++++++++---------------- programs/services/services.h | 20 ++++++--- 3 files changed, 92 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7fc3f72de77d0ab69a91f…

1 0