wine-commits January 2016

wine-commits@winehq.org

2 participants
627 discussions

Vincent Povirk : mscoree: Remove "Install Mono for Windows" message.
by Alexandre Julliard 13 Jan '16

13 Jan '16

Module: wine Branch: master Commit: 26c9bd9f15c364215be9731bb050454c14d90767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26c9bd9f15c364215be9731bb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jan 9 16:16:24 2016 -0600 mscoree: Remove "Install Mono for Windows" message. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 35284b7..b0237b3 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -126,11 +126,6 @@ static void CDECL set_print_handler_dummy(MonoPrintCallback callback) { } -static void missing_runtime_message(void) -{ - MESSAGE("wine: Install Mono for Windows to run .NET applications.\n"); -} - static HRESULT load_mono(LPCWSTR mono_path) { static const WCHAR lib[] = {'\\','l','i','b',0}; @@ -277,7 +272,7 @@ static HRESULT CLRRuntimeInfo_GetRuntimeHost(CLRRuntimeInfo *This, RuntimeHost * if (!get_mono_path(mono_path)) { - missing_runtime_message(); + ERR("Wine Mono is not installed\n"); return CLR_E_SHIM_RUNTIME; } @@ -1306,8 +1301,6 @@ HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, } } - missing_runtime_message(); - return CLR_E_SHIM_RUNTIME; }

1 0

Vincent Povirk : mscoree: Remove search fallbacks when Wine Mono isn' t installed.
by Alexandre Julliard 13 Jan '16

13 Jan '16

Module: wine Branch: master Commit: f34be7c690a9d87422f2d05d90089a079f4e65e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f34be7c690a9d87422f2d05d9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jan 9 16:16:23 2016 -0600 mscoree: Remove search fallbacks when Wine Mono isn't installed. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 106 ++++-------------------------------------------- 1 file changed, 8 insertions(+), 98 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index e3a724c..35284b7 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -589,112 +589,22 @@ static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path) return (attributes != INVALID_FILE_ATTRIBUTES); } -static BOOL get_mono_path_from_registry(LPWSTR path) -{ - static const WCHAR mono_key[] = {'S','o','f','t','w','a','r','e','\\','N','o','v','e','l','l','\\','M','o','n','o',0}; - static const WCHAR defaul_clr[] = {'D','e','f','a','u','l','t','C','L','R',0}; - static const WCHAR install_root[] = {'S','d','k','I','n','s','t','a','l','l','R','o','o','t',0}; - static const WCHAR slash[] = {'\\',0}; - - WCHAR version[64], version_key[MAX_PATH]; - DWORD len; - HKEY key; - WCHAR dll_path[MAX_PATH]; - - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, mono_key, 0, KEY_READ, &key)) - return FALSE; - - len = sizeof(version); - if (RegQueryValueExW(key, defaul_clr, 0, NULL, (LPBYTE)version, &len)) - { - RegCloseKey(key); - return FALSE; - } - RegCloseKey(key); - - lstrcpyW(version_key, mono_key); - lstrcatW(version_key, slash); - lstrcatW(version_key, version); - - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, version_key, 0, KEY_READ, &key)) - return FALSE; - - len = sizeof(WCHAR) * MAX_PATH; - if (RegQueryValueExW(key, install_root, 0, NULL, (LPBYTE)path, &len)) - { - RegCloseKey(key); - return FALSE; - } - RegCloseKey(key); - - return find_mono_dll(path, dll_path); -} - -static BOOL get_mono_path_from_folder(LPCWSTR folder, LPWSTR mono_path) -{ - static const WCHAR mono_two_dot_zero[] = {'\\','m','o','n','o','-','2','.','0', 0}; - WCHAR mono_dll_path[MAX_PATH]; - BOOL found = FALSE; - - strcpyW(mono_path, folder); - - strcatW(mono_path, mono_two_dot_zero); - - found = find_mono_dll(mono_path, mono_dll_path); - - return found; -} - static BOOL get_mono_path(LPWSTR path) { - static const WCHAR subdir_mono[] = {'\\','m','o','n','o',0}; - static const WCHAR sibling_mono[] = {'\\','.','.','\\','m','o','n','o',0}; - WCHAR base_path[MAX_PATH]; - const char *unix_data_dir; - WCHAR *dos_data_dir; - BOOL build_tree = FALSE; - static WCHAR* (CDECL *wine_get_dos_file_name)(const char*); - - /* First try c:\windows\mono */ + static const WCHAR subdir_mono[] = {'\\','m','o','n','o','\\','m','o','n','o','-','2','.','0', 0}; + WCHAR base_path[MAX_PATH], mono_dll_path[MAX_PATH]; + + /* c:\windows\mono\mono-2.0 */ GetWindowsDirectoryW(base_path, MAX_PATH); strcatW(base_path, subdir_mono); - if (get_mono_path_from_folder(base_path, path)) - return TRUE; - - /* Next: /usr/share/wine/mono */ - unix_data_dir = wine_get_data_dir(); - - if (!unix_data_dir) + if (find_mono_dll(base_path, mono_dll_path)) { - unix_data_dir = wine_get_build_dir(); - build_tree = TRUE; - } - - if (unix_data_dir) - { - if (!wine_get_dos_file_name) - wine_get_dos_file_name = (void*)GetProcAddress(GetModuleHandleA("kernel32"), "wine_get_dos_file_name"); - - if (wine_get_dos_file_name) - { - dos_data_dir = wine_get_dos_file_name(unix_data_dir); - - if (dos_data_dir) - { - strcpyW(base_path, dos_data_dir); - strcatW(base_path, build_tree ? sibling_mono : subdir_mono); - - HeapFree(GetProcessHeap(), 0, dos_data_dir); - - if (get_mono_path_from_folder(base_path, path)) - return TRUE; - } - } + strcpyW(path, base_path); + return TRUE; } - /* Last: the registry */ - return get_mono_path_from_registry(path); + return FALSE; } struct InstalledRuntimeEnum

1 0

Jacek Caban : mshtml/tests: Fixed location tests on IE11.
by Alexandre Julliard 13 Jan '16

13 Jan '16

Module: wine Branch: master Commit: f9036324278650ed72b07f3625f7920894f9ae22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9036324278650ed72b07f362… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 13 16:32:28 2016 +0100 mshtml/tests: Fixed location tests on IE11. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/htmllocation.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c index 8bf5517..ee241e7 100644 --- a/dlls/mshtml/tests/htmllocation.c +++ b/dlls/mshtml/tests/htmllocation.c @@ -215,7 +215,8 @@ static void test_port(IHTMLLocation *loc, const struct location_test *test) hres = IHTMLLocation_get_port(loc, &str); ok(hres == S_OK, "%s: get_port failed: 0x%08x\n", test->name, hres); if(hres == S_OK) - ok(str_eq_wa(str, test->port), + ok(str_eq_wa(str, test->port) + || (!str && !*test->port), /* IE11 */ "%s: expected retrieved port to be L\"%s\", was: %s\n", test->name, test->port, wine_dbgstr_w(str)); SysFreeString(str);

1 0

Nikolay Sivov : ole2disp: Implement SafeArrayGetElemsize().
by Alexandre Julliard 13 Jan '16

13 Jan '16

Module: wine Branch: master Commit: 5f8f19299834ae03d46fc436925d8fd8fa2c0932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f8f19299834ae03d46fc4369… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 13 12:25:48 2016 +0300 ole2disp: Implement SafeArrayGetElemsize(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole2disp.dll16/ole2disp.c | 9 +++++++++ dlls/ole2disp.dll16/ole2disp.dll16.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index 0c033cd..20b7b6c 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -99,6 +99,15 @@ USHORT WINAPI SafeArrayGetDim16(SAFEARRAY16 *sa) } /****************************************************************************** + * SafeArrayGetElemsize [OLE2DISP.18] + */ +USHORT WINAPI SafeArrayGetElemsize16(SAFEARRAY16 *sa) +{ + TRACE("(%p)\n", sa); + return sa->cbElements; +} + +/****************************************************************************** * SafeArrayAllocDescriptor [OLE2DISP.38] */ HRESULT WINAPI SafeArrayAllocDescriptor16(UINT16 dims, SEGPTR *ret) diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index 1fd2b0b..ca884a0 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -15,7 +15,7 @@ 15 stub SAFEARRAYCREATE 16 stub SAFEARRAYDESTROY 17 pascal -ret16 SafeArrayGetDim(ptr) SafeArrayGetDim16 -18 stub SAFEARRAYGETELEMSIZE +18 pascal -ret16 SafeArrayGetElemsize(ptr) SafeArrayGetElemsize16 19 stub SAFEARRAYGETUBOUND 20 stub SAFEARRAYGETLBOUND 21 stub SAFEARRAYLOCK

1 0

Nikolay Sivov : ole2disp: Implement SafeArrayGetDim().
by Alexandre Julliard 13 Jan '16

13 Jan '16

Module: wine Branch: master Commit: 332dd07fad031a51f5d921d6d348f3345b9ae061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=332dd07fad031a51f5d921d6d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 13 12:25:47 2016 +0300 ole2disp: Implement SafeArrayGetDim(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole2disp.dll16/ole2disp.c | 9 +++++++++ dlls/ole2disp.dll16/ole2disp.dll16.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index 5831d86..0c033cd 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -90,6 +90,15 @@ static ULONG safearray_getcellcount(const SAFEARRAY16 *sa) } /****************************************************************************** + * SafeArrayGetDim [OLE2DISP.17] + */ +USHORT WINAPI SafeArrayGetDim16(SAFEARRAY16 *sa) +{ + TRACE("(%p)\n", sa); + return sa->cDims; +} + +/****************************************************************************** * SafeArrayAllocDescriptor [OLE2DISP.38] */ HRESULT WINAPI SafeArrayAllocDescriptor16(UINT16 dims, SEGPTR *ret) diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index 919583d..1fd2b0b 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -14,7 +14,7 @@ 14 stub DOSDATETIMETOVARIANTTIME 15 stub SAFEARRAYCREATE 16 stub SAFEARRAYDESTROY -17 stub SAFEARRAYGETDIM +17 pascal -ret16 SafeArrayGetDim(ptr) SafeArrayGetDim16 18 stub SAFEARRAYGETELEMSIZE 19 stub SAFEARRAYGETUBOUND 20 stub SAFEARRAYGETLBOUND

1 0

Hans Leidekker : bcrypt/tests: Add tests for SHA hashes.
by Alexandre Julliard 13 Jan '16

13 Jan '16

Module: wine Branch: master Commit: a3b10f13b166372a3d9217960732e16cb38c27d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3b10f13b166372a3d9217960… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 13 10:43:37 2016 +0100 bcrypt/tests: Add tests for SHA hashes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 308 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 308 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a3b10f13b166372a3d921…

1 0

Hans Leidekker : bcrypt/tests: Don't load bcrypt dynamically.
by Alexandre Julliard 13 Jan '16

13 Jan '16

Module: wine Branch: master Commit: 7897c5a60f06f73672a6a24e8c0da99883c90b28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7897c5a60f06f73672a6a24e8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 13 10:43:36 2016 +0100 bcrypt/tests: Don't load bcrypt dynamically. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- dlls/bcrypt/Makefile.in | 1 + dlls/bcrypt/tests/Makefile.in | 2 +- dlls/bcrypt/tests/bcrypt.c | 54 ++++++++----------------------------------- 5 files changed, 14 insertions(+), 47 deletions(-) diff --git a/configure b/configure index 339a734..66dca2b 100755 --- a/configure +++ b/configure @@ -17379,7 +17379,7 @@ wine_fn_config_dll avifil32 enable_avifil32 clean,implib,po wine_fn_config_test dlls/avifil32/tests avifil32_test wine_fn_config_dll avifile.dll16 enable_win16 wine_fn_config_dll avrt enable_avrt implib -wine_fn_config_dll bcrypt enable_bcrypt +wine_fn_config_dll bcrypt enable_bcrypt implib wine_fn_config_test dlls/bcrypt/tests bcrypt_test wine_fn_config_dll bluetoothapis enable_bluetoothapis wine_fn_config_dll browseui enable_browseui clean,po diff --git a/configure.ac b/configure.ac index 3712906..811e2aa 100644 --- a/configure.ac +++ b/configure.ac @@ -2723,7 +2723,7 @@ WINE_CONFIG_DLL(avifil32,,[clean,implib,po]) WINE_CONFIG_TEST(dlls/avifil32/tests) WINE_CONFIG_DLL(avifile.dll16,enable_win16) WINE_CONFIG_DLL(avrt,,[implib]) -WINE_CONFIG_DLL(bcrypt) +WINE_CONFIG_DLL(bcrypt,,[implib]) WINE_CONFIG_TEST(dlls/bcrypt/tests) WINE_CONFIG_DLL(bluetoothapis) WINE_CONFIG_DLL(browseui,,[clean,po]) diff --git a/dlls/bcrypt/Makefile.in b/dlls/bcrypt/Makefile.in index 54814a0..ef9d7ea 100644 --- a/dlls/bcrypt/Makefile.in +++ b/dlls/bcrypt/Makefile.in @@ -1,5 +1,6 @@ MODULE = bcrypt.dll IMPORTS = advapi32 +IMPORTLIB = bcrypt EXTRAINCL = $(GNUTLS_CFLAGS) C_SRCS = \ diff --git a/dlls/bcrypt/tests/Makefile.in b/dlls/bcrypt/tests/Makefile.in index b193519..0f130b1 100644 --- a/dlls/bcrypt/tests/Makefile.in +++ b/dlls/bcrypt/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = bcrypt.dll -IMPORTS = user32 +IMPORTS = bcrypt user32 C_SRCS = \ bcrypt.c diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 9e659d6..ad54ab2 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -25,57 +25,32 @@ #include "wine/test.h" -static NTSTATUS (WINAPI *pBCryptGenRandom)(BCRYPT_ALG_HANDLE hAlgorithm, PUCHAR pbBuffer, - ULONG cbBuffer, ULONG dwFlags); -static NTSTATUS (WINAPI *pBCryptGetFipsAlgorithmMode)(BOOLEAN *enabled); - -static BOOL Init(void) -{ - HMODULE hbcrypt = LoadLibraryA("bcrypt.dll"); - if (!hbcrypt) - { - win_skip("bcrypt library not available\n"); - return FALSE; - } - - pBCryptGenRandom = (void *)GetProcAddress(hbcrypt, "BCryptGenRandom"); - pBCryptGetFipsAlgorithmMode = (void *)GetProcAddress(hbcrypt, "BCryptGetFipsAlgorithmMode"); - - return TRUE; -} - static void test_BCryptGenRandom(void) { NTSTATUS ret; UCHAR buffer[256]; - if (!pBCryptGenRandom) - { - win_skip("BCryptGenRandom is not available\n"); - return; - } - - ret = pBCryptGenRandom(NULL, NULL, 0, 0); + ret = BCryptGenRandom(NULL, NULL, 0, 0); ok(ret == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got 0x%x\n", ret); - ret = pBCryptGenRandom(NULL, buffer, 0, 0); + ret = BCryptGenRandom(NULL, buffer, 0, 0); ok(ret == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got 0x%x\n", ret); - ret = pBCryptGenRandom(NULL, buffer, sizeof(buffer), 0); + ret = BCryptGenRandom(NULL, buffer, sizeof(buffer), 0); ok(ret == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got 0x%x\n", ret); - ret = pBCryptGenRandom(NULL, buffer, sizeof(buffer), BCRYPT_USE_SYSTEM_PREFERRED_RNG); + ret = BCryptGenRandom(NULL, buffer, sizeof(buffer), BCRYPT_USE_SYSTEM_PREFERRED_RNG); ok(ret == STATUS_SUCCESS, "Expected success, got 0x%x\n", ret); - ret = pBCryptGenRandom(NULL, buffer, sizeof(buffer), + ret = BCryptGenRandom(NULL, buffer, sizeof(buffer), BCRYPT_USE_SYSTEM_PREFERRED_RNG|BCRYPT_RNG_USE_ENTROPY_IN_BUFFER); ok(ret == STATUS_SUCCESS, "Expected success, got 0x%x\n", ret); - ret = pBCryptGenRandom(NULL, NULL, sizeof(buffer), BCRYPT_USE_SYSTEM_PREFERRED_RNG); + ret = BCryptGenRandom(NULL, NULL, sizeof(buffer), BCRYPT_USE_SYSTEM_PREFERRED_RNG); ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got 0x%x\n", ret); /* Zero sized buffer should work too */ - ret = pBCryptGenRandom(NULL, buffer, 0, BCRYPT_USE_SYSTEM_PREFERRED_RNG); + ret = BCryptGenRandom(NULL, buffer, 0, BCRYPT_USE_SYSTEM_PREFERRED_RNG); ok(ret == STATUS_SUCCESS, "Expected success, got 0x%x\n", ret); /* Test random number generation - It's impossible for a sane RNG to return 8 zeros */ memset(buffer, 0, 16); - ret = pBCryptGenRandom(NULL, buffer, 8, BCRYPT_USE_SYSTEM_PREFERRED_RNG); + ret = BCryptGenRandom(NULL, buffer, 8, BCRYPT_USE_SYSTEM_PREFERRED_RNG); ok(ret == STATUS_SUCCESS, "Expected success, got 0x%x\n", ret); ok(memcmp(buffer, buffer + 8, 8), "Expected a random number, got 0\n"); } @@ -85,24 +60,15 @@ static void test_BCryptGetFipsAlgorithmMode(void) NTSTATUS ret; BOOLEAN enabled; - if (!pBCryptGetFipsAlgorithmMode) - { - win_skip("BCryptGetFipsAlgorithmMode is not available\n"); - return; - } - - ret = pBCryptGetFipsAlgorithmMode(&enabled); + ret = BCryptGetFipsAlgorithmMode(&enabled); ok(ret == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got 0x%x\n", ret); - ret = pBCryptGetFipsAlgorithmMode(NULL); + ret = BCryptGetFipsAlgorithmMode(NULL); ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got 0x%x\n", ret); } START_TEST(bcrypt) { - if (!Init()) - return; - test_BCryptGenRandom(); test_BCryptGetFipsAlgorithmMode(); }

1 0

Hans Leidekker : bcrypt: Add support for SHA hashes on Linux using GnuTLS.
by Alexandre Julliard 13 Jan '16

13 Jan '16

Module: wine Branch: master Commit: 2cd8d273734cfbf3095d7937398676fdba635051 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cd8d273734cfbf3095d79373… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 13 10:43:35 2016 +0100 bcrypt: Add support for SHA hashes on Linux using GnuTLS. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/Makefile.in | 1 + dlls/bcrypt/bcrypt_main.c | 167 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 163 insertions(+), 5 deletions(-) diff --git a/dlls/bcrypt/Makefile.in b/dlls/bcrypt/Makefile.in index 87e1429..54814a0 100644 --- a/dlls/bcrypt/Makefile.in +++ b/dlls/bcrypt/Makefile.in @@ -1,5 +1,6 @@ MODULE = bcrypt.dll IMPORTS = advapi32 +EXTRAINCL = $(GNUTLS_CFLAGS) C_SRCS = \ bcrypt_main.c diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 9cc5227..227399f 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -18,10 +18,14 @@ */ #include "config.h" +#include "wine/port.h" #include <stdarg.h> #ifdef HAVE_COMMONCRYPTO_COMMONDIGEST_H #include <CommonCrypto/CommonDigest.h> +#elif defined(SONAME_LIBGNUTLS) +#include <gnutls/gnutls.h> +#include <gnutls/crypto.h> #endif #include "ntstatus.h" @@ -32,10 +36,88 @@ #include "bcrypt.h" #include "wine/debug.h" +#include "wine/library.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); +static HINSTANCE instance; + +#if defined(SONAME_LIBGNUTLS) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) +WINE_DECLARE_DEBUG_CHANNEL(winediag); + +static void *libgnutls_handle; +#define MAKE_FUNCPTR(f) static typeof(f) * p##f +MAKE_FUNCPTR(gnutls_global_deinit); +MAKE_FUNCPTR(gnutls_global_init); +MAKE_FUNCPTR(gnutls_global_set_log_function); +MAKE_FUNCPTR(gnutls_global_set_log_level); +MAKE_FUNCPTR(gnutls_hash); +MAKE_FUNCPTR(gnutls_hash_deinit); +MAKE_FUNCPTR(gnutls_hash_init); +MAKE_FUNCPTR(gnutls_perror); +#undef MAKE_FUNCPTR + +static void gnutls_log( int level, const char *msg ) +{ + TRACE( "<%d> %s", level, msg ); +} + +static BOOL gnutls_initialize(void) +{ + int ret; + + if (!(libgnutls_handle = wine_dlopen( SONAME_LIBGNUTLS, RTLD_NOW, NULL, 0 ))) + { + ERR_(winediag)( "failed to load libgnutls, no support for crypto hashes\n" ); + return FALSE; + } + +#define LOAD_FUNCPTR(f) \ + if (!(p##f = wine_dlsym( libgnutls_handle, #f, NULL, 0 ))) \ + { \ + ERR( "failed to load %s\n", #f ); \ + goto fail; \ + } + + LOAD_FUNCPTR(gnutls_global_deinit) + LOAD_FUNCPTR(gnutls_global_init) + LOAD_FUNCPTR(gnutls_global_set_log_function) + LOAD_FUNCPTR(gnutls_global_set_log_level) + LOAD_FUNCPTR(gnutls_hash); + LOAD_FUNCPTR(gnutls_hash_deinit); + LOAD_FUNCPTR(gnutls_hash_init); + LOAD_FUNCPTR(gnutls_perror) +#undef LOAD_FUNCPTR + + if ((ret = pgnutls_global_init()) != GNUTLS_E_SUCCESS) + { + pgnutls_perror( ret ); + goto fail; + } + + if (TRACE_ON( bcrypt )) + { + pgnutls_global_set_log_level( 4 ); + pgnutls_global_set_log_function( gnutls_log ); + } + + return TRUE; + +fail: + wine_dlclose( libgnutls_handle, NULL, 0 ); + libgnutls_handle = NULL; + return FALSE; +} + +static void gnutls_uninitialize(void) +{ + pgnutls_global_deinit(); + wine_dlclose( libgnutls_handle, NULL, 0 ); + libgnutls_handle = NULL; +} +#endif /* SONAME_LIBGNUTLS && !HAVE_COMMONCRYPTO_COMMONDIGEST_H */ + NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG dwAlgOperations, ULONG *pAlgCount, BCRYPT_ALGORITHM_IDENTIFIER **ppAlgList, ULONG dwFlags) { @@ -203,7 +285,7 @@ static NTSTATUS hash_init( struct hash *hash ) return STATUS_SUCCESS; } -static void hash_update( struct hash *hash, UCHAR *input, ULONG size ) +static NTSTATUS hash_update( struct hash *hash, UCHAR *input, ULONG size ) { switch (hash->alg_id) { @@ -225,8 +307,9 @@ static void hash_update( struct hash *hash, UCHAR *input, ULONG size ) default: ERR( "unhandled id %u\n", hash->alg_id ); - break; + return STATUS_NOT_IMPLEMENTED; } + return STATUS_SUCCESS; } static NTSTATUS hash_finish( struct hash *hash, UCHAR *output, ULONG size ) @@ -255,6 +338,58 @@ static NTSTATUS hash_finish( struct hash *hash, UCHAR *output, ULONG size ) } return STATUS_SUCCESS; } +#elif defined(SONAME_LIBGNUTLS) +struct hash +{ + struct object hdr; + enum alg_id alg_id; + gnutls_hash_hd_t handle; +}; + +static NTSTATUS hash_init( struct hash *hash ) +{ + gnutls_digest_algorithm_t alg; + + if (!libgnutls_handle) return STATUS_INTERNAL_ERROR; + + switch (hash->alg_id) + { + case ALG_ID_SHA1: + alg = GNUTLS_DIG_SHA1; + break; + + case ALG_ID_SHA256: + alg = GNUTLS_DIG_SHA256; + break; + + case ALG_ID_SHA384: + alg = GNUTLS_DIG_SHA384; + break; + + case ALG_ID_SHA512: + alg = GNUTLS_DIG_SHA512; + break; + + default: + ERR( "unhandled id %u\n", hash->alg_id ); + return STATUS_NOT_IMPLEMENTED; + } + + if (pgnutls_hash_init( &hash->handle, alg )) return STATUS_INTERNAL_ERROR; + return STATUS_SUCCESS; +} + +static NTSTATUS hash_update( struct hash *hash, UCHAR *input, ULONG size ) +{ + if (pgnutls_hash( hash->handle, input, size )) return STATUS_INTERNAL_ERROR; + return STATUS_SUCCESS; +} + +static NTSTATUS hash_finish( struct hash *hash, UCHAR *output, ULONG size ) +{ + pgnutls_hash_deinit( hash->handle, output ); + return STATUS_SUCCESS; +} #else struct hash { @@ -268,9 +403,10 @@ static NTSTATUS hash_init( struct hash *hash ) return STATUS_NOT_IMPLEMENTED; } -static void hash_update( struct hash *hash, UCHAR *input, ULONG size ) +static NTSTATUS hash_update( struct hash *hash, UCHAR *input, ULONG size ) { ERR( "support for hashes not available at build time\n" ); + return STATUS_NOT_IMPLEMENTED; } static NTSTATUS hash_finish( struct hash *hash, UCHAR *output, ULONG size ) @@ -484,8 +620,7 @@ NTSTATUS WINAPI BCryptHashData( BCRYPT_HASH_HANDLE handle, UCHAR *input, ULONG s if (!hash || hash->hdr.magic != MAGIC_HASH) return STATUS_INVALID_HANDLE; if (!input) return STATUS_INVALID_PARAMETER; - hash_update( hash, input, size ); - return STATUS_SUCCESS; + return hash_update( hash, input, size ); } NTSTATUS WINAPI BCryptFinishHash( BCRYPT_HASH_HANDLE handle, UCHAR *output, ULONG size, ULONG flags ) @@ -499,3 +634,25 @@ NTSTATUS WINAPI BCryptFinishHash( BCRYPT_HASH_HANDLE handle, UCHAR *output, ULON return hash_finish( hash, output, size ); } + +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + instance = hinst; + DisableThreadLibraryCalls( hinst ); +#if defined(SONAME_LIBGNUTLS) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) + gnutls_initialize(); +#endif + break; + + case DLL_PROCESS_DETACH: + if (reserved) break; +#if defined(SONAME_LIBGNUTLS) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) + gnutls_uninitialize(); +#endif + break; + } + return TRUE; +}

1 0

Francois Gouget : shell32/tests: Trace the effective ShellExecuteEx() flags.
by Alexandre Julliard 13 Jan '16

13 Jan '16

Module: wine Branch: master Commit: 9cc07a2b31c62ba5b60f00a9128988bb7195da33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cc07a2b31c62ba5b60f00a91… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 13 12:42:10 2016 +0100 shell32/tests: Trace the effective ShellExecuteEx() flags. shell_execute_ex() adds some flags for its own internal needs. The traces should reflect that. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 3acfe4d..cc6e06a 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -164,17 +164,17 @@ static INT_PTR shell_execute_ex(DWORD mask, LPCSTR verb, LPCSTR file, LPCSTR parameters, LPCSTR directory, LPCSTR class) { + char smask[11]; SHELLEXECUTEINFOA sei; BOOL success; INT_PTR rc; + /* Add some flags so we can wait for the child process */ + mask |= SEE_MASK_NOCLOSEPROCESS | SEE_MASK_NO_CONSOLE; + strcpy(shell_call, "ShellExecuteEx("); - if (mask) - { - char smask[11]; - sprintf(smask, "0x%x", mask); - strcat_param(shell_call, "mask", smask); - } + sprintf(smask, "0x%x", mask); + strcat_param(shell_call, "mask", smask); strcat_param(shell_call, "verb", verb); strcat_param(shell_call, "file", file); strcat_param(shell_call, "params", parameters); @@ -185,7 +185,7 @@ static INT_PTR shell_execute_ex(DWORD mask, LPCSTR verb, LPCSTR file, trace("%s\n", shell_call); sei.cbSize=sizeof(sei); - sei.fMask=SEE_MASK_NOCLOSEPROCESS | SEE_MASK_NO_CONSOLE | mask; + sei.fMask=mask; sei.hwnd=NULL; sei.lpVerb=verb; sei.lpFile=file;

1 0

Francois Gouget : shell32/tests: Tweak some overly optimistic ok() messages.
by Alexandre Julliard 13 Jan '16

13 Jan '16

Module: wine Branch: master Commit: f816bc93b06d2fd7f9ef0404ca5d88fc5495943e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f816bc93b06d2fd7f9ef0404c… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 13 12:41:15 2016 +0100 shell32/tests: Tweak some overly optimistic ok() messages. ShellExecute() is more likely to have returned an unexpected error code than it is to have succeeded. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index f67206d..3acfe4d 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -951,7 +951,7 @@ static void test_lpFile_parsed(void) /* error should be SE_ERR_FNF, not SE_ERR_NOASSOC */ sprintf(fileA, "\"%s\\drawback_file.noassoc\" foo.shlexec", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); - ok(rc == SE_ERR_FNF, "%s succeeded: rc=%lu\n", shell_call, rc); + ok(rc == SE_ERR_FNF, "%s returned %lu\n", shell_call, rc); /* ""command"" not works on wine (and real win9x and w2k) */ sprintf(fileA, "\"\"%s\\simple.shlexec\"\"", tmpdir); @@ -966,11 +966,11 @@ static void test_lpFile_parsed(void) /* is SEE_MASK_DOENVSUBST default flag? Should only be when XP emulates 9x (XP bug or real 95 or ME behavior ?) */ rc=shell_execute(NULL, "%TMPDIR%\\simple.shlexec", NULL, NULL); - todo_wine ok(rc == SE_ERR_FNF, "%s succeeded: rc=%lu\n", shell_call, rc); + todo_wine ok(rc == SE_ERR_FNF, "%s returned %lu\n", shell_call, rc); /* quoted */ rc=shell_execute(NULL, "\"%TMPDIR%\\simple.shlexec\"", NULL, NULL); - todo_wine ok(rc == SE_ERR_FNF, "%s succeeded: rc=%lu\n", shell_call, rc); + todo_wine ok(rc == SE_ERR_FNF, "%s returned %lu\n", shell_call, rc); /* test SEE_MASK_DOENVSUBST works */ rc=shell_execute_ex(SEE_MASK_DOENVSUBST | SEE_MASK_FLAG_NO_UI, @@ -2114,7 +2114,7 @@ static void test_exes(void) { rc=shell_execute(NULL, filename, params, NULL); todo_wine { - ok(rc==SE_ERR_NOASSOC, "%s succeeded: rc=%lu\n", shell_call, rc); + ok(rc==SE_ERR_NOASSOC, "%s returned %lu\n", shell_call, rc); } } }

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2016