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

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

27 Aug '13

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 : server: Make signal and wait a separate select operation.
by Alexandre Julliard 27 Aug '13

27 Aug '13

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 : ntdll: Rename NTDLL_wait_for_multiple_objects to server_select since it' s more generic now.
by Alexandre Julliard 27 Aug '13

27 Aug '13

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 : ntdll: Move the select and APC support to server.c.
by Alexandre Julliard 27 Aug '13

27 Aug '13

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

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

27 Aug '13

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

Ken Thomases : winemac: Don' t generate scroll wheel events for axes with 0 delta.
by Alexandre Julliard 27 Aug '13

27 Aug '13

Module: wine Branch: master Commit: 1b9fac3b3dfbb63157dbfeeb5d90c34f4f7d81bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b9fac3b3dfbb63157dbfeeb5… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Aug 26 20:14:00 2013 -0500 winemac: Don't generate scroll wheel events for axes with 0 delta. --- dlls/winemac.drv/mouse.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index b729d55..f9130c0 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -911,12 +911,14 @@ void macdrv_mouse_scroll(HWND hwnd, const macdrv_event *event) event->mouse_scroll.x, event->mouse_scroll.y, event->mouse_scroll.time_ms, (GetTickCount() - event->mouse_scroll.time_ms)); - send_mouse_input(hwnd, event->window, MOUSEEVENTF_WHEEL | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, - event->mouse_scroll.x, event->mouse_scroll.y, - event->mouse_scroll.y_scroll, FALSE, event->mouse_scroll.time_ms); - send_mouse_input(hwnd, event->window, MOUSEEVENTF_HWHEEL | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, - event->mouse_scroll.x, event->mouse_scroll.y, - event->mouse_scroll.x_scroll, FALSE, event->mouse_scroll.time_ms); + if (event->mouse_scroll.y_scroll) + send_mouse_input(hwnd, event->window, MOUSEEVENTF_WHEEL | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, + event->mouse_scroll.x, event->mouse_scroll.y, + event->mouse_scroll.y_scroll, FALSE, event->mouse_scroll.time_ms); + if (event->mouse_scroll.x_scroll) + send_mouse_input(hwnd, event->window, MOUSEEVENTF_HWHEEL | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, + event->mouse_scroll.x, event->mouse_scroll.y, + event->mouse_scroll.x_scroll, FALSE, event->mouse_scroll.time_ms); }

1 0

Nikolay Sivov : ole32: Missing MiscStatus key is not a failure for OleRegGetMiscStatus().
by Alexandre Julliard 27 Aug '13

27 Aug '13

Module: wine Branch: master Commit: c192885df403107c7a07ac003547e029bdf706e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c192885df403107c7a07ac003… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 27 10:13:15 2013 +0400 ole32: Missing MiscStatus key is not a failure for OleRegGetMiscStatus(). --- dlls/ole32/ole2.c | 11 +++++------ dlls/ole32/tests/compobj.c | 25 ++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index a1a4b9a..0994a5f 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -882,11 +882,6 @@ HRESULT WINAPI OleRegGetMiscStatus( LONG result; /* - * Initialize the out parameter. - */ - *pdwStatus = 0; - - /* * Build the key name we're looking for */ sprintfW( keyName, clsidfmtW, @@ -896,6 +891,10 @@ HRESULT WINAPI OleRegGetMiscStatus( TRACE("(%s, %d, %p)\n", debugstr_w(keyName), dwAspect, pdwStatus); + if (!pdwStatus) return E_INVALIDARG; + + *pdwStatus = 0; + /* * Open the class id Key */ @@ -910,7 +909,7 @@ HRESULT WINAPI OleRegGetMiscStatus( if (result != ERROR_SUCCESS) { RegCloseKey(clsidKey); - return REGDB_E_READREGDB; + return S_OK; } /* diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index c81a017..519cb74 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1732,18 +1732,41 @@ static void test_OleRegGetMiscStatus(void) DWORD status; HRESULT hr; + hr = OleRegGetMiscStatus(&CLSID_Testclass, DVASPECT_ICON, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + status = 0xdeadbeef; hr = OleRegGetMiscStatus(&CLSID_Testclass, DVASPECT_ICON, &status); ok(hr == REGDB_E_CLASSNOTREG, "got 0x%08x\n", hr); + ok(status == 0, "got 0x%08x\n", status); + + status = -1; + hr = OleRegGetMiscStatus(&CLSID_StdFont, DVASPECT_ICON, &status); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(status == 0, "got 0x%08x\n", status); if ((handle = activate_context(actctx_manifest, &cookie))) { - status = 0; hr = OleRegGetMiscStatus(&CLSID_Testclass, DVASPECT_ICON, &status); todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(status == OLEMISC_RECOMPOSEONRESIZE, "got 0x%08x\n", status); } + /* context data takes precedence over registration info */ + status = 0; + hr = OleRegGetMiscStatus(&CLSID_StdFont, DVASPECT_ICON, &status); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(status == OLEMISC_RECOMPOSEONRESIZE, "got 0x%08x\n", status); + + /* there's no such attribute in context */ + status = -1; + hr = OleRegGetMiscStatus(&CLSID_Testclass, DVASPECT_DOCPRINT, &status); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(status == 0, "got 0x%08x\n", status); + pDeactivateActCtx(0, cookie); pReleaseActCtx(handle); }

1 0

Henri Verbeet : wined3d: Introduce a separate function for initializing a wined3d_state structure.
by Alexandre Julliard 27 Aug '13

27 Aug '13

Module: wine Branch: master Commit: cc85c6aff032f7def880e9ba7f199e758cba1c96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc85c6aff032f7def880e9ba7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 27 08:44:57 2013 +0200 wined3d: Introduce a separate function for initializing a wined3d_state structure. --- dlls/wined3d/stateblock.c | 46 ++++++++++++++++++++++++++++---------------- 1 files changed, 29 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 8abd8e5..1621ba7 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -196,19 +196,10 @@ static HRESULT stateblock_allocate_shader_constants(struct wined3d_stateblock *o { const struct wined3d_d3d_info *d3d_info = &object->device->adapter->d3d_info; - /* Allocate space for floating point constants */ - object->state.ps_consts_f = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(float) * d3d_info->limits.ps_uniform_count * 4); - if (!object->state.ps_consts_f) goto fail; - object->changed.pixelShaderConstantsF = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BOOL) * d3d_info->limits.ps_uniform_count); if (!object->changed.pixelShaderConstantsF) goto fail; - object->state.vs_consts_f = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(float) * d3d_info->limits.vs_uniform_count * 4); - if (!object->state.vs_consts_f) goto fail; - object->changed.vertexShaderConstantsF = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BOOL) * d3d_info->limits.vs_uniform_count); if (!object->changed.vertexShaderConstantsF) goto fail; @@ -225,9 +216,7 @@ static HRESULT stateblock_allocate_shader_constants(struct wined3d_stateblock *o fail: ERR("Failed to allocate memory\n"); - HeapFree(GetProcessHeap(), 0, object->state.ps_consts_f); HeapFree(GetProcessHeap(), 0, object->changed.pixelShaderConstantsF); - HeapFree(GetProcessHeap(), 0, object->state.vs_consts_f); HeapFree(GetProcessHeap(), 0, object->changed.vertexShaderConstantsF); HeapFree(GetProcessHeap(), 0, object->contained_vs_consts_f); HeapFree(GetProcessHeap(), 0, object->contained_ps_consts_f); @@ -609,6 +598,29 @@ static void state_cleanup(struct wined3d_state *state) HeapFree(GetProcessHeap(), 0, state->ps_consts_f); } +static HRESULT state_init(struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info) +{ + unsigned int i; + + for (i = 0; i < LIGHTMAP_SIZE; i++) + { + list_init(&state->light_map[i]); + } + + if (!(state->vs_consts_f = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + 4 * sizeof(float) * d3d_info->limits.vs_uniform_count))) + return E_OUTOFMEMORY; + + if (!(state->ps_consts_f = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + 4 * sizeof(float) * d3d_info->limits.ps_uniform_count))) + { + HeapFree(GetProcessHeap(), 0, state->vs_consts_f); + return E_OUTOFMEMORY; + } + + return WINED3D_OK; +} + ULONG CDECL wined3d_stateblock_decref(struct wined3d_stateblock *stateblock) { ULONG refcount = InterlockedDecrement(&stateblock->ref); @@ -1407,21 +1419,21 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, struct wined3d_device *device, enum wined3d_stateblock_type type) { - unsigned int i; HRESULT hr; const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; stateblock->ref = 1; stateblock->device = device; - for (i = 0; i < LIGHTMAP_SIZE; i++) + if (FAILED(hr = state_init(&stateblock->state, d3d_info))) + return hr; + + if (FAILED(hr = stateblock_allocate_shader_constants(stateblock))) { - list_init(&stateblock->state.light_map[i]); + state_cleanup(&stateblock->state); + return hr; } - hr = stateblock_allocate_shader_constants(stateblock); - if (FAILED(hr)) return hr; - /* The WINED3D_SBT_INIT stateblock type is used during initialization to * produce a placeholder stateblock so other functions called can update a * state block. */

1 0

Henri Verbeet : wined3d: Make stateblock_init_default_state() work with a wined3d_state structure instead.
by Alexandre Julliard 27 Aug '13

27 Aug '13

Module: wine Branch: master Commit: fc5f9d4709d6fbcc86f4828554800d3fb721b32c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc5f9d4709d6fbcc86f482855… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 27 08:44:58 2013 +0200 wined3d: Make stateblock_init_default_state() work with a wined3d_state structure instead. --- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/stateblock.c | 6 ++---- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 18dcae4..8a2557b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1169,7 +1169,7 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, /* Set up some starting GL setup */ /* Setup all the devices defaults */ - stateblock_init_default_state(device->stateBlock); + state_init_default(&device->stateBlock->state, device); context = context_acquire(device, swapchain->front_buffer); @@ -5216,7 +5216,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, TRACE("Created stateblock %p.\n", device->stateBlock); device->update_state = &device->stateBlock->state; - stateblock_init_default_state(device->stateBlock); + state_init_default(&device->stateBlock->state, device); } else { diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 1621ba7..c7b68ea 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1168,11 +1168,9 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) TRACE("Applied stateblock %p.\n", stateblock); } -void stateblock_init_default_state(struct wined3d_stateblock *stateblock) +void state_init_default(struct wined3d_state *state, struct wined3d_device *device) { - struct wined3d_device *device = stateblock->device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - struct wined3d_state *state = &stateblock->state; union { struct wined3d_line_pattern lp; @@ -1193,7 +1191,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) 0.0f, 0.0f, 0.0f, 1.0f, }}}; - TRACE("stateblock %p.\n", stateblock); + TRACE("state %p, device %p.\n", state, device); /* Set some of the defaults for lights, transforms etc */ state->transforms[WINED3D_TS_PROJECTION] = identity; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2e113ef..89a4be7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2453,8 +2453,8 @@ struct wined3d_stateblock }; void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; -void stateblock_init_default_state(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; +void state_init_default(struct wined3d_state *state, struct wined3d_device *device) DECLSPEC_HIDDEN; void state_unbind_resources(struct wined3d_state *state) DECLSPEC_HIDDEN; /* Direct3D terminology with little modifications. We do not have an issued state

1 0

Henri Verbeet : wined3d: Replace the "stateBlock" wined3d_device field with a wined3d_state structure.
by Alexandre Julliard 27 Aug '13

27 Aug '13

Module: wine Branch: master Commit: b85c2a74bbd8bbaf10e5c962d2203619d3934165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b85c2a74bbd8bbaf10e5c962d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 27 08:44:59 2013 +0200 wined3d: Replace the "stateBlock" wined3d_device field with a wined3d_state structure. --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/context.c | 4 +- dlls/wined3d/device.c | 205 ++++++++++++++++++---------------------- dlls/wined3d/drawprim.c | 4 +- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/stateblock.c | 22 ++--- dlls/wined3d/wined3d_private.h | 137 ++++++++++++++------------- include/wine/wined3d.h | 1 - 8 files changed, 179 insertions(+), 198 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b85c2a74bbd8bbaf10e5c…

1 0