Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 05/05: [WIN32SS] Replace inline by FORCEINLINE, as in other files of the module
by Hervé Poussineau 22 Jan '20

22 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=99f979d6e9bd5c8f668e7… commit 99f979d6e9bd5c8f668e709754827fb99a8a3f80 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon Jan 20 17:56:44 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Wed Jan 22 20:57:42 2020 +0100 [WIN32SS] Replace inline by FORCEINLINE, as in other files of the module --- win32ss/user/rtl/text.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/user/rtl/text.c b/win32ss/user/rtl/text.c index 6456065b5da..061e49b6d5e 100644 --- a/win32ss/user/rtl/text.c +++ b/win32ss/user/rtl/text.c @@ -332,7 +332,7 @@ static void TEXT_PathEllipsify (HDC hdc, WCHAR *str, unsigned int max_len, } /* Check the character is Chinese, Japanese, Korean and/or Thai */ -inline BOOL IsCJKT(WCHAR wch) +FORCEINLINE BOOL IsCJKT(WCHAR wch) { if (0x0E00 <= wch && wch <= 0x0E7F) return TRUE; /* Thai */

1 0

[reactos] 04/05: [SETUPLIB] Fix possible out-of-bound buffer if BootStore->Type is unknown/invalid
by Hervé Poussineau 22 Jan '20

22 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=043ce2c832c9fa2c95e10… commit 043ce2c832c9fa2c95e102cad19cb6ae5dab5f13 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon Jan 20 17:49:00 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Wed Jan 22 20:57:38 2020 +0100 [SETUPLIB] Fix possible out-of-bound buffer if BootStore->Type is unknown/invalid --- base/setup/lib/utils/bldrsup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/setup/lib/utils/bldrsup.c b/base/setup/lib/utils/bldrsup.c index 554cfc3f56e..2e127924368 100644 --- a/base/setup/lib/utils/bldrsup.c +++ b/base/setup/lib/utils/bldrsup.c @@ -1016,7 +1016,7 @@ AddBootStoreEntry( } else { - DPRINT1("Loader type %d is currently unsupported!\n", NtosBootLoaders[BootStore->Type].Type); + DPRINT1("Loader type %d is currently unsupported!\n", BootStore->Type); return STATUS_NOT_SUPPORTED; } } @@ -1152,7 +1152,7 @@ QueryBootStoreOptions( // if (BootStore->Type >= BldrTypeMax || NtosBootLoaders[BootStore->Type].Type >= BldrTypeMax) if (BootStore->Type != FreeLdr && BootStore->Type != NtLdr) { - DPRINT1("Loader type %d is currently unsupported!\n", NtosBootLoaders[BootStore->Type].Type); + DPRINT1("Loader type %d is currently unsupported!\n", BootStore->Type); return STATUS_NOT_SUPPORTED; }

1 0

[reactos] 03/05: [SDK] Use HEX macro, like elsewhere in the file
by Hervé Poussineau 22 Jan '20

22 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=698e1a3782daf4479d38a… commit 698e1a3782daf4479d38a4f84ad7d5df7f86cb40 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Jan 14 23:20:10 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Wed Jan 22 20:57:04 2020 +0100 [SDK] Use HEX macro, like elsewhere in the file --- sdk/lib/crt/math/amd64/sqrt.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/crt/math/amd64/sqrt.S b/sdk/lib/crt/math/amd64/sqrt.S index 5238feebc98..8093ab27920 100644 --- a/sdk/lib/crt/math/amd64/sqrt.S +++ b/sdk/lib/crt/math/amd64/sqrt.S @@ -30,7 +30,7 @@ sqrt: /* x is positive, now check if it is NaN by checking if the unsigned integer value is larger than the highest valid positive value. */ - mov rcx, 7FF0000000000000h + mov rcx, HEX(7FF0000000000000) cmp rax, rcx ja short x_is_nan

1 0

[reactos] 02/05: [NTOS] Move FORCEINLINE specifier where appropriate
by Hervé Poussineau 22 Jan '20

22 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8314c8eeba7ab45471109… commit 8314c8eeba7ab45471109b3f680bd76d43c6239f Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Jan 14 23:18:48 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Wed Jan 22 20:57:01 2020 +0100 [NTOS] Move FORCEINLINE specifier where appropriate --- ntoskrnl/include/internal/amd64/intrin_i.h | 12 ++++++------ ntoskrnl/include/internal/amd64/ke.h | 6 +++--- ntoskrnl/include/internal/amd64/mm.h | 26 +++++++++++++------------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/ntoskrnl/include/internal/amd64/intrin_i.h b/ntoskrnl/include/internal/amd64/intrin_i.h index bbfaff7e251..97072c3fd94 100644 --- a/ntoskrnl/include/internal/amd64/intrin_i.h +++ b/ntoskrnl/include/internal/amd64/intrin_i.h @@ -1,22 +1,22 @@ #ifndef _INTRIN_INTERNAL_ #define _INTRIN_INTERNAL_ -VOID FORCEINLINE +VOID KeSetCurrentIrql(KIRQL Irql) { __writecr8(Irql); } -PKGDTENTRY64 FORCEINLINE +PKGDTENTRY64 KiGetGdtEntry(PVOID pGdt, USHORT Selector) { return (PKGDTENTRY64)((ULONG64)pGdt + (Selector & ~RPL_MASK)); } -PVOID FORCEINLINE +PVOID KiGetGdtDescriptorBase(PKGDTENTRY Entry) { return (PVOID)((ULONG64)Entry->BaseLow | @@ -25,8 +25,8 @@ KiGetGdtDescriptorBase(PKGDTENTRY Entry) (ULONG64)Entry->BaseUpper << 32); } -VOID FORCEINLINE +VOID KiSetGdtDescriptorBase(PKGDTENTRY Entry, ULONG64 Base) { Entry->BaseLow = Base & 0xffff; @@ -35,16 +35,16 @@ KiSetGdtDescriptorBase(PKGDTENTRY Entry, ULONG64 Base) Entry->BaseUpper = Base >> 32; } -VOID FORCEINLINE +VOID KiSetGdtDescriptorLimit(PKGDTENTRY Entry, ULONG Limit) { Entry->LimitLow = Limit & 0xffff; Entry->Bits.LimitHigh = Limit >> 16; } -VOID FORCEINLINE +VOID KiInitGdtEntry(PKGDTENTRY64 Entry, ULONG64 Base, ULONG Size, UCHAR Type, UCHAR Dpl) { KiSetGdtDescriptorBase(Entry, Base); diff --git a/ntoskrnl/include/internal/amd64/ke.h b/ntoskrnl/include/internal/amd64/ke.h index 977a8f85984..85001d22745 100644 --- a/ntoskrnl/include/internal/amd64/ke.h +++ b/ntoskrnl/include/internal/amd64/ke.h @@ -282,16 +282,16 @@ KeQueryInterruptHandler(IN ULONG Vector) (ULONG64)Idt->OffsetLow); } -VOID FORCEINLINE +VOID KiSendEOI(VOID) { /* Write 0 to the apic EOI register */ *((volatile ULONG*)APIC_EOI_REGISTER) = 0; } -VOID FORCEINLINE +VOID KiEndInterrupt(IN KIRQL Irql, IN PKTRAP_FRAME TrapFrame) { @@ -300,8 +300,8 @@ KiEndInterrupt(IN KIRQL Irql, //KeLowerIrql(Irql); } -BOOLEAN FORCEINLINE +BOOLEAN KiUserTrap(IN PKTRAP_FRAME TrapFrame) { /* Anything else but Ring 0 is Ring 3 */ diff --git a/ntoskrnl/include/internal/amd64/mm.h b/ntoskrnl/include/internal/amd64/mm.h index fbdd92eb3d8..d4f0287acc3 100644 --- a/ntoskrnl/include/internal/amd64/mm.h +++ b/ntoskrnl/include/internal/amd64/mm.h @@ -124,8 +124,8 @@ #define ValidKernelPpe ValidKernelPde /* Convert an address to a corresponding PTE */ -PMMPTE FORCEINLINE +PMMPTE _MiAddressToPte(PVOID Address) { ULONG64 Offset = (ULONG64)Address >> (PTI_SHIFT - 3); @@ -135,8 +135,8 @@ _MiAddressToPte(PVOID Address) #define MiAddressToPte(x) _MiAddressToPte((PVOID)(x)) /* Convert an address to a corresponding PDE */ -PMMPTE FORCEINLINE +PMMPTE _MiAddressToPde(PVOID Address) { ULONG64 Offset = (ULONG64)Address >> (PDI_SHIFT - 3); @@ -146,8 +146,8 @@ _MiAddressToPde(PVOID Address) #define MiAddressToPde(x) _MiAddressToPde((PVOID)(x)) /* Convert an address to a corresponding PPE */ -PMMPTE FORCEINLINE +PMMPTE MiAddressToPpe(PVOID Address) { ULONG64 Offset = (ULONG64)Address >> (PPI_SHIFT - 3); @@ -156,8 +156,8 @@ MiAddressToPpe(PVOID Address) } /* Convert an address to a corresponding PXE */ -PMMPTE FORCEINLINE +PMMPTE MiAddressToPxe(PVOID Address) { ULONG64 Offset = (ULONG64)Address >> (PXI_SHIFT - 3); @@ -166,8 +166,8 @@ MiAddressToPxe(PVOID Address) } /* Convert an address to a corresponding PTE offset/index */ -ULONG FORCEINLINE +ULONG MiAddressToPti(PVOID Address) { return ((((ULONG64)Address) >> PTI_SHIFT) & 0x1FF); @@ -175,8 +175,8 @@ MiAddressToPti(PVOID Address) #define MiAddressToPteOffset(x) MiAddressToPti(x) // FIXME: bad name /* Convert an address to a corresponding PDE offset/index */ -ULONG FORCEINLINE +ULONG MiAddressToPdi(PVOID Address) { return ((((ULONG64)Address) >> PDI_SHIFT) & 0x1FF); @@ -185,16 +185,16 @@ MiAddressToPdi(PVOID Address) #define MiGetPdeOffset(x) MiAddressToPdi(x) /* Convert an address to a corresponding PXE offset/index */ -ULONG FORCEINLINE +ULONG MiAddressToPxi(PVOID Address) { return ((((ULONG64)Address) >> PXI_SHIFT) & 0x1FF); } /* Convert a PTE into a corresponding address */ -PVOID FORCEINLINE +PVOID MiPteToAddress(PMMPTE PointerPte) { /* Use signed math */ @@ -202,8 +202,8 @@ MiPteToAddress(PMMPTE PointerPte) } /* Convert a PDE into a corresponding address */ -PVOID FORCEINLINE +PVOID MiPdeToAddress(PMMPTE PointerPde) { /* Use signed math */ @@ -211,8 +211,8 @@ MiPdeToAddress(PMMPTE PointerPde) } /* Convert a PPE into a corresponding address */ -PVOID FORCEINLINE +PVOID MiPpeToAddress(PMMPTE PointerPpe) { /* Use signed math */ @@ -220,8 +220,8 @@ MiPpeToAddress(PMMPTE PointerPpe) } /* Convert a PXE into a corresponding address */ -PVOID FORCEINLINE +PVOID MiPxeToAddress(PMMPTE PointerPxe) { /* Use signed math */ @@ -291,15 +291,15 @@ MI_IS_MAPPED_PTE(PMMPTE PointerPte) } INIT_FUNCTION -VOID FORCEINLINE +VOID MmInitGlobalKernelPageDirectory(VOID) { /* Nothing to do */ } -BOOLEAN FORCEINLINE +BOOLEAN MiIsPdeForAddressValid(PVOID Address) { return ((MiAddressToPxe(Address)->u.Hard.Valid) &&

1 0

[reactos] 01/05: [FREELDR] Comment out useless variable
by Hervé Poussineau 22 Jan '20

22 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=46fdc89e4fa0bcee83432… commit 46fdc89e4fa0bcee83432d522b4cd3f1e24e89f8 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Jan 14 23:16:25 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Wed Jan 22 20:56:51 2020 +0100 [FREELDR] Comment out useless variable --- boot/freeldr/freeldr/ntldr/arch/amd64/winldr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/freeldr/freeldr/ntldr/arch/amd64/winldr.c b/boot/freeldr/freeldr/ntldr/arch/amd64/winldr.c index 9540c63370a..5c804372844 100644 --- a/boot/freeldr/freeldr/ntldr/arch/amd64/winldr.c +++ b/boot/freeldr/freeldr/ntldr/arch/amd64/winldr.c @@ -325,14 +325,14 @@ VOID Amd64SetupIdt(PVOID IdtBase) { KDESCRIPTOR IdtDesc, OldIdt; - ULONG Size; + //ULONG Size; TRACE("Amd64SetupIdt(IdtBase = %p)\n", IdtBase); /* Get old IDT */ __sidt(&OldIdt.Limit); /* Copy the old IDT */ - Size = min(OldIdt.Limit + 1, NUM_IDT * sizeof(KIDTENTRY)); + //Size = min(OldIdt.Limit + 1, NUM_IDT * sizeof(KIDTENTRY)); //RtlCopyMemory(IdtBase, (PVOID)OldIdt.Base, Size); /* Setup the new IDT descriptor */

1 0

[reactos] 01/01: [EXPLORER][INCLUDE] Fix wrong title on taskbar about ampersand (&) (#2266)
by Katayama Hirofumi MZ 22 Jan '20

22 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f692ed1f00188be77cf1… commit 5f692ed1f00188be77cf1580a7510bc5a5660ae3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 22 09:58:43 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 22 09:58:43 2020 +0900 [EXPLORER][INCLUDE] Fix wrong title on taskbar about ampersand (&) (#2266) Co-authored-by: Mark Jansen <mark.jansen(a)reactos.org> Based on @learn-more's CORE-11619.patch. CORE-11619 --- base/shell/explorer/taskswnd.cpp | 4 +++- sdk/include/reactos/rosctrls.h | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/base/shell/explorer/taskswnd.cpp b/base/shell/explorer/taskswnd.cpp index deeb50f2547..17d11e27ed0 100644 --- a/base/shell/explorer/taskswnd.cpp +++ b/base/shell/explorer/taskswnd.cpp @@ -285,7 +285,9 @@ public: TBSTYLE_TOOLTIPS | TBSTYLE_WRAPABLE | TBSTYLE_LIST | TBSTYLE_TRANSPARENT | CCS_TOP | CCS_NORESIZE | CCS_NODIVIDER; - return SubclassWindow(CToolbar::Create(hWndParent, styles)); + HWND toolbar = CToolbar::Create(hWndParent, styles); + SetDrawTextFlags(DT_NOPREFIX, DT_NOPREFIX); + return SubclassWindow(toolbar); } }; diff --git a/sdk/include/reactos/rosctrls.h b/sdk/include/reactos/rosctrls.h index 6dd4ba9fa39..73e7cfab1d2 100644 --- a/sdk/include/reactos/rosctrls.h +++ b/sdk/include/reactos/rosctrls.h @@ -306,6 +306,11 @@ public: // Configuration methods return SendMessageW(TB_SETHOTITEM, item); } + DWORD SetDrawTextFlags(DWORD useBits, DWORD bitState) + { + return SendMessageW(TB_SETDRAWTEXTFLAGS, useBits, bitState); + } + public: // Button list management methods int GetButtonCount() {

1 0

[reactos] 01/01: [BOOTDATA][USERENV] Improve and fix user profile info (#2265)
by Katayama Hirofumi MZ 21 Jan '20

21 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=257a701e9b787f3e4747a… commit 257a701e9b787f3e4747a06f0fdeab8f6b79d3fe Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 22 08:19:39 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 22 08:19:39 2020 +0900 [BOOTDATA][USERENV] Improve and fix user profile info (#2265) The international user profile info was inconsistent; thus TEMP and TMP environment variables were wrong. CORE-16635 --- boot/bootdata/hivedef.inf | 315 ++++++++++++++++++++++++++++++++++------ dll/win32/userenv/lang/bg-BG.rc | 2 +- dll/win32/userenv/lang/cs-CZ.rc | 2 +- dll/win32/userenv/lang/da-DK.rc | 2 +- dll/win32/userenv/lang/de-DE.rc | 2 +- dll/win32/userenv/lang/el-GR.rc | 2 +- dll/win32/userenv/lang/en-US.rc | 2 +- dll/win32/userenv/lang/es-ES.rc | 2 +- dll/win32/userenv/lang/fi-FI.rc | 2 +- dll/win32/userenv/lang/fr-FR.rc | 2 +- dll/win32/userenv/lang/he-IL.rc | 2 +- dll/win32/userenv/lang/hu-HU.rc | 2 +- dll/win32/userenv/lang/id-ID.rc | 2 +- dll/win32/userenv/lang/it-IT.rc | 2 +- dll/win32/userenv/lang/ja-JP.rc | 12 +- dll/win32/userenv/lang/lt-LT.rc | 2 +- dll/win32/userenv/lang/nl-NL.rc | 2 +- dll/win32/userenv/lang/no-NO.rc | 2 +- dll/win32/userenv/lang/pl-PL.rc | 2 +- dll/win32/userenv/lang/pt-BR.rc | 2 +- dll/win32/userenv/lang/pt-PT.rc | 2 +- dll/win32/userenv/lang/ro-RO.rc | 2 +- dll/win32/userenv/lang/ru-RU.rc | 2 +- dll/win32/userenv/lang/sk-SK.rc | 2 +- dll/win32/userenv/lang/sq-AL.rc | 2 +- dll/win32/userenv/lang/sv-SE.rc | 2 +- dll/win32/userenv/lang/th-TH.rc | 2 +- dll/win32/userenv/lang/tr-TR.rc | 2 +- dll/win32/userenv/lang/uk-UA.rc | 2 +- dll/win32/userenv/lang/zh-CN.rc | 2 +- dll/win32/userenv/lang/zh-TW.rc | 2 +- 31 files changed, 306 insertions(+), 79 deletions(-) diff --git a/boot/bootdata/hivedef.inf b/boot/bootdata/hivedef.inf index bc8585d0c4c..f2a7625204f 100644 --- a/boot/bootdata/hivedef.inf +++ b/boot/bootdata/hivedef.inf @@ -2181,8 +2181,44 @@ TEMP_DIR="%USERPROFILE%\Local Settings\Temp" ; LANG_BULGARIAN SUBLANG_NEUTRAL -;[Strings.0002] -;TEMP_DIR="%USERPROFILE%\..." +[Strings.0002] +POWERCFG_NAME_0="Home/Office Desk" +POWERCFG_DESC_0="This scheme is suited to most home or desktop computers that are left plugged in all the time." +POWERCFG_NAME_1="Portable/Laptop" +POWERCFG_DESC_1="This scheme is designed for extended battery life for portable computers on the road." +POWERCFG_NAME_2="Presentation" +POWERCFG_DESC_2="This scheme keeps the monitor on for doing presentations." +POWERCFG_NAME_3="Always On" +POWERCFG_DESC_3="This scheme keeps the computer running so that it can be accessed from the network. Use this scheme if you do not have network wakeup hardware." +POWERCFG_NAME_4="Minimal Power Management" +POWERCFG_DESC_4="This scheme keeps the computer on and optimizes it for high performance." +POWERCFG_NAME_5="Max Battery" +POWERCFG_DESC_5="This scheme is extremely aggressive for saving power." +DESKTOP_SCHEME_0="ReactOS Standard" +DESKTOP_SCHEME_1="Brick" +DESKTOP_SCHEME_2="Eggplant" +DESKTOP_SCHEME_3="Green Olive" +DESKTOP_SCHEME_4="High Contrast 1" +DESKTOP_SCHEME_5="High Contrast 2" +DESKTOP_SCHEME_6="High Contrast Black" +DESKTOP_SCHEME_7="High Contrast White" +DESKTOP_SCHEME_8="Lilac" +DESKTOP_SCHEME_9="Maple" +DESKTOP_SCHEME_10="Marine" +DESKTOP_SCHEME_11="Plum" +DESKTOP_SCHEME_12="Pumpkin" +DESKTOP_SCHEME_13="Rainy Day" +DESKTOP_SCHEME_14="ReactOS Classic" +DESKTOP_SCHEME_15="Rose" +DESKTOP_SCHEME_16="Sand" +DESKTOP_SCHEME_17="Sky" +DESKTOP_SCHEME_18="Slate" +DESKTOP_SCHEME_19="Storm" +DESKTOP_SCHEME_20="Teal" +DESKTOP_SCHEME_21="Wheat" +DESKTOP_SCHEME_22="Red, White, and Blue" +DESKTOP_SCHEME_SIZE_0="Default size" +TEMP_DIR="%USERPROFILE%\Местни настройки\Временни" ; LANG_CZECH SUBLANG_NEUTRAL @@ -2557,42 +2593,42 @@ TEMP_DIR="%USERPROFILE%\Impostazioni locali\Temp" ; LANG_JAPANESE SUBLANG_NEUTRAL [Strings.0011] POWERCFG_NAME_0="Home/Office Desk" -POWERCFG_DESC_0="This scheme is suited to most home or desktop computers that are left plugged in all the time." +POWERCFG_DESC_0="このスキームは、常時接続されているほとんどの家庭用またはデスクトップコンピューターに適しています。" POWERCFG_NAME_1="Portable/Laptop" -POWERCFG_DESC_1="This scheme is designed for extended battery life for portable computers on the road." -POWERCFG_NAME_2="Presentation" -POWERCFG_DESC_2="This scheme keeps the monitor on for doing presentations." -POWERCFG_NAME_3="Always On" -POWERCFG_DESC_3="This scheme keeps the computer running so that it can be accessed from the network. Use this scheme if you do not have network wakeup hardware." -POWERCFG_NAME_4="Minimal Power Management" -POWERCFG_DESC_4="This scheme keeps the computer on and optimizes it for high performance." -POWERCFG_NAME_5="Max Battery" -POWERCFG_DESC_5="This scheme is extremely aggressive for saving power." -DESKTOP_SCHEME_0="ReactOS Standard" -DESKTOP_SCHEME_1="Brick" -DESKTOP_SCHEME_2="Eggplant" -DESKTOP_SCHEME_3="Green Olive" -DESKTOP_SCHEME_4="High Contrast 1" -DESKTOP_SCHEME_5="High Contrast 2" -DESKTOP_SCHEME_6="High Contrast Black" -DESKTOP_SCHEME_7="High Contrast White" -DESKTOP_SCHEME_8="Lilac" -DESKTOP_SCHEME_9="Maple" -DESKTOP_SCHEME_10="Marine" -DESKTOP_SCHEME_11="Plum" -DESKTOP_SCHEME_12="Pumpkin" -DESKTOP_SCHEME_13="Rainy Day" -DESKTOP_SCHEME_14="ReactOS Classic" -DESKTOP_SCHEME_15="Rose" -DESKTOP_SCHEME_16="Sand" -DESKTOP_SCHEME_17="Sky" -DESKTOP_SCHEME_18="Slate" -DESKTOP_SCHEME_19="Storm" -DESKTOP_SCHEME_20="Teal" -DESKTOP_SCHEME_21="Wheat" -DESKTOP_SCHEME_22="Red, White, and Blue" -DESKTOP_SCHEME_SIZE_0="Default size" -TEMP_DIR="%USERPROFILE%\Local Settings\Temp" +POWERCFG_DESC_1="このスキームは、外出中のポータブルコンピューターのバッテリー寿命を延ばすために設計されています。" +POWERCFG_NAME_2="プレゼン用" +POWERCFG_DESC_2="このスキームは、プレゼンテーション用にモニターを維持します。" +POWERCFG_NAME_3="常にオン" +POWERCFG_DESC_3="このスキームは、ネットワークからアクセスできるようにコンピューターを実行し続けます。ネットワークウェイクアップハードウェアがない場合は、このスキームを使用します。" +POWERCFG_NAME_4="パフォーマンス優先" +POWERCFG_DESC_4="このスキームは、コンピューターの電源を入れたままにし、処理能力を最適化します。" +POWERCFG_NAME_5="バッテリー優先" +POWERCFG_DESC_5="このスキームは、電力を節約するために非常に積極的です。" +DESKTOP_SCHEME_0="ReactOS 標準" +DESKTOP_SCHEME_1="レンガ" +DESKTOP_SCHEME_2="ナス" +DESKTOP_SCHEME_3="緑のオリーブ" +DESKTOP_SCHEME_4="ハイコントラスト 1" +DESKTOP_SCHEME_5="ハイコントラスト 2" +DESKTOP_SCHEME_6="ハイコントラスト黒" +DESKTOP_SCHEME_7="ハイコントラスト白" +DESKTOP_SCHEME_8="ライラック" +DESKTOP_SCHEME_9="紅葉" +DESKTOP_SCHEME_10="マリン" +DESKTOP_SCHEME_11="プラム" +DESKTOP_SCHEME_12="パンプキン" +DESKTOP_SCHEME_13="雨の日" +DESKTOP_SCHEME_14="ReactOS クラシック" +DESKTOP_SCHEME_15="バラ" +DESKTOP_SCHEME_16="砂" +DESKTOP_SCHEME_17="空" +DESKTOP_SCHEME_18="粘板岩" +DESKTOP_SCHEME_19="暴風" +DESKTOP_SCHEME_20="コガモ" +DESKTOP_SCHEME_21="小麦" +DESKTOP_SCHEME_22="赤・白・青" +DESKTOP_SCHEME_SIZE_0="デフォルトのサイズ" +TEMP_DIR="%USERPROFILE%\ローカル設定\Temp" ; LANG_DUTCH SUBLANG_NEUTRAL @@ -2718,9 +2754,45 @@ DESKTOP_SCHEME_SIZE_0="Domyślny rozmiar" TEMP_DIR="%USERPROFILE%\Ustawienia lokalne\Temp" -; LANG_PORTUGESE SUBLANG_NEUTRAL -;[Strings.0016] -;TEMP_DIR="%USERPROFILE%\..." +; LANG_PORTUGUESE SUBLANG_NEUTRAL +[Strings.0016] +POWERCFG_NAME_0="Home/Office Desk" +POWERCFG_DESC_0="This scheme is suited to most home or desktop computers that are left plugged in all the time." +POWERCFG_NAME_1="Portable/Laptop" +POWERCFG_DESC_1="This scheme is designed for extended battery life for portable computers on the road." +POWERCFG_NAME_2="Presentation" +POWERCFG_DESC_2="This scheme keeps the monitor on for doing presentations." +POWERCFG_NAME_3="Always On" +POWERCFG_DESC_3="This scheme keeps the computer running so that it can be accessed from the network. Use this scheme if you do not have network wakeup hardware." +POWERCFG_NAME_4="Minimal Power Management" +POWERCFG_DESC_4="This scheme keeps the computer on and optimizes it for high performance." +POWERCFG_NAME_5="Max Battery" +POWERCFG_DESC_5="This scheme is extremely aggressive for saving power." +DESKTOP_SCHEME_0="ReactOS Standard" +DESKTOP_SCHEME_1="Brick" +DESKTOP_SCHEME_2="Eggplant" +DESKTOP_SCHEME_3="Green Olive" +DESKTOP_SCHEME_4="High Contrast 1" +DESKTOP_SCHEME_5="High Contrast 2" +DESKTOP_SCHEME_6="High Contrast Black" +DESKTOP_SCHEME_7="High Contrast White" +DESKTOP_SCHEME_8="Lilac" +DESKTOP_SCHEME_9="Maple" +DESKTOP_SCHEME_10="Marine" +DESKTOP_SCHEME_11="Plum" +DESKTOP_SCHEME_12="Pumpkin" +DESKTOP_SCHEME_13="Rainy Day" +DESKTOP_SCHEME_14="ReactOS Classic" +DESKTOP_SCHEME_15="Rose" +DESKTOP_SCHEME_16="Sand" +DESKTOP_SCHEME_17="Sky" +DESKTOP_SCHEME_18="Slate" +DESKTOP_SCHEME_19="Storm" +DESKTOP_SCHEME_20="Teal" +DESKTOP_SCHEME_21="Wheat" +DESKTOP_SCHEME_22="Red, White, and Blue" +DESKTOP_SCHEME_SIZE_0="Default size" +TEMP_DIR="%USERPROFILE%\Configurações locais\Temp" ; LANG_ROMANIAN SUBLANG_NEUTRAL @@ -2845,6 +2917,46 @@ DESKTOP_SCHEME_22="Red, White, and Blue" DESKTOP_SCHEME_SIZE_0="Default size" TEMP_DIR="%USERPROFILE%\Local Settings\Temp" +; LANG_ALBANIAN SUBLANG_NEUTRAL +[Strings.001C] +POWERCFG_NAME_0="Home/Office Desk" +POWERCFG_DESC_0="This scheme is suited to most home or desktop computers that are left plugged in all the time." +POWERCFG_NAME_1="Portable/Laptop" +POWERCFG_DESC_1="This scheme is designed for extended battery life for portable computers on the road." +POWERCFG_NAME_2="Presentation" +POWERCFG_DESC_2="This scheme keeps the monitor on for doing presentations." +POWERCFG_NAME_3="Always On" +POWERCFG_DESC_3="This scheme keeps the computer running so that it can be accessed from the network. Use this scheme if you do not have network wakeup hardware." +POWERCFG_NAME_4="Minimal Power Management" +POWERCFG_DESC_4="This scheme keeps the computer on and optimizes it for high performance." +POWERCFG_NAME_5="Max Battery" +POWERCFG_DESC_5="This scheme is extremely aggressive for saving power." +DESKTOP_SCHEME_0="ReactOS Standard" +DESKTOP_SCHEME_1="Brick" +DESKTOP_SCHEME_2="Eggplant" +DESKTOP_SCHEME_3="Green Olive" +DESKTOP_SCHEME_4="High Contrast 1" +DESKTOP_SCHEME_5="High Contrast 2" +DESKTOP_SCHEME_6="High Contrast Black" +DESKTOP_SCHEME_7="High Contrast White" +DESKTOP_SCHEME_8="Lilac" +DESKTOP_SCHEME_9="Maple" +DESKTOP_SCHEME_10="Marine" +DESKTOP_SCHEME_11="Plum" +DESKTOP_SCHEME_12="Pumpkin" +DESKTOP_SCHEME_13="Rainy Day" +DESKTOP_SCHEME_14="ReactOS Classic" +DESKTOP_SCHEME_15="Rose" +DESKTOP_SCHEME_16="Sand" +DESKTOP_SCHEME_17="Sky" +DESKTOP_SCHEME_18="Slate" +DESKTOP_SCHEME_19="Storm" +DESKTOP_SCHEME_20="Teal" +DESKTOP_SCHEME_21="Wheat" +DESKTOP_SCHEME_22="Red, White, and Blue" +DESKTOP_SCHEME_SIZE_0="Default size" +TEMP_DIR="%USERPROFILE%\Cilësimet lokale\Përk" + ; LANG_SWEDISH SUBLANG_NEUTRAL [Strings.001D] @@ -2888,9 +3000,84 @@ TEMP_DIR="%USERPROFILE%\Lokala inställningar\Temp" ; LANG_THAI SUBLANG_NEUTRAL -;[Strings.001E] -;TEMP_DIR="%USERPROFILE%\..." +[Strings.001E] +POWERCFG_NAME_0="Home/Office Desk" +POWERCFG_DESC_0="This scheme is suited to most home or desktop computers that are left plugged in all the time." +POWERCFG_NAME_1="Portable/Laptop" +POWERCFG_DESC_1="This scheme is designed for extended battery life for portable computers on the road." +POWERCFG_NAME_2="Presentation" +POWERCFG_DESC_2="This scheme keeps the monitor on for doing presentations." +POWERCFG_NAME_3="Always On" +POWERCFG_DESC_3="This scheme keeps the computer running so that it can be accessed from the network. Use this scheme if you do not have network wakeup hardware." +POWERCFG_NAME_4="Minimal Power Management" +POWERCFG_DESC_4="This scheme keeps the computer on and optimizes it for high performance." +POWERCFG_NAME_5="Max Battery" +POWERCFG_DESC_5="This scheme is extremely aggressive for saving power." +DESKTOP_SCHEME_0="ReactOS Standard" +DESKTOP_SCHEME_1="Brick" +DESKTOP_SCHEME_2="Eggplant" +DESKTOP_SCHEME_3="Green Olive" +DESKTOP_SCHEME_4="High Contrast 1" +DESKTOP_SCHEME_5="High Contrast 2" +DESKTOP_SCHEME_6="High Contrast Black" +DESKTOP_SCHEME_7="High Contrast White" +DESKTOP_SCHEME_8="Lilac" +DESKTOP_SCHEME_9="Maple" +DESKTOP_SCHEME_10="Marine" +DESKTOP_SCHEME_11="Plum" +DESKTOP_SCHEME_12="Pumpkin" +DESKTOP_SCHEME_13="Rainy Day" +DESKTOP_SCHEME_14="ReactOS Classic" +DESKTOP_SCHEME_15="Rose" +DESKTOP_SCHEME_16="Sand" +DESKTOP_SCHEME_17="Sky" +DESKTOP_SCHEME_18="Slate" +DESKTOP_SCHEME_19="Storm" +DESKTOP_SCHEME_20="Teal" +DESKTOP_SCHEME_21="Wheat" +DESKTOP_SCHEME_22="Red, White, and Blue" +DESKTOP_SCHEME_SIZE_0="Default size" +TEMP_DIR="%USERPROFILE%\การตั้งค่าตั้งต้น\เก็บชั่วคราว" +; LANG_TURKISH SUBLANG_NEUTRAL +[Strings.001F] +POWERCFG_NAME_0="Home/Office Desk" +POWERCFG_DESC_0="This scheme is suited to most home or desktop computers that are left plugged in all the time." +POWERCFG_NAME_1="Portable/Laptop" +POWERCFG_DESC_1="This scheme is designed for extended battery life for portable computers on the road." +POWERCFG_NAME_2="Presentation" +POWERCFG_DESC_2="This scheme keeps the monitor on for doing presentations." +POWERCFG_NAME_3="Always On" +POWERCFG_DESC_3="This scheme keeps the computer running so that it can be accessed from the network. Use this scheme if you do not have network wakeup hardware." +POWERCFG_NAME_4="Minimal Power Management" +POWERCFG_DESC_4="This scheme keeps the computer on and optimizes it for high performance." +POWERCFG_NAME_5="Max Battery" +POWERCFG_DESC_5="This scheme is extremely aggressive for saving power." +DESKTOP_SCHEME_0="ReactOS Standard" +DESKTOP_SCHEME_1="Brick" +DESKTOP_SCHEME_2="Eggplant" +DESKTOP_SCHEME_3="Green Olive" +DESKTOP_SCHEME_4="High Contrast 1" +DESKTOP_SCHEME_5="High Contrast 2" +DESKTOP_SCHEME_6="High Contrast Black" +DESKTOP_SCHEME_7="High Contrast White" +DESKTOP_SCHEME_8="Lilac" +DESKTOP_SCHEME_9="Maple" +DESKTOP_SCHEME_10="Marine" +DESKTOP_SCHEME_11="Plum" +DESKTOP_SCHEME_12="Pumpkin" +DESKTOP_SCHEME_13="Rainy Day" +DESKTOP_SCHEME_14="ReactOS Classic" +DESKTOP_SCHEME_15="Rose" +DESKTOP_SCHEME_16="Sand" +DESKTOP_SCHEME_17="Sky" +DESKTOP_SCHEME_18="Slate" +DESKTOP_SCHEME_19="Storm" +DESKTOP_SCHEME_20="Teal" +DESKTOP_SCHEME_21="Wheat" +DESKTOP_SCHEME_22="Red, White, and Blue" +DESKTOP_SCHEME_SIZE_0="Default size" +TEMP_DIR="%USERPROFILE%\Yerli Ayarlar\Geçici" ; LANG_INDONESIAN SUBLANG_NEUTRAL [Strings.0021] @@ -2930,7 +3117,7 @@ DESKTOP_SCHEME_20="Teal" DESKTOP_SCHEME_21="Wheat" DESKTOP_SCHEME_22="Red, White, and Blue" DESKTOP_SCHEME_SIZE_0="Default size" -TEMP_DIR="%USERPROFILE%\Local Settings\Temp" +TEMP_DIR="%USERPROFILE%\Setelan Lokal\Temp" ; LANG_UKRAINIAN SUBLANG_NEUTRAL @@ -3054,7 +3241,7 @@ DESKTOP_SCHEME_22="Red, White, and Blue" DESKTOP_SCHEME_SIZE_0="Ön Tanımlı Büyüklük" TEMP_DIR="%USERPROFILE%\Yerli Ayarlar\Geçici" -; Simplified Chinese +; Simplified Chinese (LANG_CHINESE SUBLANG_CHINESE_SIMPLIFIED) [Strings.0804] POWERCFG_NAME_0="家庭/办公桌" POWERCFG_DESC_0="此方案适合大多数一直插电的台式计算机。" @@ -3094,4 +3281,44 @@ DESKTOP_SCHEME_22="Red, White, and Blue" DESKTOP_SCHEME_SIZE_0="默认大小" TEMP_DIR="%USERPROFILE%\Local Settings\Temp" +; Traditional Chinese (LANG_CHINESE SUBLANG_CHINESE_TRADITIONAL) +[Strings.0801] +POWERCFG_NAME_0="Home/Office Desk" +POWERCFG_DESC_0="This scheme is suited to most home or desktop computers that are left plugged in all the time." +POWERCFG_NAME_1="Portable/Laptop" +POWERCFG_DESC_1="This scheme is designed for extended battery life for portable computers on the road." +POWERCFG_NAME_2="Presentation" +POWERCFG_DESC_2="This scheme keeps the monitor on for doing presentations." +POWERCFG_NAME_3="Always On" +POWERCFG_DESC_3="This scheme keeps the computer running so that it can be accessed from the network. Use this scheme if you do not have network wakeup hardware." +POWERCFG_NAME_4="Minimal Power Management" +POWERCFG_DESC_4="This scheme keeps the computer on and optimizes it for high performance." +POWERCFG_NAME_5="Max Battery" +POWERCFG_DESC_5="This scheme is extremely aggressive for saving power." +DESKTOP_SCHEME_0="ReactOS Standard" +DESKTOP_SCHEME_1="Brick" +DESKTOP_SCHEME_2="Eggplant" +DESKTOP_SCHEME_3="Green Olive" +DESKTOP_SCHEME_4="High Contrast 1" +DESKTOP_SCHEME_5="High Contrast 2" +DESKTOP_SCHEME_6="High Contrast Black" +DESKTOP_SCHEME_7="High Contrast White" +DESKTOP_SCHEME_8="Lilac" +DESKTOP_SCHEME_9="Maple" +DESKTOP_SCHEME_10="Marine" +DESKTOP_SCHEME_11="Plum" +DESKTOP_SCHEME_12="Pumpkin" +DESKTOP_SCHEME_13="Rainy Day" +DESKTOP_SCHEME_14="ReactOS Classic" +DESKTOP_SCHEME_15="Rose" +DESKTOP_SCHEME_16="Sand" +DESKTOP_SCHEME_17="Sky" +DESKTOP_SCHEME_18="Slate" +DESKTOP_SCHEME_19="Storm" +DESKTOP_SCHEME_20="Teal" +DESKTOP_SCHEME_21="Wheat" +DESKTOP_SCHEME_22="Red, White, and Blue" +DESKTOP_SCHEME_SIZE_0="Default size" +TEMP_DIR="%USERPROFILE%\Local Settings\Temp" + ; EOF diff --git a/dll/win32/userenv/lang/bg-BG.rc b/dll/win32/userenv/lang/bg-BG.rc index 245445e10ed..e016f79d21c 100644 --- a/dll/win32/userenv/lang/bg-BG.rc +++ b/dll/win32/userenv/lang/bg-BG.rc @@ -17,7 +17,7 @@ BEGIN IDS_STARTUP "Пусков изборник\\Приложения\\Самопускащи" IDS_LOCALSETTINGS "Местни настройки" IDS_LOCALAPPDATA "Местни настройки\\Приложни данни" - IDS_TEMP "Местни настройки\\Временни" + IDS_TEMP "Местни настройки\\Временни" /* See also TEMP_DIR in boot/bootdata/hivedef.inf */ IDS_CACHE "Местни настройки\\Временни файлове за интернет" IDS_HISTORY "Местни настройки\\Посетени" IDS_COOKIES "Курабийки" diff --git a/dll/win32/userenv/lang/cs-CZ.rc b/dll/win32/userenv/lang/cs-CZ.rc index f3a0c2ca446..ae60572a59a 100644 --- a/dll/win32/userenv/lang/cs-CZ.rc +++ b/dll/win32/userenv/lang/cs-CZ.rc @@ -22,7 +22,7 @@ BEGIN IDS_STARTUP "Nabídka Start\\Programy\\Po spuštění" IDS_LOCALSETTINGS "Local Settings" IDS_LOCALAPPDATA "Local Settings\\Data Aplikací" - IDS_TEMP "Local Settings\\Temp" + IDS_TEMP "Local Settings\\Temp" /* See also TEMP_DIR in boot/bootdata/hivedef.inf */ IDS_CACHE "Local Settings\\Temporary Internet Files" IDS_HISTORY "Local Settings\\History" IDS_COOKIES "Cookies" diff --git a/dll/win32/userenv/lang/da-DK.rc b/dll/win32/userenv/lang/da-DK.rc index 48cc790caa5..82fdd044903 100644 --- a/dll/win32/userenv/lang/da-DK.rc +++ b/dll/win32/userenv/lang/da-DK.rc @@ -17,7 +17,7 @@ BEGIN IDS_STARTUP "Start Menu\\Programmer\\Opstart" IDS_LOCALSETTINGS "Lokale Indstillinger" IDS_LOCALAPPDATA "Lokale Indstillinger\\Application Data" - IDS_TEMP "Lokale Indstillinger\\Temp" + IDS_TEMP "Lokale Indstillinger\\Temp" /* See also TEMP_DIR in boot/bootdata/hivedef.inf */ IDS_CACHE "Lokale Indstillinger\\Midlertidige Internet Filer" IDS_HISTORY "Lokale Indstillinger\\Historie" IDS_COOKIES "Cookies" diff --git a/dll/win32/userenv/lang/de-DE.rc b/dll/win32/userenv/lang/de-DE.rc index de9f8714d28..ab7a7b4b90d 100644 --- a/dll/win32/userenv/lang/de-DE.rc +++ b/dll/win32/userenv/lang/de-DE.rc @@ -17,7 +17,7 @@ BEGIN IDS_STARTUP "Startmenü\\Programme\\Autostart" IDS_LOCALSETTINGS "Lokale Einstellungen" IDS_LOCALAPPDATA "Lokale Einstellungen\\Anwendungsdaten" - IDS_TEMP "Lokale Einstellungen\\Temp" + IDS_TEMP "Lokale Einstellungen\\Temp" /* See also TEMP_DIR in boot/bootdata/hivedef.inf */ IDS_CACHE "Lokale Einstellungen\\Temporary Internet Files" IDS_HISTORY "Lokale Einstellungen\\Verlauf" IDS_COOKIES "Cookies" diff --git a/dll/win32/userenv/lang/el-GR.rc b/dll/win32/userenv/lang/el-GR.rc index 3985a53757b..7c30252b150 100644 --- a/dll/win32/userenv/lang/el-GR.rc +++ b/dll/win32/userenv/lang/el-GR.rc @@ -17,7 +17,7 @@ BEGIN IDS_STARTUP "Start Menu\\Programs\\Startup" IDS_LOCALSETTINGS "Local Settings" IDS_LOCALAPPDATA "Local Settings\\Application Data" - IDS_TEMP "Local Settings\\Temp" + IDS_TEMP "Local Settings\\Temp" /* See also TEMP_DIR in boot/bootdata/hivedef.inf */ IDS_CACHE "Local Settings\\Temporary Internet Files" IDS_HISTORY "Local Settings\\History" IDS_COOKIES "Cookies" diff --git a/dll/win32/userenv/lang/en-US.rc b/dll/win32/userenv/lang/en-US.rc index a026e05d14a..bd9a787df28 100644 --- a/dll/win32/userenv/lang/en-US.rc +++ b/dll/win32/userenv/lang/en-US.rc @@ -17,7 +17,7 @@ BEGIN IDS_STARTUP "Start Menu\\Programs\\Startup" IDS_LOCALSETTINGS "Local Settings" IDS_LOCALAPPDATA "Local Settings\\Application Data" - IDS_TEMP "Local Settings\\Temp" + IDS_TEMP "Local Settings\\Temp" /* See also TEMP_DIR in boot/bootdata/hivedef.inf */ IDS_CACHE "Local Settings\\Temporary Internet Files" IDS_HISTORY "Local Settings\\History" IDS_COOKIES "Cookies" diff --git a/dll/win32/userenv/lang/es-ES.rc b/dll/win32/userenv/lang/es-ES.rc index 05515719909..da2debb9006 100644 --- a/dll/win32/userenv/lang/es-ES.rc +++ b/dll/win32/userenv/lang/es-ES.rc @@ -26,7 +26,7 @@ BEGIN IDS_STARTUP "Menú Inicio\\Programas\\Inicio" IDS_LOCALSETTINGS "Configuración local" IDS_LOCALAPPDATA "Configuración local\\Datos de programa" - IDS_TEMP "Configuración local\\Temp" + IDS_TEMP "Configuración local\\Temp" /* See also TEMP_DIR in boot/bootdata/hivedef.inf */ IDS_CACHE "Configuración local\\Archivos temporales de Internet" IDS_HISTORY "Configuración local\\Historial" IDS_COOKIES "Cookies" diff --git a/dll/win32/userenv/lang/fi-FI.rc b/dll/win32/userenv/lang/fi-FI.rc index 98ef5b6f4cf..24fc600e229 100644 --- a/dll/win32/userenv/lang/fi-FI.rc +++ b/dll/win32/userenv/lang/fi-FI.rc @@ -17,7 +17,7 @@ BEGIN IDS_STARTUP "Käynnistä Valikko\\Kaikki Ohjelmat\\Käynnistys" IDS_LOCALSETTINGS "Paikalliset Asetukset" IDS_LOCALAPPDATA "Paikalliset Asetukset\\Application Data" - IDS_TEMP "Paikalliset Asetukset\\Temp" + IDS_TEMP "Paikalliset Asetukset\\Temp" /* See also TEMP_DIR in boot/bootdata/hivedef.inf */ IDS_CACHE "Paikalliset Asetukset\\Temporary Internet Files" IDS_HISTORY "Paikalliset Asetukset\\Historia" IDS_COOKIES "Keksit" diff --git a/dll/win32/userenv/lang/fr-FR.rc b/dll/win32/userenv/lang/fr-FR.rc index 7041427ff82..e57e2c78056 100644 --- a/dll/win32/userenv/lang/fr-FR.rc +++ b/dll/win32/userenv/lang/fr-FR.rc @@ -17,7 +17,7 @@ BEGIN IDS_STARTUP "Menu Démarrer\\Programmes\\Démarrage" IDS_LOCALSETTINGS "Local Settings" IDS_LOCALAPPDATA "Local Settings\\Application Data" - IDS_TEMP "Local Settings\\Temp" + IDS_TEMP "Local Settings\\Temp" /* See also TEMP_DIR in boot/bootdata/hivedef.inf */ IDS_CACHE "Local Settings\\Temporary Internet Files" IDS_HISTORY "Local Settings\\Historique" IDS_COOKIES "Cookies" diff --git a/dll/win32/userenv/lang/he-IL.rc b/dll/win32/userenv/lang/he-IL.rc index fb3c7e8e4a0..2e684163816 100644 --- a/dll/win32/userenv/lang/he-IL.rc +++ b/dll/win32/userenv/lang/he-IL.rc @@ -17,7 +17,7 @@ BEGIN IDS_STARTUP "תפריט ההתחלה\\תכניות\\הפעלה" IDS_LOCALSETTINGS "Local Settings" IDS_LOCALAPPDATA "Local Settings\\Application Data" - IDS_TEMP "Local Settings\\Temp" + IDS_TEMP "Local Settings\\Temp" /* See also TEMP_DIR in boot/bootdata/hivedef.inf */ IDS_CACHE "Local Settings\\Temporary Internet Files" IDS_HISTORY "Local Settings\\היסטוריה" IDS_COOKIES "עוגיות" diff --git a/dll/win32/userenv/lang/hu-HU.rc b/dll/win32/userenv/lang/hu-HU.rc index f5e8e7f9717..a856a666ef5 100644 --- a/dll/win32/userenv/lang/hu-HU.rc +++ b/dll/win32/userenv/lang/hu-HU.rc @@ -17,7 +17,7 @@ BEGIN IDS_STARTUP "Start Menu\\Programs\\Startup" IDS_LOCALSETTINGS "Local Settings" IDS_LOCALAPPDATA "Local Settings\\Application Data" - IDS_TEMP "Local Settings\\Temp" + IDS_TEMP "Local Settings\\Temp" /* See also TEMP_DIR in boot/bootdata/hivedef.inf */ IDS_CACHE "Local Settings\\Temporary Internet Files" IDS_HISTORY "Local Settings\\History" IDS_COOKIES "Cookies" diff --git a/dll/win32/userenv/lang/id-ID.rc b/dll/win32/userenv/lang/id-ID.rc index 2a0653eed2a..e529f6afcb1 100644 --- a/dll/win32/userenv/lang/id-ID.rc +++ b/dll/win32/userenv/lang/id-ID.rc @@ -17,7 +17,7 @@ BEGIN IDS_STARTUP "Menu Mulai\\Program\\StartUp" IDS_LOCALSETTINGS "Setelan Lokal" IDS_LOCALAPPDATA "Setelan Lokal\\Data Aplikasi" - IDS_TEMP "Setelan Lokal\\Temp" + IDS_TEMP "Setelan Lokal\\Temp" /* See also TEMP_DIR in boot/bootdata/hivedef.inf */ IDS_CACHE "Setelan Lokal\\Berkas Internet Sementara" IDS_HISTORY "Setelan Lokal\\Riwayat" IDS_COOKIES "Kuki" diff --git a/dll/win32/userenv/lang/it-IT.rc b/dll/win32/userenv/lang/it-IT.rc index fec106423fa..835bd787b09 100644 --- a/dll/win32/userenv/lang/it-IT.rc +++ b/dll/win32/userenv/lang/it-IT.rc @@ -28,7 +28,7 @@ BEGIN IDS_STARTUP "Menu Avvio\\Programmi\\Esecuzione automatica" IDS_LOCALSETTINGS "Impostazioni locali" IDS_LOCALAPPDATA "Impostazioni locali\\Dati applicazioni" - IDS_TEMP "Impostazioni locali\\Temp" + IDS_TEMP "Impostazioni locali\\Temp" /* See also TEMP_DIR in boot/bootdata/hivedef.inf */ IDS_CACHE "Impostazioni locali\\Temporary Internet Files" IDS_HISTORY "Impostazioni locali\\Cronologia" IDS_COOKIES "Cookies" diff --git a/dll/win32/userenv/lang/ja-JP.rc b/dll/win32/userenv/lang/ja-JP.rc index df17904974a..1c194f9c81f 100644 --- a/dll/win32/userenv/lang/ja-JP.rc +++ b/dll/win32/userenv/lang/ja-JP.rc @@ -3,7 +3,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT STRINGTABLE BEGIN IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" - IDS_APPDATA "Application Data" + IDS_APPDATA "アプリのデータ" IDS_DESKTOP "デスクトップ" IDS_FAVORITES "お気に入り" IDS_MYDOCUMENTS "マイドキュメント" @@ -15,10 +15,10 @@ BEGIN IDS_STARTMENU "スタートメニュー" IDS_PROGRAMS "スタートメニュー\\プログラム" IDS_STARTUP "スタートメニュー\\プログラム\\スタートアップ" - IDS_LOCALSETTINGS "Local Settings" - IDS_LOCALAPPDATA "Local Settings\\Application Data" - IDS_TEMP "Local Settings\\Temp" - IDS_CACHE "Local Settings\\Temporary Internet Files" - IDS_HISTORY "Local Settings\\History" + IDS_LOCALSETTINGS "ローカル設定" + IDS_LOCALAPPDATA "ローカル設定\\アプリのデータ" + IDS_TEMP "ローカル設定\\Temp" /* See also TEMP_DIR in boot/bootdata/hivedef.inf */ + IDS_CACHE "ローカル設定\\一時インターネットファイル" + IDS_HISTORY "ローカル設定\\履歴" IDS_COOKIES "クッキー" END diff --git a/dll/win32/userenv/lang/lt-LT.rc b/dll/win32/userenv/lang/lt-LT.rc index c1ecdc009eb..4e059d05ed6 100644 --- a/dll/win32/userenv/lang/lt-LT.rc +++ b/dll/win32/userenv/lang/lt-LT.rc @@ -17,7 +17,7 @@ BEGIN IDS_STARTUP "Meniu\\Programos\\Paleistis" IDS_LOCALSETTINGS "Local Settings" IDS_LOCALAPPDATA "Local Settings\\Application Data" - IDS_TEMP "Local Settings\\Temp" + IDS_TEMP "Local Settings\\Temp" /* See also TEMP_DIR in boot/bootdata/hivedef.inf */ IDS_CACHE "Local Settings\\Temporary Internet Files" IDS_HISTORY "Local Settings\\History" IDS_COOKIES "Slapukai" diff --git a/dll/win32/userenv/lang/nl-NL.rc b/dll/win32/userenv/lang/nl-NL.rc index de95425a034..b4188037808 100644 --- a/dll/win32/userenv/lang/nl-NL.rc +++ b/dll/win32/userenv/lang/nl-NL.rc @@ -17,7 +17,7 @@ BEGIN IDS_STARTUP "Menu Start\\Programma's\\Opstarten" IDS_LOCALSETTINGS "Local Settings" IDS_LOCALAPPDATA "Local Settings\\Application Data" - IDS_TEMP "Local Settings\\Temp" + IDS_TEMP "Local Settings\\Temp" /* See also TEMP_DIR in boot/bootdata/hivedef.inf */ IDS_CACHE "Local Settings\\Temporary Internet Files" IDS_HISTORY "Local Settings\\Geschiedenis" IDS_COOKIES "Cookies" diff --git a/dll/win32/userenv/lang/no-NO.rc b/dll/win32/userenv/lang/no-NO.rc index 0a2c6889b07..ab7faaff405 100644 --- a/dll/win32/userenv/lang/no-NO.rc +++ b/dll/win32/userenv/lang/no-NO.rc @@ -17,7 +17,7 @@ BEGIN IDS_STARTUP "Start-Meny\\Programmer\\Oppstart" IDS_LOCALSETTINGS "Lokale innstillinger" IDS_LOCALAPPDATA "Lokale innstillinger\\Programdata" - IDS_TEMP "Lokale innstillinger\\Midlertidig" + IDS_TEMP "Lokale innstillinger\\Midlertidig" /* See also TEMP_DIR in boot/bootdata/hivedef.inf */ IDS_CACHE "Lokale innstillinger\\Midlertidig internett filer" IDS_HISTORY "Lokale innstillinger\\Logg" IDS_COOKIES "Informasjonkapsel" diff --git a/dll/win32/userenv/lang/pl-PL.rc b/dll/win32/userenv/lang/pl-PL.rc index 4b979b6ac11..baccea8c7ff 100644 --- a/dll/win32/userenv/lang/pl-PL.rc +++ b/dll/win32/userenv/lang/pl-PL.rc @@ -17,7 +17,7 @@ BEGIN IDS_STARTUP "Menu Start\\Programy\\Autostart" IDS_LOCALSETTINGS "Ustawienia lokalne" IDS_LOCALAPPDATA "Ustawienia lokalne\\Dane aplikacji" - IDS_TEMP "Ustawienia lokalne\\Temp" + IDS_TEMP "Ustawienia lokalne\\Temp" /* See also TEMP_DIR in boot/bootdata/hivedef.inf */ IDS_CACHE "Ustawienia lokalne\\Temporary Internet Files" IDS_HISTORY "Ustawienia lokalne\\Historia" IDS_COOKIES "Ciasteczka" diff --git a/dll/win32/userenv/lang/pt-BR.rc b/dll/win32/userenv/lang/pt-BR.rc index c43ee3cfeda..b803246736b 100644 --- a/dll/win32/userenv/lang/pt-BR.rc +++ b/dll/win32/userenv/lang/pt-BR.rc @@ -17,7 +17,7 @@ BEGIN IDS_STARTUP "Menu Iniciar\\Programas\\Inicializar" IDS_LOCALSETTINGS "Configurações locais" IDS_LOCALAPPDATA "Configurações locais\\Dados de aplicativos" - IDS_TEMP "Configurações locais\\Temp" + IDS_TEMP "Configurações locais\\Temp" /* See also TEMP_DIR in boot/bootdata/hivedef.inf */ IDS_CACHE "Configurações locais\\Temporary Internet Files" IDS_HISTORY "Configurações locais\\Histórico" IDS_COOKIES "Cookies" diff --git a/dll/win32/userenv/lang/pt-PT.rc b/dll/win32/userenv/lang/pt-PT.rc index 0486ea25773..7a8bb934136 100644 --- a/dll/win32/userenv/lang/pt-PT.rc +++ b/dll/win32/userenv/lang/pt-PT.rc @@ -17,7 +17,7 @@ BEGIN IDS_STARTUP "Menu Iniciar\\Programas\\Inicializar" IDS_LOCALSETTINGS "Configurações locais" IDS_LOCALAPPDATA "Configurações locais\\Dados de aplicativos" - IDS_TEMP "Configurações locais\\Temp" + IDS_TEMP "Configurações locais\\Temp" /* See also TEMP_DIR in boot/bootdata/hivedef.inf */ IDS_CACHE "Configurações locais\\Temporary Internet Files" IDS_HISTORY "Configurações locais\\Histórico" IDS_COOKIES "Cookies" diff --git a/dll/win32/userenv/lang/ro-RO.rc b/dll/win32/userenv/lang/ro-RO.rc index 815ebe61a3f..54badf18340 100644 --- a/dll/win32/userenv/lang/ro-RO.rc +++ b/dll/win32/userenv/lang/ro-RO.rc @@ -23,7 +23,7 @@ BEGIN IDS_STARTUP "Meniul Pornire\\Programe\\Autolansate" IDS_LOCALSETTINGS "Preferințe locale" IDS_LOCALAPPDATA "Preferințe locale\\Date de aplicație" - IDS_TEMP "Preferințe locale\\Temp" + IDS_TEMP "Preferințe locale\\Temp" /* See also TEMP_DIR in boot/bootdata/hivedef.inf */ IDS_CACHE "Preferințe locale\\Fișiere de Internet temporare" IDS_HISTORY "Preferințe locale\\Istoric" IDS_COOKIES "Cookies" diff --git a/dll/win32/userenv/lang/ru-RU.rc b/dll/win32/userenv/lang/ru-RU.rc index b43cf37fb46..dbc67617d3c 100644 --- a/dll/win32/userenv/lang/ru-RU.rc +++ b/dll/win32/userenv/lang/ru-RU.rc @@ -17,7 +17,7 @@ BEGIN IDS_STARTUP "Главное меню\\Программы\\Автозагрузка" IDS_LOCALSETTINGS "Local Settings" IDS_LOCALAPPDATA "Local Settings\\Application Data" - IDS_TEMP "Local Settings\\Temp" + IDS_TEMP "Local Settings\\Temp" /* See also TEMP_DIR in boot/bootdata/hivedef.inf */ IDS_CACHE "Local Settings\\Temporary Internet Files" IDS_HISTORY "Local Settings\\History" IDS_COOKIES "Cookies" diff --git a/dll/win32/userenv/lang/sk-SK.rc b/dll/win32/userenv/lang/sk-SK.rc index cd42a15dd0a..7ce4ac06368 100644 --- a/dll/win32/userenv/lang/sk-SK.rc +++ b/dll/win32/userenv/lang/sk-SK.rc @@ -22,7 +22,7 @@ BEGIN IDS_STARTUP "Ponuka Štart\\Programy\\Po spustení" IDS_LOCALSETTINGS "Local Settings" IDS_LOCALAPPDATA "Local Settings\\Application Data" - IDS_TEMP "Local Settings\\Temp" + IDS_TEMP "Local Settings\\Temp" /* See also TEMP_DIR in boot/bootdata/hivedef.inf */ IDS_CACHE "Local Settings\\Temporary Internet Files" IDS_HISTORY "Local Settings\\History" IDS_COOKIES "Cookies" diff --git a/dll/win32/userenv/lang/sq-AL.rc b/dll/win32/userenv/lang/sq-AL.rc index 5b536119606..affc3637748 100644 --- a/dll/win32/userenv/lang/sq-AL.rc +++ b/dll/win32/userenv/lang/sq-AL.rc @@ -22,7 +22,7 @@ BEGIN IDS_STARTUP "Fillo Menu\\Programe\\Fillimi" IDS_LOCALSETTINGS "Cilësimet lokale" IDS_LOCALAPPDATA "Cilësimet lokale\\Aplikacion Data" - IDS_TEMP "Cilësimet lokale\\Përk" + IDS_TEMP "Cilësimet lokale\\Përk" /* See also TEMP_DIR in boot/bootdata/hivedef.inf */ IDS_CACHE "Cilësimet lokale\\Dokumente Interneti Përkohshëm" IDS_HISTORY "Cilësimet lokale\\Historia" IDS_COOKIES "Biskota" diff --git a/dll/win32/userenv/lang/sv-SE.rc b/dll/win32/userenv/lang/sv-SE.rc index 3bf9311c857..6e660126a7e 100644 --- a/dll/win32/userenv/lang/sv-SE.rc +++ b/dll/win32/userenv/lang/sv-SE.rc @@ -17,7 +17,7 @@ BEGIN IDS_STARTUP "Start-meny\\Program\\Autostart" IDS_LOCALSETTINGS "Lokala inställningar" IDS_LOCALAPPDATA "Lokala inställningar\\Application Data" - IDS_TEMP "Lokala inställningar\\Temp" + IDS_TEMP "Lokala inställningar\\Temp" /* See also TEMP_DIR in boot/bootdata/hivedef.inf */ IDS_CACHE "Lokala inställningar\\Temporary Internet Files" IDS_HISTORY "Lokala inställningar\\Tidigare" IDS_COOKIES "Cookies" diff --git a/dll/win32/userenv/lang/th-TH.rc b/dll/win32/userenv/lang/th-TH.rc index c34c48885af..8ed187dfed8 100644 --- a/dll/win32/userenv/lang/th-TH.rc +++ b/dll/win32/userenv/lang/th-TH.rc @@ -17,7 +17,7 @@ BEGIN IDS_STARTUP "เริ่มรายการ\\โปรแกรม\\เริ่มต้น" IDS_LOCALSETTINGS "การตั้งค่าตั้งต้น" IDS_LOCALAPPDATA "การตั้งค่าตั้งต้น\\ข้อมูลประยุกต์" - IDS_TEMP "การตั้งค่าตั้งต้น\\เก็บชั่วคราว" + IDS_TEMP "การตั้งค่าตั้งต้น\\เก็บชั่วคราว" /* See also TEMP_DIR in boot/bootdata/hivedef.inf */ IDS_CACHE "การตั้งค่าตั้งต้น\\เก็บไฟล์อินเตอร์เน็ตชั่วคราว" IDS_HISTORY "การตั้งค่าตั้งต้น\\ประวัติใช้งาน" IDS_COOKIES "คุกกี้" diff --git a/dll/win32/userenv/lang/tr-TR.rc b/dll/win32/userenv/lang/tr-TR.rc index eb4262128da..2a5ef2513c7 100644 --- a/dll/win32/userenv/lang/tr-TR.rc +++ b/dll/win32/userenv/lang/tr-TR.rc @@ -19,7 +19,7 @@ BEGIN IDS_STARTUP "Başlat Seçkesi\\İzlenceler\\Başlangıç" IDS_LOCALSETTINGS "Yerli Ayarlar" IDS_LOCALAPPDATA "Yerli Ayarlar\\Uygulama Verisi" - IDS_TEMP "Yerli Ayarlar\\Geçici" + IDS_TEMP "Yerli Ayarlar\\Geçici" /* See also TEMP_DIR in boot/bootdata/hivedef.inf */ IDS_CACHE "Yerli Ayarlar\\Geçici Umûmî Ağ Kütükleri" IDS_HISTORY "Yerli Ayarlar\\Geçmiş" IDS_COOKIES "Tanımlama Bilgileri" diff --git a/dll/win32/userenv/lang/uk-UA.rc b/dll/win32/userenv/lang/uk-UA.rc index ffe54f9b25a..5f4da2723d2 100644 --- a/dll/win32/userenv/lang/uk-UA.rc +++ b/dll/win32/userenv/lang/uk-UA.rc @@ -17,7 +17,7 @@ BEGIN IDS_STARTUP "Головне меню\\Програми\\Автозапуск" IDS_LOCALSETTINGS "Local Settings" IDS_LOCALAPPDATA "Local Settings\\Application Data" - IDS_TEMP "Local Settings\\Temp" + IDS_TEMP "Local Settings\\Temp" /* See also TEMP_DIR in boot/bootdata/hivedef.inf */ IDS_CACHE "Local Settings\\Temporary Internet Files" IDS_HISTORY "Local Settings\\History" IDS_COOKIES "Cookies" diff --git a/dll/win32/userenv/lang/zh-CN.rc b/dll/win32/userenv/lang/zh-CN.rc index 1e65c404eca..a3f17c7f7a9 100644 --- a/dll/win32/userenv/lang/zh-CN.rc +++ b/dll/win32/userenv/lang/zh-CN.rc @@ -23,7 +23,7 @@ BEGIN IDS_STARTUP "「开始」菜单\\程序\\启动" IDS_LOCALSETTINGS "Local Settings" IDS_LOCALAPPDATA "Local Settings\\Application Data" - IDS_TEMP "Local Settings\\Temp" + IDS_TEMP "Local Settings\\Temp" /* See also TEMP_DIR in boot/bootdata/hivedef.inf */ IDS_CACHE "Local Settings\\Temporary Internet Files" IDS_HISTORY "Local Settings\\History" IDS_COOKIES "Cookies" diff --git a/dll/win32/userenv/lang/zh-TW.rc b/dll/win32/userenv/lang/zh-TW.rc index 732fd89c3c1..6d854c199b4 100644 --- a/dll/win32/userenv/lang/zh-TW.rc +++ b/dll/win32/userenv/lang/zh-TW.rc @@ -22,7 +22,7 @@ BEGIN IDS_STARTUP "「開始」功能表\\程式\\啟動" IDS_LOCALSETTINGS "Local Settings" IDS_LOCALAPPDATA "Local Settings\\Application Data" - IDS_TEMP "Local Settings\\Temp" + IDS_TEMP "Local Settings\\Temp" /* See also TEMP_DIR in boot/bootdata/hivedef.inf */ IDS_CACHE "Local Settings\\Temporary Internet Files" IDS_HISTORY "Local Settings\\History" IDS_COOKIES "Cookies"

1 0

[reactos] 01/01: [Win32nt|ApiTests] Add Exclude, Intersect and Offset Clip Region tests.
by jimtabor 20 Jan '20

20 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ef8c9239d700b8375b7d5… commit ef8c9239d700b8375b7d50333511e2ca33850bf7 Author: jimtabor <james.tabor(a)reactos.org> AuthorDate: Mon Jan 20 13:11:09 2020 -0600 Commit: jimtabor <james.tabor(a)reactos.org> CommitDate: Mon Jan 20 13:11:09 2020 -0600 [Win32nt|ApiTests] Add Exclude, Intersect and Offset Clip Region tests. --- modules/rostests/apitests/win32nt/CMakeLists.txt | 3 +++ .../apitests/win32nt/ntgdi/NtGdiExcludeClipRect.c | 30 ++++++++++++++++++++++ .../apitests/win32nt/ntgdi/NtGdiExtSelectClipRgn.c | 2 +- .../win32nt/ntgdi/NtGdiIntersectClipRect.c | 29 +++++++++++++++++++++ .../apitests/win32nt/ntgdi/NtGdiOffsetClipRgn.c | 29 +++++++++++++++++++++ modules/rostests/apitests/win32nt/testlist.c | 6 +++++ 6 files changed, 98 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/win32nt/CMakeLists.txt b/modules/rostests/apitests/win32nt/CMakeLists.txt index 8ef26f564d9..bdda9755197 100644 --- a/modules/rostests/apitests/win32nt/CMakeLists.txt +++ b/modules/rostests/apitests/win32nt/CMakeLists.txt @@ -18,6 +18,7 @@ list(APPEND SOURCE ntgdi/NtGdiDoPalette.c ntgdi/NtGdiEngCreatePalette.c ntgdi/NtGdiEnumFontOpen.c + ntgdi/NtGdiExcludeClipRect.c ntgdi/NtGdiExtSelectClipRgn.c ntgdi/NtGdiExtTextOutW.c #ntgdi/NtGdiFlushUserBatch.c @@ -26,6 +27,8 @@ list(APPEND SOURCE ntgdi/NtGdiGetFontResourceInfoInternalW.c ntgdi/NtGdiGetRandomRgn.c ntgdi/NtGdiGetStockObject.c + ntgdi/NtGdiIntersectClipRect.c + ntgdi/NtGdiOffsetClipRgn.c ntgdi/NtGdiPolyPolyDraw.c ntgdi/NtGdiRestoreDC.c ntgdi/NtGdiSaveDC.c diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiExcludeClipRect.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiExcludeClipRect.c new file mode 100644 index 00000000000..6dd1a22a86e --- /dev/null +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiExcludeClipRect.c @@ -0,0 +1,30 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for NtGdiExcludeClipRect + * PROGRAMMERS: + */ + +#include <win32nt.h> + +START_TEST(NtGdiExcludeClipRect) +{ + //HDC hdc; +// test what params are accepted for what operations +// 0? invalid? are params maybe ignored in some cases? +// LastError + + /* Preparation */ + //hdc = CreateCompatibleDC(NULL); + + /* Test NULL DC */ + SetLastError(0x12345); + ok_int(NtGdiExcludeClipRect(NULL, 0, 0, 0, 0), ERROR); + ok_int(GetLastError(), ERROR_INVALID_HANDLE); + + /* Test invalid DC */ + SetLastError(0x12345); + ok_int(NtGdiExcludeClipRect((HDC)(ULONG_PTR)0x12345, 0, 0, 0, 0), ERROR); + ok((GetLastError() == ERROR_INVALID_HANDLE), "ERROR_INVALID_HANDLE, got %ld\n", GetLastError()); + +} diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtSelectClipRgn.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtSelectClipRgn.c index 03cd12d161f..847c1377cef 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtSelectClipRgn.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtSelectClipRgn.c @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS api tests * LICENSE: GPL - See COPYING in the top level directory - * PURPOSE: Test for NtGdiCombineRgn + * PURPOSE: Test for NtGdiExtSelectClipRgn * PROGRAMMERS: */ diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiIntersectClipRect.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiIntersectClipRect.c new file mode 100644 index 00000000000..cbe66134ab7 --- /dev/null +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiIntersectClipRect.c @@ -0,0 +1,29 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for NtGdiIntersectClipRect + * PROGRAMMERS: + */ + +#include <win32nt.h> + +START_TEST(NtGdiIntersectClipRect) +{ + //HDC hdc; +// test what params are accepted for what operations +// 0? invalid? are params maybe ignored in some cases? +// LastError + + /* Preparation */ + //hdc = CreateCompatibleDC(NULL); + + /* Test NULL DC */ + SetLastError(0x12345); + ok_int(NtGdiIntersectClipRect(NULL, 0, 0, 0, 0), ERROR); + ok_int(GetLastError(), ERROR_INVALID_HANDLE); + + /* Test invalid DC */ + SetLastError(0x12345); + ok_int(NtGdiIntersectClipRect((HDC)(ULONG_PTR)0x12345, 0, 0, 0, 0), ERROR); + ok((GetLastError() == ERROR_INVALID_HANDLE), "ERROR_INVALID_HANDLE, got %ld\n", GetLastError()); +} diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiOffsetClipRgn.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiOffsetClipRgn.c new file mode 100644 index 00000000000..ef28a23c8f2 --- /dev/null +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiOffsetClipRgn.c @@ -0,0 +1,29 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for NtGdiOffsetClipRgn + * PROGRAMMERS: + */ + +#include <win32nt.h> + +START_TEST(NtGdiOffsetClipRgn) +{ + //HDC hdc; +// test what params are accepted for what operations +// 0? invalid? are params maybe ignored in some cases? +// LastError + + /* Preparation */ + //hdc = CreateCompatibleDC(NULL); + + /* Test NULL DC */ + SetLastError(0x12345); + ok_int(NtGdiOffsetClipRgn(NULL, 0, 0), ERROR); + ok_int(GetLastError(), ERROR_INVALID_HANDLE); + + /* Test invalid DC */ + SetLastError(0x12345); + ok_int(NtGdiOffsetClipRgn((HDC)(ULONG_PTR)0x12345, 0, 0), ERROR); + ok((GetLastError() == ERROR_INVALID_HANDLE), "ERROR_INVALID_HANDLE, got %ld\n", GetLastError()); +} diff --git a/modules/rostests/apitests/win32nt/testlist.c b/modules/rostests/apitests/win32nt/testlist.c index 186fd03e6ca..bbf0756fc31 100644 --- a/modules/rostests/apitests/win32nt/testlist.c +++ b/modules/rostests/apitests/win32nt/testlist.c @@ -19,6 +19,7 @@ extern void func_NtGdiDeleteObjectApp(void); extern void func_NtGdiDoPalette(void); extern void func_NtGdiEngCreatePalette(void); extern void func_NtGdiEnumFontOpen(void); +extern void func_NtGdiExcludeClipRect(void); extern void func_NtGdiExtSelectClipRgn(void); extern void func_NtGdiExtTextOutW(void); //extern void func_NtGdiFlushUserBatch(void); @@ -27,6 +28,8 @@ extern void func_NtGdiGetDIBitsInternal(void); extern void func_NtGdiGetFontResourceInfoInternalW(void); extern void func_NtGdiGetRandomRgn(void); extern void func_NtGdiGetStockObject(void); +extern void func_NtGdiIntersectClipRect(void); +extern void func_NtGdiOffsetClipRgn(void); extern void func_NtGdiPolyPolyDraw(void); extern void func_NtGdiRestoreDC(void); extern void func_NtGdiSaveDC(void); @@ -80,6 +83,7 @@ const struct test winetest_testlist[] = { "NtGdiDoPalette", func_NtGdiDoPalette }, { "NtGdiEngCreatePalette", func_NtGdiEngCreatePalette }, { "NtGdiEnumFontOpen", func_NtGdiEnumFontOpen }, + { "NtGdiExcludeClipRect", func_NtGdiExcludeClipRect }, { "NtGdiExtSelectClipRgn", func_NtGdiExtSelectClipRgn }, { "NtGdiExtTextOutW", func_NtGdiExtTextOutW }, //{ "NtGdiFlushUserBatch", func_NtGdiFlushUserBatch }, @@ -88,6 +92,8 @@ const struct test winetest_testlist[] = { "NtGdiGetFontResourceInfoInternalW", func_NtGdiGetFontResourceInfoInternalW }, { "NtGdiGetRandomRgn", func_NtGdiGetRandomRgn }, { "NtGdiGetStockObject", func_NtGdiGetStockObject }, + { "NtGdiIntersectClipRect", func_NtGdiIntersectClipRect }, + { "NtGdiOffsetClipRgn", func_NtGdiOffsetClipRgn }, { "NtGdiPolyPolyDraw", func_NtGdiPolyPolyDraw }, { "NtGdiRestoreDC", func_NtGdiRestoreDC }, { "NtGdiSaveDC", func_NtGdiSaveDC },

1 0

[reactos] 01/01: [NtGdi] Fix clip region merging.
by James Tabor 20 Jan '20

20 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4927905eeb0a1d51a349c… commit 4927905eeb0a1d51a349c4f8f4a31c6cd52379c2 Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Mon Jan 20 12:49:11 2020 -0600 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Mon Jan 20 12:49:11 2020 -0600 [NtGdi] Fix clip region merging. Use a new region while merging from the original. See CORE-16626. --- win32ss/gdi/ntgdi/cliprgn.c | 87 ++++++++++++++------------------------------- 1 file changed, 26 insertions(+), 61 deletions(-) diff --git a/win32ss/gdi/ntgdi/cliprgn.c b/win32ss/gdi/ntgdi/cliprgn.c index 23f32426fe5..163106ed1ce 100644 --- a/win32ss/gdi/ntgdi/cliprgn.c +++ b/win32ss/gdi/ntgdi/cliprgn.c @@ -145,12 +145,12 @@ IntSelectClipRgn( } } //EngReleaseSemaphore(pdc->ppdev->hsemDevLock); - +#if 0 rcl.left += dc->ptlDCOrig.x; rcl.top += dc->ptlDCOrig.y; rcl.right += dc->ptlDCOrig.x; rcl.bottom += dc->ptlDCOrig.y; - +#endif prgnClip = IntSysCreateRectpRgnIndirect(&rcl); Ret = IntGdiCombineRgn(prgnNClip, prgnClip, prgn, fnMode); @@ -439,9 +439,10 @@ NtGdiExcludeClipRect( _In_ INT xRight, _In_ INT yBottom) { - INT iComplexity; + INT iComplexity = ERROR; RECTL rect; PDC pdc; + PREGION prgn; /* Lock the DC */ pdc = DC_LockDc(hdc); @@ -452,46 +453,25 @@ NtGdiExcludeClipRect( } /* Convert coordinates to device space */ - rect.left = xLeft; - rect.top = yTop; - rect.right = xRight; + rect.left = xLeft; + rect.top = yTop; + rect.right = xRight; rect.bottom = yBottom; RECTL_vMakeWellOrdered(&rect); IntLPtoDP(pdc, (LPPOINT)&rect, 2); - /* Check if we already have a clip region */ - if (pdc->dclevel.prgnClip != NULL) + prgn = IntSysCreateRectpRgnIndirect(&rect); + if ( prgn ) { - /* We have a region, subtract the rect */ - iComplexity = REGION_SubtractRectFromRgn(pdc->dclevel.prgnClip, - pdc->dclevel.prgnClip, - &rect); - } - else - { - /* We don't have a clip region yet, create an empty region */ - pdc->dclevel.prgnClip = IntSysCreateRectpRgn(0, 0, 0, 0); - if (pdc->dclevel.prgnClip == NULL) - { - iComplexity = ERROR; - } - else - { - /* Subtract the rect from the VIS region */ - iComplexity = REGION_SubtractRectFromRgn(pdc->dclevel.prgnClip, - pdc->prgnVis, - &rect); - } + iComplexity = IntSelectClipRgn( pdc, prgn, RGN_DIFF ); + + REGION_Delete(prgn); } /* Emulate Windows behavior */ if (iComplexity == SIMPLEREGION) iComplexity = COMPLEXREGION; - /* If we succeeded, mark the RAO region as dirty */ - if (iComplexity != ERROR) - pdc->fs |= DC_FLAG_DIRTY_RAO; - /* Unlock the DC */ DC_UnlockDc(pdc); @@ -507,10 +487,10 @@ NtGdiIntersectClipRect( _In_ INT xRight, _In_ INT yBottom) { - INT iComplexity; + INT iComplexity = ERROR; RECTL rect; - PREGION prgnNew; PDC pdc; + PREGION prgn; DPRINT("NtGdiIntersectClipRect(%p, %d,%d-%d,%d)\n", hdc, xLeft, yTop, xRight, yBottom); @@ -524,39 +504,24 @@ NtGdiIntersectClipRect( } /* Convert coordinates to device space */ - rect.left = xLeft; - rect.top = yTop; - rect.right = xRight; + rect.left = xLeft; + rect.top = yTop; + rect.right = xRight; rect.bottom = yBottom; + RECTL_vMakeWellOrdered(&rect); IntLPtoDP(pdc, (LPPOINT)&rect, 2); - /* Check if we already have a clip region */ - if (pdc->dclevel.prgnClip != NULL) - { - /* We have a region, crop it */ - iComplexity = REGION_CropRegion(pdc->dclevel.prgnClip, - pdc->dclevel.prgnClip, - &rect); - } - else + prgn = IntSysCreateRectpRgnIndirect(&rect); + if ( prgn ) { - /* We don't have a region yet, allocate a new one */ - prgnNew = IntSysCreateRectpRgnIndirect(&rect); - if (prgnNew == NULL) - { - iComplexity = ERROR; - } - else - { - /* Set the new region */ - pdc->dclevel.prgnClip = prgnNew; - iComplexity = SIMPLEREGION; - } + iComplexity = IntSelectClipRgn( pdc, prgn, RGN_AND ); + + REGION_Delete(prgn); } - /* If we succeeded, mark the RAO region as dirty */ - if (iComplexity != ERROR) - pdc->fs |= DC_FLAG_DIRTY_RAO; + /* Emulate Windows behavior */ + if ( iComplexity == SIMPLEREGION ) + iComplexity = COMPLEXREGION; /* Unlock the DC */ DC_UnlockDc(pdc);

1 0

[reactos] 01/01: [ATL] Re-enable MSVC warning C4477 (#2010)
by Serge Gautherie 20 Jan '20

20 Jan '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=367a94211b0d83ed0ffa4… commit 367a94211b0d83ed0ffa4dfd4d2e97dadaca18fc Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Jan 20 14:24:06 2020 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jan 20 14:24:06 2020 +0100 [ATL] Re-enable MSVC warning C4477 (#2010) Follow-up to e410a122. --- dll/win32/atl/CMakeLists.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dll/win32/atl/CMakeLists.txt b/dll/win32/atl/CMakeLists.txt index ac492112eeb..475ebab24ff 100644 --- a/dll/win32/atl/CMakeLists.txt +++ b/dll/win32/atl/CMakeLists.txt @@ -9,11 +9,6 @@ add_definitions( include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(atl.dll atl.spec ADD_IMPORTLIB) -if(MSVC) - # Disable warning C4477 (printf format warnings) - add_compile_flags("/wd4477") -endif() - list(APPEND SOURCE atl.c atl30.c

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