Fixed/added missing/wrong function prototypes and made internal
functions static.
diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c
index 63a792e..3349f07 100644
--- a/dlls/avifil32/avifile.c
+++ b/dlls/avifil32/avifile.c
@@ -18,6 +18,64 @@
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 @@
/* 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 @@
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 @@
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 @@
/*****************************************************************************
* [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 @@
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 @@
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;
diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c
index 906bdc9..7dcc8cb 100644
--- a/dlls/comctl32/animate.c
+++ b/dlls/comctl32/animate.c
@@ -260,7 +260,7 @@
-LRESULT WINAPI
+static LRESULT WINAPI
ANIMATE_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
switch (uMsg)
diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c
index 4c0021b..0655f7c 100644
--- a/dlls/comctl32/comboex.c
+++ b/dlls/comctl32/comboex.c
@@ -221,7 +221,7 @@
}
-LRESULT WINAPI
+static LRESULT WINAPI
COMBOEX_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
switch (uMsg)
diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c
index ab553a3..3f7d2a3 100644
--- a/dlls/comctl32/datetime.c
+++ b/dlls/comctl32/datetime.c
@@ -433,7 +433,7 @@
-LRESULT WINAPI
+static LRESULT WINAPI
DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
diff --git a/dlls/comctl32/flatsb.c b/dlls/comctl32/flatsb.c
index ab0c509..8f5fff9 100644
--- a/dlls/comctl32/flatsb.c
+++ b/dlls/comctl32/flatsb.c
@@ -128,7 +128,7 @@
-LRESULT WINAPI
+static LRESULT WINAPI
FlatSB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
switch (uMsg)
diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c
index 97bd3e9..42a633c 100644
--- a/dlls/comctl32/header.c
+++ b/dlls/comctl32/header.c
@@ -1442,7 +1442,7 @@
}
-LRESULT WINAPI
+static LRESULT WINAPI
HEADER_WindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
switch (msg) {
diff --git a/dlls/comctl32/hotkey.c b/dlls/comctl32/hotkey.c
index ecc6ab0..60c903e 100644
--- a/dlls/comctl32/hotkey.c
+++ b/dlls/comctl32/hotkey.c
@@ -266,7 +266,7 @@
-LRESULT WINAPI
+static LRESULT WINAPI
HOTKEY_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
switch (uMsg)
diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c
index b619e80..e79c078 100644
--- a/dlls/comctl32/ipaddress.c
+++ b/dlls/comctl32/ipaddress.c
@@ -590,7 +590,7 @@
}
-LRESULT WINAPI
+static LRESULT WINAPI
IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
switch (uMsg)
diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index 2950b4b..cbc1d23 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -6606,7 +6606,7 @@
* 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)
diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c
index 76d56ba..09d9138 100644
--- a/dlls/comctl32/monthcal.c
+++ b/dlls/comctl32/monthcal.c
@@ -1471,7 +1471,7 @@
-LRESULT WINAPI
+static LRESULT WINAPI
MONTHCAL_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
diff --git a/dlls/comctl32/nativefont.c b/dlls/comctl32/nativefont.c
index 4bfa5f6..33ee44f 100644
--- a/dlls/comctl32/nativefont.c
+++ b/dlls/comctl32/nativefont.c
@@ -59,7 +59,7 @@
-LRESULT WINAPI
+static LRESULT WINAPI
NATIVEFONT_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
switch (uMsg)
diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c
index 84d71ca..44a01e3 100644
--- a/dlls/comctl32/pager.c
+++ b/dlls/comctl32/pager.c
@@ -287,7 +287,7 @@
-LRESULT WINAPI
+static LRESULT WINAPI
PAGER_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
switch (uMsg)
diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c
index 2ef35de..81e5a88 100644
--- a/dlls/comctl32/progress.c
+++ b/dlls/comctl32/progress.c
@@ -193,7 +193,7 @@
/***********************************************************************
* 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);
diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c
index e119d9d..3bf29a8 100644
--- a/dlls/comctl32/rebar.c
+++ b/dlls/comctl32/rebar.c
@@ -1859,7 +1859,7 @@
}
-LRESULT WINAPI
+static LRESULT WINAPI
REBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
switch (uMsg)
diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c
index e38e32c..17ab844 100644
--- a/dlls/comctl32/status.c
+++ b/dlls/comctl32/status.c
@@ -1111,7 +1111,7 @@
-LRESULT WINAPI
+static LRESULT WINAPI
StatusWindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
switch (msg) {
diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c
index 3e3e773..9585d28 100644
--- a/dlls/comctl32/tab.c
+++ b/dlls/comctl32/tab.c
@@ -1656,7 +1656,7 @@
return 0;
}
-LRESULT WINAPI
+static LRESULT WINAPI
TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
switch (uMsg)
diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index 2edf3e1..f5f5b6d 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -719,7 +719,7 @@
* 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 @@
-LRESULT WINAPI
+static LRESULT WINAPI
ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
switch (uMsg)
diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c
index baff076..999b450 100644
--- a/dlls/comctl32/tooltips.c
+++ b/dlls/comctl32/tooltips.c
@@ -2181,7 +2181,7 @@
}
-LRESULT CALLBACK
+static LRESULT CALLBACK
TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
switch (uMsg)
diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c
index 0b7215b..a9f3fb5 100644
--- a/dlls/comctl32/trackbar.c
+++ b/dlls/comctl32/trackbar.c
@@ -56,7 +56,7 @@
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 @@
}
-LRESULT WINAPI
+static LRESULT WINAPI
TRACKBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
switch (uMsg)
diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c
index f313a4b..3fd3ea0 100644
--- a/dlls/comctl32/treeview.c
+++ b/dlls/comctl32/treeview.c
@@ -1446,7 +1446,7 @@
* 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 @@
* 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 @@
/***************************************************************************
* 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 @@
}
-LRESULT CALLBACK
+static LRESULT CALLBACK
TREEVIEW_GetEditControl (HWND hwnd)
{
@@ -2575,7 +2575,6 @@
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 @@
-LRESULT
+static LRESULT
TREEVIEW_LButtonDoubleClick (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
TREEVIEW_ITEM *wineItem;
@@ -3521,7 +3520,7 @@
}
-LRESULT WINAPI
+static LRESULT WINAPI
TREEVIEW_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
switch (uMsg) {
diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c
index 36b9e71..f9ca6f8 100644
--- a/dlls/comctl32/updown.c
+++ b/dlls/comctl32/updown.c
@@ -706,7 +706,7 @@
/***********************************************************************
* 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);
diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c
index 5b20c0f..f8d31df 100644
--- a/dlls/shell32/brsfolder.c
+++ b/dlls/shell32/brsfolder.c
@@ -227,8 +227,8 @@
/*************************************************************************
* BrsFolderDlgProc32 (not an exported API function)
*/
-BOOL WINAPI BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam,
- LPARAM lParam )
+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 );
switch(msg)
diff --git a/dlls/shell32/contmenu.c b/dlls/shell32/contmenu.c
index a3b57ca..f58b40e 100644
--- a/dlls/shell32/contmenu.c
+++ b/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 @@
/**************************************************************************
* 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 @@
/**************************************************************************
* IContextMenu_FreePidlTable()
*/
-void IContextMenu_FreePidlTable(IContextMenuImpl *This)
+static void IContextMenu_FreePidlTable(IContextMenuImpl *This)
{
int i;
@@ -74,7 +100,7 @@
/**************************************************************************
* 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 @@
/**************************************************************************
* IContextMenu_CanRenameItems()
*/
-BOOL IContextMenu_CanRenameItems(IContextMenuImpl *This)
+static BOOL IContextMenu_CanRenameItems(IContextMenuImpl *This)
{ UINT i;
DWORD dwAttributes;
@@ -427,20 +453,3 @@
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 */
-};
-
diff --git a/dlls/shell32/memorystream.c b/dlls/shell32/memorystream.c
index 443a2af..a407ce5 100644
--- a/dlls/shell32/memorystream.c
+++ b/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 @@
DWORD dwPos;
} ISHFileStream;
-static ICOM_VTABLE(IStream) stvt;
-
/**************************************************************************
* CreateStreamOnFile()
*
@@ -246,23 +279,3 @@
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
-
-};
diff --git a/graphics/ddraw.c b/graphics/ddraw.c
index eeee9e9..3a523e0 100644
--- a/graphics/ddraw.c
+++ b/graphics/ddraw.c
@@ -158,7 +158,7 @@
static int XShmErrorFlag = 0;
#endif
-BOOL
+static BOOL
DDRAW_DGA_Available(void)
{
#ifdef HAVE_LIBXXF86DGA
@@ -4830,7 +4830,7 @@
* 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 @@
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 @@
#endif /* defined(HAVE_LIBXXF86DGA) */
}
-BOOL
+static BOOL
DDRAW_XSHM_Available(void)
{
#ifdef HAVE_LIBXXSHM
@@ -4980,7 +4980,7 @@
#endif
}
-HRESULT WINAPI Xlib_DirectDrawCreate( LPDIRECTDRAW *lplpDD, LPUNKNOWN pUnkOuter) {
+static HRESULT WINAPI Xlib_DirectDrawCreate( LPDIRECTDRAW *lplpDD, LPUNKNOWN pUnkOuter) {
IDirectDrawImpl** ilplpDD=(IDirectDrawImpl**)lplpDD;
int depth;
diff --git a/include/tapi.h b/include/tapi.h
index 4a80afa..f515249 100644
--- a/include/tapi.h
+++ b/include/tapi.h
@@ -601,6 +601,7 @@
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 *);
diff --git a/include/winbase.h b/include/winbase.h
index ba6eaaf..35a79fd 100644
--- a/include/winbase.h
+++ b/include/winbase.h
@@ -1166,6 +1166,7 @@
/* 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 @@
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 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);
diff --git a/scheduler/thread.c b/scheduler/thread.c
index a649ceb..16ecbc9 100644
--- a/scheduler/thread.c
+++ b/scheduler/thread.c
@@ -491,7 +491,7 @@
*/
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;
