mirror of
https://github.com/reactos/reactos.git
synced 2025-08-05 16:23:01 +00:00
[SHLWAPI] Fix version control (_WIN32_WINNT) (#5514)
- _WIN32_WINNT had wrong value to do workaround on Vista+ RegGetValueW. - Do #undef and #define _WIN32_WINNT _WIN32_WINNT_VISTA in assoc.c. - Delete _WIN32_WINNT hack in CMakeLists.txt. CORE-9283
This commit is contained in:
parent
6299340c45
commit
0160354145
3 changed files with 7 additions and 6 deletions
|
@ -1,9 +1,6 @@
|
||||||
|
|
||||||
project(SHELL)
|
project(SHELL)
|
||||||
|
|
||||||
remove_definitions(-D_WIN32_WINNT=0x502)
|
|
||||||
add_definitions(-D_WIN32_WINNT=0x600)
|
|
||||||
|
|
||||||
add_definitions(
|
add_definitions(
|
||||||
-D__WINESRC__
|
-D__WINESRC__
|
||||||
-D_SHLWAPI_)
|
-D_SHLWAPI_)
|
||||||
|
@ -11,7 +8,6 @@ add_definitions(
|
||||||
spec2def(shlwapi.dll shlwapi.spec ADD_IMPORTLIB)
|
spec2def(shlwapi.dll shlwapi.spec ADD_IMPORTLIB)
|
||||||
|
|
||||||
list(APPEND SOURCE
|
list(APPEND SOURCE
|
||||||
assoc.c
|
|
||||||
clist.c
|
clist.c
|
||||||
istream.c
|
istream.c
|
||||||
msgbox.c
|
msgbox.c
|
||||||
|
@ -27,6 +23,7 @@ list(APPEND SOURCE
|
||||||
url.c)
|
url.c)
|
||||||
|
|
||||||
list(APPEND PCH_SKIP_SOURCE
|
list(APPEND PCH_SKIP_SOURCE
|
||||||
|
assoc.c
|
||||||
wsprintf.c
|
wsprintf.c
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/shlwapi_stubs.c)
|
${CMAKE_CURRENT_BINARY_DIR}/shlwapi_stubs.c)
|
||||||
|
|
||||||
|
|
|
@ -17,6 +17,10 @@
|
||||||
* License along with this library; if not, write to the Free Software
|
* License along with this library; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
#ifdef __REACTOS__
|
||||||
|
#undef _WIN32_WINNT
|
||||||
|
#define _WIN32_WINNT _WIN32_WINNT_VISTA /* for RegGetValueW */
|
||||||
|
#endif
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
|
|
|
@ -2249,7 +2249,7 @@ BOOL WINAPI PathIsUNCA(LPCSTR lpszPath)
|
||||||
* considered UNC, while on Windows Vista+ this is not the case anymore.
|
* considered UNC, while on Windows Vista+ this is not the case anymore.
|
||||||
*/
|
*/
|
||||||
// #ifdef __REACTOS__
|
// #ifdef __REACTOS__
|
||||||
#if (WINVER >= _WIN32_WINNT_VISTA)
|
#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA)
|
||||||
if (lpszPath && (lpszPath[0]=='\\') && (lpszPath[1]=='\\') && (lpszPath[2]!='?'))
|
if (lpszPath && (lpszPath[0]=='\\') && (lpszPath[1]=='\\') && (lpszPath[2]!='?'))
|
||||||
#else
|
#else
|
||||||
if (lpszPath && (lpszPath[0]=='\\') && (lpszPath[1]=='\\'))
|
if (lpszPath && (lpszPath[0]=='\\') && (lpszPath[1]=='\\'))
|
||||||
|
@ -2272,7 +2272,7 @@ BOOL WINAPI PathIsUNCW(LPCWSTR lpszPath)
|
||||||
* considered UNC, while on Windows Vista+ this is not the case anymore.
|
* considered UNC, while on Windows Vista+ this is not the case anymore.
|
||||||
*/
|
*/
|
||||||
// #ifdef __REACTOS__
|
// #ifdef __REACTOS__
|
||||||
#if (WINVER >= _WIN32_WINNT_VISTA)
|
#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA)
|
||||||
if (lpszPath && (lpszPath[0]=='\\') && (lpszPath[1]=='\\') && (lpszPath[2]!='?'))
|
if (lpszPath && (lpszPath[0]=='\\') && (lpszPath[1]=='\\') && (lpszPath[2]!='?'))
|
||||||
#else
|
#else
|
||||||
if (lpszPath && (lpszPath[0]=='\\') && (lpszPath[1]=='\\'))
|
if (lpszPath && (lpszPath[0]=='\\') && (lpszPath[1]=='\\'))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue