[ros-diffs] [winesync] 26092: Autosyncing with Wine HEAD

Author: winesync
Date: Wed Mar 14 17:55:42 2007
New Revision: 26092

URL: http://svn.reactos.org/svn/reactos?rev=26092&view=rev
Log:
Autosyncing with Wine HEAD

Modified:
    trunk/reactos/dll/win32/uxtheme/draw.c
    trunk/reactos/dll/win32/uxtheme/main.c
    trunk/reactos/dll/win32/uxtheme/metric.c
    trunk/reactos/dll/win32/uxtheme/msstyles.c
    trunk/reactos/dll/win32/uxtheme/msstyles.h
    trunk/reactos/dll/win32/uxtheme/property.c
    trunk/reactos/dll/win32/uxtheme/system.c

Modified: trunk/reactos/dll/win32/uxtheme/draw.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/draw.c?r…
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/draw.c (original)
+++ trunk/reactos/dll/win32/uxtheme/draw.c Wed Mar 14 17:55:42 2007
@@ -27,6 +27,7 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "wingdi.h"
+#include "vfwmsgs.h"
 #include "uxtheme.h"
 #include "tmschema.h"
 
@@ -53,8 +54,8 @@
     static const WCHAR szTab[] = { 'T','a','b',0 };
     HRESULT hr;
 
-    TRACE("(%p,0x%08lx\n", hwnd, dwFlags);
-    hr = SetPropW (hwnd, MAKEINTATOMW (atDialogThemeEnabled), 
+    TRACE("(%p,0x%08x\n", hwnd, dwFlags);
+    hr = SetPropW (hwnd, (LPCWSTR)MAKEINTATOM(atDialogThemeEnabled), 
         (HANDLE)(dwFlags|0x80000000)); 
         /* 0x80000000 serves as a "flags set" flag */
     if (FAILED(hr))
@@ -75,7 +76,7 @@
     TRACE("(%p)\n", hwnd);
 
     dwDialogTextureFlags = (DWORD)GetPropW (hwnd, 
-        MAKEINTATOMW (atDialogThemeEnabled));
+        (LPCWSTR)MAKEINTATOM(atDialogThemeEnabled));
     if (dwDialogTextureFlags == 0) 
         /* Means EnableThemeDialogTexture wasn't called for this dialog */
         return TRUE;
@@ -220,7 +221,7 @@
                 }
             }
             if(reqsize.x <= size.x && reqsize.y <= size.y) {
-                TRACE("Using image size %ldx%ld, image %d\n", reqsize.x,
reqsize.y, i + TMT_IMAGEFILE1);
+                TRACE("Using image size %dx%d, image %d\n", reqsize.x,
reqsize.y, i + TMT_IMAGEFILE1);
                 return fileProp;
             }
         }
@@ -831,7 +832,7 @@
     HRESULT hr = S_OK;
     int filltype = FT_SOLID;
 
-    TRACE("(%d,%d,%ld)\n", iPartId, iStateId, pOptions->dwFlags);
+    TRACE("(%d,%d,%d)\n", iPartId, iStateId, pOptions->dwFlags);
 
     if(pOptions->dwFlags & DTBG_OMITCONTENT)
         return S_OK;
@@ -929,7 +930,7 @@
     int bgtype = BT_BORDERFILL;
     RECT rt;
 
-    TRACE("(%p,%p,%d,%d,%ld,%ld)\n", hTheme, hdc, iPartId,
iStateId,pRect->left,pRect->top);
+    TRACE("(%p,%p,%d,%d,%d,%d)\n", hTheme, hdc, iPartId,
iStateId,pRect->left,pRect->top);
     if(!hTheme)
         return E_HANDLE;
 
@@ -1388,7 +1389,7 @@
         LTInnerI = RBInnerI = LTRBInnerFlat[uType & (BDR_INNER|BDR_OUTER)];
         LTOuterI = RBOuterI = LTRBOuterFlat[uType & (BDR_INNER|BDR_OUTER)];
 
-        if( LTInnerI != -1 ) LTInnerI = RBInnerI = COLOR_BTNFACE;
+        if( LTInnerI != -1 ) LTInnerI = RBInnerI = EDGE_FILL;
     }
     else if(uFlags & BF_SOFT)
     {
@@ -1627,7 +1628,7 @@
         /* If nothing was found, leave unchanged */
     }
 
-    TRACE("left:%ld,top:%ld,right:%ld,bottom:%ld\n", pContentRect->left,
pContentRect->top, pContentRect->right, pContentRect->bottom);
+    TRACE("left:%d,top:%d,right:%d,bottom:%d\n", pContentRect->left,
pContentRect->top, pContentRect->right, pContentRect->bottom);
 
     return S_OK;
 }
@@ -1675,7 +1676,7 @@
         /* If nothing was found, leave unchanged */
     }
 
-    TRACE("left:%ld,top:%ld,right:%ld,bottom:%ld\n", pExtentRect->left,
pExtentRect->top, pExtentRect->right, pExtentRect->bottom);
+    TRACE("left:%d,top:%d,right:%d,bottom:%d\n", pExtentRect->left,
pExtentRect->top, pExtentRect->right, pExtentRect->bottom);
 
     return S_OK;
 }
@@ -1718,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;

Modified: trunk/reactos/dll/win32/uxtheme/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/main.c?r…
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/main.c (original)
+++ trunk/reactos/dll/win32/uxtheme/main.c Wed Mar 14 17:55:42 2007
@@ -35,7 +35,7 @@
 /* For the moment, do nothing here. */
 BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
 {
-    TRACE("%p 0x%lx %p: stub\n", hInstDLL, fdwReason, lpv);
+    TRACE("%p 0x%x %p: stub\n", hInstDLL, fdwReason, lpv);
     switch(fdwReason) {
         case DLL_PROCESS_ATTACH:
             DisableThreadLibraryCalls(hInstDLL);

Modified: trunk/reactos/dll/win32/uxtheme/metric.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/metric.c…
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/metric.c (original)
+++ trunk/reactos/dll/win32/uxtheme/metric.c Wed Mar 14 17:55:42 2007
@@ -26,6 +26,7 @@
 #include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
+#include "vfwmsgs.h"
 #include "uxtheme.h"
 #include "tmschema.h"
 

Modified: trunk/reactos/dll/win32/uxtheme/msstyles.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/msstyles…
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/msstyles.c (original)
+++ trunk/reactos/dll/win32/uxtheme/msstyles.c Wed Mar 14 17:55:42 2007
@@ -28,6 +28,7 @@
 #include "wingdi.h"
 #include "winuser.h"
 #include "winnls.h"
+#include "vfwmsgs.h"
 #include "uxtheme.h"
 #include "tmschema.h"
 
@@ -46,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;
@@ -57,7 +58,7 @@
    
't','h','e','m','e','s','_','i','n','i','\0'
 };
 
-PTHEME_FILE tfActiveTheme = NULL;
+static PTHEME_FILE tfActiveTheme;
 
 /***********************************************************************/
 
@@ -115,7 +116,7 @@
     }
     if((versize = SizeofResource(hTheme, hrsc)) != 2)
     {
-        TRACE("Version resource found, but wrong size: %ld\n", versize);
+        TRACE("Version resource found, but wrong size: %d\n", versize);
         hr = HRESULT_FROM_WIN32(ERROR_BAD_FORMAT);
         goto invalid_theme;
     }
@@ -402,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) {
@@ -674,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));
 }
@@ -728,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);
@@ -1225,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'};

Modified: trunk/reactos/dll/win32/uxtheme/msstyles.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/msstyles…
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/msstyles.h (original)
+++ trunk/reactos/dll/win32/uxtheme/msstyles.h Wed Mar 14 17:55:42 2007
@@ -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);

Modified: trunk/reactos/dll/win32/uxtheme/property.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/property…
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/property.c (original)
+++ trunk/reactos/dll/win32/uxtheme/property.c Wed Mar 14 17:55:42 2007
@@ -26,6 +26,7 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "wingdi.h"
+#include "vfwmsgs.h"
 #include "uxtheme.h"
 #include "tmschema.h"
 

Modified: trunk/reactos/dll/win32/uxtheme/system.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/system.c…
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/system.c (original)
+++ trunk/reactos/dll/win32/uxtheme/system.c Wed Mar 14 17:55:42 2007
@@ -28,6 +28,7 @@
 #include "wingdi.h"
 #include "winuser.h"
 #include "winreg.h"
+#include "vfwmsgs.h"
 #include "uxtheme.h"
 #include "tmschema.h"
 
@@ -165,7 +166,7 @@
         }
         else {
             bThemeActive = FALSE;
-            TRACE("Failed to get ThemeActive: %ld\n", GetLastError());
+            TRACE("Failed to get ThemeActive: %d\n", GetLastError());
         }
         buffsize = sizeof(szCurrentColor)/sizeof(szCurrentColor[0]);
         if(RegQueryValueExW(hKey, szColorName, NULL, NULL, (LPBYTE)szCurrentColor,
&buffsize))
@@ -205,7 +206,7 @@
     }
     if(!bThemeActive) {
         MSSTYLES_SetActiveTheme(NULL, FALSE);
-        TRACE("Themeing not active\n");
+        TRACE("Theming not active\n");
     }
 }
 
@@ -470,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];
@@ -604,15 +605,15 @@
  * 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)
-{
-    ATOM oldValue = (ATOM)(size_t)RemovePropW(hwnd, MAKEINTATOMW(aProp));
+static HRESULT UXTHEME_SetWindowProperty(HWND hwnd, ATOM aProp, LPCWSTR pszValue)
+{
+    ATOM oldValue = (ATOM)(size_t)RemovePropW(hwnd, (LPCWSTR)MAKEINTATOM(aProp));
     if(oldValue)
         DeleteAtom(oldValue);
     if(pszValue) {
         ATOM atValue = AddAtomW(pszValue);
         if(!atValue
-           || !SetPropW(hwnd, MAKEINTATOMW(aProp), (LPWSTR)MAKEINTATOMW(atValue))) {
+           || !SetPropW(hwnd, (LPCWSTR)MAKEINTATOM(aProp), (LPWSTR)MAKEINTATOM(atValue)))
{
             HRESULT hr = HRESULT_FROM_WIN32(GetLastError());
             if(atValue) DeleteAtom(atValue);
             return hr;
@@ -621,9 +622,9 @@
     return S_OK;
 }
 
-LPWSTR UXTHEME_GetWindowProperty(HWND hwnd, ATOM aProp, LPWSTR pszBuffer, int dwLen)
-{
-    ATOM atValue = (ATOM)(size_t)GetPropW(hwnd, MAKEINTATOMW(aProp));
+static LPWSTR UXTHEME_GetWindowProperty(HWND hwnd, ATOM aProp, LPWSTR pszBuffer, int
dwLen)
+{
+    ATOM atValue = (ATOM)(size_t)GetPropW(hwnd, (LPCWSTR)MAKEINTATOM(aProp));
     if(atValue) {
         if(GetAtomNameW(atValue, pszBuffer, dwLen))
             return pszBuffer;
@@ -642,7 +643,7 @@
     LPCWSTR pszAppName;
     LPCWSTR pszUseClassList;
     HTHEME hTheme = NULL;
-    TRACE("(%p,%s)", hwnd, debugstr_w(pszClassList));
+    TRACE("(%p,%s)\n", hwnd, debugstr_w(pszClassList));
 
     if(bThemeActive)
     {
@@ -656,7 +657,7 @@
             hTheme = MSSTYLES_OpenThemeClass(pszAppName, pszUseClassList);
     }
     if(IsWindow(hwnd))
-        SetPropW(hwnd, MAKEINTATOMW(atWindowTheme), hTheme);
+        SetPropW(hwnd, (LPCWSTR)MAKEINTATOM(atWindowTheme), hTheme);
     TRACE(" = %p\n", hTheme);
     return hTheme;
 }
@@ -675,7 +676,7 @@
 HTHEME WINAPI GetWindowTheme(HWND hwnd)
 {
     TRACE("(%p)\n", hwnd);
-    return GetPropW(hwnd, MAKEINTATOMW(atWindowTheme));
+    return GetPropW(hwnd, (LPCWSTR)MAKEINTATOM(atWindowTheme));
 }
 
 /***********************************************************************
@@ -725,7 +726,7 @@
  */
 void WINAPI SetThemeAppProperties(DWORD dwFlags)
 {
-    TRACE("(0x%08lx)\n", dwFlags);
+    TRACE("(0x%08x)\n", dwFlags);
     dwThemeAppProperties = dwFlags;
 }
 
@@ -748,7 +749,7 @@
                                      const RECT *pRect, HRGN hrgn,
                                      POINT ptTest, WORD *pwHitTestCode)
 {
-    FIXME("%d %d 0x%08lx: stub\n", iPartId, iStateId, dwOptions);
+    FIXME("%d %d 0x%08x: stub\n", iPartId, iStateId, dwOptions);
     if(!hTheme)
         return E_HANDLE;
     return ERROR_CALL_NOT_IMPLEMENTED;
@@ -867,7 +868,7 @@
                              LPCWSTR pszSizeName, HTHEMEFILE *hThemeFile,
                              DWORD unknown)
 {
-    TRACE("(%s,%s,%s,%p,%ld)\n", debugstr_w(pszThemeFileName),
+    TRACE("(%s,%s,%s,%p,%d)\n", debugstr_w(pszThemeFileName),
           debugstr_w(pszColorName), debugstr_w(pszSizeName),
           hThemeFile, unknown);
     return MSSTYLES_OpenThemeFile(pszThemeFileName, pszColorName, pszSizeName,
(PTHEME_FILE*)hThemeFile);
@@ -947,7 +948,7 @@
 {
     PTHEME_FILE pt;
     HRESULT hr;
-    TRACE("(%s,%p,%ld,%p,%ld)\n", debugstr_w(pszThemeFileName),
+    TRACE("(%s,%p,%d,%p,%d)\n", debugstr_w(pszThemeFileName),
           pszColorName, dwColorNameLen,
           pszSizeName, dwSizeNameLen);
 
@@ -1066,7 +1067,7 @@
     HRESULT hr;
     LPWSTR tmp;
     UINT resourceId = dwColorNum + 1000;
-    TRACE("(%s,%s,%ld)\n", debugstr_w(pszThemeFileName),
+    TRACE("(%s,%s,%d)\n", debugstr_w(pszThemeFileName),
           debugstr_w(pszSizeName), dwColorNum);
 
     hr = MSSTYLES_OpenThemeFile(pszThemeFileName, NULL, pszSizeName, &pt);
@@ -1126,7 +1127,7 @@
     HRESULT hr;
     LPWSTR tmp;
     UINT resourceId = dwSizeNum + 3000;
-    TRACE("(%s,%s,%ld)\n", debugstr_w(pszThemeFileName),
+    TRACE("(%s,%s,%d)\n", debugstr_w(pszThemeFileName),
           debugstr_w(pszColorName), dwSizeNum);
 
     hr = MSSTYLES_OpenThemeFile(pszThemeFileName, pszColorName, NULL, &pt);