cabinet,uxtheme: make some functions static
Stefan Huehner
stefan at huehner.org
Fri Jul 1 07:56:25 CDT 2005
Hi,
attached patches makes functions static wich aren't used outside their
declaring source file, and thus fixes some -Wmissing-declarations
warnings.
ChangeLog:
- make some function static
Regards,
Stefan
-------------- next part --------------
Index: dlls/riched20/caret.c
===================================================================
RCS file: /home/wine/wine/dlls/riched20/caret.c,v
retrieving revision 1.10
diff -u -p -r1.10 caret.c
--- dlls/riched20/caret.c 28 Jun 2005 13:51:32 -0000 1.10
+++ dlls/riched20/caret.c 1 Jul 2005 12:51:28 -0000
@@ -413,7 +413,7 @@ void ME_InsertTextFromCursor(ME_TextEdit
}
}
-BOOL ME_ArrowLeft(ME_TextEditor *editor, ME_Cursor *p)
+static BOOL ME_ArrowLeft(ME_TextEditor *editor, ME_Cursor *p)
{
if (p->nOffset) {
p->nOffset = ME_StrRelPos2(p->pRun->member.run.strText, p->nOffset, -1);
@@ -453,7 +453,7 @@ BOOL ME_ArrowLeft(ME_TextEditor *editor,
return FALSE;
}
-BOOL ME_ArrowRight(ME_TextEditor *editor, ME_Cursor *p)
+static BOOL ME_ArrowRight(ME_TextEditor *editor, ME_Cursor *p)
{
int new_ofs = ME_StrRelPos2(p->pRun->member.run.strText, p->nOffset, 1);
if (new_ofs<p->pRun->member.run.strText->nLen) {
@@ -698,7 +698,7 @@ static int ME_GetXForArrow(ME_TextEditor
return x;
}
-void ME_ArrowUp(ME_TextEditor *editor, ME_Cursor *pCursor)
+static void ME_ArrowUp(ME_TextEditor *editor, ME_Cursor *pCursor)
{
ME_DisplayItem *pRun = pCursor->pRun;
ME_DisplayItem *pItem, *pItem2;
@@ -725,7 +725,7 @@ void ME_ArrowUp(ME_TextEditor *editor, M
pCursor->pRun = ME_FindRunInRow(editor, pItem2, x, &pCursor->nOffset, &editor->bCaretAtEnd);
}
-void ME_ArrowDown(ME_TextEditor *editor, ME_Cursor *pCursor)
+static void ME_ArrowDown(ME_TextEditor *editor, ME_Cursor *pCursor)
{
ME_DisplayItem *pRun = pCursor->pRun;
ME_DisplayItem *pItem;
@@ -749,7 +749,7 @@ void ME_ArrowDown(ME_TextEditor *editor,
assert(pCursor->pRun->type == diRun);
}
-void ME_ArrowPageUp(ME_TextEditor *editor, ME_Cursor *pCursor)
+static void ME_ArrowPageUp(ME_TextEditor *editor, ME_Cursor *pCursor)
{
ME_DisplayItem *pRun = pCursor->pRun;
ME_DisplayItem *pLast, *p;
@@ -804,7 +804,7 @@ void ME_ArrowPageUp(ME_TextEditor *edito
In such a situation, clicking the scrollbar restores its position back to the
normal range (ie. sets it to (doclength-screenheight)). */
-void ME_ArrowPageDown(ME_TextEditor *editor, ME_Cursor *pCursor)
+static void ME_ArrowPageDown(ME_TextEditor *editor, ME_Cursor *pCursor)
{
ME_DisplayItem *pRun = pCursor->pRun;
ME_DisplayItem *pLast, *p;
@@ -852,7 +852,7 @@ void ME_ArrowPageDown(ME_TextEditor *edi
assert(pCursor->pRun->type == diRun);
}
-void ME_ArrowHome(ME_TextEditor *editor, ME_Cursor *pCursor)
+static void ME_ArrowHome(ME_TextEditor *editor, ME_Cursor *pCursor)
{
ME_DisplayItem *pRow = ME_FindItemBack(pCursor->pRun, diStartRow);
if (pRow) {
@@ -871,7 +871,7 @@ void ME_ArrowHome(ME_TextEditor *editor,
editor->bCaretAtEnd = FALSE;
}
-void ME_ArrowCtrlHome(ME_TextEditor *editor, ME_Cursor *pCursor)
+static void ME_ArrowCtrlHome(ME_TextEditor *editor, ME_Cursor *pCursor)
{
ME_DisplayItem *pRow = ME_FindItemBack(pCursor->pRun, diTextStart);
if (pRow) {
@@ -883,7 +883,7 @@ void ME_ArrowCtrlHome(ME_TextEditor *edi
}
}
-void ME_ArrowEnd(ME_TextEditor *editor, ME_Cursor *pCursor)
+static void ME_ArrowEnd(ME_TextEditor *editor, ME_Cursor *pCursor)
{
ME_DisplayItem *pRow;
@@ -907,7 +907,7 @@ void ME_ArrowEnd(ME_TextEditor *editor,
editor->bCaretAtEnd = FALSE;
}
-void ME_ArrowCtrlEnd(ME_TextEditor *editor, ME_Cursor *pCursor)
+static void ME_ArrowCtrlEnd(ME_TextEditor *editor, ME_Cursor *pCursor)
{
ME_DisplayItem *p = ME_FindItemFwd(pCursor->pRun, diTextEnd);
assert(p);
@@ -924,7 +924,7 @@ BOOL ME_IsSelection(ME_TextEditor *edito
return memcmp(&editor->pCursors[0], &editor->pCursors[1], sizeof(ME_Cursor))!=0;
}
-int ME_GetSelCursor(ME_TextEditor *editor, int dir)
+static int ME_GetSelCursor(ME_TextEditor *editor, int dir)
{
int cdir = ME_GetCursorOfs(editor, 0) - ME_GetCursorOfs(editor, 1);
@@ -934,7 +934,7 @@ int ME_GetSelCursor(ME_TextEditor *edito
return 1;
}
-BOOL ME_CancelSelection(ME_TextEditor *editor, int dir)
+static BOOL ME_CancelSelection(ME_TextEditor *editor, int dir)
{
int cdir;
@@ -979,7 +979,7 @@ BOOL ME_UpdateSelection(ME_TextEditor *e
return TRUE;
}
-void ME_RepaintSelection(ME_TextEditor *editor, ME_Cursor *pTempCursor)
+static void ME_RepaintSelection(ME_TextEditor *editor, ME_Cursor *pTempCursor)
{
if (ME_UpdateSelection(editor, pTempCursor)) {
ME_EnsureVisible(editor, editor->pCursors[0].pRun);
-------------- next part --------------
Index: dlls/uxtheme/draw.c
===================================================================
RCS file: /home/wine/wine/dlls/uxtheme/draw.c,v
retrieving revision 1.10
diff -u -p -r1.10 draw.c
--- dlls/uxtheme/draw.c 24 May 2005 09:49:29 -0000 1.10
+++ dlls/uxtheme/draw.c 1 Jul 2005 12:49:32 -0000
@@ -134,7 +134,7 @@ HRESULT WINAPI DrawThemeBackground(HTHEM
*
* Select the image to use
*/
-PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, const RECT *pRect, BOOL glyph)
+static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, const RECT *pRect, BOOL glyph)
{
PTHEME_PROPERTY tp;
int imageselecttype = IST_NONE;
@@ -186,7 +186,7 @@ PTHEME_PROPERTY UXTHEME_SelectImage(HTHE
*
* Load image for part/state
*/
-HRESULT UXTHEME_LoadImage(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, const RECT *pRect, BOOL glyph,
+static HRESULT UXTHEME_LoadImage(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, const RECT *pRect, BOOL glyph,
HBITMAP *hBmp, RECT *bmpRect)
{
int imagelayout = IL_VERTICAL;
@@ -267,7 +267,7 @@ static inline BOOL UXTHEME_Blt(HDC hdcDe
*
* Draw an imagefile glyph
*/
-HRESULT UXTHEME_DrawImageGlyph(HTHEME hTheme, HDC hdc, int iPartId,
+static HRESULT UXTHEME_DrawImageGlyph(HTHEME hTheme, HDC hdc, int iPartId,
int iStateId, RECT *pRect,
const DTBGOPTS *pOptions)
{
@@ -333,7 +333,7 @@ HRESULT UXTHEME_DrawImageGlyph(HTHEME hT
*
* Draw glyph on top of background, if appropriate
*/
-HRESULT UXTHEME_DrawGlyph(HTHEME hTheme, HDC hdc, int iPartId,
+static HRESULT UXTHEME_DrawGlyph(HTHEME hTheme, HDC hdc, int iPartId,
int iStateId, RECT *pRect,
const DTBGOPTS *pOptions)
{
@@ -356,7 +356,7 @@ HRESULT UXTHEME_DrawGlyph(HTHEME hTheme,
*
* Draw an imagefile background
*/
-HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId,
+static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId,
int iStateId, RECT *pRect,
const DTBGOPTS *pOptions)
{
@@ -576,7 +576,7 @@ draw_error:
*
* Draw the bounding rectangle for a borderfill background
*/
-HRESULT UXTHEME_DrawBorderRectangle(HTHEME hTheme, HDC hdc, int iPartId,
+static HRESULT UXTHEME_DrawBorderRectangle(HTHEME hTheme, HDC hdc, int iPartId,
int iStateId, RECT *pRect,
const DTBGOPTS *pOptions)
{
@@ -621,7 +621,7 @@ HRESULT UXTHEME_DrawBorderRectangle(HTHE
*
* Fill a borderfill background rectangle
*/
-HRESULT UXTHEME_DrawBackgroundFill(HTHEME hTheme, HDC hdc, int iPartId,
+static HRESULT UXTHEME_DrawBackgroundFill(HTHEME hTheme, HDC hdc, int iPartId,
int iStateId, RECT *pRect,
const DTBGOPTS *pOptions)
{
@@ -696,7 +696,7 @@ HRESULT UXTHEME_DrawBackgroundFill(HTHEM
*
* Draw an imagefile background
*/
-HRESULT UXTHEME_DrawBorderBackground(HTHEME hTheme, HDC hdc, int iPartId,
+static HRESULT UXTHEME_DrawBorderBackground(HTHEME hTheme, HDC hdc, int iPartId,
int iStateId, const RECT *pRect,
const DTBGOPTS *pOptions)
{
Index: dlls/uxtheme/uxini.c
===================================================================
RCS file: /home/wine/wine/dlls/uxtheme/uxini.c,v
retrieving revision 1.3
diff -u -p -r1.3 uxini.c
--- dlls/uxtheme/uxini.c 23 Jan 2004 04:34:02 -0000 1.3
+++ dlls/uxtheme/uxini.c 1 Jul 2005 12:49:32 -0000
@@ -149,7 +149,7 @@ static inline BOOL UXINI_isspace(WCHAR c
* RETURNS
* The section name, non NULL terminated
*/
-LPCWSTR UXINI_GetNextLine(PUXINI_FILE uf, DWORD *dwLen)
+static LPCWSTR UXINI_GetNextLine(PUXINI_FILE uf, DWORD *dwLen)
{
LPCWSTR lpLineEnd;
LPCWSTR lpLineStart;
More information about the wine-patches
mailing list