wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

Sebastian Lackner : advapi32: Do not stop service main thread as long as there are still running services.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 2263baaf2e4d5e3325fb2339613a68a8a232923b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2263baaf2e4d5e3325fb23396… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 17 09:40:04 2016 +0200 advapi32: Do not stop service main thread as long as there are still running services. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/service.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index d6bd14c..cd3cd2f 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -96,7 +96,7 @@ static CRITICAL_SECTION service_cs = { &service_cs_debug, -1, 0, 0, 0, 0 }; static service_data **services; static unsigned int nb_services; static HANDLE service_event; -static HANDLE stop_event; +static BOOL stop_service; extern HANDLE CDECL __wine_make_process_system(void); @@ -546,22 +546,21 @@ static BOOL service_run_main_thread(void) } service_event = CreateEventW( NULL, FALSE, FALSE, NULL ); - stop_event = CreateEventW( NULL, FALSE, FALSE, NULL ); + stop_service = FALSE; /* FIXME: service_control_dispatcher should be merged into the main thread */ wait_handles[0] = __wine_make_process_system(); wait_handles[1] = CreateThread( NULL, 0, service_control_dispatcher, disp, 0, NULL ); wait_handles[2] = service_event; - wait_handles[3] = stop_event; TRACE("Starting %d services running as process %d\n", nb_services, GetCurrentProcessId()); /* wait for all the threads to pack up and exit */ - for (;;) + while (!stop_service) { EnterCriticalSection( &service_cs ); - for (i = 0, n = 4; i < nb_services && n < MAXIMUM_WAIT_OBJECTS; i++) + for (i = 0, n = 3; i < nb_services && n < MAXIMUM_WAIT_OBJECTS; i++) { if (!services[i]->thread) continue; wait_services[n] = i; @@ -619,10 +618,6 @@ static BOOL service_run_main_thread(void) { continue; /* rebuild the list */ } - else if (ret == 3) - { - return TRUE; - } else if (ret < n) { i = wait_services[ret]; @@ -633,6 +628,8 @@ static BOOL service_run_main_thread(void) } else return FALSE; } + + return TRUE; } /****************************************************************************** @@ -810,9 +807,21 @@ SetServiceStatus( SERVICE_STATUS_HANDLE hService, LPSERVICE_STATUS lpStatus ) return FALSE; } - if (lpStatus->dwCurrentState == SERVICE_STOPPED) { - SetEvent(stop_event); - CloseServiceHandle((SC_HANDLE)hService); + if (lpStatus->dwCurrentState == SERVICE_STOPPED) + { + unsigned int i, count = 0; + EnterCriticalSection( &service_cs ); + for (i = 0; i < nb_services; i++) + { + if (services[i]->handle == (SC_HANDLE)hService) continue; + if (services[i]->thread) count++; + } + if (!count) + { + stop_service = TRUE; + SetEvent( service_event ); /* notify the main loop */ + } + LeaveCriticalSection( &service_cs ); } return TRUE;

1 0

Sebastian Lackner : advapi32: Hold lock while handling service thread shutdown.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 13bb213aeb65b657a57adbf486ddb73da78dffbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=13bb213aeb65b657a57adbf48… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 17 09:36:59 2016 +0200 advapi32: Hold lock while handling service thread shutdown. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/service.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 11186c5..d6bd14c 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -625,8 +625,11 @@ static BOOL service_run_main_thread(void) } else if (ret < n) { - services[wait_services[ret]]->thread = 0; - CloseHandle( wait_handles[ret] ); + i = wait_services[ret]; + EnterCriticalSection( &service_cs ); + CloseHandle( services[i]->thread ); + services[i]->thread = NULL; + LeaveCriticalSection( &service_cs ); } else return FALSE; }

1 0

Sebastian Lackner : advapi32: Hold lock while processing service controls.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 63c36da6da2f1da6fc4b184b5101503ad2996f81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63c36da6da2f1da6fc4b184b5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 17 09:36:13 2016 +0200 advapi32: Hold lock while processing service controls. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/service.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index ccca721..11186c5 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -461,6 +461,8 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) } } + EnterCriticalSection( &service_cs ); + /* validate service name */ name = (WCHAR *)data; if (!info.name_size || data_size < info.name_size * sizeof(WCHAR) || name[info.name_size - 1]) @@ -504,6 +506,7 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) } done: + LeaveCriticalSection( &service_cs ); WriteFile( disp->pipe, &result, sizeof(result), &count, NULL ); heap_free( data ); }

1 0

Sebastian Lackner : advapi32: Simplify RegisterServiceCtrlHandlerExW.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: f4590e91ebd1530dd04e81a9d724ce06cd1df2a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4590e91ebd1530dd04e81a9d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 17 09:35:30 2016 +0200 advapi32: Simplify RegisterServiceCtrlHandlerExW. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/service.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 86bd713..ccca721 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2360,7 +2360,6 @@ SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerExW( LPCWSTR lpServiceNam { service_data *service; SC_HANDLE hService = 0; - BOOL found = FALSE; TRACE("%s %p %p\n", debugstr_w(lpServiceName), lpHandlerProc, lpContext); @@ -2370,12 +2369,10 @@ SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerExW( LPCWSTR lpServiceNam service->handler = lpHandlerProc; service->context = lpContext; hService = service->handle; - found = TRUE; } LeaveCriticalSection( &service_cs ); - if (!found) SetLastError(ERROR_SERVICE_DOES_NOT_EXIST); - + if (!hService) SetLastError( ERROR_SERVICE_DOES_NOT_EXIST ); return (SERVICE_STATUS_HANDLE)hService; }

1 0

Sebastian Lackner : services: Add a grab_service function.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 46a974856fee148a1006478df1978a82153fb9c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46a974856fee148a1006478df… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 17 09:12:27 2016 +0200 services: Add a grab_service function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 4 +--- programs/services/services.c | 13 +++++++++---- programs/services/services.h | 1 + 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 45366fb..eb8f4ff 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -373,9 +373,7 @@ DWORD __cdecl svcctl_OpenServiceW( return ERROR_INVALID_NAME; scmdatabase_lock(manager->db); - entry = scmdatabase_find_service(manager->db, lpServiceName); - if (entry != NULL) - InterlockedIncrement(&entry->ref_count); + entry = grab_service(scmdatabase_find_service(manager->db, lpServiceName)); scmdatabase_unlock(manager->db); if (entry == NULL) diff --git a/programs/services/services.c b/programs/services/services.c index f7a2725..9be9bb8 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -346,15 +346,13 @@ static void scmdatabase_autostart_services(struct scmdatabase *db) break; services_list = slist_new; } - services_list[i] = service; - InterlockedIncrement(&service->ref_count); - i++; + services_list[i++] = grab_service(service); } } + size = i; scmdatabase_unlock(db); - size = i; for (i = 0; i < size; i++) { DWORD err; @@ -494,6 +492,13 @@ void release_process(struct process_entry *process) scmdatabase_unlock(db); } +struct service_entry *grab_service(struct service_entry *service) +{ + if (service) + InterlockedIncrement(&service->ref_count); + return service; +} + void release_service(struct service_entry *service) { struct scmdatabase *db = service->db; diff --git a/programs/services/services.h b/programs/services/services.h index 16f99f89..59d8d00 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -84,6 +84,7 @@ BOOL validate_service_name(LPCWSTR name); BOOL validate_service_config(struct service_entry *entry); DWORD save_service_config(struct service_entry *entry); void free_service_entry(struct service_entry *entry); +struct service_entry *grab_service(struct service_entry *service); void release_service(struct service_entry *service); void service_lock(struct service_entry *service); void service_unlock(struct service_entry *service);

1 0

Alexandre Julliard : user32/tests: Add some cross-process clipboard tests.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 2e6fc893956c820a005b910665c5b22f0a90f1b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e6fc893956c820a005b91066… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 17 19:01:25 2016 +0900 user32/tests: Add some cross-process clipboard tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 138 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 625d550..d218941 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdio.h> #include "wine/test.h" #include "winbase.h" #include "winerror.h" @@ -28,6 +29,7 @@ static BOOL (WINAPI *pAddClipboardFormatListener)(HWND hwnd); static DWORD (WINAPI *pGetClipboardSequenceNumber)(void); static int thread_from_line; +static char *argv0; static DWORD WINAPI open_clipboard_thread(LPVOID arg) { @@ -80,6 +82,32 @@ static DWORD WINAPI set_clipboard_data_thread(LPVOID arg) return 0; } +static void set_clipboard_data_process( int arg ) +{ + HANDLE ret; + + SetLastError( 0xdeadbeef ); + if (arg) + { + todo_wine_if( arg == 1 || arg == 3 ) + ok( IsClipboardFormatAvailable( CF_WAVE ), "process %u: CF_WAVE not available\n", arg ); + ret = SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_DDESHARE | GMEM_ZEROINIT, 100 )); + todo_wine_if( arg == 2 || arg == 4 ) + ok( ret != 0, "process %u: SetClipboardData failed err %u\n", arg, GetLastError() ); + } + else + { + SetClipboardData( CF_WAVE, 0 ); + todo_wine ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "process %u: wrong error %u\n", + arg, GetLastError()); + todo_wine ok( !IsClipboardFormatAvailable( CF_WAVE ), "process %u: SetClipboardData succeeded\n", arg ); + ret = SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_DDESHARE | GMEM_ZEROINIT, 100 )); + ok( !ret, "process %u: SetClipboardData succeeded\n", arg ); + todo_wine ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "process %u: wrong error %u\n", + arg, GetLastError()); + } +} + static void run_thread( LPTHREAD_START_ROUTINE func, void *arg, int line ) { DWORD ret; @@ -102,6 +130,23 @@ static void run_thread( LPTHREAD_START_ROUTINE func, void *arg, int line ) CloseHandle(thread); } +static void run_process( const char *args ) +{ + char cmd[MAX_PATH]; + PROCESS_INFORMATION info; + STARTUPINFOA startup; + + sprintf( cmd, "%s clipboard %s", argv0, args ); + memset( &startup, 0, sizeof(startup) ); + startup.cb = sizeof(startup); + ok( CreateProcessA( NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info ), + "CreateProcess %s failed\n", cmd ); + + winetest_wait_child_process( info.hProcess ); + CloseHandle( info.hProcess ); + CloseHandle( info.hThread ); +} + static void test_ClipboardOwner(void) { HWND hWnd1, hWnd2; @@ -137,6 +182,7 @@ static void test_ClipboardOwner(void) run_thread( open_clipboard_thread, hWnd1, __LINE__ ); run_thread( empty_clipboard_thread, 0, __LINE__ ); run_thread( set_clipboard_data_thread, hWnd1, __LINE__ ); + run_process( "set_clipboard_data 0" ); ok(!CloseClipboard(), "CloseClipboard should fail if clipboard wasn't open\n"); ok(OpenClipboard(hWnd1), "OpenClipboard failed\n"); @@ -152,6 +198,7 @@ static void test_ClipboardOwner(void) ok(GetClipboardOwner() == hWnd1, "clipboard should be owned by %p, not by %p\n", hWnd1, GetClipboardOwner()); run_thread( empty_clipboard_thread, 0, __LINE__ ); run_thread( set_clipboard_data_thread, hWnd1, __LINE__ ); + run_process( "set_clipboard_data 1" ); SetLastError(0xdeadbeef); ret = OpenClipboard(hWnd2); @@ -170,6 +217,7 @@ static void test_ClipboardOwner(void) ok( GetClipboardOwner() == GetDesktopWindow(), "wrong owner %p/%p\n", GetClipboardOwner(), GetDesktopWindow() ); run_thread( set_clipboard_data_thread, GetDesktopWindow(), __LINE__ ); + run_process( "set_clipboard_data 2" ); ret = CloseClipboard(); ok( ret, "CloseClipboard error %d\n", GetLastError()); @@ -191,6 +239,7 @@ static void test_ClipboardOwner(void) ret = OpenClipboard( 0 ); ok( ret, "OpenClipboard error %d\n", GetLastError()); run_thread( set_clipboard_data_thread, 0, __LINE__ ); + run_process( "set_clipboard_data 3" ); ret = CloseClipboard(); ok( ret, "CloseClipboard error %d\n", GetLastError()); @@ -199,6 +248,7 @@ static void test_ClipboardOwner(void) ret = OpenClipboard( 0 ); ok( ret, "OpenClipboard error %d\n", GetLastError()); run_thread( set_clipboard_data_thread, 0, __LINE__ ); + run_process( "set_clipboard_data 4" ); ret = EmptyClipboard(); ok( ret, "EmptyClipboard error %d\n", GetLastError()); ret = CloseClipboard(); @@ -795,8 +845,56 @@ static DWORD WINAPI test_handles_thread( void *arg ) return 0; } +static DWORD WINAPI test_handles_thread2( void *arg ) +{ + BOOL r; + HANDLE h; + char *ptr; + + r = OpenClipboard( 0 ); + ok( r, "gle %d\n", GetLastError() ); + h = GetClipboardData( CF_TEXT ); + ok( is_moveable( h ), "expected moveable mem %p\n", h ); + ptr = GlobalLock( h ); + if (ptr) ok( !strcmp( "test", ptr ), "wrong data '%.5s'\n", ptr ); + GlobalUnlock( h ); + h = GetClipboardData( format_id ); + ok( is_moveable( h ), "expected moveable mem %p\n", h ); + ptr = GlobalLock( h ); + if (ptr) ok( !strcmp( "test", ptr ), "wrong data '%.5s'\n", ptr ); + GlobalUnlock( h ); + r = CloseClipboard(); + ok( r, "gle %d\n", GetLastError() ); + return 0; +} + +static void test_handles_process( const char *str ) +{ + BOOL r; + HANDLE h; + char *ptr; + + format_id = RegisterClipboardFormatA( "my_cool_clipboard_format" ); + r = OpenClipboard( 0 ); + ok( r, "gle %d\n", GetLastError() ); + h = GetClipboardData( CF_TEXT ); + todo_wine ok( is_fixed( h ), "expected fixed mem %p\n", h ); + ptr = GlobalLock( h ); + if (ptr) todo_wine ok( !strcmp( str, ptr ), "wrong data '%.5s'\n", ptr ); + GlobalUnlock( h ); + h = GetClipboardData( format_id ); + todo_wine ok( is_fixed( h ), "expected fixed mem %p\n", h ); + ptr = GlobalLock( h ); + if (ptr) ok( !strcmp( str, ptr ), "wrong data '%.5s'\n", ptr ); + GlobalUnlock( h ); + r = CloseClipboard(); + ok( r, "gle %d\n", GetLastError() ); +} + static void test_data_handles(void) { + BOOL r; + HANDLE h; HWND hwnd = CreateWindowA( "static", NULL, WS_POPUP, 0, 0, 10, 10, 0, 0, 0, NULL ); format_id = RegisterClipboardFormatA( "my_cool_clipboard_format" ); @@ -805,16 +903,56 @@ static void test_data_handles(void) test_handles( GetDesktopWindow() ); test_handles( hwnd ); run_thread( test_handles_thread, hwnd, __LINE__ ); + + r = OpenClipboard( hwnd ); + ok( r, "gle %d\n", GetLastError() ); + r = EmptyClipboard(); + ok( r, "gle %d\n", GetLastError() ); + h = SetClipboardData( CF_TEXT, create_text() ); + ok( is_moveable( h ), "expected moveable mem %p\n", h ); + h = SetClipboardData( format_id, create_text() ); + ok( is_moveable( h ), "expected moveable mem %p\n", h ); + r = CloseClipboard(); + ok( r, "gle %d\n", GetLastError() ); + + run_thread( test_handles_thread2, 0, __LINE__ ); + run_process( "handles test" ); + + r = OpenClipboard( hwnd ); + ok( r, "gle %d\n", GetLastError() ); + h = GetClipboardData( CF_TEXT ); + ok( is_moveable( h ), "expected moveable mem %p\n", h ); + h = GetClipboardData( format_id ); + ok( is_moveable( h ), "expected moveable mem %p\n", h ); + r = EmptyClipboard(); + ok( r, "gle %d\n", GetLastError() ); + r = CloseClipboard(); + ok( r, "gle %d\n", GetLastError() ); + DestroyWindow( hwnd ); } START_TEST(clipboard) { + char **argv; + int argc = winetest_get_mainargs( &argv ); HMODULE mod = GetModuleHandleA( "user32" ); + argv0 = argv[0]; pAddClipboardFormatListener = (void *)GetProcAddress( mod, "AddClipboardFormatListener" ); pGetClipboardSequenceNumber = (void *)GetProcAddress( mod, "GetClipboardSequenceNumber" ); + if (argc == 4 && !strcmp( argv[2], "set_clipboard_data" )) + { + set_clipboard_data_process( atoi( argv[3] )); + return; + } + if (argc == 4 && !strcmp( argv[2], "handles" )) + { + test_handles_process( argv[3] ); + return; + } + test_RegisterClipboardFormatA(); test_ClipboardOwner(); test_synthesized();

1 0

Alexandre Julliard : winex11: Don' t crash when getting an invalid window in SelectionRequest.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 6da991c75bb4140e0922a76b5db0de3637e3f52f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6da991c75bb4140e0922a76b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 17 17:23:31 2016 +0900 winex11: Don't crash when getting an invalid window in SelectionRequest. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 5dc5e3c..9b6c749 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2298,6 +2298,11 @@ static int is_atom_error( Display *display, XErrorEvent *event, void *arg ) return (event->error_code == BadAtom); } +static int is_window_error( Display *display, XErrorEvent *event, void *arg ) +{ + return (event->error_code == BadWindow); +} + /************************************************************************** * X11DRV_CLIPBOARD_InsertSelectionProperties * @@ -3439,6 +3444,8 @@ static void X11DRV_HandleSelectionRequest( HWND hWnd, XSelectionRequestEvent *ev TRACE("\n"); + X11DRV_expect_error( display, is_window_error, NULL ); + /* * We can only handle the selection request if : * The selection is PRIMARY or CLIPBOARD, AND we can successfully open the clipboard. @@ -3527,6 +3534,8 @@ END: TRACE("Sending SelectionNotify event...\n"); XSendEvent(display,event->requestor,False,NoEventMask,(XEvent*)&result); } + XSync( display, False ); + if (X11DRV_check_error()) WARN( "requestor %lx is no longer valid\n", event->requestor ); }

1 0

Alexandre Julliard : user32/tests: Add tests for clipboard global memory handles.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 0a1f9bec6d2d7e895bbc68bb7327f776df53afc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a1f9bec6d2d7e895bbc68bb7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 17 16:55:16 2016 +0900 user32/tests: Add tests for clipboard global memory handles. The GMEM_FIXED tests are based on a patch by Rafał Harabień. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 127 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index be6c9bf..625d550 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -682,6 +682,132 @@ static void test_messages(void) DeleteCriticalSection(&clipboard_cs); } +static BOOL is_moveable( HANDLE handle ) +{ + void *ptr = GlobalLock( handle ); + if (ptr) GlobalUnlock( handle ); + return ptr && ptr != handle; +} + +static BOOL is_fixed( HANDLE handle ) +{ + void *ptr = GlobalLock( handle ); + if (ptr) GlobalUnlock( handle ); + return ptr && ptr == handle; +} + +static BOOL is_freed( HANDLE handle ) +{ + void *ptr = GlobalLock( handle ); + if (ptr) GlobalUnlock( handle ); + return !ptr; +} + +static UINT format_id; + +static void test_handles( HWND hwnd ) +{ + HGLOBAL h, htext, htext2; + BOOL r; + HANDLE data; + DWORD process; + BOOL is_owner = (GetWindowThreadProcessId( hwnd, &process ) && process == GetCurrentProcessId()); + + trace( "hwnd %p\n", hwnd ); + htext = create_text(); + htext2 = create_text(); + + r = OpenClipboard( hwnd ); + ok( r, "gle %d\n", GetLastError() ); + r = EmptyClipboard(); + ok( r, "gle %d\n", GetLastError() ); + + h = SetClipboardData( CF_TEXT, htext ); + ok( h == htext, "got %p\n", h ); + ok( is_moveable( h ), "expected moveable mem %p\n", h ); + h = SetClipboardData( format_id, htext2 ); + ok( h == htext2, "got %p\n", h ); + ok( is_moveable( h ), "expected moveable mem %p\n", h ); + + data = GetClipboardData( CF_TEXT ); + ok( data == htext, "wrong data %p\n", data ); + ok( is_moveable( data ), "expected moveable mem %p\n", data ); + + data = GetClipboardData( format_id ); + ok( data == htext2, "wrong data %p, cf %08x\n", data, format_id ); + ok( is_moveable( data ), "expected moveable mem %p\n", data ); + + r = CloseClipboard(); + ok( r, "gle %d\n", GetLastError() ); + + /* data handles are still valid */ + ok( is_moveable( htext ), "expected moveable mem %p\n", htext ); + ok( is_moveable( htext2 ), "expected moveable mem %p\n", htext ); + + r = OpenClipboard( hwnd ); + ok( r, "gle %d\n", GetLastError() ); + + /* and now they are freed, unless we are the owner */ + if (!is_owner) + { + todo_wine ok( is_freed( htext ), "expected freed mem %p\n", htext ); + todo_wine ok( is_freed( htext2 ), "expected freed mem %p\n", htext ); + + data = GetClipboardData( CF_TEXT ); + todo_wine ok( is_fixed( data ), "expected fixed mem %p\n", data ); + + data = GetClipboardData( CF_OEMTEXT ); + todo_wine ok( is_fixed( data ), "expected fixed mem %p\n", data ); + + data = GetClipboardData( CF_UNICODETEXT ); + todo_wine ok( is_fixed( data ), "expected fixed mem %p\n", data ); + + data = GetClipboardData( format_id ); + todo_wine ok( is_fixed( data ), "expected fixed mem %p\n", data ); + } + else + { + ok( is_moveable( htext ), "expected moveable mem %p\n", htext ); + ok( is_moveable( htext2 ), "expected moveable mem %p\n", htext ); + + data = GetClipboardData( CF_TEXT ); + ok( data == htext, "wrong data %p\n", data ); + + data = GetClipboardData( format_id ); + ok( data == htext2, "wrong data %p, cf %08x\n", data, format_id ); + } + + r = EmptyClipboard(); + ok( r, "gle %d\n", GetLastError() ); + + /* w2003, w2008 don't seem to free the data here */ + ok( is_freed( htext ) || broken( !is_freed( htext )), "expected freed mem %p\n", htext ); + ok( is_freed( htext2 ) || broken( !is_freed( htext2 )), "expected freed mem %p\n", htext ); + + r = CloseClipboard(); + ok( r, "gle %d\n", GetLastError() ); +} + +static DWORD WINAPI test_handles_thread( void *arg ) +{ + trace( "running from different thread\n" ); + test_handles( (HWND)arg ); + return 0; +} + +static void test_data_handles(void) +{ + HWND hwnd = CreateWindowA( "static", NULL, WS_POPUP, 0, 0, 10, 10, 0, 0, 0, NULL ); + + format_id = RegisterClipboardFormatA( "my_cool_clipboard_format" ); + ok( hwnd != 0, "window creation failed\n" ); + test_handles( 0 ); + test_handles( GetDesktopWindow() ); + test_handles( hwnd ); + run_thread( test_handles_thread, hwnd, __LINE__ ); + DestroyWindow( hwnd ); +} + START_TEST(clipboard) { HMODULE mod = GetModuleHandleA( "user32" ); @@ -693,4 +819,5 @@ START_TEST(clipboard) test_ClipboardOwner(); test_synthesized(); test_messages(); + test_data_handles(); }

1 0

Alexandre Julliard : ole32/tests: Make the clipboard test more strict and remove Win9x compatibility cruft.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 295061a2804f95c7517d6538f3b0704b21a1b91d URL: http://source.winehq.org/git/wine.git/?a=commit;h=295061a2804f95c7517d6538f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 17 14:26:59 2016 +0900 ole32/tests: Make the clipboard test more strict and remove Win9x compatibility cruft. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/clipboard.c | 64 +++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 36 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 1a8301e..004b807 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -612,9 +612,7 @@ static void test_enum_fmtetc(IDataObject *src) if(src) { hr = IEnumFORMATETC_Next(src_enum, 1, &src_fmt, NULL); - ok(hr == S_FALSE || - broken(hr == S_OK && count == 5), /* win9x and winme don't enumerate duplicated cf's */ - "%d: got %08x\n", count, hr); + ok(hr == S_FALSE, "%d: got %08x\n", count, hr); IEnumFORMATETC_Release(src_enum); } @@ -795,8 +793,7 @@ static void test_cf_dataobject(IDataObject *data) ok(DataObjectImpl_GetDataHere_calls == 1, "got %d\n", DataObjectImpl_GetDataHere_calls); ptr = GlobalLock(h); size = GlobalSize(h); - ok(size == strlen(cmpl_stm_data) || - broken(size > strlen(cmpl_stm_data)), /* win9x, winme */ + ok(size == strlen(cmpl_stm_data), "expected %d got %d\n", lstrlenA(cmpl_stm_data), size); ok(!memcmp(ptr, cmpl_stm_data, strlen(cmpl_stm_data)), "mismatch\n"); GlobalUnlock(h); @@ -812,8 +809,7 @@ static void test_cf_dataobject(IDataObject *data) ok(DataObjectImpl_GetDataHere_calls == 0, "got %d\n", DataObjectImpl_GetDataHere_calls); ptr = GlobalLock(h); size = GlobalSize(h); - ok(size == strlen(cmpl_text_data) + 1 || - broken(size > strlen(cmpl_text_data) + 1), /* win9x, winme */ + ok(size == strlen(cmpl_text_data) + 1, "expected %d got %d\n", lstrlenA(cmpl_text_data) + 1, size); ok(!memcmp(ptr, cmpl_text_data, strlen(cmpl_text_data) + 1), "mismatch\n"); GlobalUnlock(h); @@ -830,6 +826,7 @@ static void test_set_clipboard(void) ULONG ref; LPDATAOBJECT data1, data2, data_cmpl; HGLOBAL hblob, h; + void *ptr; cf_stream = RegisterClipboardFormatA("stream format"); cf_storage = RegisterClipboardFormatA("storage format"); @@ -855,10 +852,7 @@ static void test_set_clipboard(void) CoInitialize(NULL); hr = OleSetClipboard(data1); - ok(hr == CO_E_NOTINITIALIZED || - hr == CLIPBRD_E_CANT_SET, /* win9x */ - "OleSetClipboard should have failed with " - "CO_E_NOTINITIALIZED or CLIPBRD_E_CANT_SET instead of 0x%08x\n", hr); + ok(hr == CO_E_NOTINITIALIZED, "OleSetClipboard failed with 0x%08x\n", hr); CoUninitialize(); hr = OleInitialize(NULL); @@ -890,14 +884,18 @@ static void test_set_clipboard(void) /* put a format directly onto the clipboard to show OleFlushClipboard doesn't empty the clipboard */ hblob = GlobalAlloc(GMEM_DDESHARE|GMEM_MOVEABLE|GMEM_ZEROINIT, 10); - OpenClipboard(NULL); + ptr = GlobalLock( hblob ); + ok( ptr && ptr != hblob, "got fixed block %p / %p\n", ptr, hblob ); + GlobalUnlock( hblob ); + ok( OpenClipboard(NULL), "OpenClipboard failed\n" ); h = SetClipboardData(cf_onemore, hblob); ok(h == hblob, "got %p\n", h); h = GetClipboardData(cf_onemore); - ok(h == hblob || - broken(h != NULL), /* win9x */ - "got %p\n", h); - CloseClipboard(); + ok(h == hblob, "got %p / %p\n", h, hblob); + ptr = GlobalLock( h ); + ok( ptr && ptr != h, "got fixed block %p / %p\n", ptr, h ); + GlobalUnlock( hblob ); + ok( CloseClipboard(), "CloseClipboard failed\n" ); hr = OleFlushClipboard(); ok(hr == S_OK, "failed to flush clipboard, hr = 0x%08x\n", hr); @@ -909,12 +907,13 @@ static void test_set_clipboard(void) ok(hr == S_FALSE, "expect S_FALSE, hr = 0x%08x\n", hr); /* format should survive the flush */ - OpenClipboard(NULL); + ok( OpenClipboard(NULL), "OpenClipboard failed\n" ); h = GetClipboardData(cf_onemore); - ok(h == hblob || - broken(h != NULL), /* win9x */ - "got %p\n", h); - CloseClipboard(); + ok(h == hblob, "got %p\n", h); + ptr = GlobalLock( h ); + ok( ptr && ptr != h, "got fixed block %p / %p\n", ptr, h ); + GlobalUnlock( hblob ); + ok( CloseClipboard(), "CloseClipboard failed\n" ); test_cf_dataobject(NULL); @@ -981,9 +980,7 @@ static void test_consumer_refs(void) hr = OleGetClipboard(&get2); ok(hr == S_OK, "got %08x\n", hr); - ok(get1 == get2 || - broken(get1 != get2), /* win9x, winme & nt4 */ - "data objects differ\n"); + ok(get1 == get2, "data objects differ\n"); refs = IDataObject_Release(get2); ok(refs == (get1 == get2 ? 1 : 0), "got %d\n", refs); @@ -1359,19 +1356,14 @@ static void test_nonole_clipboard(void) hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); ok(hr == S_OK, "got %08x\n", hr); - ok(fmt.cfFormat == CF_UNICODETEXT || - broken(fmt.cfFormat == CF_METAFILEPICT), /* win9x and winme don't have CF_UNICODETEXT */ - "cf %04x\n", fmt.cfFormat); - if(fmt.cfFormat == CF_UNICODETEXT) - { - ok(fmt.ptd == NULL, "ptd %p\n", fmt.ptd); - ok(fmt.dwAspect == DVASPECT_CONTENT, "aspect %x\n", fmt.dwAspect); - ok(fmt.lindex == -1, "lindex %d\n", fmt.lindex); - ok(fmt.tymed == (TYMED_ISTREAM | TYMED_HGLOBAL), "tymed %x\n", fmt.tymed); + ok(fmt.cfFormat == CF_UNICODETEXT, "cf %04x\n", fmt.cfFormat); + ok(fmt.ptd == NULL, "ptd %p\n", fmt.ptd); + ok(fmt.dwAspect == DVASPECT_CONTENT, "aspect %x\n", fmt.dwAspect); + ok(fmt.lindex == -1, "lindex %d\n", fmt.lindex); + ok(fmt.tymed == (TYMED_ISTREAM | TYMED_HGLOBAL), "tymed %x\n", fmt.tymed); - hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); - ok(hr == S_OK, "got %08x\n", hr); - } + hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); + ok(hr == S_OK, "got %08x\n", hr); ok(fmt.cfFormat == CF_METAFILEPICT, "cf %04x\n", fmt.cfFormat); ok(fmt.ptd == NULL, "ptd %p\n", fmt.ptd); ok(fmt.dwAspect == DVASPECT_CONTENT, "aspect %x\n", fmt.dwAspect);

1 0

Hugh McMaster : kernel32: Implement GetConsoleScreenBufferInfoEx.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 2bda84a410fbb0e354316313126b24085c294fc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bda84a410fbb0e3543163131… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Aug 17 01:35:53 2016 +0000 kernel32: Implement GetConsoleScreenBufferInfoEx. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 35 ++++++++++++++++++++++++++++++++--- dlls/kernel32/tests/console.c | 14 +++++++------- 2 files changed, 39 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index cc2936d..51061de 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -3356,9 +3356,38 @@ BOOL WINAPI GetConsoleFontInfo(HANDLE hConsole, BOOL maximize, DWORD numfonts, C BOOL WINAPI GetConsoleScreenBufferInfoEx(HANDLE hConsole, CONSOLE_SCREEN_BUFFER_INFOEX *csbix) { - FIXME("(%p %p): stub!\n", hConsole, csbix); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + BOOL ret; + + if (csbix->cbSize != sizeof(CONSOLE_SCREEN_BUFFER_INFOEX)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + SERVER_START_REQ(get_console_output_info) + { + req->handle = console_handle_unmap(hConsole); + wine_server_set_reply(req, csbix->ColorTable, sizeof(csbix->ColorTable)); + if ((ret = !wine_server_call_err(req))) + { + csbix->dwSize.X = reply->width; + csbix->dwSize.Y = reply->height; + csbix->dwCursorPosition.X = reply->cursor_x; + csbix->dwCursorPosition.Y = reply->cursor_y; + csbix->wAttributes = reply->attr; + csbix->srWindow.Left = reply->win_left; + csbix->srWindow.Top = reply->win_top; + csbix->srWindow.Right = reply->win_right; + csbix->srWindow.Bottom = reply->win_bottom; + csbix->dwMaximumWindowSize.X = min(reply->width, reply->max_width); + csbix->dwMaximumWindowSize.Y = min(reply->height, reply->max_height); + csbix->wPopupAttributes = reply->popup_attr; + csbix->bFullscreenSupported = FALSE; + } + } + SERVER_END_REQ; + + return ret; } BOOL WINAPI SetConsoleScreenBufferInfoEx(HANDLE hConsole, CONSOLE_SCREEN_BUFFER_INFOEX *csbix) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 826ed43..24f15d4 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2957,34 +2957,34 @@ static void test_GetConsoleScreenBufferInfoEx(HANDLE std_output) SetLastError(0xdeadbeef); ret = pGetConsoleScreenBufferInfoEx(NULL, &csbix); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); SetLastError(0xdeadbeef); ret = pGetConsoleScreenBufferInfoEx(std_input, &csbix); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); SetLastError(0xdeadbeef); ret = pGetConsoleScreenBufferInfoEx(std_output, &csbix); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); csbix.cbSize = sizeof(CONSOLE_SCREEN_BUFFER_INFOEX); SetLastError(0xdeadbeef); ret = pGetConsoleScreenBufferInfoEx(NULL, &csbix); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef); ret = pGetConsoleScreenBufferInfoEx(std_input, &csbix); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef); ret = pGetConsoleScreenBufferInfoEx(std_output, &csbix); - todo_wine ok(ret, "got %d, expected non-zero\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + ok(ret, "got %d, expected non-zero\n", ret); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); } START_TEST(console)

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
78
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 August 2016