include/uxtheme.h : enum THEMESIZE (again)

[Nicolas (dyalog.com)]

I send again the same patches but merged into one, in the GIT format.
Nicolas.

======

according to MSDN, include/uxtheme.h should define an "enum THEMESIZE",
which is typedefed to "THEME_SIZE",
rather than typedef the enum {} to "THEMESIZE" as it is currently.
http://msdn2.microsoft.com/en-us/library/ms649970.aspx

note that dlls/uxtheme/draw.c uses this definition so must also be patched.

I attach the diffs for 0.9.30, they are the same for the current version.

Cheers,

Nicolas.
-------------- next part --------------
>From 0ebd555b1441c401020e2a03a2dd1e04a9198f04 Mon Sep 17 00:00:00 2001
From: Nicolas <nicolas at dyalog.com>
Date: Fri, 15 Jun 2007 17:44:12 +0100
Subject: [PATCH] enum THEMESIZE according to MSDN


diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c
index 003cf20..8827059 100644
--- a/dlls/uxtheme/draw.c
+++ b/dlls/uxtheme/draw.c
@@ -491,7 +491,7 @@ static HRESULT UXTHEME_DrawGlyph(HTHEME
  * Used by GetThemePartSize and UXTHEME_DrawImageBackground
  */
 static HRESULT get_image_part_size (HTHEME hTheme, HDC hdc, int iPartId,
-                                    int iStateId, RECT *prc, THEMESIZE eSize,
+                                    int iStateId, RECT *prc, THEME_SIZE eSize,
                                     POINT *psz)
 {
     HRESULT hr = S_OK;
@@ -1720,7 +1720,7 @@ HRESULT WINAPI GetThemeBackgroundRegion(
 
 /* compute part size for "borderfill" backgrounds */
 static HRESULT get_border_background_size (HTHEME hTheme, int iPartId,
-                                           int iStateId, THEMESIZE eSize, POINT* psz)
+                                           int iStateId, THEME_SIZE eSize, POINT* psz)
 {
     HRESULT hr = S_OK;
     int bordersize = 1;
@@ -1742,7 +1742,7 @@ static HRESULT get_border_background_siz
  *      GetThemePartSize                                    (UXTHEME.@)
  */
 HRESULT WINAPI GetThemePartSize(HTHEME hTheme, HDC hdc, int iPartId,
-                                int iStateId, RECT *prc, THEMESIZE eSize,
+                                int iStateId, RECT *prc, THEME_SIZE eSize,
                                 SIZE *psz)
 {
     int bgtype = BT_BORDERFILL;
diff --git a/include/uxtheme.h b/include/uxtheme.h
index 8ee63b6..0d86d49 100644
--- a/include/uxtheme.h
+++ b/include/uxtheme.h
@@ -115,13 +115,13 @@ typedef struct _MARGINS {
 HRESULT WINAPI GetThemeMargins(HTHEME,HDC,int,int,int,RECT*,MARGINS*);
 HRESULT WINAPI GetThemeMetric(HTHEME,HDC,int,int,int,int*);
 
-typedef enum {
+typedef enum THEMESIZE {
     TS_MIN,
     TS_TRUE,
     TS_DRAW
-} THEMESIZE;
+} THEME_SIZE;
 
-HRESULT WINAPI GetThemePartSize(HTHEME,HDC,int,int,RECT*,THEMESIZE,SIZE*);
+HRESULT WINAPI GetThemePartSize(HTHEME,HDC,int,int,RECT*,THEME_SIZE,SIZE*);
 HRESULT WINAPI GetThemePosition(HTHEME,int,int,int,POINT*);
 
 typedef enum {
-- 
1.4.3.4