Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
VLC
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
15
Merge Requests
15
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Steve Lhomme
VLC
Commits
aceca94c
Commit
aceca94c
authored
Jul 08, 2016
by
Hugo Beauzée-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: gnutls: Don't use LoadLibraryA
parent
fef8823d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
0 deletions
+23
-0
contrib/src/gnutls/gnutls-loadlibrary.patch
contrib/src/gnutls/gnutls-loadlibrary.patch
+22
-0
contrib/src/gnutls/rules.mak
contrib/src/gnutls/rules.mak
+1
-0
No files found.
contrib/src/gnutls/gnutls-loadlibrary.patch
0 → 100644
View file @
aceca94c
--- gnutls/lib/system.c.orig 2016-07-08 14:39:45.104700999 +0200
+++ gnutls/lib/system.c 2016-07-08 14:40:28.276750643 +0200
@@ -322,7 +322,7 @@
#ifdef _WIN32
#if defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR) && __MINGW32_MAJOR_VERSION <= 3 && __MINGW32_MINOR_VERSION <= 20
HMODULE crypto;
- crypto = LoadLibraryA("Crypt32.dll");
+ crypto = LoadLibrary(TEXT("Crypt32.dll"));
if (crypto == NULL)
return GNUTLS_E_CRYPTO_INIT_FAILED;
--- gnutls/lib/system-keys-win.c.orig 2016-07-08 14:39:58.336716261 +0200
+++ gnutls/lib/system-keys-win.c 2016-07-08 14:40:12.568732630 +0200
@@ -1059,7 +1059,7 @@
int ret;
#ifdef DYN_NCRYPT
- ncrypt_lib = LoadLibraryA("ncrypt.dll");
+ ncrypt_lib = LoadLibrary(TEXT("ncrypt.dll"));
if (ncrypt_lib == NULL) {
return gnutls_assert_val(GNUTLS_E_CRYPTO_INIT_FAILED);
}
contrib/src/gnutls/rules.mak
View file @
aceca94c
...
...
@@ -22,6 +22,7 @@ gnutls: gnutls-$(GNUTLS_VERSION).tar.xz .sum-gnutls
ifdef
HAVE_WIN32
$(APPLY)
$(SRC)
/gnutls/gnutls-win32.patch
$(APPLY)
$(SRC)
/gnutls/gnutls-mingw64.patch
$(APPLY)
$(SRC)
/gnutls/gnutls-loadlibrary.patch
ifdef
HAVE_WINSTORE
$(APPLY)
$(SRC)
/gnutls/gnutls-winrt.patch
$(APPLY)
$(SRC)
/gnutls/winrt-topendir.patch
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment