September 2013 - Wine-commits

Bruno Jesus : ws2_32: Auto detect the socket type and family based on the protocol.
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: 35e54fa59bf4b45abfa18e2323a590bc3c673498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35e54fa59bf4b45abfa18e232… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Sep 17 10:00:37 2013 -0300 ws2_32: Auto detect the socket type and family based on the protocol. --- dlls/ws2_32/socket.c | 31 ++++++++++++++++++------------- dlls/ws2_32/tests/sock.c | 13 ------------- 2 files changed, 18 insertions(+), 26 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 30c3c6c..1e2c44e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5894,24 +5894,29 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, protocol = lpProtocolInfo->iProtocol; } - /* convert the socket family and type */ - af = convert_af_w2u(af); - type = convert_socktype_w2u(type); - - if ( af == AF_UNSPEC) /* did they not specify the address family? */ + if (!type && (af || protocol)) { - if ((protocol == IPPROTO_TCP && type == SOCK_STREAM) || - (protocol == IPPROTO_UDP && type == SOCK_DGRAM)) - { - af = AF_INET; - } - else + WSAPROTOCOL_INFOW infow; + + /* default to the first valid protocol */ + if (!protocol) + protocol = valid_protocols[0]; + + if (WS_EnterSingleProtocolW(protocol, &infow)) { - SetLastError(WSAEPROTOTYPE); - return INVALID_SOCKET; + type = infow.iSocketType; + + /* after win2003 it's no longer possible to pass AF_UNSPEC + using the protocol info struct */ + if (!lpProtocolInfo && af == WS_AF_UNSPEC) + af = infow.iAddressFamily; } } + /* convert the socket family and type */ + af = convert_af_w2u(af); + type = convert_socktype_w2u(type); + SERVER_START_REQ( create_socket ) { req->family = af; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 1f18869..a9e6333 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1788,7 +1788,6 @@ todo_wine ok(err == WSAEINVAL, "Expected 10022, received %d\n", err); sock = WSASocketA(AF_INET, 0, 0, NULL, 0, 0); -todo_wine ok(sock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); closesocket(sock); @@ -1800,14 +1799,12 @@ todo_wine ok(WSASocketA(0, SOCK_STREAM, -1, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAEPROTONOSUPPORT, "Expected 10043, received %d\n", err); SetLastError(0xdeadbeef); ok(WSASocketA(0, -1, IPPROTO_UDP, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAESOCKTNOSUPPORT, "Expected 10044, received %d\n", err); SetLastError(0xdeadbeef); @@ -1821,7 +1818,6 @@ todo_wine ok(WSASocketA(0, -1, -1, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAESOCKTNOSUPPORT, "Expected 10044, received %d\n", err); SetLastError(0xdeadbeef); @@ -1832,7 +1828,6 @@ todo_wine ok(err == WSAEAFNOSUPPORT, "Expected 10047, received %d\n", err); sock = WSASocketA(AF_INET, 0, IPPROTO_TCP, NULL, 0, 0); -todo_wine ok(sock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); closesocket(sock); @@ -1864,7 +1859,6 @@ todo_wine ok(err == WSAEINVAL, "Expected 10022, received %d\n", err); sock = WSASocketA(0, 0, IPPROTO_TCP, NULL, 0, 0); -todo_wine ok(sock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); closesocket(sock); @@ -1992,20 +1986,17 @@ todo_wine * from WSAEnumProtocols that has the flag PFL_MATCHES_PROTOCOL_ZERO * is returned */ sock = WSASocketA(AF_INET, 0, 0, NULL, 0, 0); -todo_wine ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", WSAGetLastError()); size = sizeof(socktype); socktype = 0xdead; err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); -todo_wine ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); for(i = 0; i < items; i++) { if(pi[i].dwProviderFlags & PFL_MATCHES_PROTOCOL_ZERO) { -todo_wine ok(socktype == pi[i].iSocketType, "Wrong socket type, expected %d received %d\n", pi[i].iSocketType, socktype); break; @@ -2019,14 +2010,12 @@ todo_wine for (i = 0; i < sizeof(autoprotocols) / sizeof(autoprotocols[0]); i++) { sock = WSASocketA(0, 0, autoprotocols[i], NULL, 0, 0); -todo_wine ok(sock != INVALID_SOCKET, "Failed to create socket for protocol %d, received %d\n", autoprotocols[i], WSAGetLastError()); size = sizeof(socktype); socktype = 0xdead; err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); -todo_wine ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); for (err = 1, j = 0; j < items; j++) @@ -2036,13 +2025,11 @@ todo_wine if (socktype == pi[j].iSocketType) err = 0; else -todo_wine ok(0, "Wrong socket type, expected %d received %d\n", pi[j].iSocketType, socktype); break; } } -todo_wine ok(!err, "Protocol %d not found in WSAEnumProtocols\n", autoprotocols[i]); closesocket(sock);

1 0

Bruno Jesus : ws2_32: Filter invalid socket parameters and return the appropriate error.
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: 0298165bea97e577401383eb62bd0c882116fbd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0298165bea97e577401383eb6… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Sep 17 10:00:52 2013 -0300 ws2_32: Filter invalid socket parameters and return the appropriate error. --- dlls/ws2_32/socket.c | 48 +++++++++++++++++++++++++++++++++++++++++---- dlls/ws2_32/tests/sock.c | 20 +++++++++++------- 2 files changed, 55 insertions(+), 13 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1e2c44e..e8d87da 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5868,6 +5868,7 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, { SOCKET ret; DWORD err; + int unixaf, unixtype; /* FIXME: The "advanced" parameters of WSASocketW (lpProtocolInfo, @@ -5913,14 +5914,50 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, } } - /* convert the socket family and type */ - af = convert_af_w2u(af); - type = convert_socktype_w2u(type); + /* convert the socket family, type and protocol */ + unixaf = convert_af_w2u(af); + unixtype = convert_socktype_w2u(type); + protocol = convert_proto_w2u(protocol); + if (unixaf == AF_UNSPEC) unixaf = -1; + + /* filter invalid parameters */ + if (protocol < 0) + { + /* the type could not be converted */ + if (type && unixtype < 0) + { + err = WSAESOCKTNOSUPPORT; + goto done; + } + + err = WSAEPROTONOSUPPORT; + goto done; + } + if (unixaf < 0) + { + /* both family and protocol can't be invalid */ + if (protocol <= 0) + { + err = WSAEINVAL; + goto done; + } + + /* family could not be converted and neither socket type */ + if (unixtype < 0 && af >= 0) + { + + err = WSAESOCKTNOSUPPORT; + goto done; + } + + err = WSAEAFNOSUPPORT; + goto done; + } SERVER_START_REQ( create_socket ) { - req->family = af; - req->type = type; + req->family = unixaf; + req->type = unixtype; req->protocol = protocol; req->access = GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE; req->attributes = OBJ_INHERIT; @@ -5952,6 +5989,7 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, err = WSAEPROTONOSUPPORT; } +done: WARN("\t\tfailed, error %d!\n", err); SetLastError(err); return INVALID_SOCKET; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index a9e6333..3921262 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1784,7 +1784,6 @@ static void test_WSASocket(void) ok(WSASocketA(0, 0, 0, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAEINVAL, "Expected 10022, received %d\n", err); sock = WSASocketA(AF_INET, 0, 0, NULL, 0, 0); @@ -1811,10 +1810,21 @@ todo_wine ok(WSASocketA(0, -1, 0, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAEINVAL, "Expected 10022, received %d\n", err); SetLastError(0xdeadbeef); + ok(WSASocketA(AF_INET, -1, 0, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAESOCKTNOSUPPORT, "Expected 10044, received %d\n", err); + + SetLastError(0xdeadbeef); + ok(WSASocketA(AF_INET, 0, -1, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAEPROTONOSUPPORT, "Expected 10043, received %d\n", err); + + SetLastError(0xdeadbeef); ok(WSASocketA(0, -1, -1, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); err = WSAGetLastError(); @@ -1824,7 +1834,6 @@ todo_wine ok(WSASocketA(-1, SOCK_STREAM, IPPROTO_UDP, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAEAFNOSUPPORT, "Expected 10047, received %d\n", err); sock = WSASocketA(AF_INET, 0, IPPROTO_TCP, NULL, 0, 0); @@ -1835,14 +1844,12 @@ todo_wine ok(WSASocketA(0, SOCK_STREAM, 0, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAEINVAL, "Expected 10022, received %d\n", err); SetLastError(0xdeadbeef); ok(WSASocketA(0, 0, 0xdead, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAEPROTONOSUPPORT, "Expected 10043, received %d\n", err); SetLastError(0xdeadbeef); @@ -1855,7 +1862,6 @@ todo_wine ok(WSASocketA(0, 0xdead, 0, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAEINVAL, "Expected 10022, received %d\n", err); sock = WSASocketA(0, 0, IPPROTO_TCP, NULL, 0, 0); @@ -1917,7 +1923,6 @@ todo_wine ok(WSASocketA(0, 0, IPPROTO_UDP, &pi[0], 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAEAFNOSUPPORT, "Expected 10047, received %d\n", err); pi[0].iProtocol = 0; @@ -1932,7 +1937,6 @@ todo_wine else { err = WSAGetLastError(); -todo_wine ok(err == WSAEAFNOSUPPORT, "Expected 10047, received %d\n", err); }

1 0

Bruno Jesus : ws2_32: Do not allow socket creation if WSAStartup was not called.
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: 2034f515981ead985c4c24fac7b6935326cdb490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2034f515981ead985c4c24fac… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Sep 17 10:01:07 2013 -0300 ws2_32: Do not allow socket creation if WSAStartup was not called. --- dlls/ws2_32/socket.c | 6 ++++++ dlls/ws2_32/tests/sock.c | 1 - 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e8d87da..8a790f3 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5878,6 +5878,12 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, TRACE("af=%d type=%d protocol=%d protocol_info=%p group=%d flags=0x%x\n", af, type, protocol, lpProtocolInfo, g, dwFlags ); + if (!num_startup) + { + err = WSANOTINITIALISED; + goto done; + } + /* hack for WSADuplicateSocket */ if (lpProtocolInfo && lpProtocolInfo->dwServiceFlags4 == 0xff00ff00) { ret = lpProtocolInfo->dwServiceFlags3; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3921262..b77bb3c 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -975,7 +975,6 @@ static void test_WithoutWSAStartup(void) WSASetLastError(0xdeadbeef); ok(WSASocketA(0, 0, 0, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSANOTINITIALISED, "Expected 10093, received %d\n", err); WSASetLastError(0xdeadbeef);

1 0

Henri Verbeet : ddraw: Fix render target refcount handling.
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: df01e8d6ccd30d0278b6a999dbd984c901f150dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=df01e8d6ccd30d0278b6a999d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 17 09:22:36 2013 +0200 ddraw: Fix render target refcount handling. Similar to AddAttachedSurface() / DeleteAttachedSurface(), we should Release the interface version that we stored. (And actually store the interface that we AddRef.) --- dlls/ddraw/ddraw.c | 15 ++++--- dlls/ddraw/ddraw_private.h | 4 +- dlls/ddraw/device.c | 102 +++++++++++++++++-------------------------- dlls/ddraw/surface.c | 7 ++- 4 files changed, 55 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=df01e8d6ccd30d0278b6a…

1 0

Henri Verbeet : ddraw: Don't set render target / depth stencil usage on sysmem surfaces.
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: 3fb53e21fb2cccf249ed65a4641eac21422f6609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fb53e21fb2cccf249ed65a46… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 17 09:22:37 2013 +0200 ddraw: Don't set render target / depth stencil usage on sysmem surfaces. Setting render target usage on a P8 surface for example would fail surface creation, while such surfaces can't be used for actual rendering anyway. Tests confirm that surface creation is supposed to succeed for P8 surfaces with both DDSCAPS_SYSTEMMEMORY and DDSCAPS_3DDEVICE set. --- dlls/ddraw/surface.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d23fc9c..416c13f 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5740,9 +5740,12 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, if (desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) desc->ddsCaps.dwCaps |= DDSCAPS_VISIBLE; - if ((desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) && !(desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER)) + if (!(desc->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY)) { - usage |= WINED3DUSAGE_RENDERTARGET; + if (desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) + usage |= WINED3DUSAGE_DEPTHSTENCIL; + else if (desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) + usage |= WINED3DUSAGE_RENDERTARGET; } if (desc->ddsCaps.dwCaps & (DDSCAPS_OVERLAY)) @@ -5750,9 +5753,6 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, usage |= WINED3DUSAGE_OVERLAY; } - if (desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) - usage |= WINED3DUSAGE_DEPTHSTENCIL; - if (desc->ddsCaps.dwCaps & DDSCAPS_OWNDC) usage |= WINED3DUSAGE_OWNDC;

1 0

Henri Verbeet : ddraw: Verify that the surface is a render target in d3d_device_create().
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: d2d0c42b6d037fa954633a397306f557ef8bfe9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2d0c42b6d037fa954633a397… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 17 09:22:38 2013 +0200 ddraw: Verify that the surface is a render target in d3d_device_create(). --- dlls/ddraw/device.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 66e0b7f..7510ed8 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6745,6 +6745,13 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn TRACE("ddraw %p, target %p, version %u, device %p, outer_unknown %p.\n", ddraw, target, version, device, outer_unknown); + if (!(target->surface_desc.ddsCaps.dwCaps & DDSCAPS_3DDEVICE) + || (target->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER)) + { + WARN("Surface %p is not a render target.\n", target); + return DDERR_INVALIDCAPS; + } + if (ddraw->flags & DDRAW_NO3D) { ERR_(winediag)("The application wants to create a Direct3D device, "

1 0

Henri Verbeet : d3d10core: Avoid LPSTR.
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: 592b347c79ddeaf895def4b0232ff9ee05db45f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=592b347c79ddeaf895def4b02… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 17 09:22:39 2013 +0200 d3d10core: Avoid LPSTR. --- dlls/d3d10core/device.c | 4 ++-- include/d3d10.idl | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index c40a353..e694a80 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1610,8 +1610,8 @@ static void STDMETHODCALLTYPE d3d10_device_CheckCounterInfo(ID3D10Device *iface, } static HRESULT STDMETHODCALLTYPE d3d10_device_CheckCounter(ID3D10Device *iface, - const D3D10_COUNTER_DESC *desc, D3D10_COUNTER_TYPE *type, UINT *active_counters, LPSTR name, - UINT *name_length, LPSTR units, UINT *units_length, LPSTR description, UINT *description_length) + const D3D10_COUNTER_DESC *desc, D3D10_COUNTER_TYPE *type, UINT *active_counters, char *name, + UINT *name_length, char *units, UINT *units_length, char *description, UINT *description_length) { FIXME("iface %p, desc %p, type %p, active_counters %p, name %p, name_length %p,\n" "\tunits %p, units_length %p, description %p, description_length %p stub!\n", diff --git a/include/d3d10.idl b/include/d3d10.idl index 73a9e62..9f84400 100644 --- a/include/d3d10.idl +++ b/include/d3d10.idl @@ -1559,11 +1559,11 @@ interface ID3D10Device : IUnknown [in] const D3D10_COUNTER_DESC *pDesc, [out] D3D10_COUNTER_TYPE *pType, [out] UINT *pActiveCounters, - [out] LPSTR szName, + [out] char *name, [in, out] UINT *pNameLength, - [out] LPSTR szUnits, + [out] char *units, [in, out] UINT *pUnitsLength, - [out] LPSTR szDescription, + [out] char *description, [in, out] UINT *pDescriptionLength); UINT GetCreationFlags(); HRESULT OpenSharedResource(

1 0

Henri Verbeet : d3d10core: Avoid LPVOID.
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: 6d02c19f2be9273e17f41b51100ea29ff7b97887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d02c19f2be9273e17f41b511… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 17 09:22:40 2013 +0200 d3d10core: Avoid LPVOID. --- dlls/d3d10core/d3d10core_main.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/d3d10core_main.c b/dlls/d3d10core/d3d10core_main.c index 78826f6..abc8434 100644 --- a/dlls/d3d10core/d3d10core_main.c +++ b/dlls/d3d10core/d3d10core_main.c @@ -25,14 +25,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) { - TRACE("fdwReason %u\n", fdwReason); - - switch(fdwReason) + switch (reason) { case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); + DisableThreadLibraryCalls(inst); break; }

1 0

André Hentschel : kernel32/tests: Add initial CreateFile2 tests based on the CreateFileW tests.
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: 22cd7a10cfe80c83717b6c976edc8409315da782 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22cd7a10cfe80c83717b6c976… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Sep 16 20:26:01 2013 +0200 kernel32/tests: Add initial CreateFile2 tests based on the CreateFileW tests. --- dlls/kernel32/tests/file.c | 85 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 85 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index d7a8776..288fc5e 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -33,6 +33,7 @@ #include "winbase.h" #include "winerror.h" #include "winnls.h" +#include "fileapi.h" static HANDLE (WINAPI *pFindFirstFileExA)(LPCSTR,FINDEX_INFO_LEVELS,LPVOID,FINDEX_SEARCH_OPS,LPVOID,DWORD); static BOOL (WINAPI *pReplaceFileA)(LPCSTR, LPCSTR, LPCSTR, DWORD, LPVOID, LPVOID); @@ -44,6 +45,7 @@ static BOOL (WINAPI *pGetFileInformationByHandleEx)(HANDLE, FILE_INFO_BY_HANDLE_ static HANDLE (WINAPI *pOpenFileById)(HANDLE, LPFILE_ID_DESCRIPTOR, DWORD, DWORD, LPSECURITY_ATTRIBUTES, DWORD); static BOOL (WINAPI *pSetFileValidData)(HANDLE, LONGLONG); static HRESULT (WINAPI *pCopyFile2)(PCWSTR,PCWSTR,COPYFILE2_EXTENDED_PARAMETERS*); +static HANDLE (WINAPI *pCreateFile2)(LPCWSTR, DWORD, DWORD, DWORD, CREATEFILE2_EXTENDED_PARAMETERS*); /* keep filename and filenameW the same */ static const char filename[] = "testfile.xxx"; @@ -82,6 +84,7 @@ static void InitFunctionPointers(void) pOpenFileById = (void *) GetProcAddress(hkernel32, "OpenFileById"); pSetFileValidData = (void *) GetProcAddress(hkernel32, "SetFileValidData"); pCopyFile2 = (void *) GetProcAddress(hkernel32, "CopyFile2"); + pCreateFile2 = (void *) GetProcAddress(hkernel32, "CreateFile2"); } static void test__hread( void ) @@ -1488,6 +1491,87 @@ static void test_CreateFileW(void) ok(ret, "DeleteFileW: error %d\n", GetLastError()); } +static void test_CreateFile2(void) +{ + HANDLE hFile; + WCHAR temp_path[MAX_PATH]; + WCHAR filename[MAX_PATH]; + CREATEFILE2_EXTENDED_PARAMETERS exparams; + static const WCHAR emptyW[]={'\0'}; + static const WCHAR prefix[] = {'p','f','x',0}; + static const WCHAR bogus[] = { '\\', '\\', '.', '\\', 'B', 'O', 'G', 'U', 'S', 0 }; + DWORD ret; + + if (!pCreateFile2) + { + win_skip("CreateFile2 is missing\n"); + return; + } + + ret = GetTempPathW(MAX_PATH, temp_path); + ok(ret != 0, "GetTempPathW error %d\n", GetLastError()); + ok(ret < MAX_PATH, "temp path should fit into MAX_PATH\n"); + + ret = GetTempFileNameW(temp_path, prefix, 0, filename); + ok(ret != 0, "GetTempFileNameW error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + exparams.dwSize = sizeof(exparams); + exparams.dwFileAttributes = FILE_FLAG_RANDOM_ACCESS; + exparams.dwFileFlags = 0; + exparams.dwSecurityQosFlags = 0; + exparams.lpSecurityAttributes = NULL; + exparams.hTemplateFile = 0; + hFile = pCreateFile2(filename, GENERIC_READ, 0, CREATE_NEW, &exparams); + ok(hFile == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_EXISTS, + "CREATE_NEW should fail if file exists and last error value should be ERROR_FILE_EXISTS\n"); + + SetLastError(0xdeadbeef); + hFile = pCreateFile2(filename, GENERIC_READ, FILE_SHARE_READ, CREATE_ALWAYS, &exparams); + ok(hFile != INVALID_HANDLE_VALUE && GetLastError() == ERROR_ALREADY_EXISTS, + "hFile %p, last error %u\n", hFile, GetLastError()); + CloseHandle(hFile); + + SetLastError(0xdeadbeef); + hFile = pCreateFile2(filename, GENERIC_READ, FILE_SHARE_READ, OPEN_ALWAYS, &exparams); + ok(hFile != INVALID_HANDLE_VALUE && GetLastError() == ERROR_ALREADY_EXISTS, + "hFile %p, last error %u\n", hFile, GetLastError()); + CloseHandle(hFile); + + ret = DeleteFileW(filename); + ok(ret, "DeleteFileW: error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + hFile = pCreateFile2(filename, GENERIC_READ, FILE_SHARE_READ, OPEN_ALWAYS, &exparams); + ok(hFile != INVALID_HANDLE_VALUE && GetLastError() == 0, + "hFile %p, last error %u\n", hFile, GetLastError()); + CloseHandle(hFile); + + ret = DeleteFileW(filename); + ok(ret, "DeleteFileW: error %d\n", GetLastError()); + + hFile = pCreateFile2(emptyW, GENERIC_READ, 0, CREATE_NEW, &exparams); + ok(hFile == INVALID_HANDLE_VALUE && GetLastError() == ERROR_PATH_NOT_FOUND, + "CreateFile2(\"\") returned ret=%p error=%d\n",hFile,GetLastError()); + + /* test the result of opening a nonexistent driver name */ + exparams.dwFileAttributes = FILE_ATTRIBUTE_NORMAL; + hFile = pCreateFile2(bogus, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, OPEN_EXISTING, &exparams); + ok(hFile == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_NOT_FOUND, + "CreateFile2 on invalid VxD name returned ret=%p error=%d\n",hFile,GetLastError()); + + ret = CreateDirectoryW(filename, NULL); + ok(ret == TRUE, "couldn't create temporary directory\n"); + exparams.dwFileAttributes = FILE_ATTRIBUTE_NORMAL | FILE_FLAG_BACKUP_SEMANTICS; + hFile = pCreateFile2(filename, GENERIC_READ | GENERIC_WRITE, 0, OPEN_ALWAYS, &exparams); + todo_wine + ok(hFile == INVALID_HANDLE_VALUE, + "expected CreateFile2 to fail on existing directory, error: %d\n", GetLastError()); + CloseHandle(hFile); + ret = RemoveDirectoryW(filename); + ok(ret, "DeleteFileW: error %d\n", GetLastError()); +} + static void test_GetTempFileNameA(void) { UINT result; @@ -3906,6 +3990,7 @@ START_TEST(file) test_CreateFile(); test_CreateFileA(); test_CreateFileW(); + test_CreateFile2(); test_DeleteFileA(); test_DeleteFileW(); test_MoveFileA();

1 0

Hans Leidekker : wsnmp32: Add stub implementations for a couple of functions.
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: d36e7c080c5631eca2e176f23d4cc0e3f3664993 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d36e7c080c5631eca2e176f23… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 17 11:03:32 2013 +0200 wsnmp32: Add stub implementations for a couple of functions. --- configure | 3 +- configure.ac | 3 +- dlls/wsnmp32/Makefile.in | 3 +- dlls/wsnmp32/tests/Makefile.in | 7 +++++ dlls/wsnmp32/tests/wsnmp.c | 51 +++++++++++++++++++++++++++++++++++++ dlls/wsnmp32/wsnmp32.c | 32 +++++++++++++++++++++++ dlls/wsnmp32/wsnmp32.spec | 8 +++--- include/Makefile.in | 1 + include/winsnmp.h | 55 ++++++++++++++++++++++++++++++++++++++++ 9 files changed, 156 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 8ee4819..28e275d 100755 --- a/configure +++ b/configure @@ -16493,7 +16493,8 @@ wine_fn_config_dll ws2_32 enable_ws2_32 implib wine_fn_config_test dlls/ws2_32/tests ws2_32_test wine_fn_config_dll wshom.ocx enable_wshom_ocx wine_fn_config_test dlls/wshom.ocx/tests wshom.ocx_test -wine_fn_config_dll wsnmp32 enable_wsnmp32 +wine_fn_config_dll wsnmp32 enable_wsnmp32 implib +wine_fn_config_test dlls/wsnmp32/tests wsnmp32_test wine_fn_config_dll wsock32 enable_wsock32 implib wine_fn_config_dll wtsapi32 enable_wtsapi32 implib wine_fn_config_dll wuapi enable_wuapi diff --git a/configure.ac b/configure.ac index 96af299..f42fc15 100644 --- a/configure.ac +++ b/configure.ac @@ -3167,7 +3167,8 @@ WINE_CONFIG_DLL(ws2_32,,[implib]) WINE_CONFIG_TEST(dlls/ws2_32/tests) WINE_CONFIG_DLL(wshom.ocx) WINE_CONFIG_TEST(dlls/wshom.ocx/tests) -WINE_CONFIG_DLL(wsnmp32) +WINE_CONFIG_DLL(wsnmp32,,[implib]) +WINE_CONFIG_TEST(dlls/wsnmp32/tests) WINE_CONFIG_DLL(wsock32,,[implib]) WINE_CONFIG_DLL(wtsapi32,,[implib]) WINE_CONFIG_DLL(wuapi) diff --git a/dlls/wsnmp32/Makefile.in b/dlls/wsnmp32/Makefile.in index 0fe0da2..32e63b8 100644 --- a/dlls/wsnmp32/Makefile.in +++ b/dlls/wsnmp32/Makefile.in @@ -1,4 +1,5 @@ -MODULE = wsnmp32.dll +MODULE = wsnmp32.dll +IMPORTLIB = wsnmp32 C_SRCS = wsnmp32.c diff --git a/dlls/wsnmp32/tests/Makefile.in b/dlls/wsnmp32/tests/Makefile.in new file mode 100644 index 0000000..9d733c7 --- /dev/null +++ b/dlls/wsnmp32/tests/Makefile.in @@ -0,0 +1,7 @@ +TESTDLL = wsnmp32.dll +IMPORTS = wsnmp32 + +C_SRCS = \ + wsnmp.c + +(a)MAKE_TEST_RULES@ diff --git a/dlls/wsnmp32/tests/wsnmp.c b/dlls/wsnmp32/tests/wsnmp.c new file mode 100644 index 0000000..6c1cf60 --- /dev/null +++ b/dlls/wsnmp32/tests/wsnmp.c @@ -0,0 +1,51 @@ +/* + * Copyright 2013 Hans Leidekker for CodeWeavers + * + * 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 <stdarg.h> +#include <stdlib.h> +#include <windef.h> +#include <winbase.h> +#include <winsnmp.h> + +#include "wine/test.h" + +static void test_SnmpStartup(void) +{ + SNMPAPI_STATUS status; + smiUINT32 major, minor, level, translate_mode, retransmit_mode; + + status = SnmpStartup( NULL, NULL, NULL, NULL, NULL ); + ok( status == SNMPAPI_SUCCESS, "got %u\n", status ); + + status = SnmpCleanup(); + ok( status == SNMPAPI_SUCCESS, "got %u\n", status ); + + major = minor = level = translate_mode = retransmit_mode = 0xdeadbeef; + status = SnmpStartup( &major, &minor, &level, &translate_mode, &retransmit_mode ); + ok( status == SNMPAPI_SUCCESS, "got %u\n", status ); + trace( "major %u minor %u level %u translate_mode %u retransmit_mode %u\n", + major, minor, level, translate_mode, retransmit_mode ); + + status = SnmpCleanup(); + ok( status == SNMPAPI_SUCCESS, "got %u\n", status ); +} + +START_TEST (wsnmp) +{ + test_SnmpStartup(); +} diff --git a/dlls/wsnmp32/wsnmp32.c b/dlls/wsnmp32/wsnmp32.c index 838c9bb..721842f 100644 --- a/dlls/wsnmp32/wsnmp32.c +++ b/dlls/wsnmp32/wsnmp32.c @@ -19,6 +19,7 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include "winsnmp.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wsnmp32); @@ -37,3 +38,34 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) } return TRUE; } + +SNMPAPI_STATUS WINAPI SnmpCleanup( void ) +{ + FIXME( "\n" ); + return SNMPAPI_SUCCESS; +} + +SNMPAPI_STATUS WINAPI SnmpSetRetransmitMode( smiUINT32 retransmit_mode ) +{ + FIXME( "%u\n", retransmit_mode ); + return SNMPAPI_SUCCESS; +} + +SNMPAPI_STATUS WINAPI SnmpSetTranslateMode( smiUINT32 translate_mode ) +{ + FIXME( "%u\n", translate_mode ); + return SNMPAPI_SUCCESS; +} + +SNMPAPI_STATUS WINAPI SnmpStartup( smiLPUINT32 major, smiLPUINT32 minor, smiLPUINT32 level, + smiLPUINT32 translate_mode, smiLPUINT32 retransmit_mode ) +{ + FIXME( "%p, %p, %p, %p, %p\n", major, minor, level, translate_mode, retransmit_mode ); + + if (major) *major = 2; + if (minor) *minor = 0; + if (level) *level = SNMPAPI_V2_SUPPORT; + if (translate_mode) *translate_mode = SNMPAPI_UNTRANSLATED_V1; + if (retransmit_mode) *retransmit_mode = SNMPAPI_ON; + return SNMPAPI_SUCCESS; +} diff --git a/dlls/wsnmp32/wsnmp32.spec b/dlls/wsnmp32/wsnmp32.spec index fedf760..197092a 100644 --- a/dlls/wsnmp32/wsnmp32.spec +++ b/dlls/wsnmp32/wsnmp32.spec @@ -1,7 +1,7 @@ 100 stub SnmpGetTranslateMode -101 stub SnmpSetTranslateMode +101 stdcall SnmpSetTranslateMode(long) 102 stub SnmpGetRetransmitMode -103 stub SnmpSetRetransmitMode +103 stdcall SnmpSetRetransmitMode(long) 104 stub SnmpGetTimeout 105 stub SnmpSetTimeout 106 stub SnmpSetRetry @@ -9,8 +9,8 @@ 108 stub _SnmpConveyAgentAddress(a)4 109 stub _SnmpSetAgentAddress(a)4 120 stub SnmpGetVendorInfo -200 stub SnmpStartup -201 stub SnmpCleanup +200 stdcall SnmpStartup(ptr ptr ptr ptr ptr) +201 stdcall SnmpCleanup() 202 stub SnmpOpen 203 stub SnmpClose 204 stub SnmpSendMsg diff --git a/include/Makefile.in b/include/Makefile.in index d40284e..c109c06 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -589,6 +589,7 @@ SRCDIR_INCLUDES = \ winsafer.h \ winscard.h \ winsmcrd.h \ + winsnmp.h \ winsock.h \ winsock2.h \ winspool.h \ diff --git a/include/winsnmp.h b/include/winsnmp.h new file mode 100644 index 0000000..64765de --- /dev/null +++ b/include/winsnmp.h @@ -0,0 +1,55 @@ +/* + * Copyright 2013 Hans Leidekker for CodeWeavers. + * + * 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 + */ + +#ifndef __WINE_WINSNMP_H +#define __WINE_WINSNMP_H + +#ifdef __cplusplus +extern "C" { +#endif + +typedef int smiINT, *smiLPINT; +typedef smiINT smiINT32, *smiLPINT32; +typedef unsigned int smiUINT32, *smiLPUINT32; +typedef smiUINT32 SNMPAPI_STATUS; + +#define SNMPAPI_NO_SUPPORT 0 +#define SNMPAPI_V1_SUPPORT 1 +#define SNMPAPI_V2_SUPPORT 2 +#define SNMPAPI_M2M_SUPPORT 3 + +#define SNMPAPI_TRANSLATED 0 +#define SNMPAPI_UNTRANSLATED_V1 1 +#define SNMPAPI_UNTRANSLATED_V2 2 + +#define SNMPAPI_OFF 0 +#define SNMPAPI_ON 1 + +#define SNMPAPI_FAILURE 0 +#define SNMPAPI_SUCCESS 1 + +SNMPAPI_STATUS WINAPI SnmpCleanup(void); +SNMPAPI_STATUS WINAPI SnmpSetRetransmitMode(smiUINT32); +SNMPAPI_STATUS WINAPI SnmpSetTranslateMode(smiUINT32); +SNMPAPI_STATUS WINAPI SnmpStartup(smiLPUINT32,smiLPUINT32,smiLPUINT32,smiLPUINT32,smiLPUINT32); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_WINSNMP_H */

1 0