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

Michael Stefaniuc : comdlg32: Use wine_dbgstr_rect() to trace a RECT.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: 69f6493a8c74534b29a6b49990b2360b32054c00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69f6493a8c74534b29a6b4999… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Apr 21 10:51:07 2016 +0200 comdlg32: Use wine_dbgstr_rect() to trace a RECT. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/fontdlg.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 344a356..ed2615d 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -1173,9 +1173,7 @@ static LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam, const CHOOSE MapWindowPoints( 0, hDlg, (LPPOINT) &info.rcWindow, 2); hdc = BeginPaint( hDlg, &ps ); - TRACE("erase %d, rect=(%d,%d)-(%d,%d)\n", ps.fErase, - ps.rcPaint.left, ps.rcPaint.top, - ps.rcPaint.right, ps.rcPaint.bottom); + TRACE("erase %d, rect=%s\n", ps.fErase, wine_dbgstr_rect(&ps.rcPaint)); /* Paint frame */ DrawEdge( hdc, &info.rcWindow, EDGE_SUNKEN, BF_RECT|BF_ADJUST );

1 0

Michael Stefaniuc : shell32: Use wine_dbgstr_rect() to trace RECTs.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: 816df88a77d1f4847e0cc5ddb5e5ec22dbed43c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=816df88a77d1f4847e0cc5ddb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Apr 21 10:58:01 2016 +0200 shell32: Use wine_dbgstr_rect() to trace RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlmenu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c index 5dfdd08..694b5d1 100644 --- a/dlls/shell32/shlmenu.c +++ b/dlls/shell32/shlmenu.c @@ -633,7 +633,7 @@ LRESULT WINAPI FileMenu_DrawItem( Shell_GetImageLists(0, &hImageList); ImageList_Draw(hImageList, pMyItem->iIconIndex, lpdis->hDC, xi, yi, ILD_NORMAL); - TRACE("-- 0x%04x 0x%04x 0x%04x 0x%04x\n", TextRect.left, TextRect.top, TextRect.right, TextRect.bottom); + TRACE("-- %s\n", wine_dbgstr_rect(&TextRect)); SetTextColor(lpdis->hDC, clrPrevText); SetBkColor(lpdis->hDC, clrPrevBkgnd); @@ -794,8 +794,8 @@ DWORD WINAPI FileMenu_GetItemExtent (HMENU hMenu, UINT uPos) FIXME("%p 0x%08x\n", hMenu, uPos); if (GetMenuItemRect(0, hMenu, uPos, &rect)) - { FIXME("0x%04x 0x%04x 0x%04x 0x%04x\n", - rect.right, rect.left, rect.top, rect.bottom); + { + FIXME("%s\n", wine_dbgstr_rect(&rect)); return ((rect.right-rect.left)<<16) + (rect.top-rect.bottom); } return 0x00100010; /*FIXME*/

1 0

Aaryaman Vasishta : d3drm: Implement IDirect3DRM*::CreateObject.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: c44d9dad3f76a62f7a85d8036c14989929639f5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c44d9dad3f76a62f7a85d8036… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Wed Apr 20 20:40:09 2016 +0530 d3drm: Implement IDirect3DRM*::CreateObject. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 56 ++++++++++++++++++++++++++++++++++++++++++------ dlls/d3drm/tests/d3drm.c | 38 ++++++++++++++++++++------------ 2 files changed, 74 insertions(+), 20 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index fe33315..edb46df 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -139,10 +139,12 @@ static ULONG WINAPI d3drm1_Release(IDirect3DRM *iface) static HRESULT WINAPI d3drm1_CreateObject(IDirect3DRM *iface, REFCLSID clsid, IUnknown *outer, REFIID iid, void **out) { - FIXME("iface %p, clsid %s, outer %p, iid %s, out %p stub!\n", + struct d3drm *d3drm = impl_from_IDirect3DRM(iface); + + TRACE("iface %p, clsid %s, outer %p, iid %s, out %p.\n", iface, debugstr_guid(clsid), outer, debugstr_guid(iid), out); - return E_NOTIMPL; + return IDirect3DRM3_CreateObject(&d3drm->IDirect3DRM3_iface, clsid, outer, iid, out); } static HRESULT WINAPI d3drm1_CreateFrame(IDirect3DRM *iface, @@ -603,10 +605,12 @@ static ULONG WINAPI d3drm2_Release(IDirect3DRM2 *iface) static HRESULT WINAPI d3drm2_CreateObject(IDirect3DRM2 *iface, REFCLSID clsid, IUnknown *outer, REFIID iid, void **out) { - FIXME("iface %p, clsid %s, outer %p, iid %s, out %p stub!\n", + struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); + + TRACE("iface %p, clsid %s, outer %p, iid %s, out %p.\n", iface, debugstr_guid(clsid), outer, debugstr_guid(iid), out); - return E_NOTIMPL; + return IDirect3DRM3_CreateObject(&d3drm->IDirect3DRM3_iface, clsid, outer, iid, out); } static HRESULT WINAPI d3drm2_CreateFrame(IDirect3DRM2 *iface, @@ -1054,10 +1058,50 @@ static ULONG WINAPI d3drm3_Release(IDirect3DRM3 *iface) static HRESULT WINAPI d3drm3_CreateObject(IDirect3DRM3 *iface, REFCLSID clsid, IUnknown *outer, REFIID iid, void **out) { - FIXME("iface %p, clsid %s, outer %p, iid %s, out %p stub!\n", + IUnknown *object; + HRESULT hr; + + TRACE("iface %p, clsid %s, outer %p, iid %s, out %p.\n", iface, debugstr_guid(clsid), outer, debugstr_guid(iid), out); - return E_NOTIMPL; + if (!out) + return D3DRMERR_BADVALUE; + + if (!clsid || !iid) + { + *out = NULL; + return D3DRMERR_BADVALUE; + } + + if (outer) + { + FIXME("COM aggregation for outer IUnknown (%p) not implemented. Returning E_NOTIMPL.\n", outer); + *out = NULL; + return E_NOTIMPL; + } + + if (IsEqualGUID(clsid, &CLSID_CDirect3DRMTexture)) + { + struct d3drm_texture *texture; + if (FAILED(hr = d3drm_texture_create(&texture))) + { + *out = NULL; + return hr; + } + object = (IUnknown *)&texture->IDirect3DRMTexture3_iface; + } + else + { + FIXME("%s not implemented. Returning CLASSFACTORY_E_FIRST.\n", debugstr_guid(clsid)); + *out = NULL; + return CLASSFACTORY_E_FIRST; + } + + if (FAILED(hr = IUnknown_QueryInterface(object, iid, out))) + *out = NULL; + IUnknown_Release(object); + + return hr; } static HRESULT WINAPI d3drm3_CreateFrame(IDirect3DRM3 *iface, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index a8f9c40..9f6eaab 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1353,23 +1353,24 @@ static void test_object(void) { REFCLSID clsid; REFIID iid; + BOOL todo; } tests[] = { - { &CLSID_CDirect3DRMDevice, &IID_IDirect3DRMDevice }, - { &CLSID_CDirect3DRMDevice, &IID_IDirect3DRMDevice2 }, - { &CLSID_CDirect3DRMDevice, &IID_IDirect3DRMDevice3 }, - { &CLSID_CDirect3DRMDevice, &IID_IDirect3DRMWinDevice }, - { &CLSID_CDirect3DRMTexture, &IID_IDirect3DRMTexture }, - { &CLSID_CDirect3DRMTexture, &IID_IDirect3DRMTexture2 }, - { &CLSID_CDirect3DRMTexture, &IID_IDirect3DRMTexture3 }, - { &CLSID_CDirect3DRMViewport, &IID_IDirect3DRMViewport }, - { &CLSID_CDirect3DRMViewport, &IID_IDirect3DRMViewport2 }, + { &CLSID_CDirect3DRMDevice, &IID_IDirect3DRMDevice, TRUE }, + { &CLSID_CDirect3DRMDevice, &IID_IDirect3DRMDevice2, TRUE }, + { &CLSID_CDirect3DRMDevice, &IID_IDirect3DRMDevice3, TRUE }, + { &CLSID_CDirect3DRMDevice, &IID_IDirect3DRMWinDevice, TRUE }, + { &CLSID_CDirect3DRMTexture, &IID_IDirect3DRMTexture, FALSE }, + { &CLSID_CDirect3DRMTexture, &IID_IDirect3DRMTexture2, FALSE }, + { &CLSID_CDirect3DRMTexture, &IID_IDirect3DRMTexture3, FALSE }, + { &CLSID_CDirect3DRMViewport, &IID_IDirect3DRMViewport, TRUE }, + { &CLSID_CDirect3DRMViewport, &IID_IDirect3DRMViewport2, TRUE }, }; IDirect3DRM *d3drm1; IDirect3DRM2 *d3drm2; IDirect3DRM3 *d3drm3; - IUnknown *unknown; + IUnknown *unknown = (IUnknown *)0xdeadbeef; HRESULT hr; ULONG ref1, ref2, ref3, ref4; int i; @@ -1382,17 +1383,26 @@ static void test_object(void) hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3); ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %#x).\n", hr); + hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_DirectDraw, NULL, &IID_IDirectDraw, (void **)&unknown); + ok(hr == CLASSFACTORY_E_FIRST, "Expected hr == CLASSFACTORY_E_FIRST, got %#x.\n", hr); + ok(!unknown, "Expected object returned == NULL, got %p.\n", unknown); + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) { + unknown = (IUnknown *)0xdeadbeef; hr = IDirect3DRM_CreateObject(d3drm1, NULL, NULL, tests[i].iid, (void **)&unknown); - todo_wine ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr); + ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr); + ok(!unknown, "Expected object returned == NULL, got %p.\n", unknown); + unknown = (IUnknown *)0xdeadbeef; hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, NULL, (void **)&unknown); - todo_wine ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr); + ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr); + ok(!unknown, "Expected object returned == NULL, got %p.\n", unknown); hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, NULL, NULL); - todo_wine ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr); + ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr); hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, tests[i].iid, (void **)&unknown); - todo_wine ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#x.\n", i, hr); + todo_wine_if(tests[i].todo) + ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#x.\n", i, hr); if (SUCCEEDED(hr)) { ref2 = get_refcount((IUnknown *)d3drm1);

1 0

Caron Wills : wined3d: Add Nvidia GeForce GTX 870M.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: 7c18fe17c76efd7d7a2b2648c48e5990c2ae780a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c18fe17c76efd7d7a2b2648c… Author: Caron Wills <caron(a)codeweavers.com> Date: Wed Apr 20 16:15:18 2016 +0000 wined3d: Add Nvidia GeForce GTX 870M. Signed-off-by: Caron Wills <caron(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3f80225..1bb7182 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1293,6 +1293,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_845M, "NVIDIA GeForce 845M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX850M, "NVIDIA GeForce GTX 850M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX870M, "NVIDIA GeForce GTX 870M", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX960, "NVIDIA GeForce GTX 960", DRIVER_NVIDIA_GEFORCE8, 4096}, @@ -1755,6 +1756,7 @@ cards_nvidia_binary[] = {"GTX 960", CARD_NVIDIA_GEFORCE_GTX960}, /* GeForce 900 - midend high */ {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ + {"GTX 870M", CARD_NVIDIA_GEFORCE_GTX870M}, /* GeForce 800 - mobile */ {"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */ {"GTX 850M", CARD_NVIDIA_GEFORCE_GTX850M}, /* GeForce 800 - mobile */ {"GeForce 845M", CARD_NVIDIA_GEFORCE_845M}, /* GeForce 800 - mobile */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7421368..7863c8c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1801,6 +1801,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_845M = 0x1344, CARD_NVIDIA_GEFORCE_GTX850M = 0x1391, CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */ + CARD_NVIDIA_GEFORCE_GTX870M = 0x1199, CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a, CARD_NVIDIA_GEFORCE_GTX960 = 0x1401,

1 0

Michael Stefaniuc : mshtml: Use wine_dbgstr_rect() to trace RECTs.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: db8159ee89649954620169da7b168c8b71d61395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db8159ee89649954620169da7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 20 10:37:03 2016 +0200 mshtml: Use wine_dbgstr_rect() to trace RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/view.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 43ea3e3..8ca3caf 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -250,9 +250,8 @@ static HRESULT activate_window(HTMLDocumentObj *This) return hres; } - TRACE("got window context: %p %p {%d %d %d %d} {%d %d %d %d} {%d %x %p %p %d}\n", - pIPFrame, This->ip_window, posrect.left, posrect.top, posrect.right, posrect.bottom, - cliprect.left, cliprect.top, cliprect.right, cliprect.bottom, + TRACE("got window context: %p %p %s %s {%d %x %p %p %d}\n", + pIPFrame, This->ip_window, wine_dbgstr_rect(&posrect), wine_dbgstr_rect(&cliprect), frameinfo.cb, frameinfo.fMDIApp, frameinfo.hwndFrame, frameinfo.haccel, frameinfo.cAccelEntries); hres = IOleInPlaceSite_GetWindow(This->ipsite, &parent_hwnd);

1 0

Michael Müller : ws2_32/tests: Add initial tests for DisconnectEx.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: 0625dd8bf6f60a90f33e2000c9c48860b01596ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=0625dd8bf6f60a90f33e2000c… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Apr 20 16:03:48 2016 +0200 ws2_32/tests: Add initial tests for DisconnectEx. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d5e01c8..e5da804 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7810,6 +7810,102 @@ end: closesocket(connector2); } +static void test_DisconnectEx(void) +{ + SOCKET listener, acceptor, connector; + LPFN_DISCONNECTEX pDisconnectEx; + GUID disconnectExGuid = WSAID_DISCONNECTEX; + struct sockaddr_in address; + DWORD num_bytes, flags; + OVERLAPPED overlapped; + int addrlen, iret; + BOOL bret; + + connector = socket(AF_INET, SOCK_STREAM, 0); + ok(connector != INVALID_SOCKET, "failed to create connector socket, error %d\n", WSAGetLastError()); + + iret = WSAIoctl(connector, SIO_GET_EXTENSION_FUNCTION_POINTER, &disconnectExGuid, sizeof(disconnectExGuid), + &pDisconnectEx, sizeof(pDisconnectEx), &num_bytes, NULL, NULL); + if (iret) + { + skip("WSAIoctl failed to get DisconnectEx, error %d\n", WSAGetLastError()); + closesocket(connector); + return; + } + + listener = socket(AF_INET, SOCK_STREAM, 0); + ok(listener != INVALID_SOCKET, "failed to create listener socket, error %d\n", WSAGetLastError()); + + memset(&address, 0, sizeof(address)); + address.sin_family = AF_INET; + address.sin_addr.s_addr = inet_addr("127.0.0.1"); + iret = bind(listener, (struct sockaddr *)&address, sizeof(address)); + ok(iret == 0, "failed to bind, error %d\n", WSAGetLastError()); + + addrlen = sizeof(address); + iret = getsockname(listener, (struct sockaddr *)&address, &addrlen); + ok(iret == 0, "failed to lookup bind address, error %d\n", WSAGetLastError()); + + iret = listen(listener, 1); + ok(iret == 0, "failed to listen, error %d\n", WSAGetLastError()); + + set_blocking(listener, TRUE); + + memset(&overlapped, 0, sizeof(overlapped)); + bret = pDisconnectEx(INVALID_SOCKET, &overlapped, 0, 0); + ok(bret == FALSE, "DisconnectEx unexpectedly succeeded\n"); + ok(WSAGetLastError() == WSAENOTSOCK, "expected WSAENOTSOCK, got %d\n", WSAGetLastError()); + + memset(&overlapped, 0, sizeof(overlapped)); + bret = pDisconnectEx(connector, &overlapped, 0, 0); + ok(bret == FALSE, "DisconnectEx unexpectedly succeeded\n"); + ok(WSAGetLastError() == WSAENOTCONN, "expected WSAENOTCONN, got %d\n", WSAGetLastError()); + + iret = connect(connector, (struct sockaddr *)&address, addrlen); + ok(iret == 0, "failed to connect, error %d\n", WSAGetLastError()); + + acceptor = accept(listener, NULL, NULL); + ok(acceptor != INVALID_SOCKET, "could not accept socket, error %d\n", WSAGetLastError()); + + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.hEvent = WSACreateEvent(); + ok(overlapped.hEvent != WSA_INVALID_EVENT, "WSACreateEvent failed, error %d\n", WSAGetLastError()); + bret = pDisconnectEx(connector, &overlapped, 0, 0); + if (bret) + ok(overlapped.Internal == STATUS_PENDING, "expected STATUS_PENDING, got %08lx\n", overlapped.Internal); + else if (WSAGetLastError() == ERROR_IO_PENDING) + bret = WSAGetOverlappedResult(connector, &overlapped, &num_bytes, TRUE, &flags); + ok(bret, "DisconnectEx failed, error %d\n", WSAGetLastError()); + WSACloseEvent(overlapped.hEvent); + + iret = connect(connector, (struct sockaddr *)&address, sizeof(address)); + ok(iret != 0, "connect unexpectedly succeeded\n"); + ok(WSAGetLastError() == WSAEISCONN, "expected WSAEISCONN, got %d\n", WSAGetLastError()); + + closesocket(acceptor); + closesocket(connector); + + connector = socket(AF_INET, SOCK_STREAM, 0); + ok(connector != INVALID_SOCKET, "failed to create connector socket, error %d\n", WSAGetLastError()); + + iret = connect(connector, (struct sockaddr *)&address, addrlen); + ok(iret == 0, "failed to connect, error %d\n", WSAGetLastError()); + + acceptor = accept(listener, NULL, NULL); + ok(acceptor != INVALID_SOCKET, "could not accept socket, error %d\n", WSAGetLastError()); + + bret = pDisconnectEx(connector, NULL, 0, 0); + ok(bret, "DisconnectEx failed, error %d\n", WSAGetLastError()); + + iret = connect(connector, (struct sockaddr *)&address, sizeof(address)); + ok(iret != 0, "connect unexpectedly succeeded\n"); + ok(WSAGetLastError() == WSAEISCONN, "expected WSAEISCONN, got %d\n", WSAGetLastError()); + + closesocket(acceptor); + closesocket(connector); + closesocket(listener); +} + #define compare_file(h,s,o) compare_file2(h,s,o,__FILE__,__LINE__) static void compare_file2(HANDLE handle, SOCKET sock, int offset, const char *file, int line) @@ -9588,6 +9684,7 @@ START_TEST( sock ) test_getaddrinfo(); test_AcceptEx(); test_ConnectEx(); + test_DisconnectEx(); test_sioRoutingInterfaceQuery(); test_sioAddressListChange();

1 0

Michael Müller : ws2_32: Add semi-stub for DisconnectEx.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: 59ffe4e321dae9aa5135baa333e614140282a70a URL: http://source.winehq.org/git/wine.git/?a=commit;h=59ffe4e321dae9aa5135baa33… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Apr 20 16:03:57 2016 +0200 ws2_32: Add semi-stub for DisconnectEx. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 21 ++++++++++++++++++++- dlls/ws2_32/tests/sock.c | 4 ++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f62c9cd..8d58631 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3552,6 +3552,24 @@ connection_success: return TRUE; } +/*********************************************************************** + * DisconnectEx + */ +static BOOL WINAPI WS2_DisconnectEx( SOCKET s, LPOVERLAPPED ov, DWORD flags, DWORD reserved ) +{ + TRACE( "socket %04lx, ov %p, flags 0x%x, reserved 0x%x\n", s, ov, flags, reserved ); + + if (flags & TF_REUSE_SOCKET) + FIXME( "Reusing socket not supported yet\n" ); + + if (ov) + { + ov->Internal = STATUS_PENDING; + ov->InternalHigh = 0; + } + + return !WS_shutdown( s, SD_BOTH ); +} /*********************************************************************** * getpeername (WS2_32.5) @@ -4767,7 +4785,8 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID } else if ( IsEqualGUID(&disconnectex_guid, in_buff) ) { - FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented DisconnectEx\n"); + *(LPFN_DISCONNECTEX *)out_buff = WS2_DisconnectEx; + break; } else if ( IsEqualGUID(&acceptex_guid, in_buff) ) { diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e5da804..00555a9 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7828,7 +7828,7 @@ static void test_DisconnectEx(void) &pDisconnectEx, sizeof(pDisconnectEx), &num_bytes, NULL, NULL); if (iret) { - skip("WSAIoctl failed to get DisconnectEx, error %d\n", WSAGetLastError()); + win_skip("WSAIoctl failed to get DisconnectEx, error %d\n", WSAGetLastError()); closesocket(connector); return; } @@ -7859,7 +7859,7 @@ static void test_DisconnectEx(void) memset(&overlapped, 0, sizeof(overlapped)); bret = pDisconnectEx(connector, &overlapped, 0, 0); ok(bret == FALSE, "DisconnectEx unexpectedly succeeded\n"); - ok(WSAGetLastError() == WSAENOTCONN, "expected WSAENOTCONN, got %d\n", WSAGetLastError()); + todo_wine ok(WSAGetLastError() == WSAENOTCONN, "expected WSAENOTCONN, got %d\n", WSAGetLastError()); iret = connect(connector, (struct sockaddr *)&address, addrlen); ok(iret == 0, "failed to connect, error %d\n", WSAGetLastError());

1 0

Nikolay Sivov : d3dx10: Implement D3DX10CreateDevice().
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: 8622cdac40471c9be4c26d1d12d7bb066d92ebc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8622cdac40471c9be4c26d1d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 20 17:42:30 2016 +0200 d3dx10: Implement D3DX10CreateDevice(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/Makefile.in | 1 + dlls/d3dx10_43/d3dx10_43.spec | 2 +- dlls/d3dx10_43/d3dx10_43_main.c | 21 ++++++++++++++++++++- include/d3dx10core.idl | 2 ++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/Makefile.in b/dlls/d3dx10_43/Makefile.in index cb48f0d..6e67a6b 100644 --- a/dlls/d3dx10_43/Makefile.in +++ b/dlls/d3dx10_43/Makefile.in @@ -1,5 +1,6 @@ MODULE = d3dx10_43.dll IMPORTLIB = d3dx10 +IMPORTS = d3d10_1 C_SRCS = \ d3dx10_43_main.c diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index 0673f6a..53059bf 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -18,7 +18,7 @@ @ stub D3DX10CreateAsyncShaderResourceViewProcessor(ptr ptr ptr) @ stub D3DX10CreateAsyncTextureInfoProcessor(ptr ptr) @ stub D3DX10CreateAsyncTextureProcessor(ptr ptr ptr) -@ stub D3DX10CreateDevice(ptr long long long ptr) +@ stdcall D3DX10CreateDevice(ptr long long long ptr) @ stub D3DX10CreateDeviceAndSwapChain(ptr long long long ptr ptr ptr) @ stdcall D3DX10CreateEffectFromFileA(str ptr ptr str long long ptr ptr ptr ptr ptr ptr) @ stdcall D3DX10CreateEffectFromFileW(wstr ptr ptr str long long ptr ptr ptr ptr ptr ptr) diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index fa4fa79..1b60fc5 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -33,7 +33,7 @@ #include "winuser.h" #include "objbase.h" -#include "d3d10.h" +#include "d3d10_1.h" #include "d3dx10core.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); @@ -123,3 +123,22 @@ HRESULT WINAPI D3DX10UnsetAllDeviceObjects(ID3D10Device *device) return E_NOTIMPL; } + +HRESULT WINAPI D3DX10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, + HMODULE swrast, unsigned int flags, ID3D10Device **device) +{ + HRESULT hr; + + TRACE("adapter %p, driver_type %d, swrast %p, flags %#x, device %p.\n", adapter, driver_type, + swrast, flags, device); + + if (SUCCEEDED(hr = D3D10CreateDevice1(adapter, driver_type, swrast, flags, D3D10_FEATURE_LEVEL_10_1, + D3D10_SDK_VERSION, (ID3D10Device1 **)device))) + return hr; + + if (SUCCEEDED(hr = D3D10CreateDevice1(adapter, driver_type, swrast, flags, D3D10_FEATURE_LEVEL_10_0, + D3D10_SDK_VERSION, (ID3D10Device1 **)device))) + return hr; + + return hr; +} diff --git a/include/d3dx10core.idl b/include/d3dx10core.idl index 0e2bf31..6d9927e 100644 --- a/include/d3dx10core.idl +++ b/include/d3dx10core.idl @@ -66,3 +66,5 @@ interface ID3DX10ThreadPump : IUnknown }; cpp_quote("HRESULT WINAPI D3DX10UnsetAllDeviceObjects(ID3D10Device *device);") +cpp_quote("HRESULT WINAPI D3DX10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type,") +cpp_quote(" HMODULE swrast, unsigned int flags, ID3D10Device **device);")

1 0

Francois Gouget : mmdevapi/tests: A spelling fix for a render ok() message.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: c79236b86ed841179d64a930806b49d3f2da8d34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c79236b86ed841179d64a9308… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 20 08:56:12 2016 +0200 mmdevapi/tests: A spelling fix for a render ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/render.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 9d2853c..9c42f3a 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -730,7 +730,7 @@ static void test_padding(void) ok(defp == 100000 || broken(defp == 101587) || defp == 200000, "Expected 10ms default period: %u\n", (ULONG)defp); ok(minp != 0, "Minimum period is 0\n"); - ok(minp <= defp, "Mininum period is greater than default period\n"); + ok(minp <= defp, "Minimum period is greater than default period\n"); hr = IAudioClient_GetService(ac, &IID_IAudioRenderClient, (void**)&arc); ok(hr == S_OK, "GetService failed: %08x\n", hr);

1 0

Francois Gouget : mmdevapi/tests: Use RegQueryValueExW() for compatibility with Windows XP.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: d25af3c247fa47c7b62e924138c7e56ad9b5b5b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d25af3c247fa47c7b62e92413… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 20 11:52:11 2016 +0200 mmdevapi/tests: Use RegQueryValueExW() for compatibility with Windows XP. RegGetValueW() was added later and should be avoided in the conformance tests. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/propstore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index 06fe690..665136f 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -173,7 +173,7 @@ static void test_setvalue_on_wow64(IPropertyStore *store) /* Note: the registry key exists even without calling IPropStore::Commit */ size = sizeof(regval); - ret = RegGetValueW(props, NULL, bogusW, RRF_RT_DWORD, &type, &regval, &size); + ret = RegQueryValueExW(props, bogusW, NULL, &type, (LPBYTE)&regval, &size); ok(ret == ERROR_SUCCESS, "Couldn't get bogus propertykey value: %u\n", ret); ok(type == REG_DWORD, "Got wrong value type: %u\n", type); ok(regval == 0xAB, "Got wrong value: 0x%x\n", regval);

1 0