Alexandre Julliard : oleaut32: Use a dlldata. c file instead of maintaining the data manually.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8d8ff37ca316d520c13c294bef0e559d806049c8
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8d8ff37ca316d520c13c294bef...

Author: Alexandre Julliard 
Date:   Mon Dec  1 18:56:35 2008 +0100

oleaut32: Use a dlldata.c file instead of maintaining the data manually.

---

dlls/oleaut32/Makefile.in  |    5 ++++-
 dlls/oleaut32/oleaut.c     |    2 +-
 dlls/oleaut32/usrmarshal.c |   22 ----------------------
 3 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in
index 93b19d1..7ea6586 100644
--- a/dlls/oleaut32/Makefile.in
+++ b/dlls/oleaut32/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -D_OLEAUT32_ -DCOM_NO_WINDOWS_H
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
@@ -7,6 +6,8 @@ MODULE    = oleaut32.dll
 IMPORTLIB = oleaut32
 IMPORTS   = uuid ole32 rpcrt4 user32 gdi32 advapi32 kernel32 ntdll
 DELAYIMPORTS = comctl32 urlmon
+EXTRADEFS = -D_OLEAUT32_ -DCOM_NO_WINDOWS_H \
+    -DENTRY_PREFIX=OLEAUTPS_ -DPROXY_CLSID=CLSID_PSDispatch -DPROXY_DELEGATION

C_SRCS = \
    connpt.c \
@@ -42,6 +43,8 @@ IDL_P_SRCS = \
    oleaut32_oaidl.idl \
    oleaut32_ocidl.idl

+EXTRA_OBJS = dlldata.o
+
 @MAKE_DLL_RULES@

@DEPENDENCIES@  # everything below this line is overwritten by make depend
diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c
index 4e636e3..1a36f7f 100644
--- a/dlls/oleaut32/oleaut.c
+++ b/dlls/oleaut32/oleaut.c
@@ -696,7 +696,7 @@ HRESULT WINAPI OleTranslateColor(
   return S_OK;
 }

-extern HRESULT OLEAUTPS_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv);
+extern HRESULT WINAPI OLEAUTPS_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLSPEC_HIDDEN;

extern void _get_STDFONT_CF(LPVOID *);
 extern void _get_STDPIC_CF(LPVOID *);
diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c
index b31eb39..85faac4 100644
--- a/dlls/oleaut32/usrmarshal.c
+++ b/dlls/oleaut32/usrmarshal.c
@@ -25,7 +25,6 @@
 #define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
-#define PROXY_DELEGATION

#include "windef.h"
 #include "winbase.h"
@@ -35,7 +34,6 @@

#include "ole2.h"
 #include "oleauto.h"
-#include "rpcproxy.h"
 #include "typelib.h"
 #include "ocidl.h"
 #include "wine/debug.h"
@@ -47,26 +45,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole);
 #define ALIGN_LENGTH(_Len, _Align) _Len = ALIGNED_LENGTH(_Len, _Align)
 #define ALIGN_POINTER(_Ptr, _Align) _Ptr = ALIGNED_POINTER(_Ptr, _Align)

-static CStdPSFactoryBuffer PSFactoryBuffer;
-
-CSTDSTUBBUFFERRELEASE(&PSFactoryBuffer)
-CSTDSTUBBUFFER2RELEASE(&PSFactoryBuffer)
-
-extern const ExtendedProxyFileInfo oleaut32_oaidl_ProxyFileInfo;
-extern const ExtendedProxyFileInfo oleaut32_ocidl_ProxyFileInfo;
-
-static const ProxyFileInfo *OLEAUT32_ProxyFileList[] = {
-  &oleaut32_oaidl_ProxyFileInfo,
-  &oleaut32_ocidl_ProxyFileInfo,
-  NULL
-};
-
-HRESULT OLEAUTPS_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
-{
-  return NdrDllGetClassObject(rclsid, riid, ppv, OLEAUT32_ProxyFileList,
-                              &CLSID_PSDispatch, &PSFactoryBuffer);
-}
-
 static void dump_user_flags(const ULONG *pFlags)
 {
     if (HIWORD(*pFlags) == NDR_LOCAL_DATA_REPRESENTATION)