mirrors/reactos
0
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-11-23 11:33:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

[3RDPARTY] Link to oldnames for stricmp/wcsicmp

Browse Source
This commit is contained in:
Timo Kreuzer 2024-05-21 19:33:42 +03:00
parent a3bab12b50
commit 1de09c477c
48 changed files with 80 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/applications/cmdutils/cscript/CMakeLists.txt
View File

@ -13,7 +13,7 @@ add_executable(cscript ${SOURCE} rsrc.rc)
add_idl_headers(cscript_idlheader ihost.idl) add_idl_headers(cscript_idlheader ihost.idl)
add_typelib(ihost.idl) add_typelib(ihost.idl)
set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ihost.tlb) set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ihost.tlb)
target_link_libraries(cscript uuid wine) target_link_libraries(cscript uuid wine oldnames)
set_module_type(cscript win32cui UNICODE) set_module_type(cscript win32cui UNICODE)
add_delay_importlibs(cscript shlwapi) add_delay_importlibs(cscript shlwapi)
add_importlibs(cscript shell32 oleaut32 ole32 advapi32 user32 msvcrt kernel32 ntdll) add_importlibs(cscript shell32 oleaut32 ole32 advapi32 user32 msvcrt kernel32 ntdll)

2
base/applications/cmdutils/reg/CMakeLists.txt
View File

@ -5,6 +5,6 @@ add_definitions(-D_WIN32_WINNT=0x600)
add_definitions(-D__WINESRC__) add_definitions(-D__WINESRC__)
add_executable(reg add.c copy.c delete.c export.c import.c query.c reg.c reg.rc) add_executable(reg add.c copy.c delete.c export.c import.c query.c reg.c reg.rc)
set_module_type(reg win32cui UNICODE) set_module_type(reg win32cui UNICODE)
target_link_libraries(reg wine) target_link_libraries(reg wine oldnames)
add_importlibs(reg advapi32 advapi32_vista user32 msvcrt kernel32 ntdll) add_importlibs(reg advapi32 advapi32_vista user32 msvcrt kernel32 ntdll)
add_cd_file(TARGET reg DESTINATION reactos/system32 FOR all) add_cd_file(TARGET reg DESTINATION reactos/system32 FOR all)

2
base/applications/cmdutils/wscript/CMakeLists.txt
View File

@ -11,7 +11,7 @@ add_executable(wscript ${SOURCE} rsrc.rc)
add_idl_headers(wscript_idlheader ihost.idl) add_idl_headers(wscript_idlheader ihost.idl)
add_typelib(ihost.idl) add_typelib(ihost.idl)
set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ihost.tlb) set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ihost.tlb)
target_link_libraries(wscript uuid wine) target_link_libraries(wscript uuid wine oldnames)
set_module_type(wscript win32gui UNICODE) set_module_type(wscript win32gui UNICODE)
add_delay_importlibs(wscript shlwapi) add_delay_importlibs(wscript shlwapi)
add_importlibs(wscript shell32 oleaut32 ole32 user32 advapi32 msvcrt kernel32 ntdll) add_importlibs(wscript shell32 oleaut32 ole32 user32 advapi32 msvcrt kernel32 ntdll)

7
base/applications/network/telnet/CMakeLists.txt
View File

@ -27,12 +27,7 @@ set_target_cpp_properties(telnet WITH_EXCEPTIONS)
if (MSVC) if (MSVC)
# C4838: conversion from 'int' to 'SHORT' requires a narrowing conversion # C4838: conversion from 'int' to 'SHORT' requires a narrowing conversion
# C4996: 'strnicmp': Deprecated POSIX name, Try _strnicmp instead! target_compile_options(telnet PRIVATE /wd4838)
target_compile_options(telnet PRIVATE /wd4838 /wd4996)
endif()
if (NOT MSVC)
target_compile_definitions(telnet PRIVATE _CRT_NONSTDC_NO_DEPRECATE)
endif() endif()
if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang")

6
base/applications/winhlp32/CMakeLists.txt
View File

@ -4,8 +4,8 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
add_definitions( add_definitions(
-D__WINESRC__ -D__WINESRC__
-D__ROS_LONG64__ -D__ROS_LONG64__
-Dfileno=_fileno -Dstrcasecmp=_stricmp
-Disatty=_isatty) )
list(APPEND SOURCE list(APPEND SOURCE
callback.c callback.c
@ -27,7 +27,7 @@ add_executable(winhlp32
rsrc.rc) rsrc.rc)
set_module_type(winhlp32 win32gui) set_module_type(winhlp32 win32gui)
target_link_libraries(winhlp32 wine) target_link_libraries(winhlp32 wine oldnames)
add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt kernel32 ntdll) add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt kernel32 ntdll)
add_pch(winhlp32 precomp.h "${PCH_SKIP_SOURCE}") add_pch(winhlp32 precomp.h "${PCH_SKIP_SOURCE}")
add_cd_file(TARGET winhlp32 DESTINATION reactos FOR all) add_cd_file(TARGET winhlp32 DESTINATION reactos FOR all)

2
base/services/nfsd/CMakeLists.txt
View File

@ -56,6 +56,8 @@ else()
target_compile_options(nfsd PRIVATE "-w") target_compile_options(nfsd PRIVATE "-w")
endif() endif()
target_link_libraries(nfsd oldnames)
set_module_type(nfsd win32cui) set_module_type(nfsd win32cui)
add_importlibs(nfsd advapi32 iphlpapi kernel32_vista libtirpc msvcrt shell32 ws2_32 wldap32 kernel32 ntdll) add_importlibs(nfsd advapi32 iphlpapi kernel32_vista libtirpc msvcrt shell32 ws2_32 wldap32 kernel32 ntdll)
add_pch(nfsd precomp.h SOURCE) add_pch(nfsd precomp.h SOURCE)

2
base/services/tftpd/CMakeLists.txt
View File

@ -4,6 +4,8 @@ set_module_type(tftpd win32cui)
add_importlibs(tftpd advapi32 ws2_32 iphlpapi msvcrt kernel32) add_importlibs(tftpd advapi32 ws2_32 iphlpapi msvcrt kernel32)
add_cd_file(TARGET tftpd DESTINATION reactos/system32 FOR all) add_cd_file(TARGET tftpd DESTINATION reactos/system32 FOR all)
add_definitions(-Dstrcasecmp=_stricmp)
if (MSVC) if (MSVC)
# Disable warning C4267: 'initializing': conversion from 'size_t' to 'unsigned short', possible loss of data # Disable warning C4267: 'initializing': conversion from 'size_t' to 'unsigned short', possible loss of data
target_compile_options(tftpd PRIVATE /wd4267) target_compile_options(tftpd PRIVATE /wd4267)

2
base/system/format/CMakeLists.txt
View File

@ -4,7 +4,7 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)
add_executable(format format.c format.rc) add_executable(format format.c format.rc)
set_module_type(format win32cui UNICODE) set_module_type(format win32cui UNICODE)
target_link_libraries(format conutils ${PSEH_LIB}) target_link_libraries(format conutils ${PSEH_LIB} oldnames)
add_importlibs(format fmifs msvcrt kernel32 ntdll) add_importlibs(format fmifs msvcrt kernel32 ntdll)
set_target_properties(format PROPERTIES SUFFIX ".com") set_target_properties(format PROPERTIES SUFFIX ".com")
add_cd_file(TARGET format DESTINATION reactos/system32 FOR all) add_cd_file(TARGET format DESTINATION reactos/system32 FOR all)

1
dll/directx/wine/d3dcompiler_43/CMakeLists.txt
View File

@ -2,6 +2,7 @@
add_definitions( add_definitions(
-D__WINESRC__ -D__WINESRC__
-D__ROS_LONG64__ -D__ROS_LONG64__
-Dstrcasecmp=_stricmp
-DDIRECT3D_VERSION=0x0900) -DDIRECT3D_VERSION=0x0900)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)

2
dll/directx/wine/d3dx9_36/d3dx9.cmake
View File

@ -39,7 +39,7 @@ function(add_d3dx9_target __version)
add_definitions(-D__ROS_LONG64__) add_definitions(-D__ROS_LONG64__)
set_module_type(${module} win32dll) set_module_type(${module} win32dll)
add_dependencies(${module} d3d_idl_headers) add_dependencies(${module} d3d_idl_headers)
target_link_libraries(${module} dxguid wine) target_link_libraries(${module} dxguid wine oldnames)
add_importlibs(${module} d3dcompiler_43 d3dxof usp10 user32 ole32 gdi32 msvcrt kernel32 ntdll) add_importlibs(${module} d3dcompiler_43 d3dxof usp10 user32 ole32 gdi32 msvcrt kernel32 ntdll)
add_delay_importlibs(${module} windowscodecs) add_delay_importlibs(${module} windowscodecs)
add_pch(${module} ../d3dx9_36/precomp.h "${PCH_SKIP_SOURCE}") add_pch(${module} ../d3dx9_36/precomp.h "${PCH_SKIP_SOURCE}")

2
dll/win32/comctl32/CMakeLists.txt
View File

@ -72,7 +72,7 @@ if(MSVC)
endif() endif()
set_module_type(comctl32 win32dll UNICODE) set_module_type(comctl32 win32dll UNICODE)
target_link_libraries(comctl32 uuid wine ${PSEH_LIB}) target_link_libraries(comctl32 uuid wine ${PSEH_LIB} oldnames)
add_delay_importlibs(comctl32 winmm uxtheme) add_delay_importlibs(comctl32 winmm uxtheme)
add_importlibs(comctl32 user32 gdi32 advapi32 usp10 imm32 msvcrt kernel32 ntdll) add_importlibs(comctl32 user32 gdi32 advapi32 usp10 imm32 msvcrt kernel32 ntdll)
add_pch(comctl32 precomp.h "${PCH_SKIP_SOURCE}") add_pch(comctl32 precomp.h "${PCH_SKIP_SOURCE}")

2
dll/win32/comdlg32/CMakeLists.txt
View File

@ -26,7 +26,7 @@ add_library(comdlg32 MODULE
${CMAKE_CURRENT_BINARY_DIR}/comdlg32.def) ${CMAKE_CURRENT_BINARY_DIR}/comdlg32.def)
set_module_type(comdlg32 win32dll) set_module_type(comdlg32 win32dll)
target_link_libraries(comdlg32 uuid wine) target_link_libraries(comdlg32 uuid wine oldnames)
add_delay_importlibs(comdlg32 ole32) add_delay_importlibs(comdlg32 ole32)
add_importlibs(comdlg32 shell32 shlwapi comctl32 winspool user32 gdi32 advapi32 msvcrt kernel32 ntdll) add_importlibs(comdlg32 shell32 shlwapi comctl32 winspool user32 gdi32 advapi32 msvcrt kernel32 ntdll)
add_pch(comdlg32 precomp.h SOURCE) add_pch(comdlg32 precomp.h SOURCE)

2
dll/win32/credui/CMakeLists.txt
View File

@ -10,6 +10,6 @@ list(APPEND SOURCE
add_library(credui MODULE ${SOURCE} credui.rc) add_library(credui MODULE ${SOURCE} credui.rc)
set_module_type(credui win32dll) set_module_type(credui win32dll)
target_link_libraries(credui wine) target_link_libraries(credui wine oldnames)
add_importlibs(credui advapi32 user32 comctl32 msvcrt kernel32 ntdll) add_importlibs(credui advapi32 user32 comctl32 msvcrt kernel32 ntdll)
add_cd_file(TARGET credui DESTINATION reactos/system32 FOR all) add_cd_file(TARGET credui DESTINATION reactos/system32 FOR all)

4
dll/win32/crypt32/CMakeLists.txt
View File

@ -6,7 +6,9 @@ add_definitions(
-D__WINESRC__ -D__WINESRC__
-D__ROS_LONG64__ -D__ROS_LONG64__
-D_WINE -D_WINE
-D_CRYPT32_) -D_CRYPT32_
-Dstrncasecmp=_strnicmp
)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(crypt32.dll crypt32.spec ADD_IMPORTLIB) spec2def(crypt32.dll crypt32.spec ADD_IMPORTLIB)

2
dll/win32/cryptui/CMakeLists.txt
View File

@ -13,7 +13,7 @@ list(APPEND SOURCE
add_library(cryptui MODULE ${SOURCE} cryptui.rc) add_library(cryptui MODULE ${SOURCE} cryptui.rc)
set_module_type(cryptui win32dll) set_module_type(cryptui win32dll)
target_link_libraries(cryptui uuid wine) target_link_libraries(cryptui uuid wine oldnames)
add_delay_importlibs(cryptui urlmon wintrust) add_delay_importlibs(cryptui urlmon wintrust)
add_importlibs(cryptui user32 ole32 crypt32 gdi32 advapi32 comctl32 comdlg32 msvcrt kernel32 ntdll) add_importlibs(cryptui user32 ole32 crypt32 gdi32 advapi32 comctl32 comdlg32 msvcrt kernel32 ntdll)
add_cd_file(TARGET cryptui DESTINATION reactos/system32 FOR all) add_cd_file(TARGET cryptui DESTINATION reactos/system32 FOR all)

1
dll/win32/fusion/CMakeLists.txt
View File

@ -13,6 +13,7 @@ list(APPEND COMMON_SOURCE
${CMAKE_CURRENT_BINARY_DIR}/fusion_stubs.c) ${CMAKE_CURRENT_BINARY_DIR}/fusion_stubs.c)
add_library(fusion_common STATIC ${COMMON_SOURCE}) add_library(fusion_common STATIC ${COMMON_SOURCE})
target_link_libraries(fusion_common oldnames)
add_dependencies(fusion_common psdk) add_dependencies(fusion_common psdk)
add_pch(fusion_common precomp.h COMMON_SOURCE) add_pch(fusion_common precomp.h COMMON_SOURCE)

2
dll/win32/fusion/fusion_1_1/CMakeLists.txt
View File

@ -9,7 +9,7 @@ add_library(fusion_1_1 MODULE
${CMAKE_CURRENT_BINARY_DIR}/fusion.def) ${CMAKE_CURRENT_BINARY_DIR}/fusion.def)
set_module_type(fusion_1_1 win32dll) set_module_type(fusion_1_1 win32dll)
target_link_libraries(fusion_1_1 fusion_common uuid wine) target_link_libraries(fusion_1_1 fusion_common uuid wine oldnames)
set_target_properties(fusion_1_1 PROPERTIES OUTPUT_NAME "fusion" PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") set_target_properties(fusion_1_1 PROPERTIES OUTPUT_NAME "fusion" PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
add_importlibs(fusion_1_1 bcrypt advapi32 dbghelp shlwapi user32 msvcrt kernel32 ntdll) add_importlibs(fusion_1_1 bcrypt advapi32 dbghelp shlwapi user32 msvcrt kernel32 ntdll)
add_cd_file(TARGET fusion_1_1 DESTINATION reactos/Microsoft.NET/Framework/v1.1.4322 FOR all) add_cd_file(TARGET fusion_1_1 DESTINATION reactos/Microsoft.NET/Framework/v1.1.4322 FOR all)

2
dll/win32/fusion/fusion_2_0/CMakeLists.txt
View File

@ -9,7 +9,7 @@ add_library(fusion_2_0 MODULE
${CMAKE_CURRENT_BINARY_DIR}/fusion.def) ${CMAKE_CURRENT_BINARY_DIR}/fusion.def)
set_module_type(fusion_2_0 win32dll) set_module_type(fusion_2_0 win32dll)
target_link_libraries(fusion_2_0 fusion_common uuid wine) target_link_libraries(fusion_2_0 fusion_common uuid wine oldnames)
set_target_properties(fusion_2_0 PROPERTIES OUTPUT_NAME "fusion" PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") set_target_properties(fusion_2_0 PROPERTIES OUTPUT_NAME "fusion" PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
add_importlibs(fusion_2_0 bcrypt advapi32 dbghelp shlwapi user32 msvcrt kernel32 ntdll) add_importlibs(fusion_2_0 bcrypt advapi32 dbghelp shlwapi user32 msvcrt kernel32 ntdll)
add_cd_file(TARGET fusion_2_0 DESTINATION reactos/Microsoft.NET/Framework/v2.0.50727 FOR all) add_cd_file(TARGET fusion_2_0 DESTINATION reactos/Microsoft.NET/Framework/v2.0.50727 FOR all)

2
dll/win32/hlink/CMakeLists.txt
View File

@ -19,7 +19,7 @@ add_library(hlink MODULE
${CMAKE_CURRENT_BINARY_DIR}/hlink.def) ${CMAKE_CURRENT_BINARY_DIR}/hlink.def)
set_module_type(hlink win32dll) set_module_type(hlink win32dll)
target_link_libraries(hlink uuid wine) target_link_libraries(hlink uuid wine oldnames)
add_delay_importlibs(hlink urlmon) add_delay_importlibs(hlink urlmon)
add_importlibs(hlink shell32 ole32 advapi32 msvcrt kernel32 ntdll) add_importlibs(hlink shell32 ole32 advapi32 msvcrt kernel32 ntdll)
add_pch(hlink precomp.h "${PCH_SKIP_SOURCE}") add_pch(hlink precomp.h "${PCH_SKIP_SOURCE}")

6
dll/win32/inseng/CMakeLists.txt
View File

@ -2,7 +2,11 @@
remove_definitions(-D_WIN32_WINNT=0x502) remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600) add_definitions(-D_WIN32_WINNT=0x600)
add_definitions(-D__WINESRC__) add_definitions(
-D__WINESRC__
-Dstrcasecmp=_stricmp
-Dstrncasecmp=_strnicmp
)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(inseng.dll inseng.spec) spec2def(inseng.dll inseng.spec)

2
dll/win32/itss/CMakeLists.txt
View File

@ -22,7 +22,7 @@ add_library(itss MODULE
${CMAKE_CURRENT_BINARY_DIR}/itss.def) ${CMAKE_CURRENT_BINARY_DIR}/itss.def)
set_module_type(itss win32dll) set_module_type(itss win32dll)
target_link_libraries(itss uuid wine) target_link_libraries(itss uuid wine oldnames)
add_importlibs(itss urlmon shlwapi ole32 msvcrt kernel32 ntdll) add_importlibs(itss urlmon shlwapi ole32 msvcrt kernel32 ntdll)
add_pch(itss precomp.h "${PCH_SKIP_SOURCE}") add_pch(itss precomp.h "${PCH_SKIP_SOURCE}")
add_dependencies(itss wineheaders) add_dependencies(itss wineheaders)

2
dll/win32/jscript/CMakeLists.txt
View File

@ -65,7 +65,7 @@ add_idl_headers(jscript_idlheader jscript_classes.idl)
add_typelib(jsglobal.idl) add_typelib(jsglobal.idl)
add_dependencies(jscript jscript_idlheader stdole2) add_dependencies(jscript jscript_idlheader stdole2)
set_module_type(jscript win32dll) set_module_type(jscript win32dll)
target_link_libraries(jscript uuid wine) target_link_libraries(jscript uuid wine oldnames)
add_importlibs(jscript user32 ole32 oleaut32 advapi32 msvcrt kernel32 ntdll) add_importlibs(jscript user32 ole32 oleaut32 advapi32 msvcrt kernel32 ntdll)
add_pch(jscript precomp.h "${PCH_SKIP_SOURCE}") add_pch(jscript precomp.h "${PCH_SKIP_SOURCE}")
add_cd_file(TARGET jscript DESTINATION reactos/system32 FOR all) add_cd_file(TARGET jscript DESTINATION reactos/system32 FOR all)

2
dll/win32/mlang/CMakeLists.txt
View File

@ -13,7 +13,7 @@ list(APPEND SOURCE
add_library(mlang MODULE ${SOURCE} mlang.rc) add_library(mlang MODULE ${SOURCE} mlang.rc)
set_module_type(mlang win32dll UNICODE) set_module_type(mlang win32dll UNICODE)
target_link_libraries(mlang uuid wine) target_link_libraries(mlang uuid wine oldnames)
add_delay_importlibs(mlang oleaut32) add_delay_importlibs(mlang oleaut32)
add_importlibs(mlang gdi32 advapi32 msvcrt kernel32 ntdll) add_importlibs(mlang gdi32 advapi32 msvcrt kernel32 ntdll)
add_cd_file(TARGET mlang DESTINATION reactos/system32 FOR all) add_cd_file(TARGET mlang DESTINATION reactos/system32 FOR all)

2
dll/win32/msacm32/CMakeLists.txt
View File

@ -20,7 +20,7 @@ add_library(msacm32 MODULE
${CMAKE_CURRENT_BINARY_DIR}/msacm32.def) ${CMAKE_CURRENT_BINARY_DIR}/msacm32.def)
set_module_type(msacm32 win32dll ENTRYPOINT DllMain 12 UNICODE) set_module_type(msacm32 win32dll ENTRYPOINT DllMain 12 UNICODE)
target_link_libraries(msacm32 wine) target_link_libraries(msacm32 wine oldnames)
add_importlibs(msacm32 advapi32 user32 winmm msvcrt kernel32 ntdll) add_importlibs(msacm32 advapi32 user32 winmm msvcrt kernel32 ntdll)
add_pch(msacm32 precomp.h SOURCE) add_pch(msacm32 precomp.h SOURCE)
add_cd_file(TARGET msacm32 DESTINATION reactos/system32 FOR all) add_cd_file(TARGET msacm32 DESTINATION reactos/system32 FOR all)

5
dll/win32/mshtml/CMakeLists.txt
View File

@ -5,7 +5,10 @@ add_definitions(-D_WIN32_WINNT=0x600)
add_definitions( add_definitions(
-D__WINESRC__ -D__WINESRC__
-D__ROS_LONG64__ -D__ROS_LONG64__
-DCOM_NO_WINDOWS_H) -DCOM_NO_WINDOWS_H
-Dstrcasecmp=_stricmp
-Dstrncasecmp=_strnicmp
)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
add_idl_headers(mshtml_nsiface_header nsiface.idl) add_idl_headers(mshtml_nsiface_header nsiface.idl)

2
dll/win32/ole32/CMakeLists.txt
View File

@ -88,7 +88,7 @@ if(MSVC)
endif() endif()
set_module_type(ole32 win32dll) set_module_type(ole32 win32dll)
target_link_libraries(ole32 wine uuid ${PSEH_LIB}) target_link_libraries(ole32 wine uuid ${PSEH_LIB} oldnames)
add_delay_importlibs(ole32 oleaut32) add_delay_importlibs(ole32 oleaut32)
add_importlibs(ole32 advapi32 user32 gdi32 rpcrt4 msvcrt kernel32 kernel32_vista ntdll) add_importlibs(ole32 advapi32 user32 gdi32 rpcrt4 msvcrt kernel32 kernel32_vista ntdll)
add_dependencies(ole32 ole32idl) add_dependencies(ole32 ole32idl)

2
dll/win32/oleacc/CMakeLists.txt
View File

@ -39,7 +39,7 @@ add_library(oleacc MODULE
add_dependencies(oleacc oleacc_idlheader stdole2) add_dependencies(oleacc oleacc_idlheader stdole2)
set_module_type(oleacc win32dll) set_module_type(oleacc win32dll)
target_link_libraries(oleacc uuid wine ${PSEH_LIB}) target_link_libraries(oleacc uuid wine ${PSEH_LIB} oldnames)
add_importlibs(oleacc oleaut32 ole32 user32 rpcrt4 msvcrt kernel32 ntdll) add_importlibs(oleacc oleaut32 ole32 user32 rpcrt4 msvcrt kernel32 ntdll)
add_pch(oleacc precomp.h "${PCH_SKIP_SOURCE}") add_pch(oleacc precomp.h "${PCH_SKIP_SOURCE}")
add_cd_file(TARGET oleacc DESTINATION reactos/system32 FOR all) add_cd_file(TARGET oleacc DESTINATION reactos/system32 FOR all)

2
dll/win32/oleaut32/CMakeLists.txt
View File

@ -58,7 +58,7 @@ endif()
add_idl_headers(oleaut32_idlheader oleaut32_oaidl.idl) add_idl_headers(oleaut32_idlheader oleaut32_oaidl.idl)
add_dependencies(oleaut32 oleaut32_idlheader) add_dependencies(oleaut32 oleaut32_idlheader)
set_module_type(oleaut32 win32dll) set_module_type(oleaut32 win32dll)
target_link_libraries(oleaut32 wine wineldr uuid ${PSEH_LIB}) target_link_libraries(oleaut32 wine wineldr uuid ${PSEH_LIB} oldnames)
add_delay_importlibs(oleaut32 comctl32 urlmon windowscodecs) add_delay_importlibs(oleaut32 comctl32 urlmon windowscodecs)
add_importlibs(oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 kernel32_vista msvcrt kernel32 ntdll) add_importlibs(oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 kernel32_vista msvcrt kernel32 ntdll)
add_pch(oleaut32 precomp.h "${PCH_SKIP_SOURCE}") add_pch(oleaut32 precomp.h "${PCH_SKIP_SOURCE}")

2
dll/win32/rpcrt4/CMakeLists.txt
View File

@ -64,7 +64,7 @@ if(MSVC)
endif() endif()
set_module_type(rpcrt4 win32dll) set_module_type(rpcrt4 win32dll)
target_link_libraries(rpcrt4 wine uuid ${PSEH_LIB}) target_link_libraries(rpcrt4 wine uuid ${PSEH_LIB} oldnames)
add_delay_importlibs(rpcrt4 iphlpapi wininet secur32 user32 oleaut32) add_delay_importlibs(rpcrt4 iphlpapi wininet secur32 user32 oleaut32)
add_importlibs(rpcrt4 advapi32 advapi32_vista kernel32_vista ws2_32 msvcrt kernel32 ntdll) add_importlibs(rpcrt4 advapi32 advapi32_vista kernel32_vista ws2_32 msvcrt kernel32 ntdll)
add_dependencies(rpcrt4 ndr_types_header) add_dependencies(rpcrt4 ndr_types_header)

2
dll/win32/scrrun/CMakeLists.txt
View File

@ -29,7 +29,7 @@ add_library(scrrun MODULE
add_dependencies(scrrun scrrun_idlheader stdole2) add_dependencies(scrrun scrrun_idlheader stdole2)
set_module_type(scrrun win32dll) set_module_type(scrrun win32dll)
target_link_libraries(scrrun uuid wine) target_link_libraries(scrrun uuid wine oldnames)
add_importlibs(scrrun oleaut32 version advapi32 msvcrt kernel32 ntdll) add_importlibs(scrrun oleaut32 version advapi32 msvcrt kernel32 ntdll)
add_pch(scrrun precomp.h "${PCH_SKIP_SOURCE}") add_pch(scrrun precomp.h "${PCH_SKIP_SOURCE}")
add_cd_file(TARGET scrrun DESTINATION reactos/system32 FOR all) add_cd_file(TARGET scrrun DESTINATION reactos/system32 FOR all)

4
dll/win32/setupapi/CMakeLists.txt
View File

@ -7,7 +7,7 @@ include_directories(
add_definitions( add_definitions(
-D_SETUPAPI_ -D_SETUPAPI_
-D_CFGMGR32_ -D_CFGMGR32_
-Dwcsnicmp=_wcsnicmp) )
add_rpc_files(client ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/pnp.idl) add_rpc_files(client ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/pnp.idl)
spec2def(setupapi.dll setupapi.spec ADD_IMPORTLIB) spec2def(setupapi.dll setupapi.spec ADD_IMPORTLIB)
@ -42,7 +42,7 @@ add_library(setupapi MODULE
${CMAKE_CURRENT_BINARY_DIR}/setupapi.def) ${CMAKE_CURRENT_BINARY_DIR}/setupapi.def)
set_module_type(setupapi win32dll UNICODE) set_module_type(setupapi win32dll UNICODE)
target_link_libraries(setupapi uuid wine ${PSEH_LIB}) target_link_libraries(setupapi uuid wine ${PSEH_LIB} oldnames)
add_delay_importlibs(setupapi comdlg32 shell32 winspool.drv wintrust) add_delay_importlibs(setupapi comdlg32 shell32 winspool.drv wintrust)
add_importlibs(setupapi gdi32 comctl32 advapi32 user32 rpcrt4 version msvcrt kernel32 ntdll) add_importlibs(setupapi gdi32 comctl32 advapi32 user32 rpcrt4 version msvcrt kernel32 ntdll)
add_pch(setupapi setupapi_private.h "${PCH_SKIP_SOURCE}") add_pch(setupapi setupapi_private.h "${PCH_SKIP_SOURCE}")

2
dll/win32/urlmon/CMakeLists.txt
View File

@ -50,7 +50,7 @@ add_library(urlmon MODULE
${CMAKE_CURRENT_BINARY_DIR}/urlmon.def) ${CMAKE_CURRENT_BINARY_DIR}/urlmon.def)
set_module_type(urlmon win32dll) set_module_type(urlmon win32dll)
target_link_libraries(urlmon uuid wine ${PSEH_LIB}) target_link_libraries(urlmon uuid wine ${PSEH_LIB} oldnames)
add_delay_importlibs(urlmon advpack) add_delay_importlibs(urlmon advpack)
add_importlibs(urlmon rpcrt4 propsys ole32 oleaut32 shlwapi shell32 wininet user32 advapi32 kernel32_vista msvcrt kernel32 ntdll) add_importlibs(urlmon rpcrt4 propsys ole32 oleaut32 shlwapi shell32 wininet user32 advapi32 kernel32_vista msvcrt kernel32 ntdll)
add_pch(urlmon precomp.h "${PCH_SKIP_SOURCE}") add_pch(urlmon precomp.h "${PCH_SKIP_SOURCE}")

2
dll/win32/vbscript/CMakeLists.txt
View File

@ -45,7 +45,7 @@ if(MSVC)
endif() endif()
set_module_type(vbscript win32dll) set_module_type(vbscript win32dll)
target_link_libraries(vbscript uuid wine) target_link_libraries(vbscript uuid wine oldnames)
add_importlibs(vbscript oleaut32 ole32 user32 msvcrt kernel32 ntdll) add_importlibs(vbscript oleaut32 ole32 user32 msvcrt kernel32 ntdll)
add_dependencies(vbscript vbscript_idlheader stdole2) add_dependencies(vbscript vbscript_idlheader stdole2)
add_pch(vbscript precomp.h "${PCH_SKIP_SOURCE}") add_pch(vbscript precomp.h "${PCH_SKIP_SOURCE}")

2
dll/win32/version/CMakeLists.txt
View File

@ -9,6 +9,6 @@ list(APPEND SOURCE
add_library(version MODULE ${SOURCE} version.rc) add_library(version MODULE ${SOURCE} version.rc)
set_module_type(version win32dll) set_module_type(version win32dll)
target_link_libraries(version wine) target_link_libraries(version wine oldnames)
add_importlibs(version msvcrt kernel32 ntdll) add_importlibs(version msvcrt kernel32 ntdll)
add_cd_file(TARGET version DESTINATION reactos/system32 FOR all) add_cd_file(TARGET version DESTINATION reactos/system32 FOR all)

2
dll/win32/wbemdisp/CMakeLists.txt
View File

@ -27,7 +27,7 @@ add_library(wbemdisp MODULE
${CMAKE_CURRENT_BINARY_DIR}/wbemdisp.def) ${CMAKE_CURRENT_BINARY_DIR}/wbemdisp.def)
set_module_type(wbemdisp win32dll) set_module_type(wbemdisp win32dll)
target_link_libraries(wbemdisp uuid wine) target_link_libraries(wbemdisp uuid wine oldnames)
add_dependencies(wbemdisp stdole2 wbemdisp_idlheader) add_dependencies(wbemdisp stdole2 wbemdisp_idlheader)
add_importlibs(wbemdisp oleaut32 ole32 msvcrt kernel32 ntdll) add_importlibs(wbemdisp oleaut32 ole32 msvcrt kernel32 ntdll)
add_pch(wbemdisp precomp.h "${PCH_SKIP_SOURCE}") add_pch(wbemdisp precomp.h "${PCH_SKIP_SOURCE}")

2
dll/win32/wbemprox/CMakeLists.txt
View File

@ -34,7 +34,7 @@ add_library(wbemprox MODULE
set_source_files_properties(wbemprox.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/wbemprox.rgs) set_source_files_properties(wbemprox.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/wbemprox.rgs)
set_module_type(wbemprox win32dll) set_module_type(wbemprox win32dll)
target_link_libraries(wbemprox uuid wine) target_link_libraries(wbemprox uuid wine oldnames)
add_importlibs(wbemprox iphlpapi oleaut32 advapi32 user32 gdi32 version winspool ws2_32 rpcrt4 setupapi msvcrt kernel32 ntdll) add_importlibs(wbemprox iphlpapi oleaut32 advapi32 user32 gdi32 version winspool ws2_32 rpcrt4 setupapi msvcrt kernel32 ntdll)
add_dependencies(wbemprox d3d_idl_headers) add_dependencies(wbemprox d3d_idl_headers)
add_pch(wbemprox precomp.h "${PCH_SKIP_SOURCE}") add_pch(wbemprox precomp.h "${PCH_SKIP_SOURCE}")

2
dll/win32/winmm/CMakeLists.txt
View File

@ -29,7 +29,7 @@ if(MSVC)
endif() endif()
set_module_type(winmm win32dll) set_module_type(winmm win32dll)
target_link_libraries(winmm wine ${PSEH_LIB}) target_link_libraries(winmm wine ${PSEH_LIB} oldnames)
add_importlibs(winmm advapi32 user32 msvcrt kernel32 ntdll) add_importlibs(winmm advapi32 user32 msvcrt kernel32 ntdll)
add_pch(winmm winemm.h SOURCE) add_pch(winmm winemm.h SOURCE)
add_cd_file(TARGET winmm DESTINATION reactos/system32 FOR all) add_cd_file(TARGET winmm DESTINATION reactos/system32 FOR all)

2
dll/win32/wshom.ocx/CMakeLists.txt
View File

@ -29,7 +29,7 @@ list(APPEND wshom_rc_deps
set_source_files_properties(wshom.rc PROPERTIES OBJECT_DEPENDS "${wshom_rc_deps}") set_source_files_properties(wshom.rc PROPERTIES OBJECT_DEPENDS "${wshom_rc_deps}")
set_module_type(wshom win32ocx) set_module_type(wshom win32ocx)
target_link_libraries(wshom uuid wine) target_link_libraries(wshom uuid wine oldnames)
add_importlibs(wshom oleaut32 ole32 shell32 advapi32 advapi32_vista user32 msvcrt kernel32 ntdll) add_importlibs(wshom oleaut32 ole32 shell32 advapi32 advapi32_vista user32 msvcrt kernel32 ntdll)
add_dependencies(wshom stdole2 wshom_idlheader) add_dependencies(wshom stdole2 wshom_idlheader)
add_pch(wshom precomp.h "${PCH_SKIP_SOURCE}") add_pch(wshom precomp.h "${PCH_SKIP_SOURCE}")

2
dll/win32/xmllite/CMakeLists.txt
View File

@ -21,7 +21,7 @@ if(MSVC)
endif() endif()
set_module_type(xmllite win32dll) set_module_type(xmllite win32dll)
target_link_libraries(xmllite uuid wine) target_link_libraries(xmllite uuid wine oldnames)
add_importlibs(xmllite msvcrt kernel32 ntdll) add_importlibs(xmllite msvcrt kernel32 ntdll)
add_pch(xmllite precomp.h SOURCE) add_pch(xmllite precomp.h SOURCE)
add_cd_file(TARGET xmllite DESTINATION reactos/system32 FOR all) add_cd_file(TARGET xmllite DESTINATION reactos/system32 FOR all)

5
modules/rostests/winetests/inetcomm/CMakeLists.txt
View File

@ -1,5 +1,8 @@
add_definitions(-DUSE_WINE_TODOS) add_definitions(
-DUSE_WINE_TODOS
-Dstrcasecmp=_stricmp
)
list(APPEND SOURCE list(APPEND SOURCE
mimeintl.c mimeintl.c

4
modules/rostests/winetests/kernel32/CMakeLists.txt
View File

@ -3,6 +3,10 @@ include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502) remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502)
add_definitions(-DWINVER=0x600 -D_WIN32_WINNT=0x601) add_definitions(-DWINVER=0x600 -D_WIN32_WINNT=0x601)
add_definitions(
-Dstrcasecmp=_stricmp
)
list(APPEND SOURCE list(APPEND SOURCE
actctx.c actctx.c
atom.c atom.c

2
modules/rostests/winetests/msi/CMakeLists.txt
View File

@ -43,7 +43,7 @@ add_idl_headers(msi_winetest_idlheader typelib.idl)
generate_idl_iids(typelib.idl) generate_idl_iids(typelib.idl)
add_typelib(typelib.idl) add_typelib(typelib.idl)
target_compile_definitions(msi_winetest PRIVATE __WINESRC__ USE_WINE_TODOS) target_compile_definitions(msi_winetest PRIVATE __WINESRC__ USE_WINE_TODOS strcasecmp=_stricmp)
if(CMAKE_C_COMPILER_ID STREQUAL "GNU") if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
target_compile_options(msi_winetest PRIVATE -Wno-format-overflow -Wno-format) target_compile_options(msi_winetest PRIVATE -Wno-format-overflow -Wno-format)

4
modules/rostests/winetests/oleaut32/CMakeLists.txt
View File

@ -3,7 +3,9 @@ add_definitions(
-D__WINESRC__ -D__WINESRC__
-DUSE_WINE_TODOS -DUSE_WINE_TODOS
-DWINETEST_USE_DBGSTR_LONGLONG -DWINETEST_USE_DBGSTR_LONGLONG
-D_USE_MATH_DEFINES) -D_USE_MATH_DEFINES
-Dstrcasecmp=_stricmp
)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
add_typelib(test_reg.idl test_tlb.idl tmarshal.idl) add_typelib(test_reg.idl test_tlb.idl tmarshal.idl)

5
modules/rostests/winetests/setupapi/CMakeLists.txt
View File

@ -1,4 +1,9 @@
add_definitions(
-D__WINESRC__
-Dstrcasecmp=_stricmp
)
list(APPEND SOURCE list(APPEND SOURCE
devinst.c devinst.c
dialog.c dialog.c

5
modules/rostests/winetests/shell32/CMakeLists.txt
View File

@ -1,5 +1,8 @@
add_definitions(-DWINETEST_USE_DBGSTR_LONGLONG) add_definitions(
-DWINETEST_USE_DBGSTR_LONGLONG
-Dstrcasecmp=_stricmp
)
remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502) remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502)

1
modules/rostests/winetests/userenv/CMakeLists.txt
View File

@ -1,5 +1,6 @@
add_executable(userenv_winetest userenv.c testlist.c) add_executable(userenv_winetest userenv.c testlist.c)
set_module_type(userenv_winetest win32cui) set_module_type(userenv_winetest win32cui)
target_link_libraries(userenv_winetest oldnames)
add_importlibs(userenv_winetest userenv advapi32 msvcrt kernel32) add_importlibs(userenv_winetest userenv advapi32 msvcrt kernel32)
add_rostests_file(TARGET userenv_winetest) add_rostests_file(TARGET userenv_winetest)

7
sdk/lib/3rdparty/libmpg123/CMakeLists.txt vendored
View File

@ -5,10 +5,8 @@ add_definitions(
-DNOXFERMEM -DNOXFERMEM
-DHAVE_CONFIG_H -DHAVE_CONFIG_H
-DEOVERFLOW=75 -DEOVERFLOW=75
-Dlseek=_lseek -Dstrcasecmp=_stricmp
-Dread=_read -Dstrncasecmp=_strnicmp
-Dstrdup=_strdup
-D_CRT_NONSTDC_NO_DEPRECATE
-D_DLL -D__USE_CRTIMP -D_DLL -D__USE_CRTIMP
-D_CRT_NO_POSIX_ERROR_CODES) -D_CRT_NO_POSIX_ERROR_CODES)
@ -48,5 +46,6 @@ add_library(libmpg123
${SOURCE} ${SOURCE}
${PCH_SKIP_SOURCE}) ${PCH_SKIP_SOURCE})
target_link_libraries(libmpg123 oldnames)
add_dependencies(libmpg123 psdk) add_dependencies(libmpg123 psdk)
add_pch(libmpg123 precomp.h "${PCH_SKIP_SOURCE}") add_pch(libmpg123 precomp.h "${PCH_SKIP_SOURCE}")

2
sdk/lib/crt/locale/locale.c
View File

@ -31,6 +31,8 @@
#error _pctype should not be defined #error _pctype should not be defined
#endif #endif
#define strcasecmp _stricmp
#define strncasecmp _strnicmp
unsigned int __lc_codepage = 0; unsigned int __lc_codepage = 0;
int MSVCRT___lc_collate_cp = 0; int MSVCRT___lc_collate_cp = 0;
LCID MSVCRT___lc_handle[LC_MAX - LC_MIN + 1] = { 0 }; LCID MSVCRT___lc_handle[LC_MAX - LC_MIN + 1] = { 0 };