February 2017 - Wine-commits

Akihiro Sagawa : version: Ignore flag values in Ex functions.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: 8e1335b3a320d0ba9b6d9656eb2f4377124b96f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e1335b3a320d0ba9b6d9656e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Feb 13 23:46:07 2017 +0900 version: Ignore flag values in Ex functions. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/version/version.c | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/dlls/version/version.c b/dlls/version/version.c index 43f5c18..9c6869d 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -628,14 +628,7 @@ DWORD WINAPI GetFileVersionInfoSizeExW( DWORD flags, LPCWSTR filename, LPDWORD h HMODULE hModule; OFSTRUCT ofs; - if (flags) - { - FIXME("stub: %x %s %p\n", flags, wine_dbgstr_w(filename), handle); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; - } - - TRACE("(%s,%p)\n", debugstr_w(filename), handle ); + TRACE("(0x%x,%s,%p)\n", flags, debugstr_w(filename), handle ); if (handle) *handle = 0; @@ -649,6 +642,8 @@ DWORD WINAPI GetFileVersionInfoSizeExW( DWORD flags, LPCWSTR filename, LPDWORD h SetLastError(ERROR_BAD_PATHNAME); return 0; } + if (flags) + FIXME("flags 0x%x ignored\n", flags); if ((lzfd = LZOpenFileW( (LPWSTR)filename, &ofs, OF_READ )) != HFILE_ERROR) { @@ -707,14 +702,14 @@ DWORD WINAPI GetFileVersionInfoSizeExA( DWORD flags, LPCSTR filename, LPDWORD ha UNICODE_STRING filenameW; DWORD retval; - TRACE("(%s,%p)\n", debugstr_a(filename), handle ); + TRACE("(0x%x,%s,%p)\n", flags, debugstr_a(filename), handle ); if(filename) RtlCreateUnicodeStringFromAsciiz(&filenameW, filename); else filenameW.Buffer = NULL; - retval = GetFileVersionInfoSizeExW(0, filenameW.Buffer, handle); + retval = GetFileVersionInfoSizeExW(flags, filenameW.Buffer, handle); RtlFreeUnicodeString(&filenameW); @@ -733,21 +728,16 @@ BOOL WINAPI GetFileVersionInfoExW( DWORD flags, LPCWSTR filename, DWORD handle, HMODULE hModule; VS_VERSION_INFO_STRUCT32* vvis = data; - if (flags) - { - FIXME("stub: %x %s %u %u %p\n", flags, wine_dbgstr_w(filename), handle, datasize, data); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; - } - - TRACE("(%s,%d,size=%d,data=%p)\n", - debugstr_w(filename), handle, datasize, data ); + TRACE("(0x%x,%s,%d,size=%d,data=%p)\n", + flags, debugstr_w(filename), handle, datasize, data ); if (!data) { SetLastError(ERROR_INVALID_DATA); return FALSE; } + if (flags) + FIXME("flags 0x%x ignored\n", flags); if ((lzfd = LZOpenFileW( (LPWSTR)filename, &ofs, OF_READ )) != HFILE_ERROR) { @@ -810,8 +800,8 @@ BOOL WINAPI GetFileVersionInfoExA( DWORD flags, LPCSTR filename, DWORD handle, D UNICODE_STRING filenameW; BOOL retval; - TRACE("(%s,%d,size=%d,data=%p)\n", - debugstr_a(filename), handle, datasize, data ); + TRACE("(0x%x,%s,%d,size=%d,data=%p)\n", + flags, debugstr_a(filename), handle, datasize, data ); if(filename) RtlCreateUnicodeStringFromAsciiz(&filenameW, filename);

1 0

Akihiro Sagawa : version/tests: Add tests for GetFileVersionInfoEx.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: e804e9a5bc9fde9ad8b84dfd121d44afbe177752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e804e9a5bc9fde9ad8b84dfd1… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Feb 13 23:46:08 2017 +0900 version/tests: Add tests for GetFileVersionInfoEx. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/version/tests/info.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index 107cfac..d3420bc 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -1,5 +1,6 @@ /* * Copyright (C) 2004 Stefan Leichter + * Copyright (C) 2017 Akihiro Sagawa * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,7 +24,9 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" +#include "winnls.h" #include "winver.h" +#include "verrsrc.h" #include "wine/test.h" #define MY_LAST_ERROR ((DWORD)-1) @@ -624,6 +627,103 @@ static void test_extra_block(void) HeapFree(GetProcessHeap(), 0, ver); } +static void test_GetFileVersionInfoEx(void) +{ + char *ver, *p; + BOOL ret; + UINT size, translation, i; + HMODULE mod; + BOOL (WINAPI *pGetFileVersionInfoExW)(DWORD, LPCWSTR, DWORD, DWORD, LPVOID); + DWORD (WINAPI *pGetFileVersionInfoSizeExW)(DWORD, LPCWSTR, LPDWORD); + const LANGID lang = GetUserDefaultUILanguage(); + const LANGID english = MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT); + const WORD unicode = 1200; /* = UNICODE */ + const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; + const DWORD test_flags[] = { + 0, FILE_VER_GET_LOCALISED, FILE_VER_GET_NEUTRAL, + FILE_VER_GET_LOCALISED | FILE_VER_GET_NEUTRAL, + 0xdeadbeef, /* invalid value (ignored) */ + }; + char desc[MAX_PATH]; + + size = GetFileVersionInfoSizeW(kernel32W, NULL); + ok(size, "GetFileVersionInfoSize(kernel32) error %u\n", GetLastError()); + + ver = HeapAlloc(GetProcessHeap(), 0, size); + assert(ver); + + ret = GetFileVersionInfoW(kernel32W, 0, size, ver); + ok(ret, "GetFileVersionInfo error %u\n", GetLastError()); + + ret = VerQueryValueA(ver, "\\VarFileInfo\\Translation", (void **)&p, &size); + translation = *(UINT *)p; + ok(ret, "VerQueryValue error %u\n", GetLastError()); + ok(size == 4, "VerQueryValue returned %u, expected 4\n", size); + + /* test default version resource */ + todo_wine_if(lang != english) + ok(LOWORD(translation) == lang, "got %u, expected lang is %u\n", + LOWORD(translation), lang); + todo_wine + ok(HIWORD(translation) == unicode, "got %u, expected codepage is %u\n", + HIWORD(translation), unicode); + + HeapFree(GetProcessHeap(), 0, ver); + + mod = GetModuleHandleA("version.dll"); + assert(mod); + + /* prefer W-version as A-version is not available on Windows 7 */ + pGetFileVersionInfoExW = (void *)GetProcAddress(mod, "GetFileVersionInfoExW"); + pGetFileVersionInfoSizeExW = (void *)GetProcAddress(mod, "GetFileVersionInfoSizeExW"); + if (!pGetFileVersionInfoExW && !pGetFileVersionInfoSizeExW) + { + win_skip("GetFileVersionInfoEx family is not available\n"); + return; + } + + for (i = 0; i < sizeof(test_flags)/sizeof(test_flags[0]); i++) + { + size = pGetFileVersionInfoSizeExW(test_flags[i], kernel32W, NULL); + ok(size, "[%u] GetFileVersionInfoSizeEx(kernel32) error %u\n", i, GetLastError()); + + ver = HeapAlloc(GetProcessHeap(), 0, size); + assert(ver); + + ret = pGetFileVersionInfoExW(test_flags[i], kernel32W, 0, size, ver); + ok(ret, "[%u] GetFileVersionInfoEx error %u\n", i, GetLastError()); + + ret = VerQueryValueA(ver, "\\VarFileInfo\\Translation", (void **)&p, &size); + ok(ret, "[%u] VerQueryValue error %u\n", i, GetLastError()); + ok(size == 4, "[%u] VerQueryValue returned %u, expected 4\n", i, size); + translation = *(UINT *)p; + + /* test MUI version resource */ + todo_wine_if((test_flags[i] & FILE_VER_GET_LOCALISED) && lang != english) + if (test_flags[i] & FILE_VER_GET_LOCALISED) + ok(LOWORD(translation) == lang, "[%u] got %u, expected lang is %u\n", + i, LOWORD(translation), lang); + else + ok(LOWORD(translation) == english, "[%u] got %u, expected lang is %u\n", + i, LOWORD(translation), english); + todo_wine + ok(HIWORD(translation) == unicode, "[%u] got %u, expected codepage is %u\n", + i, HIWORD(translation), unicode); + + /* test string info using translation info */ + size = 0; + sprintf(desc, "\\StringFileInfo\\%04x%04x\\FileDescription", + LOWORD(translation), HIWORD(translation)); + ret = VerQueryValueA(ver, desc, (void **)&p, &size); + ok(ret, "[%u] VerQueryValue error %u\n", i, GetLastError()); + ok(size == strlen(p) + 1, "[%u] VerQueryValue returned %u\n", i, size); + + HeapFree(GetProcessHeap(), 0, ver); + } + + return; +} + START_TEST(info) { test_info_size(); @@ -631,4 +731,5 @@ START_TEST(info) test_32bit_win(); test_VerQueryValueA(); test_extra_block(); + test_GetFileVersionInfoEx(); }

1 0

Józef Kucia : d3d10core/tests: Mark sRGB RTV clear test as broken on Nvidia drivers.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: 0dd6771b623f0cb9929f1aad1747097065ab1c08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dd6771b623f0cb9929f1aad1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 13 13:07:37 2017 +0100 d3d10core/tests: Mark sRGB RTV clear test as broken on Nvidia drivers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 20a383c..4e19727 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -844,6 +844,17 @@ static BOOL is_amd_device(ID3D10Device *device) return adapter_desc.VendorId == 0x1002; } +static BOOL is_nvidia_device(ID3D10Device *device) +{ + DXGI_ADAPTER_DESC adapter_desc; + + if (!strcmp(winetest_platform, "wine")) + return FALSE; + + get_device_adapter_desc(device, &adapter_desc); + return adapter_desc.VendorId == 0x10de; +} + static BOOL is_d3d11_interface_available(ID3D10Device *device) { ID3D11Device *d3d11_device; @@ -8130,7 +8141,9 @@ static void test_clear_render_target_view(void) ID3D10RenderTargetView *rtv, *srgb_rtv; D3D10_RENDER_TARGET_VIEW_DESC rtv_desc; D3D10_TEXTURE2D_DESC texture_desc; + struct resource_readback rb; ID3D10Device *device; + unsigned int i, j; HRESULT hr; if (!init_test_context(&test_context)) @@ -8203,15 +8216,20 @@ static void test_clear_render_target_view(void) ID3D10Device_ClearRenderTargetView(device, rtv, color); check_texture_color(texture, expected_color, 1); - if (!is_warp_device(device)) - { - ID3D10Device_ClearRenderTargetView(device, srgb_rtv, color); - todo_wine check_texture_color(texture, expected_srgb_color, 1); - } - else + ID3D10Device_ClearRenderTargetView(device, srgb_rtv, color); + get_texture_readback(texture, 0, &rb); + for (i = 0; i < 4; ++i) { - win_skip("sRGB clears are broken on WARP.\n"); + for (j = 0; j < 4; ++j) + { + BOOL broken_device = is_warp_device(device) || is_nvidia_device(device); + DWORD color = get_readback_color(&rb, 80 + i * 160, 60 + j * 120); + todo_wine ok(compare_color(color, expected_srgb_color, 1) + || broken(compare_color(color, expected_color, 1) && broken_device), + "Got unexpected color 0x%08x.\n", color); + } } + release_resource_readback(&rb); ID3D10RenderTargetView_Release(srgb_rtv); ID3D10RenderTargetView_Release(rtv);

1 0

Bruno Jesus : wlanapi: Add a stub for WlanScan.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: 390881b9d6290ed037a8956c344ef125c13ac046 URL: http://source.winehq.org/git/wine.git/?a=commit;h=390881b9d6290ed037a8956c3… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Feb 13 00:55:03 2017 -0200 wlanapi: Add a stub for WlanScan. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/main.c | 9 +++++++++ dlls/wlanapi/wlanapi.spec | 2 +- include/wlanapi.h | 14 ++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index 6955245..56c5377 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -128,6 +128,15 @@ DWORD WINAPI WlanOpenHandle(DWORD client_version, void *reserved, DWORD *negotia return ERROR_SUCCESS; } +DWORD WINAPI WlanScan(HANDLE handle, const GUID *guid, const DOT11_SSID *ssid, + const WLAN_RAW_DATA *raw, void *reserved) +{ + FIXME("(%p, %s, %p, %p, %p) stub\n", + handle, wine_dbgstr_guid(guid), ssid, raw, reserved); + + return ERROR_CALL_NOT_IMPLEMENTED; +} + void WINAPI WlanFreeMemory(void *ptr) { TRACE("(%p)\n", ptr); diff --git a/dlls/wlanapi/wlanapi.spec b/dlls/wlanapi/wlanapi.spec index a11b857..aa3dabf 100644 --- a/dlls/wlanapi/wlanapi.spec +++ b/dlls/wlanapi/wlanapi.spec @@ -22,7 +22,7 @@ @ stub WlanRegisterNotification @ stub WlanRenameProfile @ stub WlanSaveTemporaryProfile -@ stub WlanScan +@ stdcall WlanScan(ptr ptr ptr ptr ptr) @ stub WlanSetAutoConfigParameter @ stub WlanSetFilterList @ stub WlanSetInterface diff --git a/include/wlanapi.h b/include/wlanapi.h index f6ef60d..f1e302c 100644 --- a/include/wlanapi.h +++ b/include/wlanapi.h @@ -45,10 +45,24 @@ typedef struct _WLAN_INTERFACE_INFO_LIST WLAN_INTERFACE_INFO InterfaceInfo[1]; } WLAN_INTERFACE_INFO_LIST, *PWLAN_INTERFACE_INFO_LIST; +#define DOT11_SSID_MAX_LENGTH 32 +typedef struct _DOT11_SSID +{ + DWORD uSSIDLength; + UCHAR ucSSID[DOT11_SSID_MAX_LENGTH]; +} DOT11_SSID; + +typedef struct _WLAN_RAW_DATA +{ + DWORD dwDataSize; + BYTE DataBlob[1]; +} WLAN_RAW_DATA, *PWLAN_RAW_DATA; + 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 *); +DWORD WINAPI WlanScan(HANDLE, const GUID *, const DOT11_SSID *, const WLAN_RAW_DATA *, void *); #endif /* _WLAN_WLANAPI_H */

1 0

Bruno Jesus : wlanapi: Add a stub for WlanRegisterNotification.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: 55649dfa4a1b733df90dc78f9817e9b1701d59b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55649dfa4a1b733df90dc78f9… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Feb 13 00:55:04 2017 -0200 wlanapi: Add a stub for WlanRegisterNotification. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/main.c | 10 ++++++++++ dlls/wlanapi/wlanapi.spec | 2 +- include/wlanapi.h | 12 ++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index 56c5377..bb139a0 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -137,6 +137,16 @@ DWORD WINAPI WlanScan(HANDLE handle, const GUID *guid, const DOT11_SSID *ssid, return ERROR_CALL_NOT_IMPLEMENTED; } +DWORD WINAPI WlanRegisterNotification(HANDLE handle, DWORD notify_source, BOOL ignore_dup, + WLAN_NOTIFICATION_CALLBACK callback, void *context, + void *reserved, DWORD *notify_prev) +{ + FIXME("(%p, %d, %d, %p, %p, %p, %p) stub\n", + handle, notify_source, ignore_dup, callback, context, reserved, notify_prev); + + return ERROR_CALL_NOT_IMPLEMENTED; +} + void WINAPI WlanFreeMemory(void *ptr) { TRACE("(%p)\n", ptr); diff --git a/dlls/wlanapi/wlanapi.spec b/dlls/wlanapi/wlanapi.spec index aa3dabf..a630e0a 100644 --- a/dlls/wlanapi/wlanapi.spec +++ b/dlls/wlanapi/wlanapi.spec @@ -19,7 +19,7 @@ @ stub WlanQueryAutoConfigParameter @ stub WlanQueryInterface @ stub WlanReasonCodeToString -@ stub WlanRegisterNotification +@ stdcall WlanRegisterNotification(ptr long long ptr ptr ptr ptr) @ stub WlanRenameProfile @ stub WlanSaveTemporaryProfile @ stdcall WlanScan(ptr ptr ptr ptr ptr) diff --git a/include/wlanapi.h b/include/wlanapi.h index f1e302c..f3d3ea6 100644 --- a/include/wlanapi.h +++ b/include/wlanapi.h @@ -58,11 +58,23 @@ typedef struct _WLAN_RAW_DATA BYTE DataBlob[1]; } WLAN_RAW_DATA, *PWLAN_RAW_DATA; +typedef struct _WLAN_NOTIFICATION_DATA +{ + DWORD NotificationSource; + DWORD NotificationCode; + GUID InterfaceGuid; + DWORD dwDataSize; + PVOID pData; +} WLAN_NOTIFICATION_DATA, *PWLAN_NOTIFICATION_DATA; + +typedef void (WINAPI *WLAN_NOTIFICATION_CALLBACK)(WLAN_NOTIFICATION_DATA *, void *); + 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 *); DWORD WINAPI WlanScan(HANDLE, const GUID *, const DOT11_SSID *, const WLAN_RAW_DATA *, void *); +DWORD WINAPI WlanRegisterNotification(HANDLE, DWORD, BOOL, WLAN_NOTIFICATION_CALLBACK, void *, void *, DWORD *); #endif /* _WLAN_WLANAPI_H */

1 0

Bruno Jesus : wlanapi: Add a stub for WlanGetAvailableNetworkList.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: ebbaa1139afac3124d9f8329b8549596866610bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebbaa1139afac3124d9f8329b… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Feb 13 00:55:05 2017 -0200 wlanapi: Add a stub for WlanGetAvailableNetworkList. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/main.c | 9 ++++++ dlls/wlanapi/wlanapi.spec | 2 +- include/wlanapi.h | 81 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 1 deletion(-) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index bb139a0..bc9c9b1 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -147,6 +147,15 @@ DWORD WINAPI WlanRegisterNotification(HANDLE handle, DWORD notify_source, BOOL i return ERROR_CALL_NOT_IMPLEMENTED; } +DWORD WINAPI WlanGetAvailableNetworkList(HANDLE handle, const GUID *guid, DWORD flags, + void *reserved, WLAN_AVAILABLE_NETWORK_LIST **network_list) +{ + FIXME("(%p, %s, 0x%x, %p, %p) stub\n", + handle, wine_dbgstr_guid(guid), flags, reserved, network_list); + + return ERROR_CALL_NOT_IMPLEMENTED; +} + void WINAPI WlanFreeMemory(void *ptr) { TRACE("(%p)\n", ptr); diff --git a/dlls/wlanapi/wlanapi.spec b/dlls/wlanapi/wlanapi.spec index a630e0a..dc1b907 100644 --- a/dlls/wlanapi/wlanapi.spec +++ b/dlls/wlanapi/wlanapi.spec @@ -6,7 +6,7 @@ @ stdcall WlanEnumInterfaces(long ptr ptr) @ stub WlanExtractPsdIEDataList @ stdcall WlanFreeMemory(ptr) -@ stub WlanGetAvailableNetworkList +@ stdcall WlanGetAvailableNetworkList(ptr ptr long ptr ptr) @ stub WlanGetFilterList @ stub WlanGetInterfaceCapability @ stub WlanGetNetworkBssList diff --git a/include/wlanapi.h b/include/wlanapi.h index f3d3ea6..1cd8c93 100644 --- a/include/wlanapi.h +++ b/include/wlanapi.h @@ -69,6 +69,86 @@ typedef struct _WLAN_NOTIFICATION_DATA typedef void (WINAPI *WLAN_NOTIFICATION_CALLBACK)(WLAN_NOTIFICATION_DATA *, void *); +typedef enum _DOT11_BSS_TYPE +{ + dot11_BSS_type_infrastructure = 0x01, + dot11_BSS_type_independent = 0x02, + dot11_BSS_type_any = 0x03 +} DOT11_BSS_TYPE, *PDOT11_BSS_TYPE; + +typedef DWORD WLAN_REASON_CODE, *PWLAN_REASON_CODE, WLAN_SIGNAL_QUALITY; + +typedef enum _DOT11_AUTH_ALGORITHM +{ + DOT11_AUTH_ALGO_80211_OPEN = 0x01, + DOT11_AUTH_ALGO_80211_SHARED_KEY = 0x02, + DOT11_AUTH_ALGO_WPA = 0x03, + DOT11_AUTH_ALGO_WPA_PSK = 0x04, + DOT11_AUTH_ALGO_WPA_NONE = 0x05, + DOT11_AUTH_ALGO_RSNA = 0x06, + DOT11_AUTH_ALGO_RSNA_PSK = 0x07, + DOT11_AUTH_ALGO_IHV_START = 0x80000000, + DOT11_AUTH_ALGO_IHV_END = 0xFFFFFFFF +} DOT11_AUTH_ALGORITHM, *PDOT11_AUTH_ALGORITHM; + +typedef enum _DOT11_CIPHER_ALGORITHM +{ + DOT11_CIPHER_ALGO_NONE = 0x00, + DOT11_CIPHER_ALGO_WEP40 = 0x01, + DOT11_CIPHER_ALGO_TKIP = 0x02, + DOT11_CIPHER_ALGO_CCMP = 0x04, + DOT11_CIPHER_ALGO_WEP104 = 0x05, + DOT11_CIPHER_ALGO_WPA_USE_GROUP = 0x100, + DOT11_CIPHER_ALGO_RSN_USE_GROUP = 0x100, + DOT11_CIPHER_ALGO_WEP = 0x101, + DOT11_CIPHER_ALGO_IHV_START = 0x80000000, + DOT11_CIPHER_ALGO_IHV_END = 0xFFFFFFFF +} DOT11_CIPHER_ALGORITHM, *PDOT11_CIPHER_ALGORITHM; + +typedef enum _DOT11_PHY_TYPE +{ + dot11_phy_type_unknown = 0x00, + dot11_phy_type_any = 0x00, + dot11_phy_type_fhss = 0x01, + dot11_phy_type_dsss = 0x02, + dot11_phy_type_irbaseband = 0x03, + dot11_phy_type_ofdm = 0x04, + dot11_phy_type_hrdsss = 0x05, + dot11_phy_type_erp = 0x06, + dot11_phy_type_ht = 0x07, + dot11_phy_type_vht = 0x08, + dot11_phy_type_IHV_start = 0x80000000, + dot11_phy_type_IHV_end = 0xFFFFFFFF +} DOT11_PHY_TYPE, *PDOT11_PHY_TYPE; + +#define WLAN_MAX_PHY_TYPE_NUMBER 8 + +typedef struct _WLAN_AVAILABLE_NETWORK +{ + WCHAR strProfileName[256]; + DOT11_SSID dot11Ssid; + DOT11_BSS_TYPE dot11BssType; + ULONG uNumberOfBssids; + BOOL bNetworkConnectable; + WLAN_REASON_CODE wlanNotConnectableReason; + ULONG uNumberOfPhyTypes; + DOT11_PHY_TYPE dot11PhyTypes[WLAN_MAX_PHY_TYPE_NUMBER]; + BOOL bMorePhyTypes; + WLAN_SIGNAL_QUALITY wlanSignalQuality; + BOOL bSecurityEnabled; + DOT11_AUTH_ALGORITHM dot11DefaultAuthAlgorithm; + DOT11_CIPHER_ALGORITHM dot11DefaultCipherAlgorithm; + DWORD dwFlags; + DWORD dwReserved; +} WLAN_AVAILABLE_NETWORK, *PWLAN_AVAILABLE_NETWORK; + +typedef struct _WLAN_AVAILABLE_NETWORK_LIST +{ + DWORD dwNumberOfItems; + DWORD dwIndex; + WLAN_AVAILABLE_NETWORK Network[1]; +} WLAN_AVAILABLE_NETWORK_LIST, *PWLAN_AVAILABLE_NETWORK_LIST; + DWORD WINAPI WlanCloseHandle(HANDLE, void *); DWORD WINAPI WlanEnumInterfaces(HANDLE, void *, WLAN_INTERFACE_INFO_LIST **); DWORD WINAPI WlanOpenHandle(DWORD, void *, DWORD *, HANDLE *); @@ -76,5 +156,6 @@ void *WINAPI WlanAllocateMemory(DWORD); void WINAPI WlanFreeMemory(void *); DWORD WINAPI WlanScan(HANDLE, const GUID *, const DOT11_SSID *, const WLAN_RAW_DATA *, void *); DWORD WINAPI WlanRegisterNotification(HANDLE, DWORD, BOOL, WLAN_NOTIFICATION_CALLBACK, void *, void *, DWORD *); +DWORD WINAPI WlanGetAvailableNetworkList(HANDLE, const GUID *, DWORD, void *, WLAN_AVAILABLE_NETWORK_LIST **); #endif /* _WLAN_WLANAPI_H */

1 0

Bruno Jesus : wlanapi: Add some usage information.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: 0cbcb71be991777c4d76bbac126ec7bb83cb019e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cbcb71be991777c4d76bbac1… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Feb 13 00:55:06 2017 -0200 wlanapi: Add some usage information. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/main.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index bc9c9b1..b764681 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -16,6 +16,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* How does this DLL work? + * This DLL is used to probe and configure wireless access points using the + * available wireless interfaces. Most functions are tied to a handle that is + * first obtained by calling WlanOpenHandle. Usually it is followed by a call + * to WlanEnumInterfaces and then for each interface a WlanScan call is made. + * WlanScan starts a parallel access point discovery that delivers the ready + * response through the callback registered by WlanRegisterNotification. After + * that the program calls WlanGetAvailableNetworkList or WlanGetNetworkBssList. + */ + #include "config.h" #include <stdarg.h>

1 0

Sebastian Lackner : dinput: Allocate correct amount of memory in IDirectInput8AImpl_EnumDevicesBySemantics.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: f9b4be55561b52cbe7a89a9f6ce32c4db49d1ce5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9b4be55561b52cbe7a89a9f6… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 10 16:56:14 2017 +0100 dinput: Allocate correct amount of memory in IDirectInput8AImpl_EnumDevicesBySemantics. Fixes 04bddb6c93dc3554fceff9612c56b62a43443b48. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 65ce52c..ab6a2e8 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -965,9 +965,9 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( if (enumSuccess == S_OK) { if (device_count++) - didevis = HeapReAlloc(GetProcessHeap(), 0, didevis, sizeof(DIDEVICEINSTANCEW)*device_count); + didevis = HeapReAlloc(GetProcessHeap(), 0, didevis, sizeof(DIDEVICEINSTANCEA)*device_count); else - didevis = HeapAlloc(GetProcessHeap(), 0, sizeof(DIDEVICEINSTANCEW)*device_count); + didevis = HeapAlloc(GetProcessHeap(), 0, sizeof(DIDEVICEINSTANCEA)*device_count); didevis[device_count-1] = didevi; } }

1 0

Wei Xie : qcap: Add O_CLOEXEC flag to prevent child process from inheriting handles.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: dfd22fb294c6ce9c3daba311f96ca3b4933d265c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfd22fb294c6ce9c3daba311f… Author: Wei Xie <xiewei(a)linuxdeepin.com> Date: Thu Feb 9 15:05:21 2017 +0800 qcap: Add O_CLOEXEC flag to prevent child process from inheriting handles. Signed-off-by: Wei Xie <xiewei(a)linuxdeepin.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index bc760bd..d67df73 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -799,7 +799,7 @@ Capture * qcap_driver_init( IPin *pOut, USHORT card ) sprintf(device, "/dev/video%i", card); TRACE("opening %s\n", device); - capBox->fd = video_open(device, O_RDWR | O_NONBLOCK); + capBox->fd = video_open(device, O_RDWR | O_NONBLOCK | O_CLOEXEC); if (capBox->fd == -1) { WARN("open failed (%d)\n", errno);

1 0

Fabian Maurer : user32/tests: Add tests for windows when first shown with WS_VISIBLE or RedrawWindow.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: 46b344fc2f8cbf57ceedfcfd074a972527450562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46b344fc2f8cbf57ceedfcfd0… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Feb 13 16:58:25 2017 +0100 user32/tests: Add tests for windows when first shown with WS_VISIBLE or RedrawWindow. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 2d2f689..2fe7d91 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -927,6 +927,79 @@ static const struct message WmShowVisiblePopupSeq_3[] = { { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE, 0, SWP_SHOWWINDOW }, { 0 } }; +/* CreateWindow (for a popup window with WS_VISIBLE style set) + */ +static const struct message WmShowPopupFirstDrawSeq_1[] = { + { HCBT_CREATEWND, hook }, + { WM_NCCREATE, sent }, + { WM_NCCALCSIZE, sent|wparam, 0 }, + { WM_CREATE, sent }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_SIZE, sent|wparam, SIZE_RESTORED }, + { WM_MOVE, sent }, + { WM_SHOWWINDOW, sent|wparam, 1 }, + { WM_WINDOWPOSCHANGING, sent }, + { HCBT_ACTIVATE, hook }, + { WM_WINDOWPOSCHANGING, sent|optional }, + { WM_QUERYNEWPALETTE, sent|optional }, + { WM_ACTIVATEAPP, sent }, + { WM_NCACTIVATE, sent }, + { WM_ACTIVATE, sent }, + { WM_IME_SETCONTEXT, sent|parent|wparam|optional, 0 }, + { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, + { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { HCBT_SETFOCUS, hook }, + { WM_SETFOCUS, sent|defwinproc }, + { WM_NCPAINT, sent|wparam, 1 }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent }, + { WM_PAINT, sent }, + /* ocasionally received on test machines */ + { WM_NCPAINT, sent|beginpaint|optional }, + { WM_ERASEBKGND, sent|beginpaint|optional }, + { 0 } +}; +/* CreateWindow (for a popup window that is shown with ShowWindow(SW_SHOWMAXIMIZED)) + */ +static const struct message WmShowPopupFirstDrawSeq_2[] = { + { HCBT_CREATEWND, hook }, + { WM_NCCREATE, sent }, + { WM_NCCALCSIZE, sent|wparam, 0 }, + { WM_CREATE, sent }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_SIZE, sent|wparam, SIZE_RESTORED }, + { WM_MOVE, sent }, + { HCBT_MINMAX, hook|lparam, 0, SW_MAXIMIZE }, + { WM_GETMINMAXINFO, sent }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_STATECHANGED|SWP_SHOWWINDOW|SWP_FRAMECHANGED }, + { WM_NCCALCSIZE, sent|wparam, TRUE }, + { HCBT_ACTIVATE, hook }, + { WM_WINDOWPOSCHANGING, sent|optional }, + { WM_NCPAINT, sent|optional|wparam, 1 }, + { WM_ERASEBKGND, sent|optional }, + { WM_WINDOWPOSCHANGED, sent|optional }, + { WM_QUERYNEWPALETTE, sent|optional }, + { WM_ACTIVATEAPP, sent }, + { WM_NCACTIVATE, sent }, + { WM_ACTIVATE, sent }, + { WM_IME_SETCONTEXT, sent|parent|wparam|optional, 0 }, + { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, + { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { HCBT_SETFOCUS, hook }, + { WM_SETFOCUS, sent|defwinproc }, + { WM_NCPAINT, sent|wparam, 1 }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|optional }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc, 0 }, + { WM_PAINT, sent}, + /* ocasionally received on test machines */ + { WM_NCPAINT, sent|beginpaint|optional }, + { WM_ERASEBKGND, sent|beginpaint|optional }, + { 0 } +}; /* CreateWindow (for child window, not initially visible) */ static const struct message WmCreateChildSeq[] = { { HCBT_CREATEWND, hook }, @@ -4830,6 +4903,42 @@ static void test_messages(void) DestroyWindow(hwnd); ok_sequence(WmDestroyOverlappedSeq, "DestroyWindow:overlapped", FALSE); + /* Test if windows are correctly drawn when first shown */ + + /* Visible, redraw */ + flush_events(); + flush_sequence(); + hwnd = CreateWindowExA(0, "TestWindowClass", "Test Popup", WS_POPUP | WS_VISIBLE, + 10, 10, 100, 100, NULL, 0, 0, NULL ); + ok (hwnd != 0, "Failed to create popup window\n"); + RedrawWindow(hwnd, NULL, NULL, RDW_UPDATENOW); + ok_sequence(WmShowPopupFirstDrawSeq_1, "RedrawWindow:show_popup_first_draw_visible", TRUE); + DestroyWindow(hwnd); + + /* Invisible, show, message */ + flush_events(); + flush_sequence(); + hwnd = CreateWindowExA(0, "TestWindowClass", "Test Popup", WS_POPUP, + 10, 10, 100, 100, NULL, 0, 0, NULL ); + ok (hwnd != 0, "Failed to create popup window\n"); + ShowWindow(hwnd, SW_SHOW); + SendMessageW(hwnd, WM_PAINT, 0, 0); + ok_sequence(WmShowPopupFirstDrawSeq_1, "RedrawWindow:show_popup_first_draw_show", TRUE); + DestroyWindow(hwnd); + + /* Invisible, show maximized, redraw */ + flush_events(); + flush_sequence(); + hwnd = CreateWindowExA(0, "TestWindowClass", "Test Popup", WS_POPUP, + 10, 10, 100, 100, NULL, 0, 0, NULL ); + ok (hwnd != 0, "Failed to create popup window\n"); + ShowWindow(hwnd, SW_SHOWMAXIMIZED); + RedrawWindow(hwnd, NULL, NULL, RDW_UPDATENOW); + ok_sequence(WmShowPopupFirstDrawSeq_2, "RedrawWindow:show_popup_first_draw_show_maximized", TRUE); + DestroyWindow(hwnd); + + /* Test child windows */ + hparent = CreateWindowExA(0, "TestParentClass", "Test parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 200, 200, 0, 0, 0, NULL); ok (hparent != 0, "Failed to create parent window\n");

1 0