February 2017 - Wine-Commits

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

Feb. 13, 2017

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 Feb. 13, 2017

Feb. 13, 2017

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

Francois Gouget : winetest: Allow sending the report to another server.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: a83c650362d81fdd25d3cba0d10fa8f76ea6552d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a83c650362d81fdd25d3cba0d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 10 16:42:48 2017 +0100 winetest: Allow sending the report to another server. This makes it possible to send the reports to both the official server and a test server. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 22 +++++++++++----- programs/winetest/send.c | 62 ++++++++++++++++++++++++++++++++++++++------ programs/winetest/winetest.h | 2 +- 3 files changed, 71 insertions(+), 15 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 4d1fa28..9c32573 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -1227,6 +1227,7 @@ usage (void) " -q quiet mode, no output at all\n" " -o FILE put report into FILE, do not submit\n" " -s FILE submit FILE, do not run tests\n" +" -S URL URL to submit the results to\n" " -t TAG include TAG of characters [-.0-9a-zA-Z] in the report\n" " -u URL include TestBot URL in the report\n" " -x DIR Extract tests to DIR (default: .\\wct) and exit\n"); @@ -1237,7 +1238,7 @@ int main( int argc, char *argv[] ) BOOL (WINAPI *pIsWow64Process)(HANDLE hProcess, PBOOL Wow64Process); char *logname = NULL, *outdir = NULL; const char *extract = NULL; - const char *cp, *submit = NULL; + const char *cp, *submit = NULL, *submiturl = NULL; int reset_env = 1; int poweroff = 0; int interactive = 1; @@ -1308,9 +1309,13 @@ int main( int argc, char *argv[] ) usage(); exit( 2 ); } - if (tag) - report (R_WARNING, "ignoring tag for submission"); - send_file (submit); + break; + case 'S': + if (!(submiturl = argv[++i])) + { + usage(); + exit( 2 ); + } break; case 'o': if (!(logname = argv[++i])) @@ -1358,7 +1363,12 @@ int main( int argc, char *argv[] ) exit (2); } } - if (!submit && !extract) { + if (submit) { + if (tag) + report (R_WARNING, "ignoring tag for submission"); + send_file (submiturl, submit); + + } else if (!extract) { int is_win9x = (GetVersion() & 0x80000000) != 0; report (R_STATUS, "Starting up"); @@ -1424,7 +1434,7 @@ int main( int argc, char *argv[] ) if (build_id[0] && nr_of_skips <= SKIP_LIMIT && failures <= FAILURES_LIMIT && !nr_native_dlls && !is_win9x && report (R_ASK, MB_YESNO, "Do you want to submit the test results?") == IDYES) - if (!send_file (logname) && !DeleteFileA(logname)) + if (!send_file (submiturl, logname) && !DeleteFileA(logname)) report (R_WARNING, "Can't remove logfile: %u", GetLastError()); } else run_tests (logname, outdir); report (R_STATUS, "Finished - %u failures", failures); diff --git a/programs/winetest/send.c b/programs/winetest/send.c index a419b16..1b0b94a 100644 --- a/programs/winetest/send.c +++ b/programs/winetest/send.c @@ -121,7 +121,7 @@ send_str (SOCKET s, ...) } static int -send_file_direct (const char *name) +send_file_direct (const char * url, const char *name) { SOCKET s; HANDLE file; @@ -139,6 +139,11 @@ send_file_direct (const char *name) CONTENT_HEADERS "\r\n"; + if (url) { + report (R_WARNING, "Can't submit to an alternative URL"); + return 0; + } + s = open_http (SERVER_NAME); if (s == INVALID_SOCKET) return 1; @@ -243,7 +248,7 @@ send_file_direct (const char *name) } static int -send_file_wininet (const char *name) +send_file_wininet (const char *url, const char *name) { int ret = 0; HMODULE wininet_mod = NULL; @@ -264,6 +269,7 @@ send_file_wininet (const char *name) HINTERNET request = NULL; INTERNET_BUFFERSA buffers_in = { 0 }; char buffer[BUFLEN+1]; + URL_COMPONENTSA uc = { 0 }; static const char extra_headers[] = CONTENT_HEADERS; @@ -283,6 +289,38 @@ send_file_wininet (const char *name) pInternetWriteFile == NULL || pInternetReadFile == NULL || pInternetCloseHandle == NULL) { goto done; } + if (url) { + BOOL (WINAPI *pInternetCrackUrlA)(const char *url, DWORD url_length, DWORD flags, URL_COMPONENTSA *ret_comp); + pInternetCrackUrlA = (void *)GetProcAddress(wininet_mod, "InternetCrackUrlA"); + if (pInternetCrackUrlA == NULL) + goto done; + uc.dwStructSize = sizeof(uc); + uc.dwSchemeLength = uc.dwHostNameLength = uc.dwUserNameLength = + uc.dwPasswordLength = uc.dwUrlPathLength = uc.dwExtraInfoLength = + strlen(url) + 1; + uc.lpszScheme = heap_alloc (uc.dwSchemeLength); + uc.lpszHostName = heap_alloc (uc.dwHostNameLength); + uc.lpszUserName = heap_alloc (uc.dwUserNameLength); + uc.lpszPassword = heap_alloc (uc.dwPasswordLength); + uc.lpszUrlPath = heap_alloc (uc.dwUrlPathLength); + uc.lpszExtraInfo = heap_alloc (uc.dwExtraInfoLength); + if (!pInternetCrackUrlA(url, 0, 0, &uc)) { + report (R_WARNING, "Can't parse submit URL '%s'", url); + goto done; + } + if ((uc.nScheme != INTERNET_SCHEME_HTTP && uc.nScheme != INTERNET_SCHEME_HTTPS) || *uc.lpszExtraInfo) { + report (R_WARNING, "Can't submit report to scheme %s or extra info '%s'", uc.lpszScheme, uc.lpszExtraInfo); + goto done; + } + + } else { + uc.nScheme = INTERNET_SCHEME_HTTP; + uc.lpszHostName = heap_strdup (SERVER_NAME); + uc.nPort = INTERNET_DEFAULT_HTTP_PORT; + uc.lpszUserName = heap_strdup (""); + uc.lpszPassword = heap_strdup (""); + uc.lpszUrlPath = heap_strdup (URL_PATH); + } ret = 1; @@ -310,20 +348,22 @@ send_file_wininet (const char *name) filesize = 1.5*1024*1024; } - report (R_STATUS, "Opening HTTP connection to " SERVER_NAME); + report (R_STATUS, "Opening %s connection to %s:%d", + (uc.nScheme == INTERNET_SCHEME_HTTP ? "http" : "https"), + uc.lpszHostName, uc.nPort); session = pInternetOpen (USER_AGENT, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); if (session == NULL) { report (R_WARNING, "Unable to open connection, error %u", GetLastError()); goto done; } - connection = pInternetConnect (session, SERVER_NAME, INTERNET_DEFAULT_HTTP_PORT, "", "", INTERNET_SERVICE_HTTP, 0, 0); + connection = pInternetConnect (session, uc.lpszHostName, uc.nPort, uc.lpszUserName, uc.lpszPassword, INTERNET_SERVICE_HTTP, 0, 0); if (connection == NULL) { report (R_WARNING, "Unable to connect, error %u", GetLastError()); goto done; } - request = pHttpOpenRequest (connection, "POST", URL_PATH, NULL, NULL, NULL, + request = pHttpOpenRequest (connection, "POST", uc.lpszUrlPath, NULL, NULL, NULL, INTERNET_FLAG_NO_CACHE_WRITE | INTERNET_FLAG_NO_COOKIES | INTERNET_FLAG_NO_UI | - INTERNET_FLAG_PRAGMA_NOCACHE | INTERNET_FLAG_RELOAD, 0); + INTERNET_FLAG_PRAGMA_NOCACHE | INTERNET_FLAG_RELOAD | (uc.nScheme == INTERNET_SCHEME_HTTPS ? INTERNET_FLAG_SECURE : 0), 0); if (request == NULL) { report (R_WARNING, "Unable to open request, error %u", GetLastError()); goto done; @@ -396,6 +436,12 @@ send_file_wininet (const char *name) } done: + heap_free (uc.lpszScheme); + heap_free (uc.lpszHostName); + heap_free (uc.lpszUserName); + heap_free (uc.lpszPassword); + heap_free (uc.lpszUrlPath); + heap_free (uc.lpszExtraInfo); heap_free((void *)buffers_in.lpcszHeader); heap_free(str); if (pInternetCloseHandle != NULL && request != NULL) @@ -413,7 +459,7 @@ send_file_wininet (const char *name) } int -send_file (const char *name) +send_file (const char *url, const char *name) { - return send_file_wininet( name ) || send_file_direct( name ); + return send_file_wininet( url, name ) || send_file_direct( url, name ); } diff --git a/programs/winetest/winetest.h b/programs/winetest/winetest.h index 2b9046c..e74f126 100644 --- a/programs/winetest/winetest.h +++ b/programs/winetest/winetest.h @@ -34,7 +34,7 @@ char *strmake (size_t *lenp, ...); int goodtagchar (char c); const char *findbadtagchar (const char *tag); -int send_file (const char *name); +int send_file (const char *url, const char *name); extern HANDLE logfile;

1 0

Bruno Jesus : wlanapi: Add a stub for WlanScan.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

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 some usage information.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

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 Feb. 13, 2017

Feb. 13, 2017

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 Feb. 13, 2017

Feb. 13, 2017

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

Huw Davies : gdi32: Calculate the stride from the image size.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: 0bec2f7965db53ca369aaa0b84d07fa73d626d5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bec2f7965db53ca369aaa0b8… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 13 14:08:04 2017 +0000 gdi32: Calculate the stride from the image size. This allows bitmaps to be created by D3DKMTCreateDCFromMemory() which have more freedom in their choice of stride. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/dc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 9bd263c..aee305f 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -154,7 +154,10 @@ static void init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, int stride, void init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void *bits) { - init_dib_info( dib, &info->bmiHeader, get_dib_stride( info->bmiHeader.biWidth, info->bmiHeader.biBitCount ), + int width_bytes = get_dib_stride( info->bmiHeader.biWidth, info->bmiHeader.biBitCount ); + if (info->bmiHeader.biSizeImage) + width_bytes = info->bmiHeader.biSizeImage / abs( info->bmiHeader.biHeight ); + init_dib_info( dib, &info->bmiHeader, width_bytes, (const DWORD *)info->bmiColors, info->bmiColors, bits ); }

1 0

Huw Davies : gdi32: Use the image size returned by GetImage.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: a3e09aa43f97a6d58550708c0e99ac3ff22e61a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3e09aa43f97a6d58550708c0… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 13 14:07:59 2017 +0000 gdi32: Use the image size returned by GetImage. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 1155ee4..ddd0051 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2004,6 +2004,7 @@ BOOL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect info->bmiHeader.biSize = sizeof(info->bmiHeader); info->bmiHeader.biWidth = src.width; info->bmiHeader.biHeight = -src.height; + info->bmiHeader.biSizeImage = get_dib_image_size( info ); err = dst_dev->funcs->pPutImage( dst_dev, 0, info, NULL, NULL, NULL, 0 ); if (!err || err == ERROR_BAD_FORMAT) { @@ -2013,7 +2014,7 @@ BOOL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect src.visrect.right = src.width; src.visrect.bottom = src.height; - bits.ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( info )); + bits.ptr = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ); if (!bits.ptr) return ERROR_OUTOFMEMORY; bits.is_copy = TRUE; bits.free = free_heap_bits; @@ -2026,13 +2027,13 @@ BOOL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect err = src_dev->funcs->pGetImage( src_dev, info, &bits, &src ); if (!err && !bits.is_copy) { - void *ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( info )); + void *ptr = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ); if (!ptr) { if (bits.free) bits.free( &bits ); return ERROR_OUTOFMEMORY; } - memcpy( ptr, bits.ptr, get_dib_image_size( info )); + memcpy( ptr, bits.ptr, info->bmiHeader.biSizeImage ); if (bits.free) bits.free( &bits ); bits.ptr = ptr; bits.is_copy = TRUE;

1 0

Nikolay Sivov : pstorec: Fix QueryInterface() of IPStore.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: 8d3af5690493a515f60adfbb77b6232baf7faaa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d3af5690493a515f60adfbb7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 13 16:57:12 2017 +0300 pstorec: Fix QueryInterface() of IPStore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/pstorec/pstorec.c | 7 ++-- dlls/pstorec/tests/Makefile.in | 4 +++ dlls/pstorec/tests/pstorec.c | 72 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 82 insertions(+), 3 deletions(-) diff --git a/configure b/configure index b2abca4..35273b0 100755 --- a/configure +++ b/configure @@ -18249,6 +18249,7 @@ wine_fn_config_test dlls/propsys/tests propsys_test wine_fn_config_dll psapi enable_psapi implib wine_fn_config_test dlls/psapi/tests psapi_test wine_fn_config_dll pstorec enable_pstorec clean +wine_fn_config_test dlls/pstorec/tests pstorec_test wine_fn_config_dll qcap enable_qcap wine_fn_config_test dlls/qcap/tests qcap_test wine_fn_config_dll qedit enable_qedit clean diff --git a/configure.ac b/configure.ac index 8bffab9..367851d 100644 --- a/configure.ac +++ b/configure.ac @@ -3306,6 +3306,7 @@ WINE_CONFIG_TEST(dlls/propsys/tests) WINE_CONFIG_DLL(psapi,,[implib]) WINE_CONFIG_TEST(dlls/psapi/tests) WINE_CONFIG_DLL(pstorec,,[clean]) +WINE_CONFIG_TEST(dlls/pstorec/tests) WINE_CONFIG_DLL(qcap) WINE_CONFIG_TEST(dlls/qcap/tests) WINE_CONFIG_DLL(qedit,,[clean]) diff --git a/dlls/pstorec/pstorec.c b/dlls/pstorec/pstorec.c index 593629b..02cd803 100644 --- a/dlls/pstorec/pstorec.c +++ b/dlls/pstorec/pstorec.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" +#include "initguid.h" #include "ole2.h" #include "pstore.h" @@ -67,13 +68,13 @@ static HRESULT WINAPI PStore_fnQueryInterface( { PStore_impl *This = impl_from_IPStore(iface); - TRACE("%p %s\n",This,debugstr_guid(riid)); + TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObj); *ppvObj = NULL; - if (IsEqualIID(riid, &IID_IUnknown)) + if (IsEqualIID(riid, &IID_IPStore) || IsEqualIID(riid, &IID_IUnknown)) { - *ppvObj = This; + *ppvObj = &This->IPStore_iface; } if (*ppvObj) diff --git a/dlls/pstorec/tests/Makefile.in b/dlls/pstorec/tests/Makefile.in new file mode 100644 index 0000000..2287f0f --- /dev/null +++ b/dlls/pstorec/tests/Makefile.in @@ -0,0 +1,4 @@ +TESTDLL = pstorec.dll + +C_SRCS = \ + pstorec.c diff --git a/dlls/pstorec/tests/pstorec.c b/dlls/pstorec/tests/pstorec.c new file mode 100644 index 0000000..bc30b19 --- /dev/null +++ b/dlls/pstorec/tests/pstorec.c @@ -0,0 +1,72 @@ +/* + * Protected Storage Tests + * + * Copyright 2017 Nikolay Sivov + * + * 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 + */ + +#include <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "initguid.h" +#include "ole2.h" +#include "pstore.h" + +#include "wine/test.h" + +static HRESULT (WINAPI *pPStoreCreateInstance)(IPStore **store, PST_PROVIDERID *id, void *reserved, DWORD flags); + +static void test_PStoreCreateInstance(void) +{ + IPStore *store; + IUnknown *unk; + HRESULT hr; + + if (!pPStoreCreateInstance) + { + win_skip("PStoreCreateInstance is not available\n"); + return; + } + + hr = pPStoreCreateInstance(&store, NULL, NULL, 0); + if (hr == E_NOTIMPL) + { + /* this function does not work starting with Win8 */ + win_skip("PStoreCreateInstance is not implemented on this system\n"); + return; + } + ok(hr == S_OK, "Unexpected return value %#x.\n", hr); + + hr = IPStore_QueryInterface(store, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Unexpected return value %#x.\n", hr); + IUnknown_Release(unk); + + hr = IPStore_QueryInterface(store, &IID_IPStore, (void **)&unk); + ok(hr == S_OK, "Unexpected return value %#x.\n", hr); + IUnknown_Release(unk); + + IPStore_Release(store); +} + +START_TEST(pstorec) +{ + HMODULE module = LoadLibraryA("pstorec"); + + pPStoreCreateInstance = (void *)GetProcAddress(module, "PStoreCreateInstance"); + + test_PStoreCreateInstance(); +}

1 0