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

Rebase against b190a72bfe53a41a83ae55d75de8327c24512bee.

Browse Source 
[uxtheme-CloseThemeData]
Removed patch to avoid crash when INVALID_HANDLE_VALUE is passed to
CloseThemeData (accepted upstream).
This commit is contained in:
Sebastian Lackner
2016-02-15 19:00:07 +01:00
parent cb7a46b342
commit bcf8079573
5 changed files with 29 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
patches/ntoskrnl-Stubs/0004-ntoskrnl.exe-Add-stubs-for-ObReferenceObjectByPointe.patch
View File

@@ -1,25 +1,23 @@
From 787df5f7b3137d116141bbe4fdba664a06a9c5af Mon Sep 17 00:00:00 2001
From 7bab64e071904df31e980969a19a231099cfd6c0 Mon Sep 17 00:00:00 2001
From: Alexander Morozov <amorozov@etersoft.ru>
Date: Fri, 30 Jan 2015 00:01:37 +0100
Subject: ntoskrnl.exe: Add stubs for ObReferenceObjectByPointer and
ObDereferenceObject.
---
dlls/ntoskrnl.exe/ntoskrnl.c | 25 ++++++++++++++++++++++++-
dlls/ntoskrnl.exe/ntoskrnl.c | 24 +++++++++++++++++++++++-
dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++--
include/ddk/wdm.h | 2 ++
3 files changed, 28 insertions(+), 3 deletions(-)
3 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
index d33fe6f..0d6f730 100644
index 702cde7..3d22563 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
@@ -1720,6 +1720,29 @@ NTSTATUS WINAPI ObReferenceObjectByName( UNICODE_STRING *ObjectName,
return STATUS_NOT_IMPLEMENTED;
}
@@ -2067,6 +2067,28 @@ NTSTATUS WINAPI ObReferenceObjectByName( UNICODE_STRING *ObjectName,
+
+/***********************************************************************
/***********************************************************************
+ * ObReferenceObjectByPointer (NTOSKRNL.EXE.@)
+ */
+NTSTATUS WINAPI ObReferenceObjectByPointer(VOID *obj, ACCESS_MASK access,
@@ -41,20 +39,21 @@ index d33fe6f..0d6f730 100644
+}
+
+
/***********************************************************************
* ObfDereferenceObject (NTOSKRNL.EXE.@)
+/***********************************************************************
* ObfReferenceObject (NTOSKRNL.EXE.@)
*/
@@ -1730,7 +1753,7 @@ void WINAPI __regs_ObfDereferenceObject( VOID *obj )
void WINAPI ObfDereferenceObject( VOID *obj )
#ifdef DEFINE_FASTCALL1_ENTRYPOINT
@@ -2090,7 +2112,7 @@ void WINAPI __regs_ObfDereferenceObject( void *obj )
void WINAPI ObfDereferenceObject( void *obj )
#endif
{
- FIXME( "stub: %p\n", obj );
- FIXME( "(%p): stub\n", obj );
+ ObDereferenceObject( obj );
}
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
index 2f08945..25624a6 100644
index 1a19fd5..acc1713 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
@@ -798,7 +798,7 @@
@@ -76,10 +75,10 @@ index 2f08945..25624a6 100644
@ stub ObReleaseObjectSecurity
@ stub ObSetHandleAttributes
diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h
index 121ca45..f2eb6a5 100644
index f5efc59..fceb4b2 100644
--- a/include/ddk/wdm.h
+++ b/include/ddk/wdm.h
@@ -1235,7 +1235,9 @@ PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,PHYSICA
@@ -1252,7 +1252,9 @@ PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,PHYSICA
void WINAPI MmFreeNonCachedMemory(PVOID,SIZE_T);
MM_SYSTEMSIZE WINAPI MmQuerySystemSize(void);
@@ -90,5 +89,5 @@ index 121ca45..f2eb6a5 100644
POWER_STATE WINAPI PoSetPowerState(PDEVICE_OBJECT,POWER_STATE_TYPE,POWER_STATE);
NTSTATUS WINAPI PsCreateSystemThread(PHANDLE,ULONG,POBJECT_ATTRIBUTES,HANDLE,PCLIENT_ID,PKSTART_ROUTINE,PVOID);
--
2.2.2
2.7.1

23
patches/ntoskrnl-Stubs/0010-ntoskrnl.exe-Implement-MmMapLockedPages-and-MmUnmapL.patch
View File

@@ -1,18 +1,18 @@
From 2312e4f90d7f17f6e631ee7f1839d30ffa70241e Mon Sep 17 00:00:00 2001
From c4b9b10d49301e248612f06b984ed9c6e9968673 Mon Sep 17 00:00:00 2001
From: Christian Costa <titan.costa@gmail.com>
Date: Sun, 1 Feb 2015 12:53:09 +0100
Subject: ntoskrnl.exe: Implement MmMapLockedPages and MmUnmapLockedPages.
---
dlls/ntoskrnl.exe/ntoskrnl.c | 21 +++++++++++++++++++++
dlls/ntoskrnl.exe/ntoskrnl.c | 20 ++++++++++++++++++++
dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++--
2 files changed, 23 insertions(+), 2 deletions(-)
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
index 715f302..10957e8 100644
index 9c88479..9b5058b 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
@@ -1673,6 +1673,16 @@ VOID WINAPI MmLockPagableSectionByHandle(PVOID ImageSectionHandle)
@@ -1991,6 +1991,16 @@ VOID WINAPI MmLockPagableSectionByHandle(PVOID ImageSectionHandle)
FIXME("stub %p\n", ImageSectionHandle);
}
@@ -29,11 +29,10 @@ index 715f302..10957e8 100644
/***********************************************************************
* MmMapLockedPagesSpecifyCache (NTOSKRNL.EXE.@)
*/
@@ -1737,6 +1747,17 @@ VOID WINAPI MmUnmapIoSpace( PVOID BaseAddress, SIZE_T NumberOfBytes )
FIXME( "stub: %p, %lu\n", BaseAddress, NumberOfBytes );
@@ -2056,6 +2066,16 @@ VOID WINAPI MmUnmapIoSpace( PVOID BaseAddress, SIZE_T NumberOfBytes )
}
+
+/***********************************************************************
+ * MmUnmapLockedPages (NTOSKRNL.EXE.@)
+ */
@@ -44,11 +43,11 @@ index 715f302..10957e8 100644
+}
+
+
/***********************************************************************
* ObfReferenceObject (NTOSKRNL.EXE.@)
/***********************************************************************
* ObReferenceObjectByHandle (NTOSKRNL.EXE.@)
*/
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
index 238c953..4a112ef 100644
index 7283510..0cd5c99 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
@@ -689,7 +689,7 @@
@@ -70,5 +69,5 @@ index 238c953..4a112ef 100644
@ stub MmUnmapVideoDisplay
@ stub MmUnmapViewInSessionSpace
--
2.3.0
2.7.1