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
Added patch to simulate a more realistic kernel environment in ntoskrnl/winedevice.
This commit is contained in:
Sebastian Lackner
@@ -0,0 +1,352 @@
|
||||
From c0f0394525325d11a1bb6dce7329ea46b802e032 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Thu, 8 Jun 2017 23:38:38 +0200
|
||||
Subject: win32k.sys: Add stub driver.
|
||||
|
||||
---
|
||||
configure.ac | 1 +
|
||||
dlls/win32k.sys/Makefile.in | 6 +
|
||||
dlls/win32k.sys/main.c | 39 +++++++
|
||||
dlls/win32k.sys/win32k.sys.spec | 246 ++++++++++++++++++++++++++++++++++++++++
|
||||
tools/make_specfiles | 1 +
|
||||
5 files changed, 293 insertions(+)
|
||||
create mode 100644 dlls/win32k.sys/Makefile.in
|
||||
create mode 100644 dlls/win32k.sys/main.c
|
||||
create mode 100644 dlls/win32k.sys/win32k.sys.spec
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 5b9af9eece1..34f2a1af63d 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3621,6 +3621,7 @@ WINE_CONFIG_DLL(wiaservc,,[clean])
|
||||
WINE_CONFIG_TEST(dlls/wiaservc/tests)
|
||||
WINE_CONFIG_DLL(wimgapi)
|
||||
WINE_CONFIG_DLL(win32s16.dll16,enable_win16)
|
||||
+WINE_CONFIG_DLL(win32k.sys)
|
||||
WINE_CONFIG_DLL(win87em.dll16,enable_win16)
|
||||
WINE_CONFIG_DLL(winaspi.dll16,enable_win16)
|
||||
WINE_CONFIG_DLL(windebug.dll16,enable_win16)
|
||||
diff --git a/dlls/win32k.sys/Makefile.in b/dlls/win32k.sys/Makefile.in
|
||||
new file mode 100644
|
||||
index 00000000000..615d8335c36
|
||||
--- /dev/null
|
||||
+++ b/dlls/win32k.sys/Makefile.in
|
||||
@@ -0,0 +1,6 @@
|
||||
+MODULE = win32k.sys
|
||||
+IMPORTS = ntoskrnl
|
||||
+EXTRADLLFLAGS = -Wb,--subsystem,native
|
||||
+
|
||||
+C_SRCS = \
|
||||
+ main.c
|
||||
diff --git a/dlls/win32k.sys/main.c b/dlls/win32k.sys/main.c
|
||||
new file mode 100644
|
||||
index 00000000000..a1ec2d4fa3f
|
||||
--- /dev/null
|
||||
+++ b/dlls/win32k.sys/main.c
|
||||
@@ -0,0 +1,39 @@
|
||||
+/*
|
||||
+ * win32k.sys driver
|
||||
+ *
|
||||
+ * Copyright 2017 Michael Müller
|
||||
+ *
|
||||
+ * This library is free software; you can redistribute it and/or
|
||||
+ * modify it under the terms of the GNU Lesser General Public
|
||||
+ * License as published by the Free Software Foundation; either
|
||||
+ * version 2.1 of the License, or (at your option) any later version.
|
||||
+ *
|
||||
+ * This library is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
+ * Lesser General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU Lesser General Public
|
||||
+ * License along with this library; if not, write to the Free Software
|
||||
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
+ */
|
||||
+
|
||||
+#include <stdarg.h>
|
||||
+
|
||||
+#define NONAMELESSUNION
|
||||
+
|
||||
+#include "ntstatus.h"
|
||||
+#define WIN32_NO_STATUS
|
||||
+#include "windef.h"
|
||||
+#include "winbase.h"
|
||||
+#include "winternl.h"
|
||||
+#include "ddk/wdm.h"
|
||||
+#include "wine/debug.h"
|
||||
+
|
||||
+WINE_DEFAULT_DEBUG_CHANNEL(win32k);
|
||||
+
|
||||
+NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path )
|
||||
+{
|
||||
+ TRACE( "(%p, %s)\n", driver, debugstr_w(path->Buffer) );
|
||||
+ return STATUS_SUCCESS;
|
||||
+}
|
||||
diff --git a/dlls/win32k.sys/win32k.sys.spec b/dlls/win32k.sys/win32k.sys.spec
|
||||
new file mode 100644
|
||||
index 00000000000..f73b4984a6a
|
||||
--- /dev/null
|
||||
+++ b/dlls/win32k.sys/win32k.sys.spec
|
||||
@@ -0,0 +1,246 @@
|
||||
+@ stub BRUSHOBJ_hGetColorTransform
|
||||
+@ stub BRUSHOBJ_pvAllocRbrush
|
||||
+@ stub BRUSHOBJ_pvGetRbrush
|
||||
+@ stub BRUSHOBJ_ulGetBrushColor
|
||||
+@ stub CLIPOBJ_GetRgn
|
||||
+@ stub CLIPOBJ_bEnum
|
||||
+@ stub CLIPOBJ_cEnumStart
|
||||
+@ stub CLIPOBJ_ppoGetPath
|
||||
+@ stub EngAcquireFastMutex
|
||||
+@ stub EngAcquireSemaphore
|
||||
+@ stub EngAcquireSemaphoreNoWait
|
||||
+@ stub EngAcquireSemaphoreShared
|
||||
+@ stub EngAcquireSemaphoreSharedNoWait
|
||||
+@ stub EngAllocMem
|
||||
+@ stub EngAllocPrivateUserMem
|
||||
+@ stub EngAllocSectionMem
|
||||
+@ stub EngAllocUserMem
|
||||
+@ stub EngAlphaBlend
|
||||
+@ stub EngAssociateSurface
|
||||
+@ stub EngBitBlt
|
||||
+@ stub EngBugCheckEx
|
||||
+@ stub EngCTGetCurrentGamma
|
||||
+@ stub EngCTGetGammaTable
|
||||
+@ stub EngCheckAbort
|
||||
+@ stub EngClearEvent
|
||||
+@ stub EngCombineRgn
|
||||
+@ stub EngComputeGlyphSet
|
||||
+@ stub EngControlSprites
|
||||
+@ stub EngCopyBits
|
||||
+@ stub EngCopyRgn
|
||||
+@ stub EngCreateBitmap
|
||||
+@ stub EngCreateClip
|
||||
+@ stub EngCreateDeviceBitmap
|
||||
+@ stub EngCreateDeviceSurface
|
||||
+@ stub EngCreateDriverObj
|
||||
+@ stub EngCreateEvent
|
||||
+@ stub EngCreateFastMutex
|
||||
+@ stub EngCreatePalette
|
||||
+@ stub EngCreatePath
|
||||
+@ stub EngCreateRectRgn
|
||||
+@ stub EngCreateRedirectionDeviceBitmap
|
||||
+@ stub EngCreateSemaphore
|
||||
+@ stub EngCreateWnd
|
||||
+@ stub EngDebugBreak
|
||||
+@ stub EngDebugPrint
|
||||
+@ stub EngDeleteClip
|
||||
+@ stub EngDeleteDriverObj
|
||||
+@ stub EngDeleteEvent
|
||||
+@ stub EngDeleteFastMutex
|
||||
+@ stub EngDeleteFile
|
||||
+@ stub EngDeletePalette
|
||||
+@ stub EngDeletePath
|
||||
+@ stub EngDeleteRgn
|
||||
+@ stub EngDeleteSafeSemaphore
|
||||
+@ stub EngDeleteSemaphore
|
||||
+@ stub EngDeleteSurface
|
||||
+@ stub EngDeleteWnd
|
||||
+@ stub EngDeviceIoControl
|
||||
+@ stub EngDitherColor
|
||||
+@ stub EngDxIoctl
|
||||
+@ stub EngEnumForms
|
||||
+@ stub EngEqualRgn
|
||||
+@ stub EngEraseSurface
|
||||
+@ stub EngFileIoControl
|
||||
+@ stub EngFileWrite
|
||||
+@ stub EngFillPath
|
||||
+@ stub EngFindImageProcAddress
|
||||
+@ stub EngFindResource
|
||||
+@ stub EngFntCacheAlloc
|
||||
+@ stub EngFntCacheFault
|
||||
+@ stub EngFntCacheLookUp
|
||||
+@ stub EngFreeMem
|
||||
+@ stub EngFreeModule
|
||||
+@ stub EngFreePrivateUserMem
|
||||
+@ stub EngFreeSectionMem
|
||||
+@ stub EngFreeUserMem
|
||||
+@ stub EngGetCurrentCodePage
|
||||
+@ stub EngGetCurrentProcessId
|
||||
+@ stub EngGetCurrentThreadId
|
||||
+@ stub EngGetDriverName
|
||||
+@ stub EngGetFileChangeTime
|
||||
+@ stub EngGetFilePath
|
||||
+@ stub EngGetForm
|
||||
+@ stub EngGetLastError
|
||||
+@ stub EngGetPrinter
|
||||
+@ stub EngGetPrinterData
|
||||
+@ stub EngGetPrinterDataFileName
|
||||
+@ stub EngGetPrinterDriver
|
||||
+@ stub EngGetProcessHandle
|
||||
+@ stub EngGetRgnBox
|
||||
+@ stub EngGetRgnData
|
||||
+@ stub EngGetTickCount
|
||||
+@ stub EngGetType1FontList
|
||||
+@ stub EngGradientFill
|
||||
+@ stub EngHangNotification
|
||||
+@ stub EngInitializeSafeSemaphore
|
||||
+@ stub EngIntersectRgn
|
||||
+@ stub EngIsSemaphoreOwned
|
||||
+@ stub EngIsSemaphoreOwnedByCurrentThread
|
||||
+@ stub EngIsSemaphoreSharedByCurrentThread
|
||||
+@ stub EngLineTo
|
||||
+@ stub EngLoadImage
|
||||
+@ stub EngLoadModule
|
||||
+@ stub EngLoadModuleForWrite
|
||||
+@ stub EngLockDirectDrawSurface
|
||||
+@ stub EngLockDriverObj
|
||||
+@ stub EngLockSurface
|
||||
+@ stub EngLpkInstalled
|
||||
+@ stub EngMapEvent
|
||||
+@ stub EngMapFile
|
||||
+@ stub EngMapFontFile
|
||||
+@ stub EngMapFontFileFD
|
||||
+@ stub EngMapModule
|
||||
+@ stub EngMapSection
|
||||
+@ stub EngMarkBandingSurface
|
||||
+@ stub EngModifySurface
|
||||
+@ stub EngMovePointer
|
||||
+@ stub EngMulDiv
|
||||
+@ stub EngMultiByteToUnicodeN
|
||||
+@ stub EngMultiByteToWideChar
|
||||
+@ stub EngNineGrid
|
||||
+@ stub EngOffsetRgn
|
||||
+@ stub EngPaint
|
||||
+@ stub EngPlgBlt
|
||||
+@ stub EngProbeForRead
|
||||
+@ stub EngProbeForReadAndWrite
|
||||
+@ stub EngQueryDeviceAttribute
|
||||
+@ stub EngQueryLocalTime
|
||||
+@ stub EngQueryPalette
|
||||
+@ stub EngQueryPerformanceCounter
|
||||
+@ stub EngQueryPerformanceFrequency
|
||||
+@ stub EngQuerySystemAttribute
|
||||
+@ stub EngQueryW32kCddInterface
|
||||
+@ stub EngReadStateEvent
|
||||
+@ stub EngRectInRgn
|
||||
+@ stub EngReleaseFastMutex
|
||||
+@ stub EngReleaseSemaphore
|
||||
+@ stub EngRestoreFloatingPointState
|
||||
+@ stub EngSaveFloatingPointState
|
||||
+@ stub EngSecureMem
|
||||
+@ stub EngSetEvent
|
||||
+@ stub EngSetLastError
|
||||
+@ stub EngSetPointerShape
|
||||
+@ stub EngSetPointerTag
|
||||
+@ stub EngSetPrinterData
|
||||
+@ stub EngSetRectRgn
|
||||
+@ stub EngSort
|
||||
+@ stub EngStretchBlt
|
||||
+@ stub EngStretchBltROP
|
||||
+@ stub EngStrokeAndFillPath
|
||||
+@ stub EngStrokePath
|
||||
+@ stub EngSubtractRgn
|
||||
+@ stub EngTextOut
|
||||
+@ stub EngTransparentBlt
|
||||
+@ stub EngUnicodeToMultiByteN
|
||||
+@ stub EngUnionRgn
|
||||
+@ stub EngUnloadImage
|
||||
+@ stub EngUnlockDirectDrawSurface
|
||||
+@ stub EngUnlockDriverObj
|
||||
+@ stub EngUnlockSurface
|
||||
+@ stub EngUnmapEvent
|
||||
+@ stub EngUnmapFile
|
||||
+@ stub EngUnmapFontFile
|
||||
+@ stub EngUnmapFontFileFD
|
||||
+@ stub EngUnsecureMem
|
||||
+@ stub EngUpdateDeviceSurface
|
||||
+@ stub EngWaitForSingleObject
|
||||
+@ stub EngWideCharToMultiByte
|
||||
+@ stub EngWritePrinter
|
||||
+@ stub EngXorRgn
|
||||
+@ stub FONTOBJ_cGetAllGlyphHandles
|
||||
+@ stub FONTOBJ_cGetGlyphs
|
||||
+@ stub FONTOBJ_pQueryGlyphAttrs
|
||||
+@ stub FONTOBJ_pfdg
|
||||
+@ stub FONTOBJ_pifi
|
||||
+@ stub FONTOBJ_pjOpenTypeTablePointer
|
||||
+@ stub FONTOBJ_pvTrueTypeFontFile
|
||||
+@ stub FONTOBJ_pwszFontFilePaths
|
||||
+@ stub FONTOBJ_pxoGetXform
|
||||
+@ stub FONTOBJ_vGetInfo
|
||||
+@ stub HT_ComputeRGBGammaTable
|
||||
+@ stub HT_Get8BPPFormatPalette
|
||||
+@ stub HT_Get8BPPMaskPalette
|
||||
+@ stub HeapVidMemAllocAligned
|
||||
+@ stub PALOBJ_cGetColors
|
||||
+@ stub PATHOBJ_bCloseFigure
|
||||
+@ stub PATHOBJ_bEnum
|
||||
+@ stub PATHOBJ_bEnumClipLines
|
||||
+@ stub PATHOBJ_bMoveTo
|
||||
+@ stub PATHOBJ_bPolyBezierTo
|
||||
+@ stub PATHOBJ_bPolyLineTo
|
||||
+@ stub PATHOBJ_vEnumStart
|
||||
+@ stub PATHOBJ_vEnumStartClipLines
|
||||
+@ stub PATHOBJ_vGetBounds
|
||||
+@ stdcall RtlAnsiCharToUnicodeChar(ptr) ntoskrnl.exe.RtlAnsiCharToUnicodeChar
|
||||
+@ stdcall -norelay RtlCaptureContext(ptr) ntoskrnl.exe.RtlCaptureContext
|
||||
+@ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr long) ntoskrnl.exe.RtlCopyMemory
|
||||
+@ stub RtlCopyMemoryNonTemporal
|
||||
+@ stdcall RtlFillMemory(ptr long long) ntoskrnl.exe.RtlFillMemory
|
||||
+@ stub RtlLookupFunctionEntry
|
||||
+@ stdcall RtlMoveMemory(ptr ptr long) ntoskrnl.exe.RtlMoveMemory
|
||||
+@ stdcall RtlMultiByteToUnicodeN(ptr long ptr ptr long) ntoskrnl.exe.RtlMultiByteToUnicodeN
|
||||
+@ stub RtlPcToFileHeader
|
||||
+@ stdcall -register RtlRaiseException(ptr) ntoskrnl.exe.RtlRaiseException
|
||||
+@ stub RtlRestoreContext
|
||||
+@ stdcall RtlUnicodeToMultiByteN(ptr long ptr ptr long) ntoskrnl.exe.RtlUnicodeToMultiByteN
|
||||
+@ stdcall RtlUnicodeToMultiByteSize(ptr ptr long) ntoskrnl.exe.RtlUnicodeToMultiByteSize
|
||||
+@ stdcall -register RtlUnwind(ptr ptr ptr ptr) ntoskrnl.exe.RtlUnwind
|
||||
+@ stdcall -arch=x86_64 RtlUnwindEx(ptr ptr ptr ptr ptr ptr) ntoskrnl.exe.RtlUnwindEx
|
||||
+@ stdcall RtlUpcaseUnicodeChar(long) ntoskrnl.exe.RtlUpcaseUnicodeChar
|
||||
+@ stdcall RtlUpcaseUnicodeToMultiByteN(ptr long ptr ptr long) ntoskrnl.exe.RtlUpcaseUnicodeToMultiByteN
|
||||
+@ stub RtlVirtualUnwind
|
||||
+@ stdcall RtlZeroMemory(ptr long) ntoskrnl.exe.RtlZeroMemory
|
||||
+@ stub STROBJ_bEnum
|
||||
+@ stub STROBJ_bEnumPositionsOnly
|
||||
+@ stub STROBJ_bGetAdvanceWidths
|
||||
+@ stub STROBJ_dwGetCodePage
|
||||
+@ stub STROBJ_fxBreakExtra
|
||||
+@ stub STROBJ_fxCharacterExtra
|
||||
+@ stub STROBJ_vEnumStart
|
||||
+@ stub VidMemFree
|
||||
+@ stub W32pArgumentTable
|
||||
+@ stub W32pServiceLimit
|
||||
+@ stub W32pServiceTable
|
||||
+@ stub WNDOBJ_bEnum
|
||||
+@ stub WNDOBJ_cEnumStart
|
||||
+@ stub WNDOBJ_vSetConsumer
|
||||
+@ stub XFORMOBJ_bApplyXform
|
||||
+@ stub XFORMOBJ_iGetFloatObjXform
|
||||
+@ stub XFORMOBJ_iGetXform
|
||||
+@ stub XLATEOBJ_cGetPalette
|
||||
+@ stub XLATEOBJ_hGetColorTransform
|
||||
+@ stub XLATEOBJ_iXlate
|
||||
+@ stub XLATEOBJ_piVector
|
||||
+@ stub __C_specific_handler
|
||||
+@ stub __chkstk
|
||||
+@ cdecl -private _itoa(long ptr long) ntoskrnl.exe._itoa
|
||||
+@ cdecl -private _itow(long ptr long) ntoskrnl.exe._itow
|
||||
+@ cdecl -private -arch=x86_64 _local_unwind(ptr ptr) ntoskrnl.exe._local_unwind
|
||||
+@ stub _setjmp
|
||||
+@ stub _setjmpex
|
||||
+@ stub longjmp
|
||||
+@ stub memcmp
|
||||
+@ cdecl -private memcpy(ptr ptr long) ntoskrnl.exe.memcpy
|
||||
+@ cdecl -private memmove(ptr ptr long) ntoskrnl.exe.memmove
|
||||
+@ cdecl -private memset(ptr long long) ntoskrnl.exe.memset
|
||||
diff --git a/tools/make_specfiles b/tools/make_specfiles
|
||||
index 71ad3b30ea2..0b30f9f93e8 100755
|
||||
--- a/tools/make_specfiles
|
||||
+++ b/tools/make_specfiles
|
||||
@@ -390,6 +390,7 @@ my @dll_groups =
|
||||
[
|
||||
"ntoskrnl.exe",
|
||||
"hal",
|
||||
+ "win32k.sys",
|
||||
],
|
||||
);
|
||||
|
||||
--
|
||||
2.13.1
|
||||
|
||||
@@ -0,0 +1,140 @@
|
||||
From bb9c9298a20f26135492ded2056eb2e49e72c024 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Thu, 8 Jun 2017 23:41:02 +0200
|
||||
Subject: dxgkrnl.sys: Add stub driver.
|
||||
|
||||
---
|
||||
configure.ac | 1 +
|
||||
dlls/dxgkrnl.sys/Makefile.in | 6 ++++++
|
||||
dlls/dxgkrnl.sys/dxgkrnl.sys.spec | 26 ++++++++++++++++++++++++++
|
||||
dlls/dxgkrnl.sys/main.c | 39 +++++++++++++++++++++++++++++++++++++++
|
||||
loader/wine.inf.in | 2 ++
|
||||
5 files changed, 74 insertions(+)
|
||||
create mode 100644 dlls/dxgkrnl.sys/Makefile.in
|
||||
create mode 100644 dlls/dxgkrnl.sys/dxgkrnl.sys.spec
|
||||
create mode 100644 dlls/dxgkrnl.sys/main.c
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 34f2a1af63d..90ea217e887 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3158,6 +3158,7 @@ WINE_CONFIG_LIB(dxerr8)
|
||||
WINE_CONFIG_LIB(dxerr9)
|
||||
WINE_CONFIG_DLL(dxgi,,[implib])
|
||||
WINE_CONFIG_TEST(dlls/dxgi/tests)
|
||||
+WINE_CONFIG_DLL(dxgkrnl.sys)
|
||||
WINE_CONFIG_LIB(dxguid)
|
||||
WINE_CONFIG_DLL(dxva2,,[clean])
|
||||
WINE_CONFIG_TEST(dlls/dxva2/tests)
|
||||
diff --git a/dlls/dxgkrnl.sys/Makefile.in b/dlls/dxgkrnl.sys/Makefile.in
|
||||
new file mode 100644
|
||||
index 00000000000..e18ea70a995
|
||||
--- /dev/null
|
||||
+++ b/dlls/dxgkrnl.sys/Makefile.in
|
||||
@@ -0,0 +1,6 @@
|
||||
+MODULE = dxgkrnl.sys
|
||||
+IMPORTS = ntoskrnl
|
||||
+EXTRADLLFLAGS = -Wb,--subsystem,native
|
||||
+
|
||||
+C_SRCS = \
|
||||
+ main.c
|
||||
diff --git a/dlls/dxgkrnl.sys/dxgkrnl.sys.spec b/dlls/dxgkrnl.sys/dxgkrnl.sys.spec
|
||||
new file mode 100644
|
||||
index 00000000000..8487664f8a7
|
||||
--- /dev/null
|
||||
+++ b/dlls/dxgkrnl.sys/dxgkrnl.sys.spec
|
||||
@@ -0,0 +1,26 @@
|
||||
+@ stub TdrCompleteRecoveryContext
|
||||
+@ stub TdrCreateRecoveryContext
|
||||
+@ stub TdrIsRecoveryRequired
|
||||
+@ stub TdrIsTimeoutForcedFlip
|
||||
+@ stub TdrResetFromTimeout
|
||||
+@ stub g_TdrConfig
|
||||
+@ stub g_TdrForceTimeout
|
||||
+@ stub DpSynchronizeExecution
|
||||
+@ stub DpiGetDriverVersion
|
||||
+@ stub DpiGetDxgAdapter
|
||||
+@ stub DpiGetSchedulerCallbackState
|
||||
+@ stub DpiSetSchedulerCallbackState
|
||||
+@ stub DxgCoreInterface
|
||||
+@ stub DxgkSqmAddToStream
|
||||
+@ stub DxgkSqmCommonGeneric
|
||||
+@ stub DxgkSqmCreateDwordStreamEntry
|
||||
+@ stub DxgkSqmCreateStringStreamEntry
|
||||
+@ stub DxgkSqmGenericDword
|
||||
+@ stub DxgkSqmGenericDword64
|
||||
+@ stub TraceDxgkBlockThread
|
||||
+@ stub TraceDxgkContext
|
||||
+@ stub TraceDxgkDevice
|
||||
+@ stub TraceDxgkFunctionProfiler
|
||||
+@ stub TraceDxgkPerformanceWarning
|
||||
+@ stub TraceDxgkPresentHistory
|
||||
+@ stub g_loggerInfo
|
||||
diff --git a/dlls/dxgkrnl.sys/main.c b/dlls/dxgkrnl.sys/main.c
|
||||
new file mode 100644
|
||||
index 00000000000..c5639c237c8
|
||||
--- /dev/null
|
||||
+++ b/dlls/dxgkrnl.sys/main.c
|
||||
@@ -0,0 +1,39 @@
|
||||
+/*
|
||||
+ * dxgkrnl.sys driver
|
||||
+ *
|
||||
+ * Copyright 2017 Michael Müller
|
||||
+ *
|
||||
+ * This library is free software; you can redistribute it and/or
|
||||
+ * modify it under the terms of the GNU Lesser General Public
|
||||
+ * License as published by the Free Software Foundation; either
|
||||
+ * version 2.1 of the License, or (at your option) any later version.
|
||||
+ *
|
||||
+ * This library is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
+ * Lesser General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU Lesser General Public
|
||||
+ * License along with this library; if not, write to the Free Software
|
||||
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
+ */
|
||||
+
|
||||
+#include <stdarg.h>
|
||||
+
|
||||
+#define NONAMELESSUNION
|
||||
+
|
||||
+#include "ntstatus.h"
|
||||
+#define WIN32_NO_STATUS
|
||||
+#include "windef.h"
|
||||
+#include "winbase.h"
|
||||
+#include "winternl.h"
|
||||
+#include "ddk/wdm.h"
|
||||
+#include "wine/debug.h"
|
||||
+
|
||||
+WINE_DEFAULT_DEBUG_CHANNEL(dxgkrnl);
|
||||
+
|
||||
+NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path )
|
||||
+{
|
||||
+ TRACE( "(%p, %s)\n", driver, debugstr_w(path->Buffer) );
|
||||
+ return STATUS_SUCCESS;
|
||||
+}
|
||||
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
|
||||
index 275862845d1..654858f7537 100644
|
||||
--- a/loader/wine.inf.in
|
||||
+++ b/loader/wine.inf.in
|
||||
@@ -2595,6 +2595,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
|
||||
10,syswow64,stdole2.tlb
|
||||
11,,iexplore.exe
|
||||
11,,winetest.exe,-
|
||||
+12,,dxgkrnl.sys,-
|
||||
12,,fltmgr.sys,-
|
||||
12,,mountmgr.sys,-
|
||||
12,,ndis.sys,-
|
||||
@@ -2639,6 +2640,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
|
||||
11,,iexplore.exe
|
||||
11,,notepad.exe
|
||||
11,,winetest.exe,-
|
||||
+12,,dxgkrnl.sys
|
||||
12,,fltmgr.sys
|
||||
12,,mountmgr.sys
|
||||
12,,ndis.sys
|
||||
--
|
||||
2.13.1
|
||||
|
||||
@@ -0,0 +1,116 @@
|
||||
From 0a1d6232f852b4ff869786aff4ec20e78ac2ce72 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Thu, 8 Jun 2017 23:42:32 +0200
|
||||
Subject: dxgmms1.sys: Add stub driver.
|
||||
|
||||
---
|
||||
configure.ac | 1 +
|
||||
dlls/dxgmms1.sys/Makefile.in | 6 ++++++
|
||||
dlls/dxgmms1.sys/dxgmms1.sys.spec | 2 ++
|
||||
dlls/dxgmms1.sys/main.c | 39 +++++++++++++++++++++++++++++++++++++++
|
||||
loader/wine.inf.in | 2 ++
|
||||
5 files changed, 50 insertions(+)
|
||||
create mode 100644 dlls/dxgmms1.sys/Makefile.in
|
||||
create mode 100644 dlls/dxgmms1.sys/dxgmms1.sys.spec
|
||||
create mode 100644 dlls/dxgmms1.sys/main.c
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 90ea217e887..5aaa20c22b6 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3159,6 +3159,7 @@ WINE_CONFIG_LIB(dxerr9)
|
||||
WINE_CONFIG_DLL(dxgi,,[implib])
|
||||
WINE_CONFIG_TEST(dlls/dxgi/tests)
|
||||
WINE_CONFIG_DLL(dxgkrnl.sys)
|
||||
+WINE_CONFIG_DLL(dxgmms1.sys)
|
||||
WINE_CONFIG_LIB(dxguid)
|
||||
WINE_CONFIG_DLL(dxva2,,[clean])
|
||||
WINE_CONFIG_TEST(dlls/dxva2/tests)
|
||||
diff --git a/dlls/dxgmms1.sys/Makefile.in b/dlls/dxgmms1.sys/Makefile.in
|
||||
new file mode 100644
|
||||
index 00000000000..affb9ce95f8
|
||||
--- /dev/null
|
||||
+++ b/dlls/dxgmms1.sys/Makefile.in
|
||||
@@ -0,0 +1,6 @@
|
||||
+MODULE = dxgmms1.sys
|
||||
+IMPORTS = ntoskrnl
|
||||
+EXTRADLLFLAGS = -Wb,--subsystem,native
|
||||
+
|
||||
+C_SRCS = \
|
||||
+ main.c
|
||||
diff --git a/dlls/dxgmms1.sys/dxgmms1.sys.spec b/dlls/dxgmms1.sys/dxgmms1.sys.spec
|
||||
new file mode 100644
|
||||
index 00000000000..124b0bf944d
|
||||
--- /dev/null
|
||||
+++ b/dlls/dxgmms1.sys/dxgmms1.sys.spec
|
||||
@@ -0,0 +1,2 @@
|
||||
+@ stub VidMmInterface
|
||||
+@ stub VidSchInterface
|
||||
diff --git a/dlls/dxgmms1.sys/main.c b/dlls/dxgmms1.sys/main.c
|
||||
new file mode 100644
|
||||
index 00000000000..686493d3296
|
||||
--- /dev/null
|
||||
+++ b/dlls/dxgmms1.sys/main.c
|
||||
@@ -0,0 +1,39 @@
|
||||
+/*
|
||||
+ * dxgmms1.sys driver
|
||||
+ *
|
||||
+ * Copyright 2017 Michael Müller
|
||||
+ *
|
||||
+ * This library is free software; you can redistribute it and/or
|
||||
+ * modify it under the terms of the GNU Lesser General Public
|
||||
+ * License as published by the Free Software Foundation; either
|
||||
+ * version 2.1 of the License, or (at your option) any later version.
|
||||
+ *
|
||||
+ * This library is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
+ * Lesser General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU Lesser General Public
|
||||
+ * License along with this library; if not, write to the Free Software
|
||||
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
+ */
|
||||
+
|
||||
+#include <stdarg.h>
|
||||
+
|
||||
+#define NONAMELESSUNION
|
||||
+
|
||||
+#include "ntstatus.h"
|
||||
+#define WIN32_NO_STATUS
|
||||
+#include "windef.h"
|
||||
+#include "winbase.h"
|
||||
+#include "winternl.h"
|
||||
+#include "ddk/wdm.h"
|
||||
+#include "wine/debug.h"
|
||||
+
|
||||
+WINE_DEFAULT_DEBUG_CHANNEL(dxgmms1);
|
||||
+
|
||||
+NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path )
|
||||
+{
|
||||
+ TRACE( "(%p, %s)\n", driver, debugstr_w(path->Buffer) );
|
||||
+ return STATUS_SUCCESS;
|
||||
+}
|
||||
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
|
||||
index 654858f7537..176647b8beb 100644
|
||||
--- a/loader/wine.inf.in
|
||||
+++ b/loader/wine.inf.in
|
||||
@@ -2596,6 +2596,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
|
||||
11,,iexplore.exe
|
||||
11,,winetest.exe,-
|
||||
12,,dxgkrnl.sys,-
|
||||
+12,,dxgmms1.sys,-
|
||||
12,,fltmgr.sys,-
|
||||
12,,mountmgr.sys,-
|
||||
12,,ndis.sys,-
|
||||
@@ -2641,6 +2642,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
|
||||
11,,notepad.exe
|
||||
11,,winetest.exe,-
|
||||
12,,dxgkrnl.sys
|
||||
+12,,dxgmms1.sys
|
||||
12,,fltmgr.sys
|
||||
12,,mountmgr.sys
|
||||
12,,ndis.sys
|
||||
--
|
||||
2.13.1
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
From 5148db493d915193f38d4b7f4f555030a8e9c476 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Thu, 8 Jun 2017 23:50:03 +0200
|
||||
Subject: programs/winedevice: Load some common drivers and fix ldr order.
|
||||
|
||||
---
|
||||
programs/winedevice/device.c | 26 ++++++++++++++++++++++++++
|
||||
1 file changed, 26 insertions(+)
|
||||
|
||||
diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c
|
||||
index b2eb0eed7f2..90bf9d6f9cc 100644
|
||||
--- a/programs/winedevice/device.c
|
||||
+++ b/programs/winedevice/device.c
|
||||
@@ -583,7 +583,33 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_
|
||||
|
||||
static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv )
|
||||
{
|
||||
+ static const WCHAR ntoskrnlW[] = {'n','t','o','s','k','r','n','l','.','e','x','e',0};
|
||||
+ static const WCHAR win32kW[] = {'w','i','n','3','2','k','.','s','y','s',0};
|
||||
+ static const WCHAR dxgkrnlW[] = {'d','x','g','k','r','n','l','.','s','y','s',0};
|
||||
+ static const WCHAR dxgmms1W[] = {'d','x','g','m','m','s','1','.','s','y','s',0};
|
||||
+ static const WCHAR *stubs[] = { win32kW, dxgkrnlW, dxgmms1W };
|
||||
const WCHAR *service_group = (argc >= 2) ? argv[1] : argv[0];
|
||||
+ LDR_MODULE *ldr;
|
||||
+ ULONG_PTR magic;
|
||||
+ int i;
|
||||
+
|
||||
+ /* Load some default drivers (required by anticheat drivers) */
|
||||
+ for (i = 0; i < sizeof(stubs)/sizeof(stubs[0]); i++)
|
||||
+ {
|
||||
+ if (!LoadLibraryW( stubs[i] ))
|
||||
+ ERR( "Failed to load %s\n", debugstr_w( stubs[i] ) );
|
||||
+ }
|
||||
+
|
||||
+ /* ntoskrnl.exe must be the first module */
|
||||
+ LdrLockLoaderLock( 0, NULL, &magic );
|
||||
+ if (!LdrFindEntryForAddress( GetModuleHandleW( ntoskrnlW ), &ldr ))
|
||||
+ {
|
||||
+ RemoveEntryList( &ldr->InLoadOrderModuleList );
|
||||
+ InsertHeadList( &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList, &ldr->InLoadOrderModuleList );
|
||||
+ RemoveEntryList( &ldr->InMemoryOrderModuleList);
|
||||
+ InsertHeadList( &NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList, &ldr->InMemoryOrderModuleList );
|
||||
+ }
|
||||
+ LdrUnlockLoaderLock( 0, magic );
|
||||
|
||||
if (!(stop_event = CreateEventW( NULL, TRUE, FALSE, NULL )))
|
||||
return;
|
||||
--
|
||||
2.13.1
|
||||
|
||||
2
patches/winedevice-Default_Drivers/definition
Normal file
2
patches/winedevice-Default_Drivers/definition
Normal file
@@ -0,0 +1,2 @@
|
||||
Fixes: Simulate a more realistic kernel environment in ntoskrnl/winedevice
|
||||
Depends: dxva2-Video_Decoder
|
||||
Reference in New Issue
Block a user