March 2008 - Wine-Commits - list.winehq.org

Reece Dunn : shlwapi: Added SHCreateStreamOnFileW tests.
by Alexandre Julliard March 25, 2008

March 25, 2008

Module: wine Branch: master Commit: fe829db189843d2ad29907da6e8beab1aa20a85b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe829db189843d2ad29907da6… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Mon Mar 24 10:09:55 2008 +0000 shlwapi: Added SHCreateStreamOnFileW tests. --- dlls/shlwapi/tests/istream.c | 95 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 1045c46..21d7c76 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -32,6 +32,7 @@ /* Function pointers for the SHCreateStreamOnFile functions */ static HMODULE hShlwapi; static HRESULT (WINAPI *pSHCreateStreamOnFileA)(LPCSTR file, DWORD mode, IStream **stream); +static HRESULT (WINAPI *pSHCreateStreamOnFileW)(LPCWSTR file, DWORD mode, IStream **stream); static void test_SHCreateStreamOnFileA(DWORD mode) @@ -118,11 +119,97 @@ static void test_SHCreateStreamOnFileA(DWORD mode) } +static void test_SHCreateStreamOnFileW(DWORD mode) +{ + IStream * stream; + HRESULT ret; + ULONG refcount; + static const WCHAR test_file[] = { 'c', ':', '\\', 't', 'e', 's', 't', '.', 't', 'x', 't' }; + + printf("SHCreateStreamOnFileW: testing mode %d\n", mode); + + /* invalid arguments */ + + stream = NULL; + ret = (*pSHCreateStreamOnFileW)(NULL, mode, &stream); + ok(ret == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) || /* XP */ + ret == E_INVALIDARG /* Vista */, + "SHCreateStreamOnFileW: expected HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) or E_INVALIDARG, got 0x%08x\n", ret); + ok(stream == NULL, "SHCreateStreamOnFileW: expected a NULL IStream object, got %p\n", stream); + +#if 0 /* This test crashes on WinXP SP2 */ + ret = (*pSHCreateStreamOnFileW)(test_file, mode, NULL); + ok(ret == E_INVALIDARG, "SHCreateStreamOnFileW: expected E_INVALIDARG, got 0x%08x\n", ret); +#endif + + stream = NULL; + ret = (*pSHCreateStreamOnFileW)(test_file, mode | STGM_CONVERT, &stream); + ok(ret == E_INVALIDARG, "SHCreateStreamOnFileW: expected E_INVALIDARG, got 0x%08x\n", ret); + ok(stream == NULL, "SHCreateStreamOnFileW: expected a NULL IStream object, got %p\n", stream); + + stream = NULL; + ret = (*pSHCreateStreamOnFileW)(test_file, mode | STGM_DELETEONRELEASE, &stream); + ok(ret == E_INVALIDARG, "SHCreateStreamOnFileW: expected E_INVALIDARG, got 0x%08x\n", ret); + ok(stream == NULL, "SHCreateStreamOnFileW: expected a NULL IStream object, got %p\n", stream); + + /* file does not exist */ + + stream = NULL; + ret = (*pSHCreateStreamOnFileW)(test_file, mode | STGM_FAILIFTHERE, &stream); + todo_wine + ok(ret == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "SHCreateStreamOnFileW: expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got 0x%08x\n", ret); + ok(stream == NULL, "SHCreateStreamOnFileW: expected a NULL IStream object, got %p\n", stream); + + stream = NULL; + ret = (*pSHCreateStreamOnFileW)(test_file, mode | STGM_CREATE, &stream); + todo_wine + ok(ret == S_OK, "SHCreateStreamOnFileW: expected S_OK, got 0x%08x\n", ret); + todo_wine + ok(stream != NULL, "SHCreateStreamOnFileW: expected a valid IStream object, got NULL\n"); + + if (stream) { + refcount = IStream_Release(stream); + ok(refcount == 0, "SHCreateStreamOnFileW: expected 0, got %d\n", refcount); + } + + /* NOTE: don't delete the file, as it will be used for the file exists tests. */ + + /* file exists */ + + stream = NULL; + ret = (*pSHCreateStreamOnFileW)(test_file, mode | STGM_FAILIFTHERE, &stream); + todo_wine + ok(ret == S_OK, "SHCreateStreamOnFileW: expected S_OK, got 0x%08x\n", ret); + todo_wine + ok(stream != NULL, "SHCreateStreamOnFileW: expected a valid IStream object, got NULL\n"); + + if (stream) { + refcount = IStream_Release(stream); + ok(refcount == 0, "SHCreateStreamOnFileW: expected 0, got %d\n", refcount); + } + + stream = NULL; + ret = (*pSHCreateStreamOnFileW)(test_file, mode | STGM_CREATE, &stream); + todo_wine + ok(ret == S_OK, "SHCreateStreamOnFileW: expected S_OK, got 0x%08x\n", ret); + todo_wine + ok(stream != NULL, "SHCreateStreamOnFileW: expected a valid IStream object, got NULL\n"); + + if (stream) { + refcount = IStream_Release(stream); + ok(refcount == 0, "SHCreateStreamOnFileW: expected 0, got %d\n", refcount); + + ok(DeleteFileW(test_file), "SHCreateStreamOnFileW: could not delete the test file, got error %d\n", GetLastError()); + } +} + + START_TEST(istream) { hShlwapi = GetModuleHandleA("shlwapi.dll"); pSHCreateStreamOnFileA = (void*)GetProcAddress(hShlwapi, "SHCreateStreamOnFileA"); + pSHCreateStreamOnFileW = (void*)GetProcAddress(hShlwapi, "SHCreateStreamOnFileW"); if (!pSHCreateStreamOnFileA) printf("SHCreateStreamOnFileA not found... skipping tests.\n"); @@ -131,4 +218,12 @@ START_TEST(istream) test_SHCreateStreamOnFileA(STGM_WRITE); test_SHCreateStreamOnFileA(STGM_READWRITE); } + + if (!pSHCreateStreamOnFileW) + printf("SHCreateStreamOnFileW not found... skipping tests.\n"); + else { + test_SHCreateStreamOnFileW(STGM_READ); + test_SHCreateStreamOnFileW(STGM_WRITE); + test_SHCreateStreamOnFileW(STGM_READWRITE); + } }

1 0

Reece Dunn : shlwapi: Added SHCreateStreamOnFileA tests.
by Alexandre Julliard March 25, 2008

March 25, 2008

Module: wine Branch: master Commit: d2e1e5bfaf85baf9b0b6c49fccf6dc53e810e39b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2e1e5bfaf85baf9b0b6c49fc… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Mon Mar 24 10:07:13 2008 +0000 shlwapi: Added SHCreateStreamOnFileA tests. --- dlls/shlwapi/tests/Makefile.in | 1 + dlls/shlwapi/tests/istream.c | 134 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 135 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/Makefile.in b/dlls/shlwapi/tests/Makefile.in index 4238276..f4c81f2 100644 --- a/dlls/shlwapi/tests/Makefile.in +++ b/dlls/shlwapi/tests/Makefile.in @@ -10,6 +10,7 @@ CTESTS = \ clist.c \ clsid.c \ generated.c \ + istream.c \ ordinal.c \ path.c \ shreg.c \ diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c new file mode 100644 index 0000000..1045c46 --- /dev/null +++ b/dlls/shlwapi/tests/istream.c @@ -0,0 +1,134 @@ +/* Unit test suite for SHLWAPI ShCreateStreamOnFile functions. + * + * Copyright 2008 Reece H. Dunn + * + * 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 + */ + +#define COBJMACROS + +#include <stdarg.h> +#include <stdio.h> + +#include "wine/test.h" +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "shlwapi.h" + + +/* Function pointers for the SHCreateStreamOnFile functions */ +static HMODULE hShlwapi; +static HRESULT (WINAPI *pSHCreateStreamOnFileA)(LPCSTR file, DWORD mode, IStream **stream); + + +static void test_SHCreateStreamOnFileA(DWORD mode) +{ + IStream * stream; + HRESULT ret; + ULONG refcount; + static const char * test_file = "c:\\test.txt"; + + printf("SHCreateStreamOnFileA: testing mode %d\n", mode); + + /* invalid arguments */ + + stream = NULL; + ret = (*pSHCreateStreamOnFileA)(NULL, mode, &stream); + todo_wine + ok(ret == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "SHCreateStreamOnFileA: expected HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), got 0x%08x\n", ret); + ok(stream == NULL, "SHCreateStreamOnFileA: expected a NULL IStream object, got %p\n", stream); + +#if 0 /* This test crashes on WinXP SP2 */ + ret = (*pSHCreateStreamOnFileA)(test_file, mode, NULL); + ok(ret == E_INVALIDARG, "SHCreateStreamOnFileA: expected E_INVALIDARG, got 0x%08x\n", ret); +#endif + + stream = NULL; + ret = (*pSHCreateStreamOnFileA)(test_file, mode | STGM_CONVERT, &stream); + ok(ret == E_INVALIDARG, "SHCreateStreamOnFileA: expected E_INVALIDARG, got 0x%08x\n", ret); + ok(stream == NULL, "SHCreateStreamOnFileA: expected a NULL IStream object, got %p\n", stream); + + stream = NULL; + ret = (*pSHCreateStreamOnFileA)(test_file, mode | STGM_DELETEONRELEASE, &stream); + ok(ret == E_INVALIDARG, "SHCreateStreamOnFileA: expected E_INVALIDARG, got 0x%08x\n", ret); + ok(stream == NULL, "SHCreateStreamOnFileA: expected a NULL IStream object, got %p\n", stream); + + /* file does not exist */ + + stream = NULL; + ret = (*pSHCreateStreamOnFileA)(test_file, mode | STGM_FAILIFTHERE, &stream); + todo_wine + ok(ret == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "SHCreateStreamOnFileA: expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got 0x%08x\n", ret); + ok(stream == NULL, "SHCreateStreamOnFileA: expected a NULL IStream object, got %p\n", stream); + + stream = NULL; + ret = (*pSHCreateStreamOnFileA)(test_file, mode | STGM_CREATE, &stream); + todo_wine + ok(ret == S_OK, "SHCreateStreamOnFileA: expected S_OK, got 0x%08x\n", ret); + todo_wine + ok(stream != NULL, "SHCreateStreamOnFileA: expected a valid IStream object, got NULL\n"); + + if (stream) { + refcount = IStream_Release(stream); + ok(refcount == 0, "SHCreateStreamOnFileA: expected 0, got %d\n", refcount); + } + + /* NOTE: don't delete the file, as it will be used for the file exists tests. */ + + /* file exists */ + + stream = NULL; + ret = (*pSHCreateStreamOnFileA)(test_file, mode | STGM_FAILIFTHERE, &stream); + todo_wine + ok(ret == S_OK, "SHCreateStreamOnFileA: expected S_OK, got 0x%08x\n", ret); + todo_wine + ok(stream != NULL, "SHCreateStreamOnFileA: expected a valid IStream object, got NULL\n"); + + if (stream) { + refcount = IStream_Release(stream); + ok(refcount == 0, "SHCreateStreamOnFileA: expected 0, got %d\n", refcount); + } + + stream = NULL; + ret = (*pSHCreateStreamOnFileA)(test_file, mode | STGM_CREATE, &stream); + todo_wine + ok(ret == S_OK, "SHCreateStreamOnFileA: expected S_OK, got 0x%08x\n", ret); + todo_wine + ok(stream != NULL, "SHCreateStreamOnFileA: expected a valid IStream object, got NULL\n"); + + if (stream) { + refcount = IStream_Release(stream); + ok(refcount == 0, "SHCreateStreamOnFileA: expected 0, got %d\n", refcount); + + ok(DeleteFileA(test_file), "SHCreateStreamOnFileA: could not delete file '%s', got error %d\n", test_file, GetLastError()); + } +} + + +START_TEST(istream) +{ + hShlwapi = GetModuleHandleA("shlwapi.dll"); + + pSHCreateStreamOnFileA = (void*)GetProcAddress(hShlwapi, "SHCreateStreamOnFileA"); + + if (!pSHCreateStreamOnFileA) + printf("SHCreateStreamOnFileA not found... skipping tests.\n"); + else { + test_SHCreateStreamOnFileA(STGM_READ); + test_SHCreateStreamOnFileA(STGM_WRITE); + test_SHCreateStreamOnFileA(STGM_READWRITE); + } +}

1 0

Tony Wasserka : d3dx9: Start implementation of d3dx9_37.
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: be0799fce2ea4482d7cf96082f3cddf4f9b462c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be0799fce2ea4482d7cf96082… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Mon Mar 24 12:32:54 2008 +0100 d3dx9: Start implementation of d3dx9_37. --- Makefile.in | 2 + configure | 3 + configure.ac | 1 + dlls/Makefile.in | 1 + dlls/d3dx9_37/Makefile.in | 13 ++ dlls/d3dx9_37/d3dx9_37.spec | 336 +++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_37/d3dx9_37_main.c | 65 ++++++++ 7 files changed, 421 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be0799fce2ea4482d7cf9…

1 0

Alexandre Julliard : setupapi/tests: Use FIELD_OFFSET instead of offsetof.
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: 39fea9329cba3f0d6bc5d437e07136fe1d5fad4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=39fea9329cba3f0d6bc5d437e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 24 21:06:15 2008 +0100 setupapi/tests: Use FIELD_OFFSET instead of offsetof. --- dlls/setupapi/tests/devinst.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index dc6d9f7..ef0d8d6 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -649,7 +649,7 @@ static void testGetDeviceInterfaceDetail(void) /* Windows 2000 and up check for the exact size. Win9x returns ERROR_INVALID_PARAMETER * on every call (so doesn't get here) and NT4 doesn't have this function. */ - detail->cbSize = offsetof(SP_DEVICE_INTERFACE_DETAIL_DATA_A, DevicePath) + sizeof(char); + detail->cbSize = FIELD_OFFSET(SP_DEVICE_INTERFACE_DETAIL_DATA_A, DevicePath[1]); ret = pSetupDiGetDeviceInterfaceDetailA(set, &interfaceData, detail, size, &size, NULL); ok(ret, "SetupDiGetDeviceInterfaceDetailA failed: %d\n",

1 0

Aurimas Fischer : fonts: Added/updated all (9x2) Lithuanian glyphs.
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: 0f2cb23c7d5df22f9ff30e40afb4d6de03e03dae URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f2cb23c7d5df22f9ff30e40a… Author: Aurimas Fischer <aurimas(a)gmail.com> Date: Mon Mar 24 16:50:06 2008 +0200 fonts: Added/updated all (9x2) Lithuanian glyphs. --- fonts/courier.sfd | 70 ++++++- fonts/courier.ttf | Bin 14060 -> 14288 bytes fonts/ms_sans_serif.sfd | 159 ++++++++++++-- fonts/ms_sans_serif.ttf | Bin 27752 -> 28572 bytes fonts/small_fonts.sfd | 16 +- fonts/small_fonts.ttf | Bin 15956 -> 15956 bytes fonts/system.sfd | 139 ++++++++++-- fonts/system.ttf | Bin 23940 -> 24776 bytes fonts/tahoma.sfd | 569 +++++++++++++++++++++++++++++----------------- fonts/tahoma.ttf | Bin 86772 -> 88648 bytes fonts/tahomabd.sfd | 447 +++++++++++++++++++++++++++---------- fonts/tahomabd.ttf | Bin 64396 -> 66372 bytes 12 files changed, 1018 insertions(+), 382 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f2cb23c7d5df22f9ff30…

1 0

Reece Dunn : ntdsapi: Fix building the tests with MSVC headers.
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: 47b97025e7d37be6dc68bd786803942890c489ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=47b97025e7d37be6dc68bd786… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Sun Mar 23 10:24:23 2008 +0000 ntdsapi: Fix building the tests with MSVC headers. --- dlls/ntdsapi/tests/ntdsapi.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ntdsapi/tests/ntdsapi.c b/dlls/ntdsapi/tests/ntdsapi.c index ac5dd19..08436ae 100644 --- a/dlls/ntdsapi/tests/ntdsapi.c +++ b/dlls/ntdsapi/tests/ntdsapi.c @@ -22,6 +22,8 @@ #include "winbase.h" #include "winerror.h" #include "winnls.h" +#include "rpc.h" +#include "rpcdce.h" #include "ntdsapi.h" #include "wine/test.h"

1 0

Reece Dunn : quartz: Fixed building with MSVC headers.
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: 1b31c6e6168ede3ea199c321e83797e92087aeb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b31c6e6168ede3ea199c321e… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Sun Mar 23 09:32:43 2008 +0000 quartz: Fixed building with MSVC headers. --- dlls/quartz/tests/misc.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/tests/misc.c b/dlls/quartz/tests/misc.c index 3be5757..7207814 100644 --- a/dlls/quartz/tests/misc.c +++ b/dlls/quartz/tests/misc.c @@ -138,32 +138,32 @@ static void test_aggregation(const CLSID clsidOuter, const CLSID clsidInner, static void test_video_renderer_aggregations(void) { - IID iids[] = { - IID_IMediaFilter, IID_IBaseFilter, IID_IBasicVideo, IID_IVideoWindow + const IID * iids[] = { + &IID_IMediaFilter, &IID_IBaseFilter, &IID_IBasicVideo, &IID_IVideoWindow }; int i; for (i = 0; i < sizeof(iids) / sizeof(iids[0]); i++) { test_aggregation(CLSID_SystemClock, CLSID_VideoRenderer, - IID_IReferenceClock, iids[i]); + IID_IReferenceClock, *iids[i]); } } static void test_filter_graph_aggregations(void) { - IID iids[] = { - IID_IFilterGraph2, IID_IMediaControl, IID_IGraphBuilder, - IID_IFilterGraph, IID_IMediaSeeking, IID_IBasicAudio, IID_IBasicVideo, - IID_IVideoWindow, IID_IMediaEventEx, IID_IMediaFilter, - IID_IMediaEventSink, IID_IGraphConfig, IID_IMediaPosition + const IID * iids[] = { + &IID_IFilterGraph2, &IID_IMediaControl, &IID_IGraphBuilder, + &IID_IFilterGraph, &IID_IMediaSeeking, &IID_IBasicAudio, &IID_IBasicVideo, + &IID_IVideoWindow, &IID_IMediaEventEx, &IID_IMediaFilter, + &IID_IMediaEventSink, &IID_IGraphConfig, &IID_IMediaPosition }; int i; for (i = 0; i < sizeof(iids) / sizeof(iids[0]); i++) { test_aggregation(CLSID_SystemClock, CLSID_FilterGraph, - IID_IReferenceClock, iids[i]); + IID_IReferenceClock, *iids[i]); } }

1 0

Reece Dunn : ole32: Added a missing include needed for CLSID_ShellDesktop using MSVC headers.
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: 4fbdab7a8f515fad4c280fdb402e9298ffe9be25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fbdab7a8f515fad4c280fdb4… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Sun Mar 23 10:04:04 2008 +0000 ole32: Added a missing include needed for CLSID_ShellDesktop using MSVC headers. --- dlls/ole32/tests/marshal.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index c7f7996..acea854 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -29,6 +29,7 @@ #include "winbase.h" #include "objbase.h" #include "shlguid.h" +#include "shobjidl.h" #include "wine/test.h"

1 0

Alistair Leslie-Hughes : msxml3: Add SAX interfaces.
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: b8040eb2567bc01d0f87fbf4e5613178028e76ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8040eb2567bc01d0f87fbf4e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 24 20:10:05 2008 +1100 msxml3: Add SAX interfaces. --- include/msxml2.idl | 915 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 915 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8040eb2567bc01d0f87f…

1 0

Kai Blin : netapi32: Revert "janitorial: Use poll() instead of select()."
by Alexandre Julliard March 24, 2008

March 24, 2008

Module: wine Branch: master Commit: 65686b583bdfd5d152b487288747f4551d62d88b URL: http://source.winehq.org/git/wine.git/?a=commit;h=65686b583bdfd5d152b487288… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon Mar 24 17:05:47 2008 +0100 netapi32: Revert "janitorial: Use poll() instead of select()." As Juan Lang pointed out, fd is a SOCKET here and the netapi32 call to select calls ws2_32.WS_select(), which uses poll internally already. --- dlls/netapi32/nbt.c | 18 +++++------------- 1 files changed, 5 insertions(+), 13 deletions(-) diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c index 96309e4..1186572 100644 --- a/dlls/netapi32/nbt.c +++ b/dlls/netapi32/nbt.c @@ -67,15 +67,6 @@ #include "config.h" #include <stdarg.h> -#ifdef HAVE_POLL_H -#include <poll.h> -#endif -#ifdef HAVE_SYS_POLL_H -# include <sys/poll.h> -#endif -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#endif #include "winsock2.h" #include "windef.h" @@ -311,12 +302,13 @@ static UCHAR NetBTWaitForNameResponse(const NetBTAdapter *adapter, SOCKET fd, while (!found && ret == NRC_GOODRET && (now = GetTickCount()) < waitUntil) { DWORD msToWait = waitUntil - now; - struct pollfd pfd; + struct fd_set fds; + struct timeval timeout = { msToWait / 1000, msToWait % 1000 }; int r; - pfd.fd = fd; - pfd.events = POLLIN; - r = poll(&pfd, 1, msToWait); + FD_ZERO(&fds); + FD_SET(fd, &fds); + r = select(fd + 1, &fds, NULL, NULL, &timeout); if (r < 0) ret = NRC_SYSTEM; else if (r == 1)

1 0