Ros-diffs December 2017

ros-diffs@reactos.org

26 participants
355 discussions

[reactos] 01/01: [NTOS:EX] Fix handle table code for x64. Based on patch by Ivan Labutin. See PR #115

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cbc4cfeed6a6c6f93d1f5… commit cbc4cfeed6a6c6f93d1f5e60abb9dd254c38c98f Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Nov 13 19:00:31 2017 +0100 [NTOS:EX] Fix handle table code for x64. Based on patch by Ivan Labutin. See PR #115 --- ntoskrnl/ex/handle.c | 64 ++++++++++++++++++++++-------------------- ntoskrnl/include/internal/ex.h | 20 +++++++------ 2 files changed, 46 insertions(+), 38 deletions(-) diff --git a/ntoskrnl/ex/handle.c b/ntoskrnl/ex/handle.c index b9732f3639..5c26ccdca8 100644 --- a/ntoskrnl/ex/handle.c +++ b/ntoskrnl/ex/handle.c @@ -18,6 +18,7 @@ LIST_ENTRY HandleTableListHead; EX_PUSH_LOCK HandleTableListLock; #define SizeOfHandle(x) (sizeof(HANDLE) * (x)) +#define INDEX_TO_HANDLE_VALUE(x) ((x) << HANDLE_TAG_BITS) /* PRIVATE FUNCTIONS *********************************************************/ @@ -67,12 +68,14 @@ ExpLookupHandleTableEntry(IN PHANDLE_TABLE HandleTable, /* Get the mid level pointer array */ PointerArray = PointerArray[Handle.HighIndex]; + ASSERT(PointerArray != NULL); /* Fall through */ case 1: /* Get the handle array */ HandleArray = PointerArray[Handle.MidIndex]; + ASSERT(HandleArray != NULL); /* Fall through */ case 0: @@ -255,8 +258,8 @@ ExpFreeHandleTableEntry(IN PHANDLE_TABLE HandleTable, IN EXHANDLE Handle, IN PHANDLE_TABLE_ENTRY HandleTableEntry) { - ULONG OldValue, NewValue, *Free; - ULONG i; + ULONG OldValue, *Free; + ULONG LockIndex; PAGED_CODE(); /* Sanity checks */ @@ -267,16 +270,16 @@ ExpFreeHandleTableEntry(IN PHANDLE_TABLE HandleTable, InterlockedDecrement(&HandleTable->HandleCount); /* Mark the handle as free */ - NewValue = (ULONG)Handle.Value & ~(SizeOfHandle(1) - 1); + Handle.TagBits = 0; /* Check if we're FIFO */ if (!HandleTable->StrictFIFO) { /* Select a lock index */ - i = (NewValue >> 2) % 4; + LockIndex = Handle.Index % 4; /* Select which entry to use */ - Free = (HandleTable->HandleTableLock[i].Locked) ? + Free = (HandleTable->HandleTableLock[LockIndex].Locked) ? &HandleTable->FirstFree : &HandleTable->LastFree; } else @@ -290,8 +293,8 @@ ExpFreeHandleTableEntry(IN PHANDLE_TABLE HandleTable, { /* Get the current value and write */ OldValue = *Free; - HandleTableEntry->NextFreeTableEntry = (ULONG)OldValue; - if (InterlockedCompareExchange((PLONG) Free, NewValue, OldValue) == OldValue) + HandleTableEntry->NextFreeTableEntry = OldValue; + if (InterlockedCompareExchange((PLONG)Free, Handle.AsULONG, OldValue) == OldValue) { /* Break out, we're done. Make sure the handle value makes sense */ ASSERT((OldValue & FREE_HANDLE_MASK) < @@ -354,7 +357,7 @@ ExpAllocateHandleTable(IN PEPROCESS Process OPTIONAL, { /* Set up the free data */ HandleEntry->Value = 0; - HandleEntry->NextFreeTableEntry = (i + 1) * SizeOfHandle(1); + HandleEntry->NextFreeTableEntry = INDEX_TO_HANDLE_VALUE(i + 1); /* Move to the next entry */ HandleEntry++; @@ -363,11 +366,11 @@ ExpAllocateHandleTable(IN PEPROCESS Process OPTIONAL, /* Terminate the last entry */ HandleEntry->Value = 0; HandleEntry->NextFreeTableEntry = 0; - HandleTable->FirstFree = SizeOfHandle(1); + HandleTable->FirstFree = INDEX_TO_HANDLE_VALUE(1); } /* Set the next handle needing pool after our allocated page from above */ - HandleTable->NextHandleNeedingPool = LOW_LEVEL_ENTRIES * SizeOfHandle(1); + HandleTable->NextHandleNeedingPool = INDEX_TO_HANDLE_VALUE(LOW_LEVEL_ENTRIES); /* Setup the rest of the handle table data */ HandleTable->QuotaProcess = Process; @@ -409,12 +412,12 @@ ExpAllocateLowLevelTable(IN PHANDLE_TABLE HandleTable, { /* Go to the next entry and the base entry */ HandleEntry++; - Base = HandleTable->NextHandleNeedingPool + SizeOfHandle(2); + Base = HandleTable->NextHandleNeedingPool + INDEX_TO_HANDLE_VALUE(2); /* Loop each entry */ for (i = Base; - i < Base + SizeOfHandle(LOW_LEVEL_ENTRIES - 2); - i += SizeOfHandle(1)) + i < Base + INDEX_TO_HANDLE_VALUE(LOW_LEVEL_ENTRIES - 2); + i += INDEX_TO_HANDLE_VALUE(1)) { /* Free this entry and move on to the next one */ HandleEntry->NextFreeTableEntry = i; @@ -494,7 +497,7 @@ ExpAllocateHandleTableEntrySlow(IN PHANDLE_TABLE HandleTable, /* Get if the next index can fit in the table */ i = HandleTable->NextHandleNeedingPool / - SizeOfHandle(LOW_LEVEL_ENTRIES); + INDEX_TO_HANDLE_VALUE(LOW_LEVEL_ENTRIES); if (i < MID_LEVEL_ENTRIES) { /* We need to allocate a new table */ @@ -539,7 +542,7 @@ ExpAllocateHandleTableEntrySlow(IN PHANDLE_TABLE HandleTable, ThirdLevel = (PVOID)TableBase; /* Get the index and check if it can fit */ - i = HandleTable->NextHandleNeedingPool / SizeOfHandle(MAX_MID_INDEX); + i = HandleTable->NextHandleNeedingPool / INDEX_TO_HANDLE_VALUE(MAX_MID_INDEX); if (i >= HIGH_LEVEL_ENTRIES) return FALSE; /* Check if there's no mid-level table */ @@ -556,8 +559,8 @@ ExpAllocateHandleTableEntrySlow(IN PHANDLE_TABLE HandleTable, else { /* We have one, check at which index we should insert our entry */ - Index = (HandleTable->NextHandleNeedingPool / SizeOfHandle(1)) - - i * MAX_MID_INDEX; + Index = (HandleTable->NextHandleNeedingPool / INDEX_TO_HANDLE_VALUE(1)) - + i * MAX_MID_INDEX; j = Index / LOW_LEVEL_ENTRIES; /* Allocate a new low level */ @@ -577,13 +580,13 @@ ExpAllocateHandleTableEntrySlow(IN PHANDLE_TABLE HandleTable, /* Update the index of the next handle */ Index = InterlockedExchangeAdd((PLONG) &HandleTable->NextHandleNeedingPool, - SizeOfHandle(LOW_LEVEL_ENTRIES)); + INDEX_TO_HANDLE_VALUE(LOW_LEVEL_ENTRIES)); /* Check if need to initialize the table */ if (DoInit) { /* Create a new index number */ - Index += SizeOfHandle(1); + Index += INDEX_TO_HANDLE_VALUE(1); /* Start free index change loop */ for (;;) @@ -646,7 +649,7 @@ ExpAllocateHandleTableEntry(IN PHANDLE_TABLE HandleTable, { ULONG OldValue, NewValue, NewValue1; PHANDLE_TABLE_ENTRY Entry; - EXHANDLE Handle; + EXHANDLE Handle, OldHandle; BOOLEAN Result; ULONG i; @@ -709,7 +712,8 @@ ExpAllocateHandleTableEntry(IN PHANDLE_TABLE HandleTable, Entry = ExpLookupHandleTableEntry(HandleTable, Handle); /* Get an available lock and acquire it */ - i = ((OldValue & FREE_HANDLE_MASK) >> 2) % 4; + OldHandle.Value = OldValue; + i = OldHandle.Index % 4; KeEnterCriticalRegion(); ExAcquirePushLockShared(&HandleTable->HandleTableLock[i]); @@ -1063,7 +1067,7 @@ ExDupHandleTable(IN PEPROCESS Process, NewTable->FirstFree = 0; /* Setup the first handle value */ - Handle.Value = SizeOfHandle(1); + Handle.Value = INDEX_TO_HANDLE_VALUE(1); /* Enter a critical region and lookup the new entry */ KeEnterCriticalRegion(); @@ -1125,13 +1129,13 @@ ExDupHandleTable(IN PEPROCESS Process, } /* Increase the handle value and move to the next entry */ - Handle.Value += SizeOfHandle(1); + Handle.Value += INDEX_TO_HANDLE_VALUE(1); NewEntry++; HandleTableEntry++; - } while (Handle.Value % SizeOfHandle(LOW_LEVEL_ENTRIES)); + } while (Handle.Value % INDEX_TO_HANDLE_VALUE(LOW_LEVEL_ENTRIES)); /* We're done, skip the last entry */ - Handle.Value += SizeOfHandle(1); + Handle.Value += INDEX_TO_HANDLE_VALUE(1); } /* Acquire the table lock and insert this new table into the list */ @@ -1198,7 +1202,7 @@ ExSweepHandleTable(IN PHANDLE_TABLE HandleTable, PAGED_CODE(); /* Set the initial value and loop the entries */ - Handle.Value = SizeOfHandle(1); + Handle.Value = INDEX_TO_HANDLE_VALUE(1); while ((HandleTableEntry = ExpLookupHandleTableEntry(HandleTable, Handle))) { /* Loop each handle */ @@ -1214,12 +1218,12 @@ ExSweepHandleTable(IN PHANDLE_TABLE HandleTable, } /* Go to the next handle and entry */ - Handle.Value += SizeOfHandle(1); + Handle.Value += INDEX_TO_HANDLE_VALUE(1); HandleTableEntry++; - } while (Handle.Value % SizeOfHandle(LOW_LEVEL_ENTRIES)); + } while (Handle.Value % INDEX_TO_HANDLE_VALUE(LOW_LEVEL_ENTRIES)); /* Skip past the last entry */ - Handle.Value += SizeOfHandle(1); + Handle.Value += INDEX_TO_HANDLE_VALUE(1); } } @@ -1271,7 +1275,7 @@ ExEnumHandleTable(IN PHANDLE_TABLE HandleTable, } /* Go to the next entry */ - Handle.Value += SizeOfHandle(1); + Handle.Value += INDEX_TO_HANDLE_VALUE(1); } /* Leave the critical region and return callback result */ diff --git a/ntoskrnl/include/internal/ex.h b/ntoskrnl/include/internal/ex.h index 3834249c44..09ba4648df 100644 --- a/ntoskrnl/include/internal/ex.h +++ b/ntoskrnl/include/internal/ex.h @@ -68,25 +68,29 @@ VOID NTAPI ExpDebuggerWorker(IN PVOID Context); #define HANDLE_LOW_BITS (PAGE_SHIFT - 3) #define HANDLE_HIGH_BITS (PAGE_SHIFT - 2) #endif -#define KERNEL_FLAG_BITS (sizeof(PVOID)*8 - 31) +#define HANDLE_TAG_BITS (2) +#define HANDLE_INDEX_BITS (HANDLE_LOW_BITS + 2*HANDLE_HIGH_BITS) +#define KERNEL_FLAG_BITS (sizeof(PVOID)*8 - HANDLE_INDEX_BITS - HANDLE_TAG_BITS) typedef union _EXHANDLE { struct { - ULONG_PTR TagBits:2; - ULONG_PTR Index:29; + ULONG_PTR TagBits: HANDLE_TAG_BITS; + ULONG_PTR Index: HANDLE_INDEX_BITS; + ULONG_PTR KernelFlag : KERNEL_FLAG_BITS; }; struct { - ULONG_PTR TagBits2:2; - ULONG_PTR LowIndex:HANDLE_LOW_BITS; - ULONG_PTR MidIndex:HANDLE_HIGH_BITS; - ULONG_PTR HighIndex:HANDLE_HIGH_BITS; - ULONG_PTR KernelFlag:KERNEL_FLAG_BITS; + ULONG_PTR TagBits2: HANDLE_TAG_BITS; + ULONG_PTR LowIndex: HANDLE_LOW_BITS; + ULONG_PTR MidIndex: HANDLE_HIGH_BITS; + ULONG_PTR HighIndex: HANDLE_HIGH_BITS; + ULONG_PTR KernelFlag2: KERNEL_FLAG_BITS; }; HANDLE GenericHandleOverlay; ULONG_PTR Value; + ULONG AsULONG; } EXHANDLE, *PEXHANDLE; typedef struct _ETIMER

6 years, 8 months

[reactos] 01/01: [NTOSKNRL] Addendum to 9a633f7

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2daf2391a6cac848d4ae6… commit 2daf2391a6cac848d4ae6e6951591a321b5b8535 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Dec 29 18:22:37 2017 +0100 [NTOSKNRL] Addendum to 9a633f7 --- ntoskrnl/mm/ARM3/expool.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ntoskrnl/mm/ARM3/expool.c b/ntoskrnl/mm/ARM3/expool.c index e892999ed3..4b5a8afbe8 100644 --- a/ntoskrnl/mm/ARM3/expool.c +++ b/ntoskrnl/mm/ARM3/expool.c @@ -497,10 +497,12 @@ MiDumpPoolConsumers(BOOLEAN CalledFromDbg, ULONG Tag, ULONG Mask) DPRINT1("---------------------\n"); DPRINT1("Out of memory dumper!\n"); } +#ifdef KDBG else { KdbpPrint("Pool Used:\n"); } +#endif // // Print table header

6 years, 8 months

[reactos] 01/01: [NTOSKRNL] Fix MSVC build

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9a633f7b48b636a981332… commit 9a633f7b48b636a981332c18bd01e7028bbc9cc2 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Dec 29 18:03:33 2017 +0100 [NTOSKRNL] Fix MSVC build --- ntoskrnl/mm/ARM3/expool.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ntoskrnl/mm/ARM3/expool.c b/ntoskrnl/mm/ARM3/expool.c index 7263141f4c..e892999ed3 100644 --- a/ntoskrnl/mm/ARM3/expool.c +++ b/ntoskrnl/mm/ARM3/expool.c @@ -475,9 +475,14 @@ ExpTagAllowPrint(CHAR Tag) return FALSE; } +#ifdef KDBG #define MiDumperPrint(dbg, fmt, ...) \ if (dbg) KdbpPrint(fmt, ##__VA_ARGS__); \ else DPRINT1(fmt, ##__VA_ARGS__) +#else +#define MiDumperPrint(dbg, fmt, ...) \ + DPRINT1(fmt, ##__VA_ARGS__) +#endif VOID MiDumpPoolConsumers(BOOLEAN CalledFromDbg, ULONG Tag, ULONG Mask)

6 years, 8 months

[reactos] 06/06: [NTOSKRNL] Add support for the ? wildcard in the !poolused command

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4e34bf2a0b168e0f5d4dd… commit 4e34bf2a0b168e0f5d4dd132f70ce649519a67b2 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Dec 29 17:19:59 2017 +0100 [NTOSKRNL] Add support for the ? wildcard in the !poolused command --- ntoskrnl/mm/ARM3/expool.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/ntoskrnl/mm/ARM3/expool.c b/ntoskrnl/mm/ARM3/expool.c index c258915495..7263141f4c 100644 --- a/ntoskrnl/mm/ARM3/expool.c +++ b/ntoskrnl/mm/ARM3/expool.c @@ -480,7 +480,7 @@ ExpTagAllowPrint(CHAR Tag) else DPRINT1(fmt, ##__VA_ARGS__) VOID -MiDumpPoolConsumers(BOOLEAN CalledFromDbg, ULONG Tag) +MiDumpPoolConsumers(BOOLEAN CalledFromDbg, ULONG Tag, ULONG Mask) { SIZE_T i; @@ -519,10 +519,13 @@ MiDumpPoolConsumers(BOOLEAN CalledFromDbg, ULONG Tag) { // // If there's a tag, attempt to do a pretty print - // only if it matches the caller tag, or if + // only if it matches the caller's tag, or if // any tag is allowed + // For checking whether it matches caller's tag, + // use the mask to make sure not to mess with the wildcards // - if (TableEntry->Key != 0 && TableEntry->Key != TAG_NONE && (Tag == 0 || TableEntry->Key == Tag)) + if (TableEntry->Key != 0 && TableEntry->Key != TAG_NONE && + (Tag == 0 || (TableEntry->Key & Mask) == (Tag & Mask))) { CHAR Tag[4]; @@ -550,7 +553,7 @@ MiDumpPoolConsumers(BOOLEAN CalledFromDbg, ULONG Tag) TableEntry->PagedAllocs, TableEntry->PagedBytes); } } - else if (Tag == 0 || Tag == TAG_NONE) + else if (Tag == 0 || (Tag & Mask) == (TAG_NONE & Mask)) { MiDumperPrint(CalledFromDbg, "Anon\t\t%ld\t\t%ld\t\t%ld\t\t%ld\n", TableEntry->NonPagedAllocs, TableEntry->NonPagedBytes, @@ -1751,7 +1754,7 @@ ExAllocatePoolWithTag(IN POOL_TYPE PoolType, // // Out of memory, display current consumption // - MiDumpPoolConsumers(FALSE, 0); + MiDumpPoolConsumers(FALSE, 0, 0); #endif // @@ -2084,7 +2087,7 @@ ExAllocatePoolWithTag(IN POOL_TYPE PoolType, // // Out of memory, display current consumption // - MiDumpPoolConsumers(FALSE, 0); + MiDumpPoolConsumers(FALSE, 0, 0); #endif // @@ -2945,11 +2948,13 @@ ExpKdbgExtPoolUsed( PCHAR Argv[]) { ULONG Tag = 0; + ULONG Mask = 0; if (Argc > 1) { CHAR Tmp[4]; ULONG Len; + USHORT i; /* Get the tag */ Len = strlen(Argv[1]); @@ -2957,12 +2962,22 @@ ExpKdbgExtPoolUsed( { Len = 4; } - RtlCopyMemory(Tmp, Argv[1], Len * sizeof(CHAR)); + /* Generate the mask to have wildcards support */ + for (i = 0; i < Len; ++i) + { + Tmp[i] = Argv[1][i]; + if (Tmp[i] != '?') + { + Mask |= (0xFF << i * 8); + } + } + /* Get the tag in the ulong form */ Tag = *((PULONG)Tmp); } - MiDumpPoolConsumers(TRUE, Tag); + /* Call the dumper */ + MiDumpPoolConsumers(TRUE, Tag, Mask); return TRUE; }

6 years, 8 months

[reactos] 05/06: [NTOSKRNL] Allow filtering !poolused output using a tag

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=454e8738f22678ce3fea3… commit 454e8738f22678ce3fea301ec09c3a8cacde77ef Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Dec 29 17:00:53 2017 +0100 [NTOSKRNL] Allow filtering !poolused output using a tag --- ntoskrnl/kdbg/kdb_cli.c | 2 +- ntoskrnl/mm/ARM3/expool.c | 32 ++++++++++++++++++++++++++------ 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index 257058c34a..b951178721 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -185,7 +185,7 @@ static const struct { "kmsg", "kmsg", "Kernel dmesg. Alias for dmesg.", KdbpCmdDmesg }, { "help", "help", "Display help screen.", KdbpCmdHelp }, { "!pool", "!pool [Address [Flags]]", "Display information about pool allocations.", ExpKdbgExtPool }, - { "!poolused", "!poolused", "Display pool usage.", ExpKdbgExtPoolUsed }, + { "!poolused", "!poolused [Tag]", "Display pool usage.", ExpKdbgExtPoolUsed }, }; /* FUNCTIONS *****************************************************************/ diff --git a/ntoskrnl/mm/ARM3/expool.c b/ntoskrnl/mm/ARM3/expool.c index 732ab2db43..c258915495 100644 --- a/ntoskrnl/mm/ARM3/expool.c +++ b/ntoskrnl/mm/ARM3/expool.c @@ -480,7 +480,7 @@ ExpTagAllowPrint(CHAR Tag) else DPRINT1(fmt, ##__VA_ARGS__) VOID -MiDumpPoolConsumers(BOOLEAN CalledFromDbg) +MiDumpPoolConsumers(BOOLEAN CalledFromDbg, ULONG Tag) { SIZE_T i; @@ -519,8 +519,10 @@ MiDumpPoolConsumers(BOOLEAN CalledFromDbg) { // // If there's a tag, attempt to do a pretty print + // only if it matches the caller tag, or if + // any tag is allowed // - if (TableEntry->Key != 0 && TableEntry->Key != TAG_NONE) + if (TableEntry->Key != 0 && TableEntry->Key != TAG_NONE && (Tag == 0 || TableEntry->Key == Tag)) { CHAR Tag[4]; @@ -548,7 +550,7 @@ MiDumpPoolConsumers(BOOLEAN CalledFromDbg) TableEntry->PagedAllocs, TableEntry->PagedBytes); } } - else + else if (Tag == 0 || Tag == TAG_NONE) { MiDumperPrint(CalledFromDbg, "Anon\t\t%ld\t\t%ld\t\t%ld\t\t%ld\n", TableEntry->NonPagedAllocs, TableEntry->NonPagedBytes, @@ -1749,7 +1751,7 @@ ExAllocatePoolWithTag(IN POOL_TYPE PoolType, // // Out of memory, display current consumption // - MiDumpPoolConsumers(FALSE); + MiDumpPoolConsumers(FALSE, 0); #endif // @@ -2082,7 +2084,7 @@ ExAllocatePoolWithTag(IN POOL_TYPE PoolType, // // Out of memory, display current consumption // - MiDumpPoolConsumers(FALSE); + MiDumpPoolConsumers(FALSE, 0); #endif // @@ -2942,7 +2944,25 @@ ExpKdbgExtPoolUsed( ULONG Argc, PCHAR Argv[]) { - MiDumpPoolConsumers(TRUE); + ULONG Tag = 0; + + if (Argc > 1) + { + CHAR Tmp[4]; + ULONG Len; + + /* Get the tag */ + Len = strlen(Argv[1]); + if (Len > 4) + { + Len = 4; + } + RtlCopyMemory(Tmp, Argv[1], Len * sizeof(CHAR)); + + Tag = *((PULONG)Tmp); + } + + MiDumpPoolConsumers(TRUE, Tag); return TRUE; }

6 years, 8 months

[reactos] 04/06: [NTOSKRNL] Now that the memory dumper handles paged pool, make use of it in any situation

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=879d8f2104d3452240785… commit 879d8f2104d3452240785246ac5fd9c8cf7cab9e Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Dec 29 16:45:50 2017 +0100 [NTOSKRNL] Now that the memory dumper handles paged pool, make use of it in any situation --- ntoskrnl/kdbg/kdb_cli.c | 2 +- ntoskrnl/mm/ARM3/expool.c | 18 ++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index ff87f56a4c..257058c34a 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -185,7 +185,7 @@ static const struct { "kmsg", "kmsg", "Kernel dmesg. Alias for dmesg.", KdbpCmdDmesg }, { "help", "help", "Display help screen.", KdbpCmdHelp }, { "!pool", "!pool [Address [Flags]]", "Display information about pool allocations.", ExpKdbgExtPool }, - { "!poolused", "!poolused", "Display non-paged pool usage.", ExpKdbgExtPoolUsed }, + { "!poolused", "!poolused", "Display pool usage.", ExpKdbgExtPoolUsed }, }; /* FUNCTIONS *****************************************************************/ diff --git a/ntoskrnl/mm/ARM3/expool.c b/ntoskrnl/mm/ARM3/expool.c index 528d534487..732ab2db43 100644 --- a/ntoskrnl/mm/ARM3/expool.c +++ b/ntoskrnl/mm/ARM3/expool.c @@ -480,7 +480,7 @@ ExpTagAllowPrint(CHAR Tag) else DPRINT1(fmt, ##__VA_ARGS__) VOID -MiDumpNonPagedPoolConsumers(BOOLEAN CalledFromDbg) +MiDumpPoolConsumers(BOOLEAN CalledFromDbg) { SIZE_T i; @@ -1747,12 +1747,9 @@ ExAllocatePoolWithTag(IN POOL_TYPE PoolType, { #if DBG // - // If non paged backed, display current consumption + // Out of memory, display current consumption // - if ((OriginalType & BASE_POOL_TYPE_MASK) == NonPagedPool) - { - MiDumpNonPagedPoolConsumers(FALSE); - } + MiDumpPoolConsumers(FALSE); #endif // @@ -2083,12 +2080,9 @@ ExAllocatePoolWithTag(IN POOL_TYPE PoolType, { #if DBG // - // If non paged backed, display current consumption + // Out of memory, display current consumption // - if ((OriginalType & BASE_POOL_TYPE_MASK) == NonPagedPool) - { - MiDumpNonPagedPoolConsumers(FALSE); - } + MiDumpPoolConsumers(FALSE); #endif // @@ -2948,7 +2942,7 @@ ExpKdbgExtPoolUsed( ULONG Argc, PCHAR Argv[]) { - MiDumpNonPagedPoolConsumers(TRUE); + MiDumpPoolConsumers(TRUE); return TRUE; }

6 years, 8 months

[reactos] 03/06: [NTOSKRNL] Add support for the paged pool in the memory dumper

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1433ade827f95c49a1950… commit 1433ade827f95c49a1950b46d087e3d4c69cd9e7 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Dec 29 09:04:34 2017 +0100 [NTOSKRNL] Add support for the paged pool in the memory dumper --- ntoskrnl/mm/ARM3/expool.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/ntoskrnl/mm/ARM3/expool.c b/ntoskrnl/mm/ARM3/expool.c index 760956ba25..528d534487 100644 --- a/ntoskrnl/mm/ARM3/expool.c +++ b/ntoskrnl/mm/ARM3/expool.c @@ -500,7 +500,8 @@ MiDumpNonPagedPoolConsumers(BOOLEAN CalledFromDbg) // // Print table header // - MiDumperPrint(CalledFromDbg, "Tag\t\tAllocs\t\tUsed\n"); + MiDumperPrint(CalledFromDbg, "\t\tNonPaged\t\t\tPaged\n"); + MiDumperPrint(CalledFromDbg, "Tag\t\tAllocs\t\tUsed\t\tAllocs\t\tUsed\n"); // // We'll extract allocations for all the tracked pools @@ -512,9 +513,9 @@ MiDumpNonPagedPoolConsumers(BOOLEAN CalledFromDbg) TableEntry = &PoolTrackTable[i]; // - // We only care about non paged + // We only care about tags which have allocated memory // - if (TableEntry->NonPagedBytes != 0) + if (TableEntry->NonPagedBytes != 0 || TableEntry->PagedBytes != 0) { // // If there's a tag, attempt to do a pretty print @@ -536,16 +537,22 @@ MiDumpNonPagedPoolConsumers(BOOLEAN CalledFromDbg) // // Print in reversed order to match what is in source code // - MiDumperPrint(CalledFromDbg, "'%c%c%c%c'\t\t%ld\t\t%ld\n", Tag[3], Tag[2], Tag[1], Tag[0], TableEntry->NonPagedAllocs, TableEntry->NonPagedBytes); + MiDumperPrint(CalledFromDbg, "'%c%c%c%c'\t\t%ld\t\t%ld\t\t%ld\t\t%ld\n", Tag[3], Tag[2], Tag[1], Tag[0], + TableEntry->NonPagedAllocs, TableEntry->NonPagedBytes, + TableEntry->PagedAllocs, TableEntry->PagedBytes); } else { - MiDumperPrint(CalledFromDbg, "%x\t%ld\t\t%ld\n", TableEntry->Key, TableEntry->NonPagedAllocs, TableEntry->NonPagedBytes); + MiDumperPrint(CalledFromDbg, "%x\t%ld\t\t%ld\t\t%ld\t\t%ld\n", TableEntry->Key, + TableEntry->NonPagedAllocs, TableEntry->NonPagedBytes, + TableEntry->PagedAllocs, TableEntry->PagedBytes); } } else { - MiDumperPrint(CalledFromDbg, "Anon\t\t%ld\t\t%ld\n", TableEntry->NonPagedAllocs, TableEntry->NonPagedBytes); + MiDumperPrint(CalledFromDbg, "Anon\t\t%ld\t\t%ld\t\t%ld\t\t%ld\n", + TableEntry->NonPagedAllocs, TableEntry->NonPagedBytes, + TableEntry->PagedAllocs, TableEntry->PagedBytes); } } }

6 years, 8 months

[reactos] 02/06: [NTOSKRNL] Prettify the memory dumper output and add number of allocs

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bb63841b575e061ded4f0… commit bb63841b575e061ded4f02470b4d5cf8ac3e4bd6 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Dec 29 08:58:11 2017 +0100 [NTOSKRNL] Prettify the memory dumper output and add number of allocs --- ntoskrnl/mm/ARM3/expool.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/mm/ARM3/expool.c b/ntoskrnl/mm/ARM3/expool.c index 129b3d0de6..760956ba25 100644 --- a/ntoskrnl/mm/ARM3/expool.c +++ b/ntoskrnl/mm/ARM3/expool.c @@ -492,6 +492,15 @@ MiDumpNonPagedPoolConsumers(BOOLEAN CalledFromDbg) DPRINT1("---------------------\n"); DPRINT1("Out of memory dumper!\n"); } + else + { + KdbpPrint("Pool Used:\n"); + } + + // + // Print table header + // + MiDumperPrint(CalledFromDbg, "Tag\t\tAllocs\t\tUsed\n"); // // We'll extract allocations for all the tracked pools @@ -527,16 +536,16 @@ MiDumpNonPagedPoolConsumers(BOOLEAN CalledFromDbg) // // Print in reversed order to match what is in source code // - MiDumperPrint(CalledFromDbg, "Tag: '%c%c%c%c', Size: %ld\n", Tag[3], Tag[2], Tag[1], Tag[0], TableEntry->NonPagedBytes); + MiDumperPrint(CalledFromDbg, "'%c%c%c%c'\t\t%ld\t\t%ld\n", Tag[3], Tag[2], Tag[1], Tag[0], TableEntry->NonPagedAllocs, TableEntry->NonPagedBytes); } else { - MiDumperPrint(CalledFromDbg, "Tag: %x, Size: %ld\n", TableEntry->Key, TableEntry->NonPagedBytes); + MiDumperPrint(CalledFromDbg, "%x\t%ld\t\t%ld\n", TableEntry->Key, TableEntry->NonPagedAllocs, TableEntry->NonPagedBytes); } } else { - MiDumperPrint(CalledFromDbg, "Anon, Size: %ld\n", TableEntry->NonPagedBytes); + MiDumperPrint(CalledFromDbg, "Anon\t\t%ld\t\t%ld\n", TableEntry->NonPagedAllocs, TableEntry->NonPagedBytes); } } }

6 years, 8 months

[reactos] 01/06: [NTOSKRNL] Make the memory dumper available as a kdbg command: !poolused

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=78b55550bb984bc14b387… commit 78b55550bb984bc14b387812660e2c6d86ba5cfe Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Dec 29 08:21:40 2017 +0100 [NTOSKRNL] Make the memory dumper available as a kdbg command: !poolused --- ntoskrnl/kdbg/kdb_cli.c | 4 +++- ntoskrnl/mm/ARM3/expool.c | 41 ++++++++++++++++++++++++++++++++--------- 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index f5e71bd369..ff87f56a4c 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -92,6 +92,7 @@ static BOOLEAN KdbpCmdHelp(ULONG Argc, PCHAR Argv[]); static BOOLEAN KdbpCmdDmesg(ULONG Argc, PCHAR Argv[]); BOOLEAN ExpKdbgExtPool(ULONG Argc, PCHAR Argv[]); +BOOLEAN ExpKdbgExtPoolUsed(ULONG Argc, PCHAR Argv[]); #ifdef __ROS_DWARF__ static BOOLEAN KdbpCmdPrintStruct(ULONG Argc, PCHAR Argv[]); @@ -183,7 +184,8 @@ static const struct { "dmesg", "dmesg", "Display debug messages on screen, with navigation on pages.", KdbpCmdDmesg }, { "kmsg", "kmsg", "Kernel dmesg. Alias for dmesg.", KdbpCmdDmesg }, { "help", "help", "Display help screen.", KdbpCmdHelp }, - { "!pool", "!pool [Address [Flags]]", "Display information about pool allocations.", ExpKdbgExtPool } + { "!pool", "!pool [Address [Flags]]", "Display information about pool allocations.", ExpKdbgExtPool }, + { "!poolused", "!poolused", "Display non-paged pool usage.", ExpKdbgExtPoolUsed }, }; /* FUNCTIONS *****************************************************************/ diff --git a/ntoskrnl/mm/ARM3/expool.c b/ntoskrnl/mm/ARM3/expool.c index 13a75be7c5..129b3d0de6 100644 --- a/ntoskrnl/mm/ARM3/expool.c +++ b/ntoskrnl/mm/ARM3/expool.c @@ -475,13 +475,23 @@ ExpTagAllowPrint(CHAR Tag) return FALSE; } +#define MiDumperPrint(dbg, fmt, ...) \ + if (dbg) KdbpPrint(fmt, ##__VA_ARGS__); \ + else DPRINT1(fmt, ##__VA_ARGS__) + VOID -MiDumpNonPagedPoolConsumers(VOID) +MiDumpNonPagedPoolConsumers(BOOLEAN CalledFromDbg) { SIZE_T i; - DPRINT1("---------------------\n"); - DPRINT1("Out of memory dumper!\n"); + // + // Only print header if called from OOM situation + // + if (!CalledFromDbg) + { + DPRINT1("---------------------\n"); + DPRINT1("Out of memory dumper!\n"); + } // // We'll extract allocations for all the tracked pools @@ -517,21 +527,24 @@ MiDumpNonPagedPoolConsumers(VOID) // // Print in reversed order to match what is in source code // - DPRINT1("Tag: '%c%c%c%c', Size: %ld\n", Tag[3], Tag[2], Tag[1], Tag[0], TableEntry->NonPagedBytes); + MiDumperPrint(CalledFromDbg, "Tag: '%c%c%c%c', Size: %ld\n", Tag[3], Tag[2], Tag[1], Tag[0], TableEntry->NonPagedBytes); } else { - DPRINT1("Tag: %x, Size: %ld\n", TableEntry->Key, TableEntry->NonPagedBytes); + MiDumperPrint(CalledFromDbg, "Tag: %x, Size: %ld\n", TableEntry->Key, TableEntry->NonPagedBytes); } } else { - DPRINT1("Anon, Size: %ld\n", TableEntry->NonPagedBytes); + MiDumperPrint(CalledFromDbg, "Anon, Size: %ld\n", TableEntry->NonPagedBytes); } } } - DPRINT1("---------------------\n"); + if (!CalledFromDbg) + { + DPRINT1("---------------------\n"); + } } #endif @@ -1722,7 +1735,7 @@ ExAllocatePoolWithTag(IN POOL_TYPE PoolType, // if ((OriginalType & BASE_POOL_TYPE_MASK) == NonPagedPool) { - MiDumpNonPagedPoolConsumers(); + MiDumpNonPagedPoolConsumers(FALSE); } #endif @@ -2058,7 +2071,7 @@ ExAllocatePoolWithTag(IN POOL_TYPE PoolType, // if ((OriginalType & BASE_POOL_TYPE_MASK) == NonPagedPool) { - MiDumpNonPagedPoolConsumers(); + MiDumpNonPagedPoolConsumers(FALSE); } #endif @@ -2914,6 +2927,16 @@ ExpKdbgExtPool( return TRUE; } +BOOLEAN +ExpKdbgExtPoolUsed( + ULONG Argc, + PCHAR Argv[]) +{ + MiDumpNonPagedPoolConsumers(TRUE); + + return TRUE; +} + #endif // DBG && KDBG /* EOF */

6 years, 8 months

[reactos] 03/03: [TRANSLATION] Use correct font name in Korean resources, CORE-9566 (#228).

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89f9c9101a57e8d1840d2… commit 89f9c9101a57e8d1840d2879462827805d817ba3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Dec 28 09:36:56 2017 +0900 [TRANSLATION] Use correct font name in Korean resources, CORE-9566 (#228). Localized resources should use the correct Korean fonts that are most suitable for UI and compatible with Windows. --- base/applications/calc/lang/ko-KR.rc | 8 +-- base/applications/charmap/lang/ko-KR.rc | 6 +- base/applications/dxdiag/lang/ko-KR.rc | 16 +++--- base/applications/games/solitaire/lang/ko-KR.rc | 4 +- base/applications/games/winmine/lang/ko-KR.rc | 6 +- base/applications/msconfig/lang/ko-KR.rc | 16 +++--- base/applications/msconfig_new/lang/ko-KR.rc | 22 ++++---- base/applications/mscutils/eventvwr/lang/ko-KR.rc | 6 +- base/applications/mscutils/servman/lang/ko-KR.rc | 20 +++---- base/applications/mstsc/lang/ko-KR.rc | 6 +- base/applications/regedit/lang/ko-KR.rc | 22 ++++---- .../applications/screensavers/3dtext/lang/ko-KR.rc | 2 +- base/applications/shutdown/lang/ko-KR.rc | 2 +- base/applications/sndvol32/lang/ko-KR.rc | 4 +- base/applications/taskmgr/lang/ko-KR.rc | 14 ++--- base/applications/wordpad/lang/ko-KR.rc | 10 ++-- base/shell/explorer/lang/ko-KR.rc | 14 ++--- dll/cpl/inetcpl/lang/ko-KR.rc | 8 +-- dll/win32/setupapi/lang/ko-KR.rc | 4 +- dll/win32/shell32/lang/ko-KR.rc | 64 +++++++++++----------- modules/rosapps/applications/winfile/lang/ko-KR.rc | 6 +- 21 files changed, 130 insertions(+), 130 deletions(-) diff --git a/base/applications/calc/lang/ko-KR.rc b/base/applications/calc/lang/ko-KR.rc index 56d96b20a6..6f89a52f3b 100644 --- a/base/applications/calc/lang/ko-KR.rc +++ b/base/applications/calc/lang/ko-KR.rc @@ -8,7 +8,7 @@ IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS 계산기" MENU IDR_MENU_SCIENTIFIC_1 -FONT 9, "MS Shell Dlg", 0, 0, 0x1 +FONT 9, "굴림", 0, 0, 0x1 BEGIN GROUPBOX "", IDC_STATIC, 5 ,14, 141, 20 CONTROL "Hex", IDC_RADIO_HEX, "Button", BS_AUTORADIOBUTTON, 8, 21, 30, 10 @@ -156,7 +156,7 @@ IDD_DIALOG_STANDARD DIALOGEX 0, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS 계산기" MENU IDR_MENU_STANDARD -FONT 9, "MS Shell Dlg", 0, 0, 0x1 +FONT 9, "굴림", 0, 0, 0x1 BEGIN PUSHBUTTON "C", IDC_BUTTON_CANC, 123, 23, 41, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP @@ -221,7 +221,7 @@ IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS 계산기 정보" MENU IDR_MENU_STANDARD -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN PUSHBUTTON "Convert", IDC_BUTTON_CONVERT, 35, 105, 76, 17 COMBOBOX IDC_COMBO_CATEGORY, 5, 31, 140, 168, CBS_DROPDOWNLIST | WS_VSCROLL | @@ -295,7 +295,7 @@ END IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Statistics box" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN LISTBOX IDC_LIST_STAT, 4, 4, 156, 40, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "RET", IDC_BUTTON_RET, 4, 48, 36, 16 diff --git a/base/applications/charmap/lang/ko-KR.rc b/base/applications/charmap/lang/ko-KR.rc index b8e54bc302..35e36dcd0d 100644 --- a/base/applications/charmap/lang/ko-KR.rc +++ b/base/applications/charmap/lang/ko-KR.rc @@ -5,7 +5,7 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDD_CHARMAP DIALOGEX 6, 6, 292, 224 -FONT 9, "MS Shell Dlg", 0, 0 +FONT 9, "굴림", 0, 0 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE BEGIN LTEXT "글꼴:", IDC_STATIC, 6, 7, 24, 9 @@ -25,7 +25,7 @@ END IDD_ADVANCED DIALOGEX 0, 0, 292, 64 STYLE DS_SHELLFONT | WS_CHILD -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN LTEXT "Charset:", IDC_STATIC, 8, 8, 48, 8 COMBOBOX IDC_COMBO_CHARSET, 72, 4, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -40,7 +40,7 @@ END IDD_ABOUTBOX DIALOGEX 22, 16, 210, 182 CAPTION "문자표에 대하여" -FONT 9, "MS Shell Dlg", 0, 0 +FONT 9, "굴림", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Character Map v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 diff --git a/base/applications/dxdiag/lang/ko-KR.rc b/base/applications/dxdiag/lang/ko-KR.rc index 71464b7ec4..1037bff92b 100644 --- a/base/applications/dxdiag/lang/ko-KR.rc +++ b/base/applications/dxdiag/lang/ko-KR.rc @@ -6,7 +6,7 @@ IDD_MAIN_DIALOG DIALOGEX 0, 0, 478, 280 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU CAPTION "ReactX 분석 도구" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN CONTROL "Tab1", IDC_TAB_CONTROL, "SysTabControl32", WS_TABSTOP, 2, 2, 474, 250 PUSHBUTTON "도움말(&H)", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP @@ -17,7 +17,7 @@ END IDD_SYSTEM_DIALOG DIALOGEX 0, 0, 462, 220 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN LTEXT "이 프로그램은 ReactX와 컴포넌트, 드라이버에 대한 자세한 정보를 제공합니다.", IDC_STATIC, 5, 0, 443, 17 LTEXT "당신이 어떤 부분에서 오류가 발생하는지 아신다면 위의 탭을 클릭해 주세요.그렇지 않다면 ""다음 장"" 버튼을 이용해 각 장을 하나하나 살펴보세요.", IDC_STATIC, 5, 15, 443, 25 @@ -49,7 +49,7 @@ END IDD_DISPLAY_DIALOG DIALOGEX 0, 0, 462, 220 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN GROUPBOX "장치", IDC_STATIC, 5, 0, 250, 95 RTEXT "이름:", IDC_STATIC, 20, 10, 70, 10 @@ -99,7 +99,7 @@ END IDD_SOUND_DIALOG DIALOGEX 0, 0, 462, 220 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN GROUPBOX "장치", IDC_STATIC, 5, 0, 250, 95 RTEXT "이름:", IDC_STATIC, 20, 10, 70, 10 @@ -137,7 +137,7 @@ END IDD_MUSIC_DIALOG DIALOGEX 0, 0, 462, 220 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN RTEXT "General MIDI DLS Collection:", IDC_STATIC, 0, 0, 100, 10 EDITTEXT IDC_MIDI_DLS_COLLECTION, 105, 0, 250, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -155,7 +155,7 @@ END IDD_INPUT_DIALOG DIALOGEX 0, 0, 462, 220 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN GROUPBOX "DirectInput 장치", IDC_STATIC, 5, 0, 452, 85 CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 65 @@ -168,7 +168,7 @@ END IDD_NETWORK_DIALOG DIALOGEX 0, 0, 462, 220 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN GROUPBOX "등록된 DirectPlay 서비스 공급자", IDC_STATIC, 5, 0, 452, 75 CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 15, 12, 432, 55 @@ -182,7 +182,7 @@ END IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN LTEXT "Still can't find the information you're looking for? Here are some additional things you can do:", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "System Information", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED diff --git a/base/applications/games/solitaire/lang/ko-KR.rc b/base/applications/games/solitaire/lang/ko-KR.rc index 63d585ecd1..b59f784103 100644 --- a/base/applications/games/solitaire/lang/ko-KR.rc +++ b/base/applications/games/solitaire/lang/ko-KR.rc @@ -7,7 +7,7 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDD_OPTIONS DIALOGEX 0, 0, 186, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT CAPTION "옵션" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN GROUPBOX "카드", -1, 7, 7, 90, 40 AUTORADIOBUTTON "한 장씩(&O)", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP @@ -25,7 +25,7 @@ END IDD_CARDBACK DIALOGEX 6, 6, 345, 185 CAPTION "카드 무늬 선택" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71 diff --git a/base/applications/games/winmine/lang/ko-KR.rc b/base/applications/games/winmine/lang/ko-KR.rc index f8fcec8fc1..bfbd5fcc6a 100644 --- a/base/applications/games/winmine/lang/ko-KR.rc +++ b/base/applications/games/winmine/lang/ko-KR.rc @@ -32,7 +32,7 @@ END DLG_TIMES DIALOGEX 0, 0, 160, 80 STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "가장 빠른 시간" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN GROUPBOX "최단 시간", -1, 10, 10, 140, 45 LTEXT "초보자", -1, 20, 20, 40, 8 @@ -50,7 +50,7 @@ END DLG_CONGRATS DIALOGEX 0, 0, 160, 60 STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "축하합니다!" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN LTEXT "당신의 이름을 적어주세요", -1, 10, 10, 150, 10 EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 @@ -60,7 +60,7 @@ END DLG_CUSTOM DIALOGEX 0, 0, 100, 100 STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT CAPTION "게임 사용자 정의 " -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN LTEXT "가로줄", -1, 5, 5, 30, 10 LTEXT "새로줄", -1, 5, 35, 30, 10 diff --git a/base/applications/msconfig/lang/ko-KR.rc b/base/applications/msconfig/lang/ko-KR.rc index 65d4c98668..2497baeb21 100644 --- a/base/applications/msconfig/lang/ko-KR.rc +++ b/base/applications/msconfig/lang/ko-KR.rc @@ -6,7 +6,7 @@ IDD_MSCONFIG_DIALOG DIALOGEX 0, 0, 378, 220 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU CAPTION "시스템 설정 프로그램" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 2, 2, 374, 195 DEFPUSHBUTTON "확인", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP @@ -17,7 +17,7 @@ END IDD_STARTUP_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN CONTROL "List3", IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148 @@ -27,7 +27,7 @@ END IDD_SYSTEM_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN CONTROL "", IDC_SYSTEM_TREE, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS | WS_CHILD | @@ -45,7 +45,7 @@ END IDD_TOOLS_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN CONTROL "List2", IDC_TOOLS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 134 @@ -55,7 +55,7 @@ END IDD_SERVICES_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN CONTROL "List1", IDC_SERVICES_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148 @@ -65,7 +65,7 @@ END IDD_GENERAL_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN GROUPBOX "사작 옵션", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT CONTROL "보통 시작(&N) - 모든 드라이버와 서비스 로드", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10 @@ -78,7 +78,7 @@ END IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN LISTBOX IDC_LIST_BOX, 10, 10, 340, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL @@ -100,7 +100,7 @@ END IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN CHECKBOX "/&MAXMEM=", IDC_CBX_MAX_MEM, 10, 10, 50, 10 EDITTEXT IDC_TXT_MAX_MEM, 80, 10, 60, 12 diff --git a/base/applications/msconfig_new/lang/ko-KR.rc b/base/applications/msconfig_new/lang/ko-KR.rc index 062a4a8f5a..06614ed795 100644 --- a/base/applications/msconfig_new/lang/ko-KR.rc +++ b/base/applications/msconfig_new/lang/ko-KR.rc @@ -5,7 +5,7 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "About the System Configuration Program" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 LTEXT "System Configuration Program\nVersion 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX @@ -21,7 +21,7 @@ END IDD_GENERAL_PAGE DIALOGEX 0, 0, 366, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION CAPTION "일반" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN CONTROL "보통 시작(&N)", IDC_RB_NORMAL_STARTUP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 18, 332, 10 CONTROL "진단 시작(&D)", IDC_RB_DIAGNOSTIC_STARTUP, "Button", BS_AUTORADIOBUTTON, 15, 46, 332, 10 @@ -41,7 +41,7 @@ END IDD_SYSTEM_PAGE DIALOGEX 0, 0, 366, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION CAPTION "System" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN CONTROL "", IDC_SYSTEM_TREE, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS | WS_BORDER | WS_HSCROLL | WS_TABSTOP, 5, 5, 285, 146 PUSHBUTTON "위로 움직임(&U)", IDC_BTN_SYSTEM_UP, 295, 5, 66, 14 @@ -59,7 +59,7 @@ END IDD_FREELDR_PAGE DIALOGEX 0, 0, 366, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION CAPTION "FREELDR.INI" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN LISTBOX IDC_LIST_BOX, 5, 5, 356, 61, LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP PUSHBUTTON "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 5, 68, 72, 14 @@ -90,7 +90,7 @@ END IDD_SERVICES_PAGE DIALOGEX 0, 0, 366, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION CAPTION "서비스" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN CONTROL "List1", IDC_SERVICES_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 5, 5, 356, 129 PUSHBUTTON "모두 활성화(&A)", IDC_BTN_SERVICES_ACTIVATE, 224, 156, 66, 14 @@ -102,7 +102,7 @@ END IDD_STARTUP_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN CONTROL "List3", IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148 @@ -113,7 +113,7 @@ END IDD_TOOLS_PAGE DIALOGEX 0, 0, 366, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CAPTION CAPTION "도구" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN CONTROL "List1", IDC_TOOLS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 5, 5, 356, 118 EDITTEXT IDC_TOOLS_CMDLINE, 5, 139, 356, 14, ES_READONLY @@ -125,7 +125,7 @@ END IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Expand Files from an Installation Source" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN LTEXT "Specify the files you want to restore, the source location containing the installation files, and the destination location for the files.", IDC_STATIC, 7, 7, 339, 17 LTEXT "F&iles to restore:", IDC_STATIC, 7, 34, 93, 10 @@ -144,7 +144,7 @@ END IDD_FIND_DIALOG DIALOGEX 30, 73, 236, 75 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Find" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN LTEXT "&Find what:", IDC_STATIC, 4, 8, 42, 10, NOT WS_GROUP EDITTEXT IDC_TXT_FIND_TEXT, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_GROUP @@ -162,7 +162,7 @@ END IDD_FREELDR_ADVANCED_PAGE DIALOGEX 0, 0, 175, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN CHECKBOX "/&MAXMEM=", IDC_CBX_MAX_MEM, 10, 10, 50, 10 EDITTEXT IDC_TXT_MAX_MEM, 80, 10, 60, 12 @@ -188,7 +188,7 @@ END IDD_REQUIRED_SERVICES_DISABLING_DIALOG DIALOGEX 0, 0, 237, 62 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "시스템 설정 프로그램" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN DEFPUSHBUTTON "OK", IDOK, 180, 41, 50, 14 LTEXT "Essential services cannot be disabled. Doing so might prevent %s from running on your computer.", IDC_STATIC_REQSVCSDIS_INFO, 7, 7, 223, 28 diff --git a/base/applications/mscutils/eventvwr/lang/ko-KR.rc b/base/applications/mscutils/eventvwr/lang/ko-KR.rc index dd46f6f7db..de0f02fe26 100644 --- a/base/applications/mscutils/eventvwr/lang/ko-KR.rc +++ b/base/applications/mscutils/eventvwr/lang/ko-KR.rc @@ -49,7 +49,7 @@ IDD_EVENTDETAILS_DLG DIALOGEX 0, 0, 266, 240 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_THICKFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP CAPTION "Event Detail" -FONT 9, "MS Shell Dlg", 400, 0, 0x1 +FONT 9, "굴림", 400, 0, 0x1 BEGIN LTEXT "EvtDetailsCtrl", IDC_STATIC, 0, 0, 266, 215 PUSHBUTTON "도움말(&H)", IDHELP, 8, 220, 50, 14 @@ -58,7 +58,7 @@ END IDD_EVENTDETAILS_CTRL DIALOGEX 0, 0, 266, 215 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 9, "MS Shell Dlg", 400, 0, 0x1 +FONT 9, "굴림", 400, 0, 0x1 BEGIN LTEXT "날짜:", IDC_STATIC, 8, 5, 31, 8 EDITTEXT IDC_EVENTDATESTATIC, 46, 5, 47, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -93,7 +93,7 @@ END IDD_LOGPROPERTIES_GENERAL DIALOGEX 0, 0, 252, 234 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "General" -FONT 8, "MS Shell Dlg" +FONT 9, "굴림" BEGIN LTEXT "&Display name:", IDC_STATIC, 7, 9, 60, 8 EDITTEXT IDC_DISPLAYNAME, 67, 7, 178, 12, ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP diff --git a/base/applications/mscutils/servman/lang/ko-KR.rc b/base/applications/mscutils/servman/lang/ko-KR.rc index 7d229807d8..927e846c7f 100644 --- a/base/applications/mscutils/servman/lang/ko-KR.rc +++ b/base/applications/mscutils/servman/lang/ko-KR.rc @@ -67,7 +67,7 @@ END IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182 CAPTION "서비스 매니저에 대하여" -FONT 9, "MS Shell Dlg", 0, 0 +FONT 9, "굴림", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Service Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 40 @@ -78,7 +78,7 @@ END IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232 CAPTION "General" -FONT 9, "MS Shell Dlg", 0, 0 +FONT 9, "굴림", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_GROUP | WS_TABSTOP BEGIN LTEXT "", IDC_SERV_NAME, 70, 11, 176, 11, WS_CHILD | WS_VISIBLE @@ -105,7 +105,7 @@ END IDD_LOGON DIALOGEX 6, 6, 253, 232 CAPTION "Log On" -FONT 8, "MS Shell Dlg", 0, 0 +FONT 9, "굴림", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_GROUP | WS_TABSTOP BEGIN LTEXT "Log on as:", IDC_STATIC, 7, 7, 238, 8 @@ -126,7 +126,7 @@ END IDD_RECOVERY DIALOGEX 6, 6, 253, 232 CAPTION "Recovery" -FONT 8, "MS Shell Dlg", 0, 0 +FONT 9, "굴림", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_GROUP | WS_TABSTOP BEGIN LTEXT "Select the computer's response if this service fails.", IDC_STATIC, 7, 7, 238, 8 @@ -154,7 +154,7 @@ END IDD_DLG_DEPEND DIALOGEX 6, 6, 253, 225 CAPTION "종속성" -FONT 9, "MS Shell Dlg", 0, 0 +FONT 9, "굴림", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_GROUP | WS_TABSTOP BEGIN CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" , WS_BORDER | WS_CHILDWINDOW | @@ -170,7 +170,7 @@ END IDD_DLG_CREATE DIALOGEX 6, 6, 225, 209 CAPTION "서비스 만들기" -FONT 9, "MS Shell Dlg", 0, 0 +FONT 9, "굴림", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_GROUP | WS_TABSTOP BEGIN EDITTEXT IDC_CREATE_SERVNAME, 72, 12, 150, 11, WS_CHILD | WS_VISIBLE | WS_EX_CLIENTEDGE @@ -190,7 +190,7 @@ END IDD_DLG_DELETE DIALOGEX 6, 6, 185, 148 CAPTION "서비스 삭제" -FONT 9, "MS Shell Dlg", 0, 0 +FONT 9, "굴림", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | DS_MODALFRAME BEGIN ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 @@ -205,7 +205,7 @@ END IDD_DLG_DEPEND_STOP DIALOGEX 6, 6, 240, 148 CAPTION "Stop Other Services" -FONT 9, "MS Shell Dlg", 0, 0 +FONT 9, "굴림", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | DS_MODALFRAME BEGIN ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 @@ -218,7 +218,7 @@ END IDD_DLG_HELP_OPTIONS DIALOGEX 6, 6, 200, 150 CAPTION "옵션" -FONT 9, "MS Shell Dlg", 0, 0 +FONT 9, "굴림", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | DS_MODALFRAME BEGIN LTEXT "", IDC_CREATE_HELP, 6, 5, 200, 150 @@ -227,7 +227,7 @@ END IDD_DLG_PROGRESS DIALOGEX 6, 6, 255, 89 CAPTION "서비스 컨트롤" -FONT 9, "MS Shell Dlg", 0, 0 +FONT 9, "굴림", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | WS_VISIBLE | DS_MODALFRAME EXSTYLE WS_EX_TOOLWINDOW BEGIN diff --git a/base/applications/mstsc/lang/ko-KR.rc b/base/applications/mstsc/lang/ko-KR.rc index ce4c21b763..8d6a8ccd83 100644 --- a/base/applications/mstsc/lang/ko-KR.rc +++ b/base/applications/mstsc/lang/ko-KR.rc @@ -4,7 +4,7 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDD_GENERAL DIALOGEX 0, 0, 242, 175 STYLE DS_SHELLFONT | WS_CHILD -FONT 9, "MS Shell Dlg", 0, 0, 0x0 +FONT 9, "굴림", 0, 0, 0x0 BEGIN GROUPBOX "로그온 설정", IDC_STATIC, 7, 7, 228, 89 GROUPBOX "연결 설정", IDC_STATIC, 7, 103, 228, 65 @@ -23,7 +23,7 @@ END IDD_DISPLAY DIALOGEX 0, 0, 242, 175 STYLE DS_SHELLFONT | WS_CHILD -FONT 9, "MS Shell Dlg", 0, 0, 0x0 +FONT 9, "굴림", 0, 0, 0x0 BEGIN GROUPBOX "원격 데스크탑 크기", IDC_STATIC, 7, 7, 228, 68 GROUPBOX "색깔", IDC_STATIC, 7, 83, 228, 85 @@ -42,7 +42,7 @@ END IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "원격 데스크탑 연결" -FONT 9, "MS Shell Dlg", 400, 0, 0x1 +FONT 9, "굴림", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "연결", IDOK, 147, 245, 50, 14 PUSHBUTTON "취소", IDCANCEL, 203, 245, 50, 14 diff --git a/base/applications/regedit/lang/ko-KR.rc b/base/applications/regedit/lang/ko-KR.rc index e4e55fd6ad..479d2d5326 100644 --- a/base/applications/regedit/lang/ko-KR.rc +++ b/base/applications/regedit/lang/ko-KR.rc @@ -151,7 +151,7 @@ END IDD_EDIT_STRING DIALOGEX 32, 24, 252, 84 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "문자열 편집" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN LTEXT "값 이름(&N):", IDC_STATIC, 6, 6, 134, 8 EDITTEXT IDC_VALUE_NAME, 6, 17, 240, 12, ES_AUTOHSCROLL | ES_READONLY @@ -164,7 +164,7 @@ END IDD_EDIT_MULTI_STRING DIALOGEX 32, 24, 252, 174 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "다중 문자열 편집" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN LTEXT "값 이름(&N):", IDC_STATIC, 6, 6, 134, 8 EDITTEXT IDC_VALUE_NAME, 6, 17, 240, 12, ES_AUTOHSCROLL | ES_READONLY @@ -178,7 +178,7 @@ END IDD_EDIT_BIN_DATA DIALOGEX 32, 24, 252, 174 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "바이너리 값 편집" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN LTEXT "값 이름(&N):", IDC_STATIC, 6, 6, 134, 8 EDITTEXT IDC_VALUE_NAME, 6, 17, 240, 12, ES_AUTOHSCROLL | ES_READONLY @@ -191,7 +191,7 @@ END IDD_EDIT_DWORD DIALOGEX 32, 24, 252, 104 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "DWORD 값 편집" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN LTEXT "값 이름(&N):", IDC_STATIC, 6, 6, 134, 8 EDITTEXT IDC_VALUE_NAME, 6, 17, 240, 12, ES_AUTOHSCROLL | ES_READONLY @@ -207,7 +207,7 @@ END IDD_EDIT_RESOURCE_LIST DIALOGEX 32, 24, 170, 120 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Resource List" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN CONTROL "", IDC_RESOURCE_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 10, 150, 75 @@ -218,7 +218,7 @@ END IDD_EDIT_RESOURCE DIALOGEX 6, 18, 281, 283 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Resources" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN LTEXT "DMA:", IDC_STATIC, 10, 5, 20, 8 CONTROL "", IDC_DMA_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | @@ -462,7 +462,7 @@ END IDD_EXPORTRANGE DIALOGEX 50, 50, 370, 50 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN GROUPBOX "내보내기 범위", IDC_STATIC, 2, 0, 366, 48 CONTROL "모두(&A)", IDC_EXPORT_ALL, "Button", BS_AUTORADIOBUTTON, 10, 10, 29, 11 @@ -484,7 +484,7 @@ END IDD_ADDFAVORITES DIALOGEX 0, 0, 186, 46 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "즐겨찾기에 추가" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN DEFPUSHBUTTON "확인", IDOK, 129, 7, 50, 14 PUSHBUTTON "취소", IDCANCEL, 129, 24, 50, 14 @@ -495,7 +495,7 @@ END IDD_REMOVEFAVORITES DIALOGEX 0, 0, 164, 135 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "즐겨찾기 제거" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN DEFPUSHBUTTON "확인", IDOK, 107, 114, 50, 14 PUSHBUTTON "취소", IDCANCEL, 7, 114, 50, 14 @@ -507,7 +507,7 @@ END IDD_FIND DIALOGEX 0, 0, 254, 82 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "찾기" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN DEFPUSHBUTTON "다음 찾기(&F)", IDOK, 197, 7, 50, 14 PUSHBUTTON "취소", IDCANCEL, 197, 24, 50, 14 @@ -529,7 +529,7 @@ END IDD_FINDING DIALOGEX 0, 0, 145, 50 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "찾기" -FONT 9, "MS Shell Dlg", 400, 0, 0x1 +FONT 9, "굴림", 400, 0, 0x1 BEGIN ICON IDI_REGEDIT, IDC_STATIC, 7, 7, 20, 20 DEFPUSHBUTTON "취소(&C)", IDCANCEL, 93, 29, 45, 14 diff --git a/base/applications/screensavers/3dtext/lang/ko-KR.rc b/base/applications/screensavers/3dtext/lang/ko-KR.rc index 9831c58b27..a5161d96ee 100644 --- a/base/applications/screensavers/3dtext/lang/ko-KR.rc +++ b/base/applications/screensavers/3dtext/lang/ko-KR.rc @@ -5,7 +5,7 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "3D 텍스트 화면 보호기 설정" -FONT 9, "MS Shell Dlg", 400, 0, 0x1 +FONT 9, "굴림", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "확인", IDOK, 216, 7, 50, 14 PUSHBUTTON "취소", IDCANCEL, 216, 24, 50, 14 diff --git a/base/applications/shutdown/lang/ko-KR.rc b/base/applications/shutdown/lang/ko-KR.rc index dc9d5dd5ac..563a55c8b5 100644 --- a/base/applications/shutdown/lang/ko-KR.rc +++ b/base/applications/shutdown/lang/ko-KR.rc @@ -4,7 +4,7 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDD_GUI DIALOGEX 0, 0, 240, 255 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Remote Shutdown" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN DEFPUSHBUTTON "&OK", IDC_OK, 125, 232, 50, 14 PUSHBUTTON "&Cancel", IDC_CANCEL, 178, 232, 50, 14 diff --git a/base/applications/sndvol32/lang/ko-KR.rc b/base/applications/sndvol32/lang/ko-KR.rc index 833a994634..99c5c40b33 100644 --- a/base/applications/sndvol32/lang/ko-KR.rc +++ b/base/applications/sndvol32/lang/ko-KR.rc @@ -28,7 +28,7 @@ END IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "속성" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN LTEXT "믹서 장치(&M):", -1, 7, 8, 48, 9 COMBOBOX IDC_MIXERDEVICE, 55, 8, 162, 80, CBS_DROPDOWNLIST | WS_TABSTOP @@ -45,7 +45,7 @@ END IDD_VOLUME_CTRL DIALOG 0, 0, 90, 150 STYLE WS_POPUP | WS_BORDER -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15 CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 diff --git a/base/applications/taskmgr/lang/ko-KR.rc b/base/applications/taskmgr/lang/ko-KR.rc index 9aa84b437c..7901e80bde 100644 --- a/base/applications/taskmgr/lang/ko-KR.rc +++ b/base/applications/taskmgr/lang/ko-KR.rc @@ -150,14 +150,14 @@ STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "작업 관리자" MENU IDR_TASKMANAGER -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 3, 3, 257, 228 END IDD_APPLICATION_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN CONTROL "List2", IDC_APPLIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 7, 233, 177 @@ -168,7 +168,7 @@ END IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN CONTROL "List2", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 7, 233, 177 @@ -180,7 +180,7 @@ END /* IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 */ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN GROUPBOX "CPU 사용", IDC_CPU_USAGE_FRAME, 5, 5, 60, 54, 0, WS_EX_TRANSPARENT GROUPBOX "메모리 사용", IDC_MEM_USAGE_FRAME, 5, 63, 60, 54, BS_LEFTTEXT, WS_EX_TRANSPARENT @@ -235,7 +235,7 @@ END IDD_DEBUG_CHANNELS_DIALOG DIALOGEX 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "디버그 채널" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN CONTROL "List2", IDC_DEBUG_CHANNELS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING, 7, 7, 233, 177 @@ -245,7 +245,7 @@ END IDD_AFFINITY_DIALOG DIALOGEX 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "프로세서 선호도" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN DEFPUSHBUTTON "확인", IDOK, 120, 133, 50, 14 PUSHBUTTON "취소", IDCANCEL, 174, 133, 50, 14 @@ -287,7 +287,7 @@ END IDD_COLUMNS_DIALOG DIALOGEX 0, 0, 195, 199 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "열 선택" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN DEFPUSHBUTTON "확인", IDOK, 84, 178, 50, 14 PUSHBUTTON "취소", IDCANCEL, 138, 178, 50, 14 diff --git a/base/applications/wordpad/lang/ko-KR.rc b/base/applications/wordpad/lang/ko-KR.rc index 7b2a395edf..5d148127f3 100644 --- a/base/applications/wordpad/lang/ko-KR.rc +++ b/base/applications/wordpad/lang/ko-KR.rc @@ -193,7 +193,7 @@ END IDD_DATETIME DIALOGEX 30, 20, 130, 80 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "날짜와 시간" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN LTEXT "가능한 형식",-1,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY @@ -204,7 +204,7 @@ END IDD_NEWFILE DIALOGEX 30, 20, 140, 80 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "새 문서" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN LTEXT "새 문서 형식",-1,3,2,100,15 LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT @@ -215,7 +215,7 @@ END IDD_PARAFORMAT DIALOGEX 30, 20, 220, 110 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "단락 형식" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN GROUPBOX "들여쓰기", -1, 10, 10, 140, 68 LTEXT "왼쪽", -1, 15, 22, 60, 13 @@ -233,7 +233,7 @@ END IDD_TABSTOPS DIALOGEX 30, 20, 200, 110 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "탭" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN GROUPBOX "탭 정지", -1, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE @@ -247,7 +247,7 @@ END IDD_FORMATOPTS DIALOGEX 0, 0, 280, 110 STYLE DS_SHELLFONT | DS_SYSMODAL CAPTION "" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN GROUPBOX "줄 넘기기", -1, 5, 10, 145, 85 RADIOBUTTON "줄넘기지 않음", IDC_PAGEFMT_WN, 10, 25, 138, 15 diff --git a/base/shell/explorer/lang/ko-KR.rc b/base/shell/explorer/lang/ko-KR.rc index 90fd962c0e..1e991e5427 100644 --- a/base/shell/explorer/lang/ko-KR.rc +++ b/base/shell/explorer/lang/ko-KR.rc @@ -67,7 +67,7 @@ END IDD_TASKBARPROP_TASKBAR DIALOGEX 0, 0, 252, 218 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Taskbar" -FONT 9, "MS Shell Dlg", 0, 0, 0x1 +FONT 9, "굴림", 0, 0, 0x1 BEGIN GROUPBOX "Taskbar appearance", IDC_STATIC, 6, 6, 240, 104 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 @@ -88,7 +88,7 @@ END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Start Menu" -FONT 9, "MS Shell Dlg", 0, 0, 0x1 +FONT 9, "굴림", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 7, 183, 108 AUTORADIOBUTTON "&Start menu", IDC_TASKBARPROP_STARTMENU, 7, 135, 105, 10, WS_DISABLED @@ -103,7 +103,7 @@ IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME EXSTYLE WS_EX_CONTEXTHELP CAPTION "Customize Notifications" -FONT 8, "MS Shell Dlg" +FONT 9, "굴림" BEGIN LTEXT "ReactOS displays icons for active and urgent notifications, and hides inactive ones. You can change this behavior for items in the list below.", IDC_STATIC, 6, 6, 220, 30 LTEXT "Select an item, then choose its notification behavior:", IDC_STATIC, 6, 40, 220, 10 @@ -117,7 +117,7 @@ END IDD_CLASSICSTART_CUSTOMIZE DIALOGEX 0, 0, 232, 240, 0 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME CAPTION "Customize Classic Start Menu" -FONT 8, "MS Shell Dlg" +FONT 9, "굴림" { GROUPBOX "Start menu", IDC_STATIC, 8, 7, 218, 114 ICON IDI_STARTMENU2, IDC_STATIC, 19, 17, 20, 20 @@ -138,7 +138,7 @@ FONT 8, "MS Shell Dlg" IDD_FILENAME_WARNING DIALOGEX 0, 0, 272, 81, 0 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUPWINDOW | WS_DLGFRAME CAPTION "File Name Warning" -FONT 8, "MS Shell Dlg" +FONT 9, "굴림" { DEFPUSHBUTTON "&Ignore", IDIGNORE, 215, 60, 50, 14 PUSHBUTTON "&Rename", IDC_FILE_RENAME, 159, 60, 50, 14 @@ -151,7 +151,7 @@ FONT 8, "MS Shell Dlg" IDD_MODERNSTART_ADVANCED DIALOGEX 0, 0, 251, 198, 0 STYLE DS_SETFONT | WS_CAPTION | WS_CHILD | WS_DISABLED CAPTION "Advanced" -FONT 8, "MS Shell Dlg" +FONT 9, "굴림" { GROUPBOX "Start menu settings ", IDC_STATIC, 7, 7, 238, 42 AUTOCHECKBOX "&Open submenus when I pause on them with my mouse", IDC_AUTOOPEN, 14, 21, 224, 10 @@ -167,7 +167,7 @@ FONT 8, "MS Shell Dlg" IDD_MODERNSTART_GENERAL DIALOGEX 0, 0, 251, 198 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_DLGFRAME CAPTION "General" -FONT 8, "MS Shell Dlg" +FONT 9, "굴림" { GROUPBOX "Select an icon size for programs ", IDC_STATIC, 7, 7, 238, 37 ICON IDC_LARGEICON, 17, 18, 20, 20, SS_CENTERIMAGE diff --git a/dll/cpl/inetcpl/lang/ko-KR.rc b/dll/cpl/inetcpl/lang/ko-KR.rc index 331c7b526f..11b52c59b3 100644 --- a/dll/cpl/inetcpl/lang/ko-KR.rc +++ b/dll/cpl/inetcpl/lang/ko-KR.rc @@ -40,7 +40,7 @@ END /* "General" propsheet */ IDD_GENERAL DIALOGEX 0, 0, 320, 220 STYLE DS_SHELLFONT | WS_CAPTION | WS_CHILD | WS_DISABLED -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" CAPTION "일반" BEGIN @@ -64,7 +64,7 @@ END /* "Delete browsing history" dialog */ IDD_DELETE_HISTORY DIALOGEX 0, 0, 250, 250 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" CAPTION "방문 기록 지우기" BEGIN @@ -86,7 +86,7 @@ END /* "Security" propsheet */ IDD_SECURITY DIALOGEX 0, 0, 320, 220 STYLE DS_SHELLFONT | WS_CAPTION | WS_CHILD | WS_DISABLED -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" CAPTION "보안" BEGIN @@ -104,7 +104,7 @@ END /* "Content" propsheet */ IDD_CONTENT DIALOGEX 0, 0, 320, 220 STYLE DS_SHELLFONT | WS_CAPTION | WS_CHILD | WS_DISABLED -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" CAPTION "내용" BEGIN diff --git a/dll/win32/setupapi/lang/ko-KR.rc b/dll/win32/setupapi/lang/ko-KR.rc index c80d7e00f4..b0ef7f95ac 100644 --- a/dll/win32/setupapi/lang/ko-KR.rc +++ b/dll/win32/setupapi/lang/ko-KR.rc @@ -3,7 +3,7 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT COPYFILEDLGORD DIALOGEX 20, 20, 208, 105 STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "파일 복사중..." -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN PUSHBUTTON "취소", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "원본:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP @@ -16,7 +16,7 @@ END IDPROMPTFORDISK DIALOG 0, 0, 260, 120 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Files Needed" -FONT 8, "MS Shell Dlg" +FONT 9, "굴림" BEGIN LTEXT "Insert the manufacturer's installation disk, and then\nmake sure the correct drive is selected below", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 204655eddd..163401775b 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -78,7 +78,7 @@ END IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN DEFPUSHBUTTON "OK", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancel", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP @@ -90,7 +90,7 @@ END IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 @@ -105,7 +105,7 @@ END IDD_YESTOALL_MSGBOX DIALOGEX 200, 100, 280, 90 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "왺쑦지" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN DEFPUSHBUTTON "예(&Y)", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "욒두 예(&A)", IDC_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP @@ -118,7 +118,7 @@ END IDD_ABOUT DIALOGEX 0, 0, 275, 198 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "%s에 관하여" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 @@ -143,7 +143,7 @@ END IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 STYLE DS_SHELLFONT | WS_CHILD -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN LTEXT "ReactOS was brought to you by:", IDC_STATIC, 0, 0, 180, 10 LISTBOX IDC_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 @@ -152,7 +152,7 @@ END IDD_RUN DIALOGEX 0, 0, 227, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Run" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 @@ -166,7 +166,7 @@ END IDD_SHORTCUT_PROPERTIES DIALOGEX 0, 0, 235, 215 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Shortcut" -FONT 9, "MS Shell Dlg", 0, 0, 0x0 +FONT 9, "굴림", 0, 0, 0x0 BEGIN ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -194,7 +194,7 @@ END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION CAPTION "Extended Properties" -FONT 9, "MS Shell Dlg", 0, 0, 0x0 +FONT 9, "굴림", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 @@ -208,7 +208,7 @@ END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "General" -FONT 9, "MS Shell Dlg", 0, 0, 0x0 +FONT 9, "굴림", 0, 0, 0x0 BEGIN ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT @@ -237,7 +237,7 @@ END IDD_FILE_PROPERTIES DIALOGEX 0, 0, 240, 205 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "General" -FONT 9, "MS Shell Dlg", 0, 0, 0x0 +FONT 9, "굴림", 0, 0, 0x0 BEGIN ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | WS_TABSTOP @@ -273,7 +273,7 @@ END IDD_FILE_VERSION DIALOGEX 0, 0, 235, 215 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Version" -FONT 9, "MS Shell Dlg", 0, 0, 0x0 +FONT 9, "굴림", 0, 0, 0x0 BEGIN LTEXT "File version: ", 14000, 10, 10, 55, 10 EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER @@ -291,7 +291,7 @@ END IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" -FONT 9, "MS Shell Dlg", 0, 0, 0x0 +FONT 9, "굴림", 0, 0, 0x0 BEGIN ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL @@ -324,7 +324,7 @@ END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Tools" -FONT 9, "MS Shell Dlg", 0, 0, 0x0 +FONT 9, "굴림", 0, 0, 0x0 BEGIN GROUPBOX "Error-checking", -1, 5, 5, 230, 60 ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 @@ -343,14 +343,14 @@ END IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hardware" -FONT 9, "MS Shell Dlg", 0, 0, 0x0 +FONT 9, "굴림", 0, 0, 0x0 BEGIN END IDD_RUN_AS DIALOGEX 0, 0, 240, 190 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Run As" -FONT 9, "MS Shell Dlg", 0, 0, 0x0 +FONT 9, "굴림", 0, 0, 0x0 BEGIN LTEXT "Which user account do you want to use to run this program?", -1, 10, 20, 220, 20 CHECKBOX "Current User %s", 14000, 10, 45, 150, 10 @@ -370,7 +370,7 @@ END IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Recycle Bin Properties" -FONT 9, "MS Shell Dlg", 0, 0, 0x0 +FONT 9, "굴림", 0, 0, 0x0 BEGIN CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50 GROUPBOX "Settings for selected location", -1, 10, 72, 220, 70 @@ -384,7 +384,7 @@ END IDD_OPEN_WITH DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Open With" -FONT 9, "MS Shell Dlg", 0, 0, 0x0 +FONT 9, "굴림", 0, 0, 0x0 BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "Choose the program you want to use to open this file:", -1, 44, 12, 211, 10 @@ -400,7 +400,7 @@ END IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "General" -FONT 9, "MS Shell Dlg", 0, 0, 0x0 +FONT 9, "굴림", 0, 0, 0x0 BEGIN GROUPBOX "Tasks", -1, 7, 10, 249, 45 CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20 @@ -422,7 +422,7 @@ END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "View" -FONT 9, "MS Shell Dlg", 0, 0, 0x0 +FONT 9, "굴림", 0, 0, 0x0 BEGIN GROUPBOX "Folder views", -1, 7, 10, 249, 60 ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20 @@ -437,7 +437,7 @@ END IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "File Types" -FONT 9, "MS Shell Dlg", 0, 0, 0x0 +FONT 9, "굴림", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 @@ -455,7 +455,7 @@ END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Confirm File Replace" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN DEFPUSHBUTTON "&Yes", IDYES, 20, 122, 60, 14 PUSHBUTTON "Yes to &All", 12807, 85, 122, 60, 14 @@ -476,7 +476,7 @@ END IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Log Off ReactOS" -FONT 8, "MS Shell Dlg" +FONT 9, "굴림" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 @@ -487,7 +487,7 @@ END IDD_DISCONNECT DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Disconnect ReactOS" -FONT 8, "MS Shell Dlg" +FONT 9, "굴림" BEGIN ICON IDI_SHELL_DISCONN, IDC_STATIC, 8, 6, 21, 20 LTEXT "Are you sure you want to disconnect?", -1, 49, 15, 131, 8 @@ -498,7 +498,7 @@ END IDD_AUTOPLAY1 DIALOGEX 0, 0, 227, 218 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION CAPTION "AutoPlay" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN LTEXT "&Select a content type, then choose an action for ReactOS to perform automatically when that type is used in this device:", 1000, 7, 7, 215, 20 CONTROL "", 1001, "COMBOBOXEX32", WS_TABSTOP | 0x00000043, 7, 27, 212, 200 @@ -512,7 +512,7 @@ END IDD_MIXED_CONTENT1 DIALOGEX 0, 0, 227, 207 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION CAPTION "Mixed Content" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN ICON "", 1000, 5, 7, 21, 20 LTEXT "This disk or device contains more than one type of content.", 1001, 32, 7, 191, 20 @@ -525,7 +525,7 @@ END IDD_MIXED_CONTENT2 DIALOGEX 0, 0, 227, 206 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION CAPTION "Mixed Content" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN ICON "", 1000, 5, 7, 21, 20 LTEXT "ReactOS can perform the same action each time you insert a disk or connect a device with this kind of file:", 1001, 30, 7, 193, 20 @@ -541,7 +541,7 @@ END IDD_AUTOPLAY2 DIALOGEX 0, 0, 227, 181 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION CAPTION "Autoplay" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN ICON "", 1000, 5, 7, 21, 20 LTEXT "ReactOS can perform the same action each time you connect this device.", 1001, 32, 7, 190, 22 @@ -555,7 +555,7 @@ END IDD_SHUTDOWN DIALOGEX 0, 0, 211, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Shut Down ReactOS" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN ICON 8240, -1, 6, 6, 21, 20, SS_REALSIZECONTROL | WS_GROUP LTEXT "What do you want the computer to do?", -1, 39, 7, 167, 10 @@ -569,7 +569,7 @@ END IDD_FORMAT_DRIVE DIALOGEX 50, 50, 184, 218 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Format" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN DEFPUSHBUTTON "&Start", IDOK, 53, 198, 60, 14 PUSHBUTTON "&Close", IDCANCEL, 118, 198, 60, 14 @@ -590,7 +590,7 @@ END IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Check Disk" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN DEFPUSHBUTTON "Start", IDOK, 63, 95, 60, 14 GROUPBOX "Check disk options", -1, 7, 6, 179, 40 @@ -604,7 +604,7 @@ END IDD_PICK_ICON DIALOGEX 0, 0, 193, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Change Icon" -FONT 9, "MS Shell Dlg", 400, 0, 0x1 +FONT 9, "굴림", 400, 0, 0x1 BEGIN LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 @@ -618,7 +618,7 @@ END IDD_NOOPEN DIALOGEX 0, 0, 240, 75 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Caution" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20 LTEXT "This file could either be used by the operating system or by\n\ diff --git a/modules/rosapps/applications/winfile/lang/ko-KR.rc b/modules/rosapps/applications/winfile/lang/ko-KR.rc index 7dccb2fcbb..c78c427bec 100644 --- a/modules/rosapps/applications/winfile/lang/ko-KR.rc +++ b/modules/rosapps/applications/winfile/lang/ko-KR.rc @@ -150,7 +150,7 @@ IDM_WINEFILE MENU IDD_SELECT_DESTINATION DIALOGEX 15, 13, 210, 63 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "목적지 선택" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" { CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 CONTROL "경로(&P):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 @@ -163,7 +163,7 @@ FONT 9, "MS Shell Dlg" IDD_DIALOG_VIEW_TYPE DIALOGEX 15, 13, 161, 97 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "파일 타입으로" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN LTEXT "이름(&N):",-1,7,8,22,10 EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL @@ -185,7 +185,7 @@ END IDD_DIALOG_PROPERTIES DIALOGEX 0, 0, 248, 215 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "%s 속성" -FONT 9, "MS Shell Dlg" +FONT 9, "굴림" BEGIN DEFPUSHBUTTON "확인",IDOK,191,7,50,14 PUSHBUTTON "취소",IDCANCEL,191,29,50,14

6 years, 8 months

← Newer
1
2
3
4
5
6
7
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2017