[ros-diffs] [cwittich] 46225: [SHELL32] reduce diffs to wine

[cwittich at svn.reactos.org]

Author: cwittich
Date: Tue Mar 16 13:26:49 2010
New Revision: 46225

URL: http://svn.reactos.org/svn/reactos?rev=46225&view=rev
Log:
[SHELL32]
reduce diffs to wine

Modified:
    trunk/reactos/dll/win32/shell32/shell32_main.c
    trunk/reactos/dll/win32/shell32/shellord.c

Modified: trunk/reactos/dll/win32/shell32/shell32_main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_main.c?rev=46225&r1=46224&r2=46225&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/shell32_main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shell32_main.c [iso-8859-1] Tue Mar 16 13:26:49 2010
@@ -495,7 +495,7 @@
                 static const WCHAR p1W[] = {'%','1',0};
                 WCHAR sTemp [MAX_PATH];
 
-                szExt = (LPWSTR) PathFindExtensionW(szFullPath);
+                szExt = PathFindExtensionW(szFullPath);
                 TRACE("szExt=%s\n", debugstr_w(szExt));
                 if ( szExt &&
                      HCR_MapTypeToValueW(szExt, sTemp, MAX_PATH, TRUE) &&

Modified: trunk/reactos/dll/win32/shell32/shellord.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord.c?rev=46225&r1=46224&r2=46225&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/shellord.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shellord.c [iso-8859-1] Tue Mar 16 13:26:49 2010
@@ -1671,6 +1671,14 @@
     }
 
     return 0;
+}
+
+/*************************************************************************
+ *      SHCreatePropSheetExtArray	[SHELL32.168]
+ */
+HPSXA WINAPI SHCreatePropSheetExtArray(HKEY hKey, LPCWSTR pszSubKey, UINT max_iface)
+{
+    return SHCreatePropSheetExtArrayEx(hKey, pszSubKey, max_iface, NULL);
 }
 
 /*************************************************************************
@@ -1781,15 +1789,6 @@
 }
 
 /*************************************************************************
- *      SHCreatePropSheetExtArray	[SHELL32.168]
- */
-HPSXA WINAPI SHCreatePropSheetExtArray(HKEY hKey, LPCWSTR pszSubKey, UINT max_iface)
-{
-    return SHCreatePropSheetExtArrayEx(hKey, pszSubKey, max_iface, NULL);
-}
-
-
-/*************************************************************************
  *      SHReplaceFromPropSheetExtArray	[SHELL32.170]
  */
 UINT WINAPI SHReplaceFromPropSheetExtArray(HPSXA hpsxa, UINT uPageID, LPFNADDPROPSHEETPAGE lpfnReplaceWith, LPARAM lParam)