January 2018 - Wine-Commits

Józef Kucia : dxgi: Allow wrapping factory objects.
by Alexandre Julliard Jan. 29, 2018

Jan. 29, 2018

Module: wine Branch: master Commit: c1f5d396040e30934a6bf0a42f2149195330ff6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1f5d396040e30934a6bf0a4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 26 22:09:05 2018 +0100 dxgi: Allow wrapping factory objects. 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/d3d11_private.h | 2 +- dlls/dxgi/factory.c | 18 +++++++++++++++--- include/wine/winedxgi.idl | 11 ++++++++++- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 9089398..c286e76 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -29,7 +29,7 @@ #include "winuser.h" #include "objbase.h" -#include "d3d11_1.h" +#include "d3d11_4.h" #ifdef D3D11_INIT_GUID #include "initguid.h" #endif diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 8d24078..3f8816b 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -35,7 +35,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_QueryInterface(IDXGIFactory4 *ifac TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); - if (IsEqualGUID(iid, &IID_IDXGIFactory4) + if (IsEqualGUID(iid, &IID_IWineDXGIFactory) + || IsEqualGUID(iid, &IID_IDXGIFactory4) || IsEqualGUID(iid, &IID_IDXGIFactory3) || IsEqualGUID(iid, &IID_IDXGIFactory2) || (factory->extended && IsEqualGUID(iid, &IID_IDXGIFactory1)) @@ -504,10 +505,21 @@ static const struct IDXGIFactory4Vtbl dxgi_factory_vtbl = struct dxgi_factory *unsafe_impl_from_IDXGIFactory4(IDXGIFactory4 *iface) { + IWineDXGIFactory *wine_factory; + struct dxgi_factory *factory; + HRESULT hr; + if (!iface) return NULL; - assert(iface->lpVtbl == &dxgi_factory_vtbl); - return CONTAINING_RECORD(iface, struct dxgi_factory, IDXGIFactory4_iface); + if (FAILED(hr = IDXGIFactory4_QueryInterface(iface, &IID_IWineDXGIFactory, (void **)&wine_factory))) + { + ERR("Failed to get IWineDXGIFactory interface, hr %#x.\n", hr); + return NULL; + } + assert(wine_factory->lpVtbl == (void *)&dxgi_factory_vtbl); + factory = CONTAINING_RECORD(wine_factory, struct dxgi_factory, IDXGIFactory4_iface); + IWineDXGIFactory_Release(wine_factory); + return factory; } static HRESULT dxgi_factory_init(struct dxgi_factory *factory, BOOL extended) diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index 983cdba..c3564d5 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -18,7 +18,7 @@ #pragma makedep header -import "dxgi.idl"; +import "dxgi1_5.idl"; [ object, @@ -59,3 +59,12 @@ interface IWineDXGIDeviceParent : IUnknown interface IWineDXGIAdapter : IDXGIAdapter1 { } + +[ + object, + local, + uuid(ea02a0d1-4c95-488a-a82c-6034621e8c4f) +] +interface IWineDXGIFactory : IDXGIFactory4 +{ +}

1 0

Mark Jansen : shobjidl.idl: Fix some typo's.
by Alexandre Julliard Jan. 29, 2018

Jan. 29, 2018

Module: wine Branch: master Commit: 61b89d2c84a097132b5db2a5a6363ae555fd2be5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61b89d2c84a097132b5db2a5… Author: Mark Jansen <mark.jansen(a)reactos.org> Date: Thu Jan 4 21:14:45 2018 +0100 shobjidl.idl: Fix some typo's. Signed-off-by: Mark Jansen <mark.jansen(a)reactos.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/ebrowser.c | 6 +++--- include/shobjidl.idl | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index 45c62c8..0a6010d 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -1677,14 +1677,14 @@ static HRESULT WINAPI ICommDlgBrowser3_fnGetCurrentFilter(ICommDlgBrowser3 *ifac return S_OK; } -static HRESULT WINAPI ICommDlgBrowser3_fnOnPreviewCreated(ICommDlgBrowser3 *iface, +static HRESULT WINAPI ICommDlgBrowser3_fnOnPreViewCreated(ICommDlgBrowser3 *iface, IShellView *pshv) { ExplorerBrowserImpl *This = impl_from_ICommDlgBrowser3(iface); TRACE("%p (%p)\n", This, pshv); if(This->pcdb3_site) - return ICommDlgBrowser3_OnPreviewCreated(This->pcdb3_site, pshv); + return ICommDlgBrowser3_OnPreViewCreated(This->pcdb3_site, pshv); return S_OK; } @@ -1701,7 +1701,7 @@ static const ICommDlgBrowser3Vtbl vt_ICommDlgBrowser3 = { ICommDlgBrowser3_fnGetViewFlags, ICommDlgBrowser3_fnOnColumnClicked, ICommDlgBrowser3_fnGetCurrentFilter, - ICommDlgBrowser3_fnOnPreviewCreated + ICommDlgBrowser3_fnOnPreViewCreated }; /************************************************************************** diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 141ac78..5e4da5d 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -1489,7 +1489,7 @@ interface ICommDlgBrowser3 : ICommDlgBrowser2 [out, string, size_is(cchFileSpec)] LPWSTR pszFileSpec, [in] int cchFileSpec); - HRESULT OnPreviewCreated( + HRESULT OnPreViewCreated( [in] IShellView *ppshv); } @@ -1900,7 +1900,7 @@ interface ISearchContext : IUnknown HRESULT GetSearchText( [in] BSTR *pbstrSearchText); HRESULT GetSearchStyle( - [in] BSTR *pdwSearchStyle); + [in] DWORD *pdwSearchStyle); } @@ -2695,6 +2695,7 @@ interface INameSpaceTreeControlCustomDraw : IUnknown HRESULT ItemPrePaint( [in] HDC hdc, [in] RECT *prc, + [in] NSTCCUSTOMDRAW *pnstccdItem, [in, out] COLORREF *pclrText, [in, out] COLORREF *pclrTextBk, [out] LRESULT *plres); @@ -3239,7 +3240,7 @@ interface IFileDialogControlEvents : IUnknown HRESULT OnCheckButtonToggled( [in] IFileDialogCustomize *pfdc, - [in] BOOL dwIDCtl, + [in] DWORD dwIDCtl, [in] BOOL bChecked); HRESULT OnControlActivating( @@ -3557,7 +3558,7 @@ interface ITransferAdviseSink : IUnknown HRESULT ConfirmOverwrite([in] IShellItem *source, [in] IShellItem *dest_parent, [in, string] LPCWSTR name); - HRESULT ConfirmEncryptLoss([in] IShellItem *source); + HRESULT ConfirmEncryptionLoss([in] IShellItem *source); HRESULT FileFailure([in] IShellItem *item, [in, unique, string] LPCWSTR itemname, [in] HRESULT hr,

1 0

Nikolay Sivov : comctl32/tests: Enable more ListView tests.
by Alexandre Julliard Jan. 29, 2018

Jan. 29, 2018

Module: wine Branch: master Commit: 10b91000dd429dc07cc71c30185641c66a8e0aa0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10b91000dd429dc07cc71c30… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 29 14:20:37 2018 +0300 comctl32/tests: Enable more ListView tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 165 ++++++++++++++++++++++------------------- 1 file changed, 90 insertions(+), 75 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=10b91000dd429dc07cc7…

1 0

Nikolay Sivov : comctl32/tests: Add more tests for tab focus.
by Alexandre Julliard Jan. 29, 2018

Jan. 29, 2018

Module: wine Branch: master Commit: 72186db5fe5ac509d5404b73a5c6590d6fbbca00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72186db5fe5ac509d5404b73… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 29 14:20:40 2018 +0300 comctl32/tests: Add more tests for tab focus. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/tab.c | 70 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 57 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index a54dbb5..d3e0e0c 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -215,6 +215,11 @@ static const struct message selchange_parent_seq[] = { { 0 } }; +static const struct message setfocus_parent_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, TCN_FOCUSCHANGE }, + { 0 } +}; + static HWND create_tabcontrol (DWORD style, DWORD mask) { @@ -593,7 +598,7 @@ static void test_width(void) static void test_curfocus(void) { const INT nTabs = 5; - INT focusIndex; + INT ret; HWND hTab; hTab = createFilledTabControl(parent_wnd, TCS_FIXEDWIDTH, TCIF_TEXT|TCIF_IMAGE, nTabs); @@ -602,24 +607,63 @@ static void test_curfocus(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); /* Testing CurFocus with largest appropriate value */ - SendMessageA(hTab, TCM_SETCURFOCUS, nTabs - 1, 0); - focusIndex = SendMessageA(hTab, TCM_GETCURFOCUS, 0, 0); - expect(nTabs-1, focusIndex); + ret = SendMessageA(hTab, TCM_SETCURFOCUS, nTabs - 1, 0); + ok(ret == 0, "Unexpected ret value %d.\n", ret); + ret = SendMessageA(hTab, TCM_GETCURFOCUS, 0, 0); + ok(ret == nTabs - 1, "Unexpected focus index %d.\n", ret); /* Testing CurFocus with negative value */ - SendMessageA(hTab, TCM_SETCURFOCUS, -10, 0); - focusIndex = SendMessageA(hTab, TCM_GETCURFOCUS, 0, 0); - expect(-1, focusIndex); + ret = SendMessageA(hTab, TCM_SETCURFOCUS, -10, 0); + ok(ret == 0, "Unexpected ret value %d.\n", ret); + ret = SendMessageA(hTab, TCM_GETCURFOCUS, 0, 0); + ok(ret == -1, "Unexpected focus index %d.\n", ret); /* Testing CurFocus with value larger than number of tabs */ - focusIndex = SendMessageA(hTab, TCM_SETCURSEL, 1, 0); - expect(-1, focusIndex); + ret = SendMessageA(hTab, TCM_SETCURSEL, 1, 0); + ok(ret == -1, "Unexpected focus index %d.\n", ret); - SendMessageA(hTab, TCM_SETCURFOCUS, nTabs + 1, 0); - focusIndex = SendMessageA(hTab, TCM_GETCURFOCUS, 0, 0); - expect(1, focusIndex); + ret = SendMessageA(hTab, TCM_SETCURFOCUS, nTabs + 1, 0); + ok(ret == 0, "Unexpected ret value %d.\n", ret); + ret = SendMessageA(hTab, TCM_GETCURFOCUS, 0, 0); + ok(ret == 1, "Unexpected focus index %d.\n", ret); + + ok_sequence(sequences, TAB_SEQ_INDEX, getset_cur_focus_seq, "Set focused tab sequence", FALSE); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_sequence, "Set focused tab parent sequence", TRUE); + + DestroyWindow(hTab); + + /* TCS_BUTTONS */ + hTab = createFilledTabControl(parent_wnd, TCS_BUTTONS, TCIF_TEXT|TCIF_IMAGE, nTabs); + ok(hTab != NULL, "Failed to create tab control\n"); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + /* Testing CurFocus with largest appropriate value */ + ret = SendMessageA(hTab, TCM_SETCURFOCUS, nTabs - 1, 0); + ok(ret == 0, "Unexpected ret value %d.\n", ret); + ret = SendMessageA(hTab, TCM_GETCURFOCUS, 0, 0); + ok(ret == nTabs - 1, "Unexpected focus index %d.\n", ret); + + /* Testing CurFocus with negative value */ + ret = SendMessageA(hTab, TCM_SETCURFOCUS, -10, 0); + ok(ret == 0, "Unexpected ret value %d.\n", ret); + ret = SendMessageA(hTab, TCM_GETCURFOCUS, 0, 0); +todo_wine + ok(ret == nTabs - 1, "Unexpected focus index %d.\n", ret); + + /* Testing CurFocus with value larger than number of tabs */ + ret = SendMessageA(hTab, TCM_SETCURSEL, 1, 0); +todo_wine + ok(ret == 0, "Unexpected focus index %d.\n", ret); + + ret = SendMessageA(hTab, TCM_SETCURFOCUS, nTabs + 1, 0); + ok(ret == 0, "Unexpected ret value %d.\n", ret); + ret = SendMessageA(hTab, TCM_GETCURFOCUS, 0, 0); +todo_wine + ok(ret == nTabs - 1, "Unexpected focus index %d.\n", ret); - ok_sequence(sequences, TAB_SEQ_INDEX, getset_cur_focus_seq, "Getset curFoc test sequence", FALSE); + ok_sequence(sequences, TAB_SEQ_INDEX, getset_cur_focus_seq, "TCS_BUTTONS: set focused tab sequence", FALSE); + ok_sequence(sequences, PARENT_SEQ_INDEX, setfocus_parent_seq, "TCS_BUTTONS: set focused tab parent sequence", TRUE); DestroyWindow(hTab); }

1 0

Nikolay Sivov : comctl32/tests: Run DPA tests on version 6.
by Alexandre Julliard Jan. 29, 2018

Jan. 29, 2018

Module: wine Branch: master Commit: d01306d1ee85b978afffe45879933af5aa122e09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d01306d1ee85b978afffe458… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 29 14:20:42 2018 +0300 comctl32/tests: Run DPA tests on version 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/dpa.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index c795c14..39f6b46 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -30,6 +30,7 @@ #include "objidl.h" #include "wine/test.h" +#include "v6util.h" #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) @@ -737,6 +738,9 @@ if (0) { START_TEST(dpa) { + ULONG_PTR cookie; + HANDLE ctxt; + init_functions(); test_dpa(); @@ -745,4 +749,18 @@ START_TEST(dpa) test_DPA_DestroyCallback(); test_DPA_LoadStream(); test_DPA_SaveStream(); + + if (!load_v6_module(&cookie, &ctxt)) + return; + + init_functions(); + + test_dpa(); + test_DPA_Merge(); + test_DPA_EnumCallback(); + test_DPA_DestroyCallback(); + test_DPA_LoadStream(); + test_DPA_SaveStream(); + + unload_v6_module(cookie, ctxt); }

1 0

Zebediah Figura : hlink: Directly check for S_OK from IHlinkBrowseContext_GetObject().
by Alexandre Julliard Jan. 29, 2018

Jan. 29, 2018

Module: wine Branch: master Commit: 13e06719591bad61d23d496f87f4b82122bd6529 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13e06719591bad61d23d496f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 27 15:30:32 2018 -0600 hlink: Directly check for S_OK from IHlinkBrowseContext_GetObject(). Fixes a regression introduced by 00aca1476efd573cbf9d31a45c3d484f6fa6055b Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/link.c | 2 +- dlls/hlink/tests/hlink.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index 983765c..25ee45d 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -493,7 +493,7 @@ static HRESULT WINAPI IHlink_fnNavigate(IHlink* iface, DWORD grfHLNF, LPBC pbc, if (phbc) { r = IHlinkBrowseContext_GetObject(phbc, mon, TRUE, &unk); - if (r == S_FALSE) + if (r != S_OK) { CreateBindCtx(0, &bcxt); RegisterBindStatusCallback(bcxt, pbsc, NULL, 0); diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index e40807c..3525c44 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -891,7 +891,7 @@ static HRESULT WINAPI HlinkBrowseContext_GetObject(IHlinkBrowseContext *iface, ok(fBindIfRootRegistered == 1, "fBindIfRootRegistered = %x\n", fBindIfRootRegistered); *ppiunk = HBC_object; - return HBC_object ? S_OK : S_FALSE; + return HBC_object ? S_OK : 0xdeadbeef; } static HRESULT WINAPI HlinkBrowseContext_Revoke(IHlinkBrowseContext *iface, DWORD dwRegister)

1 0

Henri Verbeet : wined3d: Use the resource access flags in arbfp_blit_supported().
by Alexandre Julliard Jan. 29, 2018

Jan. 29, 2018

Module: wine Branch: master Commit: a3b6f8ceb9a225966ae1b7685fc6beab4da22c46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3b6f8ceb9a225966ae1b768… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 29 21:28:24 2018 +0330 wined3d: Use the resource access flags in arbfp_blit_supported(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 11141b6..a8c4abb 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7695,15 +7695,16 @@ static void arbfp_blit_unset(const struct wined3d_gl_info *gl_info) checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)"); } -static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, - const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, - enum wined3d_pool src_pool, const struct wined3d_format *src_format, DWORD src_location, - enum wined3d_pool dst_pool, const struct wined3d_format *dst_format, DWORD dst_location) +static BOOL arbfp_blit_supported(enum wined3d_blit_op blit_op, const struct wined3d_context *context, + const struct wined3d_resource *src_resource, DWORD src_location, + const struct wined3d_resource *dst_resource, DWORD dst_location) { + const struct wined3d_format *src_format = src_resource->format; + const struct wined3d_format *dst_format = dst_resource->format; enum complex_fixup src_fixup; BOOL decompress; - if (!gl_info->supported[ARB_FRAGMENT_PROGRAM]) + if (!context->gl_info->supported[ARB_FRAGMENT_PROGRAM]) return FALSE; if (blit_op == WINED3D_BLIT_OP_RAW_BLIT && dst_format->id == src_format->id) @@ -7717,7 +7718,7 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, switch (blit_op) { case WINED3D_BLIT_OP_COLOR_BLIT_CKEY: - if (!d3d_info->shader_color_key) + if (!context->d3d_info->shader_color_key) { /* The conversion modifies the alpha channel so the color key might no longer match. */ TRACE("Color keying not supported with converted textures.\n"); @@ -7734,7 +7735,7 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, decompress = src_format && (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) && !(dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED); - if (!decompress && (dst_pool == WINED3D_POOL_SYSTEM_MEM || src_pool == WINED3D_POOL_SYSTEM_MEM)) + if (!decompress && !(src_resource->access & dst_resource->access & WINED3D_RESOURCE_ACCESS_GPU)) return FALSE; src_fixup = get_complex_fixup(src_format->color_fixup); @@ -7800,9 +7801,8 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl struct wined3d_blitter *next; RECT s, d; - if (!arbfp_blit_supported(&device->adapter->gl_info, &device->adapter->d3d_info, op, - src_texture->resource.pool, src_texture->resource.format, src_location, - dst_texture->resource.pool, dst_texture->resource.format, dst_location)) + if (!arbfp_blit_supported(op, context, &src_texture->resource, src_location, + &dst_texture->resource, dst_location)) { if ((next = blitter->next)) return next->ops->blitter_blit(next, op, context, src_surface, src_location,

1 0

Henri Verbeet : wined3d: Use the resource access flags in fbo_blitter_supported().
by Alexandre Julliard Jan. 29, 2018

Jan. 29, 2018

Module: wine Branch: master Commit: 36f20ec5d13b8f379886e2e66c4cb8aa9be1826f URL: https://source.winehq.org/git/wine.git/?a=commit;h=36f20ec5d13b8f379886e2e6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 29 21:28:25 2018 +0330 wined3d: Use the resource access flags in fbo_blitter_supported(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4e5940a..fb28117 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -484,25 +484,28 @@ static void surface_blt_fbo(const struct wined3d_device *device, context_restore(context, restore_rt); } -static BOOL fbo_blitter_supported(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, - DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, DWORD src_location, - DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format, DWORD dst_location) +static BOOL fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct wined3d_gl_info *gl_info, + const struct wined3d_resource *src_resource, DWORD src_location, + const struct wined3d_resource *dst_resource, DWORD dst_location) { + const struct wined3d_format *src_format = src_resource->format; + const struct wined3d_format *dst_format = dst_resource->format; + if ((wined3d_settings.offscreen_rendering_mode != ORM_FBO) || !gl_info->fbo_ops.glBlitFramebuffer) return FALSE; /* Source and/or destination need to be on the GL side */ - if (src_pool == WINED3D_POOL_SYSTEM_MEM || dst_pool == WINED3D_POOL_SYSTEM_MEM) + if (!(src_resource->access & dst_resource->access & WINED3D_RESOURCE_ACCESS_GPU)) return FALSE; switch (blit_op) { case WINED3D_BLIT_OP_COLOR_BLIT: if (!((src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FBO_ATTACHABLE) - || (src_usage & WINED3DUSAGE_RENDERTARGET))) + || (src_resource->usage & WINED3DUSAGE_RENDERTARGET))) return FALSE; if (!((dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FBO_ATTACHABLE) - || (dst_usage & WINED3DUSAGE_RENDERTARGET))) + || (dst_resource->usage & WINED3DUSAGE_RENDERTARGET))) return FALSE; if ((src_format->id != dst_format->id || dst_location == WINED3D_LOCATION_DRAWABLE) && (!is_identity_fixup(src_format->color_fixup) || !is_identity_fixup(dst_format->color_fixup))) @@ -2229,11 +2232,9 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, if (!depth && sub_resource->locations & (WINED3D_LOCATION_TEXTURE_SRGB | WINED3D_LOCATION_TEXTURE_RGB) && (texture->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB) - && fbo_blitter_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, - texture->resource.usage, texture->resource.pool, - texture->resource.format, WINED3D_LOCATION_TEXTURE_RGB, - texture->resource.usage, texture->resource.pool, - texture->resource.format, WINED3D_LOCATION_TEXTURE_SRGB)) + && fbo_blitter_supported(WINED3D_BLIT_OP_COLOR_BLIT, gl_info, + &texture->resource, WINED3D_LOCATION_TEXTURE_RGB, + &texture->resource, WINED3D_LOCATION_TEXTURE_SRGB)) { if (srgb) surface_blt_fbo(device, context, WINED3D_TEXF_POINT, surface, WINED3D_LOCATION_TEXTURE_RGB, @@ -2252,9 +2253,8 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, WINED3D_LOCATION_RB_RESOLVED : WINED3D_LOCATION_RB_MULTISAMPLE; DWORD dst_location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; - if (fbo_blitter_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, - texture->resource.usage, texture->resource.pool, texture->resource.format, src_location, - texture->resource.usage, texture->resource.pool, texture->resource.format, dst_location)) + if (fbo_blitter_supported(WINED3D_BLIT_OP_COLOR_BLIT, gl_info, + &texture->resource, src_location, &texture->resource, dst_location)) surface_blt_fbo(device, context, WINED3D_TEXF_POINT, surface, src_location, &src_rect, surface, dst_location, &src_rect); @@ -2470,9 +2470,8 @@ static DWORD fbo_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit blit_op = WINED3D_BLIT_OP_COLOR_BLIT; } - if (!fbo_blitter_supported(&device->adapter->gl_info, blit_op, - src_resource->usage, src_resource->pool, src_resource->format, src_location, - src_resource->usage, dst_resource->pool, dst_resource->format, dst_location)) + if (!fbo_blitter_supported(blit_op, context->gl_info, + src_resource, src_location, dst_resource, dst_location)) { if ((next = blitter->next)) return next->ops->blitter_blit(next, op, context, src_surface, src_location,

1 0

Michael Stefaniuc : vbscript: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Jan. 29, 2018

Jan. 29, 2018

Module: wine Branch: master Commit: 6ab10f2eb0d8e7b4b02271ad5f9767144e678edb URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ab10f2eb0d8e7b4b02271ad… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jan 25 20:55:40 2018 +0100 vbscript: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbscript.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index ec41737..5e935ff 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -28,6 +28,7 @@ #include "vbscript_classes.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" @@ -430,26 +431,6 @@ HRESULT create_safearray_iter(SAFEARRAY *sa, IEnumVARIANT **ev) DECLSPEC_HIDDEN; HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT WINAPI VBScriptRegExpFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR heap_strdupW(LPCWSTR str) { LPWSTR ret = NULL;

1 0

Henri Verbeet : wined3d: Get rid of WINED3D_POOL_SCRATCH.
by Alexandre Julliard Jan. 29, 2018

Jan. 29, 2018

Module: wine Branch: master Commit: 2abf1dd3238de2be3405472d40169603a3776b15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2abf1dd3238de2be3405472d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 29 21:28:23 2018 +0330 wined3d: Get rid of WINED3D_POOL_SCRATCH. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 38 +++++++++++++++++++++++++++++--------- dlls/d3d8/d3d8_private.h | 12 ++++++++++++ dlls/d3d8/device.c | 6 ++++++ dlls/d3d8/surface.c | 4 ++-- dlls/d3d8/texture.c | 30 ++++++++++++++++++++++++------ dlls/d3d8/volume.c | 4 ++-- dlls/d3d9/buffer.c | 40 ++++++++++++++++++++++++++++++---------- dlls/d3d9/d3d9_private.h | 12 ++++++++++++ dlls/d3d9/device.c | 6 ++++++ dlls/d3d9/surface.c | 4 ++-- dlls/d3d9/texture.c | 30 ++++++++++++++++++++++++------ dlls/d3d9/volume.c | 4 ++-- dlls/wined3d/buffer.c | 4 ++-- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/resource.c | 10 ++++++++-- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/texture.c | 6 +++--- dlls/wined3d/utils.c | 1 - include/wine/wined3d.h | 2 +- 19 files changed, 169 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2abf1dd3238de2be3405…

1 0