July 2013 - Wine-commits - list.winehq.org

André Hentschel : usbd.sys: Implement USBD_ParseConfigurationDescriptor using its Ex version.
by Alexandre Julliard 29 Jul '13

29 Jul '13

Module: wine Branch: master Commit: ca7ba7053f9a9f79de5a19387073a40d01371e78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca7ba7053f9a9f79de5a19387… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jul 28 19:41:51 2013 +0200 usbd.sys: Implement USBD_ParseConfigurationDescriptor using its Ex version. --- dlls/usbd.sys/usbd.c | 9 +++++++++ dlls/usbd.sys/usbd.sys.spec | 2 +- include/ddk/usbdlib.h | 1 + 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/usbd.sys/usbd.c b/dlls/usbd.sys/usbd.c index ff0362c..fbec22e 100644 --- a/dlls/usbd.sys/usbd.c +++ b/dlls/usbd.sys/usbd.c @@ -198,6 +198,15 @@ PUSB_INTERFACE_DESCRIPTOR WINAPI USBD_ParseConfigurationDescriptorEx( return NULL; } +PUSB_INTERFACE_DESCRIPTOR WINAPI USBD_ParseConfigurationDescriptor( + PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, UCHAR InterfaceNumber, + UCHAR AlternateSetting ) +{ + TRACE( "(%p, %u, %u)\n", ConfigurationDescriptor, InterfaceNumber, AlternateSetting ); + return USBD_ParseConfigurationDescriptorEx( ConfigurationDescriptor, ConfigurationDescriptor, + InterfaceNumber, AlternateSetting, -1, -1, -1 ); +} + PUSB_COMMON_DESCRIPTOR WINAPI USBD_ParseDescriptors( PVOID DescriptorBuffer, ULONG TotalLength, diff --git a/dlls/usbd.sys/usbd.sys.spec b/dlls/usbd.sys/usbd.sys.spec index 15cf352..75ce083 100644 --- a/dlls/usbd.sys/usbd.sys.spec +++ b/dlls/usbd.sys/usbd.sys.spec @@ -21,7 +21,7 @@ @ stdcall USBD_GetUSBDIVersion(ptr) @ stub USBD_InitializeDevice @ stub USBD_MakePdoName -@ stub USBD_ParseConfigurationDescriptor +@ stdcall USBD_ParseConfigurationDescriptor(ptr long long) @ stdcall _USBD_ParseConfigurationDescriptorEx(a)28(ptr ptr long long long long long) USBD_ParseConfigurationDescriptorEx @ stdcall _USBD_ParseDescriptors(a)16(ptr long ptr long) USBD_ParseDescriptors @ stub USBD_QueryBusTime diff --git a/include/ddk/usbdlib.h b/include/ddk/usbdlib.h index 86080ce..188744f 100644 --- a/include/ddk/usbdlib.h +++ b/include/ddk/usbdlib.h @@ -30,6 +30,7 @@ PURB WINAPI USBD_CreateConfigurationRequestEx(PUSB_CONFIGURATION_DESCRIPTOR,PUSB ULONG WINAPI USBD_GetInterfaceLength(PUSB_INTERFACE_DESCRIPTOR,PUCHAR); VOID WINAPI USBD_GetUSBDIVersion(PUSBD_VERSION_INFORMATION); PUSB_COMMON_DESCRIPTOR WINAPI USBD_ParseDescriptors(PVOID,ULONG,PVOID,LONG); +PUSB_INTERFACE_DESCRIPTOR WINAPI USBD_ParseConfigurationDescriptor(PUSB_CONFIGURATION_DESCRIPTOR,UCHAR,UCHAR); PUSB_INTERFACE_DESCRIPTOR WINAPI USBD_ParseConfigurationDescriptorEx(PUSB_CONFIGURATION_DESCRIPTOR,PVOID,LONG,LONG,LONG,LONG,LONG); USBD_STATUS WINAPI USBD_ValidateConfigurationDescriptor(PUSB_CONFIGURATION_DESCRIPTOR,ULONG,USHORT,PUCHAR*,ULONG);

1 0

Piotr Caban : scrrun: Add IFileSystem3::GetAbsolutePathName implementation.
by Alexandre Julliard 29 Jul '13

29 Jul '13

Module: wine Branch: master Commit: 1027c20cd7d5f6b180d904460f068933951ab98f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1027c20cd7d5f6b180d904460… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 25 15:13:13 2013 +0200 scrrun: Add IFileSystem3::GetAbsolutePathName implementation. --- dlls/scrrun/filesystem.c | 49 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 8d0f5b1..53ace2a 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -862,9 +862,54 @@ static HRESULT WINAPI filesys_GetExtensionName(IFileSystem3 *iface, BSTR Path, static HRESULT WINAPI filesys_GetAbsolutePathName(IFileSystem3 *iface, BSTR Path, BSTR *pbstrResult) { - FIXME("%p %s %p\n", iface, debugstr_w(Path), pbstrResult); + static const WCHAR cur_path[] = {'.',0}; - return E_NOTIMPL; + WCHAR buf[MAX_PATH], ch; + const WCHAR *path; + DWORD i, beg, len, exp_len; + WIN32_FIND_DATAW fdata; + HANDLE fh; + + TRACE("%p %s %p\n", iface, debugstr_w(Path), pbstrResult); + + if(!pbstrResult) + return E_POINTER; + + if(!Path) + path = cur_path; + else + path = Path; + + len = GetFullPathNameW(path, MAX_PATH, buf, NULL); + if(!len) + return E_FAIL; + + buf[0] = toupperW(buf[0]); + if(len>3 && buf[len-1] == '\\') + buf[--len] = 0; + + for(beg=3, i=3; i<=len; i++) { + if(buf[i]!='\\' && buf[i]) + continue; + + ch = buf[i]; + buf[i] = 0; + fh = FindFirstFileW(buf, &fdata); + if(fh == INVALID_HANDLE_VALUE) + break; + + exp_len = strlenW(fdata.cFileName); + if(exp_len == i-beg) + memcpy(buf+beg, fdata.cFileName, exp_len*sizeof(WCHAR)); + FindClose(fh); + buf[i] = ch; + beg = i+1; + } + + *pbstrResult = SysAllocString(buf); + if(!*pbstrResult) + return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI filesys_GetTempName(IFileSystem3 *iface, BSTR *pbstrResult)

1 0

Piotr Caban : scrrun/tests: Add IFileSystem3::GetAbsolutePathName tests.
by Alexandre Julliard 29 Jul '13

29 Jul '13

Module: wine Branch: master Commit: e7a415b3f81352e53318aee4b6b0cae7a6a5b190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7a415b3f81352e53318aee4b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 25 15:13:26 2013 +0200 scrrun/tests: Add IFileSystem3::GetAbsolutePathName tests. --- dlls/scrrun/tests/filesystem.c | 71 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 4cd4e2d..801e56f 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -391,6 +391,76 @@ static void test_GetBaseName(void) } } +static void test_GetAbsolutePathName(void) +{ + static const WCHAR dir1[] = {'t','e','s','t','_','d','i','r','1',0}; + static const WCHAR dir2[] = {'t','e','s','t','_','d','i','r','2',0}; + static const WCHAR dir_match1[] = {'t','e','s','t','_','d','i','r','*',0}; + static const WCHAR dir_match2[] = {'t','e','s','t','_','d','i','*',0}; + static const WCHAR cur_dir[] = {'.',0}; + + WIN32_FIND_DATAW fdata; + HANDLE find; + WCHAR buf[MAX_PATH]; + BSTR path, result; + HRESULT hr; + + hr = IFileSystem3_GetAbsolutePathName(fs3, NULL, NULL); + ok(hr == E_POINTER, "GetAbsolutePathName returned %x, expected E_POINTER\n", hr); + + hr = IFileSystem3_GetAbsolutePathName(fs3, NULL, &result); + ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); + GetFullPathNameW(cur_dir, MAX_PATH, buf, NULL); + ok(!lstrcmpW(buf, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); + SysFreeString(result); + + find = FindFirstFileW(dir_match2, &fdata); + if(find != INVALID_HANDLE_VALUE) { + skip("GetAbsolutePathName tests\n"); + FindClose(find); + return; + } + + path = SysAllocString(dir_match1); + hr = IFileSystem3_GetAbsolutePathName(fs3, path, &result); + ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); + GetFullPathNameW(dir_match1, MAX_PATH, buf, NULL); + ok(!lstrcmpW(buf, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); + SysFreeString(result); + + ok(CreateDirectoryW(dir1, NULL), "CreateDirectory(%s) failed\n", wine_dbgstr_w(dir1)); + hr = IFileSystem3_GetAbsolutePathName(fs3, path, &result); + ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); + GetFullPathNameW(dir1, MAX_PATH, buf, NULL); + ok(!lstrcmpW(buf, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); + SysFreeString(result); + + ok(CreateDirectoryW(dir2, NULL), "CreateDirectory(%s) failed\n", wine_dbgstr_w(dir2)); + hr = IFileSystem3_GetAbsolutePathName(fs3, path, &result); + ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); + if(!lstrcmpW(buf, result)) { + ok(!lstrcmpW(buf, result), "result = %s, expected %s\n", + wine_dbgstr_w(result), wine_dbgstr_w(buf)); + }else { + GetFullPathNameW(dir2, MAX_PATH, buf, NULL); + ok(!lstrcmpW(buf, result), "result = %s, expected %s\n", + wine_dbgstr_w(result), wine_dbgstr_w(buf)); + } + SysFreeString(result); + + SysFreeString(path); + path = SysAllocString(dir_match2); + hr = IFileSystem3_GetAbsolutePathName(fs3, path, &result); + ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); + GetFullPathNameW(dir_match2, MAX_PATH, buf, NULL); + ok(!lstrcmpW(buf, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); + SysFreeString(result); + SysFreeString(path); + + RemoveDirectoryW(dir1); + RemoveDirectoryW(dir2); +} + START_TEST(filesystem) { HRESULT hr; @@ -411,6 +481,7 @@ START_TEST(filesystem) test_GetParentFolderName(); test_GetFileName(); test_GetBaseName(); + test_GetAbsolutePathName(); IFileSystem3_Release(fs3);

1 0

Piotr Caban : scrrun: Add IFileSystem3::GetFile implementation.
by Alexandre Julliard 29 Jul '13

29 Jul '13

Module: wine Branch: master Commit: a29d77088ac2b07fb68d84646be2884f49e9df7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a29d77088ac2b07fb68d84646… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 25 15:13:36 2013 +0200 scrrun: Add IFileSystem3::GetFile implementation. --- dlls/scrrun/filesystem.c | 334 +++++++++++++++++++++++++++++++++++++++++- dlls/scrrun/scrrun.c | 3 +- dlls/scrrun/scrrun_private.h | 1 + 3 files changed, 335 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a29d77088ac2b07fb68d8…

1 0

Piotr Caban : scrrun/tests: Add IFileSystem3::GetFile tests.
by Alexandre Julliard 29 Jul '13

29 Jul '13

Module: wine Branch: master Commit: 45b31a9f019c013e35fee0a50f976c2b1d57a8e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45b31a9f019c013e35fee0a50… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 25 15:13:46 2013 +0200 scrrun/tests: Add IFileSystem3::GetFile tests. --- dlls/scrrun/tests/filesystem.c | 44 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 801e56f..101c396 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -461,6 +461,49 @@ static void test_GetAbsolutePathName(void) RemoveDirectoryW(dir2); } +static void test_GetFile(void) +{ + static const WCHAR get_file[] = {'g','e','t','_','f','i','l','e','.','t','s','t',0}; + + BSTR path = SysAllocString(get_file); + IFile *file; + HRESULT hr; + HANDLE hf; + + hr = IFileSystem3_GetFile(fs3, path, NULL); + ok(hr == E_POINTER, "GetFile returned %x, expected E_POINTER\n", hr); + hr = IFileSystem3_GetFile(fs3, NULL, &file); + ok(hr == E_INVALIDARG, "GetFile returned %x, expected E_INVALIDARG\n", hr); + + hf = CreateFileW(path, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if(hf != INVALID_HANDLE_VALUE) { + CloseHandle(hf); + skip("File already exists, skipping GetFile tests\n"); + SysFreeString(path); + return; + } + + file = (IFile*)0xdeadbeef; + hr = IFileSystem3_GetFile(fs3, path, &file); + ok(!file, "file != NULL\n"); + ok(hr == CTL_E_FILENOTFOUND, "GetFile returned %x, expected CTL_E_FILENOTFOUND\n", hr); + + hf = CreateFileW(path, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); + if(hf == INVALID_HANDLE_VALUE) { + skip("Can't create temporary file\n"); + SysFreeString(path); + return; + } + CloseHandle(hf); + + hr = IFileSystem3_GetFile(fs3, path, &file); + ok(hr == S_OK, "GetFile returned %x, expected S_OK\n", hr); + IFile_Release(file); + + DeleteFileW(path); + SysFreeString(path); +} + START_TEST(filesystem) { HRESULT hr; @@ -482,6 +525,7 @@ START_TEST(filesystem) test_GetFileName(); test_GetBaseName(); test_GetAbsolutePathName(); + test_GetFile(); IFileSystem3_Release(fs3);

1 0

Damjan Jovanovic : include/ddk: Add usbiodef.h.
by Alexandre Julliard 29 Jul '13

29 Jul '13

Module: wine Branch: master Commit: f7daa3f596cdcb6ff757b55e30af39b7bb62ee83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7daa3f596cdcb6ff757b55e3… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Jul 22 19:09:57 2013 +0000 include/ddk: Add usbiodef.h. --- include/Makefile.in | 1 + include/ddk/usbiodef.h | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index a56c6bd..46db2dc 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -236,6 +236,7 @@ SRCDIR_INCLUDES = \ ddk/usb100.h \ ddk/usb200.h \ ddk/usbdlib.h \ + ddk/usbiodef.h \ ddk/wdm.h \ ddk/winddiui.h \ ddk/winsplp.h \ diff --git a/include/ddk/usbiodef.h b/include/ddk/usbiodef.h new file mode 100644 index 0000000..5f79810 --- /dev/null +++ b/include/ddk/usbiodef.h @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2013 Damjan Jovanovic + * + * 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 __DDK_USBIODEF_H__ +#define __DDK_USBIODEF_H__ + +#define USB_SUBMIT_URB 0 + +#define FILE_DEVICE_USB FILE_DEVICE_UNKNOWN + +#endif /* __DDK_USBIODEF_H__ */

1 0

Damjan Jovanovic : include/ddk: Add usbioctl.h.
by Alexandre Julliard 29 Jul '13

29 Jul '13

Module: wine Branch: master Commit: f5f04e8a2febd7cf2dfbbcfc0b362efb2d3dc84b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5f04e8a2febd7cf2dfbbcfc0… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Jul 22 19:10:39 2013 +0000 include/ddk: Add usbioctl.h. --- include/Makefile.in | 1 + include/ddk/usbioctl.h | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 46db2dc..cecc845 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -236,6 +236,7 @@ SRCDIR_INCLUDES = \ ddk/usb100.h \ ddk/usb200.h \ ddk/usbdlib.h \ + ddk/usbioctl.h \ ddk/usbiodef.h \ ddk/wdm.h \ ddk/winddiui.h \ diff --git a/include/ddk/usbioctl.h b/include/ddk/usbioctl.h new file mode 100644 index 0000000..003e2b6 --- /dev/null +++ b/include/ddk/usbioctl.h @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2013 Damjan Jovanovic + * + * 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 __DDK_USBIOCTL_H__ +#define __DDK_USBIOCTL_H__ + +#define IOCTL_INTERNAL_USB_SUBMIT_URB \ + CTL_CODE(FILE_DEVICE_USB, USB_SUBMIT_URB, METHOD_NEITHER, FILE_ANY_ACCESS) + +#endif /* __DDK_USBIOCTL_H__ */

1 0

Hans Leidekker : mscms: Port to liblcms2.
by Alexandre Julliard 29 Jul '13

29 Jul '13

Module: wine Branch: master Commit: d40c91262b91f72c44151a1481a77acfe71ba044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d40c91262b91f72c44151a148… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 26 13:02:40 2013 +0200 mscms: Port to liblcms2. --- configure | 70 ++++++++-------- configure.ac | 20 +++--- dlls/mscms/Makefile.in | 4 +- dlls/mscms/handle.c | 14 ++-- dlls/mscms/icc.c | 93 +++++++++++++--------- dlls/mscms/mscms_main.c | 22 ++---- dlls/mscms/mscms_priv.h | 70 +++-------------- dlls/mscms/profile.c | 184 ++++++++++++++++--------------------------- dlls/mscms/tests/profile.c | 21 ++--- dlls/mscms/transform.c | 28 ++++---- include/config.h.in | 9 +-- 11 files changed, 220 insertions(+), 315 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d40c91262b91f72c44151…

1 0

Hans Leidekker : mscms: Get rid of the MSCMS_ prefix.
by Alexandre Julliard 29 Jul '13

29 Jul '13

Module: wine Branch: master Commit: 45191c542cb46cf57f8ac20cc3d43819e9f17993 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45191c542cb46cf57f8ac20cc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 26 13:03:15 2013 +0200 mscms: Get rid of the MSCMS_ prefix. --- dlls/mscms/handle.c | 48 ++++++++++++++++++------------------ dlls/mscms/mscms_priv.h | 2 +- dlls/mscms/profile.c | 60 ++++++++++++++++++++++------------------------ dlls/mscms/stub.c | 10 ++++---- dlls/mscms/transform.c | 4 +- 5 files changed, 61 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=45191c542cb46cf57f8ac…

1 0

Bruno Jesus : ws2_32/tests: Add more tests for WSASocket().
by Alexandre Julliard 29 Jul '13

29 Jul '13

Module: wine Branch: master Commit: a9f3c1974d7f2ff8a4fd476a9197a146e8de0dca URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9f3c1974d7f2ff8a4fd476a9… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Jul 28 02:25:04 2013 -0300 ws2_32/tests: Add more tests for WSASocket(). --- dlls/ws2_32/tests/sock.c | 116 ++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 108 insertions(+), 8 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5a76a7a..fce0b99 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1665,17 +1665,49 @@ static void test_WSASocket(void) { SOCKET sock = INVALID_SOCKET; WSAPROTOCOL_INFOA *pi; - int providers[] = {6, 0}; - int ret, err; + int wsaproviders[] = {IPPROTO_TCP, IPPROTO_IP}; + int autoprotocols[] = {IPPROTO_TCP, IPPROTO_UDP}; + int items, err, size, socktype, i, j; UINT pi_size; + SetLastError(0xdeadbeef); + 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); +todo_wine + ok(sock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); + closesocket(sock); + + sock = WSASocketA(AF_INET, SOCK_STREAM, 0, NULL, 0, 0); + ok(sock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); + closesocket(sock); + + sock = WSASocketA(AF_INET, 0, IPPROTO_TCP, NULL, 0, 0); +todo_wine + ok(sock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); + closesocket(sock); + + SetLastError(0xdeadbeef); + 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); + + sock = WSASocketA(0, 0, IPPROTO_TCP, NULL, 0, 0); +todo_wine + ok(sock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); + closesocket(sock); + /* Set pi_size explicitly to a value below 2*sizeof(WSAPROTOCOL_INFOA) * to avoid a crash on win98. */ pi_size = 0; - ret = WSAEnumProtocolsA(providers, NULL, &pi_size); - ok(ret == SOCKET_ERROR, "WSAEnumProtocolsA({6,0}, NULL, 0) returned %d\n", - ret); + items = WSAEnumProtocolsA(wsaproviders, NULL, &pi_size); + ok(items == SOCKET_ERROR, "WSAEnumProtocolsA({6,0}, NULL, 0) returned %d\n", + items); err = WSAGetLastError(); ok(err == WSAENOBUFS, "WSAEnumProtocolsA error is %d, not WSAENOBUFS(%d)\n", err, WSAENOBUFS); @@ -1687,11 +1719,11 @@ static void test_WSASocket(void) return; } - ret = WSAEnumProtocolsA(providers, pi, &pi_size); - ok(ret != SOCKET_ERROR, "WSAEnumProtocolsA failed, last error is %d\n", + items = WSAEnumProtocolsA(wsaproviders, pi, &pi_size); + ok(items != SOCKET_ERROR, "WSAEnumProtocolsA failed, last error is %d\n", WSAGetLastError()); - if (ret == 0) { + if (items == 0) { skip("No protocols enumerated.\n"); HeapFree(GetProcessHeap(), 0, pi); return; @@ -1703,6 +1735,74 @@ static void test_WSASocket(void) WSAGetLastError()); closesocket(sock); + + HeapFree(GetProcessHeap(), 0, pi); + + pi_size = 0; + items = WSAEnumProtocolsA(NULL, NULL, &pi_size); + ok(items == SOCKET_ERROR, "WSAEnumProtocolsA(NULL, NULL, 0) returned %d\n", + items); + err = WSAGetLastError(); + ok(err == WSAENOBUFS, "WSAEnumProtocolsA error is %d, not WSAENOBUFS(%d)\n", + err, WSAENOBUFS); + + pi = HeapAlloc(GetProcessHeap(), 0, pi_size); + ok(pi != NULL, "Failed to allocate memory\n"); + if (pi == NULL) { + skip("Can't continue without memory.\n"); + return; + } + + items = WSAEnumProtocolsA(NULL, pi, &pi_size); + ok(items != SOCKET_ERROR, "WSAEnumProtocolsA failed, last error is %d\n", + WSAGetLastError()); + + /* when no protocol is specified the first socket type from WSAEnumProtocols is returned */ + sock = WSASocketA(AF_INET, 0, 0, NULL, 0, 0); +todo_wine + ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", + WSAGetLastError()); + +todo_wine { + size = sizeof(socktype); + socktype = 0xdead; + ok(!getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size), "getsockopt failed with %d\n", + WSAGetLastError()); + ok(socktype == pi[0].iSocketType, "Wrong socket type, expected %d received %d\n", + pi[0].iSocketType, socktype); +} + closesocket(sock); + + /* when the protocol is specified the first socket type that matches the protocol is returned */ + 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; +todo_wine + ok(!getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size), "getsockopt failed with %d\n", + WSAGetLastError()); + + for (j = 0; j < items; j++) + { + if (pi[j].iProtocol == autoprotocols[i]) + { +todo_wine + ok(socktype == pi[j].iSocketType, "Wrong socket type, expected %d received %d\n", + pi[j].iSocketType, socktype); + break; + } + } +todo_wine + ok(socktype != 0xdead, "Protocol %d not found in WSAEnumProtocols\n", autoprotocols[i]); + + closesocket(sock); + } + HeapFree(GetProcessHeap(), 0, pi); }

1 0