Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 03/05: [NTOS:KDBG] Add KdbpPrintUnicodeString
by Timo Kreuzer 20 Jul '22

20 Jul '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=31a5fa61bbf47c897059d… commit 31a5fa61bbf47c897059d9af350f4646c1d01488 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jul 17 19:17:18 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Jul 20 23:57:42 2022 +0200 [NTOS:KDBG] Add KdbpPrintUnicodeString Calling normal unicode functions is not allowed at IRQL > APC_LEVEL, so calling _vsnprintf with unicode parameters from KDBG is invalid. --- ntoskrnl/kdbg/kdb.h | 4 ++++ ntoskrnl/kdbg/kdb_cli.c | 34 ++++++++++++++++++++++++++++++---- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/kdbg/kdb.h b/ntoskrnl/kdbg/kdb.h index 68f4ce03b05..808c13c5550 100644 --- a/ntoskrnl/kdbg/kdb.h +++ b/ntoskrnl/kdbg/kdb.h @@ -107,6 +107,10 @@ KdbpPrint( IN PCHAR Format, IN ... OPTIONAL); +VOID +KdbpPrintUnicodeString( + _In_ PCUNICODE_STRING String); + BOOLEAN NTAPI KdbpGetHexNumber( diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index 4958dd9be71..7da99daef32 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -564,10 +564,14 @@ KdbpPrintStructInternal KdbpPrint("%s%p+%x: %s", Indent, ((PCHAR)BaseAddress) + Member->BaseOffset, Member->Size, Member->Name ? Member->Name : "<anoymous>"); if (DoRead) { if (!strcmp(Member->Type, "_UNICODE_STRING")) { - KdbpPrint("\"%wZ\"\n", ((PCHAR)BaseAddress) + Member->BaseOffset); + KdbpPrint("\""); + KdbpPrintUnicodeString(((PCHAR)BaseAddress) + Member->BaseOffset); + KdbpPrint("\"\n"); continue; } else if (!strcmp(Member->Type, "PUNICODE_STRING")) { - KdbpPrint("\"%wZ\"\n", *(((PUNICODE_STRING*)((PCHAR)BaseAddress) + Member->BaseOffset))); + KdbpPrint("\""); + KdbpPrintUnicodeString(*(((PUNICODE_STRING*)((PCHAR)BaseAddress) + Member->BaseOffset))); + KdbpPrint("\"\n"); continue; } switch (Member->Size) { @@ -2109,7 +2113,9 @@ KdbpCmdMod( KdbpPrint(" Base Size Name\n"); for (;;) { - KdbpPrint(" %08x %08x %wZ\n", LdrEntry->DllBase, LdrEntry->SizeOfImage, &LdrEntry->BaseDllName); + KdbpPrint(" %p %08x ", LdrEntry->DllBase, LdrEntry->SizeOfImage); + KdbpPrintUnicodeString(&LdrEntry->BaseDllName); + KdbpPrint("\n"); if(DisplayOnlyOneModule || !KdbpSymFindModule(NULL, i++, &LdrEntry)) break; @@ -3035,6 +3041,24 @@ KdbpPrint( } } +VOID +KdbpPrintUnicodeString( + _In_ PCUNICODE_STRING String) +{ + ULONG i; + + if ((String == NULL) || (String->Buffer == NULL)) + { + KdbpPrint("<NULL>"); + return; + } + + for (i = 0; i < String->Length / sizeof(WCHAR); i++) + { + KdbpPrint("%c", (CHAR)String->Buffer[i]); + } +} + /** memrchr(), explicitly defined, since was absent in MinGW of RosBE. */ /* * Reverse memchr() @@ -3863,7 +3887,9 @@ KdbpCliModuleLoaded( if (!KdbBreakOnModuleLoad) return; - KdbpPrint("Module %wZ loaded.\n", Name); + KdbpPrint("Module "); + KdbpPrintUnicodeString(Name); + KdbpPrint(" loaded.\n"); DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); }

1 0

[reactos] 02/05: [KDBG] Fix x64 KDBG
by Timo Kreuzer 20 Jul '22

20 Jul '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=253362509ec64a2def87f… commit 253362509ec64a2def87fdc818f3d553f23a20c6 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jan 26 18:59:05 2020 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Jul 20 23:57:42 2022 +0200 [KDBG] Fix x64 KDBG --- ntoskrnl/ex/handle.c | 8 +- ntoskrnl/kdbg/amd64/amd64-dis.c | 0 ntoskrnl/kdbg/amd64/kdb_help.S | 152 ++++++++++++++++++++++++++++++-- ntoskrnl/kdbg/i386/i386-dis.c | 34 ++++--- ntoskrnl/kdbg/kdb.c | 19 ++-- ntoskrnl/kdbg/kdb.h | 4 +- ntoskrnl/kdbg/kdb_cli.c | 191 +++++++++++++++++++++++++++++----------- ntoskrnl/kdbg/kdb_expr.c | 9 +- ntoskrnl/kdbg/kdb_symbols.c | 2 +- ntoskrnl/mm/ARM3/kdbg.c | 4 +- 10 files changed, 340 insertions(+), 83 deletions(-) diff --git a/ntoskrnl/ex/handle.c b/ntoskrnl/ex/handle.c index 94b345caeb3..e932ca2efbd 100644 --- a/ntoskrnl/ex/handle.c +++ b/ntoskrnl/ex/handle.c @@ -22,6 +22,12 @@ EX_PUSH_LOCK HandleTableListLock; /* PRIVATE FUNCTIONS *********************************************************/ +#ifdef _WIN64 +#define strtoulptr strtoull +#else +#define strtoulptr strtoul +#endif + CODE_SEG("INIT") VOID NTAPI @@ -1360,7 +1366,7 @@ BOOLEAN ExpKdbgExtHandle(ULONG Argc, PCHAR Argv[]) } else { - ProcessId = (HANDLE)strtoul(Argv[1], &endptr, 10); + ProcessId = (HANDLE)strtoulptr(Argv[1], &endptr, 10); if (*endptr != '\0') { KdbpPrint("Invalid parameter: %s\n", Argv[1]); diff --git a/ntoskrnl/kdbg/amd64/amd64-dis.c b/ntoskrnl/kdbg/amd64/amd64-dis.c deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/ntoskrnl/kdbg/amd64/kdb_help.S b/ntoskrnl/kdbg/amd64/kdb_help.S index 39ae8721f8e..bba83e3308b 100644 --- a/ntoskrnl/kdbg/amd64/kdb_help.S +++ b/ntoskrnl/kdbg/amd64/kdb_help.S @@ -1,22 +1,162 @@ #include <asm.inc> +#include <ksamd64.inc> + .code64 +EXTERN KdbEnterDebuggerException : PROC + +PUBLIC KdbEnter +FUNC KdbEnter + + /* save flags */ + pushfq + .allocstack 8 + + /* Make room for a KTRAP_FRAME */ + sub rsp, KTRAP_FRAME_LENGTH + .allocstack KTRAP_FRAME_LENGTH + .ENDPROLOG + + /* Save rbp */ + mov [rsp + KTRAP_FRAME_Rbp], rbp + + /* Save non-volatile registers */ + mov [rsp + KTRAP_FRAME_Rbx], rbx + mov [rsp + KTRAP_FRAME_Rdi], rdi + mov [rsp + KTRAP_FRAME_Rsi], rsi + + /* Save volatile registers */ + mov [rsp + KTRAP_FRAME_Rax], rax + mov [rsp + KTRAP_FRAME_Rcx], rcx + mov [rsp + KTRAP_FRAME_Rdx], rdx + mov [rsp + KTRAP_FRAME_R8], r8 + mov [rsp + KTRAP_FRAME_R9], r9 + mov [rsp + KTRAP_FRAME_R10], r10 + mov [rsp + KTRAP_FRAME_R11], r11 + + /* Save xmm registers */ + movdqa [rsp + KTRAP_FRAME_Xmm0], xmm0 + movdqa [rsp + KTRAP_FRAME_Xmm1], xmm1 + movdqa [rsp + KTRAP_FRAME_Xmm2], xmm2 + movdqa [rsp + KTRAP_FRAME_Xmm3], xmm3 + movdqa [rsp + KTRAP_FRAME_Xmm4], xmm4 + movdqa [rsp + KTRAP_FRAME_Xmm5], xmm5 + + /* Save cs and previous mode */ + mov ax, cs + mov [rsp + KTRAP_FRAME_SegCs], ax + and ax, 1 + mov [rsp + KTRAP_FRAME_PreviousMode], al + + /* Save segment selectors */ + mov ax, ds + mov [rsp + KTRAP_FRAME_SegDs], ax + mov ax, es + mov [rsp + KTRAP_FRAME_SegEs], ax + mov ax, fs + mov [rsp + KTRAP_FRAME_SegFs], ax + mov ax, gs + mov [rsp + KTRAP_FRAME_SegGs], ax + + /* Save previous irql */ + mov rax, cr8 + mov [rsp + KTRAP_FRAME_PreviousIrql], al + + /* Save debug registers */ + mov rax, dr0 + mov [rsp + KTRAP_FRAME_Dr0], rax + mov rax, dr1 + mov [rsp + KTRAP_FRAME_Dr1], rax + mov rax, dr2 + mov [rsp + KTRAP_FRAME_Dr2], rax + mov rax, dr3 + mov [rsp + KTRAP_FRAME_Dr3], rax + mov rax, dr6 + mov [rsp + KTRAP_FRAME_Dr6], rax + mov rax, dr7 + mov [rsp + KTRAP_FRAME_Dr7], rax + + /* Point rbp, where rsp was before */ + lea rbp, [rsp + KTRAP_FRAME_LENGTH] + mov [rsp + KTRAP_FRAME_Rsp], rbp + + /* Store the EFLAGS we previously pushed on the stack */ + mov rax, [rbp + 8] + mov [rsp + KTRAP_FRAME_EFlags], rax + + /* Get RIP from the stack */ + mov rax, [rbp + 16] + mov [rsp + KTRAP_FRAME_Rip], rax + + /* Make sure the direction flag is cleared */ + cld + + /* Clear all breakpoint enables in dr7. */ + mov rax, dr7 + and rax, HEX(ffffffffFFFF0000) + mov dr7, rax + + /* Call KDB */ + mov byte ptr [rsp + KTRAP_FRAME_P5], 1 /* FirstChance */ + mov r9, rsp /* Pointer to the trap frame */ + mov r8, 0 /* Context */ + mov dl, 0 /* PreviousMode (KernelMode) */ + mov rcx, 0 /* ExceptionRecord */ + call KdbEnterDebuggerException + + /* Restore segment selectors */ + mov ax, [rsp + KTRAP_FRAME_SegDs] + mov ds, ax + mov ax, [rsp + KTRAP_FRAME_SegEs] + mov es, ax + mov ax, [rsp + KTRAP_FRAME_SegFs] + mov fs, ax + + /* Restore non-volatile registers */ + mov rbx, [rsp + KTRAP_FRAME_Rbx] + mov rdi, [rsp + KTRAP_FRAME_Rdi] + mov rsi, [rsp + KTRAP_FRAME_Rsi] + + /* Restore volatile registers */ + mov rax, [rsp + KTRAP_FRAME_Rax] + mov rcx, [rsp + KTRAP_FRAME_Rcx] + mov rdx, [rsp + KTRAP_FRAME_Rdx] + mov r8, [rsp + KTRAP_FRAME_R8] + mov r9, [rsp + KTRAP_FRAME_R9] + mov r10, [rsp + KTRAP_FRAME_R10] + mov r11, [rsp + KTRAP_FRAME_R11] + + /* Restore RSP */ + mov rsp, [rsp + KTRAP_FRAME_Rsp] + + /* Restore EFLAGS */ + popfq + + ret +ENDFUNC + PUBLIC KdbpStackSwitchAndCall KdbpStackSwitchAndCall: - push rbp - mov rbp, rsp /* Old stack - frame */ - /* Switch stack */ + /* Save old stack */ + mov rax, rsp + + /* Set new stack */ mov rsp, rcx + /* Save old stack on new stack */ + push rax + /* Call function */ call rdx - /* Switch back to old stack */ - pop rsp + /* Restore old stack */ + pop rax + mov rsp, rax - ret 8 + /* Return */ + ret END diff --git a/ntoskrnl/kdbg/i386/i386-dis.c b/ntoskrnl/kdbg/i386/i386-dis.c index 4b8a0d1ec3b..c60470aa436 100644 --- a/ntoskrnl/kdbg/i386/i386-dis.c +++ b/ntoskrnl/kdbg/i386/i386-dis.c @@ -22,11 +22,11 @@ typedef enum bfd_architecture { bfd_arch_i386, } bfd_arch; -typedef unsigned int bfd_vma; +typedef uintptr_t bfd_vma; typedef unsigned char bfd_byte; enum bfd_endian { BFD_ENDIAN_BIG, BIG_ENDIAN_LITTLE, BFD_ENDIAN_UNKNOWN }; typedef void* bfd; -typedef signed int bfd_signed_vma; +typedef intptr_t bfd_signed_vma; #define bfd_mach_x86_64_intel_syntax 0 #define bfd_mach_x86_64 1 #define bfd_mach_i386_i386_intel_syntax 2 @@ -36,7 +36,7 @@ typedef signed int bfd_signed_vma; #define _(X) X #define ATTRIBUTE_UNUSED extern int sprintf(char *str, const char *format, ...); -#define sprintf_vma(BUF, VMA) sprintf(BUF, "0x%X", VMA) +#define sprintf_vma(BUF, VMA) sprintf(BUF, "0x%IX", VMA) struct disassemble_info; int @@ -63,20 +63,20 @@ KdbpNopPrintDisasm(void* Ignored, const char* fmt, ...) } static int -KdbpReadMemory(unsigned int Addr, unsigned char* Data, unsigned int Length, +KdbpReadMemory(uintptr_t Addr, unsigned char* Data, unsigned int Length, struct disassemble_info * Ignored) { return KdbpSafeReadMemory(Data, (void *)Addr, Length); /* 0 means no error */ } static void -KdbpMemoryError(int Status, unsigned int Addr, +KdbpMemoryError(int Status, uintptr_t Addr, struct disassemble_info * Ignored) { } static void -KdbpPrintAddressInCode(unsigned int Addr, struct disassemble_info * Ignored) +KdbpPrintAddressInCode(uintptr_t Addr, struct disassemble_info * Ignored) { if (!KdbSymPrintAddress((void*)Addr, NULL)) { @@ -85,14 +85,14 @@ KdbpPrintAddressInCode(unsigned int Addr, struct disassemble_info * Ignored) } static void -KdbpNopPrintAddress(unsigned int Addr, struct disassemble_info * Ignored) +KdbpNopPrintAddress(uintptr_t Addr, struct disassemble_info * Ignored) { } #include "dis-asm.h" LONG -KdbpGetInstLength(IN ULONG Address) +KdbpGetInstLength(IN ULONG_PTR Address) { disassemble_info info; @@ -101,7 +101,11 @@ KdbpGetInstLength(IN ULONG Address) info.application_data = NULL; info.flavour = bfd_target_unknown_flavour; info.arch = bfd_arch_i386; +#ifdef _M_AMD64 + info.mach = bfd_mach_x86_64; +#else info.mach = bfd_mach_i386_i386; +#endif info.insn_sets = 0; info.flags = 0; info.read_memory_func = KdbpReadMemory; @@ -118,7 +122,7 @@ KdbpGetInstLength(IN ULONG Address) } LONG -KdbpDisassemble(IN ULONG Address, IN ULONG IntelSyntax) +KdbpDisassemble(IN ULONG_PTR Address, IN ULONG IntelSyntax) { disassemble_info info; @@ -263,7 +267,11 @@ struct dis_private { #define FWAIT_OPCODE (0x9b) /* Set to 1 for 64bit mode disassembly. */ +#ifdef _M_AMD64 +static int mode_64bit = 1; +#else static int mode_64bit; +#endif /* Flags for the prefixes for the current instruction. See below. */ static int prefixes; @@ -2079,7 +2087,7 @@ static int print_insn (bfd_vma pc, disassemble_info *info) { const struct dis386 *dp; - int i; + intptr_t i; char *first, *second, *third; int needcomma; unsigned char uses_SSE_prefix; @@ -2151,8 +2159,12 @@ print_insn (bfd_vma pc, disassemble_info *info) if (p != NULL) p++; } +#else +#ifdef _M_AMD64 + mode_64bit = 1; #else mode_64bit = 0; +#endif priv.orig_sizeflag = AFLAG | DFLAG; /*intel_syntax = 0;*/ #endif @@ -3188,7 +3200,7 @@ print_operand_value (char *buf, int hex, bfd_vma disp) if (v < 0) { *(buf++) = '-'; - v = -disp; + v = -v; /* Check for possible overflow on 0x8000000000000000. */ if (v < 0) { diff --git a/ntoskrnl/kdbg/kdb.c b/ntoskrnl/kdbg/kdb.c index df1da7da3d2..abe8f96b2cd 100644 --- a/ntoskrnl/kdbg/kdb.c +++ b/ntoskrnl/kdbg/kdb.c @@ -18,6 +18,13 @@ /* DEFINES *******************************************************************/ #define KDB_STACK_SIZE (4096*3) +#ifdef _M_AMD64 +#define KDB_STACK_ALIGN 16 +#define KDB_STACK_RESERVE (5 * sizeof(PVOID)) /* Home space + return address */ +#else +#define KDB_STACK_ALIGN 4 +#define KDB_STACK_RESERVE sizeof(ULONG) /* Return address */ +#endif #define KDB_MAXIMUM_BREAKPOINT_COUNT 256 #define KDB_MAXIMUM_HW_BREAKPOINT_COUNT 4 #define KDB_MAXIMUM_SW_BREAKPOINT_COUNT 256 @@ -28,7 +35,7 @@ /* GLOBALS *******************************************************************/ static LONG KdbEntryCount = 0; -static CHAR KdbStack[KDB_STACK_SIZE]; +static DECLSPEC_ALIGN(KDB_STACK_ALIGN) CHAR KdbStack[KDB_STACK_SIZE]; static ULONG KdbBreakPointCount = 0; /* Number of used breakpoints in the array */ static KDB_BREAKPOINT KdbBreakPoints[KDB_MAXIMUM_BREAKPOINT_COUNT] = {{0}}; /* Breakpoint array */ @@ -333,7 +340,7 @@ KdbpStepIntoInstruction( } /* Get the interrupt descriptor */ - if (!NT_SUCCESS(KdbpSafeReadMemory(IntDesc, (PVOID)(ULONG_PTR)(Idtr.Base + (IntVect * 8)), sizeof (IntDesc)))) + if (!NT_SUCCESS(KdbpSafeReadMemory(IntDesc, (PVOID)((ULONG_PTR)Idtr.Base + (IntVect * 8)), sizeof(IntDesc)))) { /*KdbpPrint("Couldn't access memory at 0x%p\n", (ULONG_PTR)Idtr.Base + (IntVect * 8));*/ return FALSE; @@ -479,7 +486,7 @@ KdbpInsertBreakPoint( IN BOOLEAN Global, OUT PLONG BreakPointNr OPTIONAL) { - LONG i; + LONG_PTR i; PVOID Condition; PCHAR ConditionExpressionDup; LONG ErrOffset; @@ -673,7 +680,7 @@ KdbpIsBreakPointOurs( KdbHwBreakPoints[i]->Enabled); DebugReg = KdbHwBreakPoints[i]->Data.Hw.DebugReg; - if ((Context->Dr6 & (1 << DebugReg)) != 0) + if ((Context->Dr6 & ((ULONG_PTR)1 << DebugReg)) != 0) { return KdbHwBreakPoints[i] - KdbBreakPoints; } @@ -1174,7 +1181,7 @@ KdbpInternalEnter(VOID) // KdbpPrint("Switching to KDB stack 0x%08x-0x%08x (Current Stack is 0x%08x)\n", Thread->Tcb.StackLimit, Thread->Tcb.StackBase, Esp); - KdbpStackSwitchAndCall(KdbStack + KDB_STACK_SIZE - sizeof(ULONG), KdbpCallMainLoop); + KdbpStackSwitchAndCall(KdbStack + KDB_STACK_SIZE - KDB_STACK_RESERVE, KdbpCallMainLoop); Thread->Tcb.InitialStack = SavedInitialStack; Thread->Tcb.StackBase = SavedStackBase; @@ -1489,7 +1496,7 @@ KdbEnterDebuggerException( } KdbpPrint("\nEntered debugger on embedded INT3 at 0x%04x:0x%p.\n", - Context->SegCs & 0xffff, KeGetContextPc(Context) - 1); + Context->SegCs & 0xffff, KeGetContextPc(Context)); } else { diff --git a/ntoskrnl/kdbg/kdb.h b/ntoskrnl/kdbg/kdb.h index aa8cb8e8f18..68f4ce03b05 100644 --- a/ntoskrnl/kdbg/kdb.h +++ b/ntoskrnl/kdbg/kdb.h @@ -64,12 +64,12 @@ typedef enum _KDB_OUTPUT_SETTINGS LONG KdbpDisassemble( - IN ULONG Address, + IN ULONG_PTR Address, IN ULONG IntelSyntax); LONG KdbpGetInstLength( - IN ULONG Address); + IN ULONG_PTR Address); /* from i386/kdb_help.S */ diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index 6c903f93695..4958dd9be71 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -21,7 +21,7 @@ * FILE: ntoskrnl/kdbg/kdb_cli.c * PURPOSE: Kernel debugger command line interface * PROGRAMMER: Gregor Anich (blight(a)blight.eu.org) - * Herv� Poussineau + * Hervé Poussineau * UPDATE HISTORY: * Created 16/01/2005 */ @@ -101,6 +101,8 @@ BOOLEAN ExpKdbgExtDefWrites(ULONG Argc, PCHAR Argv[]); BOOLEAN ExpKdbgExtIrpFind(ULONG Argc, PCHAR Argv[]); BOOLEAN ExpKdbgExtHandle(ULONG Argc, PCHAR Argv[]); +extern char __ImageBase; + #ifdef __ROS_DWARF__ static BOOLEAN KdbpCmdPrintStruct(ULONG Argc, PCHAR Argv[]); #endif @@ -364,7 +366,9 @@ static const struct /* Data */ { NULL, NULL, "Data", NULL }, { "?", "? expression", "Evaluate expression.", KdbpCmdEvalExpression }, +#ifdef _M_IX86 // FIXME: this is broken on x64 { "disasm", "disasm [address] [L count]", "Disassemble count instructions at address.", KdbpCmdDisassembleX }, +#endif // _M_IX86 { "x", "x [address] [L count]", "Display count dwords, starting at address.", KdbpCmdDisassembleX }, { "regs", "regs", "Display general purpose registers.", KdbpCmdRegs }, { "sregs", "sregs", "Display status registers.", KdbpCmdRegs }, @@ -373,7 +377,6 @@ static const struct #ifdef __ROS_DWARF__ { "dt", "dt [mod] [type] [addr]", "Print a struct. The address is optional.", KdbpCmdPrintStruct }, #endif - /* Flow control */ { NULL, NULL, "Flow control", NULL }, { "cont", "cont", "Continue execution (leave debugger).", KdbpCmdContinue }, @@ -485,7 +488,8 @@ KdbpCmdEvalExpression( ULONG Argc, PCHAR Argv[]) { - ULONG i, len; + ULONG i; + SIZE_T len; ULONGLONG Result = 0; ULONG ul; LONG l = 0; @@ -882,7 +886,7 @@ KdbpCmdDisassembleX( while (Count > 0) { if (!KdbSymPrintAddress((PVOID)Address, NULL)) - KdbpPrint("<%08x>:", Address); + KdbpPrint("<%p>:", (PVOID)Address); else KdbpPrint(":"); @@ -1085,6 +1089,10 @@ KdbpIsNestedTss( if (!Tss) return FALSE; +#ifdef _M_AMD64 + // HACK + return FALSE; +#else /* Retrieve the TSS Backlink */ if (!NT_SUCCESS(KdbpSafeReadMemory(&Backlink, (PVOID)&Tss->Backlink, @@ -1092,6 +1100,7 @@ KdbpIsNestedTss( { return FALSE; } +#endif return (Backlink != 0 && Backlink != TssSelector); } @@ -1107,6 +1116,10 @@ KdbpContextFromPrevTss( USHORT Backlink; PKTSS Tss = *pTss; +#ifdef _M_AMD64 + // HACK + return FALSE; +#else /* Retrieve the TSS Backlink */ if (!NT_SUCCESS(KdbpSafeReadMemory(&Backlink, (PVOID)&Tss->Backlink, @@ -1139,10 +1152,103 @@ KdbpContextFromPrevTss( *pTss = Tss; Context->Eip = Eip; Context->Ebp = Ebp; +#endif return TRUE; } #endif +#ifdef _M_AMD64 + +static +BOOLEAN +GetNextFrame( + _Inout_ PCONTEXT Context) +{ + PRUNTIME_FUNCTION FunctionEntry; + ULONG64 ImageBase, EstablisherFrame; + PVOID HandlerData; + + _SEH2_TRY + { + /* Lookup the FunctionEntry for the current RIP */ + FunctionEntry = RtlLookupFunctionEntry(Context->Rip, &ImageBase, NULL); + if (FunctionEntry == NULL) + { + /* No function entry, so this must be a leaf function. Pop the return address from the stack. + Note: this can happen after the first frame as the result of an exception */ + Context->Rip = *(DWORD64*)Context->Rsp; + Context->Rsp += sizeof(DWORD64); + return TRUE; + } + else + { + RtlVirtualUnwind(UNW_FLAG_NHANDLER, + ImageBase, + Context->Rip, + FunctionEntry, + Context, + &HandlerData, + &EstablisherFrame, + NULL); + } + } + _SEH2_EXCEPT(1) + { + return FALSE; + } + _SEH2_END + + return TRUE; +} + +static BOOLEAN +KdbpCmdBackTrace( + ULONG Argc, + PCHAR Argv[]) +{ + CONTEXT Context = *KdbCurrentTrapFrame; + ULONG64 CurrentRsp, CurrentRip; + + KdbpPrint("Rip:\n"); + if (!KdbSymPrintAddress((PVOID)KeGetContextPc(&Context), &Context)) + KdbpPrint("<%p>\n", KeGetContextPc(&Context)); + else + KdbpPrint("\n"); + + /* Walk through the frames */ + KdbpPrint("Frames:\n"); + for (;;) + { + CurrentRip = Context.Rip; + CurrentRsp = Context.Rsp; + + BOOLEAN GotNextFrame = GetNextFrame(&Context); + + KdbpPrint("[%p] ", (PVOID)CurrentRsp); + Context.Rsp = Context.Rsp; + + /* Print the location afrer the call instruction */ + if (!KdbSymPrintAddress((PVOID)CurrentRip, &Context)) + KdbpPrint("<%p>", (PVOID)Context.Rip); + + KdbpPrint(" (stack: 0x%Ix)\n", Context.Rsp - CurrentRsp); + + if (KdbOutputAborted) + break; + + if (Context.Rsp == 0) + break; + + if (!GotNextFrame) + { + KdbpPrint("Couldn't access memory at 0x%p!\n", (PVOID)Context.Rsp); + break; + } + } + + return TRUE; +} +#else /*!\brief Displays a backtrace. */ static BOOLEAN @@ -1316,6 +1422,8 @@ CheckForParentTSS: return TRUE; } +#endif // M_AMD64 + /*!\brief Continues execution of the system/leaves KDB. */ static BOOLEAN @@ -1410,7 +1518,7 @@ KdbpCmdBreakPointList( else { GlobalOrLocal = Buffer; - sprintf(Buffer, " PID 0x%lx", + sprintf(Buffer, " PID 0x%Ix", (ULONG_PTR)(Process ? Process->UniqueProcessId : INVALID_HANDLE_VALUE)); } @@ -1989,9 +2097,9 @@ KdbpCmdMod( { if (!KdbpSymFindModule(NULL, 0, &LdrEntry)) { - ULONG_PTR ntoskrnlBase = ((ULONG_PTR)KdbpCmdMod) & 0xfff00000; + ULONG_PTR ntoskrnlBase = (ULONG_PTR)__ImageBase; KdbpPrint(" Base Size Name\n"); - KdbpPrint(" %08x %08x %s\n", ntoskrnlBase, 0, "ntoskrnl.exe"); + KdbpPrint(" %p %08x %s\n", (PVOID)ntoskrnlBase, 0, "ntoskrnl.exe"); return TRUE; } @@ -2239,6 +2347,7 @@ KdbpCmdPcr( PKIPCR Pcr = (PKIPCR)KeGetPcr(); KdbpPrint("Current PCR is at 0x%p.\n", Pcr); +#ifdef _M_IX86 KdbpPrint(" Tib.ExceptionList: 0x%08x\n" " Tib.StackBase: 0x%08x\n" " Tib.StackLimit: 0x%08x\n" @@ -2246,75 +2355,59 @@ KdbpCmdPcr( " Tib.FiberData/Version: 0x%08x\n" " Tib.ArbitraryUserPointer: 0x%08x\n" " Tib.Self: 0x%08x\n" -#ifdef _M_IX86 " SelfPcr: 0x%08x\n" -#else - " Self: 0x%p\n" -#endif " PCRCB: 0x%08x\n" " Irql: 0x%02x\n" -#ifdef _M_IX86 " IRR: 0x%08x\n" " IrrActive: 0x%08x\n" " IDR: 0x%08x\n" -#endif " KdVersionBlock: 0x%08x\n" -#ifdef _M_IX86 " IDT: 0x%08x\n" " GDT: 0x%08x\n" " TSS: 0x%08x\n" -#endif " MajorVersion: 0x%04x\n" " MinorVersion: 0x%04x\n" -#ifdef _M_IX86 " SetMember: 0x%08x\n" -#endif " StallScaleFactor: 0x%08x\n" -#ifdef _M_IX86 " Number: 0x%02x\n" -#endif " L2CacheAssociativity: 0x%02x\n" -#ifdef _M_IX86 " VdmAlert: 0x%08x\n" -#endif " L2CacheSize: 0x%08x\n" -#ifdef _M_IX86 " InterruptMode: 0x%08x\n" -#endif , Pcr->NtTib.ExceptionList, Pcr->NtTib.StackBase, Pcr->NtTib.StackLimit, Pcr->NtTib.SubSystemTib, Pcr->NtTib.FiberData, Pcr->NtTib.ArbitraryUserPointer, Pcr->NtTib.Self -#ifdef _M_IX86 , Pcr->SelfPcr -#else - , Pcr->Self -#endif , Pcr->Prcb, Pcr->Irql -#ifdef _M_IX86 , Pcr->IRR, Pcr->IrrActive , Pcr->IDR -#endif , Pcr->KdVersionBlock -#ifdef _M_IX86 , Pcr->IDT, Pcr->GDT, Pcr->TSS -#endif , Pcr->MajorVersion, Pcr->MinorVersion -#ifdef _M_IX86 , Pcr->SetMember -#endif , Pcr->StallScaleFactor -#ifdef _M_IX86 , Pcr->Number -#endif , Pcr->SecondLevelCacheAssociativity -#ifdef _M_IX86 , Pcr->VdmAlert -#endif , Pcr->SecondLevelCacheSize -#ifdef _M_IX86 - , Pcr->InterruptMode + , Pcr->InterruptMode); +#else + KdbpPrint(" GdtBase: 0x%p\n", Pcr->GdtBase); + KdbpPrint(" TssBase: 0x%p\n", Pcr->TssBase); + KdbpPrint(" UserRsp: 0x%p\n", (PVOID)Pcr->UserRsp); + KdbpPrint(" Self: 0x%p\n", Pcr->Self); + KdbpPrint(" CurrentPrcb: 0x%p\n", Pcr->CurrentPrcb); + KdbpPrint(" LockArray: 0x%p\n", Pcr->LockArray); + KdbpPrint(" Used_Self: 0x%p\n", Pcr->Used_Self); + KdbpPrint(" IdtBase: 0x%p\n", Pcr->IdtBase); + KdbpPrint(" Irql: %u\n", Pcr->Irql); + KdbpPrint(" SecondLevelCacheAssociativity: 0x%u\n", Pcr->SecondLevelCacheAssociativity); + KdbpPrint(" ObsoleteNumber: %u\n", Pcr->ObsoleteNumber); + KdbpPrint(" MajorVersion: 0x%x\n", Pcr->MajorVersion); + KdbpPrint(" MinorVersion: 0x%x\n", Pcr->MinorVersion); + KdbpPrint(" StallScaleFactor: 0x%lx\n", Pcr->StallScaleFactor); + KdbpPrint(" SecondLevelCacheSize: 0x%lx\n", Pcr->SecondLevelCacheSize); + KdbpPrint(" KdVersionBlock: 0x%p\n", Pcr->KdVersionBlock); #endif - ); - return TRUE; } @@ -2417,7 +2510,7 @@ KdbpCmdTss( return TRUE; } -#endif +#endif // _M_IX86 /*!\brief Bugchecks the system. */ @@ -2724,7 +2817,7 @@ KdbpPrint( CHAR c = '\0'; PCHAR p, p2; ULONG Length; - ULONG i, j; + SIZE_T i, j; LONG RowsPrintedByTerminal; ULONG ScanCode; va_list ap; @@ -3039,7 +3132,7 @@ KdbpPager( CHAR c = '\0'; PCHAR p, p2; ULONG Length; - ULONG i, j; + SIZE_T i, j; LONG RowsPrintedByTerminal; ULONG ScanCode; @@ -3298,8 +3391,8 @@ static VOID KdbpCommandHistoryAppend( IN PCHAR Command) { - ULONG Length1 = strlen(Command) + 1; - ULONG Length2 = 0; + SIZE_T Length1 = strlen(Command) + 1; + SIZE_T Length2 = 0; INT i; PCHAR Buffer; @@ -3380,7 +3473,7 @@ KdbpReadCommand( static CHAR LastCommand[1024]; static CHAR NextKey = '\0'; INT CmdHistIndex = -1; - INT i; + INT_PTR i; EchoOn = !((KdbDebugState & KD_DEBUG_KDNOECHO) != 0); @@ -3644,7 +3737,7 @@ static BOOLEAN KdbpDoCommand( IN PCHAR Command) { - ULONG i; + SIZE_T i; PCHAR p; ULONG Argc; // FIXME: for what do we need a 1024 characters command line and 256 tokens? @@ -3784,7 +3877,7 @@ VOID KdbpCliInterpretInitFile(VOID) { PCHAR p1, p2; - INT i; + INT_PTR i; CHAR c; /* Execute the commands in the init file */ diff --git a/ntoskrnl/kdbg/kdb_expr.c b/ntoskrnl/kdbg/kdb_expr.c index 348d71286c3..73bff96cde1 100644 --- a/ntoskrnl/kdbg/kdb_expr.c +++ b/ntoskrnl/kdbg/kdb_expr.c @@ -437,8 +437,8 @@ RpnpParseExpression( RPN_OP ComparativeOp; BOOLEAN ComparativeOpFilled = FALSE; BOOLEAN IsComparativeOp; - INT i, i2; - ULONG ul; + INT_PTR i, i2; + ULONG64 ull; UCHAR MemorySize; CHAR Buffer[16]; BOOLEAN First; @@ -596,13 +596,12 @@ get_operand: else { /* Immediate value */ - /* FIXME: Need string to ULONGLONG function */ - ul = strtoul(p, &pend, 0); + ull = strtoull(p, &pend, 0); if (p != pend) { RpnOp.Type = RpnOpImmediate; RpnOp.CharacterOffset = CharacterOffset; - RpnOp.Data.Immediate = (ULONGLONG)ul; + RpnOp.Data.Immediate = ull; CharacterOffset += pend - p; p = pend; } diff --git a/ntoskrnl/kdbg/kdb_symbols.c b/ntoskrnl/kdbg/kdb_symbols.c index 997b55e5516..2f2703b717c 100644 --- a/ntoskrnl/kdbg/kdb_symbols.c +++ b/ntoskrnl/kdbg/kdb_symbols.c @@ -175,7 +175,7 @@ KdbSymPrintAddress( /* Use KdpPrintString because KdpDprintf is limited wrt string size */ KdpDprintf("<%s:%x (", ModuleNameAnsi, RelativeAddress); str.Buffer = FileName; - str.Length = strnlen(FileName, sizeof(FileName)); + str.Length = (USHORT)strnlen(FileName, sizeof(FileName)); str.MaximumLength = sizeof(FileName); KdpPrintString(&str); KdpDprintf(":%d (%s))>", LineNumber, FunctionName); diff --git a/ntoskrnl/mm/ARM3/kdbg.c b/ntoskrnl/mm/ARM3/kdbg.c index 5b2554a425f..92fe6af47dd 100644 --- a/ntoskrnl/mm/ARM3/kdbg.c +++ b/ntoskrnl/mm/ARM3/kdbg.c @@ -144,7 +144,7 @@ VOID ExpKdbgExtPoolUsedGetTag(PCHAR Arg, PULONG Tag, PULONG Mask) { CHAR Tmp[4]; - ULONG Len; + SIZE_T Len; USHORT i; /* Get the tag */ @@ -175,7 +175,7 @@ ExpKdbgExtPoolUsed( { ULONG Tag = 0; ULONG Mask = 0; - ULONG Flags = 0; + ULONG_PTR Flags = 0; if (Argc > 1) {

1 0

[reactos] 01/05: [NDK] Add missing x64 unwind definitions
by Timo Kreuzer 20 Jul '22

20 Jul '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=04fe6665906bf8e63a267… commit 04fe6665906bf8e63a2677bc585ec564d50eb286 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Jul 19 08:05:31 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Jul 20 23:57:42 2022 +0200 [NDK] Add missing x64 unwind definitions --- ntoskrnl/rtl/libsupp.c | 2 -- sdk/include/ndk/ketypes.h | 4 +-- sdk/include/ndk/rtlfuncs.h | 27 +++++++++++++++ sdk/include/ndk/rtltypes.h | 84 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 112 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/rtl/libsupp.c b/ntoskrnl/rtl/libsupp.c index 173944a0573..66ae4254a73 100644 --- a/ntoskrnl/rtl/libsupp.c +++ b/ntoskrnl/rtl/libsupp.c @@ -825,8 +825,6 @@ RtlCallVectoredContinueHandlers(_In_ PEXCEPTION_RECORD ExceptionRecord, #ifdef _M_AMD64 -typedef PVOID PRUNTIME_FUNCTION, PUNWIND_HISTORY_TABLE; - PRUNTIME_FUNCTION NTAPI RtlpLookupDynamicFunctionEntry( diff --git a/sdk/include/ndk/ketypes.h b/sdk/include/ndk/ketypes.h index 6556de0d737..d54b9ffa131 100644 --- a/sdk/include/ndk/ketypes.h +++ b/sdk/include/ndk/ketypes.h @@ -820,7 +820,6 @@ typedef struct _PP_LOOKASIDE_LIST // // Kernel Memory Node // -#include <pshpack1.h> typedef struct _KNODE { SLIST_HEADER DeadStackList; @@ -834,10 +833,9 @@ typedef struct _KNODE UCHAR Fill : 7; } Flags; ULONG MmShiftedColor; - ULONG FreeCount[2]; + ULONG_PTR FreeCount[2]; struct _SINGLE_LIST_ENTRY *PfnDeferredList; } KNODE, *PKNODE; -#include <poppack.h> // // Structure for Get/SetContext APC diff --git a/sdk/include/ndk/rtlfuncs.h b/sdk/include/ndk/rtlfuncs.h index ffc3bb1bcae..c6bdcfcdd19 100644 --- a/sdk/include/ndk/rtlfuncs.h +++ b/sdk/include/ndk/rtlfuncs.h @@ -807,6 +807,33 @@ RtlUnwind( #define RTL_STACK_WALKING_MODE_FRAMES_TO_SKIP_SHIFT 8 +#ifdef _M_AMD64 + +NTSYSAPI +PRUNTIME_FUNCTION +NTAPI +RtlLookupFunctionEntry( + _In_ DWORD64 ControlPc, + _Out_ PDWORD64 ImageBase, + _Inout_opt_ PUNWIND_HISTORY_TABLE HistoryTable +); + +NTSYSAPI +PEXCEPTION_ROUTINE +NTAPI +RtlVirtualUnwind( + _In_ ULONG HandlerType, + _In_ ULONG64 ImageBase, + _In_ ULONG64 ControlPc, + _In_ PRUNTIME_FUNCTION FunctionEntry, + _Inout_ PCONTEXT Context, + _Outptr_ PVOID* HandlerData, + _Out_ PULONG64 EstablisherFrame, + _Inout_opt_ PKNONVOLATILE_CONTEXT_POINTERS ContextPointers +); + +#endif // _M_AMD64 + // // Tracing Functions // diff --git a/sdk/include/ndk/rtltypes.h b/sdk/include/ndk/rtltypes.h index 03ac5156214..369d52cd297 100644 --- a/sdk/include/ndk/rtltypes.h +++ b/sdk/include/ndk/rtltypes.h @@ -1912,6 +1912,90 @@ typedef struct _MESSAGE_RESOURCE_DATA MESSAGE_RESOURCE_BLOCK Blocks[ANYSIZE_ARRAY]; } MESSAGE_RESOURCE_DATA, *PMESSAGE_RESOURCE_DATA; +#ifdef _M_AMD64 + +typedef struct _KNONVOLATILE_CONTEXT_POINTERS { + union { + PM128A FloatingContext[16]; + struct { + PM128A Xmm0; + PM128A Xmm1; + PM128A Xmm2; + PM128A Xmm3; + PM128A Xmm4; + PM128A Xmm5; + PM128A Xmm6; + PM128A Xmm7; + PM128A Xmm8; + PM128A Xmm9; + PM128A Xmm10; + PM128A Xmm11; + PM128A Xmm12; + PM128A Xmm13; + PM128A Xmm14; + PM128A Xmm15; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + + union { + PULONG64 IntegerContext[16]; + struct { + PULONG64 Rax; + PULONG64 Rcx; + PULONG64 Rdx; + PULONG64 Rbx; + PULONG64 Rsp; + PULONG64 Rbp; + PULONG64 Rsi; + PULONG64 Rdi; + PULONG64 R8; + PULONG64 R9; + PULONG64 R10; + PULONG64 R11; + PULONG64 R12; + PULONG64 R13; + PULONG64 R14; + PULONG64 R15; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME2; +} KNONVOLATILE_CONTEXT_POINTERS, *PKNONVOLATILE_CONTEXT_POINTERS; + +#define UNW_FLAG_NHANDLER 0x0 +#define UNW_FLAG_EHANDLER 0x1 +#define UNW_FLAG_UHANDLER 0x2 +#define UNW_FLAG_CHAININFO 0x4 +#define UNW_FLAG_NO_EPILOGUE 0x80000000UL + +#define RUNTIME_FUNCTION_INDIRECT 0x1 + +typedef struct _RUNTIME_FUNCTION { + ULONG BeginAddress; + ULONG EndAddress; + ULONG UnwindData; +} RUNTIME_FUNCTION, *PRUNTIME_FUNCTION; + +#define UNWIND_HISTORY_TABLE_SIZE 12 + +typedef struct _UNWIND_HISTORY_TABLE_ENTRY +{ + ULONG64 ImageBase; + PRUNTIME_FUNCTION FunctionEntry; +} UNWIND_HISTORY_TABLE_ENTRY, *PUNWIND_HISTORY_TABLE_ENTRY; + +typedef struct _UNWIND_HISTORY_TABLE +{ + ULONG Count; + UCHAR LocalHint; + UCHAR GlobalHint; + UCHAR Search; + UCHAR Once; + ULONG64 LowAddress; + ULONG64 HighAddress; + UNWIND_HISTORY_TABLE_ENTRY Entry[UNWIND_HISTORY_TABLE_SIZE]; +} UNWIND_HISTORY_TABLE, *PUNWIND_HISTORY_TABLE; + +#endif /* _M_AMD64 */ + #endif /* !NTOS_MODE_USER */ #ifdef NTOS_MODE_USER

1 0

[reactos] 01/01: [CMLIB] Don't redefine PAGED_CODE() to nothing in cmlib.h except for cmlib_host
by Timo Kreuzer 20 Jul '22

20 Jul '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2881b773020525536b0b5… commit 2881b773020525536b0b5e2fec3a63a291313367 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jul 17 11:34:27 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Jul 20 20:36:22 2022 +0200 [CMLIB] Don't redefine PAGED_CODE() to nothing in cmlib.h except for cmlib_host This header is included by ntoskrnl which effectively disabled all PAGED_CODE checks since 2015. Thanks Alex. Instead define _BLDR_ when building cmlib, which will avoid trying to import KeGetCurrentIrql() --- sdk/lib/cmlib/CMakeLists.txt | 1 + sdk/lib/cmlib/cmlib.h | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sdk/lib/cmlib/CMakeLists.txt b/sdk/lib/cmlib/CMakeLists.txt index d69202ba12d..bcd2b6b5142 100644 --- a/sdk/lib/cmlib/CMakeLists.txt +++ b/sdk/lib/cmlib/CMakeLists.txt @@ -1,5 +1,6 @@ add_definitions( + -D_BLDR_ -D_NTSYSTEM_ -DNASSERT) diff --git a/sdk/lib/cmlib/cmlib.h b/sdk/lib/cmlib/cmlib.h index d1b8c0656fe..fd6de8c75db 100644 --- a/sdk/lib/cmlib/cmlib.h +++ b/sdk/lib/cmlib/cmlib.h @@ -172,8 +172,6 @@ #include <ntdef.h> #include <ntifs.h> #include <bugcodes.h> - #undef PAGED_CODE - #define PAGED_CODE() /* Prevent inclusion of Windows headers through <wine/unicode.h> */ #define _WINDEF_

1 0

[reactos] 01/01: [MAIN] Improve mouse UI icons (#4583)
by Katayama Hirofumi MZ 19 Jul '22

19 Jul '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d520f3c27ad0f8a2836c… commit 8d520f3c27ad0f8a2836c092dfdf6787c6598c0c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jul 19 20:50:54 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jul 19 20:50:54 2022 +0900 [MAIN] Improve mouse UI icons (#4583) - Replace IDI_MOUSE_SPEED icon. - Add and use IDI_MOUSE_HIDE icon for "Hide pointer while typing". CORE-10728 --- dll/cpl/main/lang/bg-BG.rc | 2 +- dll/cpl/main/lang/cs-CZ.rc | 2 +- dll/cpl/main/lang/de-DE.rc | 2 +- dll/cpl/main/lang/el-GR.rc | 2 +- dll/cpl/main/lang/en-US.rc | 2 +- dll/cpl/main/lang/es-ES.rc | 2 +- dll/cpl/main/lang/fr-FR.rc | 2 +- dll/cpl/main/lang/he-IL.rc | 2 +- dll/cpl/main/lang/hu-HU.rc | 2 +- dll/cpl/main/lang/id-ID.rc | 2 +- dll/cpl/main/lang/it-IT.rc | 2 +- dll/cpl/main/lang/ja-JP.rc | 2 +- dll/cpl/main/lang/nl-NL.rc | 2 +- dll/cpl/main/lang/no-NO.rc | 2 +- dll/cpl/main/lang/pl-PL.rc | 2 +- dll/cpl/main/lang/pt-PT.rc | 2 +- dll/cpl/main/lang/ro-RO.rc | 2 +- dll/cpl/main/lang/ru-RU.rc | 2 +- dll/cpl/main/lang/sk-SK.rc | 2 +- dll/cpl/main/lang/sq-AL.rc | 2 +- dll/cpl/main/lang/tr-TR.rc | 2 +- dll/cpl/main/lang/uk-UA.rc | 2 +- dll/cpl/main/lang/zh-CN.rc | 2 +- dll/cpl/main/lang/zh-HK.rc | 2 +- dll/cpl/main/lang/zh-TW.rc | 2 +- dll/cpl/main/main.rc | 1 + dll/cpl/main/resource.h | 1 + dll/cpl/main/resources/mouse_hide.ico | Bin 0 -> 177367 bytes dll/cpl/main/resources/mouse_speed.ico | Bin 4470 -> 173223 bytes 29 files changed, 27 insertions(+), 25 deletions(-) diff --git a/dll/cpl/main/lang/bg-BG.rc b/dll/cpl/main/lang/bg-BG.rc index 56157fc935a..9ef7d2e17e1 100644 --- a/dll/cpl/main/lang/bg-BG.rc +++ b/dll/cpl/main/lang/bg-BG.rc @@ -121,7 +121,7 @@ BEGIN CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 //Сменено 60, 150, 90, 10->60, 150, 150, 10 CHECKBOX "&Скриване на показалеца по време на писане", IDC_CHECK_HIDE_POINTER,60, 150, 170, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 CHECKBOX "&Показване мястото на показалеца, при натискне на Ctrl", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 diff --git a/dll/cpl/main/lang/cs-CZ.rc b/dll/cpl/main/lang/cs-CZ.rc index 600dd5987ba..207afb38c5f 100644 --- a/dll/cpl/main/lang/cs-CZ.rc +++ b/dll/cpl/main/lang/cs-CZ.rc @@ -124,7 +124,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 CHECKBOX "&Skrýt ukazatel, pokud píšete.", IDC_CHECK_HIDE_POINTER, 60, 150, 150, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 CHECKBOX "&Ukázat pozici ukazatele při stisknutí klávesy Ctrl.", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 diff --git a/dll/cpl/main/lang/de-DE.rc b/dll/cpl/main/lang/de-DE.rc index e418a70f5cd..e858533cb95 100644 --- a/dll/cpl/main/lang/de-DE.rc +++ b/dll/cpl/main/lang/de-DE.rc @@ -120,7 +120,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 CHECKBOX "Zeiger bei &Tastatureingaben ausblenden", IDC_CHECK_HIDE_POINTER, 60, 150, 145, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 CHECKBOX "Zeigerposition beim Drücken der &STRG-Taste anzeigen", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 diff --git a/dll/cpl/main/lang/el-GR.rc b/dll/cpl/main/lang/el-GR.rc index 6bf3d20298d..d4ca1e4d796 100644 --- a/dll/cpl/main/lang/el-GR.rc +++ b/dll/cpl/main/lang/el-GR.rc @@ -118,7 +118,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 CHECKBOX "&Απόκρυψη του δείκτη κατά την πληκτρολόγηση", IDC_CHECK_HIDE_POINTER, 60, 150, 170, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 CHECKBOX "&Εμφάνηση της θέσης του δείκτη όταν πατάω CTRL", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 diff --git a/dll/cpl/main/lang/en-US.rc b/dll/cpl/main/lang/en-US.rc index 4617e223543..033b265e4af 100644 --- a/dll/cpl/main/lang/en-US.rc +++ b/dll/cpl/main/lang/en-US.rc @@ -118,7 +118,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 20, 128, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 143, 70, 17 CHECKBOX "&Hide pointer while typing", IDC_CHECK_HIDE_POINTER, 52, 163, 130, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 CHECKBOX "&Show location of pointer when I press the CTRL key", IDC_CHECK_SHOW_POINTER, 52, 188, 183, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 18, 183, 15, 15 diff --git a/dll/cpl/main/lang/es-ES.rc b/dll/cpl/main/lang/es-ES.rc index db7014eedbb..4434f07abd2 100644 --- a/dll/cpl/main/lang/es-ES.rc +++ b/dll/cpl/main/lang/es-ES.rc @@ -118,7 +118,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 CHECKBOX "&Ocultar puntero mientras se escribe", IDC_CHECK_HIDE_POINTER, 60, 150, 140, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 CHECKBOX "Mo&strar ubicación del puntero al presionar la tecla CTRL", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 diff --git a/dll/cpl/main/lang/fr-FR.rc b/dll/cpl/main/lang/fr-FR.rc index 94e40573c22..c523ebfcee8 100644 --- a/dll/cpl/main/lang/fr-FR.rc +++ b/dll/cpl/main/lang/fr-FR.rc @@ -118,7 +118,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 CHECKBOX "&Cacher le pointeur en écrivant", IDC_CHECK_HIDE_POINTER, 40, 150, 110, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 CHECKBOX "&Afficher le curseur quand je presse la touche CTRL", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 diff --git a/dll/cpl/main/lang/he-IL.rc b/dll/cpl/main/lang/he-IL.rc index be647e0138d..7b03f3b4df3 100644 --- a/dll/cpl/main/lang/he-IL.rc +++ b/dll/cpl/main/lang/he-IL.rc @@ -120,7 +120,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 20, 128, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 143, 70, 17 CHECKBOX "&Hide pointer while typing", IDC_CHECK_HIDE_POINTER, 52, 163, 130, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 CHECKBOX "&Show location of pointer when I press the CTRL key", IDC_CHECK_SHOW_POINTER, 52, 188, 183, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 18, 183, 15, 15 diff --git a/dll/cpl/main/lang/hu-HU.rc b/dll/cpl/main/lang/hu-HU.rc index e41189e2dc1..680d92d2dfa 100644 --- a/dll/cpl/main/lang/hu-HU.rc +++ b/dll/cpl/main/lang/hu-HU.rc @@ -118,7 +118,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 20, 128, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 143, 70, 17 CHECKBOX "Mutató el&rejtése gépelés közben", IDC_CHECK_HIDE_POINTER, 52, 163, 130, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 CHECKBOX "&Mutató helyének megjelenítése a CTRL lenyomásakor", IDC_CHECK_SHOW_POINTER, 52, 188, 183, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 18, 183, 15, 15 diff --git a/dll/cpl/main/lang/id-ID.rc b/dll/cpl/main/lang/id-ID.rc index 51126c877da..c47eafe12a0 100644 --- a/dll/cpl/main/lang/id-ID.rc +++ b/dll/cpl/main/lang/id-ID.rc @@ -118,7 +118,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 CHECKBOX "&Sembunyikan penunjuk saat mengetik", IDC_CHECK_HIDE_POINTER, 60, 150, 90, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 CHECKBOX "T&ampilkan lokasi penunjuk saat Saya menekan tombol CTRL", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 diff --git a/dll/cpl/main/lang/it-IT.rc b/dll/cpl/main/lang/it-IT.rc index 292399e100a..d042575cc27 100644 --- a/dll/cpl/main/lang/it-IT.rc +++ b/dll/cpl/main/lang/it-IT.rc @@ -120,7 +120,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 15, 119, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 74, 17 CHECKBOX "&Nascondi il puntatore mentre si scrive", IDC_CHECK_HIDE_POINTER, 60, 154, 140, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 15, 149, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 15, 149, 15, 15 CHECKBOX "&Mostra la posizione del puntatore quando si preme il tasto CTRL", IDC_CHECK_SHOW_POINTER, 60, 179, 170, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 15, 174, 15, 15 diff --git a/dll/cpl/main/lang/ja-JP.rc b/dll/cpl/main/lang/ja-JP.rc index 62dd0f50c8d..6b84aa1d8f4 100644 --- a/dll/cpl/main/lang/ja-JP.rc +++ b/dll/cpl/main/lang/ja-JP.rc @@ -118,7 +118,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 20, 128, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 143, 70, 17 CHECKBOX "タイピング中にポインタを隠す(&H)", IDC_CHECK_HIDE_POINTER, 52, 163, 130, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 CHECKBOX "CTRLキーを押したらポインタの位置を表示する(&S)", IDC_CHECK_SHOW_POINTER, 52, 188, 183, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 18, 183, 15, 15 diff --git a/dll/cpl/main/lang/nl-NL.rc b/dll/cpl/main/lang/nl-NL.rc index 9815955eba6..69b93ab3fdf 100644 --- a/dll/cpl/main/lang/nl-NL.rc +++ b/dll/cpl/main/lang/nl-NL.rc @@ -118,7 +118,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 CHECKBOX "&Aanwijzer verbergen tijdens het typen", IDC_CHECK_HIDE_POINTER, 60, 150, 90, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 CHECKBOX "&Laat zien waar de aanwijzer is met de CTRL toets", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 diff --git a/dll/cpl/main/lang/no-NO.rc b/dll/cpl/main/lang/no-NO.rc index 4dbe251fde4..c7566905289 100644 --- a/dll/cpl/main/lang/no-NO.rc +++ b/dll/cpl/main/lang/no-NO.rc @@ -118,7 +118,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 20, 128, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 143, 70, 17 CHECKBOX "&Skjul pekeren ved tastetrykk", IDC_CHECK_HIDE_POINTER, 52, 163, 130, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 CHECKBOX "&Vis hvor pekeren er når Crtl-tasten trykkes", IDC_CHECK_SHOW_POINTER, 52, 188, 183, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 18, 183, 15, 15 diff --git a/dll/cpl/main/lang/pl-PL.rc b/dll/cpl/main/lang/pl-PL.rc index a0eeab727ee..d1c49a5a706 100644 --- a/dll/cpl/main/lang/pl-PL.rc +++ b/dll/cpl/main/lang/pl-PL.rc @@ -126,7 +126,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 CHECKBOX "&Ukryj wskaźnik podczas pisania", IDC_CHECK_HIDE_POINTER, 60, 150, 130, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 CHECKBOX "Pokaż lokalizację wskaźnika po naciśnięciu klawisza &CTRL", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 diff --git a/dll/cpl/main/lang/pt-PT.rc b/dll/cpl/main/lang/pt-PT.rc index 378a43a1ad1..4646b79fce4 100644 --- a/dll/cpl/main/lang/pt-PT.rc +++ b/dll/cpl/main/lang/pt-PT.rc @@ -118,7 +118,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 20, 128, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 143, 70, 17 CHECKBOX "&Ocultar o ponteiro ao escrever", IDC_CHECK_HIDE_POINTER, 52, 163, 130, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 CHECKBOX "&Mostrar a localização do ponteiro ao premir a tecla CTRL", IDC_CHECK_SHOW_POINTER, 52, 188, 183, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 18, 183, 15, 15 diff --git a/dll/cpl/main/lang/ro-RO.rc b/dll/cpl/main/lang/ro-RO.rc index 40cac5a341f..6d53e33f3f5 100644 --- a/dll/cpl/main/lang/ro-RO.rc +++ b/dll/cpl/main/lang/ro-RO.rc @@ -123,7 +123,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 20, 128, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 143, 70, 17 CHECKBOX "As&cunde indicatorul în timpul scrierii", IDC_CHECK_HIDE_POINTER, 52, 163, 130, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 CHECKBOX "&Evidențiază poziția indicatorului apăsând tasta «Ctrl»", IDC_CHECK_SHOW_POINTER, 52, 188, 183, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 18, 183, 15, 15 diff --git a/dll/cpl/main/lang/ru-RU.rc b/dll/cpl/main/lang/ru-RU.rc index 5a0c1dbe992..b583ac990eb 100644 --- a/dll/cpl/main/lang/ru-RU.rc +++ b/dll/cpl/main/lang/ru-RU.rc @@ -118,7 +118,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 15, 134, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 82, 146, 70, 17 CHECKBOX "&Скрывать указатель во время ввода с клавиатуры", IDC_CHECK_HIDE_POINTER, 44, 164, 190, 20 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 15, 167, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 15, 167, 15, 15 CHECKBOX "Обозначать поло&жение указателя при нажатии CTRL", IDC_CHECK_SHOW_POINTER, 44, 197, 186, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 15, 194, 15, 15 diff --git a/dll/cpl/main/lang/sk-SK.rc b/dll/cpl/main/lang/sk-SK.rc index 1a5e35feec8..0a8288e0695 100644 --- a/dll/cpl/main/lang/sk-SK.rc +++ b/dll/cpl/main/lang/sk-SK.rc @@ -123,7 +123,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 20, 128, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 143, 70, 17 CHECKBOX "&Hide pointer while typing", IDC_CHECK_HIDE_POINTER, 52, 163, 130, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 CHECKBOX "&Show location of pointer when I press the CTRL key", IDC_CHECK_SHOW_POINTER, 52, 188, 183, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 18, 183, 15, 15 diff --git a/dll/cpl/main/lang/sq-AL.rc b/dll/cpl/main/lang/sq-AL.rc index 18cc4cc8f08..f57d11b2a80 100644 --- a/dll/cpl/main/lang/sq-AL.rc +++ b/dll/cpl/main/lang/sq-AL.rc @@ -122,7 +122,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 20, 128, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 143, 70, 17 CHECKBOX "&Hide treguesin ndërsa shkruani", IDC_CHECK_HIDE_POINTER, 52, 163, 130, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 CHECKBOX "&Trego vendndodhjen e treguesit kur shtypni butonin CTRL", IDC_CHECK_SHOW_POINTER, 52, 188, 183, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 18, 183, 15, 15 diff --git a/dll/cpl/main/lang/tr-TR.rc b/dll/cpl/main/lang/tr-TR.rc index 91e7d3e00bf..a205c1e92e2 100644 --- a/dll/cpl/main/lang/tr-TR.rc +++ b/dll/cpl/main/lang/tr-TR.rc @@ -120,7 +120,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 20, 128, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 143, 70, 17 CHECKBOX "&Yazarken imleci gizle", IDC_CHECK_HIDE_POINTER, 52, 163, 130, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 CHECKBOX "&CTRL tuşuna bastığımda imlecin konumunu göster", IDC_CHECK_SHOW_POINTER, 52, 188, 183, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 18, 183, 15, 15 diff --git a/dll/cpl/main/lang/uk-UA.rc b/dll/cpl/main/lang/uk-UA.rc index 3c584bd0563..49ecf2e27e5 100644 --- a/dll/cpl/main/lang/uk-UA.rc +++ b/dll/cpl/main/lang/uk-UA.rc @@ -126,7 +126,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 90, 130, 70, 17 CHECKBOX "П&риховувати вказівник під час введення з клавіатури", IDC_CHECK_HIDE_POINTER, 60, 150, 90, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 CHECKBOX "Показувати ро&зташування вказівника при натисненні CTRL", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 diff --git a/dll/cpl/main/lang/zh-CN.rc b/dll/cpl/main/lang/zh-CN.rc index d18c249b1ba..aaa5eecefaa 100644 --- a/dll/cpl/main/lang/zh-CN.rc +++ b/dll/cpl/main/lang/zh-CN.rc @@ -125,7 +125,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 20, 128, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 143, 70, 17 CHECKBOX "在打字时隐藏指针(&H)", IDC_CHECK_HIDE_POINTER, 52, 163, 130, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 CHECKBOX "当按 CTRL 键时显示指针的位置(&S)", IDC_CHECK_SHOW_POINTER, 52, 188, 183, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 18, 183, 15, 15 diff --git a/dll/cpl/main/lang/zh-HK.rc b/dll/cpl/main/lang/zh-HK.rc index 2c759d9b3e9..01f4c3c9b1a 100644 --- a/dll/cpl/main/lang/zh-HK.rc +++ b/dll/cpl/main/lang/zh-HK.rc @@ -126,7 +126,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 20, 128, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 143, 70, 17 CHECKBOX "在打字時隱藏指標(&H)", IDC_CHECK_HIDE_POINTER, 52, 163, 130, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 CHECKBOX "當按 CTRL 鍵時顯示指標的位置(&S)", IDC_CHECK_SHOW_POINTER, 52, 188, 183, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 18, 183, 15, 15 diff --git a/dll/cpl/main/lang/zh-TW.rc b/dll/cpl/main/lang/zh-TW.rc index 5d365891a1d..fd8e83b6245 100644 --- a/dll/cpl/main/lang/zh-TW.rc +++ b/dll/cpl/main/lang/zh-TW.rc @@ -126,7 +126,7 @@ BEGIN ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 20, 128, 15, 15 CONTROL "", IDC_SLIDER_POINTER_TRAIL, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 143, 70, 17 CHECKBOX "在打字時隱藏指標(&H)", IDC_CHECK_HIDE_POINTER, 52, 163, 130, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 + ICON IDI_MOUSE_HIDE, IDC_ICON_HIDE_POINTER, 18, 158, 15, 15 CHECKBOX "當按 CTRL 鍵時顯示指標的位置(&S)", IDC_CHECK_SHOW_POINTER, 52, 188, 183, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 18, 183, 15, 15 diff --git a/dll/cpl/main/main.rc b/dll/cpl/main/main.rc index 109c586e8b5..92dfeef9e21 100644 --- a/dll/cpl/main/main.rc +++ b/dll/cpl/main/main.rc @@ -21,6 +21,7 @@ IDI_MOUSE_RIGHT ICON "resources/mouse_right.ico" IDI_MOUSE_SPEED ICON "resources/mouse_speed.ico" IDI_MOUSE_BUTTON ICON "resources/mouse_button.ico" IDI_MOUSE_TRAILS ICON "resources/mouse_trails.ico" +IDI_MOUSE_HIDE ICON "resources/mouse_hide.ico" IDI_FONTS_FOLDER ICON "resources/fonts_folder.ico" IDI_ADMIN_TOOLS_FOLDER ICON "resources/admintools_folder.ico" IDI_MOUSE_POINTER ICON "resources/mouse_pointer.ico" diff --git a/dll/cpl/main/resource.h b/dll/cpl/main/resource.h index 1a5d38d3479..9bff0b95d1e 100644 --- a/dll/cpl/main/resource.h +++ b/dll/cpl/main/resource.h @@ -12,6 +12,7 @@ #define IDI_MOUSE_SPEED 205 #define IDI_MOUSE_BUTTON 206 #define IDI_MOUSE_TRAILS 207 +#define IDI_MOUSE_HIDE 208 #define IDI_FONTS_FOLDER 400 #define IDI_ADMIN_TOOLS_FOLDER 500 #define IDI_MOUSE_POINTER 600 diff --git a/dll/cpl/main/resources/mouse_hide.ico b/dll/cpl/main/resources/mouse_hide.ico new file mode 100644 index 00000000000..1715b3bdeec Binary files /dev/null and b/dll/cpl/main/resources/mouse_hide.ico differ diff --git a/dll/cpl/main/resources/mouse_speed.ico b/dll/cpl/main/resources/mouse_speed.ico index b960de39f9d..53b8d24271e 100644 Binary files a/dll/cpl/main/resources/mouse_speed.ico and b/dll/cpl/main/resources/mouse_speed.ico differ

1 0

[reactos] 01/01: [SYSDM] Don't use magic number (ja-JP)
by Katayama Hirofumi MZ 19 Jul '22

19 Jul '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9fc9180a1c1dbb7099c3e… commit 9fc9180a1c1dbb7099c3e5fbaef03fb7820105f3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jul 19 13:05:07 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Jul 19 13:05:07 2022 +0900 [SYSDM] Don't use magic number (ja-JP) --- dll/cpl/sysdm/lang/ja-JP.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/sysdm/lang/ja-JP.rc b/dll/cpl/sysdm/lang/ja-JP.rc index 059097bfabe..35b92143abb 100644 --- a/dll/cpl/sysdm/lang/ja-JP.rc +++ b/dll/cpl/sysdm/lang/ja-JP.rc @@ -139,7 +139,7 @@ CAPTION "プロファイル名の変更" FONT 9, "MS UI Gothic" BEGIN LTEXT "元の名前:", IDC_STATIC, 5, 10, 40, 8 - LTEXT "", 1401, 50, 10, 140, 10 + LTEXT "", IDC_RENPROFEDITFROM, 50, 10, 140, 10 LTEXT "新しい名前:", IDC_STATIC, 5, 30, 40, 8 EDITTEXT IDC_RENPROFEDITTO, 50, 30, 140, 12 DEFPUSHBUTTON "OK", IDOK, 199, 9, 50, 14

1 0

[reactos] 01/01: [EXPLORER] Fix assertion failure on start button (#4581)
by Katayama Hirofumi MZ 18 Jul '22

18 Jul '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=255f43086db6af47c2766… commit 255f43086db6af47c27664063c9deab36a93642f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jul 18 22:20:25 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 18 22:20:25 2022 +0900 [EXPLORER] Fix assertion failure on start button (#4581) CORE-18024 --- base/shell/explorer/traywnd.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index c4a30a6ffe3..da62c75c269 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -2687,6 +2687,7 @@ ChangePos: { CComPtr<IContextMenu> ctxMenu; CStartMenuBtnCtxMenu_CreateInstance(this, m_hWnd, &ctxMenu); + ctxMenu->AddRef(); TrackCtxMenu(ctxMenu, ppt, hWndExclude, m_Position == ABE_BOTTOM, this); } }

1 0

[reactos] 01/01: [CONSOLE] Improve Japanese translation (ja-JP)
by Katayama Hirofumi MZ 18 Jul '22

18 Jul '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f80670040c88faf7c5e3… commit 5f80670040c88faf7c5e3d1d9fb8ecde52a6f79f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jul 18 21:46:15 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Jul 18 21:46:15 2022 +0900 [CONSOLE] Improve Japanese translation (ja-JP) --- dll/cpl/console/lang/ja-JP.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/console/lang/ja-JP.rc b/dll/cpl/console/lang/ja-JP.rc index 3f7b56524b7..f0414a10dfb 100644 --- a/dll/cpl/console/lang/ja-JP.rc +++ b/dll/cpl/console/lang/ja-JP.rc @@ -150,5 +150,5 @@ BEGIN IDS_CPLDESCRIPTION "コンソールプロパティを設定します。" IDS_APPLY_SHORTCUT_ALL "このウィンドウを開始したショートカットを編集します(&S)" IDS_RASTERFONTS "ラスターフォント" - IDS_GROUPBOX_FONT_NAME "Selected Font: " + IDS_GROUPBOX_FONT_NAME "選択中のフォント: " END

1 0

[reactos] 01/01: [APPWIZ] Improve Japanese translation (ja-JP)
by Katayama Hirofumi MZ 18 Jul '22

18 Jul '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a7f06eb4806c7c356a2ee… commit a7f06eb4806c7c356a2eee3e3b4cbc242664faba Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jul 18 21:44:25 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Jul 18 21:44:25 2022 +0900 [APPWIZ] Improve Japanese translation (ja-JP) --- dll/cpl/appwiz/lang/ja-JP.rc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dll/cpl/appwiz/lang/ja-JP.rc b/dll/cpl/appwiz/lang/ja-JP.rc index ddbe0f6cc4f..3c9b052a5dd 100644 --- a/dll/cpl/appwiz/lang/ja-JP.rc +++ b/dll/cpl/appwiz/lang/ja-JP.rc @@ -78,12 +78,12 @@ BEGIN IDS_DOWNLOADING "ダウンロード中..." IDS_INSTALLING "インストール中..." IDS_INVALID_SHA "ダウンロードしたファイルのチェックサムが合致しません。壊れたファイルのインストールを中止しています。" - IDS_NEW_INTERNET_SHORTCUT "New Internet Shortcut" - IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." - IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." - IDS_CANTMAKESHORTCUT "Failed to create shortcut." - IDS_NO_MEMORY "No memory could be allocated!" - IDS_NO_DIRECTORY "No directory given!" - IDS_INVALID_PATH "The given path is invalid!" - IDS_INVALID_NAME "The shortcut name you entered either contained characters that are invalid for file names or was too long." + IDS_NEW_INTERNET_SHORTCUT "新しいインターネットショートカット" + IDS_DWL_FAILED "Geckoパッケージをダウンロードできません。ダウンロードするためにインターネット接続を確認して下さい。セットアップはGeckoをインストールせずに続行します。" + IDS_CANTMAKEINETSHORTCUT "インターネットショートカットの作成に失敗しました。" + IDS_CANTMAKESHORTCUT "ショートカットの作成に失敗しました。" + IDS_NO_MEMORY "メモリーが割り当てできませんでした！" + IDS_NO_DIRECTORY "ディレクトリが与えられてません!" + IDS_INVALID_PATH "与えられたパスは無効です!" + IDS_INVALID_NAME "入力したショートカット名にファイル名としては無効な文字が含まれているか長すぎます。" END

1 0

[reactos] 01/01: [INTL] Improve Japanese translation (ja-JP)
by Katayama Hirofumi MZ 18 Jul '22

18 Jul '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=01643b8d9e4aed5030e64… commit 01643b8d9e4aed5030e64cfe8dbef3ac2a03f48b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jul 18 21:39:29 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Jul 18 21:39:29 2022 +0900 [INTL] Improve Japanese translation (ja-JP) --- dll/cpl/intl/lang/ja-JP.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/cpl/intl/lang/ja-JP.rc b/dll/cpl/intl/lang/ja-JP.rc index b3a90521435..5ce9ec97199 100644 --- a/dll/cpl/intl/lang/ja-JP.rc +++ b/dll/cpl/intl/lang/ja-JP.rc @@ -113,7 +113,7 @@ END IDD_TIMEPAGE DIALOGEX 0, 0, 246, 234 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Time" +CAPTION "時刻" FONT 9, "MS UI Gothic" BEGIN GROUPBOX "表示例", -1, 7, 7, 230, 33, WS_CHILD | WS_VISIBLE @@ -213,5 +213,5 @@ BEGIN IDS_ERROR_NLS_KEY_REG "問題の開いているキー: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language" IDS_ERROR_NLS_CODE_REG "問題の開いているキー: HKLM\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage" IDS_ERROR_INPUT_DLL "input.dllを開始できません" - IDS_ERROR_UNICODE "Unable to install a new language for programs that don't support Unicode!" + IDS_ERROR_UNICODE "Unicodeをサポートしていないプログラムのための新しい言語をインストールできません。" END

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