January 2017 - Wine-commits

Nikolay Sivov : regedit: Clear value list when tree root is selected.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: c5f26bf56ddbf314374825fae9f66b6def582a2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5f26bf56ddbf314374825fae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 28 16:37:52 2017 +0300 regedit: Clear value list when tree root is selected. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 08eeec1..2211d68 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -174,6 +174,15 @@ static void OnTreeSelectionChanged(HWND hwndTV, HWND hwndLV, HTREEITEM hItem, BO if (bRefreshLV) { LPWSTR keyPath; HKEY hRootKey = NULL; + HTREEITEM rootitem; + + rootitem = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_ROOT, 0); + if (rootitem == hItem) + { + SendMessageW(hwndLV, LVM_DELETEALLITEMS, 0, 0); + return; + } + keyPath = GetItemPath(hwndTV, hItem, &hRootKey); RefreshListView(hwndLV, hRootKey, keyPath, NULL); HeapFree(GetProcessHeap(), 0, keyPath);

1 0

Anton Romanov : user32: Add OCR_RDR* cursors.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: cb4545eccdc4b15d0d3bd45dea57b2df4830c5d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb4545eccdc4b15d0d3bd45de… Author: Anton Romanov <theli.ua(a)gmail.com> Date: Sat Jan 28 00:08:42 2017 -0800 user32: Add OCR_RDR* cursors. Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/resources/ocr_rdr2dim.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdreast.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrhorz.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrnorth.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrnortheast.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrnorthwest.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrsouth.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrsoutheast.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrsouthwest.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrvert.cur | Bin 0 -> 326 bytes dlls/user32/resources/ocr_rdrwest.cur | Bin 0 -> 326 bytes dlls/user32/user32.rc | 34 +++++++++++++++++++++++++++++ 12 files changed, 34 insertions(+) diff --git a/dlls/user32/resources/ocr_rdr2dim.cur b/dlls/user32/resources/ocr_rdr2dim.cur new file mode 100644 index 0000000..0685c97 Binary files /dev/null and b/dlls/user32/resources/ocr_rdr2dim.cur differ diff --git a/dlls/user32/resources/ocr_rdreast.cur b/dlls/user32/resources/ocr_rdreast.cur new file mode 100644 index 0000000..20a548c Binary files /dev/null and b/dlls/user32/resources/ocr_rdreast.cur differ diff --git a/dlls/user32/resources/ocr_rdrhorz.cur b/dlls/user32/resources/ocr_rdrhorz.cur new file mode 100644 index 0000000..31cffb4 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrhorz.cur differ diff --git a/dlls/user32/resources/ocr_rdrnorth.cur b/dlls/user32/resources/ocr_rdrnorth.cur new file mode 100644 index 0000000..db00a53 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrnorth.cur differ diff --git a/dlls/user32/resources/ocr_rdrnortheast.cur b/dlls/user32/resources/ocr_rdrnortheast.cur new file mode 100644 index 0000000..9d31be5 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrnortheast.cur differ diff --git a/dlls/user32/resources/ocr_rdrnorthwest.cur b/dlls/user32/resources/ocr_rdrnorthwest.cur new file mode 100644 index 0000000..ab38893 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrnorthwest.cur differ diff --git a/dlls/user32/resources/ocr_rdrsouth.cur b/dlls/user32/resources/ocr_rdrsouth.cur new file mode 100644 index 0000000..96909c2 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrsouth.cur differ diff --git a/dlls/user32/resources/ocr_rdrsoutheast.cur b/dlls/user32/resources/ocr_rdrsoutheast.cur new file mode 100644 index 0000000..53dbfe3 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrsoutheast.cur differ diff --git a/dlls/user32/resources/ocr_rdrsouthwest.cur b/dlls/user32/resources/ocr_rdrsouthwest.cur new file mode 100644 index 0000000..eb2a204 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrsouthwest.cur differ diff --git a/dlls/user32/resources/ocr_rdrvert.cur b/dlls/user32/resources/ocr_rdrvert.cur new file mode 100644 index 0000000..019cf77 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrvert.cur differ diff --git a/dlls/user32/resources/ocr_rdrwest.cur b/dlls/user32/resources/ocr_rdrwest.cur new file mode 100644 index 0000000..d6bbe89 Binary files /dev/null and b/dlls/user32/resources/ocr_rdrwest.cur differ diff --git a/dlls/user32/user32.rc b/dlls/user32/user32.rc index 28a6c74..01fe13a 100644 --- a/dlls/user32/user32.rc +++ b/dlls/user32/user32.rc @@ -266,6 +266,40 @@ OCR_DRAGOBJECT CURSOR resources/ocr_dragobject.cur /* @makedep: resources/ocr_pen.cur */ OCR_PEN CURSOR resources/ocr_pen.cur +/* @makedep: resources/ocr_rdrvert.cur */ +OCR_RDRVERT CURSOR resources/ocr_rdrvert.cur + +/* @makedep: resources/ocr_rdrhorz.cur */ +/* FIXME: OCR_DRAGOBJECT already uses same resource number even though cursor image + * is entirely different */ +/*OCR_RDRHORZ CURSOR resources/ocr_rdrhorz.cur*/ + +/* @makedep: resources/ocr_rdr2dim.cur */ +OCR_RDR2DIM CURSOR resources/ocr_rdr2dim.cur + +/* @makedep: resources/ocr_rdrnorth.cur */ +OCR_RDRNORTH CURSOR resources/ocr_rdrnorth.cur + +/* @makedep: resources/ocr_rdrsouth.cur */ +OCR_RDRSOUTH CURSOR resources/ocr_rdrsouth.cur + +/* @makedep: resources/ocr_rdrwest.cur */ +OCR_RDRWEST CURSOR resources/ocr_rdrwest.cur + +/* @makedep: resources/ocr_rdreast.cur */ +OCR_RDREAST CURSOR resources/ocr_rdreast.cur + +/* @makedep: resources/ocr_rdrnorthwest.cur */ +OCR_RDRNORTHWEST CURSOR resources/ocr_rdrnorthwest.cur + +/* @makedep: resources/ocr_rdrnortheast.cur */ +OCR_RDRNORTHEAST CURSOR resources/ocr_rdrnortheast.cur + +/* @makedep: resources/ocr_rdrsouthwest.cur */ +OCR_RDRSOUTHWEST CURSOR resources/ocr_rdrsouthwest.cur + +/* @makedep: resources/ocr_rdrsoutheast.cur */ +OCR_RDRSOUTHEAST CURSOR resources/ocr_rdrsoutheast.cur /****************************************************************/ /* Icons */

1 0

Zebediah Figura : storage.dll16: Fix bad type in IStorage16_fnOpenStorage.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: 289d032e766fca240e02e967224f823a4a4c6fb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=289d032e766fca240e02e9672… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 28 15:48:34 2017 -0600 storage.dll16: Fix bad type in IStorage16_fnOpenStorage. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/storage.dll16/storage.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/storage.dll16/storage.c b/dlls/storage.dll16/storage.c index dcaff5c..74aa7f9 100644 --- a/dlls/storage.dll16/storage.c +++ b/dlls/storage.dll16/storage.c @@ -1848,7 +1848,7 @@ HRESULT CDECL IStorage16_fnOpenStorage(IStorage16 *iface, LPCOLESTR16 pwcsName, IStorage16 *pstgPrio, DWORD grfMode, SNB16 snbExclude, DWORD reserved, IStorage16 **ppstg) { IStorage16Impl *This = impl_from_IStorage16(iface); - IStream16Impl* lpstg; + IStorage16Impl *lpstg; WCHAR name[33]; int newpps; @@ -1869,12 +1869,12 @@ HRESULT CDECL IStorage16_fnOpenStorage(IStorage16 *iface, LPCOLESTR16 pwcsName, MultiByteToWideChar( CP_ACP, 0, pwcsName, -1, name, sizeof(name)/sizeof(WCHAR)); newpps = STORAGE_look_for_named_pps(&lpstg->str,This->stde.pps_dir,name); if (newpps==-1) { - IStream16_fnRelease(&lpstg->IStream16_iface); + IStorage16_fnRelease(&lpstg->IStorage16_iface); return E_FAIL; } if (1!=STORAGE_get_pps_entry(&lpstg->str,newpps,&(lpstg->stde))) { - IStream16_fnRelease(&lpstg->IStream16_iface); + IStorage16_fnRelease(&lpstg->IStorage16_iface); return E_FAIL; } lpstg->ppsent = newpps;

1 0

Austin English : ntoskrnl.exe: Add IoCreateFile stub.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: a8222a0437441fc3cb83413c869259b860faf46d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8222a0437441fc3cb83413c8… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 18 17:24:31 2017 -0600 ntoskrnl.exe: Add IoCreateFile stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 6 ++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 7527659..1ab3a4e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3159,3 +3159,15 @@ BOOL WINAPI KeSetTimerEx( KTIMER *timer, LARGE_INTEGER duetime, LONG period, KDP FIXME("stub: %p %s %u %p\n", timer, wine_dbgstr_longlong(duetime.QuadPart), period, dpc); return TRUE; } + +/*********************************************************************** + * IoCreateFile (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoCreateFile(HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, + IO_STATUS_BLOCK *io, LARGE_INTEGER *alloc_size, ULONG attributes, ULONG sharing, + ULONG disposition, ULONG create_options, VOID *ea_buffer, ULONG ea_length, + CREATE_FILE_TYPE file_type, VOID *parameters, ULONG options ) +{ + FIXME(": stub\n"); + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index bc37a76..bd02586 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -339,7 +339,7 @@ @ stdcall IoCreateDevice(ptr long ptr long long long ptr) @ stub IoCreateDisk @ stdcall IoCreateDriver(ptr ptr) -@ stub IoCreateFile +@ stdcall IoCreateFile(ptr long ptr ptr long long long ptr long long ptr long ptr long) @ stub IoCreateFileSpecifyDeviceObjectHint @ stub IoCreateNotificationEvent @ stub IoCreateStreamFileObject diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 95de8d0..4c696f7 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -737,6 +737,12 @@ typedef enum _BUS_QUERY_ID_TYPE { BusQueryDeviceSerialNumber } BUS_QUERY_ID_TYPE, *PBUS_QUERY_ID_TYPE; +typedef enum _CREATE_FILE_TYPE { + CreateFileTypeNone, + CreateFileTypeNamedPipe, + CreateFileTypeMailslot +} CREATE_FILE_TYPE; + typedef enum { DevicePropertyDeviceDescription, DevicePropertyHardwareID,

1 0

Austin English : ntoskrnl.exe: Add stub KeClearEvent.
by Alexandre Julliard 31 Jan '17

31 Jan '17

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

Bruno Jesus : wlanapi: Normalize input and trace parameters.
by Alexandre Julliard 31 Jan '17

31 Jan '17

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

Bruno Jesus : wlanapi/tests: Add test structure.
by Alexandre Julliard 31 Jan '17

31 Jan '17

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/tests: Add tests for WlanOpenHandle.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: 4371e1c53f3d8ed3d9cf8a344d5325c05f4d97d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4371e1c53f3d8ed3d9cf8a344… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Jan 30 04:59:40 2017 -0200 wlanapi/tests: Add tests for WlanOpenHandle. 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 | 72 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/wlanapi/tests/wlanapi.c b/dlls/wlanapi/tests/wlanapi.c index 3e6ac7a..c0bc658 100644 --- a/dlls/wlanapi/tests/wlanapi.c +++ b/dlls/wlanapi/tests/wlanapi.c @@ -24,6 +24,76 @@ #include "wine/test.h" +static void test_WlanOpenHandle(void) +{ + HANDLE bad_handle = (HANDLE) 0xdeadcafe, handle = bad_handle; + DWORD ret, neg_version = 0xdeadbeef, reserved = 0xdead; + BOOL is_xp; + + /* invalid version requested */ + ret = WlanOpenHandle(0, NULL, &neg_version, &handle); + 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"); + } + else + { + ok(neg_version == 1, "Expected 1, got %d\n", neg_version); + ok(handle != bad_handle && handle, "handle changed\n"); + ret = WlanCloseHandle(handle, NULL); + ok(ret == 0, "Expected 0, got %d\n", ret); + } + + /* 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); + ok(ret == 0, "Expected 0, got %d\n", ret); + + ret = WlanOpenHandle(2, NULL, &neg_version, &handle); + ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); + if (!is_xp) /* XP does not support client version 2 */ + ok(neg_version == 2, "Expected 2, got %d\n", neg_version); + else + ok(neg_version == 1, "Expected 1, got %d\n", neg_version); + ok(handle != bad_handle && handle, "bad handle\n"); + ret = WlanCloseHandle(handle, NULL); + ok(ret == 0, "Expected 0, got %d\n", ret); + + ret = WlanCloseHandle(NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "Expected 0, got %d\n", ret); +} +} + START_TEST(wlanapi) { HANDLE handle; @@ -36,4 +106,6 @@ START_TEST(wlanapi) win_skip("No wireless service running\n"); return; } + + test_WlanOpenHandle(); }

1 0

Bruno Jesus : wlanapi: Implement WlanAllocateMemory/ WlanFreeMemory with tests.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: 25a9e2c6e24d4f369b3c31f7e1a0c6d7534438cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=25a9e2c6e24d4f369b3c31f7e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Jan 30 04:59:41 2017 -0200 wlanapi: Implement WlanAllocateMemory/WlanFreeMemory with tests. 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 | 18 ++++++++++++++++++ dlls/wlanapi/wlanapi.spec | 4 ++-- include/wlanapi.h | 2 ++ 4 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index cf6a684..5eeb515 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -46,6 +46,31 @@ DWORD WINAPI WlanOpenHandle(DWORD client_version, void *reserved, DWORD *negotia return ERROR_CALL_NOT_IMPLEMENTED; } +void WINAPI WlanFreeMemory(void *ptr) +{ + TRACE("(%p)\n", ptr); + + HeapFree(GetProcessHeap(), 0, ptr); +} + +void *WINAPI WlanAllocateMemory(DWORD size) +{ + void *ret; + + TRACE("(%d)", size); + + if (!size) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + ret = HeapAlloc(GetProcessHeap(), 0, size); + if (!ret) + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + + return ret; +} BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *reserved) { diff --git a/dlls/wlanapi/tests/wlanapi.c b/dlls/wlanapi/tests/wlanapi.c index c0bc658..a35a7c9 100644 --- a/dlls/wlanapi/tests/wlanapi.c +++ b/dlls/wlanapi/tests/wlanapi.c @@ -94,6 +94,23 @@ todo_wine { } } +static void test_WlanAllocateFreeMemory(void) +{ + void *ptr; + + SetLastError(0xdeadbeef); + ptr = WlanAllocateMemory(0); + ok(ptr == NULL, "Expected NULL, got %p\n", ptr); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", GetLastError()); + + ptr = WlanAllocateMemory(1024); + ok(ptr != NULL, "Expected non-NULL\n"); + + WlanFreeMemory(ptr); + + WlanFreeMemory(NULL); /* return is void, proves that won't crash */ +} + START_TEST(wlanapi) { HANDLE handle; @@ -108,4 +125,5 @@ START_TEST(wlanapi) } test_WlanOpenHandle(); + test_WlanAllocateFreeMemory(); } diff --git a/dlls/wlanapi/wlanapi.spec b/dlls/wlanapi/wlanapi.spec index 59454f4..a11b857 100644 --- a/dlls/wlanapi/wlanapi.spec +++ b/dlls/wlanapi/wlanapi.spec @@ -1,11 +1,11 @@ -@ stub WlanAllocateMemory +@ stdcall WlanAllocateMemory(long) @ stdcall WlanCloseHandle(ptr ptr) @ stub WlanConnect @ stub WlanDeleteProfile @ stub WlanDisconnect @ stdcall WlanEnumInterfaces(long ptr ptr) @ stub WlanExtractPsdIEDataList -@ stub WlanFreeMemory +@ stdcall WlanFreeMemory(ptr) @ stub WlanGetAvailableNetworkList @ stub WlanGetFilterList @ stub WlanGetInterfaceCapability diff --git a/include/wlanapi.h b/include/wlanapi.h index 73b4583..f6ef60d 100644 --- a/include/wlanapi.h +++ b/include/wlanapi.h @@ -48,5 +48,7 @@ typedef struct _WLAN_INTERFACE_INFO_LIST DWORD WINAPI WlanCloseHandle(HANDLE, void *); DWORD WINAPI WlanEnumInterfaces(HANDLE, void *, WLAN_INTERFACE_INFO_LIST **); DWORD WINAPI WlanOpenHandle(DWORD, void *, DWORD *, HANDLE *); +void *WINAPI WlanAllocateMemory(DWORD); +void WINAPI WlanFreeMemory(void *); #endif /* _WLAN_WLANAPI_H */

1 0

Bruno Jesus : wlanapi/tests: Add tests for WlanEnumInterfaces.
by Alexandre Julliard 31 Jan '17

31 Jan '17

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