Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [CMD] Fix resource string (unrecognized escape sequence); addendum to 9a59558.
by Hermès Bélusca-Maïto 07 Dec '17

07 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=49db8dc2a2dd58c3f8e89… commit 49db8dc2a2dd58c3f8e89f9933c8f04b0203d086 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Dec 7 19:35:20 2017 +0100 [CMD] Fix resource string (unrecognized escape sequence); addendum to 9a59558. --- base/shell/cmd/lang/fr-FR.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/shell/cmd/lang/fr-FR.rc b/base/shell/cmd/lang/fr-FR.rc index efe80145fa..d82311e850 100644 --- a/base/shell/cmd/lang/fr-FR.rc +++ b/base/shell/cmd/lang/fr-FR.rc @@ -147,7 +147,7 @@ ERASE [/N /P /T /Q /W /Y /Z] fichier ...\n\n\ A Fichiers archivables\n\ H Fichiers cachés\n\ - préfixe signifiant ne pas\n" - STRING_DEL_HELP2 "Tous les fichiers du répertoire seront effacés!\n\Etes vous sûr(e) (O/N) ? " + STRING_DEL_HELP2 "Tous les fichiers du répertoire seront effacés!\nEtes vous sûr(e) (O/N) ? " STRING_DEL_HELP3 " %lu fichier effacé\n" STRING_DEL_HELP4 " %lu fichiers effacés\n" STRING_DELAY_HELP "Attend pendant n secondes ou millisecondes.\n\

1 0

[reactos] 01/01: [CMAKE/CLANG-CL] Silence some clang-cl warnings in consistency with our gcc build.
by Amine Khaldi 07 Dec '17

07 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=00124d1b1ad0ff51d6ce1… commit 00124d1b1ad0ff51d6ce1eb868ecb57aca481cdd Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Dec 3 23:30:10 2017 +0100 [CMAKE/CLANG-CL] Silence some clang-cl warnings in consistency with our gcc build. --- base/services/nfsd/CMakeLists.txt | 2 +- dll/3rdparty/libtiff/CMakeLists.txt | 4 +--- dll/3rdparty/libtirpc/CMakeLists.txt | 2 +- dll/3rdparty/libxslt/CMakeLists.txt | 5 +---- dll/3rdparty/mbedtls/CMakeLists.txt | 5 ++--- dll/opengl/glu32/CMakeLists.txt | 3 +++ dll/opengl/mesa/main/CMakeLists.txt | 3 +++ dll/opengl/mesa/swrast/CMakeLists.txt | 5 ++++- drivers/bluetooth/fbtusb/CMakeLists.txt | 2 +- drivers/filesystems/ext2/CMakeLists.txt | 17 ++++++++++++----- drivers/filesystems/ffs/CMakeLists.txt | 11 ++++++----- drivers/filesystems/nfs/CMakeLists.txt | 5 ++++- drivers/filesystems/reiserfs/CMakeLists.txt | 9 +++++---- drivers/filesystems/udfs/CMakeLists.txt | 8 ++++++++ drivers/storage/class/cdrom_new/CMakeLists.txt | 9 +++++---- drivers/storage/class/disk_new/CMakeLists.txt | 6 ++---- drivers/storage/ide/uniata/CMakeLists.txt | 6 ++++-- drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt | 6 ++---- modules/rostests/winetests/advapi32/CMakeLists.txt | 2 +- modules/rostests/winetests/comctl32/CMakeLists.txt | 11 +++++------ modules/rostests/winetests/kernel32/CMakeLists.txt | 2 +- modules/rostests/winetests/msvcrt/CMakeLists.txt | 7 +++++-- modules/rostests/winetests/ntdll/CMakeLists.txt | 9 +++++---- modules/rostests/winetests/rpcrt4/CMakeLists.txt | 12 ++++++++---- modules/rostests/winetests/winmm/CMakeLists.txt | 12 +++++------- modules/rostests/winetests/ws2_32/CMakeLists.txt | 9 +++++---- sdk/lib/3rdparty/adns/CMakeLists.txt | 7 ++++--- sdk/lib/3rdparty/cardlib/CMakeLists.txt | 7 ++++--- sdk/lib/3rdparty/libxml2/CMakeLists.txt | 9 +++++---- 29 files changed, 113 insertions(+), 82 deletions(-) diff --git a/base/services/nfsd/CMakeLists.txt b/base/services/nfsd/CMakeLists.txt index 91ce1221b6..3ab680be23 100644 --- a/base/services/nfsd/CMakeLists.txt +++ b/base/services/nfsd/CMakeLists.txt @@ -48,7 +48,7 @@ list(APPEND SOURCE add_executable(nfsd ${SOURCE} nfsd.rc) -if(MSVC) +if(MSVC AND (NOT USE_CLANG_CL)) else() # FIXME: Tons of warnings. add_target_compile_flags(nfsd "-w") diff --git a/dll/3rdparty/libtiff/CMakeLists.txt b/dll/3rdparty/libtiff/CMakeLists.txt index 5673ed9a97..9c57c2d1b3 100644 --- a/dll/3rdparty/libtiff/CMakeLists.txt +++ b/dll/3rdparty/libtiff/CMakeLists.txt @@ -59,7 +59,5 @@ add_pch(libtiff precomp.h SOURCE) add_cd_file(TARGET libtiff DESTINATION reactos/system32 FOR all) if(NOT MSVC) - if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") - add_target_compile_flags(libtiff "-Wno-unused-but-set-variable") - endif() + add_target_compile_flags(libtiff "-Wno-unused-but-set-variable") endif() diff --git a/dll/3rdparty/libtirpc/CMakeLists.txt b/dll/3rdparty/libtirpc/CMakeLists.txt index f6c9f4c113..3d028925de 100644 --- a/dll/3rdparty/libtirpc/CMakeLists.txt +++ b/dll/3rdparty/libtirpc/CMakeLists.txt @@ -94,7 +94,7 @@ add_library(libtirpc SHARED libtirpc/libtirpc_ros.rc ${CMAKE_CURRENT_BINARY_DIR}/libtirpc.def) -if(MSVC) +if(MSVC AND (NOT USE_CLANG_CL)) else() # FIXME: Tons of warnings. add_target_compile_flags(libtirpc "-w") diff --git a/dll/3rdparty/libxslt/CMakeLists.txt b/dll/3rdparty/libxslt/CMakeLists.txt index 1bace8f65b..07d927dbac 100644 --- a/dll/3rdparty/libxslt/CMakeLists.txt +++ b/dll/3rdparty/libxslt/CMakeLists.txt @@ -47,9 +47,6 @@ endif() add_pch(libxslt precomp.h SOURCE) add_cd_file(TARGET libxslt DESTINATION reactos/system32 FOR all) -if(NOT MSVC) +if(USE_CLANG_CL OR (NOT MSVC)) add_target_compile_flags(libxslt "-Wno-pointer-sign -Wno-unused-function") - if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") - add_target_compile_flags(libxslt "-Wno-unused-but-set-variable") - endif() endif() diff --git a/dll/3rdparty/mbedtls/CMakeLists.txt b/dll/3rdparty/mbedtls/CMakeLists.txt index 0de5e350cc..c5af423712 100644 --- a/dll/3rdparty/mbedtls/CMakeLists.txt +++ b/dll/3rdparty/mbedtls/CMakeLists.txt @@ -95,7 +95,6 @@ add_cd_file(TARGET mbedtls DESTINATION reactos/system32 FOR all) if(NOT MSVC) add_target_compile_flags(mbedtls "-Wno-pointer-sign -Wno-unused-function") - if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") - add_target_compile_flags(mbedtls "-Wno-unused-but-set-variable") - endif() +elseif(USE_CLANG_CL) + add_target_compile_flags(mbedtls "-Wno-tautological-constant-compare") endif() diff --git a/dll/opengl/glu32/CMakeLists.txt b/dll/opengl/glu32/CMakeLists.txt index 9c8802c4e0..f9e0a4793c 100644 --- a/dll/opengl/glu32/CMakeLists.txt +++ b/dll/opengl/glu32/CMakeLists.txt @@ -121,6 +121,9 @@ set_module_type(glu32 win32dll) if(NOT MSVC) add_target_compile_flags(glu32 "-Wno-write-strings -Wno-unused-but-set-variable") +elseif(USE_CLANG_CL) + add_target_compile_flags(glu32 "-Wno-self-assign -Wno-unused-function -Wno-microsoft-include") + add_target_compile_flags(glu32 "-Wno-deprecated-register -Wno-tautological-undefined-compare") endif() add_importlibs(glu32 opengl32 gdi32 msvcrt kernel32 ntdll) diff --git a/dll/opengl/mesa/main/CMakeLists.txt b/dll/opengl/mesa/main/CMakeLists.txt index a0c6a4c3d0..bb93340fb4 100644 --- a/dll/opengl/mesa/main/CMakeLists.txt +++ b/dll/opengl/mesa/main/CMakeLists.txt @@ -75,4 +75,7 @@ add_pch(mesa_main precomp.h SOURCE) if(NOT MSVC) add_target_compile_flags(mesa_main "-Wno-type-limits") +elseif(USE_CLANG_CL) + add_target_compile_flags(mesa_main "-Wno-cast-calling-convention -Wno-unused-local-typedef") + add_target_compile_flags(mesa_main "-Wno-tautological-unsigned-zero-compare -Wno-constant-conversion") endif() diff --git a/dll/opengl/mesa/swrast/CMakeLists.txt b/dll/opengl/mesa/swrast/CMakeLists.txt index 588c43df4c..32ae3fcd64 100644 --- a/dll/opengl/mesa/swrast/CMakeLists.txt +++ b/dll/opengl/mesa/swrast/CMakeLists.txt @@ -31,8 +31,11 @@ add_library(mesa_swrast STATIC ${SOURCE}) add_dependencies(mesa_swrast xdk) add_pch(mesa_swrast precomp.h SOURCE) -if(MSVC) +if(MSVC AND (NOT USE_CLANG_CL)) replace_compile_flags("/we4189" " ") else() add_target_compile_flags(mesa_swrast "-Wno-unused-variable") + if(USE_CLANG_CL) + add_target_compile_flags(mesa_swrast "-Wno-sometimes-uninitialized -Wno-unused-local-typedef") + endif() endif() diff --git a/drivers/bluetooth/fbtusb/CMakeLists.txt b/drivers/bluetooth/fbtusb/CMakeLists.txt index f3f9d190a5..b0e167a50e 100644 --- a/drivers/bluetooth/fbtusb/CMakeLists.txt +++ b/drivers/bluetooth/fbtusb/CMakeLists.txt @@ -12,7 +12,7 @@ list(APPEND SOURCE add_library(fbtusb SHARED ${SOURCE} fbtusb.rc) -if((NOT MSVC) AND (NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")) +if(NOT MSVC) add_target_compile_flags(fbtusb "-Wno-unused-but-set-variable") endif() diff --git a/drivers/filesystems/ext2/CMakeLists.txt b/drivers/filesystems/ext2/CMakeLists.txt index 66278740f2..6d0bdb7d01 100644 --- a/drivers/filesystems/ext2/CMakeLists.txt +++ b/drivers/filesystems/ext2/CMakeLists.txt @@ -92,13 +92,20 @@ if(USE_CLANG_CL) set_property(SOURCE src/create.c src/fileinfo.c src/memory.c src/read.c APPEND_STRING PROPERTY COMPILE_FLAGS " /fallback") endif() -if(NOT MSVC) - add_target_compile_flags(ext2fs "-Wno-pointer-sign -Wno-unused-function") - add_target_compile_flags(ext2fs "-Wno-unused-but-set-variable -Wno-unused-variable -Wno-missing-braces") -else() - #disable warnings: "unreferenced local variable", "initialized, but not used variable", "benign include" +if(MSVC AND (NOT USE_CLANG_CL)) + # Disable warnings: "unreferenced local variable", "initialized, but not used variable", "benign include" replace_compile_flags("/we\"4189\"" " ") add_target_compile_flags(ext2fs "/wd\"4189\" /wd\"4142\" /wd\"4101\"") +else() + add_target_compile_flags(ext2fs "-Wno-pointer-sign -Wno-unused-function") + add_target_compile_flags(ext2fs "-Wno-unused-variable -Wno-missing-braces") + if(USE_CLANG_CL) + add_target_compile_flags(ext2fs "-Wno-unused-value -Wno-parentheses-equality") + add_target_compile_flags(ext2fs "-Wno-incompatible-pointer-types-discards-qualifiers") + add_target_compile_flags(ext2fs "-Wno-#pragma-messages -Wno-cast-calling-convention") + else() + add_target_compile_flags(ext2fs "-Wno-unused-but-set-variable") + endif() endif() target_link_libraries(ext2fs memcmp ${PSEH_LIB}) diff --git a/drivers/filesystems/ffs/CMakeLists.txt b/drivers/filesystems/ffs/CMakeLists.txt index 1f353f078b..8138a15a5a 100644 --- a/drivers/filesystems/ffs/CMakeLists.txt +++ b/drivers/filesystems/ffs/CMakeLists.txt @@ -30,13 +30,14 @@ list(APPEND SOURCE add_library(ffs SHARED ${SOURCE} src/ffsdrv.rc) -if(NOT MSVC) +if(USE_CLANG_CL OR (NOT MSVC)) add_target_compile_flags(ffs "-Wno-pointer-sign -Wno-unused-function") - if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") - add_target_compile_flags(ffs "-Wno-unused-but-set-variable -Wno-unused-variable -Wno-missing-braces") + add_target_compile_flags(ffs "-Wno-unused-variable -Wno-missing-braces") + if(USE_CLANG_CL) + add_target_compile_flags(ffs "-Wno-empty-body") + else() + add_target_compile_flags(ffs "-Wno-unused-but-set-variable") endif() -#else() -# replace_compile_flags("/we\"4189\"" " ") endif() add_definitions(-D__KERNEL__) diff --git a/drivers/filesystems/nfs/CMakeLists.txt b/drivers/filesystems/nfs/CMakeLists.txt index 6bf139f9f0..88f7fd7139 100644 --- a/drivers/filesystems/nfs/CMakeLists.txt +++ b/drivers/filesystems/nfs/CMakeLists.txt @@ -14,8 +14,11 @@ set_module_type(nfs41_driver kernelmodedriver) target_link_libraries(nfs41_driver ntoskrnl_vista rdbsslib rxce copysup memcmp ${PSEH_LIB}) add_importlibs(nfs41_driver ntoskrnl hal) -if((NOT MSVC) AND (NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")) +if(USE_CLANG_CL OR (NOT MSVC)) add_target_compile_flags(nfs41_driver "-Wno-switch") + if(USE_CLANG_CL) + add_target_compile_flags(nfs41_driver "-Wno-unused-value") + endif() endif() add_cd_file(TARGET nfs41_driver DESTINATION reactos/system32/drivers FOR all) diff --git a/drivers/filesystems/reiserfs/CMakeLists.txt b/drivers/filesystems/reiserfs/CMakeLists.txt index 16dfc89e33..7990886489 100644 --- a/drivers/filesystems/reiserfs/CMakeLists.txt +++ b/drivers/filesystems/reiserfs/CMakeLists.txt @@ -78,10 +78,11 @@ list(APPEND SOURCE add_library(reiserfs SHARED ${SOURCE} src/rfsd.rc) -if(NOT MSVC) - add_target_compile_flags(reiserfs "-Wno-pointer-sign -Wno-unused-function") - if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") - add_target_compile_flags(reiserfs "-Wno-unused-but-set-variable -Wno-unused-variable -Wno-missing-braces -D__GCC__") +if(USE_CLANG_CL OR (NOT MSVC)) + add_target_compile_flags(reiserfs "-Wno-missing-braces -Wno-pointer-sign") + add_target_compile_flags(reiserfs "-Wno-unused-function -Wno-unused-variable") + if(NOT USE_CLANG_CL) + add_target_compile_flags(reiserfs "-Wno-unused-but-set-variable -D__GCC__") endif() else() #disable warnings: "unreferenced local variable", "initialized, but not used variable", "benign include" diff --git a/drivers/filesystems/udfs/CMakeLists.txt b/drivers/filesystems/udfs/CMakeLists.txt index f91090b0e8..8b5df85fcf 100644 --- a/drivers/filesystems/udfs/CMakeLists.txt +++ b/drivers/filesystems/udfs/CMakeLists.txt @@ -42,12 +42,20 @@ list(APPEND SOURCE udffs.h) add_library(udfs SHARED ${SOURCE} udffs.rc) + if(MSVC) # FIXME: Make sure we marked all what needs to be marked with stdcall before removing this. add_target_compile_flags(udfs "/Gz") + if(USE_CLANG_CL) + add_target_compile_flags(udfs "-Wno-extern-c-compat -Wno-unused-value") + add_target_compile_flags(udfs "-Wno-tautological-constant-out-of-range-compare") + add_target_compile_flags(udfs "-Wno-tautological-unsigned-zero-compare -Wno-self-assign") + add_target_compile_flags(udfs "-Wno-sometimes-uninitialized -Wno-parentheses-equality") + endif() else() add_target_compile_flags(udfs "-Wno-unused-but-set-variable") endif() + set_module_type(udfs kernelmodedriver) target_link_libraries(udfs ${PSEH_LIB}) add_importlibs(udfs ntoskrnl hal) diff --git a/drivers/storage/class/cdrom_new/CMakeLists.txt b/drivers/storage/class/cdrom_new/CMakeLists.txt index d4d0853280..35c5b14ca5 100644 --- a/drivers/storage/class/cdrom_new/CMakeLists.txt +++ b/drivers/storage/class/cdrom_new/CMakeLists.txt @@ -12,10 +12,11 @@ list(APPEND SOURCE add_library(cdrom_new SHARED ${SOURCE}) target_link_libraries(cdrom_new libcntpr wdmguid) -if((ARCH STREQUAL "i386") AND (NOT MSVC)) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #add_target_compile_flags(cdrom_new "-Wno-format -Wno-unused-variable -Wno-pointer-sign") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-format -Wno-unused-variable -Wno-pointer-sign") +if(USE_CLANG_CL OR (NOT MSVC)) + add_target_compile_flags(cdrom_new "-Wno-format -Wno-unused-variable -Wno-pointer-sign") + if(USE_CLANG_CL) + add_target_compile_flags(cdrom_new "-Wno-enum-conversion -Wno-tautological-constant-compare") + endif() endif() set_module_type(cdrom_new kernelmodedriver) diff --git a/drivers/storage/class/disk_new/CMakeLists.txt b/drivers/storage/class/disk_new/CMakeLists.txt index d2065f07b3..df08fa8208 100644 --- a/drivers/storage/class/disk_new/CMakeLists.txt +++ b/drivers/storage/class/disk_new/CMakeLists.txt @@ -14,10 +14,8 @@ list(APPEND SOURCE add_library(disk_new SHARED ${SOURCE} disk.rc) target_link_libraries(disk_new libcntpr wdmguid) -if((ARCH STREQUAL "i386") AND (NOT MSVC)) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #add_target_compile_flags(disk_new "-Wno-format -Wno-pointer-sign") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-format -Wno-pointer-sign") +if(USE_CLANG_CL OR (NOT MSVC)) + add_target_compile_flags(disk_new "-Wno-format -Wno-pointer-sign") endif() set_module_type(disk_new kernelmodedriver) diff --git a/drivers/storage/ide/uniata/CMakeLists.txt b/drivers/storage/ide/uniata/CMakeLists.txt index a9e9b10d29..c7ffa34f43 100644 --- a/drivers/storage/ide/uniata/CMakeLists.txt +++ b/drivers/storage/ide/uniata/CMakeLists.txt @@ -22,9 +22,11 @@ list(APPEND SOURCE add_library(uniata SHARED ${SOURCE} idedma.rc) -if(NOT MSVC) +if(USE_CLANG_CL OR (NOT MSVC)) add_target_compile_flags(uniata "-Wno-narrowing") - if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") + if(USE_CLANG_CL) + add_target_compile_flags(uniata "-Wno-unused-const-variable") + else() add_target_compile_flags(uniata "-Wno-unused-but-set-variable") endif() endif() diff --git a/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt b/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt index 0476aea4e7..6518ddb7ca 100644 --- a/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt +++ b/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt @@ -24,10 +24,8 @@ target_link_libraries(cmipci stdunk libcntpr uuid) set_module_type(cmipci wdmdriver UNICODE) add_importlibs(cmipci portcls hal ntoskrnl) -if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #add_target_compile_flags(cmipci "-Wno-write-strings -Wno-switch") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-write-strings -Wno-switch") +if(USE_CLANG_CL OR (NOT MSVC)) + add_target_compile_flags(cmipci "-Wno-write-strings -Wno-switch") endif() add_pch(cmipci precomp.h SOURCE) diff --git a/modules/rostests/winetests/advapi32/CMakeLists.txt b/modules/rostests/winetests/advapi32/CMakeLists.txt index 5005dd5adf..a148e08ddc 100644 --- a/modules/rostests/winetests/advapi32/CMakeLists.txt +++ b/modules/rostests/winetests/advapi32/CMakeLists.txt @@ -17,7 +17,7 @@ list(APPEND SOURCE add_executable(advapi32_winetest ${SOURCE}) -if(NOT MSVC) +if(USE_CLANG_CL OR (NOT MSVC)) add_target_compile_flags(advapi32_winetest "-Wno-format") endif() diff --git a/modules/rostests/winetests/comctl32/CMakeLists.txt b/modules/rostests/winetests/comctl32/CMakeLists.txt index 47d677d153..b1798c3018 100644 --- a/modules/rostests/winetests/comctl32/CMakeLists.txt +++ b/modules/rostests/winetests/comctl32/CMakeLists.txt @@ -33,12 +33,11 @@ list(APPEND SOURCE testlist.c) add_executable(comctl32_winetest ${SOURCE} rsrc.rc) + +if(USE_CLANG_CL OR (NOT MSVC)) + add_target_compile_flags(comctl32_winetest "-Wno-format") +endif() + set_module_type(comctl32_winetest win32cui) add_importlibs(comctl32_winetest comctl32 ole32 user32 gdi32 advapi32 msvcrt kernel32) add_rostests_file(TARGET comctl32_winetest) - -if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #add_target_compile_flags(comctl32_winetest "-Wno-format") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-format") -endif() diff --git a/modules/rostests/winetests/kernel32/CMakeLists.txt b/modules/rostests/winetests/kernel32/CMakeLists.txt index 90e4155ab9..af63b39d94 100644 --- a/modules/rostests/winetests/kernel32/CMakeLists.txt +++ b/modules/rostests/winetests/kernel32/CMakeLists.txt @@ -40,7 +40,7 @@ list(APPEND SOURCE add_executable(kernel32_winetest ${SOURCE} resource.rc) -if(NOT MSVC) +if(USE_CLANG_CL OR (NOT MSVC)) add_target_compile_flags(kernel32_winetest "-Wno-format") endif() diff --git a/modules/rostests/winetests/msvcrt/CMakeLists.txt b/modules/rostests/winetests/msvcrt/CMakeLists.txt index ecd725d42f..5aba4c2f7f 100644 --- a/modules/rostests/winetests/msvcrt/CMakeLists.txt +++ b/modules/rostests/winetests/msvcrt/CMakeLists.txt @@ -22,14 +22,17 @@ list(APPEND SOURCE time.c) add_executable(msvcrt_winetest ${SOURCE}) + +if(USE_CLANG_CL OR (NOT MSVC)) + add_target_compile_flags(msvcrt_winetest "-Wno-format") +endif() + set_module_type(msvcrt_winetest win32cui) add_importlibs(msvcrt_winetest msvcrt kernel32) if(MSVC) target_link_libraries(msvcrt_winetest oldnames) add_importlibs(msvcrt_winetest ntdll) -else() - add_target_compile_flags(msvcrt_winetest "-Wno-format") endif() add_rostests_file(TARGET msvcrt_winetest) diff --git a/modules/rostests/winetests/ntdll/CMakeLists.txt b/modules/rostests/winetests/ntdll/CMakeLists.txt index f1055f85db..0bbc8d33a1 100644 --- a/modules/rostests/winetests/ntdll/CMakeLists.txt +++ b/modules/rostests/winetests/ntdll/CMakeLists.txt @@ -33,10 +33,11 @@ if(ARCH STREQUAL "i386") endif() add_executable(ntdll_winetest ${SOURCE}) -set_module_type(ntdll_winetest win32cui) -add_importlibs(ntdll_winetest user32 ole32 advapi32 msvcrt kernel32 ntdll) -add_rostests_file(TARGET ntdll_winetest) -if(NOT MSVC) +if(USE_CLANG_CL OR (NOT MSVC)) add_target_compile_flags(ntdll_winetest "-Wno-format") endif() + +set_module_type(ntdll_winetest win32cui) +add_importlibs(ntdll_winetest user32 ole32 advapi32 msvcrt kernel32 ntdll) +add_rostests_file(TARGET ntdll_winetest) diff --git a/modules/rostests/winetests/rpcrt4/CMakeLists.txt b/modules/rostests/winetests/rpcrt4/CMakeLists.txt index eac31545f4..ea8c329a3d 100644 --- a/modules/rostests/winetests/rpcrt4/CMakeLists.txt +++ b/modules/rostests/winetests/rpcrt4/CMakeLists.txt @@ -28,11 +28,15 @@ if(MSVC) endif() add_executable(rpcrt4_winetest ${SOURCE}) + +if(USE_CLANG_CL OR (NOT MSVC)) + add_target_compile_flags(rpcrt4_winetest "-Wno-format") + if(USE_CLANG_CL) + add_target_compile_flags(rpcrt4_winetest "-Wno-cast-calling-convention") + endif() +endif() + target_link_libraries(rpcrt4_winetest uuid wine ${PSEH_LIB}) set_module_type(rpcrt4_winetest win32cui) add_importlibs(rpcrt4_winetest oleaut32 ole32 rpcrt4 secur32 advapi32 msvcrt kernel32 ntdll) add_rostests_file(TARGET rpcrt4_winetest) - -if(NOT MSVC) - add_target_compile_flags(rpcrt4_winetest "-Wno-format") -endif() diff --git a/modules/rostests/winetests/winmm/CMakeLists.txt b/modules/rostests/winetests/winmm/CMakeLists.txt index 21656afc6d..6412b65df1 100644 --- a/modules/rostests/winetests/winmm/CMakeLists.txt +++ b/modules/rostests/winetests/winmm/CMakeLists.txt @@ -12,14 +12,12 @@ list(APPEND SOURCE wave.c) add_executable(winmm_winetest ${SOURCE}) + +if(USE_CLANG_CL OR (NOT MSVC)) + add_target_compile_flags(winmm_winetest "-Wno-format") +endif() + target_link_libraries(winmm_winetest dxguid) set_module_type(winmm_winetest win32cui) add_importlibs(winmm_winetest winmm user32 advapi32 ole32 msvcrt kernel32) add_rostests_file(TARGET winmm_winetest) - -if(NOT MSVC) - add_target_compile_flags(winmm_winetest "-Wno-format") - if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") - add_target_compile_flags(winmm_winetest "-Wno-unused-but-set-variable") - endif() -endif() diff --git a/modules/rostests/winetests/ws2_32/CMakeLists.txt b/modules/rostests/winetests/ws2_32/CMakeLists.txt index 2428444907..8e0946d609 100644 --- a/modules/rostests/winetests/ws2_32/CMakeLists.txt +++ b/modules/rostests/winetests/ws2_32/CMakeLists.txt @@ -2,10 +2,11 @@ include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) add_executable(ws2_32_winetest protocol.c sock.c testlist.c) -set_module_type(ws2_32_winetest win32cui) -add_importlibs(ws2_32_winetest ws2_32 user32 msvcrt kernel32) -add_rostests_file(TARGET ws2_32_winetest) -if(NOT MSVC) +if(USE_CLANG_CL OR (NOT MSVC)) add_target_compile_flags(ws2_32_winetest "-Wno-format") endif() + +set_module_type(ws2_32_winetest win32cui) +add_importlibs(ws2_32_winetest ws2_32 user32 msvcrt kernel32) +add_rostests_file(TARGET ws2_32_winetest) diff --git a/sdk/lib/3rdparty/adns/CMakeLists.txt b/sdk/lib/3rdparty/adns/CMakeLists.txt index b8187d8fd1..058cf73f62 100644 --- a/sdk/lib/3rdparty/adns/CMakeLists.txt +++ b/sdk/lib/3rdparty/adns/CMakeLists.txt @@ -22,9 +22,10 @@ list(APPEND SOURCE src/internal.h) add_library(adns ${SOURCE}) -add_dependencies(adns psdk) -add_pch(adns src/internal.h SOURCE) -if((NOT MSVC) AND (NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")) +if(NOT MSVC) add_target_compile_flags(adns "-Wno-unused-but-set-variable") endif() + +add_dependencies(adns psdk) +add_pch(adns src/internal.h SOURCE) diff --git a/sdk/lib/3rdparty/cardlib/CMakeLists.txt b/sdk/lib/3rdparty/cardlib/CMakeLists.txt index d624197436..224d8d396c 100644 --- a/sdk/lib/3rdparty/cardlib/CMakeLists.txt +++ b/sdk/lib/3rdparty/cardlib/CMakeLists.txt @@ -16,9 +16,10 @@ list(APPEND SOURCE cardlib.h) add_library(cardlib ${SOURCE}) -add_dependencies(cardlib psdk) -add_pch(cardlib cardlib.h SOURCE) -if((NOT MSVC) AND (NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")) +if(NOT MSVC) add_target_compile_flags(cardlib "-Wno-unused-but-set-variable") endif() + +add_dependencies(cardlib psdk) +add_pch(cardlib cardlib.h SOURCE) diff --git a/sdk/lib/3rdparty/libxml2/CMakeLists.txt b/sdk/lib/3rdparty/libxml2/CMakeLists.txt index 5eb0dc7da7..033afe6d1a 100644 --- a/sdk/lib/3rdparty/libxml2/CMakeLists.txt +++ b/sdk/lib/3rdparty/libxml2/CMakeLists.txt @@ -63,11 +63,8 @@ list(APPEND SOURCE libxml.h) add_library(libxml2 ${SOURCE}) -target_link_libraries(libxml2 oldnames) -add_pch(libxml2 libxml.h SOURCE) -add_dependencies(libxml2 psdk) -if(MSVC) +if(MSVC AND (NOT USE_CLANG_CL)) # Formal parameter different from declaration add_target_compile_flags(libxml2 "/wd4101") # Local variable initialized but not referenced @@ -75,3 +72,7 @@ if(MSVC) else() add_target_compile_flags(libxml2 "-w") endif() + +target_link_libraries(libxml2 oldnames) +add_pch(libxml2 libxml.h SOURCE) +add_dependencies(libxml2 psdk)

1 0

[reactos] 01/01: [NTDLL_APITEST] Allow the test to load on Windows XP. ROSTESTS-293
by Serge Gautherie 07 Dec '17

07 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6fe9441d32f532c39446b… commit 6fe9441d32f532c39446b6ca7a2c9e11849676e0 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Nov 30 01:44:40 2017 +0100 [NTDLL_APITEST] Allow the test to load on Windows XP. ROSTESTS-293 --- .../apitests/ntdll/NtApphelpCacheControl.c | 33 ++++++++++++++-------- modules/rostests/apitests/ntdll/NtLoadUnloadKey.c | 11 ++++++-- .../rostests/apitests/ntdll/RtlCopyMappedMemory.c | 24 +++++++++++----- 3 files changed, 47 insertions(+), 21 deletions(-) diff --git a/modules/rostests/apitests/ntdll/NtApphelpCacheControl.c b/modules/rostests/apitests/ntdll/NtApphelpCacheControl.c index ea9cb2920c..d0ffde0880 100644 --- a/modules/rostests/apitests/ntdll/NtApphelpCacheControl.c +++ b/modules/rostests/apitests/ntdll/NtApphelpCacheControl.c @@ -15,6 +15,7 @@ enum ServiceCommands RegisterShimCacheWithoutHandle = 129, }; +static NTSTATUS (NTAPI *pNtApphelpCacheControl)(APPHELPCACHESERVICECLASS, PAPPHELP_CACHE_SERVICE_LOOKUP); NTSTATUS CallCacheControl(UNICODE_STRING* PathName, BOOLEAN WithMapping, APPHELPCACHESERVICECLASS Service) { @@ -38,7 +39,7 @@ NTSTATUS CallCacheControl(UNICODE_STRING* PathName, BOOLEAN WithMapping, APPHELP { CacheEntry.ImageHandle = INVALID_HANDLE_VALUE; } - Status = NtApphelpCacheControl(Service, &CacheEntry); + Status = pNtApphelpCacheControl(Service, &CacheEntry); if (CacheEntry.ImageHandle != INVALID_HANDLE_VALUE) NtClose(CacheEntry.ImageHandle); return Status; @@ -64,31 +65,31 @@ void CheckValidation(UNICODE_STRING* PathName) NTSTATUS Status; /* Validate the handling of a NULL pointer */ - Status = NtApphelpCacheControl(ApphelpCacheServiceRemove, NULL); + Status = pNtApphelpCacheControl(ApphelpCacheServiceRemove, NULL); ok_ntstatus(Status, STATUS_INVALID_PARAMETER); - Status = NtApphelpCacheControl(ApphelpCacheServiceLookup, NULL); + Status = pNtApphelpCacheControl(ApphelpCacheServiceLookup, NULL); ok_ntstatus(Status, STATUS_INVALID_PARAMETER); /* Validate the handling of a NULL pointer inside the struct */ - Status = NtApphelpCacheControl(ApphelpCacheServiceRemove, &CacheEntry); + Status = pNtApphelpCacheControl(ApphelpCacheServiceRemove, &CacheEntry); ok_ntstatus(Status, STATUS_INVALID_PARAMETER); - Status = NtApphelpCacheControl(ApphelpCacheServiceLookup, &CacheEntry); + Status = pNtApphelpCacheControl(ApphelpCacheServiceLookup, &CacheEntry); ok_ntstatus(Status, STATUS_INVALID_PARAMETER); /* Just call the dump function */ - Status = NtApphelpCacheControl(ApphelpCacheServiceDump, NULL); + Status = pNtApphelpCacheControl(ApphelpCacheServiceDump, NULL); ok_ntstatus(Status, STATUS_SUCCESS); /* Validate the handling of an invalid handle inside the struct */ CacheEntry.ImageName = *PathName; CacheEntry.ImageHandle = (HANDLE)2; - Status = NtApphelpCacheControl(ApphelpCacheServiceLookup, &CacheEntry); + Status = pNtApphelpCacheControl(ApphelpCacheServiceLookup, &CacheEntry); ok_ntstatus(Status, STATUS_NOT_FOUND); /* Validate the handling of an invalid service number */ - Status = NtApphelpCacheControl(999, NULL); + Status = pNtApphelpCacheControl(999, NULL); ok_ntstatus(Status, STATUS_INVALID_PARAMETER); - Status = NtApphelpCacheControl(999, &CacheEntry); + Status = pNtApphelpCacheControl(999, &CacheEntry); ok_ntstatus(Status, STATUS_INVALID_PARAMETER); } @@ -154,7 +155,7 @@ static void RunApphelpCacheControlTests(SC_HANDLE service_handle) let's test invalid handle behavior */ CacheEntry.ImageName = ntPath; CacheEntry.ImageHandle = 0; - Status = NtApphelpCacheControl(ApphelpCacheServiceLookup, &CacheEntry); + Status = pNtApphelpCacheControl(ApphelpCacheServiceLookup, &CacheEntry); ok_ntstatus(Status, STATUS_NOT_FOUND); /* re-add it for the next test */ @@ -162,7 +163,7 @@ static void RunApphelpCacheControlTests(SC_HANDLE service_handle) Status = CallCacheControl(&ntPath, TRUE, ApphelpCacheServiceLookup); ok_ntstatus(Status, STATUS_SUCCESS); CacheEntry.ImageHandle = (HANDLE)1; - Status = NtApphelpCacheControl(ApphelpCacheServiceLookup, &CacheEntry); + Status = pNtApphelpCacheControl(ApphelpCacheServiceLookup, &CacheEntry); ok_ntstatus(Status, STATUS_NOT_FOUND); /* and again */ @@ -170,7 +171,7 @@ static void RunApphelpCacheControlTests(SC_HANDLE service_handle) Status = CallCacheControl(&ntPath, TRUE, ApphelpCacheServiceLookup); ok_ntstatus(Status, STATUS_SUCCESS); CacheEntry.ImageHandle = (HANDLE)0x80000000; - Status = NtApphelpCacheControl(ApphelpCacheServiceLookup, &CacheEntry); + Status = pNtApphelpCacheControl(ApphelpCacheServiceLookup, &CacheEntry); ok_ntstatus(Status, STATUS_NOT_FOUND); RtlFreeHeap(RtlGetProcessHeap(), 0, ntPath.Buffer); @@ -343,6 +344,14 @@ START_TEST(NtApphelpCacheControl) win_skip("RegisterServiceCtrlHandlerExA not available, skipping tests\n"); return; } + + pNtApphelpCacheControl = (void*)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtApphelpCacheControl"); + if (!pNtApphelpCacheControl) + { + win_skip("NtApphelpCacheControl not available, skipping tests\n"); + return; + } + argc = winetest_get_mainargs(&argv); if(argc < 3) { diff --git a/modules/rostests/apitests/ntdll/NtLoadUnloadKey.c b/modules/rostests/apitests/ntdll/NtLoadUnloadKey.c index bc4f4b967a..f9bb9c2937 100644 --- a/modules/rostests/apitests/ntdll/NtLoadUnloadKey.c +++ b/modules/rostests/apitests/ntdll/NtLoadUnloadKey.c @@ -25,6 +25,7 @@ #endif +static NTSTATUS (NTAPI *pNtUnloadKey2)(POBJECT_ATTRIBUTES, ULONG); static BOOLEAN RetrieveCurrentModuleNTDirectory( @@ -381,8 +382,12 @@ DisconnectRegistry( OBJ_CASE_INSENSITIVE, RootKey, NULL); - // return NtUnloadKey(&ObjectAttributes); - return NtUnloadKey2(&ObjectAttributes, Flags); + if (!pNtUnloadKey2) + { + win_skip("NtUnloadKey2 unavailable, using NtUnloadKey. Flags %lu\n", Flags); + return NtUnloadKey(&ObjectAttributes); + } + return pNtUnloadKey2(&ObjectAttributes, Flags); } @@ -409,6 +414,8 @@ START_TEST(NtLoadUnloadKey) BOOLEAN PrivilegeSet[2] = {FALSE, FALSE}; WCHAR PathBuffer[MAX_PATH]; + pNtUnloadKey2 = (PVOID)GetProcAddress(GetModuleHandleW(L"ntdll.dll"), "NtUnloadKey2"); + /* Retrieve our current directory */ RetrieveCurrentModuleNTDirectory(&NtTestPath); diff --git a/modules/rostests/apitests/ntdll/RtlCopyMappedMemory.c b/modules/rostests/apitests/ntdll/RtlCopyMappedMemory.c index d6c3149096..b7150dfc5c 100644 --- a/modules/rostests/apitests/ntdll/RtlCopyMappedMemory.c +++ b/modules/rostests/apitests/ntdll/RtlCopyMappedMemory.c @@ -7,25 +7,35 @@ #include "precomp.h" +static NTSTATUS (NTAPI *pRtlCopyMappedMemory)(PVOID, const VOID *, SIZE_T); + START_TEST(RtlCopyMappedMemory) { NTSTATUS Status; UCHAR Buffer1[32]; UCHAR Buffer2[32]; - - StartSeh() RtlCopyMappedMemory(NULL, NULL, 1); EndSeh(STATUS_ACCESS_VIOLATION); - StartSeh() RtlCopyMappedMemory(Buffer1, NULL, 1); EndSeh(STATUS_ACCESS_VIOLATION); - StartSeh() RtlCopyMappedMemory(NULL, Buffer1, 1); EndSeh(STATUS_ACCESS_VIOLATION); - + + pRtlCopyMappedMemory = (PVOID)GetProcAddress(GetModuleHandleW(L"ntdll.dll"), + "RtlCopyMappedMemory"); + if (!pRtlCopyMappedMemory) + { + win_skip("RtlCopyMappedMemory (NT >= 5.2 API) not available\n"); + return; + } + + StartSeh() pRtlCopyMappedMemory(NULL, NULL, 1); EndSeh(STATUS_ACCESS_VIOLATION); + StartSeh() pRtlCopyMappedMemory(Buffer1, NULL, 1); EndSeh(STATUS_ACCESS_VIOLATION); + StartSeh() pRtlCopyMappedMemory(NULL, Buffer1, 1); EndSeh(STATUS_ACCESS_VIOLATION); + StartSeh() - Status = RtlCopyMappedMemory(NULL, NULL, 0); + Status = pRtlCopyMappedMemory(NULL, NULL, 0); EndSeh(STATUS_SUCCESS); ok(Status == STATUS_SUCCESS, "RtlCopyMappedMemory returned %lx\n", Status); RtlFillMemory(Buffer1, sizeof(Buffer1), 0x11); RtlFillMemory(Buffer2, sizeof(Buffer2), 0x22); StartSeh() - Status = RtlCopyMappedMemory(Buffer1, Buffer2, sizeof(Buffer1)); + Status = pRtlCopyMappedMemory(Buffer1, Buffer2, sizeof(Buffer1)); EndSeh(STATUS_SUCCESS); ok(Status == STATUS_SUCCESS, "RtlCopyMappedMemory returned %lx\n", Status); ok(RtlCompareMemory(Buffer1, Buffer2, sizeof(Buffer1)) == sizeof(Buffer1), "Data not copied\n");

1 0

[reactos] 01/01: [SERVMAN] Fix return check on PropSheet_IsDialogMessage.
by Ged Murphy 06 Dec '17

06 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d73a72c21d9e6ae57ce30… commit d73a72c21d9e6ae57ce30c44d2dbe5ee5952466c Author: Ged Murphy <gedmurphy(a)reactos.org> AuthorDate: Wed Dec 6 22:08:46 2017 +0000 [SERVMAN] Fix return check on PropSheet_IsDialogMessage. Should fix the regression introduced in the last commit. CORE-14068 --- base/applications/mscutils/servman/propsheet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/mscutils/servman/propsheet.c b/base/applications/mscutils/servman/propsheet.c index bd0ec24510..f606a50230 100644 --- a/base/applications/mscutils/servman/propsheet.c +++ b/base/applications/mscutils/servman/propsheet.c @@ -83,14 +83,14 @@ unsigned int __stdcall PropSheetThread(void* Param) /* Pump the message queue */ while (GetMessageW(&Msg, NULL, 0, 0)) { - if (PropSheet_GetCurrentPageHwnd(hDlg) == NULL) + if (!PropSheet_GetCurrentPageHwnd(hDlg)) { /* The user hit the ok / cancel button, pull it down */ EnableWindow(pServicePropSheet->Info->hMainWnd, TRUE); DestroyWindow(hDlg); } - if (PropSheet_IsDialogMessage(hDlg, &Msg) != 0) + if (!PropSheet_IsDialogMessage(hDlg, &Msg)) { TranslateMessage(&Msg); DispatchMessageW(&Msg);

1 0

[reactos] 01/01: Update Simplified Chinese translation.
by Luo Yufan 06 Dec '17

06 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=069546f5a49889e59ea10… commit 069546f5a49889e59ea10c1d483b0970d01e8778 Author: Luo Yufan <njlyf2011(a)hotmail.com> AuthorDate: Wed Dec 6 15:35:27 2017 +0100 Update Simplified Chinese translation. --- base/shell/explorer/lang/zh-CN.rc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/base/shell/explorer/lang/zh-CN.rc b/base/shell/explorer/lang/zh-CN.rc index 81e63b2eb9..1d68d920b1 100644 --- a/base/shell/explorer/lang/zh-CN.rc +++ b/base/shell/explorer/lang/zh-CN.rc @@ -4,6 +4,7 @@ * FILE: base/shell/explorer/lang/zh-CN.rc * PURPOSE: Simplified Chinese Language File for ReactOS Explorer-New * TRANSLATOR: Song Fuchang <sfc_0(a)yahoo.com.cn> + Luo Yufan <njlyf2011(a)hotmail.com> */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED @@ -65,7 +66,7 @@ BEGIN MENUITEM "同步(&Y)", IDM_SYNCHRONIZE, MFT_STRING, MFS_ENABLED MENUITEM "注销 %s(&L)...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED MENUITEM "断开连接(&I)...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED - MENUITEM "脱离计算机(&E)", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED + MENUITEM "解除锁定(&E)", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED MENUITEM "关机(&U)...", IDM_SHUTDOWN, MFT_STRING, MFS_ENABLED END END @@ -79,7 +80,7 @@ BEGIN CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "锁定任务栏(&L)", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "自动隐藏任务栏(&U)", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 - AUTOCHECKBOX "保持任务栏在其他窗口之上(&T)", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 + AUTOCHECKBOX "使任务栏显示在最上方(&T)", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "分组相似按钮(&G)", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "显示快速启动(&Q)", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 GROUPBOX "通知区域", IDC_STATIC, 6, 114, 240, 98 @@ -181,7 +182,7 @@ FONT 8, "MS Shell Dlg" AUTORADIOBUTTON "大图标(&L)", IDC_CHOOSELARGE, 43, 25, 53, 10 AUTORADIOBUTTON "小图标(&S)", IDC_CHOOSESMALL, 177, 25, 51, 10, NOT WS_TABSTOP GROUPBOX "程序 ", IDC_STATIC, 7, 49, 238, 70 - LTEXT "开始菜单包含您最常使用的程序的快捷方式。清除快捷方式的列表并不会删除程序。", IDC_STATIC, 14, 63, 224, 20 + LTEXT "开始菜单包含您最常使用的程序的快捷方式。清除快捷方式列表并不会删除程序。", IDC_STATIC, 14, 63, 224, 20 LTEXT "开始菜单上的程序的数目:(&N)", IDC_STATIC, 14, 86, 112, 8 EDITTEXT IDC_NUMBEROFPROGRAMS, 133, 84, 27, 12, ES_LEFT | ES_RIGHT | ES_NUMBER CONTROL "", IDC_NUMBERUPDOWN, "msctls_updown32", WS_BORDER | 0x000000B6, 160, 84, 11, 12 @@ -199,7 +200,7 @@ BEGIN IDS_PROPERTIES "属性(&R)" IDS_OPEN_ALL_USERS "打开所有用户(&P)" IDS_EXPLORE_ALL_USERS "浏览所有用户(&X)" - IDS_STARTUP_ERROR "因为注册表损坏或不可用，系统无法启动文件浏览器。" + IDS_STARTUP_ERROR "因为注册表损坏或不可用，系统无法启动资源管理器。" END STRINGTABLE

1 0

[reactos] 01/01: [README] Update to 0.4.7
by Alexander Shaposhnikov 06 Dec '17

06 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ad4791796d95e79b6f69… commit 3ad4791796d95e79b6f69db15c4124870dbae55a Author: Alexander Shaposhnikov <sanchaez(a)reactos.org> AuthorDate: Wed Dec 6 11:23:49 2017 +0200 [README] Update to 0.4.7 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a2b53dc6e7..bd4f225563 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@ --- <p align=center> - <a href="https://reactos.org/project-news/reactos-046-released"> - <img alt="Release 0.4.6 Release" src="https://img.shields.io/badge/release-0.4.6-0688CB.svg"> + <a href="https://reactos.org/project-news/reactos-047-released"> + <img alt="Release 0.4.7 Release" src="https://img.shields.io/badge/release-0.4.7-0688CB.svg"> </a> <a href="https://reactos.org/download"> <img alt="Download ReactOS" src="https://img.shields.io/badge/download-latest-0688CB.svg">

1 0

[reactos] 01/01: [NTOSKRNL] Only activate dumper in DBG builds
by Pierre Schweitzer 05 Dec '17

05 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c473b1a4d65e588eaba62… commit c473b1a4d65e588eaba62aa4b942aeb04f13703b Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Dec 5 23:28:04 2017 +0100 [NTOSKRNL] Only activate dumper in DBG builds --- ntoskrnl/mm/ARM3/expool.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/mm/ARM3/expool.c b/ntoskrnl/mm/ARM3/expool.c index 2b7effdea3..13a75be7c5 100644 --- a/ntoskrnl/mm/ARM3/expool.c +++ b/ntoskrnl/mm/ARM3/expool.c @@ -460,6 +460,7 @@ ExpComputePartialHashForAddress(IN PVOID BaseAddress) return (Result >> 24) ^ (Result >> 16) ^ (Result >> 8) ^ Result; } +#if DBG FORCEINLINE BOOLEAN ExpTagAllowPrint(CHAR Tag) @@ -477,7 +478,7 @@ ExpTagAllowPrint(CHAR Tag) VOID MiDumpNonPagedPoolConsumers(VOID) { - USHORT i; + SIZE_T i; DPRINT1("---------------------\n"); DPRINT1("Out of memory dumper!\n"); @@ -532,6 +533,7 @@ MiDumpNonPagedPoolConsumers(VOID) DPRINT1("---------------------\n"); } +#endif /* PRIVATE FUNCTIONS **********************************************************/ @@ -1714,6 +1716,7 @@ ExAllocatePoolWithTag(IN POOL_TYPE PoolType, Entry = MiAllocatePoolPages(OriginalType, NumberOfBytes); if (!Entry) { +#if DBG // // If non paged backed, display current consumption // @@ -1721,6 +1724,7 @@ ExAllocatePoolWithTag(IN POOL_TYPE PoolType, { MiDumpNonPagedPoolConsumers(); } +#endif // // Must succeed pool is deprecated, but still supported. These allocation @@ -2048,6 +2052,7 @@ ExAllocatePoolWithTag(IN POOL_TYPE PoolType, Entry = MiAllocatePoolPages(OriginalType, PAGE_SIZE); if (!Entry) { +#if DBG // // If non paged backed, display current consumption // @@ -2055,6 +2060,7 @@ ExAllocatePoolWithTag(IN POOL_TYPE PoolType, { MiDumpNonPagedPoolConsumers(); } +#endif // // Must succeed pool is deprecated, but still supported. These allocation

1 0

[reactos] 01/01: [NTOSKRNL] Add a non paged memory dumper in case of low memory situation. Its purpose is to dump the non paged consumption, tag by tag, to allow tracking potential faulting driver in case ReactOS starts lacking memory. This will look like what !poolused outputs, even though it doesn't deal with paged pool.
by Pierre Schweitzer 05 Dec '17

05 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=149e1a261013c5c3b24ab… commit 149e1a261013c5c3b24ab1c5ee82517646c3740f Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Dec 5 23:19:11 2017 +0100 [NTOSKRNL] Add a non paged memory dumper in case of low memory situation. Its purpose is to dump the non paged consumption, tag by tag, to allow tracking potential faulting driver in case ReactOS starts lacking memory. This will look like what !poolused outputs, even though it doesn't deal with paged pool. Thanks to Thomas for his kind review and improvement suggestions. CORE-14048 --- ntoskrnl/mm/ARM3/expool.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/ntoskrnl/mm/ARM3/expool.c b/ntoskrnl/mm/ARM3/expool.c index 73a229d431..2b7effdea3 100644 --- a/ntoskrnl/mm/ARM3/expool.c +++ b/ntoskrnl/mm/ARM3/expool.c @@ -460,6 +460,79 @@ ExpComputePartialHashForAddress(IN PVOID BaseAddress) return (Result >> 24) ^ (Result >> 16) ^ (Result >> 8) ^ Result; } +FORCEINLINE +BOOLEAN +ExpTagAllowPrint(CHAR Tag) +{ + if ((Tag >= 'a' && Tag <= 'z') || + (Tag >= 'A' && Tag <= 'Z') || + Tag == ' ') + { + return TRUE; + } + + return FALSE; +} + +VOID +MiDumpNonPagedPoolConsumers(VOID) +{ + USHORT i; + + DPRINT1("---------------------\n"); + DPRINT1("Out of memory dumper!\n"); + + // + // We'll extract allocations for all the tracked pools + // + for (i = 0; i < PoolTrackTableSize; ++i) + { + PPOOL_TRACKER_TABLE TableEntry; + + TableEntry = &PoolTrackTable[i]; + + // + // We only care about non paged + // + if (TableEntry->NonPagedBytes != 0) + { + // + // If there's a tag, attempt to do a pretty print + // + if (TableEntry->Key != 0 && TableEntry->Key != TAG_NONE) + { + CHAR Tag[4]; + + // + // Extract each 'component' and check whether they are printable + // + Tag[0] = TableEntry->Key & 0xFF; + Tag[1] = TableEntry->Key >> 8 & 0xFF; + Tag[2] = TableEntry->Key >> 16 & 0xFF; + Tag[3] = TableEntry->Key >> 24 & 0xFF; + + if (ExpTagAllowPrint(Tag[0]) && ExpTagAllowPrint(Tag[1]) && ExpTagAllowPrint(Tag[2]) && ExpTagAllowPrint(Tag[3])) + { + // + // Print in reversed order to match what is in source code + // + DPRINT1("Tag: '%c%c%c%c', Size: %ld\n", Tag[3], Tag[2], Tag[1], Tag[0], TableEntry->NonPagedBytes); + } + else + { + DPRINT1("Tag: %x, Size: %ld\n", TableEntry->Key, TableEntry->NonPagedBytes); + } + } + else + { + DPRINT1("Anon, Size: %ld\n", TableEntry->NonPagedBytes); + } + } + } + + DPRINT1("---------------------\n"); +} + /* PRIVATE FUNCTIONS **********************************************************/ VOID @@ -1641,6 +1714,14 @@ ExAllocatePoolWithTag(IN POOL_TYPE PoolType, Entry = MiAllocatePoolPages(OriginalType, NumberOfBytes); if (!Entry) { + // + // If non paged backed, display current consumption + // + if ((OriginalType & BASE_POOL_TYPE_MASK) == NonPagedPool) + { + MiDumpNonPagedPoolConsumers(); + } + // // Must succeed pool is deprecated, but still supported. These allocation // failures must cause an immediate bugcheck @@ -1967,6 +2048,14 @@ ExAllocatePoolWithTag(IN POOL_TYPE PoolType, Entry = MiAllocatePoolPages(OriginalType, PAGE_SIZE); if (!Entry) { + // + // If non paged backed, display current consumption + // + if ((OriginalType & BASE_POOL_TYPE_MASK) == NonPagedPool) + { + MiDumpNonPagedPoolConsumers(); + } + // // Must succeed pool is deprecated, but still supported. These allocation // failures must cause an immediate bugcheck

1 0

[reactos] 01/01: [SERVMAN]
by Ged Murphy 05 Dec '17

05 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e36b89addba874fc9aa89… commit e36b89addba874fc9aa898a42e894ef37465cd30 Author: Ged Murphy <gedmurphy(a)reactos.org> AuthorDate: Tue Dec 5 22:13:02 2017 +0000 [SERVMAN] - Avoid a potential race whereby the current service selection can change before the propsheet thread starts up - Cleanup the depends data, it doesn't need to be passed around the propsheet --- .../mscutils/servman/dependencies_tv1.c | 29 ++++----- .../mscutils/servman/dependencies_tv2.c | 24 +++---- base/applications/mscutils/servman/precomp.h | 17 +++-- base/applications/mscutils/servman/propsheet.c | 75 +++++++++++----------- .../mscutils/servman/propsheet_depends.c | 54 ++++++++-------- .../mscutils/servman/propsheet_recovery.c | 3 +- 6 files changed, 107 insertions(+), 95 deletions(-) diff --git a/base/applications/mscutils/servman/dependencies_tv1.c b/base/applications/mscutils/servman/dependencies_tv1.c index 5e764e51db..27d376ea54 100644 --- a/base/applications/mscutils/servman/dependencies_tv1.c +++ b/base/applications/mscutils/servman/dependencies_tv1.c @@ -10,8 +10,7 @@ #include "precomp.h" LPWSTR -TV1_GetDependants(PSERVICEPROPSHEET pDlgInfo, - SC_HANDLE hService) +TV1_GetDependants(SC_HANDLE hService) { LPQUERY_SERVICE_CONFIG lpServiceConfig; LPWSTR lpStr = NULL; @@ -80,7 +79,7 @@ TV1_GetDependants(PSERVICEPROPSHEET pDlgInfo, } VOID -TV1_AddDependantsToTree(PSERVICEPROPSHEET pDlgInfo, +TV1_AddDependantsToTree(PDEPENDDATA pDependData, HTREEITEM hParent, LPWSTR lpServiceName) { @@ -103,7 +102,7 @@ TV1_AddDependantsToTree(PSERVICEPROPSHEET pDlgInfo, if (hService) { /* Get a list of service dependents */ - lpDependants = TV1_GetDependants(pDlgInfo, hService); + lpDependants = TV1_GetDependants(hService); if (lpDependants) { lpStr = lpDependants; @@ -127,7 +126,7 @@ TV1_AddDependantsToTree(PSERVICEPROPSHEET pDlgInfo, } /* Add it */ - AddItemToTreeView(pDlgInfo->hDependsTreeView1, + AddItemToTreeView(pDependData->hDependsTreeView1, hParent, lpServiceConfig->lpDisplayName, lpStr, @@ -156,7 +155,7 @@ TV1_AddDependantsToTree(PSERVICEPROPSHEET pDlgInfo, /* Load the 'No dependencies' string */ AllocAndLoadString(&lpNoDepends, hInstance, IDS_NO_DEPENDS); - AddItemToTreeView(pDlgInfo->hDependsTreeView1, + AddItemToTreeView(pDependData->hDependsTreeView1, NULL, lpNoDepends, NULL, @@ -166,7 +165,7 @@ TV1_AddDependantsToTree(PSERVICEPROPSHEET pDlgInfo, LocalFree(lpNoDepends); /* Disable the window */ - EnableWindow(pDlgInfo->hDependsTreeView1, FALSE); + EnableWindow(pDependData->hDependsTreeView1, FALSE); } } @@ -178,25 +177,25 @@ TV1_AddDependantsToTree(PSERVICEPROPSHEET pDlgInfo, } BOOL -TV1_Initialize(PSERVICEPROPSHEET pDlgInfo, +TV1_Initialize(PDEPENDDATA pDependData, LPWSTR lpServiceName) { BOOL bRet = FALSE; /* Associate the imagelist with TV1 */ - pDlgInfo->hDependsTreeView1 = GetDlgItem(pDlgInfo->hDependsWnd, IDC_DEPEND_TREE1); - if (!pDlgInfo->hDependsTreeView1) + pDependData->hDependsTreeView1 = GetDlgItem(pDependData->hDependsWnd, IDC_DEPEND_TREE1); + if (!pDependData->hDependsTreeView1) { - ImageList_Destroy(pDlgInfo->hDependsImageList); - pDlgInfo->hDependsImageList = NULL; + ImageList_Destroy(pDependData->hDependsImageList); + pDependData->hDependsImageList = NULL; return FALSE; } - (void)TreeView_SetImageList(pDlgInfo->hDependsTreeView1, - pDlgInfo->hDependsImageList, + (void)TreeView_SetImageList(pDependData->hDependsTreeView1, + pDependData->hDependsImageList, TVSIL_NORMAL); /* Set the first items in the control */ - TV1_AddDependantsToTree(pDlgInfo, NULL, lpServiceName); + TV1_AddDependantsToTree(pDependData, NULL, lpServiceName); return bRet; } diff --git a/base/applications/mscutils/servman/dependencies_tv2.c b/base/applications/mscutils/servman/dependencies_tv2.c index a0f37b07c1..6f23197c0a 100644 --- a/base/applications/mscutils/servman/dependencies_tv2.c +++ b/base/applications/mscutils/servman/dependencies_tv2.c @@ -118,7 +118,7 @@ TV2_GetDependants(LPWSTR lpServiceName, } VOID -TV2_AddDependantsToTree(PSERVICEPROPSHEET pDlgInfo, +TV2_AddDependantsToTree(PDEPENDDATA pDependData, HTREEITEM hParent, LPWSTR lpServiceName) { @@ -138,7 +138,7 @@ TV2_AddDependantsToTree(PSERVICEPROPSHEET pDlgInfo, bHasChildren = TV2_HasDependantServices(lpServiceStatus[i].lpServiceName); /* Add it */ - AddItemToTreeView(pDlgInfo->hDependsTreeView2, + AddItemToTreeView(pDependData->hDependsTreeView2, hParent, lpServiceStatus[i].lpDisplayName, lpServiceStatus[i].lpServiceName, @@ -158,7 +158,7 @@ TV2_AddDependantsToTree(PSERVICEPROPSHEET pDlgInfo, /* Load the 'No dependencies' string */ AllocAndLoadString(&lpNoDepends, hInstance, IDS_NO_DEPENDS); - AddItemToTreeView(pDlgInfo->hDependsTreeView2, + AddItemToTreeView(pDependData->hDependsTreeView2, NULL, lpNoDepends, NULL, @@ -168,31 +168,31 @@ TV2_AddDependantsToTree(PSERVICEPROPSHEET pDlgInfo, LocalFree(lpNoDepends); /* Disable the window */ - EnableWindow(pDlgInfo->hDependsTreeView2, FALSE); + EnableWindow(pDependData->hDependsTreeView2, FALSE); } } } BOOL -TV2_Initialize(PSERVICEPROPSHEET pDlgInfo, +TV2_Initialize(PDEPENDDATA pDependData, LPWSTR lpServiceName) { BOOL bRet = FALSE; /* Associate the imagelist with TV2 */ - pDlgInfo->hDependsTreeView2 = GetDlgItem(pDlgInfo->hDependsWnd, IDC_DEPEND_TREE2); - if (!pDlgInfo->hDependsTreeView2) + pDependData->hDependsTreeView2 = GetDlgItem(pDependData->hDependsWnd, IDC_DEPEND_TREE2); + if (!pDependData->hDependsTreeView2) { - ImageList_Destroy(pDlgInfo->hDependsImageList); - pDlgInfo->hDependsImageList = NULL; + ImageList_Destroy(pDependData->hDependsImageList); + pDependData->hDependsImageList = NULL; return FALSE; } - (void)TreeView_SetImageList(pDlgInfo->hDependsTreeView2, - pDlgInfo->hDependsImageList, + (void)TreeView_SetImageList(pDependData->hDependsTreeView2, + pDependData->hDependsImageList, TVSIL_NORMAL); /* Set the first items in the control */ - TV2_AddDependantsToTree(pDlgInfo, NULL, lpServiceName); + TV2_AddDependantsToTree(pDependData, NULL, lpServiceName); return bRet; } diff --git a/base/applications/mscutils/servman/precomp.h b/base/applications/mscutils/servman/precomp.h index 051634dc95..5ec27109f6 100644 --- a/base/applications/mscutils/servman/precomp.h +++ b/base/applications/mscutils/servman/precomp.h @@ -128,11 +128,18 @@ typedef struct _SERVICEPROPSHEET { PMAIN_WND_INFO Info; ENUM_SERVICE_STATUS_PROCESS *pService; + +} SERVICEPROPSHEET, *PSERVICEPROPSHEET; + +typedef struct _DEPENDDATA +{ + PSERVICEPROPSHEET pDlgInfo; HIMAGELIST hDependsImageList; HWND hDependsWnd; HWND hDependsTreeView1; HWND hDependsTreeView2; -} SERVICEPROPSHEET, *PSERVICEPROPSHEET; + +} DEPENDDATA, *PDEPENDDATA; HTREEITEM AddItemToTreeView(HWND hTreeView, HTREEITEM hRoot, LPWSTR lpDisplayName, LPWSTR lpServiceName, ULONG serviceType, BOOL bHasChildren); @@ -147,12 +154,12 @@ LPWSTR DisplayName, LPWSTR ServiceList); /* tv1_dependencies */ -BOOL TV1_Initialize(PSERVICEPROPSHEET pDlgInfo, LPWSTR lpServiceName); -VOID TV1_AddDependantsToTree(PSERVICEPROPSHEET pDlgInfo, HTREEITEM hParent, LPWSTR lpServiceName); +BOOL TV1_Initialize(PDEPENDDATA pDependData, LPWSTR lpServiceName); +VOID TV1_AddDependantsToTree(PDEPENDDATA pDependData, HTREEITEM hParent, LPWSTR lpServiceName); /* tv2_dependencies */ -BOOL TV2_Initialize(PSERVICEPROPSHEET pDlgInfo, LPWSTR lpServiceName); -VOID TV2_AddDependantsToTree(PSERVICEPROPSHEET pDlgInfo, HTREEITEM hParent, LPWSTR lpServiceName); +BOOL TV2_Initialize(PDEPENDDATA pDependData, LPWSTR lpServiceName); +VOID TV2_AddDependantsToTree(PDEPENDDATA pDependData, HTREEITEM hParent, LPWSTR lpServiceName); BOOL TV2_HasDependantServices(LPWSTR lpServiceName); LPENUM_SERVICE_STATUS TV2_GetDependants(LPWSTR lpServiceName, LPDWORD lpdwCount); diff --git a/base/applications/mscutils/servman/propsheet.c b/base/applications/mscutils/servman/propsheet.c index 9557420ebb..bd0ec24510 100644 --- a/base/applications/mscutils/servman/propsheet.c +++ b/base/applications/mscutils/servman/propsheet.c @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/mscutils/servman/propsheet.c * PURPOSE: Property dialog box message handler - * COPYRIGHT: Copyright 2006-2007 Ged Murphy <gedmurphy(a)reactos.org> + * COPYRIGHT: Copyright 2006-2017 Ged Murphy <gedmurphy(a)reactos.org> * */ @@ -29,8 +29,20 @@ InitPropSheetPage(PROPSHEETPAGE *psp, VOID OpenPropSheet(PMAIN_WND_INFO Info) { + PSERVICEPROPSHEET pServicePropSheet; HANDLE hThread; - hThread = (HANDLE)_beginthreadex(NULL, 0, &PropSheetThread, Info, 0, NULL); + + pServicePropSheet = HeapAlloc(ProcessHeap, + 0, + sizeof(*pServicePropSheet)); + if (!pServicePropSheet) return; + + /* Set the current service in this calling thread to avoid + * it being updated before the thread is up */ + pServicePropSheet->pService = Info->pCurrentService; + pServicePropSheet->Info = Info; + + hThread = (HANDLE)_beginthreadex(NULL, 0, &PropSheetThread, pServicePropSheet, 0, NULL); if (hThread) { CloseHandle(hThread); @@ -40,65 +52,54 @@ OpenPropSheet(PMAIN_WND_INFO Info) unsigned int __stdcall PropSheetThread(void* Param) { + PSERVICEPROPSHEET pServicePropSheet; PROPSHEETHEADER psh; PROPSHEETPAGE psp[4]; - PSERVICEPROPSHEET pServicePropSheet; HWND hDlg = NULL; MSG Msg; - PMAIN_WND_INFO Info = (PMAIN_WND_INFO)Param; + pServicePropSheet = (PSERVICEPROPSHEET)Param; ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); psh.dwFlags = PSH_PROPSHEETPAGE | PSH_PROPTITLE | PSH_MODELESS; - psh.hwndParent = Info->hMainWnd; + psh.hwndParent = pServicePropSheet->Info->hMainWnd; psh.hInstance = hInstance; psh.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_SM_ICON)); - psh.pszCaption = Info->pCurrentService->lpDisplayName; + psh.pszCaption = pServicePropSheet->Info->pCurrentService->lpDisplayName; psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); psh.nStartPage = 0; psh.ppsp = psp; + /* Initialize the tabs */ + InitPropSheetPage(&psp[0], pServicePropSheet, IDD_DLG_GENERAL, GeneralPageProc); + InitPropSheetPage(&psp[1], pServicePropSheet, IDD_LOGON, LogonPageProc); + InitPropSheetPage(&psp[2], pServicePropSheet, IDD_RECOVERY, RecoveryPageProc); + InitPropSheetPage(&psp[3], pServicePropSheet, IDD_DLG_DEPEND, DependenciesPageProc); - pServicePropSheet = HeapAlloc(ProcessHeap, - 0, - sizeof(*pServicePropSheet)); - if (pServicePropSheet) + hDlg = (HWND)PropertySheetW(&psh); + if (hDlg) { - /* Save current service, as it could change while the dialog is open */ - pServicePropSheet->pService = Info->pCurrentService; - pServicePropSheet->Info = Info; - - InitPropSheetPage(&psp[0], pServicePropSheet, IDD_DLG_GENERAL, GeneralPageProc); - InitPropSheetPage(&psp[1], pServicePropSheet, IDD_LOGON, LogonPageProc); - InitPropSheetPage(&psp[2], pServicePropSheet, IDD_RECOVERY, RecoveryPageProc); - InitPropSheetPage(&psp[3], pServicePropSheet, IDD_DLG_DEPEND, DependenciesPageProc); - - hDlg = (HWND)PropertySheetW(&psh); - if (hDlg) + /* Pump the message queue */ + while (GetMessageW(&Msg, NULL, 0, 0)) { - /* Pump the message queue */ - while (GetMessageW(&Msg, NULL, 0, 0)) + if (PropSheet_GetCurrentPageHwnd(hDlg) == NULL) { + /* The user hit the ok / cancel button, pull it down */ + EnableWindow(pServicePropSheet->Info->hMainWnd, TRUE); + DestroyWindow(hDlg); + } - if (PropSheet_GetCurrentPageHwnd(hDlg) == NULL) - { - /* The user hit the ok / cancel button, pull it down */ - EnableWindow(Info->hMainWnd, TRUE); - DestroyWindow(hDlg); - } - - if (PropSheet_IsDialogMessage(hDlg, &Msg) != 0) - { - TranslateMessage(&Msg); - DispatchMessageW(&Msg); - } + if (PropSheet_IsDialogMessage(hDlg, &Msg) != 0) + { + TranslateMessage(&Msg); + DispatchMessageW(&Msg); } } - - HeapFree(GetProcessHeap(), 0, pServicePropSheet); } + HeapFree(GetProcessHeap(), 0, pServicePropSheet); + return (hDlg != NULL); } diff --git a/base/applications/mscutils/servman/propsheet_depends.c b/base/applications/mscutils/servman/propsheet_depends.c index b32111700e..de1d6a5573 100644 --- a/base/applications/mscutils/servman/propsheet_depends.c +++ b/base/applications/mscutils/servman/propsheet_depends.c @@ -159,20 +159,20 @@ TreeView_GetItemText(HWND hTreeView, */ static VOID -InitDependPage(PSERVICEPROPSHEET pDlgInfo) +InitDependPage(PDEPENDDATA pDependData) { /* Initialize the image list */ - pDlgInfo->hDependsImageList = InitImageList(IDI_NODEPENDS, - IDI_DRIVER, - GetSystemMetrics(SM_CXSMICON), - GetSystemMetrics(SM_CXSMICON), - IMAGE_ICON); + pDependData->hDependsImageList = InitImageList(IDI_NODEPENDS, + IDI_DRIVER, + GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CXSMICON), + IMAGE_ICON); /* Set the first tree view */ - TV1_Initialize(pDlgInfo, pDlgInfo->pService->lpServiceName); + TV1_Initialize(pDependData, pDependData->pDlgInfo->pService->lpServiceName); /* Set the second tree view */ - TV2_Initialize(pDlgInfo, pDlgInfo->pService->lpServiceName); + TV2_Initialize(pDependData, pDependData->pDlgInfo->pService->lpServiceName); } /* @@ -185,12 +185,13 @@ DependenciesPageProc(HWND hwndDlg, WPARAM wParam, LPARAM lParam) { - PSERVICEPROPSHEET pDlgInfo; + + PDEPENDDATA pDependData; /* Get the window context */ - pDlgInfo = (PSERVICEPROPSHEET)GetWindowLongPtr(hwndDlg, - GWLP_USERDATA); - if (pDlgInfo == NULL && uMsg != WM_INITDIALOG) + pDependData = (PDEPENDDATA)GetWindowLongPtr(hwndDlg, + GWLP_USERDATA); + if (pDependData == NULL && uMsg != WM_INITDIALOG) { return FALSE; } @@ -199,16 +200,17 @@ DependenciesPageProc(HWND hwndDlg, { case WM_INITDIALOG: { - pDlgInfo = (PSERVICEPROPSHEET)(((LPPROPSHEETPAGE)lParam)->lParam); - if (pDlgInfo != NULL) + pDependData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DEPENDDATA)); + if (pDependData != NULL) { SetWindowLongPtr(hwndDlg, GWLP_USERDATA, - (LONG_PTR)pDlgInfo); + (LONG_PTR)pDependData); - pDlgInfo->hDependsWnd = hwndDlg; + pDependData->pDlgInfo = (PSERVICEPROPSHEET)(((LPPROPSHEETPAGE)lParam)->lParam); + pDependData->hDependsWnd = hwndDlg; - InitDependPage(pDlgInfo); + InitDependPage(pDependData); } } break; @@ -226,19 +228,19 @@ DependenciesPageProc(HWND hwndDlg, if (lpnmtv->hdr.idFrom == IDC_DEPEND_TREE1) { /* Has this node been expanded before */ - if (!TreeView_GetChild(pDlgInfo->hDependsTreeView1, lpnmtv->itemNew.hItem)) + if (!TreeView_GetChild(pDependData->hDependsTreeView1, lpnmtv->itemNew.hItem)) { /* It's not, add the children */ - TV1_AddDependantsToTree(pDlgInfo, lpnmtv->itemNew.hItem, (LPWSTR)lpnmtv->itemNew.lParam); + TV1_AddDependantsToTree(pDependData, lpnmtv->itemNew.hItem, (LPWSTR)lpnmtv->itemNew.lParam); } } else if (lpnmtv->hdr.idFrom == IDC_DEPEND_TREE2) { /* Has this node been expanded before */ - if (!TreeView_GetChild(pDlgInfo->hDependsTreeView2, lpnmtv->itemNew.hItem)) + if (!TreeView_GetChild(pDependData->hDependsTreeView2, lpnmtv->itemNew.hItem)) { /* It's not, add the children */ - TV2_AddDependantsToTree(pDlgInfo, lpnmtv->itemNew.hItem, (LPWSTR)lpnmtv->itemNew.lParam); + TV2_AddDependantsToTree(pDependData, lpnmtv->itemNew.hItem, (LPWSTR)lpnmtv->itemNew.lParam); } } } @@ -256,11 +258,13 @@ DependenciesPageProc(HWND hwndDlg, break; case WM_DESTROY: - DestroyTreeView(pDlgInfo->hDependsTreeView1); - DestroyTreeView(pDlgInfo->hDependsTreeView2); + DestroyTreeView(pDependData->hDependsTreeView1); + DestroyTreeView(pDependData->hDependsTreeView2); - if (pDlgInfo->hDependsImageList) - ImageList_Destroy(pDlgInfo->hDependsImageList); + if (pDependData->hDependsImageList) + ImageList_Destroy(pDependData->hDependsImageList); + + HeapFree(GetProcessHeap(), 0, pDependData); } return FALSE; diff --git a/base/applications/mscutils/servman/propsheet_recovery.c b/base/applications/mscutils/servman/propsheet_recovery.c index 8e16122151..59205f24c0 100644 --- a/base/applications/mscutils/servman/propsheet_recovery.c +++ b/base/applications/mscutils/servman/propsheet_recovery.c @@ -170,7 +170,8 @@ ShowFailureActions( { WCHAR szBuffer[256]; PWSTR startPtr, endPtr; - INT i, index, id, length; + INT index, id, length; + DWORD i; for (i = 0; i < min(pRecoveryData->pServiceFailure->cActions, 3); i++) {

1 0

[reactos] 01/01: [VCDCLI] Add support for UDF/Joliet hidding. By providing /u or /j switch on mount, the virtual CD-ROM class driver will break the associated signatures on read so that FSDs cannot recognize them any longer.
by Pierre Schweitzer 05 Dec '17

05 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4296826c5882a245e103b… commit 4296826c5882a245e103b28bb4e64371a0b01c97 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Dec 5 21:38:40 2017 +0100 [VCDCLI] Add support for UDF/Joliet hidding. By providing /u or /j switch on mount, the virtual CD-ROM class driver will break the associated signatures on read so that FSDs cannot recognize them any longer. --- .../rosapps/applications/cmdutils/vcdcli/vcdcli.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/modules/rosapps/applications/cmdutils/vcdcli/vcdcli.c b/modules/rosapps/applications/cmdutils/vcdcli/vcdcli.c index 315dc958bc..c3bcf0cc56 100644 --- a/modules/rosapps/applications/cmdutils/vcdcli/vcdcli.c +++ b/modules/rosapps/applications/cmdutils/vcdcli/vcdcli.c @@ -37,9 +37,11 @@ PrintUsage(int type) else if (type == 1) { _ftprintf(stdout, _T("mount usage:\n")); - _ftprintf(stdout, _T("\tmount <drive letter> <path.iso>\n")); + _ftprintf(stdout, _T("\tmount <drive letter> <path.iso> [/u] [/j]\n")); _ftprintf(stdout, _T("\tMount the ISO image given in <path.iso> on the previously created virtual drive <drive letter>\n")); _ftprintf(stdout, _T("\t\tDo not use colon for drive letter\n")); + _ftprintf(stdout, _T("\t\tUse /u to make UDF volumes not appear as such\n")); + _ftprintf(stdout, _T("\t\tUse /j to make Joliet volumes not appear as such\n")); } else if (type == 2) { @@ -331,6 +333,7 @@ _tmain(int argc, const TCHAR *argv[]) } else if (_tcscmp(argv[1], _T("mount")) == 0) { + DWORD i; HANDLE hFile; WCHAR Letter; UNICODE_STRING NtPathName; @@ -377,7 +380,22 @@ _tmain(int argc, const TCHAR *argv[]) /* Copy it in the parameter structure */ _tcsncpy(MountParams.Path, NtPathName.Buffer, 255); MountParams.Length = Min(NtPathName.Length, 255 * sizeof(WCHAR)); - MountParams.Flags = 0; /* FIXME */ + MountParams.Flags = 0; + + /* Do we have to suppress anything? */ + for (i = 4; i < argc; ++i) + { + /* Make UDF uneffective */ + if (_tcscmp(argv[i], _T("/u")) == 0) + { + MountParams.Flags |= MOUNT_FLAG_SUPP_UDF; + } + /* Make Joliet uneffective */ + else if (_tcscmp(argv[i], _T("/j")) == 0) + { + MountParams.Flags |= MOUNT_FLAG_SUPP_JOLIET; + } + } /* No longer needed */ RtlFreeHeap(RtlGetProcessHeap(), 0, NtPathName.Buffer);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs