September 2013 - Wine-commits

Dmitry Timoshkov : ntdll: Make NtWriteFile explicitly check for negative offset and fail.
by Alexandre Julliard 13 Sep '13

13 Sep '13

Module: wine Branch: master Commit: b314a253203127a38613d844dc05a82141093cca URL: http://source.winehq.org/git/wine.git/?a=commit;h=b314a253203127a38613d844d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 13 15:45:44 2013 +0900 ntdll: Make NtWriteFile explicitly check for negative offset and fail. --- dlls/ntdll/file.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index dd67b3d..2d07255 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -982,6 +982,11 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, } off = st.st_size; } + else if (offset->QuadPart < 0) + { + status = STATUS_INVALID_PARAMETER; + goto done; + } /* async I/O doesn't make sense on regular files */ while ((result = pwrite( unix_handle, buffer, length, off )) == -1)

1 0

Dmitry Timoshkov : ntdll: NtReadFile should fail for overlapped IO on files if offset is negative.
by Alexandre Julliard 13 Sep '13

13 Sep '13

Module: wine Branch: master Commit: eb10471bac5510ab5a265069c472e9085e721191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb10471bac5510ab5a265069c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 13 15:45:53 2013 +0900 ntdll: NtReadFile should fail for overlapped IO on files if offset is negative. --- dlls/ntdll/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 2d07255..15e8829 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -606,7 +606,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, if (type == FD_TYPE_FILE) { - if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && !offset) + if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && (!offset || offset->QuadPart < 0)) { status = STATUS_INVALID_PARAMETER; goto done;

1 0

Henri Verbeet : wined3d: Just set the first render target to NULL in wined3d_device_uninit_3d().
by Alexandre Julliard 13 Sep '13

13 Sep '13

Module: wine Branch: master Commit: def0558b45aa5c071645fa29d004d70d372443ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=def0558b45aa5c071645fa29d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 13 10:18:09 2013 +0200 wined3d: Just set the first render target to NULL in wined3d_device_uninit_3d(). --- dlls/wined3d/device.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 656a3e9..046f5fd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1130,18 +1130,11 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) FIXME("Something's still holding the auto depth stencil buffer (%p).\n", surface); } - for (i = 1; i < gl_info->limits.buffers; ++i) + for (i = 0; i < gl_info->limits.buffers; ++i) { wined3d_device_set_render_target(device, i, NULL, FALSE); } - surface = device->fb.render_targets[0]; - TRACE("Setting rendertarget 0 to NULL\n"); - device->fb.render_targets[0] = NULL; - TRACE("Releasing the render target at %p\n", surface); - if (surface) - wined3d_surface_decref(surface); - context_release(context); for (i = 0; i < device->swapchain_count; ++i)

1 0

Henri Verbeet : wined3d: Just set the first render target to NULL in wined3d_device_reset().
by Alexandre Julliard 13 Sep '13

13 Sep '13

Module: wine Branch: master Commit: 3c023a5db5538a7622d4518e8ce24d36e1c459b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c023a5db5538a7622d4518e8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 13 10:18:10 2013 +0200 wined3d: Just set the first render target to NULL in wined3d_device_reset(). --- dlls/wined3d/device.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 046f5fd..561525b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4704,14 +4704,12 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (device->fb.render_targets) { - if (swapchain->back_buffers && swapchain->back_buffers[0]) - wined3d_device_set_render_target(device, 0, swapchain->back_buffers[0], FALSE); - else - wined3d_device_set_render_target(device, 0, swapchain->front_buffer, FALSE); - for (i = 1; i < device->adapter->gl_info.limits.buffers; ++i) + for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) { wined3d_device_set_render_target(device, i, NULL, FALSE); } + if (swapchain->back_buffers && swapchain->back_buffers[0]) + wined3d_device_set_render_target(device, 0, swapchain->back_buffers[0], FALSE); } wined3d_device_set_depth_stencil(device, NULL);

1 0

Henri Verbeet : wined3d: Never set the first render target to the front buffer in wined3d_device_init_3d ().
by Alexandre Julliard 13 Sep '13

13 Sep '13

Module: wine Branch: master Commit: fc85f4f7d6b051a0ba72ffe7791d120318ac6ccf URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc85f4f7d6b051a0ba72ffe77… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 13 10:18:11 2013 +0200 wined3d: Never set the first render target to the front buffer in wined3d_device_init_3d(). --- dlls/wined3d/device.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 561525b..627f0eb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -878,6 +878,7 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_swapchain *swapchain = NULL; struct wined3d_context *context; + DWORD clear_flags = 0; HRESULT hr; DWORD state; @@ -941,13 +942,9 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, { TRACE("Setting rendertarget to %p.\n", swapchain->back_buffers); device->fb.render_targets[0] = swapchain->back_buffers[0]; + wined3d_surface_incref(device->fb.render_targets[0]); + clear_flags |= WINED3DCLEAR_TARGET; } - else - { - TRACE("Setting rendertarget to %p.\n", swapchain->front_buffer); - device->fb.render_targets[0] = swapchain->front_buffer; - } - wined3d_surface_incref(device->fb.render_targets[0]); /* Depth Stencil support */ device->fb.depth_stencil = device->auto_depth_stencil; @@ -991,9 +988,10 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, context_release(context); /* Clear the screen */ - wined3d_device_clear(device, 0, NULL, WINED3DCLEAR_TARGET - | (swapchain_desc->enable_auto_depth_stencil ? WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL : 0), - &black, 1.0f, 0); + if (swapchain_desc->enable_auto_depth_stencil) + clear_flags |= WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL; + if (clear_flags) + wined3d_device_clear(device, 0, NULL, clear_flags, &black, 1.0f, 0); device->d3d_initialized = TRUE;

1 0

Henri Verbeet : d3d9: Avoid LPCWSTR.
by Alexandre Julliard 13 Sep '13

13 Sep '13

Module: wine Branch: master Commit: e55e24a73132ad20e1b0b56898fbc38fb2853e83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e55e24a73132ad20e1b0b5689… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 13 10:18:12 2013 +0200 d3d9: Avoid LPCWSTR. --- dlls/d3d9/d3d9_main.c | 15 +++++++++------ include/d3d9.h | 14 +++++++------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index ad2e330..2059b98 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -106,8 +106,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) /*********************************************************************** * D3DPERF_BeginEvent (D3D9.@) */ -int WINAPI D3DPERF_BeginEvent(D3DCOLOR color, LPCWSTR name) { - TRACE("(color %#x, name %s) : stub\n", color, debugstr_w(name)); +int WINAPI D3DPERF_BeginEvent(D3DCOLOR color, const WCHAR *name) +{ + TRACE("color 0x%08x, name %s.\n", color, debugstr_w(name)); return D3DPERF_event_level++; } @@ -151,13 +152,15 @@ BOOL WINAPI D3DPERF_QueryRepeatFrame(void) { /*********************************************************************** * D3DPERF_SetMarker (D3D9.@) */ -void WINAPI D3DPERF_SetMarker(D3DCOLOR color, LPCWSTR name) { - FIXME("(color %#x, name %s) : stub\n", color, debugstr_w(name)); +void WINAPI D3DPERF_SetMarker(D3DCOLOR color, const WCHAR *name) +{ + FIXME("color 0x%08x, name %s stub!\n", color, debugstr_w(name)); } /*********************************************************************** * D3DPERF_SetRegion (D3D9.@) */ -void WINAPI D3DPERF_SetRegion(D3DCOLOR color, LPCWSTR name) { - FIXME("(color %#x, name %s) : stub\n", color, debugstr_w(name)); +void WINAPI D3DPERF_SetRegion(D3DCOLOR color, const WCHAR *name) +{ + FIXME("color 0x%08x, name %s stub!\n", color, debugstr_w(name)); } diff --git a/include/d3d9.h b/include/d3d9.h index ce39c10..dc6518b 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -2087,13 +2087,13 @@ DECLARE_INTERFACE_(IDirect3DDevice9Ex,IDirect3DDevice9) extern "C" { #endif /* defined(__cplusplus) */ -int WINAPI D3DPERF_BeginEvent(D3DCOLOR,LPCWSTR); -int WINAPI D3DPERF_EndEvent(void); -DWORD WINAPI D3DPERF_GetStatus(void); -BOOL WINAPI D3DPERF_QueryRepeatFrame(void); -void WINAPI D3DPERF_SetMarker(D3DCOLOR,LPCWSTR); -void WINAPI D3DPERF_SetOptions(DWORD); -void WINAPI D3DPERF_SetRegion(D3DCOLOR,LPCWSTR); +int WINAPI D3DPERF_BeginEvent(D3DCOLOR color, const WCHAR *name); +int WINAPI D3DPERF_EndEvent(void); +DWORD WINAPI D3DPERF_GetStatus(void); +BOOL WINAPI D3DPERF_QueryRepeatFrame(void); +void WINAPI D3DPERF_SetMarker(D3DCOLOR color, const WCHAR *name); +void WINAPI D3DPERF_SetOptions(DWORD options); +void WINAPI D3DPERF_SetRegion(D3DCOLOR color, const WCHAR *name); /* Define the main entrypoint as well */ IDirect3D9* WINAPI Direct3DCreate9(UINT SDKVersion);

1 0

Huw Davies : Don't save the selected state.
by Alexandre Julliard 13 Sep '13

13 Sep '13

Module: fontforge Branch: master Commit: bd54d56438ffeb436e73f262440bc716d969e8c9 URL: http://source.winehq.org/git/fontforge.git/?a=commit;h=bd54d56438ffeb436e73… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 13 11:27:45 2013 +0100 Don't save the selected state. --- fontforge/sfd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fontforge/sfd.c b/fontforge/sfd.c index aa19b78..96e2bb4 100644 --- a/fontforge/sfd.c +++ b/fontforge/sfd.c @@ -620,7 +620,7 @@ static void SFDDumpSplineSet(FILE *sfd,SplineSet *spl) { (double) sp->prevcp.x, (double) sp->prevcp.y, (double) sp->me.x, (double) sp->me.y ); #endif - fprintf(sfd, "%d", sp->pointtype|(sp->selected<<2)| + fprintf(sfd, "%d", sp->pointtype|/*(sp->selected<<2)|*/ (sp->nextcpdef<<3)|(sp->prevcpdef<<4)| (sp->roundx<<5)|(sp->roundy<<6)| (sp->ttfindex==0xffff?(1<<7):0)|

1 0

André Hentschel : wineusr: Add a note about access rights to unix devices.
by Alexandre Julliard 13 Sep '13

13 Sep '13

Module: docs Branch: master Commit: 0bc3120e0f929acd4a1437daede1b9de385f53a2 URL: http://source.winehq.org/git/docs.git/?a=commit;h=0bc3120e0f929acd4a1437dae… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 11 21:45:53 2013 +0200 wineusr: Add a note about access rights to unix devices. --- en/wineusr-configuring.sgml | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/en/wineusr-configuring.sgml b/en/wineusr-configuring.sgml index 1be0389..ff54fa5 100644 --- a/en/wineusr-configuring.sgml +++ b/en/wineusr-configuring.sgml @@ -606,7 +606,8 @@ ln -sf /usr/local/etc/wine.systemreg system.reg number, such as <filename class="devicefile">lpt1</filename>. You should link these directly to the corresponding Unix devices, such as <filename class="devicefile">/dev/ttyS0</filename> and - <filename class="devicefile">/dev/lp0</filename>. For example, to configure + <filename class="devicefile">/dev/lp0</filename>. Make sure you have the needed + access rights to that device. For example, to configure one serial port and one parallel port, run the following commands: <screen> ln -s /dev/ttyS0 com1 @@ -618,7 +619,7 @@ ln -s /dev/lp0 lpt1 <title>Network Shares</title> <para> - Windows shares can are mapped into the <filename class="directory">unc/</filename> + Windows shares can be mapped into the <filename class="directory">unc/</filename> directory so anything trying to access <filename>\\<replaceable>myserver</replaceable>\<replaceable>some</replaceable>\<replaceable>file</replaceable></filename> will look in

1 0

André Hentschel : kernel32/tests: Add tests for ResolveDelayLoadedAPI.
by Alexandre Julliard 12 Sep '13

12 Sep '13

Module: wine Branch: master Commit: 21c3cfe541c53e36334d16ad0a92c4bfd4155fdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=21c3cfe541c53e36334d16ad0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 11 22:31:01 2013 +0200 kernel32/tests: Add tests for ResolveDelayLoadedAPI. --- dlls/kernel32/tests/loader.c | 106 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 106 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 3b72cc8..96d57f4 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -28,6 +28,7 @@ #include "winbase.h" #include "winternl.h" #include "wine/test.h" +#include "delayloadhandler.h" #define ALIGN_SIZE(size, alignment) (((size) + (alignment - 1)) & ~((alignment - 1))) @@ -43,6 +44,7 @@ struct PROCESS_BASIC_INFORMATION_PRIVATE static BOOL is_child; static LONG *child_failures; +static WORD cb_count; static NTSTATUS (WINAPI *pNtMapViewOfSection)(HANDLE, HANDLE, PVOID *, ULONG, SIZE_T, const LARGE_INTEGER *, SIZE_T *, ULONG, ULONG, ULONG); static NTSTATUS (WINAPI *pNtUnmapViewOfSection)(HANDLE, PVOID); @@ -57,6 +59,9 @@ static NTSTATUS (WINAPI *pLdrLockLoaderLock)(ULONG, ULONG *, ULONG *); static NTSTATUS (WINAPI *pLdrUnlockLoaderLock)(ULONG, ULONG); static void (WINAPI *pRtlAcquirePebLock)(void); static void (WINAPI *pRtlReleasePebLock)(void); +static PVOID (WINAPI *pResolveDelayLoadedAPI)(PVOID, PCIMAGE_DELAYLOAD_DESCRIPTOR, + PDELAYLOAD_FAILURE_DLL_CALLBACK, PVOID, + PIMAGE_THUNK_DATA ThunkAddress,ULONG); static PVOID RVAToAddr(DWORD_PTR rva, HMODULE module) { @@ -2184,6 +2189,105 @@ if (0) ok(ret, "DeleteFile error %d\n", GetLastError()); } +static PVOID WINAPI failuredllhook(ULONG ul, DELAYLOAD_INFO* pd) +{ + cb_count++; + return NULL; +} + +static void test_ResolveDelayLoadedAPI(void) +{ + HMODULE hlib; + int i; + static const char* td[] = + { + "advapi32.dll", + "comdlg32.dll", + }; + + if (!pResolveDelayLoadedAPI) + { + todo_wine win_skip("ResolveDelayLoadedAPI is not available\n"); + return; + } + + if (0) /* crashes on native */ + { + SetLastError(0xdeadbeef); + ok(!pResolveDelayLoadedAPI(NULL, NULL, NULL, NULL, NULL, 0), + "ResolveDelayLoadedAPI succeeded\n"); + ok(GetLastError() == 0xdeadbeef, "GetLastError changed to %x\n", GetLastError()); + + cb_count = 0; + SetLastError(0xdeadbeef); + ok(!pResolveDelayLoadedAPI(NULL, NULL, failuredllhook, NULL, NULL, 0), + "ResolveDelayLoadedAPI succeeded\n"); + ok(GetLastError() == 0xdeadbeef, "GetLastError changed to %x\n", GetLastError()); + ok(cb_count == 1, "Wrong callback count: %d\n", cb_count); + } + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + IMAGE_DELAYLOAD_DESCRIPTOR *delaydir; + ULONG size; + + SetLastError(0xdeadbeef); + hlib = LoadLibrary(td[i]); + ok(hlib != NULL, "LoadLibrary error %u\n", GetLastError()); + if (!hlib) + { + skip("couldn't load %s.\n", td[i]); + continue; + } + + delaydir = RtlImageDirectoryEntryToData(hlib, TRUE, IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT, &size); + if (!delaydir) + { + skip("haven't found section for delay import directory in %s.\n", td[i]); + FreeLibrary(hlib); + continue; + } + + for (;;) + { + const IMAGE_THUNK_DATA *itdn; + IMAGE_THUNK_DATA *itda; + HMODULE htarget; + int j; + + if (!delaydir->DllNameRVA || + !delaydir->ImportAddressTableRVA || + !delaydir->ImportNameTableRVA) break; + + itdn = RVAToAddr(delaydir->ImportNameTableRVA, hlib); + itda = RVAToAddr(delaydir->ImportAddressTableRVA, hlib); + htarget = LoadLibrary(RVAToAddr(delaydir->DllNameRVA, hlib)); + for (j = 0; itdn[j].u1.Ordinal; j++) + { + void *ret, *load; + + if (IMAGE_SNAP_BY_ORDINAL(itdn[j].u1.Ordinal)) + load = (void *)GetProcAddress(htarget, (LPSTR)IMAGE_ORDINAL(itdn[j].u1.Ordinal)); + else + { + const IMAGE_IMPORT_BY_NAME* iibn = RVAToAddr(itdn[j].u1.AddressOfData, hlib); + load = (void *)GetProcAddress(htarget, (char*)iibn->Name); + } + + cb_count = 0; + ret = pResolveDelayLoadedAPI(hlib, delaydir, failuredllhook, NULL, &itda[j], 0); + ok(ret != NULL, "ResolveDelayLoadedAPI failed\n"); + ok(ret == load, "expected %p, got %p\n", ret, load); + ok(ret == (void*)itda[j].u1.AddressOfData, "expected %p, got %p\n", + ret, (void*)itda[j].u1.AddressOfData); + ok(!cb_count, "Wrong callback count: %d\n", cb_count); + } + delaydir++; + } + FreeLibrary(hlib); + } +} + START_TEST(loader) { int argc; @@ -2203,6 +2307,7 @@ START_TEST(loader) pLdrUnlockLoaderLock = (void *)GetProcAddress(GetModuleHandle("ntdll.dll"), "LdrUnlockLoaderLock"); pRtlAcquirePebLock = (void *)GetProcAddress(GetModuleHandle("ntdll.dll"), "RtlAcquirePebLock"); pRtlReleasePebLock = (void *)GetProcAddress(GetModuleHandle("ntdll.dll"), "RtlReleasePebLock"); + pResolveDelayLoadedAPI = (void *)GetProcAddress(GetModuleHandle("kernel32.dll"), "ResolveDelayLoadedAPI"); mapping = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 4096, "winetest_loader"); ok(mapping != 0, "CreateFileMapping failed\n"); @@ -2227,4 +2332,5 @@ START_TEST(loader) test_ImportDescriptors(); test_section_access(); test_ExitProcess(); + test_ResolveDelayLoadedAPI(); }

1 0

Bruno Jesus : ws2_32/tests: Add more WSASocket tests.
by Alexandre Julliard 12 Sep '13

12 Sep '13

Module: wine Branch: master Commit: 260250539d9a87170549a1df1ee4e0b47ad6b40e URL: http://source.winehq.org/git/wine.git/?a=commit;h=260250539d9a87170549a1df1… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Sep 12 01:02:34 2013 -0300 ws2_32/tests: Add more WSASocket tests. --- dlls/ws2_32/tests/sock.c | 101 ++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 94 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2675e97..3c3658f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -970,14 +970,18 @@ out: /* Tests for WSAStartup */ static void test_WithoutWSAStartup(void) { - LPVOID ptr; + DWORD err; WSASetLastError(0xdeadbeef); - ptr = gethostbyname("localhost"); + 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); - ok(ptr == NULL, "gethostbyname() succeeded unexpectedly: %d\n", WSAGetLastError()); - ok(WSAGetLastError() == WSANOTINITIALISED, "gethostbyname() failed with unexpected error: %d\n", - WSAGetLastError()); + WSASetLastError(0xdeadbeef); + ok(gethostbyname("localhost") == NULL, "gethostbyname() succeeded unexpectedly\n"); + err = WSAGetLastError(); + ok(err == WSANOTINITIALISED, "Expected 10093, received %d\n", err); } static void test_WithWSAStartup(void) @@ -1777,7 +1781,8 @@ static void test_WSASocket(void) UINT pi_size; SetLastError(0xdeadbeef); - ok(WSASocketA(0, 0, 0, NULL, 0, 0) == INVALID_SOCKET, "WSASocketA should have failed\n"); + 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); @@ -1791,13 +1796,70 @@ todo_wine ok(sock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); closesocket(sock); + SetLastError(0xdeadbeef); + 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); + 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(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); + 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); 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"); + 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); + ok(WSASocketA(AF_INET, 0xdead, 0, 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); + 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); @@ -1858,6 +1920,31 @@ todo_wine closesocket(sock); /* find what parameters are used first: plain parameters or protocol info struct */ + pi[0].iProtocol = -1; + pi[0].iSocketType = -1; + pi[0].iAddressFamily = -1; + 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; + pi[0].iSocketType = 0; + pi[0].iAddressFamily = 0; + sock = WSASocketA(0, 0, IPPROTO_UDP, &pi[0], 0, 0); + if(sock != INVALID_SOCKET) + { + win_skip("must work only in OS <= 2003\n"); + closesocket(sock); + } + else + { + err = WSAGetLastError(); +todo_wine + ok(err == WSAEAFNOSUPPORT, "Expected 10047, received %d\n", err); + } + pi[0].iProtocol = IPPROTO_UDP; pi[0].iSocketType = SOCK_DGRAM; pi[0].iAddressFamily = AF_INET;

1 0