wine-commits March 2016

wine-commits@winehq.org

2 participants
722 discussions

Hans Leidekker : msiexec: Fix manpage markup for repair and logging modifiers.
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: 8d4ac88a6b18fa0655e92d292fa847021a55bfc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d4ac88a6b18fa0655e92d292… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 3 11:42:02 2016 +0100 msiexec: Fix manpage markup for repair and logging modifiers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/msiexec/msiexec.man.in | 50 ++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/programs/msiexec/msiexec.man.in b/programs/msiexec/msiexec.man.in index 23b3b58..e7c3798 100644 --- a/programs/msiexec/msiexec.man.in +++ b/programs/msiexec/msiexec.man.in @@ -24,25 +24,25 @@ Same as \fB/x\fR. \fR[\fBp\fR|\fBo\fR|\fBe\fR|\fBd\fR|\fBc\fR|\fBa\fR|\fBu\fR|\fBm\fR|\fBs\fR|\fBv\fR]\ \ \fR{\fIpackage\fR|\fIproductcode\fR} Repair an installation. Default options are \'omus\' -.IP "\fBlp\fR" +.IP "\fBp\fR" Reinstall the file if it is missing. -.IP "\fBlo\fR" +.IP "\fBo\fR" Reinstall the file if it is missing or if any older version is installed. -.IP "\fBle\fR" +.IP "\fBe\fR" Reinstall the file if it is missing, or if the installed version is equal or older. -.IP "\fBld\fR" +.IP "\fBd\fR" Reinstall the file if it is missing or a different version is installed. -.IP "\fBlc\fR" +.IP "\fBc\fR" Reinstall the file if it is missing or the checksum does not match. -.IP "\fBla\fR" +.IP "\fBa\fR" Reinstall all files. -.IP "\fBlu\fR" +.IP "\fBu\fR" Rewrite all required user registry entries. -.IP "\fBlm\fR" +.IP "\fBm\fR" Rewrite all required machine registry entries. -.IP "\fBls\fR" +.IP "\fBs\fR" Overwrite any conflicting shortcuts. -.IP "\fBlv\fR" +.IP "\fBv\fR" Recache the local installation package from the source installation package. .SH PATCHING .IP \fB/p\ \fR{\fIpatch\fR}\ \fR[\fIproperty\fR=\fIfoobar\fR] @@ -65,35 +65,35 @@ Shows a full UI. [\fBi\fR|\fBw\fR|\fBe\fR|\fBa\fR|\fBr\fR|\fBu\fR|\fBc\fR|\fBm\fR|\fBo\fR|\fBp\fR|\fBv\fR]\ [\fB+\fR|\fB!\fR]\ {\fIlogfile\fR} Enable logging to \fIlogfile\fR. Defaults are \'iwearmo\'. -.IP "\fBl*\fR" +.IP "\fB*\fR" Enable all logging options except \'v\' and \'x\'. -.IP "\fBli\fR" +.IP "\fBi\fR" Log status messages. -.IP "\fBlw\fR" +.IP "\fBw\fR" Log nonfatal warnings. -.IP "\fBle\fR" +.IP "\fBe\fR" Log all error messages. -.IP "\fBla\fR" +.IP "\fBa\fR" Log start of actions. -.IP "\fBlr\fR" +.IP "\fBr\fR" Log action specifc records. -.IP "\fBlu\fR" +.IP "\fBu\fR" Log user requests. -.IP "\fBlc\fR" +.IP "\fBc\fR" Log initial UI parameters. -.IP "\fBlm\fR" +.IP "\fBm\fR" Log out of memory errors. -.IP "\fBlo\fR" +.IP "\fBo\fR" Log out of diskspace messages. -.IP "\fBlp \fR" +.IP "\fBp \fR" Log terminal properties. -.IP "\fBlv \fR" +.IP "\fBv \fR" Verbose logging. -.IP "\fBlx \fR" +.IP "\fBx \fR" Log extra debugging messages. -.IP "\fBl+ \fR" +.IP "\fB+ \fR" Append logging to existing file. -.IP "\fBl! \fR" +.IP "\fB! \fR" Flush each line to log. .SH OTHER OPTIONS .IP \fB/h

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: 35845ddc5fc69f0b47cb1936b28cbf1bab769c27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35845ddc5fc69f0b47cb1936b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 3 11:26:29 2016 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/ru.po b/po/ru.po index 517fa14..aa28fdb 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,14 +5,14 @@ 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-02-14 19:13+0300\n" +"PO-Revision-Date: 2016-03-03 11:25+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.7\n" +"X-Generator: Poedit 1.8.7.1\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -11631,10 +11631,8 @@ msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Вы точно хотите удалить ключ реестра «%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: за опцией [/d] должно следовать целое число\n" +msgstr "reg: за опцией [/d] должна следовать строка\n" #: regedit.rc:34 msgid "&Registry"

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

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/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/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

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

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

Jacek Caban : user32: Removed unused owner argument.
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: d75991d80e77ac9d93b85b8369c6fce39bd4fdb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d75991d80e77ac9d93b85b836… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 2 15:05:10 2016 +0100 user32: Removed unused owner argument. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/dialog.c | 4 ++-- dlls/user.exe16/user_private.h | 2 +- dlls/user32/controls.h | 4 ++-- dlls/user32/dialog.c | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/user.exe16/dialog.c b/dlls/user.exe16/dialog.c index fead42d..766a468 100644 --- a/dlls/user.exe16/dialog.c +++ b/dlls/user.exe16/dialog.c @@ -744,7 +744,7 @@ INT16 WINAPI DialogBoxParam16( HINSTANCE16 hInst, LPCSTR template, { HWND owner = WIN_Handle32(owner16); hwnd = DIALOG_CreateIndirect16( hInst, data, owner, dlgProc, param, TRUE ); - if (hwnd) ret = wow_handlers32.dialog_box_loop( hwnd, owner ); + if (hwnd) ret = wow_handlers32.dialog_box_loop( hwnd ); GlobalUnlock16( hmem ); } FreeResource16( hmem ); @@ -764,7 +764,7 @@ INT16 WINAPI DialogBoxIndirectParam16( HINSTANCE16 hInst, HANDLE16 dlgTemplate, if (!(ptr = GlobalLock16( dlgTemplate ))) return -1; hwnd = DIALOG_CreateIndirect16( hInst, ptr, owner, dlgProc, param, TRUE ); GlobalUnlock16( dlgTemplate ); - if (hwnd) return wow_handlers32.dialog_box_loop( hwnd, owner ); + if (hwnd) return wow_handlers32.dialog_box_loop( hwnd ); return -1; } diff --git a/dlls/user.exe16/user_private.h b/dlls/user.exe16/user_private.h index 7c91afb..3d97546 100644 --- a/dlls/user.exe16/user_private.h +++ b/dlls/user.exe16/user_private.h @@ -63,7 +63,7 @@ struct wow_handlers32 HWND (*get_win_handle)(HWND); WNDPROC (*alloc_winproc)(WNDPROC,BOOL); struct tagDIALOGINFO *(*get_dialog_info)(HWND,BOOL); - INT (*dialog_box_loop)(HWND,HWND); + INT (*dialog_box_loop)(HWND); ULONG_PTR (*get_icon_param)(HICON); ULONG_PTR (*set_icon_param)(HICON,ULONG_PTR); }; diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 69bc94c..542bf39 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -121,7 +121,7 @@ struct wow_handlers32 HWND (*get_win_handle)(HWND); WNDPROC (*alloc_winproc)(WNDPROC,BOOL); struct tagDIALOGINFO *(*get_dialog_info)(HWND,BOOL); - INT (*dialog_box_loop)(HWND,HWND); + INT (*dialog_box_loop)(HWND); ULONG_PTR (*get_icon_param)(HICON); ULONG_PTR (*set_icon_param)(HICON,ULONG_PTR); }; @@ -244,7 +244,7 @@ typedef struct tagDIALOGINFO #define DF_OWNERENABLED 0x0002 extern DIALOGINFO *DIALOG_get_info( HWND hwnd, BOOL create ) DECLSPEC_HIDDEN; -extern INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) DECLSPEC_HIDDEN; +extern INT DIALOG_DoDialogBox( HWND hwnd ) DECLSPEC_HIDDEN; HRGN set_control_clipping( HDC hdc, const RECT *rect ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 180ab3d..3ea426d 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -769,14 +769,14 @@ HWND WINAPI CreateDialogIndirectParamW( HINSTANCE hInst, LPCDLGTEMPLATEW dlgTemp /*********************************************************************** * DIALOG_DoDialogBox */ -INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) +INT DIALOG_DoDialogBox( HWND hwnd ) { + HWND owner = GetWindow( hwnd, GW_OWNER ); DIALOGINFO * dlgInfo; MSG msg; INT retval; BOOL bFirstEmpty; - owner = GetWindow( hwnd, GW_OWNER ); if (!(dlgInfo = DIALOG_get_info( hwnd, FALSE ))) return -1; bFirstEmpty = TRUE; @@ -842,7 +842,7 @@ INT_PTR WINAPI DialogBoxParamA( HINSTANCE hInst, LPCSTR name, if (!(hrsrc = FindResourceA( hInst, name, (LPSTR)RT_DIALOG ))) return -1; if (!(ptr = LoadResource(hInst, hrsrc))) return -1; hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, FALSE, TRUE ); - if (hwnd) return DIALOG_DoDialogBox( hwnd, owner ); + if (hwnd) return DIALOG_DoDialogBox( hwnd ); return 0; } @@ -860,7 +860,7 @@ INT_PTR WINAPI DialogBoxParamW( HINSTANCE hInst, LPCWSTR name, if (!(hrsrc = FindResourceW( hInst, name, (LPWSTR)RT_DIALOG ))) return -1; if (!(ptr = LoadResource(hInst, hrsrc))) return -1; hwnd = DIALOG_CreateIndirect( hInst, ptr, owner, dlgProc, param, TRUE, TRUE ); - if (hwnd) return DIALOG_DoDialogBox( hwnd, owner ); + if (hwnd) return DIALOG_DoDialogBox( hwnd ); return 0; } @@ -873,7 +873,7 @@ INT_PTR WINAPI DialogBoxIndirectParamAorW( HINSTANCE hInstance, LPCVOID template LPARAM param, DWORD flags ) { HWND hwnd = DIALOG_CreateIndirect( hInstance, template, owner, dlgProc, param, !flags, TRUE ); - if (hwnd) return DIALOG_DoDialogBox( hwnd, owner ); + if (hwnd) return DIALOG_DoDialogBox( hwnd ); return -1; }

1 0

Jacek Caban : user32/tests: Added more dialog owner tests.
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: ed6614107a443603efdfe2815198d784a4f984c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed6614107a443603efdfe2815… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 2 15:04:56 2016 +0100 user32/tests: Added more dialog owner tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 189 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 186 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index bd02c89..47d754f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1394,6 +1394,33 @@ static const struct message WmModalDialogSeq[] = { { WM_NCDESTROY, sent }, { 0 } }; +static const struct message WmModalDialogSeq_2[] = { + { WM_CANCELMODE, sent }, + { HCBT_SETFOCUS, hook }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_KILLFOCUS, sent }, + { WM_IME_SETCONTEXT, sent|parent|wparam|optional, 0 }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_ENABLE, sent|wparam, 0 }, + { HCBT_CREATEWND, hook }, + { EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_SETFONT, sent }, + { WM_INITDIALOG, sent }, + { WM_CHANGEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_ENABLE, sent|wparam, 1 }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE }, + { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_CHANGEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { HCBT_DESTROYWND, hook }, + { 0x0090, sent|optional }, + { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam, 0, 0 }, + { WM_DESTROY, sent }, + { WM_NCDESTROY, sent }, + { 0 } +}; /* SetMenu for NonVisible windows with size change*/ static const struct message WmSetMenuNonVisibleSizeChangeSeq[] = { { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, @@ -4037,6 +4064,36 @@ static INT_PTR CALLBACK TestModalDlgProcA(HWND hwnd, UINT message, WPARAM wParam return 0; } +static INT_PTR CALLBACK TestModalDlgProc2(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + struct recvd_message msg; + + if (ignore_message( message )) return 0; + + switch (message) + { + /* ignore */ + case WM_MOUSEMOVE: + case WM_NCMOUSEMOVE: + case WM_NCMOUSELEAVE: + case WM_SETCURSOR: + return 0; + case WM_NCHITTEST: + return HTCLIENT; + } + + msg.hwnd = hwnd; + msg.message = message; + msg.flags = sent|wparam|lparam; + msg.wParam = wParam; + msg.lParam = lParam; + msg.descr = "dialog"; + add_message(&msg); + + if (message == WM_INITDIALOG) EndDialog( hwnd, 0 ); + return 0; +} + static void test_hv_scroll_1(HWND hwnd, INT ctl, DWORD clear, DWORD set, INT min, INT max) { DWORD style, exstyle; @@ -12161,7 +12218,7 @@ static const struct message WmCreateDialogParamSeq_4[] = { static void test_dialog_messages(void) { WNDCLASSA cls; - HWND hdlg, hedit1, hedit2, hfocus; + HWND hdlg, hedit1, hedit2, hfocus, parent, child, child2; LRESULT ret; #define set_selection(hctl, start, end) \ @@ -12278,11 +12335,88 @@ static void test_dialog_messages(void) flush_sequence(); UnregisterClassA(cls.lpszClassName, cls.hInstance); + + parent = CreateWindowExA(0, "TestParentClass", "Test parent", + WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok (parent != 0, "Failed to create parent window\n"); + + /* This child has no parent set. We will later call SetParent on it, + * so that it will have a parent set, but no WS_CHILD style. */ + child = CreateWindowExA(0, "TestWindowClass", "Test child", + WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok (child != 0, "Failed to create child window\n"); + + /* This is a regular child window. When used as an owner, the other + * child window will be used. */ + child2 = CreateWindowExA(0, "SimpleWindowClass", "Test child2", + WS_OVERLAPPEDWINDOW | WS_VISIBLE | WS_CHILD, + 100, 100, 200, 200, child, 0, 0, NULL); + ok (child2 != 0, "Failed to create child window\n"); + + SetParent(child, parent); + SetFocus(child); + + flush_sequence(); + DialogBoxA( 0, "TEST_DIALOG", child2, TestModalDlgProc2 ); + ok_sequence(WmModalDialogSeq_2, "ModalDialog2", TRUE); + + DestroyWindow(child2); + DestroyWindow(child); + DestroyWindow(parent); + flush_sequence(); +} + +static void test_enddialog_seq(HWND dialog, HWND owner) +{ + const struct message seq[] = { + { WM_ENABLE, sent }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, + { HCBT_ACTIVATE, hook|wparam, (WPARAM)owner }, + { WM_NCACTIVATE, sent|wparam|lparam, WA_INACTIVE, (LPARAM)owner }, + { WM_ACTIVATE, sent|wparam|lparam, WA_INACTIVE, (LPARAM)owner }, + /* FIXME: Following two are optional because Wine sends WM_QUERYNEWPALETTE instead of WM_WINDOWPOSCHANGING */ + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_QUERYNEWPALETTE, sent|optional }, + { WM_NCACTIVATE, sent|wparam|lparam, WA_ACTIVE, (LPARAM)dialog }, + { WM_GETTEXT, sent|optional|defwinproc }, + { WM_ACTIVATE, sent|wparam|lparam, WA_ACTIVE, (LPARAM)dialog }, + { HCBT_SETFOCUS, hook|wparam, (WPARAM)owner }, + { WM_KILLFOCUS, sent|wparam, (WPARAM)owner }, + { WM_SETFOCUS, sent|defwinproc|wparam, (WPARAM)dialog }, + { 0 } + }; + + flush_sequence(); + EndDialog(dialog, 0); + ok_sequence(seq, "EndDialog", FALSE); +} + +static void test_enddialog_seq2(HWND dialog, HWND owner) +{ + const struct message seq[] = { + { WM_ENABLE, parent|sent }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, + { HCBT_ACTIVATE, hook|wparam, (WPARAM)owner }, + { WM_NCACTIVATE, sent|wparam|lparam, WA_INACTIVE, (LPARAM)owner }, + { WM_ACTIVATE, sent|wparam|lparam, WA_INACTIVE, (LPARAM)owner }, + { WM_WINDOWPOSCHANGING, sent|optional|wparam, SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGING, sent|optional|wparam, SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, + { HCBT_SETFOCUS, hook|wparam, (WPARAM)owner }, + { WM_KILLFOCUS, sent|wparam, (WPARAM)owner }, + { WM_SETFOCUS, sent|parent|defwinproc|wparam, (WPARAM)dialog }, + { 0 } + }; + + flush_sequence(); + EndDialog(dialog, 0); + ok_sequence(seq, "EndDialog2", FALSE); } static void test_EndDialog(void) { - HWND hparent, hother, hactive, hdlg; + HWND hparent, hother, hactive, hdlg, hchild; WNDCLASSA cls; hparent = CreateWindowExA(0, "TestParentClass", "Test parent", @@ -12340,8 +12474,57 @@ static void test_EndDialog(void) DestroyWindow(hdlg); flush_sequence(); - DestroyWindow( hother ); DestroyWindow( hparent ); + + hparent = CreateWindowExA(0, "TestParentClass", "Test parent", + WS_POPUP | WS_VISIBLE | WS_DISABLED, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok (hparent != 0, "Failed to create parent window\n"); + + hchild = CreateWindowExA(0, "TestWindowClass", "Test child", + WS_OVERLAPPEDWINDOW | WS_VISIBLE | WS_DISABLED, + 0, 0, 0, 0, 0, 0, 0, NULL); + ok (hchild != 0, "Failed to create child window\n"); + + SetParent(hchild, hparent); + + flush_sequence(); + SetForegroundWindow(hother); + hactive = GetForegroundWindow(); + ok(hother == hactive, "Wrong foreground window (%p != %p)\n", hother, hactive); + + hdlg = CreateDialogParamA(0, "CLASS_TEST_DIALOG_2", hchild, test_dlg_proc, 0); + ok(IsWindow(hdlg), "CreateDialogParam failed\n"); + + SetForegroundWindow(hdlg); + test_enddialog_seq(hdlg, hchild); + + hactive = GetForegroundWindow(); + ok(hactive == hchild, "Wrong foreground window (active: %p, parent: %p, dlg: %p, other: %p child: %p)\n", hactive, hparent, hdlg, hother, hchild); + + DestroyWindow(hdlg); + + /* Now set WS_CHILD style flag so that it's a real child and its parent will be dialog's owner. */ + SetWindowLongW(hchild, GWL_STYLE, GetWindowLongW(hchild, GWL_STYLE) | WS_CHILD); + + SetForegroundWindow(hother); + hactive = GetForegroundWindow(); + ok(hother == hactive, "Wrong foreground window (%p != %p)\n", hother, hactive); + + hdlg = CreateDialogParamA(0, "CLASS_TEST_DIALOG_2", hchild, test_dlg_proc, 0); + ok(IsWindow(hdlg), "CreateDialogParam failed\n"); + + SetForegroundWindow(hdlg); + test_enddialog_seq2(hdlg, hparent); + + hactive = GetForegroundWindow(); + ok(hactive == hparent, "Wrong foreground window (active: %p, parent: %p, dlg: %p, other: %p child: %p)\n", hactive, hparent, hdlg, hother, hchild); + DestroyWindow(hdlg); + DestroyWindow(hchild); + DestroyWindow(hparent); + DestroyWindow(hother); + flush_sequence(); + UnregisterClassA(cls.lpszClassName, cls.hInstance); }

1 0

← Newer
1
...
61
62
63
64
65
66
67
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2016