Rebase against 0a72708126f5b8fc06698172d973bb529944c3bf

This commit is contained in:
Alistair Leslie-Hughes
2018-03-01 12:28:01 +11:00
parent d3bcb61436
commit 9999806838
39 changed files with 695 additions and 1116 deletions

View File

@@ -1,38 +1,34 @@
From daeefb5f46667a112242343f9ba95d905371bc78 Mon Sep 17 00:00:00 2001
From e3c0ebb372539b2840298d064d8f3a51c02bff63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Tue, 11 Jul 2017 23:59:58 +0200
Subject: dwmapi: Add stubs for DwmSetIconicLivePreviewBitmap and
DwmSetIconicThumbnail.
Subject: [PATCH] dwmapi: Add stub for DwmSetIconicLivePreviewBitmap.
---
dlls/dwmapi/dwmapi.spec | 4 ++--
dlls/dwmapi/dwmapi_main.c | 18 ++++++++++++++++++
2 files changed, 20 insertions(+), 2 deletions(-)
dlls/dwmapi/dwmapi.spec | 2 +-
dlls/dwmapi/dwmapi_main.c | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec
index d81df3d8418..37447195b36 100644
index 697cefc071..37447195b3 100644
--- a/dlls/dwmapi/dwmapi.spec
+++ b/dlls/dwmapi/dwmapi.spec
@@ -80,8 +80,8 @@
@@ -80,7 +80,7 @@
@ stdcall DwmRegisterThumbnail(long long ptr)
# @ stub DwmRenderGesture
@ stub DwmSetDxFrameDuration
-@ stub DwmSetIconicLivePreviewBitmap
-@ stub DwmSetIconicThumbnail
+@ stdcall DwmSetIconicLivePreviewBitmap(long long ptr long)
+@ stdcall DwmSetIconicThumbnail(long long long)
@ stdcall DwmSetIconicThumbnail(long long long)
@ stdcall DwmSetPresentParameters(ptr ptr)
@ stdcall DwmSetWindowAttribute(long long ptr long)
# @ stub DwmShowContact
diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c
index 8c3472a5294..0e6ba3bed1c 100644
index 7ac0b2b790..0e6ba3bed1 100644
--- a/dlls/dwmapi/dwmapi_main.c
+++ b/dlls/dwmapi/dwmapi_main.c
@@ -268,3 +268,21 @@ HRESULT WINAPI DwmSetPresentParameters(HWND hwnd, DWM_PRESENT_PARAMETERS *params
FIXME("(%p %p) stub\n", hwnd, params);
@@ -269,6 +269,15 @@ HRESULT WINAPI DwmSetPresentParameters(HWND hwnd, DWM_PRESENT_PARAMETERS *params
return S_OK;
};
+
+/**********************************************************************
+ * DwmSetIconicLivePreviewBitmap (DWMAPI.@)
+ */
@@ -42,14 +38,9 @@ index 8c3472a5294..0e6ba3bed1c 100644
+ return S_OK;
+};
+
+/**********************************************************************
+ * DwmSetIconicThumbnail (DWMAPI.@)
+ */
+HRESULT WINAPI DwmSetIconicThumbnail(HWND hwnd, HBITMAP hbmp, DWORD flags)
+{
+ FIXME("(%p %p %x) stub\n", hwnd, hbmp, flags);
+ return S_OK;
+};
/**********************************************************************
* DwmSetIconicThumbnail (DWMAPI.@)
*/
--
2.14.1
2.16.1