[ros-diffs] [jimtabor] 56642: [UXTHEME] - Partial sync port Wine 1.5.4 for system.c. - Researched branches/GSoC_2011/ThemesSupport and current changes before sync.

[jimtabor at svn.reactos.org]

Author: jimtabor
Date: Sun May 20 05:11:54 2012
New Revision: 56642

URL: http://svn.reactos.org/svn/reactos?rev=56642&view=rev
Log:
[UXTHEME]
- Partial sync port Wine 1.5.4 for system.c.
- Researched branches/GSoC_2011/ThemesSupport and current changes before sync.

Modified:
    trunk/reactos/dll/win32/uxtheme/system.c
    trunk/reactos/dll/win32/uxtheme/uxtheme.spec
    trunk/reactos/include/psdk/uxtheme.h

Modified: trunk/reactos/dll/win32/uxtheme/system.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/system.c?rev=56642&r1=56641&r2=56642&view=diff
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] Sun May 20 05:11:54 2012
@@ -620,9 +620,9 @@
 }
 
 /***********************************************************************
- *      OpenThemeData                                       (UXTHEME.@)
- */
-HTHEME WINAPI OpenThemeData(HWND hwnd, LPCWSTR pszClassList)
+ *      OpenThemeDataEx                                     (UXTHEME.61)
+ */
+HTHEME WINAPI OpenThemeDataEx(HWND hwnd, LPCWSTR pszClassList, DWORD flags)
 {
     WCHAR szAppBuff[256];
     WCHAR szClassBuff[256];
@@ -631,8 +631,14 @@
     HTHEME hTheme = NULL;
     TRACE("(%p,%s)\n", hwnd, debugstr_w(pszClassList));
     
-    if(pszClassList == NULL)
-		SetLastError(E_POINTER);
+    if(!pszClassList)
+    {
+        SetLastError(E_POINTER);
+        return NULL;
+    }
+
+    if(flags)
+        FIXME("unhandled flags: %x\n", flags);
 
     if(bThemeActive)
     {
@@ -648,8 +654,15 @@
     if(IsWindow(hwnd))
         SetPropW(hwnd, (LPCWSTR)MAKEINTATOM(atWindowTheme), hTheme);
     TRACE(" = %p\n", hTheme);
-
     return hTheme;
+}
+
+/***********************************************************************
+ *      OpenThemeData                                       (UXTHEME.@)
+ */
+HTHEME WINAPI OpenThemeData(HWND hwnd, LPCWSTR classlist)
+{
+    return OpenThemeDataEx(hwnd, classlist, 0);
 }
 
 /***********************************************************************

Modified: trunk/reactos/dll/win32/uxtheme/uxtheme.spec
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxtheme.spec?rev=56642&r1=56641&r2=56642&view=diff
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/uxtheme.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uxtheme/uxtheme.spec [iso-8859-1] Sun May 20 05:11:54 2012
@@ -38,7 +38,7 @@
 46 stub -noname ClassicAdjustWindowRectEx
 48 stub -noname GetThemeParseErrorInfo
 60 stub -noname CreateThemeDataFromObjects
-61 stub -noname OpenThemeDataEx
+61 stdcall OpenThemeDataEx(ptr wstr long)
 62 stub -noname ServerClearStockObjects
 63 stub -noname MarkSelection
 

Modified: trunk/reactos/include/psdk/uxtheme.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/uxtheme.h?rev=56642&r1=56641&r2=56642&view=diff
==============================================================================
--- trunk/reactos/include/psdk/uxtheme.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/uxtheme.h [iso-8859-1] Sun May 20 05:11:54 2012
@@ -136,6 +136,7 @@
 BOOL WINAPI IsThemeDialogTextureEnabled(HWND);
 BOOL WINAPI IsThemePartDefined(HTHEME,int,int);
 HTHEME WINAPI OpenThemeData(HWND,LPCWSTR);
+HTHEME WINAPI OpenThemeDataEx(HWND,LPCWSTR,DWORD);
 void WINAPI SetThemeAppProperties(DWORD);
 HRESULT WINAPI SetWindowTheme(HWND,LPCWSTR,LPCWSTR);
 #endif