March 2017 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : dpnet/tests: Show that async handlers are per object.
by Alexandre Julliard 17 Mar '17

17 Mar '17

Module: wine Branch: master Commit: 4239e2156ba1d066561f30936637b888a273d92a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4239e2156ba1d066561f30936… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 9 04:13:54 2017 +0000 dpnet/tests: Show that async handlers are per object. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/tests/client.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index 6503bc3..4415503 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -306,6 +306,13 @@ static void test_enum_hosts(void) todo_wine ok(lastAsyncCode == DPNERR_USERCANCEL, "got 0x%08x\n", lastAsyncCode); todo_wine ok(lastAsyncHandle == async, "got 0x%08x\n", async); + hr = IDirectPlay8Client_Initialize(client2, NULL, DirectPlayMessageHandler, 0); + ok(hr == S_OK, "got %x\n", hr); + + /* Show that handlers are per object. */ + hr = IDirectPlay8Client_CancelAsyncOperation(client2, async2, 0); + todo_wine ok(hr == DPNERR_INVALIDHANDLE, "IDirectPlay8Client_CancelAsyncOperation failed with 0x%08x\n", hr); + lastAsyncCode = E_FAIL; lastAsyncHandle = 0xdeadbeef; hr = IDirectPlay8Client_CancelAsyncOperation(client, async2, 0);

1 0

Alistair Leslie-Hughes : dpnet/tests: Add EnumHosts synchronous tests.
by Alexandre Julliard 17 Mar '17

17 Mar '17

Module: wine Branch: master Commit: cc93ec15c03d85b358ebd72acd1755ee13c926f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc93ec15c03d85b358ebd72ac… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 9 04:14:06 2017 +0000 dpnet/tests: Add EnumHosts synchronous tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/tests/client.c | 126 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index 4415503..e11bfe3 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -325,6 +325,68 @@ static void test_enum_hosts(void) IDirectPlay8Client_Release(client2); } +static void test_enum_hosts_sync(void) +{ + HRESULT hr; + IDirectPlay8Address *host = NULL; + IDirectPlay8Address *local = NULL; + DPN_APPLICATION_DESC appdesc; + DWORD port = 5445, type = 0, size; + + memset( &appdesc, 0, sizeof(DPN_APPLICATION_DESC) ); + appdesc.dwSize = sizeof( DPN_APPLICATION_DESC ); + appdesc.guidApplication = appguid; + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (void**)&local); + ok(hr == S_OK, "Failed with 0x%08x\n", hr); + + hr = IDirectPlay8Address_SetSP(local, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "Failed with 0x%08x\n", hr); + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (void**)&host); + ok(hr == S_OK, "Failed with 0x%08x\n", hr); + + hr = IDirectPlay8Address_SetSP(host, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "Failed with 0x%08x\n", hr); + + hr = IDirectPlay8Address_AddComponent(host, DPNA_KEY_HOSTNAME, localhost, sizeof(localhost), + DPNA_DATATYPE_STRING); + ok(hr == S_OK, "Failed with 0x%08x\n", hr); + + handlecnt = 0; + lastAsyncCode = 0xdeadbeef; + hr = IDirectPlay8Client_EnumHosts(client, &appdesc, host, local, NULL, 0, 3, 1500, 1000, + NULL, NULL, DPNENUMHOSTS_SYNC); + ok(hr == DPN_OK, "got 0x%08x\n", hr); + ok(lastAsyncCode == 0xdeadbeef, "got 0x%08x\n", lastAsyncCode); + todo_wine ok(handlecnt == 2, "message handler not called\n"); + + size = sizeof(port); + hr = IDirectPlay8Address_GetComponentByName(host, DPNA_KEY_PORT, &port, &size, &type); + ok(hr == DPNERR_DOESNOTEXIST, "got 0x%08x\n", hr); + + size = sizeof(port); + hr = IDirectPlay8Address_GetComponentByName(local, DPNA_KEY_PORT, &port, &size, &type); + ok(hr == DPNERR_DOESNOTEXIST, "got 0x%08x\n", hr); + + /* Try with specific port */ + port = 5445; + hr = IDirectPlay8Address_AddComponent(host, DPNA_KEY_PORT, &port, sizeof(port), + DPNA_DATATYPE_DWORD); + + handlecnt = 0; + lastAsyncCode = 0xbeefdead; + ok(hr == S_OK, "Failed with 0x%08x\n", hr); + hr = IDirectPlay8Client_EnumHosts(client, &appdesc, host, local, NULL, 0, 1, 1500, 1000, + NULL, NULL, DPNENUMHOSTS_SYNC); + ok(hr == DPN_OK, "got 0x%08x\n", hr); + ok(lastAsyncCode == 0xbeefdead, "got 0x%08x\n", lastAsyncCode); + ok(handlecnt == 0, "message handler called\n"); + + IDirectPlay8Address_Release(local); + IDirectPlay8Address_Release(host); +} + static void test_get_sp_caps(void) { DPN_SP_CAPS caps; @@ -669,6 +731,68 @@ static void test_enum_hosts_peer(void) IDirectPlay8Address_Release(host); } +static void test_enum_hosts_sync_peer(void) +{ + HRESULT hr; + IDirectPlay8Address *host = NULL; + IDirectPlay8Address *local = NULL; + DPN_APPLICATION_DESC appdesc; + DWORD port = 5445, type = 0, size; + + memset( &appdesc, 0, sizeof(DPN_APPLICATION_DESC) ); + appdesc.dwSize = sizeof( DPN_APPLICATION_DESC ); + appdesc.guidApplication = appguid; + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (void**)&local); + ok(hr == S_OK, "Failed with 0x%08x\n", hr); + + hr = IDirectPlay8Address_SetSP(local, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "Failed with 0x%08x\n", hr); + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (void**)&host); + ok(hr == S_OK, "Failed with 0x%08x\n", hr); + + hr = IDirectPlay8Address_SetSP(host, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "Failed with 0x%08x\n", hr); + + hr = IDirectPlay8Address_AddComponent(host, DPNA_KEY_HOSTNAME, localhost, sizeof(localhost), + DPNA_DATATYPE_STRING); + ok(hr == S_OK, "Failed with 0x%08x\n", hr); + + handlecnt = 0; + lastAsyncCode = 0xdeadbeef; + hr = IDirectPlay8Peer_EnumHosts(peer, &appdesc, host, local, NULL, 0, 3, 1500, 1000, + NULL, NULL, DPNENUMHOSTS_SYNC); + ok(hr == DPN_OK, "got 0x%08x\n", hr); + ok(lastAsyncCode == 0xdeadbeef, "got 0x%08x\n", lastAsyncCode); + todo_wine ok(handlecnt == 2, "wrong handle cnt\n"); + + size = sizeof(port); + hr = IDirectPlay8Address_GetComponentByName(host, DPNA_KEY_PORT, &port, &size, &type); + ok(hr == DPNERR_DOESNOTEXIST, "got 0x%08x\n", hr); + + size = sizeof(port); + hr = IDirectPlay8Address_GetComponentByName(local, DPNA_KEY_PORT, &port, &size, &type); + ok(hr == DPNERR_DOESNOTEXIST, "got 0x%08x\n", hr); + + /* Try with specific port */ + port = 5445; + hr = IDirectPlay8Address_AddComponent(host, DPNA_KEY_PORT, &port, sizeof(port), + DPNA_DATATYPE_DWORD); + + handlecnt = 0; + lastAsyncCode = 0xbeefdead; + ok(hr == S_OK, "Failed with 0x%08x\n", hr); + hr = IDirectPlay8Peer_EnumHosts(peer, &appdesc, host, local, NULL, 0, 1, 1500, 1000, + NULL, NULL, DPNENUMHOSTS_SYNC); + ok(hr == DPN_OK, "got 0x%08x\n", hr); + ok(lastAsyncCode == 0xbeefdead, "got 0x%08x\n", lastAsyncCode); + ok(handlecnt == 0, "message handler called\n"); + + IDirectPlay8Address_Release(local); + IDirectPlay8Address_Release(host); +} + static void test_get_sp_caps_peer(void) { DPN_SP_CAPS caps; @@ -830,6 +954,7 @@ START_TEST(client) test_enum_service_providers(); test_enum_hosts(); + test_enum_hosts_sync(); test_get_sp_caps(); test_player_info(); test_lobbyclient(); @@ -839,6 +964,7 @@ START_TEST(client) test_init_dp_peer(); test_enum_service_providers_peer(); test_enum_hosts_peer(); + test_enum_hosts_sync_peer(); test_get_sp_caps_peer(); test_player_info_peer(); test_cleanup_dp_peer();

1 0

Alexandre Julliard : Release 2.4.
by Alexandre Julliard 17 Mar '17

17 Mar '17

Module: wine Branch: master Commit: 6a05069a43f1a8f0e69c4cedd134f8d7400b8a95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a05069a43f1a8f0e69c4cedd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 17 21:17:48 2017 +0100 Release 2.4. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 822 +++++++++++++++++++++++++++++--------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 388 insertions(+), 454 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a05069a43f1a8f0e69c4…

1 0

Tag wine-2.4 : Alexandre Julliard : Release 2.4
by Alexandre Julliard 17 Mar '17

17 Mar '17

Module: wine Branch: refs/tags/wine-2.4 Tag: 6b4bc66d65086f1bcfd3776f5f0baadbede10ee6 URL: http://source.winehq.org/git/wine.git/?a=tag;h=6b4bc66d65086f1bcfd3776f5f0b… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 17 21:17:48 2017 +0100 Release 2.4

1 0

Nikolay Sivov : msxml3/saxreader: Handle NULL interface input in parse().
by Alexandre Julliard 17 Mar '17

17 Mar '17

Module: wine Branch: master Commit: ba018b52539aa594204c9234eb6c04196852ac78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba018b52539aa594204c9234e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 17 08:23:57 2017 +0300 msxml3/saxreader: Handle NULL interface input in parse(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/saxreader.c | 3 +++ dlls/msxml3/tests/saxreader.c | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 82241ad..0549bc8 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2664,6 +2664,9 @@ static HRESULT internal_parse( ISequentialStream *stream = NULL; IXMLDOMDocument *xmlDoc; + if (!V_UNKNOWN(&varInput)) + return E_INVALIDARG; + if(IUnknown_QueryInterface(V_UNKNOWN(&varInput), &IID_IXMLDOMDocument, (void**)&xmlDoc) == S_OK) { diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index cabca9d..34d11e6 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2221,6 +2221,16 @@ static void test_saxreader(void) SafeArrayDestroy(sa); + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = NULL; + hr = ISAXXMLReader_parse(reader, var); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + + V_VT(&var) = VT_DISPATCH; + V_DISPATCH(&var) = NULL; + hr = ISAXXMLReader_parse(reader, var); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + stream = create_test_stream(testXML, -1); V_VT(&var) = VT_UNKNOWN; V_UNKNOWN(&var) = (IUnknown*)stream;

1 0

Huw Davies : gdi32/tests: Combine the matching macros into a single function.
by Alexandre Julliard 17 Mar '17

17 Mar '17

Module: wine Branch: master Commit: 858c07f667b9211459ef6eace8efffcd006d9609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=858c07f667b9211459ef6eace… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 17 08:44:33 2017 +0000 gdi32/tests: Combine the matching macros into a single function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 7c80779..fb27f8e 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -30,10 +30,12 @@ #include "wine/test.h" -/* Do not allow more than 1 deviation here */ -#define match_off_by_1(a, b, exact) (abs((a) - (b)) <= ((exact) ? 0 : 1)) - -#define near_match(a, b) (abs((a) - (b)) <= 6) +static inline BOOL match_off_by_n(int a, int b, unsigned int n) +{ + return abs(a - b) <= n; +} +#define match_off_by_1(a, b, exact) match_off_by_n((a), (b), (exact) ? 0 : 1) +#define near_match(a, b) match_off_by_n((a), (b), 6) #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) static LONG (WINAPI *pGdiGetCharDimensions)(HDC hdc, LPTEXTMETRICW lptm, LONG *height);

1 0

Huw Davies : shell32/tests: Return early if the shell folder creation fails in order to avoid a compiler warning.
by Alexandre Julliard 17 Mar '17

17 Mar '17

Module: wine Branch: master Commit: aef764d37cc94a531174817d54db1bf50636ebd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aef764d37cc94a531174817d5… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 17 10:47:59 2017 +0000 shell32/tests: Return early if the shell folder creation fails in order to avoid a compiler warning. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfolder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 759cce6..07309ab 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3800,10 +3800,10 @@ static void test_ShellItemArrayEnumItems(void) hr = IShellFolder_BindToObject(pdesktopsf, pidl_testdir, NULL, (REFIID)&IID_IShellFolder, (void**)&psf); ok(hr == S_OK, "Got 0x%08x\n", hr); - if(SUCCEEDED(hr)) - pILFree(pidl_testdir); + pILFree(pidl_testdir); } IShellFolder_Release(pdesktopsf); + if (FAILED(hr)) return; hr = IShellFolder_EnumObjects(psf, NULL, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS, &peidl); ok(hr == S_OK, "Got %08x\n", hr);

1 0

Huw Davies : shell32/tests: Ignore the compressed attribute.
by Alexandre Julliard 17 Mar '17

17 Mar '17

Module: wine Branch: master Commit: a2eb5999cb34b4412297f0dbeef41958ae533df0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2eb5999cb34b4412297f0dbe… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 17 11:53:50 2017 +0000 shell32/tests: Ignore the compressed attribute. The Vista64 testbot VM reports its storage as compressed when run as a stand-alone job, but not during a winetest run. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfolder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 07309ab..9b0e7a7 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -454,7 +454,7 @@ static void test_EnumObjects(IShellFolder *iFolder) flags = ~0u; hr = IShellFolder_GetAttributesOf(iFolder, 1, (LPCITEMIDLIST*)(idlArr + i), &flags); ok(hr == S_OK, "GetAttributesOf returns %08x\n", hr); - ok((flags & ~SFGAO_HASSUBFOLDER) == full_attrs[i], "%d: got %08x expected %08x\n", i, flags, full_attrs[i]); + ok((flags & ~(SFGAO_HASSUBFOLDER|SFGAO_COMPRESSED)) == full_attrs[i], "%d: got %08x expected %08x\n", i, flags, full_attrs[i]); } for (i=0;i<5;i++)

1 0

Huw Davies : krnl386.exe16: Fix mask values.
by Alexandre Julliard 17 Mar '17

17 Mar '17

Module: wine Branch: master Commit: eec602fecb98952f5d5db4ddfec6ca60c9a897d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eec602fecb98952f5d5db4ddf… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 17 09:44:43 2017 +0000 krnl386.exe16: Fix mask values. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/dma.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/krnl386.exe16/dma.c b/dlls/krnl386.exe16/dma.c index 9a255ce..0eab98f 100644 --- a/dlls/krnl386.exe16/dma.c +++ b/dlls/krnl386.exe16/dma.c @@ -201,22 +201,22 @@ void DMA_ioport_out( WORD port, BYTE val ) break; /* Low Page Base Address */ - case 0x87: DMA_BaseAddress[0]=(DMA_BaseAddress[0] & (~0xFF << 16))|((val & 0xFF) << 16); break; - case 0x83: DMA_BaseAddress[1]=(DMA_BaseAddress[1] & (~0xFF << 16))|((val & 0xFF) << 16); break; - case 0x81: DMA_BaseAddress[2]=(DMA_BaseAddress[2] & (~0xFF << 16))|((val & 0xFF) << 16); break; - case 0x82: DMA_BaseAddress[3]=(DMA_BaseAddress[3] & (~0xFF << 16))|((val & 0xFF) << 16); break; - case 0x8B: DMA_BaseAddress[5]=(DMA_BaseAddress[5] & (~0xFF << 16))|((val & 0xFF) << 16); break; - case 0x89: DMA_BaseAddress[6]=(DMA_BaseAddress[6] & (~0xFF << 16))|((val & 0xFF) << 16); break; - case 0x8A: DMA_BaseAddress[7]=(DMA_BaseAddress[7] & (~0xFF << 16))|((val & 0xFF) << 16); break; + case 0x87: DMA_BaseAddress[0]=(DMA_BaseAddress[0] & 0xFF00FFFF)|((val & 0xFF) << 16); break; + case 0x83: DMA_BaseAddress[1]=(DMA_BaseAddress[1] & 0xFF00FFFF)|((val & 0xFF) << 16); break; + case 0x81: DMA_BaseAddress[2]=(DMA_BaseAddress[2] & 0xFF00FFFF)|((val & 0xFF) << 16); break; + case 0x82: DMA_BaseAddress[3]=(DMA_BaseAddress[3] & 0xFF00FFFF)|((val & 0xFF) << 16); break; + case 0x8B: DMA_BaseAddress[5]=(DMA_BaseAddress[5] & 0xFF00FFFF)|((val & 0xFF) << 16); break; + case 0x89: DMA_BaseAddress[6]=(DMA_BaseAddress[6] & 0xFF00FFFF)|((val & 0xFF) << 16); break; + case 0x8A: DMA_BaseAddress[7]=(DMA_BaseAddress[7] & 0xFF00FFFF)|((val & 0xFF) << 16); break; /* Low Page Base Address (only 4 lower bits are significant) */ - case 0x487: DMA_BaseAddress[0]=(DMA_BaseAddress[0] & (~0xFFu << 24))|((val & 0x0F) << 24); break; - case 0x483: DMA_BaseAddress[1]=(DMA_BaseAddress[1] & (~0xFFu << 24))|((val & 0x0F) << 24); break; - case 0x481: DMA_BaseAddress[2]=(DMA_BaseAddress[2] & (~0xFFu << 24))|((val & 0x0F) << 24); break; - case 0x482: DMA_BaseAddress[3]=(DMA_BaseAddress[3] & (~0xFFu << 24))|((val & 0x0F) << 24); break; - case 0x48B: DMA_BaseAddress[5]=(DMA_BaseAddress[5] & (~0xFFu << 24))|((val & 0x0F) << 24); break; - case 0x489: DMA_BaseAddress[6]=(DMA_BaseAddress[6] & (~0xFFu << 24))|((val & 0x0F) << 24); break; - case 0x48A: DMA_BaseAddress[7]=(DMA_BaseAddress[7] & (~0xFFu << 24))|((val & 0x0F) << 24); break; + case 0x487: DMA_BaseAddress[0]=(DMA_BaseAddress[0] & 0x00FFFFFF)|((val & 0x0F) << 24); break; + case 0x483: DMA_BaseAddress[1]=(DMA_BaseAddress[1] & 0x00FFFFFF)|((val & 0x0F) << 24); break; + case 0x481: DMA_BaseAddress[2]=(DMA_BaseAddress[2] & 0x00FFFFFF)|((val & 0x0F) << 24); break; + case 0x482: DMA_BaseAddress[3]=(DMA_BaseAddress[3] & 0x00FFFFFF)|((val & 0x0F) << 24); break; + case 0x48B: DMA_BaseAddress[5]=(DMA_BaseAddress[5] & 0x00FFFFFF)|((val & 0x0F) << 24); break; + case 0x489: DMA_BaseAddress[6]=(DMA_BaseAddress[6] & 0x00FFFFFF)|((val & 0x0F) << 24); break; + case 0x48A: DMA_BaseAddress[7]=(DMA_BaseAddress[7] & 0x00FFFFFF)|((val & 0x0F) << 24); break; case 0x08: case 0xD0:

1 0

Henri Verbeet : wined3d: Avoid device_invalidate_state() in wined3d_texture_set_lod().
by Alexandre Julliard 17 Mar '17

17 Mar '17

Module: wine Branch: master Commit: d9d5dcee2b166e28eacc417970747e24fe97b9a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9d5dcee2b166e28eacc41797… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 17 13:33:15 2017 +0100 wined3d: Avoid device_invalidate_state() in wined3d_texture_set_lod(). It's not safe to call device_invalidate_state() outside the CS. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a1aba36..ddc128c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1140,13 +1140,16 @@ DWORD CDECL wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod) if (texture->lod != lod) { + struct wined3d_device *device = texture->resource.device; + wined3d_resource_wait_idle(&texture->resource); texture->lod = lod; texture->texture_rgb.base_level = ~0u; texture->texture_srgb.base_level = ~0u; if (texture->resource.bind_count) - device_invalidate_state(texture->resource.device, STATE_SAMPLER(texture->sampler)); + wined3d_cs_emit_set_sampler_state(device->cs, texture->sampler, WINED3D_SAMP_MAX_MIP_LEVEL, + device->state.sampler_states[texture->sampler][WINED3D_SAMP_MAX_MIP_LEVEL]); } return old;

1 0