uxtheme: Declare some items static.
This commit is contained in:
parent
29c66df45b
commit
2bb44198b6
|
@ -1719,8 +1719,8 @@ HRESULT WINAPI GetThemeBackgroundRegion(HTHEME hTheme, HDC hdc, int iPartId,
|
|||
}
|
||||
|
||||
/* 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;
|
||||
|
|
|
@ -47,7 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);
|
|||
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 @@ static const WCHAR szThemesIniResource[] = {
|
|||
't','h','e','m','e','s','_','i','n','i','\0'
|
||||
};
|
||||
|
||||
PTHEME_FILE tfActiveTheme = NULL;
|
||||
static PTHEME_FILE tfActiveTheme;
|
||||
|
||||
/***********************************************************************/
|
||||
|
||||
|
@ -403,7 +403,7 @@ static BOOL MSSTYLES_ParseIniSectionName(LPCWSTR lpSection, DWORD dwLen, LPWSTR
|
|||
* 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 @@ struct PARSECOLORSTATE
|
|||
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 @@ struct PARSENONCLIENTSTATE
|
|||
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 @@ HRESULT MSSTYLES_GetPropertyColor(PTHEME_PROPERTY tp, COLORREF *pColor)
|
|||
*
|
||||
* 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'};
|
||||
|
|
|
@ -94,7 +94,6 @@ BOOL MSSTYLES_LookupEnum(LPCWSTR pszValueName, int dwEnum, int *dwValue);
|
|||
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);
|
||||
|
|
|
@ -471,7 +471,7 @@ static void UXTHEME_SaveSystemMetrics(void)
|
|||
*
|
||||
* 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 @@ HRESULT WINAPI EnableTheming(BOOL fEnable)
|
|||
* 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 @@ HRESULT UXTHEME_SetWindowProperty(HWND hwnd, ATOM aProp, LPCWSTR pszValue)
|
|||
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) {
|
||||
|
|
Loading…
Reference in New Issue