Author: gadamopoulos
Date: Thu Apr 18 17:09:20 2013
New Revision: 58778
URL:
http://svn.reactos.org/svn/reactos?rev=58778&view=rev
Log:
[uxtheme]
- Stub OpenThemeDataFromFile and DrawNCPreview that will be used by desk.cpl in the
future
Modified:
trunk/reactos/dll/win32/uxtheme/system.c
trunk/reactos/dll/win32/uxtheme/uxtheme.spec
trunk/reactos/include/reactos/uxundoc.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 [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] Thu Apr 18 17:09:20 2013
@@ -657,6 +657,11 @@
return hTheme;
}
+HTHEME WINAPI OpenThemeDataFromFile(HTHEMEFILE hThemeFile, HWND hwnd, LPCWSTR
pszClassList, DWORD flags)
+{
+ return S_OK;
+}
+
/***********************************************************************
* OpenThemeData (UXTHEME.@)
*/
@@ -1214,3 +1219,16 @@
MSSTYLES_CloseThemeFile(pt);
return S_OK;
}
+
+HRESULT WINAPI DrawNCPreview(HDC hDC,
+ DWORD DNCP_Flag,
+ LPRECT prcPreview,
+ LPCWSTR pszThemeFileName,
+ LPCWSTR pszColorName,
+ LPCWSTR pszSizeName,
+ PNONCLIENTMETRICSW pncMetrics,
+ COLORREF* lpaRgbValues)
+{
+ return S_OK;
+}
+
Modified: trunk/reactos/dll/win32/uxtheme/uxtheme.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxtheme.…
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/uxtheme.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uxtheme/uxtheme.spec [iso-8859-1] Thu Apr 18 17:09:20 2013
@@ -8,10 +8,10 @@
9 stdcall -noname EnumThemeColors(wstr wstr long ptr)
10 stdcall -noname EnumThemeSizes(wstr wstr long ptr)
11 stdcall -noname ParseThemeIniFile(wstr wstr ptr ptr)
-13 stub -noname DrawNCPreview
+13 stdcall -noname DrawNCPreview(ptr long ptr wstr wstr wstr ptr ptr)
14 stub -noname RegisterDefaultTheme
15 stub -noname DumpLoadedThemeToTextFile
-16 stub -noname OpenThemeDataFromFile
+16 stdcall -noname OpenThemeDataFromFile(ptr ptr wstr long)
17 stub -noname OpenThemeFileFromData
18 stub -noname GetThemeSysSize96
19 stub -noname GetThemeSysFont96
Modified: trunk/reactos/include/reactos/uxundoc.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/uxundoc.h?…
==============================================================================
--- trunk/reactos/include/reactos/uxundoc.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/uxundoc.h [iso-8859-1] Thu Apr 18 17:09:20 2013
@@ -56,23 +56,65 @@
/* Declarations for undocumented functions for use internally */
DWORD WINAPI QueryThemeServices(void);
-HRESULT WINAPI OpenThemeFile(LPCWSTR pszThemeFileName, LPCWSTR pszColorName,
- LPCWSTR pszSizeName, HTHEMEFILE *hThemeFile,
+
+HRESULT WINAPI OpenThemeFile(LPCWSTR pszThemeFileName,
+ LPCWSTR pszColorName,
+ LPCWSTR pszSizeName,
+ HTHEMEFILE *hThemeFile,
DWORD unknown);
+
HRESULT WINAPI CloseThemeFile(HTHEMEFILE hThemeFile);
-HRESULT WINAPI ApplyTheme(HTHEMEFILE hThemeFile, char *unknown, HWND hWnd);
-HRESULT WINAPI GetThemeDefaults(LPCWSTR pszThemeFileName, LPWSTR pszColorName,
- DWORD dwColorNameLen, LPWSTR pszSizeName,
+
+HRESULT WINAPI ApplyTheme(HTHEMEFILE hThemeFile,
+ char *unknown,
+ HWND hWnd);
+
+HRESULT WINAPI GetThemeDefaults(LPCWSTR pszThemeFileName,
+ LPWSTR pszColorName,
+ DWORD dwColorNameLen,
+ LPWSTR pszSizeName,
DWORD dwSizeNameLen);
-HRESULT WINAPI EnumThemes(LPCWSTR pszThemePath, ENUMTHEMEPROC callback,
+
+HRESULT WINAPI EnumThemes(LPCWSTR pszThemePath,
+ ENUMTHEMEPROC callback,
LPVOID lpData);
-HRESULT WINAPI EnumThemeColors(LPWSTR pszThemeFileName, LPWSTR pszSizeName,
- DWORD dwColorNum, PTHEMENAMES pszColorNames);
-HRESULT WINAPI EnumThemeSizes(LPWSTR pszThemeFileName, LPWSTR pszColorName,
- DWORD dwSizeNum, PTHEMENAMES pszColorNames);
-HRESULT WINAPI ParseThemeIniFile(LPCWSTR pszIniFileName, LPWSTR pszUnknown,
- PARSETHEMEINIFILEPROC callback, LPVOID lpData);
+
+HRESULT WINAPI EnumThemeColors(LPWSTR pszThemeFileName,
+ LPWSTR pszSizeName,
+ DWORD dwColorNum,
+ PTHEMENAMES pszColorNames);
+
+HRESULT WINAPI EnumThemeSizes(LPWSTR pszThemeFileName,
+ LPWSTR pszColorName,
+ DWORD dwSizeNum,
+ PTHEMENAMES pszColorNames);
+
+HRESULT WINAPI ParseThemeIniFile(LPCWSTR pszIniFileName,
+ LPWSTR pszUnknown,
+ PARSETHEMEINIFILEPROC callback,
+ LPVOID lpData);
+
+HTHEME WINAPI OpenThemeDataFromFile(HTHEMEFILE hThemeFile,
+ HWND hwnd,
+ LPCWSTR pszClassList,
+ DWORD flags);
+
+/* The DNCP_* flags let the caller decide what should be painted */
+#define DNCP_ACTIVEWINDOW 0x1
+#define DNCP_INACTIVEWINDOW 0x2
+#define DNCP_DIALOGWINDOW 0x4
+#define DNCP_DRAW_ALL DNCP_ACTIVEWINDOW | DNCP_INACTIVEWINDOW | DNCP_DIALOGWINDOW
+
+HRESULT WINAPI DrawNCPreview(HDC hDC,
+ DWORD DNCP_Flag,
+ LPRECT prcPreview,
+ LPCWSTR pszThemeFileName,
+ LPCWSTR pszColorName,
+ LPCWSTR pszSizeName,
+ PNONCLIENTMETRICSW pncMetrics,
+ COLORREF* lpaRgbValues);
BOOL WINAPI ThemeHooksInstall();
+
BOOL WINAPI ThemeHooksRemove();