From aa2b21abbcee798d6f3f724f7c253417fd57232a Mon Sep 17 00:00:00 2001 From: Sylvain Petreolle Date: Sun, 26 Apr 2015 20:51:10 +0000 Subject: [PATCH] [SCHANNEL] Use the force^W SONAME_LIBGNUTLS constant. svn path=/trunk/; revision=67453 --- reactos/dll/win32/schannel/schannel_gnutls.c | 9 ++++++++- reactos/include/reactos/wine/config.h | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/reactos/dll/win32/schannel/schannel_gnutls.c b/reactos/dll/win32/schannel/schannel_gnutls.c index 114354b3835..11d5511fef4 100644 --- a/reactos/dll/win32/schannel/schannel_gnutls.c +++ b/reactos/dll/win32/schannel/schannel_gnutls.c @@ -23,6 +23,7 @@ #include #include +#include #include #ifdef SONAME_LIBGNUTLS @@ -510,7 +511,13 @@ BOOL schan_imp_init(void) 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) diff --git a/reactos/include/reactos/wine/config.h b/reactos/include/reactos/wine/config.h index a10497c5b42..988ef7d7cff 100644 --- a/reactos/include/reactos/wine/config.h +++ b/reactos/include/reactos/wine/config.h @@ -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 */ -- 2.17.1