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 699eb8cdba8fe236f038550e2bd68a4cd2cab055.

Browse Source
This commit is contained in:
Zebediah Figura
2019-01-25 18:42:27 -06:00
parent ceb31ed876
commit 60f0f50382
5 changed files with 33 additions and 852 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patches/nvapi-Stub_DLL/0017-nvapi-Implement-NvAPI_GPU_Get-Physical-Virtual-Frame.patch
View File

@@ -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