Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [UDFS] Remove /Gz flag from options on MSVC
by Victor Perevertkin 15 Apr '21

15 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7194f2f044e03c57c7f03… commit 7194f2f044e03c57c7f03be412e9c57b1bafc06a Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu Apr 15 06:45:54 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Thu Apr 15 06:45:54 2021 +0300 [UDFS] Remove /Gz flag from options on MSVC --- drivers/filesystems/udfs/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/filesystems/udfs/CMakeLists.txt b/drivers/filesystems/udfs/CMakeLists.txt index dd1b7a5694a..1c4a396b879 100644 --- a/drivers/filesystems/udfs/CMakeLists.txt +++ b/drivers/filesystems/udfs/CMakeLists.txt @@ -42,8 +42,6 @@ list(APPEND SOURCE add_library(udfs MODULE ${SOURCE} udffs.rc) if(MSVC) - # FIXME: Make sure we marked all what needs to be marked with stdcall before removing this. - target_compile_options(udfs PRIVATE "/Gz") if(USE_CLANG_CL) target_compile_options(udfs PRIVATE -Wno-extern-c-compat -Wno-unused-value) target_compile_options(udfs PRIVATE -Wno-tautological-constant-out-of-range-compare)

1 0

[reactos] 03/03: [CMAKE] Rely less on CMAKE_BUILD_TYPE variable
by Victor Perevertkin 15 Apr '21

15 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d10728a64589cb87a1b47… commit d10728a64589cb87a1b47ba9c39b40b1d0f1212e Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu Apr 15 04:52:59 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Thu Apr 15 06:44:56 2021 +0300 [CMAKE] Rely less on CMAKE_BUILD_TYPE variable Having conditional statements with CMAKE_BUILD_TYPE is an antipattern See https://stackoverflow.com/questions/66079007/having-conditional-statements-… We use both single- and multi-config generators (Ninja and VS), so we can't really rely on CMAKE_BUILD_TYPE, because it's not always set. This commit alters some conditional flags to use <$CONFIG:...> generator expression, but is still not complete. Also, our default optimization level (4) now has what was always a de-facto flags --- CMakeLists.txt | 10 ++++++++++ sdk/cmake/msvc.cmake | 21 +++++++-------------- toolchain-gcc.cmake | 6 ------ toolchain-msvc.cmake | 6 ------ 4 files changed, 17 insertions(+), 26 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8796992b5e2..ac31959a410 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,6 +49,16 @@ else() set(WINARCH ${ARCH}) endif() +# set CMAKE_BUILD_TYPE if not set +if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + message(STATUS "Setting build type to Debug as none was specified.") + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Choose the type of build." FORCE) + # Set the possible values of build type for cmake-gui + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Release" "MinSizeRel" "RelWithDebInfo") +endif() + # Versioning include(sdk/include/reactos/version.cmake) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 43a2c8a7fdc..aad75ebcc4d 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -1,9 +1,5 @@ -#if(${CMAKE_BUILD_TYPE} STREQUAL "Debug") -if(CMAKE_BUILD_TYPE STREQUAL "Debug") - # no optimization - add_compile_options(/Ob0 /Od) -elseif(CMAKE_BUILD_TYPE STREQUAL "Release") +if(CMAKE_BUILD_TYPE STREQUAL "Release") add_compile_options(/Ox /Ob2 /Ot /Oy /GT) elseif(OPTIMIZE STREQUAL "1") add_compile_options(/O1) @@ -12,7 +8,7 @@ elseif(OPTIMIZE STREQUAL "2") elseif(OPTIMIZE STREQUAL "3") add_compile_options(/Ot /Ox /GS-) elseif(OPTIMIZE STREQUAL "4") - add_compile_options(/Os /Ox /GS-) + add_compile_options(/Ob0 /Od) elseif(OPTIMIZE STREQUAL "5") add_compile_options(/Gy /Ob2 /Os /Ox /GS-) endif() @@ -116,8 +112,8 @@ add_compile_options(/wd4018) add_compile_options(/we4013 /we4020 /we4022 /we4028 /we4047 /we4098 /we4101 /we4113 /we4129 /we4133 /we4163 /we4229 /we4311 /we4312 /we4313 /we4477 /we4603 /we4700 /we4715 /we4716) # - C4189: local variable initialized but not referenced -# Not in Release mode -if(NOT CMAKE_BUILD_TYPE STREQUAL "Release") +# Not in Release mode, msbuild generator doesn't like CMAKE_BUILD_TYPE +if(MSVC_IDE OR CMAKE_BUILD_TYPE STREQUAL "Debug") add_compile_options(/we4189) endif() @@ -130,13 +126,10 @@ if(USE_CLANG_CL) endif() # Debugging -if(CMAKE_BUILD_TYPE STREQUAL "Debug") - if(NOT (_PREFAST_ OR _VS_ANALYZE_)) - add_compile_options(/Zi) - endif() -elseif(CMAKE_BUILD_TYPE STREQUAL "Release") - add_definitions("/D NDEBUG") +if(NOT (_PREFAST_ OR _VS_ANALYZE_)) + add_compile_options($<$<CONFIG:Debug>:/Zi>) endif() +add_compile_definitions($<$<CONFIG:Release>:NDEBUG>) # Hotpatchable images if(ARCH STREQUAL "i386") diff --git a/toolchain-gcc.cmake b/toolchain-gcc.cmake index 9d2a51899ee..f6ca04a8000 100644 --- a/toolchain-gcc.cmake +++ b/toolchain-gcc.cmake @@ -1,10 +1,4 @@ -# Default to Debug for the build type -if(NOT DEFINED CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE "Debug" CACHE STRING - "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.") -endif() - # pass variables necessary for the toolchain (needed for try_compile) set(CMAKE_TRY_COMPILE_PLATFORM_VARIABLES ARCH) diff --git a/toolchain-msvc.cmake b/toolchain-msvc.cmake index 9de8fca31e9..97921b216f7 100644 --- a/toolchain-msvc.cmake +++ b/toolchain-msvc.cmake @@ -1,10 +1,4 @@ -# Default to Debug for the build type -if(NOT DEFINED CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE "Debug" CACHE STRING - "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.") -endif() - # pass variables necessary for the toolchain (needed for try_compile) set(CMAKE_TRY_COMPILE_PLATFORM_VARIABLES ARCH USE_CLANG_CL)

1 0

[reactos] 02/03: [CMAKE] Require ARCH variable to be specified explicitly
by Victor Perevertkin 15 Apr '21

15 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f0b53998c81f7db0c2aa8… commit f0b53998c81f7db0c2aa8106f82fe91841c22457 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu Apr 15 04:50:12 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Thu Apr 15 06:44:55 2021 +0300 [CMAKE] Require ARCH variable to be specified explicitly Also, use CMAKE_TRY_COMPILE_PLATFORM_VARIABLES in toolchain files to solve issues with ARCH not being passed during try_compile --- CMakeLists.txt | 6 +++++- toolchain-clang.cmake | 9 ++++----- toolchain-gcc.cmake | 7 +++---- toolchain-msvc.cmake | 7 +++---- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index eca63cb4723..8796992b5e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,8 +28,9 @@ set(CMAKE_C_STANDARD 99) set(CMAKE_CXX_STANDARD 11) #set_property(GLOBAL PROPERTY RULE_MESSAGES OFF) +# check that the ARCH (target architecture) variable is defined if(NOT ARCH) - set(ARCH i386) + message(FATAL_ERROR "Target architecture (ARCH) is not defined. Please, choose one of: i386, amd64, arm") endif() # Now the ARCH variable will be in lowercase. # It is needed because STREQUAL comparison @@ -38,6 +39,9 @@ endif() # for more information. string(TOLOWER ${ARCH} ARCH) +# set possible values for cmake GUI +set_property(CACHE ARCH PROPERTY STRINGS "i386" "amd64" "arm") + # Alternative WinNT-compatible architecture string if(ARCH STREQUAL "i386") set(WINARCH "x86") diff --git a/toolchain-clang.cmake b/toolchain-clang.cmake index e181bf0baf4..e06a4116438 100644 --- a/toolchain-clang.cmake +++ b/toolchain-clang.cmake @@ -1,12 +1,11 @@ -if(NOT ARCH) - set(ARCH i386) -endif() - if(DEFINED ENV{_ROSBE_ROSSCRIPTDIR}) set(CMAKE_SYSROOT $ENV{_ROSBE_ROSSCRIPTDIR}/$ENV{ROS_ARCH}) endif() +# pass variables necessary for the toolchain (needed for try_compile) +set(CMAKE_TRY_COMPILE_PLATFORM_VARIABLES ARCH CLANG_VERSION) + # The name of the target operating system set(CMAKE_SYSTEM_NAME Windows) # The processor we are targeting @@ -17,7 +16,7 @@ elseif (ARCH STREQUAL "amd64") elseif(ARCH STREQUAL "arm") set(CMAKE_SYSTEM_PROCESSOR arm) else() - message(ERROR "Unsupported ARCH: ${ARCH}") + message(FATAL_ERROR "Unsupported ARCH: ${ARCH}") endif() if (DEFINED CLANG_VERSION) diff --git a/toolchain-gcc.cmake b/toolchain-gcc.cmake index 44f6d0ce166..9d2a51899ee 100644 --- a/toolchain-gcc.cmake +++ b/toolchain-gcc.cmake @@ -1,14 +1,13 @@ -if(NOT ARCH) - set(ARCH i386) -endif() - # Default to Debug for the build type if(NOT DEFINED CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.") endif() +# pass variables necessary for the toolchain (needed for try_compile) +set(CMAKE_TRY_COMPILE_PLATFORM_VARIABLES ARCH) + # Choose the right MinGW toolchain prefix if(NOT DEFINED MINGW_TOOLCHAIN_PREFIX) if(ARCH STREQUAL "i386") diff --git a/toolchain-msvc.cmake b/toolchain-msvc.cmake index 2aae2edbdd4..9de8fca31e9 100644 --- a/toolchain-msvc.cmake +++ b/toolchain-msvc.cmake @@ -1,14 +1,13 @@ -if(NOT ARCH) - set(ARCH i386) -endif() - # Default to Debug for the build type if(NOT DEFINED CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.") endif() +# pass variables necessary for the toolchain (needed for try_compile) +set(CMAKE_TRY_COMPILE_PLATFORM_VARIABLES ARCH USE_CLANG_CL) + # the name of the target operating system set(CMAKE_SYSTEM_NAME Windows) set(CMAKE_SYSTEM_PROCESSOR i686)

1 0

[reactos] 01/03: [CMAKE] Unify configs for architectures
by Victor Perevertkin 15 Apr '21

15 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=72ad37c1cd437c3ef433c… commit 72ad37c1cd437c3ef433c01edd4aab2957bea656 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue Apr 13 21:08:04 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Thu Apr 15 06:44:52 2021 +0300 [CMAKE] Unify configs for architectures config*.cmake files are constantly getting out of sync between each other. Besides that, the parameters are not really dependent on a target architecture, but rather on a compiler (except *ARCH) This approach seems to be more future-prone, and allows to see all the options in one file (there are really not that many of them) --- CMakeLists.txt | 8 +----- sdk/cmake/config-amd64.cmake | 65 -------------------------------------------- sdk/cmake/config-arm.cmake | 47 -------------------------------- sdk/cmake/config.cmake | 50 ++++++++++++++++++++++++---------- sdk/cmake/gcc.cmake | 6 +--- 5 files changed, 38 insertions(+), 138 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 57fe94a8a5a..eca63cb4723 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,13 +49,7 @@ endif() include(sdk/include/reactos/version.cmake) # Compile options -if(ARCH STREQUAL "i386") - include(sdk/cmake/config.cmake) -elseif(ARCH STREQUAL "amd64") - include(sdk/cmake/config-amd64.cmake) -elseif(ARCH STREQUAL "arm") - include(sdk/cmake/config-arm.cmake) -endif() +include(sdk/cmake/config.cmake) # Compiler flags handling include(sdk/cmake/compilerflags.cmake) diff --git a/sdk/cmake/config-amd64.cmake b/sdk/cmake/config-amd64.cmake deleted file mode 100644 index 01ef763c719..00000000000 --- a/sdk/cmake/config-amd64.cmake +++ /dev/null @@ -1,65 +0,0 @@ - -set(SARCH "" CACHE STRING -"Sub-architecture to build for.") - -set(OARCH "athlon64" CACHE STRING -"Generate instructions for this CPU type. Specify one of: - k8 opteron athlon64 athlon-fx") - -set(OPTIMIZE "1" CACHE STRING -"What level of optimization to use. - 0 = off - 1 = Default option, optimize for size (-Os) with some additional options - 2 = Optimize for size (-Os) - 3 = Optimize debugging experience (-Og) - 4 = Optimize (-O1) - 5 = Optimize even more (-O2) - 6 = Optimize yet more (-O3) - 7 = Disregard strict standards compliance (-Ofast)") - -set(LTCG FALSE CACHE BOOL -"Whether to build with link-time code generation") - -set(DBG TRUE CACHE BOOL -"Whether to compile for debugging.") - -set(KDBG FALSE CACHE BOOL -"Whether to compile in the integrated kernel debugger.") - -set(GDB FALSE CACHE BOOL -"Whether to compile for debugging with GDB. -If you don't use GDB, don't enable this.") - -set(_WINKD_ TRUE CACHE BOOL -"Whether to compile with the KD protocol.") - -set(USERMODE TRUE CACHE BOOL -"Whether to compile any usermode parts. This is while kernel mode is under - heavy development and usermode part not relevant for bootcd.") - -if(MSVC) -set(_PREFAST_ FALSE CACHE BOOL -"Whether to enable PREFAST while compiling.") - # RTC are incompatible with compiler optimizations. - cmake_dependent_option(RUNTIME_CHECKS "Whether to enable runtime checks on MSVC" ON - "CMAKE_BUILD_TYPE STREQUAL Debug" OFF) -endif() - -if(CMAKE_C_COMPILER_ID STREQUAL "GNU") - set(GCC TRUE CACHE BOOL "The compiler is GCC") - set(CLANG FALSE CACHE BOOL "The compiler is LLVM Clang") -elseif(CMAKE_C_COMPILER_ID STREQUAL "Clang") - # We can use LLVM Clang mimicking CL or GCC. Account for this - if (MSVC) - set(GCC FALSE CACHE BOOL "The compiler is GCC") - else() - set(GCC TRUE CACHE BOOL "The compiler is GCC") - endif() - set(CLANG TRUE CACHE BOOL "The compiler is LLVM Clang") -elseif(MSVC) # aka CMAKE_C_COMPILER_ID STEQUAL "MSVC" - set(GCC FALSE CACHE BOOL "The compiler is GCC") - set(CLANG FALSE CACHE BOOL "The compiler is LLVM Clang") - # MSVC variable is already set by cmake -else() - message("WARNING: the compiler has not been recognized") -endif() diff --git a/sdk/cmake/config-arm.cmake b/sdk/cmake/config-arm.cmake deleted file mode 100644 index 85992fed996..00000000000 --- a/sdk/cmake/config-arm.cmake +++ /dev/null @@ -1,47 +0,0 @@ - -set(SARCH "omap3-zoom2" CACHE STRING -"Sub-architecture (board) to build for. Specify one of: - kurobox versatile omap3-zoom2 omap3-beagle") - -set(OARCH "armv7-a" CACHE STRING -"Generate instructions for this CPU type. Specify one of: - armv5te armv7-a") - -set(OPTIMIZE "1" CACHE STRING -"What level of optimization to use. - 0 = off - 1 = Default option, optimize for size (-Os) with some additional options - 2 = Optimize for size (-Os) - 3 = Optimize debugging experience (-Og) - 4 = Optimize (-O1) - 5 = Optimize even more (-O2) - 6 = Optimize yet more (-O3) - 7 = Disregard strict standards compliance (-Ofast)") - -set(LTCG FALSE CACHE BOOL -"Whether to build with link-time code generation") - -set(DBG TRUE CACHE BOOL -"Whether to compile for debugging.") - -set(KDBG FALSE CACHE BOOL -"Whether to compile in the integrated kernel debugger.") - -set(GDB FALSE CACHE BOOL -"Whether to compile for debugging with GDB. -If you don't use GDB, don't enable this.") - -set(_WINKD_ TRUE CACHE BOOL -"Whether to compile with the KD protocol.") - -set(BUILD_MP TRUE CACHE BOOL -"Whether to compile the multi processor versions for ntoskrnl and hal.") - -set(NEWSPRINTF FALSE CACHE BOOL -"Whether to compile the new sprintf.") - -if(MSVC) - # RTC are incompatible with compiler optimizations. - cmake_dependent_option(RUNTIME_CHECKS "Whether to enable runtime checks on MSVC" ON - "CMAKE_BUILD_TYPE STREQUAL Debug" OFF) -endif() diff --git a/sdk/cmake/config.cmake b/sdk/cmake/config.cmake index fa6defa1eb5..eaf193ca8f1 100644 --- a/sdk/cmake/config.cmake +++ b/sdk/cmake/config.cmake @@ -1,14 +1,38 @@ -set(SARCH "pc" CACHE STRING -"Sub-architecture to build for. Specify one of: - pc pc98 xbox") +if(ARCH STREQUAL "i386") + set(SARCH "pc" CACHE STRING + "Sub-architecture to build for. Specify one of: + pc pc98 xbox") +elseif(ARCH STREQUAL "amd64") + set(SARCH "" CACHE STRING + "Sub-architecture to build for.") +elseif(ARCH STREQUAL "arm") + set(SARCH "omap3-zoom2" CACHE STRING + "Sub-architecture (board) to build for. Specify one of: + kurobox versatile omap3-zoom2 omap3-beagle") +endif() -set(OARCH "pentium" CACHE STRING -"Generate instructions for this CPU type. Specify one of: - pentium, pentiumpro") +if(ARCH STREQUAL "i386") + set(OARCH "pentium" CACHE STRING + "Generate instructions for this CPU type. Specify one of: + pentium, pentiumpro") +elseif(ARCH STREQUAL "amd64") + set(OARCH "athlon64" CACHE STRING + "Generate instructions for this CPU type. Specify one of: + k8 opteron athlon64 athlon-fx") +elseif(ARCH STREQUAL "arm") + set(OARCH "armv7-a" CACHE STRING + "Generate instructions for this CPU type. Specify one of: + armv5te armv7-a") +endif() -set(TUNE "i686" CACHE STRING -"Which CPU ReactOS should be optimized for.") +if(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64") + set(TUNE "generic" CACHE STRING + "Which CPU ReactOS should be optimized for.") +elseif(ARCH STREQUAL "arm") + set(TUNE "generic-arch" CACHE STRING + "Which CPU ReactOS should be optimized for.") +endif() set(OPTIMIZE "4" CACHE STRING "What level of optimization to use. @@ -73,17 +97,15 @@ else() set(_WINKD_ FALSE CACHE BOOL "Whether to compile with the KD protocol.") endif() -set(BUILD_MP TRUE CACHE BOOL -"Whether to build the multiprocessor versions of NTOSKRNL and HAL.") +cmake_dependent_option(BUILD_MP "Whether to build the multiprocessor versions of NTOSKRNL and HAL." ON + "ARCH STREQUAL i386" OFF) set(GENERATE_DEPENDENCY_GRAPH FALSE CACHE BOOL "Whether to create a GraphML dependency graph of DLLs.") if(MSVC) -set(_PREFAST_ FALSE CACHE BOOL -"Whether to enable PREFAST while compiling.") -set(_VS_ANALYZE_ FALSE CACHE BOOL -"Whether to enable static analysis while compiling.") + option(_PREFAST_ "Whether to enable PREFAST while compiling." OFF) + option(_VS_ANALYZE_ "Whether to enable static analysis while compiling." OFF) # RTC are incompatible with compiler optimizations. cmake_dependent_option(RUNTIME_CHECKS "Whether to enable runtime checks on MSVC" ON "CMAKE_BUILD_TYPE STREQUAL Debug" OFF) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index b1d4b95fb14..4efeda21d07 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -90,11 +90,7 @@ if(NOT CMAKE_BUILD_TYPE STREQUAL "Release") endif() # Tuning -if(ARCH STREQUAL "i386") - add_compile_options(-march=${OARCH} -mtune=${TUNE}) -else() - add_compile_options(-march=${OARCH}) -endif() +add_compile_options(-march=${OARCH} -mtune=${TUNE}) # Warnings, errors if((NOT CMAKE_BUILD_TYPE STREQUAL "Release") AND (NOT CMAKE_C_COMPILER_ID STREQUAL Clang))

1 0

[reactos] 01/01: [MSHTML] MSVC: There is no 'error C4028' anymore
by Serge Gautherie 14 Apr '21

14 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1758c3831b08c1ee98790… commit 1758c3831b08c1ee98790fd20c2d50c33ac511c2 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Nov 12 01:22:46 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Apr 14 20:55:57 2021 +0200 [MSHTML] MSVC: There is no 'error C4028' anymore MSVC amd64 '...\dll\win32\mshtml\nsio.c(3755): error C4028: formal parameter 3 different from declaration' was fixed by 5ed1867. CORE-7538 --- dll/win32/mshtml/CMakeLists.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dll/win32/mshtml/CMakeLists.txt b/dll/win32/mshtml/CMakeLists.txt index 327e719aa0c..0f66f5e59f6 100644 --- a/dll/win32/mshtml/CMakeLists.txt +++ b/dll/win32/mshtml/CMakeLists.txt @@ -100,11 +100,6 @@ add_library(mshtml MODULE rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/mshtml.def) -if(MSVC) - # error C4028: formal parameter 3 different from declaration - remove_target_compile_option(mshtml "/we4028") -endif() - list(APPEND mshtml_rc_deps ${CMAKE_CURRENT_SOURCE_DIR}/blank.htm ${CMAKE_CURRENT_SOURCE_DIR}/mshtml.inf

1 0

[reactos] 01/01: [TRANSLATION] Add/update Hungarian translation for solitaire, spider solitaire, rapps, usetup, cpl/timedate, shell32, user32
by Tibor Lajos Füzi 14 Apr '21

14 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea04edce2d31711a6e0ec… commit ea04edce2d31711a6e0ec9cc6cf469996c961dba Author: Tibor Lajos Füzi <tibor.fuzi(a)gmail.com> AuthorDate: Sun Apr 11 14:48:13 2021 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Wed Apr 14 16:16:24 2021 +0200 [TRANSLATION] Add/update Hungarian translation for solitaire, spider solitaire, rapps, usetup, cpl/timedate, shell32, user32 --- base/applications/games/solitaire/lang/hu-HU.rc | 2 +- base/applications/games/spider/lang/hu-HU.rc | 2 +- base/applications/rapps/lang/hu-HU.rc | 267 ++++++++++++++++++++++++ base/applications/rapps/rapps.rc | 3 + base/setup/usetup/lang/hu-HU.h | 8 +- dll/cpl/timedate/lang/hu-HU.rc | 2 +- dll/win32/shell32/lang/hu-HU.rc | 68 +++--- win32ss/user/user32/lang/hu-HU.rc | 42 ++-- 8 files changed, 332 insertions(+), 62 deletions(-) diff --git a/base/applications/games/solitaire/lang/hu-HU.rc b/base/applications/games/solitaire/lang/hu-HU.rc index 13633305d71..981be2f1663 100644 --- a/base/applications/games/solitaire/lang/hu-HU.rc +++ b/base/applications/games/solitaire/lang/hu-HU.rc @@ -56,7 +56,7 @@ STRINGTABLE BEGIN IDS_SOL_NAME "Pasziánsz" IDS_SOL_ABOUT "Pasziánsz, készítette J Brown\n\nCardLib verzió 1.0." - IDS_SOL_QUIT "Kilépés ebbõl a játékból?" + IDS_SOL_QUIT "Kilépés ebből a játékból?" IDS_SOL_WIN "Gratulálok, Ön nyert!" IDS_SOL_DEAL "Új leosztás?" IDS_SOL_SCORE "Pont: %d" diff --git a/base/applications/games/spider/lang/hu-HU.rc b/base/applications/games/spider/lang/hu-HU.rc index 87b1556a129..c1c1feb5586 100644 --- a/base/applications/games/spider/lang/hu-HU.rc +++ b/base/applications/games/spider/lang/hu-HU.rc @@ -41,7 +41,7 @@ STRINGTABLE BEGIN IDS_SPI_NAME "Fekete özvegy" IDS_SPI_ABOUT "Fekete Özvegy, készítette Gregor Schneider\n\nCardLib verzió 1.0" - IDS_SPI_QUIT "Kilépés ebbõl a játékból?" + IDS_SPI_QUIT "Kilépés ebből a játékból?" IDS_SPI_WIN "Gratulálok, Ön nyert!" IDS_SPI_DEAL "Új leosztás?" END diff --git a/base/applications/rapps/lang/hu-HU.rc b/base/applications/rapps/lang/hu-HU.rc new file mode 100644 index 00000000000..e4b05291b63 --- /dev/null +++ b/base/applications/rapps/lang/hu-HU.rc @@ -0,0 +1,267 @@ +/* Hungarian translation by Tibor Lajos Füzi (tibor.fuzi(a)gmail.com) 2021 */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL + +IDR_MAINMENU MENU +BEGIN + POPUP "&Fájl" + BEGIN + MENUITEM "&Beállítások", ID_SETTINGS + MENUITEM SEPARATOR + MENUITEM "&Kilépés", ID_EXIT + END + POPUP "&Programok" + BEGIN + MENUITEM "&Telepítés\tCtrl+Enter", ID_INSTALL + MENUITEM "&Eltávolítás\tCtrl+Del", ID_UNINSTALL + MENUITEM "&Módosítás", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "Eltávolítás a &registryből", ID_REGREMOVE + MENUITEM SEPARATOR + MENUITEM "&Frissítés\tF5", ID_REFRESH + MENUITEM SEPARATOR + MENUITEM "Ada&tbázis frissítése\tCtrl+F5", ID_RESETDB + END + POPUP "Súgó" + BEGIN + MENUITEM "Súgó\tF1", ID_HELP, GRAYED + MENUITEM "&Névjegy", ID_ABOUT + END +END + +IDR_LINKMENU MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "Hivatkozás &megnyitása böngészőben", ID_OPEN_LINK + MENUITEM "Hivatkozás másolása a &vágólapra", ID_COPY_LINK + END +END + +IDR_APPLICATIONMENU MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&Telepítés\tCtrl+Enter", ID_INSTALL + MENUITEM "&Eltávolítás\tCtrl+Del", ID_UNINSTALL + MENUITEM "&Módosítás", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "Eltávolítás a &registryből", ID_REGREMOVE + MENUITEM SEPARATOR + MENUITEM "&Frissítés\tF5", ID_REFRESH + MENUITEM SEPARATOR + MENUITEM "Ada&tbázis frissítése\tCtrl+F5", ID_RESETDB + END +END + +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 265 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Beállítások" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Általános", -1, 4, 2, 240, 61 + AUTOCHECKBOX "&Ablak helyének megjegyzése", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 + AUTOCHECKBOX "Elérhető programok listájának &frissítése indításkor", IDC_UPDATE_AVLIST, 15, 29, 222, 12 + AUTOCHECKBOX "Programok telepítésének és eltávolításának &naplózása", IDC_LOG_ENABLED, 15, 46, 219, 12 + GROUPBOX "Letöltés", -1, 4, 65, 240, 51 + LTEXT "Letöltés mappája:", -1, 16, 75, 100, 9 + EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL + PUSHBUTTON "&Kiválasztás", IDC_CHOOSE, 187, 85, 50, 14 + AUTOCHECKBOX "Program telepítőjének &törlése telepítés után", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 + GROUPBOX "Programok forrása", -1, 4, 118, 240, 46 + CONTROL "Alapértelmezett használata", IDC_SOURCE_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 132, 104, 10 + CONTROL "Megadott forrás", IDC_USE_SOURCE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 147, 74, 10 + EDITTEXT IDC_SOURCE_URL, 97, 147, 140, 12, ES_AUTOHSCROLL | WS_DISABLED + GROUPBOX "Proxy", -1, 4, 166, 240, 76 + CONTROL "Rendszer proxy beállítások", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 180, 210, 10 + CONTROL "Közvetlen (nincs proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 195, 210, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 210, 74, 10 + EDITTEXT IDC_PROXY_SERVER, 97, 210, 140, 12, ES_AUTOHSCROLL | WS_DISABLED + LTEXT "Nincs proxy ezekhez:", -1, 27, 225, 77, 10 + EDITTEXT IDC_NO_PROXY_FOR, 97, 225, 140, 12, ES_AUTOHSCROLL | WS_DISABLED + PUSHBUTTON "Alapértelmezett", IDC_DEFAULT_SETTINGS, 8, 245, 70, 14 + DEFPUSHBUTTON "OK", IDOK, 116, 245, 60, 14 + PUSHBUTTON "Mégse", IDCANCEL, 181, 245, 60, 14 +END + +IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Program telepítése" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "…", IDC_INSTALL_TEXT, 4, 5, 209, 35 + AUTORADIOBUTTON "&Telepítés lemezről (CD vagy DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP + AUTORADIOBUTTON "&Letöltés és telepítés", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 86, 78, 60, 14 + PUSHBUTTON "Mégse", IDCANCEL, 150, 78, 60, 14 +END + +IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220 +STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +CAPTION "%ls letöltése…" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 + EDITTEXT IDC_DOWNLOAD_STATUS, 10, 28, 200, 22, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_DISABLED | NOT WS_BORDER + PUSHBUTTON "Mégse", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_TOOLTIP_INSTALL "Telepítés" + IDS_TOOLTIP_UNINSTALL "Eltávolítás" + IDS_TOOLTIP_MODIFY "Módosítás" + IDS_TOOLTIP_SETTINGS "Beállítások" + IDS_TOOLTIP_REFRESH "Frissítés" + IDS_TOOLTIP_UPDATE_DB "Adatbázis frissítése" + IDS_TOOLTIP_EXIT "Kilépés" +END + +STRINGTABLE +BEGIN + IDS_APP_NAME "Név" + IDS_APP_INST_VERSION "Verzió" + IDS_APP_DESCRIPTION "Leírás" +END + +STRINGTABLE +BEGIN + IDS_INFO_VERSION "\Verzió: " + IDS_INFO_DESCRIPTION "\nLeírás: " + IDS_INFO_PUBLISHER "\nKiadó: " + IDS_INFO_HELPLINK "\nSúgó hivatkozás: " + IDS_INFO_HELPPHONE "\nTelefonos segítség: " + IDS_INFO_README "\nOlvass-el: " + IDS_INFO_REGOWNER "\nRegisztrált tulajdonos: " + IDS_INFO_PRODUCTID "\nTermékazonosító: " + IDS_INFO_CONTACT "\nKapcsolat: " + IDS_INFO_UPDATEINFO "\nFrissítési információk: " + IDS_INFO_INFOABOUT "\nNévjegy információk: " + IDS_INFO_COMMENTS "\nMegjegyzések: " + IDS_INFO_INSTLOCATION "\nTelepítés helye: " + IDS_INFO_INSTALLSRC "\nTelepítés forrása: " + IDS_INFO_UNINSTALLSTR "\nEltávolító parancs: " + IDS_INFO_MODIFYPATH "\nMódosítási útvonal: " + IDS_INFO_INSTALLDATE "\nTelepítés dátuma: " + IDS_AINFO_PACKAGE_NAME "\nCsomagnév: " +END + +STRINGTABLE +BEGIN + IDS_AINFO_VERSION "\nVerzió: " + IDS_AINFO_AVAILABLEVERSION "\nElérhető verzió: " + IDS_AINFO_DESCRIPTION "\nLeírás: " + IDS_AINFO_SIZE "\nMéret: " + IDS_AINFO_URLSITE "\nWeboldal: " + IDS_AINFO_LICENSE "\nLicensz: " + IDS_AINFO_URLDOWNLOAD "\nLetöltés: " + IDS_AINFO_LANGUAGES "\nNyelvek: " +END + +STRINGTABLE +BEGIN + IDS_CAT_AUDIO "Audió" + IDS_CAT_DEVEL "Fejlesztés" + IDS_CAT_DRIVERS "Eszközmeghajtók" + IDS_CAT_EDU "Oktatás" + IDS_CAT_ENGINEER "Mérnöki" + IDS_CAT_FINANCE "Pénzügy" + IDS_CAT_GAMES "Játékok és szórakozás" + IDS_CAT_GRAPHICS "Grafika" + IDS_CAT_INTERNET "Internet és hálózatok" + IDS_CAT_LIBS "Függvénykönyvtárak" + IDS_CAT_OFFICE "Iroda" + IDS_CAT_OTHER "Egyéb" + IDS_CAT_SCIENCE "Tudományos" + IDS_CAT_TOOLS "Eszközök" + IDS_CAT_VIDEO "Videó" + IDS_CAT_THEMES "Témák" +END + +STRINGTABLE +BEGIN + IDS_APPTITLE "ReactOS Alkalmazáskezelő" + IDS_APP_AUTHORS "Copyright 2009 Dmitry Chapyshev" + IDS_SEARCH_TEXT "Keresés…" + IDS_INSTALL "Telepítés" + IDS_UNINSTALL "Eltávolítás" + IDS_MODIFY "Módosítás" + IDS_APPS_COUNT "Alkalmazások száma: %d; Kijelölve: %d" + IDS_WELCOME_TITLE "Üdvözöljük a ReactOS Alkalmazáskezelőben!\n\n" + IDS_WELCOME_TEXT "Bal oldalon válasszon kategóriát, majd válasszon egy telepíteni vagy eltávolítani kívánt alkalmazást.\nReactOS weboldal: " + IDS_WELCOME_URL "https://reactos.org/" + IDS_INSTALLED "Telepített" + IDS_AVAILABLEFORINST "Telepíthető alkalmazások" + IDS_UPDATES "Frissítések" + IDS_APPLICATIONS "Alkalmazások" + IDS_CHOOSE_FOLDER_TEXT "Válassza ki a mappát, ahová a letöltések kerüljenek:" + IDS_CHOOSE_FOLDER_ERROR "A megadott mappa nem létezik. Létrehozzam?" + IDS_URL_INVALID "A megadott URL érvénytelen vagy nem támogatott. Kérem javítsa ki!" + IDS_APP_REG_REMOVE "Biztosan törölni szeretné a telepített program adatait a registryből?" + IDS_INFORMATION "Információ" + IDS_UNABLE_TO_DOWNLOAD "Nem sikerült letölteni a csomagot! A cím nem található!" + IDS_UNABLE_TO_DOWNLOAD2 "Nem sikerült letölteni a csomagot! Ellenőrizze az internet kapcsolatot!" + IDS_UNABLE_TO_REMOVE "Nem sikerült eltávolítani a program adatait a registryből!" + IDS_UNABLE_TO_INSTALL "Nem lehet megnyitni a telepítőt!" + IDS_UNABLE_TO_QUERY_CERT "Nem sikerült lekérdezni a tanúsítvány információt.\n\nBiztosan folytatja?" + IDS_INTEG_CHECK_TITLE "Csomag épségének ellenőrzése…" + IDS_INTEG_CHECK_FAIL "A csomag nem ment át az épség-ellenőrzésen, lehet hogy megsérült a letöltés közben, vagy megváltoztatták. A program futtatása nem ajánlott." + IDS_INTERRUPTED_DOWNLOAD "Megszakadt a letöltés. Ellenőrizze az internet kapcsolatot." + IDS_UNABLE_TO_WRITE "Nem lehet írni a lemezre. Lehet hogy megtelt." + IDS_SELECT_ALL "Összes kijelölése/kijelölés megszüntetése" + IDS_INSTALL_SELECTED "Kijelöltek telepítése" + IDS_SELECTEDFORINST "Telepítésre kijelölve" + IDS_MISMATCH_CERT_INFO "A használt tanúsítvány ismeretlen:\nTárgy: %s\nKibocsátó: %s\nBiztosan folytatja?" + IDS_UNABLE_PATH "Az elérési út formátuma érvénytelen." + IDS_APP_DISPLAY_DETAILS "részletek" + IDS_APP_DISPLAY_LIST "lista" + IDS_APP_DISPLAY_TILE "csempe" +END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALLED "Telepítve" + IDS_STATUS_NOTINSTALLED "Nincs telepítve" + IDS_STATUS_DOWNLOADED "Letöltve" + IDS_STATUS_UPDATE_AVAILABLE "Elérhető frissítés" + IDS_STATUS_DOWNLOADING "Letöltés…" + IDS_STATUS_INSTALLING "Telepítés…" + IDS_STATUS_WAITING "Várakozás a telepítésre…" + IDS_STATUS_FINISHED "Befejezve" +END + +STRINGTABLE +BEGIN + IDS_LICENSE_OPENSOURCE "Nyílt forráskódú" + IDS_LICENSE_FREEWARE "Freeware" + IDS_LICENSE_TRIAL "Próba/Demó" +END + +STRINGTABLE +BEGIN + IDS_LANGUAGE_AVAILABLE_TRANSLATION "Támogatja az Ön nyelvét" + IDS_LANGUAGE_NO_TRANSLATION "Más nyelveket támogat" + IDS_LANGUAGE_ENGLISH_TRANSLATION "Angol nyelvű" + IDS_LANGUAGE_SINGLE "Egy nyelvet támogat" + IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d egyéb)" + IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d elérhető)" +END + +STRINGTABLE +BEGIN + IDS_DL_DIALOG_DB_DISP "Alkalmazás adatbázis" + IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Adatbázis frissítése…" + IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Adatbázis frissítése… (nem hivatalos forrásból)" +END + +STRINGTABLE +BEGIN + IDS_CMD_USAGE "Használat: " + IDS_CMD_NEED_PACKAGE_NAME "Hiba: a(z) %1 opciónak egy vagy több csomagnevet kell megadni.\n" + IDS_CMD_NEED_FILE_NAME "Hiba: a(z) %1 opciónak egy fájlnevet kell megadni.\n" + IDS_CMD_NEED_PARAMS "Hiba: a(z) %1 opciónak egy vagy több paramétert kell megadni.\n" + IDS_CMD_INVALID_OPTION "Hiba: Ismeretlen vagy érvénytelen parancssori opció lett megadva.\n" + IDS_CMD_FIND_RESULT_FOR "Keresés eredménye erre: %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Nem sikerült a(z) %1 csomagot megtalálni.\n" + IDS_CMD_PACKAGE_INFO "Információ a(z) %1 csomagról:\n" +END diff --git a/base/applications/rapps/rapps.rc b/base/applications/rapps/rapps.rc index 5debb642bdd..b6567252569 100644 --- a/base/applications/rapps/rapps.rc +++ b/base/applications/rapps/rapps.rc @@ -86,6 +86,9 @@ HOTKEYS ACCELERATORS #ifdef LANGUAGE_HE_IL #include "lang/he-IL.rc" #endif +#ifdef LANGUAGE_HU_HU + #include "lang/hu-HU.rc" +#endif #ifdef LANGUAGE_ID_ID #include "lang/id-ID.rc" #endif diff --git a/base/setup/usetup/lang/hu-HU.h b/base/setup/usetup/lang/hu-HU.h index 3289d59fc80..270cac926eb 100644 --- a/base/setup/usetup/lang/hu-HU.h +++ b/base/setup/usetup/lang/hu-HU.h @@ -1422,14 +1422,14 @@ static MUI_ENTRY huHUBootLoaderInstallPageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " telep\241t\213 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, { 0, 0, - "Installing the bootloader onto the media, please wait...", + "Bootloader telep\241t\202se az eszk\224zre, k\202rem v\240rjon...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -2181,7 +2181,7 @@ MUI_STRING huHUStrings[] = {STRING_FORMATTINGDISK, "A telep\241t\213 form\240zza a merevlemezt"}, {STRING_CHECKINGDISK, - "A telep\241t\213 ellen\213rzni a merevlemezt"}, + "A telep\241t\213 ellen\213rzi a merevlemezt"}, {STRING_FORMATDISK1, " Part\241ci\242 form\240z\240sa %S f\240jlrendszerrel (gyorsform\240z\240s) "}, {STRING_FORMATDISK2, @@ -2193,7 +2193,7 @@ MUI_STRING huHUStrings[] = {STRING_HDINFOPARTDELETE_1, "itt: %s."}, {STRING_PARTTYPE, - "Type 0x%02x"}, + "T\241pus 0x%02x"}, {STRING_HDDINFO_1, // "%lu. merevlemez (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]" "%I64u %s %lu. merevlemez (Port=%hu, Bus=%hu, Id=%hu) itt: %wZ [%s]"}, diff --git a/dll/cpl/timedate/lang/hu-HU.rc b/dll/cpl/timedate/lang/hu-HU.rc index 8f6aa313d56..00fa2d9168f 100644 --- a/dll/cpl/timedate/lang/hu-HU.rc +++ b/dll/cpl/timedate/lang/hu-HU.rc @@ -42,7 +42,7 @@ BEGIN PUSHBUTTON "Szinkronizálás", IDC_UPDATEBUTTON, 187, 22, 55, 14 LTEXT "", IDC_SUCSYNC, 16, 54, 214, 23 LTEXT "", IDC_NEXTSYNC, 12, 96, 137, 12 - LTEXT "A szinkronizálás csak akkor történhet meg, ha az internetre fel van csatlakozva a számítógép.", -1, 12, 114, 225, 25 + LTEXT "A szinkronizálás csak akkor történhet meg, ha a számítógép fel van csatlakozva az internetre.", -1, 12, 114, 225, 25 END STRINGTABLE diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 2eb2d99df5a..f1cf65bf1fa 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -139,7 +139,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "A ReactOS ezen verziója az alábbi névre van regisztrálva:", IDC_ABOUT_REG_TO, 35, 115, 200, 10 + LTEXT "A ReactOS ezen verziója az alábbi névre van regisztrálva:", IDC_ABOUT_REG_TO, 35, 115, 207, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ @@ -207,7 +207,7 @@ BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Válassza ki a parancsikonhoz tartozó speciális tulajdonságokat.", -1, 5, 30, 210, 10 CHECKBOX "Futtatás más hitelesítő adatokkal", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 - LTEXT "Ez a beállítás lehetővé teszi hogy más felhasználóként futtassa ezt a parancsikont, vagy folytathatja saját magaként, miközben megvédi a számítógépét és adatait illetéktelen programtevékenységektől.", -1, 50, 60, 175, 40 + LTEXT "Ez a beállítás lehetővé teszi hogy más felhasználóként futtassa ezt a parancsikont, vagy folytathatja saját magaként, miközben megvédi a számítógépét és adatait illetéktelen programtevékenységektől.", -1, 47, 60, 178, 40 CHECKBOX "Futtatás külön memóriaterületen", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Mégse", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE @@ -384,7 +384,7 @@ BEGIN GROUPBOX "A kijelölt hely beállításai", -1, 10, 72, 220, 70 RADIOBUTTON "&Egyéni méret:", 14001, 20, 90, 80, 10, WS_TABSTOP EDITTEXT 14002, 116, 103, 50, 14, WS_TABSTOP | ES_NUMBER - LTEXT "&Maximális méret(MB):", -1, 20, 105, 70, 10 + LTEXT "&Maximális méret(MB):", -1, 20, 105, 77, 10 RADIOBUTTON "&Ne mozgassa a fájlokat a lomtárba. Törléskor azonnal távolítsa el azokat.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP AUTOCHECKBOX "&Törléskor jóváhagyás kérése", 14004, 20, 155, 140, 10, WS_TABSTOP END @@ -424,7 +424,7 @@ BEGIN AUTORADIOBUTTON "Megnyitás &dupla kattintással (kijelölés egy kattintással)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 195, 10 AUTORADIOBUTTON "Ikonok címének aláhúzása mint a &böngészőben", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP AUTORADIOBUTTON "Ikonok címének aláhúzása csak &rámutatáskor", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 - PUSHBUTTON "&Alapértelmezések visszaállítása", IDC_FOLDER_OPTIONS_RESTORE, 142, 175, 115, 14, WS_TABSTOP + PUSHBUTTON "&Alapértelmezések visszaállítása", IDC_FOLDER_OPTIONS_RESTORE, 132, 175, 125, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 @@ -434,7 +434,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Mappanézetek", -1, 7, 10, 249, 60 ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20 - LTEXT "Be tudja állítani a nézetet (mint részletek vagy csempe)\nerre a mappára vagy az összes mappára.", -1, 60, 20, 180, 20 + LTEXT "Be tudja állítani a nézetet (mint részletek vagy csempe)\nerre a mappára vagy az összes mappára.", -1, 56, 20, 197, 20 PUSHBUTTON "Összes &mappára", IDC_VIEW_APPLY_TO_ALL, 60, 50, 80, 14, WS_TABSTOP PUSHBUTTON "Összes mappa &visszaállítása", IDC_VIEW_RESET_ALL, 145, 50, 100, 14, WS_TABSTOP LTEXT "Haladó beállítások:", -1, 7, 80, 100, 10 @@ -498,11 +498,11 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL IDB_DLG_BG, IDC_STATIC, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 CONTROL IDB_REACTOS_FLAG, IDC_STATIC, "STATIC", SS_BITMAP, 176, 1, 32, 26 - PUSHBUTTON "&Switch User", IDC_SWITCH_USER_BUTTON, 55, 46, 22, 20, BS_OWNERDRAW | WS_DISABLED | WS_GROUP + PUSHBUTTON "&Felhasználóváltás", IDC_SWITCH_USER_BUTTON, 55, 46, 22, 20, BS_OWNERDRAW | WS_DISABLED | WS_GROUP PUSHBUTTON "&Kijelentkezés", IDC_LOG_OFF_BUTTON, 132, 46, 22, 20, BS_OWNERDRAW PUSHBUTTON "Mégse", IDCANCEL, 162, 103, 40, 12, WS_GROUP | BS_FLAT LTEXT "Kijelentkezés a ReactOS-ből", IDC_LOG_OFF_TEXT_STATIC, 4, 7, 165, 19 - CTEXT "Switch User", IDC_SWITCH_USER_STATIC, 41, 70, 51, 11 + CTEXT "Felhasználóváltás", IDC_SWITCH_USER_STATIC, 35, 70, 61, 11 CTEXT "Kijelentkezés", IDC_LOG_OFF_STATIC, 118, 70, 51, 11 END @@ -566,7 +566,7 @@ CAPTION "Automatikus lejátszás" FONT 8, "MS Shell Dlg" BEGIN ICON "", 1000, 5, 7, 21, 20 - LTEXT "A ReactOS minden alkalommal, amikor csatlakoztatja ezt az eszközt el tudja végezni ugyanazt a műveletet.", 1001, 32, 7, 190, 22 + LTEXT "A ReactOS minden alkalommal, amikor csatlakoztatja ezt az eszközt el tudja végezni ugyanazt a műveletet.", 1001, 32, 7, 192, 22 LTEXT "&Mit tegyen a ReactOS?", 1002, 32, 31, 190, 8 CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 187, 96 AUTOCHECKBOX "&Mindig hajtsa végre a kijelölt műveletet", 1004, 32, 143, 190, 8 @@ -692,7 +692,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Művelet:", -1, 5, 7, 150, 10 EDITTEXT IDC_ACTION_ACTION, 5, 20, 150, 14, ES_AUTOHSCROLL - LTEXT "A művelet elvégzésére használt &alkalmazás:", -1, 5, 42, 153, 10 + LTEXT "A művelet elvégzésére használt &alkalmazás:", -1, 5, 42, 158, 10 EDITTEXT IDC_ACTION_APP, 5, 55, 150, 14, ES_AUTOHSCROLL PUSHBUTTON "&Tallózás...", IDC_ACTION_BROWSE, 160, 60, 60, 14 AUTOCHECKBOX "&DDE használata", IDC_ACTION_USE_DDE, 10, 75, 103, 14 @@ -722,17 +722,17 @@ BEGIN END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 -CAPTION "Problem with Shortcut" +CAPTION "Probléma a parancsikonnal" STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" BEGIN ICON 0, IDC_LINK_PROBLEM_ICON, 5, 5, 0, 0 - LTEXT "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly.", IDC_LINK_PROBLEM_LABEL1, 35, 5, 210, 35 - LTEXT "Nearest match based on name, type, size, and date:", IDC_LINK_PROBLEM_LABEL2, 35, 45, 210, 35 - LTEXT "Do you want to fix this shortcut to point to this target or do you just want to delete it?", -1, 35, 85, 210, 30 - DEFPUSHBUTTON "&Fix it", IDOK, 55, 120, 60, 15, WS_DISABLED - PUSHBUTTON "&Delete it", IDYES, 120, 120, 60, 15 - PUSHBUTTON "Cancel", IDCANCEL, 185, 120, 60, 15 + LTEXT "A(z) '%s' elem, amire ez a parancsikon hivatkozik megváltozott vagy áthelyezték, emiatt ez a parancsikon a továbbiakban nem fog működni.", IDC_LINK_PROBLEM_LABEL1, 35, 5, 210, 35 + LTEXT "A legközelebbi ehhez hasonló, név, típus és dátum alapján:", IDC_LINK_PROBLEM_LABEL2, 35, 45, 210, 35 + LTEXT "Szeretné javítani a parancsikont hogy erre mutasson, vagy inkább törölné?", -1, 35, 85, 210, 30 + DEFPUSHBUTTON "&Javítás", IDOK, 55, 120, 60, 15, WS_DISABLED + PUSHBUTTON "&Törlés", IDYES, 120, 120, 60, 15 + PUSHBUTTON "Mégse", IDCANCEL, 185, 120, 60, 15 END STRINGTABLE @@ -781,8 +781,8 @@ BEGIN IDS_VIEW_SMALL "Kis képek" IDS_VIEW_LIST "Lista" IDS_VIEW_DETAILS "Részletek" - IDS_SELECT "Kiválaszt" - IDS_OPEN "Megnyit" + IDS_SELECT "Kiválasztás" + IDS_OPEN "Megnyitás" IDS_CREATELINK "Parancsikon létrehozása" IDS_COPY "Másolás" IDS_DELETE "Törlés" @@ -839,8 +839,8 @@ BEGIN IDS_FORMAT_COMPLETE "A formázás kész." /* Warning format system drive dialog strings */ - IDS_NO_FORMAT_TITLE "Cannot format this volume" - IDS_NO_FORMAT "This volume cannot be formatted! It contains important system files in order for ReactOS to run." + IDS_NO_FORMAT_TITLE "Nem lehet formázni ezt a kötetet" + IDS_NO_FORMAT "Nem lehet formázni ezt a kötetet! Fontos rendszerfájlokat tartalmaz, ami a ReactOS futtatásához szükséges." /* Run File dialog */ IDS_RUNDLG_ERROR "A futtatás párbeszédpanelt nem sikerült megjeleníteni (belső hiba)" @@ -1013,21 +1013,21 @@ BEGIN IDS_EDITING_ACTION "Művelet szerkesztése ehhez: " IDS_NO_ICONS "A fájl ('%s') nem tartalmaz ikonokat.\n\nVálasszon egy ikont a listából, vagy adjon meg egy másik fájlt." IDS_FILE_NOT_FOUND "A fájl ('%s') nem található." - IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." - IDS_COPYTOMENU "Copy to &folder..." - IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." - IDS_COPYITEMS "Copy Items" - IDS_COPYBUTTON "Copy" - IDS_MOVETOMENU "Mo&ve to folder..." - IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." - IDS_MOVEITEMS "Move Items" - IDS_MOVEBUTTON "Move" - - IDS_SYSTEMFOLDER "System Folder" + IDS_LINK_INVALID "A(z) '%s' elem, amire ez a parancsikon hivatkozik megváltozott vagy áthelyezték, emiatt ez a parancsikon a továbbiakban nem fog működni." + IDS_COPYTOMENU "Má&solás mappába..." + IDS_COPYTOTITLE "Válassza ki a helyet, ahová ezt másolni szeretné: '%s'. Majd kattintson a másolás gombra." + IDS_COPYITEMS "Elemek másolása" + IDS_COPYBUTTON "Másolás" + IDS_MOVETOMENU "Mo&zgatás mappába..." + IDS_MOVETOTITLE "Válassza ki a helyet, ahová ezt át szeretné helyezni: '%s'. Majd kattintson az áthelyezés gombra." + IDS_MOVEITEMS "Elemek áthelyezése" + IDS_MOVEBUTTON "Áthelyezés" + + IDS_SYSTEMFOLDER "Rendszermappa" /* For IDD_LOG_OFF_FANCY */ - IDS_LOG_OFF_DESC "Closes your programs and ends your ReactOS session." - IDS_SWITCH_USER_DESC "Lets another user log on while your programs and files remain open.\r\n\r\n(You can also switch users by pressing the Windows logo key + L.)" + IDS_LOG_OFF_DESC "Bezárja a programokat és befejezi az Ön ReactOS munkamenetét." + IDS_SWITCH_USER_DESC "Lehetővé teszi hogy egy másik felhasználó bejelentkezzen, miközben az Ön programjai és fájljai nyitva maradnak.\r\n\r\n(A felhasználóváltás a Windows logó gomb + L gyorsbillentyűvel is működik.)" IDS_LOG_OFF_TITLE "Kijelentkezés" - IDS_SWITCH_USER_TITLE "Switch User" + IDS_SWITCH_USER_TITLE "Felhasználóváltás" END diff --git a/win32ss/user/user32/lang/hu-HU.rc b/win32ss/user/user32/lang/hu-HU.rc index c50f54fe448..5af2147a474 100644 --- a/win32ss/user/user32/lang/hu-HU.rc +++ b/win32ss/user/user32/lang/hu-HU.rc @@ -7,7 +7,7 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT SELWINDOW DIALOGEX 20, 20, 220, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Select Window" +CAPTION "Ablak kiválasztása" BEGIN LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL PUSHBUTTON "&OK", 1, 60, 120, 40, 15, BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP @@ -20,39 +20,39 @@ EDITMENU MENU BEGIN POPUP "DUMMY" BEGIN - MENUITEM "&Visszavon", EM_UNDO + MENUITEM "&Visszavonás", EM_UNDO MENUITEM SEPARATOR MENUITEM "K&ivágás", WM_CUT - MENUITEM "&Másol", WM_COPY - MENUITEM "&Beilleszt", WM_PASTE - MENUITEM "&Töröl", WM_CLEAR + MENUITEM "&Másolás", WM_COPY + MENUITEM "&Beillesztés", WM_PASTE + MENUITEM "&Törlés", WM_CLEAR MENUITEM SEPARATOR - MENUITEM "Mindet &Kijelöl", EM_SETSEL + MENUITEM "Mindet &kijelöl", EM_SETSEL END END SYSMENU MENU BEGIN - MENUITEM "&Vissza állít", SC_RESTORE - MENUITEM "Át &helyez", SC_MOVE - MENUITEM "&Méret", SC_SIZE + MENUITEM "&Visszaállítás", SC_RESTORE + MENUITEM "Át&helyezés", SC_MOVE + MENUITEM "&Méretezés", SC_SIZE MENUITEM "&Kis méret", SC_MINIMIZE MENUITEM "&Nagy méret", SC_MAXIMIZE MENUITEM SEPARATOR - MENUITEM "&Bezár\tAlt+F4", SC_CLOSE + MENUITEM "&Bezárás\tAlt+F4", SC_CLOSE END SYSMENUMDI MENU BEGIN - MENUITEM "&Vissza állít", SC_RESTORE - MENUITEM "Át &helyez", SC_MOVE - MENUITEM "&Méret", SC_SIZE + MENUITEM "&Visszaállítás", SC_RESTORE + MENUITEM "Át&helyezés", SC_MOVE + MENUITEM "&Méretezés", SC_SIZE MENUITEM "&Kis méret", SC_MINIMIZE MENUITEM "&Nagy méret", SC_MAXIMIZE MENUITEM SEPARATOR - MENUITEM "&Bezár\tCtrl+F4", SC_CLOSE + MENUITEM "&Bezárás\tCtrl+F4", SC_CLOSE MENUITEM SEPARATOR - MENUITEM "&Előre\tCtrl+F6", SC_NEXTWINDOW + MENUITEM "&Következő\tCtrl+F6", SC_NEXTWINDOW END /* Strings */ @@ -60,20 +60,20 @@ END STRINGTABLE BEGIN IDS_ERROR "Hiba" - IDS_NOT_RESPONDING " (Not Responding)" - IDS_ASK_TERMINATE "This application is not responding. Do you want to terminate it?" - IDS_HUNG_UP_TITLE "Hung up!" + IDS_NOT_RESPONDING " (nem válaszol)" + IDS_ASK_TERMINATE "Ez az alkalmazás nem válaszol. Szeretné leállítani ezt a folyamatot?" + IDS_HUNG_UP_TITLE "Lefagyott!" IDS_OK "OK" IDS_CANCEL "Mégse" - IDS_ABORT "&Megszakít" + IDS_ABORT "&Megszakítás" IDS_RETRY "&Újra" IDS_IGNORE "&Tovább" IDS_YES "&Igen" IDS_NO "&Nem" - IDS_CLOSE "&Bezár" + IDS_CLOSE "&Bezárás" IDS_HELP "Súgó" IDS_TRYAGAIN "&Újra" - IDS_CONTINUE "&Folytat" + IDS_CONTINUE "&Folytatás" END STRINGTABLE

1 0

[reactos] 01/01: [BOOTDATA][CMAKE] Sort 2 directories out
by Serge Gautherie 12 Apr '21

12 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ddbfdeb57acefe8458fa… commit 8ddbfdeb57acefe8458fa59084f7a880d64eb6ed Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Nov 12 01:22:46 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Apr 12 17:40:18 2021 +0200 [BOOTDATA][CMAKE] Sort 2 directories out winsxs\x86_reactos.newapi_6595b64144ccf1df_1.0.0.0_none_deadbeef: removed: silently added on 8d30456 and never used. bin\suppl: moved: to 60 from 80. --- boot/bootdata/packages/reactos.dff.in | 7 +++++-- sdk/cmake/CMakeMacros.cmake | 4 +--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/boot/bootdata/packages/reactos.dff.in b/boot/bootdata/packages/reactos.dff.in index cf80abab0e6..950d98acf49 100644 --- a/boot/bootdata/packages/reactos.dff.in +++ b/boot/bootdata/packages/reactos.dff.in @@ -17,6 +17,10 @@ Signature = "$Windows NT$" ; Directories relative to the installation directory. ; For specifying absolute directories, use the SystemPartitionFiles section, ; or use names starting with \. +; +; WARNING! +; Please keep the numbering in this list in sync with +; sdk/cmake/CMakeMacros.cmake [Directories] 1 = "\" 2 = system32 @@ -26,7 +30,6 @@ Signature = "$Windows NT$" 6 = inf 7 = bin 8 = bin\testdata -80 = bin\suppl 9 = media 10 = Microsoft.NET 11 = Microsoft.NET\Framework @@ -78,7 +81,7 @@ Signature = "$Windows NT$" 57 = winsxs\x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef 58 = winsxs\x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef 59 = winsxs\x86_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef -60 = winsxs\x86_reactos.newapi_6595b64144ccf1df_1.0.0.0_none_deadbeef +60 = bin\suppl 61 = winsxs\x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef 62 = Resources\Themes\Modern 63 = 3rdParty diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index 3f9a5486c9e..370673676e0 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -107,8 +107,6 @@ macro(dir_to_num dir var) set(${var} 7) elseif(${dir} STREQUAL reactos/bin/testdata) set(${var} 8) - elseif(${dir} STREQUAL reactos/bin/suppl) - set(${var} 80) elseif(${dir} STREQUAL reactos/media) set(${var} 9) elseif(${dir} STREQUAL reactos/Microsoft.NET) @@ -211,7 +209,7 @@ macro(dir_to_num dir var) set(${var} 58) elseif(${dir} STREQUAL reactos/winsxs/x86_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef) set(${var} 59) - elseif(${dir} STREQUAL reactos/winsxs/x86_reactos.newapi_6595b64144ccf1df_1.0.0.0_none_deadbeef) + elseif(${dir} STREQUAL reactos/bin/suppl) set(${var} 60) elseif(${dir} STREQUAL reactos/winsxs/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef) set(${var} 61)

1 0

[reactos] 03/03: [SETUPAPI] Correctly enumerate non-installed devices in SetupDiGetClassDevsExW
by Hervé Poussineau 11 Apr '21

11 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e044df87366d52fa5dfce… commit e044df87366d52fa5dfce50e994e3d8e2a2965c7 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Apr 11 15:10:47 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sun Apr 11 15:12:02 2021 +0200 [SETUPAPI] Correctly enumerate non-installed devices in SetupDiGetClassDevsExW Always try to read the correct device GUID from registry, even if GUID filter is disabled. CORE-17527 --- dll/win32/setupapi/devclass.c | 51 ++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/dll/win32/setupapi/devclass.c b/dll/win32/setupapi/devclass.c index 56398262437..61aa7eb8329 100644 --- a/dll/win32/setupapi/devclass.c +++ b/dll/win32/setupapi/devclass.c @@ -179,38 +179,35 @@ SETUP_CreateDevicesList( } /* Retrieve GUID of this device */ - if (Class) + ClassGuidBufferSize = sizeof(ClassGuidBuffer); + cr = CM_Get_DevNode_Registry_Property_ExW(dnDevInst, + CM_DRP_CLASSGUID, + NULL, + ClassGuidBuffer, + &ClassGuidBufferSize, + 0, + list->hMachine); + if (cr == CR_SUCCESS) { - ClassGuidBufferSize = sizeof(ClassGuidBuffer); - cr = CM_Get_DevNode_Registry_Property_ExW(dnDevInst, - CM_DRP_CLASSGUID, - NULL, - ClassGuidBuffer, - &ClassGuidBufferSize, - 0, - list->hMachine); - if (cr == CR_SUCCESS) + ClassGuidBuffer[MAX_GUID_STRING_LEN - 2] = '\0'; /* Replace the } by a NULL character */ + if (UuidFromStringW(&ClassGuidBuffer[1], &ClassGuid) != RPC_S_OK) { - ClassGuidBuffer[MAX_GUID_STRING_LEN - 2] = '\0'; /* Replace the } by a NULL character */ - if (UuidFromStringW(&ClassGuidBuffer[1], &ClassGuid) != RPC_S_OK) - { - /* Bad GUID, skip the entry */ - ERR("Invalid ClassGUID '%S' for device %S\n", ClassGuidBuffer, InstancePath); - continue; - } - } - else - { - TRACE("Using default class GUID_NULL for device %S\n", InstancePath); - memcpy(&ClassGuid, &GUID_NULL, sizeof(GUID)); - } - - if (!IsEqualIID(&ClassGuid, Class)) - { - TRACE("Skipping %S due to wrong class GUID\n", InstancePath); + /* Bad GUID, skip the entry */ + ERR("Invalid ClassGUID '%S' for device %S\n", ClassGuidBuffer, InstancePath); continue; } } + else + { + TRACE("Using default class GUID_NULL for device %S\n", InstancePath); + memcpy(&ClassGuid, &GUID_NULL, sizeof(GUID)); + } + + if (Class && !IsEqualIID(&ClassGuid, Class)) + { + TRACE("Skipping %S due to wrong class GUID\n", InstancePath); + continue; + } /* Good! Create a device info element */ if (!CreateDeviceInfo(list, InstancePath, &ClassGuid, &deviceInfo))

1 0

[reactos] 02/03: [SETUPAPI] Reimplement SetupDiBuildClassInfoListExW using CM_* functions
by Hervé Poussineau 11 Apr '21

11 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f9df7af28a85eccb916b6… commit f9df7af28a85eccb916b6decf95163418e27f04e Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Apr 11 11:46:41 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sun Apr 11 15:12:02 2021 +0200 [SETUPAPI] Reimplement SetupDiBuildClassInfoListExW using CM_* functions We can now enumerate device classes on other computers. --- dll/win32/setupapi/devinst.c | 71 +++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 41 deletions(-) diff --git a/dll/win32/setupapi/devinst.c b/dll/win32/setupapi/devinst.c index 082be95386e..a20c96b9c07 100644 --- a/dll/win32/setupapi/devinst.c +++ b/dll/win32/setupapi/devinst.c @@ -725,13 +725,12 @@ BOOL WINAPI SetupDiBuildClassInfoListExW( LPCWSTR MachineName, PVOID Reserved) { - WCHAR szKeyName[40]; - HKEY hClassesKey = INVALID_HANDLE_VALUE; + GUID CurrentClassGuid; HKEY hClassKey; - DWORD dwLength; DWORD dwIndex; - LONG lError; DWORD dwGuidListIndex = 0; + HMACHINE hMachine = NULL; + CONFIGRET cr; TRACE("%s(0x%lx %p %lu %p %s %p)\n", __FUNCTION__, Flags, ClassGuidList, ClassGuidListSize, RequiredSize, debugstr_w(MachineName), Reserved); @@ -747,39 +746,36 @@ BOOL WINAPI SetupDiBuildClassInfoListExW( return FALSE; } - hClassesKey = SetupDiOpenClassRegKeyExW(NULL, - KEY_ENUMERATE_SUB_KEYS, - DIOCR_INSTALLER, - MachineName, - Reserved); - if (hClassesKey == INVALID_HANDLE_VALUE) + if (MachineName) { - return FALSE; + cr = CM_Connect_MachineW(MachineName, &hMachine); + if (cr != CR_SUCCESS) + { + SetLastError(GetErrorCodeFromCrCode(cr)); + return FALSE; + } } for (dwIndex = 0; ; dwIndex++) { - dwLength = 40; - lError = RegEnumKeyExW(hClassesKey, - dwIndex, - szKeyName, - &dwLength, - NULL, - NULL, - NULL, - NULL); - TRACE("RegEnumKeyExW() returns %d\n", lError); - if (lError == ERROR_SUCCESS || lError == ERROR_MORE_DATA) + cr = CM_Enumerate_Classes_Ex(dwIndex, + &CurrentClassGuid, + 0, + hMachine); + if (cr == CR_SUCCESS) { - TRACE("Key name: %s\n", debugstr_w(szKeyName)); - - if (RegOpenKeyExW(hClassesKey, - szKeyName, - 0, - KEY_QUERY_VALUE, - &hClassKey)) + TRACE("Guid: %s\n", debugstr_guid(&CurrentClassGuid)); + if (CM_Open_Class_Key_ExW(&CurrentClassGuid, + NULL, + KEY_QUERY_VALUE, + RegDisposition_OpenExisting, + &hClassKey, + CM_OPEN_CLASS_KEY_INSTALLER, + hMachine) != CR_SUCCESS) { - RegCloseKey(hClassesKey); + SetLastError(GetErrorCodeFromCrCode(cr)); + if (hMachine) + CM_Disconnect_Machine(hMachine); return FALSE; } @@ -823,27 +819,20 @@ BOOL WINAPI SetupDiBuildClassInfoListExW( RegCloseKey(hClassKey); - TRACE("Guid: %s\n", debugstr_w(szKeyName)); if (dwGuidListIndex < ClassGuidListSize) { - if (szKeyName[0] == '{' && szKeyName[37] == '}') - { - szKeyName[37] = 0; - } - TRACE("Guid: %p\n", &szKeyName[1]); - - UuidFromStringW(&szKeyName[1], - &ClassGuidList[dwGuidListIndex]); + ClassGuidList[dwGuidListIndex] = CurrentClassGuid; } dwGuidListIndex++; } - if (lError != ERROR_SUCCESS) + if (cr != ERROR_SUCCESS) break; } - RegCloseKey(hClassesKey); + if (hMachine) + CM_Disconnect_Machine(hMachine); if (RequiredSize != NULL) *RequiredSize = dwGuidListIndex;

1 0

[reactos] 01/03: [SETUPAPI] Fix CM_Open_Class_Key_ExW, when pClassGuid is used
by Hervé Poussineau 11 Apr '21

11 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8da00cd97c22016976bab… commit 8da00cd97c22016976bab93c41a1299348bb4605 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Apr 11 11:37:23 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sun Apr 11 15:12:02 2021 +0200 [SETUPAPI] Fix CM_Open_Class_Key_ExW, when pClassGuid is used Braces around GUID were missing. --- dll/win32/setupapi/cfgmgr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c index b052553e9ac..b63feb46c44 100644 --- a/dll/win32/setupapi/cfgmgr.c +++ b/dll/win32/setupapi/cfgmgr.c @@ -35,7 +35,8 @@ I_ScPnPGetServiceName(IN SERVICE_STATUS_HANDLE hServiceStatus, /* Registry key and value names */ -static const WCHAR Backslash[] = {'\\', 0}; +static const WCHAR BackslashOpenBrace[] = {'\\', '{', 0}; +static const WCHAR CloseBrace[] = {'}', 0}; static const WCHAR Class[] = {'C','l','a','s','s',0}; static const WCHAR ControlClass[] = {'S','y','s','t','e','m','\\', @@ -6343,8 +6344,9 @@ CM_Open_Class_Key_ExW( return CR_INVALID_DATA; } - lstrcatW(szKeyName, Backslash); + lstrcatW(szKeyName, BackslashOpenBrace); lstrcatW(szKeyName, lpGuidString); + lstrcatW(szKeyName, CloseBrace); } if (Disposition == RegDisposition_OpenAlways)

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