[SHELL32] shellpath.c: it is _WIN32_WINNT, not WIN32_WINNT. We even need to use __REA...

[reactos.git] / dll / win32 / shell32 / wine / shellpath.c

diff --git a/dll/win32/shell32/wine/shellpath.c b/dll/win32/shell32/wine/shellpath.c
index fdde656..02072e9 100644 (file)
--- a/dll/win32/shell32/wine/shellpath.c
+++ b/dll/win32/shell32/wine/shellpath.c
@@ -89,16 +89,6 @@ BOOL WINAPI PathAppendAW(
        return PathAppendA(lpszPath1, lpszPath2);
 }
 
-/*************************************************************************
- * PathBuildRoot               [SHELL32.30]
- */
-LPVOID WINAPI PathBuildRootAW(LPVOID lpszPath, int drive)
-{
-       if(SHELL_OsIsUnicode())
-         return PathBuildRootW(lpszPath, drive);
-       return PathBuildRootA(lpszPath, drive);
-}
-
 /*************************************************************************
  * PathGetExtensionA           [internal]
  *
@@ -128,7 +118,7 @@ static LPWSTR PathGetExtensionW(LPCWSTR lpszPath)
 /*************************************************************************
  * SHPathGetExtension        [SHELL32.158]
  */
-EXTERN_C LPVOID WINAPI SHPathGetExtensionW(LPCWSTR lpszPath, DWORD void1, DWORD void2)
+LPVOID WINAPI SHPathGetExtensionW(LPCWSTR lpszPath, DWORD void1, DWORD void2)
 {
     return PathGetExtensionW(lpszPath);
 }
@@ -259,16 +249,6 @@ BOOL WINAPI PathFileExistsAW (LPCVOID lpszPath)
        return PathFileExistsA (lpszPath);
 }
 
-/*************************************************************************
- * PathIsSameRoot      [SHELL32.650]
- */
-BOOL WINAPI PathIsSameRootAW(LPCVOID lpszPath1, LPCVOID lpszPath2)
-{
-       if (SHELL_OsIsUnicode())
-         return PathIsSameRootW(lpszPath1, lpszPath2);
-       return PathIsSameRootA(lpszPath1, lpszPath2);
-}
-
 /*************************************************************************
  * IsLFNDriveA         [SHELL32.41]
  */
@@ -665,7 +645,8 @@ typedef enum _CSIDL_Type {
     CSIDL_Type_SystemX86Path,
 } CSIDL_Type;
 
-#if WIN32_WINNT >= 0x0600
+/* Cannot use #if _WIN32_WINNT >= 0x0600 because _WIN32_WINNT == 0x0600 here. */
+#ifndef __REACTOS__
 #define CSIDL_CONTACTS         0x0043
 #define CSIDL_DOWNLOADS        0x0047
 #define CSIDL_LINKS            0x004d
@@ -808,7 +789,7 @@ static const CSIDL_DATA CSIDL_Data[] =
         &FOLDERID_Fonts,
         CSIDL_Type_WindowsPath,
         FontsW,
-        MAKEINTRESOURCEW(IDS_FONTS)
+        FontsW
     },
     { /* 0x15 - CSIDL_TEMPLATES */
         &FOLDERID_Templates,
@@ -1062,7 +1043,8 @@ static const CSIDL_DATA CSIDL_Data[] =
         NULL,
         NULL
     },
-#if WIN32_WINNT >= 0x0600
+/* Cannot use #if _WIN32_WINNT >= 0x0600 because _WIN32_WINNT == 0x0600 here. */
+#ifndef __REACTOS__
     { /* 0x3f */
         &FOLDERID_AddNewPrograms,
         CSIDL_Type_Disallowed,
@@ -1538,6 +1520,7 @@ static HRESULT _SHGetDefaultValue(HANDLE hToken, BYTE folder, LPWSTR pszPath)
         ; /* no corresponding env. var, do nothing */
     }
 
+    hr = S_OK;
     if (CSIDL_Data[folder].szDefaultPath)
     {
         if (IS_INTRESOURCE(CSIDL_Data[folder].szDefaultPath))
@@ -1545,7 +1528,6 @@ static HRESULT _SHGetDefaultValue(HANDLE hToken, BYTE folder, LPWSTR pszPath)
             if (LoadStringW(shell32_hInstance,
                 LOWORD(CSIDL_Data[folder].szDefaultPath), resourcePath, MAX_PATH))
             {
-                hr = S_OK;
                 PathAppendW(pszPath, resourcePath);
             }
             else
@@ -1557,7 +1539,6 @@ static HRESULT _SHGetDefaultValue(HANDLE hToken, BYTE folder, LPWSTR pszPath)
         }
         else
         {
-            hr = S_OK;
             PathAppendW(pszPath, CSIDL_Data[folder].szDefaultPath);
         }
     }
@@ -2292,7 +2273,8 @@ static HRESULT _SHRegisterUserShellFolders(BOOL bDefault)
      CSIDL_MYPICTURES,
      CSIDL_FONTS,
      CSIDL_ADMINTOOLS,
-#if WIN32_WINNT >= 0x0600
+/* Cannot use #if _WIN32_WINNT >= 0x0600 because _WIN32_WINNT == 0x0600 here. */
+#ifndef __REACTOS__
      CSIDL_CONTACTS,
      CSIDL_DOWNLOADS,
      CSIDL_LINKS,