Rebase against c91a531957acaf4cf7cdb985b5ba47a273f5f9b2.

This commit is contained in:
Sebastian Lackner
2017-09-27 05:09:54 +02:00
parent 094f2d8d0c
commit 13a6f6a44d
11 changed files with 183 additions and 329 deletions

View File

@@ -1,27 +1,29 @@
From 7fed7fb3a06902a325d3c66465f252b6ee8b45b7 Mon Sep 17 00:00:00 2001
From daeefb5f46667a112242343f9ba95d905371bc78 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.
---
dlls/dwmapi/dwmapi.spec | 2 ++
dlls/dwmapi/dwmapi.spec | 4 ++--
dlls/dwmapi/dwmapi_main.c | 18 ++++++++++++++++++
2 files changed, 20 insertions(+)
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec
index 6adbcb947d5..6989fdbe1b7 100644
index d81df3d8418..37447195b36 100644
--- a/dlls/dwmapi/dwmapi.spec
+++ b/dlls/dwmapi/dwmapi.spec
@@ -39,6 +39,8 @@
@ stub DwmQueryThumbnailSourceSize
@@ -80,8 +80,8 @@
@ 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 DwmSetPresentParameters(ptr ptr)
@ stdcall DwmSetWindowAttribute(long long ptr long)
@ stdcall DwmUnregisterThumbnail(long)
# @ stub DwmShowContact
diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c
index 8c3472a5294..0e6ba3bed1c 100644
--- a/dlls/dwmapi/dwmapi_main.c
@@ -49,5 +51,5 @@ index 8c3472a5294..0e6ba3bed1c 100644
+ return S_OK;
+};
--
2.13.1
2.14.1