Ros-diffs April 2005

ros-diffs@reactos.org

26 participants
477 discussions

by ion＠svn.reactos.com

Delete cruft Modified: trunk/reactos/ntoskrnl/Makefile Deleted: trunk/reactos/ntoskrnl/kd/mda.c Deleted: trunk/reactos/ntoskrnl/ke/i386/multiboot.S _____ Modified: trunk/reactos/ntoskrnl/Makefile --- trunk/reactos/ntoskrnl/Makefile 2005-04-23 17:24:13 UTC (rev 14782) +++ trunk/reactos/ntoskrnl/Makefile 2005-04-23 17:56:10 UTC (rev 14783) @@ -332,7 +332,6 @@ kd/dlog.o \ kd/gdbstub.o \ kd/kdebug.o \ - kd/mda.o \ kd/service.o # User-Mode Debugging (Dbgk) _____ Deleted: trunk/reactos/ntoskrnl/kd/mda.c --- trunk/reactos/ntoskrnl/kd/mda.c 2005-04-23 17:24:13 UTC (rev 14782) +++ trunk/reactos/ntoskrnl/kd/mda.c 2005-04-23 17:56:10 UTC (rev 14783) @@ -1,131 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/kd/mda.c - * PURPOSE: Support for debugging using an MDA card. - * - * PROGRAMMERS: David Welch <welch(a)cwcom.net> - */ - -/* INCLUDES ******************************************************************/ - -#include <ntoskrnl.h> -#include <internal/kdb.h> - -/* VARIABLES ***************************************************************/ - -STATIC ULONG MdaIndexPort; -STATIC ULONG MdaValuePort; -STATIC ULONG MdaStatusPort; -STATIC ULONG MdaGfxPort; -STATIC ULONG MdaModePort; -STATIC PUSHORT VideoBuffer; - -#define MDA_COLUMNS (80) -#define MDA_LINES (25) - -STATIC ULONG MdaCursorX, MdaCursorY; - -/* PRIVATE FUNCTIONS ********************************************************/ - -#if 0 -VOID STATIC -KdWriteByteMDA(ULONG Reg, ULONG Value) -{ - WRITE_PORT_UCHAR((PUCHAR)MdaIndexPort, (CHAR)Reg); - WRITE_PORT_UCHAR((PUCHAR)MdaValuePort, (CHAR)Value); -} - -VOID STATIC -KdWriteWordMDA(ULONG Reg, ULONG Value) -{ - WRITE_PORT_UCHAR((PUCHAR)MdaIndexPort, (CHAR)Reg); - WRITE_PORT_UCHAR((PUCHAR)MdaValuePort, (CHAR)(Value >> 8)); - WRITE_PORT_UCHAR((PUCHAR)MdaIndexPort, (CHAR)(Reg + 1)); - WRITE_PORT_UCHAR((PUCHAR)MdaValuePort, (CHAR)(Value & 0xFF)); -} -#endif - -VOID -KdInitializeMda(VOID) -{ - /* Setup the variables for the various port addresses. */ - MdaIndexPort = 0x3b4; - MdaValuePort = 0x3b5; - MdaModePort = 0x3b8; - MdaStatusPort = 0x3ba; - MdaGfxPort = 0x3bf; - - VideoBuffer = (PUSHORT)(0xff3b0000); - - MdaCursorX = MdaCursorY = 0; -} - -VOID STATIC -KdScrollMda(VOID) -{ - memmove(&VideoBuffer[(MDA_COLUMNS * 0) + 0], - &VideoBuffer[(MDA_COLUMNS * 1) + 0], - MDA_COLUMNS * (MDA_LINES - 1) * 2); - memset(&VideoBuffer[(MDA_COLUMNS * (MDA_LINES - 1)) + 0], 0, - MDA_COLUMNS * 2); -} - -VOID STATIC -KdPutCharMda(CHAR Ch) -{ - if (Ch == '\n') - { - if (MdaCursorY == (MDA_LINES - 1)) - { - KdScrollMda(); - } - else - { - MdaCursorY++; - } - MdaCursorX = 0; - return; - } - VideoBuffer[(MdaCursorY * MDA_COLUMNS) + MdaCursorX] = (Ch & 0xFF) | 0x0700; - MdaCursorX++; - if (MdaCursorX == (MDA_COLUMNS - 1)) - { - if (MdaCursorY == (MDA_LINES - 1)) - { - KdScrollMda(); - } - else - { - MdaCursorY++; - } - MdaCursorX = 0; - } -} - -VOID -KdPrintMda(PCH pch) -{ - while((*pch) != 0) - { - if ((*pch) == '\t') - { - KdPutCharMda(' '); - KdPutCharMda(' '); - KdPutCharMda(' '); - KdPutCharMda(' '); - } - if ((*pch) == '\r') - { - /* Nothing. */ - } - else - { - KdPutCharMda(*pch); - } - pch++; - } -} - -/* EOF */ _____ Deleted: trunk/reactos/ntoskrnl/ke/i386/multiboot.S --- trunk/reactos/ntoskrnl/ke/i386/multiboot.S 2005-04-23 17:24:13 UTC (rev 14782) +++ trunk/reactos/ntoskrnl/ke/i386/multiboot.S 2005-04-23 17:56:10 UTC (rev 14783) @@ -1,382 +0,0 @@ -#include <roscfg.h> -#include <internal/ntoskrnl.h> -#include <internal/i386/ke.h> -#include <internal/i386/segment.h> -#include <internal/ps.h> -#include <internal/i386/mm.h> -#include <internal/i386/fpu.h> - -#define MULTIBOOT_HEADER_MAGIC (0x1BADB002) - -#define MULTIBOOT_HEADER_FLAGS (0x00010003) - -#define V2P(x) (x - KERNEL_BASE + 0x200000) - -#ifdef CONFIG_SMP - -#define AP_MAGIC (0x12481020) - -#endif /* CONFIG_SMP */ - -.globl _NtProcessStartup -.globl _start -.globl _init_stack -.globl _init_stack_top -.globl _trap_stack -.globl _trap_stack_top -.globl _unmap_me -.globl _unmap_me2 -.globl _unmap_me3 -.globl _unmap_me4 -.globl _pagetable_start -.globl _pagetable_end -.globl _pae_pagedirtable - - /* - * This is called by the realmode loader, with protected mode - * enabled, paging disabled and the segment registers pointing - * a 4Gb, 32-bit segment starting at zero. - * - * EAX = Multiboot magic or application processor magic - * - * EBX = Points to a structure in lowmem with data from the - * loader - */ - -_NtProcessStartup: -_start: - jmp _multiboot_entry - - /* Align 32 bits boundary */ - .align 4 - - /* Multiboot header */ -multiboot_header: - /* magic */ - .long MULTIBOOT_HEADER_MAGIC - /* flags */ - .long MULTIBOOT_HEADER_FLAGS - /* checksum */ - .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS) - /* header_addr */ - .long (0x200000 + multiboot_header - KERNEL_BASE) - /* load_addr */ - .long 0x200000 - /* load_end_addr */ - .long (__bss_start__ + 0x200000 - KERNEL_BASE) - /* bss_end_addr */ - .long (__bss_end__ + 0x200000 - KERNEL_BASE) - /* entry_addr */ - .long (0x200000 + _start - KERNEL_BASE) - -_multiboot_entry: - /* - * This must be PIC because we haven't set up paging yet - */ - - /* - * Gcc expects this at all times - */ - cld - -#ifdef CONFIG_SMP - - /* - * Save the multiboot or application processor magic - */ - movl %eax, %edx - - cmpl $AP_MAGIC, %edx - je .m1 - -#endif /* CONFIG_SMP */ - - /* - * Zero the BSS - */ - movl %eax, %edx - movl $0, %eax - movl $__bss_end__, %ecx - subl $__bss_start__, %ecx - shr $2, %ecx - movl $__bss_start__, %edi - subl $KERNEL_BASE, %edi - addl $0x200000, %edi - rep - stosl - - /* - * Initialize the page directory - */ - movl $V2P(startup_pagedirectory), %esi - movl $(V2P(lowmem_pagetable) + 0x3), 0x0(%esi) - movl $(V2P(kernel_pagetable) + 0x3), (KERNEL_BASE >> 20)(%esi) - movl $(V2P(kernel_pagetable+4096) + 0x3), ((KERNEL_BASE >> 20) + 4)(%esi) - - movl $(V2P(startup_pagedirectory) + 0x3), 0xF00(%esi) - movl $(V2P(hyperspace_pagetable) + 0x3), 0xF08(%esi) -#ifdef CONFIG_SMP - movl $(V2P(apic_pagetable) + 0x3), 0xFEC(%esi) -#endif /* CONFIG_SMP */ - movl $(V2P(kpcr_pagetable) + 0x3), 0xFF0(%esi) - - /* - * Initialize the page table that maps low memory - */ - movl $V2P(lowmem_pagetable), %esi - movl $0x7, %eax - movl $0, %edi -.l3: - movl %eax, (%esi, %edi) - addl $0x1000, %eax - addl $4, %edi - cmpl $4096, %edi - jl .l3 - - /* - * Initialize the page table that maps kernel memory - */ - movl $V2P(kernel_pagetable), %esi - movl $0x200003, %eax - movl $0, %edi -.l4: - movl %eax, (%esi, %edi) - addl $0x1000, %eax - addl $4, %edi - cmpl $6144, %edi - jl .l4 - -#ifdef CONFIG_SMP - - /* - * Initialize the page table that maps the APIC register address space - */ - - /* - * FIXME: APIC register address space can be non-standard so do the - * mapping later - */ - movl $V2P(apic_pagetable), %esi - movl $0, %edi - movl $0xFEC0001B, %eax - movl %eax, (%esi, %edi) - movl $0x800, %edi - movl $0xFEE0001B, %eax - movl %eax, (%esi, %edi) - -#endif /* CONFIG_SMP */ - - /* - * Initialize the page table that maps the initial KPCR (at FF000000) - */ - movl $V2P(kpcr_pagetable), %esi - movl $0, %edi - movl $0x1003, %eax - movl %eax, (%esi, %edi) - - -#ifdef CONFIG_SMP - -.m1: - /* - * Check for pae mode (only possible for an application processor) - */ - - movl $(V2P(_Ke386Pae)), %eax - cmpb $0, (%eax) - je .m3 - - /* - * Set up the PDBR - */ - movl $(V2P(_pae_pagedirtable)), %eax - movl %eax, %cr3 - - /* - * Enable pae mode - */ - movl %cr4, %eax - orl $X86_CR4_PAE, %eax - movl %eax, %cr4 - - jmp .m4 - -.m3: - -#endif /* CONFIG_SMP */ - - /* - * Set up the PDBR - */ - movl $(V2P(startup_pagedirectory)), %eax - movl %eax, %cr3 - -#ifdef CONFIG_SMP -.m4: -#endif - - /* - * Enable paging and set write protect - */ - movl %cr0, %eax - orl $0x80010000, %eax - movl %eax, %cr0 - - /* - * Do an absolute jump because we now want to execute above 0xc0000000 - */ - movl $.l2, %eax - jmp *%eax -.l2: - - /* - * Load the GDTR and IDTR with new tables located above - * 0xc0000000 - */ - - /* FIXME: Application processors should have their own GDT/IDT */ - lgdt _KiGdtDescriptor - lidt _KiIdtDescriptor - - /* - * Reload the data segment registers - */ - movl $KERNEL_DS, %eax - movl %eax, %ds - movl %eax, %es - movl %eax, %gs - movl %eax, %ss - movl $0, %eax - movl %eax, %fs - -#ifdef CONFIG_SMP - - cmpl $AP_MAGIC, %edx - jne .m2 - - /* - * This is an application processor executing - */ - - /* - * Initialize EFLAGS - */ - pushl $0 - popfl - - /* - * Reserve space for the floating point save area. - */ - subl $SIZEOF_FX_SAVE_AREA, %esp - - /* - * Call the application processor initialization code - */ - pushl $0 - pushl $.l7 - pushl $KERNEL_CS - pushl $_KiSystemStartup - lret - - /* - * Catch illegal returns from KiSystemStartup - */ -.l7: - popl %eax - pushl $0 - call _KeBugCheck@4 - popl %eax -.l8: - jmp .l8 - - -.m2: - -#endif /* CONFIG_SMP */ - - /* - * Load the PCR selector - */ - movl $PCR_SELECTOR, %eax - movl %eax, %fs - - /* - * Load the initial kernel stack - */ - movl $(_init_stack_top - SIZEOF_FX_SAVE_AREA), %esp - - /* - * Initialize EFLAGS - */ - pushl $0 - popfl - - /* - * Call the main kernel initialization - */ - movl $0, %ebp - pushl %ebx - pushl %edx - pushl $.l5 - pushl $KERNEL_CS - pushl $__main - lret - - /* - * Catch illegal returns from main, try bug checking the system, - * if that fails then loop forever. - */ -.l5: - popl %eax - popl %eax - pushl $0 - call _KeBugCheck@4 - popl %eax -.l6: - jmp .l6 - - - /* - * This needs to be page aligned so put it at the beginning of the bss - * segment - */ -.bss -_pagetable_start: -startup_pagedirectory: - .fill 4096, 1, 0 - -lowmem_pagetable: - .fill 4096, 1, 0 - -kernel_pagetable: - .fill 2*4096, 1, 0 - -hyperspace_pagetable: - .fill 4096, 1, 0 - -_pae_pagedirtable: - .fill 4096, 1, 0 -#ifdef CONFIG_SMP -apic_pagetable: - .fill 4096, 1, 0 -#endif /* CONFIG_SMP */ - -kpcr_pagetable: - .fill 4096, 1, 0 -_pagetable_end: -_unmap_me: - .fill 4096, 1, 0 - -_init_stack: - .fill 3*4096, 1, 0 -_init_stack_top: - -_unmap_me2: - .fill 4096, 1, 0 - -_trap_stack: - .fill 3*4096, 1, 0 -_trap_stack_top: - -_unmap_me3: - .fill 4096, 1, 0

19 years, 8 months

[chorns] 14782: Don't detect host compiler on Linux

by chorns＠svn.reactos.com

Don't detect host compiler on Linux Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-04-23 17:11:51 UTC (rev 14781) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-04-23 17:24:13 UTC (rev 14782) @@ -590,11 +590,13 @@ compilerCommand = ROS_PREFIXValue + "-gcc"; detectedCompiler = TryToDetectThisCompiler ( compilerCommand ); } +#if defined(WIN32) if ( !detectedCompiler ) { compilerCommand = "gcc"; detectedCompiler = TryToDetectThisCompiler ( compilerCommand ); } +#endif if ( !detectedCompiler ) { compilerCommand = "mingw32-gcc";

19 years, 8 months

[chorns] 14781: Allow warnings for now (for real this time)

by chorns＠svn.reactos.com

Allow warnings for now (for real this time) Modified: branches/xmlbuildsystem/reactos/subsys/system/format/format.xml _____ Modified: branches/xmlbuildsystem/reactos/subsys/system/format/format.xml --- branches/xmlbuildsystem/reactos/subsys/system/format/format.xml 2005-04-23 17:09:59 UTC (rev 14780) +++ branches/xmlbuildsystem/reactos/subsys/system/format/format.xml 2005-04-23 17:11:51 UTC (rev 14781) @@ -1,4 +1,4 @@ -<module name="format" type="win32cui" installbase="system32" installname="format.exe" warnings="false"> +<module name="format" type="win32cui" installbase="system32" installname="format.exe" warnings="true"> <include base="format">.</include> <define name="__USE_W32API" /> <library>ntdll</library>

19 years, 8 months

[chorns] 14780: Allow warnings for now

by chorns＠svn.reactos.com

Allow warnings for now Modified: branches/xmlbuildsystem/reactos/subsys/system/format/format.xml _____ Modified: branches/xmlbuildsystem/reactos/subsys/system/format/format.xml --- branches/xmlbuildsystem/reactos/subsys/system/format/format.xml 2005-04-23 16:23:57 UTC (rev 14779) +++ branches/xmlbuildsystem/reactos/subsys/system/format/format.xml 2005-04-23 17:09:59 UTC (rev 14780) @@ -1,4 +1,4 @@ -<module name="format" type="win32cui" installbase="system32" installname="format.exe"> +<module name="format" type="win32cui" installbase="system32" installname="format.exe" warnings="false"> <include base="format">.</include> <define name="__USE_W32API" /> <library>ntdll</library>

19 years, 8 months

[ion] 14779: Add more detailed comment about ThreadListEntry so people don't get confused liek I did

by ion＠svn.reactos.com

Add more detailed comment about ThreadListEntry so people don't get confused liek I did Modified: trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/ntoskrnl/ps/thread.c _____ Modified: trunk/reactos/ntoskrnl/ke/kthread.c --- trunk/reactos/ntoskrnl/ke/kthread.c 2005-04-23 16:17:27 UTC (rev 14778) +++ trunk/reactos/ntoskrnl/ke/kthread.c 2005-04-23 16:23:57 UTC (rev 14779) @@ -782,7 +782,11 @@ /* Set the Thread to initalized */ Thread->State = Initialized; - /* Insert the Thread into the Process's Thread List */ + /* + * Insert the Thread into the Process's Thread List + * Note, this is the KTHREAD Thread List. It is removed in + * ke/kthread.c!KeTerminateThread. + */ InsertTailList(&Process->ThreadListHead, &Thread->ThreadListEntry); DPRINT("Thread initalized\n"); } _____ Modified: trunk/reactos/ntoskrnl/ps/thread.c --- trunk/reactos/ntoskrnl/ps/thread.c 2005-04-23 16:17:27 UTC (rev 14778) +++ trunk/reactos/ntoskrnl/ps/thread.c 2005-04-23 16:23:57 UTC (rev 14779) @@ -250,7 +250,11 @@ KernelStack); } - /* Insert into Process List */ + /* + * Insert the Thread into the Process's Thread List + * Note, this is the ETHREAD Thread List. It is removed in + * ps/kill.c!PspExitThread. + */ DPRINT("Inserting into Process Thread List \n"); InsertTailList(&Process->ThreadListHead, &Thread->ThreadListEntry);

19 years, 8 months

[ion] 14778: Move removing process from active list to PspDeleteProcess instead of PspExitProcess. This way we don't have to do it manually after ObInsertObject failure in PspCreateProces. Also, set the Process Query Time at the end of Process Creation, since the process doesn't really exist before then. Thanks to Hartmut for finding the bugs.

by ion＠svn.reactos.com

Move removing process from active list to PspDeleteProcess instead of PspExitProcess. This way we don't have to do it manually after ObInsertObject failure in PspCreateProces. Also, set the Process Query Time at the end of Process Creation, since the process doesn't really exist before then. Thanks to Hartmut for finding the bugs. Modified: trunk/reactos/ntoskrnl/ps/kill.c _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2005-04-23 16:16:59 UTC (rev 14777) +++ trunk/reactos/ntoskrnl/ps/kill.c 2005-04-23 16:17:27 UTC (rev 14778) @@ -148,6 +148,11 @@ DPRINT("PiDeleteProcess(ObjectBody %x)\n", ObjectBody); + /* Remove it from the Active List */ + ExAcquireFastMutex(&PspActiveProcessMutex); + RemoveEntryList(&Process->ProcessListEntry); + ExReleaseFastMutex(&PspActiveProcessMutex); + /* Delete the CID Handle */ if(Process->UniqueProcessId != NULL) { @@ -411,12 +416,7 @@ DPRINT("PspExitProcess 0x%x\n", Process); PspRunCreateProcessNotifyRoutines(Process, FALSE); - - /* Remove it from the Active List */ - ExAcquireFastMutex(&PspActiveProcessMutex); - RemoveEntryList(&Process->ProcessListEntry); - ExReleaseFastMutex(&PspActiveProcessMutex); - + /* close all handles associated with our process, this needs to be done when the last thread still runs */ ObKillProcess(Process);

19 years, 8 months

[ion] 14777: Move removing process from active list to PspDeleteProcess instead of PspExitProcess. This way we don't have to do it manually after ObInsertObject failure in PspCreateProces. Also, set the Process Query Time at the end of Process Creation, since the process doesn't really exist before then. Thanks to Hartmut for finding the bus.

by ion＠svn.reactos.com

Move removing process from active list to PspDeleteProcess instead of PspExitProcess. This way we don't have to do it manually after ObInsertObject failure in PspCreateProces. Also, set the Process Query Time at the end of Process Creation, since the process doesn't really exist before then. Thanks to Hartmut for finding the bus. Modified: trunk/reactos/ntoskrnl/ps/process.c _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-04-23 16:09:06 UTC (rev 14776) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-04-23 16:16:59 UTC (rev 14777) @@ -287,8 +287,6 @@ /* Clean up the Object */ DPRINT("Cleaning Process Object\n"); RtlZeroMemory(Process, sizeof(EPROCESS)); - - KeQuerySystemTime(&Process->CreateTime); /* Inherit stuff from the Parent since we now have the object created */ if (pParentProcess) @@ -411,13 +409,13 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Could not get a handle to the Process Object\n"); - ExAcquireFastMutex(&PspActiveProcessMutex); - RemoveEntryList(&Process->ProcessListEntry); - ExReleaseFastMutex(&PspActiveProcessMutex); ObDereferenceObject(Process); goto exitdereferenceobjects; } + /* Set the Creation Time */ + KeQuerySystemTime(&Process->CreateTime); + DPRINT("Done. Returning handle: %x\n", hProcess); _SEH_TRY {

19 years, 8 months

[hbirr] 14776: Fixed restoring of registers.

by hbirr＠svn.reactos.com

Fixed restoring of registers. Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S _____ Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2005-04-23 14:16:48 UTC (rev 14775) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2005-04-23 16:09:06 UTC (rev 14776) @@ -281,8 +281,8 @@ /* Return the registers */ mov ebp, [esp+0] - mov esi, [esp+4] - mov edi, [esp+8] + mov edi, [esp+4] + mov esi, [esp+8] mov ebx, [esp+12] /* Clean stack */

19 years, 8 months

[hbirr] 14768: Fixed the smp build.

by hbirr＠svn.reactos.com

Fixed the smp build. Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S _____ Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2005-04-23 10:18:43 UTC (rev 14767) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2005-04-23 12:44:42 UTC (rev 14768) @@ -134,18 +134,18 @@ #ifdef CONFIG_SMP /* Save FPU state if the thread has used it. */ - mov [ebx+KPCR_NPX_THREAD], 0 + mov dword ptr [ebx+KPCR_NPX_THREAD], 0 test byte ptr [edi+KTHREAD_NPX_STATE], NPX_STATE_DIRTY jz 3f mov eax, [edi+KTHREAD_INITIAL_STACK] - cmp _FxsrSupport, 0 + cmp dword ptr _FxsrSupport, 0 je 1f fxsave [eax-SIZEOF_FX_SAVE_AREA] jmp 2f 1: fnsave [eax-SIZEOF_FX_SAVE_AREA] 2: - mov byte ptr [edi+KTHREAD_INITIAL_STACK], NPX_STATE_VALID + mov byte ptr [edi+KTHREAD_NPX_STATE], NPX_STATE_VALID 3: #endif /* CONFIG_SMP */

19 years, 8 months

[greatlrd] 14775: Swedish translation

by greatlrd＠svn.reactos.com

Swedish translation Andreas Bjerkeholt (harteex(a)gmail.com) Added: trunk/reactos/lib/cpl/intl/Sv.rc Modified: trunk/reactos/lib/cpl/intl/intl.rc _____ Added: trunk/reactos/lib/cpl/intl/Sv.rc --- trunk/reactos/lib/cpl/intl/Sv.rc 2005-04-23 14:14:16 UTC (rev 14774) +++ trunk/reactos/lib/cpl/intl/Sv.rc 2005-04-23 14:16:48 UTC (rev 14775) @@ -0,0 +1,67 @@ +/* $Id: intl.rc 12852 2005-01-06 13:58:04Z mf $ */ +/* Swedish resources by Andreas Bjerkeholt (harteex(a)gmail.com) */ + +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT + +IDD_GENERALPAGE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Generellt" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Property Page 1",-1,73,74,90,8 +END + + +IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Tal" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Property Page 2",-1,73,74,90,8 +END + + +IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Valuta" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Property Page 3",-1,73,74,90,8 +END + + +IDD_TIMEPAGE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Tid" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Property Page 4",-1,73,74,90,8 +END + + +IDD_DATEPAGE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Datum" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Property Page 5",-1,73,74,90,8 +END + + +IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "InmatningssprÕk" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Primõrt sprÕk", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Võlj det sprÕk och den region du vill anvõnda:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + + +STRINGTABLE +BEGIN + IDS_CPLNAME "Nationella instõllningar" + IDS_CPLDESCRIPTION "Võlj sprÕk och format pÕ tal, valuta, tid och datum." +END _____ Modified: trunk/reactos/lib/cpl/intl/intl.rc --- trunk/reactos/lib/cpl/intl/intl.rc 2005-04-23 14:14:16 UTC (rev 14774) +++ trunk/reactos/lib/cpl/intl/intl.rc 2005-04-23 14:16:48 UTC (rev 14775) @@ -23,4 +23,6 @@ #include "en.rc" #include "de.rc" +#include "sv.rc" +

19 years, 8 months

← Newer
1
...
8
9
10
11
12
13
14
...
48
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 April 2005