mpr: The password cache functions are not supposed to be exported by any public header. (take 2)

[Francois Gouget]

---

In my previous attempt I missed that these functions are also used in 
wininet, resulting in new warnings and a the wrong implicit call 
convention. With this version there should be no new warning.


 dlls/mpr/pwcache.c     |   13 +++++++++++++
 dlls/wininet/dialogs.c |    5 +++++
 include/winnetwk.h     |   19 -------------------
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/dlls/mpr/pwcache.c b/dlls/mpr/pwcache.c
index 8e3c191..32aa1ab 100644
--- a/dlls/mpr/pwcache.c
+++ b/dlls/mpr/pwcache.c
@@ -30,6 +30,19 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(mpr);
 
+
+typedef struct tagPASSWORD_CACHE_ENTRY
+{
+	WORD cbEntry;
+	WORD cbResource;
+	WORD cbPassword;
+	BYTE iEntry;
+	BYTE nType;
+	BYTE abResource[1];
+} PASSWORD_CACHE_ENTRY;
+
+typedef BOOL (CALLBACK *ENUMPASSWORDPROC)(PASSWORD_CACHE_ENTRY *, DWORD);
+
 static const char mpr_key[] = "Software\\Wine\\Wine\\Mpr\\";
 
 static inline BYTE hex( BYTE x )
diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c
index dd5aa31..163dd06 100644
--- a/dlls/wininet/dialogs.c
+++ b/dlls/wininet/dialogs.c
@@ -42,6 +42,11 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(wininet);
 
+/* mpr.dll functions */
+DWORD WINAPI WNetGetCachedPassword( LPSTR, WORD, LPSTR, LPWORD, BYTE );
+DWORD WINAPI WNetCachePassword( LPSTR, WORD, LPSTR, WORD, BYTE, WORD );
+
+
 struct WININET_ErrorDlgParams
 {
     HWND       hWnd;
diff --git a/include/winnetwk.h b/include/winnetwk.h
index b69c0eb..766696f 100644
--- a/include/winnetwk.h
+++ b/include/winnetwk.h
@@ -385,25 +385,6 @@ DWORD WINAPI MultinetGetErrorTextA(DWORD,DWORD,DWORD);
 DWORD WINAPI MultinetGetErrorTextW(DWORD,DWORD,DWORD);
 #define      MultinetGetErrorText WINELIB_NAME_AW(MultinetGetErrorText)
 
-/*
- * Password cache
- */
-
-/* WNetEnumCachedPasswords */
-typedef struct tagPASSWORD_CACHE_ENTRY
-{
-	WORD cbEntry;
-	WORD cbResource;
-	WORD cbPassword;
-	BYTE iEntry;
-	BYTE nType;
-	BYTE abResource[1];
-} PASSWORD_CACHE_ENTRY;
-
-typedef BOOL (CALLBACK *ENUMPASSWORDPROC)(PASSWORD_CACHE_ENTRY *, DWORD);
-UINT WINAPI WNetEnumCachedPasswords( LPSTR, WORD, BYTE, ENUMPASSWORDPROC, DWORD);
-DWORD WINAPI WNetGetCachedPassword( LPSTR, WORD, LPSTR, LPWORD, BYTE );
-DWORD WINAPI WNetCachePassword( LPSTR, WORD, LPSTR, WORD, BYTE, WORD );
 
 #ifdef __cplusplus
 }
-- 
1.5.5.1