From 94defee57992d96642ded2fae5a29fb8b9731934 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Mon, 8 Aug 2005 17:43:51 +0000
Subject: [PATCH] Don't prefix the functions DllInstall and DllGetVersion with
 the dll name so that the compiler can check the prototypes.

---
 dlls/richedit/riched32.spec | 2 +-
 dlls/richedit/richedit.c    | 2 +-
 dlls/shlwapi/shlwapi.spec   | 2 +-
 dlls/shlwapi/shlwapi_main.c | 2 +-
 dlls/wininet/wininet.spec   | 2 +-
 dlls/wininet/wininet_main.c | 3 +--
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dlls/richedit/riched32.spec b/dlls/richedit/riched32.spec
index 1f7dffe9b97..2446ff7825b 100644
--- a/dlls/richedit/riched32.spec
+++ b/dlls/richedit/riched32.spec
@@ -1 +1 @@
-2 stdcall DllGetVersion (ptr) RICHED32_DllGetVersion
+2 stdcall -private DllGetVersion (ptr)
diff --git a/dlls/richedit/richedit.c b/dlls/richedit/richedit.c
index d059b0791cd..155d4d8dc08 100644
--- a/dlls/richedit/richedit.c
+++ b/dlls/richedit/richedit.c
@@ -90,7 +90,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
  *
  * Retrieves version information
  */
-HRESULT WINAPI RICHED32_DllGetVersion (DLLVERSIONINFO *pdvi)
+HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi)
 {
     TRACE("\n");
 
diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec
index f076b07a6ed..aab84197d30 100644
--- a/dlls/shlwapi/shlwapi.spec
+++ b/dlls/shlwapi/shlwapi.spec
@@ -559,7 +559,7 @@
 @ stdcall ColorAdjustLuma(long long long)
 @ stdcall ColorHLSToRGB(long long long)
 @ stdcall ColorRGBToHLS(long ptr ptr ptr)
-@ stdcall DllGetVersion (ptr) SHLWAPI_DllGetVersion
+@ stdcall -private DllGetVersion(ptr)
 @ stdcall GetMenuPosFromID(ptr long)
 @ stdcall HashData (ptr long ptr long)
 @ stdcall IntlStrEqWorkerA(long str str long) StrIsIntlEqualA
diff --git a/dlls/shlwapi/shlwapi_main.c b/dlls/shlwapi/shlwapi_main.c
index 5d68bb71971..1624f96a672 100644
--- a/dlls/shlwapi/shlwapi_main.c
+++ b/dlls/shlwapi/shlwapi_main.c
@@ -105,7 +105,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
  *     as pdvi, provided that the size is set correctly.
  *     Returns version as shlwapi.dll from IE5.01.
  */
-HRESULT WINAPI SHLWAPI_DllGetVersion (DLLVERSIONINFO *pdvi)
+HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi)
 {
   DLLVERSIONINFO2 *pdvi2 = (DLLVERSIONINFO2*)pdvi;
 
diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec
index 44554641d9b..79003411b71 100644
--- a/dlls/wininet/wininet.spec
+++ b/dlls/wininet/wininet.spec
@@ -32,7 +32,7 @@
 @ stdcall DeleteUrlCacheEntryW(wstr)
 @ stdcall DeleteUrlCacheGroup(double long ptr)
 @ stdcall DetectAutoProxyUrl(str long long)
-@ stdcall DllInstall(long ptr) WININET_DllInstall
+@ stdcall -private DllInstall(long wstr)
 @ stdcall FindCloseUrlCache(long)
 @ stdcall FindFirstUrlCacheContainerA(ptr ptr ptr long)
 @ stdcall FindFirstUrlCacheContainerW(ptr ptr ptr long)
diff --git a/dlls/wininet/wininet_main.c b/dlls/wininet/wininet_main.c
index b499078c14d..7bfd7c6fa4c 100644
--- a/dlls/wininet/wininet_main.c
+++ b/dlls/wininet/wininet_main.c
@@ -31,11 +31,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet);
 /***********************************************************************
  *		DllInstall (WININET.@)
  */
-HRESULT WINAPI WININET_DllInstall(BOOL bInstall, LPCWSTR cmdline)
+HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline)
 {
   FIXME("(%s, %s): stub\n", bInstall?"TRUE":"FALSE",
 	debugstr_w(cmdline));
 
   return S_OK;
 }
-