Rebase against d83b71ebfdfe83704c313d7c11e8c87c9a8b0419

patches/uianimation-stubs/0002-uianimation-Add-stub-dll.patch

@@ -1,4 +1,4 @@
-From e8dc870c41c85729d2ccf24738f63fd9c8c22d68 Mon Sep 17 00:00:00 2001
+From 27139df539e603ba9db27a49a37cba789b33a108 Mon Sep 17 00:00:00 2001
 From: Louis Lenders <xerox.xerox2000x@gmail.com>
 Date: Thu, 7 Jun 2018 11:51:01 +0200
 Subject: [PATCH] uianimation: Add stub dll
@@ -16,13 +16,15 @@ Signed-off-by: Louis Lenders <xerox.xerox2000x@gmail.com>
  create mode 100644 dlls/uianimation/uianimation_typelib.idl
 
 diff --git a/dlls/uianimation/Makefile.in b/dlls/uianimation/Makefile.in
-index b504181b9a2..3663c23d68e 100644
+index 85bf1675db0..c0cab1d0fd4 100644
 --- a/dlls/uianimation/Makefile.in
 +++ b/dlls/uianimation/Makefile.in
-@@ -1,4 +1,9 @@
+@@ -1,6 +1,11 @@
  MODULE    = uianimation.dll
 +IMPORTS   = uuid ole32
  
+ EXTRADLLFLAGS = -mno-cygwin
+ 
  C_SRCS = \
  	main.c
 +
@@ -30,11 +32,11 @@ index b504181b9a2..3663c23d68e 100644
 +	uianimation_typelib.idl
 +
 diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c
-index 92d594ff5d7..1d2d86b3551 100644
+index ea35a30f51d..c20cfde47df 100644
 --- a/dlls/uianimation/main.c
 +++ b/dlls/uianimation/main.c
-@@ -21,19 +21,906 @@
- #include "config.h"
+@@ -20,19 +20,906 @@
+ 
  #include <stdarg.h>
  
 +#define COBJMACROS
@@ -940,7 +942,7 @@ index 92d594ff5d7..1d2d86b3551 100644
  BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved )
  {
      TRACE("(%p %d %p)\n", dll, reason, reserved);
-@@ -50,16 +937,6 @@ BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved )
+@@ -49,16 +936,6 @@ BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved )
      return TRUE;
  }
  
@@ -987,5 +989,5 @@ index 00000000000..9066c09a021
 +
 +#include "uianimation.idl"
 -- 
-2.20.1
+2.17.1