Ros-diffs August 2018

ros-diffs@reactos.org

32 participants
304 discussions

01/18: [USER32] Implement the special case in CreateWindowStationW() that, when no window station name is provided (either NULL or empty string), does not open any WindowStation directory handle to be passed to the Win32k function.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c0564063d6d3e4c78520… commit 9c0564063d6d3e4c78520a7742d463a2710b63d6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jun 16 19:43:59 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 19 22:18:22 2018 +0200 [USER32] Implement the special case in CreateWindowStationW() that, when no window station name is provided (either NULL or empty string), does not open any WindowStation directory handle to be passed to the Win32k function. Observed via API monitoring. This corresponds to the case where Win32k creates a window station whose name is based on the logon session identifier for the calling process. Add also a note about the fact that we need to use a per-session-based WindowStation directory name, as done already in Win32k. CORE-11933 and PR #621. --- win32ss/user/user32/misc/winsta.c | 53 ++++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 17 deletions(-) diff --git a/win32ss/user/user32/misc/winsta.c b/win32ss/user/user32/misc/winsta.c index 24f6d893b2..7308ad1461 100644 --- a/win32ss/user/user32/misc/winsta.c +++ b/win32ss/user/user32/misc/winsta.c @@ -60,32 +60,49 @@ CreateWindowStationW( NTSTATUS Status; HWINSTA hWinSta; UNICODE_STRING WindowStationName; + // FIXME: We should cache a per-session directory (see ntuser\winsta.c!UserCreateWinstaDirectory). UNICODE_STRING WindowStationsDir = RTL_CONSTANT_STRING(L"\\Windows\\WindowStations"); OBJECT_ATTRIBUTES ObjectAttributes; HANDLE hWindowStationsDir; - /* Open WindowStations directory */ - InitializeObjectAttributes(&ObjectAttributes, - &WindowStationsDir, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); + /* + * If provided, the window station name is always relative to the + * current user session's WindowStations directory. + * Otherwise (the window station name is NULL or an empty string), + * pass both an empty string and no WindowStations directory handle + * to win32k, so that it will create a window station whose name + * is based on the logon session identifier for the calling process. + */ + if (lpwinsta && *lpwinsta) + { + /* Open WindowStations directory */ + InitializeObjectAttributes(&ObjectAttributes, + &WindowStationsDir, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenDirectoryObject(&hWindowStationsDir, + DIRECTORY_CREATE_OBJECT, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + ERR("Failed to open WindowStations directory\n"); + return NULL; + } - Status = NtOpenDirectoryObject(&hWindowStationsDir, - DIRECTORY_CREATE_OBJECT, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) + RtlInitUnicodeString(&WindowStationName, lpwinsta); + } + else { - ERR("Failed to open WindowStations directory\n"); - return NULL; + lpwinsta = NULL; + hWindowStationsDir = NULL; } - RtlInitUnicodeString(&WindowStationName, lpwinsta); - /* Create the window station object */ InitializeObjectAttributes(&ObjectAttributes, - &WindowStationName, - OBJ_CASE_INSENSITIVE, + lpwinsta ? &WindowStationName : NULL, + OBJ_CASE_INSENSITIVE | OBJ_OPENIF, hWindowStationsDir, NULL); @@ -99,7 +116,8 @@ CreateWindowStationW( dwDesiredAccess, 0, 0, 0, 0, 0); - NtClose(hWindowStationsDir); + if (hWindowStationsDir) + NtClose(hWindowStationsDir); return hWinSta; } @@ -349,6 +367,7 @@ OpenWindowStationW( NTSTATUS Status; HWINSTA hWinSta; UNICODE_STRING WindowStationName; + // FIXME: We should cache a per-session directory (see ntuser\winsta.c!UserCreateWinstaDirectory). UNICODE_STRING WindowStationsDir = RTL_CONSTANT_STRING(L"\\Windows\\WindowStations"); OBJECT_ATTRIBUTES ObjectAttributes; HANDLE hWindowStationsDir;

6 years, 1 month

01/01: CORE-14513 [CMAKE] Remove modules that are shipped with cmake (#575)

by Andrew Cook

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8cd5c4e7bdd269c2c16fd… commit 8cd5c4e7bdd269c2c16fd55c894fb7c2d6d49892 Author: Andrew Cook <ariscop(a)gmail.com> AuthorDate: Mon Aug 20 06:01:31 2018 +1000 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Aug 19 22:01:31 2018 +0200 CORE-14513 [CMAKE] Remove modules that are shipped with cmake (#575) * Remove unused cmake modules - Both are unedited versions of modules provided by cmake itself * Remove Compiler/GNU.cmake - Only chang was various _INIT flags, which are handled via CMAKE_USER_MAKE_RULES_OVERRIDE instead * Remove Platform/Windows.cmake - There's no clear explination for this file being in reactos and is simply an old version of the one in cmake * Remove Platform/Windows-MSVC.cmake - _INIT variable changes moved to overrides-msvc.cmake Remove /implib from link commands * Remove CMakeDetermineASMCompiler.cmake - Only change from 3.2 is the addition of a compiler list for the generic ASM dialect, but toolchain files explicitly set a compiler so the list is never used --- CMakeLists.txt | 14 +- overrides-gcc.cmake | 6 + overrides-msvc.cmake | 14 ++ sdk/cmake/CMakeDetermineASMCompiler.cmake | 346 ------------------------------ sdk/cmake/CMakeDetermineCompilerId.cmake | 315 --------------------------- sdk/cmake/CMakeParseArguments.cmake | 157 -------------- sdk/cmake/Compiler/GNU.cmake | 63 ------ sdk/cmake/Platform/Windows-MSVC.cmake | 261 ---------------------- sdk/cmake/Platform/Windows.cmake | 36 ---- sdk/cmake/msvc.cmake | 6 + toolchain-gcc.cmake | 2 + toolchain-msvc.cmake | 2 + 12 files changed, 35 insertions(+), 1187 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 90e76be2f5..44e85661c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,9 +9,6 @@ endif() # Don't escape preprocessor definition values added via add_definitions cmake_policy(SET CMP0005 OLD) -# Shadow cmake provided modules -cmake_policy(SET CMP0017 OLD) - # Honor CMAKE_SHARED_LIBRARY_<Lang>_FLAGS variable. cmake_policy(SET CMP0018 OLD) @@ -68,12 +65,6 @@ if(MSVC_IDE) add_compile_flags("/MP") endif() -# We don't need CMake importlib handling. -# FIXME: Remove the MSVC_IDE condition when the upcoming RosBE lands. -if(NOT MSVC_IDE) - unset(CMAKE_IMPORT_LIBRARY_SUFFIX) -endif() - # Bison and Flex support # include(sdk/cmake/bison-flex.cmake) @@ -115,6 +106,11 @@ if(NOT CMAKE_CROSSCOMPILING) endif() else() + # We don't need CMake importlib handling. + # FIXME: Remove the MSVC_IDE condition when the upcoming RosBE lands. + if(NOT MSVC_IDE) + unset(CMAKE_IMPORT_LIBRARY_SUFFIX) + endif() if(NEW_STYLE_BUILD) include(sdk/cmake/host-tools.cmake) diff --git a/overrides-gcc.cmake b/overrides-gcc.cmake new file mode 100644 index 0000000000..d7f7d91927 --- /dev/null +++ b/overrides-gcc.cmake @@ -0,0 +1,6 @@ +foreach(lang C CXX ASM) + set(CMAKE_${lang}_FLAGS_DEBUG "") + set(CMAKE_${lang}_FLAGS_MINSIZEREL "-Os -DNDEBUG") + set(CMAKE_${lang}_FLAGS_RELEASE "") + set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG") +endforeach() diff --git a/overrides-msvc.cmake b/overrides-msvc.cmake new file mode 100644 index 0000000000..fb604118bd --- /dev/null +++ b/overrides-msvc.cmake @@ -0,0 +1,14 @@ +set(CMAKE_CXX_FLAGS_DEBUG_INIT "") +set(CMAKE_CXX_FLAGS_INIT "") +set(CMAKE_CXX_FLAGS_RELEASE_INIT "") +set(CMAKE_CXX_STANDARD_LIBRARIES_INIT "") +set(CMAKE_C_FLAGS_DEBUG_INIT "") +set(CMAKE_C_FLAGS_INIT "") +set(CMAKE_C_FLAGS_RELEASE_INIT "") +set(CMAKE_C_STANDARD_LIBRARIES_INIT "") +set(CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug") +set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug") +set(CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT "/debug") +set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug") +set(CMAKE_MODULE_LINKER_FLAGS_DEBUG_INIT "/debug") +set(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug") diff --git a/sdk/cmake/CMakeDetermineASMCompiler.cmake b/sdk/cmake/CMakeDetermineASMCompiler.cmake deleted file mode 100644 index df3ecdc881..0000000000 --- a/sdk/cmake/CMakeDetermineASMCompiler.cmake +++ /dev/null @@ -1,346 +0,0 @@ - -#============================================================================= -# Copyright 2007-2009 Kitware, Inc. -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# (To distribute this file outside of CMake, substitute the full -# License text for the above reference.) - -if(CMAKE_VERSION VERSION_LESS 2.8.10) - -# determine the compiler to use for ASM programs - -IF(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER) - # prefer the environment variable ASM - IF($ENV{ASM${ASM_DIALECT}} MATCHES ".+") - SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT "$ENV{ASM${ASM_DIALECT}}") - ENDIF($ENV{ASM${ASM_DIALECT}} MATCHES ".+") - - # finally list compilers to try - IF("ASM${ASM_DIALECT}" STREQUAL "ASM") # the generic assembler support - - IF(CMAKE_ASM_COMPILER_INIT) - SET(CMAKE_ASM_COMPILER_LIST ${CMAKE_ASM_COMPILER_INIT}) - ELSE(CMAKE_ASM_COMPILER_INIT) - - IF(CMAKE_C_COMPILER) - SET(CMAKE_ASM_COMPILER "${CMAKE_C_COMPILER}" CACHE FILEPATH "The ASM compiler") - SET(CMAKE_ASM_COMPILER_ID "${CMAKE_C_COMPILER_ID}") - ELSEIF(CMAKE_CXX_COMPILER) - SET(CMAKE_ASM_COMPILER "${CMAKE_CXX_COMPILER}" CACHE FILEPATH "The ASM compiler") - SET(CMAKE_ASM_COMPILER_ID "${CMAKE_CXX_COMPILER_ID}") - ELSE(CMAKE_CXX_COMPILER) - # List all default C and CXX compilers - SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_LIST ${_CMAKE_TOOLCHAIN_PREFIX}gcc ${_CMAKE_TOOLCHAIN_PREFIX}cc cl bcc xlc - ${_CMAKE_TOOLCHAIN_PREFIX}c++ ${_CMAKE_TOOLCHAIN_PREFIX}g++ CC aCC cl bcc xlC) - ENDIF(CMAKE_C_COMPILER) - - ENDIF(CMAKE_ASM_COMPILER_INIT) - - - ELSE("ASM${ASM_DIALECT}" STREQUAL "ASM") # some specific assembler "dialect" - - IF(CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT) - SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_LIST ${CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT}) - ELSE(CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT) - MESSAGE(FATAL_ERROR "CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT must be preset !") - ENDIF(CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT) - - ENDIF("ASM${ASM_DIALECT}" STREQUAL "ASM") - - - # Find the compiler. - IF (_CMAKE_USER_CXX_COMPILER_PATH OR _CMAKE_USER_C_COMPILER_PATH) - FIND_PROGRAM(CMAKE_ASM${ASM_DIALECT}_COMPILER NAMES ${CMAKE_ASM${ASM_DIALECT}_COMPILER_LIST} PATHS ${_CMAKE_USER_C_COMPILER_PATH} ${_CMAKE_USER_CXX_COMPILER_PATH} DOC "Assembler" NO_DEFAULT_PATH) - ENDIF (_CMAKE_USER_CXX_COMPILER_PATH OR _CMAKE_USER_C_COMPILER_PATH) - FIND_PROGRAM(CMAKE_ASM${ASM_DIALECT}_COMPILER NAMES ${CMAKE_ASM${ASM_DIALECT}_COMPILER_LIST} PATHS ${_CMAKE_TOOLCHAIN_LOCATION} DOC "Assembler") - -ELSE(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER) - - # we only get here if CMAKE_ASM${ASM_DIALECT}_COMPILER was specified using -D or a pre-made CMakeCache.txt - # (e.g. via ctest) or set in CMAKE_TOOLCHAIN_FILE - # - # if a compiler was specified by the user but without path, - # now try to find it with the full path - # if it is found, force it into the cache, - # if not, don't overwrite the setting (which was given by the user) with "NOTFOUND" - GET_FILENAME_COMPONENT(_CMAKE_USER_ASM${ASM_DIALECT}_COMPILER_PATH "${CMAKE_ASM${ASM_DIALECT}_COMPILER}" PATH) - IF(NOT _CMAKE_USER_ASM${ASM_DIALECT}_COMPILER_PATH) - FIND_PROGRAM(CMAKE_ASM${ASM_DIALECT}_COMPILER_WITH_PATH NAMES ${CMAKE_ASM${ASM_DIALECT}_COMPILER}) - MARK_AS_ADVANCED(CMAKE_ASM${ASM_DIALECT}_COMPILER_WITH_PATH) - IF(CMAKE_ASM${ASM_DIALECT}_COMPILER_WITH_PATH) - SET(CMAKE_ASM${ASM_DIALECT}_COMPILER ${CMAKE_ASM${ASM_DIALECT}_COMPILER_WITH_PATH} CACHE FILEPATH "Assembler" FORCE) - ENDIF(CMAKE_ASM${ASM_DIALECT}_COMPILER_WITH_PATH) - ENDIF(NOT _CMAKE_USER_ASM${ASM_DIALECT}_COMPILER_PATH) -ENDIF(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER) -MARK_AS_ADVANCED(CMAKE_ASM${ASM_DIALECT}_COMPILER) - -IF (NOT _CMAKE_TOOLCHAIN_LOCATION) - GET_FILENAME_COMPONENT(_CMAKE_TOOLCHAIN_LOCATION "${CMAKE_ASM${ASM_DIALECT}_COMPILER}" PATH) -ENDIF (NOT _CMAKE_TOOLCHAIN_LOCATION) - - -IF(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER_ID) - - # Table of per-vendor compiler id flags with expected output. - LIST(APPEND CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDORS GNU ) - SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_GNU "--version") - SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_GNU "(GNU assembler)|(GCC)|(Free Software Foundation)") - - LIST(APPEND CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDORS HP ) - SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_HP "-V") - SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_HP "HP C") - - LIST(APPEND CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDORS Intel ) - SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_Intel "--version") - SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_Intel "(ICC)") - - LIST(APPEND CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDORS SunPro ) - SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_SunPro "-V") - SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_SunPro "Sun C") - - LIST(APPEND CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDORS XL ) - SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_XL "-qversion") - SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_XL "XL C") - - LIST(APPEND CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDORS TI_DSP ) - SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_TI_DSP "-h") - SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_TI_DSP "Texas Instruments") - - LIST(APPEND CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDORS VISUAL) - SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_VISUAL "/?") - SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_VISUAL "Microsoft Corporation") - - INCLUDE(CMakeDetermineCompilerId) - CMAKE_DETERMINE_COMPILER_ID_VENDOR(ASM${ASM_DIALECT}) - -ENDIF() - -IF(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID) - MESSAGE(STATUS "The ASM${ASM_DIALECT} compiler identification is ${CMAKE_ASM${ASM_DIALECT}_COMPILER_ID}") -ELSE(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID) - MESSAGE(STATUS "The ASM${ASM_DIALECT} compiler identification is unknown") -ENDIF(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID) - - - -# If we have a gas/as cross compiler, they have usually some prefix, like -# e.g. powerpc-linux-gas, arm-elf-gas or i586-mingw32msvc-gas , optionally -# with a 3-component version number at the end -# The other tools of the toolchain usually have the same prefix -# NAME_WE cannot be used since then this test will fail for names lile -# "arm-unknown-nto-qnx6.3.0-gas.exe", where BASENAME would be -# "arm-unknown-nto-qnx6" instead of the correct "arm-unknown-nto-qnx6.3.0-" -IF (NOT _CMAKE_TOOLCHAIN_PREFIX) - GET_FILENAME_COMPONENT(COMPILER_BASENAME "${CMAKE_ASM${ASM_DIALECT}_COMPILER}" NAME) - IF (COMPILER_BASENAME MATCHES "^(.+-)g?as(-[0-9]+\\.[0-9]+\\.[0-9]+)?(\\.exe)?$") - SET(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_MATCH_1}) - ENDIF (COMPILER_BASENAME MATCHES "^(.+-)g?as(-[0-9]+\\.[0-9]+\\.[0-9]+)?(\\.exe)?$") -ENDIF (NOT _CMAKE_TOOLCHAIN_PREFIX) - -# Now try the C compiler regexp: -IF (NOT _CMAKE_TOOLCHAIN_PREFIX) - IF (COMPILER_BASENAME MATCHES "^(.+-)g?cc(-[0-9]+\\.[0-9]+\\.[0-9]+)?(\\.exe)?$") - SET(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_MATCH_1}) - ENDIF (COMPILER_BASENAME MATCHES "^(.+-)g?cc(-[0-9]+\\.[0-9]+\\.[0-9]+)?(\\.exe)?$") -ENDIF (NOT _CMAKE_TOOLCHAIN_PREFIX) - -# Finally try the CXX compiler regexp: -IF (NOT _CMAKE_TOOLCHAIN_PREFIX) - IF (COMPILER_BASENAME MATCHES "^(.+-)[gc]\\+\\+(-[0-9]+\\.[0-9]+\\.[0-9]+)?(\\.exe)?$") - SET(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_MATCH_1}) - ENDIF (COMPILER_BASENAME MATCHES "^(.+-)[gc]\\+\\+(-[0-9]+\\.[0-9]+\\.[0-9]+)?(\\.exe)?$") -ENDIF (NOT _CMAKE_TOOLCHAIN_PREFIX) - - -INCLUDE(CMakeFindBinUtils) - -SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_ENV_VAR "ASM${ASM_DIALECT}") - -IF(CMAKE_ASM${ASM_DIALECT}_COMPILER) - MESSAGE(STATUS "Found assembler: ${CMAKE_ASM${ASM_DIALECT}_COMPILER}") -ELSE(CMAKE_ASM${ASM_DIALECT}_COMPILER) - MESSAGE(STATUS "Didn't find assembler") -ENDIF(CMAKE_ASM${ASM_DIALECT}_COMPILER) - - -SET(_CMAKE_ASM_COMPILER "${CMAKE_ASM${ASM_DIALECT}_COMPILER}") -SET(_CMAKE_ASM_COMPILER_ID "${CMAKE_ASM${ASM_DIALECT}_COMPILER_ID}") -SET(_CMAKE_ASM_COMPILER_ARG1 "${CMAKE_ASM${ASM_DIALECT}_COMPILER_ARG1}") -SET(_CMAKE_ASM_COMPILER_ENV_VAR "${CMAKE_ASM${ASM_DIALECT}_COMPILER_ENV_VAR}") - -# configure variables set in this file for fast reload later on -CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeASMCompiler.cmake.in - ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeASM${ASM_DIALECT}Compiler.cmake IMMEDIATE @ONLY) - -SET(_CMAKE_ASM_COMPILER) -SET(_CMAKE_ASM_COMPILER_ARG1) -SET(_CMAKE_ASM_COMPILER_ENV_VAR) - -else() - -# determine the compiler to use for ASM programs - -include(${CMAKE_ROOT}/Modules/CMakeDetermineCompiler.cmake) - -if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER) - # prefer the environment variable ASM - if($ENV{ASM${ASM_DIALECT}} MATCHES ".+") - set(CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT "$ENV{ASM${ASM_DIALECT}}") - endif() - - # finally list compilers to try - if("ASM${ASM_DIALECT}" STREQUAL "ASM") # the generic assembler support - if(NOT CMAKE_ASM_COMPILER_INIT) - if(CMAKE_C_COMPILER) - set(CMAKE_ASM_COMPILER "${CMAKE_C_COMPILER}" CACHE FILEPATH "The ASM compiler") - set(CMAKE_ASM_COMPILER_ID "${CMAKE_C_COMPILER_ID}") - elseif(CMAKE_CXX_COMPILER) - set(CMAKE_ASM_COMPILER "${CMAKE_CXX_COMPILER}" CACHE FILEPATH "The ASM compiler") - set(CMAKE_ASM_COMPILER_ID "${CMAKE_CXX_COMPILER_ID}") - else() - # List all default C and CXX compilers - set(CMAKE_ASM${ASM_DIALECT}_COMPILER_LIST - ${_CMAKE_TOOLCHAIN_PREFIX}cc ${_CMAKE_TOOLCHAIN_PREFIX}gcc cl bcc xlc - CC ${_CMAKE_TOOLCHAIN_PREFIX}c++ ${_CMAKE_TOOLCHAIN_PREFIX}g++ aCC cl bcc xlC) - endif() - endif() - else() # some specific assembler "dialect" - if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT) - message(FATAL_ERROR "CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT must be preset !") - endif() - endif() - - # Find the compiler. - _cmake_find_compiler(ASM${ASM_DIALECT}) - -else() - - # we only get here if CMAKE_ASM${ASM_DIALECT}_COMPILER was specified using -D or a pre-made CMakeCache.txt - # (e.g. via ctest) or set in CMAKE_TOOLCHAIN_FILE - # - # if a compiler was specified by the user but without path, - # now try to find it with the full path - # if it is found, force it into the cache, - # if not, don't overwrite the setting (which was given by the user) with "NOTFOUND" - get_filename_component(_CMAKE_USER_ASM${ASM_DIALECT}_COMPILER_PATH "${CMAKE_ASM${ASM_DIALECT}_COMPILER}" PATH) - if(NOT _CMAKE_USER_ASM${ASM_DIALECT}_COMPILER_PATH) - find_program(CMAKE_ASM${ASM_DIALECT}_COMPILER_WITH_PATH NAMES ${CMAKE_ASM${ASM_DIALECT}_COMPILER}) - mark_as_advanced(CMAKE_ASM${ASM_DIALECT}_COMPILER_WITH_PATH) - if(CMAKE_ASM${ASM_DIALECT}_COMPILER_WITH_PATH) - set(CMAKE_ASM${ASM_DIALECT}_COMPILER ${CMAKE_ASM${ASM_DIALECT}_COMPILER_WITH_PATH} CACHE FILEPATH "Assembler" FORCE) - endif() - endif() -endif() -mark_as_advanced(CMAKE_ASM${ASM_DIALECT}_COMPILER) - -if (NOT _CMAKE_TOOLCHAIN_LOCATION) - get_filename_component(_CMAKE_TOOLCHAIN_LOCATION "${CMAKE_ASM${ASM_DIALECT}_COMPILER}" PATH) -endif () - - -if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER_ID) - - # Table of per-vendor compiler id flags with expected output. - list(APPEND CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDORS GNU ) - set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_GNU "--version") - set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_GNU "(GNU assembler)|(GCC)|(Free Software Foundation)") - - list(APPEND CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDORS HP ) - set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_HP "-V") - set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_HP "HP C") - - list(APPEND CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDORS Intel ) - set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_Intel "--version") - set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_Intel "(ICC)") - - list(APPEND CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDORS SunPro ) - set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_SunPro "-V") - set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_SunPro "Sun C") - - list(APPEND CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDORS XL ) - set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_XL "-qversion") - set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_XL "XL C") - - list(APPEND CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDORS MSVC ) - set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_MSVC "/?") - set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_MSVC "Microsoft") - - list(APPEND CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDORS TI_DSP ) - set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_TI_DSP "-h") - set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_TI_DSP "Texas Instruments") - - include(CMakeDetermineCompilerId) - CMAKE_DETERMINE_COMPILER_ID_VENDOR(ASM${ASM_DIALECT}) - -endif() - -if(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID) - message(STATUS "The ASM${ASM_DIALECT} compiler identification is ${CMAKE_ASM${ASM_DIALECT}_COMPILER_ID}") -else() - message(STATUS "The ASM${ASM_DIALECT} compiler identification is unknown") -endif() - - - -# If we have a gas/as cross compiler, they have usually some prefix, like -# e.g. powerpc-linux-gas, arm-elf-gas or i586-mingw32msvc-gas , optionally -# with a 3-component version number at the end -# The other tools of the toolchain usually have the same prefix -# NAME_WE cannot be used since then this test will fail for names lile -# "arm-unknown-nto-qnx6.3.0-gas.exe", where BASENAME would be -# "arm-unknown-nto-qnx6" instead of the correct "arm-unknown-nto-qnx6.3.0-" -if (NOT _CMAKE_TOOLCHAIN_PREFIX) - get_filename_component(COMPILER_BASENAME "${CMAKE_ASM${ASM_DIALECT}_COMPILER}" NAME) - if (COMPILER_BASENAME MATCHES "^(.+-)g?as(-[0-9]+\\.[0-9]+\\.[0-9]+)?(\\.exe)?$") - set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_MATCH_1}) - endif () -endif () - -# Now try the C compiler regexp: -if (NOT _CMAKE_TOOLCHAIN_PREFIX) - if (COMPILER_BASENAME MATCHES "^(.+-)g?cc(-[0-9]+\\.[0-9]+\\.[0-9]+)?(\\.exe)?$") - set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_MATCH_1}) - endif () -endif () - -# Finally try the CXX compiler regexp: -if (NOT _CMAKE_TOOLCHAIN_PREFIX) - if (COMPILER_BASENAME MATCHES "^(.+-)[gc]\\+\\+(-[0-9]+\\.[0-9]+\\.[0-9]+)?(\\.exe)?$") - set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_MATCH_1}) - endif () -endif () - - -include(CMakeFindBinUtils) - -set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ENV_VAR "ASM${ASM_DIALECT}") - -if(CMAKE_ASM${ASM_DIALECT}_COMPILER) - message(STATUS "Found assembler: ${CMAKE_ASM${ASM_DIALECT}_COMPILER}") -else() - message(STATUS "Didn't find assembler") -endif() - - -set(_CMAKE_ASM_COMPILER "${CMAKE_ASM${ASM_DIALECT}_COMPILER}") -set(_CMAKE_ASM_COMPILER_ID "${CMAKE_ASM${ASM_DIALECT}_COMPILER_ID}") -set(_CMAKE_ASM_COMPILER_ARG1 "${CMAKE_ASM${ASM_DIALECT}_COMPILER_ARG1}") -set(_CMAKE_ASM_COMPILER_ENV_VAR "${CMAKE_ASM${ASM_DIALECT}_COMPILER_ENV_VAR}") - -# configure variables set in this file for fast reload later on -configure_file(${CMAKE_ROOT}/Modules/CMakeASMCompiler.cmake.in - ${CMAKE_PLATFORM_INFO_DIR}/CMakeASM${ASM_DIALECT}Compiler.cmake IMMEDIATE @ONLY) - -set(_CMAKE_ASM_COMPILER) -set(_CMAKE_ASM_COMPILER_ARG1) -set(_CMAKE_ASM_COMPILER_ENV_VAR) - -endif() - diff --git a/sdk/cmake/CMakeDetermineCompilerId.cmake b/sdk/cmake/CMakeDetermineCompilerId.cmake deleted file mode 100644 index b160dee62d..0000000000 --- a/sdk/cmake/CMakeDetermineCompilerId.cmake +++ /dev/null @@ -1,315 +0,0 @@ - -#============================================================================= -# Copyright 2007-2009 Kitware, Inc. -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# (To distribute this file outside of CMake, substitute the full -# License text for the above reference.) - -# Function to compile a source file to identify the compiler. This is -# used internally by CMake and should not be included by user code. -# If successful, sets CMAKE_<lang>_COMPILER_ID and CMAKE_<lang>_PLATFORM_ID - -FUNCTION(CMAKE_DETERMINE_COMPILER_ID lang flagvar src) - # Make sure the compiler arguments are clean. - STRING(STRIP "${CMAKE_${lang}_COMPILER_ARG1}" CMAKE_${lang}_COMPILER_ID_ARG1) - STRING(REGEX REPLACE " +" ";" CMAKE_${lang}_COMPILER_ID_ARG1 "${CMAKE_${lang}_COMPILER_ID_ARG1}") - - # Make sure user-specified compiler flags are used. - IF(CMAKE_${lang}_FLAGS) - SET(CMAKE_${lang}_COMPILER_ID_FLAGS ${CMAKE_${lang}_FLAGS}) - ELSE(CMAKE_${lang}_FLAGS) - SET(CMAKE_${lang}_COMPILER_ID_FLAGS $ENV{${flagvar}}) - ENDIF(CMAKE_${lang}_FLAGS) - STRING(REGEX REPLACE " " ";" CMAKE_${lang}_COMPILER_ID_FLAGS_LIST "${CMAKE_${lang}_COMPILER_ID_FLAGS}") - - # Compute the directory in which to run the test. - SET(CMAKE_${lang}_COMPILER_ID_DIR ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CompilerId${lang}) - - # Try building with no extra flags and then try each set - # of helper flags. Stop when the compiler is identified. - FOREACH(flags "" ${CMAKE_${lang}_COMPILER_ID_TEST_FLAGS}) - IF(NOT CMAKE_${lang}_COMPILER_ID) - CMAKE_DETERMINE_COMPILER_ID_BUILD("${lang}" "${flags}" "${src}") - FOREACH(file ${COMPILER_${lang}_PRODUCED_FILES}) - CMAKE_DETERMINE_COMPILER_ID_CHECK("${lang}" "${CMAKE_${lang}_COMPILER_ID_DIR}/${file}" "${src}") - ENDFOREACH(file) - ENDIF(NOT CMAKE_${lang}_COMPILER_ID) - ENDFOREACH(flags) - - # If the compiler is still unknown, try to query its vendor. - IF(NOT CMAKE_${lang}_COMPILER_ID) - CMAKE_DETERMINE_COMPILER_ID_VENDOR(${lang}) - ENDIF() - - # if the format is unknown after all files have been checked, put "Unknown" in the cache - IF(NOT CMAKE_EXECUTABLE_FORMAT) - SET(CMAKE_EXECUTABLE_FORMAT "Unknown" CACHE INTERNAL "Executable file format") - ENDIF(NOT CMAKE_EXECUTABLE_FORMAT) - - # Display the final identification result. - IF(CMAKE_${lang}_COMPILER_ID) - MESSAGE(STATUS "The ${lang} compiler identification is " - "${CMAKE_${lang}_COMPILER_ID}") - ELSE(CMAKE_${lang}_COMPILER_ID) - MESSAGE(STATUS "The ${lang} compiler identification is unknown") - ENDIF(CMAKE_${lang}_COMPILER_ID) - - SET(CMAKE_${lang}_COMPILER_ID "${CMAKE_${lang}_COMPILER_ID}" PARENT_SCOPE) - SET(CMAKE_${lang}_PLATFORM_ID "${CMAKE_${lang}_PLATFORM_ID}" PARENT_SCOPE) - SET(MSVC_${lang}_ARCHITECTURE_ID "${MSVC_${lang}_ARCHITECTURE_ID}" - PARENT_SCOPE) -ENDFUNCTION(CMAKE_DETERMINE_COMPILER_ID) - -#----------------------------------------------------------------------------- -# Function to write the compiler id source file. -FUNCTION(CMAKE_DETERMINE_COMPILER_ID_WRITE lang src) - FILE(READ ${CMAKE_ROOT}/Modules/${src}.in ID_CONTENT_IN) - STRING(CONFIGURE "${ID_CONTENT_IN}" ID_CONTENT_OUT @ONLY) - FILE(WRITE ${CMAKE_${lang}_COMPILER_ID_DIR}/${src} "${ID_CONTENT_OUT}") -ENDFUNCTION(CMAKE_DETERMINE_COMPILER_ID_WRITE) - -#----------------------------------------------------------------------------- -# Function to build the compiler id source file and look for output -# files. -FUNCTION(CMAKE_DETERMINE_COMPILER_ID_BUILD lang testflags src) - # Create a clean working directory. - FILE(REMOVE_RECURSE ${CMAKE_${lang}_COMPILER_ID_DIR}) - FILE(MAKE_DIRECTORY ${CMAKE_${lang}_COMPILER_ID_DIR}) - CMAKE_DETERMINE_COMPILER_ID_WRITE("${lang}" "${src}") - - # Construct a description of this test case. - SET(COMPILER_DESCRIPTION - "Compiler: ${CMAKE_${lang}_COMPILER} ${CMAKE_${lang}_COMPILER_ID_ARG1} -Build flags: ${CMAKE_${lang}_COMPILER_ID_FLAGS_LIST} -Id flags: ${testflags} -") - - # Compile the compiler identification source. - IF(COMMAND EXECUTE_PROCESS) - EXECUTE_PROCESS( - COMMAND ${CMAKE_${lang}_COMPILER} - ${CMAKE_${lang}_COMPILER_ID_ARG1} - ${CMAKE_${lang}_COMPILER_ID_FLAGS_LIST} - ${testflags} - "${src}" - WORKING_DIRECTORY ${CMAKE_${lang}_COMPILER_ID_DIR} - OUTPUT_VARIABLE CMAKE_${lang}_COMPILER_ID_OUTPUT - ERROR_VARIABLE CMAKE_${lang}_COMPILER_ID_OUTPUT - RESULT_VARIABLE CMAKE_${lang}_COMPILER_ID_RESULT - ) - ELSE(COMMAND EXECUTE_PROCESS) - EXEC_PROGRAM( - ${CMAKE_${lang}_COMPILER} ${CMAKE_${lang}_COMPILER_ID_DIR} - ARGS ${CMAKE_${lang}_COMPILER_ID_ARG1} - ${CMAKE_${lang}_COMPILER_ID_FLAGS_LIST} - ${testflags} - \"${src}\" - OUTPUT_VARIABLE CMAKE_${lang}_COMPILER_ID_OUTPUT - RETURN_VALUE CMAKE_${lang}_COMPILER_ID_RESULT - ) - ENDIF(COMMAND EXECUTE_PROCESS) - - # Check the result of compilation. - IF(CMAKE_${lang}_COMPILER_ID_RESULT) - # Compilation failed. - SET(MSG - "Compiling the ${lang} compiler identification source file \"${src}\" failed. -${COMPILER_DESCRIPTION} -The output was: -${CMAKE_${lang}_COMPILER_ID_RESULT} -${CMAKE_${lang}_COMPILER_ID_OUTPUT} - -") - FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log "${MSG}") - #IF(NOT CMAKE_${lang}_COMPILER_ID_ALLOW_FAIL) - # MESSAGE(FATAL_ERROR "${MSG}") - #ENDIF(NOT CMAKE_${lang}_COMPILER_ID_ALLOW_FAIL) - - # No output files should be inspected. - SET(COMPILER_${lang}_PRODUCED_FILES) - ELSE(CMAKE_${lang}_COMPILER_ID_RESULT) - # Compilation succeeded. - FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log - "Compiling the ${lang} compiler identification source file \"${src}\" succeeded. -${COMPILER_DESCRIPTION} -The output was: -${CMAKE_${lang}_COMPILER_ID_RESULT} -${CMAKE_${lang}_COMPILER_ID_OUTPUT} - -") - - # Find the executable produced by the compiler, try all files in the - # binary dir. - FILE(GLOB COMPILER_${lang}_PRODUCED_FILES - RELATIVE ${CMAKE_${lang}_COMPILER_ID_DIR} - ${CMAKE_${lang}_COMPILER_ID_DIR}/*) - LIST(REMOVE_ITEM COMPILER_${lang}_PRODUCED_FILES "${src}") - FOREACH(file ${COMPILER_${lang}_PRODUCED_FILES}) - FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log - "Compilation of the ${lang} compiler identification source \"" - "${src}\" produced \"${file}\"\n\n") - ENDFOREACH(file) - - IF(NOT COMPILER_${lang}_PRODUCED_FILES) - # No executable was found. - FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log - "Compilation of the ${lang} compiler identification source \"" - "${src}\" did not produce an executable in \"" - "${CMAKE_${lang}_COMPILER_ID_DIR}\".\n\n") - ENDIF(NOT COMPILER_${lang}_PRODUCED_FILES) - ENDIF(CMAKE_${lang}_COMPILER_ID_RESULT) - - # Return the files produced by the compilation. - SET(COMPILER_${lang}_PRODUCED_FILES "${COMPILER_${lang}_PRODUCED_FILES}" PARENT_SCOPE) -ENDFUNCTION(CMAKE_DETERMINE_COMPILER_ID_BUILD lang testflags src) - -#----------------------------------------------------------------------------- -# Function to extract the compiler id from an executable. -FUNCTION(CMAKE_DETERMINE_COMPILER_ID_CHECK lang file) - # Look for a compiler id if not yet known. - IF(NOT CMAKE_${lang}_COMPILER_ID) - # Read the compiler identification string from the executable file. - SET(COMPILER_ID) - SET(PLATFORM_ID) - FILE(STRINGS ${file} - CMAKE_${lang}_COMPILER_ID_STRINGS LIMIT_COUNT 3 REGEX "INFO:") - SET(HAVE_COMPILER_TWICE 0) - FOREACH(info ${CMAKE_${lang}_COMPILER_ID_STRINGS}) - IF("${info}" MATCHES ".*INFO:compiler\\[([^]\"]*)\\].*") - IF(COMPILER_ID) - SET(COMPILER_ID_TWICE 1) - ENDIF(COMPILER_ID) - STRING(REGEX REPLACE ".*INFO:compiler\\[([^]]*)\\].*" "\\1" - COMPILER_ID "${info}") - ENDIF("${info}" MATCHES ".*INFO:compiler\\[([^]\"]*)\\].*") - IF("${info}" MATCHES ".*INFO:platform\\[([^]\"]*)\\].*") - STRING(REGEX REPLACE ".*INFO:platform\\[([^]]*)\\].*" "\\1" - PLATFORM_ID "${info}") - ENDIF("${info}" MATCHES ".*INFO:platform\\[([^]\"]*)\\].*") - IF("${info}" MATCHES ".*INFO:arch\\[([^]\"]*)\\].*") - STRING(REGEX REPLACE ".*INFO:arch\\[([^]]*)\\].*" "\\1" - ARCHITECTURE_ID "${info}") - ENDIF("${info}" MATCHES ".*INFO:arch\\[([^]\"]*)\\].*") - ENDFOREACH(info) - - # Check if a valid compiler and platform were found. - IF(COMPILER_ID AND NOT COMPILER_ID_TWICE) - SET(CMAKE_${lang}_COMPILER_ID "${COMPILER_ID}") - SET(CMAKE_${lang}_PLATFORM_ID "${PLATFORM_ID}") - SET(MSVC_${lang}_ARCHITECTURE_ID "${ARCHITECTURE_ID}") - ENDIF(COMPILER_ID AND NOT COMPILER_ID_TWICE) - - # Check the compiler identification string. - IF(CMAKE_${lang}_COMPILER_ID) - # The compiler identification was found. - FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log - "The ${lang} compiler identification is ${CMAKE_${lang}_COMPILER_ID}, found in \"" - "${file}\"\n\n") - ELSE(CMAKE_${lang}_COMPILER_ID) - # The compiler identification could not be found. - FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log - "The ${lang} compiler identification could not be found in \"" - "${file}\"\n\n") - ENDIF(CMAKE_${lang}_COMPILER_ID) - ENDIF(NOT CMAKE_${lang}_COMPILER_ID) - - # try to figure out the executable format: ELF, COFF, Mach-O - IF(NOT CMAKE_EXECUTABLE_FORMAT) - FILE(READ ${file} CMAKE_EXECUTABLE_MAGIC LIMIT 4 HEX) - - # ELF files start with 0x7f"ELF" - IF("${CMAKE_EXECUTABLE_MAGIC}" STREQUAL "7f454c46") - SET(CMAKE_EXECUTABLE_FORMAT "ELF" CACHE INTERNAL "Executable file format") - ENDIF("${CMAKE_EXECUTABLE_MAGIC}" STREQUAL "7f454c46") - -# # COFF (.exe) files start with "MZ" -# IF("${CMAKE_EXECUTABLE_MAGIC}" MATCHES "4d5a....") -# SET(CMAKE_EXECUTABLE_FORMAT "COFF" CACHE STRING "Executable file format") -# ENDIF("${CMAKE_EXECUTABLE_MAGIC}" MATCHES "4d5a....") -# -# # Mach-O files start with CAFEBABE or FEEDFACE, according to http://radio.weblogs.com/0100490/2003/01/28.html -# IF("${CMAKE_EXECUTABLE_MAGIC}" MATCHES "cafebabe") -# SET(CMAKE_EXECUTABLE_FORMAT "MACHO" CACHE STRING "Executable file format") -# ENDIF("${CMAKE_EXECUTABLE_MAGIC}" MATCHES "cafebabe") -# IF("${CMAKE_EXECUTABLE_MAGIC}" MATCHES "feedface") -# SET(CMAKE_EXECUTABLE_FORMAT "MACHO" CACHE STRING "Executable file format") -# ENDIF("${CMAKE_EXECUTABLE_MAGIC}" MATCHES "feedface") - - ENDIF(NOT CMAKE_EXECUTABLE_FORMAT) - IF(NOT DEFINED CMAKE_EXECUTABLE_FORMAT) - SET(CMAKE_EXECUTABLE_FORMAT) - ENDIF() - # Return the information extracted. - SET(CMAKE_${lang}_COMPILER_ID "${CMAKE_${lang}_COMPILER_ID}" PARENT_SCOPE) - SET(CMAKE_${lang}_PLATFORM_ID "${CMAKE_${lang}_PLATFORM_ID}" PARENT_SCOPE) - SET(MSVC_${lang}_ARCHITECTURE_ID "${MSVC_${lang}_ARCHITECTURE_ID}" - PARENT_SCOPE) - SET(CMAKE_EXECUTABLE_FORMAT "${CMAKE_EXECUTABLE_FORMAT}" PARENT_SCOPE) -ENDFUNCTION(CMAKE_DETERMINE_COMPILER_ID_CHECK lang) - -#----------------------------------------------------------------------------- -# Function to query the compiler vendor. -# This uses a table with entries of the form -# list(APPEND CMAKE_${lang}_COMPILER_ID_VENDORS ${vendor}) -# set(CMAKE_${lang}_COMPILER_ID_VENDOR_FLAGS_${vendor} -some-vendor-flag) -# set(CMAKE_${lang}_COMPILER_ID_VENDOR_REGEX_${vendor} "Some Vendor Output") -# We try running the compiler with the flag for each vendor and -# matching its regular expression in the output. -FUNCTION(CMAKE_DETERMINE_COMPILER_ID_VENDOR lang) - - IF(NOT CMAKE_${lang}_COMPILER_ID_DIR) - # We get here when this function is called not from within CMAKE_DETERMINE_COMPILER_ID() - # This is done e.g. for detecting the compiler ID for assemblers. - # Compute the directory in which to run the test and Create a clean working directory. - SET(CMAKE_${lang}_COMPILER_ID_DIR ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CompilerId${lang}) - FILE(REMOVE_RECURSE ${CMAKE_${lang}_COMPILER_ID_DIR}) - FILE(MAKE_DIRECTORY ${CMAKE_${lang}_COMPILER_ID_DIR}) - ENDIF(NOT CMAKE_${lang}_COMPILER_ID_DIR) - - - FOREACH(vendor ${CMAKE_${lang}_COMPILER_ID_VENDORS}) - SET(flags ${CMAKE_${lang}_COMPILER_ID_VENDOR_FLAGS_${vendor}}) - SET(regex ${CMAKE_${lang}_COMPILER_ID_VENDOR_REGEX_${vendor}}) - EXECUTE_PROCESS( - COMMAND ${CMAKE_${lang}_COMPILER} - ${CMAKE_${lang}_COMPILER_ID_ARG1} - ${CMAKE_${lang}_COMPILER_ID_FLAGS_LIST} - ${flags} - WORKING_DIRECTORY ${CMAKE_${lang}_COMPILER_ID_DIR} - OUTPUT_VARIABLE output ERROR_VARIABLE output - RESULT_VARIABLE result - TIMEOUT 10 - ) - - IF("${lang}" STREQUAL "ASM") - MESSAGE(STATUS "Checked for ${vendor}") - MESSAGE(STATUS " Output: -${output}-") - MESSAGE(STATUS " Result: -${result}-") - ENDIF("${lang}" STREQUAL "ASM") - - IF("${output}" MATCHES "${regex}") - FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log - "Checking whether the ${lang} compiler is ${vendor} using \"${flags}\" " - "matched \"${regex}\":\n${output}") - SET(CMAKE_${lang}_COMPILER_ID "${vendor}" PARENT_SCOPE) - BREAK() - ELSE() - IF("${result}" MATCHES "timeout") - FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log - "Checking whether the ${lang} compiler is ${vendor} using \"${flags}\" " - "terminated after 10 s due to timeout.") - ELSE() - FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log - "Checking whether the ${lang} compiler is ${vendor} using \"${flags}\" " - "did not match \"${regex}\":\n${output}") - ENDIF() - ENDIF() - ENDFOREACH() -ENDFUNCTION(CMAKE_DETERMINE_COMPILER_ID_VENDOR) diff --git a/sdk/cmake/CMakeParseArguments.cmake b/sdk/cmake/CMakeParseArguments.cmake deleted file mode 100644 index 47b73f820e..0000000000 --- a/sdk/cmake/CMakeParseArguments.cmake +++ /dev/null @@ -1,157 +0,0 @@ -# CMAKE_PARSE_ARGUMENTS(<prefix> <options> <one_value_keywords> <multi_value_keywords> args...) -# -# CMAKE_PARSE_ARGUMENTS() is intended to be used in macros or functions for -# parsing the arguments given to that macro or function. -# It processes the arguments and defines a set of variables which hold the -# values of the respective options. -# -# The <options> argument contains all options for the respective macro, -# i.e. keywords which can be used when calling the macro without any value -# following, like e.g. the OPTIONAL keyword of the install() command. -# -# The <one_value_keywords> argument contains all keywords for this macro -# which are followed by one value, like e.g. DESTINATION keyword of the -# install() command. -# -# The <multi_value_keywords> argument contains all keywords for this macro -# which can be followed by more than one value, like e.g. the TARGETS or -# FILES keywords of the install() command. -# -# When done, CMAKE_PARSE_ARGUMENTS() will have defined for each of the -# keywords listed in <options>, <one_value_keywords> and -# <multi_value_keywords> a variable composed of the given <prefix> -# followed by "_" and the name of the respective keyword. -# These variables will then hold the respective value from the argument list. -# For the <options> keywords this will be TRUE or FALSE. -# -# All remaining arguments are collected in a variable -# <prefix>_UNPARSED_ARGUMENTS, this can be checked afterwards to see whether -# your macro was called with unrecognized parameters. -# -# As an example here a my_install() macro, which takes similar arguments as the -# real install() command: -# -# function(MY_INSTALL) -# set(options OPTIONAL FAST) -# set(oneValueArgs DESTINATION RENAME) -# set(multiValueArgs TARGETS CONFIGURATIONS) -# cmake_parse_arguments(MY_INSTALL "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} ) -# ... -# -# Assume my_install() has been called like this: -# my_install(TARGETS foo bar DESTINATION bin OPTIONAL blub) -# -# After the cmake_parse_arguments() call the macro will have set the following -# variables: -# MY_INSTALL_OPTIONAL = TRUE -# MY_INSTALL_FAST = FALSE (this option was not used when calling my_install() -# MY_INSTALL_DESTINATION = "bin" -# MY_INSTALL_RENAME = "" (was not used) -# MY_INSTALL_TARGETS = "foo;bar" -# MY_INSTALL_CONFIGURATIONS = "" (was not used) -# MY_INSTALL_UNPARSED_ARGUMENTS = "blub" (no value expected after "OPTIONAL" -# -# You can the continue and process these variables. -# -# Keywords terminate lists of values, e.g. if directly after a one_value_keyword -# another recognized keyword follows, this is interpreted as the beginning of -# the new option. -# E.g. my_install(TARGETS foo DESTINATION OPTIONAL) would result in -# MY_INSTALL_DESTINATION set to "OPTIONAL", but MY_INSTALL_DESTINATION would -# be empty and MY_INSTALL_OPTIONAL would be set to TRUE therefor. - -#============================================================================= -# Copyright 2010 Alexander Neundorf <neundorf(a)kde.org> -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# * Neither the names of Kitware, Inc., the Insight Software Consortium, -# nor the names of their contributors may be used to endorse or promote -# products derived from this software without specific prior written -# permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#============================================================================= - - -if(__CMAKE_PARSE_ARGUMENTS_INCLUDED) - return() -endif() -set(__CMAKE_PARSE_ARGUMENTS_INCLUDED TRUE) - - -function(CMAKE_PARSE_ARGUMENTS prefix _optionNames _singleArgNames _multiArgNames) - # first set all result variables to empty/FALSE - foreach(arg_name ${_singleArgNames} ${_multiArgNames}) - set(${prefix}_${arg_name}) - endforeach(arg_name) - - foreach(option ${_optionNames}) - set(${prefix}_${option} FALSE) - endforeach(option) - - set(${prefix}_UNPARSED_ARGUMENTS) - - set(insideValues FALSE) - set(currentArgName) - - # now iterate over all arguments and fill the result variables - foreach(currentArg ${ARGN}) - list(FIND _optionNames "${currentArg}" optionIndex) # ... then this marks the end of the arguments belonging to this keyword - list(FIND _singleArgNames "${currentArg}" singleArgIndex) # ... then this marks the end of the arguments belonging to this keyword - list(FIND _multiArgNames "${currentArg}" multiArgIndex) # ... then this marks the end of the arguments belonging to this keyword - - if(${optionIndex} EQUAL -1 AND ${singleArgIndex} EQUAL -1 AND ${multiArgIndex} EQUAL -1) - if(insideValues) - if("${insideValues}" STREQUAL "SINGLE") - set(${prefix}_${currentArgName} ${currentArg}) - set(insideValues FALSE) - elseif("${insideValues}" STREQUAL "MULTI") - list(APPEND ${prefix}_${currentArgName} ${currentArg}) - endif() - else(insideValues) - list(APPEND ${prefix}_UNPARSED_ARGUMENTS ${currentArg}) - endif(insideValues) - else() - if(NOT ${optionIndex} EQUAL -1) - set(${prefix}_${currentArg} TRUE) - set(insideValues FALSE) - elseif(NOT ${singleArgIndex} EQUAL -1) - set(currentArgName ${currentArg}) - set(${prefix}_${currentArgName}) - set(insideValues "SINGLE") - elseif(NOT ${multiArgIndex} EQUAL -1) - set(currentArgName ${currentArg}) - set(${prefix}_${currentArgName}) - set(insideValues "MULTI") - endif() - endif() - - endforeach(currentArg) - - # propagate the result variables to the caller: - foreach(arg_name ${_singleArgNames} ${_multiArgNames} ${_optionNames}) - set(${prefix}_${arg_name} ${${prefix}_${arg_name}} PARENT_SCOPE) - endforeach(arg_name) - set(${prefix}_UNPARSED_ARGUMENTS ${${prefix}_UNPARSED_ARGUMENTS} PARENT_SCOPE) - -endfunction(CMAKE_PARSE_ARGUMENTS _options _singleArgs _multiArgs) diff --git a/sdk/cmake/Compiler/GNU.cmake b/sdk/cmake/Compiler/GNU.cmake deleted file mode 100644 index e9c1dcd29d..0000000000 --- a/sdk/cmake/Compiler/GNU.cmake +++ /dev/null @@ -1,63 +0,0 @@ - -#============================================================================= -# Copyright 2002-2009 Kitware, Inc. -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# (To distribute this file outside of CMake, substitute the full -# License text for the above reference.) - -# This module is shared by multiple languages; use include blocker. -if(__COMPILER_GNU) - return() -endif() -set(__COMPILER_GNU 1) - -macro(__compiler_gnu lang) - # Feature flags. - set(CMAKE_${lang}_VERBOSE_FLAG "-v") - set(CMAKE_${lang}_COMPILE_OPTIONS_PIC "-fPIC") - if(NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 3.4) - set(CMAKE_${lang}_COMPILE_OPTIONS_PIE "-fPIE") - endif() - if(NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 4.2) - set(CMAKE_${lang}_COMPILE_OPTIONS_VISIBILITY "-fvisibility=") - endif() - set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "-fPIC") - set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "-shared") - set(CMAKE_${lang}_COMPILE_OPTIONS_SYSROOT "--sysroot=") - - # Older versions of gcc (< 4.5) contain a bug causing them to report a missing - # header file as a warning if depfiles are enabled, causing check_header_file - # tests to always succeed. Work around this by disabling dependency tracking - # in try_compile mode. - get_property(_IN_TC GLOBAL PROPERTY IN_TRY_COMPILE) - if(NOT _IN_TC OR CMAKE_FORCE_DEPFILES) - # distcc does not transform -o to -MT when invoking the preprocessor - # internally, as it ought to. Work around this bug by setting -MT here - # even though it isn't strictly necessary. - set(CMAKE_DEPFILE_FLAGS_${lang} "-MMD -MT <OBJECT> -MF <DEPFILE>") - endif() - - # Initial configuration flags. - set(CMAKE_${lang}_FLAGS_INIT "") - set(CMAKE_${lang}_FLAGS_DEBUG_INIT "") - set(CMAKE_${lang}_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG") - set(CMAKE_${lang}_FLAGS_RELEASE_INIT "") - set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "-O2 -g -DNDEBUG") - if(CMAKE_VERSION VERSION_LESS 3.4.0) - set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>") - set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>") - else() - set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>") - set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>") - endif() - if(NOT APPLE) - set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-isystem ") - endif() -endmacro() diff --git a/sdk/cmake/Platform/Windows-MSVC.cmake b/sdk/cmake/Platform/Windows-MSVC.cmake deleted file mode 100644 index 5c3912cfea..0000000000 --- a/sdk/cmake/Platform/Windows-MSVC.cmake +++ /dev/null @@ -1,261 +0,0 @@ - -#============================================================================= -# Copyright 2001-2012 Kitware, Inc. -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# (To distribute this file outside of CMake, substitute the full -# License text for the above reference.) - -# This module is shared by multiple languages; use include blocker. -if(__WINDOWS_MSVC) - return() -endif() -set(__WINDOWS_MSVC 1) - -set(CMAKE_LIBRARY_PATH_FLAG "-LIBPATH:") -set(CMAKE_LINK_LIBRARY_FLAG "") -set(MSVC 1) - -# hack: if a new cmake (which uses CMAKE_LINKER) runs on an old build tree -# (where link was hardcoded) and where CMAKE_LINKER isn't in the cache -# and still cmake didn't fail in CMakeFindBinUtils.cmake (because it isn't rerun) -# hardcode CMAKE_LINKER here to link, so it behaves as it did before, Alex -if(NOT DEFINED CMAKE_LINKER) - set(CMAKE_LINKER link) -endif() - -if(CMAKE_VERBOSE_MAKEFILE) - set(CMAKE_CL_NOLOGO) -else() - set(CMAKE_CL_NOLOGO "/nologo") -endif() - -set(WIN32 1) - -if(CMAKE_SYSTEM_NAME MATCHES "WindowsCE") - set(CMAKE_CREATE_WIN32_EXE "/subsystem:windowsce /entry:WinMainCRTStartup") - set(CMAKE_CREATE_CONSOLE_EXE "/subsystem:windowsce /entry:mainACRTStartup") - set(WINCE 1) -else() - set(CMAKE_CREATE_WIN32_EXE "/subsystem:windows") - set(CMAKE_CREATE_CONSOLE_EXE "/subsystem:console") -endif() - -if(CMAKE_GENERATOR MATCHES "Visual Studio 6") - set (CMAKE_NO_BUILD_TYPE 1) -endif() -if(NOT CMAKE_NO_BUILD_TYPE AND CMAKE_GENERATOR MATCHES "Visual Studio") - set (CMAKE_NO_BUILD_TYPE 1) - set (CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING - "Semicolon separated list of supported configuration types, only supports Debug, Release, MinSizeRel, and RelWithDebInfo, anything else will be ignored.") - mark_as_advanced(CMAKE_CONFIGURATION_TYPES) -endif() - -# make sure to enable languages after setting configuration types -enable_language(RC) -if(CMAKE_VERSION VERSION_LESS 3.4.0) - set(CMAKE_COMPILE_RESOURCE "rc <FLAGS> /fo<OBJECT> <SOURCE>") -else() - set(CMAKE_COMPILE_RESOURCE "rc <INCLUDES> <FLAGS> /fo<OBJECT> <SOURCE>") -endif() - -if("${CMAKE_GENERATOR}" MATCHES "Visual Studio") - set(MSVC_IDE 1) -else() - set(MSVC_IDE 0) -endif() - -if(NOT MSVC_VERSION) - if(CMAKE_C_COMPILER_VERSION) - set(_compiler_version ${CMAKE_C_COMPILER_VERSION}) - else() - set(_compiler_version ${CMAKE_CXX_COMPILER_VERSION}) - endif() - if("${_compiler_version}" MATCHES "^([0-9]+)\\.([0-9]+)") - math(EXPR MSVC_VERSION "${CMAKE_MATCH_1}*100 + ${CMAKE_MATCH_2}") - else() - message(FATAL_ERROR "MSVC compiler version not detected properly: ${_compiler_version}") - endif() - - set(MSVC10) - set(MSVC11) - set(MSVC12) - set(MSVC60) - set(MSVC70) - set(MSVC71) - set(MSVC80) - set(MSVC90) - set(CMAKE_COMPILER_2005) - set(CMAKE_COMPILER_SUPPORTS_PDBTYPE) - if(NOT "${_compiler_version}" VERSION_LESS 18) - set(MSVC12 1) - elseif(NOT "${_compiler_version}" VERSION_LESS 17) - set(MSVC11 1) - elseif(NOT "${_compiler_version}" VERSION_LESS 16) - set(MSVC10 1) - elseif(NOT "${_compiler_version}" VERSION_LESS 15) - set(MSVC90 1) - elseif(NOT "${_compiler_version}" VERSION_LESS 14) - set(MSVC80 1) - set(CMAKE_COMPILER_2005 1) - elseif(NOT "${_compiler_version}" VERSION_LESS 13.10) - set(MSVC71 1) - elseif(NOT "${_compiler_version}" VERSION_LESS 13) - set(MSVC70 1) - else() - set(MSVC60 1) - set(CMAKE_COMPILER_SUPPORTS_PDBTYPE 1) - endif() -endif() - -if(MSVC_C_ARCHITECTURE_ID MATCHES 64 OR MSVC_CXX_ARCHITECTURE_ID MATCHES 64) - set(CMAKE_CL_64 1) -else() - set(CMAKE_CL_64 0) -endif() -if(CMAKE_FORCE_WIN64 OR CMAKE_FORCE_IA64) - set(CMAKE_CL_64 1) -endif() - -if(MSVC_VERSION GREATER 1599) - set(MSVC_INCREMENTAL_DEFAULT ON) -endif() - -# default to Debug builds -set(CMAKE_BUILD_TYPE_INIT Debug) - -if(CMAKE_SYSTEM_NAME MATCHES "WindowsCE") - string(TOUPPER "${MSVC_C_ARCHITECTURE_ID}" _MSVC_C_ARCHITECTURE_ID_UPPER) - string(TOUPPER "${MSVC_CXX_ARCHITECTURE_ID}" _MSVC_CXX_ARCHITECTURE_ID_UPPER) - - if("${CMAKE_SYSTEM_VERSION}" MATCHES "^([0-9]+)\\.([0-9]+)") - math(EXPR _CE_VERSION "${CMAKE_MATCH_1}*100 + ${CMAKE_MATCH_2}") - elseif("${CMAKE_SYSTEM_VERSION}" STREQUAL "") - set(_CE_VERSION "500") - else() - message(FATAL_ERROR "Invalid Windows CE version: ${CMAKE_SYSTEM_VERSION}") - endif() - - set(_PLATFORM_DEFINES "/D_WIN32_WCE=0x${_CE_VERSION} /DUNDER_CE") - set(_PLATFORM_DEFINES_C " /D${MSVC_C_ARCHITECTURE_ID} /D_${_MSVC_C_ARCHITECTURE_ID_UPPER}_") - set(_PLATFORM_DEFINES_CXX " /D${MSVC_CXX_ARCHITECTURE_ID} /D_${_MSVC_CXX_ARCHITECTURE_ID_UPPER}_") - - set(_RTC1 "") - set(_FLAGS_CXX " /GR /EHsc") - set(CMAKE_C_STANDARD_LIBRARIES_INIT "coredll.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib") - set(CMAKE_EXE_LINKER_FLAGS_INIT "${CMAKE_EXE_LINKER_FLAGS_INIT} /NODEFAULTLIB:libc.lib /NODEFAULTLIB:oldnames.lib") -else() - set(_PLATFORM_DEFINES "/DWIN32") - - if(MSVC_VERSION GREATER 1310) - set(_RTC1 "/RTC1") - set(_FLAGS_CXX " /GR /EHsc") - set(CMAKE_C_STANDARD_LIBRARIES_INIT "") - else() - set(_RTC1 "/GZ") - set(_FLAGS_CXX " /GR /GX") - set(CMAKE_C_STANDARD_LIBRARIES_INIT "") - endif() -endif() - -set(CMAKE_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}") - -# executable linker flags -set (CMAKE_LINK_DEF_FILE_FLAG "/DEF:") -# set the machine type -set(_MACHINE_ARCH_FLAG ${MSVC_C_ARCHITECTURE_ID}) -if(NOT _MACHINE_ARCH_FLAG) - set(_MACHINE_ARCH_FLAG ${MSVC_CXX_ARCHITECTURE_ID}) -endif() -if(CMAKE_SYSTEM_NAME MATCHES "WindowsCE") - if(_MACHINE_ARCH_FLAG MATCHES "ARM") - set(_MACHINE_ARCH_FLAG "THUMB") - elseif(_MACHINE_ARCH_FLAG MATCHES "SH") - set(_MACHINE_ARCH_FLAG "SH4") - endif() -endif() -set (CMAKE_EXE_LINKER_FLAGS_INIT - "${CMAKE_EXE_LINKER_FLAGS_INIT} /machine:${_MACHINE_ARCH_FLAG} /MANIFEST:NO") - -# add /debug and /INCREMENTAL:YES to DEBUG and RELWITHDEBINFO also add pdbtype -# on versions that support it -set( MSVC_INCREMENTAL_YES_FLAG "") -if(NOT MSVC_INCREMENTAL_DEFAULT) - set( MSVC_INCREMENTAL_YES_FLAG "/INCREMENTAL:YES") -else() - set( MSVC_INCREMENTAL_YES_FLAG "/INCREMENTAL" ) -endif() - -if (CMAKE_COMPILER_SUPPORTS_PDBTYPE) - if(NOT USE_CLANG_CL) - set (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug /pdbtype:sept") - set (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug /pdbtype:sept ${MSVC_INCREMENTAL_YES_FLAG}") - else() - set(CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug") - set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug") - endif() -else () - set (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug") - set (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug ${MSVC_INCREMENTAL_YES_FLAG}") -endif () -# for release and minsize release default to no incremental linking -set(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT "/INCREMENTAL:NO") -set(CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT "/INCREMENTAL:NO") - -# copy the EXE_LINKER flags to SHARED and MODULE linker flags -# shared linker flags -set (CMAKE_SHARED_LINKER_FLAGS_INIT ${CMAKE_EXE_LINKER_FLAGS_INIT}) -set (CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT ${CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT}) -set (CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT}) -set (CMAKE_SHARED_LINKER_FLAGS_RELEASE_INIT ${CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT}) -set (CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL_INIT ${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT}) -# module linker flags -set (CMAKE_MODULE_LINKER_FLAGS_INIT ${CMAKE_SHARED_LINKER_FLAGS_INIT}) -set (CMAKE_MODULE_LINKER_FLAGS_DEBUG_INIT ${CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT}) -set (CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT}) -set (CMAKE_MODULE_LINKER_FLAGS_RELEASE_INIT ${CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT}) -set (CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL_INIT ${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT}) - -macro(__windows_compiler_msvc lang) - if(NOT "${CMAKE_${lang}_COMPILER_VERSION}" VERSION_LESS 14) - # for 2005 make sure the manifest is put in the dll with mt - set(_CMAKE_VS_LINK_DLL "<CMAKE_COMMAND> -E vs_link_dll ") - set(_CMAKE_VS_LINK_EXE "<CMAKE_COMMAND> -E vs_link_exe ") - endif() - set(CMAKE_${lang}_CREATE_SHARED_LIBRARY "<CMAKE_LINKER> ${CMAKE_CL_NOLOGO} <OBJECTS> ${CMAKE_START_TEMP_FILE} /out:<TARGET> /pdb:<TARGET_PDB> /dll /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR> <LINK_FLAGS> <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}") - - set(CMAKE_${lang}_CREATE_SHARED_MODULE ${CMAKE_${lang}_CREATE_SHARED_LIBRARY}) - set(CMAKE_${lang}_CREATE_STATIC_LIBRARY "<CMAKE_LINKER> /lib ${CMAKE_CL_NOLOGO} <LINK_FLAGS> /out:<TARGET> <OBJECTS> ") - - if(CMAKE_VERSION VERSION_LESS 3.4.0) - set(CMAKE_${lang}_COMPILE_OBJECT - "<CMAKE_${lang}_COMPILER> ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO}${_COMPILE_${lang}} <FLAGS> <DEFINES> /Fo<OBJECT> /Fd<OBJECT_DIR>/ -c <SOURCE>${CMAKE_END_TEMP_FILE}") - set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE - "<CMAKE_${lang}_COMPILER> > <PREPROCESSED_SOURCE> ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO}${_COMPILE_${lang}} <FLAGS> <DEFINES> -E <SOURCE>${CMAKE_END_TEMP_FILE}") - set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE - "<CMAKE_${lang}_COMPILER> ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO}${_COMPILE_${lang}} <FLAGS> <DEFINES> /FoNUL /FAs /Fa<ASSEMBLY_SOURCE> /c <SOURCE>${CMAKE_END_TEMP_FILE}") - else() - set(CMAKE_${lang}_COMPILE_OBJECT - "<CMAKE_${lang}_COMPILER> ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO}${_COMPILE_${lang}} <INCLUDES> <FLAGS> <DEFINES> /Fo<OBJECT> /Fd<OBJECT_DIR>/ -c <SOURCE>${CMAKE_END_TEMP_FILE}") - set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE - "<CMAKE_${lang}_COMPILER> > <PREPROCESSED_SOURCE> ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO}${_COMPILE_${lang}} <INCLUDES> <FLAGS> <DEFINES> -E <SOURCE>${CMAKE_END_TEMP_FILE}") - set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE - "<CMAKE_${lang}_COMPILER> ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO}${_COMPILE_${lang}} <INCLUDES> <FLAGS> <DEFINES> /FoNUL /FAs /Fa<ASSEMBLY_SOURCE> /c <SOURCE>${CMAKE_END_TEMP_FILE}") - endif() - - set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_OBJECTS 1) - set(CMAKE_${lang}_LINK_EXECUTABLE - "${_CMAKE_VS_LINK_EXE}<CMAKE_LINKER> ${CMAKE_CL_NOLOGO} <OBJECTS> ${CMAKE_START_TEMP_FILE} /out:<TARGET> /pdb:<TARGET_PDB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR> <CMAKE_${lang}_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}") - - set(CMAKE_${lang}_FLAGS_INIT "") - set(CMAKE_${lang}_FLAGS_DEBUG_INIT "") - set(CMAKE_${lang}_FLAGS_RELEASE_INIT "") - set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "/MD /Zi /O2 /Ob1 /D NDEBUG") - set(CMAKE_${lang}_FLAGS_MINSIZEREL_INIT "/MD /O1 /Ob1 /D NDEBUG") -endmacro() diff --git a/sdk/cmake/Platform/Windows.cmake b/sdk/cmake/Platform/Windows.cmake deleted file mode 100644 index 05daa32046..0000000000 --- a/sdk/cmake/Platform/Windows.cmake +++ /dev/null @@ -1,36 +0,0 @@ -SET(WIN32 1) - -SET(CMAKE_STATIC_LIBRARY_PREFIX "") -SET(CMAKE_STATIC_LIBRARY_SUFFIX ".lib") -SET(CMAKE_SHARED_LIBRARY_PREFIX "") # lib -SET(CMAKE_SHARED_LIBRARY_SUFFIX ".dll") # .so -SET(CMAKE_IMPORT_LIBRARY_PREFIX "") -SET(CMAKE_IMPORT_LIBRARY_SUFFIX ".lib") -SET(CMAKE_EXECUTABLE_SUFFIX ".exe") # .exe -SET(CMAKE_LINK_LIBRARY_SUFFIX ".lib") -SET(CMAKE_DL_LIBS "") - -SET(CMAKE_FIND_LIBRARY_PREFIXES "") -SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib") - -# for borland make long command lines are redirected to a file -# with the following syntax, see Windows-bcc32.cmake for use -IF(CMAKE_GENERATOR MATCHES "Borland") - SET(CMAKE_START_TEMP_FILE "@&&|\n") - SET(CMAKE_END_TEMP_FILE "\n|") -ENDIF(CMAKE_GENERATOR MATCHES "Borland") - -# for nmake make long command lines are redirected to a file -# with the following syntax, see Windows-bcc32.cmake for use -IF(CMAKE_GENERATOR MATCHES "NMake") -# SET(CMAKE_START_TEMP_FILE "@<<\n") -# SET(CMAKE_END_TEMP_FILE "\n<<") -ENDIF(CMAKE_GENERATOR MATCHES "NMake") - -INCLUDE(Platform/WindowsPaths) - -# uncomment these out to debug nmake and borland makefiles -#SET(CMAKE_START_TEMP_FILE "") -#SET(CMAKE_END_TEMP_FILE "") -#SET(CMAKE_VERBOSE_MAKEFILE 1) - diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index fe15fb3bc9..d2da8dc3e9 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -139,6 +139,12 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO /INCREMENTAL: set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /MANIFEST:NO /INCREMENTAL:NO /SAFESEH:NO /NODEFAULTLIB /RELEASE /IGNORE:4104 ${_hotpatch_link_flag}") set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /MANIFEST:NO /INCREMENTAL:NO /SAFESEH:NO /NODEFAULTLIB /RELEASE ${_hotpatch_link_flag}") +# HACK: Remove the /implib argument, implibs are generated separately +string(REPLACE "/implib:<TARGET_IMPLIB>" "" CMAKE_C_LINK_EXECUTABLE "${CMAKE_C_LINK_EXECUTABLE}") +string(REPLACE "/implib:<TARGET_IMPLIB>" "" CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE}") +string(REPLACE "/implib:<TARGET_IMPLIB>" "" CMAKE_C_CREATE_SHARED_LIBRARY "${CMAKE_C_CREATE_SHARED_LIBRARY}") +string(REPLACE "/implib:<TARGET_IMPLIB>" "" CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY}") + if(CMAKE_DISABLE_NINJA_DEPSLOG) set(cl_includes_flag "") else() diff --git a/toolchain-gcc.cmake b/toolchain-gcc.cmake index cc1b25aa3a..6ffe23d89b 100644 --- a/toolchain-gcc.cmake +++ b/toolchain-gcc.cmake @@ -66,5 +66,7 @@ set(CMAKE_CXX_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C++ Libraries") set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nostdlib -Wl,--enable-auto-image-base,--disable-auto-import") +set(CMAKE_USER_MAKE_RULES_OVERRIDE "${CMAKE_CURRENT_LIST_DIR}/overrides-gcc.cmake") + # Get GCC version execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) diff --git a/toolchain-msvc.cmake b/toolchain-msvc.cmake index c94493bf7d..87d31a4893 100644 --- a/toolchain-msvc.cmake +++ b/toolchain-msvc.cmake @@ -55,3 +55,5 @@ set(CMAKE_C_STANDARD_LIBRARIES "" CACHE INTERNAL "") if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86") add_definitions(-D__i386__) endif() + +set(CMAKE_USER_MAKE_RULES_OVERRIDE "${CMAKE_CURRENT_LIST_DIR}/overrides-msvc.cmake")

6 years, 1 month

01/01: [OSK] Some enhancements for locales IT and RO (#416)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2eb7ddd598e300987d2bc… commit 2eb7ddd598e300987d2bcfb50a6767445524d346 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sun Aug 19 21:42:57 2018 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Aug 19 21:42:57 2018 +0200 [OSK] Some enhancements for locales IT and RO (#416) * Window element improvements for Italian and Romanian --- base/applications/osk/lang/it-IT.rc | 234 ++++++++++++++++++------------------ base/applications/osk/lang/ro-RO.rc | 234 ++++++++++++++++++------------------ 2 files changed, 234 insertions(+), 234 deletions(-) diff --git a/base/applications/osk/lang/it-IT.rc b/base/applications/osk/lang/it-IT.rc index db2b488275..3af1a12e2d 100644 --- a/base/applications/osk/lang/it-IT.rc +++ b/base/applications/osk/lang/it-IT.rc @@ -1,129 +1,129 @@ /* - * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/osk/lang/it-IT.rc - * PURPOSE: On screen keyboard (Italian resources) - * PROGRAMMERS: Denis ROBERT + * PROJECT: ReactOS Virtual Keyboard - OSK + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Virtual Keyboard On screen (Italian resources) + * COPYRIGHT: Copyright Denis ROBERT + * Copyright 2018 Bișoc George (fraizeraust99 at gmail dot com) */ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL -MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 +MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 463, 115 CAPTION "Tastiera visivo" FONT 8, "MS Shell Dlg" EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE BEGIN - PUSHBUTTON "Esc",SCAN_CODE_110,3,3,23,22 - PUSHBUTTON "F1",SCAN_CODE_112,48,3,23,22 - PUSHBUTTON "F2",SCAN_CODE_113,75,3,23,22 - PUSHBUTTON "F3",SCAN_CODE_114,101,3,23,22 - PUSHBUTTON "F4",SCAN_CODE_115,128,3,23,22 - PUSHBUTTON "F5",SCAN_CODE_116,173,3,23,22 - PUSHBUTTON "F6",SCAN_CODE_117,199,3,23,22 - PUSHBUTTON "F7",SCAN_CODE_118,225,3,23,22 - PUSHBUTTON "F8",SCAN_CODE_119,251,3,23,22 - PUSHBUTTON "F9",SCAN_CODE_120,296,3,23,22 - PUSHBUTTON "F10",SCAN_CODE_121,323,3,23,22 - PUSHBUTTON "F11",SCAN_CODE_122,350,3,23,22 - PUSHBUTTON "F12",SCAN_CODE_123,377,3,23,22 - PUSHBUTTON "Imp",SCAN_CODE_124,411,3,23,22 - PUSHBUTTON "Arr",SCAN_CODE_125,438,3,23,22 - PUSHBUTTON "Attn",SCAN_CODE_126,465,3,23,22 - PUSHBUTTON "\\",SCAN_CODE_1,3,35,23,22 - PUSHBUTTON "1",SCAN_CODE_2,30,35,23,22 - PUSHBUTTON "2",SCAN_CODE_3,57,35,23,22 - PUSHBUTTON "3",SCAN_CODE_4,84,35,23,22 - PUSHBUTTON "4",SCAN_CODE_5,111,35,23,22 - PUSHBUTTON "5",SCAN_CODE_6,138,35,23,22 - PUSHBUTTON "6",SCAN_CODE_7,165,35,23,22 - PUSHBUTTON "7",SCAN_CODE_8,192,35,23,22 - PUSHBUTTON "8",SCAN_CODE_9,219,35,23,22 - PUSHBUTTON "9",SCAN_CODE_10,246,35,23,22 - PUSHBUTTON "0 ",SCAN_CODE_11,273,35,23,22 - PUSHBUTTON "'",SCAN_CODE_12,300,35,23,22 - PUSHBUTTON "|",SCAN_CODE_13,327,35,23,22 - PUSHBUTTON "<--",SCAN_CODE_15,354,35,47,22,BS_ICON - PUSHBUTTON "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON - PUSHBUTTON "Q",SCAN_CODE_17,42,61,23,22 - PUSHBUTTON "W",SCAN_CODE_18,69,61,23,22 - PUSHBUTTON "E",SCAN_CODE_19,96,61,23,22 - PUSHBUTTON "R",SCAN_CODE_20,123,61,23,22 - PUSHBUTTON "T",SCAN_CODE_21,150,61,23,22 - PUSHBUTTON "Y",SCAN_CODE_22,177,61,23,22 - PUSHBUTTON "U",SCAN_CODE_23,204,61,23,22 - PUSHBUTTON "I",SCAN_CODE_24,231,61,23,22 - PUSHBUTTON "O",SCAN_CODE_25,258,61,23,22 - PUSHBUTTON "P",SCAN_CODE_26,285,61,23,22 - PUSHBUTTON "Ã¨",SCAN_CODE_27,312,61,23,22 - PUSHBUTTON "+",SCAN_CODE_28,339,61,23,22 - PUSHBUTTON "Verr maj",SCAN_CODE_30,3,87,46,22,BS_ICON - PUSHBUTTON "A",SCAN_CODE_31,53,87,23,22 - PUSHBUTTON "S",SCAN_CODE_32,80,87,23,22 - PUSHBUTTON "D",SCAN_CODE_33,107,87,23,22 - PUSHBUTTON "F",SCAN_CODE_34,134,87,23,22 - PUSHBUTTON "G",SCAN_CODE_35,161,87,23,22 - PUSHBUTTON "H",SCAN_CODE_36,188,87,23,22 - PUSHBUTTON "J",SCAN_CODE_37,215,87,23,22 - PUSHBUTTON "K",SCAN_CODE_38,242,87,23,22 - PUSHBUTTON "L",SCAN_CODE_39,269,87,23,22 - PUSHBUTTON "Ã²",SCAN_CODE_40,296,87,23,22 - PUSHBUTTON "Ã ",SCAN_CODE_41,323,87,23,22 - PUSHBUTTON "Ã¹",SCAN_CODE_42,350,87,23,22 - PUSHBUTTON "ret",SCAN_CODE_43,377,61,23,48,BS_ICON - PUSHBUTTON "Shift",SCAN_CODE_44,3,113,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "<",SCAN_CODE_45,37,113,23,22 - PUSHBUTTON "Z",SCAN_CODE_46,64,113,23,22 - PUSHBUTTON "X",SCAN_CODE_47,91,113,23,22 - PUSHBUTTON "C",SCAN_CODE_48,118,113,23,22 - PUSHBUTTON "V",SCAN_CODE_49,145,113,23,22 - PUSHBUTTON "B",SCAN_CODE_50,172,113,23,22 - PUSHBUTTON "N",SCAN_CODE_51,199,113,23,22 - PUSHBUTTON "M",SCAN_CODE_52,226,113,23,22 - PUSHBUTTON ",",SCAN_CODE_53,253,113,23,22 - PUSHBUTTON ".",SCAN_CODE_54,280,113,23,22 - PUSHBUTTON "-",SCAN_CODE_55,307,113,23,22 - PUSHBUTTON "Shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON - PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 - PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON - PUSHBUTTON "menu",SCAN_CODE_129,332,139,30,22,BS_ICON - PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 - PUSHBUTTON "del",SCAN_CODE_76,411,61,23,22 - PUSHBUTTON "home",SCAN_CODE_80,438,35,23,22,BS_ICON - PUSHBUTTON "fin",SCAN_CODE_81,438,61,23,22 - PUSHBUTTON "pg up",SCAN_CODE_85,465,35,23,22,BS_ICON - PUSHBUTTON "pg down",SCAN_CODE_86,465,61,23,22,BS_ICON - PUSHBUTTON "<-",SCAN_CODE_79,411,139,23,22,BS_ICON - PUSHBUTTON "^",SCAN_CODE_83,438,113,23,22,BS_ICON - PUSHBUTTON "v",SCAN_CODE_84,438,139,23,22,BS_ICON - PUSHBUTTON "->",SCAN_CODE_89,465,139,23,22,BS_ICON - PUSHBUTTON "num",SCAN_CODE_90,500,35,23,22 - PUSHBUTTON "7",SCAN_CODE_91,500,61,23,22 - PUSHBUTTON "4",SCAN_CODE_92,500,87,23,22 - PUSHBUTTON "1",SCAN_CODE_93,500,113,23,22 - PUSHBUTTON "/",SCAN_CODE_95,527,35,23,22 - PUSHBUTTON "8",SCAN_CODE_96,527,61,23,22 - PUSHBUTTON "5",SCAN_CODE_97,527,87,23,22 - PUSHBUTTON "2",SCAN_CODE_98,527,113,23,22 - PUSHBUTTON "0",SCAN_CODE_99,500,139,50,22 - PUSHBUTTON "*",SCAN_CODE_100,554,35,23,22 - PUSHBUTTON "9",SCAN_CODE_101,554,61,23,22 - PUSHBUTTON "6",SCAN_CODE_102,554,87,23,22 - PUSHBUTTON "3",SCAN_CODE_103,554,113,23,22 - PUSHBUTTON ".",SCAN_CODE_104,554,139,23,22 - PUSHBUTTON "-",SCAN_CODE_105,581,35,23,22 - PUSHBUTTON "+",SCAN_CODE_106,581,61,23,48 - PUSHBUTTON "ent",SCAN_CODE_108,581,113,23,48 - CTEXT "Num",IDC_STATIC,510,4,21,8 - CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,518,16,4,3 - CTEXT "Caps",IDC_STATIC,540,4,21,8 - CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,548,16,4,3 - CTEXT "Scroll",IDC_STATIC,572,4,21,8 - CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 + PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15 + PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15 + PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15 + PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15 + PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15 + PUSHBUTTON "F5",SCAN_CODE_116,143,3,15,15 + PUSHBUTTON "F6",SCAN_CODE_117,163,3,15,15 + PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15 + PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15 + PUSHBUTTON "F9",SCAN_CODE_120,243,3,15,15 + PUSHBUTTON "F10",SCAN_CODE_121,263,3,15,15 + PUSHBUTTON "F11",SCAN_CODE_122,283,3,15,15 + PUSHBUTTON "F12",SCAN_CODE_123,303,3,15,15 + PUSHBUTTON "Imp",SCAN_CODE_124,323,3,15,15 + PUSHBUTTON "Arr",SCAN_CODE_125,343,3,15,15 + PUSHBUTTON "Attn",SCAN_CODE_126,363,3,15,15 + PUSHBUTTON "\\",SCAN_CODE_1,3,22,15,15 + PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15 + PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15 + PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15 + PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15 + PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15 + PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15 + PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15 + PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15 + PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15 + PUSHBUTTON "0 ",SCAN_CODE_11,203,22,15,15 + PUSHBUTTON "'",SCAN_CODE_12,223,22,15,15 + PUSHBUTTON "|",SCAN_CODE_13,243,22,15,15 + PUSHBUTTON "<--",SCAN_CODE_15,263,22,55,15,BS_ICON + PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON + PUSHBUTTON "Q",SCAN_CODE_17,42,41,15,15 + PUSHBUTTON "W",SCAN_CODE_18,61,41,15,15 + PUSHBUTTON "E",SCAN_CODE_19,80,41,15,15 + PUSHBUTTON "R",SCAN_CODE_20,99,41,15,15 + PUSHBUTTON "T",SCAN_CODE_21,118,41,15,15 + PUSHBUTTON "Y",SCAN_CODE_22,137,41,15,15 + PUSHBUTTON "U",SCAN_CODE_23,156,41,15,15 + PUSHBUTTON "I",SCAN_CODE_24,175,41,15,15 + PUSHBUTTON "O",SCAN_CODE_25,194,41,15,15 + PUSHBUTTON "P",SCAN_CODE_26,213,41,15,15 + PUSHBUTTON "è",SCAN_CODE_27,232,41,15,15 + PUSHBUTTON "+",SCAN_CODE_28,251,41,15,15 + PUSHBUTTON "Verr maj",SCAN_CODE_30,3,60,46,15,BS_ICON + PUSHBUTTON "A",SCAN_CODE_31,53,60,15,15 + PUSHBUTTON "S",SCAN_CODE_32,72,60,15,15 + PUSHBUTTON "D",SCAN_CODE_33,91,60,15,15 + PUSHBUTTON "F",SCAN_CODE_34,110,60,15,15 + PUSHBUTTON "G",SCAN_CODE_35,129,60,15,15 + PUSHBUTTON "H",SCAN_CODE_36,148,60,15,15 + PUSHBUTTON "J",SCAN_CODE_37,167,60,15,15 + PUSHBUTTON "K",SCAN_CODE_38,186,60,15,15 + PUSHBUTTON "L",SCAN_CODE_39,205,60,15,15 + PUSHBUTTON "ò",SCAN_CODE_40,224,60,15,15 + PUSHBUTTON "à",SCAN_CODE_41,243,60,15,15 + PUSHBUTTON "ù",SCAN_CODE_42,243,60,15,15 + PUSHBUTTON "ret",SCAN_CODE_43,262,60,56,15,BS_ICON + PUSHBUTTON "Shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "Z",SCAN_CODE_45,64,79,15,15 + PUSHBUTTON "<",SCAN_CODE_46,64,79,15,15 + PUSHBUTTON "X",SCAN_CODE_47,83,79,15,15 + PUSHBUTTON "C",SCAN_CODE_48,102,79,15,15 + PUSHBUTTON "V",SCAN_CODE_49,121,79,15,15 + PUSHBUTTON "B",SCAN_CODE_50,140,79,15,15 + PUSHBUTTON "N",SCAN_CODE_51,159,79,15,15 + PUSHBUTTON "M",SCAN_CODE_52,178,79,15,15 + PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15 + PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15 + PUSHBUTTON "-",SCAN_CODE_55,235,79,15,15 + PUSHBUTTON "Shift",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "",SCAN_CODE_61,84,98,125,15 + PUSHBUTTON "alt gr",SCAN_CODE_62,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON + PUSHBUTTON "menu",SCAN_CODE_129,267,98,24,15,BS_ICON + PUSHBUTTON "ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ins",SCAN_CODE_75,323,22,15,15 + PUSHBUTTON "del",SCAN_CODE_76,323,41,15,15 + PUSHBUTTON "home",SCAN_CODE_80,343,22,15,15,BS_ICON + PUSHBUTTON "fin",SCAN_CODE_81,343,41,15,15 + PUSHBUTTON "pg up",SCAN_CODE_85,363,22,15,15,BS_ICON + PUSHBUTTON "pg down",SCAN_CODE_86,363,41,15,15,BS_ICON + PUSHBUTTON "<-",SCAN_CODE_79,323,98,15,15,BS_ICON + PUSHBUTTON "^",SCAN_CODE_83,343,79,15,15,BS_ICON + PUSHBUTTON "v",SCAN_CODE_84,343,98,15,15,BS_ICON + PUSHBUTTON "->",SCAN_CODE_89,363,98,15,15,BS_ICON + PUSHBUTTON "num",SCAN_CODE_90,383,22,15,15 + PUSHBUTTON "7",SCAN_CODE_91,383,41,15,15 + PUSHBUTTON "4",SCAN_CODE_92,383,60,15,15 + PUSHBUTTON "1",SCAN_CODE_93,383,79,15,15 + PUSHBUTTON "/",SCAN_CODE_95,403,22,15,15 + PUSHBUTTON "8",SCAN_CODE_96,403,41,15,15 + PUSHBUTTON "5",SCAN_CODE_97,403,60,15,15 + PUSHBUTTON "2",SCAN_CODE_98,403,79,15,15 + PUSHBUTTON "0",SCAN_CODE_99,383,98,34,15 + PUSHBUTTON "*",SCAN_CODE_100,423,22,15,15 + PUSHBUTTON "9",SCAN_CODE_101,423,41,15,15 + PUSHBUTTON "6",SCAN_CODE_102,423,60,15,15 + PUSHBUTTON "3",SCAN_CODE_103,423,79,15,15 + PUSHBUTTON ".",SCAN_CODE_104,423,98,15,15 + PUSHBUTTON "-",SCAN_CODE_105,443,22,15,15 + PUSHBUTTON "+",SCAN_CODE_106,443,41,15,35 + PUSHBUTTON "ent",SCAN_CODE_108,443,78,15,35 + CTEXT "Num",IDC_STATIC,383,3,21,8 + CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,391,15,4,3 + CTEXT "Caps",IDC_STATIC,408,3,21,8 + CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,417,15,4,3 + CTEXT "Scroll",IDC_STATIC,433,3,21,8 + CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3 END /* EOF */ diff --git a/base/applications/osk/lang/ro-RO.rc b/base/applications/osk/lang/ro-RO.rc index 00451ecead..1b23f418c1 100644 --- a/base/applications/osk/lang/ro-RO.rc +++ b/base/applications/osk/lang/ro-RO.rc @@ -1,129 +1,129 @@ /* - * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/osk/lang/ro-RO.rc - * PURPOSE: On screen keyboard (Romanian resources). - * PROGRAMMERS: Denis ROBERT - * TRANSLATORS: Ștefan Fulea (stefan dot fulea at mail dot md) + * PROJECT: ReactOS Virtual Keyboard - OSK + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: On screen keyboard (Romanian resources) + * COPYRIGHT: Copyright Denis ROBERT + * Copyright Ștefan Fulea (stefan dot fulea at mail dot md) + * Copyright 2018 Bișoc George (fraizeraust99 at gmail dot com) */ LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT -MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 +MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 463, 115 CAPTION "Tastatură virtuală" FONT 8, "MS Shell Dlg" EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE BEGIN - PUSHBUTTON "Esc",SCAN_CODE_110,3,3,23,22 - PUSHBUTTON "F1",SCAN_CODE_112,48,3,23,22 - PUSHBUTTON "F2",SCAN_CODE_113,75,3,23,22 - PUSHBUTTON "F3",SCAN_CODE_114,101,3,23,22 - PUSHBUTTON "F4",SCAN_CODE_115,128,3,23,22 - PUSHBUTTON "F5",SCAN_CODE_116,173,3,23,22 - PUSHBUTTON "F6",SCAN_CODE_117,199,3,23,22 - PUSHBUTTON "F7",SCAN_CODE_118,225,3,23,22 - PUSHBUTTON "F8",SCAN_CODE_119,251,3,23,22 - PUSHBUTTON "F9",SCAN_CODE_120,296,3,23,22 - PUSHBUTTON "F10",SCAN_CODE_121,323,3,23,22 - PUSHBUTTON "F11",SCAN_CODE_122,350,3,23,22 - PUSHBUTTON "F12",SCAN_CODE_123,377,3,23,22 - PUSHBUTTON "Prn",SCAN_CODE_124,411,3,23,22 - PUSHBUTTON "Stop",SCAN_CODE_125,438,3,23,22 - PUSHBUTTON "Attn",SCAN_CODE_126,465,3,23,22 - PUSHBUTTON "`",SCAN_CODE_1,3,35,23,22 - PUSHBUTTON "1",SCAN_CODE_2,30,35,23,22 - PUSHBUTTON "2",SCAN_CODE_3,57,35,23,22 - PUSHBUTTON "3",SCAN_CODE_4,84,35,23,22 - PUSHBUTTON "4",SCAN_CODE_5,111,35,23,22 - PUSHBUTTON "5",SCAN_CODE_6,138,35,23,22 - PUSHBUTTON "6",SCAN_CODE_7,165,35,23,22 - PUSHBUTTON "7",SCAN_CODE_8,192,35,23,22 - PUSHBUTTON "8",SCAN_CODE_9,219,35,23,22 - PUSHBUTTON "9",SCAN_CODE_10,246,35,23,22 - PUSHBUTTON "0",SCAN_CODE_11,273,35,23,22 - PUSHBUTTON "-",SCAN_CODE_12,300,35,23,22 - PUSHBUTTON "=",SCAN_CODE_13,327,35,23,22 - PUSHBUTTON "<--",SCAN_CODE_15,354,35,47,22,BS_ICON - PUSHBUTTON "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON - PUSHBUTTON "Q",SCAN_CODE_17,42,61,23,22 - PUSHBUTTON "W",SCAN_CODE_18,69,61,23,22 - PUSHBUTTON "E",SCAN_CODE_19,96,61,23,22 - PUSHBUTTON "R",SCAN_CODE_20,123,61,23,22 - PUSHBUTTON "T",SCAN_CODE_21,150,61,23,22 - PUSHBUTTON "Y",SCAN_CODE_22,177,61,23,22 - PUSHBUTTON "U",SCAN_CODE_23,204,61,23,22 - PUSHBUTTON "I",SCAN_CODE_24,231,61,23,22 - PUSHBUTTON "O",SCAN_CODE_25,258,61,23,22 - PUSHBUTTON "P",SCAN_CODE_26,285,61,23,22 - PUSHBUTTON "[",SCAN_CODE_27,312,61,23,22 - PUSHBUTTON "]",SCAN_CODE_28,339,61,23,22 - PUSHBUTTON "\\",SCAN_CODE_29,366,61,35,22 - PUSHBUTTON "Fix cap",SCAN_CODE_30,3,87,46,22,BS_ICON - PUSHBUTTON "A",SCAN_CODE_31,53,87,23,22 - PUSHBUTTON "S",SCAN_CODE_32,80,87,23,22 - PUSHBUTTON "D",SCAN_CODE_33,107,87,23,22 - PUSHBUTTON "F",SCAN_CODE_34,134,87,23,22 - PUSHBUTTON "G",SCAN_CODE_35,161,87,23,22 - PUSHBUTTON "H",SCAN_CODE_36,188,87,23,22 - PUSHBUTTON "J",SCAN_CODE_37,215,87,23,22 - PUSHBUTTON "K",SCAN_CODE_38,242,87,23,22 - PUSHBUTTON "L",SCAN_CODE_39,269,87,23,22 - PUSHBUTTON ";",SCAN_CODE_40,296,87,23,22 - PUSHBUTTON "'",SCAN_CODE_41,323,87,23,22 - PUSHBUTTON "ret",SCAN_CODE_43,350,87,51,22,BS_ICON - PUSHBUTTON "schimb",SCAN_CODE_44,3,113,57,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "Z",SCAN_CODE_46,64,113,23,22 - PUSHBUTTON "X",SCAN_CODE_47,91,113,23,22 - PUSHBUTTON "C",SCAN_CODE_48,118,113,23,22 - PUSHBUTTON "V",SCAN_CODE_49,145,113,23,22 - PUSHBUTTON "B",SCAN_CODE_50,172,113,23,22 - PUSHBUTTON "N",SCAN_CODE_51,199,113,23,22 - PUSHBUTTON "M",SCAN_CODE_52,226,113,23,22 - PUSHBUTTON ",",SCAN_CODE_53,253,113,23,22 - PUSHBUTTON ".",SCAN_CODE_54,280,113,23,22 - PUSHBUTTON "/",SCAN_CODE_55,307,113,23,22 - PUSHBUTTON "schimb",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON - PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 - PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON - PUSHBUTTON "meniu",SCAN_CODE_129,332,139,30,22,BS_ICON - PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 - PUSHBUTTON "ștg",SCAN_CODE_76,411,61,23,22 - PUSHBUTTON "init",SCAN_CODE_80,438,35,23,22,BS_ICON - PUSHBUTTON "fin",SCAN_CODE_81,438,61,23,22 - PUSHBUTTON "pg sus",SCAN_CODE_85,465,35,23,22,BS_ICON - PUSHBUTTON "pg jos",SCAN_CODE_86,465,61,23,22,BS_ICON - PUSHBUTTON "<-",SCAN_CODE_79,411,139,23,22,BS_ICON - PUSHBUTTON "^",SCAN_CODE_83,438,113,23,22,BS_ICON - PUSHBUTTON "v",SCAN_CODE_84,438,139,23,22,BS_ICON - PUSHBUTTON "->",SCAN_CODE_89,465,139,23,22,BS_ICON - PUSHBUTTON "num",SCAN_CODE_90,500,35,23,22 - PUSHBUTTON "7",SCAN_CODE_91,500,61,23,22 - PUSHBUTTON "4",SCAN_CODE_92,500,87,23,22 - PUSHBUTTON "1",SCAN_CODE_93,500,113,23,22 - PUSHBUTTON "/",SCAN_CODE_95,527,35,23,22 - PUSHBUTTON "8",SCAN_CODE_96,527,61,23,22 - PUSHBUTTON "5",SCAN_CODE_97,527,87,23,22 - PUSHBUTTON "2",SCAN_CODE_98,527,113,23,22 - PUSHBUTTON "0",SCAN_CODE_99,500,139,50,22 - PUSHBUTTON "*",SCAN_CODE_100,554,35,23,22 - PUSHBUTTON "9",SCAN_CODE_101,554,61,23,22 - PUSHBUTTON "6",SCAN_CODE_102,554,87,23,22 - PUSHBUTTON "3",SCAN_CODE_103,554,113,23,22 - PUSHBUTTON ".",SCAN_CODE_104,554,139,23,22 - PUSHBUTTON "-",SCAN_CODE_105,581,35,23,22 - PUSHBUTTON "+",SCAN_CODE_106,581,61,23,48 - PUSHBUTTON "intr",SCAN_CODE_108,581,113,23,48 - CTEXT "Num",IDC_STATIC,510,4,21,8 - CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,518,16,4,3 - CTEXT "Cap",IDC_STATIC,540,4,21,8 - CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,548,16,4,3 - CTEXT "Derul",IDC_STATIC,572,4,21,8 - CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 + PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15 + PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15 + PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15 + PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15 + PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15 + PUSHBUTTON "F5",SCAN_CODE_116,143,3,15,15 + PUSHBUTTON "F6",SCAN_CODE_117,163,3,15,15 + PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15 + PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15 + PUSHBUTTON "F9",SCAN_CODE_120,243,3,15,15 + PUSHBUTTON "F10",SCAN_CODE_121,263,3,15,15 + PUSHBUTTON "F11",SCAN_CODE_122,283,3,15,15 + PUSHBUTTON "F12",SCAN_CODE_123,303,3,15,15 + PUSHBUTTON "Prn",SCAN_CODE_124,323,3,15,15 + PUSHBUTTON "Stop",SCAN_CODE_125,343,3,15,15 + PUSHBUTTON "Attn",SCAN_CODE_126,363,3,15,15 + PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15 + PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15 + PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15 + PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15 + PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15 + PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15 + PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15 + PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15 + PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15 + PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15 + PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15 + PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15 + PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15 + PUSHBUTTON "<--",SCAN_CODE_15,263,22,55,15,BS_ICON + PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON + PUSHBUTTON "Q",SCAN_CODE_17,42,41,15,15 + PUSHBUTTON "W",SCAN_CODE_18,61,41,15,15 + PUSHBUTTON "E",SCAN_CODE_19,80,41,15,15 + PUSHBUTTON "R",SCAN_CODE_20,99,41,15,15 + PUSHBUTTON "T",SCAN_CODE_21,118,41,15,15 + PUSHBUTTON "Y",SCAN_CODE_22,137,41,15,15 + PUSHBUTTON "U",SCAN_CODE_23,156,41,15,15 + PUSHBUTTON "I",SCAN_CODE_24,175,41,15,15 + PUSHBUTTON "O",SCAN_CODE_25,194,41,15,15 + PUSHBUTTON "P",SCAN_CODE_26,213,41,15,15 + PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15 + PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15 + PUSHBUTTON "\\",SCAN_CODE_29,270,41,48,15 + PUSHBUTTON "Fix cap",SCAN_CODE_30,3,60,46,15,BS_ICON + PUSHBUTTON "A",SCAN_CODE_31,53,60,15,15 + PUSHBUTTON "S",SCAN_CODE_32,72,60,15,15 + PUSHBUTTON "D",SCAN_CODE_33,91,60,15,15 + PUSHBUTTON "F",SCAN_CODE_34,110,60,15,15 + PUSHBUTTON "G",SCAN_CODE_35,129,60,15,15 + PUSHBUTTON "H",SCAN_CODE_36,148,60,15,15 + PUSHBUTTON "J",SCAN_CODE_37,167,60,15,15 + PUSHBUTTON "K",SCAN_CODE_38,186,60,15,15 + PUSHBUTTON "L",SCAN_CODE_39,205,60,15,15 + PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15 + PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15 + PUSHBUTTON "ret",SCAN_CODE_43,262,60,56,15,BS_ICON + PUSHBUTTON "schimb",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "Z",SCAN_CODE_46,64,79,15,15 + PUSHBUTTON "X",SCAN_CODE_47,83,79,15,15 + PUSHBUTTON "C",SCAN_CODE_48,102,79,15,15 + PUSHBUTTON "V",SCAN_CODE_49,121,79,15,15 + PUSHBUTTON "B",SCAN_CODE_50,140,79,15,15 + PUSHBUTTON "N",SCAN_CODE_51,159,79,15,15 + PUSHBUTTON "M",SCAN_CODE_52,178,79,15,15 + PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15 + PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15 + PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15 + PUSHBUTTON "schimb",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "",SCAN_CODE_61,84,98,125,15 + PUSHBUTTON "alt gr",SCAN_CODE_62,213,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON + PUSHBUTTON "meniu",SCAN_CODE_129,267,98,24,15,BS_ICON + PUSHBUTTON "ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ins",SCAN_CODE_75,323,22,15,15 + PUSHBUTTON "ștg",SCAN_CODE_76,323,41,15,15 + PUSHBUTTON "init",SCAN_CODE_80,343,22,15,15 + PUSHBUTTON "fin",SCAN_CODE_81,343,41,15,15 + PUSHBUTTON "pg sus",SCAN_CODE_85,363,22,15,15,BS_ICON + PUSHBUTTON "pg jos",SCAN_CODE_86,363,41,15,15,BS_ICON + PUSHBUTTON "<-",SCAN_CODE_79,323,98,15,15,BS_ICON + PUSHBUTTON "^",SCAN_CODE_83,343,79,15,15,BS_ICON + PUSHBUTTON "v",SCAN_CODE_84,343,98,15,15,BS_ICON + PUSHBUTTON "->",SCAN_CODE_89,363,98,15,15,BS_ICON + PUSHBUTTON "num",SCAN_CODE_90,383,22,15,15 + PUSHBUTTON "7",SCAN_CODE_91,383,41,15,15 + PUSHBUTTON "4",SCAN_CODE_92,383,60,15,15 + PUSHBUTTON "1",SCAN_CODE_93,383,79,15,15 + PUSHBUTTON "/",SCAN_CODE_95,403,22,15,15 + PUSHBUTTON "8",SCAN_CODE_96,403,41,15,15 + PUSHBUTTON "5",SCAN_CODE_97,403,60,15,15 + PUSHBUTTON "2",SCAN_CODE_98,403,79,15,15 + PUSHBUTTON "0",SCAN_CODE_99,383,98,34,15 + PUSHBUTTON "*",SCAN_CODE_100,423,22,15,15 + PUSHBUTTON "9",SCAN_CODE_101,423,41,15,15 + PUSHBUTTON "6",SCAN_CODE_102,423,60,15,15 + PUSHBUTTON "3",SCAN_CODE_103,423,79,15,15 + PUSHBUTTON ".",SCAN_CODE_104,423,98,15,15 + PUSHBUTTON "-",SCAN_CODE_105,443,22,15,15 + PUSHBUTTON "+",SCAN_CODE_106,443,41,15,35 + PUSHBUTTON "intr",SCAN_CODE_108,443,78,15,35 + CTEXT "Num",IDC_STATIC,383,3,21,8 + CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,391,15,4,3 + CTEXT "Cap",IDC_STATIC,408,3,21,8 + CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,417,15,4,3 + CTEXT "Derul",IDC_STATIC,433,3,21,8 + CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3 END /* EOF */

6 years, 1 month

01/01: [OSK] Rearrange window elements for ru-RU and en-US locales (#412)

by Petr Akhlamov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=05fbad174f0a696a51af6… commit 05fbad174f0a696a51af69448d55da54d23b0a5b Author: Petr Akhlamov <petr-akhlamov(a)yandex.ru> AuthorDate: Sun Aug 19 22:40:58 2018 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Aug 19 21:40:58 2018 +0200 [OSK] Rearrange window elements for ru-RU and en-US locales (#412) * Resize osk window at RU and EN(US) languages --- base/applications/osk/lang/en-US.rc | 222 ++++++++++++++++++------------------ base/applications/osk/lang/ru-RU.rc | 222 ++++++++++++++++++------------------ 2 files changed, 222 insertions(+), 222 deletions(-) diff --git a/base/applications/osk/lang/en-US.rc b/base/applications/osk/lang/en-US.rc index 9fd4035a05..9c29b65aff 100644 --- a/base/applications/osk/lang/en-US.rc +++ b/base/applications/osk/lang/en-US.rc @@ -8,121 +8,121 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 +MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 463, 115 CAPTION "On screen keyboard" FONT 8, "MS Shell Dlg" EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE BEGIN - PUSHBUTTON "Esc",SCAN_CODE_110,3,3,23,22 - PUSHBUTTON "F1",SCAN_CODE_112,48,3,23,22 - PUSHBUTTON "F2",SCAN_CODE_113,75,3,23,22 - PUSHBUTTON "F3",SCAN_CODE_114,101,3,23,22 - PUSHBUTTON "F4",SCAN_CODE_115,128,3,23,22 - PUSHBUTTON "F5",SCAN_CODE_116,173,3,23,22 - PUSHBUTTON "F6",SCAN_CODE_117,199,3,23,22 - PUSHBUTTON "F7",SCAN_CODE_118,225,3,23,22 - PUSHBUTTON "F8",SCAN_CODE_119,251,3,23,22 - PUSHBUTTON "F9",SCAN_CODE_120,296,3,23,22 - PUSHBUTTON "F10",SCAN_CODE_121,323,3,23,22 - PUSHBUTTON "F11",SCAN_CODE_122,350,3,23,22 - PUSHBUTTON "F12",SCAN_CODE_123,377,3,23,22 - PUSHBUTTON "Prn",SCAN_CODE_124,411,3,23,22 - PUSHBUTTON "Stop",SCAN_CODE_125,438,3,23,22 - PUSHBUTTON "Attn",SCAN_CODE_126,465,3,23,22 - PUSHBUTTON "`",SCAN_CODE_1,3,35,23,22 - PUSHBUTTON "1",SCAN_CODE_2,30,35,23,22 - PUSHBUTTON "2",SCAN_CODE_3,57,35,23,22 - PUSHBUTTON "3",SCAN_CODE_4,84,35,23,22 - PUSHBUTTON "4",SCAN_CODE_5,111,35,23,22 - PUSHBUTTON "5",SCAN_CODE_6,138,35,23,22 - PUSHBUTTON "6",SCAN_CODE_7,165,35,23,22 - PUSHBUTTON "7",SCAN_CODE_8,192,35,23,22 - PUSHBUTTON "8",SCAN_CODE_9,219,35,23,22 - PUSHBUTTON "9",SCAN_CODE_10,246,35,23,22 - PUSHBUTTON "0",SCAN_CODE_11,273,35,23,22 - PUSHBUTTON "-",SCAN_CODE_12,300,35,23,22 - PUSHBUTTON "=",SCAN_CODE_13,327,35,23,22 - PUSHBUTTON "<--",SCAN_CODE_15,354,35,47,22,BS_ICON - PUSHBUTTON "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON - PUSHBUTTON "Q",SCAN_CODE_17,42,61,23,22 - PUSHBUTTON "W",SCAN_CODE_18,69,61,23,22 - PUSHBUTTON "E",SCAN_CODE_19,96,61,23,22 - PUSHBUTTON "R",SCAN_CODE_20,123,61,23,22 - PUSHBUTTON "T",SCAN_CODE_21,150,61,23,22 - PUSHBUTTON "Y",SCAN_CODE_22,177,61,23,22 - PUSHBUTTON "U",SCAN_CODE_23,204,61,23,22 - PUSHBUTTON "I",SCAN_CODE_24,231,61,23,22 - PUSHBUTTON "O",SCAN_CODE_25,258,61,23,22 - PUSHBUTTON "P",SCAN_CODE_26,285,61,23,22 - PUSHBUTTON "[",SCAN_CODE_27,312,61,23,22 - PUSHBUTTON "]",SCAN_CODE_28,339,61,23,22 - PUSHBUTTON "\\",SCAN_CODE_29,366,61,35,22 - PUSHBUTTON "Caps Lock",SCAN_CODE_30,3,87,46,22,BS_ICON - PUSHBUTTON "A",SCAN_CODE_31,53,87,23,22 - PUSHBUTTON "S",SCAN_CODE_32,80,87,23,22 - PUSHBUTTON "D",SCAN_CODE_33,107,87,23,22 - PUSHBUTTON "F",SCAN_CODE_34,134,87,23,22 - PUSHBUTTON "G",SCAN_CODE_35,161,87,23,22 - PUSHBUTTON "H",SCAN_CODE_36,188,87,23,22 - PUSHBUTTON "J",SCAN_CODE_37,215,87,23,22 - PUSHBUTTON "K",SCAN_CODE_38,242,87,23,22 - PUSHBUTTON "L",SCAN_CODE_39,269,87,23,22 - PUSHBUTTON ";",SCAN_CODE_40,296,87,23,22 - PUSHBUTTON "'",SCAN_CODE_41,323,87,23,22 - PUSHBUTTON "ret",SCAN_CODE_43,350,87,51,22,BS_ICON - PUSHBUTTON "shift",SCAN_CODE_44,3,113,57,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "Z",SCAN_CODE_46,64,113,23,22 - PUSHBUTTON "X",SCAN_CODE_47,91,113,23,22 - PUSHBUTTON "C",SCAN_CODE_48,118,113,23,22 - PUSHBUTTON "V",SCAN_CODE_49,145,113,23,22 - PUSHBUTTON "B",SCAN_CODE_50,172,113,23,22 - PUSHBUTTON "N",SCAN_CODE_51,199,113,23,22 - PUSHBUTTON "M",SCAN_CODE_52,226,113,23,22 - PUSHBUTTON ",",SCAN_CODE_53,253,113,23,22 - PUSHBUTTON ".",SCAN_CODE_54,280,113,23,22 - PUSHBUTTON "/",SCAN_CODE_55,307,113,23,22 - PUSHBUTTON "shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON - PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 - PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON - PUSHBUTTON "menu",SCAN_CODE_129,332,139,30,22,BS_ICON - PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 - PUSHBUTTON "del",SCAN_CODE_76,411,61,23,22 - PUSHBUTTON "home",SCAN_CODE_80,438,35,23,22,BS_ICON - PUSHBUTTON "end",SCAN_CODE_81,438,61,23,22 - PUSHBUTTON "pg up",SCAN_CODE_85,465,35,23,22,BS_ICON - PUSHBUTTON "pg down",SCAN_CODE_86,465,61,23,22,BS_ICON - PUSHBUTTON "<-",SCAN_CODE_79,411,139,23,22,BS_ICON - PUSHBUTTON "^",SCAN_CODE_83,438,113,23,22,BS_ICON - PUSHBUTTON "v",SCAN_CODE_84,438,139,23,22,BS_ICON - PUSHBUTTON "->",SCAN_CODE_89,465,139,23,22,BS_ICON - PUSHBUTTON "num",SCAN_CODE_90,500,35,23,22 - PUSHBUTTON "7",SCAN_CODE_91,500,61,23,22 - PUSHBUTTON "4",SCAN_CODE_92,500,87,23,22 - PUSHBUTTON "1",SCAN_CODE_93,500,113,23,22 - PUSHBUTTON "/",SCAN_CODE_95,527,35,23,22 - PUSHBUTTON "8",SCAN_CODE_96,527,61,23,22 - PUSHBUTTON "5",SCAN_CODE_97,527,87,23,22 - PUSHBUTTON "2",SCAN_CODE_98,527,113,23,22 - PUSHBUTTON "0",SCAN_CODE_99,500,139,50,22 - PUSHBUTTON "*",SCAN_CODE_100,554,35,23,22 - PUSHBUTTON "9",SCAN_CODE_101,554,61,23,22 - PUSHBUTTON "6",SCAN_CODE_102,554,87,23,22 - PUSHBUTTON "3",SCAN_CODE_103,554,113,23,22 - PUSHBUTTON ".",SCAN_CODE_104,554,139,23,22 - PUSHBUTTON "-",SCAN_CODE_105,581,35,23,22 - PUSHBUTTON "+",SCAN_CODE_106,581,61,23,48 - PUSHBUTTON "ent",SCAN_CODE_108,581,113,23,48 - CTEXT "Num",IDC_STATIC,510,4,21,8 - CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,518,16,4,3 - CTEXT "Caps",IDC_STATIC,540,4,21,8 - CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,548,16,4,3 - CTEXT "Scroll",IDC_STATIC,572,4,21,8 - CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 + PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15 + PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15 + PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15 + PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15 + PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15 + PUSHBUTTON "F5",SCAN_CODE_116,143,3,15,15 + PUSHBUTTON "F6",SCAN_CODE_117,163,3,15,15 + PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15 + PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15 + PUSHBUTTON "F9",SCAN_CODE_120,243,3,15,15 + PUSHBUTTON "F10",SCAN_CODE_121,263,3,15,15 + PUSHBUTTON "F11",SCAN_CODE_122,283,3,15,15 + PUSHBUTTON "F12",SCAN_CODE_123,303,3,15,15 + PUSHBUTTON "Prn",SCAN_CODE_124,323,3,15,15 + PUSHBUTTON "Stop",SCAN_CODE_125,343,3,15,15 + PUSHBUTTON "Attn",SCAN_CODE_126,363,3,15,15 + PUSHBUTTON "`",SCAN_CODE_1,3,22,15,15 + PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15 + PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15 + PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15 + PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15 + PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15 + PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15 + PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15 + PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15 + PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15 + PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15 + PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15 + PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15 + PUSHBUTTON "<--",SCAN_CODE_15,263,22,55,15,BS_ICON + PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON + PUSHBUTTON "q",SCAN_CODE_17,42,41,15,15 + PUSHBUTTON "w",SCAN_CODE_18,61,41,15,15 + PUSHBUTTON "e",SCAN_CODE_19,80,41,15,15 + PUSHBUTTON "r",SCAN_CODE_20,99,41,15,15 + PUSHBUTTON "t",SCAN_CODE_21,118,41,15,15 + PUSHBUTTON "y",SCAN_CODE_22,137,41,15,15 + PUSHBUTTON "u",SCAN_CODE_23,156,41,15,15 + PUSHBUTTON "i",SCAN_CODE_24,175,41,15,15 + PUSHBUTTON "o",SCAN_CODE_25,194,41,15,15 + PUSHBUTTON "p",SCAN_CODE_26,213,41,15,15 + PUSHBUTTON "[",SCAN_CODE_27,232,41,15,15 + PUSHBUTTON "]",SCAN_CODE_28,251,41,15,15 + PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON + PUSHBUTTON "a",SCAN_CODE_31,53,60,15,15 + PUSHBUTTON "s",SCAN_CODE_32,72,60,15,15 + PUSHBUTTON "d",SCAN_CODE_33,91,60,15,15 + PUSHBUTTON "f",SCAN_CODE_34,110,60,15,15 + PUSHBUTTON "g",SCAN_CODE_35,129,60,15,15 + PUSHBUTTON "h",SCAN_CODE_36,148,60,15,15 + PUSHBUTTON "j",SCAN_CODE_37,167,60,15,15 + PUSHBUTTON "k",SCAN_CODE_38,186,60,15,15 + PUSHBUTTON "l",SCAN_CODE_39,205,60,15,15 + PUSHBUTTON ";",SCAN_CODE_40,224,60,15,15 + PUSHBUTTON "'",SCAN_CODE_41,243,60,15,15 + PUSHBUTTON "\\",SCAN_CODE_29,270,41,48,15 + PUSHBUTTON "ret",SCAN_CODE_43,262,60,56,15,BS_ICON + PUSHBUTTON "shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "z",SCAN_CODE_46,64,79,15,15 + PUSHBUTTON "x",SCAN_CODE_47,83,79,15,15 + PUSHBUTTON "c",SCAN_CODE_48,102,79,15,15 + PUSHBUTTON "v",SCAN_CODE_49,121,79,15,15 + PUSHBUTTON "b",SCAN_CODE_50,140,79,15,15 + PUSHBUTTON "n",SCAN_CODE_51,159,79,15,15 + PUSHBUTTON "m",SCAN_CODE_52,178,79,15,15 + PUSHBUTTON ",",SCAN_CODE_53,197,79,15,15 + PUSHBUTTON ".",SCAN_CODE_54,216,79,15,15 + PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15 + PUSHBUTTON "shift",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "v",SCAN_CODE_84,343,98,15,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "",SCAN_CODE_61,84,98,125,15 //space + PUSHBUTTON "alt",SCAN_CODE_62,213,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON + PUSHBUTTON "menu",SCAN_CODE_129,267,98,24,15,BS_ICON + PUSHBUTTON "ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ins",SCAN_CODE_75,323,22,15,15 + PUSHBUTTON "del",SCAN_CODE_76,323,41,15,15 + PUSHBUTTON "hm",SCAN_CODE_80,343,22,15,15 + PUSHBUTTON "end",SCAN_CODE_81,343,41,15,15 + PUSHBUTTON "pup",SCAN_CODE_85,363,22,15,15 + PUSHBUTTON "pdn",SCAN_CODE_86,363,41,15,15 + PUSHBUTTON "<-",SCAN_CODE_79,323,98,15,15,BS_ICON + PUSHBUTTON "^",SCAN_CODE_83,343,79,15,15,BS_ICON + PUSHBUTTON "->",SCAN_CODE_89,363,98,15,15,BS_ICON + PUSHBUTTON "nlk",SCAN_CODE_90,383,22,15,15 + PUSHBUTTON "7",SCAN_CODE_91,383,41,15,15 + PUSHBUTTON "4",SCAN_CODE_92,383,60,15,15 + PUSHBUTTON "1",SCAN_CODE_93,383,79,15,15 + PUSHBUTTON "/",SCAN_CODE_95,403,22,15,15 + PUSHBUTTON "8",SCAN_CODE_96,403,41,15,15 + PUSHBUTTON "5",SCAN_CODE_97,403,60,15,15 + PUSHBUTTON "2",SCAN_CODE_98,403,79,15,15 + PUSHBUTTON "0",SCAN_CODE_99,383,98,34,15 + PUSHBUTTON "*",SCAN_CODE_100,423,22,15,15 + PUSHBUTTON "9",SCAN_CODE_101,423,41,15,15 + PUSHBUTTON "6",SCAN_CODE_102,423,60,15,15 + PUSHBUTTON "3",SCAN_CODE_103,423,79,15,15 + PUSHBUTTON ".",SCAN_CODE_104,423,98,15,15 + PUSHBUTTON "-",SCAN_CODE_105,443,22,15,15 + PUSHBUTTON "+",SCAN_CODE_106,443,41,15,35 + PUSHBUTTON "ent",SCAN_CODE_108,443,78,15,35 + CTEXT "Num",IDC_STATIC,383,3,21,8 + CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,391,15,4,3 + CTEXT "Caps",IDC_STATIC,408,3,21,8 + CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,417,15,4,3 + CTEXT "Scroll",IDC_STATIC,433,3,21,8 + CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3 END /* EOF */ diff --git a/base/applications/osk/lang/ru-RU.rc b/base/applications/osk/lang/ru-RU.rc index 42826e3891..3a042884e3 100644 --- a/base/applications/osk/lang/ru-RU.rc +++ b/base/applications/osk/lang/ru-RU.rc @@ -8,121 +8,121 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL -MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 +MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 463, 115 CAPTION "Экранная клавиатура" FONT 8, "MS Shell Dlg" EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE BEGIN - PUSHBUTTON "Esc",SCAN_CODE_110,3,3,23,22 - PUSHBUTTON "F1",SCAN_CODE_112,48,3,23,22 - PUSHBUTTON "F2",SCAN_CODE_113,75,3,23,22 - PUSHBUTTON "F3",SCAN_CODE_114,101,3,23,22 - PUSHBUTTON "F4",SCAN_CODE_115,128,3,23,22 - PUSHBUTTON "F5",SCAN_CODE_116,173,3,23,22 - PUSHBUTTON "F6",SCAN_CODE_117,199,3,23,22 - PUSHBUTTON "F7",SCAN_CODE_118,225,3,23,22 - PUSHBUTTON "F8",SCAN_CODE_119,251,3,23,22 - PUSHBUTTON "F9",SCAN_CODE_120,296,3,23,22 - PUSHBUTTON "F10",SCAN_CODE_121,323,3,23,22 - PUSHBUTTON "F11",SCAN_CODE_122,350,3,23,22 - PUSHBUTTON "F12",SCAN_CODE_123,377,3,23,22 - PUSHBUTTON "Prn",SCAN_CODE_124,411,3,23,22 - PUSHBUTTON "Stop",SCAN_CODE_125,438,3,23,22 - PUSHBUTTON "Attn",SCAN_CODE_126,465,3,23,22 - PUSHBUTTON "Ë",SCAN_CODE_1,3,35,23,22 - PUSHBUTTON "1",SCAN_CODE_2,30,35,23,22 - PUSHBUTTON "2",SCAN_CODE_3,57,35,23,22 - PUSHBUTTON "3",SCAN_CODE_4,84,35,23,22 - PUSHBUTTON "4",SCAN_CODE_5,111,35,23,22 - PUSHBUTTON "5",SCAN_CODE_6,138,35,23,22 - PUSHBUTTON "6",SCAN_CODE_7,165,35,23,22 - PUSHBUTTON "7",SCAN_CODE_8,192,35,23,22 - PUSHBUTTON "8",SCAN_CODE_9,219,35,23,22 - PUSHBUTTON "9",SCAN_CODE_10,246,35,23,22 - PUSHBUTTON "0",SCAN_CODE_11,273,35,23,22 - PUSHBUTTON "-",SCAN_CODE_12,300,35,23,22 - PUSHBUTTON "=",SCAN_CODE_13,327,35,23,22 - PUSHBUTTON "<--",SCAN_CODE_15,354,35,47,22,BS_ICON - PUSHBUTTON "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON - PUSHBUTTON "Й",SCAN_CODE_17,42,61,23,22 - PUSHBUTTON "Ц",SCAN_CODE_18,69,61,23,22 - PUSHBUTTON "У",SCAN_CODE_19,96,61,23,22 - PUSHBUTTON "К",SCAN_CODE_20,123,61,23,22 - PUSHBUTTON "E",SCAN_CODE_21,150,61,23,22 - PUSHBUTTON "Н",SCAN_CODE_22,177,61,23,22 - PUSHBUTTON "Г",SCAN_CODE_23,204,61,23,22 - PUSHBUTTON "Ш",SCAN_CODE_24,231,61,23,22 - PUSHBUTTON "Щ",SCAN_CODE_25,258,61,23,22 - PUSHBUTTON "З",SCAN_CODE_26,285,61,23,22 - PUSHBUTTON "X",SCAN_CODE_27,312,61,23,22 - PUSHBUTTON "Ъ",SCAN_CODE_28,339,61,23,22 - PUSHBUTTON "Caps lock",SCAN_CODE_30,3,87,46,22,BS_ICON - PUSHBUTTON "Ф",SCAN_CODE_31,53,87,23,22 - PUSHBUTTON "Ы",SCAN_CODE_32,80,87,23,22 - PUSHBUTTON "В",SCAN_CODE_33,107,87,23,22 - PUSHBUTTON "A",SCAN_CODE_34,134,87,23,22 - PUSHBUTTON "П",SCAN_CODE_35,161,87,23,22 - PUSHBUTTON "P",SCAN_CODE_36,188,87,23,22 - PUSHBUTTON "O",SCAN_CODE_37,215,87,23,22 - PUSHBUTTON "Л",SCAN_CODE_38,242,87,23,22 - PUSHBUTTON "Д",SCAN_CODE_39,269,87,23,22 - PUSHBUTTON "Ж",SCAN_CODE_40,296,87,23,22 - PUSHBUTTON "Э",SCAN_CODE_41,323,87,23,22 - PUSHBUTTON "\\",SCAN_CODE_42,350,87,23,22 - PUSHBUTTON "ret",SCAN_CODE_43,377,61,23,48,BS_ICON - PUSHBUTTON "shift",SCAN_CODE_44,3,113,57,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "Я",SCAN_CODE_46,64,113,23,22 - PUSHBUTTON "Ч",SCAN_CODE_47,91,113,23,22 - PUSHBUTTON "C",SCAN_CODE_48,118,113,23,22 - PUSHBUTTON "M",SCAN_CODE_49,145,113,23,22 - PUSHBUTTON "И",SCAN_CODE_50,172,113,23,22 - PUSHBUTTON "T",SCAN_CODE_51,199,113,23,22 - PUSHBUTTON "Ь",SCAN_CODE_52,226,113,23,22 - PUSHBUTTON "Б",SCAN_CODE_53,253,113,23,22 - PUSHBUTTON "Ю",SCAN_CODE_54,280,113,23,22 - PUSHBUTTON ".",SCAN_CODE_55,307,113,23,22 - PUSHBUTTON "shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON - PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 - PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON - PUSHBUTTON "menu",SCAN_CODE_129,332,139,30,22,BS_ICON - PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 - PUSHBUTTON "del",SCAN_CODE_76,411,61,23,22 - PUSHBUTTON "home",SCAN_CODE_80,438,35,23,22,BS_ICON - PUSHBUTTON "end",SCAN_CODE_81,438,61,23,22 - PUSHBUTTON "pg AR",SCAN_CODE_85,465,35,23,22,BS_ICON - PUSHBUTTON "pg AV",SCAN_CODE_86,465,61,23,22,BS_ICON - PUSHBUTTON "<-",SCAN_CODE_79,411,139,23,22,BS_ICON - PUSHBUTTON "^",SCAN_CODE_83,438,113,23,22,BS_ICON - PUSHBUTTON "v",SCAN_CODE_84,438,139,23,22,BS_ICON - PUSHBUTTON "->",SCAN_CODE_89,465,139,23,22,BS_ICON - PUSHBUTTON "num",SCAN_CODE_90,500,35,23,22 - PUSHBUTTON "7",SCAN_CODE_91,500,61,23,22 - PUSHBUTTON "4",SCAN_CODE_92,500,87,23,22 - PUSHBUTTON "1",SCAN_CODE_93,500,113,23,22 - PUSHBUTTON "/",SCAN_CODE_95,527,35,23,22 - PUSHBUTTON "8",SCAN_CODE_96,527,61,23,22 - PUSHBUTTON "5",SCAN_CODE_97,527,87,23,22 - PUSHBUTTON "2",SCAN_CODE_98,527,113,23,22 - PUSHBUTTON "0",SCAN_CODE_99,500,139,50,22 - PUSHBUTTON "*",SCAN_CODE_100,554,35,23,22 - PUSHBUTTON "9",SCAN_CODE_101,554,61,23,22 - PUSHBUTTON "6",SCAN_CODE_102,554,87,23,22 - PUSHBUTTON "3",SCAN_CODE_103,554,113,23,22 - PUSHBUTTON ".",SCAN_CODE_104,554,139,23,22 - PUSHBUTTON "-",SCAN_CODE_105,581,35,23,22 - PUSHBUTTON "+",SCAN_CODE_106,581,61,23,48 - PUSHBUTTON "ent",SCAN_CODE_108,581,113,23,48 - CTEXT "Num",IDC_STATIC,510,4,21,8 - CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,518,16,4,3 - CTEXT "Caps",IDC_STATIC,540,4,21,8 - CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,548,16,4,3 - CTEXT "Scroll",IDC_STATIC,572,4,21,8 - CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 + PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15 + PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15 + PUSHBUTTON "F2",SCAN_CODE_113,63,3,15,15 + PUSHBUTTON "F3",SCAN_CODE_114,83,3,15,15 + PUSHBUTTON "F4",SCAN_CODE_115,103,3,15,15 + PUSHBUTTON "F5",SCAN_CODE_116,143,3,15,15 + PUSHBUTTON "F6",SCAN_CODE_117,163,3,15,15 + PUSHBUTTON "F7",SCAN_CODE_118,183,3,15,15 + PUSHBUTTON "F8",SCAN_CODE_119,203,3,15,15 + PUSHBUTTON "F9",SCAN_CODE_120,243,3,15,15 + PUSHBUTTON "F10",SCAN_CODE_121,263,3,15,15 + PUSHBUTTON "F11",SCAN_CODE_122,283,3,15,15 + PUSHBUTTON "F12",SCAN_CODE_123,303,3,15,15 + PUSHBUTTON "Prn",SCAN_CODE_124,323,3,15,15 + PUSHBUTTON "Stop",SCAN_CODE_125,343,3,15,15 + PUSHBUTTON "Attn",SCAN_CODE_126,363,3,15,15 + PUSHBUTTON "ё",SCAN_CODE_1,3,22,15,15 + PUSHBUTTON "1",SCAN_CODE_2,23,22,15,15 + PUSHBUTTON "2",SCAN_CODE_3,43,22,15,15 + PUSHBUTTON "3",SCAN_CODE_4,63,22,15,15 + PUSHBUTTON "4",SCAN_CODE_5,83,22,15,15 + PUSHBUTTON "5",SCAN_CODE_6,103,22,15,15 + PUSHBUTTON "6",SCAN_CODE_7,123,22,15,15 + PUSHBUTTON "7",SCAN_CODE_8,143,22,15,15 + PUSHBUTTON "8",SCAN_CODE_9,163,22,15,15 + PUSHBUTTON "9",SCAN_CODE_10,183,22,15,15 + PUSHBUTTON "0",SCAN_CODE_11,203,22,15,15 + PUSHBUTTON "-",SCAN_CODE_12,223,22,15,15 + PUSHBUTTON "=",SCAN_CODE_13,243,22,15,15 + PUSHBUTTON "<--",SCAN_CODE_15,263,22,55,15,BS_ICON + PUSHBUTTON "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON + PUSHBUTTON "й",SCAN_CODE_17,42,41,15,15 + PUSHBUTTON "ц",SCAN_CODE_18,61,41,15,15 + PUSHBUTTON "у",SCAN_CODE_19,80,41,15,15 + PUSHBUTTON "к",SCAN_CODE_20,99,41,15,15 + PUSHBUTTON "е",SCAN_CODE_21,118,41,15,15 + PUSHBUTTON "н",SCAN_CODE_22,137,41,15,15 + PUSHBUTTON "г",SCAN_CODE_23,156,41,15,15 + PUSHBUTTON "ш",SCAN_CODE_24,175,41,15,15 + PUSHBUTTON "щ",SCAN_CODE_25,194,41,15,15 + PUSHBUTTON "з",SCAN_CODE_26,213,41,15,15 + PUSHBUTTON "х",SCAN_CODE_27,232,41,15,15 + PUSHBUTTON "ъ",SCAN_CODE_28,251,41,15,15 + PUSHBUTTON "lock",SCAN_CODE_30,3,60,46,15,BS_ICON + PUSHBUTTON "ф",SCAN_CODE_31,53,60,15,15 + PUSHBUTTON "ы",SCAN_CODE_32,72,60,15,15 + PUSHBUTTON "в",SCAN_CODE_33,91,60,15,15 + PUSHBUTTON "а",SCAN_CODE_34,110,60,15,15 + PUSHBUTTON "п",SCAN_CODE_35,129,60,15,15 + PUSHBUTTON "р",SCAN_CODE_36,148,60,15,15 + PUSHBUTTON "о",SCAN_CODE_37,167,60,15,15 + PUSHBUTTON "л",SCAN_CODE_38,186,60,15,15 + PUSHBUTTON "д",SCAN_CODE_39,205,60,15,15 + PUSHBUTTON "ж",SCAN_CODE_40,224,60,15,15 + PUSHBUTTON "э",SCAN_CODE_41,243,60,15,15 + PUSHBUTTON "\\",SCAN_CODE_42,270,41,48,15 + PUSHBUTTON "ret",SCAN_CODE_43,262,60,56,15,BS_ICON + PUSHBUTTON "shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "я",SCAN_CODE_46,64,79,15,15 + PUSHBUTTON "ч",SCAN_CODE_47,83,79,15,15 + PUSHBUTTON "с",SCAN_CODE_48,102,79,15,15 + PUSHBUTTON "м",SCAN_CODE_49,121,79,15,15 + PUSHBUTTON "и",SCAN_CODE_50,140,79,15,15 + PUSHBUTTON "т",SCAN_CODE_51,159,79,15,15 + PUSHBUTTON "ь",SCAN_CODE_52,178,79,15,15 + PUSHBUTTON "б",SCAN_CODE_53,197,79,15,15 + PUSHBUTTON "ю",SCAN_CODE_54,216,79,15,15 + PUSHBUTTON ".",SCAN_CODE_55,235,79,15,15 + PUSHBUTTON "shift",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "v",SCAN_CODE_84,343,98,15,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "",SCAN_CODE_61,84,98,125,15 //space + PUSHBUTTON "alt",SCAN_CODE_62,213,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON + PUSHBUTTON "menu",SCAN_CODE_129,267,98,24,15,BS_ICON + PUSHBUTTON "ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ins",SCAN_CODE_75,323,22,15,15 + PUSHBUTTON "del",SCAN_CODE_76,323,41,15,15 + PUSHBUTTON "hm",SCAN_CODE_80,343,22,15,15 + PUSHBUTTON "end",SCAN_CODE_81,343,41,15,15 + PUSHBUTTON "pup",SCAN_CODE_85,363,22,15,15 + PUSHBUTTON "pdn",SCAN_CODE_86,363,41,15,15 + PUSHBUTTON "<-",SCAN_CODE_79,323,98,15,15,BS_ICON + PUSHBUTTON "^",SCAN_CODE_83,343,79,15,15,BS_ICON + PUSHBUTTON "->",SCAN_CODE_89,363,98,15,15,BS_ICON + PUSHBUTTON "nlk",SCAN_CODE_90,383,22,15,15 + PUSHBUTTON "7",SCAN_CODE_91,383,41,15,15 + PUSHBUTTON "4",SCAN_CODE_92,383,60,15,15 + PUSHBUTTON "1",SCAN_CODE_93,383,79,15,15 + PUSHBUTTON "/",SCAN_CODE_95,403,22,15,15 + PUSHBUTTON "8",SCAN_CODE_96,403,41,15,15 + PUSHBUTTON "5",SCAN_CODE_97,403,60,15,15 + PUSHBUTTON "2",SCAN_CODE_98,403,79,15,15 + PUSHBUTTON "0",SCAN_CODE_99,383,98,34,15 + PUSHBUTTON "*",SCAN_CODE_100,423,22,15,15 + PUSHBUTTON "9",SCAN_CODE_101,423,41,15,15 + PUSHBUTTON "6",SCAN_CODE_102,423,60,15,15 + PUSHBUTTON "3",SCAN_CODE_103,423,79,15,15 + PUSHBUTTON ".",SCAN_CODE_104,423,98,15,15 + PUSHBUTTON "-",SCAN_CODE_105,443,22,15,15 + PUSHBUTTON "+",SCAN_CODE_106,443,41,15,35 + PUSHBUTTON "ent",SCAN_CODE_108,443,78,15,35 + CTEXT "Num",IDC_STATIC,383,3,21,8 + CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,391,15,4,3 + CTEXT "Caps",IDC_STATIC,408,3,21,8 + CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,417,15,4,3 + CTEXT "Scroll",IDC_STATIC,433,3,21,8 + CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3 END /* EOF */

6 years, 1 month

01/01: [NETSHELL] Update French translation to reflect 0725098

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e8611d3e65aec17ff3bd5… commit e8611d3e65aec17ff3bd5c2df533fc049f27fced Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Aug 19 20:50:55 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Aug 19 20:50:55 2018 +0200 [NETSHELL] Update French translation to reflect 0725098 --- dll/shellext/netshell/lang/fr-FR.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/shellext/netshell/lang/fr-FR.rc b/dll/shellext/netshell/lang/fr-FR.rc index cbb263e227..9634e222a4 100644 --- a/dll/shellext/netshell/lang/fr-FR.rc +++ b/dll/shellext/netshell/lang/fr-FR.rc @@ -169,8 +169,8 @@ BEGIN IDS_NETWORKSETTINGSSUBTITLE "Installe les logiciels réseau utilisés pour se connecter à d'autres réseaux, ordinateurs et à l'Internet." IDS_NETWORKCOMPONENTTITLE "Composants réseau" IDS_NETWORKCOMPONENTSUBTITLE "Détermine quels composants réseaux sont utilisés sur votre ordinateur. Pour ajouter de nouveaux composants, cliquez sur Installer." - IDS_NETWORKDOMAINTITLE "Groupe de travail ou domaine" - IDS_NETWORKDOMAINSUBTITLE "Un domaine est un groupe d'ordinateurs défini par un administrateur réseau. Un groupe de travail est un groupe d'ordinateurs partageant le même nom de groupe de travail." + IDS_NETWORKDOMAINTITLE "Groupe de travail ou domaine réseau" + IDS_NETWORKDOMAINSUBTITLE "Specifie comment l'ordinateur sera utilisé - comme membre d'un groupe de travail ou d'un domaine réseau." IDS_REACTOS_SETUP "Installation de ReactOS" IDS_WZD_DOMAIN_NAME "L'installation ne peut pas continuer tant que\nvous n'entrez pas le nom du domaine\nou celui du groupe de travail." END

6 years, 1 month

03/03: [NTOS:EX] Implement SystemFirmwareTableInformation class

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d033fe9bbf03037730826… commit d033fe9bbf03037730826f12791987935187010c Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Aug 5 16:39:51 2018 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Aug 19 20:27:59 2018 +0200 [NTOS:EX] Implement SystemFirmwareTableInformation class --- ntoskrnl/ex/sysinfo.c | 187 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 187 insertions(+) diff --git a/ntoskrnl/ex/sysinfo.c b/ntoskrnl/ex/sysinfo.c index 016ac5b1d9..ab8481b328 100644 --- a/ntoskrnl/ex/sysinfo.c +++ b/ntoskrnl/ex/sysinfo.c @@ -11,12 +11,18 @@ /* INCLUDES *****************************************************************/ #include <ntoskrnl.h> +#include <wmidata.h> +#include <wmistr.h> #define NDEBUG #include <debug.h> /* The maximum size of an environment value (in bytes) */ #define MAX_ENVVAL_SIZE 1024 +#define SIG_ACPI 0x41435049 +#define SIG_FIRM 0x4649524D +#define SIG_RSMB 0x52534D42 + extern LIST_ENTRY HandleTableListHead; extern EX_PUSH_LOCK HandleTableListLock; @@ -239,6 +245,75 @@ ExLockUserBuffer( return STATUS_SUCCESS; } +NTSTATUS +NTAPI +ExpGetRawSMBiosTable( + _Out_opt_ PVOID Buffer, + _Out_ ULONG * OutSize, + _In_ ULONG BufferSize) +{ + NTSTATUS Status; + PVOID DataBlockObject; + PWNODE_ALL_DATA AllData; + ULONG WMIBufSize; + + ASSERT(OutSize != NULL); + *OutSize = 0; + + /* Open the data block object for the SMBIOS table */ + Status = IoWMIOpenBlock(&MSSmBios_RawSMBiosTables_GUID, + WMIGUID_QUERY, + &DataBlockObject); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IoWMIOpenBlock failed: 0x%08lx\n", Status); + return Status; + } + + /* Query the required buffer size */ + WMIBufSize = 0; + Status = IoWMIQueryAllData(DataBlockObject, &WMIBufSize, NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IoWMIOpenBlock failed: 0x%08lx\n", Status); + return Status; + } + + AllData = ExAllocatePoolWithTag(PagedPool, WMIBufSize, 'itfS'); + if (AllData == NULL) + { + DPRINT1("Failed to allocate %lu bytes for SMBIOS tables\n", WMIBufSize); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Query the buffer data */ + Status = IoWMIQueryAllData(DataBlockObject, &WMIBufSize, AllData); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IoWMIOpenBlock failed: 0x%08lx\n", Status); + ExFreePoolWithTag(AllData, 'itfS'); + return Status; + } + + Status = STATUS_SUCCESS; + *OutSize = AllData->FixedInstanceSize; + if (Buffer != NULL) + { + if (BufferSize >= *OutSize) + { + RtlMoveMemory(Buffer, AllData + 1, *OutSize); + } + else + { + Status = STATUS_BUFFER_TOO_SMALL; + } + } + + /* Free the buffer */ + ExFreePoolWithTag(AllData, 'itfS'); + return Status; +} + /* FUNCTIONS *****************************************************************/ /* @@ -2503,6 +2578,106 @@ QSI_DEF(SystemExtendedHandleInformation) return Status; } +/* Class 76 - System firmware table information */ +QSI_DEF(SystemFirmwareTableInformation) +{ + PSYSTEM_FIRMWARE_TABLE_INFORMATION SysFirmwareInfo = (PSYSTEM_FIRMWARE_TABLE_INFORMATION)Buffer; + NTSTATUS Status = STATUS_SUCCESS; + ULONG InputBufSize; + ULONG DataSize = 0; + ULONG TableCount = 0; + + DPRINT("NtQuerySystemInformation - SystemFirmwareTableInformation\n"); + + /* Set initial required buffer size */ + *ReqSize = FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer); + + /* Check user's buffer size */ + if (Size < *ReqSize) + { + return STATUS_INFO_LENGTH_MISMATCH; + } + + InputBufSize = SysFirmwareInfo->TableBufferLength; + switch (SysFirmwareInfo->ProviderSignature) + { + /* + * ExpFirmwareTableResource and ExpFirmwareTableProviderListHead + * variables should be used there somehow... + */ + case SIG_ACPI: + { + /* FIXME: Not implemented yet */ + DPRINT1("ACPI provider not implemented\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + } + case SIG_FIRM: + { + /* FIXME: Not implemented yet */ + DPRINT1("FIRM provider not implemented\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + } + case SIG_RSMB: + { + Status = ExpGetRawSMBiosTable(NULL, &DataSize, 0); + if (DataSize > 0) + { + TableCount = 1; + if (SysFirmwareInfo->Action == SystemFirmwareTable_Enumerate) + { + DataSize = TableCount * sizeof(ULONG); + if (DataSize <= InputBufSize) + { + *(ULONG *)SysFirmwareInfo->TableBuffer = 0; + } + } + else if (SysFirmwareInfo->Action == SystemFirmwareTable_Get + && DataSize <= InputBufSize) + { + Status = ExpGetRawSMBiosTable(SysFirmwareInfo->TableBuffer, &DataSize, InputBufSize); + } + SysFirmwareInfo->TableBufferLength = DataSize; + } + break; + } + default: + { + DPRINT1("SystemFirmwareTableInformation: Unsupported provider (0x%x)\n", + SysFirmwareInfo->ProviderSignature); + Status = STATUS_ILLEGAL_FUNCTION; + } + } + + if (NT_SUCCESS(Status)) + { + switch (SysFirmwareInfo->Action) + { + case SystemFirmwareTable_Enumerate: + case SystemFirmwareTable_Get: + { + if (SysFirmwareInfo->TableBufferLength > InputBufSize) + { + Status = STATUS_BUFFER_TOO_SMALL; + } + break; + } + default: + { + DPRINT1("SystemFirmwareTableInformation: Unsupported action (0x%x)\n", + SysFirmwareInfo->Action); + Status = STATUS_ILLEGAL_FUNCTION; + } + } + } + else + { + SysFirmwareInfo->TableBufferLength = 0; + } + return Status; +} + /* Query/Set Calls Table */ typedef struct _QSSI_CALLS @@ -2590,6 +2765,18 @@ CallQS [] = SI_XX(SystemEmulationBasicInformation), /* FIXME: not implemented */ SI_XX(SystemEmulationProcessorInformation), /* FIXME: not implemented */ SI_QX(SystemExtendedHandleInformation), + SI_XX(SystemLostDelayedWriteInformation), /* FIXME: not implemented */ + SI_XX(SystemBigPoolInformation), /* FIXME: not implemented */ + SI_XX(SystemSessionPoolTagInformation), /* FIXME: not implemented */ + SI_XX(SystemSessionMappedViewInformation), /* FIXME: not implemented */ + SI_XX(SystemHotpatchInformation), /* FIXME: not implemented */ + SI_XX(SystemObjectSecurityMode), /* FIXME: not implemented */ + SI_XX(SystemWatchdogTimerHandler), /* FIXME: not implemented */ + SI_XX(SystemWatchdogTimerInformation), /* FIXME: not implemented */ + SI_XX(SystemLogicalProcessorInformation), /* FIXME: not implemented */ + SI_XX(SystemWow64SharedInformation), /* FIXME: not implemented */ + SI_XX(SystemRegisterFirmwareTableInformationHandler), /* FIXME: not implemented */ + SI_QX(SystemFirmwareTableInformation), }; C_ASSERT(SystemBasicInformation == 0);

6 years, 1 month

02/03: [KERNEL32] Implement system firmware functions properly

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=844483504b94b6f187b22… commit 844483504b94b6f187b22209c42cece07077a43a Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Aug 5 11:48:25 2018 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Aug 19 20:27:59 2018 +0200 [KERNEL32] Implement system firmware functions properly --- dll/win32/kernel32/client/sysinfo.c | 239 +++++++----------------------------- 1 file changed, 41 insertions(+), 198 deletions(-) diff --git a/dll/win32/kernel32/client/sysinfo.c b/dll/win32/kernel32/client/sysinfo.c index 92474d050a..0e588b3e44 100644 --- a/dll/win32/kernel32/client/sysinfo.c +++ b/dll/win32/kernel32/client/sysinfo.c @@ -7,7 +7,8 @@ * Christoph von Wittich * Thomas Weidenmueller * Gunnar Andre Dalsnes - * Stanislav Motylkov + * Stanislav Motylkov (x86corez(a)gmail.com) + * Mark Jansen (mark.jansen(a)reactos.org) */ /* INCLUDES *******************************************************************/ @@ -75,80 +76,50 @@ GetSystemInfoInternal(IN PSYSTEM_BASIC_INFORMATION BasicInfo, } } +static UINT -WINAPI -GetRawSMBiosTableFromRegistry(OUT PVOID pData) +BaseQuerySystemFirmware(IN DWORD FirmwareTableProviderSignature, + IN DWORD FirmwareTableID, + OUT PVOID pFirmwareTableBuffer, + IN DWORD BufferSize, + IN SYSTEM_FIRMWARE_TABLE_ACTION Action) { - static const LPCWSTR RegistryKey = L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\mssmbios\\Data"; - static const LPCWSTR ValueNameStr = L"SMBiosData"; - - PKEY_VALUE_PARTIAL_INFORMATION KeyInfo = NULL; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - UNICODE_STRING ValueName; - HANDLE KeyHandle; - ULONG KeyInfoSize; - ULONG ReturnSize = 0; + SYSTEM_FIRMWARE_TABLE_INFORMATION* SysFirmwareInfo; + ULONG Result = 0, ReturnedSize; + ULONG TotalSize = BufferSize + sizeof(SYSTEM_FIRMWARE_TABLE_INFORMATION); NTSTATUS Status; - RtlInitUnicodeString(&KeyName, RegistryKey); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - Status = NtOpenKey(&KeyHandle, - KEY_READ, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) + SysFirmwareInfo = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, TotalSize); + if (!SysFirmwareInfo) { + SetLastError(ERROR_INVALID_PARAMETER); return 0; } - - // 256 KiB is more than enough for raw SMBIOS dump - KeyInfoSize = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + 256 * 1024; - KeyInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, KeyInfoSize); - if (KeyInfo == NULL) + _SEH2_TRY { - NtClose(KeyHandle); - goto cleanup; - } + SysFirmwareInfo->ProviderSignature = FirmwareTableProviderSignature; + SysFirmwareInfo->TableID = FirmwareTableID; + SysFirmwareInfo->Action = Action; + SysFirmwareInfo->TableBufferLength = BufferSize; - RtlInitUnicodeString(&ValueName, ValueNameStr); + Status = NtQuerySystemInformation(SystemFirmwareTableInformation, SysFirmwareInfo, TotalSize, &ReturnedSize); - Status = NtQueryValueKey(KeyHandle, - &ValueName, - KeyValuePartialInformation, - KeyInfo, - KeyInfoSize, - &ReturnSize); - - NtClose(KeyHandle); - ReturnSize = 0; - - if (!NT_SUCCESS(Status)) - { - goto cleanup; - } + if (NT_SUCCESS(Status) || Status == STATUS_BUFFER_TOO_SMALL) + Result = SysFirmwareInfo->TableBufferLength; - if (KeyInfo->Type != REG_BINARY) - { - goto cleanup; + if (NT_SUCCESS(Status) && pFirmwareTableBuffer) + { + RtlCopyMemory(pFirmwareTableBuffer, SysFirmwareInfo->TableBuffer, SysFirmwareInfo->TableBufferLength); + } } - - ReturnSize = KeyInfo->DataLength; - if (pData) + _SEH2_FINALLY { - RtlCopyMemory(pData, KeyInfo->Data, KeyInfo->DataLength); + RtlFreeHeap(RtlGetProcessHeap(), 0, SysFirmwareInfo); } + _SEH2_END; -cleanup: - if (KeyInfo) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, KeyInfo); - } - return ReturnSize; + BaseSetLastNTError(Status); + return Result; } /* PUBLIC FUNCTIONS ***********************************************************/ @@ -533,69 +504,11 @@ EnumSystemFirmwareTables(IN DWORD FirmwareTableProviderSignature, OUT PVOID pFirmwareTableBuffer, IN DWORD BufferSize) { - UINT uSize = 0; - UINT uCount = 0; - DWORD dwError = ERROR_SUCCESS; - PDWORD pBuffer = NULL; - - switch (FirmwareTableProviderSignature) - { - case 'ACPI': - { - /* FIXME: Not implemented yet */ - dwError = ERROR_CALL_NOT_IMPLEMENTED; - break; - } - case 'FIRM': - { - /* FIXME: Not implemented yet */ - dwError = ERROR_CALL_NOT_IMPLEMENTED; - break; - } - case 'RSMB': - { - if (GetRawSMBiosTableFromRegistry(NULL) > 0) - { - uCount = 1; - uSize = uCount * sizeof(DWORD); - pBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, uSize); - if (!pBuffer) - { - SetLastError(ERROR_OUTOFMEMORY); - return 0; - } - *pBuffer = 0; - } - break; - } - default: - { - dwError = ERROR_INVALID_FUNCTION; - } - } - - if (dwError == ERROR_SUCCESS) - { - if (uSize > 0 && BufferSize >= uSize) - { - /* Write to buffer */ - if (pFirmwareTableBuffer) - { - RtlMoveMemory(pFirmwareTableBuffer, pBuffer, uSize); - } - } - else if (BufferSize < uSize) - { - dwError = ERROR_INSUFFICIENT_BUFFER; - } - } - - if (pBuffer) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, pBuffer); - } - SetLastError(dwError); - return uSize; + return BaseQuerySystemFirmware(FirmwareTableProviderSignature, + 0, + pFirmwareTableBuffer, + BufferSize, + SystemFirmwareTable_Enumerate); } /** @@ -639,81 +552,11 @@ GetSystemFirmwareTable(IN DWORD FirmwareTableProviderSignature, OUT PVOID pFirmwareTableBuffer, IN DWORD BufferSize) { - /* This function currently obtains data using a hack (registry workaround) - which is located here: drivers/input/i8042prt/hwhacks.c - i8042StoreSMBiosTables is responsible for writing SMBIOS table into registry - - Should be implemented correctly using NtQuerySystemInformation - along with SystemFirmwareTableInformation class - - Reference: https://github.com/hfiref0x/VMDE/blob/master/src/vmde/sup.c - */ - - UINT uSize = 0; - DWORD dwError = ERROR_SUCCESS; - PVOID pBuffer = NULL; - - switch (FirmwareTableProviderSignature) - { - case 'ACPI': - { - /* FIXME: Not implemented yet */ - dwError = ERROR_CALL_NOT_IMPLEMENTED; - break; - } - case 'FIRM': - { - /* FIXME: Not implemented yet */ - dwError = ERROR_CALL_NOT_IMPLEMENTED; - break; - } - case 'RSMB': - { - uSize = GetRawSMBiosTableFromRegistry(NULL); - if (uSize > 0) - { - pBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, uSize); - if (!pBuffer) - { - SetLastError(ERROR_OUTOFMEMORY); - return 0; - } - GetRawSMBiosTableFromRegistry(pBuffer); - } - else - { - dwError = ERROR_NOT_FOUND; - } - break; - } - default: - { - dwError = ERROR_INVALID_FUNCTION; - } - } - - if (dwError == ERROR_SUCCESS) - { - if (uSize > 0 && BufferSize >= uSize) - { - /* Write to buffer */ - if (pFirmwareTableBuffer) - { - RtlMoveMemory(pFirmwareTableBuffer, pBuffer, uSize); - } - } - else if (BufferSize < uSize) - { - dwError = ERROR_INSUFFICIENT_BUFFER; - } - } - - if (pBuffer) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, pBuffer); - } - SetLastError(dwError); - return uSize; + return BaseQuerySystemFirmware(FirmwareTableProviderSignature, + FirmwareTableID, + pFirmwareTableBuffer, + BufferSize, + SystemFirmwareTable_Get); } /*

6 years, 1 month

01/03: [KERNEL32_APITEST] Add SystemFirmwareTableInformation tests

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b851d7e1d3775e7c080d2… commit b851d7e1d3775e7c080d2e7c9e2d3f9d71142605 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Aug 5 11:38:20 2018 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Aug 19 20:27:59 2018 +0200 [KERNEL32_APITEST] Add SystemFirmwareTableInformation tests Thanks goes to Mark Jansen for help! --- .../rostests/apitests/kernel32/SystemFirmware.c | 123 +++++++++++++++++---- modules/rostests/apitests/kernel32/precomp.h | 3 + 2 files changed, 103 insertions(+), 23 deletions(-) diff --git a/modules/rostests/apitests/kernel32/SystemFirmware.c b/modules/rostests/apitests/kernel32/SystemFirmware.c index 5ba946d815..c052761b45 100644 --- a/modules/rostests/apitests/kernel32/SystemFirmware.c +++ b/modules/rostests/apitests/kernel32/SystemFirmware.c @@ -3,6 +3,7 @@ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Tests for System Firmware functions * COPYRIGHT: Copyright 2018 Stanislav Motylkov + * Copyright 2018 Mark Jansen */ #include "precomp.h" @@ -17,6 +18,70 @@ typedef struct ENTRY DWORD ErrSuccess; } ENTRY; +static UINT +CallNt(IN DWORD FirmwareTableProviderSignature, + IN DWORD FirmwareTableID, + OUT PVOID pFirmwareTableBuffer, + IN DWORD BufferSize, + IN SYSTEM_FIRMWARE_TABLE_ACTION Action) +{ + SYSTEM_FIRMWARE_TABLE_INFORMATION* SysFirmwareInfo; + ULONG Result = 0, ReturnedSize; + ULONG TotalSize = BufferSize + sizeof(SYSTEM_FIRMWARE_TABLE_INFORMATION); + NTSTATUS Status; + + SysFirmwareInfo = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, TotalSize); + if (!SysFirmwareInfo) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + _SEH2_TRY + { + SysFirmwareInfo->ProviderSignature = FirmwareTableProviderSignature; + SysFirmwareInfo->TableID = FirmwareTableID; + SysFirmwareInfo->Action = Action; + SysFirmwareInfo->TableBufferLength = BufferSize; + + Status = NtQuerySystemInformation(SystemFirmwareTableInformation, SysFirmwareInfo, TotalSize, &ReturnedSize); + + if (NT_SUCCESS(Status) || Status == STATUS_BUFFER_TOO_SMALL) + Result = SysFirmwareInfo->TableBufferLength; + + if (NT_SUCCESS(Status) && pFirmwareTableBuffer) + { + memcpy(pFirmwareTableBuffer, SysFirmwareInfo->TableBuffer, SysFirmwareInfo->TableBufferLength); + } + } + _SEH2_FINALLY + { + RtlFreeHeap(RtlGetProcessHeap(), 0, SysFirmwareInfo); + } + _SEH2_END; + + SetLastError(RtlNtStatusToDosError(Status)); + return Result; +} + +UINT +WINAPI +fEnumSystemFirmwareTables(IN DWORD FirmwareTableProviderSignature, + OUT PVOID pFirmwareTableBuffer, + IN DWORD BufferSize) +{ + return CallNt(FirmwareTableProviderSignature, 0, pFirmwareTableBuffer, BufferSize, SystemFirmwareTable_Enumerate); +} + +UINT +WINAPI +fGetSystemFirmwareTable(IN DWORD FirmwareTableProviderSignature, + IN DWORD FirmwareTableID, + OUT PVOID pFirmwareTableBuffer, + IN DWORD BufferSize) +{ + return CallNt(FirmwareTableProviderSignature, FirmwareTableID, pFirmwareTableBuffer, BufferSize, SystemFirmwareTable_Get); +} + static VOID test_EnumBuffer( @@ -378,7 +443,9 @@ test_GetBuffer( } } -START_TEST(SystemFirmware) +static +VOID +test_Functions() { static const ENTRY Entries[] = { @@ -388,34 +455,12 @@ START_TEST(SystemFirmware) /* This entry should be last */ { 0xDEAD, ERROR_INVALID_FUNCTION, ERROR_INVALID_FUNCTION }, }; - HANDLE hKernel; CHAR Buffer[262144]; // 256 KiB should be enough CHAR Sign[sizeof(DWORD) + 1]; UINT TableCount[_countof(Entries)]; DWORD FirstTableID[_countof(Entries)]; int i; - hKernel = GetModuleHandleW(L"kernel32.dll"); - if (!hKernel) - { - skip("kernel32.dll module not found. Can't proceed\n"); - return; - } - - pEnumSystemFirmwareTables = (void *)GetProcAddress(hKernel, "EnumSystemFirmwareTables"); - pGetSystemFirmwareTable = (void *)GetProcAddress(hKernel, "GetSystemFirmwareTable"); - - if (!pEnumSystemFirmwareTables) - { - skip("EnumSystemFirmwareTables not found. Can't proceed\n"); - return; - } - if (!pGetSystemFirmwareTable) - { - skip("GetSystemFirmwareTable not found. Can't proceed\n"); - return; - } - // Test EnumSystemFirmwareTables for (i = 0; i < _countof(Entries); i++) { @@ -464,3 +509,35 @@ START_TEST(SystemFirmware) FALSE, Entries[i].ErrInsuff, Entries[i].ErrSuccess); } } + +START_TEST(SystemFirmware) +{ + HANDLE hKernel; + + hKernel = GetModuleHandleW(L"kernel32.dll"); + if (!hKernel) + { + skip("kernel32.dll module not found. Can't proceed\n"); + return; + } + + pEnumSystemFirmwareTables = (void *)fEnumSystemFirmwareTables; + pGetSystemFirmwareTable = (void *)fGetSystemFirmwareTable; + + test_Functions(); + + pEnumSystemFirmwareTables = (void *)GetProcAddress(hKernel, "EnumSystemFirmwareTables"); + pGetSystemFirmwareTable = (void *)GetProcAddress(hKernel, "GetSystemFirmwareTable"); + + if (!pEnumSystemFirmwareTables) + { + skip("EnumSystemFirmwareTables not found. Can't proceed\n"); + return; + } + if (!pGetSystemFirmwareTable) + { + skip("GetSystemFirmwareTable not found. Can't proceed\n"); + return; + } + test_Functions(); +} diff --git a/modules/rostests/apitests/kernel32/precomp.h b/modules/rostests/apitests/kernel32/precomp.h index ffbf218a93..b356a2d117 100644 --- a/modules/rostests/apitests/kernel32/precomp.h +++ b/modules/rostests/apitests/kernel32/precomp.h @@ -11,5 +11,8 @@ #include <winreg.h> #include <strsafe.h> #include <ndk/umtypes.h> +#include <ndk/extypes.h> +#include <ndk/exfuncs.h> +#include <ndk/rtlfuncs.h> #endif /* _KERNEL32_APITEST_PRECOMP_H_ */

6 years, 1 month

01/01: [APPVEYOR] Add 'BuildType: vssolution'

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=95fdc24157f663fe85589… commit 95fdc24157f663fe85589f8b7fd8eea3e3985fd2 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu May 24 22:00:01 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Aug 19 20:03:14 2018 +0200 [APPVEYOR] Add 'BuildType: vssolution' Disabled by default, though ready to be enabled. --- appveyor.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 0c196ee825..8e88b5e7b1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,6 +3,7 @@ environment: - BuildType: "msvc-x64" - BuildType: "msvc" - BuildType: "clang-cl" +# - BuildType: vssolution version: reactos.appveyor.{build} skip_branch_with_pr: true @@ -39,3 +40,18 @@ build_script: test: off deploy: off + +for: +- + matrix: + only: + - BuildType: vssolution + + build_script: + - set PATH=C:\RosCMakeNinja\bin;%PATH% + - call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86 + - cmake --version + - md C:\ros_build + - cd C:\ros_build + - call %APPVEYOR_BUILD_FOLDER%\configure.cmd VSSolution -DENABLE_ROSTESTS=1 + - msbuild /verbosity:quiet /target:bootcd REACTOS.sln

6 years, 1 month

01/01: [UPDATES] New stubs for Automatic Updates service and WUSA.exe. Presence of this modules required for installation by some NT6+ applications.

by Denis Malikov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=55368bacc8cba3f9b729d… commit 55368bacc8cba3f9b729d1e06e0184f11907e294 Author: Denis Malikov <filedem(a)gmail.com> AuthorDate: Sat Feb 3 05:03:17 2018 +0700 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Aug 19 19:56:18 2018 +0200 [UPDATES] New stubs for Automatic Updates service and WUSA.exe. Presence of this modules required for installation by some NT6+ applications. --- base/applications/CMakeLists.txt | 1 + base/applications/wusa/CMakeLists.txt | 6 ++ base/applications/wusa/res/setup.ico | Bin 0 -> 22486 bytes base/applications/wusa/resource.h | 3 + base/applications/wusa/resource.rc | 14 ++++ base/applications/wusa/wusa.c | 19 +++++ base/applications/wusa/wusa.h | 4 ++ base/services/CMakeLists.txt | 1 + base/services/wuauserv/CMakeLists.txt | 7 ++ base/services/wuauserv/wuauserv.c | 128 ++++++++++++++++++++++++++++++++++ base/services/wuauserv/wuauserv.h | 11 +++ base/services/wuauserv/wuauserv.rc | 5 ++ base/services/wuauserv/wuauserv.spec | 1 + boot/bootdata/hivesys.inf | 13 ++++ 14 files changed, 213 insertions(+) diff --git a/base/applications/CMakeLists.txt b/base/applications/CMakeLists.txt index 4c7677abdc..87cbdbf5e1 100644 --- a/base/applications/CMakeLists.txt +++ b/base/applications/CMakeLists.txt @@ -43,3 +43,4 @@ add_subdirectory(winhlp32) add_subdirectory(winver) add_subdirectory(wordpad) add_subdirectory(write) +add_subdirectory(wusa) diff --git a/base/applications/wusa/CMakeLists.txt b/base/applications/wusa/CMakeLists.txt new file mode 100644 index 0000000000..ab27e96541 --- /dev/null +++ b/base/applications/wusa/CMakeLists.txt @@ -0,0 +1,6 @@ + +add_rc_deps(resource.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/setup.ico) +add_executable(wusa wusa.c resource.rc) +set_module_type(wusa win32gui UNICODE) +add_importlibs(wusa shell32 msvcrt kernel32) +add_cd_file(TARGET wusa DESTINATION reactos/system32 FOR all) diff --git a/base/applications/wusa/res/setup.ico b/base/applications/wusa/res/setup.ico new file mode 100644 index 0000000000..cd786edc67 Binary files /dev/null and b/base/applications/wusa/res/setup.ico differ diff --git a/base/applications/wusa/resource.h b/base/applications/wusa/resource.h new file mode 100644 index 0000000000..0901b426ea --- /dev/null +++ b/base/applications/wusa/resource.h @@ -0,0 +1,3 @@ +#pragma once + +#define IDI_WUSA 101 diff --git a/base/applications/wusa/resource.rc b/base/applications/wusa/resource.rc new file mode 100644 index 0000000000..d4141fce21 --- /dev/null +++ b/base/applications/wusa/resource.rc @@ -0,0 +1,14 @@ +#include <windef.h> + +#include "resource.h" + +/* Common resources */ + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS WUSA stub" +#define REACTOS_STR_INTERNAL_NAME "wusa" +#define REACTOS_STR_ORIGINAL_FILENAME "wusa.exe" +#include <reactos/version.rc> + +IDI_WUSA ICON "res/setup.ico" diff --git a/base/applications/wusa/wusa.c b/base/applications/wusa/wusa.c new file mode 100644 index 0000000000..c6a7245f95 --- /dev/null +++ b/base/applications/wusa/wusa.c @@ -0,0 +1,19 @@ +/* +* PROJECT: ReactOS Update Service +* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) +* PURPOSE: Windows Update Stand-Alone installer. +* Stub is required for some application at the installation phase. +* COPYRIGHT: Copyright 2018 Denis Malikov (filedem(a)gmail.com) +*/ + +#include "wusa.h" + +int +WINAPI +wWinMain(HINSTANCE hCurInst, + HINSTANCE hPrevInst, + LPWSTR lpsCmdLine, + int nCmdShow) +{ + return 0; +} diff --git a/base/applications/wusa/wusa.h b/base/applications/wusa/wusa.h new file mode 100644 index 0000000000..4b4669d575 --- /dev/null +++ b/base/applications/wusa/wusa.h @@ -0,0 +1,4 @@ +#define WIN32_NO_STATUS +#define WIN32_LEAN_AND_MEAN +#include <windows.h> +#include <wchar.h> diff --git a/base/services/CMakeLists.txt b/base/services/CMakeLists.txt index 75b547844c..977b5edf68 100644 --- a/base/services/CMakeLists.txt +++ b/base/services/CMakeLists.txt @@ -15,3 +15,4 @@ add_subdirectory(umpnpmgr) add_subdirectory(wkssvc) add_subdirectory(wlansvc) add_subdirectory(wmisvc) +add_subdirectory(wuauserv) diff --git a/base/services/wuauserv/CMakeLists.txt b/base/services/wuauserv/CMakeLists.txt new file mode 100644 index 0000000000..841d836fa6 --- /dev/null +++ b/base/services/wuauserv/CMakeLists.txt @@ -0,0 +1,7 @@ +add_library(wuauserv SHARED + wuauserv.c + wuauserv.rc) + +set_module_type(wuauserv win32dll UNICODE) +add_importlibs(wuauserv advapi32 msvcrt kernel32 ntdll) +add_cd_file(TARGET wuauserv DESTINATION reactos/system32 FOR all) diff --git a/base/services/wuauserv/wuauserv.c b/base/services/wuauserv/wuauserv.c new file mode 100644 index 0000000000..d302169826 --- /dev/null +++ b/base/services/wuauserv/wuauserv.c @@ -0,0 +1,128 @@ +/* +* PROJECT: ReactOS Update Service +* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) +* PURPOSE: Automatic Updates service stub. +* Stub is required for some application at the installation phase. +* COPYRIGHT: Copyright 2018 Denis Malikov (filedem(a)gmail.com) +*/ + +#include "wuauserv.h" + +/* GLOBALS ******************************************************************/ + +static WCHAR ServiceName[] = L"wuauserv"; + +static SERVICE_STATUS_HANDLE ServiceStatusHandle; +static SERVICE_STATUS ServiceStatus; + +static HANDLE exitEvent = NULL; + +/* FUNCTIONS *****************************************************************/ + +static VOID +UpdateServiceStatus(DWORD dwState) +{ + ServiceStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + ServiceStatus.dwCurrentState = dwState; + ServiceStatus.dwControlsAccepted = 0; + ServiceStatus.dwWin32ExitCode = 0; + ServiceStatus.dwServiceSpecificExitCode = 0; + ServiceStatus.dwCheckPoint = 0; + + if (dwState == SERVICE_START_PENDING || + dwState == SERVICE_STOP_PENDING || + dwState == SERVICE_PAUSE_PENDING || + dwState == SERVICE_CONTINUE_PENDING) + ServiceStatus.dwWaitHint = 1000; + else + ServiceStatus.dwWaitHint = 0; + + SetServiceStatus(ServiceStatusHandle, + &ServiceStatus); + DPRINT1("WU UpdateServiceStatus() called\n"); +} + +static DWORD WINAPI +ServiceControlHandler(DWORD dwControl, + DWORD dwEventType, + LPVOID lpEventData, + LPVOID lpContext) +{ + switch (dwControl) + { + case SERVICE_CONTROL_STOP: + DPRINT1("WU ServiceControlHandler() SERVICE_CONTROL_STOP received\n"); + UpdateServiceStatus(SERVICE_STOPPED); + SetEvent(exitEvent); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_PAUSE: + DPRINT1("WU ServiceControlHandler() SERVICE_CONTROL_PAUSE received\n"); + UpdateServiceStatus(SERVICE_PAUSED); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_CONTINUE: + DPRINT1("WU ServiceControlHandler() SERVICE_CONTROL_CONTINUE received\n"); + UpdateServiceStatus(SERVICE_RUNNING); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_INTERROGATE: + DPRINT1("WU ServiceControlHandler() SERVICE_CONTROL_INTERROGATE received\n"); + SetServiceStatus(ServiceStatusHandle, + &ServiceStatus); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_SHUTDOWN: + DPRINT1("WU ServiceControlHandler() SERVICE_CONTROL_SHUTDOWN received\n"); + UpdateServiceStatus(SERVICE_STOPPED); + return ERROR_SUCCESS; + + default : + DPRINT1("WU ServiceControlHandler() Control %lu received\n"); + return ERROR_CALL_NOT_IMPLEMENTED; + } +} + +VOID WINAPI +ServiceMain(DWORD argc, LPTSTR *argv) +{ + UNREFERENCED_PARAMETER(argc); + UNREFERENCED_PARAMETER(argv); + + DPRINT("WU ServiceMain() called\n"); + + ServiceStatusHandle = RegisterServiceCtrlHandlerExW(ServiceName, + ServiceControlHandler, + NULL); + if (!ServiceStatusHandle) + { + DPRINT1("RegisterServiceCtrlHandlerExW() failed! (Error %lu)\n", GetLastError()); + return; + } + + UpdateServiceStatus(SERVICE_RUNNING); + + exitEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + WaitForSingleObject(exitEvent, INFINITE); + CloseHandle(exitEvent); + + UpdateServiceStatus(SERVICE_STOPPED); +} + +BOOL WINAPI +DllMain(HINSTANCE hinstDLL, + DWORD fdwReason, + LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/base/services/wuauserv/wuauserv.h b/base/services/wuauserv/wuauserv.h new file mode 100644 index 0000000000..7134c2642b --- /dev/null +++ b/base/services/wuauserv/wuauserv.h @@ -0,0 +1,11 @@ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <winsvc.h> + +#define NDEBUG +#include <debug.h> diff --git a/base/services/wuauserv/wuauserv.rc b/base/services/wuauserv/wuauserv.rc new file mode 100644 index 0000000000..83feb925b1 --- /dev/null +++ b/base/services/wuauserv/wuauserv.rc @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "AutoUpdate Service Stub" +#define REACTOS_STR_INTERNAL_NAME "wuauserv" +#define REACTOS_STR_ORIGINAL_FILENAME "wuauserv.dll" +#include <reactos/version.rc> diff --git a/base/services/wuauserv/wuauserv.spec b/base/services/wuauserv/wuauserv.spec new file mode 100644 index 0000000000..1b27fe5386 --- /dev/null +++ b/base/services/wuauserv/wuauserv.spec @@ -0,0 +1 @@ +@ stdcall ServiceMain(long ptr) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 31f50ed773..1f58e5c939 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -2035,6 +2035,16 @@ HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","Start",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","Type",0x00010001,0x00000020 HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt\Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\wbem\wmisvc.dll" +; AutoUpdate Service +HKLM,"SYSTEM\CurrentControlSet\Services\wuauserv","DisplayName",0x00000000,%WUAUSERV_SERVICE% +HKLM,"SYSTEM\CurrentControlSet\Services\wuauserv","Description",0x00000000,%WUAUSERV_SERVICE_DESCRIPTION% +HKLM,"SYSTEM\CurrentControlSet\Services\wuauserv","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\wuauserv","ImagePath",0x00020000,"%SystemRoot%\system32\svchost.exe -k netsvcs" +HKLM,"SYSTEM\CurrentControlSet\Services\wuauserv","ObjectName",0x00000000,"LocalSystem" +HKLM,"SYSTEM\CurrentControlSet\Services\wuauserv","Start",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\wuauserv","Type",0x00010001,0x00000020 +HKLM,"SYSTEM\CurrentControlSet\Services\wuauserv\Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\wuauserv.dll" + ; Sound Blaster (NT4) ;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","Description",0x00000000,"Sound Blaster (NT4)" ;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","ErrorControl",0x00010001,0x00000001 @@ -2191,6 +2201,9 @@ THEMES_SERVICE_DESCRIPTION="Themes support" WINMGMT_SERVICE="ReactOS Management Infrastructure" WINMGMT_SERVICE_DESCRIPTION="Provides interface to system management information." +WUAUSERV_SERVICE="Automatic Updates" +WUAUSERV_SERVICE_DESCRIPTION="AutoUpdate Service stub." + WLANSVC_SERVICE="WLAN Service" WLANSVC_SERVICE_DESCRIPTION="WLAN Service"

6 years, 1 month

← Newer
1
...
10
11
12
13
14
15
16
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2018