mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Rebase against 699eb8cdba8fe236f038550e2bd68a4cd2cab055.
This commit is contained in:
Zebediah Figura
parent
ceb31ed876
commit
60f0f50382
File diff suppressed because it is too large
Load Diff
@ -1 +0,0 @@
|
||||
Fixes: [33456] d3dx9_36: D3DXMatrixTransformation support NULL scaling matrix
|
||||
@ -1,20 +1,20 @@
|
||||
From 7b85e96f6dbced2fa2bb4c8f73b26abfd442dfef Mon Sep 17 00:00:00 2001
|
||||
From fe51309d6a518b11b1d9db5e42abfb6d31cae9eb Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Tue, 6 Jun 2017 23:42:56 +0200
|
||||
Subject: [PATCH] ntoskrnl.exe: Implement ExInitializeNPagedLookasideList.
|
||||
|
||||
---
|
||||
dlls/ntoskrnl.exe/ntoskrnl.c | 19 +++++++++-
|
||||
dlls/ntoskrnl.exe/tests/driver.c | 37 +++++++++++++++++--
|
||||
include/ddk/wdm.h | 76 ++++++++++++++++++++++++++++++++++++++--
|
||||
include/winnt.h | 2 ++
|
||||
dlls/ntoskrnl.exe/ntoskrnl.c | 19 +++++++-
|
||||
dlls/ntoskrnl.exe/tests/driver.c | 37 ++++++++++++++--
|
||||
include/ddk/wdm.h | 76 ++++++++++++++++++++++++++++++--
|
||||
include/winnt.h | 2 +
|
||||
4 files changed, 127 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
index 14a6e82..6123a45 100644
|
||||
index 952fa5ec..2e08a50e 100644
|
||||
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
@@ -2029,7 +2029,24 @@ void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST Lookaside,
|
||||
@@ -2181,7 +2181,24 @@ void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST Lookaside,
|
||||
ULONG Tag,
|
||||
USHORT Depth)
|
||||
{
|
||||
@ -41,7 +41,7 @@ index 14a6e82..6123a45 100644
|
||||
|
||||
/***********************************************************************
|
||||
diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c
|
||||
index 2e1107b..4f32c30 100644
|
||||
index e361d345..2260816c 100644
|
||||
--- a/dlls/ntoskrnl.exe/tests/driver.c
|
||||
+++ b/dlls/ntoskrnl.exe/tests/driver.c
|
||||
@@ -22,6 +22,9 @@
|
||||
@ -54,7 +54,7 @@ index 2e1107b..4f32c30 100644
|
||||
#include "ntstatus.h"
|
||||
#define WIN32_NO_STATUS
|
||||
#include "windef.h"
|
||||
@@ -525,6 +528,33 @@ static void test_version(void)
|
||||
@@ -528,6 +531,33 @@ static void test_version(void)
|
||||
ok(*pNtBuildNumber == build, "Expected build number %u, got %u\n", build, *pNtBuildNumber);
|
||||
}
|
||||
|
||||
@ -88,7 +88,7 @@ index 2e1107b..4f32c30 100644
|
||||
static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info)
|
||||
{
|
||||
ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength;
|
||||
@@ -555,6 +585,7 @@ static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info)
|
||||
@@ -558,6 +588,7 @@ static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info)
|
||||
test_load_driver();
|
||||
test_sync();
|
||||
test_version();
|
||||
@ -96,7 +96,7 @@ index 2e1107b..4f32c30 100644
|
||||
|
||||
/* print process report */
|
||||
if (test_input->winetest_debug)
|
||||
@@ -606,7 +637,7 @@ static NTSTATUS test_load_driver_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG
|
||||
@@ -609,7 +640,7 @@ static NTSTATUS test_load_driver_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG
|
||||
|
||||
static NTSTATUS WINAPI driver_Create(DEVICE_OBJECT *device, IRP *irp)
|
||||
{
|
||||
@ -105,7 +105,7 @@ index 2e1107b..4f32c30 100644
|
||||
IoCompleteRequest(irp, IO_NO_INCREMENT);
|
||||
return STATUS_SUCCESS;
|
||||
}
|
||||
@@ -631,14 +662,14 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp)
|
||||
@@ -634,14 +665,14 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp)
|
||||
break;
|
||||
}
|
||||
|
||||
@ -123,7 +123,7 @@ index 2e1107b..4f32c30 100644
|
||||
return STATUS_SUCCESS;
|
||||
}
|
||||
diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h
|
||||
index b5e4424..9ff245e 100644
|
||||
index a53c7a26..ca83129f 100644
|
||||
--- a/include/ddk/wdm.h
|
||||
+++ b/include/ddk/wdm.h
|
||||
@@ -153,20 +153,18 @@ typedef struct _KWAIT_BLOCK {
|
||||
@ -242,12 +242,12 @@ index b5e4424..9ff245e 100644
|
||||
+void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST,PALLOCATE_FUNCTION,PFREE_FUNCTION,ULONG,SIZE_T,ULONG,USHORT);
|
||||
PSLIST_ENTRY WINAPI ExInterlockedPopEntrySList(PSLIST_HEADER,PKSPIN_LOCK);
|
||||
PSLIST_ENTRY WINAPI ExInterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY,PKSPIN_LOCK);
|
||||
void WINAPI ExReleaseFastMutexUnsafe(PFAST_MUTEX);
|
||||
LIST_ENTRY * WINAPI ExInterlockedRemoveHeadList(LIST_ENTRY*,KSPIN_LOCK*);
|
||||
diff --git a/include/winnt.h b/include/winnt.h
|
||||
index 66720a2..2b15c8c 100644
|
||||
index c08ee9a4..a156efc4 100644
|
||||
--- a/include/winnt.h
|
||||
+++ b/include/winnt.h
|
||||
@@ -755,6 +755,8 @@ typedef struct _MEMORY_BASIC_INFORMATION
|
||||
@@ -757,6 +757,8 @@ typedef struct _MEMORY_BASIC_INFORMATION
|
||||
#define UNICODE_STRING_MAX_CHARS 32767
|
||||
|
||||
#define FIELD_OFFSET(type, field) ((LONG)offsetof(type, field))
|
||||
@ -257,5 +257,5 @@ index 66720a2..2b15c8c 100644
|
||||
#ifdef __GNUC__
|
||||
# define CONTAINING_RECORD(address, type, field) ({ \
|
||||
--
|
||||
2.7.4
|
||||
2.20.1
|
||||
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
From 83e27676c959aa8968d4db9c5ce898b4fe91b8f3 Mon Sep 17 00:00:00 2001
|
||||
From 5dd48cb814d0b69b43c5a57022d3beef8c2418a0 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Tue, 27 Jun 2017 00:28:03 +0200
|
||||
Subject: nvapi: Implement NvAPI_GPU_Get{Physical,Virtual}FrameBufferSize.
|
||||
|
||||
---
|
||||
dlls/nvapi/Makefile.in | 1 +
|
||||
dlls/nvapi/nvapi.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
dlls/nvapi/nvapi.c | 75 ++++++++++++++++++++++++++++++++++++++++
|
||||
dlls/nvapi64/Makefile.in | 1 +
|
||||
3 files changed, 76 insertions(+)
|
||||
3 files changed, 77 insertions(+)
|
||||
|
||||
diff --git a/dlls/nvapi/Makefile.in b/dlls/nvapi/Makefile.in
|
||||
index 606177f1f8b..6341254d9f6 100644
|
||||
index 606177f1..6341254d 100644
|
||||
--- a/dlls/nvapi/Makefile.in
|
||||
+++ b/dlls/nvapi/Makefile.in
|
||||
@@ -1,4 +1,5 @@
|
||||
@ -20,10 +20,14 @@ index 606177f1f8b..6341254d9f6 100644
|
||||
C_SRCS = \
|
||||
nvapi.c
|
||||
diff --git a/dlls/nvapi/nvapi.c b/dlls/nvapi/nvapi.c
|
||||
index 598267d6c86..372ae359ded 100644
|
||||
index 598267d6..d2c88655 100644
|
||||
--- a/dlls/nvapi/nvapi.c
|
||||
+++ b/dlls/nvapi/nvapi.c
|
||||
@@ -21,6 +21,7 @@
|
||||
@@ -18,9 +18,11 @@
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
+#include "wine/port.h"
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
@ -31,7 +35,7 @@ index 598267d6c86..372ae359ded 100644
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "winternl.h"
|
||||
@@ -29,6 +30,8 @@
|
||||
@@ -29,6 +31,8 @@
|
||||
#include "nvapi.h"
|
||||
#include "d3d9.h"
|
||||
|
||||
@ -40,7 +44,7 @@ index 598267d6c86..372ae359ded 100644
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(nvapi);
|
||||
|
||||
#define FAKE_PHYSICAL_GPU ((NvPhysicalGpuHandle)0xdead0001)
|
||||
@@ -589,6 +592,75 @@ static NvAPI_Status CDECL NvAPI_D3D9_RegisterResource(IDirect3DResource9* pResou
|
||||
@@ -589,6 +593,75 @@ static NvAPI_Status CDECL NvAPI_D3D9_RegisterResource(IDirect3DResource9* pResou
|
||||
return NVAPI_ERROR;
|
||||
}
|
||||
|
||||
@ -116,7 +120,7 @@ index 598267d6c86..372ae359ded 100644
|
||||
void* CDECL nvapi_QueryInterface(unsigned int offset)
|
||||
{
|
||||
static const struct
|
||||
@@ -631,6 +703,8 @@ void* CDECL nvapi_QueryInterface(unsigned int offset)
|
||||
@@ -631,6 +704,8 @@ void* CDECL nvapi_QueryInterface(unsigned int offset)
|
||||
{0xee1370cf, NvAPI_GetLogicalGPUFromDisplay},
|
||||
{0xfceac864, NvAPI_D3D_GetObjectHandleForResource},
|
||||
{0xa064bdfc, NvAPI_D3D9_RegisterResource},
|
||||
@ -126,7 +130,7 @@ index 598267d6c86..372ae359ded 100644
|
||||
unsigned int i;
|
||||
TRACE("(%x)\n", offset);
|
||||
diff --git a/dlls/nvapi64/Makefile.in b/dlls/nvapi64/Makefile.in
|
||||
index 80e2d6bfb20..04bd0cf1c46 100644
|
||||
index 80e2d6bf..04bd0cf1 100644
|
||||
--- a/dlls/nvapi64/Makefile.in
|
||||
+++ b/dlls/nvapi64/Makefile.in
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -137,5 +141,5 @@ index 80e2d6bfb20..04bd0cf1c46 100644
|
||||
C_SRCS = \
|
||||
nvapi.c
|
||||
--
|
||||
2.13.1
|
||||
2.20.1
|
||||
|
||||
|
||||
@ -52,7 +52,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "fee112f90accd80805e9b499b9f8917661f76cba"
|
||||
echo "699eb8cdba8fe236f038550e2bd68a4cd2cab055"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
@ -112,7 +112,6 @@ patch_enable_all ()
|
||||
enable_d3dx9_36_BumpLuminance="$1"
|
||||
enable_d3dx9_36_CloneEffect="$1"
|
||||
enable_d3dx9_36_D3DXDisassembleShader="$1"
|
||||
enable_d3dx9_36_D3DXMatrixTransformation="$1"
|
||||
enable_d3dx9_36_D3DXOptimizeVertices="$1"
|
||||
enable_d3dx9_36_D3DXSHProjectCubeMap="$1"
|
||||
enable_d3dx9_36_D3DXStubs="$1"
|
||||
@ -501,9 +500,6 @@ patch_enable ()
|
||||
d3dx9_36-D3DXDisassembleShader)
|
||||
enable_d3dx9_36_D3DXDisassembleShader="$2"
|
||||
;;
|
||||
d3dx9_36-D3DXMatrixTransformation)
|
||||
enable_d3dx9_36_D3DXMatrixTransformation="$2"
|
||||
;;
|
||||
d3dx9_36-D3DXOptimizeVertices)
|
||||
enable_d3dx9_36_D3DXOptimizeVertices="$2"
|
||||
;;
|
||||
@ -2964,21 +2960,6 @@ if test "$enable_d3dx9_36_D3DXDisassembleShader" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset d3dx9_36-D3DXMatrixTransformation
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#33456] d3dx9_36: D3DXMatrixTransformation support NULL scaling matrix
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/d3dx9_36/math.c, dlls/d3dx9_36/tests/math.c
|
||||
# |
|
||||
if test "$enable_d3dx9_36_D3DXMatrixTransformation" -eq 1; then
|
||||
patch_apply d3dx9_36-D3DXMatrixTransformation/0001-d3dx9_36-tests-Fix-D3DXMatrixTransformation-when-the.patch
|
||||
(
|
||||
printf '%s\n' '+ { "David Adam", "d3dx9_36/tests: Fix D3DXMatrixTransformation when the scaling matrix is NULL.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset d3dx9_36-D3DXOptimizeVertices
|
||||
# |
|
||||
# | Modified files:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user