February 2015 - Wine-commits

Matteo Bruni : d3d8/tests: Allow more alternative results in the ATI1N test.
by Alexandre Julliard 19 Feb '15

19 Feb '15

Module: wine Branch: master Commit: d49d2a5d470e6a3c0bb2ba0dd1c1bcab798be6d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d49d2a5d470e6a3c0bb2ba0dd… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 18 14:20:46 2015 +0100 d3d8/tests: Allow more alternative results in the ATI1N test. --- dlls/d3d8/tests/visual.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index c095463..85b3fad 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5130,15 +5130,17 @@ static void test_3dc_formats(void) static const struct { struct vec2 position; - D3DCOLOR amd; - D3DCOLOR nvidia; + D3DCOLOR amd_r500; + D3DCOLOR amd_r600; + D3DCOLOR nvidia_old; + D3DCOLOR nvidia_new; } expected_colors[] = { - {{ 80, 240}, 0x003f3f3f, 0x007f0000}, - {{240, 240}, 0x003f3f3f, 0x007f0000}, - {{400, 240}, 0x00007fff, 0x00007fff}, - {{560, 240}, 0x007f00ff, 0x007f00ff}, + {{ 80, 240}, 0x007fffff, 0x003f3f3f, 0x007f7f7f, 0x007f0000}, + {{240, 240}, 0x007fffff, 0x003f3f3f, 0x007f7f7f, 0x007f0000}, + {{400, 240}, 0x00007fff, 0x00007fff, 0x00007fff, 0x00007fff}, + {{560, 240}, 0x007f00ff, 0x007f00ff, 0x007f00ff, 0x007f00ff}, }; IDirect3D8 *d3d; IDirect3DDevice8 *device; @@ -5236,9 +5238,11 @@ static void test_3dc_formats(void) for (i = 0; i < 4; ++i) { color = getPixelColor(device, expected_colors[i].position.x, expected_colors[i].position.y); - ok (color_match(color, expected_colors[i].amd, 1) || color_match(color, expected_colors[i].nvidia, 1), - "Expected color 0x%08x or 0x%08x, got 0x%08x, case %u.\n", - expected_colors[i].amd, expected_colors[i].nvidia, color, i); + ok (color_match(color, expected_colors[i].amd_r500, 1) + || color_match(color, expected_colors[i].amd_r600, 1) + || color_match(color, expected_colors[i].nvidia_old, 1) + || color_match(color, expected_colors[i].nvidia_new, 1), + "Got unexpected color 0x%08x, case %u.\n", color, i); } hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL);

1 0

Matteo Bruni : wined3d: Set the surface pitch for user-memory surfaces.
by Alexandre Julliard 19 Feb '15

19 Feb '15

Module: wine Branch: master Commit: d56c168da12d890b0ed3c2f22c4554d3d1140252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d56c168da12d890b0ed3c2f22… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 18 14:20:47 2015 +0100 wined3d: Set the surface pitch for user-memory surfaces. --- dlls/wined3d/surface.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 096579f..429147e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2187,10 +2187,16 @@ HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface, surface->resource.multisample_type = texture_resource->multisample_type; surface->resource.multisample_quality = texture_resource->multisample_quality; if (surface->pitch) + { surface->resource.size = height * surface->pitch; + } else + { + /* User memory surfaces don't have the regular surface alignment. */ surface->resource.size = wined3d_format_calculate_size(texture_resource->format, - texture_resource->device->surface_alignment, width, height, 1); + 1, width, height, 1); + surface->pitch = wined3d_format_calculate_pitch(texture_resource->format, width); + } /* The format might be changed to a format that needs conversion. * If the surface didn't use PBOs previously but could now, don't

1 0

Matteo Bruni : wined3d: Reject unsupported pitches in wined3d_surface_update_desc().
by Alexandre Julliard 19 Feb '15

19 Feb '15

Module: wine Branch: master Commit: b47695bf3abd188a9e4185c43df3c80ea92bd74b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b47695bf3abd188a9e4185c43… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 18 19:21:00 2015 +0100 wined3d: Reject unsupported pitches in wined3d_surface_update_desc(). --- dlls/wined3d/texture.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 675ca9e..6b2e266 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -658,6 +658,19 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT return WINED3DERR_INVALIDCALL; } + /* We have no way of supporting a pitch that is not a multiple of the pixel + * byte width short of uploading the texture row-by-row. + * Fortunately that's not an issue since D3D9Ex doesn't allow a custom pitch + * for user-memory textures (it always expects packed data) while DirectDraw + * requires a 4-byte aligned pitch and doesn't support texture formats + * larger than 4 bytes per pixel nor any format using 3 bytes per pixel. + * This check is here to verify that the assumption holds. */ + if (pitch % texture->resource.format->byte_count) + { + WARN("Pitch unsupported, not a multiple of the texture format byte width.\n"); + return WINED3DERR_INVALIDCALL; + } + surface = surface_from_resource(texture->sub_resources[0]); if (surface->resource.map_count || (surface->flags & SFLAG_DCINUSE)) {

1 0

Matteo Bruni : wined3d: Make sure the correct texture is bound in device_update_volume.
by Alexandre Julliard 19 Feb '15

19 Feb '15

Module: wine Branch: master Commit: 7c4d512fee752876b4ce95f1f97308f6a291b010 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c4d512fee752876b4ce95f1f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 18 14:20:49 2015 +0100 wined3d: Make sure the correct texture is bound in device_update_volume. --- dlls/wined3d/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 649f324..8cab927 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3501,6 +3501,7 @@ static HRESULT device_update_volume(struct wined3d_device *device, /* Only a prepare, since we're uploading the entire volume. */ wined3d_texture_prepare_texture(dst_volume->container, context, FALSE); + wined3d_texture_bind(dst_volume->container, context, FALSE); data.buffer_object = 0; data.addr = src.data;

1 0

Alex Henrie : dpvoice/tests: Add GetCompressionTypes tests.
by Alexandre Julliard 19 Feb '15

19 Feb '15

Module: wine Branch: master Commit: d3c87e50008b696b0089ce652cd8b5ba60ae3fc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c87e50008b696b0089ce652… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Feb 19 00:00:34 2015 -0700 dpvoice/tests: Add GetCompressionTypes tests. --- dlls/dpvoice/tests/voice.c | 207 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 205 insertions(+), 2 deletions(-) diff --git a/dlls/dpvoice/tests/voice.c b/dlls/dpvoice/tests/voice.c index 8048280..fe2db94 100644 --- a/dlls/dpvoice/tests/voice.c +++ b/dlls/dpvoice/tests/voice.c @@ -21,6 +21,7 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <stdio.h> +#include <assert.h> #include <initguid.h> #include <dplay8.h> @@ -343,6 +344,195 @@ static void create_voicetest(void) } } +static void test_GetCompressionTypes(IDirectPlayVoiceClient *client_iface, IDirectPlayVoiceServer *server_iface) +{ + const char *name = client_iface ? "client" : "server"; + HRESULT ret; + DVCOMPRESSIONINFO data[32]; + DWORD data_size = 0, num_elements, i, j; + WCHAR *string_loc; + BOOL found_pcm; + + /* some variables are initialized to 99 just to check that they are not overwritten with 0 */ + static struct + { + /* inputs */ + DWORD data_size; + DWORD num_elements; + DWORD flags; + /* expected output */ + HRESULT ret; + /* test flags */ + enum + { + NULL_DATA = 1, + NULL_DATA_SIZE = 2, + NULL_NUM_ELEMENTS = 4, + SHARED_VARIABLE = 8 + } + test_flags; + } + tests[] = + { + /* tests NULL data with an insufficient data_size */ + { 10, 0, 0, DVERR_BUFFERTOOSMALL, NULL_DATA }, + + /* tests NULL data with an ample data_size */ + { sizeof(data) - 1, 0, 0, DVERR_INVALIDPOINTER, NULL_DATA }, + + /* tests NULL data_size */ + { 0, 99, 0, DVERR_INVALIDPOINTER, NULL_DATA_SIZE }, + + /* tests NULL num_elements */ + { 99, 0, 0, DVERR_INVALIDPOINTER, NULL_NUM_ELEMENTS }, + + /* tests NULL everything */ + { 99, 99, 0, DVERR_INVALIDPOINTER, NULL_DATA | NULL_DATA_SIZE | NULL_NUM_ELEMENTS }, + + /* tests passing the same pointer for data_size and num_elements */ + { 10, 0, 0, DVERR_BUFFERTOOSMALL, SHARED_VARIABLE }, + + /* tests passing the same pointer but with an ample data_size */ + { sizeof(data) - 1, 0, 0, DVERR_BUFFERTOOSMALL, SHARED_VARIABLE }, + + /* tests flags!=0 */ + { 99, 99, 1, DVERR_INVALIDFLAGS }, + + /* tests data_size=0 */ + { 0, 0, 0, DVERR_BUFFERTOOSMALL }, + + /* tests data_size=1 */ + { 1, 0, 0, DVERR_BUFFERTOOSMALL }, + + /* tests data_size = sizeof(DVCOMPRESSIONINFO) */ + { sizeof(DVCOMPRESSIONINFO), 0, 0, DVERR_BUFFERTOOSMALL }, + + /* tests data_size = returned data_size - 1 */ + { 0 /* initialized later */, 0, 0, DVERR_BUFFERTOOSMALL }, + + /* tests data_size = returned data_size */ + { 0 /* initialized later */, 0, 0, DV_OK }, + + /* tests data_size = returned data_size + 1 */ + { 0 /* initialized later */, 0, 0, DV_OK } + }; + + /* either client_iface or server_iface must be given, but not both */ + assert(!client_iface ^ !server_iface); + + if(client_iface) + ret = IDirectPlayVoiceClient_GetCompressionTypes(client_iface, NULL, NULL, NULL, 0); + else + ret = IDirectPlayVoiceServer_GetCompressionTypes(server_iface, NULL, NULL, NULL, 0); + if(ret == E_NOTIMPL) + { + skip("%s: GetCompressionTypes not implemented\n", name); + return; + } + + if (client_iface) + ret = IDirectPlayVoiceClient_GetCompressionTypes(client_iface, NULL, &data_size, &num_elements, 0); + else + ret = IDirectPlayVoiceServer_GetCompressionTypes(server_iface, NULL, &data_size, &num_elements, 0); + ok(ret == DVERR_BUFFERTOOSMALL, + "%s: expected ret=%x got ret=%x\n", name, DVERR_BUFFERTOOSMALL, ret); + ok(data_size > sizeof(DVCOMPRESSIONINFO) && data_size < sizeof(data) - 1, + "%s: got data_size=%u\n", name, data_size); + tests[sizeof(tests) / sizeof(tests[0]) - 3].data_size = data_size - 1; + tests[sizeof(tests) / sizeof(tests[0]) - 2].data_size = data_size; + tests[sizeof(tests) / sizeof(tests[0]) - 1].data_size = data_size + 1; + + for(i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + { + memset(data, 0x23, sizeof(data)); + + data_size = tests[i].data_size; + num_elements = tests[i].num_elements; + + if(client_iface) + ret = IDirectPlayVoiceClient_GetCompressionTypes( + client_iface, + tests[i].test_flags & NULL_DATA ? NULL : data, + tests[i].test_flags & NULL_DATA_SIZE ? NULL : &data_size, + tests[i].test_flags & NULL_NUM_ELEMENTS ? NULL : + tests[i].test_flags & SHARED_VARIABLE ? &data_size : &num_elements, + tests[i].flags + ); + else + ret = IDirectPlayVoiceServer_GetCompressionTypes( + server_iface, + tests[i].test_flags & NULL_DATA ? NULL : data, + tests[i].test_flags & NULL_DATA_SIZE ? NULL : &data_size, + tests[i].test_flags & NULL_NUM_ELEMENTS ? NULL : + tests[i].test_flags & SHARED_VARIABLE ? &data_size : &num_elements, + tests[i].flags + ); + + ok(ret == tests[i].ret, + "%s: tests[%u]: expected ret=%x got ret=%x\n", name, i, tests[i].ret, ret); + + if(ret == DV_OK || ret == DVERR_BUFFERTOOSMALL || tests[i].test_flags == NULL_DATA) + { + ok(data_size > sizeof(DVCOMPRESSIONINFO) && data_size < sizeof(data) - 1, + "%s: tests[%u]: got data_size=%u\n", name, i, data_size); + if(!(tests[i].test_flags & SHARED_VARIABLE)) + ok(num_elements > 0 && num_elements < data_size / sizeof(DVCOMPRESSIONINFO) + 1, + "%s: tests[%u]: got num_elements=%u\n", name, i, num_elements); + } + else + { + ok(data_size == tests[i].data_size, + "%s: tests[%u]: expected data_size=%u got data_size=%u\n", + name, i, tests[i].data_size, data_size); + ok(num_elements == tests[i].num_elements, + "%s: tests[%u]: expected num_elements=%u got num_elements=%u\n", + name, i, tests[i].num_elements, num_elements); + } + + if(ret == DV_OK) + { + string_loc = (WCHAR*)(data + num_elements); + found_pcm = FALSE; + for(j = 0; j < num_elements; j++) + { + if(memcmp(&data[j].guidType, &DPVCTGUID_NONE, sizeof(GUID)) == 0) + { + ok(data[j].dwMaxBitsPerSecond == 64000, + "%s: tests[%u]: data[%u]: expected dwMaxBitsPerSecond=64000 got dwMaxBitsPerSecond=%u\n", + name, i, j, data[j].dwMaxBitsPerSecond); + found_pcm = TRUE; + } + ok(data[j].dwSize == 80, + "%s: tests[%u]: data[%u]: expected dwSize=80 got dwSize=%u\n", + name, i, j, data[j].dwSize); + ok(data[j].lpszName == string_loc, + "%s: tests[%u]: data[%u]: expected lpszName=%p got lpszName=%p\n", + name, i, j, string_loc, data[j].lpszName); + ok(!data[j].lpszDescription, + "%s: tests[%u]: data[%u]: expected lpszDescription=NULL got lpszDescription=%s\n", + name, i, j, wine_dbgstr_w(data[j].lpszDescription)); + ok(!data[j].dwFlags, + "%s: tests[%u]: data[%u]: expected dwFlags=0 got dwFlags=%u\n", + name, i, j, data[j].dwFlags); + string_loc += lstrlenW(data[j].lpszName) + 1; + } + ok((char*)string_loc == (char*)data + data_size, + "%s: tests[%u]: expected string_loc=%p got string_loc=%p\n", + name, i, (char*)data + data_size, string_loc); + ok(*(char*)string_loc == 0x23, + "%s: tests[%u]: expected *(char*)string_loc=0x23 got *(char*)string_loc=0x%x\n", + name, i, *(char*)string_loc); + ok(found_pcm, "%s: tests[%u]: MS-PCM codec not found\n", name, i); + } + else + { + ok(*(char*)data == 0x23, + "%s: tests[%u]: expected *(char*)data=0x23 got *(char*)data=0x%x\n", + name, i, *(char*)data); + } + } +} + START_TEST(voice) { HRESULT hr; @@ -354,9 +544,22 @@ START_TEST(voice) create_voicetest(); - if(test_init_dpvoice_server() && test_init_dpvoice_client()) + if(test_init_dpvoice_server()) + { + test_GetCompressionTypes(NULL, vserver); + + if(test_init_dpvoice_client()) + { + test_GetCompressionTypes(vclient, NULL); + } + else + { + skip("client failed to initialize\n"); + } + } + else { - /* TODO */ + skip("server failed to initialize\n"); } test_cleanup_dpvoice();

1 0

Alex Henrie : dpvoice: Turn GetCompressionTypes into a semi-stub.
by Alexandre Julliard 19 Feb '15

19 Feb '15

Module: wine Branch: master Commit: 5cd04574084c3e39d41d50fd61a70b53eb04a0a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cd04574084c3e39d41d50fd6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Feb 19 00:00:35 2015 -0700 dpvoice: Turn GetCompressionTypes into a semi-stub. --- dlls/dpvoice/client.c | 5 +++-- dlls/dpvoice/dvoice_private.h | 1 + dlls/dpvoice/server.c | 43 +++++++++++++++++++++++++++++++++++++++++-- dlls/dpvoice/tests/voice.c | 10 ---------- 4 files changed, 45 insertions(+), 14 deletions(-) diff --git a/dlls/dpvoice/client.c b/dlls/dpvoice/client.c index 29b5336..bdae160 100644 --- a/dlls/dpvoice/client.c +++ b/dlls/dpvoice/client.c @@ -32,6 +32,7 @@ #include "wine/debug.h" #include "dvoice.h" +#include "dvoice_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dpvoice); @@ -149,8 +150,8 @@ static HRESULT WINAPI dpvclient_GetCompressionTypes(IDirectPlayVoiceClient *ifac DWORD *pdwDataSize, DWORD *pdwNumElements, DWORD dwFlags) { IDirectPlayVoiceClientImpl *This = impl_from_IDirectPlayVoiceClient(iface); - FIXME("%p %p %p %p %d\n", This, pData, pdwDataSize, pdwNumElements, dwFlags); - return E_NOTIMPL; + FIXME("%p %p %p %p %d semi-stub\n", This, pData, pdwDataSize, pdwNumElements, dwFlags); + return DPVOICE_GetCompressionTypes(pData, pdwDataSize, pdwNumElements, dwFlags); } static HRESULT WINAPI dpvclient_SetTransmitTargets(IDirectPlayVoiceClient *iface, PDVID pdvIDTargets, diff --git a/dlls/dpvoice/dvoice_private.h b/dlls/dpvoice/dvoice_private.h index 5b0e57d..ededeab 100644 --- a/dlls/dpvoice/dvoice_private.h +++ b/dlls/dpvoice/dvoice_private.h @@ -23,5 +23,6 @@ extern HRESULT DPVOICE_CreateDirectPlayVoiceClient(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppobj) DECLSPEC_HIDDEN; extern HRESULT DPVOICE_CreateDirectPlayVoiceServer(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppobj) DECLSPEC_HIDDEN; extern HRESULT DPVOICE_CreateDirectPlayVoiceTest(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppobj) DECLSPEC_HIDDEN; +extern HRESULT DPVOICE_GetCompressionTypes(DVCOMPRESSIONINFO *pData, DWORD *pdwDataSize, DWORD *pdwNumElements, DWORD dwFlags) DECLSPEC_HIDDEN; #endif diff --git a/dlls/dpvoice/server.c b/dlls/dpvoice/server.c index e9291e2..80ef199 100644 --- a/dlls/dpvoice/server.c +++ b/dlls/dpvoice/server.c @@ -41,6 +41,45 @@ typedef struct IDirectPlayVoiceServerImpl LONG ref; } IDirectPlayVoiceServerImpl; +HRESULT DPVOICE_GetCompressionTypes(DVCOMPRESSIONINFO *pData, DWORD *pdwDataSize, DWORD *pdwNumElements, DWORD dwFlags) +{ + static const DVCOMPRESSIONINFO pcm_type = + {80, {0x8de12fd4,0x7cb3,0x48ce,{0xa7,0xe8,0x9c,0x47,0xa2,0x2e,0x8a,0xc5}}, NULL, NULL, 0, 64000}; + static const WCHAR pcm_name[] = + {'M','S','-','P','C','M',' ','6','4',' ','k','b','i','t','/','s',0}; + + HRESULT ret; + LPWSTR string_loc; + + if (!pdwDataSize || !pdwNumElements) + return DVERR_INVALIDPOINTER; + + if (dwFlags) + return DVERR_INVALIDFLAGS; + + *pdwNumElements = 1; + + if (*pdwDataSize < sizeof(pcm_type) + sizeof(pcm_name)) + { + ret = DVERR_BUFFERTOOSMALL; + } + else if (!pData) + { + ret = DVERR_INVALIDPOINTER; + } + else + { + string_loc = (LPWSTR)((char*)pData + sizeof(pcm_type)); + memcpy(pData, &pcm_type, sizeof(pcm_type)); + memcpy(string_loc, pcm_name, sizeof(pcm_name)); + pData->lpszName = string_loc; + ret = DV_OK; + } + + *pdwDataSize = sizeof(pcm_type) + sizeof(pcm_name); + return ret; +} + static inline IDirectPlayVoiceServerImpl *impl_from_IDirectPlayVoiceServer(IDirectPlayVoiceServer *iface) { return CONTAINING_RECORD(iface, IDirectPlayVoiceServerImpl, IDirectPlayVoiceServer_iface); @@ -130,8 +169,8 @@ static HRESULT WINAPI dpvserver_GetCompressionTypes(IDirectPlayVoiceServer *ifac DWORD *pdwNumElements, DWORD dwFlags) { IDirectPlayVoiceServerImpl *This = impl_from_IDirectPlayVoiceServer(iface); - FIXME("%p %p %p %p %d\n", This, pData, pdwDataSize, pdwNumElements, dwFlags); - return E_NOTIMPL; + FIXME("%p %p %p %p %d semi-stub\n", This, pData, pdwDataSize, pdwNumElements, dwFlags); + return DPVOICE_GetCompressionTypes(pData, pdwDataSize, pdwNumElements, dwFlags); } static HRESULT WINAPI dpvserver_SetTransmitTargets(IDirectPlayVoiceServer *iface, DVID dvSource, PDVID pdvIDTargets, diff --git a/dlls/dpvoice/tests/voice.c b/dlls/dpvoice/tests/voice.c index fe2db94..7f0faa3 100644 --- a/dlls/dpvoice/tests/voice.c +++ b/dlls/dpvoice/tests/voice.c @@ -420,16 +420,6 @@ static void test_GetCompressionTypes(IDirectPlayVoiceClient *client_iface, IDire /* either client_iface or server_iface must be given, but not both */ assert(!client_iface ^ !server_iface); - if(client_iface) - ret = IDirectPlayVoiceClient_GetCompressionTypes(client_iface, NULL, NULL, NULL, 0); - else - ret = IDirectPlayVoiceServer_GetCompressionTypes(server_iface, NULL, NULL, NULL, 0); - if(ret == E_NOTIMPL) - { - skip("%s: GetCompressionTypes not implemented\n", name); - return; - } - if (client_iface) ret = IDirectPlayVoiceClient_GetCompressionTypes(client_iface, NULL, &data_size, &num_elements, 0); else

1 0

Austin English : xapofx1_5: Add stub dll.
by Alexandre Julliard 18 Feb '15

18 Feb '15

Module: wine Branch: master Commit: 91cba2f1a8dc96056739168390342b8325704bc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91cba2f1a8dc9605673916839… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 12 10:58:02 2015 -0800 xapofx1_5: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/xapofx1_5/Makefile.in | 4 ++++ dlls/xapofx1_5/main.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/xapofx1_5/xapofx1_5.spec | 1 + 5 files changed, 45 insertions(+) diff --git a/configure b/configure index abef0c3..0deacd1 100755 --- a/configure +++ b/configure @@ -1325,6 +1325,7 @@ enable_wuapi enable_wuaueng enable_x3daudio1_7 enable_xapofx1_1 +enable_xapofx1_5 enable_xaudio2_7 enable_xinput1_1 enable_xinput1_2 @@ -17675,6 +17676,7 @@ wine_fn_config_dll wuapi enable_wuapi clean wine_fn_config_dll wuaueng enable_wuaueng wine_fn_config_dll x3daudio1_7 enable_x3daudio1_7 wine_fn_config_dll xapofx1_1 enable_xapofx1_1 +wine_fn_config_dll xapofx1_5 enable_xapofx1_5 wine_fn_config_dll xaudio2_7 enable_xaudio2_7 wine_fn_config_dll xinput1_1 enable_xinput1_1 wine_fn_config_dll xinput1_2 enable_xinput1_2 diff --git a/configure.ac b/configure.ac index 2e6cb4c..11a3b78 100644 --- a/configure.ac +++ b/configure.ac @@ -3386,6 +3386,7 @@ WINE_CONFIG_DLL(wuapi,,[clean]) WINE_CONFIG_DLL(wuaueng) WINE_CONFIG_DLL(x3daudio1_7) WINE_CONFIG_DLL(xapofx1_1) +WINE_CONFIG_DLL(xapofx1_5) WINE_CONFIG_DLL(xaudio2_7) WINE_CONFIG_DLL(xinput1_1) WINE_CONFIG_DLL(xinput1_2) diff --git a/dlls/xapofx1_5/Makefile.in b/dlls/xapofx1_5/Makefile.in new file mode 100644 index 0000000..e0c6e9a --- /dev/null +++ b/dlls/xapofx1_5/Makefile.in @@ -0,0 +1,4 @@ +MODULE = xapofx1_5.dll + +C_SRCS = \ + main.c diff --git a/dlls/xapofx1_5/main.c b/dlls/xapofx1_5/main.c new file mode 100644 index 0000000..1b223ad --- /dev/null +++ b/dlls/xapofx1_5/main.c @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2015 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/xapofx1_5/xapofx1_5.spec b/dlls/xapofx1_5/xapofx1_5.spec new file mode 100644 index 0000000..33269e3 --- /dev/null +++ b/dlls/xapofx1_5/xapofx1_5.spec @@ -0,0 +1 @@ +@ stub CreateFX

1 0

Stefan Dösinger : wined3d: Manage color key changes in the texture.
by Alexandre Julliard 18 Feb '15

18 Feb '15

Module: wine Branch: master Commit: e53d22b0c002bbea2dfa3fc40d9587ee8b905018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e53d22b0c002bbea2dfa3fc40… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 17 23:09:36 2015 +0100 wined3d: Manage color key changes in the texture. This fixes a regression with color keyed mipmaps that was introduced by ee8a5b7dd1e554ef32229c766715f23ba17c9f6c. surface_load for level n+1 would call texture_force_reload, thus removing level n from the GL texture. --- dlls/wined3d/surface.c | 36 ++---------------------------------- dlls/wined3d/texture.c | 25 ++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 9 ++++----- 3 files changed, 30 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8f60769..06d8433 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1814,43 +1814,18 @@ GLenum surface_get_gl_buffer(const struct wined3d_surface *surface) void surface_load(struct wined3d_surface *surface, BOOL srgb) { DWORD location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; - BOOL ck_changed; TRACE("surface %p, srgb %#x.\n", surface, srgb); if (surface->resource.pool == WINED3D_POOL_SCRATCH) ERR("Not supported on scratch surfaces.\n"); - ck_changed = !(surface->flags & SFLAG_GLCKEY) != !(surface->container->color_key_flags & WINED3D_CKEY_SRC_BLT); - - /* Reload if either the texture and sysmem have different ideas about the - * color key, or the actual key values changed. */ - if (ck_changed || ((surface->container->color_key_flags & WINED3D_CKEY_SRC_BLT) - && (surface->gl_color_key.color_space_low_value - != surface->container->src_blt_color_key.color_space_low_value - || surface->gl_color_key.color_space_high_value - != surface->container->src_blt_color_key.color_space_high_value))) - { - TRACE("Reloading because of color keying\n"); - /* To perform the color key conversion we need a sysmem copy of - * the surface. Make sure we have it. */ - - surface_prepare_map_memory(surface); - surface_load_location(surface, surface->resource.map_binding); - surface_invalidate_location(surface, ~surface->resource.map_binding); - /* Switching color keying on / off may change the internal format. */ - if (ck_changed) - wined3d_texture_force_reload(surface->container); - } - else if (!(surface->locations & location)) - { - TRACE("Reloading because surface is dirty.\n"); - } - else + if (surface->locations & location) { TRACE("surface is already in texture\n"); return; } + TRACE("Reloading because surface is dirty.\n"); surface_load_location(surface, location); surface_evict_sysmem(surface); @@ -4179,13 +4154,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, wined3d_texture_prepare_texture(texture, context, srgb); wined3d_texture_bind_and_dirtify(texture, context, srgb); - if (texture->color_key_flags & WINED3D_CKEY_SRC_BLT) - { - surface->flags |= SFLAG_GLCKEY; - surface->gl_color_key = texture->src_blt_color_key; - } - else surface->flags &= ~SFLAG_GLCKEY; - width = surface->resource.width; src_pitch = wined3d_surface_get_pitch(surface); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 57c8ef7..675ca9e 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -456,6 +456,22 @@ void wined3d_texture_load(struct wined3d_texture *texture, else flag = WINED3D_TEXTURE_RGB_VALID; + if (!(texture->flags & WINED3D_TEXTURE_COLOR_KEY) != !(texture->color_key_flags & WINED3D_CKEY_SRC_BLT) + || (texture->flags & WINED3D_TEXTURE_COLOR_KEY + && (texture->gl_color_key.color_space_low_value != texture->src_blt_color_key.color_space_low_value + || texture->gl_color_key.color_space_high_value != texture->src_blt_color_key.color_space_high_value))) + { + unsigned int sub_count = texture->level_count * texture->layer_count; + unsigned int i; + + TRACE("Reloading because of color key value change.\n"); + for (i = 0; i < sub_count; i++) + texture->texture_ops->texture_sub_resource_add_dirty_region(texture->sub_resources[i], NULL); + wined3d_texture_set_dirty(texture); + + texture->gl_color_key = texture->src_blt_color_key; + } + if (texture->flags & flag) { TRACE("Texture %p not dirty, nothing to do.\n", texture); @@ -665,9 +681,15 @@ void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct win { DWORD alloc_flag = srgb ? WINED3D_TEXTURE_SRGB_ALLOCATED : WINED3D_TEXTURE_RGB_ALLOCATED; + if (!(texture->flags & WINED3D_TEXTURE_COLOR_KEY) != !(texture->color_key_flags & WINED3D_CKEY_SRC_BLT)) + wined3d_texture_force_reload(texture); + if (texture->flags & alloc_flag) return; + if (texture->color_key_flags & WINED3D_CKEY_SRC_BLT) + texture->flags |= WINED3D_TEXTURE_COLOR_KEY; + texture->texture_ops->texture_prepare_texture(texture, context, srgb); texture->flags |= alloc_flag; } @@ -677,7 +699,8 @@ void wined3d_texture_force_reload(struct wined3d_texture *texture) unsigned int sub_count = texture->level_count * texture->layer_count; unsigned int i; - texture->flags &= ~(WINED3D_TEXTURE_RGB_ALLOCATED | WINED3D_TEXTURE_SRGB_ALLOCATED | WINED3D_TEXTURE_CONVERTED); + texture->flags &= ~(WINED3D_TEXTURE_RGB_ALLOCATED | WINED3D_TEXTURE_SRGB_ALLOCATED + | WINED3D_TEXTURE_CONVERTED | WINED3D_TEXTURE_COLOR_KEY); for (i = 0; i < sub_count; ++i) { texture->texture_ops->texture_sub_resource_invalidate_location(texture->sub_resources[i], diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d924271..b0c7a53 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2181,6 +2181,7 @@ struct wined3d_texture_ops #define WINED3D_TEXTURE_PIN_SYSMEM 0x00000100 #define WINED3D_TEXTURE_DYNAMIC_MAP 0x00000200 #define WINED3D_TEXTURE_NORMALIZED_COORDS 0x00000400 +#define WINED3D_TEXTURE_COLOR_KEY 0x00000800 struct wined3d_texture { @@ -2203,6 +2204,7 @@ struct wined3d_texture struct wined3d_color_key src_blt_color_key; struct wined3d_color_key dst_overlay_color_key; struct wined3d_color_key src_overlay_color_key; + struct wined3d_color_key gl_color_key; DWORD color_key_flags; }; @@ -2336,8 +2338,6 @@ struct wined3d_surface struct wined3d_surface_dib dib; HDC hDC; - struct wined3d_color_key gl_color_key; - struct list renderbuffers; const struct wined3d_renderbuffer_entry *current_renderbuffer; SIZE ds_current_size; @@ -2404,9 +2404,8 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_DISCARD 0x00000002 /* ??? */ #define SFLAG_NONPOW2 0x00000004 /* Surface sizes are not a power of 2 */ #define SFLAG_LOST 0x00000008 /* Surface lost flag for ddraw. */ -#define SFLAG_GLCKEY 0x00000010 /* The GL texture was created with a color key. */ -#define SFLAG_CLIENT 0x00000020 /* GL_APPLE_client_storage is used with this surface. */ -#define SFLAG_DCINUSE 0x00000040 /* Set between GetDC and ReleaseDC calls. */ +#define SFLAG_CLIENT 0x00000010 /* GL_APPLE_client_storage is used with this surface. */ +#define SFLAG_DCINUSE 0x00000020 /* Set between GetDC and ReleaseDC calls. */ struct wined3d_sampler {

1 0

Stefan Dösinger : wined3d: Read WINED3D_TEXTURE_COLOR_KEY and gl_color_key to find format conversions.
by Alexandre Julliard 18 Feb '15

18 Feb '15

Module: wine Branch: master Commit: 52ab9e382e7ac7a538a2688aee9cc2fb8367cc40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52ab9e382e7ac7a538a2688ae… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 17 23:09:37 2015 +0100 wined3d: Read WINED3D_TEXTURE_COLOR_KEY and gl_color_key to find format conversions. The idea is to make it clear that wined3d_texture_load is responsible for checking the color key for changes. Once we can do color keying in the shader we also have one place where we can disable the surface conversion. --- dlls/wined3d/surface.c | 2 +- dlls/wined3d/utils.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 06d8433..096579f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4217,7 +4217,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, if (texture->swapchain && texture->swapchain->palette) palette = texture->swapchain->palette; conversion->convert(data.addr, src_pitch, mem, dst_pitch, - width, height, palette, &texture->src_blt_color_key); + width, height, palette, &texture->gl_color_key); src_pitch = dst_pitch; data.addr = mem; } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9e9fc49..1ce23ac 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -795,7 +795,7 @@ const struct wined3d_color_key_conversion * wined3d_format_get_color_key_convers WINED3DFMT_B8G8R8A8_UNORM, convert_p8_uint_b8g8r8a8_unorm }; - if (need_alpha_ck && (texture->color_key_flags & WINED3D_CKEY_SRC_BLT)) + if (need_alpha_ck && (texture->flags & WINED3D_TEXTURE_COLOR_KEY)) { for (i = 0; i < sizeof(color_key_info) / sizeof(*color_key_info); ++i) {

1 0

Henri Verbeet : dxgi: Implement dxgi_swapchain_GetPrivateData().
by Alexandre Julliard 18 Feb '15

18 Feb '15

Module: wine Branch: master Commit: 3beaf224ea2c8a331e717857796375f325e0c053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3beaf224ea2c8a331e7178577… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 18 10:39:28 2015 +0100 dxgi: Implement dxgi_swapchain_GetPrivateData(). --- dlls/dxgi/swapchain.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index a348ecc..d3f2289 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -102,9 +102,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_SetPrivateDataInterface(IDXGISwa static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetPrivateData(IDXGISwapChain *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct dxgi_swapchain *swapchain = impl_from_IDXGISwapChain(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return dxgi_get_private_data(&swapchain->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetParent(IDXGISwapChain *iface, REFIID riid, void **parent)

1 0