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

Ken Thomases : winemac: Call -removeFromSuperview on a view before adding it to a superview, on 10.9 and earlier.
by Alexandre Julliard 22 Jul '16

22 Jul '16

Module: wine Branch: master Commit: 887db3403e53a422ff6c0817b3aa6466ec3ab604 URL: http://source.winehq.org/git/wine.git/?a=commit;h=887db3403e53a422ff6c0817b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jul 22 01:25:06 2016 -0500 winemac: Call -removeFromSuperview on a view before adding it to a superview, on 10.9 and earlier. This works around a Cocoa bug that causes an exception and hang if the view is being re-ordered within its current superview (as opposed to being moved to a new superview). This reverts commit 9fbc364ea103239553701aa9a9932e3fdabcfff6 but adds some conditions around the call to avoid the flicker on platforms where it's unnecessary. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 808a7e7..c6e0709 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -3357,6 +3357,10 @@ void macdrv_set_view_superview(macdrv_view v, macdrv_view s, macdrv_window w, ma WineWindow* oldWindow = (WineWindow*)[view window]; WineWindow* newWindow = (WineWindow*)[superview window]; +#if !defined(MAC_OS_X_VERSION_10_10) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_10 + if (floor(NSAppKitVersionNumber) <= 1265 /*NSAppKitVersionNumber10_9*/) + [view removeFromSuperview]; +#endif if (prev) [superview addSubview:view positioned:NSWindowBelow relativeTo:prev]; else

1 0

Nikolay Sivov : comctl32/tooltips: Fix TTM_GETMARGIN/ TTM_SETMARGIN handling.
by Alexandre Julliard 22 Jul '16

22 Jul '16

Module: wine Branch: master Commit: 9618aae324032337098b259ddba939490c9de25f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9618aae324032337098b259dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 22 12:51:12 2016 +0300 comctl32/tooltips: Fix TTM_GETMARGIN/TTM_SETMARGIN handling. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/tooltips.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tooltips.c | 16 ++++++---------- 2 files changed, 44 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 422dd43..feb74ad 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -1010,6 +1010,43 @@ static void test_setinfo(void) DestroyWindow(parent2); } +static void test_margin(void) +{ + RECT r, r1; + HWND hwnd; + DWORD ret; + + hwnd = CreateWindowExA(0, TOOLTIPS_CLASSA, NULL, 0, + 10, 10, 300, 100, + NULL, NULL, NULL, 0); + ok(hwnd != NULL, "failed to create tooltip wnd\n"); + + ret = SendMessageA(hwnd, TTM_SETMARGIN, 0, 0); + ok(!ret, "got %d\n", ret); + + SetRect(&r, -1, -1, 1, 1); + ret = SendMessageA(hwnd, TTM_SETMARGIN, 0, (LPARAM)&r); + ok(!ret, "got %d\n", ret); + + SetRect(&r1, 0, 0, 0, 0); + ret = SendMessageA(hwnd, TTM_GETMARGIN, 0, (LPARAM)&r1); + ok(!ret, "got %d\n", ret); + ok(EqualRect(&r, &r1), "got %s, was %s\n", wine_dbgstr_rect(&r1), wine_dbgstr_rect(&r)); + + ret = SendMessageA(hwnd, TTM_SETMARGIN, 0, 0); + ok(!ret, "got %d\n", ret); + + SetRect(&r1, 0, 0, 0, 0); + ret = SendMessageA(hwnd, TTM_GETMARGIN, 0, (LPARAM)&r1); + ok(!ret, "got %d\n", ret); + ok(EqualRect(&r, &r1), "got %s, was %s\n", wine_dbgstr_rect(&r1), wine_dbgstr_rect(&r)); + + ret = SendMessageA(hwnd, TTM_GETMARGIN, 0, 0); + ok(!ret, "got %d\n", ret); + + DestroyWindow(hwnd); +} + START_TEST(tooltips) { InitCommonControls(); @@ -1022,4 +1059,5 @@ START_TEST(tooltips) test_longtextW(); test_track(); test_setinfo(); + test_margin(); } diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index eed113e..4944e3b 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1323,12 +1323,10 @@ TOOLTIPS_GetDelayTime (const TOOLTIPS_INFO *infoPtr, DWORD duration) static LRESULT -TOOLTIPS_GetMargin (const TOOLTIPS_INFO *infoPtr, LPRECT lpRect) +TOOLTIPS_GetMargin (const TOOLTIPS_INFO *infoPtr, RECT *rect) { - lpRect->left = infoPtr->rcMargin.left; - lpRect->right = infoPtr->rcMargin.right; - lpRect->bottom = infoPtr->rcMargin.bottom; - lpRect->top = infoPtr->rcMargin.top; + if (rect) + *rect = infoPtr->rcMargin; return 0; } @@ -1600,12 +1598,10 @@ TOOLTIPS_SetDelayTime (TOOLTIPS_INFO *infoPtr, DWORD duration, INT nTime) static LRESULT -TOOLTIPS_SetMargin (TOOLTIPS_INFO *infoPtr, const RECT *lpRect) +TOOLTIPS_SetMargin (TOOLTIPS_INFO *infoPtr, const RECT *rect) { - infoPtr->rcMargin.left = lpRect->left; - infoPtr->rcMargin.right = lpRect->right; - infoPtr->rcMargin.bottom = lpRect->bottom; - infoPtr->rcMargin.top = lpRect->top; + if (rect) + infoPtr->rcMargin = *rect; return 0; }

1 0

Andrey Gusev : hlink: Use debugstr_guid() in FIXME() message.
by Alexandre Julliard 22 Jul '16

22 Jul '16

Module: wine Branch: master Commit: cb901b5fe50c4478d55fb6eb0ca48cb6b47cd85a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb901b5fe50c4478d55fb6eb0… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jul 22 12:56:48 2016 +0300 hlink: Use debugstr_guid() in FIXME() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/hlink_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index 1cfa6a6..dc965c2 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -226,8 +226,8 @@ HRESULT WINAPI HlinkCreateFromData(IDataObject *piDataObj, IHlinkSite *pihlsite, DWORD dwSiteData, IUnknown *piunkOuter, REFIID riid, void **ppvObj) { - FIXME("%p %p %d %p %p %p\n", - piDataObj, pihlsite, dwSiteData, piunkOuter, riid, ppvObj); + FIXME("%p, %p, %d, %p, %s, %p\n", piDataObj, pihlsite, dwSiteData, + piunkOuter, debugstr_guid(riid), ppvObj); *ppvObj = NULL; return E_NOTIMPL; }

1 0

Andrey Gusev : ole32: Use debugstr_guid() in TRACE() messages.
by Alexandre Julliard 22 Jul '16

22 Jul '16

Module: wine Branch: master Commit: 3db78a2bb726492fda9f84b77771724106780e78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3db78a2bb726492fda9f84b77… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jul 22 13:01:59 2016 +0300 ole32: Use debugstr_guid() in TRACE() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/classmoniker.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index 1bcf58f..877c3ec 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -231,7 +231,7 @@ static HRESULT WINAPI ClassMoniker_BindToObject(IMoniker* iface, IClassActivator *pActivator; HRESULT hr; - TRACE("(%p,%p,%p,%p)\n", pbc, pmkToLeft, riid, ppvResult); + TRACE("(%p, %p, %s, %p)\n", pbc, pmkToLeft, debugstr_guid(riid), ppvResult); bindopts.cbStruct = sizeof(bindopts); IBindCtx_GetBindOptions(pbc, (BIND_OPTS *)&bindopts); @@ -264,7 +264,7 @@ static HRESULT WINAPI ClassMoniker_BindToStorage(IMoniker* iface, REFIID riid, VOID** ppvResult) { - TRACE("(%p,%p,%p,%p)\n",pbc, pmkToLeft, riid, ppvResult); + TRACE("(%p, %p, %s, %p)\n", pbc, pmkToLeft, debugstr_guid(riid), ppvResult); return IMoniker_BindToObject(iface, pbc, pmkToLeft, riid, ppvResult); } @@ -586,7 +586,7 @@ static HRESULT WINAPI ClassMonikerROTData_QueryInterface(IROTData *iface,REFIID ClassMoniker *This = impl_from_IROTData(iface); - TRACE("(%p,%p,%p)\n",iface,riid,ppvObject); + TRACE("(%p, %s, %p)\n", iface, debugstr_guid(riid), ppvObject); return IMoniker_QueryInterface(&This->IMoniker_iface, riid, ppvObject); }

1 0

Andrey Gusev : shell32: Use debugstr_guid() and debugstr_w() in TRACE() messages.
by Alexandre Julliard 22 Jul '16

22 Jul '16

Module: wine Branch: master Commit: 954560f8479fc0c7f7357e4d105d29431d0447d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=954560f8479fc0c7f7357e4d1… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jul 22 13:11:09 2016 +0300 shell32: Use debugstr_guid() and debugstr_w() in TRACE() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/folders.c | 3 ++- dlls/shell32/shellitem.c | 2 +- dlls/shell32/shfldr_unixfs.c | 10 +++++----- dlls/shell32/shlview.c | 9 +++++---- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index 34e5142..cf26caf 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -198,7 +198,8 @@ static HRESULT WINAPI IExtractIconW_fnGetIconLocation(IExtractIconW * iface, UIN GUID const * riid; LPITEMIDLIST pSimplePidl = ILFindLastID(This->pidl); - TRACE("(%p) (flags=%u %p %u %p %p)\n", This, uFlags, szIconFile, cchMax, piIndex, pwFlags); + TRACE("(%p) (flags=%u, %s, %u, %p, %p)\n", This, uFlags, debugstr_w(szIconFile), + cchMax, piIndex, pwFlags); if (pwFlags) *pwFlags = 0; diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index d688f17..b0af6d6 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -61,7 +61,7 @@ static HRESULT WINAPI ShellItem_QueryInterface(IShellItem2 *iface, REFIID riid, { ShellItem *This = impl_from_IShellItem2(iface); - TRACE("(%p,%p,%p)\n", iface, riid, ppv); + TRACE("(%p, %s, %p)\n", iface, debugstr_guid(riid), ppv); if (!ppv) return E_INVALIDARG; diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 884fc0a..9df761f 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -2338,22 +2338,22 @@ static HRESULT CreateUnixFolder(IUnknown *outer, REFIID riid, void **ppv, const } HRESULT WINAPI UnixFolder_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv) { - TRACE("(pUnkOuter=%p, riid=%p, ppv=%p)\n", pUnkOuter, riid, ppv); + TRACE("(pUnkOuter=%p, riid=%s, ppv=%p)\n", pUnkOuter, debugstr_guid(riid), ppv); return CreateUnixFolder(pUnkOuter, riid, ppv, &CLSID_UnixFolder); } HRESULT WINAPI UnixDosFolder_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv) { - TRACE("(pUnkOuter=%p, riid=%p, ppv=%p)\n", pUnkOuter, riid, ppv); + TRACE("(pUnkOuter=%p, riid=%s, ppv=%p)\n", pUnkOuter, debugstr_guid(riid), ppv); return CreateUnixFolder(pUnkOuter, riid, ppv, &CLSID_UnixDosFolder); } HRESULT WINAPI FolderShortcut_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv) { - TRACE("(pUnkOuter=%p, riid=%p, ppv=%p)\n", pUnkOuter, riid, ppv); + TRACE("(pUnkOuter=%p, riid=%s, ppv=%p)\n", pUnkOuter, debugstr_guid(riid), ppv); return CreateUnixFolder(pUnkOuter, riid, ppv, &CLSID_FolderShortcut); } HRESULT WINAPI MyDocuments_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv) { - TRACE("(pUnkOuter=%p, riid=%p, ppv=%p)\n", pUnkOuter, riid, ppv); + TRACE("(pUnkOuter=%p, riid=%s, ppv=%p)\n", pUnkOuter, debugstr_guid(riid), ppv); return CreateUnixFolder(pUnkOuter, riid, ppv, &CLSID_MyDocuments); } @@ -2390,7 +2390,7 @@ static void UnixSubFolderIterator_Destroy(UnixSubFolderIterator *iterator) { static HRESULT WINAPI UnixSubFolderIterator_IEnumIDList_QueryInterface(IEnumIDList* iface, REFIID riid, void** ppv) { - TRACE("(iface=%p, riid=%p, ppv=%p)\n", iface, riid, ppv); + TRACE("(iface=%p, riid=%s, ppv=%p)\n", iface, debugstr_guid(riid), ppv); if (!ppv) return E_INVALIDARG; diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index b763468..5990982 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -3502,8 +3502,8 @@ static HRESULT WINAPI shellfolderviewdual_GetIDsOfNames( ITypeInfo *ti; HRESULT hr; - TRACE("(%p,%p,%p,%u,%d,%p)\n", This, riid, rgszNames, cNames, lcid, - rgDispId); + TRACE("(%p, %s, %p, %u, %d, %p)\n", This, debugstr_guid(riid), rgszNames, + cNames, lcid, rgDispId); hr = get_typeinfo(IShellFolderViewDual3_tid, &ti); if (SUCCEEDED(hr)) @@ -3520,8 +3520,9 @@ static HRESULT WINAPI shellfolderviewdual_Invoke(IShellFolderViewDual3 *iface, ITypeInfo *ti; HRESULT hr; - TRACE("(%p,%d,%p,%d,%u,%p,%p,%p,%p)\n", This, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + TRACE("(%p, %d, %s, %d, %u, %p, %p, %p, %p)\n", This, dispIdMember, + debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, + pExcepInfo, puArgErr); hr = get_typeinfo(IShellFolderViewDual3_tid, &ti); if (SUCCEEDED(hr))

1 0

Alexandre Julliard : Release 1.9.15.
by Alexandre Julliard 22 Jul '16

22 Jul '16

Module: wine Branch: master Commit: 267e8e3eeb6d0b6e8ccab809fddd27bae05cbfc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=267e8e3eeb6d0b6e8ccab809f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 22 23:16:00 2016 +0900 Release 1.9.15. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 693 ++++++++++++++++++++++++++++++-------------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 344 insertions(+), 372 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=267e8e3eeb6d0b6e8ccab…

1 0

Tag wine-1.9.15 : Alexandre Julliard : Release 1.9.15
by Alexandre Julliard 22 Jul '16

22 Jul '16

Module: wine Branch: refs/tags/wine-1.9.15 Tag: ae8cea329186309d2201173748c0740ff9e90820 URL: http://source.winehq.org/git/wine.git/?a=tag;h=ae8cea329186309d2201173748c0… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 22 23:16:00 2016 +0900 Release 1.9.15

1 0

Henri Verbeet : wined3d: Fail event query creation when event queries are not supported.
by Alexandre Julliard 21 Jul '16

21 Jul '16

Module: wine Branch: master Commit: d18ff87af9ef38b1fe10f0be6d04899da22ddfc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d18ff87af9ef38b1fe10f0be6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 21 15:57:59 2016 +0200 wined3d: Fail event query creation when event queries are not supported. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index c09fe86..0683731 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -732,11 +732,8 @@ static HRESULT query_init(struct wined3d_query *query, struct wined3d_device *de TRACE("Event query.\n"); if (!wined3d_event_query_supported(gl_info)) { - /* Half-Life 2 needs this query. It does not render the main - * menu correctly otherwise. Pretend to support it, faking - * this query does not do much harm except potentially - * lowering performance. */ - FIXME("Event query: Unimplemented, but pretending to be supported.\n"); + WARN("Event queries not supported.\n"); + return WINED3DERR_NOTAVAILABLE; } query->query_ops = &event_query_ops; query->data_size = sizeof(BOOL);

1 0

Henri Verbeet : wined3d: Get rid of redundant ARB_occlusion_query checks.
by Alexandre Julliard 21 Jul '16

21 Jul '16

Module: wine Branch: master Commit: a02c7ce7518b19d401ae854f18d2401a489f60db URL: http://source.winehq.org/git/wine.git/?a=commit;h=a02c7ce7518b19d401ae854f1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 21 15:58:00 2016 +0200 wined3d: Get rid of redundant ARB_occlusion_query checks. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 105 ++++++++++++++++++++++----------------------------- 1 file changed, 45 insertions(+), 60 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 0683731..369951d 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -337,14 +337,6 @@ static HRESULT wined3d_occlusion_query_ops_get_data(struct wined3d_query *query, return S_FALSE; } - if (!gl_info->supported[ARB_OCCLUSION_QUERY]) - { - WARN("%p Occlusion queries not supported. Returning 1.\n", query); - samples = 1; - fill_query_data(data, size, &samples, sizeof(samples)); - return S_OK; - } - if (oq->context->tid != GetCurrentThreadId()) { FIXME("%p Wrong thread, returning 1.\n", query); @@ -461,77 +453,70 @@ static HRESULT wined3d_event_query_ops_issue(struct wined3d_query *query, DWORD static HRESULT wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD flags) { + struct wined3d_occlusion_query *oq = query->extendedData; struct wined3d_device *device = query->device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + struct wined3d_context *context; TRACE("query %p, flags %#x.\n", query, flags); - if (gl_info->supported[ARB_OCCLUSION_QUERY]) + /* This is allowed according to MSDN and our tests. Reset the query and + * restart. */ + if (flags & WINED3DISSUE_BEGIN) { - struct wined3d_occlusion_query *oq = query->extendedData; - struct wined3d_context *context; - - /* This is allowed according to msdn and our tests. Reset the query and restart */ - if (flags & WINED3DISSUE_BEGIN) + if (query->state == QUERY_BUILDING) { - if (query->state == QUERY_BUILDING) + if (oq->context->tid != GetCurrentThreadId()) { - if (oq->context->tid != GetCurrentThreadId()) - { - FIXME("Wrong thread, can't restart query.\n"); - - context_free_occlusion_query(oq); - context = context_acquire(query->device, NULL); - context_alloc_occlusion_query(context, oq); - } - else - { - context = context_acquire(device, context_get_rt_surface(oq->context)); - - GL_EXTCALL(glEndQuery(GL_SAMPLES_PASSED)); - checkGLcall("glEndQuery()"); - } + FIXME("Wrong thread, can't restart query.\n"); + + context_free_occlusion_query(oq); + context = context_acquire(query->device, NULL); + context_alloc_occlusion_query(context, oq); } else { - if (oq->context) context_free_occlusion_query(oq); - context = context_acquire(query->device, NULL); - context_alloc_occlusion_query(context, oq); + context = context_acquire(device, context_get_rt_surface(oq->context)); + + GL_EXTCALL(glEndQuery(GL_SAMPLES_PASSED)); + checkGLcall("glEndQuery()"); } + } + else + { + if (oq->context) + context_free_occlusion_query(oq); + context = context_acquire(query->device, NULL); + context_alloc_occlusion_query(context, oq); + } - GL_EXTCALL(glBeginQuery(GL_SAMPLES_PASSED, oq->id)); - checkGLcall("glBeginQuery()"); + GL_EXTCALL(glBeginQuery(GL_SAMPLES_PASSED, oq->id)); + checkGLcall("glBeginQuery()"); - context_release(context); - } - if (flags & WINED3DISSUE_END) + context_release(context); + } + if (flags & WINED3DISSUE_END) + { + /* MSDN says END on a non-building occlusion query returns an error, + * but our tests show that it returns OK. But OpenGL doesn't like it, + * so avoid generating an error. */ + if (query->state == QUERY_BUILDING) { - /* Msdn says _END on a non-building occlusion query returns an error, but - * our tests show that it returns OK. But OpenGL doesn't like it, so avoid - * generating an error - */ - if (query->state == QUERY_BUILDING) + if (oq->context->tid != GetCurrentThreadId()) + { + FIXME("Wrong thread, can't end query.\n"); + } + else { - if (oq->context->tid != GetCurrentThreadId()) - { - FIXME("Wrong thread, can't end query.\n"); - } - else - { - context = context_acquire(device, context_get_rt_surface(oq->context)); - - GL_EXTCALL(glEndQuery(GL_SAMPLES_PASSED)); - checkGLcall("glEndQuery()"); - - context_release(context); - } + context = context_acquire(device, context_get_rt_surface(oq->context)); + + GL_EXTCALL(glEndQuery(GL_SAMPLES_PASSED)); + checkGLcall("glEndQuery()"); + + context_release(context); } } } - else - { - FIXME("%p Occlusion queries not supported.\n", query); - } if (flags & WINED3DISSUE_BEGIN) query->state = QUERY_BUILDING;

1 0

Nikolay Sivov : msscript: Added IServiceProvider stub.
by Alexandre Julliard 21 Jul '16

21 Jul '16

Module: wine Branch: master Commit: f2a8b5d2abc7c5020c72b08d3d469d88ec1ec32a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2a8b5d2abc7c5020c72b08d3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 20 22:31:17 2016 +0300 msscript: Added IServiceProvider stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 46 ++++++++++++++++++++++++++++++++++++++ dlls/msscript.ocx/tests/msscript.c | 4 +--- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 3b097af..3fcbb42 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -57,6 +57,7 @@ struct ConnectionPoint { typedef struct ScriptHost { IActiveScriptSite IActiveScriptSite_iface; + IServiceProvider IServiceProvider_iface; LONG ref; IActiveScript *script; @@ -221,6 +222,11 @@ static inline ScriptHost *impl_from_IActiveScriptSite(IActiveScriptSite *iface) return CONTAINING_RECORD(iface, ScriptHost, IActiveScriptSite_iface); } +static inline ScriptHost *impl_from_IServiceProvider(IServiceProvider *iface) +{ + return CONTAINING_RECORD(iface, ScriptHost, IServiceProvider_iface); +} + /* IActiveScriptSite */ static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, REFIID riid, void **ppv) { @@ -232,6 +238,9 @@ static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, }else if(IsEqualGUID(&IID_IActiveScriptSite, riid)) { TRACE("(%p)->(IID_IActiveScriptSite %p)\n", This, ppv); *ppv = &This->IActiveScriptSite_iface; + }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { + TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); + *ppv = &This->IServiceProvider_iface; }else { FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -370,6 +379,42 @@ static const IActiveScriptSiteVtbl ActiveScriptSiteVtbl = { ActiveScriptSite_OnLeaveScript }; +/* IServiceProvider */ +static HRESULT WINAPI ServiceProvider_QueryInterface(IServiceProvider *iface, REFIID riid, void **obj) +{ + ScriptHost *This = impl_from_IServiceProvider(iface); + return IActiveScriptSite_QueryInterface(&This->IActiveScriptSite_iface, riid, obj); +} + +static ULONG WINAPI ServiceProvider_AddRef(IServiceProvider *iface) +{ + ScriptHost *This = impl_from_IServiceProvider(iface); + return IActiveScriptSite_AddRef(&This->IActiveScriptSite_iface); +} + +static ULONG WINAPI ServiceProvider_Release(IServiceProvider *iface) +{ + ScriptHost *This = impl_from_IServiceProvider(iface); + return IActiveScriptSite_Release(&This->IActiveScriptSite_iface); +} + +static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFGUID service, + REFIID riid, void **obj) +{ + ScriptHost *This = impl_from_IServiceProvider(iface); + + FIXME("(%p)->(%s %s %p)\n", This, debugstr_guid(service), debugstr_guid(riid), obj); + + return E_NOTIMPL; +} + +static const IServiceProviderVtbl ServiceProviderVtbl = { + ServiceProvider_QueryInterface, + ServiceProvider_AddRef, + ServiceProvider_Release, + ServiceProvider_QueryService +}; + static HRESULT init_script_host(const CLSID *clsid, ScriptHost **ret) { IObjectSafety *objsafety; @@ -383,6 +428,7 @@ static HRESULT init_script_host(const CLSID *clsid, ScriptHost **ret) return E_OUTOFMEMORY; host->IActiveScriptSite_iface.lpVtbl = &ActiveScriptSiteVtbl; + host->IServiceProvider_iface.lpVtbl = &ServiceProviderVtbl; host->ref = 1; host->script = NULL; host->parse = NULL; diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index a211fe3..1ef7e9f 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -273,10 +273,8 @@ static HRESULT WINAPI ActiveScript_SetScriptSite(IActiveScript *iface, IActiveSc ok(hres == E_NOINTERFACE, "Could not get IID_ICanHandleException interface: %08x\n", hres); hres = IActiveScriptSite_QueryInterface(pass, &IID_IServiceProvider, (void**)&service); -todo_wine ok(hres == S_OK, "Could not get IServiceProvider interface: %08x\n", hres); - if(SUCCEEDED(hres)) - IServiceProvider_Release(service); + IServiceProvider_Release(service); site = pass; IActiveScriptSite_AddRef(site);

1 0