Ros-diffs April 2019

ros-diffs@reactos.org

32 participants
240 discussions

[reactos] 01/03: [TOOLS] Fix/suppress all MSVC/x64 warnings (#1525)

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f47f45dbdd68e21ec7ab2… commit f47f45dbdd68e21ec7ab283877cbd139f418c804 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Apr 15 13:29:33 2019 +0200 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Sun Apr 28 23:21:48 2019 +0200 [TOOLS] Fix/suppress all MSVC/x64 warnings (#1525) --- sdk/lib/cmlib/hivebin.c | 6 +++--- sdk/lib/inflib/CMakeLists.txt | 2 +- sdk/lib/inflib/infget.c | 2 +- sdk/tools/CMakeLists.txt | 9 +++++---- sdk/tools/bin2c.c | 4 ++-- sdk/tools/cabman/cabinet.cxx | 2 +- sdk/tools/hhpcomp/CMakeLists.txt | 8 ++++++++ sdk/tools/hhpcomp/chmc/chmc.c | 4 ++++ sdk/tools/hhpcomp/port/config.h | 7 +++++++ sdk/tools/hpp/CMakeLists.txt | 5 +++++ sdk/tools/isohybrid/CMakeLists.txt | 8 ++++++++ sdk/tools/isohybrid/isohybrid.c | 12 ++++++------ sdk/tools/isohybrid/reactos_support_code.h | 2 ++ sdk/tools/kbdtool/kbdtool.h | 2 +- sdk/tools/kbdtool/main.c | 3 ++- sdk/tools/kbdtool/output.c | 2 +- sdk/tools/mkhive/reginf.c | 6 +++--- sdk/tools/mkisofs/CMakeLists.txt | 13 +++++++++++++ sdk/tools/mkisofs/reactos/xconfig.h | 9 ++++++++- sdk/tools/mkshelllink/mkshelllink.c | 2 +- sdk/tools/spec2def/spec2def.c | 4 ++-- sdk/tools/unicode/CMakeLists.txt | 11 +++++++++++ sdk/tools/unicode/string.c | 3 +-- sdk/tools/utf16le/utf16le.cpp | 11 ++++++----- sdk/tools/widl/CMakeLists.txt | 11 +++++++++++ sdk/tools/widl/port/config.h | 15 +++++++++++++++ sdk/tools/wpp/CMakeLists.txt | 7 +++++++ sdk/tools/xml2sdb/CMakeLists.txt | 5 ++++- sdk/tools/xml2sdb/main.cpp | 2 +- 29 files changed, 140 insertions(+), 37 deletions(-) diff --git a/sdk/lib/cmlib/hivebin.c b/sdk/lib/cmlib/hivebin.c index 23ca9cb18b..1b6cdf1641 100644 --- a/sdk/lib/cmlib/hivebin.c +++ b/sdk/lib/cmlib/hivebin.c @@ -16,7 +16,7 @@ HvpAddBin( { PHMAP_ENTRY BlockList; PHBIN Bin; - SIZE_T BinSize; + ULONG BinSize; ULONG i; ULONG BitmapSize; ULONG BlockCount; @@ -24,7 +24,7 @@ HvpAddBin( PHCELL Block; BinSize = ROUND_UP(Size + sizeof(HBIN), HBLOCK_SIZE); - BlockCount = (ULONG)(BinSize / HBLOCK_SIZE); + BlockCount = BinSize / HBLOCK_SIZE; Bin = RegistryHive->Allocate(BinSize, TRUE, TAG_CM); if (Bin == NULL) @@ -34,7 +34,7 @@ HvpAddBin( Bin->Signature = HV_HBIN_SIGNATURE; Bin->FileOffset = RegistryHive->Storage[Storage].Length * HBLOCK_SIZE; - Bin->Size = (ULONG)BinSize; + Bin->Size = BinSize; /* Allocate new block list */ OldBlockListSize = RegistryHive->Storage[Storage].Length; diff --git a/sdk/lib/inflib/CMakeLists.txt b/sdk/lib/inflib/CMakeLists.txt index e6ed96f8c1..bf8086acf0 100644 --- a/sdk/lib/inflib/CMakeLists.txt +++ b/sdk/lib/inflib/CMakeLists.txt @@ -21,7 +21,7 @@ else() infhostput.c infhostrtl.c) - add_definitions(-D__NO_CTYPE_INLINES -DINFLIB_HOST) + add_definitions(-D__NO_CTYPE_INLINES -DINFLIB_HOST -D_CRT_SECURE_NO_WARNINGS) add_library(inflibhost ${SOURCE}) if(NOT MSVC) diff --git a/sdk/lib/inflib/infget.c b/sdk/lib/inflib/infget.c index 5e1ccdbf3b..70b3473ff8 100644 --- a/sdk/lib/inflib/infget.c +++ b/sdk/lib/inflib/infget.c @@ -582,7 +582,7 @@ InfpGetStringField(PINFCONTEXT Context, 0); if (RequiredSize != NULL) - *RequiredSize = Size + 1; + *RequiredSize = (ULONG)Size + 1; if (ReturnBuffer != NULL) { diff --git a/sdk/tools/CMakeLists.txt b/sdk/tools/CMakeLists.txt index bbcf9e78ce..f721728015 100644 --- a/sdk/tools/CMakeLists.txt +++ b/sdk/tools/CMakeLists.txt @@ -9,8 +9,11 @@ endfunction() #add_executable(pefixup pefixup.c) if(MSVC) - add_definitions(-D_CRT_SECURE_NO_WARNINGS) + add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -DHAVE_IO_H=1) add_compile_flags_language("/EHsc" "CXX") + + # Disable warning "conversion from 'size_t' to 'int', possible loss of data" + add_compile_flags("/wd4267") endif() add_host_tool(bin2c bin2c.c) @@ -19,10 +22,10 @@ add_host_tool(geninc geninc/geninc.c) add_host_tool(mkshelllink mkshelllink/mkshelllink.c) add_host_tool(obj2bin obj2bin/obj2bin.c) add_host_tool(spec2def spec2def/spec2def.c) - add_host_tool(utf16le utf16le/utf16le.cpp) add_subdirectory(cabman) +add_subdirectory(fatten) add_subdirectory(hhpcomp) add_subdirectory(hpp) add_subdirectory(isohybrid) @@ -38,5 +41,3 @@ if(NOT MSVC) add_subdirectory(log2lines) add_subdirectory(rsym) endif() - -add_subdirectory(fatten) diff --git a/sdk/tools/bin2c.c b/sdk/tools/bin2c.c index f7ee025a4d..12b2a3fab6 100644 --- a/sdk/tools/bin2c.c +++ b/sdk/tools/bin2c.c @@ -167,8 +167,8 @@ int main(int argc, char* argv[]) /* Generate the header file and close it */ fprintf(outHFile, "/* This file is autogenerated, do not edit. */\n\n"); - fprintf(outHFile, "#define %s_SIZE %lu\n" , argv[5], bufLen); - fprintf(outHFile, "extern unsigned char %s[%lu];\n", argv[5], bufLen); + fprintf(outHFile, "#define %s_SIZE %lu\n" , argv[5], (unsigned long)bufLen); + fprintf(outHFile, "extern unsigned char %s[%lu];\n", argv[5], (unsigned long)bufLen); fclose(outHFile); /* Close the input file */ diff --git a/sdk/tools/cabman/cabinet.cxx b/sdk/tools/cabman/cabinet.cxx index 5202404bd8..39400498c1 100644 --- a/sdk/tools/cabman/cabinet.cxx +++ b/sdk/tools/cabman/cabinet.cxx @@ -3106,7 +3106,7 @@ ULONG CCabinet::GetFileTimes(FILE* FileHandle, PCFFILE_NODE File) { #if defined(_WIN32) FILETIME FileTime; - HANDLE FileNo = (HANDLE)_fileno(FileHandle); + HANDLE FileNo = UlongToHandle(_fileno(FileHandle)); if (GetFileTime(FileNo, NULL, NULL, &FileTime)) FileTimeToDosDateTime(&FileTime, diff --git a/sdk/tools/hhpcomp/CMakeLists.txt b/sdk/tools/hhpcomp/CMakeLists.txt index bbe004a631..8e073ff12e 100644 --- a/sdk/tools/hhpcomp/CMakeLists.txt +++ b/sdk/tools/hhpcomp/CMakeLists.txt @@ -14,3 +14,11 @@ add_definitions(-DNONSLIDE) add_executable(hhpcomp ${SOURCE}) target_link_libraries(hhpcomp) + +if(MSVC) + # Disable warning "'x': unreferenced local variable" + add_target_compile_flags(hhpcomp "/wd4101") + + # Disable warning "'=': conversion from 'a' to 'b', possible loss of data" + add_target_compile_flags(hhpcomp "/wd4244") +endif() diff --git a/sdk/tools/hhpcomp/chmc/chmc.c b/sdk/tools/hhpcomp/chmc/chmc.c index 50c4b467ee..934bfba417 100644 --- a/sdk/tools/hhpcomp/chmc/chmc.c +++ b/sdk/tools/hhpcomp/chmc/chmc.c @@ -30,6 +30,10 @@ #include <stdlib.h> #include <sys/types.h> #include <sys/stat.h> +#ifdef __REACTOS__ +#include <io.h> +int mkstemps(char* template, int suffix_len); +#endif /* __REACTOS__ */ #else #ifdef __REACTOS__ #include <sys/types.h> diff --git a/sdk/tools/hhpcomp/port/config.h b/sdk/tools/hhpcomp/port/config.h new file mode 100644 index 0000000000..74ef33dafe --- /dev/null +++ b/sdk/tools/hhpcomp/port/config.h @@ -0,0 +1,7 @@ + +#pragma once + +#if defined(_WIN32) +#include <io.h> +#define HAVE_PROCESS_H 1 +#endif diff --git a/sdk/tools/hpp/CMakeLists.txt b/sdk/tools/hpp/CMakeLists.txt index 684214fbe1..3ca527e44f 100644 --- a/sdk/tools/hpp/CMakeLists.txt +++ b/sdk/tools/hpp/CMakeLists.txt @@ -1,2 +1,7 @@ add_host_tool(hpp hpp.c) + +if(MSVC) + # Disable warning "'=': conversion from 'a' to 'b', possible loss of data" + add_target_compile_flags(hpp "/wd4244") +endif() diff --git a/sdk/tools/isohybrid/CMakeLists.txt b/sdk/tools/isohybrid/CMakeLists.txt index 13b57e1aff..d24f3b95cb 100644 --- a/sdk/tools/isohybrid/CMakeLists.txt +++ b/sdk/tools/isohybrid/CMakeLists.txt @@ -5,3 +5,11 @@ add_definitions( add_host_tool(isohybrid isohybrid.c reactos_support_code.c) + +if(MSVC) + # Disable warning "'x': unreferenced local variable" + add_target_compile_flags(isohybrid "/wd4101") + + # Disable warning "'return': conversion from '__int64' to 'int', possible loss of data" + add_target_compile_flags(isohybrid "/wd4244") +endif() diff --git a/sdk/tools/isohybrid/isohybrid.c b/sdk/tools/isohybrid/isohybrid.c index dd78c79a4f..b8d2da6f36 100644 --- a/sdk/tools/isohybrid/isohybrid.c +++ b/sdk/tools/isohybrid/isohybrid.c @@ -57,12 +57,12 @@ uint8_t mode = 0; enum { VERBOSE = 1 , EFI = 2 , MAC = 4}; /* user options */ -uint16_t head = 64; /* 1 <= head <= 256 */ -uint8_t sector = 32; /* 1 <= sector <= 63 */ +uint32_t head = 64; /* 1 <= head <= 256 */ +uint32_t sector = 32; /* 1 <= sector <= 63 */ -uint8_t entry = 0; /* partition number: 1 <= entry <= 4 */ -uint8_t offset = 0; /* partition offset: 0 <= offset <= 64 */ -uint16_t type = 0x17; /* partition type: 0 <= type <= 255 */ +uint32_t entry = 0; /* partition number: 1 <= entry <= 4 */ +uint32_t offset = 0; /* partition offset: 0 <= offset <= 64 */ +uint32_t type = 0x17; /* partition type: 0 <= type <= 255 */ uint32_t id = 0; /* MBR: 0 <= id <= 0xFFFFFFFF(4294967296) */ uint8_t hd0 = 0; /* 0 <= hd0 <= 2 */ @@ -994,7 +994,7 @@ main(int argc, char *argv[]) errx(1, "%s: --offset is invalid with UEFI images\n", argv[0]); #endif - srand(time(NULL) << (getppid() << getpid())); + srand((unsigned int)time(NULL) << (getppid() << getpid())); if (!(fp = fopen(argv[0], "rb+"))) err(1, "could not open file `%s'", argv[0]); diff --git a/sdk/tools/isohybrid/reactos_support_code.h b/sdk/tools/isohybrid/reactos_support_code.h index 3f3344c4e0..591ace9e4b 100644 --- a/sdk/tools/isohybrid/reactos_support_code.h +++ b/sdk/tools/isohybrid/reactos_support_code.h @@ -9,6 +9,8 @@ #ifdef _WIN32 #include <malloc.h> #include <windows.h> +#include <process.h> +#include <io.h> #else #include <alloca.h> #include <unistd.h> diff --git a/sdk/tools/kbdtool/kbdtool.h b/sdk/tools/kbdtool/kbdtool.h index bf14307d40..b2b9612484 100644 --- a/sdk/tools/kbdtool/kbdtool.h +++ b/sdk/tools/kbdtool/kbdtool.h @@ -34,7 +34,7 @@ typedef struct tagKEYNAME typedef struct tagSCVK { USHORT ScanCode; - USHORT VirtualKey; + UCHAR VirtualKey; PCHAR Name; BOOLEAN Processed; } SCVK, *PSCVK; diff --git a/sdk/tools/kbdtool/main.c b/sdk/tools/kbdtool/main.c index 9a5517ac7f..16cb86fa47 100644 --- a/sdk/tools/kbdtool/main.c +++ b/sdk/tools/kbdtool/main.c @@ -61,7 +61,8 @@ INT main(INT argc, PCHAR* argv) { - ULONG i, ErrorCode, FailureCode; + int i; + ULONG ErrorCode, FailureCode; CHAR Option; PCHAR OpenFlags; CHAR BuildOptions[16] = {0}; diff --git a/sdk/tools/kbdtool/output.c b/sdk/tools/kbdtool/output.c index 8b3e3766e6..6d1846af6a 100644 --- a/sdk/tools/kbdtool/output.c +++ b/sdk/tools/kbdtool/output.c @@ -855,7 +855,7 @@ kbd_c(IN ULONG StateCount, if (i >= 1) { /* J is the loop variable, K is the double */ - for (NeedPlus = 0, j = 0, k = 1; (1 << j) <= i; j++, k = (1 << j)) + for (NeedPlus = 0, j = 0, k = 1; (1u << j) <= i; j++, k = (1 << j)) { /* Do we need to add a plus? */ if (NeedPlus) diff --git a/sdk/tools/mkhive/reginf.c b/sdk/tools/mkhive/reginf.c index b630d7535d..53db8802d0 100644 --- a/sdk/tools/mkhive/reginf.c +++ b/sdk/tools/mkhive/reginf.c @@ -345,7 +345,7 @@ do_reg_operation( 0, Type, (PVOID)Str, - Size * sizeof(WCHAR)); + (ULONG)(Size * sizeof(WCHAR))); } else { @@ -372,7 +372,7 @@ do_reg_operation( if (Data == NULL) return FALSE; - DPRINT("setting binary data '%S' len %d\n", ValueName, Size); + DPRINT("setting binary data '%S' len %d\n", ValueName, (ULONG)Size); InfHostGetBinaryField(Context, 5, Data, Size, NULL); } @@ -381,7 +381,7 @@ do_reg_operation( 0, Type, (PVOID)Data, - Size); + (ULONG)Size); free(Data); } diff --git a/sdk/tools/mkisofs/CMakeLists.txt b/sdk/tools/mkisofs/CMakeLists.txt index a045c03dd5..82704df306 100644 --- a/sdk/tools/mkisofs/CMakeLists.txt +++ b/sdk/tools/mkisofs/CMakeLists.txt @@ -88,7 +88,20 @@ if(MSVC) if (ARCH STREQUAL "amd64") # Disable warning "conversion from 'size_t' to 'int', possible loss of data" add_target_compile_flags(mkisofs "/wd4267") + + # Disable warning "'type cast': pointer truncation from 'const char *' to 'long'" + add_target_compile_flags(libschily "/wd4311") endif() + + # Disable warning "'<': signed/unsigned mismatch" + add_target_compile_flags(mkisofs "/wd4018") + + # Disable warning "'nchar': unreferenced local variable" + add_target_compile_flags(mkisofs "/wd4101") + + # Disable warning "'+=': conversion from 'x' to 'y', possible loss of data" + add_target_compile_flags(libschily "/wd4244") + add_target_compile_flags(mkisofs "/wd4244") else() # libschily implements an own printf function with support for the %r formatter. # Silence compilers checking for invalid formatting sequences. diff --git a/sdk/tools/mkisofs/reactos/xconfig.h b/sdk/tools/mkisofs/reactos/xconfig.h index 3fdd3a8bbb..484acc3db4 100644 --- a/sdk/tools/mkisofs/reactos/xconfig.h +++ b/sdk/tools/mkisofs/reactos/xconfig.h @@ -195,12 +195,19 @@ #define HAVE_TYPE_INTMAX_T 1 #define HAVE_TYPE_UINTMAX_T 1 +#define HAVE_ENVIRON_DEF 1 +#define HAVE_RENAME 1 +#define HAVE_STRNLEN 1 +#ifdef _WIN32 + #define _CRT_NONSTDC_NO_DEPRECATE 1 +#endif /* * ReactOS additions */ #ifdef _MSC_VER - #define ssize_t int + #define ssize_t intptr_t + #include <io.h> #endif /* Would need additional fprformat.c, less portable */ diff --git a/sdk/tools/mkshelllink/mkshelllink.c b/sdk/tools/mkshelllink/mkshelllink.c index cf88f450c0..2cb921e567 100644 --- a/sdk/tools/mkshelllink/mkshelllink.c +++ b/sdk/tools/mkshelllink/mkshelllink.c @@ -129,7 +129,7 @@ typedef struct _ID_LIST_DRIVE int main(int argc, const char *argv[]) { - unsigned i; + int i; const char *pszOutputPath = "shortcut.lnk"; const char *pszTarget = NULL; const char *pszDescription = "Description"; diff --git a/sdk/tools/spec2def/spec2def.c b/sdk/tools/spec2def/spec2def.c index 1246ce3ad3..fe89a12815 100644 --- a/sdk/tools/spec2def/spec2def.c +++ b/sdk/tools/spec2def/spec2def.c @@ -500,7 +500,7 @@ PrintName(FILE *fileDest, EXPORT *pexp, PSTRING pstr, int fDeco) { /* Skip leading underscore and remove trailing decoration */ pcName++; - nNameLength = pcAt - pcName; + nNameLength = (int)(pcAt - pcName); } /* Print the undecorated function name */ @@ -515,7 +515,7 @@ PrintName(FILE *fileDest, EXPORT *pexp, PSTRING pstr, int fDeco) if (pcDot) { /* First print the dll name, followed by a dot */ - nNameLength = pcDot - pcName; + nNameLength = (int)(pcDot - pcName); fprintf(fileDest, "%.*s.", nNameLength, pcName); /* Now the actual function name */ diff --git a/sdk/tools/unicode/CMakeLists.txt b/sdk/tools/unicode/CMakeLists.txt index a715719c8b..8e6c09f5b8 100644 --- a/sdk/tools/unicode/CMakeLists.txt +++ b/sdk/tools/unicode/CMakeLists.txt @@ -84,3 +84,14 @@ list(APPEND SOURCE wctype.c) add_library(unicode ${SOURCE}) + +if(MSVC) + # Disable warning "'<': signed/unsigned mismatch" + add_target_compile_flags(unicode "/wd4018") + + # Disable warning "unary minus operator applied to unsigned type, result still unsigned" + add_target_compile_flags(unicode "/wd4146") + + # Disable warning "conversion from 'const WCHAR' to 'char', possible loss of data" + add_target_compile_flags(unicode "/wd4244") +endif() diff --git a/sdk/tools/unicode/string.c b/sdk/tools/unicode/string.c index 09499ea988..4eab49cd3b 100644 --- a/sdk/tools/unicode/string.c +++ b/sdk/tools/unicode/string.c @@ -469,8 +469,7 @@ int vsnprintfW(WCHAR *str, size_t len, const WCHAR *format, va_list valist) /* FIXME: for unrecognised types, should ignore % when printing */ char *bufaiter = bufa; if (*iter == 'p') - sprintf(bufaiter, "%0*lX", 2 * (int)sizeof(void*), - (unsigned long)va_arg(valist, void *)); + sprintf(bufaiter, "%p", va_arg(valist, void*)); else { *fmta++ = *iter; diff --git a/sdk/tools/utf16le/utf16le.cpp b/sdk/tools/utf16le/utf16le.cpp index 7ba25b1c57..391205cbba 100644 --- a/sdk/tools/utf16le/utf16le.cpp +++ b/sdk/tools/utf16le/utf16le.cpp @@ -35,7 +35,8 @@ protected: err_types error; enc_types encoding; bom_types bom_type; - unsigned char buffer[4], fill, index; // need 4 char buffer for optional BOM handling + unsigned char buffer[4], index; // need 4 char buffer for optional BOM handling + std::streamsize fill; fstream inputfile,outputfile; static const unsigned char utf8table[64]; public: @@ -75,7 +76,7 @@ public: valid values are 0xef, 0xff, 0xfe, 0x00 */ inputfile.read(reinterpret_cast<char*>(&buffer),4); - fill =inputfile.gcount(); + fill = inputfile.gcount(); // stupid utf8 bom if ((fill > 2) && (buffer[0] == 0xef) && @@ -135,7 +136,7 @@ public: } return utf8; // no valid bom so use utf8 as default } - int getByte(unsigned char &c) + std::streamsize getByte(unsigned char &c) { if (fill) { @@ -149,7 +150,7 @@ public: return inputfile.gcount(); } } - int getWord(unsigned short &w) + std::streamsize getWord(unsigned short &w) { unsigned char c[2]; if (!getByte(c[0])) @@ -162,7 +163,7 @@ public: w = c[1] | (c[0] << 8); return 2; } - int getDWord(wchar_t &d) + std::streamsize getDWord(wchar_t &d) { unsigned char c[4]; for (int i=0;i<4;i++) diff --git a/sdk/tools/widl/CMakeLists.txt b/sdk/tools/widl/CMakeLists.txt index 40bf91671b..17239f0136 100644 --- a/sdk/tools/widl/CMakeLists.txt +++ b/sdk/tools/widl/CMakeLists.txt @@ -35,3 +35,14 @@ list(APPEND SOURCE add_definitions(-DINT16=SHORT) add_host_tool(widl ${SOURCE}) target_link_libraries(widl wpphost) + +if(MSVC) + # Disable warning "'>': signed/unsigned mismatch" + add_target_compile_flags(widl "/wd4018") + + # Disable warning "unary minus operator applied to unsigned type, result still unsigned" + add_target_compile_flags(widl "/wd4146") + + # Disable warning "'=': conversion from 'a' to 'b', possible loss of data" + add_target_compile_flags(widl "/wd4244") +endif() diff --git a/sdk/tools/widl/port/config.h b/sdk/tools/widl/port/config.h new file mode 100644 index 0000000000..568b15d51d --- /dev/null +++ b/sdk/tools/widl/port/config.h @@ -0,0 +1,15 @@ + +#pragma once + +#include <io.h> + +#define HAVE_PROCESS_H 1 + +int +_getopt_internal( + int argc, + char *const *argv, + const char *optstring, + const struct option *longopts, + int *longind, + int long_only); diff --git a/sdk/tools/wpp/CMakeLists.txt b/sdk/tools/wpp/CMakeLists.txt index 2539e6b733..39f3b2d9f9 100644 --- a/sdk/tools/wpp/CMakeLists.txt +++ b/sdk/tools/wpp/CMakeLists.txt @@ -11,6 +11,13 @@ if(MSVC) add_definitions(-Dvsnprintf=_vsnprintf) endif() endif() + + # Disable warning " unary minus operator applied to unsigned type, result still unsigned" + add_compile_flags("/wd4146") + + # Disable warning "'=': conversion from 'a' to 'b', possible loss of data" + add_compile_flags("/wd4244") + endif() if(CMAKE_CROSSCOMPILING) diff --git a/sdk/tools/xml2sdb/CMakeLists.txt b/sdk/tools/xml2sdb/CMakeLists.txt index 1a59e62fc4..15e2fc73e0 100644 --- a/sdk/tools/xml2sdb/CMakeLists.txt +++ b/sdk/tools/xml2sdb/CMakeLists.txt @@ -14,6 +14,9 @@ include_directories( ${REACTOS_SOURCE_DIR}/sdk/include/reactos/appcompat) add_host_tool(xml2sdb ${SOURCE}) -if(NOT MSVC) +if(MSVC) + # Disable warning "'=': conversion from 'a' to 'b', possible loss of data" + add_target_compile_flags(xml2sdb "/wd4244") +else() add_target_compile_flags(xml2sdb "-fshort-wchar") endif() diff --git a/sdk/tools/xml2sdb/main.cpp b/sdk/tools/xml2sdb/main.cpp index c39a08308b..14a7d685cb 100644 --- a/sdk/tools/xml2sdb/main.cpp +++ b/sdk/tools/xml2sdb/main.cpp @@ -132,7 +132,7 @@ BOOL WINAPIV ShimDbgPrint(SHIM_LOG_LEVEL Level, PCSTR FunctionName, PCSTR Format va_list ArgList; const char* LevelStr; - if (Level > g_ShimDebugLevel) + if ((ULONG)Level > g_ShimDebugLevel) return FALSE; switch (Level)

5 years, 7 months

[reactos] 01/01: [CONSRV] Cache the console window system menu handle; simplify its initialization code.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0aed8b09a411b6c2ef4af… commit 0aed8b09a411b6c2ef4af5976c2f80a40f0b2604 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 28 21:47:55 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 28 21:47:55 2019 +0200 [CONSRV] Cache the console window system menu handle; simplify its initialization code. --- win32ss/user/winsrv/consrv/frontends/gui/conwnd.c | 40 ++++++++++++---------- win32ss/user/winsrv/consrv/frontends/gui/conwnd.h | 1 + win32ss/user/winsrv/consrv/frontends/gui/guiterm.c | 8 ++--- 3 files changed, 27 insertions(+), 22 deletions(-) diff --git a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c index 9da1e92e76..13f5da948f 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c +++ b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c @@ -231,30 +231,32 @@ VOID CreateSysMenu(HWND hWnd) { MENUITEMINFOW mii; + HMENU hMenu; + PWCHAR ptrTab; WCHAR szMenuStringBack[255]; - WCHAR *ptrTab; - HMENU hMenu = GetSystemMenu(hWnd, FALSE); - if (hMenu != NULL) - { - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_STRING; - mii.dwTypeData = szMenuStringBack; - mii.cch = sizeof(szMenuStringBack)/sizeof(WCHAR); - GetMenuItemInfoW(hMenu, SC_CLOSE, FALSE, &mii); + hMenu = GetSystemMenu(hWnd, FALSE); + if (hMenu == NULL) + return; - ptrTab = wcschr(szMenuStringBack, '\t'); - if (ptrTab) - { - *ptrTab = '\0'; - mii.cch = wcslen(szMenuStringBack); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_STRING; + mii.dwTypeData = szMenuStringBack; + mii.cch = ARRAYSIZE(szMenuStringBack); - SetMenuItemInfoW(hMenu, SC_CLOSE, FALSE, &mii); - } + GetMenuItemInfoW(hMenu, SC_CLOSE, FALSE, &mii); + + ptrTab = wcschr(szMenuStringBack, L'\t'); + if (ptrTab) + { + *ptrTab = L'\0'; + mii.cch = wcslen(szMenuStringBack); - AppendMenuItems(hMenu, GuiConsoleMainMenuItems); - DrawMenuBar(hWnd); + SetMenuItemInfoW(hMenu, SC_CLOSE, FALSE, &mii); } + + AppendMenuItems(hMenu, GuiConsoleMainMenuItems); + DrawMenuBar(hWnd); } static VOID @@ -597,6 +599,7 @@ OnNcCreate(HWND hWnd, LPCREATESTRUCTW Create) Console = GuiData->Console; GuiData->hWindow = hWnd; + GuiData->hSysMenu = GetSystemMenu(hWnd, FALSE); /* Initialize the fonts */ if (!InitFonts(GuiData, @@ -1370,6 +1373,7 @@ OnNcDestroy(HWND hWnd) /* Free the GuiData registration */ SetWindowLongPtrW(hWnd, GWLP_USERDATA, (DWORD_PTR)NULL); + /* Reset the system menu back to default and destroy the previous menu */ GetSystemMenu(hWnd, TRUE); if (GuiData) diff --git a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h index 1efc2103cb..6a5215fb69 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h +++ b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h @@ -73,6 +73,7 @@ typedef struct _GUI_CONSOLE_DATA BOOL HackCORE8394IgnoreNextMove; /* HACK FOR CORE-8394. See conwnd.c!OnMouse for more details. */ + HMENU hSysMenu; /* Handle to the console window system menu */ BOOL IsCloseButtonEnabled; /* TRUE if the Close button and the corresponding system menu item are enabled (default), FALSE otherwise */ UINT CmdIdLow ; /* Lowest menu id of the user-reserved menu id range */ UINT CmdIdHigh; /* Highest menu id of the user-reserved menu id range */ diff --git a/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c b/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c index 2b2e9d4f27..c811c4c030 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c +++ b/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c @@ -96,6 +96,7 @@ InvalidateCell(PGUI_CONSOLE_DATA GuiData, * GUI Terminal Initialization * ******************************************************************************/ +// FIXME: HACK: Potential HACK for CORE-8129; see revision 63595. VOID CreateSysMenu(HWND hWnd); @@ -1116,7 +1117,7 @@ GuiMenuControl(IN OUT PFRONTEND This, GuiData->CmdIdLow = CmdIdLow ; GuiData->CmdIdHigh = CmdIdHigh; - return GetSystemMenu(GuiData->hWindow, FALSE); + return GuiData->hSysMenu; } static BOOL NTAPI @@ -1130,12 +1131,11 @@ GuiSetMenuClose(IN OUT PFRONTEND This, */ PGUI_CONSOLE_DATA GuiData = This->Context; - HMENU hSysMenu = GetSystemMenu(GuiData->hWindow, FALSE); - if (hSysMenu == NULL) return FALSE; + if (GuiData->hSysMenu == NULL) return FALSE; GuiData->IsCloseButtonEnabled = Enable; - EnableMenuItem(hSysMenu, SC_CLOSE, MF_BYCOMMAND | (Enable ? MF_ENABLED : MF_GRAYED)); + EnableMenuItem(GuiData->hSysMenu, SC_CLOSE, MF_BYCOMMAND | (Enable ? MF_ENABLED : MF_GRAYED)); return TRUE; }

5 years, 7 months

[reactos] 01/01: [REACTOS] Replace remnant legacy SPIF_SENDWININICHANGE by SPIF_SENDCHANGE (#1526)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cf48f8bf8a6711a521637… commit cf48f8bf8a6711a521637881f2f50e017d18051d Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sun Apr 28 21:19:42 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 28 21:19:42 2019 +0200 [REACTOS] Replace remnant legacy SPIF_SENDWININICHANGE by SPIF_SENDCHANGE (#1526) No functional change otherwise. --- base/applications/mspaint/registry.cpp | 2 +- base/system/userinit/livecd.c | 2 +- dll/win32/uxtheme/system.c | 2 +- sdk/include/psdk/winuser.h | 2 +- win32ss/user/ntuser/sysparams.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/base/applications/mspaint/registry.cpp b/base/applications/mspaint/registry.cpp index e2955302d9..cd1250b239 100644 --- a/base/applications/mspaint/registry.cpp +++ b/base/applications/mspaint/registry.cpp @@ -46,7 +46,7 @@ void RegistrySettings::SetWallpaper(LPCTSTR szFileName, RegistrySettings::Wallpa desktop.SetStringValue(_T("TileWallpaper"), (style == RegistrySettings::TILED) ? _T("1") : _T("0")); } - SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, (PVOID) szFileName, SPIF_UPDATEINIFILE | SPIF_SENDWININICHANGE); + SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, (PVOID) szFileName, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); } void RegistrySettings::LoadPresets() diff --git a/base/system/userinit/livecd.c b/base/system/userinit/livecd.c index 6a17bbb797..86d3eb70fc 100644 --- a/base/system/userinit/livecd.c +++ b/base/system/userinit/livecd.c @@ -301,7 +301,7 @@ SetKeyboardLayout( swprintf(szLayoutId, L"%08lx", ulLayoutId); hKl = LoadKeyboardLayoutW(szLayoutId, KLF_ACTIVATE | KLF_REPLACELANG | KLF_SETFORPROCESS); - SystemParametersInfoW(SPI_SETDEFAULTINPUTLANG, 0, &hKl, SPIF_SENDWININICHANGE); + SystemParametersInfoW(SPI_SETDEFAULTINPUTLANG, 0, &hKl, SPIF_SENDCHANGE); } diff --git a/dll/win32/uxtheme/system.c b/dll/win32/uxtheme/system.c index 2fb1ac8b5a..eaf8faf924 100644 --- a/dll/win32/uxtheme/system.c +++ b/dll/win32/uxtheme/system.c @@ -473,7 +473,7 @@ static void UXTHEME_RestoreSystemMetrics(void) /* Make system settings persistent, so they're in effect even w/o uxtheme * loaded. * For efficiency reasons, only the last SystemParametersInfoW sets - * SPIF_SENDWININICHANGE */ + * SPIF_SENDCHANGE */ static void UXTHEME_SaveSystemMetrics(void) { const struct BackupSysParam* bsp = backupSysParams; diff --git a/sdk/include/psdk/winuser.h b/sdk/include/psdk/winuser.h index ec8249cddf..f9ff766a2a 100644 --- a/sdk/include/psdk/winuser.h +++ b/sdk/include/psdk/winuser.h @@ -1551,8 +1551,8 @@ extern "C" { #endif #define SPIF_UPDATEINIFILE 1 -#define SPIF_SENDWININICHANGE 2 #define SPIF_SENDCHANGE 2 +#define SPIF_SENDWININICHANGE SPIF_SENDCHANGE #define ATF_ONOFFFEEDBACK 2 #define ATF_TIMEOUTON 1 diff --git a/win32ss/user/ntuser/sysparams.c b/win32ss/user/ntuser/sysparams.c index a325dcc672..f07db3aab2 100644 --- a/win32ss/user/ntuser/sysparams.c +++ b/win32ss/user/ntuser/sysparams.c @@ -2107,7 +2107,7 @@ UserSystemParametersInfo( InitMetrics(); /* Send notification to toplevel windows, if requested */ - if (fWinIni & (SPIF_SENDCHANGE | SPIF_SENDWININICHANGE)) + if (fWinIni & SPIF_SENDCHANGE) { /* Send WM_SETTINGCHANGE to all toplevel windows */ co_IntSendMessageTimeout(HWND_BROADCAST,

5 years, 7 months

[reactos] 01/01: [ACCESS] Reposition the "ToggleKeys" group box control (#1541)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89f6929dae09c1eba3426… commit 89f6929dae09c1eba3426b928e08d5b2a3088fac Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sun Apr 28 20:21:38 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 28 20:21:38 2019 +0200 [ACCESS] Reposition the "ToggleKeys" group box control (#1541) CORE-15383 --- dll/cpl/access/lang/bg-BG.rc | 2 +- dll/cpl/access/lang/cs-CZ.rc | 2 +- dll/cpl/access/lang/de-DE.rc | 2 +- dll/cpl/access/lang/el-GR.rc | 2 +- dll/cpl/access/lang/en-US.rc | 2 +- dll/cpl/access/lang/es-ES.rc | 2 +- dll/cpl/access/lang/et-EE.rc | 2 +- dll/cpl/access/lang/fr-FR.rc | 6 +++--- dll/cpl/access/lang/he-IL.rc | 2 +- dll/cpl/access/lang/hu-HU.rc | 2 +- dll/cpl/access/lang/id-ID.rc | 2 +- dll/cpl/access/lang/it-IT.rc | 2 +- dll/cpl/access/lang/ja-JP.rc | 2 +- dll/cpl/access/lang/no-NO.rc | 2 +- dll/cpl/access/lang/pt-BR.rc | 2 +- dll/cpl/access/lang/ro-RO.rc | 2 +- dll/cpl/access/lang/ru-RU.rc | 2 +- dll/cpl/access/lang/sk-SK.rc | 2 +- dll/cpl/access/lang/sq-AL.rc | 2 +- dll/cpl/access/lang/tr-TR.rc | 2 +- dll/cpl/access/lang/uk-UA.rc | 2 +- dll/cpl/access/lang/zh-CN.rc | 2 +- dll/cpl/access/lang/zh-TW.rc | 2 +- 23 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dll/cpl/access/lang/bg-BG.rc b/dll/cpl/access/lang/bg-BG.rc index 7f4bdcb8f2..449ba338a2 100644 --- a/dll/cpl/access/lang/bg-BG.rc +++ b/dll/cpl/access/lang/bg-BG.rc @@ -15,7 +15,7 @@ BEGIN -1, 12, 89, 222, 29 AUTOCHECKBOX "Използване на &ПресяващиКлавиши", IDC_FILTER_BOX, 12, 121, 140, 14 PUSHBUTTON "На&стройки", IDC_FILTER_BUTTON, 104, 121, 50, 14 - GROUPBOX "ОбращащиКлавиши", -1, 6, 145, 234, 62 + GROUPBOX "ОбращащиКлавиши", -1, 6, 148, 234, 62 LTEXT "Използвайте ОбръщащиКлавиши, ако искате да чувате звук при натискане на Caps Lock, Num Lock и Scroll Lock.", -1, 12, 161, 222, 20 AUTOCHECKBOX "Използване на &ОбръщащиКлавиши", IDC_TOGGLE_BOX, 12, 184, 154, 14 diff --git a/dll/cpl/access/lang/cs-CZ.rc b/dll/cpl/access/lang/cs-CZ.rc index b118b3ee9f..ca98d8628e 100644 --- a/dll/cpl/access/lang/cs-CZ.rc +++ b/dll/cpl/access/lang/cs-CZ.rc @@ -15,7 +15,7 @@ BEGIN -1, 12, 89, 222, 29 AUTOCHECKBOX "Používat funkci &Filtrování kláves", IDC_FILTER_BOX, 12, 121, 126, 14 PUSHBUTTON "N&astavení", IDC_FILTER_BUTTON, 144, 121, 90, 14 - GROUPBOX "Ozvučení kláves", -1, 6, 145, 234, 62 + GROUPBOX "Ozvučení kláves", -1, 6, 148, 234, 62 LTEXT "Použijte funkci Ozvučení kláves, chcete-li být upozorněni na stisk kláves Caps Lock, Num Lock a Scroll Lock zvukovým signálem.", -1, 12, 161, 222, 26 AUTOCHECKBOX "Používat funkci O&zvučení kláves", IDC_TOGGLE_BOX, 12, 186, 126, 14 diff --git a/dll/cpl/access/lang/de-DE.rc b/dll/cpl/access/lang/de-DE.rc index bc8cb4a9d3..638cde30cb 100644 --- a/dll/cpl/access/lang/de-DE.rc +++ b/dll/cpl/access/lang/de-DE.rc @@ -17,7 +17,7 @@ BEGIN -1, 12, 89, 222, 29 AUTOCHECKBOX "&Verzögerung aktivieren", IDC_FILTER_BOX, 12, 121, 126, 14 PUSHBUTTON "E&instellungen", IDC_FILTER_BUTTON, 144, 121, 90, 14 - GROUPBOX "Signalfunktion", -1, 6, 145, 234, 62 + GROUPBOX "Signalfunktion", -1, 6, 148, 234, 62 LTEXT "Benutzen Sie die Signalfunktion, wenn Sie einen Signalton hören wollen, wenn Sie Caps-, Num-, oder Scroll-Lock drücken.", -1, 12, 161, 222, 29 AUTOCHECKBOX "&Signalfunktion benutzen", IDC_TOGGLE_BOX, 12, 184, 126, 14 diff --git a/dll/cpl/access/lang/el-GR.rc b/dll/cpl/access/lang/el-GR.rc index 45d8737fac..b5bcbb3b1f 100644 --- a/dll/cpl/access/lang/el-GR.rc +++ b/dll/cpl/access/lang/el-GR.rc @@ -15,7 +15,7 @@ BEGIN -1, 12, 89, 222, 29 AUTOCHECKBOX "Χρήση &Φίλτρου πλήκτρων", IDC_FILTER_BOX, 12, 121, 126, 14 PUSHBUTTON "Ρ&υθμίσεις", IDC_FILTER_BUTTON, 144, 121, 90, 14 - GROUPBOX "Εναλλαγή πλήκτρων", -1, 6, 145, 234, 62 + GROUPBOX "Εναλλαγή πλήκτρων", -1, 6, 148, 234, 62 LTEXT "Χρησιμοποιήστε την Εναλλαγή πλήκτρων, αν θέλετε να ακούτε ηχητικό σήμα όταν πατάτε Caps Lock, Num Lock και Scroll Lock.", -1, 12, 161, 222, 20 AUTOCHECKBOX "Χρήση &Εναλλαγής πλήκτρων", IDC_TOGGLE_BOX, 12, 184, 126, 14 diff --git a/dll/cpl/access/lang/en-US.rc b/dll/cpl/access/lang/en-US.rc index 5b653e596e..4086c4fb5f 100644 --- a/dll/cpl/access/lang/en-US.rc +++ b/dll/cpl/access/lang/en-US.rc @@ -15,7 +15,7 @@ BEGIN -1, 12, 89, 222, 29 AUTOCHECKBOX "Use &FilterKeys", IDC_FILTER_BOX, 12, 121, 126, 14 PUSHBUTTON "S&ettings", IDC_FILTER_BUTTON, 144, 121, 90, 14 - GROUPBOX "ToggleKeys", -1, 6, 145, 234, 62 + GROUPBOX "ToggleKeys", -1, 6, 148, 234, 62 LTEXT "Use ToggleKeys if you want to hear tones when pressing Caps Lock, Num Lock, and Scroll Lock.", -1, 12, 161, 222, 20 AUTOCHECKBOX "Use &ToggleKeys", IDC_TOGGLE_BOX, 12, 184, 126, 14 diff --git a/dll/cpl/access/lang/es-ES.rc b/dll/cpl/access/lang/es-ES.rc index b3c43bcf54..02d3e3ec03 100644 --- a/dll/cpl/access/lang/es-ES.rc +++ b/dll/cpl/access/lang/es-ES.rc @@ -17,7 +17,7 @@ BEGIN -1, 12, 89, 222, 29 AUTOCHECKBOX "Utilizar &FilterKeys", IDC_FILTER_BOX, 12, 121, 126, 14 PUSHBUTTON "Co&nfiguración", IDC_FILTER_BUTTON, 144, 121, 90, 14 - GROUPBOX "ToogleKeys ", -1, 6, 145, 234, 62 + GROUPBOX "ToogleKeys ", -1, 6, 148, 234, 62 LTEXT "Use &ToogleKeys si desea escuchar tonos al presionar Bloq Mayús, Bloq Num, y Bloq Despl.", -1, 12, 161, 222, 20 AUTOCHECKBOX "Utilizar &ToogleKeys", IDC_TOGGLE_BOX, 12, 184, 126, 14 diff --git a/dll/cpl/access/lang/et-EE.rc b/dll/cpl/access/lang/et-EE.rc index 21d7ddf74c..04a88abbac 100644 --- a/dll/cpl/access/lang/et-EE.rc +++ b/dll/cpl/access/lang/et-EE.rc @@ -22,7 +22,7 @@ BEGIN -1, 12, 89, 222, 29 AUTOCHECKBOX "Kasuta &filterklahve", IDC_FILTER_BOX, 12, 121, 126, 14 PUSHBUTTON "S&ätted", IDC_FILTER_BUTTON, 144, 121, 90, 14 - GROUPBOX "Tumblerklahvid", -1, 6, 145, 234, 62 + GROUPBOX "Tumblerklahvid", -1, 6, 148, 234, 62 LTEXT "Kasutage tumblerklahve, kui soovite klahve CAPS LOCK, NUM LOCK ja SCROLL LOCK vajutamisel kuulda heli.", -1, 12, 161, 222, 20 AUTOCHECKBOX "Kasuta &tumblerklahve", IDC_TOGGLE_BOX, 12, 184, 126, 14 diff --git a/dll/cpl/access/lang/fr-FR.rc b/dll/cpl/access/lang/fr-FR.rc index e2659c10bc..ce4afe942a 100644 --- a/dll/cpl/access/lang/fr-FR.rc +++ b/dll/cpl/access/lang/fr-FR.rc @@ -17,11 +17,11 @@ BEGIN -1, 12, 89, 222, 29 AUTOCHECKBOX "Utiliser les touches &filtre", IDC_FILTER_BOX, 12, 121, 126, 14 PUSHBUTTON "P&aramètres", IDC_FILTER_BUTTON, 144, 121, 90, 14 - GROUPBOX "Touches bascules", -1, 6, 145, 234, 62 + GROUPBOX "Touches bascules", -1, 6, 148, 234, 62 LTEXT "Utilisez les touches &bascules si vous voulez entendre un son émis à chaque fois que vous appuyez sur Verr. maj, Verr. num, et Arrêt défil.", -1, 12, 161, 222, 29 - AUTOCHECKBOX "Utiliser les touches bascules", IDC_TOGGLE_BOX, 12, 184, 126, 14 - PUSHBUTTON "Para&mètres", IDC_TOGGLE_BUTTON, 144, 184, 90, 14 + AUTOCHECKBOX "Utiliser les touches bascules", IDC_TOGGLE_BOX, 12, 189, 126, 14 + PUSHBUTTON "Para&mètres", IDC_TOGGLE_BUTTON, 144, 189, 90, 14 AUTOCHECKBOX "&Afficher l'aide supplémentaire sur le clavier dans les programmes", IDC_KEYBOARD_EXTRA, 6, 212, 234, 14 END diff --git a/dll/cpl/access/lang/he-IL.rc b/dll/cpl/access/lang/he-IL.rc index 99d6affc90..4fc9411db7 100644 --- a/dll/cpl/access/lang/he-IL.rc +++ b/dll/cpl/access/lang/he-IL.rc @@ -17,7 +17,7 @@ BEGIN -1, 12, 89, 222, 29 AUTOCHECKBOX "Use &FilterKeys", IDC_FILTER_BOX, 12, 121, 126, 14 PUSHBUTTON "הגדרות", IDC_FILTER_BUTTON, 144, 121, 90, 14 - GROUPBOX "ToggleKeys", -1, 6, 145, 234, 62 + GROUPBOX "ToggleKeys", -1, 6, 148, 234, 62 LTEXT "Use ToggleKeys if you want to hear tones when pressing Caps Lock, Num Lock, and Scroll Lock.", -1, 12, 161, 222, 20 AUTOCHECKBOX "Use &ToggleKeys", IDC_TOGGLE_BOX, 12, 184, 126, 14 diff --git a/dll/cpl/access/lang/hu-HU.rc b/dll/cpl/access/lang/hu-HU.rc index fbd76a4365..9fa0974b40 100644 --- a/dll/cpl/access/lang/hu-HU.rc +++ b/dll/cpl/access/lang/hu-HU.rc @@ -17,7 +17,7 @@ BEGIN -1, 12, 89, 222, 29 AUTOCHECKBOX "Use &FilterKeys", IDC_FILTER_BOX, 12, 121, 126, 14 PUSHBUTTON "B&eállítások", IDC_FILTER_BUTTON, 144, 121, 90, 14 - GROUPBOX "Állásjelző hangok", -1, 6, 145, 234, 62 + GROUPBOX "Állásjelző hangok", -1, 6, 148, 234, 62 LTEXT "Ha a Caps Lock, Num Lock, és Scroll Lock billentyűk lenyomásakor hangot szeretne hallani, használja az Állásjelző hangok lehetőséget.", -1, 12, 161, 222, 29 AUTOCHECKBOX "Állásjelző hangok használata", IDC_TOGGLE_BOX, 12, 184, 126, 14 diff --git a/dll/cpl/access/lang/id-ID.rc b/dll/cpl/access/lang/id-ID.rc index e2746def62..92128538fe 100644 --- a/dll/cpl/access/lang/id-ID.rc +++ b/dll/cpl/access/lang/id-ID.rc @@ -17,7 +17,7 @@ BEGIN -1, 12, 89, 222, 29 AUTOCHECKBOX "Gunakan &FilterKeys", IDC_FILTER_BOX, 12, 121, 126, 14 PUSHBUTTON "S&etelan", IDC_FILTER_BUTTON, 144, 121, 90, 14 - GROUPBOX "ToggleKeys", -1, 6, 145, 234, 62 + GROUPBOX "ToggleKeys", -1, 6, 148, 234, 62 LTEXT "Gunakan ToggleKeys jika anda ingin mendengan nada ketika menekan Caps Lock, Num Lock, dan Scroll Lock.", -1, 12, 161, 222, 20 AUTOCHECKBOX "Gunakan &ToggleKeys", IDC_TOGGLE_BOX, 12, 184, 126, 14 diff --git a/dll/cpl/access/lang/it-IT.rc b/dll/cpl/access/lang/it-IT.rc index 6ecf004c3c..e238bae67f 100644 --- a/dll/cpl/access/lang/it-IT.rc +++ b/dll/cpl/access/lang/it-IT.rc @@ -15,7 +15,7 @@ BEGIN -1, 12, 89, 222, 29 AUTOCHECKBOX "Usa &Filtro", IDC_FILTER_BOX, 12, 121, 126, 14 PUSHBUTTON "I&mpostazioni", IDC_FILTER_BUTTON, 144, 121, 90, 14 - GROUPBOX "Segnali acustici", -1, 6, 145, 234, 62 + GROUPBOX "Segnali acustici", -1, 6, 148, 234, 62 LTEXT "Se vuoi un segnale acustico quando viene premuto Blocco Maiuscole, Num o Scr.", -1, 12, 161, 222, 20 AUTOCHECKBOX "Usa segnali acustici", IDC_TOGGLE_BOX, 12, 184, 126, 14 diff --git a/dll/cpl/access/lang/ja-JP.rc b/dll/cpl/access/lang/ja-JP.rc index 957003d9a7..e8e1aba8dc 100644 --- a/dll/cpl/access/lang/ja-JP.rc +++ b/dll/cpl/access/lang/ja-JP.rc @@ -15,7 +15,7 @@ BEGIN -1, 12, 89, 222, 29 AUTOCHECKBOX "フィルタキー機能を使う(&F)", IDC_FILTER_BOX, 12, 121, 126, 14 PUSHBUTTON "設定(&E)", IDC_FILTER_BUTTON, 144, 121, 90, 14 - GROUPBOX "切り替えキー機能", -1, 6, 145, 234, 62 + GROUPBOX "切り替えキー機能", -1, 6, 148, 234, 62 LTEXT "切り替えキー機能を使うと、CapsLock、NumLock、ScrollLock キーを押したときに音を鳴らします。", -1, 12, 161, 222, 20 AUTOCHECKBOX "切り替えキー機能を使う(&T)", IDC_TOGGLE_BOX, 12, 184, 126, 14 diff --git a/dll/cpl/access/lang/no-NO.rc b/dll/cpl/access/lang/no-NO.rc index e880163378..23576d3800 100644 --- a/dll/cpl/access/lang/no-NO.rc +++ b/dll/cpl/access/lang/no-NO.rc @@ -15,7 +15,7 @@ BEGIN -1, 12, 89, 222, 29 AUTOCHECKBOX "Bruk &filtertaster", IDC_FILTER_BOX, 12, 121, 126, 14 PUSHBUTTON "I&nnstillinger", IDC_FILTER_BUTTON, 144, 121, 90, 14 - GROUPBOX "Veksletaster", -1, 6, 145, 234, 62 + GROUPBOX "Veksletaster", -1, 6, 148, 234, 62 LTEXT "Bruk vekseltaster hvis du vil høre lydsignaler når du trykker på Caps Lock, Num Lock, eller Scroll Lock.", -1, 12, 161, 222, 20 AUTOCHECKBOX "Bruk &Vekseltaster", IDC_TOGGLE_BOX, 12, 184, 126, 14 diff --git a/dll/cpl/access/lang/pt-BR.rc b/dll/cpl/access/lang/pt-BR.rc index 0c052ec92f..2d4064582e 100644 --- a/dll/cpl/access/lang/pt-BR.rc +++ b/dll/cpl/access/lang/pt-BR.rc @@ -15,7 +15,7 @@ BEGIN -1, 12, 89, 222, 29 AUTOCHECKBOX "Usar as teclas de &filtragem", IDC_FILTER_BOX, 12, 121, 126, 14 PUSHBUTTON "C&onfigurações", IDC_FILTER_BUTTON, 144, 121, 90, 14 - GROUPBOX "Teclas de alternância", -1, 6, 145, 234, 62 + GROUPBOX "Teclas de alternância", -1, 6, 148, 234, 62 LTEXT "Use as teclas de alternância para ouvir sons quando pressionar CAPS LOCK, NUM LOCK e SCROLL LOCK.", -1, 12, 161, 222, 20 AUTOCHECKBOX "Usar as &teclas de alternância", IDC_TOGGLE_BOX, 12, 184, 126, 14 diff --git a/dll/cpl/access/lang/ro-RO.rc b/dll/cpl/access/lang/ro-RO.rc index 2f83e30f8c..cf7a0e1d9d 100644 --- a/dll/cpl/access/lang/ro-RO.rc +++ b/dll/cpl/access/lang/ro-RO.rc @@ -20,7 +20,7 @@ BEGIN -1, 12, 89, 222, 29 AUTOCHECKBOX "Doresc folosirea de Filt&ruTaste", IDC_FILTER_BOX, 12, 121, 126, 14 PUSHBUTTON "O&pțiuni…", IDC_FILTER_BUTTON, 154, 121, 80, 14 - GROUPBOX "TasteDeComutare", -1, 6, 145, 234, 62 + GROUPBOX "TasteDeComutare", -1, 6, 148, 234, 62 LTEXT "Utilizați TasteDeComutare pentru a semnala sonor apăsarea tastelor «Caps Lock», «Num Lock» sau «Scroll Lock».", -1, 12, 161, 222, 20 AUTOCHECKBOX "Doresc folosirea de TasteDe&Comutare", IDC_TOGGLE_BOX, 12, 184, 136, 14 diff --git a/dll/cpl/access/lang/ru-RU.rc b/dll/cpl/access/lang/ru-RU.rc index a9f1112ad0..d9b1cecb08 100644 --- a/dll/cpl/access/lang/ru-RU.rc +++ b/dll/cpl/access/lang/ru-RU.rc @@ -15,7 +15,7 @@ BEGIN -1, 12, 89, 222, 29 AUTOCHECKBOX "Использовать &фильтрацию ввода", IDC_FILTER_BOX, 12, 125, 134, 14 PUSHBUTTON "Н&астройка", IDC_FILTER_BUTTON, 149, 125, 85, 14 - GROUPBOX "Озвучивание переключения режимов", -1, 6, 145, 234, 62 + GROUPBOX "Озвучивание переключения режимов", -1, 6, 148, 234, 62 LTEXT "Озвучивание нажатия клавиш переключения режимов Caps Lock, Num Lock и Scroll Lock.", -1, 12, 161, 222, 20 AUTOCHECKBOX "&Озвучивание", IDC_TOGGLE_BOX, 12, 188, 126, 14 diff --git a/dll/cpl/access/lang/sk-SK.rc b/dll/cpl/access/lang/sk-SK.rc index 3b6d02f3c4..f3aedcff70 100644 --- a/dll/cpl/access/lang/sk-SK.rc +++ b/dll/cpl/access/lang/sk-SK.rc @@ -19,7 +19,7 @@ BEGIN -1, 12, 89, 222, 29 AUTOCHECKBOX "Use &FilterKeys", IDC_FILTER_BOX, 12, 121, 126, 14 PUSHBUTTON "S&ettings", IDC_FILTER_BUTTON, 144, 121, 90, 14 - GROUPBOX "ToggleKeys", -1, 6, 145, 234, 62 + GROUPBOX "ToggleKeys", -1, 6, 148, 234, 62 LTEXT "Use ToggleKeys if you want to hear tones when pressing Caps Lock, Num Lock, and Scroll Lock.", -1, 12, 161, 222, 20 AUTOCHECKBOX "Use &ToggleKeys", IDC_TOGGLE_BOX, 12, 184, 126, 14 diff --git a/dll/cpl/access/lang/sq-AL.rc b/dll/cpl/access/lang/sq-AL.rc index d5735d646b..d7bfb072f6 100644 --- a/dll/cpl/access/lang/sq-AL.rc +++ b/dll/cpl/access/lang/sq-AL.rc @@ -19,7 +19,7 @@ BEGIN -1, 12, 89, 222, 29 AUTOCHECKBOX "Perdor &FilterKeys", IDC_FILTER_BOX, 12, 121, 126, 14 PUSHBUTTON "Konfigurime", IDC_FILTER_BUTTON, 144, 121, 90, 14 - GROUPBOX "ToggleKeys", -1, 6, 145, 234, 62 + GROUPBOX "ToggleKeys", -1, 6, 148, 234, 62 LTEXT "Perdor ToggleKeys nese doni te degjoni tone gjate shtypjes se Caps Lock, Num Lock, dhe Scroll Lock.", -1, 12, 161, 222, 20 AUTOCHECKBOX "Perdor &ToggleKeys", IDC_TOGGLE_BOX, 12, 184, 126, 14 diff --git a/dll/cpl/access/lang/tr-TR.rc b/dll/cpl/access/lang/tr-TR.rc index c430a34357..46209a3e13 100644 --- a/dll/cpl/access/lang/tr-TR.rc +++ b/dll/cpl/access/lang/tr-TR.rc @@ -17,7 +17,7 @@ BEGIN -1, 12, 89, 222, 29 AUTOCHECKBOX "&Süzgeç Düğmeleri'ni Kullan", IDC_FILTER_BOX, 12, 121, 126, 14 PUSHBUTTON "Aya&rlar", IDC_FILTER_BUTTON, 144, 121, 90, 14 - GROUPBOX "Geçiş Düğmeleri", -1, 6, 145, 234, 62 + GROUPBOX "Geçiş Düğmeleri", -1, 6, 148, 234, 62 LTEXT "Eğer Büyük Harf Kilidi'ni, Sayılık Kilit'i ve Kaydırma Kilidi'ni basarken ses duymanızı istiyorsanız Geçiş Düğmeleri'ni kullanınız.", -1, 12, 161, 222, 20 AUTOCHECKBOX "&Geçiş Düğmeleri'ni Kullan", IDC_TOGGLE_BOX, 12, 184, 126, 14 diff --git a/dll/cpl/access/lang/uk-UA.rc b/dll/cpl/access/lang/uk-UA.rc index 340287933e..f625e5d5e4 100644 --- a/dll/cpl/access/lang/uk-UA.rc +++ b/dll/cpl/access/lang/uk-UA.rc @@ -23,7 +23,7 @@ BEGIN -1, 12, 89, 222, 29 AUTOCHECKBOX "Використовувати &фільтрацію вводу", IDC_FILTER_BOX, 12, 125, 150, 14 PUSHBUTTON "Н&алаштування", IDC_FILTER_BUTTON, 149, 125, 85, 14 - GROUPBOX "Озвучування переключення режимів", -1, 6, 145, 234, 62 + GROUPBOX "Озвучування переключення режимів", -1, 6, 148, 234, 62 LTEXT "При зміні стану клавіш Caps Lock, Num Lock і Scroll Lock звучить сигнал.", -1, 12, 161, 222, 20 AUTOCHECKBOX "&Озвучування", IDC_TOGGLE_BOX, 12, 188, 126, 14 diff --git a/dll/cpl/access/lang/zh-CN.rc b/dll/cpl/access/lang/zh-CN.rc index 3c3fd029e3..0e11c9a3c3 100644 --- a/dll/cpl/access/lang/zh-CN.rc +++ b/dll/cpl/access/lang/zh-CN.rc @@ -21,7 +21,7 @@ BEGIN -1, 12, 89, 222, 29 AUTOCHECKBOX "使用筛选键(&F)", IDC_FILTER_BOX, 12, 121, 126, 14 PUSHBUTTON "设置(&E)", IDC_FILTER_BUTTON, 144, 121, 90, 14 - GROUPBOX "切换键", -1, 6, 145, 234, 62 + GROUPBOX "切换键", -1, 6, 148, 234, 62 LTEXT "如果希望在按 CAPS、NUM LOCK 和 SCROLL LOCK 键时听到声音，请用切换键。", -1, 12, 161, 222, 20 AUTOCHECKBOX "使用切换键(&T)", IDC_TOGGLE_BOX, 12, 184, 126, 14 diff --git a/dll/cpl/access/lang/zh-TW.rc b/dll/cpl/access/lang/zh-TW.rc index 5edefa1306..982f7e31f6 100644 --- a/dll/cpl/access/lang/zh-TW.rc +++ b/dll/cpl/access/lang/zh-TW.rc @@ -17,7 +17,7 @@ BEGIN -1, 12, 89, 222, 29 AUTOCHECKBOX "使用篩選鍵(&F)", IDC_FILTER_BOX, 12, 121, 126, 14 PUSHBUTTON "設定(&E)", IDC_FILTER_BUTTON, 144, 121, 90, 14 - GROUPBOX "切換鍵", -1, 6, 145, 234, 62 + GROUPBOX "切換鍵", -1, 6, 148, 234, 62 LTEXT "如果希望在按 CAPS、NUM LOCK 和 SCROLL LOCK 鍵時聽到聲音，請用切換鍵。", -1, 12, 161, 222, 20 AUTOCHECKBOX "使用切換鍵(&T)", IDC_TOGGLE_BOX, 12, 184, 126, 14

5 years, 8 months

[reactos] 01/01: [WIN32SS:NTUSER] Use the 2nd parameter of NtUserGetThreadDesktop() as fallback. (#1065)

by Andrew Boyarshin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=458a26ab76232b035a4a5… commit 458a26ab76232b035a4a5989e17c431727c6ca5b Author: Andrew Boyarshin <andrew.boyarshin(a)gmail.com> AuthorDate: Mon Nov 26 19:49:15 2018 +0700 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 28 19:27:45 2019 +0200 [WIN32SS:NTUSER] Use the 2nd parameter of NtUserGetThreadDesktop() as fallback. (#1065) - The 2nd parameter is already passed in user-mode by GetThreadDesktop(). It is then used by NtUserGetThreadDesktop() as a fallback for console threads. - Lookup and validate the thread by using the IntTID2PTI() helper. - Don't reference the desktop with too many access rights. - Get rid of the old-school DECLARE_RETURN() & co. macros. Co-authored-by: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> --- win32ss/include/ntuser.h | 2 +- win32ss/user/ntuser/desktop.c | 114 +++++++++++++++++++++++-------------- win32ss/user/user32/misc/desktop.c | 2 +- 3 files changed, 74 insertions(+), 44 deletions(-) diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index 68f37ebff8..81a0b91440 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -2439,7 +2439,7 @@ HDESK NTAPI NtUserGetThreadDesktop( DWORD dwThreadId, - DWORD Unknown1); + HDESK hConsoleDesktop); enum ThreadStateRoutines { diff --git a/win32ss/user/ntuser/desktop.c b/win32ss/user/ntuser/desktop.c index 875cc4b69c..f1aec1b5af 100644 --- a/win32ss/user/ntuser/desktop.c +++ b/win32ss/user/ntuser/desktop.c @@ -2981,14 +2981,14 @@ CLEANUP: */ HDESK APIENTRY -NtUserGetThreadDesktop(DWORD dwThreadId, DWORD Unknown1) +NtUserGetThreadDesktop(DWORD dwThreadId, HDESK hConsoleDesktop) { + HDESK hDesk; NTSTATUS Status; - PETHREAD Thread; + PTHREADINFO pti; + PEPROCESS Process; PDESKTOP DesktopObject; - HDESK hDesk, hThreadDesktop; OBJECT_HANDLE_INFORMATION HandleInformation; - DECLARE_RETURN(HDESK); UserEnterExclusive(); TRACE("Enter NtUserGetThreadDesktop\n"); @@ -2996,67 +2996,97 @@ NtUserGetThreadDesktop(DWORD dwThreadId, DWORD Unknown1) if (!dwThreadId) { EngSetLastError(ERROR_INVALID_PARAMETER); - RETURN(0); + hDesk = NULL; + goto Quit; } - Status = PsLookupThreadByThreadId((HANDLE)(DWORD_PTR)dwThreadId, &Thread); - if (!NT_SUCCESS(Status)) + /* Validate the Win32 thread and retrieve its information */ + pti = IntTID2PTI(UlongToHandle(dwThreadId)); + if (pti) + { + /* Get the desktop handle of the thread */ + hDesk = pti->hdesk; + Process = pti->ppi->peProcess; + } + else if (hConsoleDesktop) + { + /* + * The thread may belong to a console, so attempt to use the provided + * console desktop handle as a fallback. Otherwise this means that the + * thread is either not Win32 or invalid. + */ + hDesk = hConsoleDesktop; + Process = gpepCSRSS; + } + else { EngSetLastError(ERROR_INVALID_PARAMETER); - RETURN(0); + hDesk = NULL; + goto Quit; } - if (Thread->ThreadsProcess == PsGetCurrentProcess()) + if (!hDesk) { - /* Just return the handle, we queried the desktop handle of a thread running - in the same context */ - hDesk = ((PTHREADINFO)Thread->Tcb.Win32Thread)->hdesk; - ObDereferenceObject(Thread); - RETURN(hDesk); + ERR("Desktop information of thread 0x%x broken!?\n", dwThreadId); + goto Quit; } - /* Get the desktop handle and the desktop of the thread */ - if (!(hThreadDesktop = ((PTHREADINFO)Thread->Tcb.Win32Thread)->hdesk) || - !(DesktopObject = ((PTHREADINFO)Thread->Tcb.Win32Thread)->rpdesk)) + if (Process == PsGetCurrentProcess()) { - ObDereferenceObject(Thread); - ERR("Desktop information of thread 0x%x broken!?\n", dwThreadId); - RETURN(NULL); + /* + * Just return the handle, since we queried the desktop handle + * of a thread running in the same context. + */ + goto Quit; } - /* We could just use DesktopObject instead of looking up the handle, but latter - may be a bit safer (e.g. when the desktop is being destroyed */ - /* Switch into the context of the thread we're trying to get the desktop from, - so we can use the handle */ - KeAttachProcess(&Thread->ThreadsProcess->Pcb); - Status = ObReferenceObjectByHandle(hThreadDesktop, - GENERIC_ALL, + /* + * We could just use the cached rpdesk instead of looking up the handle, + * but it may actually be safer to validate the desktop and get a temporary + * reference to it so that it does not disappear under us (e.g. when the + * desktop is being destroyed) during the operation. + */ + /* + * Switch into the context of the thread we are trying to get + * the desktop from, so we can use the handle. + */ + KeAttachProcess(&Process->Pcb); + Status = ObReferenceObjectByHandle(hDesk, + 0, ExDesktopObjectType, UserMode, (PVOID*)&DesktopObject, &HandleInformation); KeDetachProcess(); - /* The handle couldn't be found, there's nothing to get... */ - if (!NT_SUCCESS(Status)) + if (NT_SUCCESS(Status)) { - ObDereferenceObject(Thread); - RETURN(NULL); - } + /* + * Lookup our handle table if we can find a handle to the desktop object. + * If not, create one. + * QUESTION: Do we really need to create a handle in case it doesn't exist?? + */ + hDesk = IntGetDesktopObjectHandle(DesktopObject); - /* Lookup our handle table if we can find a handle to the desktop object, - if not, create one */ - hDesk = IntGetDesktopObjectHandle(DesktopObject); + /* All done, we got a valid handle to the desktop */ + ObDereferenceObject(DesktopObject); + } + else + { + /* The handle could not be found, there is nothing to get... */ + hDesk = NULL; + } - /* All done, we got a valid handle to the desktop */ - ObDereferenceObject(DesktopObject); - ObDereferenceObject(Thread); - RETURN(hDesk); + if (!hDesk) + { + ERR("Could not retrieve or access desktop for thread 0x%x\n", dwThreadId); + EngSetLastError(ERROR_ACCESS_DENIED); + } -CLEANUP: - TRACE("Leave NtUserGetThreadDesktop, ret=%p\n",_ret_); +Quit: + TRACE("Leave NtUserGetThreadDesktop, hDesk = 0x%p\n", hDesk); UserLeave(); - END_CLEANUP; + return hDesk; } static NTSTATUS diff --git a/win32ss/user/user32/misc/desktop.c b/win32ss/user/user32/misc/desktop.c index bd3ca78826..862ff16503 100644 --- a/win32ss/user/user32/misc/desktop.c +++ b/win32ss/user/user32/misc/desktop.c @@ -563,7 +563,7 @@ GetThreadDesktop( } return NtUserGetThreadDesktop(dwThreadId, - (DWORD_PTR)GetThreadConsoleDesktopRequest->ConsoleDesktop); + GetThreadConsoleDesktopRequest->ConsoleDesktop); }

5 years, 8 months

[reactos] 01/01: [WIN32SS][NTGDI] Fix wrong IN/OUT (#1539)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=23ad2173f21593baac605… commit 23ad2173f21593baac60547eba89c92bb96c9976 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Apr 29 00:24:57 2019 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 28 17:24:57 2019 +0200 [WIN32SS][NTGDI] Fix wrong IN/OUT (#1539) --- win32ss/gdi/ntgdi/coord.h | 4 ++-- win32ss/gdi/ntgdi/gdiobj.c | 2 +- win32ss/gdi/ntgdi/gdiobj.h | 2 +- win32ss/gdi/ntgdi/xformobj.c | 8 ++++---- win32ss/gdi/ntgdi/xformobj.h | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/win32ss/gdi/ntgdi/coord.h b/win32ss/gdi/ntgdi/coord.h index 9993ef527a..dc3228dfad 100644 --- a/win32ss/gdi/ntgdi/coord.h +++ b/win32ss/gdi/ntgdi/coord.h @@ -124,7 +124,7 @@ VOID DC_vXformDeviceToWorld( IN PDC pdc, IN ULONG cNumPoints, - IN PPOINTL pptlDest, + OUT PPOINTL pptlDest, IN PPOINTL pptlSource) { XFORMOBJ xo; @@ -140,7 +140,7 @@ VOID DC_vXformWorldToDevice( IN PDC pdc, IN ULONG cNumPoints, - IN PPOINTL pptlDest, + OUT PPOINTL pptlDest, IN PPOINTL pptlSource) { XFORMOBJ xo; diff --git a/win32ss/gdi/ntgdi/gdiobj.c b/win32ss/gdi/ntgdi/gdiobj.c index 03d71ebdaf..2635aab457 100644 --- a/win32ss/gdi/ntgdi/gdiobj.c +++ b/win32ss/gdi/ntgdi/gdiobj.c @@ -1259,7 +1259,7 @@ NTAPI GreGetObject( IN HGDIOBJ hobj, IN INT cbCount, - IN PVOID pvBuffer) + OUT PVOID pvBuffer) { PVOID pvObj; UCHAR objt; diff --git a/win32ss/gdi/ntgdi/gdiobj.h b/win32ss/gdi/ntgdi/gdiobj.h index 5a475f379d..71520e2fb0 100644 --- a/win32ss/gdi/ntgdi/gdiobj.h +++ b/win32ss/gdi/ntgdi/gdiobj.h @@ -111,7 +111,7 @@ NTAPI GreGetObject( IN HGDIOBJ hobj, IN INT cbCount, - IN PVOID pvBuffer); + OUT PVOID pvBuffer); POBJ NTAPI diff --git a/win32ss/gdi/ntgdi/xformobj.c b/win32ss/gdi/ntgdi/xformobj.c index 0d938df687..e1d2241f2c 100644 --- a/win32ss/gdi/ntgdi/xformobj.c +++ b/win32ss/gdi/ntgdi/xformobj.c @@ -105,7 +105,7 @@ HintFromAccel(ULONG flAccel) ULONG NTAPI XFORMOBJ_UpdateAccel( - IN XFORMOBJ *pxo) + IN OUT XFORMOBJ *pxo) { PMATRIX pmx = XFORMOBJ_pmx(pxo); @@ -146,7 +146,7 @@ XFORMOBJ_UpdateAccel( ULONG NTAPI XFORMOBJ_iSetXform( - OUT XFORMOBJ *pxo, + IN OUT XFORMOBJ *pxo, IN const XFORML *pxform) { PMATRIX pmx = XFORMOBJ_pmx(pxo); @@ -189,7 +189,7 @@ XFORMOBJ_iSetXform( ULONG NTAPI XFORMOBJ_iCombine( - IN XFORMOBJ *pxo, + IN OUT XFORMOBJ *pxo, IN XFORMOBJ *pxo1, IN XFORMOBJ *pxo2) { @@ -222,7 +222,7 @@ XFORMOBJ_iCombine( ULONG NTAPI XFORMOBJ_iCombineXform( - IN XFORMOBJ *pxo, + IN OUT XFORMOBJ *pxo, IN XFORMOBJ *pxo1, IN XFORML *pxform, IN BOOL bLeftMultiply) diff --git a/win32ss/gdi/ntgdi/xformobj.h b/win32ss/gdi/ntgdi/xformobj.h index 4adeb3d818..0c3ff2ee51 100644 --- a/win32ss/gdi/ntgdi/xformobj.h +++ b/win32ss/gdi/ntgdi/xformobj.h @@ -36,20 +36,20 @@ XFORMOBJ_pmx( ULONG NTAPI XFORMOBJ_iSetXform( - OUT XFORMOBJ *pxo, + IN OUT XFORMOBJ *pxo, IN const XFORML *pxform); ULONG NTAPI XFORMOBJ_iCombine( - IN XFORMOBJ *pxo, + IN OUT XFORMOBJ *pxo, IN XFORMOBJ *pxo1, IN XFORMOBJ *pxo2); ULONG NTAPI XFORMOBJ_iCombineXform( - IN XFORMOBJ *pxo, + IN OUT XFORMOBJ *pxo, IN XFORMOBJ *pxo1, IN XFORML *pxform, IN BOOL bLeftMultiply);

5 years, 8 months

[reactos] 01/01: [POWERCFG] Fix minor power scheme issues

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=93b54d007f30212033980… commit 93b54d007f30212033980d92e03a68884c87a465 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Apr 28 13:18:12 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Apr 28 13:18:52 2019 +0200 [POWERCFG] Fix minor power scheme issues - Really fix the exception that occurs on closing the property sheet. - Use the correct scheme ID when the current power scheme is set. --- dll/cpl/powercfg/powershemes.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dll/cpl/powercfg/powershemes.c b/dll/cpl/powercfg/powershemes.c index 7d1441a043..7654f1758c 100644 --- a/dll/cpl/powercfg/powershemes.c +++ b/dll/cpl/powercfg/powershemes.c @@ -162,9 +162,12 @@ DestroySchemesList( PLIST_ENTRY ListEntry; PPOWER_SCHEME pScheme; - while (!IsListEmpty(&pPageData->PowerSchemesList)) + for (;;) { ListEntry = pPageData->PowerSchemesList.Flink; + if (ListEntry == &pPageData->PowerSchemesList) + break; + pScheme = CONTAINING_RECORD(ListEntry, POWER_SCHEME, ListEntry); DeletePowerScheme(pScheme); } @@ -560,7 +563,7 @@ Pos_SaveData(HWND hwndDlg) pScheme->PowerPolicy.mach.DozeS4TimeoutDc = Sec[tmp]; } - SetActivePwrScheme(iCurSel, NULL, &pScheme->PowerPolicy); + SetActivePwrScheme(pScheme->uId, NULL, &pScheme->PowerPolicy); LoadConfig(hwndDlg); }

5 years, 8 months

[reactos] 01/01: [ROSAUTOTEST] "Enforce" ending '\n' on C___Exception messages (#1533)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f79ca12eda537e0b2a79f… commit f79ca12eda537e0b2a79f17c72e8857488968578 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sun Apr 28 12:20:37 2019 +0200 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Sun Apr 28 12:20:37 2019 +0200 [ROSAUTOTEST] "Enforce" ending '\n' on C___Exception messages (#1533) --- modules/rostests/rosautotest/CConfiguration.cpp | 2 +- modules/rostests/rosautotest/CPipe.cpp | 10 +++++----- modules/rostests/rosautotest/CWebService.cpp | 2 +- modules/rostests/rosautotest/CWineTest.cpp | 2 +- modules/rostests/rosautotest/main.cpp | 4 +++- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/modules/rostests/rosautotest/CConfiguration.cpp b/modules/rostests/rosautotest/CConfiguration.cpp index 2a605b4502..95f95cac55 100644 --- a/modules/rostests/rosautotest/CConfiguration.cpp +++ b/modules/rostests/rosautotest/CConfiguration.cpp @@ -27,7 +27,7 @@ CConfiguration::CConfiguration() /* Check if we are running under ReactOS from the SystemRoot directory */ if(!GetWindowsDirectoryW(WindowsDirectory, MAX_PATH)) - FATAL("GetWindowsDirectoryW failed"); + FATAL("GetWindowsDirectoryW failed\n"); m_IsReactOS = !_wcsnicmp(&WindowsDirectory[3], L"reactos", 7); diff --git a/modules/rostests/rosautotest/CPipe.cpp b/modules/rostests/rosautotest/CPipe.cpp index 73e9eda295..efff475e93 100644 --- a/modules/rostests/rosautotest/CPipe.cpp +++ b/modules/rostests/rosautotest/CPipe.cpp @@ -86,7 +86,7 @@ void CPipe::CloseReadPipe() { if (!m_hReadPipe) - FATAL("Trying to close already closed read pipe"); + FATAL("Trying to close already closed read pipe\n"); CloseHandle(m_hReadPipe); m_hReadPipe = NULL; } @@ -98,7 +98,7 @@ void CPipe::CloseWritePipe() { if (!m_hWritePipe) - FATAL("Trying to close already closed write pipe"); + FATAL("Trying to close already closed write pipe\n"); CloseHandle(m_hWritePipe); m_hWritePipe = NULL; } @@ -129,7 +129,7 @@ bool CPipe::Peek(PVOID Buffer, DWORD BufferSize, PDWORD BytesRead, PDWORD TotalBytesAvailable) { if (!m_hReadPipe) - FATAL("Trying to peek from a closed read pipe"); + FATAL("Trying to peek from a closed read pipe\n"); return PeekNamedPipe(m_hReadPipe, Buffer, BufferSize, BytesRead, TotalBytesAvailable, NULL); } @@ -161,7 +161,7 @@ CPipe::Read(PVOID Buffer, DWORD NumberOfBytesToRead, PDWORD NumberOfBytesRead, D { if (!m_hReadPipe) { - FATAL("Trying to read from a closed read pipe"); + FATAL("Trying to read from a closed read pipe\n"); } if (ReadFile(m_hReadPipe, Buffer, NumberOfBytesToRead, NumberOfBytesRead, &m_ReadOverlapped)) @@ -232,7 +232,7 @@ bool CPipe::Write(LPCVOID Buffer, DWORD NumberOfBytesToWrite, PDWORD NumberOfBytesWritten) { if (!m_hWritePipe) - FATAL("Trying to write to a closed write pipe"); + FATAL("Trying to write to a closed write pipe\n"); return WriteFile(m_hWritePipe, Buffer, NumberOfBytesToWrite, NumberOfBytesWritten, NULL); } diff --git a/modules/rostests/rosautotest/CWebService.cpp b/modules/rostests/rosautotest/CWebService.cpp index 850b466117..1a8ae3710d 100644 --- a/modules/rostests/rosautotest/CWebService.cpp +++ b/modules/rostests/rosautotest/CWebService.cpp @@ -108,7 +108,7 @@ CWebService::Finish(const char* TestType) stringstream ss; if (!m_TestID) - EXCEPTION("CWebService::Finish was called, but not a single result had been submitted!"); + EXCEPTION("CWebService::Finish was called, but not a single result had been submitted!\n"); Data = "action=finish"; Data += Configuration.GetAuthenticationRequestString(); diff --git a/modules/rostests/rosautotest/CWineTest.cpp b/modules/rostests/rosautotest/CWineTest.cpp index 9967d2d21c..d734d2a0a2 100644 --- a/modules/rostests/rosautotest/CWineTest.cpp +++ b/modules/rostests/rosautotest/CWineTest.cpp @@ -32,7 +32,7 @@ CWineTest::CWineTest() else { if (!GetWindowsDirectoryW(wszDirectory, MAX_PATH)) - FATAL("GetWindowsDirectoryW failed"); + FATAL("GetWindowsDirectoryW failed\n"); m_TestPath = wszDirectory; m_TestPath += L"\\bin\\"; diff --git a/modules/rostests/rosautotest/main.cpp b/modules/rostests/rosautotest/main.cpp index 57426ae659..8d6d342da9 100644 --- a/modules/rostests/rosautotest/main.cpp +++ b/modules/rostests/rosautotest/main.cpp @@ -89,14 +89,16 @@ wmain(int argc, wchar_t* argv[]) } catch(CSimpleException& e) { + // e.GetMessage() must include ending '\n'. StringOut(e.GetMessage()); } catch(CFatalException& e) { stringstream ss; + // e.GetMessage() must include ending '\n'. ss << "An exception occured in rosautotest." << endl - << "Message: " << e.GetMessage() << endl + << "Message: " << e.GetMessage() << "File: " << e.GetFile() << endl << "Line: " << e.GetLine() << endl << "Last Win32 Error: " << GetLastError() << endl;

5 years, 8 months

[reactos] 01/01: [FORMATTING] appveyor.yml: Remove an extra space (#1538)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=853f7d84a0cd512e517ef… commit 853f7d84a0cd512e517ef7fa7283a886c16654c7 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sun Apr 28 03:23:27 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 28 03:23:27 2019 +0200 [FORMATTING] appveyor.yml: Remove an extra space (#1538) Addendum to 48f98e88. --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index f4e1512326..9abbb299ff 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,7 +9,7 @@ version: reactos.appveyor.{build} skip_branch_with_pr: true clone_depth: 5 clone_folder: c:\reactos-cov -matrix: +matrix: fast_finish: true init:

5 years, 8 months

[reactos] 01/01: [WINSRV] Implement SrvGetThreadConsoleDesktop(). CORE-13470

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d70848b8b7d1a7e8dd8fd… commit d70848b8b7d1a7e8dd8fd7c6ae10b38d8a9c0f53 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 28 02:40:20 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 28 02:50:38 2019 +0200 [WINSRV] Implement SrvGetThreadConsoleDesktop(). CORE-13470 It retrieves the handle to the desktop assigned to the specified thread belonging to a console application, which is going to be where the input thread of this console is. --- sdk/include/reactos/subsys/win/winmsg.h | 2 +- win32ss/user/winsrv/consrv/api.h | 8 +++++ win32ss/user/winsrv/consrv/frontendctl.c | 36 ++++++++++++++++++++++ win32ss/user/winsrv/consrv/frontends/gui/guiterm.c | 8 +++++ win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c | 8 +++++ win32ss/user/winsrv/consrv/include/conio_winsrv.h | 1 + win32ss/user/winsrv/consrv/include/term.h | 2 ++ win32ss/user/winsrv/usersrv/init.c | 18 ++++++----- 8 files changed, 75 insertions(+), 8 deletions(-) diff --git a/sdk/include/reactos/subsys/win/winmsg.h b/sdk/include/reactos/subsys/win/winmsg.h index 6134538cad..e445331eba 100644 --- a/sdk/include/reactos/subsys/win/winmsg.h +++ b/sdk/include/reactos/subsys/win/winmsg.h @@ -68,7 +68,7 @@ typedef struct _USER_LOGON typedef struct _USER_GET_THREAD_CONSOLE_DESKTOP { ULONG_PTR ThreadId; - HANDLE ConsoleDesktop; + HDESK ConsoleDesktop; } USER_GET_THREAD_CONSOLE_DESKTOP, *PUSER_GET_THREAD_CONSOLE_DESKTOP; typedef struct _USER_REGISTER_SERVICES_PROCESS diff --git a/win32ss/user/winsrv/consrv/api.h b/win32ss/user/winsrv/consrv/api.h index c9e62d46c9..45aca668c2 100644 --- a/win32ss/user/winsrv/consrv/api.h +++ b/win32ss/user/winsrv/consrv/api.h @@ -78,6 +78,14 @@ CSR_API(SrvShowConsoleCursor); CSR_API(SrvSetConsoleCursor); CSR_API(SrvConsoleMenuControl); CSR_API(SrvSetConsoleMenuClose); + +/* Used by USERSRV!SrvGetThreadConsoleDesktop() */ +NTSTATUS +NTAPI +GetThreadConsoleDesktop( + IN ULONG_PTR ThreadId, + OUT HDESK* ConsoleDesktop); + CSR_API(SrvGetConsoleWindow); CSR_API(SrvSetConsoleIcon); CSR_API(SrvGetConsoleSelectionInfo); diff --git a/win32ss/user/winsrv/consrv/frontendctl.c b/win32ss/user/winsrv/consrv/frontendctl.c index 9ea1fe9961..18ef2edd51 100644 --- a/win32ss/user/winsrv/consrv/frontendctl.c +++ b/win32ss/user/winsrv/consrv/frontendctl.c @@ -275,6 +275,42 @@ CSR_API(SrvSetConsoleMenuClose) return (Success ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); } +/* Used by USERSRV!SrvGetThreadConsoleDesktop() */ +NTSTATUS +NTAPI +GetThreadConsoleDesktop( + IN ULONG_PTR ThreadId, + OUT HDESK* ConsoleDesktop) +{ + NTSTATUS Status; + PCSR_THREAD CsrThread; + PCONSRV_CONSOLE Console; + + /* No console desktop handle by default */ + *ConsoleDesktop = NULL; + + /* Retrieve and lock the thread */ + Status = CsrLockThreadByClientId(ULongToHandle(ThreadId), &CsrThread); + if (!NT_SUCCESS(Status)) + return Status; + + ASSERT(CsrThread->Process); + + /* Retrieve the console to which the process is attached, and unlock the thread */ + Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrThread->Process), + &Console, TRUE); + CsrUnlockThread(CsrThread); + + if (!NT_SUCCESS(Status)) + return Status; + + /* Retrieve the console desktop handle, and release the console */ + *ConsoleDesktop = TermGetThreadConsoleDesktop(Console); + ConSrvReleaseConsole(Console, TRUE); + + return STATUS_SUCCESS; +} + CSR_API(SrvGetConsoleWindow) { NTSTATUS Status; diff --git a/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c b/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c index 1468363517..2b2e9d4f27 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c +++ b/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c @@ -911,6 +911,13 @@ GuiChangeIcon(IN OUT PFRONTEND This, return TRUE; } +static HDESK NTAPI +GuiGetThreadConsoleDesktop(IN OUT PFRONTEND This) +{ + PGUI_CONSOLE_DATA GuiData = This->Context; + return GuiData->Desktop; +} + static HWND NTAPI GuiGetConsoleWindowHandle(IN OUT PFRONTEND This) { @@ -1148,6 +1155,7 @@ static FRONTEND_VTBL GuiVtbl = GuiRefreshInternalInfo, GuiChangeTitle, GuiChangeIcon, + GuiGetThreadConsoleDesktop, GuiGetConsoleWindowHandle, GuiGetLargestConsoleWindowSize, GuiGetSelectionInfo, diff --git a/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c b/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c index e1e96d6e55..e66203ad7b 100644 --- a/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c +++ b/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c @@ -831,6 +831,13 @@ TuiChangeIcon(IN OUT PFRONTEND This, return TRUE; } +static HDESK NTAPI +TuiGetThreadConsoleDesktop(IN OUT PFRONTEND This) +{ + // PTUI_CONSOLE_DATA TuiData = This->Context; + return NULL; +} + static HWND NTAPI TuiGetConsoleWindowHandle(IN OUT PFRONTEND This) { @@ -920,6 +927,7 @@ static FRONTEND_VTBL TuiVtbl = TuiRefreshInternalInfo, TuiChangeTitle, TuiChangeIcon, + TuiGetThreadConsoleDesktop, TuiGetConsoleWindowHandle, TuiGetLargestConsoleWindowSize, TuiGetSelectionInfo, diff --git a/win32ss/user/winsrv/consrv/include/conio_winsrv.h b/win32ss/user/winsrv/consrv/include/conio_winsrv.h index 9398065bc0..79e0c04277 100644 --- a/win32ss/user/winsrv/consrv/include/conio_winsrv.h +++ b/win32ss/user/winsrv/consrv/include/conio_winsrv.h @@ -89,6 +89,7 @@ typedef struct _FRONTEND_VTBL VOID (NTAPI *ChangeTitle)(IN OUT PFRONTEND This); BOOL (NTAPI *ChangeIcon)(IN OUT PFRONTEND This, HICON IconHandle); + HDESK (NTAPI *GetThreadConsoleDesktop)(IN OUT PFRONTEND This); HWND (NTAPI *GetConsoleWindowHandle)(IN OUT PFRONTEND This); VOID (NTAPI *GetLargestConsoleWindowSize)(IN OUT PFRONTEND This, PCOORD pSize); diff --git a/win32ss/user/winsrv/consrv/include/term.h b/win32ss/user/winsrv/consrv/include/term.h index a672499acf..2766ec8906 100644 --- a/win32ss/user/winsrv/consrv/include/term.h +++ b/win32ss/user/winsrv/consrv/include/term.h @@ -47,6 +47,8 @@ (Console)->FrontEndIFace.Vtbl->ChangeTitle(&(Console)->FrontEndIFace) #define TermChangeIcon(Console, IconHandle) \ (Console)->FrontEndIFace.Vtbl->ChangeIcon(&(Console)->FrontEndIFace, (IconHandle)) +#define TermGetThreadConsoleDesktop(Console) \ + (Console)->FrontEndIFace.Vtbl->GetThreadConsoleDesktop(&(Console)->FrontEndIFace) #define TermGetConsoleWindowHandle(Console) \ (Console)->FrontEndIFace.Vtbl->GetConsoleWindowHandle(&(Console)->FrontEndIFace) #define TermGetSelectionInfo(Console, pSelectionInfo) \ diff --git a/win32ss/user/winsrv/usersrv/init.c b/win32ss/user/winsrv/usersrv/init.c index 2e65099915..f3c5be8a4d 100644 --- a/win32ss/user/winsrv/usersrv/init.c +++ b/win32ss/user/winsrv/usersrv/init.c @@ -10,8 +10,8 @@ /* INCLUDES *******************************************************************/ #include "usersrv.h" - -#include "api.h" +#include "api.h" // USERSRV Public server APIs definitions +#include "../consrv/api.h" // CONSRV Public server APIs definitions #define NDEBUG #include <debug.h> @@ -138,14 +138,18 @@ CSR_API(SrvActivateDebugger) CSR_API(SrvGetThreadConsoleDesktop) { + NTSTATUS Status; PUSER_GET_THREAD_CONSOLE_DESKTOP GetThreadConsoleDesktopRequest = &((PUSER_API_MESSAGE)ApiMessage)->Data.GetThreadConsoleDesktopRequest; - UNIMPLEMENTED_ONCE; - - /* Return nothing for the moment... */ - GetThreadConsoleDesktopRequest->ConsoleDesktop = NULL; + Status = GetThreadConsoleDesktop(GetThreadConsoleDesktopRequest->ThreadId, + &GetThreadConsoleDesktopRequest->ConsoleDesktop); + if (!NT_SUCCESS(Status)) + { + DPRINT1("GetThreadConsoleDesktop(%lu) failed with Status 0x%08x\n", + GetThreadConsoleDesktopRequest->ThreadId, Status); + } - /* Always succeeds */ + /* Windows-compatibility: Always return success since User32 relies on this! */ return STATUS_SUCCESS; }

5 years, 8 months

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 April 2019