From 05b2c1cc811a4451062dafdae9d61d9a7604bfbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20B=C3=A9ron?= Date: Sun, 24 Jul 2005 16:17:28 +0000 Subject: [PATCH] Remove multiple declarations of the same function, keeping the public one as reference. --- dlls/commdlg/cdlg16.h | 1 - dlls/ddraw/ddraw_private.h | 3 --- dlls/kernel/toolhelp.h | 1 - dlls/shell32/undocshell.h | 12 ------------ include/msi.h | 8 -------- include/objbase.h | 3 --- include/ole2.h | 1 + include/oleauto.h | 2 -- include/winbase.h | 2 -- include/wininet.h | 4 ---- 10 files changed, 1 insertion(+), 36 deletions(-) diff --git a/dlls/commdlg/cdlg16.h b/dlls/commdlg/cdlg16.h index 8f5be87617c..8bd0368f916 100644 --- a/dlls/commdlg/cdlg16.h +++ b/dlls/commdlg/cdlg16.h @@ -143,7 +143,6 @@ typedef struct BOOL16 WINAPI ChooseColor16(LPCHOOSECOLOR16 lpChCol); HWND16 WINAPI FindText16( SEGPTR find); -INT16 WINAPI GetFileTitle16(LPCSTR lpFile, LPSTR lpTitle, UINT16 cbBuf); BOOL16 WINAPI GetOpenFileName16(SEGPTR ofn); BOOL16 WINAPI GetSaveFileName16(SEGPTR ofn); BOOL16 WINAPI PrintDlg16( LPPRINTDLG16 print); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index ee97e4caba6..c86d87f9669 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -448,9 +448,6 @@ extern const IDirectDrawSurface3Vtbl DDRAW_IDDS3_Thunk_VTable; /***************************************************************************** * IDirectDrawClipper declarations */ -HRESULT WINAPI DirectDrawCreateClipper(DWORD dwFlags, - LPDIRECTDRAWCLIPPER* ppClipper, - LPUNKNOWN pUnkOuter); HRESULT DDRAW_CreateClipper(IUnknown* pUnkOuter, REFIID riid, LPVOID* ppObj); void Main_DirectDrawClipper_ForceDestroy(IDirectDrawClipperImpl* This); diff --git a/dlls/kernel/toolhelp.h b/dlls/kernel/toolhelp.h index fb7d6584d75..b5af360b1c8 100644 --- a/dlls/kernel/toolhelp.h +++ b/dlls/kernel/toolhelp.h @@ -95,7 +95,6 @@ typedef struct /* wFlags values */ #define GF_PDB_OWNER 0x0100 /* Low byte is KERNEL flags */ -WORD WINAPI GlobalHandleToSel16( HGLOBAL16 handle ); BOOL16 WINAPI GlobalInfo16( GLOBALINFO *pInfo ); BOOL16 WINAPI GlobalFirst16( GLOBALENTRY *pGlobal, WORD wFlags ); BOOL16 WINAPI GlobalNext16( GLOBALENTRY *pGlobal, WORD wFlags) ; diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index 2ae56a8b3d8..0cc5bce2b0d 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -65,9 +65,6 @@ HRESULT WINAPI SHILCreateFromPathW ( LPITEMIDLIST * ppidl, DWORD *attributes); -LPITEMIDLIST WINAPI ILCreateFromPathA(LPCSTR path); -LPITEMIDLIST WINAPI ILCreateFromPathW(LPCWSTR path); - /* string functions */ @@ -124,15 +121,6 @@ void WINAPI RunFileDlg( void WINAPI ExitWindowsDialog(HWND hwndOwner); -BOOL WINAPI GetFileNameFromBrowse( - HWND hwndOwner, - LPSTR lpstrFile, - DWORD nMaxFile, - LPCSTR lpstrInitialDir, - LPCSTR lpstrDefExt, - LPCSTR lpstrFilter, - LPCSTR lpstrTitle); - BOOL WINAPI SHFindComputer( LPCITEMIDLIST pidlRoot, LPCITEMIDLIST pidlSavedSearch); diff --git a/include/msi.h b/include/msi.h index d64ffd1386b..38e37251f99 100644 --- a/include/msi.h +++ b/include/msi.h @@ -373,10 +373,6 @@ UINT WINAPI MsiEnumClientsA(LPCSTR, DWORD, LPSTR); UINT WINAPI MsiEnumClientsW(LPCWSTR, DWORD, LPWSTR); #define MsiEnumClients WINELIB_NAME_AW(MsiEnumClients) -UINT WINAPI MsiOpenDatabaseA(LPCSTR, LPCSTR, MSIHANDLE *); -UINT WINAPI MsiOpenDatabaseW(LPCWSTR, LPCWSTR, MSIHANDLE *); -#define MsiOpenDatabase WINELIB_NAME_AW(MsiOpenDatabase) - UINT WINAPI MsiOpenPackageA(LPCSTR, MSIHANDLE*); UINT WINAPI MsiOpenPackageW(LPCWSTR, MSIHANDLE*); #define MsiOpenPackage WINELIB_NAME_AW(MsiOpenPackage) @@ -397,10 +393,6 @@ UINT WINAPI MsiGetProductPropertyA(MSIHANDLE,LPCSTR,LPSTR,DWORD*); UINT WINAPI MsiGetProductPropertyW(MSIHANDLE,LPCWSTR,LPWSTR,DWORD*); #define MsiGetProductProperty WINELIB_NAME_AW(MsiGetProductProperty) -UINT WINAPI MsiGetPropertyA(MSIHANDLE, LPCSTR, LPSTR, DWORD*); -UINT WINAPI MsiGetPropertyW(MSIHANDLE, LPCWSTR, LPWSTR, DWORD*); -#define MsiGetProperty WINELIB_NAME_AW(MsiGetProperty) - UINT WINAPI MsiVerifyPackageA(LPCSTR); UINT WINAPI MsiVerifyPackageW(LPCWSTR); #define MsiVerifyPackage WINELIB_NAME_AW(MsiVerifyPackage) diff --git a/include/objbase.h b/include/objbase.h index cefa748bb80..1c1ab3021a3 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -490,9 +490,6 @@ HRESULT WINAPI StgIsStorageILockBytes(ILockBytes *plkbyt); HRESULT WINAPI StgOpenStorage(const OLECHAR* pwcsName,IStorage* pstgPriority,DWORD grfMode,SNB snbExclude,DWORD reserved,IStorage**ppstgOpen); HRESULT WINAPI StgOpenStorageEx(const WCHAR* pwcwName,DWORD grfMode,DWORD stgfmt,DWORD grfAttrs,STGOPTIONS *pStgOptions, void *reserved, REFIID riid, void **ppObjectOpen); -HRESULT WINAPI WriteClassStg(IStorage* pStg, REFCLSID rclsid); -HRESULT WINAPI ReadClassStg(IStorage *pstg,CLSID *pclsid); - HRESULT WINAPI StgCreateDocfileOnILockBytes(ILockBytes *plkbyt,DWORD grfMode, DWORD reserved, IStorage** ppstgOpen); HRESULT WINAPI StgOpenStorageOnILockBytes(ILockBytes *plkbyt, IStorage *pstgPriority, DWORD grfMode, SNB snbExclude, DWORD reserved, IStorage **ppstgOpen); HRESULT WINAPI StgSetTimes( OLECHAR const *lpszName, FILETIME const *pctime, FILETIME const *patime, FILETIME const *pmtime); diff --git a/include/ole2.h b/include/ole2.h index 98b04b5c7bf..42410484fc2 100644 --- a/include/ole2.h +++ b/include/ole2.h @@ -56,6 +56,7 @@ HOLEMENU WINAPI OleCreateMenuDescriptor(HMENU hmenuCombined,LPOLEMENUGROUPWIDTHS HRESULT WINAPI OleDestroyMenuDescriptor(HOLEMENU hmenuDescriptor); HRESULT WINAPI OleSetMenuDescriptor(HOLEMENU hmenuDescriptor,HWND hwndFrame,HWND hwndActiveObject,LPOLEINPLACEFRAME lpFrame,LPOLEINPLACEACTIVEOBJECT lpActiveObject); +HRESULT WINAPI WriteClassStg(IStorage *pstg, REFCLSID rclsid); HRESULT WINAPI ReadClassStg(IStorage *pstg,CLSID *pclsid); HRESULT WINAPI WriteClassStm(IStream *pStm,REFCLSID rclsid); HRESULT WINAPI ReadClassStm(IStream *pStm,CLSID *pclsid); diff --git a/include/oleauto.h b/include/oleauto.h index 1b33756823e..3317b8167a4 100644 --- a/include/oleauto.h +++ b/include/oleauto.h @@ -349,7 +349,6 @@ HRESULT WINAPI VarCyFromUI2(USHORT,CY*); HRESULT WINAPI VarCyFromUI4(ULONG,CY*); HRESULT WINAPI VarCyFromUI8(ULONG64,CY*); HRESULT WINAPI VarCyFromDec(DECIMAL*,CY*); -HRESULT WINAPI VarCyFromStr(OLECHAR*,LCID,ULONG,CY*); HRESULT WINAPI VarCyFromDisp(IDispatch*,LCID,CY*); HRESULT WINAPI VarBstrFromUI1(BYTE,LCID,ULONG,BSTR*); @@ -718,7 +717,6 @@ HRESULT WINAPI CreateDispTypeInfo(INTERFACEDATA*,LCID,ITypeInfo**); HRESULT WINAPI CreateStdDispatch(IUnknown*,void*,ITypeInfo*,IUnknown**); HRESULT WINAPI DispCallFunc(void*,ULONG,CALLCONV,VARTYPE,UINT,VARTYPE*, VARIANTARG**,VARIANT*); -HRESULT WINAPI GetActiveObject(REFCLSID,void*,IUnknown**); /* diff --git a/include/winbase.h b/include/winbase.h index c27dbfcdc0d..0fb93ab5aab 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1789,7 +1789,6 @@ BOOL WINAPI CreateDirectoryExW(LPCWSTR,LPCWSTR,LPSECURITY_ATTRIBUTES); BOOL WINAPI DecryptFileA(LPCSTR,DWORD); BOOL WINAPI DecryptFileW(LPCWSTR,DWORD); #define DecryptFile WINELIB_NAME_AW(DecryptFile) -BOOL WINAPI DefineDosDeviceA(DWORD,LPCSTR,LPCSTR); #define DefineHandleTable(w) ((w),TRUE) ATOM WINAPI DeleteAtom(ATOM); BOOL WINAPI DeleteFileA(LPCSTR); @@ -2153,7 +2152,6 @@ DWORD WINAPI MapLS(LPCVOID); LPVOID WINAPI MapSL(DWORD); VOID WINAPI ReleaseThunkLock(DWORD*); VOID WINAPI RestoreThunkLock(DWORD); -void WINAPI SetProcessDword(DWORD,INT,DWORD); VOID WINAPI UnMapLS(DWORD); HFILE WINAPI Win32HandleToDosFileHandle(HANDLE); VOID WINAPI _CheckNotSysLevel(SYSLEVEL *lock); diff --git a/include/wininet.h b/include/wininet.h index 042bd2c7068..d2715c1e959 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1576,10 +1576,6 @@ INTERNETAPI BOOL WINAPI InternetSetDialStateW(LPCWSTR ,DWORD ,DWORD); #define InternetSetDialState WINELIB_NAME_AW(InternetSetDialState) #define INTERNET_DIALSTATE_DISCONNECTED 1 -BOOLAPI InternetCheckConnectionA(LPCSTR lpszUrl,DWORD dwFlags,DWORD dwReserved); -BOOLAPI InternetCheckConnectionW(LPCWSTR lpszUrl,DWORD dwFlags,DWORD dwReserved); -#define InternetCheckConnection WINELIB_NAME_AW(InternetCheckConnection) - BOOL WINAPI InternetGetConnectedStateExA(LPDWORD, LPSTR, DWORD, DWORD); BOOL WINAPI InternetGetConnectedStateExW(LPDWORD, LPWSTR, DWORD, DWORD); #define InternetGetConnectedStateEx WINELIB_NAME_AW(InternetGetConnectedStateEx)