January 2014 - Wine-Commits

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

Jan. 10, 2014

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

Dmitry Timoshkov : include: Redefine security privilege names without using TEXT macro.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 81991c093e80806df70fed2009ecedecd709e15a URL: http://source.winehq.org/git/wine.git/?a=commit;h=81991c093e80806df70fed200… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:01:50 2013 +0900 include: Redefine security privilege names without using TEXT macro. (cherry picked from commit ebc7dcc630723c09e8f2f73f4364504025343907) --- include/winnt.h | 152 ++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 123 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=81991c093e80806df70fe…

1 0

Nikolay Sivov : wshom.ocx: Implement IWshShell3::ExpandEnvironmentStrings( ).
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 73ab03c3a2f9b4bef109f2dca3b1b570a470a394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73ab03c3a2f9b4bef109f2dca… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 27 12:28:06 2013 +0400 wshom.ocx: Implement IWshShell3::ExpandEnvironmentStrings(). (cherry picked from commit 71ecb55661a8cf14a0e19b94749f1d8957c9ab16) --- dlls/wshom.ocx/shell.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 17d0306..385d2a3 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -745,10 +745,26 @@ static HRESULT WINAPI WshShell3_CreateShortcut(IWshShell3 *iface, BSTR PathLink, return WshShortcut_Create(PathLink, Shortcut); } -static HRESULT WINAPI WshShell3_ExpandEnvironmentStrings(IWshShell3 *iface, BSTR Src, BSTR* out_Dst) +static HRESULT WINAPI WshShell3_ExpandEnvironmentStrings(IWshShell3 *iface, BSTR Src, BSTR* Dst) { - FIXME("(%s %p): stub\n", debugstr_w(Src), out_Dst); - return E_NOTIMPL; + DWORD ret; + + TRACE("(%s %p)\n", debugstr_w(Src), Dst); + + if (!Src || !Dst) return E_POINTER; + + ret = ExpandEnvironmentStringsW(Src, NULL, 0); + *Dst = SysAllocStringLen(NULL, ret); + if (!*Dst) return E_OUTOFMEMORY; + + if (ExpandEnvironmentStringsW(Src, *Dst, ret)) + return S_OK; + else + { + SysFreeString(*Dst); + *Dst = NULL; + return HRESULT_FROM_WIN32(GetLastError()); + } } static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR Name, VARIANT* out_Value)

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 Jan. 10, 2014

Jan. 10, 2014

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

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

Jan. 10, 2014

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

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

Jan. 10, 2014

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

Ken Thomases : winemac: Disable software GL rendering unless it' s enabled via a new registry setting, AllowSoftwareRendering.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: dd4fe90edd73e49b9d356368641ad53d3228d925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd4fe90edd73e49b9d3563686… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Oct 21 16:37:05 2013 -0500 winemac: Disable software GL rendering unless it's enabled via a new registry setting, AllowSoftwareRendering. (cherry picked from commit 742c48b3489a21dd373221aa10bb648dd02c86d8) --- dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_main.c | 4 ++++ dlls/winemac.drv/opengl.c | 5 +++++ 3 files changed, 10 insertions(+) diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 98aa600..992a7cd 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -38,6 +38,7 @@ extern BOOL skip_single_buffer_flushes DECLSPEC_HIDDEN; extern BOOL allow_vsync DECLSPEC_HIDDEN; extern BOOL allow_set_gamma DECLSPEC_HIDDEN; +extern BOOL allow_software_rendering DECLSPEC_HIDDEN; extern HMODULE macdrv_module DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 0f4b056..c44a267 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -52,6 +52,7 @@ BOOL allow_vsync = TRUE; BOOL allow_set_gamma = TRUE; int left_option_is_alt = 0; int right_option_is_alt = 0; +BOOL allow_software_rendering = FALSE; HMODULE macdrv_module = 0; @@ -176,6 +177,9 @@ static void setup_options(void) if (!get_config_key(hkey, appkey, "RightOptionIsAlt", buffer, sizeof(buffer))) right_option_is_alt = IS_OPTION_TRUE(buffer[0]); + if (!get_config_key(hkey, appkey, "AllowSoftwareRendering", buffer, sizeof(buffer))) + allow_software_rendering = IS_OPTION_TRUE(buffer[0]); + if (appkey) RegCloseKey(appkey); if (hkey) RegCloseKey(hkey); } diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index ee9d254..f090821 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -618,6 +618,11 @@ static void enum_renderer_pixel_formats(renderer_properties renderer, CFMutableA attribs[n++] = kCGLPFAAccelerated; attribs[n++] = kCGLPFANoRecovery; } + else if (!allow_software_rendering) + { + TRACE("ignoring software renderer because AllowSoftwareRendering is off\n"); + return; + } n_stack[++n_stack_idx] = n; for (double_buffer = 0; double_buffer <= 1; double_buffer++)

1 0

Piotr Caban : comctl32: Fix a typo in UPDOWN_OffsetVal that breaks UDS_WRAP flag support.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 33134b39457f5eca261c4389ebf1daeacee3402f URL: http://source.winehq.org/git/wine.git/?a=commit;h=33134b39457f5eca261c4389e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 28 09:56:18 2013 +0100 comctl32: Fix a typo in UPDOWN_OffsetVal that breaks UDS_WRAP flag support. (cherry picked from commit 22a132938229e9fcb33a905787318a96bee4c33c) --- dlls/comctl32/updown.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 0761774..23a633e 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -150,7 +150,7 @@ static BOOL UPDOWN_OffsetVal(UPDOWN_INFO *infoPtr, int delta) (infoPtr->MaxVal < infoPtr->MinVal ? -1 : 1) * (infoPtr->MinVal - infoPtr->MaxVal) + (delta < 0 ? 1 : -1); - } if ((infoPtr->MaxVal > infoPtr->MinVal && infoPtr->CurVal+delta > infoPtr->MaxVal) + } else if ((infoPtr->MaxVal > infoPtr->MinVal && infoPtr->CurVal+delta > infoPtr->MaxVal) || (infoPtr->MaxVal < infoPtr->MinVal && infoPtr->CurVal+delta < infoPtr->MaxVal)) { delta = infoPtr->MaxVal - infoPtr->CurVal; } else {

1 0

Nikolay Sivov : wshom.ocx: Silence failure to query IDispatchEx from IWshShell3.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: d313a000354629ea57513cb6d95d7ffae0b0835d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d313a000354629ea57513cb6d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 27 12:27:45 2013 +0400 wshom.ocx: Silence failure to query IDispatchEx from IWshShell3. (cherry picked from commit f3c805be67df81713bd7b6130d03dace50688a49) --- dlls/wshom.ocx/shell.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index bc6a839..17d0306 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -21,6 +21,7 @@ #include "shellapi.h" #include "shlobj.h" +#include "dispex.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -576,14 +577,21 @@ static HRESULT WINAPI WshShell3_QueryInterface(IWshShell3 *iface, REFIID riid, v { TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); + *ppv = NULL; + if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDispatch) || IsEqualGUID(riid, &IID_IWshShell3)) { *ppv = iface; - }else { + } + else if (IsEqualGUID(riid, &IID_IDispatchEx)) + { + return E_NOINTERFACE; + } + else + { FIXME("Unknown iface %s\n", debugstr_guid(riid)); - *ppv = NULL; return E_NOINTERFACE; }

1 0

Alexandre Julliard : user32: Fix tick counter wrap-around handling.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 65f93d20e8fbff642ba3e68fd799246442e977d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65f93d20e8fbff642ba3e68fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 21 14:48:01 2013 +0200 user32: Fix tick counter wrap-around handling. (cherry picked from commit 7b2eafbc8a7073cb70c4eb4d19691ef5c25807b0) --- dlls/user32/dde_client.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index 91e1549..7a30ed2 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -1017,22 +1017,20 @@ static WDML_QUEUE_STATE WDML_HandleReply(WDML_CONV* pConv, MSG* msg, HDDEDATA* h */ static HDDEDATA WDML_SyncWaitTransactionReply(HCONV hConv, DWORD dwTimeout, const WDML_XACT* pXAct, DWORD *ack) { - DWORD dwTime; + DWORD start, elapsed; DWORD err; WDML_CONV* pConv; TRACE("Starting wait for a timeout of %d ms\n", dwTimeout); - /* FIXME: time 32 bit wrap around */ - dwTimeout += GetCurrentTime(); - - while ((dwTime = GetCurrentTime()) < dwTimeout) + start = GetTickCount(); + while ((elapsed = GetTickCount() - start) < dwTimeout) { /* we cannot be in the crit sect all the time because when client and server run in a * single process they need to share the access to the internal data */ if (MsgWaitForMultipleObjects(0, NULL, FALSE, - dwTimeout - dwTime, QS_POSTMESSAGE) == WAIT_OBJECT_0) + dwTimeout - elapsed, QS_POSTMESSAGE) == WAIT_OBJECT_0) { MSG msg;

1 0