May 2016 - Wine-commits - list.winehq.org

Vincent Povirk : user32: Don't regard the clipboard as changed if we don' t own it.
by Alexandre Julliard 20 May '16

20 May '16

Module: wine Branch: master Commit: b68e03f9c936708c9757e2e7c2be5011b50fe070 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b68e03f9c936708c9757e2e7c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 18 14:23:47 2016 -0500 user32: Don't regard the clipboard as changed if we don't own it. I ran into a situation where user32 will call EndClipboardUpdate even though the clipboard hasn't changed. It went something like this: * Program A acquires the clipboard and adds some delay-rendered data. * Program B requests data from the clipboard, causing program A to receive WM_RENDERFORMAT. * Program A calls SetClipboardData to fulfill the request, setting bCBHasChanged to TRUE. * Program C acquires the clipboard. * Program A opens the clipboard to enumerate the formats. When it closes the clipboard, EndClipboardUpdate is called. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index dec738a..4764784 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -178,6 +178,7 @@ INT WINAPI GetClipboardFormatNameA(UINT wFormat, LPSTR retStr, INT maxlen) BOOL WINAPI OpenClipboard( HWND hWnd ) { BOOL bRet; + UINT flags; TRACE("(%p)...\n", hWnd); @@ -185,10 +186,16 @@ BOOL WINAPI OpenClipboard( HWND hWnd ) { req->flags = SET_CB_OPEN; req->clipboard = wine_server_user_handle( hWnd ); - bRet = !wine_server_call( req ); + if ((bRet = !wine_server_call( req ))) + flags = reply->flags; } SERVER_END_REQ; + if (bRet && !(flags & CB_PROCESS)) + { + bCBHasChanged = FALSE; + } + TRACE(" returning %i\n", bRet); return bRet; @@ -201,6 +208,7 @@ BOOL WINAPI OpenClipboard( HWND hWnd ) BOOL WINAPI CloseClipboard(void) { HWND viewer = 0; + UINT flags; BOOL ret; TRACE("() Changed=%d\n", bCBHasChanged); @@ -210,18 +218,21 @@ BOOL WINAPI CloseClipboard(void) req->flags = SET_CB_CLOSE; if (bCBHasChanged) req->flags |= SET_CB_SEQNO; if ((ret = !wine_server_call_err( req ))) + { viewer = wine_server_ptr_handle( reply->old_viewer ); + flags = reply->flags; + } } SERVER_END_REQ; if (!ret) return FALSE; - if (bCBHasChanged) + if (bCBHasChanged && (flags & CB_PROCESS)) { USER_Driver->pEndClipboardUpdate(); - bCBHasChanged = FALSE; if (viewer) SendNotifyMessageW(viewer, WM_DRAWCLIPBOARD, (WPARAM) GetClipboardOwner(), 0); } + bCBHasChanged = FALSE; return TRUE; }

1 0

Sebastian Lackner : wininet: Initialize user_len before GetUserNameW call.
by Alexandre Julliard 20 May '16

20 May '16

Module: wine Branch: master Commit: ff1fb7f51cc5555d0a30c0131a012d730600ecba URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff1fb7f51cc5555d0a30c0131… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu May 19 21:25:04 2016 +0200 wininet: Initialize user_len before GetUserNameW call. Fixes a regression introduced by 441347f084963ef9f9ae721e5731284443c40656. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban<jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/cookie.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 8e9ebfb..34c6c0b 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -151,6 +151,7 @@ static WCHAR *create_cookie_url(substr_t domain, substr_t path, substr_t *ret_pa static const WCHAR cookie_prefix[] = {'C','o','o','k','i','e',':'}; + user_len = sizeof(user)/sizeof(WCHAR); if(!GetUserNameW(user, &user_len)) return FALSE; user_len--;

1 0

Józef Kucia : d3d11/tests: Add create_buffer() helper.
by Alexandre Julliard 20 May '16

20 May '16

Module: wine Branch: master Commit: 4c8f89d37d36a6e2ab6cfa1435320562e97615cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c8f89d37d36a6e2ab6cfa143… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 20 11:47:28 2016 +0200 d3d11/tests: Add create_buffer() helper. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 245 +++++++++-------------------------------------- 1 file changed, 45 insertions(+), 200 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c8f89d37d36a6e2ab6cf…

1 0

Józef Kucia : d3d10core/tests: Add create_buffer() helper.
by Alexandre Julliard 20 May '16

20 May '16

Module: wine Branch: master Commit: 9eef3c90ca7bcee7ef2cdb4ae80a7f1e8616b6ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eef3c90ca7bcee7ef2cdb4ae… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 20 11:47:29 2016 +0200 d3d10core/tests: Add create_buffer() helper. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 252 ++++++++---------------------------------- 1 file changed, 48 insertions(+), 204 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9eef3c90ca7bcee7ef2cd…

1 0

Andrew Eikum : winegstreamer: Fix IQualityControl::Notify.
by Alexandre Julliard 19 May '16

19 May '16

Module: wine Branch: master Commit: 1517bfb1863667b39117762c448a3f43bc4852bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1517bfb1863667b39117762c4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 19 09:14:48 2016 -0500 winegstreamer: Fix IQualityControl::Notify. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index f0b30e2..97648bc 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1663,15 +1663,28 @@ static ULONG WINAPI GST_QualityControl_Release(IQualityControl *iface) static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) { GSTOutPin *pin = impl_from_IQualityControl(iface); - REFERENCE_TIME late = qm.Late; + GstEvent *evt; + TRACE("(%p)->(%p, { 0x%x %u %s %s })\n", pin, sender, qm.Type, qm.Proportion, wine_dbgstr_longlong(qm.Late), wine_dbgstr_longlong(qm.TimeStamp)); + mark_wine_thread(); - if (qm.Late < 0 && -qm.Late > qm.TimeStamp) - late = -qm.TimeStamp; - gst_pad_push_event(pin->my_sink, gst_event_new_qos(late <= 0 ? GST_QOS_TYPE_OVERFLOW : GST_QOS_TYPE_UNDERFLOW, 1000./qm.Proportion, late*100, qm.TimeStamp*100)); + + if (qm.Type == Flood) + qm.Late = 0; + + evt = gst_event_new_qos(qm.Type == Famine ? GST_QOS_TYPE_UNDERFLOW : GST_QOS_TYPE_OVERFLOW, + qm.Proportion / 1000., qm.Late * 100, qm.TimeStamp * 100); + + if (!evt) { + WARN("Failed to create QOS event\n"); + return E_INVALIDARG; + } + + gst_pad_push_event(pin->my_sink, evt); + return S_OK; }

1 0

Andrew Eikum : winegstreamer: Set offset on GstBuffer.
by Alexandre Julliard 19 May '16

19 May '16

Module: wine Branch: master Commit: 29deae351b4a4460fe8d7a04af88325dac420a0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=29deae351b4a4460fe8d7a04a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 19 09:14:51 2016 -0500 winegstreamer: Set offset on GstBuffer. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 97648bc..d71225d 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -712,6 +712,8 @@ static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 ERR("Returned %08x\n", hr); return GST_FLOW_ERROR; } + + GST_BUFFER_OFFSET(*buf) = ofs; return GST_FLOW_OK; }

1 0

Andrey Gusev : gdi32: Fix a typo in a pointer name in primitive_funcs.
by Alexandre Julliard 19 May '16

19 May '16

Module: wine Branch: master Commit: 9a80284e1a886ff7e01d33f68715c9bfdb773459 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a80284e1a886ff7e01d33f68… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu May 19 17:16:12 2016 +0300 gdi32: Fix a typo in a pointer name in primitive_funcs. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/dibdrv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 4152f2e..c64058b 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -177,7 +177,7 @@ typedef struct primitive_funcs void (* solid_rects)(const dib_info *dib, int num, const RECT *rc, DWORD and, DWORD xor); void (* solid_line)(const dib_info *dib, const POINT *start, const struct line_params *params, DWORD and, DWORD xor); - void (* pattern_rects)(const dib_info *dib, int num, const RECT *rc, const POINT *orign, + void (* pattern_rects)(const dib_info *dib, int num, const RECT *rc, const POINT *origin, const dib_info *brush, const rop_mask_bits *bits); void (* copy_rect)(const dib_info *dst, const RECT *rc, const dib_info *src, const POINT *origin, int rop2, int overlap);

1 0

Ken Thomases : winemac: Adjust sizes of all descendant views when Retina mode changes.
by Alexandre Julliard 19 May '16

19 May '16

Module: wine Branch: master Commit: 4a7628946489c6f575e4094c6273d656a7ad6c64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a7628946489c6f575e4094c6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed May 18 18:38:25 2016 -0500 winemac: Adjust sizes of all descendant views when Retina mode changes. As opposed to just the immediate subviews of the window contentView. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index d97eb1d..1b0f9cc 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -553,6 +553,24 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi } } + - (void) setRetinaMode:(int)mode + { + double scale = mode ? 0.5 : 2.0; + NSRect frame = self.frame; + frame.origin.x *= scale; + frame.origin.y *= scale; + frame.size.width *= scale; + frame.size.height *= scale; + [self setFrame:frame]; + [self updateGLContexts]; + + for (WineContentView* subview in [self subviews]) + { + if ([subview isKindOfClass:[WineContentView class]]) + [subview setRetinaMode:mode]; + } + } + - (BOOL) acceptsFirstMouse:(NSEvent*)theEvent { return YES; @@ -2301,15 +2319,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi for (WineContentView* subview in [self.contentView subviews]) { if ([subview isKindOfClass:[WineContentView class]]) - { - frame = subview.frame; - frame.origin.x *= scale; - frame.origin.y *= scale; - frame.size.width *= scale; - frame.size.height *= scale; - [subview setFrame:frame]; - [subview updateGLContexts]; - } + [subview setRetinaMode:mode]; } frame = [self contentRectForFrameRect:self.wine_fractionalFrame];

1 0

Alexandre Julliard : user32: Load the default app icon with LR_SHARED to avoid a leak.
by Alexandre Julliard 19 May '16

19 May '16

Module: wine Branch: master Commit: c007b3cd4612e9c1b9e2990819415486f59a6acc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c007b3cd4612e9c1b9e299081… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 19 16:38:34 2016 +0900 user32: Load the default app icon with LR_SHARED to avoid a leak. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/nonclient.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 68320af..d3598b1 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -173,7 +173,7 @@ static HICON NC_IconForWindow( HWND hwnd ) */ if (!hIcon && !(GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_DLGMODALFRAME)) hIcon = LoadImageW(0, (LPCWSTR)IDI_WINLOGO, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), - GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR); + GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR | LR_SHARED); return hIcon; }

1 0

Huw Davies : fonts: Fix typo in glyph name.
by Alexandre Julliard 19 May '16

19 May '16

Module: wine Branch: master Commit: 6e0a4a8924c1c0b69124a21075713ae051a41064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e0a4a8924c1c0b69124a2107… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 19 10:38:27 2016 +0100 fonts: Fix typo in glyph name. Reported by Andrey Gusev. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- fonts/wingding.sfd | 2 +- fonts/wingding.ttf | Bin 6720 -> 6720 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/fonts/wingding.sfd b/fonts/wingding.sfd index 55723b4..c46152b 100644 --- a/fonts/wingding.sfd +++ b/fonts/wingding.sfd @@ -333,7 +333,7 @@ SplineSet EndSplineSet EndChar -StartChar: sqaure2 +StartChar: square2 Encoding: 160 160 14 Width: 641 Flags: W diff --git a/fonts/wingding.ttf b/fonts/wingding.ttf index b1e9d58..36539ce 100644 Binary files a/fonts/wingding.ttf and b/fonts/wingding.ttf differ

1 0