From 2ddd5ce5dff38348fe7dd84d48a10bab4d7808c4 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Tue, 20 Jun 2000 20:59:27 +0000
Subject: [PATCH] Cleaned up a few inter-dll dependencies.

---
 dlls/oleaut32/oleaut32.spec | 6 +++---
 dlls/olecli/olecli32.spec   | 8 ++++----
 dlls/olecli/olecli_main.c   | 2 +-
 dlls/olesvr/olesvr_main.c   | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec
index c90a9827ed6..6d6f836911e 100644
--- a/dlls/oleaut32/oleaut32.spec
+++ b/dlls/oleaut32/oleaut32.spec
@@ -156,9 +156,9 @@ import ole32.dll
 197 stub VarDecFromStr
 198 stub VarDecFromDisp
 199 stub VarDecFromBool
-200 stdcall GetErrorInfo(long ptr) GetErrorInfo
-201 stdcall SetErrorInfo(long ptr ) SetErrorInfo
-202 stdcall CreateErrorInfo(ptr) CreateErrorInfo
+200 forward GetErrorInfo ole32.GetErrorInfo
+201 forward SetErrorInfo ole32.SetErrorInfo
+202 forward CreateErrorInfo ole32.CreateErrorInfo
 205 stdcall VarI2FromI1(long ptr) VarI2FromI1
 206 stdcall VarI2FromUI2(long ptr) VarI2FromUI2
 207 stdcall VarI2FromUI4(long ptr) VarI2FromUI4
diff --git a/dlls/olecli/olecli32.spec b/dlls/olecli/olecli32.spec
index e81898716d8..4b66f049d66 100644
--- a/dlls/olecli/olecli32.spec
+++ b/dlls/olecli/olecli32.spec
@@ -6,8 +6,8 @@ import olesvr32.dll
 
    1 stub WEP
    2 stub OleDelete
-   3 stdcall OleSaveToStream(ptr ptr) OleSaveToStream
-   4 stdcall OleLoadFromStream(ptr ptr ptr) OleLoadFromStream
+   3 forward OleSaveToStream ole32.OleSaveToStream
+   4 forward OleLoadFromStream ole32.OleLoadFromStream
    6 stub OleClone
    7 stub OleCopyFromLink
    8 stub OleEqual
@@ -36,11 +36,11 @@ import olesvr32.dll
   31 stub OleQueryOutOfDate
   32 stub OleObjectConvert
   33 stub OleCreateFromTemplate
-  34 stdcall OleCreate(ptr ptr long ptr ptr ptr ptr) OleCreate
+  34 forward OleCreate ole32.OleCreate
   35 stub OleQueryReleaseStatus
   36 stub OleQueryReleaseError
   37 stub OleQueryReleaseMethod
-  38 stdcall OleCreateFromFile(ptr ptr ptr long ptr ptr ptr ptr) OleCreateFromFile
+  38 forward OleCreateFromFile ole32.OleCreateFromFile
   39 stub OleCreateLinkFromFile
   40 stub OleRelease
   41 stdcall OleRegisterClientDoc(str str long ptr) OleRegisterClientDoc
diff --git a/dlls/olecli/olecli_main.c b/dlls/olecli/olecli_main.c
index a21f887f20a..485836911da 100644
--- a/dlls/olecli/olecli_main.c
+++ b/dlls/olecli/olecli_main.c
@@ -16,7 +16,7 @@
 DEFAULT_DEBUG_CHANNEL(ole);
 
 
-extern LONG	OLE_current_handle;
+static LONG OLE_current_handle;
 
 /******************************************************************************
  *		OleRegisterClientDoc16	[OLECLI.41]
diff --git a/dlls/olesvr/olesvr_main.c b/dlls/olesvr/olesvr_main.c
index 77fc096cac4..afc4a885cf7 100644
--- a/dlls/olesvr/olesvr_main.c
+++ b/dlls/olesvr/olesvr_main.c
@@ -15,7 +15,7 @@
 
 DEFAULT_DEBUG_CHANNEL(ole);
 
-LONG	OLE_current_handle;
+static LONG OLE_current_handle;
 
 /******************************************************************************
  *		OleRegisterServer16	[OLESVR.2]
-- 
2.11.4.GIT