Rebase against 33c35baa6761b00c8cef236c06cb1655f3f228d9

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

@@ -1,4 +1,4 @@
-From 11c1254ba19c465a4a8683d3293bafdc1b9c1a39 Mon Sep 17 00:00:00 2001
+From e8dc870c41c85729d2ccf24738f63fd9c8c22d68 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
@@ -10,14 +10,13 @@ Split into multiple changes.
 Signed-off-by: Louis Lenders <xerox.xerox2000x@gmail.com>
 ---
  dlls/uianimation/Makefile.in             |   5 +
- dlls/uianimation/main.c                  | 918 +++++++++++++++++++++++++++++++
- dlls/uianimation/uianimation.spec        |   9 +-
+ dlls/uianimation/main.c                  | 897 ++++++++++++++++++++++-
  dlls/uianimation/uianimation_typelib.idl |  23 +
- 4 files changed, 951 insertions(+), 4 deletions(-)
+ 3 files changed, 915 insertions(+), 10 deletions(-)
  create mode 100644 dlls/uianimation/uianimation_typelib.idl
 
 diff --git a/dlls/uianimation/Makefile.in b/dlls/uianimation/Makefile.in
-index b504181..3663c23 100644
+index b504181b9a2..3663c23d68e 100644
 --- a/dlls/uianimation/Makefile.in
 +++ b/dlls/uianimation/Makefile.in
 @@ -1,4 +1,9 @@
@@ -31,10 +30,10 @@ index b504181..3663c23 100644
 +	uianimation_typelib.idl
 +
 diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c
-index 0fa9bfb..793a200 100644
+index 92d594ff5d7..1d2d86b3551 100644
 --- a/dlls/uianimation/main.c
 +++ b/dlls/uianimation/main.c
-@@ -21,15 +21,906 @@
+@@ -21,19 +21,906 @@
  #include "config.h"
  #include <stdarg.h>
  
@@ -42,8 +41,8 @@ index 0fa9bfb..793a200 100644
 +
  #include "windef.h"
  #include "winbase.h"
-+#include "objbase.h"
-+#include "rpcproxy.h"
+ #include "objbase.h"
+ #include "rpcproxy.h"
 +#include "oaidl.h"
 +#include "ocidl.h"
  
@@ -56,8 +55,8 @@ index 0fa9bfb..793a200 100644
  
  WINE_DEFAULT_DEBUG_CHANNEL(uianimation);
  
-+static HINSTANCE hinstance;
-+
+ static HINSTANCE hinstance;
+ 
 +struct class_factory
 +{
 +    IClassFactory IClassFactory_iface;
@@ -941,59 +940,26 @@ index 0fa9bfb..793a200 100644
  BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved )
  {
      TRACE("(%p %d %p)\n", dll, reason, reserved);
-@@ -39,8 +930,35 @@ BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved )
-     case DLL_WINE_PREATTACH:
-         return FALSE;  /* prefer native version */
-     case DLL_PROCESS_ATTACH:
-+        hinstance = dll;
-         DisableThreadLibraryCalls( dll );
-         break;
-     }
+@@ -50,16 +937,6 @@ BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved )
      return TRUE;
  }
-+
-+/******************************************************************
-+ *              DllCanUnloadNow
-+ */
-+HRESULT WINAPI DllCanUnloadNow( void )
-+{
-+    TRACE( "()\n" );
-+    return S_FALSE;
-+}
-+
-+
-+/***********************************************************************
-+ *          DllRegisterServer
-+ */
-+HRESULT WINAPI DllRegisterServer( void )
-+{
-+    return __wine_register_resources( hinstance );
-+}
-+
-+/***********************************************************************
-+ *          DllUnregisterServer
-+ */
-+HRESULT WINAPI DllUnregisterServer( void )
-+{
-+    return __wine_unregister_resources( hinstance );
-+}
-diff --git a/dlls/uianimation/uianimation.spec b/dlls/uianimation/uianimation.spec
-index a43b12d..37b010b 100644
---- a/dlls/uianimation/uianimation.spec
-+++ b/dlls/uianimation/uianimation.spec
-@@ -1,4 +1,5 @@
--@ stub DllCanUnloadNow()
--@ stub DllGetClassObject(ptr ptr ptr)
--@ stub DllRegisterServer()
--@ stub DllUnregisterServer()
-+@ stdcall -private DllCanUnloadNow()
-+@ stdcall -private DllGetClassObject(ptr ptr ptr)
-+@ stdcall -private DllRegisterServer()
-+@ stdcall -private DllUnregisterServer()
-+
+ 
+-/******************************************************************
+- *             DllGetClassObject
+- */
+-HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj )
+-{
+-    FIXME( "(%s %s %p)\n", debugstr_guid( clsid ), debugstr_guid( iid ), obj );
+-
+-    return CLASS_E_CLASSNOTAVAILABLE;
+-}
+-
+ /******************************************************************
+  *              DllCanUnloadNow
+  */
 diff --git a/dlls/uianimation/uianimation_typelib.idl b/dlls/uianimation/uianimation_typelib.idl
 new file mode 100644
-index 0000000..9066c09
+index 00000000000..9066c09a021
 --- /dev/null
 +++ b/dlls/uianimation/uianimation_typelib.idl
 @@ -0,0 +1,23 @@
@@ -1021,5 +987,5 @@ index 0000000..9066c09
 +
 +#include "uianimation.idl"
 -- 
-1.9.1
+2.20.1