Added missing prototypes for some implemented functions.

diff --git a/include/oledlg.h b/include/oledlg.h
index 353e0e949a081e5b93c950958aaea6da1e148775..a2367235a51aedf5e7dc110599444af44d8be168 100644 (file)
--- a/include/oledlg.h
+++ b/include/oledlg.h
@@ -833,7 +833,9 @@ BOOL WINAPI  OleUIAddVerbMenuW(LPOLEOBJECT lpOleObj, LPCWSTR lpszShortType, HMEN
 UINT WINAPI  OleUIPasteSpecialA(LPOLEUIPASTESPECIALA lpOleUIPasteSpecial);
 UINT WINAPI  OleUIPasteSpecialW(LPOLEUIPASTESPECIALW lpOleUIPasteSpecial);
 #define      OleUIPasteSpecial WINELIB_NAME_AW(OleUIPasteSpecial)
-
+INT  __cdecl OleUIPromptUserA(INT,HWND, ...);
+INT  __cdecl OleUIPromptUserW(INT,HWND, ...);
+#define      OleUIPromptUser WINELIB_NAME_AW(OleUIPromptUser)
 
 #ifdef __cplusplus
 } /* Extern "C" */

diff --git a/include/ras.h b/include/ras.h
index b589e3e9ca831ff50641f3bed7aef392352f4f6d..4c58b614dd0909e2b667ae5a0890fd50975ba96f 100644 (file)
--- a/include/ras.h
+++ b/include/ras.h
@@ -307,6 +307,9 @@ DWORD WINAPI RasDeleteSubEntryW(LPCWSTR,LPCWSTR,DWORD);
 DWORD WINAPI RasEnumConnectionsA(LPRASCONNA,LPDWORD,LPDWORD);
 DWORD WINAPI RasEnumConnectionsW(LPRASCONNW,LPDWORD,LPDWORD);
 #define      RasEnumConnections WINELIB_NAME_AW(RasEnumConnections)
+DWORD WINAPI RasEnumDevicesA(LPRASDEVINFOA,LPDWORD,LPDWORD);
+DWORD WINAPI RasEnumDevicesW(LPRASDEVINFOW,LPDWORD,LPDWORD);
+#define      RasEnumDevices WINELIB_NAME_AW(RasEnumDevices)
 DWORD WINAPI RasEnumEntriesA(LPCSTR,LPCSTR,LPRASENTRYNAMEA,LPDWORD,LPDWORD);
 DWORD WINAPI RasEnumEntriesW(LPCWSTR,LPCWSTR,LPRASENTRYNAMEW,LPDWORD,LPDWORD);
 #define      RasEnumEntries WINELIB_NAME_AW(RasEnumEntries)

diff --git a/include/vfw.h b/include/vfw.h
index 2ac448d6142026b3b619559f1087855f81e91e09..8fe77ab23fd2129bec31b333961e34b8989850af 100644 (file)
--- a/include/vfw.h
+++ b/include/vfw.h
@@ -1258,17 +1258,13 @@ HRESULT WINAPI AVIClearClipboard(void);
 HRESULT WINAPI AVIGetFromClipboard(PAVIFILE *ppfile);
 HRESULT WINAPI AVIPutFileOnClipboard(PAVIFILE pfile);
 
-#ifdef _WIN32
 #ifdef OFN_READONLY
 BOOL WINAPI GetOpenFileNamePreviewA(LPOPENFILENAMEA lpofn);
 BOOL WINAPI GetOpenFileNamePreviewW(LPOPENFILENAMEW lpofn);
 #define GetOpenFileNamePreview WINELIB_NAME_AW(GetOpenFileNamePreview)
-
 BOOL WINAPI GetSaveFileNamePreviewA(LPOPENFILENAMEA lpofn);
 BOOL WINAPI GetSaveFileNamePreviewW(LPOPENFILENAMEW lpofn);
 #define GetSaveFileNamePreview WINELIB_NAME_AW(GetSaveFileNamePreview)
-
-#endif
 #endif
 
 #define AVIERR_OK              0
@@ -1572,6 +1568,13 @@ BOOL VFWAPI DrawDibClose(HDRAWDIB hdd);
 
 DWORD VFWAPI DrawDibProfileDisplay(LPBITMAPINFOHEADER lpbi);
 
+HWND VFWAPI capCreateCaptureWindowA(LPCSTR,DWORD,INT,INT,INT,INT,HWND,INT);
+HWND VFWAPI capCreateCaptureWindowW(LPCWSTR,DWORD,INT,INT,INT,INT,HWND,INT);
+#define     capCreateCaptureWindow WINELIB_NAME_AW(capCreateCaptureWindow)
+BOOL VFWAPI capGetDriverDescriptionA(WORD,LPSTR,INT,LPSTR,INT);
+BOOL VFWAPI capGetDriverDescriptionW(WORD,LPWSTR,INT,LPWSTR,INT);
+#define     capGetDriverDescription WINELIB_NAME_AW(capGetDriverDescription)
+
 #ifdef __cplusplus
 }
 #endif  /* __cplusplus */

diff --git a/include/winbase.h b/include/winbase.h
index 25d82245f35b193119bfeaabf9dfdcf6667ae30d..c4a6cf51debbc645f73ac3a35ca14c7f1c7ad65f 100644 (file)
--- a/include/winbase.h
+++ b/include/winbase.h
@@ -1112,12 +1112,18 @@ BOOL        WINAPI BackupRead(HANDLE,LPBYTE,DWORD,LPDWORD,BOOL,BOOL,LPVOID*);
 BOOL        WINAPI BackupSeek(HANDLE,DWORD,DWORD,LPDWORD,LPDWORD,LPVOID*);
 BOOL        WINAPI BackupWrite(HANDLE,LPBYTE,DWORD,LPDWORD,BOOL,BOOL,LPVOID*);
 BOOL        WINAPI Beep(DWORD,DWORD);
+HANDLE      WINAPI BeginUpdateResourceA(LPCSTR,BOOL);
+HANDLE      WINAPI BeginUpdateResourceW(LPCWSTR,BOOL);
+#define     BeginUpdateResource WINELIB_NAME_AW(BeginUpdateResource)
 BOOL        WINAPI BuildCommDCBA(LPCSTR,LPDCB);
 BOOL        WINAPI BuildCommDCBW(LPCWSTR,LPDCB);
 #define     BuildCommDCB WINELIB_NAME_AW(BuildCommDCB)
 BOOL        WINAPI BuildCommDCBAndTimeoutsA(LPCSTR,LPDCB,LPCOMMTIMEOUTS);
 BOOL        WINAPI BuildCommDCBAndTimeoutsW(LPCWSTR,LPDCB,LPCOMMTIMEOUTS);
 #define     BuildCommDCBAndTimeouts WINELIB_NAME_AW(BuildCommDCBAndTimeouts)
+BOOL        WINAPI CallNamedPipeA(LPCSTR,LPVOID,DWORD,LPVOID,DWORD,LPDWORD,DWORD);
+BOOL        WINAPI CallNamedPipeW(LPCWSTR,LPVOID,DWORD,LPVOID,DWORD,LPDWORD,DWORD);
+#define     CallNamedPipe WINELIB_NAME_AW(CallNamedPipe)
 BOOL        WINAPI CancelIo(HANDLE);
 BOOL        WINAPI CancelWaitableTimer(HANDLE);
 BOOL        WINAPI CheckTokenMembership(HANDLE,PSID,PBOOL);
@@ -1209,6 +1215,9 @@ BOOL        WINAPI DnsHostnameToComputerNameW(LPCWSTR,LPWSTR,LPDWORD);
 BOOL        WINAPI DosDateTimeToFileTime(WORD,WORD,LPFILETIME);
 BOOL        WINAPI DuplicateHandle(HANDLE,HANDLE,HANDLE,HANDLE*,DWORD,BOOL,DWORD);
 BOOL        WINAPI EscapeCommFunction(HANDLE,UINT);
+BOOL        WINAPI EndUpdateResourceA(HANDLE,BOOL);
+BOOL        WINAPI EndUpdateResourceW(HANDLE,BOOL);
+#define     EndUpdateResource WINELIB_NAME_AW(EndUpdateResource)
 BOOL        WINAPI EnumResourceLanguagesA(HMODULE,LPCSTR,LPCSTR,ENUMRESLANGPROCA,LONG_PTR);
 BOOL        WINAPI EnumResourceLanguagesW(HMODULE,LPCWSTR,LPCWSTR,ENUMRESLANGPROCW,LONG_PTR);
 #define     EnumResourceLanguages WINELIB_NAME_AW(EnumResourceLanguages)
@@ -1312,6 +1321,9 @@ DWORD       WINAPI GetLongPathNameA(LPCSTR,LPSTR,DWORD);
 DWORD       WINAPI GetLongPathNameW(LPCWSTR,LPWSTR,DWORD);
 #define     GetLongPathName WINELIB_NAME_AW(GetLongPathName)
 BOOL        WINAPI GetMailslotInfo(HANDLE,LPDWORD,LPDWORD,LPDWORD,LPDWORD);
+BOOL        WINAPI GetNamedPipeHandleStateA(HANDLE,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPSTR,DWORD);
+BOOL        WINAPI GetNamedPipeHandleStateW(HANDLE,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPWSTR,DWORD);
+#define     GetNamedPipeHandleState WINELIB_NAME_AW(GetNamedPipeHandleState)
 BOOL        WINAPI GetNumberOfEventLogRecords(HANDLE,PDWORD);
 BOOL        WINAPI GetOldestEventLogRecord(HANDLE,PDWORD);
 DWORD       WINAPI GetPriorityClass(HANDLE);
@@ -1529,6 +1541,9 @@ BOOL        WINAPI TransmitCommChar(HANDLE,CHAR);
 BOOL        WINAPI UnlockFile(HANDLE,DWORD,DWORD,DWORD,DWORD);
 BOOL        WINAPI UnlockFileEx(HANDLE,DWORD,DWORD,DWORD,LPOVERLAPPED);
 BOOL        WINAPI UnmapViewOfFile(LPVOID);
+BOOL        WINAPI UpdateResourceA(HANDLE,LPCSTR,LPCSTR,WORD,LPVOID,DWORD);
+BOOL        WINAPI UpdateResourceW(HANDLE,LPCWSTR,LPCWSTR,WORD,LPVOID,DWORD);
+#define     UpdateResource WINELIB_NAME_AW(UpdateResource)
 BOOL        WINAPI VerifyVersionInfoA(LPOSVERSIONINFOEXA,DWORD,DWORDLONG);
 BOOL        WINAPI VerifyVersionInfoW(LPOSVERSIONINFOEXW,DWORD,DWORDLONG);
 #define     VerifyVersionInfo WINELIB_NAME_AW(VerifyVersionInfo)

diff --git a/include/wincrypt.h b/include/wincrypt.h
index dd9f750ca6d7d4426935d8c4570b308e64fe93c2..07829535fd3802684a0646171b130777e2cf8fda 100644 (file)
--- a/include/wincrypt.h
+++ b/include/wincrypt.h
@@ -503,10 +503,8 @@ BOOL WINAPI CryptImportKey (HCRYPTPROV hProv, BYTE *pbData, DWORD dwDataLen,
 BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags);
 BOOL WINAPI CryptSignHashA (HCRYPTHASH hHash, DWORD dwKeySpec, LPCSTR sDescription,
                DWORD dwFlags, BYTE *pbSignature, DWORD *pdwSigLen);
-/*BOOL WINAPI CryptSignHashW (HCRYPTHASH hHash, DWORD dwKeySpec, LPCWSTR sDescription,
-               DWORD dwFlags, BYTE *pbSignature, DWORD *pdwSigLen);*/
-#define CryptSignHashW(hHash, dwKeySpec, sDescription, dwFlags, pbSignature, pdwSigLen) \\
-       CryptSignHashA(hHash, dwKeySpec, (LPCSTR)sDescription, dwFlags, pbSignature, pdwSigLen)
+BOOL WINAPI CryptSignHashW (HCRYPTHASH hHash, DWORD dwKeySpec, LPCWSTR sDescription,
+               DWORD dwFlags, BYTE *pbSignature, DWORD *pdwSigLen);
 #define CryptSignHash WINELIB_NAME_AW(CryptSignHash)
 BOOL WINAPI CryptSetHashParam (HCRYPTHASH hHash, DWORD dwParam, BYTE *pbData, DWORD dwFlags);
 BOOL WINAPI CryptSetKeyParam (HCRYPTKEY hKey, DWORD dwParam, BYTE *pbData, DWORD dwFlags);
@@ -519,10 +517,8 @@ BOOL WINAPI CryptSetProviderExW (LPCWSTR pszProvName, DWORD dwProvType, DWORD *p
 BOOL WINAPI CryptSetProvParam (HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, DWORD dwFlags);
 BOOL WINAPI CryptVerifySignatureA (HCRYPTHASH hHash, BYTE *pbSignature, DWORD dwSigLen,
                HCRYPTKEY hPubKey, LPCSTR sDescription, DWORD dwFlags);
-/*BOOL WINAPI CryptVerifySignatureW (HCRYPTHASH hHash, BYTE *pbSignature, DWORD dwSigLen,
-               HCRYPTKEY hPubKey, LPCWSTR sDescription, DWORD dwFlags);*/
-#define CryptVerifySignatureW(hHash, pbSignature, dwSigLen, hPubKey, sDescription, dwFlags) \\
-       CryptVerifySignatureA(hHash, pbSignature, dwSigLen, hPubKey, (LPCSTR)sDescription, dwFlags)
+BOOL WINAPI CryptVerifySignatureW (HCRYPTHASH hHash, BYTE *pbSignature, DWORD dwSigLen,
+               HCRYPTKEY hPubKey, LPCWSTR sDescription, DWORD dwFlags);
 #define CryptVerifySignature WINELIB_NAME_AW(CryptVerifySignature)
 
 #ifdef __cplusplus

diff --git a/include/wingdi.h b/include/wingdi.h
index 0cfa642286ff6de2cc9014b102f3ec209b97b6cd..bf13909fc4448a3a007ee9ce6bbae3f8da7d2563 100644 (file)
--- a/include/wingdi.h
+++ b/include/wingdi.h
@@ -3249,14 +3249,14 @@ BOOL      WINAPI GetCharABCWidthsFloatW(HDC,UINT,UINT,LPABCFLOAT);
 DWORD     WINAPI GetCharacterPlacementA(HDC,LPCSTR,INT,INT,GCP_RESULTSA*,DWORD);
 DWORD     WINAPI GetCharacterPlacementW(HDC,LPCWSTR,INT,INT,GCP_RESULTSW*,DWORD);
 #define     GetCharacterPlacement WINELIB_NAME_AW(GetCharacterPlacement)
-BOOL      WINAPI GetCharWidth32A(HDC,UINT,UINT,LPINT);
-BOOL      WINAPI GetCharWidth32W(HDC,UINT,UINT,LPINT);
-#define     GetCharWidthA GetCharWidth32A
-#define     GetCharWidthW GetCharWidth32W
+BOOL        WINAPI GetCharWidth32A(HDC,UINT,UINT,LPINT);
+BOOL        WINAPI GetCharWidth32W(HDC,UINT,UINT,LPINT);
 #define     GetCharWidth32 WINELIB_NAME_AW(GetCharWidth32)
+BOOL        WINAPI GetCharWidthA(HDC,UINT,UINT,LPINT);
+BOOL        WINAPI GetCharWidthW(HDC,UINT,UINT,LPINT);
 #define     GetCharWidth WINELIB_NAME_AW(GetCharWidth)
-BOOL      WINAPI GetCharWidthFloatA(HDC,UINT,UINT,PFLOAT);
-BOOL      WINAPI GetCharWidthFloatW(HDC,UINT,UINT,PFLOAT);
+BOOL        WINAPI GetCharWidthFloatA(HDC,UINT,UINT,PFLOAT);
+BOOL        WINAPI GetCharWidthFloatW(HDC,UINT,UINT,PFLOAT);
 #define     GetCharWidthFloat WINELIB_NAME_AW(GetCharWidthFloat)
 INT       WINAPI GetClipBox(HDC,LPRECT);
 INT       WINAPI GetClipRgn(HDC,HRGN);

diff --git a/include/winnetwk.h b/include/winnetwk.h
index 26d013fc319dc3fe3b6fa8ce33a6b5a75959e180..f5149bdb9e6e58bfee1900665f496eca0cd6b659 100644 (file)
--- a/include/winnetwk.h
+++ b/include/winnetwk.h
@@ -218,6 +218,12 @@ DWORD WINAPI WNetOpenEnumW(DWORD,DWORD,DWORD,LPNETRESOURCEW,LPHANDLE);
 DWORD WINAPI WNetEnumResourceA(HANDLE,LPDWORD,LPVOID,LPDWORD);
 DWORD WINAPI WNetEnumResourceW(HANDLE,LPDWORD,LPVOID,LPDWORD);
 #define      WNetEnumResource WINELIB_NAME_AW(WNetEnumResource)
+DWORD WINAPI WNetGetResourceInformationA(LPNETRESOURCEA,LPVOID,LPDWORD,LPSTR*);
+DWORD WINAPI WNetGetResourceInformationW(LPNETRESOURCEW,LPVOID,LPDWORD,LPWSTR*);
+#define      WNetGetResourceInformation WINELIB_NAME_AW(WNetGetResourceInformation)
+DWORD WINAPI WNetGetResourceParentA(LPNETRESOURCEA,LPVOID,LPDWORD);
+DWORD WINAPI WNetGetResourceParentW(LPNETRESOURCEW,LPVOID,LPDWORD);
+#define      WNetGetResourceParent WINELIB_NAME_AW(WNetGetResourceParent)
 DWORD WINAPI WNetCloseEnum(HANDLE);
 
 /*

diff --git a/include/winnls.h b/include/winnls.h
index 0aabaf1d6b1744c252d340a943b18c4ebbaaf335..e28484835c060f4600c95df50ce0258b936c2c8f 100644 (file)
--- a/include/winnls.h
+++ b/include/winnls.h
@@ -747,6 +747,9 @@ INT         WINAPI LCMapStringA(LCID,DWORD,LPCSTR,INT,LPSTR,INT);
 INT         WINAPI LCMapStringW(LCID,DWORD,LPCWSTR,INT,LPWSTR,INT);
 #define     LCMapString WINELIB_NAME_AW(LCMapString)
 INT         WINAPI MultiByteToWideChar(UINT,DWORD,LPCSTR,INT,LPWSTR,INT);
+INT         WINAPI SetCalendarInfoA(LCID,CALID,CALTYPE,LPCSTR);
+INT         WINAPI SetCalendarInfoW(LCID,CALID,CALTYPE,LPCWSTR);
+#define     SetCalendarInfo WINELIB_NAME_AW(SetCalendarInfo)
 BOOL        WINAPI SetLocaleInfoA(LCID,LCTYPE,LPCSTR);
 BOOL        WINAPI SetLocaleInfoW(LCID,LCTYPE,LPCWSTR);
 #define     SetLocaleInfo WINELIB_NAME_AW(SetLocaleInfo)