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

Iván Matellanes : msvcirt: Implement Iostream_init constructor.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 1978c7d7169559f3ce48f9fe29867eb3c8707143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1978c7d7169559f3ce48f9fe2… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Aug 17 11:57:37 2016 +0100 msvcirt: Implement Iostream_init constructor. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 8 +++- dlls/msvcirt/tests/msvcirt.c | 109 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+), 1 deletion(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 6cc8f1c..4597060 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -4037,7 +4037,13 @@ iostream* __thiscall iostream_scalar_dtor(ios *base, unsigned int flags) DEFINE_THISCALL_WRAPPER(Iostream_init_ios_ctor, 12) void* __thiscall Iostream_init_ios_ctor(void *this, ios *obj, int n) { - FIXME("(%p %p %d) stub\n", this, obj, n); + TRACE("(%p %p %d)\n", this, obj, n); + obj->delbuf = 1; + if (n >= 0) { + obj->tie = NULL; /* FIXME: tie to cout */ + if (n > 0) + ios_setf(obj, FLAGS_unitbuf); + } return this; } diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 9750d88..dcab485 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -383,6 +383,12 @@ static void (*__thiscall p_iostream_vbase_dtor)(iostream*); static iostream* (*__thiscall p_iostream_assign_sb)(iostream*, streambuf*); static iostream* (*__thiscall p_iostream_assign)(iostream*, const iostream*); +/* Iostream_init */ +static void* (*__thiscall p_Iostream_init_ios_ctor)(void*, ios*, int); + +/* Predefined streams */ +static ostream *p_cout; + /* Emulate a __thiscall */ #ifdef __i386__ @@ -635,6 +641,8 @@ static BOOL init(void) SET(p_iostream_vbase_dtor, "??_Diostream@@QEAAXXZ"); SET(p_iostream_assign_sb, "??4iostream@@IEAAAEAV0(a)PEAVstreambuf@@@Z"); SET(p_iostream_assign, "??4iostream@@IEAAAEAV0(a)AEAV0@@Z"); + + SET(p_Iostream_init_ios_ctor, "??0Iostream_init@@QEAA(a)AEAVios@@H(a)Z"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3(a)YAXPAX@Z"); @@ -810,6 +818,8 @@ static BOOL init(void) SET(p_iostream_vbase_dtor, "??_Diostream@@QAEXXZ"); SET(p_iostream_assign_sb, "??4iostream@@IAEAAV0(a)PAVstreambuf@@@Z"); SET(p_iostream_assign, "??4iostream@@IAEAAV0(a)AAV0@@Z"); + + SET(p_Iostream_init_ios_ctor, "??0Iostream_init@@QAE(a)AAVios@@H(a)Z"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -820,6 +830,7 @@ static BOOL init(void) SET(p_ios_statebuf, "?x_statebuf(a)ios@@0PAJA"); SET(p_ios_xalloc, "?xalloc(a)ios@@SAHXZ"); SET(p_ios_fLockcInit, "?fLockcInit(a)ios@@0HA"); + SET(p_cout, "?cout@@3Vostream_withassign@@A"); init_thiscall_thunk(); return TRUE; @@ -6032,6 +6043,103 @@ static void test_iostream(void) ok(ios2.base_ios.do_lock == 0xcdcdcdcd, "expected %d got %d\n", 0xcdcdcdcd, ios2.base_ios.do_lock); } +static void test_Iostream_init(void) +{ + ios ios_obj; + ostream *pos; + streambuf *psb; + void *pinit; + + memset(&ios_obj, 0xab, sizeof(ios)); + psb = ios_obj.sb; + pinit = call_func3(p_Iostream_init_ios_ctor, NULL, &ios_obj, 0); + ok(pinit == NULL, "wrong return, expected %p got %p\n", NULL, pinit); + ok(ios_obj.sb == psb, "expected %p got %p\n", psb, ios_obj.sb); + ok(ios_obj.state == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.state); + ok(ios_obj.special[0] == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.special[0]); + ok(ios_obj.special[1] == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.special[1]); + ok(ios_obj.delbuf == 1, "expected 1 got %d\n", ios_obj.delbuf); +todo_wine + ok(ios_obj.tie == p_cout, "expected %p got %p\n", p_cout, ios_obj.tie); + ok(ios_obj.flags == 0xabababab, "expected %d got %x\n", 0xabababab, ios_obj.flags); + ok(ios_obj.precision == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.precision); + ok(ios_obj.fill == (char) 0xab, "expected -85 got %d\n", ios_obj.fill); + ok(ios_obj.width == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.width); + ok(ios_obj.do_lock == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.do_lock); + + memset(&ios_obj, 0xab, sizeof(ios)); + pos = ios_obj.tie; + pinit = call_func3(p_Iostream_init_ios_ctor, NULL, &ios_obj, -1); + ok(pinit == NULL, "wrong return, expected %p got %p\n", NULL, pinit); + ok(ios_obj.sb == psb, "expected %p got %p\n", psb, ios_obj.sb); + ok(ios_obj.state == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.state); + ok(ios_obj.special[0] == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.special[0]); + ok(ios_obj.special[1] == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.special[1]); + ok(ios_obj.delbuf == 1, "expected 1 got %d\n", ios_obj.delbuf); + ok(ios_obj.tie == pos, "expected %p got %p\n", pos, ios_obj.tie); + ok(ios_obj.flags == 0xabababab, "expected %d got %x\n", 0xabababab, ios_obj.flags); + ok(ios_obj.precision == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.precision); + ok(ios_obj.fill == (char) 0xab, "expected -85 got %d\n", ios_obj.fill); + ok(ios_obj.width == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.width); + ok(ios_obj.do_lock == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.do_lock); + + memset(&ios_obj, 0xab, sizeof(ios)); + pinit = call_func3(p_Iostream_init_ios_ctor, NULL, &ios_obj, -100); + ok(pinit == NULL, "wrong return, expected %p got %p\n", NULL, pinit); + ok(ios_obj.sb == psb, "expected %p got %p\n", psb, ios_obj.sb); + ok(ios_obj.state == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.state); + ok(ios_obj.special[0] == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.special[0]); + ok(ios_obj.special[1] == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.special[1]); + ok(ios_obj.delbuf == 1, "expected 1 got %d\n", ios_obj.delbuf); + ok(ios_obj.tie == pos, "expected %p got %p\n", pos, ios_obj.tie); + ok(ios_obj.flags == 0xabababab, "expected %d got %x\n", 0xabababab, ios_obj.flags); + ok(ios_obj.precision == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.precision); + ok(ios_obj.fill == (char) 0xab, "expected -85 got %d\n", ios_obj.fill); + ok(ios_obj.width == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.width); + ok(ios_obj.do_lock == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.do_lock); + + if (0) /* crashes on native */ + pinit = call_func3(p_Iostream_init_ios_ctor, NULL, NULL, -1); + + memset(&ios_obj, 0xab, sizeof(ios)); + ios_obj.flags = 0xcdcdcdcd; + ios_obj.do_lock = 0x34343434; + pinit = call_func3(p_Iostream_init_ios_ctor, (void*) 0xdeadbeef, &ios_obj, 1); + ok(pinit == (void*) 0xdeadbeef, "wrong return, expected %p got %p\n", (void*) 0xdeadbeef, pinit); + ok(ios_obj.sb == psb, "expected %p got %p\n", psb, ios_obj.sb); + ok(ios_obj.state == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.state); + ok(ios_obj.special[0] == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.special[0]); + ok(ios_obj.special[1] == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.special[1]); + ok(ios_obj.delbuf == 1, "expected 1 got %d\n", ios_obj.delbuf); +todo_wine + ok(ios_obj.tie == p_cout, "expected %p got %p\n", p_cout, ios_obj.tie); + ok(ios_obj.flags == (0xcdcdcdcd|FLAGS_unitbuf), "expected %d got %x\n", + 0xcdcdcdcd|FLAGS_unitbuf, ios_obj.flags); + ok(ios_obj.precision == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.precision); + ok(ios_obj.fill == (char) 0xab, "expected -85 got %d\n", ios_obj.fill); + ok(ios_obj.width == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.width); + ok(ios_obj.do_lock == 0x34343434, "expected %d got %d\n", 0x34343434, ios_obj.do_lock); + + memset(&ios_obj, 0xab, sizeof(ios)); + ios_obj.flags = 0xcdcdcdcd; + ios_obj.do_lock = 0x34343434; + pinit = call_func3(p_Iostream_init_ios_ctor, (void*) 0xabababab, &ios_obj, 5); + ok(pinit == (void*) 0xabababab, "wrong return, expected %p got %p\n", (void*) 0xabababab, pinit); + ok(ios_obj.sb == psb, "expected %p got %p\n", psb, ios_obj.sb); + ok(ios_obj.state == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.state); + ok(ios_obj.special[0] == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.special[0]); + ok(ios_obj.special[1] == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.special[1]); + ok(ios_obj.delbuf == 1, "expected 1 got %d\n", ios_obj.delbuf); +todo_wine + ok(ios_obj.tie == p_cout, "expected %p got %p\n", p_cout, ios_obj.tie); + ok(ios_obj.flags == (0xcdcdcdcd|FLAGS_unitbuf), "expected %d got %x\n", + 0xcdcdcdcd|FLAGS_unitbuf, ios_obj.flags); + ok(ios_obj.precision == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.precision); + ok(ios_obj.fill == (char) 0xab, "expected -85 got %d\n", ios_obj.fill); + ok(ios_obj.width == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.width); + ok(ios_obj.do_lock == 0x34343434, "expected %d got %d\n", 0x34343434, ios_obj.do_lock); +} + START_TEST(msvcirt) { if(!init()) @@ -6051,6 +6159,7 @@ START_TEST(msvcirt) test_istream_read(); test_istream_withassign(); test_iostream(); + test_Iostream_init(); FreeLibrary(msvcrt); FreeLibrary(msvcirt);

1 0

Hans Leidekker : include: Add missing Web Services declarations.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 5ab0cecaca52d079a699e37bf72175f8aa45e008 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ab0cecaca52d079a699e37bf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 17 14:23:58 2016 +0200 include: Add missing Web Services declarations. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/webservices.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/webservices.h b/include/webservices.h index cd30e4fc..53f851f 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -60,6 +60,7 @@ typedef struct _WS_DOUBLE_DESCRIPTION WS_DOUBLE_DESCRIPTION; typedef struct _WS_DATETIME WS_DATETIME; typedef struct _WS_DATETIME_DESCRIPTION WS_DATETIME_DESCRIPTION; typedef struct _WS_GUID_DESCRIPTION WS_GUID_DESCRIPTION; +typedef struct _WS_UNIQUE_ID_DESCRIPTION WS_UNIQUE_ID_DESCRIPTION; typedef struct _WS_URL WS_URL; typedef struct _WS_HTTP_URL WS_HTTP_URL; typedef struct _WS_HTTPS_URL WS_HTTPS_URL; @@ -404,6 +405,15 @@ struct _WS_DOUBLE_DESCRIPTION { double maxValue; }; +struct _WS_GUID_DESCRIPTION { + GUID value; +}; + +struct _WS_UNIQUE_ID_DESCRIPTION { + ULONG minCharCount; + ULONG maxCharCount; +}; + typedef enum { WS_TYPE_ATTRIBUTE_FIELD_MAPPING, WS_ATTRIBUTE_FIELD_MAPPING, @@ -1336,6 +1346,8 @@ typedef enum typedef void (CALLBACK *WS_MESSAGE_DONE_CALLBACK) (void*); +HRESULT WINAPI WsAddMappedHeader(WS_MESSAGE*, const WS_XML_STRING*, WS_TYPE, WS_WRITE_OPTION, + const void*, ULONG, WS_ERROR*); HRESULT WINAPI WsAddressMessage(WS_MESSAGE*, const WS_ENDPOINT_ADDRESS*, WS_ERROR*); HRESULT WINAPI WsAlloc(WS_HEAP*, SIZE_T, void**, WS_ERROR*); HRESULT WINAPI WsCall(WS_SERVICE_PROXY*, const WS_OPERATION_DESCRIPTION*, const void**, @@ -1421,6 +1433,7 @@ HRESULT WINAPI WsReceiveMessage(WS_CHANNEL*, WS_MESSAGE*, const WS_MESSAGE_DESCR WS_RECEIVE_OPTION, WS_READ_OPTION, WS_HEAP*, void*, ULONG, ULONG*, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsRemoveHeader(WS_MESSAGE*, WS_HEADER_TYPE, WS_ERROR*); +HRESULT WINAPI WsRemoveMappedHeader(WS_MESSAGE*, const WS_XML_STRING*, WS_ERROR*); HRESULT WINAPI WsRemoveNode(const WS_XML_NODE_POSITION*, WS_ERROR*); HRESULT WINAPI WsResetChannel(WS_CHANNEL*, WS_ERROR*); HRESULT WINAPI WsResetError(WS_ERROR*);

1 0

Józef Kucia : d3d9/tests: Add test for regression in IDirect3DDevice9_Reset().
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 7d836b3f138c4cf7a46608165c031362db3a5dae URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d836b3f138c4cf7a46608165… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 15 16:00:17 2016 +0200 d3d9/tests: Add test for regression in IDirect3DDevice9_Reset(). This adds a test for regression introduced in cad279449c62a965a70a712a91b11ba52c4ff4f7. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 68 +++++++++++++++++++++++++-- dlls/d3d9/tests/device.c | 116 ++++++++++++++++++++++++++++++++--------------- 2 files changed, 144 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7d836b3f138c4cf7a4660…

1 0

Józef Kucia : d3d10core/tests: Add test for swapchain views.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 75820f412a0785e75bcedcca546a38b83494159a URL: http://source.winehq.org/git/wine.git/?a=commit;h=75820f412a0785e75bcedcca5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 15 16:00:18 2016 +0200 d3d10core/tests: Add test for swapchain views. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index ef7ad82..43abcf7 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -7257,6 +7257,42 @@ float4 main(const ps_in v) : SV_TARGET release_test_context(&test_context); } +static void test_swapchain_views(void) +{ + struct d3d10core_test_context test_context; + D3D10_SHADER_RESOURCE_VIEW_DESC srv_desc; + D3D10_RENDER_TARGET_VIEW_DESC rtv_desc; + ID3D10ShaderResourceView *srv; + ID3D10RenderTargetView *rtv; + ID3D10Device *device; + HRESULT hr; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; + rtv_desc.ViewDimension = D3D10_RTV_DIMENSION_TEXTURE2D; + U(rtv_desc).Texture2D.MipSlice = 0; + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)test_context.backbuffer, &rtv_desc, &rtv); + /* This seems to work only on Windows 7. */ + ok(hr == S_OK || broken(hr == E_INVALIDARG), "Failed to create render target view, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D10RenderTargetView_Release(rtv); + + srv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; + srv_desc.ViewDimension = D3D10_SRV_DIMENSION_TEXTURE2D; + U(srv_desc).Texture2D.MostDetailedMip = 0; + U(srv_desc).Texture2D.MipLevels = 1; + hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)test_context.backbuffer, &srv_desc, &srv); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D10ShaderResourceView_Release(srv); + + release_test_context(&test_context); +} + static void test_swapchain_flip(void) { IDXGISwapChain *swapchain; @@ -9370,6 +9406,7 @@ START_TEST(device) test_texture_data_init(); test_check_multisample_quality_levels(); test_cb_relative_addressing(); + test_swapchain_views(); test_swapchain_flip(); test_clear_render_target_view(); test_clear_depth_stencil_view();

1 0

Józef Kucia : d3d11/tests: Fix copy-paste error in test_swapchain_views().
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 085afd35f4463fa1bf583d74285d0f15273a2289 URL: http://source.winehq.org/git/wine.git/?a=commit;h=085afd35f4463fa1bf583d742… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 15 16:00:19 2016 +0200 d3d11/tests: Fix copy-paste error in test_swapchain_views(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 330a960..25ecad4 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -7523,11 +7523,13 @@ static void test_swapchain_views(void) todo_wine check_texture_color(test_context.backbuffer, 0xffbc957c, 1); srv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; - rtv_desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D; + srv_desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D; U(srv_desc).Texture2D.MostDetailedMip = 0; U(srv_desc).Texture2D.MipLevels = 1; hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)test_context.backbuffer, &srv_desc, &srv); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D11ShaderResourceView_Release(srv); ID3D11RenderTargetView_Release(rtv); release_test_context(&test_context);

1 0

Józef Kucia : dxgi/tests: Also test IDXGISwapChain_ResizeTarget() in fullscreen with disabled mode switch.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 2c67e1c9c305d95375f2c3b22d885088457a1314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c67e1c9c305d95375f2c3b22… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 15 16:00:20 2016 +0200 dxgi/tests: Also test IDXGISwapChain_ResizeTarget() in fullscreen with disabled mode switch. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/device.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index a0f5e24..a29c13c 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -1503,6 +1503,11 @@ static void test_fullscreen_resize_target(IDXGISwapChain *swapchain, expected_state = *initial_state; for (i = 0; i < min(mode_count, 20); ++i) { + /* FIXME: Modes with scaling aren't fully tested. */ + if (!(swapchain_desc.Flags & DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH) + && modes[i].Scaling != DXGI_MODE_SCALING_UNSPECIFIED) + continue; + hr = IDXGIOutput_GetDesc(target, &output_desc); ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); @@ -1546,6 +1551,8 @@ static void test_resize_target(void) } tests[] = { + {{ 0, 0}, TRUE, FALSE, 0}, + {{10, 10}, TRUE, FALSE, 0}, {{ 0, 0}, TRUE, FALSE, DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH}, {{10, 10}, TRUE, FALSE, DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH}, {{ 0, 0}, FALSE, FALSE, 0},

1 0

Józef Kucia : dxgi: Properly switch to fullscreen mode when creating fullscreen swapchains.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 0d92a9a7a429f5727c997d814155acdd8f4095fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d92a9a7a429f5727c997d814… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 15 16:00:21 2016 +0200 dxgi: Properly switch to fullscreen mode when creating fullscreen swapchains. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 172b0f4..0057aa2 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -485,6 +485,8 @@ HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device wined3d_mutex_lock(); wined3d_private_store_init(&swapchain->private_store); + swapchain->fullscreen = !desc->windowed; + desc->windowed = TRUE; if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, &dxgi_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) { @@ -492,10 +494,10 @@ HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device goto cleanup; } - swapchain->fullscreen = !desc->windowed; swapchain->target = NULL; if (swapchain->fullscreen) { + desc->windowed = FALSE; if (FAILED(hr = wined3d_swapchain_set_fullscreen(swapchain->wined3d_swapchain, desc, NULL))) {

1 0

Józef Kucia : dxgi/tests: Check fullscreen state in test_create_swapchain().
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 20b39d41e124231f8ab97baf2848b8b1fc4448ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=20b39d41e124231f8ab97baf2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 15 16:00:22 2016 +0200 dxgi/tests: Check fullscreen state in test_create_swapchain(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/device.c | 300 ++++++++++++++++++++++++----------------------- 1 file changed, 155 insertions(+), 145 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=20b39d41e124231f8ab97…

1 0

Józef Kucia : d3d11: Remove redundant 'break' statement.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 51afeca5aa2f9bc0b78d7cc69799587ca6a1d678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51afeca5aa2f9bc0b78d7cc69… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 15 16:00:23 2016 +0200 d3d11: Remove redundant 'break' statement. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/shader.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index dab2b9b..1da1293 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -108,7 +108,6 @@ static HRESULT shdr_handler(const char *data, DWORD data_size, DWORD tag, void * else { TRACE("Skipping feature level 9 shader code on feature level %#x.\n", ctx->feature_level); - break; } break;

1 0

Alistair Leslie-Hughes : d3dx11: Add D3DX11CreateTextureFromMemory stub.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 77568fd0326941a6cd212e7ac29a8f900c3521fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=77568fd0326941a6cd212e7ac… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 16 05:47:15 2016 +0000 d3dx11: Add D3DX11CreateTextureFromMemory stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_42/d3dx11_42.spec | 2 +- dlls/d3dx11_43/async.c | 10 ++++++++++ dlls/d3dx11_43/d3dx11_43.spec | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec index cb02a95..45e8482 100644 --- a/dlls/d3dx11_42/d3dx11_42.spec +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -22,7 +22,7 @@ @ stub D3DX11CreateShaderResourceViewFromResourceW @ stub D3DX11CreateTextureFromFileA @ stub D3DX11CreateTextureFromFileW -@ stub D3DX11CreateTextureFromMemory +@ stdcall D3DX11CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateTextureFromResourceA @ stub D3DX11CreateTextureFromResourceW @ stub D3DX11CreateThreadPump diff --git a/dlls/d3dx11_43/async.c b/dlls/d3dx11_43/async.c index b33c235..6eb2a10 100644 --- a/dlls/d3dx11_43/async.c +++ b/dlls/d3dx11_43/async.c @@ -65,3 +65,13 @@ HRESULT WINAPI D3DX11CompileFromFileW(const WCHAR *filename, const D3D10_SHADER_ return E_NOTIMPL; } + +HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *data, + SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, + ID3D11Resource **texture, HRESULT *hresult) +{ + FIXME("device %p, data %p, data_size %lu, load_info %p, pump %p, texture %p, hresult %p stub.\n", + device, data, data_size, load_info, pump, texture, hresult); + + return E_NOTIMPL; +} diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec index 69c12fb..7c3a598 100644 --- a/dlls/d3dx11_43/d3dx11_43.spec +++ b/dlls/d3dx11_43/d3dx11_43.spec @@ -22,7 +22,7 @@ @ stub D3DX11CreateShaderResourceViewFromResourceW @ stub D3DX11CreateTextureFromFileA @ stub D3DX11CreateTextureFromFileW -@ stub D3DX11CreateTextureFromMemory +@ stdcall D3DX11CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateTextureFromResourceA @ stub D3DX11CreateTextureFromResourceW @ stub D3DX11CreateThreadPump

1 0