Alex Henrie : uxtheme: Turn a variable and a constant into static constants.
Alexandre Julliard
julliard at winehq.org
Tue Dec 4 16:33:55 CST 2018
Module: wine
Branch: master
Commit: 53c8abbf8aecf96ef5d239984c6054a56f5a64cd
URL: https://source.winehq.org/git/wine.git/?a=commit;h=53c8abbf8aecf96ef5d239984c6054a56f5a64cd
Author: Alex Henrie <alexhenrie24 at gmail.com>
Date: Mon Dec 3 21:42:59 2018 -0700
uxtheme: Turn a variable and a constant into static constants.
Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/uxtheme/metric.c | 6 +++---
dlls/uxtheme/system.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/uxtheme/metric.c b/dlls/uxtheme/metric.c
index 5f6c36f..073422f 100644
--- a/dlls/uxtheme/metric.c
+++ b/dlls/uxtheme/metric.c
@@ -165,9 +165,7 @@ HRESULT WINAPI GetThemeSysInt(HTHEME hTheme, int iIntID, int *piValue)
*/
int WINAPI GetThemeSysSize(HTHEME hTheme, int iSizeID)
{
- PTHEME_PROPERTY tp;
- int i, id = -1;
- int metricMap[] = {
+ static const int metricMap[] = {
SM_CXVSCROLL, TMT_SCROLLBARWIDTH,
SM_CYHSCROLL, TMT_SCROLLBARHEIGHT,
SM_CXSIZE, TMT_CAPTIONBARWIDTH,
@@ -179,6 +177,8 @@ int WINAPI GetThemeSysSize(HTHEME hTheme, int iSizeID)
SM_CXMENUSIZE, TMT_MENUBARWIDTH,
SM_CYMENUSIZE, TMT_MENUBARHEIGHT
};
+ PTHEME_PROPERTY tp;
+ int i, id = -1;
if(hTheme) {
for(i=0; i<ARRAY_SIZE(metricMap); i+=2) {
diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c
index db49754..c898ad3 100644
--- a/dlls/uxtheme/system.c
+++ b/dlls/uxtheme/system.c
@@ -813,7 +813,7 @@ HRESULT WINAPI GetThemeDocumentationProperty(LPCWSTR pszThemeName,
LPWSTR pszValueBuff,
int cchMaxValChars)
{
- const WORD wDocToRes[] = {
+ static const WORD wDocToRes[] = {
TMT_DISPLAYNAME,5000,
TMT_TOOLTIP,5001,
TMT_COMPANY,5002,
More information about the wine-cvs
mailing list