[SCHANNEL]
authorSylvain Petreolle <spetreolle@yahoo.fr>
Sun, 26 Apr 2015 20:51:10 +0000 (20:51 +0000)
committerSylvain Petreolle <spetreolle@yahoo.fr>
Sun, 26 Apr 2015 20:51:10 +0000 (20:51 +0000)
Use the force^W SONAME_LIBGNUTLS constant.

svn path=/trunk/; revision=67453

reactos/dll/win32/schannel/schannel_gnutls.c
reactos/include/reactos/wine/config.h

index 114354b..11d5511 100644 (file)
@@ -23,6 +23,7 @@
 
 #include <wine/config.h>
 #include <wine/port.h>
 
 #include <wine/config.h>
 #include <wine/port.h>
+#include <wine/library.h>
 #include <strsafe.h>
 
 #ifdef SONAME_LIBGNUTLS
 #include <strsafe.h>
 
 #ifdef SONAME_LIBGNUTLS
@@ -510,7 +511,13 @@ BOOL schan_imp_init(void)
     wcscat(Path, L"\\");
     wcscat(Path, SONAME_LIBGNUTLS);
 */
     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)
 
     libgnutls_handle = LoadLibraryExW(Path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
     if (!libgnutls_handle)
index a10497c..988ef7d 100644 (file)
 /* #undef SONAME_LIBGLU */
 
 /* Define to the soname of the libgnutls library. */
 /* #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 */
 
 /* Define to the soname of the libgsm library. */
 /* #undef SONAME_LIBGSM */