February 2017 - Wine-commits

Jacek Caban : mshtml: Added IHTMLCurrentStyle:: get_direction implementation.
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: db1d194078d6835bce882c7c6943c2e7ad6b2044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db1d194078d6835bce882c7c6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 15 16:28:46 2017 +0100 mshtml: Added IHTMLCurrentStyle::get_direction implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/style.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 32f5281..a7daf4b 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -592,8 +592,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_borderCollapse(IHTMLCurrentStyle *ifa static HRESULT WINAPI HTMLCurrentStyle_get_direction(IHTMLCurrentStyle *iface, BSTR *p) { HTMLCurrentStyle *This = impl_from_IHTMLCurrentStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr(This->nsstyle, STYLEID_DIRECTION, p, 0); } static HRESULT WINAPI HTMLCurrentStyle_get_behavior(IHTMLCurrentStyle *iface, BSTR *p) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 57207de..7fc04a4 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -2942,6 +2942,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(!strcmp_wa(str, "hidden"), "overflowY = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + hres = IHTMLCurrentStyle_get_direction(current_style, &str); + ok(hres == S_OK, "get_direction failed: %08x\n", hres); + ok(!strcmp_wa(str, "ltr"), "direction = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + current_style2 = get_current_style2_iface((IUnknown*)current_style); b = 100;

1 0

Alistair Leslie-Hughes : dpnet: Add basic validation in IDirectPlay8Client EnumHosts.
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: 6eb0015d0896b217a80205c0f5bdbd8ece4a3c6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eb0015d0896b217a80205c0f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 15 04:36:03 2017 +0000 dpnet: Add basic validation in IDirectPlay8Client EnumHosts. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/client.c | 18 +++++++++++++++--- dlls/dpnet/tests/client.c | 14 +++++++------- dlls/dpnet/tests/thread.c | 4 ++-- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index d1e6b3b..3b3361f 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -144,9 +144,21 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_EnumHosts(IDirectPlay8Client *iface const DWORD dwTimeOut, void * const pvUserContext, DPNHANDLE * const pAsyncHandle, const DWORD dwFlags) { - IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - FIXME("(%p):(%p,%p,%x): Stub\n", This, pvUserContext, pAsyncHandle, dwFlags); - return DPN_OK; + IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); + + FIXME("(%p):(%p,%p,%p,%p,%u,%u,%u,%u,%p,%p,%x)\n", This, pApplicationDesc, pAddrHost, pDeviceInfo, pUserEnumData, + dwUserEnumDataSize, dwEnumCount, dwRetryInterval, dwTimeOut, pvUserContext, pAsyncHandle, dwFlags); + + if(!This->msghandler) + return DPNERR_UNINITIALIZED; + + if((dwFlags & DPNENUMHOSTS_SYNC) && pAsyncHandle) + return DPNERR_INVALIDPARAM; + + if(dwUserEnumDataSize > This->spcaps.dwMaxEnumPayloadSize) + return DPNERR_ENUMQUERYTOOLARGE; + + return (dwFlags & DPNENUMHOSTS_SYNC) ? DPN_OK : DPNSUCCESS_PENDING; } static HRESULT WINAPI IDirectPlay8ClientImpl_CancelAsyncOperation(IDirectPlay8Client *iface, diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index ca16f57..0c3f9ed 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -254,22 +254,22 @@ static void test_enum_hosts(void) data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, caps.dwMaxEnumPayloadSize + 1); hr = IDirectPlay8Client_EnumHosts(client, &appdesc, host, local, NULL, 0, 2, 1000, 1000, NULL, &async, DPNENUMHOSTS_SYNC); - todo_wine ok(hr == DPNERR_INVALIDPARAM, "got 0x%08x\n", hr); + ok(hr == DPNERR_INVALIDPARAM, "got 0x%08x\n", hr); hr = IDirectPlay8Client_EnumHosts(client, &appdesc, host, local, data, caps.dwMaxEnumPayloadSize + 1, INFINITE, 0, INFINITE, NULL, &async, DPNENUMHOSTS_SYNC); - todo_wine ok(hr == DPNERR_INVALIDPARAM, "got 0x%08x\n", hr); + ok(hr == DPNERR_INVALIDPARAM, "got 0x%08x\n", hr); async = 0; hr = IDirectPlay8Client_EnumHosts(client, &appdesc, host, local, data, caps.dwMaxEnumPayloadSize + 1, INFINITE, 0, INFINITE, NULL, &async, 0); - todo_wine ok(hr == DPNERR_ENUMQUERYTOOLARGE, "got 0x%08x\n", hr); + ok(hr == DPNERR_ENUMQUERYTOOLARGE, "got 0x%08x\n", hr); ok(!async, "Handle returned\n"); async = 0; hr = IDirectPlay8Client_EnumHosts(client, &appdesc, host, local, data, caps.dwMaxEnumPayloadSize, INFINITE, 0, INFINITE, NULL, &async, 0); - todo_wine ok(hr == DPNSUCCESS_PENDING, "got 0x%08x\n", hr); + ok(hr == DPNSUCCESS_PENDING, "got 0x%08x\n", hr); todo_wine ok(async, "No Handle returned\n"); /* This CancelAsyncOperation doesn't generate a DPN_MSGID_ASYNC_OP_COMPLETE */ @@ -279,15 +279,15 @@ static void test_enum_hosts(void) /* No Initialize has been called on client2. */ hr = IDirectPlay8Client_EnumHosts(client2, &appdesc, host, local, NULL, 0, INFINITE, 0, INFINITE, NULL, &async, 0); - todo_wine ok(hr == DPNERR_UNINITIALIZED, "IDirectPlay8Client_EnumHosts failed with 0x%08x\n", hr); + ok(hr == DPNERR_UNINITIALIZED, "IDirectPlay8Client_EnumHosts failed with 0x%08x\n", hr); /* Since we are running asynchronously, EnumHosts returns DPNSUCCESS_PENDING. */ hr = IDirectPlay8Client_EnumHosts(client, &appdesc, host, local, NULL, 0, INFINITE, 0, INFINITE, NULL, &async, 0); - todo_wine ok(hr == DPNSUCCESS_PENDING, "IDirectPlay8Client_EnumHosts failed with 0x%08x\n", hr); + ok(hr == DPNSUCCESS_PENDING, "IDirectPlay8Client_EnumHosts failed with 0x%08x\n", hr); todo_wine ok(async, "No Handle returned\n"); hr = IDirectPlay8Client_EnumHosts(client, &appdesc, host, local, NULL, 0, INFINITE, 0, INFINITE, NULL, &async2, 0); - todo_wine ok(hr == DPNSUCCESS_PENDING, "IDirectPlay8Client_EnumHosts failed with 0x%08x\n", hr); + ok(hr == DPNSUCCESS_PENDING, "IDirectPlay8Client_EnumHosts failed with 0x%08x\n", hr); todo_wine ok(async2, "No Handle returned\n"); todo_wine ok(async2 != async, "Same handle returned.\n"); diff --git a/dlls/dpnet/tests/thread.c b/dlls/dpnet/tests/thread.c index edcab25..ce1b144 100644 --- a/dlls/dpnet/tests/thread.c +++ b/dlls/dpnet/tests/thread.c @@ -164,7 +164,7 @@ static void test_enum_hosts(void) ok(hr == S_OK, "IDirectPlay8Address failed with 0x%08x\n", hr); hr = IDirectPlay8Client_EnumHosts(client, &appdesc, host, local, NULL, 0, INFINITE, 0, INFINITE, NULL, &async, 0); - todo_wine ok(hr == DPNSUCCESS_PENDING, "IDirectPlay8Client_EnumHosts failed with 0x%08x\n", hr); + ok(hr == DPNSUCCESS_PENDING, "IDirectPlay8Client_EnumHosts failed with 0x%08x\n", hr); todo_wine ok(async, "No Handle returned\n"); hr = IDirectPlay8ThreadPool_GetThreadCount(pool1, -1, &threadcnt, 0); @@ -172,7 +172,7 @@ static void test_enum_hosts(void) todo_wine ok(threadcnt == 6, "got %d\n", threadcnt); hr = IDirectPlay8Client_EnumHosts(client, &appdesc, host, local, NULL, 0, INFINITE, 0, INFINITE, NULL, &async2, 0); - todo_wine ok(hr == DPNSUCCESS_PENDING, "IDirectPlay8Client_EnumHosts failed with 0x%08x\n", hr); + ok(hr == DPNSUCCESS_PENDING, "IDirectPlay8Client_EnumHosts failed with 0x%08x\n", hr); WaitForSingleObject(enumevent, 1000);

1 0

Alistair Leslie-Hughes : dpnet: Add basic validation in IDirectPlay8Peer EnumHosts.
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: 960b48f4e791c94deddef422e422152e16167e29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=960b48f4e791c94deddef422e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 15 04:36:15 2017 +0000 dpnet: Add basic validation in IDirectPlay8Peer EnumHosts. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/peer.c | 15 +++++++++++++-- dlls/dpnet/tests/client.c | 8 ++++---- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index 57f15ef..91a7e3e 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -457,11 +457,22 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_EnumHosts(IDirectPlay8Peer *iface, const DWORD dwUserEnumDataSize, const DWORD dwEnumCount, const DWORD dwRetryInterval, const DWORD dwTimeOut, void * const pvUserContext, DPNHANDLE * const pAsyncHandle, const DWORD dwFlags) { + IDirectPlay8PeerImpl* This = impl_from_IDirectPlay8Peer(iface); + FIXME("(%p)->(%p,%p,%p,%p,%x,%x,%x,%x,%p,%p,%x): stub\n", - iface, pApplicationDesc, pAddrHost, pDeviceInfo, pUserEnumData, dwUserEnumDataSize, dwEnumCount, + This, pApplicationDesc, pAddrHost, pDeviceInfo, pUserEnumData, dwUserEnumDataSize, dwEnumCount, dwRetryInterval, dwTimeOut, pvUserContext, pAsyncHandle, dwFlags); - return DPNERR_GENERIC; + if(!This->msghandler) + return DPNERR_UNINITIALIZED; + + if((dwFlags & DPNENUMHOSTS_SYNC) && pAsyncHandle) + return DPNERR_INVALIDPARAM; + + if(dwUserEnumDataSize > This->spcaps.dwMaxEnumPayloadSize) + return DPNERR_ENUMQUERYTOOLARGE; + + return (dwFlags & DPNENUMHOSTS_SYNC) ? DPN_OK : DPNSUCCESS_PENDING; } static HRESULT WINAPI IDirectPlay8PeerImpl_DestroyPeer(IDirectPlay8Peer *iface, const DPNID dpnidClient, diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index 0c3f9ed..ee2722b 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -609,7 +609,7 @@ static void test_enum_hosts_peer(void) ok(hr == S_OK, "IDirectPlay8Address failed with 0x%08x\n", hr); hr = IDirectPlay8Peer_EnumHosts(peer, &appdesc, host, local, NULL, 0, INFINITE, 0, INFINITE, NULL, &async, 0); - todo_wine ok(hr == DPNSUCCESS_PENDING, "IDirectPlay8Peer_EnumServiceProviders failed with 0x%08x\n", hr); + ok(hr == DPNSUCCESS_PENDING, "IDirectPlay8Peer_EnumServiceProviders failed with 0x%08x\n", hr); todo_wine ok(async, "No Handle returned\n"); hr = IDirectPlay8Peer_CancelAsyncOperation(peer, async, 0); @@ -617,15 +617,15 @@ static void test_enum_hosts_peer(void) /* No Initialize has been called on peer2. */ hr = IDirectPlay8Peer_EnumHosts(peer2, &appdesc, host, local, NULL, 0, INFINITE, 0, INFINITE, NULL, &async, 0); - todo_wine ok(hr == DPNERR_UNINITIALIZED, "IDirectPlay8Peer_EnumHosts failed with 0x%08x\n", hr); + ok(hr == DPNERR_UNINITIALIZED, "IDirectPlay8Peer_EnumHosts failed with 0x%08x\n", hr); /* Since we are running asynchronously, EnumHosts returns DPNSUCCESS_PENDING. */ hr = IDirectPlay8Peer_EnumHosts(peer, &appdesc, host, local, NULL, 0, INFINITE, 0, INFINITE, NULL, &async, 0); - todo_wine ok(hr == DPNSUCCESS_PENDING, "IDirectPlay8Peer_EnumHosts failed with 0x%08x\n", hr); + ok(hr == DPNSUCCESS_PENDING, "IDirectPlay8Peer_EnumHosts failed with 0x%08x\n", hr); todo_wine ok(async, "No Handle returned\n"); hr = IDirectPlay8Peer_EnumHosts(peer, &appdesc, host, local, NULL, 0, INFINITE, 0, INFINITE, NULL, &async2, 0); - todo_wine ok(hr == DPNSUCCESS_PENDING, "IDirectPlay8Peer_EnumHosts failed with 0x%08x\n", hr); + ok(hr == DPNSUCCESS_PENDING, "IDirectPlay8Peer_EnumHosts failed with 0x%08x\n", hr); todo_wine ok(async2, "No Handle returned\n"); todo_wine ok(async2 != async, "Same handle returned.\n");

1 0

Alistair Leslie-Hughes : dpnet: Implement IDirectPlay8Thread Initialize.
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: da5e8d088796462a9967a54059980f240565ad68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da5e8d088796462a9967a5405… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 15 04:36:26 2017 +0000 dpnet: Implement IDirectPlay8Thread Initialize. In order to get the tests to pass, msghandler needed to be reset in Close. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/dpnet_private.h | 8 ++++++-- dlls/dpnet/tests/thread.c | 5 ++++- dlls/dpnet/threadpool.c | 21 ++++++++++++++++++++- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 49c3495..7b6de4a 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -120,8 +120,12 @@ struct IDirectPlay8LobbiedApplicationImpl */ struct IDirectPlay8ThreadPoolImpl { - IDirectPlay8ThreadPool IDirectPlay8ThreadPool_iface; - LONG ref; + IDirectPlay8ThreadPool IDirectPlay8ThreadPool_iface; + LONG ref; + + PFNDPNMESSAGEHANDLER msghandler; + DWORD flags; + void *usercontext; }; /** diff --git a/dlls/dpnet/tests/thread.c b/dlls/dpnet/tests/thread.c index ce1b144..37c226f 100644 --- a/dlls/dpnet/tests/thread.c +++ b/dlls/dpnet/tests/thread.c @@ -64,7 +64,7 @@ static void create_threadpool(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDirectPlay8ThreadPool_Initialize(pool1, NULL, NULL, 0); - todo_wine ok(hr == DPNERR_INVALIDPARAM, "got 0x%08x\n", hr); + ok(hr == DPNERR_INVALIDPARAM, "got 0x%08x\n", hr); hr = IDirectPlay8ThreadPool_Initialize(pool1, NULL, &DirectPlayThreadHandler, 0); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -133,6 +133,9 @@ static void test_enum_hosts(void) hr = IDirectPlay8ThreadPool_Initialize(pool1, NULL, &DirectPlayThreadHandler, 0); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDirectPlay8ThreadPool_Initialize(pool1, NULL, &DirectPlayThreadHandler, 0); + ok(hr == DPNERR_ALREADYINITIALIZED, "got 0x%08x\n", hr); + hr = IDirectPlay8ThreadPool_GetThreadCount(pool1, -1, &threadcnt, 0); ok(hr == S_OK, "got 0x%08x\n", hr); ok(threadcnt == 0, "got %d\n", threadcnt); diff --git a/dlls/dpnet/threadpool.c b/dlls/dpnet/threadpool.c index 9e13ffb..37a05e2 100644 --- a/dlls/dpnet/threadpool.c +++ b/dlls/dpnet/threadpool.c @@ -82,13 +82,32 @@ static ULONG WINAPI IDirectPlay8ThreadPoolImpl_Release(IDirectPlay8ThreadPool *i static HRESULT WINAPI IDirectPlay8ThreadPoolImpl_Initialize(IDirectPlay8ThreadPool *iface, void * const pvUserContext, const PFNDPNMESSAGEHANDLER pfn, const DWORD dwFlags) { - FIXME("(%p)->(%p,%p,%x): stub\n", iface, pvUserContext, pfn, dwFlags); + IDirectPlay8ThreadPoolImpl *This = impl_from_IDirectPlay8ThreadPool(iface); + + TRACE("(%p)->(%p,%p,%x)\n", This, pvUserContext, pfn, dwFlags); + + if(!pfn) + return DPNERR_INVALIDPARAM; + + if(This->msghandler) + return DPNERR_ALREADYINITIALIZED; + + This->msghandler = pfn; + This->flags = dwFlags; + This->usercontext = pvUserContext; + return DPN_OK; } static HRESULT WINAPI IDirectPlay8ThreadPoolImpl_Close(IDirectPlay8ThreadPool *iface, const DWORD dwFlags) { + IDirectPlay8ThreadPoolImpl *This = impl_from_IDirectPlay8ThreadPool(iface); + + FIXME("(%p)->(%x)\n", This, dwFlags); + + This->msghandler = NULL; + return DPN_OK; }

1 0

Andrey Semakin : winemine: Added Shift+LClick hotkey to uncover multiple cells.
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: ca8f056da1f5eecd7d10cafde4fe5fc62d3185de URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca8f056da1f5eecd7d10cafde… Author: Andrey Semakin <and-semakin(a)ya.ru> Date: Tue Feb 14 21:44:42 2017 +0500 winemine: Added Shift+LClick hotkey to uncover multiple cells. Signed-off-by: Andrey Semakin <and-semakin(a)ya.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemine/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winemine/main.c b/programs/winemine/main.c index da47359..27fc159 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -884,7 +884,7 @@ static LRESULT WINAPI MainProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara case WM_LBUTTONDOWN: WINE_TRACE("WM_LBUTTONDOWN\n"); - if( wParam & MK_RBUTTON ) + if( wParam & ( MK_RBUTTON | MK_SHIFT ) ) msg = WM_MBUTTONDOWN; TestBoard( hWnd, &board, (short)LOWORD(lParam), (short)HIWORD(lParam), msg ); SetCapture( hWnd ); @@ -892,7 +892,7 @@ static LRESULT WINAPI MainProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara case WM_LBUTTONUP: WINE_TRACE("WM_LBUTTONUP\n"); - if( wParam & MK_RBUTTON ) + if( wParam & ( MK_RBUTTON | MK_SHIFT ) ) msg = WM_MBUTTONUP; TestBoard( hWnd, &board, (short)LOWORD(lParam), (short)HIWORD(lParam), msg ); ReleaseCapture();

1 0

Henri Verbeet : usp10: Explicitly check for zero-width control characters in ScriptShapeOpenType ().
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: 721fbf617b06d2ac3ab44ca7074ca9b0862d6426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=721fbf617b06d2ac3ab44ca70… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 13 22:57:13 2017 +0100 usp10: Explicitly check for zero-width control characters in ScriptShapeOpenType(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 105 +++++++++++++++++++++++++++++++---------------- dlls/usp10/usp10.c | 20 +++++++-- 2 files changed, 85 insertions(+), 40 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index b6fc038..2e87d3c 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1614,7 +1614,7 @@ static void test_ScriptShape(HDC hdc) SCRIPT_CACHE sc = NULL; WORD glyphs[4], glyphs2[4], logclust[4], glyphs3[4]; SCRIPT_VISATTR attrs[4]; - SCRIPT_ITEM items[2]; + SCRIPT_ITEM items[4]; int nb, i, j; hr = ScriptItemize(test1, 4, 2, NULL, NULL, items, NULL); @@ -1744,9 +1744,33 @@ static void test_ScriptShape(HDC hdc) for (i = 0; i < 2; i++) { static const WCHAR space[] = {' ', 0}; - static const WCHAR blanks[] = {'\t', '\r', '\n', 0x001c, 0x001d, 0x001e, 0x001f, - 0x200b, 0x200c, 0x200d, 0x200e, 0x200f, /* ZWSP, ZWNJ, ZWJ, LRM, RLM */ - 0x202a, 0x202b, 0x202c, 0x202d, 0x202e, 0}; /* LRE, RLE, PDF, LRO, RLO */ + static const struct + { + WCHAR c; + unsigned int item_count; + unsigned int item; + } + test_data[] = + { + {0x0009, 3, 1}, /* \t */ + {0x000a, 3, 1}, /* \n */ + {0x000d, 3, 1}, /* \r */ + {0x001c, 3, 1}, /* FS */ + {0x001d, 3, 1}, /* GS */ + {0x001e, 3, 1}, /* RS */ + {0x001f, 3, 1}, /* US */ + {0x200b, 1, 0}, /* ZWSP */ + {0x200c, 1, 0}, /* ZWNJ */ + {0x200d, 1, 0}, /* ZWJ */ + {0x200e, 3, 1}, /* LRM */ + {0x200f, 3, 1}, /* RLM */ + {0x202a, 3, 1}, /* LRE */ + {0x202b, 3, 1}, /* RLE */ + {0x202c, 3, 1}, /* PDF */ + {0x202d, 3, 1}, /* LRO */ + {0x202e, 3, 1}, /* RLO */ + }; + WCHAR chars[3]; HFONT font, oldfont = NULL; LOGFONTA lf; @@ -1765,43 +1789,52 @@ static void test_ScriptShape(HDC hdc) ok(hr == S_OK, "%s: expected S_OK, got %08x\n", lf.lfFaceName, hr); ok(nb == 1, "%s: expected 1, got %d\n", lf.lfFaceName, nb); - for (j = 0; blanks[j]; j++) + chars[0] = 'A'; + chars[2] = 'A'; + for (j = 0; j < sizeof(test_data) / sizeof(*test_data); ++j) { - hr = ScriptItemize(&blanks[j], 1, 2, NULL, NULL, items, NULL); - ok(hr == S_OK, "%s: [%02x] expected S_OK, got %08x\n", lf.lfFaceName, blanks[j], hr); - - ok(!items[0].a.fNoGlyphIndex, "%s: [%02x] got unexpected fNoGlyphIndex %#x.\n", - lf.lfFaceName, blanks[j], items[0].a.fNoGlyphIndex); - hr = ScriptShape(hdc, &sc, &blanks[j], 1, 1, &items[0].a, glyphs2, logclust, attrs, &nb); - ok(hr == S_OK, "%s: [%02x] expected S_OK, got %08x\n", lf.lfFaceName, blanks[j], hr); - ok(nb == 1, "%s: [%02x] expected 1, got %d\n", lf.lfFaceName, blanks[j], nb); - ok(!items[0].a.fNoGlyphIndex, "%s: [%02x] got unexpected fNoGlyphIndex %#x.\n", - lf.lfFaceName, blanks[j], items[0].a.fNoGlyphIndex); - - ok(glyphs[0] == glyphs2[0] || - broken(glyphs2[0] == blanks[j] && (blanks[j] < 0x10)), - "%s: [%02x] expected %04x, got %04x\n", lf.lfFaceName, blanks[j], glyphs[0], glyphs2[0]); - ok(attrs[0].fZeroWidth || broken(!attrs[0].fZeroWidth && (blanks[j] < 0x10) /* Vista */), - "%s: [%02x] got unexpected fZeroWidth %#x.\n", lf.lfFaceName, blanks[j], attrs[0].fZeroWidth); - - items[0].a.fNoGlyphIndex = 1; - hr = ScriptShape(hdc, &sc, &blanks[j], 1, 1, &items[0].a, glyphs2, logclust, attrs, &nb); - ok(hr == S_OK, "%s: [%02x] expected S_OK, got %08x\n", lf.lfFaceName, blanks[j], hr); - ok(nb == 1, "%s: [%02x] expected 1, got %d\n", lf.lfFaceName, blanks[j], nb); - - if (blanks[j] == 0x200b || blanks[j] == 0x200c || blanks[j] == 0x200d) + WCHAR c = test_data[j].c; + SCRIPT_ITEM *item; + + chars[1] = c; + hr = ScriptItemize(chars, 3, 4, NULL, NULL, items, &nb); + ok(hr == S_OK, "%s: [%02x] expected S_OK, got %08x\n", lf.lfFaceName, c, hr); + todo_wine_if(c == 0x200b) ok(nb == test_data[j].item_count, "%s: [%02x] Got unexpected item count %d.\n", + lf.lfFaceName, c, nb); + item = &items[test_data[j].item]; + + ok(!item->a.fNoGlyphIndex, "%s: [%02x] got unexpected fNoGlyphIndex %#x.\n", + lf.lfFaceName, c, item->a.fNoGlyphIndex); + hr = ScriptShape(hdc, &sc, chars, 3, 3, &item->a, glyphs2, logclust, attrs, &nb); + ok(hr == S_OK, "%s: [%02x] expected S_OK, got %08x\n", lf.lfFaceName, c, hr); + ok(nb == 3, "%s: [%02x] expected 3, got %d\n", lf.lfFaceName, c, nb); + ok(!item->a.fNoGlyphIndex, "%s: [%02x] got unexpected fNoGlyphIndex %#x.\n", + lf.lfFaceName, c, item->a.fNoGlyphIndex); + + ok(glyphs[0] == glyphs2[1] || + broken(glyphs2[1] == c && (c < 0x10)), + "%s: [%02x] expected %04x, got %04x\n", lf.lfFaceName, c, glyphs[0], glyphs2[1]); + ok(attrs[1].fZeroWidth || broken(!attrs[1].fZeroWidth && (c < 0x10) /* Vista */), + "%s: [%02x] got unexpected fZeroWidth %#x.\n", lf.lfFaceName, c, attrs[1].fZeroWidth); + + item->a.fNoGlyphIndex = 1; + hr = ScriptShape(hdc, &sc, chars, 3, 3, &item->a, glyphs2, logclust, attrs, &nb); + ok(hr == S_OK, "%s: [%02x] expected S_OK, got %08x\n", lf.lfFaceName, c, hr); + ok(nb == 3, "%s: [%02x] expected 1, got %d\n", lf.lfFaceName, c, nb); + + if (c == 0x200b || c == 0x200c || c == 0x200d) { - ok(glyphs2[0] == 0x0020, - "%s: [%02x] got unexpected %04x.\n", lf.lfFaceName, blanks[j], glyphs2[0]); - ok(attrs[0].fZeroWidth, "%s: [%02x] got unexpected fZeroWidth %#x.\n", - lf.lfFaceName, blanks[j], attrs[0].fZeroWidth); + ok(glyphs2[1] == 0x0020, + "%s: [%02x] got unexpected %04x.\n", lf.lfFaceName, c, glyphs2[1]); + ok(attrs[1].fZeroWidth, "%s: [%02x] got unexpected fZeroWidth %#x.\n", + lf.lfFaceName, c, attrs[1].fZeroWidth); } else { - ok(glyphs2[0] == blanks[j], - "%s: [%02x] got unexpected %04x.\n", lf.lfFaceName, blanks[j], glyphs2[0]); - ok(!attrs[0].fZeroWidth, "%s: [%02x] got unexpected fZeroWidth %#x.\n", - lf.lfFaceName, blanks[j], attrs[0].fZeroWidth); + ok(glyphs2[1] == c, + "%s: [%02x] got unexpected %04x.\n", lf.lfFaceName, c, glyphs2[1]); + ok(!attrs[1].fZeroWidth, "%s: [%02x] got unexpected fZeroWidth %#x.\n", + lf.lfFaceName, c, attrs[1].fZeroWidth); } } if (oldfont) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 0471fc6..221aab4 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3123,9 +3123,6 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, chInput = mirror_char(pwcChars[idx]); else chInput = pwcChars[idx]; - /* special case for tabs */ - if (chInput == 0x0009) - chInput = 0x0020; rChars[i] = chInput; } else @@ -3165,6 +3162,20 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, SHAPE_ContextualShaping(hdc, (ScriptCache *)*psc, psa, rChars, cChars, pwOutGlyphs, pcGlyphs, cMaxGlyphs, pwLogClust); SHAPE_ApplyDefaultOpentypeFeatures(hdc, (ScriptCache *)*psc, psa, pwOutGlyphs, pcGlyphs, cMaxGlyphs, cChars, pwLogClust); SHAPE_CharGlyphProp(hdc, (ScriptCache *)*psc, psa, pwcChars, cChars, pwOutGlyphs, *pcGlyphs, pwLogClust, pCharProps, pOutGlyphProps); + + for (i = 0; i < cChars; ++i) + { + /* Special case for tabs and joiners. As control characters, ZWNJ + * and ZWJ would in principle get handled by the corresponding + * shaping functions. However, since ZWNJ and ZWJ can get merged + * into adjoining runs during itemisation, these don't generally + * get classified as Script_Control. */ + if (pwcChars[i] == 0x0009 || pwcChars[i] == ZWSP || pwcChars[i] == ZWNJ || pwcChars[i] == ZWJ) + { + pwOutGlyphs[pwLogClust[i]] = ((ScriptCache *)*psc)->sfp.wgBlank; + pOutGlyphProps[pwLogClust[i]].sva.fZeroWidth = 1; + } + } heap_free(rChars); } else @@ -3189,7 +3200,8 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, pOutGlyphProps[i].sva.fZeroWidth = 1; } } - else if (psa->eScript == Script_Control) + else if (psa->eScript == Script_Control || pwcChars[idx] == ZWSP + || pwcChars[idx] == ZWNJ || pwcChars[idx] == ZWJ) { if (pwcChars[idx] == 0x0009 || pwcChars[idx] == 0x000A || pwcChars[idx] == 0x000D || pwcChars[idx] >= 0x001C)

1 0

Henri Verbeet : usp10: Itemise ZWSP like ZWNJ and ZWJ.
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: d00f7315e0cec0c2fe34ba5ab2b55cf5718860dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d00f7315e0cec0c2fe34ba5ab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 13 22:57:14 2017 +0100 usp10: Itemise ZWSP like ZWNJ and ZWJ. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 2 +- dlls/usp10/usp10.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 2e87d3c..c5cc401 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1799,7 +1799,7 @@ static void test_ScriptShape(HDC hdc) chars[1] = c; hr = ScriptItemize(chars, 3, 4, NULL, NULL, items, &nb); ok(hr == S_OK, "%s: [%02x] expected S_OK, got %08x\n", lf.lfFaceName, c, hr); - todo_wine_if(c == 0x200b) ok(nb == test_data[j].item_count, "%s: [%02x] Got unexpected item count %d.\n", + ok(nb == test_data[j].item_count, "%s: [%02x] Got unexpected item count %d.\n", lf.lfFaceName, c, nb); item = &items[test_data[j].item]; diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 221aab4..3595ca2 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1363,7 +1363,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, for (i = 0; i < cInChars; i++) { /* Joiners get merged preferencially right */ - if (i > 0 && (pwcInChars[i] == ZWJ || pwcInChars[i] == ZWNJ)) + if (i > 0 && (pwcInChars[i] == ZWJ || pwcInChars[i] == ZWNJ || pwcInChars[i] == ZWSP)) { int j; if (i+1 == cInChars) @@ -1372,7 +1372,8 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, { for (j = i+1; j < cInChars; j++) { - if (pwcInChars[j] != ZWJ && pwcInChars[j] != ZWNJ && pwcInChars[j] != Numeric_space) + if (pwcInChars[j] != ZWJ && pwcInChars[j] != ZWNJ + && pwcInChars[j] != ZWSP && pwcInChars[j] != Numeric_space) { scripts[i] = scripts[j]; break; @@ -1497,14 +1498,15 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, } /* Joiners get merged preferencially right */ - if (i > 0 && (pwcInChars[i] == ZWJ || pwcInChars[i] == ZWNJ)) + if (i > 0 && (pwcInChars[i] == ZWJ || pwcInChars[i] == ZWNJ || pwcInChars[i] == ZWSP)) { int j; if (i+1 == cInChars && levels[i-1] == levels[i]) strength[i] = strength[i-1]; else for (j = i+1; j < cInChars && levels[i] == levels[j]; j++) - if (pwcInChars[j] != ZWJ && pwcInChars[j] != ZWNJ && pwcInChars[j] != Numeric_space) + if (pwcInChars[j] != ZWJ && pwcInChars[j] != ZWNJ + && pwcInChars[j] != ZWSP && pwcInChars[j] != Numeric_space) { strength[i] = strength[j]; break;

1 0

Henri Verbeet : wined3d: Get rid of the unused "depth_blt_texture" field from struct wined3d_device.
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: 908010d47bfeaed417250897bb18e569f5632394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=908010d47bfeaed417250897b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 15 14:17:12 2017 +0100 wined3d: Get rid of the unused "depth_blt_texture" field from struct wined3d_device. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 17 ----------------- dlls/wined3d/wined3d_private.h | 3 --- 2 files changed, 20 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b4b1803..6452420 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1126,15 +1126,6 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) wine_rb_clear(&device->samplers, device_free_sampler, NULL); - /* Destroy the depth blt resources, they will be invalid after the reset. Also free shader - * private data, it might contain opengl pointers - */ - if (device->depth_blt_texture) - { - gl_info->gl_ops.gl.p_glDeleteTextures(1, &device->depth_blt_texture); - device->depth_blt_texture = 0; - } - /* Destroy the shader backend. Note that this has to happen after all shaders are destroyed. */ device->blitter->free_private(device); device->shader_backend->shader_free_private(device); @@ -4540,7 +4531,6 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d_swapchain *swapchain) { struct wined3d_resource *resource, *cursor; - const struct wined3d_gl_info *gl_info; struct wined3d_context *context; struct wined3d_shader *shader; @@ -4556,13 +4546,6 @@ static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d } context = context_acquire(device, NULL); - gl_info = context->gl_info; - - if (device->depth_blt_texture) - { - gl_info->gl_ops.gl.p_glDeleteTextures(1, &device->depth_blt_texture); - device->depth_blt_texture = 0; - } device->blitter->free_private(device); device->shader_backend->shader_free_private(device); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 23a8559..6b3d3e6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2618,9 +2618,6 @@ struct wined3d_device struct wined3d_fb_state fb; struct wined3d_rendertarget_view *auto_depth_stencil_view; - /* For rendering to a texture using glCopyTexImage */ - GLuint depth_blt_texture; - /* Cursor management */ UINT xHotSpot; UINT yHotSpot;

1 0

Henri Verbeet : wined3d: Free the swapchain context array in swapchain_destroy_contexts().
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: 274b091c87a564f955f7dcef7f5f5508b6997f97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=274b091c87a564f955f7dcef7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 15 14:17:13 2017 +0100 wined3d: Free the swapchain context array in swapchain_destroy_contexts(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 7 ++----- dlls/wined3d/swapchain.c | 2 ++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6452420..1271363 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4528,7 +4528,7 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) } } -static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d_swapchain *swapchain) +static void wined3d_device_delete_opengl_contexts(struct wined3d_device *device) { struct wined3d_resource *resource, *cursor; struct wined3d_context *context; @@ -4561,9 +4561,6 @@ static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d else context_destroy(device, device->contexts[0]); } - - HeapFree(GetProcessHeap(), 0, swapchain->context); - swapchain->context = NULL; } static HRESULT create_primary_opengl_context(struct wined3d_device *device, struct wined3d_swapchain *swapchain) @@ -4827,7 +4824,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, state_cleanup(&device->state); if (device->d3d_initialized) - delete_opengl_contexts(device, swapchain); + wined3d_device_delete_opengl_contexts(device); state_init(&device->state, &device->fb, &device->adapter->gl_info, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index dfb62c8..f5fdd96 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1136,7 +1136,9 @@ void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) { context_destroy(swapchain->device, swapchain->context[i]); } + HeapFree(GetProcessHeap(), 0, swapchain->context); swapchain->num_contexts = 0; + swapchain->context = NULL; } struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchain)

1 0

Henri Verbeet : wined3d: Use wined3d_device_delete_opengl_contexts() in wined3d_device_uninit_3d().
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: b64d5474de2e442d2fe11cd64c86adb6f2d75c20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b64d5474de2e442d2fe11cd64… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 15 14:17:14 2017 +0100 wined3d: Use wined3d_device_delete_opengl_contexts() in wined3d_device_uninit_3d(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 191 ++++++++++++++++++++++---------------------------- 1 file changed, 83 insertions(+), 108 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1271363..22a13a8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -942,6 +942,87 @@ static void device_init_swapchain_state(struct wined3d_device *device, struct wi wined3d_device_set_render_state(device, WINED3D_RS_ZENABLE, ds_enable); } +static void wined3d_device_delete_opengl_contexts(struct wined3d_device *device) +{ + struct wined3d_resource *resource, *cursor; + struct wined3d_context *context; + struct wined3d_shader *shader; + + LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) + { + TRACE("Unloading resource %p.\n", resource); + wined3d_cs_emit_unload_resource(device->cs, resource); + } + + LIST_FOR_EACH_ENTRY(shader, &device->shaders, struct wined3d_shader, shader_list_entry) + { + device->shader_backend->shader_destroy(shader); + } + + context = context_acquire(device, NULL); + device->blitter->free_private(device); + device->shader_backend->shader_free_private(device); + destroy_dummy_textures(device, context); + destroy_default_samplers(device, context); + context_release(context); + + while (device->context_count) + { + if (device->contexts[0]->swapchain) + swapchain_destroy_contexts(device->contexts[0]->swapchain); + else + context_destroy(device, device->contexts[0]); + } +} + +static HRESULT create_primary_opengl_context(struct wined3d_device *device, struct wined3d_swapchain *swapchain) +{ + struct wined3d_context *context; + struct wined3d_texture *target; + HRESULT hr; + + if (FAILED(hr = device->shader_backend->shader_alloc_private(device, + device->adapter->vertex_pipe, device->adapter->fragment_pipe))) + { + ERR("Failed to allocate shader private data, hr %#x.\n", hr); + return hr; + } + + if (FAILED(hr = device->blitter->alloc_private(device))) + { + ERR("Failed to allocate blitter private data, hr %#x.\n", hr); + device->shader_backend->shader_free_private(device); + return hr; + } + + /* Recreate the primary swapchain's context. */ + if (!(swapchain->context = HeapAlloc(GetProcessHeap(), 0, sizeof(*swapchain->context)))) + { + ERR("Failed to allocate memory for swapchain context array.\n"); + device->blitter->free_private(device); + device->shader_backend->shader_free_private(device); + return E_OUTOFMEMORY; + } + + target = swapchain->back_buffers ? swapchain->back_buffers[0] : swapchain->front_buffer; + if (!(context = context_create(swapchain, target, swapchain->ds_format))) + { + WARN("Failed to create context.\n"); + HeapFree(GetProcessHeap(), 0, swapchain->context); + device->blitter->free_private(device); + device->shader_backend->shader_free_private(device); + return E_FAIL; + } + + swapchain->context[0] = context; + swapchain->num_contexts = 1; + create_dummy_textures(device, context); + create_default_samplers(device, context); + context_release(context); + + return WINED3D_OK; +} + HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, struct wined3d_swapchain_desc *swapchain_desc) { @@ -1094,9 +1175,6 @@ static void device_free_sampler(struct wine_rb_entry *entry, void *context) HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) { - struct wined3d_resource *resource, *cursor; - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; UINT i; TRACE("device %p.\n", device); @@ -1104,12 +1182,6 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) if (!device->d3d_initialized) return WINED3DERR_INVALIDCALL; - /* I don't think that the interface guarantees that the device is destroyed from the same thread - * it was created. Thus make sure a context is active for the glDelete* calls - */ - context = context_acquire(device, NULL); - gl_info = context->gl_info; - if (device->logo_texture) wined3d_texture_decref(device->logo_texture); if (device->cursor_texture) @@ -1117,22 +1189,9 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) state_unbind_resources(&device->state); - /* Unload resources */ - LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) - { - TRACE("Unloading resource %p.\n", resource); - wined3d_cs_emit_unload_resource(device->cs, resource); - } - wine_rb_clear(&device->samplers, device_free_sampler, NULL); - /* Destroy the shader backend. Note that this has to happen after all shaders are destroyed. */ - device->blitter->free_private(device); - device->shader_backend->shader_free_private(device); - destroy_dummy_textures(device, context); - destroy_default_samplers(device, context); - - context_release(context); + wined3d_device_delete_opengl_contexts(device); if (device->fb.depth_stencil) { @@ -1153,7 +1212,7 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) ERR("Something's still holding the auto depth/stencil view (%p).\n", view); } - for (i = 0; i < gl_info->limits.buffers; ++i) + for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) { wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); } @@ -4528,90 +4587,6 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) } } -static void wined3d_device_delete_opengl_contexts(struct wined3d_device *device) -{ - struct wined3d_resource *resource, *cursor; - struct wined3d_context *context; - struct wined3d_shader *shader; - - LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) - { - TRACE("Unloading resource %p.\n", resource); - wined3d_cs_emit_unload_resource(device->cs, resource); - } - - LIST_FOR_EACH_ENTRY(shader, &device->shaders, struct wined3d_shader, shader_list_entry) - { - device->shader_backend->shader_destroy(shader); - } - - context = context_acquire(device, NULL); - - device->blitter->free_private(device); - device->shader_backend->shader_free_private(device); - destroy_dummy_textures(device, context); - destroy_default_samplers(device, context); - - context_release(context); - - while (device->context_count) - { - if (device->contexts[0]->swapchain) - swapchain_destroy_contexts(device->contexts[0]->swapchain); - else - context_destroy(device, device->contexts[0]); - } -} - -static HRESULT create_primary_opengl_context(struct wined3d_device *device, struct wined3d_swapchain *swapchain) -{ - struct wined3d_context *context; - struct wined3d_texture *target; - HRESULT hr; - - if (FAILED(hr = device->shader_backend->shader_alloc_private(device, - device->adapter->vertex_pipe, device->adapter->fragment_pipe))) - { - ERR("Failed to allocate shader private data, hr %#x.\n", hr); - return hr; - } - - if (FAILED(hr = device->blitter->alloc_private(device))) - { - ERR("Failed to allocate blitter private data, hr %#x.\n", hr); - device->shader_backend->shader_free_private(device); - return hr; - } - - /* Recreate the primary swapchain's context */ - swapchain->context = HeapAlloc(GetProcessHeap(), 0, sizeof(*swapchain->context)); - if (!swapchain->context) - { - ERR("Failed to allocate memory for swapchain context array.\n"); - device->blitter->free_private(device); - device->shader_backend->shader_free_private(device); - return E_OUTOFMEMORY; - } - - target = swapchain->back_buffers ? swapchain->back_buffers[0] : swapchain->front_buffer; - if (!(context = context_create(swapchain, target, swapchain->ds_format))) - { - WARN("Failed to create context.\n"); - device->blitter->free_private(device); - device->shader_backend->shader_free_private(device); - HeapFree(GetProcessHeap(), 0, swapchain->context); - return E_FAIL; - } - - swapchain->context[0] = context; - swapchain->num_contexts = 1; - create_dummy_textures(device, context); - create_default_samplers(device, context); - context_release(context); - - return WINED3D_OK; -} - HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, wined3d_device_reset_cb callback, BOOL reset_state)

1 0