wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Added patch to ensure wintrust resets data->pWintrustData->u.pFile->hFile after closing handle.

Browse Source
This commit is contained in:
Sebastian Lackner
2014-11-25 21:29:26 +01:00
parent bb565dbad1
commit 3a7d42fd2c
5 changed files with 49 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/Makefile
View File

@@ -118,6 +118,7 @@ PATCHLIST := \
winex11-Window_Groups.ok \
winex11-XEMBED.ok \
winex11-wglShareLists.ok \
wintrust-Reset_hFile.ok \
wpcap-Dynamic_Linking.ok \
ws2_32-Connect_Time.ok \
ws2_32-TransmitFile.ok \
@@ -1870,6 +1871,21 @@ winex11-wglShareLists.ok:
echo '+ { "Michael Müller", "winex11.drv: Only warn about used contexts in wglShareLists.", 1 },'; \
) > winex11-wglShareLists.ok
# Patchset wintrust-Reset_hFile
# |
# | This patchset fixes the following Wine bugs:
# | * [#36257] Wintrust doesn't reset data->pWintrustData->u.pFile->hFile after closing handle
# |
# | Modified files:
# | * dlls/wintrust/softpub.c
# |
.INTERMEDIATE: wintrust-Reset_hFile.ok
wintrust-Reset_hFile.ok:
$(call APPLY_FILE,wintrust-Reset_hFile/0001-wintrust-Reset-data-pWintrustData-u.pFile-hFile-afte.patch)
@( \
echo '+ { "Sebastian Lackner", "wintrust: Reset data->pWintrustData->u.pFile->hFile after closing handle.", 1 },'; \
) > wintrust-Reset_hFile.ok
# Patchset wpcap-Dynamic_Linking
# |
# | Modified files:

29
patches/wintrust-Reset_hFile/0001-wintrust-Reset-data-pWintrustData-u.pFile-hFile-afte.patch Normal file
View File

@@ -0,0 +1,29 @@
From 64e1f4ac26867d15c0957c0b0212c9b67a87cb5d Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Tue, 25 Nov 2014 21:26:54 +0100
Subject: wintrust: Reset data->pWintrustData->u.pFile->hFile after closing
handle.
---
dlls/wintrust/softpub.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c
index 358ba01..4e8582e 100644
--- a/dlls/wintrust/softpub.c
+++ b/dlls/wintrust/softpub.c
@@ -1209,7 +1209,11 @@ HRESULT WINAPI SoftpubCleanup(CRYPT_PROVIDER_DATA *data)
if (data->fOpenedFile &&
data->pWintrustData->dwUnionChoice == WTD_CHOICE_FILE &&
data->pWintrustData->u.pFile)
+ {
CloseHandle(data->pWintrustData->u.pFile->hFile);
+ data->pWintrustData->u.pFile->hFile = INVALID_HANDLE_VALUE;
+ data->fOpenedFile = FALSE;
+ }
return S_OK;
}
--
2.1.3

1
patches/wintrust-Reset_hFile/definition Normal file
View File

@@ -0,0 +1 @@
Fixes: [36257] Wintrust doesn't reset data->pWintrustData->u.pFile->hFile after closing handle