Fixed/added missing/wrong function prototypes and made internal

dlls/avifil32/avifile.c

@@ -18,6 +18,64 @@ DECLARE_DEBUG_CHANNEL(avifile)
 DECLARE_DEBUG_CHANNEL(msvideo)
 DECLARE_DEBUG_CHANNEL(relay)
 
+static HRESULT WINAPI IAVIFile_fnQueryInterface(IAVIFile* iface,REFIID refiid,LPVOID *obj);
+static ULONG WINAPI IAVIFile_fnAddRef(IAVIFile* iface);
+static ULONG WINAPI IAVIFile_fnRelease(IAVIFile* iface);
+static HRESULT WINAPI IAVIFile_fnInfo(IAVIFile*iface,AVIFILEINFOW*afi,LONG size);
+static HRESULT WINAPI IAVIFile_fnGetStream(IAVIFile*iface,PAVISTREAM*avis,DWORD fccType,LONG lParam);
+static HRESULT WINAPI IAVIFile_fnCreateStream(IAVIFile*iface,PAVISTREAM*avis,AVISTREAMINFOW*asi);
+static HRESULT WINAPI IAVIFile_fnWriteData(IAVIFile*iface,DWORD ckid,LPVOID lpData,LONG size);
+static HRESULT WINAPI IAVIFile_fnReadData(IAVIFile*iface,DWORD ckid,LPVOID lpData,LONG *size);
+static HRESULT WINAPI IAVIFile_fnEndRecord(IAVIFile*iface);
+static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile*iface,DWORD fccType,LONG lParam);
+
+struct ICOM_VTABLE(IAVIFile) iavift = {
+    ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+    IAVIFile_fnQueryInterface,
+    IAVIFile_fnAddRef,
+    IAVIFile_fnRelease,
+    IAVIFile_fnInfo,
+    IAVIFile_fnGetStream,
+    IAVIFile_fnCreateStream,
+    IAVIFile_fnWriteData,
+    IAVIFile_fnReadData,
+    IAVIFile_fnEndRecord,
+    IAVIFile_fnDeleteStream
+};
+
+static HRESULT WINAPI IAVIStream_fnQueryInterface(IAVIStream*iface,REFIID refiid,LPVOID *obj);
+static ULONG WINAPI IAVIStream_fnAddRef(IAVIStream*iface);
+static ULONG WINAPI IAVIStream_fnRelease(IAVIStream* iface);
+static HRESULT WINAPI IAVIStream_fnCreate(IAVIStream*iface,LPARAM lParam1,LPARAM lParam2);
+static HRESULT WINAPI IAVIStream_fnInfo(IAVIStream*iface,AVISTREAMINFOW *psi,LONG size);
+static LONG WINAPI IAVIStream_fnFindSample(IAVIStream*iface,LONG pos,LONG flags);
+static HRESULT WINAPI IAVIStream_fnReadFormat(IAVIStream*iface,LONG pos,LPVOID format,LONG *formatsize);
+static HRESULT WINAPI IAVIStream_fnSetFormat(IAVIStream*iface,LONG pos,LPVOID format,LONG formatsize);
+static HRESULT WINAPI IAVIStream_fnRead(IAVIStream*iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,LONG *bytesread,LONG *samplesread);
+static HRESULT WINAPI IAVIStream_fnWrite(IAVIStream*iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,DWORD flags,LONG *sampwritten,LONG *byteswritten);
+static HRESULT WINAPI IAVIStream_fnDelete(IAVIStream*iface,LONG start,LONG samples);
+static HRESULT WINAPI IAVIStream_fnReadData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG *lpread);
+static HRESULT WINAPI IAVIStream_fnWriteData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG size);
+static HRESULT WINAPI IAVIStream_fnSetInfo(IAVIStream*iface,AVISTREAMINFOW*info,LONG infolen);
+
+struct ICOM_VTABLE(IAVIStream) iavist = {
+    ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+    IAVIStream_fnQueryInterface,
+    IAVIStream_fnAddRef,
+    IAVIStream_fnRelease,
+    IAVIStream_fnCreate,
+    IAVIStream_fnInfo,
+    IAVIStream_fnFindSample,
+    IAVIStream_fnReadFormat,
+    IAVIStream_fnSetFormat,
+    IAVIStream_fnRead,
+    IAVIStream_fnWrite,
+    IAVIStream_fnDelete,
+    IAVIStream_fnReadData,
+    IAVIStream_fnWriteData,
+    IAVIStream_fnSetInfo
+};
+
 typedef struct IAVIStreamImpl {
 	/* IUnknown stuff */
 	ICOM_VTABLE(IAVIStream)*	lpvtbl;
@@ -56,8 +114,6 @@ typedef struct IAVIFileImpl {
 	/* IAVIFile stuff... */
 } IAVIFileImpl;
 
-struct ICOM_VTABLE(IAVIStream) iavist;
-
 static HRESULT WINAPI IAVIFile_fnQueryInterface(IAVIFile* iface,REFIID refiid,LPVOID *obj) {
 	ICOM_THIS(IAVIFileImpl,iface);
 	char    xrefiid[50];
@@ -151,20 +207,6 @@ static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile*iface,DWORD fccType,LONG
 	return E_FAIL;
 }
 
-struct ICOM_VTABLE(IAVIFile) iavift = {
-    ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
-    IAVIFile_fnQueryInterface,
-    IAVIFile_fnAddRef,
-    IAVIFile_fnRelease,
-    IAVIFile_fnInfo,
-    IAVIFile_fnGetStream,
-    IAVIFile_fnCreateStream,
-    IAVIFile_fnWriteData,
-    IAVIFile_fnReadData,
-    IAVIFile_fnEndRecord,
-    IAVIFile_fnDeleteStream
-};
-
 HRESULT WINAPI AVIFileOpenA(
 	PAVIFILE * ppfile,LPCSTR szFile,UINT uMode,LPCLSID lpHandler
 ) {
@@ -219,22 +261,22 @@ static ULONG WINAPI IAVIStream_fnRelease(IAVIStream* iface) {
 	return This->ref;
 }
 
-HRESULT WINAPI IAVIStream_fnCreate(IAVIStream*iface,LPARAM lParam1,LPARAM lParam2) {
+static HRESULT WINAPI IAVIStream_fnCreate(IAVIStream*iface,LPARAM lParam1,LPARAM lParam2) {
 	FIXME_(avifile)("(%p)->Create(0x%08lx,0x%08lx)\n",iface,lParam1,lParam2);
 	return E_FAIL;
 }
 
-HRESULT WINAPI IAVIStream_fnInfo(IAVIStream*iface,AVISTREAMINFOW *psi,LONG size) {
+static HRESULT WINAPI IAVIStream_fnInfo(IAVIStream*iface,AVISTREAMINFOW *psi,LONG size) {
 	FIXME_(avifile)("(%p)->Info(%p,%ld)\n",iface,psi,size);
 	return E_FAIL;
 }
 
-LONG WINAPI IAVIStream_fnFindSample(IAVIStream*iface,LONG pos,LONG flags) {
+static LONG WINAPI IAVIStream_fnFindSample(IAVIStream*iface,LONG pos,LONG flags) {
 	FIXME_(avifile)("(%p)->FindSample(%ld,0x%08lx)\n",iface,pos,flags);
 	return E_FAIL;
 }
 
-HRESULT WINAPI IAVIStream_fnReadFormat(IAVIStream*iface,LONG pos,LPVOID format,LONG *formatsize) {
+static HRESULT WINAPI IAVIStream_fnReadFormat(IAVIStream*iface,LONG pos,LPVOID format,LONG *formatsize) {
 	FIXME_(avifile)("(%p)->ReadFormat(%ld,%p,%p)\n",iface,pos,format,formatsize);
 	return E_FAIL;
 }
@@ -242,7 +284,7 @@ HRESULT WINAPI IAVIStream_fnReadFormat(IAVIStream*iface,LONG pos,LPVOID format,L
 /*****************************************************************************
  *						[IAVIStream::SetFormat]
  */
-HRESULT WINAPI IAVIStream_fnSetFormat(IAVIStream*iface,LONG pos,LPVOID format,LONG formatsize) {
+static HRESULT WINAPI IAVIStream_fnSetFormat(IAVIStream*iface,LONG pos,LPVOID format,LONG formatsize) {
 	IAVIStreamImpl	*as = (IAVIStreamImpl*)iface;
 
 	FIXME_(avifile)("(%p)->SetFormat(%ld,%p,%ld)\n",iface,pos,format,formatsize);
@@ -276,12 +318,12 @@ HRESULT WINAPI IAVIStream_fnSetFormat(IAVIStream*iface,LONG pos,LPVOID format,LO
 	return S_OK;
 }
 
-HRESULT WINAPI IAVIStream_fnRead(IAVIStream*iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,LONG *bytesread,LONG *samplesread) {
+static HRESULT WINAPI IAVIStream_fnRead(IAVIStream*iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,LONG *bytesread,LONG *samplesread) {
 	FIXME_(avifile)("(%p)->Read(%ld,%ld,%p,%ld,%p,%p)\n",iface,start,samples,buffer,buffersize,bytesread,samplesread);
 	return E_FAIL;
 }
 
-HRESULT WINAPI IAVIStream_fnWrite(IAVIStream*iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,DWORD flags,LONG *sampwritten,LONG *byteswritten) {
+static HRESULT WINAPI IAVIStream_fnWrite(IAVIStream*iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,DWORD flags,LONG *sampwritten,LONG *byteswritten) {
 	IAVIStreamImpl	*as = (IAVIStreamImpl*)iface;
 	DWORD		ckid,xflags;
 
@@ -310,44 +352,25 @@ HRESULT WINAPI IAVIStream_fnWrite(IAVIStream*iface,LONG start,LONG samples,LPVOI
 	return S_OK;
 }
 
-HRESULT WINAPI IAVIStream_fnDelete(IAVIStream*iface,LONG start,LONG samples) {
+static HRESULT WINAPI IAVIStream_fnDelete(IAVIStream*iface,LONG start,LONG samples) {
 	FIXME_(avifile)("(%p)->Delete(%ld,%ld)\n",iface,start,samples);
 	return E_FAIL;
 }
-
-HRESULT WINAPI IAVIStream_fnReadData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG *lpread) {
+static HRESULT WINAPI IAVIStream_fnReadData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG *lpread) {
 	FIXME_(avifile)("(%p)->ReadData(0x%08lx,%p,%p)\n",iface,fcc,lp,lpread);
 	return E_FAIL;
 }
 
-HRESULT WINAPI IAVIStream_fnWriteData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG size) {
+static HRESULT WINAPI IAVIStream_fnWriteData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG size) {
 	FIXME_(avifile)("(%p)->WriteData(0x%08lx,%p,%ld)\n",iface,fcc,lp,size);
 	return E_FAIL;
 }
 
-HRESULT WINAPI IAVIStream_fnSetInfo(IAVIStream*iface,AVISTREAMINFOW*info,LONG infolen) {
+static HRESULT WINAPI IAVIStream_fnSetInfo(IAVIStream*iface,AVISTREAMINFOW*info,LONG infolen) {
 	FIXME_(avifile)("(%p)->SetInfo(%p,%ld)\n",iface,info,infolen);
 	return E_FAIL;
 }
 
-struct ICOM_VTABLE(IAVIStream) iavist = {
-    ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
-    IAVIStream_fnQueryInterface,
-    IAVIStream_fnAddRef,
-    IAVIStream_fnRelease,
-    IAVIStream_fnCreate,
-    IAVIStream_fnInfo,
-    IAVIStream_fnFindSample,
-    IAVIStream_fnReadFormat,
-    IAVIStream_fnSetFormat,
-    IAVIStream_fnRead,
-    IAVIStream_fnWrite,
-    IAVIStream_fnDelete,
-    IAVIStream_fnReadData,
-    IAVIStream_fnWriteData,
-    IAVIStream_fnSetInfo
-};
-
 HRESULT WINAPI AVIFileCreateStreamA(PAVIFILE iface,PAVISTREAM *ppavi,AVISTREAMINFOA * psi) {
 	AVISTREAMINFOW	psiw;
 	

dlls/comctl32/animate.c

@@ -260,7 +260,7 @@ ANIMATE_EraseBackground (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
 
 
-LRESULT WINAPI
+static LRESULT WINAPI
 ANIMATE_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     switch (uMsg)

dlls/comctl32/comboex.c

@@ -221,7 +221,7 @@ COMBOEX_Size (HWND hwnd, WPARAM wParam, LPARAM lParam)
 }
 
 
-LRESULT WINAPI
+static LRESULT WINAPI
 COMBOEX_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     switch (uMsg)

dlls/comctl32/datetime.c

@@ -433,7 +433,7 @@ DATETIME_Destroy (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
 
 
-LRESULT WINAPI
+static LRESULT WINAPI
 DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 

dlls/comctl32/flatsb.c

@@ -128,7 +128,7 @@ FlatSB_Destroy (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
 
 
-LRESULT WINAPI
+static LRESULT WINAPI
 FlatSB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     switch (uMsg)

dlls/comctl32/header.c

@@ -1442,7 +1442,7 @@ HEADER_SetFont (HWND hwnd, WPARAM wParam, LPARAM lParam)
 }
 
 
-LRESULT WINAPI
+static LRESULT WINAPI
 HEADER_WindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
     switch (msg) {

dlls/comctl32/hotkey.c

@@ -266,7 +266,7 @@ HOTKEY_SysKeyUp (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
 
 
-LRESULT WINAPI
+static LRESULT WINAPI
 HOTKEY_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     switch (uMsg)

dlls/comctl32/ipaddress.c

@@ -590,7 +590,7 @@ IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 }
 
 
-LRESULT WINAPI
+static LRESULT WINAPI
 IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
   switch (uMsg)

dlls/comctl32/listview.c

@@ -6606,7 +6606,7 @@ static INT LISTVIEW_StyleChanged(HWND hwnd, WPARAM wStyleType,
  * Window procedure of the listview control.
  *
  */
-LRESULT WINAPI LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam,
+static LRESULT WINAPI LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam,
                                    LPARAM lParam)
 {
   switch (uMsg)

dlls/comctl32/monthcal.c

@@ -1471,7 +1471,7 @@ MONTHCAL_Destroy (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
 
 
-LRESULT WINAPI
+static LRESULT WINAPI
 MONTHCAL_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 

dlls/comctl32/nativefont.c

@@ -59,7 +59,7 @@ NATIVEFONT_Destroy (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
 
 
-LRESULT WINAPI
+static LRESULT WINAPI
 NATIVEFONT_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     switch (uMsg)

dlls/comctl32/pager.c

@@ -287,7 +287,7 @@ PAGER_Size (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
 
 
-LRESULT WINAPI
+static LRESULT WINAPI
 PAGER_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     switch (uMsg)

dlls/comctl32/progress.c

@@ -193,7 +193,7 @@ PROGRESS_SetFont (HWND hwnd, WPARAM wParam, LPARAM lParam)
 /***********************************************************************
  *           ProgressWindowProc
  */
-LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, 
+static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, 
                                   WPARAM wParam, LPARAM lParam)
 {
     PROGRESS_INFO *infoPtr = PROGRESS_GetInfoPtr(hwnd); 

dlls/comctl32/rebar.c

@@ -1859,7 +1859,7 @@ REBAR_Size (HWND hwnd, WPARAM wParam, LPARAM lParam)
 }
 
 
-LRESULT WINAPI
+static LRESULT WINAPI
 REBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     switch (uMsg)

dlls/comctl32/status.c

@@ -1111,7 +1111,7 @@ STATUSBAR_SendNotify (HWND hwnd, UINT code)
 
 
 
-LRESULT WINAPI
+static LRESULT WINAPI
 StatusWindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
     switch (msg) {

dlls/comctl32/tab.c

@@ -1656,7 +1656,7 @@ TAB_Destroy (HWND hwnd, WPARAM wParam, LPARAM lParam)
   return 0;
 }
 
-LRESULT WINAPI
+static LRESULT WINAPI
 TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     switch (uMsg)

dlls/comctl32/toolbar.c

@@ -719,7 +719,7 @@ TOOLBAR_RelayEvent (HWND hwndTip, HWND hwndMsg, UINT uMsg,
  * TOOLBAR_CustomizeDialogProc
  * This function implements the toolbar customization dialog.
  */
-BOOL WINAPI
+static BOOL WINAPI
 TOOLBAR_CustomizeDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     TOOLBAR_INFO *infoPtr = (TOOLBAR_INFO *)GetWindowLongA (hwnd, DWL_USER);
@@ -2983,7 +2983,7 @@ TOOLBAR_StyleChanged (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
 
 
-LRESULT WINAPI
+static LRESULT WINAPI
 ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     switch (uMsg)

dlls/comctl32/tooltips.c

@@ -2181,7 +2181,7 @@ TOOLTIPS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 }
 
 
-LRESULT CALLBACK
+static LRESULT CALLBACK
 TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     switch (uMsg)

dlls/comctl32/trackbar.c

@@ -56,7 +56,7 @@ DEFAULT_DEBUG_CHANNEL(trackbar)
 
 static BOOL TRACKBAR_SendNotify (HWND hwnd, UINT code);
 
-void TRACKBAR_RecalculateTics (TRACKBAR_INFO *infoPtr)
+static void TRACKBAR_RecalculateTics (TRACKBAR_INFO *infoPtr)
 {
     int i,tic,nrTics;
 
@@ -1462,7 +1462,7 @@ TRACKBAR_KeyUp (HWND hwnd, WPARAM wParam)
 }
 
 
-LRESULT WINAPI
+static LRESULT WINAPI
 TRACKBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     switch (uMsg)

dlls/comctl32/treeview.c

@@ -1446,7 +1446,7 @@ static INT WINAPI TREEVIEW_SortOnName (
  *         application decide what that means. See also TVM_SORTCHILDRENCB.
  */
 
-LRESULT WINAPI TREEVIEW_Sort (
+static LRESULT WINAPI TREEVIEW_Sort (
   HWND   hwnd, 
   BOOL   fRecurse, 
   HTREEITEM parent,
@@ -1556,7 +1556,7 @@ LRESULT WINAPI TREEVIEW_Sort (
  * Setup the treeview structure with regards of the sort method
  * and sort the children of the TV item specified in lParam
  */
-LRESULT WINAPI TREEVIEW_SortChildrenCB(
+static LRESULT WINAPI TREEVIEW_SortChildrenCB(
   HWND   hwnd, 
   WPARAM wParam, 
   LPARAM lParam
@@ -1571,7 +1571,7 @@ LRESULT WINAPI TREEVIEW_SortChildrenCB(
 /***************************************************************************
  * Sort the children of the TV item specified in lParam.
  */
-LRESULT WINAPI TREEVIEW_SortChildren (
+static LRESULT WINAPI TREEVIEW_SortChildren (
   HWND   hwnd, 
   WPARAM wParam, 
   LPARAM lParam)
@@ -2000,7 +2000,7 @@ TREEVIEW_SetToolTips (HWND hwnd, WPARAM wParam)
 }
 
 
-LRESULT CALLBACK
+static LRESULT CALLBACK
 TREEVIEW_GetEditControl (HWND hwnd)
 
 {
@@ -2575,7 +2575,6 @@ TREEVIEW_Expand (HWND hwnd, WPARAM wParam, LPARAM lParam)
   		TRACE("For (%s) item:%d, flags %x, state:%d\n", 
                 wineItem->pszText, flag, expand, wineItem->state);
 
-
   if (wineItem->cChildren==I_CHILDRENCALLBACK) {
     FIXME("we don't handle I_CHILDRENCALLBACK yet\n");
     return 0;
@@ -2837,7 +2836,7 @@ TREEVIEW_EndEditLabelNow (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
 
 
-LRESULT
+static LRESULT
 TREEVIEW_LButtonDoubleClick (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
   TREEVIEW_ITEM *wineItem;
@@ -3521,7 +3520,7 @@ TREEVIEW_SetScrollTime (HWND hwnd, UINT uScrollTime)
 }
 
 
-LRESULT WINAPI
+static LRESULT WINAPI
 TREEVIEW_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     switch (uMsg) {

dlls/comctl32/updown.c

@@ -706,7 +706,7 @@ static void UPDOWN_HandleMouseEvent (HWND hwnd, UINT msg, POINT pt)
 /***********************************************************************
  *           UpDownWndProc
  */
-LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam,
+static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam,
 				LPARAM lParam)
 {
   UPDOWN_INFO *infoPtr = UPDOWN_GetInfoPtr (hwnd);

dlls/shell32/brsfolder.c

@@ -227,7 +227,7 @@ static LRESULT MsgNotify(HWND hWnd,  UINT CtlID, LPNMHDR lpnmh)
 /*************************************************************************
  *             BrsFolderDlgProc32  (not an exported API function)
  */
-BOOL WINAPI BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam,
+static BOOL WINAPI BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam,
 				     LPARAM lParam )
 {    TRACE("hwnd=%i msg=%i 0x%08x 0x%08lx\n", hWnd,  msg, wParam, lParam );
 

dlls/shell32/contmenu.c

@@ -20,6 +20,32 @@
 DEFAULT_DEBUG_CHANNEL(shell)
 
 /**************************************************************************
+* IContextMenu VTable
+* 
+*/
+
+static HRESULT WINAPI IContextMenu_fnQueryInterface(IContextMenu *iface, REFIID riid, LPVOID *ppvObj);
+static ULONG WINAPI IContextMenu_fnAddRef(IContextMenu *iface);
+static ULONG WINAPI IContextMenu_fnRelease(IContextMenu *iface);
+static HRESULT WINAPI IContextMenu_fnQueryContextMenu(IContextMenu *iface, HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags);
+static HRESULT WINAPI IContextMenu_fnInvokeCommand(IContextMenu *iface, LPCMINVOKECOMMANDINFO lpcmi);
+static HRESULT WINAPI IContextMenu_fnGetCommandString(IContextMenu *iface, UINT idCommand, UINT uFlags, LPUINT lpReserved, LPSTR lpszName, UINT uMaxNameLen);
+static HRESULT WINAPI IContextMenu_fnHandleMenuMsg(IContextMenu *iface, UINT uMsg, WPARAM wParam, LPARAM lParam);
+
+static struct ICOM_VTABLE(IContextMenu) cmvt = 
+{	
+	ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+	IContextMenu_fnQueryInterface,
+	IContextMenu_fnAddRef,
+	IContextMenu_fnRelease,
+	IContextMenu_fnQueryContextMenu,
+	IContextMenu_fnInvokeCommand,
+	IContextMenu_fnGetCommandString,
+	IContextMenu_fnHandleMenuMsg,
+	(void *) 0xdeadbabe	/* just paranoia */
+};
+
+/**************************************************************************
 *  IContextMenu Implementation
 */
 typedef struct 
@@ -37,7 +63,7 @@ static struct ICOM_VTABLE(IContextMenu) cmvt;
 /**************************************************************************
 *  IContextMenu_AllocPidlTable()
 */
-BOOL IContextMenu_AllocPidlTable(IContextMenuImpl *This, DWORD dwEntries)
+static BOOL IContextMenu_AllocPidlTable(IContextMenuImpl *This, DWORD dwEntries)
 {
 	TRACE("(%p)->(entrys=%lu)\n",This, dwEntries);
 
@@ -55,7 +81,7 @@ BOOL IContextMenu_AllocPidlTable(IContextMenuImpl *This, DWORD dwEntries)
 /**************************************************************************
 * IContextMenu_FreePidlTable()
 */
-void IContextMenu_FreePidlTable(IContextMenuImpl *This)
+static void IContextMenu_FreePidlTable(IContextMenuImpl *This)
 {
 	int   i;
 
@@ -74,7 +100,7 @@ void IContextMenu_FreePidlTable(IContextMenuImpl *This)
 /**************************************************************************
 * IContextMenu_FillPidlTable()
 */
-BOOL IContextMenu_FillPidlTable(IContextMenuImpl *This, LPCITEMIDLIST *aPidls, UINT uItemCount)
+static BOOL IContextMenu_FillPidlTable(IContextMenuImpl *This, LPCITEMIDLIST *aPidls, UINT uItemCount)
 {
 	UINT  i;
 
@@ -92,7 +118,7 @@ BOOL IContextMenu_FillPidlTable(IContextMenuImpl *This, LPCITEMIDLIST *aPidls, U
 /**************************************************************************
 * IContextMenu_CanRenameItems()
 */
-BOOL IContextMenu_CanRenameItems(IContextMenuImpl *This)
+static BOOL IContextMenu_CanRenameItems(IContextMenuImpl *This)
 {	UINT  i;
 	DWORD dwAttributes;
 
@@ -427,20 +453,3 @@ static HRESULT WINAPI IContextMenu_fnHandleMenuMsg(
 	return E_NOTIMPL;
 }
 
-/**************************************************************************
-* IContextMenu VTable
-* 
-*/
-static struct ICOM_VTABLE(IContextMenu) cmvt = 
-{	
-	ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
-	IContextMenu_fnQueryInterface,
-	IContextMenu_fnAddRef,
-	IContextMenu_fnRelease,
-	IContextMenu_fnQueryContextMenu,
-	IContextMenu_fnInvokeCommand,
-	IContextMenu_fnGetCommandString,
-	IContextMenu_fnHandleMenuMsg,
-	(void *) 0xdeadbabe	/* just paranoia */
-};
-

dlls/shell32/memorystream.c

@@ -19,6 +19,41 @@
 
 DEFAULT_DEBUG_CHANNEL(shell)
 
+static HRESULT WINAPI IStream_fnQueryInterface(IStream *iface, REFIID riid, LPVOID *ppvObj);
+static ULONG WINAPI IStream_fnAddRef(IStream *iface);
+static ULONG WINAPI IStream_fnRelease(IStream *iface);
+static HRESULT WINAPI IStream_fnRead (IStream * iface, void* pv, ULONG cb, ULONG* pcbRead);
+static HRESULT WINAPI IStream_fnWrite (IStream * iface, const void* pv, ULONG cb, ULONG* pcbWritten);
+static HRESULT WINAPI IStream_fnSeek (IStream * iface, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER* plibNewPosition);
+static HRESULT WINAPI IStream_fnSetSize (IStream * iface, ULARGE_INTEGER libNewSize);
+static HRESULT WINAPI IStream_fnCopyTo (IStream * iface, IStream* pstm, ULARGE_INTEGER cb, ULARGE_INTEGER* pcbRead, ULARGE_INTEGER* pcbWritten);
+static HRESULT WINAPI IStream_fnCommit (IStream * iface, DWORD grfCommitFlags);
+static HRESULT WINAPI IStream_fnRevert (IStream * iface);
+static HRESULT WINAPI IStream_fnLockRegion (IStream * iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType);
+static HRESULT WINAPI IStream_fnUnlockRegion (IStream * iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType);
+static HRESULT WINAPI IStream_fnStat (IStream * iface, STATSTG*   pstatstg, DWORD grfStatFlag);
+static HRESULT WINAPI IStream_fnClone (IStream * iface, IStream** ppstm);
+
+static ICOM_VTABLE(IStream) stvt = 
+{	
+	ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+	IStream_fnQueryInterface,
+	IStream_fnAddRef,
+	IStream_fnRelease,
+	IStream_fnRead,
+	IStream_fnWrite,
+	IStream_fnSeek,
+	IStream_fnSetSize,
+	IStream_fnCopyTo,
+	IStream_fnCommit,
+	IStream_fnRevert,
+	IStream_fnLockRegion,
+	IStream_fnUnlockRegion,
+	IStream_fnStat,
+	IStream_fnClone
+	
+};
+
 typedef struct 
 {	ICOM_VTABLE(IStream)	*lpvtst;
 	DWORD		ref;
@@ -28,8 +63,6 @@ typedef struct
 	DWORD		dwPos;
 } ISHFileStream;
 
-static ICOM_VTABLE(IStream)		stvt;
-
 /**************************************************************************
  *   CreateStreamOnFile()
  *
@@ -246,23 +279,3 @@ static HRESULT WINAPI IStream_fnClone (IStream * iface, IStream** ppstm)
 
 	return E_NOTIMPL;
 }
-
-static struct ICOM_VTABLE(IStream) stvt = 
-{	
-	ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
-	IStream_fnQueryInterface,
-	IStream_fnAddRef,
-	IStream_fnRelease,
-	IStream_fnRead,
-	IStream_fnWrite,
-	IStream_fnSeek,
-	IStream_fnSetSize,
-	IStream_fnCopyTo,
-	IStream_fnCommit,
-	IStream_fnRevert,
-	IStream_fnLockRegion,
-	IStream_fnUnlockRegion,
-	IStream_fnStat,
-	IStream_fnClone
-	
-};

graphics/ddraw.c

@@ -158,7 +158,7 @@ static XF86VidModeModeInfo *orig_mode = NULL;
 static int XShmErrorFlag = 0;
 #endif
 
-BOOL
+static BOOL
 DDRAW_DGA_Available(void)
 {
 #ifdef HAVE_LIBXXF86DGA
@@ -4830,7 +4830,7 @@ static ICOM_VTABLE(IDirectDraw4) xlib_dd4vt =
  * 				DirectDrawCreate
  */
 
-LRESULT WINAPI Xlib_DDWndProc(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam)
+static LRESULT WINAPI Xlib_DDWndProc(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam)
 {
    LRESULT ret;
    IDirectDrawImpl* ddraw = NULL;
@@ -4893,7 +4893,7 @@ LRESULT WINAPI Xlib_DDWndProc(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam)
     return ret;
 }
 
-HRESULT WINAPI DGA_DirectDrawCreate( LPDIRECTDRAW *lplpDD, LPUNKNOWN pUnkOuter) {
+static HRESULT WINAPI DGA_DirectDrawCreate( LPDIRECTDRAW *lplpDD, LPUNKNOWN pUnkOuter) {
 #ifdef HAVE_LIBXXF86DGA
         IDirectDrawImpl** ilplpDD=(IDirectDrawImpl**)lplpDD;
 	int	memsize,banksize,width,major,minor,flags,height;
@@ -4958,7 +4958,7 @@ HRESULT WINAPI DGA_DirectDrawCreate( LPDIRECTDRAW *lplpDD, LPUNKNOWN pUnkOuter)
 #endif /* defined(HAVE_LIBXXF86DGA) */
 }
 
-BOOL
+static BOOL
 DDRAW_XSHM_Available(void)
    {
 #ifdef HAVE_LIBXXSHM
@@ -4980,7 +4980,7 @@ DDRAW_XSHM_Available(void)
 #endif
 }
 
-HRESULT WINAPI Xlib_DirectDrawCreate( LPDIRECTDRAW *lplpDD, LPUNKNOWN pUnkOuter) {
+static HRESULT WINAPI Xlib_DirectDrawCreate( LPDIRECTDRAW *lplpDD, LPUNKNOWN pUnkOuter) {
         IDirectDrawImpl** ilplpDD=(IDirectDrawImpl**)lplpDD;
 	int depth;
 

include/tapi.h

@@ -601,6 +601,7 @@ DWORD WINAPI phoneGetButtonInfo(HPHONE,DWORD,LPPHONEBUTTONINFO);
 DWORD WINAPI phoneGetData(HPHONE,DWORD,LPVOID,DWORD);
 DWORD WINAPI phoneGetDevCaps(HPHONEAPP,DWORD,DWORD,DWORD,LPPHONECAPS);
 DWORD WINAPI phoneGetDisplay(HPHONE,LPVARSTRING);
+DWORD WINAPI phoneGetGain(HPHONE,DWORD,LPDWORD);
 DWORD WINAPI phoneGetHookSwitch(HPHONE,LPDWORD);
 DWORD WINAPI phoneGetID(HPHONE,LPVARSTRING,LPCSTR);
 DWORD WINAPI phoneGetIcon(DWORD,LPCSTR,HICON *);

include/winbase.h

@@ -1166,6 +1166,7 @@ BOOL16      WINAPI SetWinDebugInfo16(LPWINDEBUGINFO);
 /* Declarations for functions that exist only in Win32 */
 
 
+BOOL        WINAPI AttachThreadInput(DWORD,DWORD,BOOL);
 BOOL        WINAPI AccessCheck(PSECURITY_DESCRIPTOR,HANDLE,DWORD,PGENERIC_MAPPING,PPRIVILEGE_SET,LPDWORD,LPDWORD,LPBOOL);
 BOOL        WINAPI AdjustTokenPrivileges(HANDLE,BOOL,LPVOID,DWORD,LPVOID,LPDWORD);
 BOOL        WINAPI AllocateAndInitializeSid(PSID_IDENTIFIER_AUTHORITY,BYTE,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,PSID *);
@@ -1361,9 +1362,11 @@ VOID        WINAPI GetSystemTime(LPSYSTEMTIME);
 INT       WINAPI GetTimeFormatA(LCID,DWORD,LPSYSTEMTIME,LPCSTR,LPSTR,INT);
 INT       WINAPI GetTimeFormatW(LCID,DWORD,LPSYSTEMTIME,LPCWSTR,LPWSTR,INT);
 #define     GetTimeFormat WINELIB_NAME_AW(GetTimeFormat)
+BOOL        WINAPI GetThreadContext(HANDLE,CONTEXT *);
 LCID        WINAPI GetThreadLocale(void);
 INT       WINAPI GetThreadPriority(HANDLE);
 BOOL      WINAPI GetThreadSelectorEntry(HANDLE,DWORD,LPLDT_ENTRY);
+BOOL        WINAPI GetThreadTimes(HANDLE,LPFILETIME,LPFILETIME,LPFILETIME,LPFILETIME);
 BOOL        WINAPI GetTokenInformation(HANDLE,TOKEN_INFORMATION_CLASS,LPVOID,DWORD,LPDWORD);
 BOOL        WINAPI GetUserNameA(LPSTR,LPDWORD);
 BOOL        WINAPI GetUserNameW(LPWSTR,LPDWORD);
@@ -1502,6 +1505,7 @@ BOOL      WINAPI SetStdHandle(DWORD,HANDLE);
 BOOL      WINAPI SetSystemPowerState(BOOL,BOOL);
 BOOL      WINAPI SetSystemTime(const SYSTEMTIME*);
 DWORD       WINAPI SetThreadAffinityMask(HANDLE,DWORD);
+BOOL        WINAPI SetThreadContext(HANDLE,const CONTEXT *);
 BOOL      WINAPI SetThreadLocale(LCID);
 BOOL      WINAPI SetThreadPriority(HANDLE,INT);
 BOOL      WINAPI SetTimeZoneInformation(const LPTIME_ZONE_INFORMATION);

scheduler/thread.c

@@ -491,7 +491,7 @@ BOOL WINAPI TlsSetValue(
  */
 BOOL WINAPI SetThreadContext(
     HANDLE handle,  /* [in]  Handle to thread with context */
-    CONTEXT *context) /* [out] Address of context structure */
+    const CONTEXT *context) /* [out] Address of context structure */
 {
     FIXME("not implemented\n" );
     return TRUE;