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 0f8a0fd4002f9d5d1cb6dadcb81ef430d8be21b7.

Browse Source 
[kernel32-CompareString_Length]
Removed patch to ensure CompareStringW aborts on the first nonmatching
character (accepted upstream).

[ntdll-SystemRecommendedSharedDataAlignment]
Removed patch to implement SystemRecommendedSharedDataAlignment class (accepted
upstream).

[vmm.vxd-PageReserve]
Removed patch to fix protection flags passed to VirtualAlloc call (accepted
upstream).
This commit is contained in:
Sebastian Lackner
2016-02-13 04:52:20 +01:00
parent 72edf5c454
commit e0c5f8a2b9
49 changed files with 155 additions and 912 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
patches/dxgi-MakeWindowAssociation/0001-dxgi-Improve-stubs-for-MakeWindowAssociation-and-Get.patch
View File

@@ -1,4 +1,4 @@
From 1833c60c709550a99efa024659eb3149204d13f5 Mon Sep 17 00:00:00 2001
From 144cdcfa8f77e8bf2cdb01d6ced2faa240ea605e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Tue, 19 Aug 2014 22:47:51 +0200
Subject: dxgi: Improve stubs for MakeWindowAssociation and
@@ -6,14 +6,14 @@ Subject: dxgi: Improve stubs for MakeWindowAssociation and
---
dlls/dxgi/dxgi_private.h | 1 +
dlls/dxgi/factory.c | 16 ++++++++++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
dlls/dxgi/factory.c | 14 +++++++++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h
index 8703158..85c5ec1 100644
index 59b436b..fc61bb2 100644
--- a/dlls/dxgi/dxgi_private.h
+++ b/dlls/dxgi/dxgi_private.h
@@ -94,6 +94,7 @@ struct dxgi_factory
@@ -102,6 +102,7 @@ struct dxgi_factory
IDXGIAdapter1 **adapters;
BOOL extended;
HWND device_window;
@@ -22,7 +22,7 @@ index 8703158..85c5ec1 100644
HRESULT dxgi_factory_create(REFIID riid, void **factory, BOOL extended) DECLSPEC_HIDDEN;
diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c
index a66585e..1446557 100644
index 5956e62..8151221 100644
--- a/dlls/dxgi/factory.c
+++ b/dlls/dxgi/factory.c
@@ -163,16 +163,28 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapters(IDXGIFactory1 *iface,
@@ -33,12 +33,11 @@ index a66585e..1446557 100644
+
FIXME("iface %p, window %p, flags %#x stub!\n", iface, window, flags);
- return E_NOTIMPL;
+ if (!window && flags)
+ return DXGI_ERROR_INVALID_CALL;
+
+ factory->assoc_window = window;
+ return S_OK;
return S_OK;
}
static HRESULT STDMETHODCALLTYPE dxgi_factory_GetWindowAssociation(IDXGIFactory1 *iface, HWND *window)
@@ -57,5 +56,5 @@ index a66585e..1446557 100644
static UINT dxgi_rational_to_uint(const DXGI_RATIONAL *rational)
--
2.5.0
2.7.1