You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against 56404595d5c42168d4fd4c1ec3a1b802a6aab5c1
This commit is contained in:
Alistair Leslie-Hughes
@@ -1,4 +1,4 @@
|
||||
From 22e4de0e6c77f8d5e29ecd125f016a221a3b8e1b Mon Sep 17 00:00:00 2001
|
||||
From 11c1254ba19c465a4a8683d3293bafdc1b9c1a39 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
|
||||
@@ -9,109 +9,53 @@ Split into multiple changes.
|
||||
|
||||
Signed-off-by: Louis Lenders <xerox.xerox2000x@gmail.com>
|
||||
---
|
||||
configure | 2 +
|
||||
configure.ac | 1 +
|
||||
dlls/uianimation/Makefile.in | 7 +
|
||||
dlls/uianimation/main.c | 959 +++++++++++++++++++++++++++++++
|
||||
dlls/uianimation/uianimation.spec | 4 +
|
||||
dlls/uianimation/Makefile.in | 5 +
|
||||
dlls/uianimation/main.c | 918 +++++++++++++++++++++++++++++++
|
||||
dlls/uianimation/uianimation.spec | 9 +-
|
||||
dlls/uianimation/uianimation_typelib.idl | 23 +
|
||||
6 files changed, 996 insertions(+)
|
||||
create mode 100644 dlls/uianimation/Makefile.in
|
||||
create mode 100644 dlls/uianimation/main.c
|
||||
create mode 100644 dlls/uianimation/uianimation.spec
|
||||
4 files changed, 951 insertions(+), 4 deletions(-)
|
||||
create mode 100644 dlls/uianimation/uianimation_typelib.idl
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 5cefb64..10f7e05 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -1547,6 +1547,7 @@ enable_traffic
|
||||
enable_twain_32
|
||||
enable_tzres
|
||||
enable_ucrtbase
|
||||
+enable_uianimation
|
||||
enable_uiautomationcore
|
||||
enable_uiribbon
|
||||
enable_unicows
|
||||
@@ -19985,6 +19986,7 @@ wine_fn_config_makefile dlls/typelib.dll16 enable_win16
|
||||
wine_fn_config_makefile dlls/tzres enable_tzres
|
||||
wine_fn_config_makefile dlls/ucrtbase enable_ucrtbase
|
||||
wine_fn_config_makefile dlls/ucrtbase/tests enable_tests
|
||||
+wine_fn_config_makefile dlls/uianimation enable_uianimation
|
||||
wine_fn_config_makefile dlls/uiautomationcore enable_uiautomationcore
|
||||
wine_fn_config_makefile dlls/uiautomationcore/tests enable_tests
|
||||
wine_fn_config_makefile dlls/uiribbon enable_uiribbon
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index bac2c09..8191489 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3783,6 +3783,7 @@ WINE_CONFIG_MAKEFILE(dlls/typelib.dll16,enable_win16)
|
||||
WINE_CONFIG_MAKEFILE(dlls/tzres)
|
||||
WINE_CONFIG_MAKEFILE(dlls/ucrtbase)
|
||||
WINE_CONFIG_MAKEFILE(dlls/ucrtbase/tests)
|
||||
+WINE_CONFIG_MAKEFILE(dlls/uianimation)
|
||||
WINE_CONFIG_MAKEFILE(dlls/uiautomationcore)
|
||||
WINE_CONFIG_MAKEFILE(dlls/uiautomationcore/tests)
|
||||
WINE_CONFIG_MAKEFILE(dlls/uiribbon)
|
||||
diff --git a/dlls/uianimation/Makefile.in b/dlls/uianimation/Makefile.in
|
||||
new file mode 100644
|
||||
index 0000000..bc303b3
|
||||
--- /dev/null
|
||||
index b504181..3663c23 100644
|
||||
--- a/dlls/uianimation/Makefile.in
|
||||
+++ b/dlls/uianimation/Makefile.in
|
||||
@@ -0,0 +1,7 @@
|
||||
+MODULE = uianimation.dll
|
||||
@@ -1,4 +1,9 @@
|
||||
MODULE = uianimation.dll
|
||||
+IMPORTS = uuid ole32
|
||||
|
||||
C_SRCS = \
|
||||
main.c
|
||||
+
|
||||
+C_SRCS = \
|
||||
+ main.c
|
||||
+IDL_SRCS = \
|
||||
+ uianimation_typelib.idl
|
||||
+
|
||||
diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c
|
||||
new file mode 100644
|
||||
index 0000000..6101827
|
||||
--- /dev/null
|
||||
index 0fa9bfb..793a200 100644
|
||||
--- a/dlls/uianimation/main.c
|
||||
+++ b/dlls/uianimation/main.c
|
||||
@@ -0,0 +1,959 @@
|
||||
+/*
|
||||
+ * Uianimation main file.
|
||||
+ *
|
||||
+ * Copyright (C) 2018 Louis Lenders
|
||||
+ *
|
||||
+ * This library is free software; you can redistribute it and/or
|
||||
+ * modify it under the terms of the GNU Lesser General Public
|
||||
+ * License as published by the Free Software Foundation; either
|
||||
+ * version 2.1 of the License, or (at your option) any later version.
|
||||
+ *
|
||||
+ * This library is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
+ * Lesser General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU Lesser General Public
|
||||
+ * License along with this library; if not, write to the Free Software
|
||||
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
+ */
|
||||
+
|
||||
+#include "config.h"
|
||||
+#include <stdarg.h>
|
||||
+
|
||||
@@ -21,15 +21,906 @@
|
||||
#include "config.h"
|
||||
#include <stdarg.h>
|
||||
|
||||
+#define COBJMACROS
|
||||
+
|
||||
+#include "windef.h"
|
||||
+#include "winbase.h"
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
+#include "objbase.h"
|
||||
+#include "rpcproxy.h"
|
||||
+#include "oaidl.h"
|
||||
+#include "ocidl.h"
|
||||
+
|
||||
|
||||
+#include "initguid.h"
|
||||
+#include "uianimation.h"
|
||||
+
|
||||
#include "uianimation.h"
|
||||
|
||||
+#include "wine/heap.h"
|
||||
+#include "wine/debug.h"
|
||||
+
|
||||
+WINE_DEFAULT_DEBUG_CHANNEL(uianimation);
|
||||
+
|
||||
#include "wine/debug.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(uianimation);
|
||||
|
||||
+static HINSTANCE hinstance;
|
||||
+
|
||||
+struct class_factory
|
||||
@@ -994,17 +938,19 @@ index 0000000..6101827
|
||||
+ return IClassFactory_QueryInterface( cf, iid, obj );
|
||||
+}
|
||||
+
|
||||
+BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved )
|
||||
+{
|
||||
+ switch (reason)
|
||||
+ {
|
||||
+ case DLL_PROCESS_ATTACH:
|
||||
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;
|
||||
+ }
|
||||
+ return TRUE;
|
||||
+}
|
||||
DisableThreadLibraryCalls( dll );
|
||||
break;
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
+
|
||||
+/******************************************************************
|
||||
+ * DllCanUnloadNow
|
||||
@@ -1032,15 +978,19 @@ index 0000000..6101827
|
||||
+ return __wine_unregister_resources( hinstance );
|
||||
+}
|
||||
diff --git a/dlls/uianimation/uianimation.spec b/dlls/uianimation/uianimation.spec
|
||||
new file mode 100644
|
||||
index 0000000..b16365d
|
||||
--- /dev/null
|
||||
index a43b12d..37b010b 100644
|
||||
--- a/dlls/uianimation/uianimation.spec
|
||||
+++ b/dlls/uianimation/uianimation.spec
|
||||
@@ -0,0 +1,4 @@
|
||||
@@ -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()
|
||||
+
|
||||
diff --git a/dlls/uianimation/uianimation_typelib.idl b/dlls/uianimation/uianimation_typelib.idl
|
||||
new file mode 100644
|
||||
index 0000000..9066c09
|
||||
|
||||
Reference in New Issue
Block a user