September 2013 - Wine-Commits

Michael Müller : d3d9/tests: Test if IDirect3DSwapChain9Ex is available with IDirect3D9(Ex).
by Alexandre Julliard Sept. 20, 2013

Sept. 20, 2013

Module: wine Branch: master Commit: cf01bb3d2ab711c9a0504350097383372b8f6818 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf01bb3d2ab711c9a05043500… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Sep 9 16:16:32 2013 +0200 d3d9/tests: Test if IDirect3DSwapChain9Ex is available with IDirect3D9(Ex). --- dlls/d3d9/tests/d3d9ex.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index f4f3327..d175d4e 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -122,6 +122,8 @@ static void test_qi_base_to_ex(void) IDirect3D9Ex *d3d9ex = (void *) 0xdeadbeef; IDirect3DDevice9 *device; IDirect3DDevice9Ex *deviceEx = (void *) 0xdeadbeef; + IDirect3DSwapChain9 *swapchain = NULL; + IDirect3DSwapChain9Ex *swapchainEx = (void *)0xdeadbeef; HRESULT hr; HWND window = create_window(); D3DPRESENT_PARAMETERS present_parameters; @@ -160,6 +162,22 @@ static void test_qi_base_to_ex(void) ok(deviceEx == NULL, "QueryInterface returned interface %p, expected NULL\n", deviceEx); if(deviceEx) IDirect3DDevice9Ex_Release(deviceEx); + /* Get the implicit swapchain */ + hr = IDirect3DDevice9_GetSwapChain(device, 0, &swapchain); + ok(SUCCEEDED(hr), "Failed to get the implicit swapchain (%08x).\n", hr); + if (SUCCEEDED(hr)) + { + hr = IDirect3DSwapChain9_QueryInterface(swapchain, &IID_IDirect3DSwapChain9Ex, (void **)&swapchainEx); + ok(hr == E_NOINTERFACE, + "IDirect3DSwapChain9::QueryInterface for IID_IDirect3DSwapChain9Ex returned %08x, expected E_NOINTERFACE.\n", + hr); + ok(swapchainEx == NULL, "QueryInterface returned interface %p, expected NULL.\n", swapchainEx); + if (swapchainEx) + IDirect3DSwapChain9Ex_Release(swapchainEx); + } + if (swapchain) + IDirect3DSwapChain9_Release(swapchain); + IDirect3DDevice9_Release(device); out: @@ -173,6 +191,8 @@ static void test_qi_ex_to_base(void) IDirect3D9Ex *d3d9ex; IDirect3DDevice9 *device; IDirect3DDevice9Ex *deviceEx = (void *) 0xdeadbeef; + IDirect3DSwapChain9 *swapchain = NULL; + IDirect3DSwapChain9Ex *swapchainEx = (void *)0xdeadbeef; HRESULT hr; HWND window = create_window(); D3DPRESENT_PARAMETERS present_parameters; @@ -242,6 +262,24 @@ static void test_qi_ex_to_base(void) ok(ref == 2, "IDirect3DDevice9 refcount is %d, expected 2\n", ref); ref = getref((IUnknown *) deviceEx); ok(ref == 2, "IDirect3DDevice9Ex refcount is %d, expected 2\n", ref); + + /* Get the implicit swapchain */ + hr = IDirect3DDevice9_GetSwapChain(device, 0, &swapchain); + ok(SUCCEEDED(hr), "Failed to get the implicit swapchain (%08x).\n", hr); + if (SUCCEEDED(hr)) + { + hr = IDirect3DSwapChain9_QueryInterface(swapchain, &IID_IDirect3DSwapChain9Ex, (void **)&swapchainEx); + ok(hr == D3D_OK, + "IDirect3DSwapChain9::QueryInterface for IID_IDirect3DSwapChain9Ex returned %08x, expected D3D_OK.\n", + hr); + ok(swapchainEx != NULL && swapchainEx != (void *)0xdeadbeef, + "QueryInterface returned interface %p, expected != NULL && != 0xdeadbeef.\n", swapchainEx); + if (swapchainEx) + IDirect3DSwapChain9Ex_Release(swapchainEx); + } + if (swapchain) + IDirect3DSwapChain9_Release(swapchain); + if(deviceEx) IDirect3DDevice9Ex_Release(deviceEx); IDirect3DDevice9_Release(device);

1 0

Henri Verbeet : wined3d: Set the default scissor rect from the swapchain desc in state_init_default ().
by Alexandre Julliard Sept. 20, 2013

Sept. 20, 2013

Module: wine Branch: master Commit: 0eae0858ae19e4ad14951252c833d8e9e8e9ca46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eae0858ae19e4ad14951252c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 20 10:41:45 2013 +0200 wined3d: Set the default scissor rect from the swapchain desc in state_init_default(). We always have a swapchain here, even if there are no back buffers. --- dlls/wined3d/stateblock.c | 40 ++++++++++++++-------------------------- 1 files changed, 14 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 00ab69a..c2a5208 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1181,8 +1181,7 @@ void state_init_default(struct wined3d_state *state, struct wined3d_device *devi DWORD d; } tmpfloat; unsigned int i; - struct wined3d_swapchain *swapchain; - struct wined3d_surface *backbuffer; + struct wined3d_swapchain_desc *swapchain_desc; static const struct wined3d_matrix identity = {{{ 1.0f, 0.0f, 0.0f, 0.0f, @@ -1386,32 +1385,21 @@ void state_init_default(struct wined3d_state *state, struct wined3d_device *devi state->textures[i] = NULL; } - /* check the return values, because the GetBackBuffer call isn't valid for ddraw */ - if ((swapchain = wined3d_device_get_swapchain(device, 0))) - { - if ((backbuffer = wined3d_swapchain_get_back_buffer(swapchain, 0, WINED3D_BACKBUFFER_TYPE_MONO))) - { - struct wined3d_resource_desc desc; - - wined3d_resource_get_desc(&backbuffer->resource, &desc); + swapchain_desc = &device->swapchains[0]->desc; - /* Set the default scissor rect values */ - state->scissor_rect.left = 0; - state->scissor_rect.right = desc.width; - state->scissor_rect.top = 0; - state->scissor_rect.bottom = desc.height; - } - - /* Set the default viewport */ - state->viewport.x = 0; - state->viewport.y = 0; - state->viewport.width = swapchain->desc.backbuffer_width; - state->viewport.height = swapchain->desc.backbuffer_height; - state->viewport.min_z = 0.0f; - state->viewport.max_z = 1.0f; - } + /* Set the default scissor rect values */ + state->scissor_rect.left = 0; + state->scissor_rect.right = swapchain_desc->backbuffer_width; + state->scissor_rect.top = 0; + state->scissor_rect.bottom = swapchain_desc->backbuffer_height; - TRACE("Done.\n"); + /* Set the default viewport */ + state->viewport.x = 0; + state->viewport.y = 0; + state->viewport.width = swapchain_desc->backbuffer_width; + state->viewport.height = swapchain_desc->backbuffer_height; + state->viewport.min_z = 0.0f; + state->viewport.max_z = 1.0f; } static HRESULT stateblock_init(struct wined3d_stateblock *stateblock,

1 0

Henri Verbeet : wined3d: Only print a warning about render target usage in wined3d_device_set_render_target ().
by Alexandre Julliard Sept. 20, 2013

Sept. 20, 2013

Module: wine Branch: master Commit: 49c6b87a324f91afef9fef1a9a767bab59fc3bf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c6b87a324f91afef9fef1a9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 20 10:41:44 2013 +0200 wined3d: Only print a warning about render target usage in wined3d_device_set_render_target(). --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 30dcc06..58c3db1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3997,7 +3997,7 @@ HRESULT CDECL wined3d_device_set_render_target(struct wined3d_device *device, if (render_target && !(render_target->resource.usage & WINED3DUSAGE_RENDERTARGET)) { - FIXME("Surface %p doesn't have render target usage.\n", render_target); + WARN("Surface %p doesn't have render target usage.\n", render_target); return WINED3DERR_INVALIDCALL; }

1 0

Bruno Jesus : ws2_32: ConnectEx should not work on unbound socket.
by Alexandre Julliard Sept. 20, 2013

Sept. 20, 2013

Module: wine Branch: master Commit: 68377494c6f1d22a1c0ca12901ffd2bf7e788344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68377494c6f1d22a1c0ca1290… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Sep 20 00:14:27 2013 -0300 ws2_32: ConnectEx should not work on unbound socket. --- dlls/ws2_32/socket.c | 14 +++++++++++++- dlls/ws2_32/tests/sock.c | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2cb077e..45166de 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2726,6 +2726,8 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n PVOID sendBuf, DWORD sendBufLen, LPDWORD sent, LPOVERLAPPED ov) { int fd, ret, status; + union generic_unix_sockaddr uaddr; + socklen_t uaddrlen = sizeof(uaddr); if (!ov) { @@ -2743,7 +2745,17 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n TRACE("socket %04lx, ptr %p %s, length %d, sendptr %p, len %d, ov %p\n", s, name, debugstr_sockaddr(name), namelen, sendBuf, sendBufLen, ov); - /* FIXME: technically the socket has to be bound */ + if (getsockname(fd, &uaddr.addr, &uaddrlen) != 0) + { + SetLastError(wsaErrno()); + return FALSE; + } + else if (!is_sockaddr_bound(&uaddr.addr, uaddrlen)) + { + SetLastError(WSAEINVAL); + return FALSE; + } + ret = do_connect(fd, name, namelen); if (ret == 0) { diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b77bb3c..c1d6956 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5097,7 +5097,7 @@ static void test_ConnectEx(void) "returned %d + errno %d\n", bret, WSAGetLastError()); bret = pConnectEx(connector, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, &overlapped); - todo_wine ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "ConnectEx on a unbound socket " + ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "ConnectEx on a unbound socket " "returned %d + errno %d\n", bret, WSAGetLastError()); if (bret == TRUE || WSAGetLastError() != WSAEINVAL) {

1 0

Dmitry Timoshkov : ntdll/tests: Add 0-length read tests for a disk file.
by Alexandre Julliard Sept. 20, 2013

Sept. 20, 2013

Module: wine Branch: master Commit: d6900fc55652edc2dc53d9859a487b0fc12ec7bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6900fc55652edc2dc53d9859… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 18 15:53:02 2013 +0900 ntdll/tests: Add 0-length read tests for a disk file. --- dlls/ntdll/tests/file.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 120fdac..5ae605b 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1985,6 +1985,22 @@ static void test_read_write(void) bytes = 0xdeadbeef; SetLastError(0xdeadbeef); + ret = ReadFile(INVALID_HANDLE_VALUE, buf, 0, &bytes, NULL); +todo_wine + ok(!ret, "ReadFile should fail\n"); +todo_wine + ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + ok(bytes == 0, "bytes %u\n", bytes); + + bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadFile(hfile, buf, 0, &bytes, NULL); + ok(ret, "ReadFile error %d\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + ok(bytes == 0, "bytes %u\n", bytes); + + bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); ret = ReadFile(hfile, buf, sizeof(buf), &bytes, NULL); ok(ret, "ReadFile error %d\n", GetLastError()); ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); @@ -2184,6 +2200,31 @@ todo_wine bytes = 0xdeadbeef; SetLastError(0xdeadbeef); + ret = ReadFile(INVALID_HANDLE_VALUE, buf, 0, &bytes, NULL); +todo_wine + ok(!ret, "ReadFile should fail\n"); +todo_wine + ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + ok(bytes == 0, "bytes %u\n", bytes); + + S(U(ovl)).Offset = 0; + S(U(ovl)).OffsetHigh = 0; + ovl.Internal = -1; + ovl.InternalHigh = -1; + ovl.hEvent = 0; + bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadFile(hfile, buf, 0, &bytes, &ovl); + /* ReadFile return value depends on Windows version and testing it is not practical */ + if (!ret) ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); + ok(bytes == 0, "bytes %u\n", bytes); +todo_wine + ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); +todo_wine + ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh); + + bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); ret = WriteFile(hfile, contents, sizeof(contents), &bytes, NULL); ok(!ret, "WriteFile should fail\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());

1 0

Francois Gouget : winapi: Small tweaks to fix perl warnings.
by Alexandre Julliard Sept. 20, 2013

Sept. 20, 2013

Module: wine Branch: master Commit: 3b5fb27f914bedbf06d95b57be34a9ab7e706b88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b5fb27f914bedbf06d95b57b… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 20 11:49:34 2013 +0200 winapi: Small tweaks to fix perl warnings. perl says defined(@array) is deprecated. --- tools/winapi/options.pm | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winapi/options.pm b/tools/winapi/options.pm index 749b9b7..3daeb11 100644 --- a/tools/winapi/options.pm +++ b/tools/winapi/options.pm @@ -414,7 +414,7 @@ sub c_files($) { my $c_files = \@{$self->{_C_FILES}}; - if(!defined(@$c_files)) { + if(!@$c_files) { $self->parse_files; } @@ -426,7 +426,7 @@ sub h_files($) { my $h_files = \@{$self->{_H_FILES}}; - if(!defined(@$h_files)) { + if(!@$h_files) { $self->parse_files; } @@ -438,7 +438,7 @@ sub directories($) { my $directories = \@{$self->{_DIRECTORIES}}; - if(!defined(@$directories)) { + if(!@$directories) { $self->parse_files; }

1 0

Michael Müller : d3d9: Partial implementation of IDirect3DSwapChain9Ex.
by Alexandre Julliard Sept. 20, 2013

Sept. 20, 2013

Module: wine Branch: master Commit: edad7dea7e09cb48daf0e36044ffb99a0588f4fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=edad7dea7e09cb48daf0e3604… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Sep 9 15:43:00 2013 +0200 d3d9: Partial implementation of IDirect3DSwapChain9Ex. --- dlls/d3d9/d3d9_private.h | 7 ++- dlls/d3d9/device.c | 13 ++--- dlls/d3d9/swapchain.c | 123 +++++++++++++++++++++++++++++++++++++--------- 3 files changed, 109 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=edad7dea7e09cb48daf0e…

1 0

Alexandre Julliard : include: Remove CONST from non-pointer parameters.
by Alexandre Julliard Sept. 20, 2013

Sept. 20, 2013

Module: wine Branch: master Commit: bf611955748f3670d187d98fef30d08f81cb7e7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf611955748f3670d187d98fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 20 12:14:47 2013 +0200 include: Remove CONST from non-pointer parameters. --- include/dpaddr.h | 20 +++--- include/dplay8.h | 194 ++++++++++++++++++++++++++-------------------------- include/dplobby8.h | 36 +++++----- include/dpnathlp.h | 58 ++++++++-------- 4 files changed, 154 insertions(+), 154 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf611955748f3670d187d…

1 0

Henri Verbeet : d3d9: Avoid CONST.
by Alexandre Julliard Sept. 20, 2013

Sept. 20, 2013

Module: wine Branch: master Commit: 11ced88a37ac5bfa33a5d7578205a04ee27b4b85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11ced88a37ac5bfa33a5d7578… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 20 10:41:47 2013 +0200 d3d9: Avoid CONST. --- dlls/d3d9/tests/vertexdeclaration.c | 103 ++++++++++---------- include/d3d9.h | 175 +++++++++++++++++++---------------- 2 files changed, 149 insertions(+), 129 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=11ced88a37ac5bfa33a5d…

1 0

Henri Verbeet : ddraw/tests: Add a test for render target surface capabilities.
by Alexandre Julliard Sept. 20, 2013

Sept. 20, 2013

Module: wine Branch: master Commit: 31de4f1670536df30ba0c518c4de1cfa97f72c4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=31de4f1670536df30ba0c518c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 20 10:41:43 2013 +0200 ddraw/tests: Add a test for render target surface capabilities. --- dlls/ddraw/tests/ddraw1.c | 242 ++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 318 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 302 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 308 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 1170 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=31de4f1670536df30ba0c…

1 0