You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against dfa1815c02d1661766c8f3a4a290635e7adb4ccf.
This commit is contained in:
@@ -0,0 +1,25 @@
|
||||
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
|
||||
|
@@ -1,25 +0,0 @@
|
||||
From 33717bde9e702520e23ae014c398bd7076902d43 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sun, 4 Jun 2017 12:56:47 +0200
|
||||
Subject: shell32: Fix length parameter for ZeroMemory.
|
||||
|
||||
---
|
||||
dlls/shell32/shfldr_fs.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c
|
||||
index c7259276d1d..10653f92b52 100644
|
||||
--- a/dlls/shell32/shfldr_fs.c
|
||||
+++ b/dlls/shell32/shfldr_fs.c
|
||||
@@ -1315,7 +1315,7 @@ ISFHelper_fnCopyItems (ISFHelper * iface, IShellFolder * pSFFrom, UINT cidl,
|
||||
|
||||
if (SUCCEEDED (IPersistFolder2_GetCurFolder (ppf2, &pidl))) {
|
||||
SHGetPathFromIDListW (pidl, wszSrcPathRoot);
|
||||
- ZeroMemory(wszDstPath, MAX_PATH+1);
|
||||
+ ZeroMemory(wszDstPath, sizeof(wszDstPath));
|
||||
if (This->sPathTarget)
|
||||
lstrcpynW(wszDstPath, This->sPathTarget, MAX_PATH);
|
||||
PathAddBackslashW(wszSrcPathRoot);
|
||||
--
|
||||
2.13.0
|
||||
|
Reference in New Issue
Block a user