Ros-diffs May 2021

ros-diffs@reactos.org

21 participants
183 discussions

[reactos] 03/04: [PEFIXUP] Avoid multi-level nesting of code with the error handling done at the very end. Use size_t variables for file sizes. (#3598)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea26767353361622762a4… commit ea26767353361622762a46a14e1e82e2bfb45eb0 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Apr 10 20:21:43 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed May 5 19:15:01 2021 +0200 [PEFIXUP] Avoid multi-level nesting of code with the error handling done at the very end. Use size_t variables for file sizes. (#3598) --- sdk/tools/pefixup.c | 140 +++++++++++++++++++++++++--------------------------- 1 file changed, 67 insertions(+), 73 deletions(-) diff --git a/sdk/tools/pefixup.c b/sdk/tools/pefixup.c index bb4f9ddaffc..1bf9db9deeb 100644 --- a/sdk/tools/pefixup.c +++ b/sdk/tools/pefixup.c @@ -61,10 +61,10 @@ static void error(const char* message, ...) va_end(args); } -static void fix_checksum(unsigned char *buffer, long len, PIMAGE_NT_HEADERS nt_header) +static void fix_checksum(unsigned char *buffer, size_t len, PIMAGE_NT_HEADERS nt_header) { unsigned int checksum = 0; - long n; + size_t n; nt_header->OptionalHeader.CheckSum = 0; @@ -74,7 +74,7 @@ static void fix_checksum(unsigned char *buffer, long len, PIMAGE_NT_HEADERS nt_h checksum = (checksum + (checksum >> 16)) & 0xffff; } - checksum += len; + checksum += (unsigned int)len; nt_header->OptionalHeader.CheckSum = checksum; } @@ -82,58 +82,55 @@ static int add_loadconfig(unsigned char *buffer, PIMAGE_NT_HEADERS nt_header) { PIMAGE_DATA_DIRECTORY export_dir; PIMAGE_EXPORT_DIRECTORY export_directory; + PDWORD name_ptr, function_ptr; + PWORD ordinal_ptr; + DWORD n; export_dir = &nt_header->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT]; - if (export_dir->Size != 0) + if (export_dir->Size == 0) { - export_directory = rva_to_ptr(buffer, nt_header, export_dir->VirtualAddress); - if (export_directory != NULL) - { - DWORD *name_ptr, *function_ptr, n; - WORD *ordinal_ptr; - - name_ptr = rva_to_ptr(buffer, nt_header, export_directory->AddressOfNames); - ordinal_ptr = rva_to_ptr(buffer, nt_header, export_directory->AddressOfNameOrdinals); - function_ptr = rva_to_ptr(buffer, nt_header, export_directory->AddressOfFunctions); - - for (n = 0; n < export_directory->NumberOfNames; n++) - { - const char* name = rva_to_ptr(buffer, nt_header, name_ptr[n]); - if (!strcmp(name, "_load_config_used")) - { - PIMAGE_DATA_DIRECTORY load_config_dir; - DWORD load_config_rva = function_ptr[ordinal_ptr[n]]; - DWORD* load_config_ptr = rva_to_ptr(buffer, nt_header, load_config_rva); - - /* Update the DataDirectory pointer / size - The first entry of the LOAD_CONFIG struct is the size, use that as DataDirectory.Size */ - load_config_dir = &nt_header->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG]; - load_config_dir->VirtualAddress = load_config_rva; - load_config_dir->Size = *load_config_ptr; - - return 0; - } - } - - error("Export '_load_config_used' not found\n"); - } - else - { - error("Invalid rva for export directory\n"); - } + error("No export directory\n"); + return 1; } - else + + export_directory = rva_to_ptr(buffer, nt_header, export_dir->VirtualAddress); + if (export_directory == NULL) { - error("No export directory\n"); + error("Invalid rva for export directory\n"); + return 1; + } + + name_ptr = rva_to_ptr(buffer, nt_header, export_directory->AddressOfNames); + ordinal_ptr = rva_to_ptr(buffer, nt_header, export_directory->AddressOfNameOrdinals); + function_ptr = rva_to_ptr(buffer, nt_header, export_directory->AddressOfFunctions); + + for (n = 0; n < export_directory->NumberOfNames; n++) + { + const char* name = rva_to_ptr(buffer, nt_header, name_ptr[n]); + if (!strcmp(name, "_load_config_used")) + { + PIMAGE_DATA_DIRECTORY load_config_dir; + DWORD load_config_rva = function_ptr[ordinal_ptr[n]]; + PDWORD load_config_ptr = rva_to_ptr(buffer, nt_header, load_config_rva); + + /* Update the DataDirectory pointer / size + The first entry of the LOAD_CONFIG struct is the size, use that as DataDirectory.Size */ + load_config_dir = &nt_header->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG]; + load_config_dir->VirtualAddress = load_config_rva; + load_config_dir->Size = *load_config_ptr; + + return 0; + } } + error("Export '_load_config_used' not found\n"); return 1; } static int driver_fixup(int mode, unsigned char *buffer, PIMAGE_NT_HEADERS nt_header) { /* GNU LD just doesn't know what a driver is, and has notably no idea of paged vs non-paged sections */ - for (unsigned i = 0; i < nt_header->FileHeader.NumberOfSections; i++) + for (unsigned int i = 0; i < nt_header->FileHeader.NumberOfSections; i++) { PIMAGE_SECTION_HEADER Section = IMAGE_FIRST_SECTION(nt_header) + i; @@ -192,12 +189,13 @@ print_usage(void) int main(int argc, char **argv) { + int result = 1; + enum fixup_mode mode; FILE* file; - long len; + size_t len; unsigned char *buffer; PIMAGE_DOS_HEADER dos_header; - int result = 1; - enum fixup_mode mode; + PIMAGE_NT_HEADERS nt_header; g_ApplicationName = argv[0]; @@ -258,7 +256,7 @@ int main(int argc, char **argv) if (buffer == NULL) { fclose(file); - error("Not enough memory available: (Needed %u bytes).\n", len + 1); + error("Not enough memory available: (Needed %lu bytes).\n", len + 1); return 1; } @@ -268,40 +266,36 @@ int main(int argc, char **argv) /* Check the headers and save pointers to them. */ dos_header = (PIMAGE_DOS_HEADER)buffer; - if (dos_header->e_magic == IMAGE_DOS_SIGNATURE) + if (dos_header->e_magic != IMAGE_DOS_SIGNATURE) { - PIMAGE_NT_HEADERS nt_header; - - nt_header = (PIMAGE_NT_HEADERS)(buffer + dos_header->e_lfanew); + error("Invalid DOS signature: %x\n", dos_header->e_magic); + goto Quit; + } - if (nt_header->Signature == IMAGE_NT_SIGNATURE) - { - if (mode == MODE_LOADCONFIG) - result = add_loadconfig(buffer, nt_header); - else - result = driver_fixup(mode, buffer, nt_header); - - if (!result) - { - /* Success. Recalculate the checksum only if this is not a reproducible build file */ - if (nt_header->OptionalHeader.CheckSum != 0) - fix_checksum(buffer, len, nt_header); - - /* We could optimize by only writing the changed parts, but keep it simple for now */ - fseek(file, 0, SEEK_SET); - fwrite(buffer, 1, len, file); - } - } - else - { - error("Invalid PE signature: %x\n", nt_header->Signature); - } + nt_header = (PIMAGE_NT_HEADERS)(buffer + dos_header->e_lfanew); + if (nt_header->Signature != IMAGE_NT_SIGNATURE) + { + error("Invalid PE signature: %x\n", nt_header->Signature); + goto Quit; } + + if (mode == MODE_LOADCONFIG) + result = add_loadconfig(buffer, nt_header); else + result = driver_fixup(mode, buffer, nt_header); + + if (!result) { - error("Invalid DOS signature: %x\n", dos_header->e_magic); + /* Success. Recalculate the checksum only if this is not a reproducible build file */ + if (nt_header->OptionalHeader.CheckSum != 0) + fix_checksum(buffer, len, nt_header); + + /* We could optimize by only writing the changed parts, but keep it simple for now */ + fseek(file, 0, SEEK_SET); + fwrite(buffer, 1, len, file); } +Quit: free(buffer); fclose(file);

3 years, 4 months

[reactos] 02/04: [PEFIXUP] Only recalculate the PE checksum if the image is not from a reproducible build (original checksum == 0). (#3598)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=88b933330d110ad142fe8… commit 88b933330d110ad142fe8de2241dd4cc278fad15 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Apr 10 20:06:56 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed May 5 19:15:01 2021 +0200 [PEFIXUP] Only recalculate the PE checksum if the image is not from a reproducible build (original checksum == 0). (#3598) --- sdk/tools/pefixup.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sdk/tools/pefixup.c b/sdk/tools/pefixup.c index 22d3d0c00fa..bb4f9ddaffc 100644 --- a/sdk/tools/pefixup.c +++ b/sdk/tools/pefixup.c @@ -283,10 +283,11 @@ int main(int argc, char **argv) if (!result) { - /* Success. Fix checksum and write to file */ - fix_checksum(buffer, len, nt_header); + /* Success. Recalculate the checksum only if this is not a reproducible build file */ + if (nt_header->OptionalHeader.CheckSum != 0) + fix_checksum(buffer, len, nt_header); - /* We could 'optimize by only writing the changed parts, but keep it simple for now */ + /* We could optimize by only writing the changed parts, but keep it simple for now */ fseek(file, 0, SEEK_SET); fwrite(buffer, 1, len, file); }

3 years, 4 months

[reactos] 01/04: [PEFIXUP] Use vfprintf() with the va_args list. (#3598)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7ad33940c2932bd5eb775… commit 7ad33940c2932bd5eb775f72330718960e8f7db3 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Apr 10 20:05:18 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed May 5 19:14:57 2021 +0200 [PEFIXUP] Use vfprintf() with the va_args list. (#3598) --- sdk/tools/pefixup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/tools/pefixup.c b/sdk/tools/pefixup.c index 3ea638653a0..22d3d0c00fa 100644 --- a/sdk/tools/pefixup.c +++ b/sdk/tools/pefixup.c @@ -57,7 +57,7 @@ static void error(const char* message, ...) fprintf(stderr, "%s ERROR: '%s': ", g_ApplicationName, g_Target); va_start(args, message); - fprintf(stderr, message, args); + vfprintf(stderr, message, args); va_end(args); }

3 years, 4 months

[reactos] 09/09: [CSRSRV] Fix uninitialized variable warning detected by Clang. (#3619) CORE-17545

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=abd4c818dc26802a01a04… commit abd4c818dc26802a01a044d054702741b21f2965 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Apr 21 19:48:58 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed May 5 17:24:14 2021 +0200 [CSRSRV] Fix uninitialized variable warning detected by Clang. (#3619) CORE-17545 subsystems/win32/csrsrv/api.c:63:9: warning: variable 'ServerDll' is used uninitialized whenever '||' condition is true [-Wsometimes-uninitialized] if ((ServerId >= CSR_SERVER_DLL_MAX) || ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ subsystems/win32/csrsrv/api.c:67:76: note: uninitialized use occurs here DPRINT1("CSRSS: %lx is invalid ServerDllIndex (%08x)\n", ServerId, ServerDll); ^~~~~~~~~ --- subsystems/win32/csrsrv/api.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subsystems/win32/csrsrv/api.c b/subsystems/win32/csrsrv/api.c index 39229a1b384..07b8db3749c 100644 --- a/subsystems/win32/csrsrv/api.c +++ b/subsystems/win32/csrsrv/api.c @@ -52,7 +52,7 @@ CsrCallServerFromServer(IN PCSR_API_MESSAGE ReceiveMsg, IN OUT PCSR_API_MESSAGE ReplyMsg) { ULONG ServerId; - PCSR_SERVER_DLL ServerDll; + PCSR_SERVER_DLL ServerDll = NULL; ULONG ApiId; CSR_REPLY_CODE ReplyCode = CsrReplyImmediately;

3 years, 4 months

[reactos] 08/09: [CSRSRV] Display some other DPRINTs only when CSRSRV is compiled in debugging mode. Addendum to 835f3ef1.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c5b87ac6ac9abcf19b997… commit c5b87ac6ac9abcf19b99748d5f52584f92c3f593 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Apr 21 19:47:36 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed May 5 17:24:13 2021 +0200 [CSRSRV] Display some other DPRINTs only when CSRSRV is compiled in debugging mode. Addendum to 835f3ef1. --- subsystems/win32/csrsrv/api.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/subsystems/win32/csrsrv/api.c b/subsystems/win32/csrsrv/api.c index 6ff8694537a..39229a1b384 100644 --- a/subsystems/win32/csrsrv/api.c +++ b/subsystems/win32/csrsrv/api.c @@ -64,7 +64,11 @@ CsrCallServerFromServer(IN PCSR_API_MESSAGE ReceiveMsg, (!(ServerDll = CsrLoadedServerDll[ServerId]))) { /* We are beyond the Maximum Server ID */ - DPRINT1("CSRSS: %lx is invalid ServerDllIndex (%08x)\n", ServerId, ServerDll); +#ifdef CSR_DBG + DPRINT1("CSRSS: %lx is invalid ServerDllIndex (%08x)\n", + ServerId, ServerDll); + if (NtCurrentPeb()->BeingDebugged) DbgBreakPoint(); +#endif ReplyMsg->Status = STATUS_ILLEGAL_FUNCTION; return STATUS_ILLEGAL_FUNCTION; } @@ -547,7 +551,6 @@ CsrApiRequestThread(IN PVOID Parameter) ServerId, ServerDll); if (NtCurrentPeb()->BeingDebugged) DbgBreakPoint(); #endif - ReplyMsg = NULL; ReplyPort = CsrApiPort; continue; @@ -560,10 +563,11 @@ CsrApiRequestThread(IN PVOID Parameter) if (ApiId >= ServerDll->HighestApiSupported) { /* We are beyond the Maximum API ID, or it doesn't exist */ +#ifdef CSR_DBG DPRINT1("CSRSS: %lx is invalid ApiTableIndex for %Z\n", CSR_API_NUMBER_TO_API_ID(ReceiveMsg.ApiNumber), &ServerDll->Name); - +#endif ReplyPort = CsrApiPort; ReplyMsg = NULL; continue; @@ -751,7 +755,6 @@ CsrApiRequestThread(IN PVOID Parameter) ServerId, ServerDll); if (NtCurrentPeb()->BeingDebugged) DbgBreakPoint(); #endif - ReplyPort = CsrApiPort; ReplyMsg = &ReceiveMsg; ReplyMsg->Status = STATUS_ILLEGAL_FUNCTION; @@ -765,11 +768,12 @@ CsrApiRequestThread(IN PVOID Parameter) /* Make sure that the ID is within limits, and the entry exists */ if (ApiId >= ServerDll->HighestApiSupported) { +#ifdef CSR_DBG /* We are beyond the Maximum API ID, or it doesn't exist */ DPRINT1("CSRSS: %lx is invalid ApiTableIndex for %Z\n", CSR_API_NUMBER_TO_API_ID(ReceiveMsg.ApiNumber), &ServerDll->Name); - +#endif ReplyPort = CsrApiPort; ReplyMsg = &ReceiveMsg; ReplyMsg->Status = STATUS_ILLEGAL_FUNCTION;

3 years, 4 months

[reactos] 07/09: [CONSRV] wcwidth.c: Fix out-of-range comparisons Clang warnings for wchar_t's, that are only 2 bytes long on NT. (#3619) CORE-17545

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f9aca9f7d22519cc4eb81… commit f9aca9f7d22519cc4eb81f66748b3691c4f40bf9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Apr 21 19:12:43 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed May 5 17:24:13 2021 +0200 [CONSRV] wcwidth.c: Fix out-of-range comparisons Clang warnings for wchar_t's, that are only 2 bytes long on NT. (#3619) CORE-17545 win32ss/user/winsrv/consrv/frontends/wcwidth.c:203:30: warning: result of comparison of constant 262141 with expression of type 'wchar_t' (aka 'unsigned short') is always true [-Wtautological-constant-out-of-range-compare] (ucs >= 0x30000 && ucs <= 0x3fffd))); ~~~ ^ ~~~~~~~ win32ss/user/winsrv/consrv/frontends/wcwidth.c:203:12: warning: result of comparison of constant 196608 with expression of type 'wchar_t' (aka 'unsigned short') is always false [-Wtautological-constant-out-of-range-compare] (ucs >= 0x30000 && ucs <= 0x3fffd))); ~~~ ^ ~~~~~~~ win32ss/user/winsrv/consrv/frontends/wcwidth.c:202:30: warning: result of comparison of constant 196605 with expression of type 'wchar_t' (aka 'unsigned short') is always true [-Wtautological-constant-out-of-range-compare] (ucs >= 0x20000 && ucs <= 0x2fffd) || ~~~ ^ ~~~~~~~ win32ss/user/winsrv/consrv/frontends/wcwidth.c:202:12: warning: result of comparison of constant 131072 with expression of type 'wchar_t' (aka 'unsigned short') is always false [-Wtautological-constant-out-of-range-compare] (ucs >= 0x20000 && ucs <= 0x2fffd) || ~~~ ^ ~~~~~~~ --- win32ss/user/winsrv/consrv/frontends/wcwidth.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/win32ss/user/winsrv/consrv/frontends/wcwidth.c b/win32ss/user/winsrv/consrv/frontends/wcwidth.c index 61e822ad679..6a39b02a2a6 100644 --- a/win32ss/user/winsrv/consrv/frontends/wcwidth.c +++ b/win32ss/user/winsrv/consrv/frontends/wcwidth.c @@ -198,9 +198,13 @@ int mk_wcwidth(wchar_t ucs) (ucs >= 0xfe10 && ucs <= 0xfe19) || /* Vertical forms */ (ucs >= 0xfe30 && ucs <= 0xfe6f) || /* CJK Compatibility Forms */ (ucs >= 0xff00 && ucs <= 0xff60) || /* Fullwidth Forms */ - (ucs >= 0xffe0 && ucs <= 0xffe6) || + (ucs >= 0xffe0 && ucs <= 0xffe6) +#if !defined(__REACTOS__) || (defined(WCHAR_MAX) && (WCHAR_MAX >= 0x10000)) + || (ucs >= 0x20000 && ucs <= 0x2fffd) || - (ucs >= 0x30000 && ucs <= 0x3fffd))); + (ucs >= 0x30000 && ucs <= 0x3fffd) +#endif + )); }

3 years, 4 months

[reactos] 06/09: [PSDK] Remove a buggy GNU-specific "PACKED" attribute in KEY_EVENT_RECORD structure declaration. (#3619) CORE-17545

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=db089c517edb75d560760… commit db089c517edb75d560760ec1ff8dac35cd0a2137 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Apr 21 19:03:00 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed May 5 17:24:12 2021 +0200 [PSDK] Remove a buggy GNU-specific "PACKED" attribute in KEY_EVENT_RECORD structure declaration. (#3619) CORE-17545 No other public header out there (in MS PSDK, MinGW, Wine, etc...) does have this hack (that was introduced back in the days in r15141 / commit 01df92bc). Add static assert on KEY_EVENT_RECORD's uChar member to ensure it's properly aligned. May fix Clang warning: win32ss/user/winsrv/consrv/lineinput.c:457:62: warning: taking address of packed member 'uChar' of class or structure '_KEY_EVENT_RECORD' may result in an unaligned pointer value [-Waddress-of-packed-member] LineInputEdit(Console, (Overstrike ? 1 : 0), 1, &KeyEvent->uChar.UnicodeChar); ^~~~~~~~~~~~~~~~~~~~~~~~~~~ and whatnot... --- sdk/include/psdk/wincon.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sdk/include/psdk/wincon.h b/sdk/include/psdk/wincon.h index 6145b93cf1c..bb6e1ed8dc5 100644 --- a/sdk/include/psdk/wincon.h +++ b/sdk/include/psdk/wincon.h @@ -246,12 +246,9 @@ typedef struct _KEY_EVENT_RECORD { CHAR AsciiChar; } uChar; DWORD dwControlKeyState; -} -#ifdef __GNUC__ -/* gcc's alignment is not what win32 expects */ -PACKED -#endif -KEY_EVENT_RECORD, *PKEY_EVENT_RECORD; +} KEY_EVENT_RECORD, *PKEY_EVENT_RECORD; + +C_ASSERT(FIELD_OFFSET(KEY_EVENT_RECORD, uChar) == 0xA); typedef struct _MOUSE_EVENT_RECORD { COORD dwMousePosition;

3 years, 4 months

[reactos] 05/09: [CONSRV] Fix uninitialized variables warnings detected by Clang. (#3619) CORE-17545

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9a93d2fe3aa11afa871a2… commit 9a93d2fe3aa11afa871a2745019e9618da73c665 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Apr 21 18:45:35 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed May 5 17:24:12 2021 +0200 [CONSRV] Fix uninitialized variables warnings detected by Clang. (#3619) CORE-17545 Fix 3 warnings: win32ss/user/winsrv/consrv/alias.c:648:16: warning: variable 'Status' is used uninitialized whenever 'while' loop exits because its condition is false [-Wsometimes-uninitialized] while (CurEntry) ^~~~~~~~ win32ss/user/winsrv/consrv/alias.c:693:12: note: uninitialized use occurs here return Status; ^~~~~~ win32ss/user/winsrv/consrv/alias.c:715:9: warning: variable 'Status' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized] if (Header) ^~~~~~ win32ss/user/winsrv/consrv/alias.c:727:12: note: uninitialized use occurs here return Status; ^~~~~~ win32ss/user/winsrv/consrv/alias.c:771:16: warning: variable 'Status' is used uninitialized whenever 'while' loop exits because its condition is false [-Wsometimes-uninitialized] while (RootHeader) ^~~~~~~~~~ win32ss/user/winsrv/consrv/alias.c:807:12: note: uninitialized use occurs here return Status; --- win32ss/user/winsrv/consrv/alias.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/win32ss/user/winsrv/consrv/alias.c b/win32ss/user/winsrv/consrv/alias.c index 87134679181..ebe976481b0 100644 --- a/win32ss/user/winsrv/consrv/alias.c +++ b/win32ss/user/winsrv/consrv/alias.c @@ -594,7 +594,7 @@ CON_API(SrvGetConsoleAlias, CON_API(SrvGetConsoleAliases, CONSOLE_GETALLALIASES, GetAllAliasesRequest) { - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; ULONG BytesWritten = 0; PALIAS_HEADER Header; @@ -697,7 +697,7 @@ Quit: CON_API(SrvGetConsoleAliasesLength, CONSOLE_GETALLALIASESLENGTH, GetAllAliasesLengthRequest) { - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; PALIAS_HEADER Header; if (!CsrValidateMessageBuffer(ApiMessage, @@ -731,7 +731,7 @@ CON_API(SrvGetConsoleAliasesLength, CON_API(SrvGetConsoleAliasExes, CONSOLE_GETALIASESEXES, GetAliasesExesRequest) { - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; UINT BytesWritten = 0; if (!CsrValidateMessageBuffer(ApiMessage,

3 years, 4 months

[reactos] 04/09: [SYSDM] Fix uninitialized variables warnings detected by Clang. (#3619) CORE-17545

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab8d7f254802f20aab4e1… commit ab8d7f254802f20aab4e1f85e5370b032e109e06 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Apr 21 18:29:11 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed May 5 17:24:11 2021 +0200 [SYSDM] Fix uninitialized variables warnings detected by Clang. (#3619) CORE-17545 Addendum to commit d635ce0c. dll/cpl/sysdm/general.c:156:25: warning: variable 'hCreditsDC' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized] if (hDC == NULL) ^~~~~~~~~~~ dll/cpl/sysdm/general.c:216:25: note: uninitialized use occurs here if (hCreditsDC != NULL) DeleteDC(hCreditsDC); ^~~~~~~~~~ and the same for hLogoDC: dll/cpl/sysdm/general.c:215:25: note: uninitialized use occurs here if (hLogoDC != NULL) DeleteDC(hLogoDC); ^~~~~~~ --- dll/cpl/sysdm/general.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dll/cpl/sysdm/general.c b/dll/cpl/sysdm/general.c index 746c8235b16..c23010e6e3f 100644 --- a/dll/cpl/sysdm/general.c +++ b/dll/cpl/sysdm/general.c @@ -148,19 +148,21 @@ LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam { if (timerid == 0) { - HDC hCreditsDC, hLogoDC; - HDC hDC = GetDC(NULL); + HDC hDC; + HDC hCreditsDC = NULL, hLogoDC = NULL; HFONT hFont = NULL; NONCLIENTMETRICS ncm; RECT rcCredits; TCHAR szCredits[2048]; INT iDevsHeight; + hDC = GetDC(NULL); if (hDC == NULL) goto Cleanup; top = 0; offset = 0; + hCreditsDC = CreateCompatibleDC(hDC); hLogoDC = CreateCompatibleDC(hCreditsDC); @@ -183,7 +185,6 @@ LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam iDevsHeight = rcCredits.bottom - rcCredits.top; hCreditsBitmap = CreateBitmap(pImgInfo->cxSource, (2 * pImgInfo->cySource) + iDevsHeight + 1, pImgInfo->iPlanes, pImgInfo->iBits, NULL); - if (!hCreditsBitmap) goto Cleanup;

3 years, 4 months

[reactos] 03/09: [SYSDM][USERINIT] Fix uninitialized variables warnings detected by Clang. (#3619) CORE-17545

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cba0d6464534227726af9… commit cba0d6464534227726af9a310c03772923930aa0 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Apr 21 18:18:41 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed May 5 17:24:10 2021 +0200 [SYSDM][USERINIT] Fix uninitialized variables warnings detected by Clang. (#3619) CORE-17545 Addendum to commit d635ce0c. - Move the HDC variables initialization via function calls, out of the variables declaration block. - Fix warnings (and identical for base/system/userinit/livecd.c): dll/cpl/sysdm/general.c:72:9: warning: variable 'hLogo' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized] if (hDC == NULL || hDCLogo == NULL || hDCMask == NULL) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ dll/cpl/sysdm/general.c:130:9: note: uninitialized use occurs here if (hLogo != NULL) DeleteObject(hLogo); ^~~~~ and similar for hMask too: dll/cpl/sysdm/general.c:129:9: note: uninitialized use occurs here if (hMask != NULL) DeleteObject(hMask); ^~~~~ --- base/system/userinit/livecd.c | 11 +++++++---- dll/cpl/sysdm/general.c | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/base/system/userinit/livecd.c b/base/system/userinit/livecd.c index 40626609402..216579f427b 100644 --- a/base/system/userinit/livecd.c +++ b/base/system/userinit/livecd.c @@ -27,13 +27,16 @@ InitLogo(PIMGINFO pImgInfo, HWND hwndDlg) BITMAP logoBitmap; BITMAP maskBitmap; BITMAPINFO bmpi; - HDC hDC = GetDC(hwndDlg); - HDC hDCLogo = CreateCompatibleDC(NULL); - HDC hDCMask = CreateCompatibleDC(NULL); - HBITMAP hMask, hLogo, hAlphaLogo = NULL; + HDC hDC, hDCLogo, hDCMask; + HBITMAP hMask = NULL, hLogo = NULL; + HBITMAP hAlphaLogo = NULL; COLORREF *pBits; INT line, column; + hDC = GetDC(hwndDlg); + hDCLogo = CreateCompatibleDC(NULL); + hDCMask = CreateCompatibleDC(NULL); + if (hDC == NULL || hDCLogo == NULL || hDCMask == NULL) goto Cleanup; diff --git a/dll/cpl/sysdm/general.c b/dll/cpl/sysdm/general.c index d43a75cf4e7..746c8235b16 100644 --- a/dll/cpl/sysdm/general.c +++ b/dll/cpl/sysdm/general.c @@ -62,13 +62,16 @@ static VOID InitLogo(HWND hwndDlg) BITMAP logoBitmap; BITMAP maskBitmap; BITMAPINFO bmpi; - HDC hDC = GetDC(hwndDlg); - HDC hDCLogo = CreateCompatibleDC(NULL); - HDC hDCMask = CreateCompatibleDC(NULL); - HBITMAP hMask, hLogo, hAlphaLogo = NULL; + HDC hDC, hDCLogo, hDCMask; + HBITMAP hMask = NULL, hLogo = NULL; + HBITMAP hAlphaLogo = NULL; COLORREF *pBits; INT line, column; + hDC = GetDC(hwndDlg); + hDCLogo = CreateCompatibleDC(NULL); + hDCMask = CreateCompatibleDC(NULL); + if (hDC == NULL || hDCLogo == NULL || hDCMask == NULL) goto Cleanup;

3 years, 4 months

← Newer
1
...
10
11
12
13
14
15
16
...
19
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 May 2021