From 57aa1f1fc6744733020e800e45ffa86481337179 Mon Sep 17 00:00:00 2001 From: Serge Gautherie Date: Fri, 17 Nov 2017 01:44:31 +0100 Subject: [PATCH] [SHELL32] shellpath.c: it is _WIN32_WINNT, not WIN32_WINNT. We even need to use __REACTOS__ instead here. CORE-12580 --- dll/win32/shell32/wine/shellpath.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dll/win32/shell32/wine/shellpath.c b/dll/win32/shell32/wine/shellpath.c index c65ac4ed476..02072e9a854 100644 --- a/dll/win32/shell32/wine/shellpath.c +++ b/dll/win32/shell32/wine/shellpath.c @@ -645,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 @@ -1042,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, @@ -2271,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,