From b8d0f4cd10ee401d22ca247348df1a47d787ab8c Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Tue, 9 Aug 2005 10:38:54 +0000
Subject: [PATCH] Get rid of the almost empty tmarshal.h file.

---
 dlls/oleaut32/oleaut.c   |  5 ++---
 dlls/oleaut32/tmarshal.c |  5 ++---
 dlls/oleaut32/tmarshal.h | 24 ------------------------
 dlls/oleaut32/typelib.h  |  5 ++++-
 4 files changed, 8 insertions(+), 31 deletions(-)
 delete mode 100644 dlls/oleaut32/tmarshal.h

diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c
index b9125b4801..c6e0139f73 100644
--- a/dlls/oleaut32/oleaut.c
+++ b/dlls/oleaut32/oleaut.c
@@ -32,8 +32,7 @@
 #include "ole2.h"
 #include "olectl.h"
 #include "oleauto.h"
-
-#include "tmarshal.h"
+#include "typelib.h"
 
 #include "wine/debug.h"
 
@@ -727,7 +726,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
         return OLEAUTPS_DllGetClassObject(&CLSID_PSDispatch, iid, ppv);
     }
     if (IsEqualGUID(rclsid,&CLSID_PSOAInterface)) {
-	if (S_OK==TypeLibFac_DllGetClassObject(rclsid,iid,ppv))
+	if (S_OK==TMARSHAL_DllGetClassObject(rclsid,iid,ppv))
 	    return S_OK;
 	/*FALLTHROUGH*/
     }
diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c
index dc51e33876..71256b72d3 100644
--- a/dlls/oleaut32/tmarshal.c
+++ b/dlls/oleaut32/tmarshal.c
@@ -2305,10 +2305,9 @@ static const IPSFactoryBufferVtbl psfacbufvtbl = {
 static const IPSFactoryBufferVtbl *lppsfac = &psfacbufvtbl;
 
 /***********************************************************************
- *           DllGetClassObject [OLE32.63]
+ *           TMARSHAL_DllGetClassObject
  */
-HRESULT WINAPI
-TypeLibFac_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv)
+HRESULT TMARSHAL_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv)
 {
     if (IsEqualIID(iid,&IID_IPSFactoryBuffer)) {
 	*ppv = &lppsfac;
diff --git a/dlls/oleaut32/tmarshal.h b/dlls/oleaut32/tmarshal.h
deleted file mode 100644
index 20dc32bd17..0000000000
--- a/dlls/oleaut32/tmarshal.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2002 Marcus Meissner
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef TMARSHAL_H
-#define TMARSHAL_H
-HRESULT WINAPI
-TypeLibFac_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv);
-
-#endif
diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h
index 5e9c90f33b..031eb859b3 100644
--- a/dlls/oleaut32/typelib.h
+++ b/dlls/oleaut32/typelib.h
@@ -597,9 +597,12 @@ WORD offset from start of block to SAFEARRAY
 WORD typeofarray
 */
 
+#include "poppack.h"
+
 extern DWORD _invoke(FARPROC func,CALLCONV callconv, int nrargs, DWORD *args);
 extern void dump_Variant(VARIANT * pvar);
-#include "poppack.h"
+
+HRESULT TMARSHAL_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv);
 
 /*---------------------------END--------------------------------------------*/
 #endif
-- 
2.32.0.93.g670b81a890