January 2014 - Wine-Commits

Vijay Kiran Kamuju : wininet: Implement setting INTERNET_PER_CONN_PROXY_BYPASS.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

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: Send WM_{ENTER, EXIT}SIZEMOVE around window frame changes initiated by Cocoa.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

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: Trace flags of WINDOW_FRAME_CHANGED events.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

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

Alexandre Julliard : user32: Fix the scope of a local variable.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 09b159824818db3b53043124bd03d7f634ddb43e URL: http://source.winehq.org/git/wine.git/?a=commit;h=09b159824818db3b53043124b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 21 14:48:20 2013 +0200 user32: Fix the scope of a local variable. (cherry picked from commit 6d0d7e08e51f6dd5870a0b20d2a5b3f2419f2381) --- dlls/user32/message.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 27e3441..69507dc 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1999,6 +1999,7 @@ static BOOL post_dde_message( struct packed_message *data, const struct send_mes HGLOBAL hunlock = 0; int i; DWORD res; + ULONGLONG hpack; if (!UnpackDDElParam( info->msg, info->lparam, &uiLo, &uiHi )) return FALSE; @@ -2019,7 +2020,7 @@ static BOOL post_dde_message( struct packed_message *data, const struct send_mes HGLOBAL h = dde_get_pair( (HANDLE)uiHi ); if (h) { - ULONGLONG hpack = pack_ptr( h ); + hpack = pack_ptr( h ); /* send back the value of h on the other side */ push_data( data, &hpack, sizeof(hpack) ); lp = uiLo;

1 0

Alexandre Julliard : include: Add inline wrappers for some underscore-prefixed math functions.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: e05d42e89b0a8703631d9533e8f0830e2f842395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e05d42e89b0a8703631d9533e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 21 18:45:27 2013 +0200 include: Add inline wrappers for some underscore-prefixed math functions. (cherry picked from commit a40574577072da11d8eda570e934636b5e83e528) --- include/msvcrt/math.h | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index 4d0655e..34aa268 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -68,13 +68,13 @@ double __cdecl frexp(double, int*); double __cdecl modf(double, double*); double __cdecl fmod(double, double); -double __cdecl hypot(double, double); -double __cdecl j0(double); -double __cdecl j1(double); -double __cdecl jn(int, double); -double __cdecl y0(double); -double __cdecl y1(double); -double __cdecl yn(int, double); +double __cdecl _hypot(double, double); +double __cdecl _j0(double); +double __cdecl _j1(double); +double __cdecl _jn(int, double); +double __cdecl _y0(double); +double __cdecl _y1(double); +double __cdecl _yn(int, double); #ifdef __x86_64__ @@ -129,7 +129,7 @@ float __cdecl fmodf(float, float); #define fabsf(x) ((float)fabs((double)(x))) #define ldexpf(x,y) ((float)ldexp((double)(x),(y))) -float __cdecl hypotf(float, float); +float __cdecl _hypotf(float, float); int __cdecl _matherr(struct _exception*); double __cdecl _cabs(struct _complex); @@ -171,4 +171,15 @@ static const union { #endif /* !_MATH_DEFINES_DEFINED */ #endif /* _USE_MATH_DEFINES */ +static inline double hypot( double x, double y ) { return _hypot( x, y ); } +static inline double j0( double x ) { return _j0( x ); } +static inline double j1( double x ) { return _j1( x ); } +static inline double jn( int n, double x ) { return _jn( n, x ); } +static inline double y0( double x ) { return _y0( x ); } +static inline double y1( double x ) { return _y1( x ); } +static inline double yn( int n, double x ) { return _yn( n, x ); } +static inline double cabs(struct _complex z) { return _cabs( z ); } + +static inline float hypotf( float x, float y ) { return _hypotf( x, y ); } + #endif /* __WINE_MATH_H */

1 0

Ken Thomases : winemac: Send WM_CANCELMODE when keyboard layout changes from Cocoa side.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 58f2168742191ed3fea4beeee0c5936fe3bfc634 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58f2168742191ed3fea4beeee… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Oct 23 20:13:10 2013 -0500 winemac: Send WM_CANCELMODE when keyboard layout changes from Cocoa side. The standard keyboard shortcut for switching the keyboard layout is Command- Space, but the Mac driver never sees the Space key press. So, Wine only sees a press and release of Alt, which puts focus on the menu bar. This prevents that focus change. (cherry picked from commit 35f0cf26b0225f31d662c834d55997a7a4bf3c59) --- dlls/winemac.drv/keyboard.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index cc25789..206ee8d 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -843,6 +843,8 @@ void macdrv_keyboard_changed(const macdrv_event *event) thread_data->dead_key_state = 0; macdrv_compute_keyboard_layout(thread_data); + + SendMessageW(GetActiveWindow(), WM_CANCELMODE, 0, 0); }

1 0

Daniel Lehman : kernel32: Don't use depth in RtlInterlockedFlushSList.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: cae03c156dd654beb13aaa0535c84e7cb78a7dfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cae03c156dd654beb13aaa053… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Oct 22 22:47:26 2013 -0700 kernel32: Don't use depth in RtlInterlockedFlushSList. Depth wraps around at 65536 but list supports more elements. (cherry picked from commit 0669a8aca2dec4eaf6632e368832a8aec1c48ffd) --- dlls/ntdll/rtl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index bbcd454..0bad4a0 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1080,7 +1080,7 @@ PSLIST_ENTRY WINAPI RtlInterlockedFlushSList(PSLIST_HEADER list) SLIST_HEADER old, new; #ifdef _WIN64 - if (!list->Header16.Depth) return NULL; + if (!list->Header16.NextEntry) return NULL; new.s.Alignment = new.s.Region = 0; new.Header16.HeaderType = 1; /* we use the 16-byte header */ do @@ -1090,7 +1090,7 @@ PSLIST_ENTRY WINAPI RtlInterlockedFlushSList(PSLIST_HEADER list) } while (!interlocked_cmpxchg128((__int64 *)list, new.s.Region, new.s.Alignment, (__int64 *)&old)); return (SLIST_ENTRY *)((ULONG_PTR)old.Header16.NextEntry << 4); #else - if (!list->s.Depth) return NULL; + if (!list->s.Next.Next) return NULL; new.Alignment = 0; do {

1 0

Vincent Povirk : xinput1_3: Make XInputGetState patchable.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 15da8cc6f9b2e0cfa178e3729eb66abf68f4e497 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15da8cc6f9b2e0cfa178e3729… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Oct 25 16:18:24 2013 -0500 xinput1_3: Make XInputGetState patchable. (cherry picked from commit b29c2b050defc9137f88d5927edb5675c8f4a5f5) --- dlls/xinput1_3/xinput1_3_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xinput1_3/xinput1_3_main.c b/dlls/xinput1_3/xinput1_3_main.c index a2a83dd..63f725b 100644 --- a/dlls/xinput1_3/xinput1_3_main.c +++ b/dlls/xinput1_3/xinput1_3_main.c @@ -65,7 +65,7 @@ DWORD WINAPI XInputSetState(DWORD dwUserIndex, XINPUT_VIBRATION* pVibration) return ERROR_BAD_ARGUMENTS; } -DWORD WINAPI XInputGetState(DWORD dwUserIndex, XINPUT_STATE* pState) +DWORD WINAPI DECLSPEC_HOTPATCH XInputGetState(DWORD dwUserIndex, XINPUT_STATE* pState) { static int warn_once;

1 0

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

Jan. 10, 2014

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

Jan. 10, 2014

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