Author: spetreolle Date: Sun Apr 26 20:51:10 2015 New Revision: 67453
URL: http://svn.reactos.org/svn/reactos?rev=67453&view=rev Log: [SCHANNEL] Use the force^W SONAME_LIBGNUTLS constant.
Modified: trunk/reactos/dll/win32/schannel/schannel_gnutls.c trunk/reactos/include/reactos/wine/config.h
Modified: trunk/reactos/dll/win32/schannel/schannel_gnutls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/schannel... ============================================================================== --- trunk/reactos/dll/win32/schannel/schannel_gnutls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/schannel/schannel_gnutls.c [iso-8859-1] Sun Apr 26 20:51:10 2015 @@ -23,6 +23,7 @@
#include <wine/config.h> #include <wine/port.h> +#include <wine/library.h> #include <strsafe.h>
#ifdef SONAME_LIBGNUTLS @@ -510,7 +511,13 @@ wcscat(Path, L"\"); wcscat(Path, SONAME_LIBGNUTLS); */ - static const WCHAR Path[] = L"C:\Reactos\system32\gnutls\libgnutls-28.dll"; + WCHAR Path[MAX_PATH]; + DWORD PathSize = sizeof(Path); + PathSize = GetSystemDirectoryW(Path, PathSize); + if(!PathSize) + return FALSE; + wcscat(Path, L"\"); + wcscat(Path, SONAME_LIBGNUTLS);
libgnutls_handle = LoadLibraryExW(Path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); if (!libgnutls_handle)
Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/config... ============================================================================== --- trunk/reactos/include/reactos/wine/config.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/config.h [iso-8859-1] Sun Apr 26 20:51:10 2015 @@ -1227,7 +1227,7 @@ /* #undef SONAME_LIBGLU */
/* Define to the soname of the libgnutls library. */ -#define SONAME_LIBGNUTLS L"libgnutls-28.dll" +#define SONAME_LIBGNUTLS L"gnutls\libgnutls-28.dll"
/* Define to the soname of the libgsm library. */ /* #undef SONAME_LIBGSM */