Ros-diffs May 2020

ros-diffs@reactos.org

28 participants
193 discussions

[reactos] 01/01: [WIN32K:NTUSER] NC_IconForWindow(): Remove redundant if() (#2842)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=938df97b54aa0d61d6c21… commit 938df97b54aa0d61d6c2134b5e50d0a2873c0bd6 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Tue May 26 20:25:39 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue May 26 20:25:39 2020 +0200 [WIN32K:NTUSER] NC_IconForWindow(): Remove redundant if() (#2842) No impact. Detected by Cppcheck: identicalInnerCondition. Addendum to 98060c28c8b051bc4cfd460bd008a2eff125658e (r60622). --- win32ss/user/ntuser/nonclient.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/nonclient.c b/win32ss/user/ntuser/nonclient.c index 0c7dac84c48..59bd57e2f3d 100644 --- a/win32ss/user/ntuser/nonclient.c +++ b/win32ss/user/ntuser/nonclient.c @@ -696,7 +696,7 @@ PCURICON_OBJECT FASTCALL NC_IconForWindow( PWND pWnd ) // it does not use the default icon! And it does not check for DS_MODALFRAME. if (!hIcon && !(pWnd->ExStyle & WS_EX_DLGMODALFRAME)) { - if (!hIcon) hIcon = gpsi->hIconSmWindows; // Both are IDI_WINLOGO Small + hIcon = gpsi->hIconSmWindows; // Both are IDI_WINLOGO Small if (!hIcon) hIcon = gpsi->hIconWindows; // Reg size. } if (hIcon)

4 years, 7 months

[reactos] 01/01: [WINSPOOL] GetPrinterDriverA(): Refactor failure handling (#2832)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4b1ae54046b6727652e8d… commit 4b1ae54046b6727652e8d2d98c297a6731711cc4 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Tue May 26 20:21:25 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue May 26 20:21:25 2020 +0200 [WINSPOOL] GetPrinterDriverA(): Refactor failure handling (#2832) * [WINSPOOL] GetPrinterDriverA(): Refactor failure handling Addendum to d90beaeed26863985486874aaa2a1c3422fd6d9f. --- win32ss/printing/base/winspool/precomp.h | 2 +- win32ss/printing/base/winspool/printers.c | 351 ++++++++++++++++++++---------- win32ss/printing/base/winspool/utils.c | 29 ++- 3 files changed, 253 insertions(+), 129 deletions(-) diff --git a/win32ss/printing/base/winspool/precomp.h b/win32ss/printing/base/winspool/precomp.h index 58eed626d02..e5a857b34e0 100644 --- a/win32ss/printing/base/winspool/precomp.h +++ b/win32ss/printing/base/winspool/precomp.h @@ -42,7 +42,7 @@ SPOOLER_HANDLE, *PSPOOLER_HANDLE; extern HANDLE hProcessHeap; // utils.c -extern BOOL UnicodeToAnsiInPlace(PWSTR pwszField); +DWORD UnicodeToAnsiInPlace(PWSTR pwszField); // devmode.c extern void RosConvertAnsiDevModeToUnicodeDevmode(PDEVMODEA pDevModeInput, PDEVMODEW pDevModeOutput); diff --git a/win32ss/printing/base/winspool/printers.c b/win32ss/printing/base/winspool/printers.c index 1576ca0edd4..249d41256bd 100644 --- a/win32ss/printing/base/winspool/printers.c +++ b/win32ss/printing/base/winspool/printers.c @@ -472,7 +472,6 @@ BOOL WINAPI EnumPrintersA(DWORD Flags, PSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) { DWORD dwErrorCode; - BOOL bResult; DWORD cch; PWSTR pwszName = NULL; PSTR pszPrinterName = NULL; @@ -525,8 +524,7 @@ EnumPrintersA(DWORD Flags, PSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cbB } /* Ref: https://stackoverflow.com/questions/41147180/why-enumprintersa-and-enumprin… */ - bResult = EnumPrintersW(Flags, pwszName, Level, pPrinterEnum, cbBuf, pcbNeeded, pcReturned); - if (!bResult) + if (!EnumPrintersW(Flags, pwszName, Level, pPrinterEnum, cbBuf, pcbNeeded, pcReturned)) { dwErrorCode = GetLastError(); goto Cleanup; @@ -1118,7 +1116,6 @@ BOOL WINAPI GetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD pcbNeeded) { DWORD dwErrorCode; - BOOL bResult; PPRINTER_INFO_1A ppi1a = (PPRINTER_INFO_1A)pPrinter; PPRINTER_INFO_1W ppi1w = (PPRINTER_INFO_1W)pPrinter; PPRINTER_INFO_2A ppi2a = (PPRINTER_INFO_2A)pPrinter; @@ -1141,8 +1138,7 @@ GetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD goto Cleanup; } - bResult = GetPrinterW(hPrinter, Level, pPrinter, cbBuf, pcbNeeded); - if (!bResult) + if (!GetPrinterW(hPrinter, Level, pPrinter, cbBuf, pcbNeeded)) { dwErrorCode = GetLastError(); goto Cleanup; @@ -1580,6 +1576,7 @@ Cleanup: BOOL WINAPI GetPrinterDriverA(HANDLE hPrinter, LPSTR pEnvironment, DWORD Level, LPBYTE pDriverInfo, DWORD cbBuf, LPDWORD pcbNeeded) { + DWORD dwErrorCode; /* * We are mapping multiple different pointers to the same pDriverInfo pointer here so that * we can use the same incoming pointer for different Levels @@ -1591,7 +1588,6 @@ GetPrinterDriverA(HANDLE hPrinter, LPSTR pEnvironment, DWORD Level, LPBYTE pDriv PDRIVER_INFO_5W pdi5w = (PDRIVER_INFO_5W)pDriverInfo; PDRIVER_INFO_6W pdi6w = (PDRIVER_INFO_6W)pDriverInfo; - BOOL bReturnValue = FALSE; DWORD cch; PWSTR pwszEnvironment = NULL; @@ -1600,9 +1596,9 @@ GetPrinterDriverA(HANDLE hPrinter, LPSTR pEnvironment, DWORD Level, LPBYTE pDriv // Check for invalid levels here for early error return. Should be 1-6. if (Level < 1 || Level > 6) { - SetLastError(ERROR_INVALID_LEVEL); + dwErrorCode = ERROR_INVALID_LEVEL; ERR("Invalid Level!\n"); - goto Exit; + goto Cleanup; } if (pEnvironment) @@ -1613,26 +1609,18 @@ GetPrinterDriverA(HANDLE hPrinter, LPSTR pEnvironment, DWORD Level, LPBYTE pDriv pwszEnvironment = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(WCHAR)); if (!pwszEnvironment) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("HeapAlloc failed!\n"); - goto Exit; + goto Cleanup; } MultiByteToWideChar(CP_ACP, 0, pEnvironment, -1, pwszEnvironment, cch + 1); } - bReturnValue = GetPrinterDriverW(hPrinter, pwszEnvironment, Level, pDriverInfo, cbBuf, pcbNeeded); - TRACE("*pcbNeeded is '%d' and bReturnValue is '%d' and GetLastError is '%ld'.\n", *pcbNeeded, bReturnValue, GetLastError()); - - if (pwszEnvironment) - { - HeapFree(hProcessHeap, 0, pwszEnvironment); - } - - if (!bReturnValue) + if (!GetPrinterDriverW(hPrinter, pwszEnvironment, Level, pDriverInfo, cbBuf, pcbNeeded)) { - TRACE("GetPrinterDriverW failed!\n"); - goto Exit; + dwErrorCode = GetLastError(); + goto Cleanup; } // Do Unicode to ANSI conversions for strings based on Level @@ -1640,170 +1628,307 @@ GetPrinterDriverA(HANDLE hPrinter, LPSTR pEnvironment, DWORD Level, LPBYTE pDriv { case 1: { - if (!UnicodeToAnsiInPlace(pdi1w->pName)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi1w->pName); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } break; } case 2: { - if (!UnicodeToAnsiInPlace(pdi2w->pName)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi2w->pName); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi2w->pEnvironment)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi2w->pEnvironment); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi2w->pDriverPath)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi2w->pDriverPath); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi2w->pDataFile)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi2w->pDataFile); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi2w->pConfigFile)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi2w->pConfigFile); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } break; } case 3: { - if (!UnicodeToAnsiInPlace(pdi3w->pName)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi3w->pName); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi3w->pEnvironment)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi3w->pEnvironment); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi3w->pDriverPath)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi3w->pDriverPath); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi3w->pDataFile)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi3w->pDataFile); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi3w->pConfigFile)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi3w->pConfigFile); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi3w->pHelpFile)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi3w->pHelpFile); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi3w->pDependentFiles)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi3w->pDependentFiles); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi3w->pMonitorName)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi3w->pMonitorName); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi3w->pDefaultDataType)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi3w->pDefaultDataType); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } break; } case 4: { - if (!UnicodeToAnsiInPlace(pdi4w->pName)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi4w->pName); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi4w->pEnvironment)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi4w->pEnvironment); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi4w->pDriverPath)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi4w->pDriverPath); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi4w->pDataFile)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi4w->pDataFile); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi4w->pConfigFile)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi4w->pConfigFile); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi4w->pHelpFile)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi4w->pHelpFile); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi4w->pDependentFiles)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi4w->pDependentFiles); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi4w->pMonitorName)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi4w->pMonitorName); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi4w->pDefaultDataType)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi4w->pDefaultDataType); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi4w->pszzPreviousNames)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi4w->pszzPreviousNames); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } break; } case 5: { - if (!UnicodeToAnsiInPlace(pdi5w->pName)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi5w->pName); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi5w->pEnvironment)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi5w->pEnvironment); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi5w->pDriverPath)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi5w->pDriverPath); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi5w->pDataFile)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi5w->pDataFile); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi5w->pConfigFile)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi5w->pConfigFile); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } break; } case 6: { - if (!UnicodeToAnsiInPlace(pdi6w->pName)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi6w->pName); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi6w->pEnvironment)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi6w->pEnvironment); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi6w->pDriverPath)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi6w->pDriverPath); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi6w->pDataFile)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi6w->pDataFile); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi6w->pConfigFile)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi6w->pConfigFile); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi6w->pHelpFile)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi6w->pHelpFile); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi6w->pDependentFiles)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi6w->pDependentFiles); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi6w->pMonitorName)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi6w->pMonitorName); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi6w->pDefaultDataType)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi6w->pDefaultDataType); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi6w->pszzPreviousNames)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi6w->pszzPreviousNames); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi6w->pszMfgName)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi6w->pszMfgName); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi6w->pszOEMUrl)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi6w->pszOEMUrl); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi6w->pszHardwareID)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi6w->pszHardwareID); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } - if (!UnicodeToAnsiInPlace(pdi6w->pszProvider)) - goto Exit; + dwErrorCode = UnicodeToAnsiInPlace(pdi6w->pszProvider); + if (dwErrorCode != ERROR_SUCCESS) + { + goto Cleanup; + } } } - bReturnValue = TRUE; + dwErrorCode = ERROR_SUCCESS; -Exit: +Cleanup: + if (pwszEnvironment) + { + HeapFree(hProcessHeap, 0, pwszEnvironment); + } - return bReturnValue; + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); } BOOL WINAPI diff --git a/win32ss/printing/base/winspool/utils.c b/win32ss/printing/base/winspool/utils.c index ae190ed5108..f16cd95d014 100644 --- a/win32ss/printing/base/winspool/utils.c +++ b/win32ss/printing/base/winspool/utils.c @@ -7,16 +7,16 @@ #include "precomp.h" -BOOL UnicodeToAnsiInPlace(PWSTR pwszField) +/* + * Converts an incoming Unicode string to an ANSI string. + * It is only useful for "in-place" conversions where the ANSI string goes + * back into the same place where the Unicode string came into this function. + * + * It returns an error code. + */ +// TODO: It seems that many of the functions involving printing could use this. +DWORD UnicodeToAnsiInPlace(PWSTR pwszField) { - /* - * This converts an incoming Unicode string to an ANSI string. - * It returns FALSE on failure, otherwise it returns TRUE. - * It is only useful for "in-place" conversions where the ANSI string goes - * back into the same place where the Unicode string came into this function. - * It seems that many of the functions involving printing can use this. - */ - PSTR pszTemp; DWORD cch; @@ -29,21 +29,20 @@ BOOL UnicodeToAnsiInPlace(PWSTR pwszField) if (!pwszField) { - return TRUE; + return ERROR_SUCCESS; } cch = wcslen(pwszField); if (cch == 0) { - return TRUE; + return ERROR_SUCCESS; } pszTemp = HeapAlloc(hProcessHeap, 0, (cch + 1) * sizeof(CHAR)); - if (!pszField) + if (!pszTemp) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); ERR("HeapAlloc failed!\n"); - return FALSE; // indicates a failure to be handled by caller + return ERROR_NOT_ENOUGH_MEMORY; } WideCharToMultiByte(CP_ACP, 0, pwszField, -1, pszTemp, cch + 1, NULL, NULL); @@ -51,5 +50,5 @@ BOOL UnicodeToAnsiInPlace(PWSTR pwszField) HeapFree(hProcessHeap, 0, pszTemp); - return TRUE; + return ERROR_SUCCESS; }

4 years, 7 months

[reactos] 01/01: [CSRSRV] CsrGetProcessLuid(): Check 1st NtQueryInformationToken() result too (#2857)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8fde48b5d733c516eee24… commit 8fde48b5d733c516eee249dad4df44ccdea2d40f Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon May 25 23:52:35 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon May 25 23:52:35 2020 +0200 [CSRSRV] CsrGetProcessLuid(): Check 1st NtQueryInformationToken() result too (#2857) Detected by Cppcheck: redundantAssignment. Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> --- subsystems/win32/csrsrv/procsup.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/subsystems/win32/csrsrv/procsup.c b/subsystems/win32/csrsrv/procsup.c index 30cde8a2fea..de9743cd6c2 100644 --- a/subsystems/win32/csrsrv/procsup.c +++ b/subsystems/win32/csrsrv/procsup.c @@ -873,6 +873,12 @@ CsrGetProcessLuid(IN HANDLE hProcess OPTIONAL, NULL, 0, &Length); + if (Status != STATUS_BUFFER_TOO_SMALL) + { + /* Close the token and fail */ + NtClose(hToken); + return Status; + } /* Allocate memory for the Token Info */ if (!(TokenStats = RtlAllocateHeap(CsrHeap, 0, Length)))

4 years, 7 months

[reactos] 01/01: [NTVDM] GetNextFreeVDDEntry(): Remove 'Entry' redundant initialization (#2859)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d59d74fb691667f40236e… commit d59d74fb691667f40236edd92cb3f6f32b52c95e Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon May 25 23:49:47 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon May 25 23:49:47 2020 +0200 [NTVDM] GetNextFreeVDDEntry(): Remove 'Entry' redundant initialization (#2859) Detected by Cppcheck: redundantInitialization. Addendum to ed874b41 (r61283). --- subsystems/mvdm/ntvdm/vddsup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subsystems/mvdm/ntvdm/vddsup.c b/subsystems/mvdm/ntvdm/vddsup.c index f6a6fa9afa5..accc241ff2e 100644 --- a/subsystems/mvdm/ntvdm/vddsup.c +++ b/subsystems/mvdm/ntvdm/vddsup.c @@ -59,7 +59,7 @@ static LIST_ENTRY VddUserHooksList = {&VddUserHooksList, &VddUserHooksList}; static USHORT GetNextFreeVDDEntry(VOID) { - USHORT Entry = MAX_VDD_MODULES; + USHORT Entry; for (Entry = 0; Entry < ARRAYSIZE(VDDList); ++Entry) { if (VDDList[Entry].hDll == NULL) break;

4 years, 7 months

[reactos] 01/01: [MMSYS] OnHScroll(): Fix wrong '&&' operator (#2855)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=03d5ff7f68b2eea68c2a4… commit 03d5ff7f68b2eea68c2a4f3c2ddc9e31ef5b602a Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon May 25 19:57:52 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon May 25 19:57:52 2020 +0200 [MMSYS] OnHScroll(): Fix wrong '&&' operator (#2855) CORE-17079 --- dll/cpl/mmsys/speakervolume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/mmsys/speakervolume.c b/dll/cpl/mmsys/speakervolume.c index a21c9406dcb..3b8b2cfc81d 100644 --- a/dll/cpl/mmsys/speakervolume.c +++ b/dll/cpl/mmsys/speakervolume.c @@ -155,7 +155,7 @@ OnHScroll( INT id, idx, i, j; id = (INT)GetWindowLongPtr((HWND)lParam, GWLP_ID); - if (id < 9475 && id > 9503) + if (id < 9475 || id > 9503) return; if ((id - 9475) % 4 != 0)

4 years, 7 months

[reactos] 01/01: [HAL:HALPPC] HalAllocateCrashDumpRegisters(): Remove redundant MapRegisterNumber assignment (#2854)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=327813e7da4993e754924… commit 327813e7da4993e754924793d0108cb3847dc705 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon May 25 18:58:17 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon May 25 18:58:17 2020 +0200 [HAL:HALPPC] HalAllocateCrashDumpRegisters(): Remove redundant MapRegisterNumber assignment (#2854) Detected by CppCheck: redundantAssignment. Addendum to commit 81f09273 (r28793). --- hal/halppc/generic/dma.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hal/halppc/generic/dma.c b/hal/halppc/generic/dma.c index 92e76bc8c03..fd50a00d349 100644 --- a/hal/halppc/generic/dma.c +++ b/hal/halppc/generic/dma.c @@ -1979,7 +1979,6 @@ HalAllocateCrashDumpRegisters(IN PADAPTER_OBJECT AdapterObject, } /* Try to find free map registers */ - MapRegisterNumber = MAXULONG; MapRegisterNumber = RtlFindClearBitsAndSet(MasterAdapter->MapRegisters, *NumberOfMapRegisters, 0);

4 years, 7 months

[reactos] 01/01: [PROCESSR][INF] Fix "Intel Intel" duplication typos

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7c8d5635aa3075774318a… commit 7c8d5635aa3075774318adc93873d2d7645bfb2e Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon May 25 02:36:17 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon May 25 02:36:17 2020 +0300 [PROCESSR][INF] Fix "Intel Intel" duplication typos Addendum to 3509318. --- drivers/processor/processr/cpu.inf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/processor/processr/cpu.inf b/drivers/processor/processr/cpu.inf index 1676a72bdb6..d2871382a7b 100644 --- a/drivers/processor/processr/cpu.inf +++ b/drivers/processor/processr/cpu.inf @@ -130,7 +130,7 @@ IntelP3Processor.DeviceDesc = "Intel Pentium III / Celeron / Xeon Processor" IntelMProcessor.DeviceDesc = "Intel Pentium M / Celeron M Processor" IntelP4Processor.DeviceDesc = "Intel Pentium 4 / Celeron / Xeon / D Processor" IntelAtomProcessor.DeviceDesc = "Intel Atom Processor" -IntelCoreProcessor.DeviceDesc = "Intel Intel Core Solo/Duo/Ex / Celeron / Xeon / M Processor" +IntelCoreProcessor.DeviceDesc = "Intel Core Solo/Duo/Ex / Celeron / Xeon / M Processor" IntelCoreiXProcessor.DeviceDesc = "Intel Core i* Processor" AMDProcessor.DeviceDesc = "AMD Processor" AMDK6Processor.DeviceDesc = "AMD K6 Processor" @@ -160,7 +160,7 @@ IntelP3Processor.DeviceDesc = "Procesor Intel Pentium III / Celeron / Xeon" IntelMProcessor.DeviceDesc = "Procesor Intel Pentium M / Celeron M" IntelP4Processor.DeviceDesc = "Procesor Intel Pentium 4 / Celeron / Xeon / D" IntelAtomProcessor.DeviceDesc = "Procesor Intel Atom" -IntelCoreProcessor.DeviceDesc = "Procesor Intel Intel Core Solo/Duo/Ex / Celeron / Xeon" +IntelCoreProcessor.DeviceDesc = "Procesor Intel Core Solo/Duo/Ex / Celeron / Xeon" IntelCoreiXProcessor.DeviceDesc = "Procesor Intel Core i*" AMDProcessor.DeviceDesc = "Procesor AMD" AMDK6Processor.DeviceDesc = "Procesor AMD K6" @@ -191,7 +191,7 @@ IntelP3Processor.DeviceDesc = "Intel Pentium III / Celeron / Xeon Prozessor" IntelMProcessor.DeviceDesc = "Intel Pentium M / Celeron M Prozessor" IntelP4Processor.DeviceDesc = "Intel Pentium 4 / Celeron / Xeon / D Prozessor" IntelAtomProcessor.DeviceDesc = "Intel Atom Prozessor" -IntelCoreProcessor.DeviceDesc = "Intel Intel Core Solo/Duo/Ex / Celeron / Xeon Prozessor" +IntelCoreProcessor.DeviceDesc = "Intel Core Solo/Duo/Ex / Celeron / Xeon Prozessor" IntelCoreiXProcessor.DeviceDesc = "Intel Core i* Prozessor" AMDProcessor.DeviceDesc = "AMD Prozessor" AMDK6Processor.DeviceDesc = "AMD K6 Prozessor" @@ -255,7 +255,7 @@ IntelP3Processor.DeviceDesc = "Procesor Intel Pentium III / Celeron / Xeon" IntelMProcessor.DeviceDesc = "Procesor Intel Pentium M / Celeron M" IntelP4Processor.DeviceDesc = "Procesor Intel Pentium 4 / Celeron / Xeon / D" IntelAtomProcessor.DeviceDesc = "Procesor Intel Atom" -IntelCoreProcessor.DeviceDesc = "Procesor Intel Intel Core Solo/Duo/Ex / Celeron / Xeon / M" +IntelCoreProcessor.DeviceDesc = "Procesor Intel Core Solo/Duo/Ex / Celeron / Xeon / M" IntelCoreiXProcessor.DeviceDesc = "Procesor Intel Core i*" AMDProcessor.DeviceDesc = "Procesor AMD" AMDK6Processor.DeviceDesc = "Procesor AMD K6" @@ -327,7 +327,7 @@ IntelP3Processor.DeviceDesc = "Intel Pentium III / Celeron / Xeon процесс IntelMProcessor.DeviceDesc = "Intel Pentium M / Celeron M процессор" IntelP4Processor.DeviceDesc = "Intel Pentium 4 / Celeron / Xeon / D процессор" IntelAtomProcessor.DeviceDesc = "Intel Atom процессор" -IntelCoreProcessor.DeviceDesc = "Intel Intel Core Solo/Duo/Ex / Celeron / Xeon / M процессор" +IntelCoreProcessor.DeviceDesc = "Intel Core Solo/Duo/Ex / Celeron / Xeon / M процессор" IntelCoreiXProcessor.DeviceDesc = "Intel Core i* процессор" AMDProcessor.DeviceDesc = "AMD процессор" AMDK6Processor.DeviceDesc = "AMD K6 процессор" @@ -371,7 +371,7 @@ IntelP3Processor.DeviceDesc = "Intel Pentium III / Celeron / Xeon İşlemci" IntelMProcessor.DeviceDesc = "Intel Pentium M / Celeron M İşlemci" IntelP4Processor.DeviceDesc = "Intel Pentium 4 / Celeron / Xeon / D İşlemci" IntelAtomProcessor.DeviceDesc = "Intel Atom İşlemci" -IntelCoreProcessor.DeviceDesc = "Intel Intel Core Solo/Duo/Ex / Celeron / Xeon / M İşlemci" +IntelCoreProcessor.DeviceDesc = "Intel Core Solo/Duo/Ex / Celeron / Xeon / M İşlemci" IntelCoreiXProcessor.DeviceDesc = "Intel Core i* İşlemci" AMDProcessor.DeviceDesc = "AMD İşlemci" AMDK6Processor.DeviceDesc = "AMD K6 İşlemci" @@ -439,7 +439,7 @@ IntelP3Processor.DeviceDesc = "Intel Pentium III / Celeron / Xeon 处理器" IntelMProcessor.DeviceDesc = "Intel Pentium M / Celeron M 处理器" IntelP4Processor.DeviceDesc = "Intel Pentium 4 / Celeron / Xeon / D 处理器" IntelAtomProcessor.DeviceDesc = "Intel Atom 处理器" -IntelCoreProcessor.DeviceDesc = "Intel Intel Core Solo/Duo/Ex / Celeron / Xeon / M 处理器" +IntelCoreProcessor.DeviceDesc = "Intel Core Solo/Duo/Ex / Celeron / Xeon / M 处理器" IntelCoreiXProcessor.DeviceDesc = "Intel Core i* 处理器" AMDProcessor.DeviceDesc = "AMD 处理器" AMDK6Processor.DeviceDesc = "AMD K6 处理器"

4 years, 7 months

[reactos] 01/01: [NTOS:PO] Report correct CPU frequency in CurrentMhz

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4c78b2c38d1621c4787a9… commit 4c78b2c38d1621c4787a9847210f865f07b6fae8 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon May 25 01:24:52 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon May 25 01:24:52 2020 +0300 [NTOS:PO] Report correct CPU frequency in CurrentMhz Also add some relevant FIXME comments. CORE-13206 --- ntoskrnl/po/power.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/po/power.c b/ntoskrnl/po/power.c index d29c85658bc..c1b82234fe6 100644 --- a/ntoskrnl/po/power.c +++ b/ntoskrnl/po/power.c @@ -863,11 +863,14 @@ NtPowerInformation(IN POWER_INFORMATION_LEVEL PowerInformationLevel, if (OutputBufferLength < sizeof(PROCESSOR_POWER_INFORMATION)) return STATUS_BUFFER_TOO_SMALL; + /* FIXME: return structures for all processors */ + _SEH2_TRY { + /* FIXME: some values are hardcoded */ PowerInformation->Number = 0; PowerInformation->MaxMhz = 1000; - PowerInformation->CurrentMhz = 1000; + PowerInformation->CurrentMhz = KeGetCurrentPrcb()->MHz; PowerInformation->MhzLimit = 1000; PowerInformation->MaxIdleState = 0; PowerInformation->CurrentIdleState = 0;

4 years, 7 months

[reactos] 01/01: [NTOS:INBV] Fix hardcoded values (#2840)

by Yaroslav Kibysh

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=93aa5801dcfa36ab9dbeb… commit 93aa5801dcfa36ab9dbeb0c3b1adbf96072dd436 Author: Yaroslav Kibysh <yanet.prod(a)gmail.com> AuthorDate: Sun May 24 20:37:47 2020 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Sun May 24 19:37:47 2020 +0200 [NTOS:INBV] Fix hardcoded values (#2840) --- ntoskrnl/inbv/inbv.c | 20 ++++++++++++++------ ntoskrnl/inbv/logo.h | 2 ++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ntoskrnl/inbv/inbv.c b/ntoskrnl/inbv/inbv.c index 8613f7a3b14..6757f71b3bc 100644 --- a/ntoskrnl/inbv/inbv.c +++ b/ntoskrnl/inbv/inbv.c @@ -84,6 +84,7 @@ BOOLEAN InbvBootDriverInstalled = FALSE; static BOOLEAN InbvDisplayDebugStrings = FALSE; static INBV_DISPLAY_STRING_FILTER InbvDisplayFilter = NULL; static ULONG ProgressBarLeft = 0, ProgressBarTop = 0; +static ULONG ProgressBarWidth = 0, ProgressBarHeight = 0; static BOOLEAN ShowProgressBar = FALSE; static INBV_PROGRESS_STATE InbvProgressState; static BT_PROGRESS_INDICATOR InbvProgressIndicator = {0, 25, 0}; @@ -769,7 +770,7 @@ InbvUpdateProgressBar(IN ULONG Progress) { /* Compute fill count */ BoundedProgress = (InbvProgressState.Floor / 100) + Progress; - FillCount = 121 * (InbvProgressState.Bias * BoundedProgress) / 1000000; + FillCount = ProgressBarWidth * (InbvProgressState.Bias * BoundedProgress) / 1000000; /* Acquire the lock */ InbvAcquireLock(); @@ -778,7 +779,7 @@ InbvUpdateProgressBar(IN ULONG Progress) VidSolidColorFill(ProgressBarLeft, ProgressBarTop, ProgressBarLeft + FillCount, - ProgressBarTop + 12, + ProgressBarTop + ProgressBarHeight, BV_COLOR_WHITE); /* Release the lock */ @@ -847,11 +848,15 @@ INIT_FUNCTION VOID NTAPI InbvSetProgressBarCoordinates(IN ULONG Left, - IN ULONG Top) + IN ULONG Top, + IN ULONG Width, + IN ULONG Height) { /* Update the coordinates */ - ProgressBarLeft = Left; - ProgressBarTop = Top; + ProgressBarLeft = Left; + ProgressBarTop = Top; + ProgressBarWidth = Width; + ProgressBarHeight = Height; /* Enable the progress bar */ ShowProgressBar = TRUE; @@ -1236,7 +1241,10 @@ DisplayBootBitmap(IN BOOLEAN TextMode) #endif /* Set progress bar coordinates and display it */ - InbvSetProgressBarCoordinates(VID_PROGRESS_BAR_LEFT, VID_PROGRESS_BAR_TOP); + InbvSetProgressBarCoordinates(VID_PROGRESS_BAR_LEFT, + VID_PROGRESS_BAR_TOP, + VID_PROGRESS_BAR_WIDTH, + VID_PROGRESS_BAR_HEIGHT); #ifdef REACTOS_SKUS /* Check for non-workstation products */ diff --git a/ntoskrnl/inbv/logo.h b/ntoskrnl/inbv/logo.h index c18d1efeea7..caecbf3dd4f 100644 --- a/ntoskrnl/inbv/logo.h +++ b/ntoskrnl/inbv/logo.h @@ -11,6 +11,8 @@ #define VID_PROGRESS_BAR_LEFT 259 #define VID_PROGRESS_BAR_TOP 352 +#define VID_PROGRESS_BAR_WIDTH 121 +#define VID_PROGRESS_BAR_HEIGHT 12 /* 16px space between shutdown logo and message */ #define VID_SHUTDOWN_LOGO_LEFT 225

4 years, 7 months

[reactos] 01/01: [NTOS:EX] ExpInitializeExecutive(): Fix 'PerfMem' copypasta (#2841)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de0ce9dd028ab4d0d42c6… commit de0ce9dd028ab4d0d42c6d5f467365481b99a111 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sun May 24 19:37:16 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun May 24 19:37:16 2020 +0200 [NTOS:EX] ExpInitializeExecutive(): Fix 'PerfMem' copypasta (#2841) Detected by Cppcheck: identicalInnerCondition. Addendum to commit c307d73c (r25621). --- ntoskrnl/ex/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/ex/init.c b/ntoskrnl/ex/init.c index e39b00070f4..537fba3593b 100644 --- a/ntoskrnl/ex/init.c +++ b/ntoskrnl/ex/init.c @@ -1000,7 +1000,7 @@ ExpInitializeExecutive(IN ULONG Cpu, { /* Read the number of pages we'll use */ PerfMemUsed = atol(PerfMem + 1) * (1024 * 1024 / PAGE_SIZE); - if (PerfMem) + if (PerfMemUsed) { /* FIXME: TODO */ DPRINT1("BBT performance mode not yet supported."

4 years, 7 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 May 2020