February 2015 - Wine-Commits

Henri Verbeet : d2d1: Implement d2d_solid_color_brush_GetTransform().
by Alexandre Julliard Feb. 2, 2015

Feb. 2, 2015

Module: wine Branch: master Commit: 88edc866ea4a761b0e6b69fb93e7083328373f1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=88edc866ea4a761b0e6b69fb9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 29 10:27:22 2015 +0100 d2d1: Implement d2d_solid_color_brush_GetTransform(). --- dlls/d2d1/brush.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index c1e2289..9e3f643 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -244,16 +244,11 @@ static float STDMETHODCALLTYPE d2d_solid_color_brush_GetOpacity(ID2D1SolidColorB static void STDMETHODCALLTYPE d2d_solid_color_brush_GetTransform(ID2D1SolidColorBrush *iface, D2D1_MATRIX_3X2_F *transform) { - static const D2D1_MATRIX_3X2_F identity = - { - 1.0f, 0.0f, - 0.0f, 1.0f, - 0.0f, 0.0f, - }; + struct d2d_brush *brush = impl_from_ID2D1SolidColorBrush(iface); - FIXME("iface %p, transform %p stub!\n", iface, transform); + TRACE("iface %p, transform %p.\n", iface, transform); - *transform = identity; + *transform = brush->transform; } static void STDMETHODCALLTYPE d2d_solid_color_brush_SetColor(ID2D1SolidColorBrush *iface, const D2D1_COLOR_F *color)

1 0

Ken Thomases : winemac: When Cocoa brings a window forward, tell Wine even if it's disabled or no-activate.
by Alexandre Julliard Feb. 2, 2015

Feb. 2, 2015

Module: wine Branch: master Commit: 2b97f8c1d195fdef9a76373b2821ac986662d54b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b97f8c1d195fdef9a76373b2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jan 29 16:48:41 2015 -0600 winemac: When Cocoa brings a window forward, tell Wine even if it's disabled or no-activate. We can't prevent Cocoa from bringing disabled/no-activate windows forward. So, we need to tell Wine about the z-order change. We still do avoid telling Wine to activate disabled/no-activate windows, though. --- dlls/winemac.drv/cocoa_app.m | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 7d61120..1196987 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1587,7 +1587,6 @@ int macdrv_err_on; BOOL broughtWindowForward = FALSE; if ([window isKindOfClass:[WineWindow class]] && - !window.disabled && !window.noActivate && type == NSLeftMouseDown && (([theEvent modifierFlags] & (NSShiftKeyMask | NSControlKeyMask| NSAlternateKeyMask | NSCommandKeyMask)) != NSCommandKeyMask)) { @@ -1693,7 +1692,7 @@ int macdrv_err_on; else if (broughtWindowForward) { [[window ancestorWineWindow] postBroughtForwardEvent]; - if (![window isKeyWindow]) + if (![window isKeyWindow] && !window.disabled && !window.noActivate) [self windowGotFocus:window]; } }

1 0

Piotr Caban : shell32: Pass trash path to TRASH_EnumItems.
by Alexandre Julliard Feb. 2, 2015

Feb. 2, 2015

Module: wine Branch: master Commit: 8aba9366edbafeada63105e000a101738338c91e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aba9366edbafeada63105e00… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 30 17:03:36 2015 +0100 shell32: Pass trash path to TRASH_EnumItems. --- dlls/shell32/recyclebin.c | 8 +++----- dlls/shell32/trash.c | 7 +++++-- dlls/shell32/xdg.h | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 7053998..28098af 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -423,7 +423,7 @@ static HRESULT WINAPI RecycleBin_EnumObjects(IShellFolder2 *iface, HWND hwnd, SH if (grfFlags & SHCONTF_NONFOLDERS) { - if (FAILED(ret = TRASH_EnumItems(&pidls, &pidls_count))) + if (FAILED(ret = TRASH_EnumItems(NULL, &pidls, &pidls_count))) goto failed; for (i=0; i<pidls_count; i++) if (!AddToEnumList(list, pidls[i])) @@ -863,9 +863,8 @@ HRESULT WINAPI SHQueryRecycleBinW(LPCWSTR pszRootPath, LPSHQUERYRBINFO pSHQueryR HRESULT hr; TRACE("(%s, %p)\n", debugstr_w(pszRootPath), pSHQueryRBInfo); - FIXME("Ignoring pszRootPath=%s\n",debugstr_w(pszRootPath)); - hr = TRASH_EnumItems(&apidl,&cidl); + hr = TRASH_EnumItems(pszRootPath, &apidl, &cidl); if (FAILED(hr)) return hr; pSHQueryRBInfo->i64NumItems = cidl; @@ -900,9 +899,8 @@ HRESULT WINAPI SHEmptyRecycleBinW(HWND hwnd, LPCWSTR pszRootPath, DWORD dwFlags) HRESULT ret; TRACE("(%p, %s, 0x%08x)\n", hwnd, debugstr_w(pszRootPath) , dwFlags); - FIXME("Ignoring pszRootPath=%s\n",debugstr_w(pszRootPath)); - ret = TRASH_EnumItems(&apidl,&cidl); + ret = TRASH_EnumItems(pszRootPath, &apidl, &cidl); if (FAILED(ret)) return ret; diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index 3ca6e4e..f178570 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -100,7 +100,7 @@ BOOL TRASH_TrashFile(LPCWSTR wszPath) return (status == noErr); } -HRESULT TRASH_EnumItems(LPITEMIDLIST **pidls, int *count) +HRESULT TRASH_EnumItems(const WCHAR *path, LPITEMIDLIST **pidls, int *count) { FIXME("stub!\n"); return E_NOTIMPL; @@ -577,12 +577,15 @@ failed: return NULL; } -HRESULT TRASH_EnumItems(LPITEMIDLIST **pidls, int *count) +HRESULT TRASH_EnumItems(const WCHAR *path, LPITEMIDLIST **pidls, int *count) { int ti_count; int pos=0, i; HRESULT err = E_OUTOFMEMORY; HDPA tinfs; + + if(path) + FIXME("Ignoring path = %s\n", debugstr_w(path)); if (!TRASH_EnsureInitialized()) return E_FAIL; tinfs = enum_bucket_trashinfos(home_trash, &ti_count); diff --git a/dlls/shell32/xdg.h b/dlls/shell32/xdg.h index 6236887..dc3acb0 100644 --- a/dlls/shell32/xdg.h +++ b/dlls/shell32/xdg.h @@ -40,7 +40,7 @@ void XDG_FreeParsedFile(XDG_PARSED_FILE *file) DECLSPEC_HIDDEN; BOOL TRASH_CanTrashFile(LPCWSTR wszPath) DECLSPEC_HIDDEN; BOOL TRASH_TrashFile(LPCWSTR wszPath) DECLSPEC_HIDDEN; HRESULT TRASH_UnpackItemID(LPCSHITEMID id, WIN32_FIND_DATAW *data) DECLSPEC_HIDDEN; -HRESULT TRASH_EnumItems(LPITEMIDLIST **pidls, int *count) DECLSPEC_HIDDEN; +HRESULT TRASH_EnumItems(const WCHAR *path, LPITEMIDLIST **pidls, int *count) DECLSPEC_HIDDEN; HRESULT TRASH_RestoreItem(LPCITEMIDLIST pidl) DECLSPEC_HIDDEN; HRESULT TRASH_EraseItem(LPCITEMIDLIST pidl) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : d2d1: Implement d2d_linear_gradient_brush_GetTransform().
by Alexandre Julliard Feb. 2, 2015

Feb. 2, 2015

Module: wine Branch: master Commit: bbba52dc345c5c0ef30e8769e111c1f40f6e712e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbba52dc345c5c0ef30e8769e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 29 10:27:21 2015 +0100 d2d1: Implement d2d_linear_gradient_brush_GetTransform(). --- dlls/d2d1/brush.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index ef70847..c1e2289 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -377,16 +377,11 @@ static float STDMETHODCALLTYPE d2d_linear_gradient_brush_GetOpacity(ID2D1LinearG static void STDMETHODCALLTYPE d2d_linear_gradient_brush_GetTransform(ID2D1LinearGradientBrush *iface, D2D1_MATRIX_3X2_F *transform) { - static const D2D1_MATRIX_3X2_F identity = - { - 1.0f, 0.0f, - 0.0f, 1.0f, - 0.0f, 0.0f, - }; + struct d2d_brush *brush = impl_from_ID2D1LinearGradientBrush(iface); - FIXME("iface %p, transform %p stub!\n", iface, transform); + TRACE("iface %p, transform %p.\n", iface, transform); - *transform = identity; + *transform = brush->transform; } static void STDMETHODCALLTYPE d2d_linear_gradient_brush_SetStartPoint(ID2D1LinearGradientBrush *iface,

1 0

Henri Verbeet : d2d1: Implement d2d_linear_gradient_brush_SetTransform().
by Alexandre Julliard Feb. 2, 2015

Feb. 2, 2015

Module: wine Branch: master Commit: ecca6269481fab554c39409512b75ca0713103e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecca6269481fab554c3940951… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 29 10:27:24 2015 +0100 d2d1: Implement d2d_linear_gradient_brush_SetTransform(). --- dlls/d2d1/brush.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 30112e8..477b111 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -359,7 +359,11 @@ static void STDMETHODCALLTYPE d2d_linear_gradient_brush_SetOpacity(ID2D1LinearGr static void STDMETHODCALLTYPE d2d_linear_gradient_brush_SetTransform(ID2D1LinearGradientBrush *iface, const D2D1_MATRIX_3X2_F *transform) { - FIXME("iface %p, transform %p stub!\n", iface, transform); + struct d2d_brush *brush = impl_from_ID2D1LinearGradientBrush(iface); + + TRACE("iface %p, transform %p.\n", iface, transform); + + brush->transform = *transform; } static float STDMETHODCALLTYPE d2d_linear_gradient_brush_GetOpacity(ID2D1LinearGradientBrush *iface)

1 0

Ken Thomases : winemac: Tell Wine that Cocoa brought a window forward even if a window is being dragged.
by Alexandre Julliard Feb. 2, 2015

Feb. 2, 2015

Module: wine Branch: master Commit: 8ec1b4f010952bfee423c66c9b6b5a7e248814d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ec1b4f010952bfee423c66c9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jan 29 16:49:30 2015 -0600 winemac: Tell Wine that Cocoa brought a window forward even if a window is being dragged. When a window is being dragged, we prevent delivery of clicks to Wine. We were also preventing telling Wine that a window had been brought forward, but this was incorrect. It prevented clicks in the title bar from activating the window. --- dlls/winemac.drv/cocoa_app.m | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 119de2a..5afb7f8 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1585,6 +1585,7 @@ int macdrv_err_on; WineWindow* window = (WineWindow*)[theEvent window]; NSEventType type = [theEvent type]; WineWindow* windowBroughtForward = nil; + BOOL process = FALSE; if ([window isKindOfClass:[WineWindow class]] && type == NSLeftMouseDown && @@ -1622,7 +1623,6 @@ int macdrv_err_on; { BOOL pressed = (type == NSLeftMouseDown || type == NSRightMouseDown || type == NSOtherMouseDown); CGPoint pt = CGEventGetLocation([theEvent CGEvent]); - BOOL process; if (clippingCursor) [self clipCursorLocation:&pt]; @@ -1689,12 +1689,13 @@ int macdrv_err_on; macdrv_release_event(event); } - else if (windowBroughtForward) - { - [[windowBroughtForward ancestorWineWindow] postBroughtForwardEvent]; - if (![windowBroughtForward isKeyWindow] && !windowBroughtForward.disabled && !windowBroughtForward.noActivate) - [self windowGotFocus:windowBroughtForward]; - } + } + + if (!process && windowBroughtForward) + { + [[windowBroughtForward ancestorWineWindow] postBroughtForwardEvent]; + if (![windowBroughtForward isKeyWindow] && !windowBroughtForward.disabled && !windowBroughtForward.noActivate) + [self windowGotFocus:windowBroughtForward]; } // Since mouse button events deliver absolute cursor position, the

1 0

Charles Davis : winemac.drv: Always initialize a closure-captured object pointer.
by Alexandre Julliard Feb. 2, 2015

Feb. 2, 2015

Module: wine Branch: master Commit: a872c21a48ddb6ba876eb906b65e6393c1be869d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a872c21a48ddb6ba876eb906b… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Jan 29 16:23:25 2015 -0700 winemac.drv: Always initialize a closure-captured object pointer. --- dlls/winemac.drv/cocoa_event.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index 757ad6b..c011f8d 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -470,7 +470,7 @@ 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; + dispatch_semaphore_t semaphore = NULL; __block BOOL finished; if (!queue)

1 0

Matteo Bruni : opengl32: Don' t use deprecated functions for extension checking purposes on core profile contexts.
by Alexandre Julliard Feb. 2, 2015

Feb. 2, 2015

Module: wine Branch: master Commit: 1e48bbb7acf3bfc43c5d041a2680d73aed9e40c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e48bbb7acf3bfc43c5d041a2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 29 18:45:00 2015 +0100 opengl32: Don't use deprecated functions for extension checking purposes on core profile contexts. --- dlls/opengl32/wgl.c | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 32d241c..cb91699 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -162,6 +162,12 @@ static void free_handle_ptr( struct wgl_handle *ptr ) LeaveCriticalSection( &wgl_section ); } +static inline enum wgl_handle_type get_current_context_type(void) +{ + if (!NtCurrentTeb()->glCurrentRC) return HANDLE_CONTEXT; + return (LOWORD(NtCurrentTeb()->glCurrentRC) & HANDLE_TYPE_MASK) >> 12; +} + /*********************************************************************** * wglCopyContext (OPENGL32.@) */ @@ -684,6 +690,30 @@ int WINAPI wglGetLayerPaletteEntries(HDC hdc, /* check if the extension is present in the list */ static BOOL has_extension( const char *list, const char *ext, size_t len ) { + if (!list) + { + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; + const char *gl_ext; + unsigned int i; + GLint extensions_count; + + if (!funcs->ext.p_glGetStringi) + { + void **func_ptr = (void **)&funcs->ext.p_glGetStringi; + + *func_ptr = funcs->wgl.p_wglGetProcAddress("glGetStringi"); + } + + glGetIntegerv(GL_NUM_EXTENSIONS, &extensions_count); + for (i = 0; i < extensions_count; ++i) + { + gl_ext = (const char *)funcs->ext.p_glGetStringi(GL_EXTENSIONS, i); + if (!strncmp(gl_ext, ext, len) && !gl_ext[len]) + return TRUE; + } + return FALSE; + } + while (list) { while (*list == ' ') list++; @@ -701,15 +731,21 @@ static int compar(const void *elt_a, const void *elt_b) { /* Check if a GL extension is supported */ static BOOL is_extension_supported(const char* extension) { + enum wgl_handle_type type = get_current_context_type(); const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; - const char *gl_ext_string = (const char*)glGetString(GL_EXTENSIONS); + const char *gl_ext_string = NULL; size_t len; TRACE("Checking for extension '%s'\n", extension); - if(!gl_ext_string) { - ERR("No OpenGL extensions found, check if your OpenGL setup is correct!\n"); - return FALSE; + if (type == HANDLE_CONTEXT) + { + gl_ext_string = (const char*)glGetString(GL_EXTENSIONS); + if (!gl_ext_string) + { + ERR("No OpenGL extensions found, check if your OpenGL setup is correct!\n"); + return FALSE; + } } /* We use the GetProcAddress function from the display driver to retrieve function pointers

1 0

Matteo Bruni : wined3d: Use the core version of the asynchronous queries functions.
by Alexandre Julliard Feb. 2, 2015

Feb. 2, 2015

Module: wine Branch: master Commit: 9defaa53a1052fcd9e0c75a50ecbfaafe6b08c87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9defaa53a1052fcd9e0c75a50… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 29 18:45:04 2015 +0100 wined3d: Use the core version of the asynchronous queries functions. --- dlls/wined3d/context.c | 16 ++++++++-------- dlls/wined3d/directx.c | 16 ++++++++++++++-- dlls/wined3d/query.c | 22 +++++++++++----------- 3 files changed, 33 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9defaa53a1052fcd9e0c7…

1 0

Henri Verbeet : d2d1: Implement d2d_bitmap_brush_SetTransform().
by Alexandre Julliard Feb. 2, 2015

Feb. 2, 2015

Module: wine Branch: master Commit: fce8603a39dcb5f2ee3bb99bf7920465a2457fc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fce8603a39dcb5f2ee3bb99bf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 29 10:27:23 2015 +0100 d2d1: Implement d2d_bitmap_brush_SetTransform(). --- dlls/d2d1/brush.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 9e3f643..30112e8 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -515,7 +515,11 @@ static void STDMETHODCALLTYPE d2d_bitmap_brush_SetOpacity(ID2D1BitmapBrush *ifac static void STDMETHODCALLTYPE d2d_bitmap_brush_SetTransform(ID2D1BitmapBrush *iface, const D2D1_MATRIX_3X2_F *transform) { - FIXME("iface %p, transform %p stub!\n", iface, transform); + struct d2d_brush *brush = impl_from_ID2D1BitmapBrush(iface); + + TRACE("iface %p, transform %p.\n", iface, transform); + + brush->transform = *transform; } static float STDMETHODCALLTYPE d2d_bitmap_brush_GetOpacity(ID2D1BitmapBrush *iface)

1 0