January 2017 - Wine-Commits

André Hentschel : winhttp: Fix some spec file entries.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 5b9beca16269380532dae13bc969de5a1df9ea20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b9beca16269380532dae13bc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 30 23:11:00 2017 +0100 winhttp: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/winhttp.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/winhttp.spec b/dlls/winhttp/winhttp.spec index 15c560a..28dcb15 100644 --- a/dlls/winhttp/winhttp.spec +++ b/dlls/winhttp/winhttp.spec @@ -20,11 +20,11 @@ @ stdcall WinHttpQueryOption(ptr long ptr ptr) @ stdcall WinHttpReadData(ptr ptr long ptr) @ stdcall WinHttpReceiveResponse(ptr ptr) -@ stdcall WinHttpSendRequest(ptr wstr long ptr long long ptr) +@ stdcall WinHttpSendRequest(ptr wstr long ptr long long long) @ stdcall WinHttpSetCredentials(ptr long long wstr ptr ptr) @ stdcall WinHttpSetDefaultProxyConfiguration(ptr) @ stdcall WinHttpSetOption(ptr long ptr long) -@ stdcall WinHttpSetStatusCallback(ptr ptr long ptr) +@ stdcall WinHttpSetStatusCallback(ptr ptr long long) @ stdcall WinHttpSetTimeouts(ptr long long long long) @ stdcall WinHttpTimeFromSystemTime(ptr ptr) @ stdcall WinHttpTimeToSystemTime(wstr ptr)

1 0

André Hentschel : comctl32: Fix some more spec file entries.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 70c9a96052a6b8cba56f1711e6a232b74c9ece4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=70c9a96052a6b8cba56f1711e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 30 23:11:01 2017 +0100 comctl32: Fix some more spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/comctl32.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index c3e9167..9287346 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec @@ -5,7 +5,7 @@ 2 stdcall MenuHelp(long long long long long long ptr) 3 stdcall ShowHideMenuCtl(long long ptr) - 4 stdcall GetEffectiveClientRect(long long long) + 4 stdcall GetEffectiveClientRect(long ptr ptr) 5 stdcall DrawStatusTextA(long ptr str long) 6 stdcall CreateStatusWindowA(long str long long) 7 stdcall CreateToolbar(long long long long long long ptr long) @@ -93,7 +93,7 @@ 382 stdcall -noname SmoothScrollWindow(ptr) 383 stub -noname DoReaderMode 384 stdcall -noname SetPathWordBreakProc(ptr long) -385 stdcall -ordinal DPA_EnumCallback(long long ptr) +385 stdcall -ordinal DPA_EnumCallback(ptr ptr ptr) 386 stdcall -ordinal DPA_DestroyCallback(ptr ptr ptr) 387 stdcall -ordinal DSA_EnumCallback(ptr ptr ptr) 388 stdcall -ordinal DSA_DestroyCallback(ptr ptr ptr)

1 0

André Hentschel : msvfw32: Fix some spec file entries.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 8b566b5e32f8412acfd110702d96b169ebcfbc6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b566b5e32f8412acfd110702… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 30 23:10:59 2017 +0100 msvfw32: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/msvfw32.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvfw32/msvfw32.spec b/dlls/msvfw32/msvfw32.spec index 3fdd2f6..f0c9e15 100644 --- a/dlls/msvfw32/msvfw32.spec +++ b/dlls/msvfw32/msvfw32.spec @@ -34,13 +34,13 @@ @ stdcall ICImageCompress(long long ptr ptr ptr long ptr) @ stdcall ICImageDecompress(long long ptr ptr ptr) @ stdcall ICInfo(long long ptr) -@ stdcall ICInstall(long long ptr str long) +@ stdcall ICInstall(long long long str long) @ stdcall ICLocate(long long ptr ptr long) @ stub ICMThunk @ stdcall ICOpen(long long long) @ stdcall ICOpenFunction(long long long ptr) @ stdcall ICRemove(long long long) -@ stdcall ICSendMessage(long long ptr ptr) +@ stdcall ICSendMessage(long long long long) @ stdcall ICSeqCompressFrame(ptr long ptr ptr ptr) @ stdcall ICSeqCompressFrameEnd(ptr) @ stdcall ICSeqCompressFrameStart(ptr ptr)

1 0

André Hentschel : serialui: Fix EnumPropPages spec file entry.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 557f459058d82b3bb73d68108dadae6a17277556 URL: http://source.winehq.org/git/wine.git/?a=commit;h=557f459058d82b3bb73d68108… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 30 23:10:56 2017 +0100 serialui: Fix EnumPropPages spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/serialui/serialui.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/serialui/serialui.spec b/dlls/serialui/serialui.spec index bd6c701..7be42ae 100644 --- a/dlls/serialui/serialui.spec +++ b/dlls/serialui/serialui.spec @@ -1,4 +1,4 @@ -1 stdcall EnumPropPages(ptr ptr ptr) +1 stdcall EnumPropPages(ptr ptr long) 2 stdcall drvCommConfigDialogW(ptr long ptr) 3 stdcall drvCommConfigDialogA(ptr long ptr) 4 stdcall drvSetDefaultCommConfigW(wstr ptr long)

1 0

Bruno Jesus : wlanapi: Implement WlanCloseHandle.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 062067d887b03bea65943b83f3c3762defd887ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=062067d887b03bea65943b83f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Jan 30 04:59:44 2017 -0200 wlanapi: Implement WlanCloseHandle. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/main.c | 25 +++++++++++++++++++++++-- dlls/wlanapi/tests/wlanapi.c | 12 +++++++----- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index 9b71330..303d173 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -35,6 +35,16 @@ static struct wine_wlan DWORD magic, cli_version; } handle_table[16]; +static struct wine_wlan* handle_index(HANDLE handle) +{ + ULONG_PTR i = (ULONG_PTR)handle - 1; + + if (i < sizeof(handle_table) / sizeof(handle_table[0]) && handle_table[i].magic == WLAN_MAGIC) + return &handle_table[i]; + + return NULL; +} + static HANDLE handle_new(struct wine_wlan **entry) { ULONG_PTR i; @@ -59,8 +69,19 @@ DWORD WINAPI WlanEnumInterfaces(HANDLE handle, void *reserved, WLAN_INTERFACE_IN DWORD WINAPI WlanCloseHandle(HANDLE handle, void *reserved) { - FIXME("(%p, %p) stub\n", handle, reserved); - return ERROR_CALL_NOT_IMPLEMENTED; + struct wine_wlan *wlan; + + TRACE("(%p, %p)\n", handle, reserved); + + if (!handle || reserved) + return ERROR_INVALID_PARAMETER; + + wlan = handle_index(handle); + if (!wlan) + return ERROR_INVALID_HANDLE; + + wlan->magic = 0; + return ERROR_SUCCESS; } DWORD WINAPI WlanOpenHandle(DWORD client_version, void *reserved, DWORD *negotiated_version, HANDLE *handle) diff --git a/dlls/wlanapi/tests/wlanapi.c b/dlls/wlanapi/tests/wlanapi.c index 7f8b83c..e0c55f6 100644 --- a/dlls/wlanapi/tests/wlanapi.c +++ b/dlls/wlanapi/tests/wlanapi.c @@ -71,7 +71,6 @@ static void test_WlanOpenHandle(void) ok(neg_version == 1, "Expected 1, got %d\n", neg_version); ok(handle != bad_handle && handle, "handle changed\n"); ret = WlanCloseHandle(handle, NULL); -todo_wine ok(ret == 0, "Expected 0, got %d\n", ret); ret = WlanOpenHandle(2, NULL, &neg_version, &handle); @@ -82,7 +81,6 @@ todo_wine ok(neg_version == 1, "Expected 1, got %d\n", neg_version); ok(handle != bad_handle && handle, "bad handle\n"); ret = WlanCloseHandle(handle, NULL); -todo_wine ok(ret == 0, "Expected 0, got %d\n", ret); /* open twice */ @@ -91,15 +89,19 @@ todo_wine ret = WlanOpenHandle(1, NULL, &neg_version, &handle2); ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); -todo_wine { + ret = WlanCloseHandle(handle, &reserved); + ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + ret = WlanCloseHandle(handle, NULL); ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); ret = WlanCloseHandle(handle2, NULL); ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); + ret = WlanCloseHandle(bad_handle, NULL); + ok(ret == ERROR_INVALID_HANDLE, "Expected 6, got %d\n", ret); + ret = WlanCloseHandle(NULL, NULL); - ok(ret == ERROR_INVALID_PARAMETER, "Expected 0, got %d\n", ret); -} + ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); } static void test_WlanAllocateFreeMemory(void)

1 0

Bruno Jesus : wlanapi: Implement WlanOpenHandle.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 8b3c6943e30225908c4d87af7983d9301c10875f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b3c6943e30225908c4d87af7… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Jan 30 04:59:43 2017 -0200 wlanapi: Implement WlanOpenHandle. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/main.c | 45 ++++++++++++++++++++++++++++++++++++++++++-- dlls/wlanapi/tests/wlanapi.c | 23 ++++++++++++++-------- 2 files changed, 58 insertions(+), 10 deletions(-) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index 5eeb515..9b71330 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -28,6 +28,29 @@ WINE_DEFAULT_DEBUG_CHANNEL(wlanapi); +#define WLAN_MAGIC 0x574c414e /* WLAN */ + +static struct wine_wlan +{ + DWORD magic, cli_version; +} handle_table[16]; + +static HANDLE handle_new(struct wine_wlan **entry) +{ + ULONG_PTR i; + + for (i = 0; i < sizeof(handle_table) / sizeof(handle_table[0]); i++) + { + if (handle_table[i].magic == 0) + { + *entry = &handle_table[i]; + return (HANDLE)(i + 1); + } + } + + return NULL; +} + DWORD WINAPI WlanEnumInterfaces(HANDLE handle, void *reserved, WLAN_INTERFACE_INFO_LIST **interface_list) { FIXME("(%p, %p, %p) stub\n", handle, reserved, interface_list); @@ -42,8 +65,26 @@ DWORD WINAPI WlanCloseHandle(HANDLE handle, void *reserved) DWORD WINAPI WlanOpenHandle(DWORD client_version, void *reserved, DWORD *negotiated_version, HANDLE *handle) { - FIXME("(%u, %p, %p, %p) stub\n", client_version, reserved, negotiated_version, handle); - return ERROR_CALL_NOT_IMPLEMENTED; + struct wine_wlan *wlan; + HANDLE ret_handle; + + TRACE("(%u, %p, %p, %p)\n", client_version, reserved, negotiated_version, handle); + + if (reserved || !negotiated_version || !handle) + return ERROR_INVALID_PARAMETER; + + if (client_version != 1 && client_version != 2) + return ERROR_NOT_SUPPORTED; + + ret_handle = handle_new(&wlan); + if (!ret_handle) + return ERROR_REMOTE_SESSION_LIMIT_EXCEEDED; + + wlan->magic = WLAN_MAGIC; + wlan->cli_version = *negotiated_version = client_version; + *handle = ret_handle; + + return ERROR_SUCCESS; } void WINAPI WlanFreeMemory(void *ptr) diff --git a/dlls/wlanapi/tests/wlanapi.c b/dlls/wlanapi/tests/wlanapi.c index 09fcb58..7f8b83c 100644 --- a/dlls/wlanapi/tests/wlanapi.c +++ b/dlls/wlanapi/tests/wlanapi.c @@ -26,7 +26,7 @@ static void test_WlanOpenHandle(void) { - HANDLE bad_handle = (HANDLE) 0xdeadcafe, handle = bad_handle; + HANDLE bad_handle = (HANDLE) 0xdeadcafe, handle = bad_handle, handle2; DWORD ret, neg_version = 0xdeadbeef, reserved = 0xdead; BOOL is_xp; @@ -35,30 +35,25 @@ static void test_WlanOpenHandle(void) is_xp = ret == ERROR_SUCCESS; if (!is_xp) /* the results in XP differ completely from all other versions */ { -todo_wine ok(ret == ERROR_NOT_SUPPORTED, "Expected 50, got %d\n", ret); ok(neg_version == 0xdeadbeef, "neg_vesion changed\n"); ok(handle == bad_handle, "handle changed\n"); ret = WlanOpenHandle(10, NULL, &neg_version, &handle); -todo_wine ok(ret == ERROR_NOT_SUPPORTED, "Expected 50, got %d\n", ret); ok(neg_version == 0xdeadbeef, "neg_vesion changed\n"); ok(handle == bad_handle, "handle changed\n"); /* reserved parameter must not be used */ ret = WlanOpenHandle(1, &reserved, &neg_version, &handle); -todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); ok(neg_version == 0xdeadbeef, "neg_vesion changed\n"); ok(handle == bad_handle, "handle changed\n"); /* invalid parameters */ ret = WlanOpenHandle(1, NULL, NULL, &handle); -todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); ok(handle == bad_handle, "bad handle\n"); ret = WlanOpenHandle(1, NULL, &neg_version, NULL); -todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); ok(neg_version == 0xdeadbeef, "neg_vesion changed\n"); } @@ -71,12 +66,12 @@ todo_wine } /* good tests */ -todo_wine { ret = WlanOpenHandle(1, NULL, &neg_version, &handle); ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); ok(neg_version == 1, "Expected 1, got %d\n", neg_version); ok(handle != bad_handle && handle, "handle changed\n"); ret = WlanCloseHandle(handle, NULL); +todo_wine ok(ret == 0, "Expected 0, got %d\n", ret); ret = WlanOpenHandle(2, NULL, &neg_version, &handle); @@ -87,8 +82,21 @@ todo_wine { ok(neg_version == 1, "Expected 1, got %d\n", neg_version); ok(handle != bad_handle && handle, "bad handle\n"); ret = WlanCloseHandle(handle, NULL); +todo_wine ok(ret == 0, "Expected 0, got %d\n", ret); + /* open twice */ + ret = WlanOpenHandle(1, NULL, &neg_version, &handle); + ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); + ret = WlanOpenHandle(1, NULL, &neg_version, &handle2); + ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); + +todo_wine { + ret = WlanCloseHandle(handle, NULL); + ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); + ret = WlanCloseHandle(handle2, NULL); + ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); + ret = WlanCloseHandle(NULL, NULL); ok(ret == ERROR_INVALID_PARAMETER, "Expected 0, got %d\n", ret); } @@ -120,7 +128,6 @@ static void test_WlanEnumInterfaces(void) WLAN_INTERFACE_INFO *info; ret = WlanOpenHandle(1, NULL, &neg_version, &handle); -todo_wine ok(ret == 0, "Expected 0, got %d\n", ret); /* invalid parameters */

1 0

Bruno Jesus : wlanapi/tests: Add tests for WlanEnumInterfaces.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 382755af1f19a059085d6e423ace95fcfa3104d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=382755af1f19a059085d6e423… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Jan 30 04:59:42 2017 -0200 wlanapi/tests: Add tests for WlanEnumInterfaces. Manually tested on XP and Windows 8 with real wireless card. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/tests/wlanapi.c | 67 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/wlanapi/tests/wlanapi.c b/dlls/wlanapi/tests/wlanapi.c index a35a7c9..09fcb58 100644 --- a/dlls/wlanapi/tests/wlanapi.c +++ b/dlls/wlanapi/tests/wlanapi.c @@ -111,6 +111,72 @@ static void test_WlanAllocateFreeMemory(void) WlanFreeMemory(NULL); /* return is void, proves that won't crash */ } +static void test_WlanEnumInterfaces(void) +{ + HANDLE handle; + DWORD neg_version, i, ret, reserved = 0xdeadbeef; + WLAN_INTERFACE_INFO_LIST *bad_list = (WLAN_INTERFACE_INFO_LIST *)0xdeadcafe, + *list = bad_list; + WLAN_INTERFACE_INFO *info; + + ret = WlanOpenHandle(1, NULL, &neg_version, &handle); +todo_wine + ok(ret == 0, "Expected 0, got %d\n", ret); + + /* invalid parameters */ + ret = WlanEnumInterfaces(NULL, NULL, &list); +todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + ok(list == bad_list, "list changed\n"); + ret = WlanEnumInterfaces(handle, &reserved, &list); +todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + ok(list == bad_list, "list changed\n"); + ret = WlanEnumInterfaces(handle, NULL, NULL); +todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + ok(list == bad_list, "list changed\n"); + + /* good tests */ + list = NULL; + ret = WlanEnumInterfaces(handle, NULL, &list); +todo_wine + ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); +todo_wine + ok(list != NULL, "bad interface list\n"); + if (!list || !list->dwNumberOfItems) + { + skip("No wireless interfaces\n"); + WlanCloseHandle(handle, NULL); + return; + } + + trace("Wireless interfaces: %d\n", list->dwNumberOfItems); + for (i = 0; i < list->dwNumberOfItems;i ++) + { + info = &list->InterfaceInfo[i]; + trace(" Index[%d] GUID: %s\n", i, wine_dbgstr_guid(&info->InterfaceGuid)); + switch (info->isState) + { + case wlan_interface_state_disconnected: + trace(" Status: Disconnected\n"); + break; + case wlan_interface_state_connected: + trace(" Status: Connected\n"); + break; + default: + trace(" Status: Other\n"); + break; + } + trace(" Description: %s\n", wine_dbgstr_w(info->strInterfaceDescription)); + } + + WlanFreeMemory(list); + + ret = WlanCloseHandle(handle, NULL); + ok(ret == 0, "Expected 0, got %d\n", ret); +} + START_TEST(wlanapi) { HANDLE handle; @@ -126,4 +192,5 @@ START_TEST(wlanapi) test_WlanOpenHandle(); test_WlanAllocateFreeMemory(); + test_WlanEnumInterfaces(); }

1 0

Bruno Jesus : wlanapi/tests: Add test structure.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 3052c700682ef2dc176b47fac883367f7ea422a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3052c700682ef2dc176b47fac… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Jan 30 04:59:39 2017 -0200 wlanapi/tests: Add test structure. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 ++- configure.ac | 3 ++- dlls/wlanapi/Makefile.in | 3 ++- dlls/wlanapi/tests/Makefile.in | 5 +++++ dlls/wlanapi/tests/wlanapi.c | 39 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 50 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 6368926..68a79c0 100755 --- a/configure +++ b/configure @@ -18429,7 +18429,8 @@ wine_fn_config_dll wintab32 enable_wintab32 implib wine_fn_config_test dlls/wintab32/tests wintab32_test wine_fn_config_dll wintrust enable_wintrust implib wine_fn_config_test dlls/wintrust/tests wintrust_test -wine_fn_config_dll wlanapi enable_wlanapi +wine_fn_config_dll wlanapi enable_wlanapi implib +wine_fn_config_test dlls/wlanapi/tests wlanapi_test wine_fn_config_dll wldap32 enable_wldap32 clean,implib wine_fn_config_test dlls/wldap32/tests wldap32_test wine_fn_config_dll wmasf enable_wmasf diff --git a/configure.ac b/configure.ac index d30dd9c..6e4cd8b 100644 --- a/configure.ac +++ b/configure.ac @@ -3488,7 +3488,8 @@ WINE_CONFIG_DLL(wintab32,,[implib]) WINE_CONFIG_TEST(dlls/wintab32/tests) WINE_CONFIG_DLL(wintrust,,[implib]) WINE_CONFIG_TEST(dlls/wintrust/tests) -WINE_CONFIG_DLL(wlanapi) +WINE_CONFIG_DLL(wlanapi,,[implib]) +WINE_CONFIG_TEST(dlls/wlanapi/tests) WINE_CONFIG_DLL(wldap32,,[clean,implib]) WINE_CONFIG_TEST(dlls/wldap32/tests) WINE_CONFIG_DLL(wmasf) diff --git a/dlls/wlanapi/Makefile.in b/dlls/wlanapi/Makefile.in index a0a06b9..1f4b294 100644 --- a/dlls/wlanapi/Makefile.in +++ b/dlls/wlanapi/Makefile.in @@ -1,4 +1,5 @@ -MODULE = wlanapi.dll +MODULE = wlanapi.dll +IMPORTLIB = wlanapi C_SRCS = \ main.c diff --git a/dlls/wlanapi/tests/Makefile.in b/dlls/wlanapi/tests/Makefile.in new file mode 100644 index 0000000..a08db32 --- /dev/null +++ b/dlls/wlanapi/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = wlanapi.dll +IMPORTS = wlanapi + +C_SRCS = \ + wlanapi.c diff --git a/dlls/wlanapi/tests/wlanapi.c b/dlls/wlanapi/tests/wlanapi.c new file mode 100644 index 0000000..3e6ac7a --- /dev/null +++ b/dlls/wlanapi/tests/wlanapi.c @@ -0,0 +1,39 @@ +/* + * Unit test suite for wlanapi functions + * + * Copyright 2017 Bruno Jesus + * + * 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 WIN32_LEAN_AND_MEAN +#include <windows.h> +#include <wlanapi.h> + +#include "wine/test.h" + +START_TEST(wlanapi) +{ + HANDLE handle; + DWORD neg_version; + + /* Windows checks the service before validating the client version so this + * call will always result in error, no need to free the handle. */ + if (WlanOpenHandle(0, NULL, &neg_version, &handle) == ERROR_SERVICE_NOT_ACTIVE) + { + win_skip("No wireless service running\n"); + return; + } +}

1 0

Bruno Jesus : wlanapi: Normalize input and trace parameters.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: f9d14b18b1195c78b123949ae07f29dfb647d56f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9d14b18b1195c78b123949ae… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Jan 30 04:59:38 2017 -0200 wlanapi: Normalize input and trace parameters. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/main.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index c9fbae0..cf6a684 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -28,31 +28,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(wlanapi); -DWORD WINAPI WlanEnumInterfaces(HANDLE client, void *reserved, WLAN_INTERFACE_INFO_LIST **interface_list) +DWORD WINAPI WlanEnumInterfaces(HANDLE handle, void *reserved, WLAN_INTERFACE_INFO_LIST **interface_list) { - FIXME("(%p, %p, %p) stub\n", client, reserved, interface_list); + FIXME("(%p, %p, %p) stub\n", handle, reserved, interface_list); return ERROR_CALL_NOT_IMPLEMENTED; } -DWORD WINAPI WlanCloseHandle(HANDLE client_handle, VOID *reserved) +DWORD WINAPI WlanCloseHandle(HANDLE handle, void *reserved) { - FIXME("(%p, %p) stub\n", client_handle, reserved); + FIXME("(%p, %p) stub\n", handle, reserved); return ERROR_CALL_NOT_IMPLEMENTED; } -DWORD WINAPI WlanOpenHandle(DWORD clientVersion, PVOID reserved, - PDWORD negotiatedVersion, PHANDLE clientHandle) +DWORD WINAPI WlanOpenHandle(DWORD client_version, void *reserved, DWORD *negotiated_version, HANDLE *handle) { - FIXME("(%d, %p, %p, %p) stub\n",clientVersion, reserved, negotiatedVersion, clientHandle); + FIXME("(%u, %p, %p, %p) stub\n", client_version, reserved, negotiated_version, handle); return ERROR_CALL_NOT_IMPLEMENTED; } -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *reserved) { - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + TRACE("(0x%p, %u, %p)\n", hinstDLL, reason, reserved); - switch (fdwReason) + switch (reason) { case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */

1 0

Austin English : ntoskrnl.exe: Add stub KeClearEvent.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 23c95cabf38724f463954023a9d908b5c1838cdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=23c95cabf38724f463954023a… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 18 17:31:34 2017 -0600 ntoskrnl.exe: Add stub KeClearEvent. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 1ab3a4e..bc12788 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3171,3 +3171,11 @@ NTSTATUS WINAPI IoCreateFile(HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUT FIXME(": stub\n"); return STATUS_NOT_IMPLEMENTED; } + +/*********************************************************************** + * KeClearEvent (NTOSKRNL.EXE.@) + */ +VOID WINAPI KeClearEvent(PRKEVENT event) +{ + FIXME("stub: %p\n", event); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index bd02586..acc740f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -515,7 +515,7 @@ @ stub KeBugCheckEx @ stub KeCancelTimer @ stub KeCapturePersistentThreadState -@ stub KeClearEvent +@ stdcall KeClearEvent(ptr) @ stub KeConnectInterrupt @ stub KeDcacheFlushCount @ stdcall KeDelayExecutionThread(long long ptr)

1 0