Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 04/04: [CRT/x64] Make _fpreset/_logb public, as they are exported using the .spec file
by Hervé Poussineau 07 Jan '21

07 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0cce1348c65729fb71a94… commit 0cce1348c65729fb71a94c631a705eae987d8de0 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Wed Jan 6 21:00:09 2021 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Jan 7 21:12:11 2021 +0100 [CRT/x64] Make _fpreset/_logb public, as they are exported using the .spec file --- sdk/lib/crt/float/amd64/fpreset.S | 1 + sdk/lib/crt/float/amd64/logb.S | 1 + 2 files changed, 2 insertions(+) diff --git a/sdk/lib/crt/float/amd64/fpreset.S b/sdk/lib/crt/float/amd64/fpreset.S index 008da4152eb..bae9ed4c856 100644 --- a/sdk/lib/crt/float/amd64/fpreset.S +++ b/sdk/lib/crt/float/amd64/fpreset.S @@ -3,6 +3,7 @@ .code64 +PUBLIC _fpreset FUNC _fpreset .endprolog fninit diff --git a/sdk/lib/crt/float/amd64/logb.S b/sdk/lib/crt/float/amd64/logb.S index 47f9630ea63..2cb4bb886ec 100644 --- a/sdk/lib/crt/float/amd64/logb.S +++ b/sdk/lib/crt/float/amd64/logb.S @@ -4,6 +4,7 @@ .code64 +PUBLIC _logb FUNC _logb .endprolog

1 0

[reactos] 03/04: [CRT/x64] Disable MSVCRT__setjmp function, which references non-existent function __wine_setjmpex
by Hervé Poussineau 07 Jan '21

07 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a644e7f5fd30642399284… commit a644e7f5fd3064239928414803eda8748b911ee2 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Wed Jan 6 16:36:48 2021 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Jan 7 21:12:11 2021 +0100 [CRT/x64] Disable MSVCRT__setjmp function, which references non-existent function __wine_setjmpex _setjmp is already defined in sdk/lib/crt/setjmp/amd64/setjmp.s --- sdk/lib/crt/wine/except_x86_64.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk/lib/crt/wine/except_x86_64.c b/sdk/lib/crt/wine/except_x86_64.c index e91b8628297..9e7676413de 100644 --- a/sdk/lib/crt/wine/except_x86_64.c +++ b/sdk/lib/crt/wine/except_x86_64.c @@ -674,11 +674,13 @@ unsigned int CDECL __CxxQueryExceptionSize(void) } +#ifndef __REACTOS__ /******************************************************************* * _setjmp (MSVCRT.@) */ __ASM_GLOBAL_FUNC( MSVCRT__setjmp, "jmp " __ASM_NAME("__wine_setjmpex") ); +#endif /******************************************************************* * longjmp (MSVCRT.@)

1 0

[reactos] 02/04: [ASM x64] Change ; by /* */ for comments
by Hervé Poussineau 07 Jan '21

07 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ff7035d940d31f3168b5c… commit ff7035d940d31f3168b5ca767bae262615797562 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Wed Jan 6 22:50:22 2021 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Jan 7 21:12:11 2021 +0100 [ASM x64] Change ; by /* */ for comments Syntax with semi-colon is not supported by gas. --- dll/ntdll/dispatch/amd64/dispatch.S | 36 ++++++++++---------- ntoskrnl/ke/amd64/ctxswitch.S | 12 ++++--- ntoskrnl/ke/amd64/trap.S | 47 ++++++++++++------------- ntoskrnl/ke/amd64/usercall_asm.S | 68 ++++++++++++++++++------------------- sdk/include/asm/kxamd64.inc | 22 ++++++------ sdk/include/asm/macamd64.inc | 14 ++++---- 6 files changed, 101 insertions(+), 98 deletions(-) diff --git a/dll/ntdll/dispatch/amd64/dispatch.S b/dll/ntdll/dispatch/amd64/dispatch.S index 86fe423ab2c..c78ff86e78d 100644 --- a/dll/ntdll/dispatch/amd64/dispatch.S +++ b/dll/ntdll/dispatch/amd64/dispatch.S @@ -62,44 +62,44 @@ PUBLIC KiRaiseUserExceptionDispatcher PUBLIC KiUserCallbackDispatcher .PROC KiUserCallbackDispatcher - ; The stack is set up with a UCALLOUT_FRAME - ; The frame ends with a MACHINE_FRAME. + /* The stack is set up with a UCALLOUT_FRAME */ + /* The frame ends with a MACHINE_FRAME. */ .PUSHFRAME - ; This is for the Home space, Buffer, Length and ApiNumber + /* This is for the Home space, Buffer, Length and ApiNumber */ .ALLOCSTACK 6 * 8 .ENDPROLOG #if DBG - ; We enter the function with a fully setup stack, so it must be aligned! + /* We enter the function with a fully setup stack, so it must be aligned! */ test rsp, 15 jz AlignmentOk int HEX(2C) AlignmentOk: #endif - ; Get the parameters from the callout frame + /* Get the parameters from the callout frame */ mov rcx, [rsp + CkBuffer] mov edx, [rsp + CkLength] mov r8d, [rsp + CkApiNumber] - ; Get the callback table + /* Get the callback table */ mov rax, gs:[TePeb] mov r9, [rax + PeKernelCallbackTable] - ; Call the routine + /* Call the routine */ call qword ptr [r9 + r8 * 8] - ; Return from callback + /* Return from callback */ xor ecx, ecx xor edx, edx mov r8d, eax call ZwCallbackReturn - ; Save callback return value + /* Save callback return value */ mov esi, eax - ; Raise status + /* Raise status */ StatusRaise: mov ecx, esi call RtlRaiseStatus @@ -158,11 +158,11 @@ EXTERN RtlRaiseException:PROC PUBLIC KiUserExceptionDispatcher .PROC KiUserExceptionDispatcher - ; The stack is set up with a KUSER_EXCEPTION_STACK - ; The frame ends with a MACHINE_FRAME. + /* The stack is set up with a KUSER_EXCEPTION_STACK */ + /* The frame ends with a MACHINE_FRAME. */ .PUSHFRAME - ; This is for the alignment, EXCEPTION_RECORD and CONTEXT + /* This is for the alignment, EXCEPTION_RECORD and CONTEXT */ .ALLOCSTACK 8 + EXCEPTION_RECORD_LENGTH + CONTEXT_FRAME_LENGTH .ENDPROLOG @@ -177,8 +177,8 @@ PUBLIC KiUserExceptionDispatcher jz RaiseException /* We're fine, continue execution */ - lea rcx, [rsp] ; ContextRecord - mov dl, 0 ; TestAlert + lea rcx, [rsp] /* ContextRecord */ + mov dl, 0 /* TestAlert */ call ZwContinue /* Exit */ @@ -187,13 +187,13 @@ PUBLIC KiUserExceptionDispatcher RaiseException: /* Raise the exception */ - lea rcx, [rsp + CONTEXT_FRAME_LENGTH] ; ExceptionRecord - lea rdx, [rsp] ; ContextRecord + lea rcx, [rsp + CONTEXT_FRAME_LENGTH] /* ExceptionRecord */ + lea rdx, [rsp] /* ContextRecord */ xor r8, r8 call ZwRaiseException Exit: - lea rcx, [rsp + CONTEXT_FRAME_LENGTH] ; ExceptionRecord + lea rcx, [rsp + CONTEXT_FRAME_LENGTH] /* ExceptionRecord */ mov rdx, rax call KiUserExceptionDispatcherNested ret diff --git a/ntoskrnl/ke/amd64/ctxswitch.S b/ntoskrnl/ke/amd64/ctxswitch.S index a88188e00d0..ddd9a734499 100644 --- a/ntoskrnl/ke/amd64/ctxswitch.S +++ b/ntoskrnl/ke/amd64/ctxswitch.S @@ -11,11 +11,13 @@ #include <ksamd64.inc> -; BOOLEAN -; KiSwapContextResume( -; _In_ KIRQL WaitIrql, -; _In_ PKTHREAD OldThread, -; _In_ PKTHREAD NewThread) +/* + * BOOLEAN + * KiSwapContextResume( + * _In_ KIRQL WaitIrql, + * _In_ PKTHREAD OldThread, + * _In_ PKTHREAD NewThread) + */ EXTERN KiSwapContextResume:PROC /* FUNCTIONS ****************************************************************/ diff --git a/ntoskrnl/ke/amd64/trap.S b/ntoskrnl/ke/amd64/trap.S index 2d7194b82de..b32d0ef4a4b 100644 --- a/ntoskrnl/ke/amd64/trap.S +++ b/ntoskrnl/ke/amd64/trap.S @@ -825,7 +825,7 @@ no_user_apc_pending: /* Swap gs back to user */ swapgs - ; Zero out volatiles + /* Zero out volatiles */ pxor xmm0, xmm0 pxor xmm1, xmm1 pxor xmm2, xmm2 @@ -965,7 +965,7 @@ FUNC KiConvertToGuiThread test rax, rax jz KiConvertToGuiThreadFailed - ; OldStack = KeSwitchKernelStack((PVOID)NewStack, (PVOID)(NewStack - KERNEL_STACK_SIZE)); + /* OldStack = KeSwitchKernelStack((PVOID)NewStack, (PVOID)(NewStack - KERNEL_STACK_SIZE)); */ mov rcx, rax mov rdx, rax sub rdx, KERNEL_STACK_SIZE @@ -1011,44 +1011,45 @@ KiConvertToGuiThreadFailed: ENDFUNC -; -; VOID -; KiDeliverApc( -; _In_ KPROCESSOR_MODE DeliveryMode, -; _In_ PKEXCEPTION_FRAME ExceptionFrame, -; _In_ PKTRAP_FRAME TrapFrame); -; +/* + * VOID + * KiDeliverApc( + * _In_ KPROCESSOR_MODE DeliveryMode, + * _In_ PKEXCEPTION_FRAME ExceptionFrame, + * _In_ PKTRAP_FRAME TrapFrame); + * + */ EXTERN KiDeliverApc:PROC PUBLIC KiInitiateUserApc .PROC KiInitiateUserApc - ; Generate a KEXCEPTION_FRAME on the stack + /* Generate a KEXCEPTION_FRAME on the stack */ GENERATE_EXCEPTION_FRAME - ; Raise IRQL to APC_LEVEL + /* Raise IRQL to APC_LEVEL */ mov rax, APC_LEVEL mov cr8, rax - ; Enable interrupts + /* Enable interrupts */ sti - ; Get the current trap frame + /* Get the current trap frame */ mov rax, gs:[PcCurrentThread] mov r8, [rax + KTHREAD_TrapFrame] - ; Call the C function + /* Call the C function */ mov ecx, 1 mov rdx, rsp call KiDeliverApc - ; Disable interrupts again + /* Disable interrupts again */ cli - ; Restore the registers from the KEXCEPTION_FRAME + /* Restore the registers from the KEXCEPTION_FRAME */ RESTORE_EXCEPTION_STATE - ; Return + /* Return */ ret .ENDP @@ -1092,22 +1093,22 @@ FUNC KeSwitchKernelStack sub rsp, 40 .allocstack 40 - ; Save rcx + /* Save rcx */ mov [rsp], rcx .savereg rcx, 0 .endprolog - ; Call the C handler, which returns the old stack in rax - call KiSwitchKernelStack + /* Call the C handler, which returns the old stack in rax */ + call KiSwitchKernelStack - ; Restore rcx (StackBase) + /* Restore rcx (StackBase) */ mov rcx, [rsp] - ; Switch to new stack: RSP += (StackBase - OldStackBase) + /* Switch to new stack: RSP += (StackBase - OldStackBase) */ sub rcx, rax add rsp, rcx - ; Deallocate the home frame + /* Deallocate the home frame */ add rsp, 40 ret diff --git a/ntoskrnl/ke/amd64/usercall_asm.S b/ntoskrnl/ke/amd64/usercall_asm.S index 2d894161fed..8962f2470e0 100644 --- a/ntoskrnl/ke/amd64/usercall_asm.S +++ b/ntoskrnl/ke/amd64/usercall_asm.S @@ -1,72 +1,72 @@ -;++ -; PROJECT: ReactOS Kernel -; LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) -; PURPOSE: ReactOS AMD64 user mode callback helper -; COPYRIGHT: Timo Kreuzer (timo.kreuzer(a)reactos.org) -;-- +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: ReactOS AMD64 user mode callback helper + * COPYRIGHT: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ #include <ksamd64.inc> -; -; NTSTATUS -; KiUserModeCallout ( -; _Inout_ PKCALLOUT_FRAME CalloutFrame); -; +/* + * NTSTATUS + * KiUserModeCallout ( + * _Inout_ PKCALLOUT_FRAME CalloutFrame); + */ EXTERN KiUserModeCallout:PROC .code64 -; -; NTSTATUS -; KiCallUserMode ( -; _In_ PVOID *OutputBuffer@<rcx>, -; _In_ PULONG OutputLength@<rdx>); -; +/* + * NTSTATUS + * KiCallUserMode ( + * _In_ PVOID *OutputBuffer@<rcx>, + * _In_ PULONG OutputLength@<rdx>); + */ PUBLIC KiCallUserMode .PROC KiCallUserMode - ; Generate a KEXCEPTION_FRAME on the stack - ; This is identical to a KCALLOUT_FRAME + /* Generate a KEXCEPTION_FRAME on the stack */ + /* This is identical to a KCALLOUT_FRAME */ GENERATE_EXCEPTION_FRAME - ; Save OutputBuffer and OutputLength + /* Save OutputBuffer and OutputLength */ mov [rsp + ExOutputBuffer], rcx mov [rsp + ExOutputLength], rdx - ; Call the C function + /* Call the C function */ mov rcx, rsp call KiUserModeCallout - ; Restore the registers from the KEXCEPTION_FRAME + /* Restore the registers from the KEXCEPTION_FRAME */ RESTORE_EXCEPTION_STATE - ; Return + /* Return */ ret .ENDP -; -; DECLSPEC_NORETURN -; VOID -; KiCallbackReturn ( -; _In_ PVOID Stack, -; _In_ NTSTATUS Status); -; +/* + * DECLSPEC_NORETURN + * VOID + * KiCallbackReturn ( + * _In_ PVOID Stack, + * _In_ NTSTATUS Status); + */ PUBLIC KiCallbackReturn .PROC KiCallbackReturn .ENDPROLOG - ; Restore the stack + /* Restore the stack */ mov rsp, rcx - ; Set return status + /* Set return status */ mov eax, edx - ; Restore the registers from the KEXCEPTION_FRAME + /* Restore the registers from the KEXCEPTION_FRAME */ RESTORE_EXCEPTION_STATE - ; Return + /* Return */ ret .ENDP diff --git a/sdk/include/asm/kxamd64.inc b/sdk/include/asm/kxamd64.inc index 187cf74e4ff..dccf8a2c409 100644 --- a/sdk/include/asm/kxamd64.inc +++ b/sdk/include/asm/kxamd64.inc @@ -1,20 +1,20 @@ -;++ -; PROJECT: ReactOS SDK -; LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) -; PURPOSE: ReactOS AMD64 architecture asm macros -; COPYRIGHT: Timo Kreuzer (timo.kreuzer(a)reactos.org) -;-- +/* + * PROJECT: ReactOS SDK + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: ReactOS AMD64 architecture asm macros + * COPYRIGHT: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ #include <macamd64.inc> MACRO(GENERATE_EXCEPTION_FRAME) - ; Allocate a KEXCEPTION_FRAME on the stack - ; -8 because the last field is the return address + /* Allocate a KEXCEPTION_FRAME on the stack */ + /* -8 because the last field is the return address */ sub rsp, KEXCEPTION_FRAME_LENGTH - 8 .allocstack KEXCEPTION_FRAME_LENGTH - 8 - ; Save non-volatiles in KEXCEPTION_FRAME + /* Save non-volatiles in KEXCEPTION_FRAME */ mov [rsp + ExRbp], rbp .savereg rbp, ExRbp mov [rsp + ExRbx], rbx @@ -56,7 +56,7 @@ ENDM MACRO(RESTORE_EXCEPTION_STATE) - ; Restore non-volatile registers + /* Restore non-volatile registers */ mov rbp, [rsp + ExRbp] mov rbx, [rsp + ExRbx] mov rdi, [rsp + ExRdi] @@ -76,7 +76,7 @@ MACRO(RESTORE_EXCEPTION_STATE) movaps xmm14, [rsp + ExXmm14] movaps xmm15, [rsp + ExXmm15] - ; Clean stack and return + /* Clean stack and return */ add rsp, KEXCEPTION_FRAME_LENGTH - 8 ENDM diff --git a/sdk/include/asm/macamd64.inc b/sdk/include/asm/macamd64.inc index e342e440ded..af917f54f31 100644 --- a/sdk/include/asm/macamd64.inc +++ b/sdk/include/asm/macamd64.inc @@ -1,9 +1,9 @@ -;++ -; PROJECT: ReactOS SDK -; LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) -; PURPOSE: ReactOS AMD64 architecture asm macros -; COPYRIGHT: Timo Kreuzer (timo.kreuzer(a)reactos.org) -;-- +/* + * PROJECT: ReactOS SDK + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: ReactOS AMD64 architecture asm macros + * COPYRIGHT: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ #include <asm.inc> @@ -156,4 +156,4 @@ MACRO(Yield) pause ENDM -; EOF +/* EOF */

1 0

[reactos] 01/04: [FRAMEDYN] Fix an x64 export (probably wrong copy/paste from x86 version)
by Hervé Poussineau 07 Jan '21

07 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4bb7bd1f50c1edd589b78… commit 4bb7bd1f50c1edd589b784409c520beb4ddca973 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Wed Jan 6 20:52:15 2021 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Jan 7 21:12:11 2021 +0100 [FRAMEDYN] Fix an x64 export (probably wrong copy/paste from x86 version) --- dll/win32/framedyn/framedyn.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/framedyn/framedyn.spec b/dll/win32/framedyn/framedyn.spec index c2431ae97c0..99bc8ca5074 100644 --- a/dll/win32/framedyn/framedyn.spec +++ b/dll/win32/framedyn/framedyn.spec @@ -127,7 +127,7 @@ @ thiscall -arch=win64 ?MakeUpper@CHString@@QEAAXXZ() _ZN8CHString9MakeUpperEv # public: void __thiscall CHString::MakeUpper(void) @ thiscall -arch=win64 ?Mid@CHString@@QEBA?AV1@H@Z(long) _ZNK8CHString3MidEi # public: class CHString __thiscall CHString::Mid(int)const @ thiscall -arch=win64 ?Mid@CHString@@QEBA?AV1@HH@Z(long long) _ZNK8CHString3MidEii # public: class CHString __thiscall CHString::Mid(int,int)const -@ thiscall -arch=win64 ?Release@CHString@@KAXPEAUCHStringData@@@Z(ptr) _ZN8CHString7ReleaseEP12CHStringData@4 # protected: static void __stdcall CHString::Release(struct CHStringData *) +@ thiscall -arch=win64 ?Release@CHString@@KAXPEAUCHStringData@@@Z(ptr) _ZN8CHString7ReleaseEP12CHStringData # protected: static void __stdcall CHString::Release(struct CHStringData *) @ thiscall -arch=win64 ?Release@CHString@@IEAAXXZ() _ZN8CHString7ReleaseEv # protected: void __thiscall CHString::Release(void) @ thiscall -arch=win64 ?ReleaseBuffer@CHString@@QEAAXH@Z(long) _ZN8CHString13ReleaseBufferEi # public: void __thiscall CHString::ReleaseBuffer(int) @ thiscall -arch=win64 ?ReverseFind@CHString@@QEBAHG@Z(long) _ZNK8CHString11ReverseFindEw # public: int __thiscall CHString::ReverseFind(unsigned short)const

1 0

[reactos] 01/01: [TRANSLATION] Fix format for Indonesian translation (#3418)
by Mas Ahmad Muhammad 07 Jan '21

07 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4ca79260937babaf51bd7… commit 4ca79260937babaf51bd7f258f37f921e1895766 Author: Mas Ahmad Muhammad <m.charly81(a)gmail.com> AuthorDate: Fri Jan 8 00:47:10 2021 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jan 7 18:47:10 2021 +0100 [TRANSLATION] Fix format for Indonesian translation (#3418) - USETUP: Fix alignment on translation. - SHELL32: Update and fix translation. --- base/setup/usetup/lang/id-ID.h | 22 ++++++++--------- dll/win32/shell32/lang/id-ID.rc | 52 ++++++++++++++++++++--------------------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/base/setup/usetup/lang/id-ID.h b/base/setup/usetup/lang/id-ID.h index f7df6647aae..fc566c19022 100644 --- a/base/setup/usetup/lang/id-ID.h +++ b/base/setup/usetup/lang/id-ID.h @@ -461,21 +461,21 @@ static MUI_ENTRY idIDDevicePageEntries[] = { 6, 19, - "Anda dapat mengubah pengaturan perangkat keras dengan menekan tombol ATAS atau", + "Anda dapat mengubah pengaturan perangkat keras dengan menekan tombol", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 20, - "BAWAH untuk menunjuk daftar. Kemudian tekan tombol ENTER untuk memilih pengaturan", + "ATAS atau BAWAH untuk menunjuk daftar. Kemudian tekan tombol ENTER", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 21, - "alternatif.", + "untuk memilih pengaturan alternatif.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -593,21 +593,21 @@ static MUI_ENTRY idIDUpgradePageEntries[] = { 6, 8, - "Penyetelan ReactOS dapat meningkatkan salah satu dari pemasangan ReactOS yang", + "Penyetelan ReactOS dapat meningkatkan salah satu dari pemasangan", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 9, - "tersedia di bawah ini, atau, jika pemasangan ReactOS ini rusak, program", + "ReactOS yang tersedia di bawah ini, atau, jika pemasangan ReactOS", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 10, - "penyetelan ini dapat mengupayakan perbaikan.", + "ini rusak, program penyetelan ini dapat mengupayakan perbaikan.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1355,21 +1355,21 @@ static MUI_ENTRY idIDInstallDirectoryEntries[] = { 6, 14, - "Untuk mengubah direktori yang disarankan, tekan BACKSPACE untuk menghapus", + "Untuk mengubah direktori yang disarankan, tekan BACKSPACE untuk", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 15, - "beberapa karakter dan kemudian ketikkan direktori yang anda inginkan untuk", + "menghapus beberapa karakter dan kemudian ketikkan direktori yang", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, { 6, 16, - "memasang ReactOS.", + "anda inginkan untuk memasang ReactOS.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -1414,7 +1414,7 @@ static MUI_ENTRY idIDFileCopyEntries[] = { 0, 14, - "This may take several minutes to complete.", + "Mungkin butuh beberapa waktu untuk penyelesaiannya.", TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER, TEXT_ID_STATIC }, @@ -2231,7 +2231,7 @@ MUI_STRING idIDStrings[] = {STRING_CHECKINGDISK, "Penyetelan sedang memeriksa cakram anda"}, {STRING_FORMATDISK1, - " Format partiti sebagai sistem berkas %S (format cepat) "}, + " Format partisi sebagai sistem berkas %S (format cepat) "}, {STRING_FORMATDISK2, " Format partisi sebagai sistem berkas %S "}, {STRING_KEEPFORMAT, diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index b89c71a6b4b..8d2931cf96f 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -237,10 +237,10 @@ BEGIN EDITTEXT 14015, 58, 128, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 144, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Atribut:", 14020, 8, 152, 46, 10 - AUTOCHECKBOX "&Hanya-baca", 14021, 58, 188, 53, 10 - AUTOCHECKBOX "&Tersembunyi", 14022, 112, 188, 53, 10 - AUTOCHECKBOX "&Arsip", 14023, 181, 188, 49, 10 - PUSHBUTTON "Tin&gkat Lanjut...", 14028, 166, 185, 64, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + AUTOCHECKBOX "&Hanya-baca", 14021, 58, 151, 70, 10 + AUTOCHECKBOX "&Tersembunyi", 14022, 126, 151, 70, 10 + AUTOCHECKBOX "&Arsip", 14023, 181, 151, 70, 10 + PUSHBUTTON "Tin&gkat Lanjut...", 14028, 158, 150, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END IDD_FILE_PROPERTIES DIALOGEX 0, 0, 240, 205 @@ -272,11 +272,11 @@ BEGIN LTEXT "Diakses:", 14018, 8, 163, 45, 10 EDITTEXT 14019, 58, 163, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "", -1, 8, 179, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Atribut:", 14020, 8, 189, 53, 10 - AUTOCHECKBOX "&Hanya-baca", 14021, 58, 151, 53, 10 - AUTOCHECKBOX "&Tersembunyi", 14022, 112, 151, 50, 10 - AUTOCHECKBOX "&Arsip", 14023, 181, 151, 70, 10 - PUSHBUTTON "Tin&gkat Lanjut...", 14028, 165, 150, 63, 14, WS_TABSTOP + LTEXT "Atribut:", 14020, 8, 189, 45, 10 + AUTOCHECKBOX "&Hanya-baca", 14021, 58, 188, 67, 10 + AUTOCHECKBOX "&Tersembunyi", 14022, 126, 188, 50, 10 + AUTOCHECKBOX "&Arsip", 14023, 181, 188, 49, 10 + PUSHBUTTON "Tin&gkat Lanjut...", 14028, 180, 185, 50, 14, WS_TABSTOP END IDD_FILE_VERSION DIALOGEX 0, 0, 235, 215 @@ -707,17 +707,17 @@ BEGIN END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 -CAPTION "Problem with Shortcut" +CAPTION "Masalah pada Pintasan" STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" BEGIN ICON 0, IDC_LINK_PROBLEM_ICON, 5, 5, 0, 0 - LTEXT "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly.", IDC_LINK_PROBLEM_LABEL1, 35, 5, 210, 35 - LTEXT "Nearest match based on name, type, size, and date:", IDC_LINK_PROBLEM_LABEL2, 35, 45, 210, 35 - LTEXT "Do you want to fix this shortcut to point to this target or do you just want to delete it?", -1, 35, 85, 210, 30 - DEFPUSHBUTTON "&Fix it", IDOK, 55, 120, 60, 15, WS_DISABLED - PUSHBUTTON "&Delete it", IDYES, 120, 120, 60, 15 - PUSHBUTTON "Cancel", IDCANCEL, 185, 120, 60, 15 + LTEXT "Item '%s' yang menjadi rujukan pintasan telah berubah atau berpindah, pintasan ini akan bekerja tidak semestinya.", IDC_LINK_PROBLEM_LABEL1, 35, 5, 210, 35 + LTEXT "Kecocokan terdekat yang didasarkan pada nama, jenis, ukuran, dan tanggal:", IDC_LINK_PROBLEM_LABEL2, 35, 45, 210, 35 + LTEXT "Apakah anda ingin mempernaiki rujukan dari pintasan atau hanya ingin menghapusnya?", -1, 35, 85, 210, 30 + DEFPUSHBUTTON "&Perbaiki", IDOK, 55, 120, 60, 15, WS_DISABLED + PUSHBUTTON "&Hapus", IDYES, 120, 120, 60, 15 + PUSHBUTTON "Batal", IDCANCEL, 185, 120, 60, 15 END STRINGTABLE @@ -994,14 +994,14 @@ BEGIN IDS_NO_ICONS "Berkas '%s' tidak berisi ikon.\n\nPilih ikon dari daftar atau pilih berkas yang berbeda." IDS_FILE_NOT_FOUND "Berkas '%s' tidak ditemukan." IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." - IDS_COPYTOMENU "Copy to &folder..." - IDS_COPYTOTITLE "Select the place where you want to copy '%s'. Then click the Copy button." - IDS_COPYITEMS "Copy Items" - IDS_COPYBUTTON "Copy" - IDS_MOVETOMENU "Mo&ve to folder..." - IDS_MOVETOTITLE "Select the place where you want to move '%s' to. Then click the Move button." - IDS_MOVEITEMS "Move Items" - IDS_MOVEBUTTON "Move" - - IDS_SYSTEMFOLDER "System Folder" + IDS_COPYTOMENU "Salin ke &folder..." + IDS_COPYTOTITLE "Pilih tempat dimana anda ingin menyalin '%s'. Kemudian klik tombol Salin." + IDS_COPYITEMS "Salin Item" + IDS_COPYBUTTON "Salin" + IDS_MOVETOMENU "&Pindahkan ke folder..." + IDS_MOVETOTITLE "Pilih tempat dimana anda ingin memindahkan '%s' to. Kemudian klik tombol Pindahkan." + IDS_MOVEITEMS "Pindahkan Item" + IDS_MOVEBUTTON "Pindahkan" + + IDS_SYSTEMFOLDER "Folder Sistem" END

1 0

[reactos] 01/01: [CMD] Consume only one line for the version header CORE-17420
by Joachim Henze 06 Jan '21

06 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab45955a5ae1e93032680… commit ab45955a5ae1e93032680dde17055405f4aca7b3 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Jan 6 01:34:54 2021 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed Jan 6 01:34:54 2021 +0100 [CMD] Consume only one line for the version header CORE-17420 Necessary because our version string got longer during 0.4.15-dev'ing. We added the target platform. --- base/shell/cmd/lang/cs-CZ.rc | 2 +- base/shell/cmd/lang/de-DE.rc | 2 +- base/shell/cmd/lang/el-GR.rc | 2 +- base/shell/cmd/lang/en-US.rc | 2 +- base/shell/cmd/lang/es-ES.rc | 2 +- base/shell/cmd/lang/fr-FR.rc | 2 +- base/shell/cmd/lang/hu-HU.rc | 2 +- base/shell/cmd/lang/id-ID.rc | 2 +- base/shell/cmd/lang/it-IT.rc | 2 +- base/shell/cmd/lang/ja-JP.rc | 2 +- base/shell/cmd/lang/no-NO.rc | 2 +- base/shell/cmd/lang/pl-PL.rc | 2 +- base/shell/cmd/lang/pt-PT.rc | 2 +- base/shell/cmd/lang/ru-RU.rc | 2 +- base/shell/cmd/lang/sk-SK.rc | 2 +- base/shell/cmd/lang/sq-AL.rc | 2 +- base/shell/cmd/lang/sv-SE.rc | 2 +- base/shell/cmd/lang/tr-TR.rc | 2 +- base/shell/cmd/lang/uk-UA.rc | 2 +- base/shell/cmd/lang/zh-CN.rc | 2 +- base/shell/cmd/lang/zh-TW.rc | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/base/shell/cmd/lang/cs-CZ.rc b/base/shell/cmd/lang/cs-CZ.rc index dc51d57a7b7..0a656af3f4b 100644 --- a/base/shell/cmd/lang/cs-CZ.rc +++ b/base/shell/cmd/lang/cs-CZ.rc @@ -532,7 +532,7 @@ title new title\n" STRING_REPLACE_ERROR6 "Nebyly nazeleny žádné soubory - %s\n" STRING_REPLACE_ERROR7 "Rozšířená chyba 32\n" STRING_CMD_INFOLINE " ReactOS Příkazový řádek Napsání HELP = Nápověda " - STRING_REACTOS_VERSION "Operační systém ReactOS [Verze %s %s]\n" + STRING_REACTOS_VERSION "ReactOS [Verze %s %s]\n" STRING_CMD_SHELLINFO "\nReactOS Interpret příkazového řádku\nVerze %s %s" STRING_VERSION_RUNNING_ON "Běží na: " STRING_VERSION_RUNVER "%s [Verze %d.%d.%d] %s" diff --git a/base/shell/cmd/lang/de-DE.rc b/base/shell/cmd/lang/de-DE.rc index 11d50747609..73a78b9abea 100644 --- a/base/shell/cmd/lang/de-DE.rc +++ b/base/shell/cmd/lang/de-DE.rc @@ -528,7 +528,7 @@ Titel neuer Titel" STRING_REPLACE_ERROR6 "Keine Dateien gefunden - %s\n" STRING_REPLACE_ERROR7 "Erweiterter Fehler 32\n" STRING_CMD_INFOLINE " ReactOS Eingabeaufforderung HELP eingeben = Hilfe " - STRING_REACTOS_VERSION "ReactOS Betriebssystem [Version %s %s]\n" + STRING_REACTOS_VERSION "ReactOS [Version %s %s]\n" STRING_CMD_SHELLINFO "\nReactOS Eingabeaufforderung\nVersion %s %s" STRING_VERSION_RUNNING_ON "Läuft in: " STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" diff --git a/base/shell/cmd/lang/el-GR.rc b/base/shell/cmd/lang/el-GR.rc index 46afb8885b9..4df8d643f9e 100644 --- a/base/shell/cmd/lang/el-GR.rc +++ b/base/shell/cmd/lang/el-GR.rc @@ -531,7 +531,7 @@ title new title\n" STRING_REPLACE_ERROR6 "Δε βρέθηκαν αρχεία - %s\n" STRING_REPLACE_ERROR7 "Extended Error 32\n" STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " - STRING_REACTOS_VERSION "ReactOS Operating System [Version %s %s]\n" + STRING_REACTOS_VERSION "ReactOS [Version %s %s]\n" STRING_CMD_SHELLINFO "\nReactOS Command Line Interpreter\nVersion %s %s" STRING_VERSION_RUNNING_ON "Running on: " STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" diff --git a/base/shell/cmd/lang/en-US.rc b/base/shell/cmd/lang/en-US.rc index 405fd9d36c4..c3b7b02d6e6 100644 --- a/base/shell/cmd/lang/en-US.rc +++ b/base/shell/cmd/lang/en-US.rc @@ -527,7 +527,7 @@ title new title\n" STRING_REPLACE_ERROR6 "No files found - %s\n" STRING_REPLACE_ERROR7 "Extended Error 32\n" STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " - STRING_REACTOS_VERSION "ReactOS Operating System [Version %s %s]\n" + STRING_REACTOS_VERSION "ReactOS [Version %s %s]\n" STRING_CMD_SHELLINFO "\nReactOS Command Line Interpreter\nVersion %s %s" STRING_VERSION_RUNNING_ON "Running on: " STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" diff --git a/base/shell/cmd/lang/es-ES.rc b/base/shell/cmd/lang/es-ES.rc index f6d16a2511a..d8efff00395 100644 --- a/base/shell/cmd/lang/es-ES.rc +++ b/base/shell/cmd/lang/es-ES.rc @@ -535,7 +535,7 @@ title Nuevo título\n" STRING_REPLACE_ERROR6 "No se han encontrado archivos - %s\n" STRING_REPLACE_ERROR7 "Error extendido 32\n" STRING_CMD_INFOLINE " Consola de comandos de ReactOS Escribe HELP para ver la ayuda " - STRING_REACTOS_VERSION "Sistema operativo ReactOS [Versión %s %s]\n" + STRING_REACTOS_VERSION "ReactOS [Versión %s %s]\n" STRING_CMD_SHELLINFO "\nIntérprete de comandos de ReactOS\nVersion %s %s" STRING_VERSION_RUNNING_ON "Funcionando en: " STRING_VERSION_RUNVER "%s [Versión %d.%d.%d] %s" diff --git a/base/shell/cmd/lang/fr-FR.rc b/base/shell/cmd/lang/fr-FR.rc index cc68402bcf1..66ba4466f73 100644 --- a/base/shell/cmd/lang/fr-FR.rc +++ b/base/shell/cmd/lang/fr-FR.rc @@ -543,7 +543,7 @@ titre titre de la fenêtre" STRING_REPLACE_ERROR6 "Aucun fichier trouvé - %s\n" STRING_REPLACE_ERROR7 "Erreur étendue 32\n" STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " - STRING_REACTOS_VERSION "ReactOS Operating System [Version %s %s]\n" + STRING_REACTOS_VERSION "ReactOS [Version %s %s]\n" STRING_CMD_SHELLINFO "\nInterpréteur de ligne de commandes ReactOS\nVersion %s %s" STRING_VERSION_RUNNING_ON "Fonctionnant sous: " STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" diff --git a/base/shell/cmd/lang/hu-HU.rc b/base/shell/cmd/lang/hu-HU.rc index d1dad191d4d..fbcbab44545 100644 --- a/base/shell/cmd/lang/hu-HU.rc +++ b/base/shell/cmd/lang/hu-HU.rc @@ -519,7 +519,7 @@ title új cím\n" STRING_REPLACE_ERROR6 "Nem találhatóak fájlok - %s\n" STRING_REPLACE_ERROR7 "Kiterjesztett hiba 32\n" STRING_CMD_INFOLINE " ReactOS Parancssor HELP parancs = Súgó " - STRING_REACTOS_VERSION "ReactOS Operációs Rendszer [Version %s %s]\n" + STRING_REACTOS_VERSION "ReactOS [Version %s %s]\n" STRING_CMD_SHELLINFO "\nReactOS Parancssor értelmező\nVersion %s %s" STRING_VERSION_RUNNING_ON "Ezen fut: " STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" diff --git a/base/shell/cmd/lang/id-ID.rc b/base/shell/cmd/lang/id-ID.rc index 7583f29b89d..a49c4598e5d 100644 --- a/base/shell/cmd/lang/id-ID.rc +++ b/base/shell/cmd/lang/id-ID.rc @@ -526,7 +526,7 @@ title judul baru\n" STRING_REPLACE_ERROR6 "No files found - %s\n" STRING_REPLACE_ERROR7 "Extended Error 32\n" STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " - STRING_REACTOS_VERSION "ReactOS Operating System [Version %s %s]\n" + STRING_REACTOS_VERSION "ReactOS [Version %s %s]\n" STRING_CMD_SHELLINFO "\nInterpreter Baris Perintah ReactOS\nVersion %s %s" STRING_VERSION_RUNNING_ON "Berjalan pada: " STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" diff --git a/base/shell/cmd/lang/it-IT.rc b/base/shell/cmd/lang/it-IT.rc index 1db834f53d0..5c2bf7f94af 100644 --- a/base/shell/cmd/lang/it-IT.rc +++ b/base/shell/cmd/lang/it-IT.rc @@ -536,7 +536,7 @@ titolo il nuovo titolo\n" STRING_REPLACE_ERROR6 "Nessun file trovato - %s\n" STRING_REPLACE_ERROR7 "Errore esteso 32\n" STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " - STRING_REACTOS_VERSION "ReactOS Operating System [Version %s %s]\n" + STRING_REACTOS_VERSION "ReactOS [Version %s %s]\n" STRING_CMD_SHELLINFO "\nInterprete di linea di comando di ReactOS\nVersion %s %s" STRING_VERSION_RUNNING_ON "In esecuzione su: " STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" diff --git a/base/shell/cmd/lang/ja-JP.rc b/base/shell/cmd/lang/ja-JP.rc index fad5b9d894b..e5e4d3f6d1e 100644 --- a/base/shell/cmd/lang/ja-JP.rc +++ b/base/shell/cmd/lang/ja-JP.rc @@ -534,7 +534,7 @@ RESTORE ウィンドウを元のサイズに戻します。\n\ STRING_REPLACE_ERROR6 "No files found - %s\n" STRING_REPLACE_ERROR7 "Extended Error 32\n" STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " - STRING_REACTOS_VERSION "ReactOS Operating System [Version %s %s]\n" + STRING_REACTOS_VERSION "ReactOS [Version %s %s]\n" STRING_CMD_SHELLINFO "\nReactOS Command Line Interpreter\nVersion %s %s" STRING_VERSION_RUNNING_ON "Running on: " STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" diff --git a/base/shell/cmd/lang/no-NO.rc b/base/shell/cmd/lang/no-NO.rc index 03d3140e1e0..c53f699e39e 100644 --- a/base/shell/cmd/lang/no-NO.rc +++ b/base/shell/cmd/lang/no-NO.rc @@ -525,7 +525,7 @@ tittel ny tittel\n" STRING_REPLACE_ERROR6 "Ingen filer ble funnet - %s\n" STRING_REPLACE_ERROR7 "Extended Error 32\n" STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " - STRING_REACTOS_VERSION "ReactOS Operativsystem [Versjon %s %s]\n" + STRING_REACTOS_VERSION "ReactOS [Versjon %s %s]\n" STRING_CMD_SHELLINFO "\nReactOS Kommandotolk\nVersjon %s %s" STRING_VERSION_RUNNING_ON "Kjører på: " STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" diff --git a/base/shell/cmd/lang/pl-PL.rc b/base/shell/cmd/lang/pl-PL.rc index ef56df34093..ca1762fefa2 100644 --- a/base/shell/cmd/lang/pl-PL.rc +++ b/base/shell/cmd/lang/pl-PL.rc @@ -532,7 +532,7 @@ title nowy tytuł okna\n" STRING_REPLACE_ERROR6 "Nie znaleziono plików - %s\n" STRING_REPLACE_ERROR7 "Extended Error 32 - Błąd współdzielenia\n" STRING_CMD_INFOLINE " Wiersz polecenia ReactOS Type HELP = Help " - STRING_REACTOS_VERSION "System operacyjny ReactOS [Wersja %s %s]\n" + STRING_REACTOS_VERSION "ReactOS [Wersja %s %s]\n" STRING_CMD_SHELLINFO "\nInterpreter linii poleceń ReactOS\nWersja %s %s" STRING_VERSION_RUNNING_ON "Działający na: " STRING_VERSION_RUNVER "%s [Wersja %d.%d.%d] %s" diff --git a/base/shell/cmd/lang/pt-PT.rc b/base/shell/cmd/lang/pt-PT.rc index 9bc57241270..0dcbfd9a99a 100644 --- a/base/shell/cmd/lang/pt-PT.rc +++ b/base/shell/cmd/lang/pt-PT.rc @@ -548,7 +548,7 @@ título Novo título\n" STRING_REPLACE_ERROR6 "Nenhum ficheiro encontrado - %s\n" STRING_REPLACE_ERROR7 "Erro estendido 32\n" STRING_CMD_INFOLINE "Tipo de prompt de comando do ReactOS HELP = Ajuda" - STRING_REACTOS_VERSION "Sistema operacional ReactOS [Versão %s %s]\n" + STRING_REACTOS_VERSION "ReactOS [Versão %s %s]\n" STRING_CMD_SHELLINFO "\nReactOS Intérprete de linha de comando\nVersão %s %s" STRING_VERSION_RUNNING_ON "Em execução em:" STRING_VERSION_RUNVER "%s [Versão %d.%d.%d] %s" diff --git a/base/shell/cmd/lang/ru-RU.rc b/base/shell/cmd/lang/ru-RU.rc index fd62af6af8c..87cda4c4da6 100644 --- a/base/shell/cmd/lang/ru-RU.rc +++ b/base/shell/cmd/lang/ru-RU.rc @@ -537,7 +537,7 @@ RESTORE восстанавливает окно\n\ STRING_REPLACE_ERROR6 "Не найдено файлов - %s\n" STRING_REPLACE_ERROR7 "Расширенная ошибка 32\n" STRING_CMD_INFOLINE " ReactOS Командная строка Введите HELP для Справки " - STRING_REACTOS_VERSION "Операционная система ReactOS [Версия %s %s]\n" + STRING_REACTOS_VERSION "ReactOS [Версия %s %s]\n" STRING_CMD_SHELLINFO "\nИнтерпретатор командной строки ReactOS\nВерсия %s %s" STRING_VERSION_RUNNING_ON "Запущен на: " STRING_VERSION_RUNVER "%s [Версия %d.%d.%d] %s" diff --git a/base/shell/cmd/lang/sk-SK.rc b/base/shell/cmd/lang/sk-SK.rc index 312ff25bfa6..8d872f717e7 100644 --- a/base/shell/cmd/lang/sk-SK.rc +++ b/base/shell/cmd/lang/sk-SK.rc @@ -533,7 +533,7 @@ title new title\n" STRING_REPLACE_ERROR6 "Žiadne súbory sa nenašli - %s\n" STRING_REPLACE_ERROR7 "Extended Error 32\n" STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " - STRING_REACTOS_VERSION "Operačný systém ReactOS [Verzia %s %s]\n" + STRING_REACTOS_VERSION "ReactOS [Verzia %s %s]\n" STRING_CMD_SHELLINFO "\nInterpréter príkazového riadku systému ReactOS\nVerzia %s %s" STRING_VERSION_RUNNING_ON "Running on: " STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" diff --git a/base/shell/cmd/lang/sq-AL.rc b/base/shell/cmd/lang/sq-AL.rc index a41c6b635b8..48f762a8dde 100644 --- a/base/shell/cmd/lang/sq-AL.rc +++ b/base/shell/cmd/lang/sq-AL.rc @@ -531,7 +531,7 @@ title titull i ri\n" STRING_REPLACE_ERROR6 "Nuk u gjet dokumenti - %s\n" STRING_REPLACE_ERROR7 "Error i zgjatur 32\n" STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " - STRING_REACTOS_VERSION "Sistemi Operativ ReactOS [Versioni %s %s]\n" + STRING_REACTOS_VERSION "ReactOS [Versioni %s %s]\n" STRING_CMD_SHELLINFO "\nReactOS Interpretuesi i komandave\nVersioni %s %s" STRING_VERSION_RUNNING_ON "Funksionon në: " STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" diff --git a/base/shell/cmd/lang/sv-SE.rc b/base/shell/cmd/lang/sv-SE.rc index d59c44ea4ce..f9e961ccbb7 100644 --- a/base/shell/cmd/lang/sv-SE.rc +++ b/base/shell/cmd/lang/sv-SE.rc @@ -525,7 +525,7 @@ tittel ny tittel\n" STRING_REPLACE_ERROR6 "Ingna filer hittades - %s\n" STRING_REPLACE_ERROR7 "Extended Error 32\n" STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " - STRING_REACTOS_VERSION "ReactOS Operativsystem [Version %s %s]\n" + STRING_REACTOS_VERSION "ReactOS [Version %s %s]\n" STRING_CMD_SHELLINFO "\nReactOS Kommandotolk\nVersion %s %s" STRING_VERSION_RUNNING_ON "Körs på: " STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" diff --git a/base/shell/cmd/lang/tr-TR.rc b/base/shell/cmd/lang/tr-TR.rc index ee4c481cdf0..1273b6e4039 100644 --- a/base/shell/cmd/lang/tr-TR.rc +++ b/base/shell/cmd/lang/tr-TR.rc @@ -532,7 +532,7 @@ başlık Yeni başlık\n" STRING_REPLACE_ERROR6 "Bir kütük yok - %s\n" STRING_REPLACE_ERROR7 "Ek Yanlışlık 32\n" STRING_CMD_INFOLINE " ReactOS Komut İstemi HELP yazmak = Yardım " - STRING_REACTOS_VERSION "ReactOS İşletim Dizgesi [Sürüm %s %s]\n" + STRING_REACTOS_VERSION "ReactOS [Sürüm %s %s]\n" STRING_CMD_SHELLINFO "\nReactOS Komut Yatacı Yorumlayıcısı\nSürüm %s %s" STRING_VERSION_RUNNING_ON "Üzerinde çalışıyor: " STRING_VERSION_RUNVER "%s [Sürüm %d.%d.%d] %s" diff --git a/base/shell/cmd/lang/uk-UA.rc b/base/shell/cmd/lang/uk-UA.rc index f5228fe8532..7e8accb8b15 100644 --- a/base/shell/cmd/lang/uk-UA.rc +++ b/base/shell/cmd/lang/uk-UA.rc @@ -537,7 +537,7 @@ title новий заголовок\n" STRING_REPLACE_ERROR6 "Файли не знайдено - %s\n" STRING_REPLACE_ERROR7 "Розширена помилка 32\n" STRING_CMD_INFOLINE " Командний рядок ReactOS Введіть HELP = Допомога " - STRING_REACTOS_VERSION "Операцiйна Система ReactOS [Версiя %s %s]\n" + STRING_REACTOS_VERSION "ReactOS [Версiя %s %s]\n" STRING_CMD_SHELLINFO "\nIнтерпретатор командного рядка ReactOS\nVersion %s %s" STRING_VERSION_RUNNING_ON "Запущений на: " STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" diff --git a/base/shell/cmd/lang/zh-CN.rc b/base/shell/cmd/lang/zh-CN.rc index f491b86b7bd..74afd4f6e43 100644 --- a/base/shell/cmd/lang/zh-CN.rc +++ b/base/shell/cmd/lang/zh-CN.rc @@ -498,7 +498,7 @@ RESTORE 恢复窗口\n\ STRING_REPLACE_ERROR6 "没有文件被发现 - %s\n" STRING_REPLACE_ERROR7 "扩展错误 32\n" STRING_CMD_INFOLINE " ReactOS 命令行解释器输入 HELP = 帮助 " - STRING_REACTOS_VERSION "ReactOS 操作系统 [版本 %s %s]\n" + STRING_REACTOS_VERSION "ReactOS [版本 %s %s]\n" STRING_CMD_SHELLINFO "\nReactOS 命令行解释器\n版本 %s %s" STRING_VERSION_RUNNING_ON "在上运行" STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" diff --git a/base/shell/cmd/lang/zh-TW.rc b/base/shell/cmd/lang/zh-TW.rc index 3d7faeecee6..e82008a257a 100644 --- a/base/shell/cmd/lang/zh-TW.rc +++ b/base/shell/cmd/lang/zh-TW.rc @@ -498,7 +498,7 @@ RESTORE 恢復視窗\n\ STRING_REPLACE_ERROR6 "沒有檔案被發現 - %s\n" STRING_REPLACE_ERROR7 "擴展錯誤 32\n" STRING_CMD_INFOLINE " ReactOS 命令列直譯器輸入 HELP = 幫助 " - STRING_REACTOS_VERSION "ReactOS 作業系統 [版本 %s %s]\n" + STRING_REACTOS_VERSION "ReactOS [版本 %s %s]\n" STRING_CMD_SHELLINFO "\nReactOS 命令列直譯器\n版本 %s %s" STRING_VERSION_RUNNING_ON "在上運行" STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s"

1 0

[reactos] 01/01: [SHELL32] Improve German (de-DE) translation
by Joachim Henze 05 Jan '21

05 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1e9547e0d04b416b71714… commit 1e9547e0d04b416b71714588ac5c334f1f93f47a Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Jan 6 00:14:32 2021 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed Jan 6 00:41:45 2021 +0100 [SHELL32] Improve German (de-DE) translation --- dll/win32/shell32/lang/de-DE.rc | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index a88cb99ddc4..65bcdb4b1d2 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -11,7 +11,7 @@ BEGIN BEGIN MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Automatisch anordnen", FCIDM_SHVIEW_AUTOARRANGE - MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID + MENUITEM "Am &Raster ausrichten", FCIDM_SHVIEW_ALIGNTOGRID END END @@ -32,7 +32,7 @@ BEGIN BEGIN MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Automatisch anordnen", FCIDM_SHVIEW_AUTOARRANGE - MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID + MENUITEM "Am &Raster ausrichten", FCIDM_SHVIEW_ALIGNTOGRID END MENUITEM "Aktualisieren", FCIDM_SHVIEW_REFRESH MENUITEM "", -1, MFT_SEPARATOR @@ -702,7 +702,7 @@ BEGIN LTEXT "Wählen Sie eine Datei aus, die auf diesem Ordnersymbol angezeigt wird.", IDC_STATIC, 15, 87, 115, 33 PUSHBUTTON "&Datei auswählen...", IDC_FOLDERCUST_CHOOSE_PIC, 15, 125, 115, 15 PUSHBUTTON "&Wiederherstellen", IDC_FOLDERCUST_RESTORE_DEFAULTS, 15, 144, 115, 15 - LTEXT "Preview:", IDC_STATIC, 139, 85, 81, 11 + LTEXT "Vorschau:", IDC_STATIC, 139, 85, 81, 11 CONTROL "", IDC_FOLDERCUST_PREVIEW_BITMAP, "STATIC", SS_BITMAP | WS_GROUP, 150, 100, 60, 60 GROUPBOX "Ordnersymbole", IDC_STATIC, 5, 170, 230, 65, WS_TABSTOP LTEXT "Sie können das Ordnersymbol ändern. Wenn Sie das Symbol ändern, wird keine Vorschau der Ordnerinhalte mehr angezeigt.", IDC_STATIC, 15, 180, 210, 25 @@ -711,17 +711,17 @@ BEGIN END IDD_LINK_PROBLEM DIALOGEX 0, 0, 250, 140 -CAPTION "Problem with Shortcut" +CAPTION "Verknüpfungsproblem" STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" BEGIN ICON 0, IDC_LINK_PROBLEM_ICON, 5, 5, 0, 0 - LTEXT "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly.", IDC_LINK_PROBLEM_LABEL1, 35, 5, 210, 35 - LTEXT "Nearest match based on name, type, size, and date:", IDC_LINK_PROBLEM_LABEL2, 35, 45, 210, 35 - LTEXT "Do you want to fix this shortcut to point to this target or do you just want to delete it?", -1, 35, 85, 210, 30 - DEFPUSHBUTTON "&Fix it", IDOK, 55, 120, 60, 15, WS_DISABLED - PUSHBUTTON "&Delete it", IDYES, 120, 120, 60, 15 - PUSHBUTTON "Cancel", IDCANCEL, 185, 120, 60, 15 + LTEXT "Das Ziel '%s', auf das sich die Verknüpfung bezieht, wurde verändert oder verschoben. Die Verknüpfung ist nicht länger funktionsfähig.", IDC_LINK_PROBLEM_LABEL1, 35, 5, 210, 35 + LTEXT "Beste Übereinstimmung bezüglich Name, Typ, Größe und Datum:", IDC_LINK_PROBLEM_LABEL2, 35, 45, 210, 35 + LTEXT "Möchten Sie die Verknüpfung korrigieren, auf das neue Ziel zu verweisen, oder soll die Verknüpfung gelöscht werden?", -1, 35, 85, 210, 30 + DEFPUSHBUTTON "&Korrigieren", IDOK, 55, 120, 60, 15, WS_DISABLED + PUSHBUTTON "&Löschen", IDYES, 120, 120, 60, 15 + PUSHBUTTON "Abbrechen", IDCANCEL, 185, 120, 60, 15 END STRINGTABLE @@ -896,7 +896,7 @@ BEGIN IDS_CANTEJECTMEDIA "Auswerfen des Mediums nicht möglich (Fehlercode: %lu)." IDS_CANTSHOWPROPERTIES "Anzeigen der Eigenschaften nicht möglich (Fehlercode: %lu)." IDS_CANTDISCONNECT "Trennen nicht möglich (Fehlercode: %lu)." - IDS_NONE "(None)" + IDS_NONE "(Leer)" /* Friendly File Type Names */ IDS_DIRECTORY "Dateiordner" @@ -933,7 +933,7 @@ BEGIN IDS_EDIT_VERB "Bearbeiten" IDS_FIND_VERB "Finden" IDS_PRINT_VERB "Drucken" - IDS_CMD_VERB "Command Prompt here" + IDS_CMD_VERB "Command Prompt hier" IDS_FILE_FOLDER "%u Dateien, %u Ordner" IDS_PRINTERS "Drucker" @@ -998,7 +998,7 @@ BEGIN IDS_EDITING_ACTION "Vorgang bearbeiten für Typ: " IDS_NO_ICONS "Die Datei '%s' enthält keine Symbole.\n\nWählen Sie ein Symbol aus der Liste oder wählen Sie eine andere Datei." IDS_FILE_NOT_FOUND "Die Datei '%s' wurde nicht gefunden." - IDS_LINK_INVALID "The item '%s' that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." + IDS_LINK_INVALID "Das Ziel '%s', auf das sich die Verknüpfung bezieht, wurde verändert oder verschoben. Die Verknüpfung ist nicht länger funktionsfähig." IDS_COPYTOMENU "In &Ordner kopieren..." IDS_COPYTOTITLE "Wählen Sie den Ort, in den '%s' kopiert werden soll. Klicken Sie anschließend auf Kopieren." IDS_COPYITEMS "Elemente kopieren" @@ -1008,5 +1008,5 @@ BEGIN IDS_MOVEITEMS "Elemente verschieben" IDS_MOVEBUTTON "Verschieben" - IDS_SYSTEMFOLDER "System Folder" + IDS_SYSTEMFOLDER "Systemordner" END

1 0

[reactos] 01/01: [WIN32SS][COMCTL32] Commit Flip_Fix_9.patch
by Joachim Henze 05 Jan '21

05 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=232c45fcd71b12a0d726b… commit 232c45fcd71b12a0d726b47f4a72e9a16f87432a Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Tue Jan 5 20:30:40 2021 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Tue Jan 5 20:30:40 2021 +0100 [WIN32SS][COMCTL32] Commit Flip_Fix_9.patch flip_fix_9.patch fixes: CORE-16984 " 'SPINA Thrulg' / 'SPINA Thyr' / 'Sim Thyr' have images flipped" CORE-17194 "StretchDIBits test" isn't work correctly" "Output of 'Project 3 Test'" CORE-14701 "DVDStyler 3.0.4 transparent toolbars" CORE-14701 "DVDStyler 3.0.4 erroneously black around icons of welcome-dlg" CORE-14671 "'Peazip' shows icons in buttons and menubar vertically flipped" "Double Commander shoes icons flipped in buttons, menubar, listview and the treeview" CORE-13273 "Welcome to Lazarus" icon shows flipped CORE-13026 "'CudaText app' icon shows flipped" Not all of those are duplicates, although they appear to be at first glance. It affects different controls and some of those tickets do have different 'guilty revs' than others. The patch does consist of 3 parts: 1.) win32ss/gdi/ntgdi/dibobj.c This one is the most clean part of it, that addresses most of the flipping issues now. 2.) The hack in comctl32.h redefining the version: We used that in the past to appease some, but not all of the issues listed above. But it does hide additional issues, e.g. in DvDStyler, therefore we seem to still need that appeasement even today. Most likely it would make sense to aim to avoid this part in the future. part 2.) was committed as first appeasement on its own already into 0.4.14-RC-24-g 198b61e 0.4.13-RC-7-g 67211fa 0.4.12-RC-5-g 8449527 0.4.11-RC-16-g b906163 0.4.10-RC-7-g f1e80fe 0.4.9-RC-34-g 9d758ae 3.) toolbar.c change That part fixes at least the toolbar case for DvDStyler without relying on the comctl32.h hack any longer, but it was still not enough to completely get rid of part 2.) yet. Many thanks to all contributors: 'I_kill_Bugs', Doug Lyons and also 'Julenuri' for testing. The patch gave nice testbot results: KVM: https://reactos.org/testman/compare.php?ids=75704,75714 VBox: https://reactos.org/testman/compare.php?ids=75705,75715 and we also created a summary of manual test-results: https://jira.reactos.org/browse/CORE-17415?focusedCommentId=126668&page=com… If you read this comment via git blame and your goal is to get rid of the hack in comctl32.h, I would highly recommend to redo the tests of that testing table, and if that is asked too much, then please test at least the following cases: CORE-14701 "DVDStyler 3.0.4 transparent toolbars" CORE-14701 "DVDStyler 3.0.4 erroneously black around icons of welcome-dlg" "DVDStyler 3.0.4 erroneously black/transparent within comboboxes of properties of VMGM menu" and try to add what might be needed to fix them, and double-check again: "DoubleCommander optionsDlg the most complex testcase, contains flip-prone icons in treeview, listview, menubar, buttons, statics". Only some of its flipped icons were impacted by the comctl32.h change before. --- dll/win32/comctl32/comctl32.h | 9 +++++++ dll/win32/comctl32/toolbar.c | 4 ++++ win32ss/gdi/ntgdi/dibobj.c | 55 ++++++++++++++++++++++++++----------------- 3 files changed, 47 insertions(+), 21 deletions(-) diff --git a/dll/win32/comctl32/comctl32.h b/dll/win32/comctl32/comctl32.h index fe4af2ad0de..40baabb24ff 100644 --- a/dll/win32/comctl32/comctl32.h +++ b/dll/win32/comctl32/comctl32.h @@ -36,6 +36,13 @@ #include "commctrl.h" #include "windowsx.h" +#ifdef __REACTOS__ +// This is really ComCtl32 v5.82, the last one not supporting SxS +#undef COMCTL32_VERSION // Undefines what the PSDK gave to us +#define COMCTL32_VERSION 5 +#define COMCTL32_VERSION_MINOR 82 +#endif + extern HMODULE COMCTL32_hModule DECLSPEC_HIDDEN; extern HBRUSH COMCTL32_hPattern55AABrush DECLSPEC_HIDDEN; @@ -188,7 +195,9 @@ INT Str_GetPtrAtoW (LPCSTR lpSrc, LPWSTR lpDest, INT nMaxLen) DECLSPEC_HIDDEN; BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc) DECLSPEC_HIDDEN; BOOL Str_SetPtrWtoA (LPSTR *lppDest, LPCWSTR lpSrc) DECLSPEC_HIDDEN; +#ifndef __REACTOS__ #define COMCTL32_VERSION_MINOR 81 +#endif /* Our internal stack structure of the window procedures to subclass */ typedef struct _SUBCLASSPROCS { diff --git a/dll/win32/comctl32/toolbar.c b/dll/win32/comctl32/toolbar.c index e2b6193b663..b725f3c5121 100644 --- a/dll/win32/comctl32/toolbar.c +++ b/dll/win32/comctl32/toolbar.c @@ -6603,6 +6603,10 @@ TOOLBAR_Paint (TOOLBAR_INFO *infoPtr, WPARAM wParam) TRACE("psrect=(%s)\n", wine_dbgstr_rect(&ps.rcPaint)); +#ifdef __REACTOS__ + TOOLBAR_EraseBackground(infoPtr, (WPARAM)hdc, (LPARAM) 0); +#endif + TOOLBAR_Refresh (infoPtr, hdc, &ps); if (!wParam) EndPaint (infoPtr->hwndSelf, &ps); diff --git a/win32ss/gdi/ntgdi/dibobj.c b/win32ss/gdi/ntgdi/dibobj.c index 93208665b39..7b8cc330c73 100644 --- a/win32ss/gdi/ntgdi/dibobj.c +++ b/win32ss/gdi/ntgdi/dibobj.c @@ -951,25 +951,28 @@ GreGetDIBitsInternal( RECT rcDest; POINTL srcPoint; BOOL ret ; + int newLines = -1; - if (StartScan > (ULONG)psurf->SurfObj.sizlBitmap.cy) + if (StartScan >= abs(Info->bmiHeader.biHeight)) { - ScanLines = 0; + ScanLines = 1; goto done; } else { - ScanLines = min(ScanLines, psurf->SurfObj.sizlBitmap.cy - StartScan); + ScanLines = min(ScanLines, abs(Info->bmiHeader.biHeight) - StartScan); } + if (abs(Info->bmiHeader.biHeight) < psurf->SurfObj.sizlBitmap.cy) + { + StartScan += psurf->SurfObj.sizlBitmap.cy - abs(Info->bmiHeader.biHeight); + } /* Fixup values */ - Info->bmiHeader.biWidth = psurf->SurfObj.sizlBitmap.cx; Info->bmiHeader.biHeight = (height < 0) ? -(LONG)ScanLines : ScanLines; /* Create the DIB */ hBmpDest = DIB_CreateDIBSection(pDC, Info, Usage, &pDIBits, NULL, 0, 0); /* Restore them */ - Info->bmiHeader.biWidth = width; Info->bmiHeader.biHeight = height; if(!hBmpDest) @@ -982,27 +985,33 @@ GreGetDIBitsInternal( psurfDest = SURFACE_ShareLockSurface(hBmpDest); - RECTL_vSetRect(&rcDest, 0, 0, psurf->SurfObj.sizlBitmap.cx, ScanLines); - + RECTL_vSetRect(&rcDest, 0, 0, Info->bmiHeader.biWidth, ScanLines); + Info->bmiHeader.biWidth = width; srcPoint.x = 0; - if(height < 0) + if (abs(Info->bmiHeader.biHeight) <= psurf->SurfObj.sizlBitmap.cy) { - srcPoint.y = 0; - - if(ScanLines <= StartScan) - { - ScanLines = 1; - SURFACE_ShareUnlockSurface(psurfDest); - GreDeleteObject(hBmpDest); - goto done; - } - - ScanLines -= StartScan; + srcPoint.y = psurf->SurfObj.sizlBitmap.cy - StartScan - ScanLines; } else { - srcPoint.y = StartScan; + /* Determine the actual number of lines copied from the */ + /* original bitmap. It might be different from ScanLines. */ + newLines = abs(Info->bmiHeader.biHeight) - psurf->SurfObj.sizlBitmap.cy; + newLines = min((int)(StartScan + ScanLines - newLines), psurf->SurfObj.sizlBitmap.cy); + if (newLines > 0) + { + srcPoint.y = psurf->SurfObj.sizlBitmap.cy - newLines; + if (StartScan > psurf->SurfObj.sizlBitmap.cy) + { + newLines -= (StartScan - psurf->SurfObj.sizlBitmap.cy); + } + } + else + { + newLines = 0; + srcPoint.y = psurf->SurfObj.sizlBitmap.cy; + } } EXLATEOBJ_vInitialize(&exlo, psurf->ppal, psurfDest->ppal, 0xffffff, 0xffffff, 0); @@ -1022,7 +1031,11 @@ GreGetDIBitsInternal( { RtlCopyMemory(Bits, pDIBits, DIB_GetDIBImageBytes (width, ScanLines, bpp)); } - + /* Update if line count has changed */ + if (newLines != -1) + { + ScanLines = (UINT)newLines; + } GreDeleteObject(hBmpDest); EXLATEOBJ_vCleanup(&exlo); }

1 0

[reactos] 03/03: [SDK] Fix _SEH2_GetExceptionInformation() macro in dummy SEH, to return the right structure
by Hervé Poussineau 05 Jan '21

05 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5112776b2b7476aabb4a8… commit 5112776b2b7476aabb4a8ef3b44b9782e3402848 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Jan 5 19:22:37 2021 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Tue Jan 5 19:24:23 2021 +0100 [SDK] Fix _SEH2_GetExceptionInformation() macro in dummy SEH, to return the right structure --- sdk/include/reactos/libs/pseh/pseh2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/reactos/libs/pseh/pseh2.h b/sdk/include/reactos/libs/pseh/pseh2.h index 6022638313b..8437bbe2f7a 100644 --- a/sdk/include/reactos/libs/pseh/pseh2.h +++ b/sdk/include/reactos/libs/pseh/pseh2.h @@ -46,7 +46,7 @@ extern int _SEH2_VolatileExceptionCode; #define _SEH2_FINALLY } { #define _SEH2_EXCEPT(...) } if (_SEH2_Volatile0 || (0 && (__VA_ARGS__))) { #define _SEH2_END } -#define _SEH2_GetExceptionInformation() 0 +#define _SEH2_GetExceptionInformation() ((struct _EXCEPTION_POINTERS*)0) #define _SEH2_GetExceptionCode() _SEH2_VolatileExceptionCode #define _SEH2_AbnormalTermination() (0) #define _SEH2_YIELD(STMT_) STMT_

1 0

[reactos] 02/03: [NTOSKRNL] Correctly use SEH2 macros (fixes GCC x64 compilation)
by Hervé Poussineau 05 Jan '21

05 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e581123c357633c0a1990… commit e581123c357633c0a199007a393ade028f189997 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Jan 5 19:22:21 2021 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Tue Jan 5 19:24:23 2021 +0100 [NTOSKRNL] Correctly use SEH2 macros (fixes GCC x64 compilation) --- ntoskrnl/ke/amd64/stubs.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/ke/amd64/stubs.c b/ntoskrnl/ke/amd64/stubs.c index c99a0efcfac..08076199d56 100644 --- a/ntoskrnl/ke/amd64/stubs.c +++ b/ntoskrnl/ke/amd64/stubs.c @@ -330,6 +330,7 @@ KiSystemCallHandler( { GdiBatchCount = 0; } + _SEH2_END; /* Flush batch, if there are entries */ if (GdiBatchCount != 0) @@ -363,7 +364,7 @@ KiSystemCallHandler( /* Get stack bytes and calculate argument count */ Count = DescriptorTable->Number[ServiceNumber] / 8; - __try + _SEH2_TRY { switch (Count) { @@ -391,12 +392,12 @@ KiSystemCallHandler( break; } } - __except(1) + _SEH2_EXCEPT(1) { TrapFrame->Rax = _SEH2_GetExceptionCode(); return (PVOID)NtSyscallFailure; } - + _SEH2_END; return (PVOID)DescriptorTable->Base[ServiceNumber]; }

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