Remove multiple declarations of the same function, keeping the public

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);

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);
 

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) ;

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);

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)

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);

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);

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**);
 
 
 /*

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);

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)