Rebase against c579a81a6353dd7c843270561cd5763ff895de40.

This commit is contained in:
Sebastian Lackner
2017-08-30 01:14:43 +02:00
parent 7b687557c3
commit d076d04ebc
10 changed files with 23 additions and 255 deletions

View File

@@ -1,25 +0,0 @@
From 6bb09c3a238180db2b88afeef8f5d08aade863c0 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Mon, 28 Aug 2017 23:28:00 +0200
Subject: kernel32: Fix compile error in load_library function.
---
dlls/kernel32/module.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c
index fa6f40b41e3..bfeae34326d 100644
--- a/dlls/kernel32/module.c
+++ b/dlls/kernel32/module.c
@@ -1043,7 +1043,7 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags )
NTSTATUS nts;
HMODULE hModule;
WCHAR *load_path;
- static const DWORD unsupported_flags = load_library_search_flags |
+ const DWORD unsupported_flags = load_library_search_flags |
LOAD_IGNORE_CODE_AUTHZ_LEVEL |
LOAD_LIBRARY_AS_IMAGE_RESOURCE |
LOAD_LIBRARY_REQUIRE_SIGNED_TARGET |
--
2.14.1

View File

@@ -1,25 +0,0 @@
From 61ceddca38f26c2df2acc6361c35ced52fe9b098 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 4 Jun 2017 12:58:31 +0200
Subject: rsaenh/tests: Avoid compiler warnings with GCC 7.
---
dlls/rsaenh/rsaenh.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c
index 9af770dfc6e..6978c860278 100644
--- a/dlls/rsaenh/rsaenh.c
+++ b/dlls/rsaenh/rsaenh.c
@@ -1097,7 +1097,7 @@ static void store_key_permissions(HCRYPTKEY hCryptKey, HKEY hKey, DWORD dwKeySpe
*/
static BOOL create_container_key(KEYCONTAINER *pKeyContainer, REGSAM sam, HKEY *phKey)
{
- CHAR szRSABase[MAX_PATH];
+ CHAR szRSABase[MAX_PATH + 25];
HKEY hRootKey;
sprintf(szRSABase, RSAENH_REGKEY, pKeyContainer->szName);
--
2.13.0