August 2013 - Wine-Commits - list.winehq.org

Ken Thomases : winemac: Don't unminimize a window for SetFocus().
by Alexandre Julliard Aug. 27, 2013

Aug. 27, 2013

Module: wine Branch: master Commit: b755674df30b84c379944186e97953b562acd96d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b755674df30b84c379944186e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Aug 26 20:13:44 2013 -0500 winemac: Don't unminimize a window for SetFocus(). --- dlls/winemac.drv/cocoa_window.m | 58 +-------------------------------------- 1 files changed, 1 insertions(+), 57 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 4a0a945..48c5056 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1026,67 +1026,11 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (void) makeFocused:(BOOL)activate { - WineApplicationController* controller = [WineApplicationController sharedController]; - NSArray* screens; - WineWindow* front; - BOOL wasVisible = [self isVisible]; - - [controller transformProcessToForeground]; - - /* If a borderless window is offscreen, orderFront: won't move - it onscreen like it would for a titled window. Do that ourselves. */ - screens = [NSScreen screens]; - if (!([self styleMask] & NSTitledWindowMask) && ![self isOrderedIn] && - !frame_intersects_screens([self frame], screens)) - { - NSScreen* primaryScreen = [screens objectAtIndex:0]; - NSRect frame = [primaryScreen frame]; - [self setFrameTopLeftPoint:NSMakePoint(NSMinX(frame), NSMaxY(frame))]; - frame = [self constrainFrameRect:[self frame] toScreen:primaryScreen]; - [self setFrame:frame display:YES]; - [self updateColorSpace]; - } - - if (activate) - [NSApp activateIgnoringOtherApps:YES]; - - NSDisableScreenUpdates(); - - if (latentParentWindow) - { - if ([latentParentWindow level] > [self level]) - [self setLevel:[latentParentWindow level]]; - [latentParentWindow addChildWindow:self ordered:NSWindowAbove]; - self.latentParentWindow = nil; - } - front = [controller frontWineWindow]; - if (front && [self level] < [front level]) - [self setLevel:[front level]]; - [self orderFront:nil]; - if (!wasVisible && fullscreen && [self isOnActiveSpace]) - [controller updateFullscreenWindows]; - [controller adjustWindowLevels]; - - if (pendingMinimize) - { - ignore_windowMiniaturize = TRUE; - [self miniaturize:nil]; - pendingMinimize = FALSE; - } - - NSEnableScreenUpdates(); + [self orderBelow:nil orAbove:nil activate:activate]; causing_becomeKeyWindow = TRUE; [self makeKeyWindow]; causing_becomeKeyWindow = FALSE; - - if (![self isExcludedFromWindowsMenu]) - [NSApp addWindowsItem:self title:[self title] filename:NO]; - - /* Cocoa may adjust the frame when the window is ordered onto the screen. - Generate a frame-changed event just in case. The back end will ignore - it if nothing actually changed. */ - [self windowDidResize:nil]; } - (void) postKey:(uint16_t)keyCode

1 0

Alexandre Julliard : ntdll: Move the select and APC support to server.c.
by Alexandre Julliard Aug. 27, 2013

Aug. 27, 2013

Module: wine Branch: master Commit: 5c0b5f4dcb60d2c7341cfb1ba3d586e30143cc79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c0b5f4dcb60d2c7341cfb1ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 22 11:38:58 2013 +0200 ntdll: Move the select and APC support to server.c. --- dlls/ntdll/ntdll_misc.h | 9 +- dlls/ntdll/server.c | 353 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/sync.c | 347 ---------------------------------------------- dlls/ntdll/thread.c | 2 +- dlls/ntdll/virtual.c | 18 ++-- 5 files changed, 364 insertions(+), 365 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c0b5f4dcb60d2c7341cf…

1 0

Alexandre Julliard : ntdll: Rename NTDLL_wait_for_multiple_objects to server_select since it' s more generic now.
by Alexandre Julliard Aug. 27, 2013

Aug. 27, 2013

Module: wine Branch: master Commit: a56ffb6326f4eb453e20e95bf84f92a1d3fe5a33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a56ffb6326f4eb453e20e95bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 22 11:27:15 2013 +0200 ntdll: Rename NTDLL_wait_for_multiple_objects to server_select since it's more generic now. --- dlls/ntdll/critsection.c | 2 +- dlls/ntdll/exception.c | 4 ++-- dlls/ntdll/ntdll_misc.h | 4 ++-- dlls/ntdll/sync.c | 15 ++++++--------- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c index 4032745..839c7ca 100644 --- a/dlls/ntdll/critsection.c +++ b/dlls/ntdll/critsection.c @@ -235,7 +235,7 @@ static inline NTSTATUS wait_semaphore( RTL_CRITICAL_SECTION *crit, int timeout ) time.QuadPart = timeout * (LONGLONG)-10000000; select_op.wait.op = SELECT_WAIT; select_op.wait.handles[0] = wine_server_obj_handle( sem ); - ret = NTDLL_wait_for_multiple_objects( &select_op, offsetof( select_op_t, wait.handles[1] ), 0, &time ); + ret = server_select( &select_op, offsetof( select_op_t, wait.handles[1] ), 0, &time ); } return ret; } diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 3192571..31d5edd 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -81,7 +81,7 @@ void wait_suspend( CONTEXT *context ) /* wait with 0 timeout, will only return once the thread is no longer suspended */ timeout.QuadPart = 0; - NTDLL_wait_for_multiple_objects( NULL, 0, SELECT_INTERRUPTIBLE, &timeout ); + server_select( NULL, 0, SELECT_INTERRUPTIBLE, &timeout ); /* retrieve the new context */ SERVER_START_REQ( get_suspend_context ) @@ -134,7 +134,7 @@ NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, int first_chance, CONTEXT *con select_op.wait.op = SELECT_WAIT; select_op.wait.handles[0] = handle; - NTDLL_wait_for_multiple_objects( &select_op, offsetof( select_op_t, wait.handles[1] ), SELECT_INTERRUPTIBLE, NULL ); + server_select( &select_op, offsetof( select_op_t, wait.handles[1] ), SELECT_INTERRUPTIBLE, NULL ); SERVER_START_REQ( get_exception_status ) { diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 20d4d30..a06c91d 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -63,8 +63,8 @@ extern LPCSTR debugstr_us( const UNICODE_STRING *str ) DECLSPEC_HIDDEN; extern LPCSTR debugstr_ObjectAttributes(const OBJECT_ATTRIBUTES *oa) DECLSPEC_HIDDEN; extern NTSTATUS NTDLL_queue_process_apc( HANDLE process, const apc_call_t *call, apc_result_t *result ) DECLSPEC_HIDDEN; -extern NTSTATUS NTDLL_wait_for_multiple_objects( const select_op_t *select_op, data_size_t size, - UINT flags, const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN; +extern NTSTATUS server_select( const select_op_t *select_op, data_size_t size, + UINT flags, const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN; /* init routines */ extern NTSTATUS signal_alloc_thread( TEB **teb ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 15652ce..3141016 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1102,12 +1102,10 @@ NTSTATUS NTDLL_queue_process_apc( HANDLE process, const apc_call_t *call, apc_re /*********************************************************************** - * NTDLL_wait_for_multiple_objects - * - * Implementation of NtWaitForMultipleObjects + * server_select */ -NTSTATUS NTDLL_wait_for_multiple_objects( const select_op_t *select_op, data_size_t size, UINT flags, - const LARGE_INTEGER *timeout ) +NTSTATUS server_select( const select_op_t *select_op, data_size_t size, UINT flags, + const LARGE_INTEGER *timeout ) { NTSTATUS ret; int cookie; @@ -1178,7 +1176,7 @@ NTSTATUS WINAPI NtWaitForMultipleObjects( DWORD count, const HANDLE *handles, if (alertable) flags |= SELECT_ALERTABLE; select_op.wait.op = wait_all ? SELECT_WAIT_ALL : SELECT_WAIT; for (i = 0; i < count; i++) select_op.wait.handles[i] = wine_server_obj_handle( handles[i] ); - return NTDLL_wait_for_multiple_objects( &select_op, offsetof( select_op_t, wait.handles[count] ), flags, timeout ); + return server_select( &select_op, offsetof( select_op_t, wait.handles[count] ), flags, timeout ); } @@ -1206,7 +1204,7 @@ NTSTATUS WINAPI NtSignalAndWaitForSingleObject( HANDLE hSignalObject, HANDLE hWa select_op.signal_and_wait.op = SELECT_SIGNAL_AND_WAIT; select_op.signal_and_wait.wait = wine_server_obj_handle( hWaitObject ); select_op.signal_and_wait.signal = wine_server_obj_handle( hSignalObject ); - return NTDLL_wait_for_multiple_objects( &select_op, sizeof(select_op.signal_and_wait), flags, timeout ); + return server_select( &select_op, sizeof(select_op.signal_and_wait), flags, timeout ); } @@ -1231,8 +1229,7 @@ NTSTATUS WINAPI NtDelayExecution( BOOLEAN alertable, const LARGE_INTEGER *timeou { /* if alertable, we need to query the server */ if (alertable) - return NTDLL_wait_for_multiple_objects( NULL, 0, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, - timeout ); + return server_select( NULL, 0, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, timeout ); if (!timeout || timeout->QuadPart == TIMEOUT_INFINITE) /* sleep forever */ {

1 0

Alexandre Julliard : server: Make signal and wait a separate select operation.
by Alexandre Julliard Aug. 27, 2013

Aug. 27, 2013

Module: wine Branch: master Commit: 947e3374802ed654e53836d9dfbd712d6347d2f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=947e3374802ed654e53836d9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 22 11:15:44 2013 +0200 server: Make signal and wait a separate select operation. --- dlls/ntdll/critsection.c | 2 +- dlls/ntdll/exception.c | 4 +- dlls/ntdll/ntdll_misc.h | 4 +- dlls/ntdll/sync.c | 20 ++++++---- include/wine/server_protocol.h | 15 ++++++-- server/protocol.def | 12 +++++-- server/request.h | 5 +-- server/thread.c | 74 ++++++++++++++++++++++----------------- server/trace.c | 7 +++- 9 files changed, 86 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=947e3374802ed654e5383…

1 0

Alexandre Julliard : server: Make select on all handles a separate operation.
by Alexandre Julliard Aug. 27, 2013

Aug. 27, 2013

Module: wine Branch: master Commit: 042e0046d4e77efdb5a797f76f0dcfa5bf63e75b URL: http://source.winehq.org/git/wine.git/?a=commit;h=042e0046d4e77efdb5a797f76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 22 10:43:36 2013 +0200 server: Make select on all handles a separate operation. --- dlls/ntdll/sync.c | 3 +-- include/wine/server_protocol.h | 10 +++++----- server/protocol.def | 10 +++++----- server/thread.c | 10 +++++++--- server/trace.c | 3 ++- 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index aa01209..df6e48e 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1173,9 +1173,8 @@ NTSTATUS WINAPI NtWaitForMultipleObjects( DWORD count, const HANDLE *handles, if (!count || count > MAXIMUM_WAIT_OBJECTS) return STATUS_INVALID_PARAMETER_1; - if (wait_all) flags |= SELECT_ALL; if (alertable) flags |= SELECT_ALERTABLE; - select_op.wait.op = SELECT_WAIT; + select_op.wait.op = wait_all ? SELECT_WAIT_ALL : SELECT_WAIT; for (i = 0; i < count; i++) select_op.wait.handles[i] = wine_server_obj_handle( handles[i] ); return NTDLL_wait_for_multiple_objects( &select_op, offsetof( select_op_t, wait.handles[count] ), flags, timeout, 0 ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 590bd81..890c8a3 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -407,7 +407,8 @@ struct token_groups enum select_op { SELECT_NONE, - SELECT_WAIT + SELECT_WAIT, + SELECT_WAIT_ALL }; typedef union @@ -1082,9 +1083,8 @@ struct select_reply obj_handle_t apc_handle; char __pad_60[4]; }; -#define SELECT_ALL 1 -#define SELECT_ALERTABLE 2 -#define SELECT_INTERRUPTIBLE 4 +#define SELECT_ALERTABLE 1 +#define SELECT_INTERRUPTIBLE 2 @@ -5787,6 +5787,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 444 +#define SERVER_PROTOCOL_VERSION 445 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 4601942..0b50766 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -423,7 +423,8 @@ struct token_groups enum select_op { SELECT_NONE, - SELECT_WAIT + SELECT_WAIT, + SELECT_WAIT_ALL }; typedef union @@ -431,7 +432,7 @@ typedef union enum select_op op; struct { - enum select_op op; /* SELECT_WAIT */ + enum select_op op; /* SELECT_WAIT or SELECT_WAIT_ALL */ obj_handle_t handles[MAXIMUM_WAIT_OBJECTS]; } wait; } select_op_t; @@ -946,9 +947,8 @@ struct rawinput_device apc_call_t call; /* APC call arguments */ obj_handle_t apc_handle; /* handle to next APC */ @END -#define SELECT_ALL 1 -#define SELECT_ALERTABLE 2 -#define SELECT_INTERRUPTIBLE 4 +#define SELECT_ALERTABLE 1 +#define SELECT_INTERRUPTIBLE 2 /* Create an event */ diff --git a/server/thread.c b/server/thread.c index c6eeaf9..6858fd1 100644 --- a/server/thread.c +++ b/server/thread.c @@ -75,6 +75,7 @@ struct thread_wait struct thread *thread; /* owner thread */ int count; /* count of objects */ int flags; + enum select_op select; client_ptr_t cookie; /* magic cookie to return to client */ timeout_t timeout; struct timeout_user *user; @@ -558,7 +559,8 @@ static void end_wait( struct thread *thread ) } /* build the thread wait structure */ -static int wait_on( unsigned int count, struct object *objects[], int flags, timeout_t timeout ) +static int wait_on( const select_op_t *select_op, unsigned int count, struct object *objects[], + int flags, timeout_t timeout ) { struct thread_wait *wait; struct wait_queue_entry *entry; @@ -569,6 +571,7 @@ static int wait_on( unsigned int count, struct object *objects[], int flags, tim wait->thread = current; wait->count = count; wait->flags = flags; + wait->select = select_op->op; wait->user = NULL; wait->timeout = timeout; current->wait = wait; @@ -602,7 +605,7 @@ static int check_wait( struct thread *thread ) /* Suspended threads may not acquire locks, but they can run system APCs */ if (thread->process->suspend + thread->suspend > 0) return -1; - if (wait->flags & SELECT_ALL) + if (wait->select == SELECT_WAIT_ALL) { int not_ok = 0; /* Note: we must check them all anyway, as some objects may @@ -726,6 +729,7 @@ static timeout_t select_on( const select_op_t *select_op, data_size_t op_size, c break; case SELECT_WAIT: + case SELECT_WAIT_ALL: count = (op_size - offsetof( select_op_t, wait.handles )) / sizeof(select_op->wait.handles[0]); if (op_size < offsetof( select_op_t, wait.handles ) || count > MAXIMUM_WAIT_OBJECTS) { @@ -747,7 +751,7 @@ static timeout_t select_on( const select_op_t *select_op, data_size_t op_size, c } if (i < count) goto done; - if (!wait_on( count, objects, flags, timeout )) goto done; + if (!wait_on( select_op, count, objects, flags, timeout )) goto done; /* signal the object */ if (signal_obj) diff --git a/server/trace.c b/server/trace.c index c9af74f..cf58794 100644 --- a/server/trace.c +++ b/server/trace.c @@ -399,7 +399,8 @@ static void dump_varargs_select_op( const char *prefix, data_size_t size ) fprintf( stderr, "NONE" ); break; case SELECT_WAIT: - fprintf( stderr, "WAIT" ); + case SELECT_WAIT_ALL: + fprintf( stderr, "%s", data.op == SELECT_WAIT ? "WAIT" : "WAIT_ALL" ); if (size > offsetof( select_op_t, wait.handles )) dump_handles( ",handles=", data.wait.handles, min( size, sizeof(data.wait) ) - offsetof( select_op_t, wait.handles ));

1 0

Alexandre Julliard : ntdll: Pass a select operation structure to NTDLL_wait_for_multiple_objects.
by Alexandre Julliard Aug. 27, 2013

Aug. 27, 2013

Module: wine Branch: master Commit: cbdc0ec72d917334059dd1ab0d17375594442aa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbdc0ec72d917334059dd1ab0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 22 10:53:45 2013 +0200 ntdll: Pass a select operation structure to NTDLL_wait_for_multiple_objects. --- dlls/ntdll/critsection.c | 5 ++++- dlls/ntdll/exception.c | 13 ++++++++----- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/sync.c | 22 ++++++++++++---------- 4 files changed, 25 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c index dcc66e0..6f0b5d5 100644 --- a/dlls/ntdll/critsection.c +++ b/dlls/ntdll/critsection.c @@ -230,9 +230,12 @@ static inline NTSTATUS wait_semaphore( RTL_CRITICAL_SECTION *crit, int timeout ) { HANDLE sem = get_semaphore( crit ); LARGE_INTEGER time; + select_op_t select_op; time.QuadPart = timeout * (LONGLONG)-10000000; - ret = NTDLL_wait_for_multiple_objects( 1, &sem, 0, &time, 0 ); + select_op.wait.op = SELECT_WAIT; + select_op.wait.handles[0] = wine_server_obj_handle( sem ); + ret = NTDLL_wait_for_multiple_objects( &select_op, offsetof( select_op_t, wait.handles[1] ), 0, &time, 0 ); } return ret; } diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index faa9e0d..99fac41 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -81,7 +81,7 @@ void wait_suspend( CONTEXT *context ) /* wait with 0 timeout, will only return once the thread is no longer suspended */ timeout.QuadPart = 0; - NTDLL_wait_for_multiple_objects( 0, NULL, SELECT_INTERRUPTIBLE, &timeout, 0 ); + NTDLL_wait_for_multiple_objects( NULL, 0, SELECT_INTERRUPTIBLE, &timeout, 0 ); /* retrieve the new context */ SERVER_START_REQ( get_suspend_context ) @@ -105,9 +105,10 @@ NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, int first_chance, CONTEXT *con { NTSTATUS ret; DWORD i; - HANDLE handle = 0; + obj_handle_t handle = 0; client_ptr_t params[EXCEPTION_MAXIMUM_PARAMETERS]; context_t server_context; + select_op_t select_op; if (!NtCurrentTeb()->Peb->BeingDebugged) return 0; /* no debugger present */ @@ -126,16 +127,18 @@ NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, int first_chance, CONTEXT *con req->len = i * sizeof(params[0]); wine_server_add_data( req, params, req->len ); wine_server_add_data( req, &server_context, sizeof(server_context) ); - if (!wine_server_call( req )) handle = wine_server_ptr_handle( reply->handle ); + if (!wine_server_call( req )) handle = reply->handle; } SERVER_END_REQ; if (!handle) return 0; - NTDLL_wait_for_multiple_objects( 1, &handle, SELECT_INTERRUPTIBLE, NULL, 0 ); + select_op.wait.op = SELECT_WAIT; + select_op.wait.handles[0] = handle; + NTDLL_wait_for_multiple_objects( &select_op, offsetof( select_op_t, wait.handles[1] ), SELECT_INTERRUPTIBLE, NULL, 0 ); SERVER_START_REQ( get_exception_status ) { - req->handle = wine_server_obj_handle( handle ); + req->handle = handle; wine_server_set_reply( req, &server_context, sizeof(server_context) ); ret = wine_server_call( req ); } diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 7a0d925..225121f 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -63,7 +63,7 @@ extern LPCSTR debugstr_us( const UNICODE_STRING *str ) DECLSPEC_HIDDEN; extern LPCSTR debugstr_ObjectAttributes(const OBJECT_ATTRIBUTES *oa) DECLSPEC_HIDDEN; extern NTSTATUS NTDLL_queue_process_apc( HANDLE process, const apc_call_t *call, apc_result_t *result ) DECLSPEC_HIDDEN; -extern NTSTATUS NTDLL_wait_for_multiple_objects( UINT count, const HANDLE *handles, UINT flags, +extern NTSTATUS NTDLL_wait_for_multiple_objects( const select_op_t *select_op, data_size_t size, UINT flags, const LARGE_INTEGER *timeout, HANDLE signal_object ) DECLSPEC_HIDDEN; /* init routines */ diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 89f6ee6..aa01209 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1106,12 +1106,10 @@ NTSTATUS NTDLL_queue_process_apc( HANDLE process, const apc_call_t *call, apc_re * * Implementation of NtWaitForMultipleObjects */ -NTSTATUS NTDLL_wait_for_multiple_objects( UINT count, const HANDLE *handles, UINT flags, +NTSTATUS NTDLL_wait_for_multiple_objects( const select_op_t *select_op, data_size_t size, UINT flags, const LARGE_INTEGER *timeout, HANDLE signal_object ) { - select_op_t select_op; NTSTATUS ret; - UINT i; int cookie; BOOL user_apc = FALSE; obj_handle_t apc_handle = 0; @@ -1120,8 +1118,6 @@ NTSTATUS NTDLL_wait_for_multiple_objects( UINT count, const HANDLE *handles, UIN timeout_t abs_timeout = timeout ? timeout->QuadPart : TIMEOUT_INFINITE; memset( &result, 0, sizeof(result) ); - select_op.wait.op = SELECT_WAIT; - for (i = 0; i < count; i++) select_op.wait.handles[i] = wine_server_obj_handle( handles[i] ); for (;;) { @@ -1133,7 +1129,7 @@ NTSTATUS NTDLL_wait_for_multiple_objects( UINT count, const HANDLE *handles, UIN req->prev_apc = apc_handle; req->timeout = abs_timeout; wine_server_add_data( req, &result, sizeof(result) ); - wine_server_add_data( req, &select_op, offsetof( select_op_t, wait.handles[count] )); + wine_server_add_data( req, select_op, size ); ret = wine_server_call( req ); abs_timeout = reply->timeout; apc_handle = reply->apc_handle; @@ -1172,13 +1168,16 @@ NTSTATUS WINAPI NtWaitForMultipleObjects( DWORD count, const HANDLE *handles, BOOLEAN wait_all, BOOLEAN alertable, const LARGE_INTEGER *timeout ) { - UINT flags = SELECT_INTERRUPTIBLE; + select_op_t select_op; + UINT i, flags = SELECT_INTERRUPTIBLE; if (!count || count > MAXIMUM_WAIT_OBJECTS) return STATUS_INVALID_PARAMETER_1; if (wait_all) flags |= SELECT_ALL; if (alertable) flags |= SELECT_ALERTABLE; - return NTDLL_wait_for_multiple_objects( count, handles, flags, timeout, 0 ); + select_op.wait.op = SELECT_WAIT; + for (i = 0; i < count; i++) select_op.wait.handles[i] = wine_server_obj_handle( handles[i] ); + return NTDLL_wait_for_multiple_objects( &select_op, offsetof( select_op_t, wait.handles[count] ), flags, timeout, 0 ); } @@ -1197,11 +1196,14 @@ NTSTATUS WINAPI NtWaitForSingleObject(HANDLE handle, BOOLEAN alertable, const LA NTSTATUS WINAPI NtSignalAndWaitForSingleObject( HANDLE hSignalObject, HANDLE hWaitObject, BOOLEAN alertable, const LARGE_INTEGER *timeout ) { + select_op_t select_op; UINT flags = SELECT_INTERRUPTIBLE; if (!hSignalObject) return STATUS_INVALID_HANDLE; if (alertable) flags |= SELECT_ALERTABLE; - return NTDLL_wait_for_multiple_objects( 1, &hWaitObject, flags, timeout, hSignalObject ); + select_op.wait.op = SELECT_WAIT; + select_op.wait.handles[0] = wine_server_obj_handle( hWaitObject ); + return NTDLL_wait_for_multiple_objects( &select_op, offsetof( select_op_t, wait.handles[1] ), flags, timeout, hSignalObject ); } @@ -1226,7 +1228,7 @@ NTSTATUS WINAPI NtDelayExecution( BOOLEAN alertable, const LARGE_INTEGER *timeou { /* if alertable, we need to query the server */ if (alertable) - return NTDLL_wait_for_multiple_objects( 0, NULL, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, + return NTDLL_wait_for_multiple_objects( NULL, 0, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, timeout, 0 ); if (!timeout || timeout->QuadPart == TIMEOUT_INFINITE) /* sleep forever */

1 0

Alexandre Julliard : server: Add a structure to pass the parameters of a select request.
by Alexandre Julliard Aug. 27, 2013

Aug. 27, 2013

Module: wine Branch: master Commit: c2ab7a625e5728977668688a66c4e0b7eaa14c3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2ab7a625e5728977668688a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 22 10:34:11 2013 +0200 server: Add a structure to pass the parameters of a select request. --- dlls/ntdll/sync.c | 7 +++-- include/wine/server_protocol.h | 20 +++++++++++++++- server/protocol.def | 18 ++++++++++++++- server/thread.c | 34 ++++++++++++++++++++++------- server/trace.c | 46 +++++++++++++++++++++++++++++++++------- 5 files changed, 103 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 2e6ffdf..89f6ee6 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1109,18 +1109,19 @@ NTSTATUS NTDLL_queue_process_apc( HANDLE process, const apc_call_t *call, apc_re NTSTATUS NTDLL_wait_for_multiple_objects( UINT count, const HANDLE *handles, UINT flags, const LARGE_INTEGER *timeout, HANDLE signal_object ) { + select_op_t select_op; NTSTATUS ret; UINT i; int cookie; BOOL user_apc = FALSE; - obj_handle_t obj_handles[MAXIMUM_WAIT_OBJECTS]; obj_handle_t apc_handle = 0; apc_call_t call; apc_result_t result; timeout_t abs_timeout = timeout ? timeout->QuadPart : TIMEOUT_INFINITE; memset( &result, 0, sizeof(result) ); - for (i = 0; i < count; i++) obj_handles[i] = wine_server_obj_handle( handles[i] ); + select_op.wait.op = SELECT_WAIT; + for (i = 0; i < count; i++) select_op.wait.handles[i] = wine_server_obj_handle( handles[i] ); for (;;) { @@ -1132,7 +1133,7 @@ NTSTATUS NTDLL_wait_for_multiple_objects( UINT count, const HANDLE *handles, UIN req->prev_apc = apc_handle; req->timeout = abs_timeout; wine_server_add_data( req, &result, sizeof(result) ); - wine_server_add_data( req, obj_handles, count * sizeof(*obj_handles) ); + wine_server_add_data( req, &select_op, offsetof( select_op_t, wait.handles[count] )); ret = wine_server_call( req ); abs_timeout = reply->timeout; apc_handle = reply->apc_handle; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 98835b2..590bd81 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -404,6 +404,22 @@ struct token_groups }; +enum select_op +{ + SELECT_NONE, + SELECT_WAIT +}; + +typedef union +{ + enum select_op op; + struct + { + enum select_op op; + obj_handle_t handles[MAXIMUM_WAIT_OBJECTS]; + } wait; +} select_op_t; + enum apc_type { APC_NONE, @@ -1056,7 +1072,7 @@ struct select_request obj_handle_t prev_apc; timeout_t timeout; /* VARARG(result,apc_result); */ - /* VARARG(handles,handles); */ + /* VARARG(data,select_op); */ }; struct select_reply { @@ -5771,6 +5787,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 443 +#define SERVER_PROTOCOL_VERSION 444 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 6748e5d..4601942 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -420,6 +420,22 @@ struct token_groups /* VARARG(sids,SID); */ }; +enum select_op +{ + SELECT_NONE, + SELECT_WAIT +}; + +typedef union +{ + enum select_op op; + struct + { + enum select_op op; /* SELECT_WAIT */ + obj_handle_t handles[MAXIMUM_WAIT_OBJECTS]; + } wait; +} select_op_t; + enum apc_type { APC_NONE, @@ -924,7 +940,7 @@ struct rawinput_device obj_handle_t prev_apc; /* handle to previous APC */ timeout_t timeout; /* timeout */ VARARG(result,apc_result); /* result of previous APC */ - VARARG(handles,handles); /* handles to select on */ + VARARG(data,select_op); /* operation-specific data */ @REPLY timeout_t timeout; /* timeout converted to absolute */ apc_call_t call; /* APC call arguments */ diff --git a/server/thread.c b/server/thread.c index 5f9738d..c6eeaf9 100644 --- a/server/thread.c +++ b/server/thread.c @@ -710,23 +710,39 @@ static int signal_object( obj_handle_t handle ) } /* select on a list of handles */ -static timeout_t select_on( unsigned int count, client_ptr_t cookie, const obj_handle_t *handles, +static timeout_t select_on( const select_op_t *select_op, data_size_t op_size, client_ptr_t cookie, int flags, timeout_t timeout, obj_handle_t signal_obj ) { int ret; - unsigned int i; + unsigned int i, count; struct object *objects[MAXIMUM_WAIT_OBJECTS]; if (timeout <= 0) timeout = current_time - timeout; - if (count > MAXIMUM_WAIT_OBJECTS) + switch (select_op->op) { + case SELECT_NONE: + count = 0; + break; + + case SELECT_WAIT: + count = (op_size - offsetof( select_op_t, wait.handles )) / sizeof(select_op->wait.handles[0]); + if (op_size < offsetof( select_op_t, wait.handles ) || count > MAXIMUM_WAIT_OBJECTS) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + break; + + default: set_error( STATUS_INVALID_PARAMETER ); return 0; } + for (i = 0; i < count; i++) { - if (!(objects[i] = get_handle_obj( current->process, handles[i], SYNCHRONIZE, NULL ))) + if (!(objects[i] = get_handle_obj( current->process, select_op->wait.handles[i], + SYNCHRONIZE, NULL ))) break; } @@ -1310,17 +1326,19 @@ DECL_HANDLER(resume_thread) /* select on a handle list */ DECL_HANDLER(select) { + select_op_t select_op; + data_size_t op_size; struct thread_apc *apc; - unsigned int count; const apc_result_t *result = get_req_data(); - const obj_handle_t *handles = (const obj_handle_t *)(result + 1); if (get_req_data_size() < sizeof(*result)) { set_error( STATUS_INVALID_PARAMETER ); return; } - count = (get_req_data_size() - sizeof(*result)) / sizeof(obj_handle_t); + op_size = min( get_req_data_size() - sizeof(*result), sizeof(select_op) ); + memset( &select_op, 0, sizeof(select_op) ); + memcpy( &select_op, result + 1, op_size ); /* first store results of previous apc */ if (req->prev_apc) @@ -1348,7 +1366,7 @@ DECL_HANDLER(select) release_object( apc ); } - reply->timeout = select_on( count, req->cookie, handles, req->flags, req->timeout, req->signal ); + reply->timeout = select_on( &select_op, op_size, req->cookie, req->flags, req->timeout, req->signal ); if (get_error() == STATUS_USER_APC) { diff --git a/server/trace.c b/server/trace.c index 7740545..c9af74f 100644 --- a/server/trace.c +++ b/server/trace.c @@ -66,6 +66,19 @@ static void dump_uints( const int *ptr, int len ) fputc( '}', stderr ); } +static void dump_handles( const char *prefix, const obj_handle_t *data, data_size_t size ) +{ + data_size_t len = size / sizeof(*data); + + fprintf( stderr,"%s{", prefix ); + while (len > 0) + { + fprintf( stderr, "%04x", *data++ ); + if (--len) fputc( ',', stderr ); + } + fputc( '}', stderr ); +} + static void dump_timeout( const char *prefix, const timeout_t *time ) { fprintf( stderr, "%s%s", prefix, get_timeout_str(*time) ); @@ -367,16 +380,33 @@ static void dump_varargs_apc_result( const char *prefix, data_size_t size ) remove_data( size ); } -static void dump_varargs_handles( const char *prefix, data_size_t size ) +static void dump_varargs_select_op( const char *prefix, data_size_t size ) { - const obj_handle_t *data = cur_data; - data_size_t len = size / sizeof(*data); + select_op_t data; - fprintf( stderr,"%s{", prefix ); - while (len > 0) + if (!size) { - fprintf( stderr, "%04x", *data++ ); - if (--len) fputc( ',', stderr ); + fprintf( stderr, "%s{}", prefix ); + return; + } + memset( &data, 0, sizeof(data) ); + memcpy( &data, cur_data, min( size, sizeof(data) )); + + fprintf( stderr, "%s{", prefix ); + switch (data.op) + { + case SELECT_NONE: + fprintf( stderr, "NONE" ); + break; + case SELECT_WAIT: + fprintf( stderr, "WAIT" ); + if (size > offsetof( select_op_t, wait.handles )) + dump_handles( ",handles=", data.wait.handles, + min( size, sizeof(data.wait) ) - offsetof( select_op_t, wait.handles )); + break; + default: + fprintf( stderr, "op=%u", data.op ); + break; } fputc( '}', stderr ); remove_data( size ); @@ -1361,7 +1391,7 @@ static void dump_select_request( const struct select_request *req ) fprintf( stderr, ", prev_apc=%04x", req->prev_apc ); dump_timeout( ", timeout=", &req->timeout ); dump_varargs_apc_result( ", result=", cur_size ); - dump_varargs_handles( ", handles=", cur_size ); + dump_varargs_select_op( ", data=", cur_size ); } static void dump_select_reply( const struct select_reply *req )

1 0

Frédéric Delanoy : winedev: Assorted formatting & tagging fixes.
by Alexandre Julliard Aug. 27, 2013

Aug. 27, 2013

Module: docs Branch: master Commit: e99940531ede2bf66d69c2634a2f2d6c93cb9fed URL: http://source.winehq.org/git/docs.git/?a=commit;h=e99940531ede2bf66d69c2634… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Aug 26 22:21:55 2013 +0200 winedev: Assorted formatting & tagging fixes. A couple typos as well. --- en/winedev-architecture.sgml | 18 ++-- en/winedev-coding.sgml | 52 ++++++------ en/winedev-ddraw.sgml | 92 ++++++++++--------- en/winedev-debugger.sgml | 196 ++++++++++++++++++++++------------------- en/winedev-debugging.sgml | 21 +++-- en/winedev-documentation.sgml | 106 +++++++++++----------- en/winedev-kernel.sgml | 79 +++++++++-------- en/winedev-multimedia.sgml | 53 ++++++------ en/winedev-opengl.sgml | 12 ++-- en/winedev-otherdebug.sgml | 22 +++--- en/winedev-testing.sgml | 128 ++++++++++++++------------- en/winedev-windowing.sgml | 8 +- 12 files changed, 408 insertions(+), 379 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=e99940531ede2bf66d69c…

1 0

Stefan Dösinger : wined3d: UpdateTexture requires a sysmem source and default destination.
by Alexandre Julliard Aug. 26, 2013

Aug. 26, 2013

Module: wine Branch: master Commit: 9fbc90b8e3763eef9d5bdb8de85276b4573d694e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fbc90b8e3763eef9d5bdb8de… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Aug 26 02:01:30 2013 +0200 wined3d: UpdateTexture requires a sysmem source and default destination. --- dlls/wined3d/device.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a0db7c7..79a957b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4131,9 +4131,14 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - if (src_texture == dst_texture) + if (src_texture->resource.pool != WINED3D_POOL_SYSTEM_MEM) { - WARN("Source and destination are the same object, returning WINED3DERR_INVALIDCALL.\n"); + WARN("Source texture not in WINED3D_POOL_SYSTEM_MEM, returning WINED3DERR_INVALIDCALL.\n"); + return WINED3DERR_INVALIDCALL; + } + if (dst_texture->resource.pool != WINED3D_POOL_DEFAULT) + { + WARN("Destination texture not in WINED3D_POOL_DEFAULT, returning WINED3DERR_INVALIDCALL.\n"); return WINED3DERR_INVALIDCALL; }

1 0

Stefan Dösinger : wined3d: Disallow MANAGED or SCRATCH pool dynamic volumes.
by Alexandre Julliard Aug. 26, 2013

Aug. 26, 2013

Module: wine Branch: master Commit: e69670f76b009a161d04cc13f36cdbaaddc93082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e69670f76b009a161d04cc13f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Aug 26 02:01:32 2013 +0200 wined3d: Disallow MANAGED or SCRATCH pool dynamic volumes. --- dlls/wined3d/volume.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 9f49f87..c472b3c 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -676,6 +676,14 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_device WARN("Volume cannot be created - no volume texture support.\n"); return WINED3DERR_INVALIDCALL; } + /* TODO: Write tests for other resources and move this check + * to resource_init, if applicable. */ + if (usage & WINED3DUSAGE_DYNAMIC + && (pool == WINED3D_POOL_MANAGED || pool == WINED3D_POOL_SCRATCH)) + { + WARN("Attempted to create a DYNAMIC texture in pool %u.\n", pool); + return WINED3DERR_INVALIDCALL; + } size = wined3d_format_calculate_size(format, device->surface_alignment, width, height, depth);

1 0