[SHELL32]

reduce diffs to wine

svn path=/trunk/; revision=46225

diff --git a/reactos/dll/win32/shell32/shell32_main.c b/reactos/dll/win32/shell32/shell32_main.c
index f4ae815..2bf6502 100644 (file)
--- a/reactos/dll/win32/shell32/shell32_main.c
+++ b/reactos/dll/win32/shell32/shell32_main.c
@@ -495,7 +495,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes,
                 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) &&

diff --git a/reactos/dll/win32/shell32/shellord.c b/reactos/dll/win32/shell32/shellord.c
index ff9025c..c25ddff 100644 (file)
--- a/reactos/dll/win32/shell32/shellord.c
+++ b/reactos/dll/win32/shell32/shellord.c
@@ -1673,6 +1673,14 @@ UINT WINAPI SHAddFromPropSheetExtArray(HPSXA hpsxa, LPFNADDPROPSHEETPAGE lpfnAdd
     return 0;
 }
 
+/*************************************************************************
+ *      SHCreatePropSheetExtArray      [SHELL32.168]
+ */
+HPSXA WINAPI SHCreatePropSheetExtArray(HKEY hKey, LPCWSTR pszSubKey, UINT max_iface)
+{
+    return SHCreatePropSheetExtArrayEx(hKey, pszSubKey, max_iface, NULL);
+}
+
 /*************************************************************************
  *      SHCreatePropSheetExtArrayEx    [SHELL32.194]
  */
@@ -1780,15 +1788,6 @@ HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY hKey, LPCWSTR pszSubKey, UINT max_
     return (HPSXA)psxa;
 }
 
-/*************************************************************************
- *      SHCreatePropSheetExtArray      [SHELL32.168]
- */
-HPSXA WINAPI SHCreatePropSheetExtArray(HKEY hKey, LPCWSTR pszSubKey, UINT max_iface)
-{
-    return SHCreatePropSheetExtArrayEx(hKey, pszSubKey, max_iface, NULL);
-}
-
-
 /*************************************************************************
  *      SHReplaceFromPropSheetExtArray [SHELL32.170]
  */