January 2014 - Wine-commits

Vijay Kiran Kamuju : wininet: Implement setting INTERNET_PER_CONN_PROXY_BYPASS.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: b09944a11d5138c3883efb56c1035840711abb1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b09944a11d5138c3883efb56c… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Oct 27 22:01:22 2013 +0000 wininet: Implement setting INTERNET_PER_CONN_PROXY_BYPASS. (cherry picked from commit ebe121e360c4118c5263c20717a3fc25ebbcd9b1) --- dlls/wininet/internet.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index a54a3df..77bc801 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2912,13 +2912,17 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, } break; + case INTERNET_PER_CONN_PROXY_BYPASS: + heap_free(pi.proxyBypass); + pi.proxyBypass = heap_strdupW(option->Value.pszValue); + break; + case INTERNET_PER_CONN_AUTOCONFIG_URL: case INTERNET_PER_CONN_AUTODISCOVERY_FLAGS: case INTERNET_PER_CONN_AUTOCONFIG_SECONDARY_URL: case INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS: case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME: case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_URL: - case INTERNET_PER_CONN_PROXY_BYPASS: FIXME("Unhandled dwOption %d\n", option->dwOption); break;

1 0

Ken Thomases : winemac: Don' t use the main dispatch queue to implement OnMainThread() for a thread with no event queue.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: abd235f26f5aa17c910507ba71a676cab8088abf URL: http://source.winehq.org/git/wine.git/?a=commit;h=abd235f26f5aa17c910507ba7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Oct 30 05:52:58 2013 -0500 winemac: Don't use the main dispatch queue to implement OnMainThread() for a thread with no event queue. The main dispatch queue is a serial queue and is a shared resource. If we submit a long-running task to it, then no other tasks, including those submitted by the system frameworks, can run until it completes. (cherry picked from commit 2f68e47167925993947ac07e360e9fa251c50979) --- dlls/winemac.drv/cocoa_event.m | 49 +++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index 621729f..4be744a 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -323,42 +323,55 @@ void OnMainThread(dispatch_block_t block) NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; NSMutableDictionary* threadDict = [[NSThread currentThread] threadDictionary]; WineEventQueue* queue = [threadDict objectForKey:WineEventQueueThreadDictionaryKey]; + dispatch_semaphore_t semaphore; __block BOOL finished; if (!queue) { - /* Fall back to synchronous dispatch without handling query events. */ - dispatch_sync(dispatch_get_main_queue(), block); - [pool release]; - return; + semaphore = dispatch_semaphore_create(0); + dispatch_retain(semaphore); } finished = FALSE; OnMainThreadAsync(^{ block(); finished = TRUE; - [queue signalEventAvailable]; + if (queue) + [queue signalEventAvailable]; + else + { + dispatch_semaphore_signal(semaphore); + dispatch_release(semaphore); + } }); - while (!finished) + if (queue) { - MacDrvEvent* macDrvEvent; - struct kevent kev; - - while (!finished && - (macDrvEvent = [queue getEventMatchingMask:event_mask_for_type(QUERY_EVENT)])) + while (!finished) { - queue->event_handler(macDrvEvent->event); - } + MacDrvEvent* macDrvEvent; + struct kevent kev; - if (!finished) - { - [pool release]; - pool = [[NSAutoreleasePool alloc] init]; + while (!finished && + (macDrvEvent = [queue getEventMatchingMask:event_mask_for_type(QUERY_EVENT)])) + { + queue->event_handler(macDrvEvent->event); + } + + if (!finished) + { + [pool release]; + pool = [[NSAutoreleasePool alloc] init]; - kevent(queue->kq, NULL, 0, &kev, 1, NULL); + kevent(queue->kq, NULL, 0, &kev, 1, NULL); + } } } + else + { + dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER); + dispatch_release(semaphore); + } [pool release]; }

1 0

Ken Thomases : winemac: Hide cursor when first requested even if we don' t know it's over a window.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 692bd28f020a41a587842f251efa66d20994504b URL: http://source.winehq.org/git/wine.git/?a=commit;h=692bd28f020a41a587842f251… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Oct 30 08:07:51 2013 -0500 winemac: Hide cursor when first requested even if we don't know it's over a window. The tracking of whether it is over a window or not is only updated when the mouse moves. If a window was created or moved under it, then the state can be stale. That caused us to defer hiding the cursor until the mouse was moved. This happens at the start of games pretty often. (cherry picked from commit 6b9f81271b4b150244ed37fbda79103ba16dcbf4) --- dlls/winemac.drv/cocoa_app.m | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 1cc8d2d..ca9dcac 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -787,9 +787,9 @@ int macdrv_err_on; return ([originalDisplayModes count] > 0 || displaysCapturedForFullscreen); } - - (void) updateCursor + - (void) updateCursor:(BOOL)force { - if (lastTargetWindow) + if (force || lastTargetWindow) { if (clientWantsCursorHidden && !cursorHidden) { @@ -829,7 +829,7 @@ int macdrv_err_on; if (!clientWantsCursorHidden) { clientWantsCursorHidden = TRUE; - [self updateCursor]; + [self updateCursor:TRUE]; } } @@ -838,7 +838,7 @@ int macdrv_err_on; if (clientWantsCursorHidden) { clientWantsCursorHidden = FALSE; - [self updateCursor]; + [self updateCursor:FALSE]; } } @@ -849,7 +849,7 @@ int macdrv_err_on; [cursor release]; cursor = [newCursor retain]; cursorIsCurrent = FALSE; - [self updateCursor]; + [self updateCursor:FALSE]; } } @@ -1516,7 +1516,7 @@ int macdrv_err_on; else lastTargetWindow = nil; - [self updateCursor]; + [self updateCursor:FALSE]; } - (void) handleMouseButton:(NSEvent*)theEvent

1 0

Ken Thomases : winemac: Tell Cocoa that we don' t draw a focus ring for our views.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: c4c7375a30d9285141478e1cd8c1511dd7f65baf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4c7375a30d9285141478e1cd… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 31 15:00:13 2013 -0500 winemac: Tell Cocoa that we don't draw a focus ring for our views. This seems to eliminate a lot of house-keeping work inside Cocoa. (cherry picked from commit b11d6850f2596d58c8a9ceaf7ac08e7bd527cc30) --- dlls/winemac.drv/cocoa_window.m | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index f4926e2..bfbb36d 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -357,6 +357,11 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif [[self inputContext] discardMarkedText]; } + - (NSFocusRingType) focusRingType + { + return NSFocusRingTypeNone; + } + /* * ---------- NSTextInputClient methods ---------- */

1 0

Ken Thomases : winemac: Send WM_{ENTER, EXIT}SIZEMOVE around window frame changes initiated by Cocoa.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 120c8b2cf202ff7a645a62dbde8926c6ee9e67e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=120c8b2cf202ff7a645a62dbd… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 31 16:54:53 2013 -0500 winemac: Send WM_{ENTER, EXIT}SIZEMOVE around window frame changes initiated by Cocoa. The Mac driver was already sending these events when the user resizes the window by dragging its corner/edges, but there are other occasions when the window frame changes. For example, when the user zooms the window. (cherry picked from commit de3fb34af7dbb4a8f73ac4489a02ec2225979d00) --- dlls/winemac.drv/cocoa_window.m | 1 + dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/window.c | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index bfbb36d..48d3e86 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1709,6 +1709,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif event = macdrv_create_event(WINDOW_FRAME_CHANGED, self); event->window_frame_changed.frame = NSRectToCGRect(frame); event->window_frame_changed.fullscreen = ([self styleMask] & NSFullScreenWindowMask) != 0; + event->window_frame_changed.in_resize = [self inLiveResize]; [queue postEvent:event]; macdrv_release_event(event); diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index d7da551..3f6c8f4 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -262,6 +262,7 @@ typedef struct macdrv_event { struct { CGRect frame; int fullscreen; + int in_resize; } window_frame_changed; struct { unsigned long serial; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 52875cd..3d436ac 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1687,7 +1687,13 @@ void macdrv_window_frame_changed(HWND hwnd, const macdrv_event *event) if (event->window_frame_changed.fullscreen) flags |= SWP_NOSENDCHANGING; if (!(flags & SWP_NOSIZE) || !(flags & SWP_NOMOVE)) + { + if (!event->window_frame_changed.in_resize) + SendMessageW(hwnd, WM_ENTERSIZEMOVE, 0, 0); SetWindowPos(hwnd, 0, rect.left, rect.top, width, height, flags); + if (!event->window_frame_changed.in_resize) + SendMessageW(hwnd, WM_EXITSIZEMOVE, 0, 0); + } }

1 0

Ken Thomases : winemac: Convert the QUERY_RESIZE_END query to an event, WINDOW_RESIZE_ENDED.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 53adc25ed90b8da9b3ec669d477ab4b66289fd35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53adc25ed90b8da9b3ec669d4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 31 19:16:42 2013 -0500 winemac: Convert the QUERY_RESIZE_END query to an event, WINDOW_RESIZE_ENDED. Queries can be run out of order because the main thread is waiting on the response. The main thread didn't really need a response from QUERY_RESIZE_END. It was only a query for symmetry with QUERY_RESIZE_START. (cherry picked from commit 83f6470c0e325f8e25062eeb21fa2ffc0dbaa50f) --- dlls/winemac.drv/cocoa_window.m | 9 +++------ dlls/winemac.drv/event.c | 9 +++++---- dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/macdrv_cocoa.h | 2 +- dlls/winemac.drv/window.c | 25 ++++++++++++------------- 5 files changed, 22 insertions(+), 25 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 48d3e86..713f45c 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1630,12 +1630,9 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif - (void) windowDidEndLiveResize:(NSNotification *)notification { - macdrv_query* query = macdrv_create_query(); - query->type = QUERY_RESIZE_END; - query->window = (macdrv_window)[self retain]; - - [self.queue query:query timeout:0.3]; - macdrv_release_query(query); + macdrv_event* event = macdrv_create_event(WINDOW_RESIZE_ENDED, self); + [queue postEvent:event]; + macdrv_release_event(event); self.liveResizeDisplayTimer = nil; } diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 5491cdd..adb2900 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -54,6 +54,7 @@ static const char *dbgstr_event(int type) "WINDOW_GOT_FOCUS", "WINDOW_LOST_FOCUS", "WINDOW_MINIMIZE_REQUESTED", + "WINDOW_RESIZE_ENDED", }; if (0 <= type && type < NUM_EVENT_TYPES) return event_names[type]; @@ -110,6 +111,7 @@ static macdrv_event_mask get_event_mask(DWORD mask) event_mask |= event_mask_for_type(RELEASE_CAPTURE); event_mask |= event_mask_for_type(WINDOW_BROUGHT_FORWARD); event_mask |= event_mask_for_type(WINDOW_MINIMIZE_REQUESTED); + event_mask |= event_mask_for_type(WINDOW_RESIZE_ENDED); } return event_mask; @@ -148,10 +150,6 @@ static void macdrv_query_event(HWND hwnd, const macdrv_event *event) TRACE("QUERY_PASTEBOARD_DATA\n"); success = query_pasteboard_data(hwnd, query->pasteboard_data.type); break; - case QUERY_RESIZE_END: - TRACE("QUERY_RESIZE_END\n"); - success = query_resize_end(hwnd); - break; case QUERY_RESIZE_START: TRACE("QUERY_RESIZE_START\n"); success = query_resize_start(hwnd); @@ -250,6 +248,9 @@ void macdrv_handle_event(const macdrv_event *event) case WINDOW_MINIMIZE_REQUESTED: macdrv_window_minimize_requested(hwnd); break; + case WINDOW_RESIZE_ENDED: + macdrv_window_resize_ended(hwnd); + break; default: TRACE(" ignoring\n"); break; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 992a7cd..2d3b4d0 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -164,7 +164,7 @@ extern void macdrv_app_quit_requested(const macdrv_event *event) DECLSPEC_HIDDEN extern void macdrv_window_minimize_requested(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_did_unminimize(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_brought_forward(HWND hwnd) DECLSPEC_HIDDEN; -extern BOOL query_resize_end(HWND hwnd) DECLSPEC_HIDDEN; +extern void macdrv_window_resize_ended(HWND hwnd) DECLSPEC_HIDDEN; extern BOOL query_resize_start(HWND hwnd) DECLSPEC_HIDDEN; extern BOOL query_min_max_info(HWND hwnd) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 3f6c8f4..76248bd 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -187,6 +187,7 @@ enum { WINDOW_GOT_FOCUS, WINDOW_LOST_FOCUS, WINDOW_MINIMIZE_REQUESTED, + WINDOW_RESIZE_ENDED, NUM_EVENT_TYPES }; @@ -277,7 +278,6 @@ enum { QUERY_DRAG_OPERATION, QUERY_IME_CHAR_RECT, QUERY_PASTEBOARD_DATA, - QUERY_RESIZE_END, QUERY_RESIZE_START, QUERY_MIN_MAX_INFO, NUM_QUERY_TYPES diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 3d436ac..273b70e 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1867,6 +1867,18 @@ void macdrv_window_brought_forward(HWND hwnd) } +/*********************************************************************** + * macdrv_window_resize_ended + * + * Handler for WINDOW_RESIZE_ENDED events. + */ +void macdrv_window_resize_ended(HWND hwnd) +{ + TRACE("hwnd %p\n", hwnd); + SendMessageW(hwnd, WM_EXITSIZEMOVE, 0, 0); +} + + struct quit_info { HWND *wins; UINT capacity; @@ -2051,19 +2063,6 @@ BOOL query_resize_start(HWND hwnd) /*********************************************************************** - * query_resize_end - * - * Handler for QUERY_RESIZE_END query. - */ -BOOL query_resize_end(HWND hwnd) -{ - TRACE("hwnd %p\n", hwnd); - SendMessageW(hwnd, WM_EXITSIZEMOVE, 0, 0); - return TRUE; -} - - -/*********************************************************************** * query_min_max_info * * Handler for QUERY_MIN_MAX_INFO query.

1 0

Ken Thomases : winemac: Trace flags of WINDOW_FRAME_CHANGED events.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: ea26c8066d1cd557262e7e1d9edabd55545de664 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea26c8066d1cd557262e7e1d9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 31 19:16:44 2013 -0500 winemac: Trace flags of WINDOW_FRAME_CHANGED events. (cherry picked from commit 8e1fdb845e284f6aad436330bc1bb77506635e90) --- dlls/winemac.drv/window.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 273b70e..9007610 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1658,8 +1658,9 @@ void macdrv_window_frame_changed(HWND hwnd, const macdrv_event *event) parent = GetAncestor(hwnd, GA_PARENT); - TRACE("win %p/%p new Cocoa frame %s\n", hwnd, data->cocoa_window, - wine_dbgstr_cgrect(event->window_frame_changed.frame)); + TRACE("win %p/%p new Cocoa frame %s fullscreen %d in_resize %d\n", hwnd, data->cocoa_window, + wine_dbgstr_cgrect(event->window_frame_changed.frame), + event->window_frame_changed.fullscreen, event->window_frame_changed.in_resize); rect = rect_from_cgrect(event->window_frame_changed.frame); macdrv_mac_to_window_rect(data, &rect);

1 0

Piotr Caban : msvcrt: Don' t call invalid parameter handler on invalid mode flag.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 659003adfcaab9bed046eba528681e6a3437e1e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=659003adfcaab9bed046eba52… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 1 12:12:06 2013 +0100 msvcrt: Don't call invalid parameter handler on invalid mode flag. (cherry picked from commit 647817b018fc5eb5223e5938581a8eb2eb3fcc8d) --- dlls/msvcrt/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 1594c33..f26d0c2 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1384,8 +1384,8 @@ static int msvcrt_get_flags(const MSVCRT_wchar_t* mode, int *open_flags, int* st FIXME("ignoring cache optimization flag: %c\n", mode[-1]); break; default: - MSVCRT_INVALID_PMT(0, MSVCRT_EINVAL); - return -1; + ERR("incorrect mode flag: %c\n", mode[-1]); + break; } if(*mode == ',')

1 0

Henri Verbeet : wined3d: Introduce a function for safely releasing a DC.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: e1de06b266c38adb324e656cfd7e6448dec3cd16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1de06b266c38adb324e656cf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 4 10:02:43 2013 +0100 wined3d: Introduce a function for safely releasing a DC. (cherry picked from commit 3ad89896148d7d7a0a5f3a1eb99d637ca1791bd8) --- dlls/wined3d/context.c | 24 ++++-------------------- dlls/wined3d/directx.c | 2 +- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/utils.c | 14 ++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4533a68..a20bc7f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -842,25 +842,9 @@ static void context_update_window(struct wined3d_context *context) context, context->win_handle, context->swapchain->win_handle); if (context->valid) - { - /* You'd figure ReleaseDC() would fail if the DC doesn't match the - * window. However, that's not what actually happens, and there are - * user32 tests that confirm ReleaseDC() with the wrong window is - * supposed to succeed. So explicitly check that the DC belongs to - * the window, since we want to avoid releasing a DC that belongs to - * some other window if the original window was already destroyed. */ - if (WindowFromDC(context->hdc) != context->win_handle) - { - WARN("DC %p does not belong to window %p.\n", - context->hdc, context->win_handle); - } - else if (!ReleaseDC(context->win_handle, context->hdc)) - { - ERR("Failed to release device context %p, last error %#x.\n", - context->hdc, GetLastError()); - } - } - else context->valid = 1; + wined3d_release_dc(context->win_handle, context->hdc); + else + context->valid = 1; context->win_handle = context->swapchain->win_handle; @@ -986,7 +970,7 @@ static void context_destroy_gl_resources(struct wined3d_context *context) ERR("Failed to disable GL context.\n"); } - ReleaseDC(context->win_handle, context->hdc); + wined3d_release_dc(context->win_handle, context->hdc); if (!wglDeleteContext(context->glCtx)) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ff3c46d..ae3f0db 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -291,7 +291,7 @@ static void WineD3D_ReleaseFakeGLContext(const struct wined3d_fake_gl_ctx *ctx) ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx->gl_ctx, err); } - ReleaseDC(ctx->wnd, ctx->dc); + wined3d_release_dc(ctx->wnd, ctx->dc); DestroyWindow(ctx->wnd); if (ctx->restore_gl_ctx && !wglMakeCurrent(ctx->restore_dc, ctx->restore_gl_ctx)) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 47ee901..2793d03 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -84,7 +84,7 @@ static void swapchain_cleanup(struct wined3d_swapchain *swapchain) { TRACE("Destroying backup wined3d window %p, dc %p.\n", swapchain->backup_wnd, swapchain->backup_dc); - ReleaseDC(swapchain->backup_wnd, swapchain->backup_dc); + wined3d_release_dc(swapchain->backup_wnd, swapchain->backup_dc); DestroyWindow(swapchain->backup_wnd); } } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 21bcac8..2ee4b95 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3777,3 +3777,17 @@ void wined3d_ftoa(float value, char *s) sprintf(s, "%s%d.%08de%+03d", sign, x, frac, exponent); } + +void wined3d_release_dc(HWND window, HDC dc) +{ + /* You'd figure ReleaseDC() would fail if the DC doesn't match the window. + * However, that's not what actually happens, and there are user32 tests + * that confirm ReleaseDC() with the wrong window is supposed to succeed. + * So explicitly check that the DC belongs to the window, since we want to + * avoid releasing a DC that belongs to some other window if the original + * window was already destroyed. */ + if (WindowFromDC(dc) != window) + WARN("DC %p does not belong to window %p.\n", dc, window); + else if (!ReleaseDC(window, dc)) + ERR("Failed to release device context %p, last error %#x.\n", dc, GetLastError()); +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ba63a02..5858e0f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2668,6 +2668,8 @@ void multiply_matrix(struct wined3d_matrix *dest, const struct wined3d_matrix *s UINT wined3d_log2i(UINT32 x) DECLSPEC_HIDDEN; unsigned int count_bits(unsigned int mask) DECLSPEC_HIDDEN; +void wined3d_release_dc(HWND window, HDC dc) DECLSPEC_HIDDEN; + struct wined3d_shader_lconst { struct list entry;

1 0

Andrew Eikum : advapi32: Attempt to open WOW64 key before the lowest level key, too.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 151c003c22d28cc809d4e1d4b2d3bb437769dad0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=151c003c22d28cc809d4e1d4b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 4 09:44:21 2013 -0500 advapi32: Attempt to open WOW64 key before the lowest level key, too. Without this, we'll fail to open the correct key for e.g. <Machine\Software\Classes> with KEY_WOW64_32KEY, which should resolve to <Machine\Software\Wow6432Node\Classes>. (cherry picked from commit 8cb7f877d7406065074183ae8541355f0090e6db) --- dlls/advapi32/registry.c | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index c01e125..9012254 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -140,10 +140,9 @@ static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES if (i == len && !force_wow32) return status; attrs = attr->Attributes; - attr->Attributes &= ~OBJ_OPENLINK; attr->ObjectName = &str; - while (i < len) + for (;;) { str.Buffer = buffer + pos; str.Length = (i - pos) * sizeof(WCHAR); @@ -157,20 +156,25 @@ static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES force_wow32 = FALSE; } } - status = NtCreateKey( &subkey, access, attr, 0, class, - options & ~REG_OPTION_CREATE_LINK, dispos ); + if (i == len) + { + attr->Attributes = attrs; + status = NtCreateKey( (PHANDLE)retkey, access, attr, 0, class, options, dispos ); + } + else + { + attr->Attributes = attrs & ~OBJ_OPENLINK; + status = NtCreateKey( &subkey, access, attr, 0, class, + options & ~REG_OPTION_CREATE_LINK, dispos ); + } if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); if (status) return status; + if (i == len) break; attr->RootDirectory = subkey; while (i < len && buffer[i] == '\\') i++; pos = i; while (i < len && buffer[i] != '\\') i++; } - str.Buffer = buffer + pos; - str.Length = (i - pos) * sizeof(WCHAR); - attr->Attributes = attrs; - status = NtCreateKey( (PHANDLE)retkey, access, attr, 0, class, options, dispos ); - if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); } return status; } @@ -190,10 +194,9 @@ static NTSTATUS open_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *a if (len && buffer[0] == '\\') return STATUS_OBJECT_PATH_INVALID; while (i < len && buffer[i] != '\\') i++; attrs = attr->Attributes; - attr->Attributes &= ~OBJ_OPENLINK; attr->ObjectName = &str; - while (i < len) + for (;;) { str.Buffer = buffer + pos; str.Length = (i - pos) * sizeof(WCHAR); @@ -207,21 +210,25 @@ static NTSTATUS open_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *a force_wow32 = FALSE; } } - status = NtOpenKey( &subkey, access, attr ); + if (i == len) + { + attr->Attributes = attrs; + status = NtOpenKey( (PHANDLE)retkey, access, attr ); + } + else + { + attr->Attributes = attrs & ~OBJ_OPENLINK; + status = NtOpenKey( &subkey, access, attr ); + } if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); if (status) return status; + if (i == len) break; attr->RootDirectory = subkey; while (i < len && buffer[i] == '\\') i++; pos = i; while (i < len && buffer[i] != '\\') i++; } - str.Buffer = buffer + pos; - str.Length = (i - pos) * sizeof(WCHAR); - attr->Attributes = attrs; - status = NtOpenKey( (PHANDLE)retkey, access, attr ); - if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); return status; - } /* create one of the HKEY_* special root keys */

1 0