uxtheme: Declare some items static
Andrew Talbot
Andrew.Talbot at talbotville.com
Thu Feb 1 15:52:58 CST 2007
Changelog:
uxtheme: Declare some items static.
diff -urN a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c
--- a/dlls/uxtheme/draw.c 2006-11-08 17:27:33.000000000 +0000
+++ b/dlls/uxtheme/draw.c 2007-02-01 20:49:18.000000000 +0000
@@ -1719,8 +1719,8 @@
}
/* compute part size for "borderfill" backgrounds */
-HRESULT get_border_background_size (HTHEME hTheme, int iPartId,
- int iStateId, THEMESIZE eSize, POINT* psz)
+static HRESULT get_border_background_size (HTHEME hTheme, int iPartId,
+ int iStateId, THEMESIZE eSize, POINT* psz)
{
HRESULT hr = S_OK;
int bordersize = 1;
diff -urN a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c
--- a/dlls/uxtheme/msstyles.c 2006-11-08 17:27:33.000000000 +0000
+++ b/dlls/uxtheme/msstyles.c 2007-02-01 21:07:42.000000000 +0000
@@ -47,7 +47,7 @@
BOOL MSSTYLES_GetNextInteger(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, int *value);
BOOL MSSTYLES_GetNextToken(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LPWSTR lpBuff, DWORD buffSize);
void MSSTYLES_ParseThemeIni(PTHEME_FILE tf, BOOL setMetrics);
-HRESULT MSSTYLES_GetFont (LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LOGFONTW* logfont);
+static HRESULT MSSTYLES_GetFont (LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LOGFONTW* logfont);
extern HINSTANCE hDllInst;
extern int alphaBlendMode;
@@ -58,7 +58,7 @@
't','h','e','m','e','s','_','i','n','i','\0'
};
-PTHEME_FILE tfActiveTheme = NULL;
+static PTHEME_FILE tfActiveTheme;
/***********************************************************************/
@@ -403,7 +403,7 @@
* RETURNS
* The class found, or NULL
*/
-PTHEME_CLASS MSSTYLES_FindClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWSTR pszClassName)
+static PTHEME_CLASS MSSTYLES_FindClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWSTR pszClassName)
{
PTHEME_CLASS cur = tf->classes;
while(cur) {
@@ -675,7 +675,7 @@
int captionColors;
};
-inline void parse_init_color (struct PARSECOLORSTATE* state)
+static inline void parse_init_color (struct PARSECOLORSTATE* state)
{
memset (state, 0, sizeof (*state));
}
@@ -729,7 +729,7 @@
LOGFONTW iconTitleFont;
};
-inline void parse_init_nonclient (struct PARSENONCLIENTSTATE* state)
+static inline void parse_init_nonclient (struct PARSENONCLIENTSTATE* state)
{
memset (state, 0, sizeof (*state));
state->metrics.cbSize = sizeof (NONCLIENTMETRICSW);
@@ -1226,8 +1226,8 @@
*
* Retrieve a color value for a property
*/
-HRESULT MSSTYLES_GetFont (LPCWSTR lpCur, LPCWSTR lpEnd,
- LPCWSTR *lpValEnd, LOGFONTW* pFont)
+static HRESULT MSSTYLES_GetFont (LPCWSTR lpCur, LPCWSTR lpEnd,
+ LPCWSTR *lpValEnd, LOGFONTW* pFont)
{
static const WCHAR szBold[] = {'b','o','l','d','\0'};
static const WCHAR szItalic[] = {'i','t','a','l','i','c','\0'};
diff -urN a/dlls/uxtheme/msstyles.h b/dlls/uxtheme/msstyles.h
--- a/dlls/uxtheme/msstyles.h 2006-05-23 13:48:50.000000000 +0100
+++ b/dlls/uxtheme/msstyles.h 2007-02-01 20:49:46.000000000 +0000
@@ -94,7 +94,6 @@
BOOL MSSTYLES_LookupPartState(LPCWSTR pszClass, LPCWSTR pszPart, LPCWSTR pszState, int *iPartId, int *iStateId);
PUXINI_FILE MSSTYLES_GetThemeIni(PTHEME_FILE tf);
PTHEME_PARTSTATE MSSTYLES_FindPartState(PTHEME_CLASS tc, int iPartId, int iStateId, PTHEME_CLASS *tcNext);
-PTHEME_CLASS MSSTYLES_FindClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWSTR pszClassName);
PTHEME_PROPERTY MSSTYLES_FindProperty(PTHEME_CLASS tc, int iPartId, int iStateId, int iPropertyPrimitive, int iPropertyId);
PTHEME_PROPERTY MSSTYLES_FindMetric(int iPropertyPrimitive, int iPropertyId);
HBITMAP MSSTYLES_LoadBitmap(PTHEME_CLASS tc, LPCWSTR lpFilename, BOOL* hasAlpha);
diff -urN a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c
--- a/dlls/uxtheme/system.c 2006-11-13 17:34:39.000000000 +0000
+++ b/dlls/uxtheme/system.c 2007-02-01 21:49:23.000000000 +0000
@@ -471,7 +471,7 @@
*
* Change the current active theme
*/
-HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf)
+static HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf)
{
HKEY hKey;
WCHAR tmp[2];
@@ -605,7 +605,7 @@
* I'm using atoms as there may be large numbers of duplicated strings
* and they do the work of keeping memory down as a cause of that quite nicely
*/
-HRESULT UXTHEME_SetWindowProperty(HWND hwnd, ATOM aProp, LPCWSTR pszValue)
+static HRESULT UXTHEME_SetWindowProperty(HWND hwnd, ATOM aProp, LPCWSTR pszValue)
{
ATOM oldValue = (ATOM)(size_t)RemovePropW(hwnd, (LPCWSTR)MAKEINTATOM(aProp));
if(oldValue)
@@ -622,7 +622,7 @@
return S_OK;
}
-LPWSTR UXTHEME_GetWindowProperty(HWND hwnd, ATOM aProp, LPWSTR pszBuffer, int dwLen)
+static LPWSTR UXTHEME_GetWindowProperty(HWND hwnd, ATOM aProp, LPWSTR pszBuffer, int dwLen)
{
ATOM atValue = (ATOM)(size_t)GetPropW(hwnd, (LPCWSTR)MAKEINTATOM(aProp));
if(atValue) {
More information about the wine-patches
mailing list