You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-04-13 14:42:51 -07:00
Rebase against f820c0942854c14fcd063c83225af03e73286334.
[dinput-DIPROP_USERNAME] Removed patch to implement dinput device property DIPROP_USERNAME (accepted upstream). [kernel32-CreateFileA] Removed patch to check for invalid filename pointers in CreateFileA in Win 9x mode (accepted upstream). [kernel32-ERROR_DLL_NOT_FOUND] Removed patch to set ERROR_DLL_NOT_FOUND as error code for Win 9X instead of ERROR_MOD_NOT_FOUND in load_library (accepted upstream). [kernel32-GetOverlappedResult] Removed patch to fix handling of GetOverlappedResult when status remains STATUS_PENDING (accepted upstream). [setupapi-SetupDiSetDeviceInstallParamsW] Removed patch to add stub for setupapi.SetupDiSetDeviceInstallParamsW (accepted upstream). [user32-EnumDisplayMonitors] Removed patch to set %ecx to address of rect in EnumDisplayMonitors callback (accepted upstream).
This commit is contained in:
@@ -1,44 +0,0 @@
|
||||
From a3e9e92ee5c436b3704b505ae4ea4cc076526b0e Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sat, 31 Oct 2015 02:41:47 +0100
|
||||
Subject: ntdll: Use close_handle instead of NtClose for internal memory
|
||||
management functions.
|
||||
|
||||
---
|
||||
dlls/ntdll/virtual.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
|
||||
index f30d94a..54c4cf4 100644
|
||||
--- a/dlls/ntdll/virtual.c
|
||||
+++ b/dlls/ntdll/virtual.c
|
||||
@@ -1279,7 +1279,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz
|
||||
error:
|
||||
if (view) delete_view( view );
|
||||
server_leave_uninterrupted_section( &csVirtual, &sigset );
|
||||
- if (dup_mapping) NtClose( dup_mapping );
|
||||
+ if (dup_mapping) close_handle( dup_mapping );
|
||||
return status;
|
||||
}
|
||||
|
||||
@@ -2663,7 +2663,7 @@ NTSTATUS WINAPI SYSCALL(NtMapViewOfSection)( HANDLE handle, HANDLE process, PVOI
|
||||
res = map_image( handle, unix_handle, base, size, mask, header_size,
|
||||
shared_fd, dup_mapping, map_vprot, addr_ptr );
|
||||
if (shared_needs_close) close( shared_fd );
|
||||
- NtClose( shared_file );
|
||||
+ close_handle( shared_file );
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -2731,7 +2731,7 @@ NTSTATUS WINAPI SYSCALL(NtMapViewOfSection)( HANDLE handle, HANDLE process, PVOI
|
||||
server_leave_uninterrupted_section( &csVirtual, &sigset );
|
||||
|
||||
done:
|
||||
- if (dup_mapping) NtClose( dup_mapping );
|
||||
+ if (dup_mapping) close_handle( dup_mapping );
|
||||
if (needs_close) close( unix_handle );
|
||||
return res;
|
||||
}
|
||||
--
|
||||
2.6.1
|
||||
|
Reference in New Issue
Block a user