Rebase against 48a74277f5f9e0c87d8c01457236a89d94cb71d3

This commit is contained in:
Alistair Leslie-Hughes
2019-06-07 08:38:50 +10:00
parent 1998c0570d
commit a49aa40ac8
5 changed files with 87 additions and 84 deletions

View File

@@ -1,22 +1,22 @@
From e4c38a569fe653a038d46bbf67a8d151851ea2b9 Mon Sep 17 00:00:00 2001
From a119d47ffc9e59747c435488002ee3eaecbc515f Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Tue, 23 Apr 2019 13:32:56 +1000
Subject: [PATCH 2/2] gdi32: Add D3DKMTQueryStatistics stub
Subject: [PATCH] gdi32: Add D3DKMTQueryStatistics stub
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47074
---
dlls/gdi32/driver.c | 9 +++++++++
dlls/gdi32/gdi32.spec | 1 +
include/ddk/d3dkmthk.h | 1 +
3 files changed, 11 insertions(+)
dlls/gdi32/driver.c | 10 ++++++++++
dlls/gdi32/gdi32.spec | 1 +
include/ddk/d3dkmthk.h | 1 +
3 files changed, 12 insertions(+)
diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c
index 88f49a0..d2d9fd7 100644
index 96c2f1f1299..53914a88e5f 100644
--- a/dlls/gdi32/driver.c
+++ b/dlls/gdi32/driver.c
@@ -1272,3 +1272,12 @@ NTSTATUS WINAPI D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc )
FIXME("(%p): stub\n", desc);
return STATUS_SUCCESS;
@@ -1423,3 +1423,13 @@ NTSTATUS WINAPI D3DKMTDestroyDevice( const D3DKMT_DESTROYDEVICE *desc )
return status;
}
+
+/******************************************************************************
@@ -27,30 +27,31 @@ index 88f49a0..d2d9fd7 100644
+ FIXME("(%p): stub\n", stats);
+ return STATUS_SUCCESS;
+}
+
diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec
index 2d158e0..745e05e 100644
index 9abd82173c8..cc5d2c21a31 100644
--- a/dlls/gdi32/gdi32.spec
+++ b/dlls/gdi32/gdi32.spec
@@ -85,6 +85,7 @@
@ stdcall D3DKMTDestroyDCFromMemory(ptr)
@@ -88,6 +88,7 @@
@ stdcall D3DKMTEscape(ptr)
@ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr)
@ stdcall D3DKMTOpenAdapterFromHdc(ptr)
+@ stdcall D3DKMTQueryStatistics(ptr)
@ stdcall DPtoLP(long ptr long)
@ stdcall DeleteColorSpace(long)
@ stdcall DeleteDC(long)
diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h
index ab2af52..2ce2c6c 100644
index 8e28c94bbf8..ea4df3a9e01 100644
--- a/include/ddk/d3dkmthk.h
+++ b/include/ddk/d3dkmthk.h
@@ -490,6 +490,7 @@ extern "C"
NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *desc);
NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc);
@@ -608,6 +608,7 @@ NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc);
NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc);
NTSTATUS WINAPI D3DKMTDestroyDevice(const D3DKMT_DESTROYDEVICE *desc);
NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc);
+NTSTATUS WINAPI D3DKMTQueryStatistics(D3DKMT_QUERYSTATISTICS *stats);
#ifdef __cplusplus
}
--
1.9.1
2.17.1