Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [NTUSER] Implement NtUserCreateInputContext (#4230)
by Katayama Hirofumi MZ 01 Jan '22

01 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d5deacd90305a83d413af… commit d5deacd90305a83d413af18dca8fa41fe03e61b3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Jan 1 20:59:00 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jan 1 20:59:00 2022 +0900 [NTUSER] Implement NtUserCreateInputContext (#4230) - Modify NtUserCreateInputContext prototype. - Add UserCreateInputContext helper function. - Implement NtUserCreateInputContext function by using UserCreateInputContext. - Call UserCreateInputContext(0) in InitThreadCallback function to create the default input context. CORE-11700 --- dll/win32/imm32/imm.c | 2 +- win32ss/include/ntuser.h | 2 +- win32ss/user/ntuser/main.c | 6 +++++ win32ss/user/ntuser/ntstubs.c | 57 ++++++++++++++++++++++++++++++++++++++--- win32ss/user/ntuser/userfuncs.h | 1 + 5 files changed, 63 insertions(+), 5 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index e24806c86d4..e916d44480f 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -597,7 +597,7 @@ HIMC WINAPI ImmCreateContext(void) if (pClientImc == NULL) return NULL; - hIMC = NtUserCreateInputContext(pClientImc); + hIMC = NtUserCreateInputContext((ULONG_PTR)pClientImc); if (hIMC == NULL) { Imm32HeapFree(pClientImc); diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index 1e6234f84c1..4618c99af76 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -1937,7 +1937,7 @@ NtUserCreateDesktop( HIMC NTAPI -NtUserCreateInputContext(PCLIENTIMC pClientImc); +NtUserCreateInputContext(ULONG_PTR dwClientImcData); NTSTATUS NTAPI diff --git a/win32ss/user/ntuser/main.c b/win32ss/user/ntuser/main.c index 00a683af61c..8daf15ba95d 100644 --- a/win32ss/user/ntuser/main.c +++ b/win32ss/user/ntuser/main.c @@ -651,6 +651,12 @@ InitThreadCallback(PETHREAD Thread) } ptiCurrent->pClientInfo->dwTIFlags = ptiCurrent->TIF_flags; + /* Create the default input context */ + if (IS_IMM_MODE()) + { + UserCreateInputContext(0); + } + /* Last things to do only if we are not a SYSTEM or CSRSS thread */ if (!(ptiCurrent->TIF_flags & (TIF_SYSTEMTHREAD | TIF_CSRSSTHREAD))) { diff --git a/win32ss/user/ntuser/ntstubs.c b/win32ss/user/ntuser/ntstubs.c index 95a87900242..ddf9ba09381 100644 --- a/win32ss/user/ntuser/ntstubs.c +++ b/win32ss/user/ntuser/ntstubs.c @@ -461,12 +461,63 @@ NtUserYieldTask(VOID) return 0; } +PIMC FASTCALL UserCreateInputContext(ULONG_PTR dwClientImcData) +{ + PIMC pIMC; + PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); + PDESKTOP pdesk = pti->rpdesk; + + if (!IS_IMM_MODE() || (pti->TIF_flags & TIF_DISABLEIME)) // Disabled? + return NULL; + + if (!pdesk) // No desktop? + return NULL; + + // pti->spDefaultImc should be already set if non-first time. + if (dwClientImcData && !pti->spDefaultImc) + return NULL; + + // Create an input context user object. + pIMC = UserCreateObject(gHandleTable, pdesk, pti, NULL, TYPE_INPUTCONTEXT, sizeof(IMC)); + if (!pIMC) + return NULL; + + if (dwClientImcData) // Non-first time. + { + // Insert pIMC to the second position (non-default) of the list. + pIMC->pImcNext = pti->spDefaultImc->pImcNext; + pti->spDefaultImc->pImcNext = pIMC; + } + else // First time. It's the default IMC. + { + // Add the first one (default) to the list. + pti->spDefaultImc = pIMC; + pIMC->pImcNext = NULL; + } + + pIMC->dwClientImcData = dwClientImcData; // Set it. + return pIMC; +} + HIMC APIENTRY -NtUserCreateInputContext(PCLIENTIMC pClientImc) +NtUserCreateInputContext(ULONG_PTR dwClientImcData) { - STUB; - return NULL; + PIMC pIMC; + HIMC ret = NULL; + + UserEnterExclusive(); + + if (!IS_IMM_MODE() || !dwClientImcData) + goto Quit; + + pIMC = UserCreateInputContext(dwClientImcData); + if (pIMC) + ret = UserHMGetHandle(pIMC); + +Quit: + UserLeave(); + return ret; } DWORD diff --git a/win32ss/user/ntuser/userfuncs.h b/win32ss/user/ntuser/userfuncs.h index 6fb86e64d71..3bae17d5567 100644 --- a/win32ss/user/ntuser/userfuncs.h +++ b/win32ss/user/ntuser/userfuncs.h @@ -165,6 +165,7 @@ BOOL FASTCALL GetLayeredStatus(PWND pWnd); /************** INPUT CONTEXT **************/ +PIMC FASTCALL UserCreateInputContext(ULONG_PTR dwClientImcData); VOID UserFreeInputContext(PVOID Object); BOOLEAN UserDestroyInputContext(PVOID Object); PVOID AllocInputContextObject(PDESKTOP pDesk, PTHREADINFO pti, SIZE_T Size, PVOID* HandleOwner);

1 0

[reactos] 01/01: [NTUSER] Implement NtUserUpdateInputContext (#4228)
by Katayama Hirofumi MZ 01 Jan '22

01 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ba3affe5f7f7f8818cc90… commit ba3affe5f7f7f8818cc90a884a3ddcf8257d4d85 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Jan 1 20:57:51 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jan 1 20:57:51 2022 +0900 [NTUSER] Implement NtUserUpdateInputContext (#4228) - Modify NtUserUpdateInputContext prototype. - Implement NtUserUpdateInputContext function. - Add enum UPDATE_INPUT_CONTEXT (UIC_*) to undocuser.h. CORE-11700 --- dll/win32/imm32/imm.c | 2 +- sdk/include/reactos/undocuser.h | 6 +++++ win32ss/include/ntuser.h | 6 ++--- win32ss/user/ntuser/ntstubs.c | 55 +++++++++++++++++++++++++++++++++++++---- 4 files changed, 60 insertions(+), 9 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 4ac2cdebb6e..e24806c86d4 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -928,7 +928,7 @@ PCLIENTIMC WINAPI ImmLockClientImc(HIMC hImc) // FIXME: NtUserGetThreadState and enum ThreadStateRoutines are broken. pClientImc->unknown = NtUserGetThreadState(13); - if (!NtUserUpdateInputContext(hImc, 0, pClientImc)) + if (!NtUserUpdateInputContext(hImc, UIC_CLIENTIMCDATA, (DWORD_PTR)pClientImc)) { Imm32HeapFree(pClientImc); return NULL; diff --git a/sdk/include/reactos/undocuser.h b/sdk/include/reactos/undocuser.h index ca13a8b0239..3c0ebb3c149 100644 --- a/sdk/include/reactos/undocuser.h +++ b/sdk/include/reactos/undocuser.h @@ -296,6 +296,12 @@ MessageBoxTimeoutW( LPCWSTR WINAPI MB_GetString(IN UINT wBtn); +/* dwType for NtUserUpdateInputContext */ +typedef enum _UPDATE_INPUT_CONTEXT +{ + UIC_CLIENTIMCDATA = 0, + UIC_IMEWINDOW +} UPDATE_INPUT_CONTEXT; // // User api hook diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index 0e6d4c3b4d9..1e6234f84c1 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -3533,12 +3533,12 @@ BOOL NTAPI NtUserUnregisterUserApiHook(VOID); -DWORD +BOOL NTAPI NtUserUpdateInputContext( HIMC hIMC, - DWORD Unknown1, - LPVOID pClientImc); + DWORD dwType, + DWORD_PTR dwValue); DWORD NTAPI diff --git a/win32ss/user/ntuser/ntstubs.c b/win32ss/user/ntuser/ntstubs.c index 1a173714958..95a87900242 100644 --- a/win32ss/user/ntuser/ntstubs.c +++ b/win32ss/user/ntuser/ntstubs.c @@ -346,16 +346,61 @@ NtUserSetSysColors( return Ret; } -DWORD +BOOL FASTCALL UserUpdateInputContext(PIMC pIMC, DWORD dwType, DWORD_PTR dwValue) +{ + PTHREADINFO pti = GetW32ThreadInfo(); + PTHREADINFO ptiIMC = pIMC->head.pti; + + if (pti->ppi != ptiIMC->ppi) // Different process? + return FALSE; + + switch (dwType) + { + case UIC_CLIENTIMCDATA: + if (pIMC->dwClientImcData) + return FALSE; // Already set + + pIMC->dwClientImcData = dwValue; + break; + + case UIC_IMEWINDOW: + if (!ValidateHwndNoErr((HWND)dwValue)) + return FALSE; // Invalid HWND + + pIMC->hImeWnd = (HWND)dwValue; + break; + + default: + return FALSE; + } + + return TRUE; +} + +BOOL APIENTRY NtUserUpdateInputContext( HIMC hIMC, - DWORD Unknown1, - LPVOID pClientImc) + DWORD dwType, + DWORD_PTR dwValue) { - STUB + PIMC pIMC; + BOOL ret = FALSE; - return 0; + UserEnterExclusive(); + + if (!IS_IMM_MODE()) + goto Quit; + + pIMC = UserGetObject(gHandleTable, hIMC, TYPE_INPUTCONTEXT); + if (!pIMC) + goto Quit; + + ret = UserUpdateInputContext(pIMC, dwType, dwValue); + +Quit: + UserLeave(); + return ret; } DWORD

1 0

[reactos] 01/01: [NTUSER] Implement NtUserQueryInputContext (#4227)
by Katayama Hirofumi MZ 01 Jan '22

01 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cdf3b5e85ac106e9e0fce… commit cdf3b5e85ac106e9e0fce956054621aebaa9cc1f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Jan 1 20:56:50 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jan 1 20:56:50 2022 +0900 [NTUSER] Implement NtUserQueryInputContext (#4227) Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> - Modify NtUserQueryInputContext prototype. - Implement NtUserQueryInputContext function. - Add enum QUERY_INPUT_CONTEXT (QIC_*) to undocuser.h. CORE-11700 --- dll/win32/imm32/compstr.c | 2 +- dll/win32/imm32/ime.c | 4 ++-- dll/win32/imm32/imm.c | 4 ++-- dll/win32/imm32/precomp.h | 2 +- dll/win32/imm32/utils.c | 4 ++-- sdk/include/reactos/undocuser.h | 9 +++++++++ win32ss/include/ntuser.h | 4 ++-- win32ss/user/ntuser/ntstubs.c | 45 +++++++++++++++++++++++++++++++++++++---- 8 files changed, 60 insertions(+), 14 deletions(-) diff --git a/dll/win32/imm32/compstr.c b/dll/win32/imm32/compstr.c index 7fa9a0e4111..b49b4a5db19 100644 --- a/dll/win32/imm32/compstr.c +++ b/dll/win32/imm32/compstr.c @@ -527,7 +527,7 @@ Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwComp UINT uCodePage; LPRECONVERTSTRING pRS; - dwThreadId = NtUserQueryInputContext(hIMC, 1); + dwThreadId = (DWORD)NtUserQueryInputContext(hIMC, QIC_INPUTTHREADID); if (dwThreadId != GetCurrentThreadId()) return FALSE; diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index cfe0b66754e..7da1ea09fec 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -376,7 +376,7 @@ Imm32GetImeMenuItemsAW(HIMC hIMC, DWORD dwFlags, DWORD dwType, LPVOID lpImeParen if (!hIMC) return 0; - dwProcessId = NtUserQueryInputContext(hIMC, 0); + dwProcessId = (DWORD)NtUserQueryInputContext(hIMC, QIC_INPUTPROCESSID); if (dwProcessId == 0) return 0; @@ -392,7 +392,7 @@ Imm32GetImeMenuItemsAW(HIMC hIMC, DWORD dwFlags, DWORD dwType, LPVOID lpImeParen if (pIC == NULL) return 0; - dwThreadId = NtUserQueryInputContext(hIMC, 1); + dwThreadId = (DWORD)NtUserQueryInputContext(hIMC, QIC_INPUTTHREADID); if (dwThreadId == 0) { ImmUnlockIMC(hIMC); diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index c21c5a23567..4ac2cdebb6e 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -818,7 +818,7 @@ LPINPUTCONTEXT APIENTRY Imm32LockIMCEx(HIMC hIMC, BOOL fSelect) if (!pClientImc->hInputContext) { - dwThreadId = (DWORD)NtUserQueryInputContext(hIMC, 1); + dwThreadId = (DWORD)NtUserQueryInputContext(hIMC, QIC_INPUTTHREADID); if (dwThreadId == GetCurrentThreadId() && Imm32IsCiceroMode() && !Imm32Is16BitMode()) { @@ -833,7 +833,7 @@ LPINPUTCONTEXT APIENTRY Imm32LockIMCEx(HIMC hIMC, BOOL fSelect) } } - if (!NtUserQueryInputContext(hIMC, 2)) + if (!NtUserQueryInputContext(hIMC, QIC_DEFAULTWINDOWIME)) { RtlLeaveCriticalSection(&pClientImc->cs); goto Quit; diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index 285ab70b8d1..4cd92e5e09d 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -97,7 +97,7 @@ BOOL APIENTRY Imm32ReleaseIME(HKL hKL); static inline BOOL Imm32IsCrossThreadAccess(HIMC hIMC) { - DWORD dwImeThreadId = NtUserQueryInputContext(hIMC, 1); + DWORD dwImeThreadId = (DWORD)NtUserQueryInputContext(hIMC, QIC_INPUTTHREADID); DWORD dwThreadId = GetCurrentThreadId(); return (dwImeThreadId != dwThreadId); } diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index e035fec3ed2..29c2c3adfeb 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -186,7 +186,7 @@ BOOL APIENTRY Imm32CheckImcProcess(PIMC pIMC) return TRUE; hIMC = pIMC->head.h; - dwProcessID = NtUserQueryInputContext(hIMC, 0); + dwProcessID = (DWORD)NtUserQueryInputContext(hIMC, QIC_INPUTPROCESSID); return dwProcessID == (DWORD_PTR)NtCurrentTeb()->ClientId.UniqueProcess; } @@ -211,7 +211,7 @@ Imm32NotifyAction(HIMC hIMC, HWND hwnd, DWORD dwAction, DWORD_PTR dwIndex, DWORD if (dwAction) { - dwThreadId = NtUserQueryInputContext(hIMC, 1); + dwThreadId = (DWORD)NtUserQueryInputContext(hIMC, QIC_INPUTTHREADID); if (dwThreadId) { /* find keyboard layout and lock it */ diff --git a/sdk/include/reactos/undocuser.h b/sdk/include/reactos/undocuser.h index f63e5cd4153..ca13a8b0239 100644 --- a/sdk/include/reactos/undocuser.h +++ b/sdk/include/reactos/undocuser.h @@ -379,6 +379,15 @@ BOOL WINAPI RegisterUserApiHook(PUSERAPIHOOKINFO puah); BOOL WINAPI UnregisterUserApiHook(VOID); +/* dwType for NtUserQueryInputContext */ +typedef enum _QUERY_INPUT_CONTEXT +{ + QIC_INPUTPROCESSID = 0, + QIC_INPUTTHREADID, + QIC_DEFAULTWINDOWIME, + QIC_DEFAULTIMC +} QUERY_INPUT_CONTEXT; + #ifdef __cplusplus } /* extern "C" */ #endif /* defined(__cplusplus) */ diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index 9d936530827..0e6d4c3b4d9 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -2877,11 +2877,11 @@ NtUserQueryInformationThread( OUT PVOID ThreadInformation, IN ULONG ThreadInformationLength); -DWORD +DWORD_PTR NTAPI NtUserQueryInputContext( HIMC hIMC, - DWORD dwUnknown2); + DWORD dwType); DWORD NTAPI diff --git a/win32ss/user/ntuser/ntstubs.c b/win32ss/user/ntuser/ntstubs.c index 9d7b624151b..1a173714958 100644 --- a/win32ss/user/ntuser/ntstubs.c +++ b/win32ss/user/ntuser/ntstubs.c @@ -647,14 +647,51 @@ Quit: return Status; } -DWORD +DWORD_PTR APIENTRY NtUserQueryInputContext( HIMC hIMC, - DWORD dwUnknown2) + DWORD dwType) { - TRACE("NtUserQueryInputContext(%p, 0x%lX)\n", hIMC, dwUnknown2); - return 0; + PIMC pIMC; + PTHREADINFO ptiIMC; + DWORD_PTR ret = 0; + + UserEnterExclusive(); + + if (!IS_IMM_MODE()) + goto Quit; + + pIMC = UserGetObject(gHandleTable, hIMC, TYPE_INPUTCONTEXT); + if (!pIMC) + goto Quit; + + ptiIMC = pIMC->head.pti; + + switch (dwType) + { + case QIC_INPUTPROCESSID: + ret = (DWORD_PTR)PsGetThreadProcessId(ptiIMC->pEThread); + break; + + case QIC_INPUTTHREADID: + ret = (DWORD_PTR)PsGetThreadId(ptiIMC->pEThread); + break; + + case QIC_DEFAULTWINDOWIME: + if (ptiIMC->spwndDefaultIme) + ret = (DWORD_PTR)UserHMGetHandle(ptiIMC->spwndDefaultIme); + break; + + case QIC_DEFAULTIMC: + if (ptiIMC->spDefaultImc) + ret = (DWORD_PTR)UserHMGetHandle(ptiIMC->spDefaultImc); + break; + } + +Quit: + UserLeave(); + return ret; } BOOL

1 0

[reactos] 02/02: [FREELDR] Slightly revamp the Exception BSOD screen.
by Hermès Bélusca-Maïto 01 Jan '22

01 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d00a5d6eb977461e61bc… commit 0d00a5d6eb977461e61bc552647358b9f1d71e3f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jan 1 04:49:06 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jan 1 05:04:23 2022 +0100 [FREELDR] Slightly revamp the Exception BSOD screen. - Don't store trailing newlines in the exception description text strings. - Remove unused i386PrintChar(). - Display CR4 in x86. - Use the "indentation" printf generation trick in order to get aligned strings for (CF4 and) DR6 and DR7, without having to hardcode the tons of alignment whitespaces (--> make the strings stored in freeldr shorter). - Show the IP/ErrorCode/EFlags/GDTR/IDTR/LDTR values vertically aligned. - Display the stack frames in both x86 and x64 modes. - Adjust the instruction pointer when a BREAKPOINT or OVERFLOW exception arises, so that the offending instruction can show up in the instruction stream. --- boot/freeldr/freeldr/arch/i386/i386bug.c | 117 +++++++++++++++--------------- boot/freeldr/freeldr/arch/i386/i386trap.S | 2 +- 2 files changed, 61 insertions(+), 58 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/i386bug.c b/boot/freeldr/freeldr/arch/i386/i386bug.c index 908ad46950c..7e03deacdcb 100644 --- a/boot/freeldr/freeldr/arch/i386/i386bug.c +++ b/boot/freeldr/freeldr/arch/i386/i386bug.c @@ -5,31 +5,31 @@ typedef struct _FRAME { - struct _FRAME *Next; - void *Address; + struct _FRAME* Next; + PVOID Address; } FRAME; static const CHAR *i386ExceptionDescriptionText[] = { - "Exception 00: DIVIDE BY ZERO\n\n", - "Exception 01: DEBUG EXCEPTION\n\n", - "Exception 02: NON-MASKABLE INTERRUPT EXCEPTION\n\n", - "Exception 03: BREAKPOINT (INT 3)\n\n", - "Exception 04: OVERFLOW\n\n", - "Exception 05: BOUND EXCEPTION\n\n", - "Exception 06: INVALID OPCODE\n\n", - "Exception 07: FPU NOT AVAILABLE\n\n", - "Exception 08: DOUBLE FAULT\n\n", - "Exception 09: COPROCESSOR SEGMENT OVERRUN\n\n", - "Exception 0A: INVALID TSS\n\n", - "Exception 0B: SEGMENT NOT PRESENT\n\n", - "Exception 0C: STACK EXCEPTION\n\n", - "Exception 0D: GENERAL PROTECTION FAULT\n\n", - "Exception 0E: PAGE FAULT\n\n", - "Exception 0F: Reserved\n\n", - "Exception 10: COPROCESSOR ERROR\n\n", - "Exception 11: ALIGNMENT CHECK\n\n", - "Exception 12: MACHINE CHECK\n\n" + "Exception 00: DIVIDE BY ZERO", + "Exception 01: DEBUG EXCEPTION", + "Exception 02: NON-MASKABLE INTERRUPT EXCEPTION", + "Exception 03: BREAKPOINT (INT 3)", + "Exception 04: OVERFLOW", + "Exception 05: BOUND EXCEPTION", + "Exception 06: INVALID OPCODE", + "Exception 07: FPU NOT AVAILABLE", + "Exception 08: DOUBLE FAULT", + "Exception 09: COPROCESSOR SEGMENT OVERRUN", + "Exception 0A: INVALID TSS", + "Exception 0B: SEGMENT NOT PRESENT", + "Exception 0C: STACK EXCEPTION", + "Exception 0D: GENERAL PROTECTION FAULT", + "Exception 0E: PAGE FAULT", + "Exception 0F: Reserved", + "Exception 10: COPROCESSOR ERROR", + "Exception 11: ALIGNMENT CHECK", + "Exception 12: MACHINE CHECK" }; #define SCREEN_ATTR 0x1F // Bright white on blue background @@ -38,14 +38,6 @@ static const CHAR *i386ExceptionDescriptionText[] = static ULONG i386_ScreenPosX = 0; static ULONG i386_ScreenPosY = 0; -#if 0 -static void -i386PrintChar(CHAR chr, ULONG x, ULONG y) -{ - MachVideoPutChar(chr, SCREEN_ATTR, x, y); -} -#endif - static void i386PrintText(CHAR *pszText) { @@ -96,18 +88,17 @@ PrintText(const CHAR *Format, ...) static void i386PrintFrames(PKTRAP_FRAME TrapFrame) { - FRAME *Frame; + FRAME* Frame; PrintText("Frames:\n"); + for (Frame = #ifdef _M_IX86 - for (Frame = (FRAME*)TrapFrame->Ebp; - Frame != 0 && (ULONG_PTR)Frame < STACKADDR; - Frame = Frame->Next) + (FRAME*)TrapFrame->Ebp; #else - for (Frame = (FRAME*)TrapFrame->TrapFrame; - Frame != 0 && (ULONG_PTR)Frame < STACKADDR; - Frame = Frame->Next) + (FRAME*)TrapFrame->TrapFrame; #endif + Frame != NULL && (ULONG_PTR)Frame < STACKADDR; + Frame = Frame->Next) { PrintText("%p ", Frame->Address); } @@ -126,7 +117,8 @@ i386PrintExceptionText(ULONG TrapIndex, PKTRAP_FRAME TrapFrame, PKSPECIAL_REGIST PrintText("An error occured in " VERSION "\n" "Report this error on the ReactOS Bug Tracker: https://jira.reactos.org\n\n" - "0x%02lx: %s\n", TrapIndex, i386ExceptionDescriptionText[TrapIndex]); + "0x%02lx: %s\n\n", TrapIndex, i386ExceptionDescriptionText[TrapIndex]); + #ifdef _M_IX86 PrintText("EAX: %.8lx ESP: %.8lx CR0: %.8lx DR0: %.8lx\n", TrapFrame->Eax, TrapFrame->HardwareEsp, Special->Cr0, TrapFrame->Dr0); @@ -136,29 +128,28 @@ i386PrintExceptionText(ULONG TrapIndex, PKTRAP_FRAME TrapFrame, PKSPECIAL_REGIST TrapFrame->Ecx, TrapFrame->Esi, Special->Cr2, TrapFrame->Dr2); PrintText("EDX: %.8lx EDI: %.8lx CR3: %.8lx DR3: %.8lx\n", TrapFrame->Edx, TrapFrame->Edi, Special->Cr3, TrapFrame->Dr3); - PrintText(" DR6: %.8lx\n", - TrapFrame->Dr6); - PrintText(" DR7: %.8lx\n\n", - TrapFrame->Dr7); + PrintText("%*s CR4: %.8lx DR6: %.8lx\n", + 41, "", Special->Cr4, TrapFrame->Dr6); + PrintText("%*s DR7: %.8lx\n", + 62, "", TrapFrame->Dr7); /* NOTE: Segment registers are intrinsically 16 bits. Even if the x86 * KTRAP_FRAME structure stores them as ULONG, only their lower 16 bits * are initialized. We thus cast them to USHORT before display. */ - PrintText("CS: %.4lx EIP: %.8lx\n", + PrintText(" CS: %.4lx EIP: %.8lx\n", (USHORT)TrapFrame->SegCs, TrapFrame->Eip); - PrintText("DS: %.4lx ERROR CODE: %.8lx\n", + PrintText(" DS: %.4lx ERROR CODE: %.8lx\n", (USHORT)TrapFrame->SegDs, TrapFrame->ErrCode); - PrintText("ES: %.4lx EFLAGS: %.8lx\n", + PrintText(" ES: %.4lx EFLAGS: %.8lx\n", (USHORT)TrapFrame->SegEs, TrapFrame->EFlags); - PrintText("FS: %.4lx GDTR Base: %.8lx Limit: %.4x\n", + PrintText(" FS: %.4lx GDTR Base: %.8lx Limit: %.4x\n", + // " FS: %.4lx GDTR: Base %.8lx Limit %.4x\n" (USHORT)TrapFrame->SegFs, Special->Gdtr.Base, Special->Gdtr.Limit); - PrintText("GS: %.4lx IDTR Base: %.8lx Limit: %.4x\n", + PrintText(" GS: %.4lx IDTR Base: %.8lx Limit: %.4x\n", + // " GS: %.4lx IDTR: Base %.8lx Limit %.4x\n", (USHORT)TrapFrame->SegGs, Special->Idtr.Base, Special->Idtr.Limit); - PrintText("SS: %.4lx LDTR: %.4lx TR: %.4lx\n\n", + PrintText(" SS: %.4lx LDTR: %.4lx TR: %.4lx\n\n", (USHORT)TrapFrame->HardwareSegSs, Special->Ldtr, Special->Tr); - - i386PrintFrames(TrapFrame); // Display frames - InstructionPointer = (PUCHAR)TrapFrame->Eip; #else PrintText("RAX: %.8lx R8: %.8lx R12: %.8lx RSI: %.8lx\n", TrapFrame->Rax, TrapFrame->R8, 0, TrapFrame->Rsi); @@ -169,21 +160,33 @@ i386PrintExceptionText(ULONG TrapIndex, PKTRAP_FRAME TrapFrame, PKSPECIAL_REGIST PrintText("RDX: %.8lx R11: %.8lx R15: %.8lx RSP: %.8lx\n", TrapFrame->Rdx, TrapFrame->R11, 0, TrapFrame->Rsp); - PrintText("CS: %.4lx RIP: %.8lx\n", + PrintText(" CS: %.4lx RIP: %.8lx\n", TrapFrame->SegCs, TrapFrame->Rip); - PrintText("DS: %.4lx ERROR CODE: %.8lx\n", + PrintText(" DS: %.4lx ERROR CODE: %.8lx\n", TrapFrame->SegDs, TrapFrame->ErrorCode); - PrintText("ES: %.4lx EFLAGS: %.8lx\n", + PrintText(" ES: %.4lx EFLAGS: %.8lx\n", TrapFrame->SegEs, TrapFrame->EFlags); - PrintText("FS: %.4lx GDTR Base: %.8lx Limit: %.4x\n", + PrintText(" FS: %.4lx GDTR Base: %.8lx Limit: %.4x\n", TrapFrame->SegFs, Special->Gdtr.Base, Special->Gdtr.Limit); - PrintText("GS: %.4lx IDTR Base: %.8lx Limit: %.4x\n", + PrintText(" GS: %.4lx IDTR Base: %.8lx Limit: %.4x\n", TrapFrame->SegGs, Special->Idtr.Base, Special->Idtr.Limit); - PrintText("SS: %.4lx LDTR: %.4lx TR: %.4lx\n\n", + PrintText(" SS: %.4lx LDTR: %.4lx TR: %.4lx\n\n", TrapFrame->SegSs, Special->Ldtr, Special->Tr); +#endif + + /* Display the stack frames */ + i386PrintFrames(TrapFrame); + +#ifdef _M_IX86 + InstructionPointer = (PUCHAR)TrapFrame->Eip; +#else InstructionPointer = (PUCHAR)TrapFrame->Rip; #endif - PrintText("\nInstruction stream: %.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x \n", + /* Adjust IP for #BP (INT 03) or #OF to point to the offending instruction */ + if ((TrapIndex == 3) || (TrapIndex == 4)) + InstructionPointer--; + + PrintText("\nInstruction stream: %.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x\n", InstructionPointer[0], InstructionPointer[1], InstructionPointer[2], InstructionPointer[3], InstructionPointer[4], InstructionPointer[5], diff --git a/boot/freeldr/freeldr/arch/i386/i386trap.S b/boot/freeldr/freeldr/arch/i386/i386trap.S index 0be6ec7e5a2..bbc5367d70d 100644 --- a/boot/freeldr/freeldr/arch/i386/i386trap.S +++ b/boot/freeldr/freeldr/arch/i386/i386trap.S @@ -82,7 +82,7 @@ MACRO(SAVE_CPU_REGS) push eax ENDM -/* Set by each exception handler to the address of the description text */ +/* Set by each exception handler to the index of the description text */ i386ExceptionIndex: .long 0

1 0

[reactos] 01/02: [FREELDR] Fix displayed information in the Exception BSOD. CORE-16748
by Hermès Bélusca-Maïto 01 Jan '22

01 Jan '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2c9dbacebbee6b53bf331… commit 2c9dbacebbee6b53bf331e032d9f2af4e4f828eb Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jan 1 02:24:52 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jan 1 05:04:22 2022 +0100 [FREELDR] Fix displayed information in the Exception BSOD. CORE-16748 - Display the correct TR register value. - Ensure that the x86 segment register values displayed are really 2-byte long. Segment registers are intrinsically 16 bits. Even if the x86 KTRAP_FRAME structure stores them as ULONG, only their lower 16 bits are initialized. We thus cast them to USHORT before display. These segment registers are saved in a stack-based KTRAP_FRAME by the CPU trap mechanism (for SS), and by 'push CS' etc. instructions for the others, and from Intel documentation, we know that: " If the source operand is a segment register (16 bits) and the operand size is 64-bits, a zero-extended value is pushed on the stack; if the operand size is 32-bits, either a zero-extended value is pushed on the stack or the segment selector is written on the stack using a 16-bit move. For the last case, all recent Core and Atom processors perform a 16-bit move, leaving the upper portion of the stack location unmodified. " So it may happen, when using the push, that either they get zero-extended, or garbage gets stored in the higher bits, and these need to be trimmed. --- boot/freeldr/freeldr/arch/i386/i386bug.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/i386bug.c b/boot/freeldr/freeldr/arch/i386/i386bug.c index f94639650f4..908ad46950c 100644 --- a/boot/freeldr/freeldr/arch/i386/i386bug.c +++ b/boot/freeldr/freeldr/arch/i386/i386bug.c @@ -140,18 +140,22 @@ i386PrintExceptionText(ULONG TrapIndex, PKTRAP_FRAME TrapFrame, PKSPECIAL_REGIST TrapFrame->Dr6); PrintText(" DR7: %.8lx\n\n", TrapFrame->Dr7); + + /* NOTE: Segment registers are intrinsically 16 bits. Even if the x86 + * KTRAP_FRAME structure stores them as ULONG, only their lower 16 bits + * are initialized. We thus cast them to USHORT before display. */ PrintText("CS: %.4lx EIP: %.8lx\n", - TrapFrame->SegCs, TrapFrame->Eip); + (USHORT)TrapFrame->SegCs, TrapFrame->Eip); PrintText("DS: %.4lx ERROR CODE: %.8lx\n", - TrapFrame->SegDs, TrapFrame->ErrCode); + (USHORT)TrapFrame->SegDs, TrapFrame->ErrCode); PrintText("ES: %.4lx EFLAGS: %.8lx\n", - TrapFrame->SegEs, TrapFrame->EFlags); + (USHORT)TrapFrame->SegEs, TrapFrame->EFlags); PrintText("FS: %.4lx GDTR Base: %.8lx Limit: %.4x\n", - TrapFrame->SegFs, Special->Gdtr.Base, Special->Gdtr.Limit); + (USHORT)TrapFrame->SegFs, Special->Gdtr.Base, Special->Gdtr.Limit); PrintText("GS: %.4lx IDTR Base: %.8lx Limit: %.4x\n", - TrapFrame->SegGs, Special->Idtr.Base, Special->Idtr.Limit); + (USHORT)TrapFrame->SegGs, Special->Idtr.Base, Special->Idtr.Limit); PrintText("SS: %.4lx LDTR: %.4lx TR: %.4lx\n\n", - TrapFrame->HardwareSegSs, Special->Ldtr, Special->Idtr.Limit); + (USHORT)TrapFrame->HardwareSegSs, Special->Ldtr, Special->Tr); i386PrintFrames(TrapFrame); // Display frames InstructionPointer = (PUCHAR)TrapFrame->Eip; @@ -176,7 +180,7 @@ i386PrintExceptionText(ULONG TrapIndex, PKTRAP_FRAME TrapFrame, PKSPECIAL_REGIST PrintText("GS: %.4lx IDTR Base: %.8lx Limit: %.4x\n", TrapFrame->SegGs, Special->Idtr.Base, Special->Idtr.Limit); PrintText("SS: %.4lx LDTR: %.4lx TR: %.4lx\n\n", - TrapFrame->SegSs, Special->Ldtr, Special->Idtr.Limit); + TrapFrame->SegSs, Special->Ldtr, Special->Tr); InstructionPointer = (PUCHAR)TrapFrame->Rip; #endif PrintText("\nInstruction stream: %.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x \n",

1 0

[reactos] 03/03: 🎊 🍾 🥳 Happy New Year 2022 to the ReactOS Community! 🎆 ⚛️ ☢️
by Hermès Bélusca-Maïto 31 Dec '21

31 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=10a976e78f2eaeaafb052… commit 10a976e78f2eaeaafb05207c8191cebb1f01654e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jan 1 00:00:00 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jan 1 00:00:00 2022 +0100 🎊 🍾 🥳 Happy New Year 2022 to the ReactOS Community! 🎆 ⚛️ ☢️ .:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.: __, ,__) __, ,__) __, ,__) ░▄████▄░▄███▄░▄████▄░▄████▄░ (--|__| _ ,_ ,_ (--|\ | _ (--\ | _ _ ,_ ░▀▀░▄██░██░██░▀▀░▄██░▀▀░▄██░ _| |(_||_)|_)(_| _| \|(/_(_|_) \|(/_(_|| ░░▄██▀░░██░██░░▄██▀░░░▄██▀░░ ( | | ,_| ( (__| ░██████░▀███▀░██████░██████░ .:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.: --- dll/win32/msgina/resources/reactos.bmp | Bin 89334 -> 89334 bytes dll/win32/msgina/resources/svg/reactos.svg | 2 +- dll/win32/msgina/resources/svg/rosbanner.svg | 2 +- dll/win32/shell32/res/bitmaps/reactos.bmp | Bin 89334 -> 89334 bytes dll/win32/shell32/res/bitmaps/reactosserver.bmp | Bin 89334 -> 89334 bytes .../shell32/res/bitmaps/reactosworkstation.bmp | Bin 89334 -> 89334 bytes dll/win32/syssetup/resources/reactos.bmp | Bin 89334 -> 89334 bytes ntoskrnl/inbv/resources/copyright.bmp | Bin 1830 -> 1850 bytes sdk/include/reactos/version.cmake | 2 +- 9 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/msgina/resources/reactos.bmp b/dll/win32/msgina/resources/reactos.bmp index 0195a53a7d2..9c562375bfb 100644 Binary files a/dll/win32/msgina/resources/reactos.bmp and b/dll/win32/msgina/resources/reactos.bmp differ diff --git a/dll/win32/msgina/resources/svg/reactos.svg b/dll/win32/msgina/resources/svg/reactos.svg index 55f54057c41..084e4504459 100644 --- a/dll/win32/msgina/resources/svg/reactos.svg +++ b/dll/win32/msgina/resources/svg/reactos.svg @@ -1928,7 +1928,7 @@ x="5.59375" y="1047.7255" style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#1e2122;fill-opacity:1;font-family:Lucida Sans Unicode;-inkscape-font-specification:Lucida Sans Unicode" - id="tspan3618">Copyright © 1996-2021 ReactOS Team & Contributors</tspan></text> + id="tspan3618">Copyright © 1996-2022 ReactOS Team & Contributors</tspan></text> <g transform="matrix(0.16958533,0,0,0.16958533,89.849943,981.79073)" id="g15501"> diff --git a/dll/win32/msgina/resources/svg/rosbanner.svg b/dll/win32/msgina/resources/svg/rosbanner.svg index 3591265e07b..64bc94b3f70 100644 --- a/dll/win32/msgina/resources/svg/rosbanner.svg +++ b/dll/win32/msgina/resources/svg/rosbanner.svg @@ -1727,7 +1727,7 @@ id="tspan196" x="48.681915" y="18.210854" - style="font-size:2.11667px;fill:#ffffff;stroke-width:0.264583">Copyright © 1996 - 2021 ReactOS Team & Contributors</tspan></text> + style="font-size:2.11667px;fill:#ffffff;stroke-width:0.264583">Copyright © 1996 - 2022 ReactOS Team & Contributors</tspan></text> </g> <g inkscape:groupmode="layer" diff --git a/dll/win32/shell32/res/bitmaps/reactos.bmp b/dll/win32/shell32/res/bitmaps/reactos.bmp index 0195a53a7d2..9c562375bfb 100644 Binary files a/dll/win32/shell32/res/bitmaps/reactos.bmp and b/dll/win32/shell32/res/bitmaps/reactos.bmp differ diff --git a/dll/win32/shell32/res/bitmaps/reactosserver.bmp b/dll/win32/shell32/res/bitmaps/reactosserver.bmp index 9410cfd6896..98828a54bd1 100644 Binary files a/dll/win32/shell32/res/bitmaps/reactosserver.bmp and b/dll/win32/shell32/res/bitmaps/reactosserver.bmp differ diff --git a/dll/win32/shell32/res/bitmaps/reactosworkstation.bmp b/dll/win32/shell32/res/bitmaps/reactosworkstation.bmp index 27921a18fb3..b1f36913070 100644 Binary files a/dll/win32/shell32/res/bitmaps/reactosworkstation.bmp and b/dll/win32/shell32/res/bitmaps/reactosworkstation.bmp differ diff --git a/dll/win32/syssetup/resources/reactos.bmp b/dll/win32/syssetup/resources/reactos.bmp index 0195a53a7d2..9c562375bfb 100644 Binary files a/dll/win32/syssetup/resources/reactos.bmp and b/dll/win32/syssetup/resources/reactos.bmp differ diff --git a/ntoskrnl/inbv/resources/copyright.bmp b/ntoskrnl/inbv/resources/copyright.bmp index 53e0c83f4b5..a79c23d38f6 100644 Binary files a/ntoskrnl/inbv/resources/copyright.bmp and b/ntoskrnl/inbv/resources/copyright.bmp differ diff --git a/sdk/include/reactos/version.cmake b/sdk/include/reactos/version.cmake index 8d326087e0b..2bfda9e47af 100644 --- a/sdk/include/reactos/version.cmake +++ b/sdk/include/reactos/version.cmake @@ -9,7 +9,7 @@ endif() set(KERNEL_VERSION_MAJOR "0") set(KERNEL_VERSION_MINOR "4") set(KERNEL_VERSION_PATCH_LEVEL "15") -set(COPYRIGHT_YEAR "2021") +set(COPYRIGHT_YEAR "2022") # KERNEL_VERSION_BUILD_TYPE is "dev" for Git builds # or "RC1", "RC2", "" for releases.

1 0

[reactos] 02/03: [MSGINA][SHELL32] Update some resources information.
by Hermès Bélusca-Maïto 31 Dec '21

31 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e05010193e01162f0a0fc… commit e05010193e01162f0a0fcd95ea13bac89fedb76d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Dec 31 17:58:54 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Dec 31 23:55:32 2021 +0100 [MSGINA][SHELL32] Update some resources information. --- dll/win32/msgina/resources/README.txt | 4 ++-- dll/win32/msgina/resources/svg/reactos.svg | 6 ++---- dll/win32/msgina/resources/svg/rosbanner.svg | 2 +- dll/win32/shell32/res/bitmaps/Readme.txt | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dll/win32/msgina/resources/README.txt b/dll/win32/msgina/resources/README.txt index d211058325c..0c8da7d0c36 100644 --- a/dll/win32/msgina/resources/README.txt +++ b/dll/win32/msgina/resources/README.txt @@ -4,7 +4,7 @@ dlg_bg.bmp image_strip.bmp reactos_flag.bmp -Its source is available as the following files: +Their source is available as the following files: svg/background.svg svg/flag.svg @@ -12,4 +12,4 @@ svg/shut_down.svg svg/sleep_hibernate.svg svg/reboot.svg -These files are in the public domain. \ No newline at end of file +These files are in the public domain. diff --git a/dll/win32/msgina/resources/svg/reactos.svg b/dll/win32/msgina/resources/svg/reactos.svg index b7b16388f2e..55f54057c41 100644 --- a/dll/win32/msgina/resources/svg/reactos.svg +++ b/dll/win32/msgina/resources/svg/reactos.svg @@ -1,6 +1,4 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> - - <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" @@ -17,8 +15,8 @@ inkscape:version="0.48.2 r9819" sodipodi:docname="reactos.svg" inkscape:export-filename="reactos.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> <defs id="defs4"> <linearGradient diff --git a/dll/win32/msgina/resources/svg/rosbanner.svg b/dll/win32/msgina/resources/svg/rosbanner.svg index 0320420388f..3591265e07b 100644 --- a/dll/win32/msgina/resources/svg/rosbanner.svg +++ b/dll/win32/msgina/resources/svg/rosbanner.svg @@ -13,7 +13,7 @@ viewBox="0 0 109.27291 19.050001" version="1.1" id="svg8" - inkscape:export-filename=".\reactos.png" + inkscape:export-filename="reactos.png" inkscape:export-xdpi="96" inkscape:export-ydpi="96" inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)" diff --git a/dll/win32/shell32/res/bitmaps/Readme.txt b/dll/win32/shell32/res/bitmaps/Readme.txt index 4a466bb6c26..41516f01ddb 100644 --- a/dll/win32/shell32/res/bitmaps/Readme.txt +++ b/dll/win32/shell32/res/bitmaps/Readme.txt @@ -7,4 +7,4 @@ Its source is available as the following files: svg/log_off.svg svg/switch_user.svg -These files are in the public domain. \ No newline at end of file +These files are in the public domain.

1 0

[reactos] 01/03: [FREELDR] Use actual ReactOS copyright year.
by Hermès Bélusca-Maïto 31 Dec '21

31 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=50eaa449f848a5693b3ac… commit 50eaa449f848a5693b3ac656e15920ff78887b63 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Dec 31 17:52:25 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Dec 31 23:55:31 2021 +0100 [FREELDR] Use actual ReactOS copyright year. --- boot/freeldr/freeldr/include/ver.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/freeldr/freeldr/include/ver.h b/boot/freeldr/freeldr/include/ver.h index a7b7f2af488..8d3088aceba 100644 --- a/boot/freeldr/freeldr/include/ver.h +++ b/boot/freeldr/freeldr/include/ver.h @@ -21,7 +21,7 @@ /* Just some stuff */ #define VERSION "FreeLoader v3.0" -#define COPYRIGHT "Copyright (C) 1998-2007 ReactOS Team" +#define COPYRIGHT "Copyright (C) 1998-" COPYRIGHT_YEAR " ReactOS Team" #define AUTHOR_EMAIL "<www.reactos.org>" #define BY_AUTHOR "by ReactOS Team"

1 0

[reactos] 02/02: [PSDK] Add some missing argument names
by Mark Jansen 31 Dec '21

31 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b1c06c035c3786fb1b23… commit 3b1c06c035c3786fb1b230e5a41d75c77f05e87d Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Dec 30 20:17:52 2021 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Dec 31 21:27:48 2021 +0100 [PSDK] Add some missing argument names --- sdk/include/psdk/winbase.h | 6 +++--- sdk/include/psdk/winreg.h | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sdk/include/psdk/winbase.h b/sdk/include/psdk/winbase.h index 1e7071fda07..12e61c70900 100644 --- a/sdk/include/psdk/winbase.h +++ b/sdk/include/psdk/winbase.h @@ -2183,8 +2183,8 @@ DWORD WINAPI GetLongPathNameA(LPCSTR,LPSTR,DWORD); DWORD WINAPI GetLongPathNameW(LPCWSTR,LPWSTR,DWORD); #endif BOOL WINAPI GetMailslotInfo(_In_ HANDLE, _Out_opt_ PDWORD, _Out_opt_ PDWORD, _Out_opt_ PDWORD, _Out_opt_ PDWORD); -DWORD WINAPI GetModuleFileNameA(HINSTANCE,LPSTR,DWORD); -DWORD WINAPI GetModuleFileNameW(HINSTANCE,LPWSTR,DWORD); +DWORD WINAPI GetModuleFileNameA(HINSTANCE hModule,LPSTR lpFilename,DWORD nSize); +DWORD WINAPI GetModuleFileNameW(HINSTANCE hModule,LPWSTR lpFilename,DWORD nSize); HMODULE WINAPI GetModuleHandleA(LPCSTR); HMODULE WINAPI GetModuleHandleW(LPCWSTR); #if (_WIN32_WINNT >= 0x0500) @@ -2406,7 +2406,7 @@ BOOL WINAPI GetSystemPowerStatus(_Out_ LPSYSTEM_POWER_STATUS); #if (_WIN32_WINNT >= 0x0502) BOOL WINAPI GetSystemRegistryQuota(_Out_opt_ PDWORD, _Out_opt_ PDWORD); #endif -VOID WINAPI GetSystemTime(LPSYSTEMTIME); +VOID WINAPI GetSystemTime(LPSYSTEMTIME lpSystemTime); #if (_WIN32_WINNT >= 0x0501) BOOL WINAPI GetSystemTimes(_Out_opt_ LPFILETIME, _Out_opt_ LPFILETIME, _Out_opt_ LPFILETIME); #endif diff --git a/sdk/include/psdk/winreg.h b/sdk/include/psdk/winreg.h index d4e42fbd0a7..bfcb4e59d55 100644 --- a/sdk/include/psdk/winreg.h +++ b/sdk/include/psdk/winreg.h @@ -93,7 +93,7 @@ BOOL WINAPI InitiateSystemShutdownA(_In_opt_ LPSTR, _In_opt_ LPSTR, _In_ DWORD, BOOL WINAPI InitiateSystemShutdownW(_In_opt_ LPWSTR, _In_opt_ LPWSTR, _In_ DWORD, _In_ BOOL, _In_ BOOL); BOOL WINAPI InitiateSystemShutdownExA(_In_opt_ LPSTR, _In_opt_ LPSTR, _In_ DWORD, _In_ BOOL, _In_ BOOL, _In_ DWORD); BOOL WINAPI InitiateSystemShutdownExW(_In_opt_ LPWSTR, _In_opt_ LPWSTR, _In_ DWORD, _In_ BOOL, _In_ BOOL, _In_ DWORD); -LSTATUS WINAPI RegCloseKey(_In_ HKEY); +LSTATUS WINAPI RegCloseKey(_In_ HKEY hKey); LSTATUS WINAPI RegConnectRegistryA(_In_opt_ LPCSTR, _In_ HKEY, _Out_ PHKEY); LSTATUS WINAPI RegConnectRegistryW(_In_opt_ LPCWSTR,_In_ HKEY, _Out_ PHKEY); @@ -102,14 +102,14 @@ LSTATUS WINAPI RegCopyTreeA(_In_ HKEY, _In_opt_ LPCSTR, _In_ HKEY); LSTATUS WINAPI RegCopyTreeW(_In_ HKEY, _In_opt_ LPCWSTR, _In_ HKEY); #endif -LSTATUS WINAPI RegCreateKeyA(_In_ HKEY, _In_opt_ LPCSTR, _Out_ PHKEY); -LSTATUS WINAPI RegCreateKeyW(_In_ HKEY, _In_opt_ LPCWSTR, _Out_ PHKEY); -LSTATUS WINAPI RegCreateKeyExA(_In_ HKEY, _In_ LPCSTR, _Reserved_ DWORD, _In_opt_ LPSTR, _In_ DWORD, _In_ REGSAM, _In_opt_ LPSECURITY_ATTRIBUTES, _Out_ PHKEY, _Out_opt_ PDWORD); -LSTATUS WINAPI RegCreateKeyExW(_In_ HKEY, _In_ LPCWSTR, _Reserved_ DWORD, _In_opt_ LPWSTR, _In_ DWORD, _In_ REGSAM, _In_opt_ LPSECURITY_ATTRIBUTES, _Out_ PHKEY, _Out_opt_ PDWORD); -LSTATUS WINAPI RegDeleteKeyA(_In_ HKEY, _In_ LPCSTR); -LSTATUS WINAPI RegDeleteKeyW(_In_ HKEY, _In_ LPCWSTR); -LSTATUS WINAPI RegDeleteKeyExA(_In_ HKEY, _In_ LPCSTR, _In_ REGSAM, _Reserved_ DWORD); -LSTATUS WINAPI RegDeleteKeyExW(_In_ HKEY, _In_ LPCWSTR, _In_ REGSAM, _Reserved_ DWORD); +LSTATUS WINAPI RegCreateKeyA(_In_ HKEY hKey, _In_opt_ LPCSTR lpSubKey, _Out_ PHKEY phkResult); +LSTATUS WINAPI RegCreateKeyW(_In_ HKEY hKey, _In_opt_ LPCWSTR lpSubKey, _Out_ PHKEY phkResult); +LSTATUS WINAPI RegCreateKeyExA(_In_ HKEY hKey, _In_ LPCSTR lpSubKey, _Reserved_ DWORD Reserved, _In_opt_ LPSTR lpClass, _In_ DWORD dwOptions, _In_ REGSAM samDesired, _In_opt_ LPSECURITY_ATTRIBUTES lpSecurityAttributes, _Out_ PHKEY phkResult, _Out_opt_ PDWORD lpdwDisposition); +LSTATUS WINAPI RegCreateKeyExW(_In_ HKEY hKey, _In_ LPCWSTR lpSubKey, _Reserved_ DWORD Reserved, _In_opt_ LPWSTR lpClass, _In_ DWORD dwOptions, _In_ REGSAM samDesired, _In_opt_ LPSECURITY_ATTRIBUTES lpSecurityAttributes, _Out_ PHKEY phkResult, _Out_opt_ PDWORD lpdwDisposition); +LSTATUS WINAPI RegDeleteKeyA(_In_ HKEY hKey, _In_ LPCSTR lpSubKey); +LSTATUS WINAPI RegDeleteKeyW(_In_ HKEY hKey, _In_ LPCWSTR lpSubKey); +LSTATUS WINAPI RegDeleteKeyExA(_In_ HKEY hKey, _In_ LPCSTR lpSubKey, _In_ REGSAM samDesired, _Reserved_ DWORD Reserved); +LSTATUS WINAPI RegDeleteKeyExW(_In_ HKEY hKey, _In_ LPCWSTR lpSubKey, _In_ REGSAM samDesired, _Reserved_ DWORD Reserved); #if (_WIN32_WINNT >= 0x0600) LSTATUS WINAPI RegDeleteKeyValueA(_In_ HKEY, _In_opt_ LPCSTR, _In_opt_ LPCSTR);

1 0

[reactos] 01/02: [RAPPS] Show the user that there are no search results
by Mark Jansen 31 Dec '21

31 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=acc25ce9145688cac8f6a… commit acc25ce9145688cac8f6aef26e648ce6dd130d75 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Dec 30 20:17:32 2021 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Dec 31 21:27:48 2021 +0100 [RAPPS] Show the user that there are no search results CORE-17944 --- base/applications/rapps/appview.cpp | 37 ++++++++++++++++++++++++++++++ base/applications/rapps/gui.cpp | 8 +++++++ base/applications/rapps/include/appview.h | 13 ++++++++++- base/applications/rapps/include/resource.h | 1 + base/applications/rapps/lang/bg-BG.rc | 1 + base/applications/rapps/lang/cs-CZ.rc | 1 + base/applications/rapps/lang/de-DE.rc | 1 + base/applications/rapps/lang/en-US.rc | 1 + base/applications/rapps/lang/es-ES.rc | 1 + base/applications/rapps/lang/et-EE.rc | 1 + base/applications/rapps/lang/fr-FR.rc | 1 + base/applications/rapps/lang/he-IL.rc | 1 + base/applications/rapps/lang/hu-HU.rc | 1 + base/applications/rapps/lang/id-ID.rc | 1 + base/applications/rapps/lang/it-IT.rc | 1 + base/applications/rapps/lang/ja-JP.rc | 1 + base/applications/rapps/lang/no-NO.rc | 1 + base/applications/rapps/lang/pl-PL.rc | 1 + base/applications/rapps/lang/pt-BR.rc | 1 + base/applications/rapps/lang/pt-PT.rc | 1 + base/applications/rapps/lang/ro-RO.rc | 1 + base/applications/rapps/lang/ru-RU.rc | 1 + base/applications/rapps/lang/sk-SK.rc | 1 + base/applications/rapps/lang/sq-AL.rc | 1 + base/applications/rapps/lang/sv-SE.rc | 1 + base/applications/rapps/lang/tr-TR.rc | 1 + base/applications/rapps/lang/uk-UA.rc | 1 + base/applications/rapps/lang/zh-CN.rc | 1 + base/applications/rapps/lang/zh-HK.rc | 1 + base/applications/rapps/lang/zh-TW.rc | 1 + 30 files changed, 84 insertions(+), 1 deletion(-) diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index 09bbb178a9a..7cffc3748bb 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -1127,6 +1127,30 @@ CAppsListView::~CAppsListView() } } +LRESULT +CAppsListView::OnEraseBackground(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + LRESULT lRes = this->DefWindowProc(uMsg, wParam, lParam); + if (!m_Watermark.IsEmpty()) + { + RECT rc; + GetClientRect(&rc); + HGDIOBJ oldFont = SelectFont(HDC(wParam), GetStockFont(DEFAULT_GUI_FONT)); + DrawShadowText( + HDC(wParam), m_Watermark.GetString(), m_Watermark.GetLength(), &rc, + DT_CENTER | DT_VCENTER | DT_NOPREFIX | DT_SINGLELINE, GetSysColor(COLOR_GRAYTEXT), + GetSysColor(COLOR_GRAYTEXT), 1, 1); + SelectFont(HDC(wParam), oldFont); + } + return lRes; +} + +VOID CAppsListView::SetWatermark(const CStringW& Text) +{ + m_Watermark = Text; +} + + VOID CAppsListView::SetCheckboxesVisible(BOOL bIsVisible) { if (bIsVisible) @@ -1279,6 +1303,12 @@ HWND CAppsListView::Create(HWND hwndParent) SetImageList(m_hImageListView, LVSIL_SMALL); SetImageList(m_hImageListView, LVSIL_NORMAL); +#pragma push_macro("SubclassWindow") +#undef SubclassWindow + m_hWnd = NULL; + SubclassWindow(hwnd); +#pragma pop_macro("SubclassWindow") + return hwnd; } @@ -2015,6 +2045,13 @@ BOOL CApplicationView::AddAvailableApplication(CAvailableApplicationInfo *AvlbAp return m_ListView->AddAvailableApplication(AvlbAppInfo, InitCheckState, param); } +VOID CApplicationView::SetWatermark(const CStringW& Text) +{ + ATLASSERT(GetItemCount() == 0); + + m_ListView->SetWatermark(Text); +} + void CApplicationView::CheckAll() { m_ListView->CheckAll(); diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index 8b26bc2a2f1..a7590e51a43 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -706,6 +706,14 @@ VOID CMainWindow::UpdateApplicationsList(INT EnumType) m_ApplicationView->SetRedraw(TRUE); m_ApplicationView->RedrawWindow(0, 0, RDW_INVALIDATE | RDW_ALLCHILDREN); // force the child window to repaint UpdateStatusBarText(); + + CStringW text; + if (m_ApplicationView->GetItemCount() == 0 && !szSearchPattern.IsEmpty()) + { + text.LoadString(IDS_NO_SEARCH_RESULTS); + } + m_ApplicationView->SetWatermark(text); + bUpdating = FALSE; } diff --git a/base/applications/rapps/include/appview.h b/base/applications/rapps/include/appview.h index 7a6374ccafa..206f99e37ab 100644 --- a/base/applications/rapps/include/appview.h +++ b/base/applications/rapps/include/appview.h @@ -201,7 +201,7 @@ public: }; class CAppsListView : - public CUiWindow<CListView> + public CUiWindow<CWindowImpl<CAppsListView, CListView>> { struct SortContext { @@ -221,11 +221,20 @@ class CAppsListView : APPLICATION_VIEW_TYPE ApplicationViewType = AppViewTypeEmpty; HIMAGELIST m_hImageListView = NULL; + CStringW m_Watermark; + + BEGIN_MSG_MAP(CAppsListView) + MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground) + END_MSG_MAP() + + + LRESULT OnEraseBackground(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); public: CAppsListView(); ~CAppsListView(); + VOID SetWatermark(const CStringW& Text); VOID SetCheckboxesVisible(BOOL bIsVisible); VOID ColumnClick(LPNMLISTVIEW pnmv); @@ -372,6 +381,8 @@ public: BOOL AddInstalledApplication(CInstalledApplicationInfo *InstAppInfo, LPVOID param); BOOL AddAvailableApplication(CAvailableApplicationInfo *AvlbAppInfo, BOOL InitCheckState, LPVOID param); + VOID SetWatermark(const CStringW& Text); + void CheckAll(); PVOID GetFocusedItemData(); diff --git a/base/applications/rapps/include/resource.h b/base/applications/rapps/include/resource.h index 023fcdda882..bb4249cedc1 100644 --- a/base/applications/rapps/include/resource.h +++ b/base/applications/rapps/include/resource.h @@ -123,6 +123,7 @@ #define IDS_APP_DISPLAY_DETAILS 133 #define IDS_APP_DISPLAY_LIST 134 #define IDS_APP_DISPLAY_TILE 135 +#define IDS_NO_SEARCH_RESULTS 136 /* Tooltips */ #define IDS_TOOLTIP_INSTALL 200 diff --git a/base/applications/rapps/lang/bg-BG.rc b/base/applications/rapps/lang/bg-BG.rc index 82f7814246e..f81020f4310 100644 --- a/base/applications/rapps/lang/bg-BG.rc +++ b/base/applications/rapps/lang/bg-BG.rc @@ -218,6 +218,7 @@ BEGIN IDS_APP_DISPLAY_DETAILS "Details" IDS_APP_DISPLAY_LIST "List" IDS_APP_DISPLAY_TILE "Tile" + IDS_NO_SEARCH_RESULTS "No search results" END STRINGTABLE diff --git a/base/applications/rapps/lang/cs-CZ.rc b/base/applications/rapps/lang/cs-CZ.rc index e29d47af284..e2670f3ac0c 100644 --- a/base/applications/rapps/lang/cs-CZ.rc +++ b/base/applications/rapps/lang/cs-CZ.rc @@ -219,6 +219,7 @@ BEGIN IDS_APP_DISPLAY_DETAILS "Details" IDS_APP_DISPLAY_LIST "List" IDS_APP_DISPLAY_TILE "Tile" + IDS_NO_SEARCH_RESULTS "No search results" END STRINGTABLE diff --git a/base/applications/rapps/lang/de-DE.rc b/base/applications/rapps/lang/de-DE.rc index 93ebd353bf0..476cd6d086e 100644 --- a/base/applications/rapps/lang/de-DE.rc +++ b/base/applications/rapps/lang/de-DE.rc @@ -214,6 +214,7 @@ BEGIN IDS_APP_DISPLAY_DETAILS "Details" IDS_APP_DISPLAY_LIST "Liste" IDS_APP_DISPLAY_TILE "Kacheln" + IDS_NO_SEARCH_RESULTS "No search results" END STRINGTABLE diff --git a/base/applications/rapps/lang/en-US.rc b/base/applications/rapps/lang/en-US.rc index 3f151c10dab..4c4c8bff35f 100644 --- a/base/applications/rapps/lang/en-US.rc +++ b/base/applications/rapps/lang/en-US.rc @@ -214,6 +214,7 @@ BEGIN IDS_APP_DISPLAY_DETAILS "Details" IDS_APP_DISPLAY_LIST "List" IDS_APP_DISPLAY_TILE "Tile" + IDS_NO_SEARCH_RESULTS "No search results" END STRINGTABLE diff --git a/base/applications/rapps/lang/es-ES.rc b/base/applications/rapps/lang/es-ES.rc index 6bbec17dd19..12c7aa808a5 100644 --- a/base/applications/rapps/lang/es-ES.rc +++ b/base/applications/rapps/lang/es-ES.rc @@ -217,6 +217,7 @@ BEGIN IDS_APP_DISPLAY_DETAILS "Details" IDS_APP_DISPLAY_LIST "List" IDS_APP_DISPLAY_TILE "Tile" + IDS_NO_SEARCH_RESULTS "No search results" END STRINGTABLE diff --git a/base/applications/rapps/lang/et-EE.rc b/base/applications/rapps/lang/et-EE.rc index 659c28d953b..8db73934252 100644 --- a/base/applications/rapps/lang/et-EE.rc +++ b/base/applications/rapps/lang/et-EE.rc @@ -222,6 +222,7 @@ BEGIN IDS_APP_DISPLAY_DETAILS "Details" IDS_APP_DISPLAY_LIST "List" IDS_APP_DISPLAY_TILE "Tile" + IDS_NO_SEARCH_RESULTS "No search results" END STRINGTABLE diff --git a/base/applications/rapps/lang/fr-FR.rc b/base/applications/rapps/lang/fr-FR.rc index 6ee794799b9..499cdda5851 100644 --- a/base/applications/rapps/lang/fr-FR.rc +++ b/base/applications/rapps/lang/fr-FR.rc @@ -214,6 +214,7 @@ BEGIN IDS_APP_DISPLAY_DETAILS "Détails" IDS_APP_DISPLAY_LIST "Liste" IDS_APP_DISPLAY_TILE "Tuile" + IDS_NO_SEARCH_RESULTS "No search results" END STRINGTABLE diff --git a/base/applications/rapps/lang/he-IL.rc b/base/applications/rapps/lang/he-IL.rc index 306fe22928f..ff689d5a33a 100644 --- a/base/applications/rapps/lang/he-IL.rc +++ b/base/applications/rapps/lang/he-IL.rc @@ -220,6 +220,7 @@ BEGIN IDS_APP_DISPLAY_DETAILS "Details" IDS_APP_DISPLAY_LIST "List" IDS_APP_DISPLAY_TILE "Tile" + IDS_NO_SEARCH_RESULTS "No search results" END STRINGTABLE diff --git a/base/applications/rapps/lang/hu-HU.rc b/base/applications/rapps/lang/hu-HU.rc index 2e1bb14b662..50c6ae4e7cf 100644 --- a/base/applications/rapps/lang/hu-HU.rc +++ b/base/applications/rapps/lang/hu-HU.rc @@ -216,6 +216,7 @@ BEGIN IDS_APP_DISPLAY_DETAILS "Részletek" IDS_APP_DISPLAY_LIST "Lista" IDS_APP_DISPLAY_TILE "Csempe" + IDS_NO_SEARCH_RESULTS "No search results" END STRINGTABLE diff --git a/base/applications/rapps/lang/id-ID.rc b/base/applications/rapps/lang/id-ID.rc index 4907c52af91..c8b11ebd592 100644 --- a/base/applications/rapps/lang/id-ID.rc +++ b/base/applications/rapps/lang/id-ID.rc @@ -214,6 +214,7 @@ BEGIN IDS_APP_DISPLAY_DETAILS "Details" IDS_APP_DISPLAY_LIST "List" IDS_APP_DISPLAY_TILE "Tile" + IDS_NO_SEARCH_RESULTS "No search results" END STRINGTABLE diff --git a/base/applications/rapps/lang/it-IT.rc b/base/applications/rapps/lang/it-IT.rc index ebe78af30e9..1ca702e8d1c 100644 --- a/base/applications/rapps/lang/it-IT.rc +++ b/base/applications/rapps/lang/it-IT.rc @@ -214,6 +214,7 @@ BEGIN IDS_APP_DISPLAY_DETAILS "Details" IDS_APP_DISPLAY_LIST "List" IDS_APP_DISPLAY_TILE "Tile" + IDS_NO_SEARCH_RESULTS "No search results" END STRINGTABLE diff --git a/base/applications/rapps/lang/ja-JP.rc b/base/applications/rapps/lang/ja-JP.rc index 7c26a55f3e7..6d11465afa1 100644 --- a/base/applications/rapps/lang/ja-JP.rc +++ b/base/applications/rapps/lang/ja-JP.rc @@ -214,6 +214,7 @@ BEGIN IDS_APP_DISPLAY_DETAILS "Details" IDS_APP_DISPLAY_LIST "List" IDS_APP_DISPLAY_TILE "Tile" + IDS_NO_SEARCH_RESULTS "No search results" END STRINGTABLE diff --git a/base/applications/rapps/lang/no-NO.rc b/base/applications/rapps/lang/no-NO.rc index 043f551ae6c..605c223fd29 100644 --- a/base/applications/rapps/lang/no-NO.rc +++ b/base/applications/rapps/lang/no-NO.rc @@ -214,6 +214,7 @@ BEGIN IDS_APP_DISPLAY_DETAILS "Details" IDS_APP_DISPLAY_LIST "List" IDS_APP_DISPLAY_TILE "Tile" + IDS_NO_SEARCH_RESULTS "No search results" END STRINGTABLE diff --git a/base/applications/rapps/lang/pl-PL.rc b/base/applications/rapps/lang/pl-PL.rc index 3b82b312267..c32f17306d3 100644 --- a/base/applications/rapps/lang/pl-PL.rc +++ b/base/applications/rapps/lang/pl-PL.rc @@ -223,6 +223,7 @@ BEGIN IDS_APP_DISPLAY_DETAILS "Szczegóły" IDS_APP_DISPLAY_LIST "Lista" IDS_APP_DISPLAY_TILE "Kafelki" + IDS_NO_SEARCH_RESULTS "No search results" END STRINGTABLE diff --git a/base/applications/rapps/lang/pt-BR.rc b/base/applications/rapps/lang/pt-BR.rc index d507c54b8f3..1bd4c71f3b2 100644 --- a/base/applications/rapps/lang/pt-BR.rc +++ b/base/applications/rapps/lang/pt-BR.rc @@ -216,6 +216,7 @@ BEGIN IDS_APP_DISPLAY_DETAILS "Details" IDS_APP_DISPLAY_LIST "List" IDS_APP_DISPLAY_TILE "Tile" + IDS_NO_SEARCH_RESULTS "No search results" END STRINGTABLE diff --git a/base/applications/rapps/lang/pt-PT.rc b/base/applications/rapps/lang/pt-PT.rc index c9cf992be2c..c7c0fbded2f 100644 --- a/base/applications/rapps/lang/pt-PT.rc +++ b/base/applications/rapps/lang/pt-PT.rc @@ -216,6 +216,7 @@ BEGIN IDS_APP_DISPLAY_DETAILS "Details" IDS_APP_DISPLAY_LIST "List" IDS_APP_DISPLAY_TILE "Tile" + IDS_NO_SEARCH_RESULTS "No search results" END STRINGTABLE diff --git a/base/applications/rapps/lang/ro-RO.rc b/base/applications/rapps/lang/ro-RO.rc index c958987a43b..cfd6b0e4aec 100644 --- a/base/applications/rapps/lang/ro-RO.rc +++ b/base/applications/rapps/lang/ro-RO.rc @@ -223,6 +223,7 @@ BEGIN IDS_APP_DISPLAY_DETAILS "Details" IDS_APP_DISPLAY_LIST "List" IDS_APP_DISPLAY_TILE "Tile" + IDS_NO_SEARCH_RESULTS "No search results" END STRINGTABLE diff --git a/base/applications/rapps/lang/ru-RU.rc b/base/applications/rapps/lang/ru-RU.rc index 0ae6e33e89b..71efe6844ef 100644 --- a/base/applications/rapps/lang/ru-RU.rc +++ b/base/applications/rapps/lang/ru-RU.rc @@ -214,6 +214,7 @@ BEGIN IDS_APP_DISPLAY_DETAILS "Details" IDS_APP_DISPLAY_LIST "List" IDS_APP_DISPLAY_TILE "Tile" + IDS_NO_SEARCH_RESULTS "No search results" END STRINGTABLE diff --git a/base/applications/rapps/lang/sk-SK.rc b/base/applications/rapps/lang/sk-SK.rc index 1b261b21feb..f029af632ee 100644 --- a/base/applications/rapps/lang/sk-SK.rc +++ b/base/applications/rapps/lang/sk-SK.rc @@ -219,6 +219,7 @@ BEGIN IDS_APP_DISPLAY_DETAILS "Details" IDS_APP_DISPLAY_LIST "List" IDS_APP_DISPLAY_TILE "Tile" + IDS_NO_SEARCH_RESULTS "No search results" END STRINGTABLE diff --git a/base/applications/rapps/lang/sq-AL.rc b/base/applications/rapps/lang/sq-AL.rc index 0ee3a66f24c..99b28381606 100644 --- a/base/applications/rapps/lang/sq-AL.rc +++ b/base/applications/rapps/lang/sq-AL.rc @@ -218,6 +218,7 @@ BEGIN IDS_APP_DISPLAY_DETAILS "Details" IDS_APP_DISPLAY_LIST "List" IDS_APP_DISPLAY_TILE "Tile" + IDS_NO_SEARCH_RESULTS "No search results" END STRINGTABLE diff --git a/base/applications/rapps/lang/sv-SE.rc b/base/applications/rapps/lang/sv-SE.rc index 5c3800d4200..46c7a7df733 100644 --- a/base/applications/rapps/lang/sv-SE.rc +++ b/base/applications/rapps/lang/sv-SE.rc @@ -221,6 +221,7 @@ BEGIN IDS_APP_DISPLAY_DETAILS "Details" IDS_APP_DISPLAY_LIST "List" IDS_APP_DISPLAY_TILE "Tile" + IDS_NO_SEARCH_RESULTS "No search results" END STRINGTABLE diff --git a/base/applications/rapps/lang/tr-TR.rc b/base/applications/rapps/lang/tr-TR.rc index 53b348f1fb2..a03094e8896 100644 --- a/base/applications/rapps/lang/tr-TR.rc +++ b/base/applications/rapps/lang/tr-TR.rc @@ -216,6 +216,7 @@ BEGIN IDS_APP_DISPLAY_DETAILS "Detaylar" IDS_APP_DISPLAY_LIST "Liste" IDS_APP_DISPLAY_TILE "Karo" + IDS_NO_SEARCH_RESULTS "No search results" END STRINGTABLE diff --git a/base/applications/rapps/lang/uk-UA.rc b/base/applications/rapps/lang/uk-UA.rc index 46bfb100389..c618712d4a4 100644 --- a/base/applications/rapps/lang/uk-UA.rc +++ b/base/applications/rapps/lang/uk-UA.rc @@ -222,6 +222,7 @@ BEGIN IDS_APP_DISPLAY_DETAILS "Details" IDS_APP_DISPLAY_LIST "List" IDS_APP_DISPLAY_TILE "Tile" + IDS_NO_SEARCH_RESULTS "No search results" END STRINGTABLE diff --git a/base/applications/rapps/lang/zh-CN.rc b/base/applications/rapps/lang/zh-CN.rc index f82334fa9d0..3cec27c9b99 100644 --- a/base/applications/rapps/lang/zh-CN.rc +++ b/base/applications/rapps/lang/zh-CN.rc @@ -217,6 +217,7 @@ BEGIN IDS_APP_DISPLAY_DETAILS "细节" IDS_APP_DISPLAY_LIST "列表" IDS_APP_DISPLAY_TILE "卡片" + IDS_NO_SEARCH_RESULTS "No search results" END STRINGTABLE diff --git a/base/applications/rapps/lang/zh-HK.rc b/base/applications/rapps/lang/zh-HK.rc index 24552ce79f8..a259434899c 100644 --- a/base/applications/rapps/lang/zh-HK.rc +++ b/base/applications/rapps/lang/zh-HK.rc @@ -222,6 +222,7 @@ BEGIN IDS_APP_DISPLAY_DETAILS "詳細資料" IDS_APP_DISPLAY_LIST "列表" IDS_APP_DISPLAY_TILE "並排" + IDS_NO_SEARCH_RESULTS "No search results" END STRINGTABLE diff --git a/base/applications/rapps/lang/zh-TW.rc b/base/applications/rapps/lang/zh-TW.rc index ecec54fadf4..fa25f1c619a 100644 --- a/base/applications/rapps/lang/zh-TW.rc +++ b/base/applications/rapps/lang/zh-TW.rc @@ -222,6 +222,7 @@ BEGIN IDS_APP_DISPLAY_DETAILS "詳情" IDS_APP_DISPLAY_LIST "列表" IDS_APP_DISPLAY_TILE "卡片" + IDS_NO_SEARCH_RESULTS "No search results" END STRINGTABLE

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs