Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ros-arm-bringup] 32207: We now also implement InterlockedExchange (Fixes rtl build). We now set -lgcc for all builds (to get built-in division helpers), and also -static (not to import libgcc.dll -- it seems -static isn't needed on x86, but it is on ARM). We hackfix kdcom to use the FeroUart base address -- this driver won't be used for a while, but we need to have it built. Now binaries are being created properly (previously kernel was 15MB and importing .DLL files...). FreeLDR output: FreeLoa
by ros-arm-bringup＠svn.reactos.org 08 Feb '08

08 Feb '08

Author: ros-arm-bringup Date: Fri Feb 8 11:20:06 2008 New Revision: 32207 URL: http://svn.reactos.org/svn/reactos?rev=32207&view=rev Log: We now also implement InterlockedExchange (Fixes rtl build). We now set -lgcc for all builds (to get built-in division helpers), and also -static (not to import libgcc.dll -- it seems -static isn't needed on x86, but it is on ARM). We hackfix kdcom to use the FeroUart base address -- this driver won't be used for a while, but we need to have it built. Now binaries are being created properly (previously kernel was 15MB and importing .DLL files...). FreeLDR output: FreeLoader v3.0 for ARM Bootargs: rdbase=0x2000000 rdsize=0x1400000 Detecting Hardware... Loading... Reading NTOSKRNL.EXE Reading BOOTVID.DLL Reading HAL.DLL Reading HAL.DLL Reading c_1252.nls Reading c_437.nls Reading l_intl.nls Reading scsiport.sys Modified: trunk/reactos/ReactOS-arm.rbuild trunk/reactos/drivers/base/kdcom/kdbg.c trunk/reactos/include/psdk/intrin_arm.h Modified: trunk/reactos/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=322… ============================================================================== --- trunk/reactos/ReactOS-arm.rbuild (original) +++ trunk/reactos/ReactOS-arm.rbuild Fri Feb 8 11:20:06 2008 @@ -33,4 +33,7 @@ <compilerflag>-Wno-attributes</compilerflag> <compilerflag>-fno-strict-aliasing</compilerflag> + <linkerflag>-s</linkerflag> + <linkerflag>-lgcc</linkerflag> + <linkerflag>-static</linkerflag> </project> Modified: trunk/reactos/drivers/base/kdcom/kdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdbg.c?… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdbg.c (original) +++ trunk/reactos/drivers/base/kdcom/kdbg.c Fri Feb 8 11:20:06 2008 @@ -59,6 +59,8 @@ const ULONG BaseArray[2] = {0, 0x800003f8}; #elif defined(_M_MIPS) const ULONG BaseArray[3] = {0, 0x80006000, 0x80007000}; +#elif defined(_M_ARM) +const ULONG BaseArray[2] = {0, 0xF1012000}; #else #error Unknown architecture #endif Modified: trunk/reactos/include/psdk/intrin_arm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin_arm.h?… ============================================================================== --- trunk/reactos/include/psdk/intrin_arm.h (original) +++ trunk/reactos/include/psdk/intrin_arm.h Fri Feb 8 11:20:06 2008 @@ -72,6 +72,17 @@ return a; } +static __inline__ __attribute__((always_inline)) long _InterlockedExchange(volatile long * const dest, const long exch) +{ + long a; + + __asm__ __volatile__ ( "swp %0, %2, [%1]" + : "=&r" (a) + : "r" (dest), "r" (exch)); + + return a; +} + static __inline__ __attribute__((always_inline)) char _InterlockedAnd8(volatile char * const value, const char mask) { char x;

1 0

[ros-arm-bringup] 32206: We now have the correct intrinsics for ARM. The ARM linkerscript is now created (copy of the x86 linker script). The kernel can now be linked.
by ros-arm-bringup＠svn.reactos.org 08 Feb '08

08 Feb '08

Author: ros-arm-bringup Date: Fri Feb 8 10:51:01 2008 New Revision: 32206 URL: http://svn.reactos.org/svn/reactos?rev=32206&view=rev Log: We now have the correct intrinsics for ARM. The ARM linkerscript is now created (copy of the x86 linker script). The kernel can now be linked. Modified: trunk/reactos/include/psdk/intrin_arm.h trunk/reactos/ntoskrnl/ntoskrnl_arm.lnk Modified: trunk/reactos/include/psdk/intrin_arm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin_arm.h?… ============================================================================== --- trunk/reactos/include/psdk/intrin_arm.h (original) +++ trunk/reactos/include/psdk/intrin_arm.h Fri Feb 8 10:51:01 2008 @@ -34,98 +34,195 @@ #define _ReadWriteBarrier() __sync_synchronize() -FORCEINLINE char _InterlockedCompareExchange8(volatile char * const Destination, const char Exchange, const char Comperand) -{ - return __sync_val_compare_and_swap(Destination, Comperand, Exchange); -} - -FORCEINLINE short _InterlockedCompareExchange16(volatile short * const Destination, const short Exchange, const short Comperand) -{ - return __sync_val_compare_and_swap(Destination, Comperand, Exchange); -} - -FORCEINLINE long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand) -{ - return __sync_val_compare_and_swap(Destination, Comperand, Exchange); -} - -FORCEINLINE long long _InterlockedCompareExchange64(volatile long long * const Destination, const long long Exchange, const long long Comperand) -{ - return __sync_val_compare_and_swap(Destination, Comperand, Exchange); -} - -FORCEINLINE void * _InterlockedCompareExchangePointer(void * volatile * const Destination, void * const Exchange, void * const Comperand) -{ - return __sync_val_compare_and_swap(Destination, Comperand, Exchange); -} - -FORCEINLINE long _InterlockedExchange(volatile long * const Target, const long Value) -{ - /* NOTE: __sync_lock_test_and_set would be an acquire barrier, so we force a full barrier */ - __sync_synchronize(); - return __sync_lock_test_and_set(Target, Value); -} - -FORCEINLINE void * _InterlockedExchangePointer(void * volatile * const Target, void * const Value) -{ - /* NOTE: ditto */ - __sync_synchronize(); - return __sync_lock_test_and_set(Target, Value); -} - -static __inline__ __attribute__((always_inline)) long _InterlockedExchangeAdd16(volatile short * const Addend, const short Value) -{ - return __sync_fetch_and_add(Addend, Value); -} - -FORCEINLINE long _InterlockedExchangeAdd(volatile long * const Addend, const long Value) -{ - return __sync_fetch_and_add(Addend, Value); -} - -FORCEINLINE char _InterlockedAnd8(volatile char * const value, const char mask) -{ - return __sync_fetch_and_and(value, mask); -} - -FORCEINLINE short _InterlockedAnd16(volatile short * const value, const short mask) -{ - return __sync_fetch_and_and(value, mask); -} - -FORCEINLINE long _InterlockedAnd(volatile long * const value, const long mask) -{ - return __sync_fetch_and_and(value, mask); -} - -FORCEINLINE char _InterlockedOr8(volatile char * const value, const char mask) -{ - return __sync_fetch_and_or(value, mask); -} - -FORCEINLINE short _InterlockedOr16(volatile short * const value, const short mask) -{ - return __sync_fetch_and_or(value, mask); -} - -FORCEINLINE long _InterlockedOr(volatile long * const value, const long mask) -{ - return __sync_fetch_and_or(value, mask); -} - -FORCEINLINE char _InterlockedXor8(volatile char * const value, const char mask) -{ - return __sync_fetch_and_xor(value, mask); -} - -FORCEINLINE short _InterlockedXor16(volatile short * const value, const short mask) -{ - return __sync_fetch_and_xor(value, mask); -} - -FORCEINLINE long _InterlockedXor(volatile long * const value, const long mask) -{ - return __sync_fetch_and_xor(value, mask); +static __inline__ __attribute__((always_inline)) long _InterlockedCompareExchange(volatile long * const dest, const long exch, const long comp) +{ + long a, b; + + __asm__ __volatile__ ( "0:\n\t" + "ldr %1, [%2]\n\t" + "cmp %1, %4\n\t" + "bne 1f\n\t" + "swp %0, %3, [%2]\n\t" + "cmp %0, %1\n\t" + "swpne %3, %0, [%2]\n\t" + "bne 0b\n\t" + "1:" + : "=&r" (a), "=&r" (b) + : "r" (dest), "r" (exch), "r" (comp) + : "cc", "memory"); + + return a; +} + +static __inline__ __attribute__((always_inline)) long _InterlockedExchangeAdd(volatile long * const dest, const long add) +{ + long a, b, c; + + __asm__ __volatile__ ( "0:\n\t" + "ldr %0, [%3]\n\t" + "add %1, %0, %4\n\t" + "swp %2, %1, [%3]\n\t" + "cmp %0, %2\n\t" + "swpne %1, %2, [%3]\n\t" + "bne 0b" + : "=&r" (a), "=&r" (b), "=&r" (c) + : "r" (dest), "r" (add) + : "cc", "memory"); + + return a; +} + +static __inline__ __attribute__((always_inline)) char _InterlockedAnd8(volatile char * const value, const char mask) +{ + char x; + char y; + + y = *value; + + do + { + x = y; + y = _InterlockedCompareExchange8(value, x & mask, x); + } + while(y != x); + + return y; +} + +static __inline__ __attribute__((always_inline)) short _InterlockedAnd16(volatile short * const value, const short mask) +{ + short x; + short y; + + y = *value; + + do + { + x = y; + y = _InterlockedCompareExchange16(value, x & mask, x); + } + while(y != x); + + return y; +} + +static __inline__ __attribute__((always_inline)) long _InterlockedAnd(volatile long * const value, const long mask) +{ + long x; + long y; + + y = *value; + + do + { + x = y; + y = _InterlockedCompareExchange(value, x & mask, x); + } + while(y != x); + + return y; +} + +static __inline__ __attribute__((always_inline)) char _InterlockedOr8(volatile char * const value, const char mask) +{ + char x; + char y; + + y = *value; + + do + { + x = y; + y = _InterlockedCompareExchange8(value, x | mask, x); + } + while(y != x); + + return y; +} + +static __inline__ __attribute__((always_inline)) short _InterlockedOr16(volatile short * const value, const short mask) +{ + short x; + short y; + + y = *value; + + do + { + x = y; + y = _InterlockedCompareExchange16(value, x | mask, x); + } + while(y != x); + + return y; +} + +static __inline__ __attribute__((always_inline)) long _InterlockedOr(volatile long * const value, const long mask) +{ + long x; + long y; + + y = *value; + + do + { + x = y; + y = _InterlockedCompareExchange(value, x | mask, x); + } + while(y != x); + + return y; +} + +static __inline__ __attribute__((always_inline)) char _InterlockedXor8(volatile char * const value, const char mask) +{ + char x; + char y; + + y = *value; + + do + { + x = y; + y = _InterlockedCompareExchange8(value, x ^ mask, x); + } + while(y != x); + + return y; +} + +static __inline__ __attribute__((always_inline)) short _InterlockedXor16(volatile short * const value, const short mask) +{ + short x; + short y; + + y = *value; + + do + { + x = y; + y = _InterlockedCompareExchange16(value, x ^ mask, x); + } + while(y != x); + + return y; +} + +static __inline__ __attribute__((always_inline)) long _InterlockedXor(volatile long * const value, const long mask) +{ + long x; + long y; + + y = *value; + + do + { + x = y; + y = _InterlockedCompareExchange(value, x ^ mask, x); + } + while(y != x); + + return y; } static __inline__ __attribute__((always_inline)) long _InterlockedDecrement(volatile long * const lpAddend) Modified: trunk/reactos/ntoskrnl/ntoskrnl_arm.lnk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_arm.lnk?… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl_arm.lnk (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_arm.lnk Fri Feb 8 10:51:01 2008 @@ -1,0 +1,105 @@ +OUTPUT_FORMAT(pei-arm-wince-little) +ENTRY(_mainCRTStartup) +SECTIONS +{ + .text __image_base__ + __section_alignment__ : + { + __text_start__ = .; + *(.init) + *(.text) + *(SORT(.text$*)) + *(.glue_7t) + *(.glue_7) + ___CTOR_LIST__ = .; __CTOR_LIST__ = . ; + LONG (-1); *(.ctors); *(.ctor); LONG (0); + ___DTOR_LIST__ = .; __DTOR_LIST__ = . ; + LONG (-1); *(.dtors); *(.dtor); LONG (0); + *(.fini) + /* ??? Why is .gcc_exc here? */ + *(.gcc_exc) + __text_end__ = .; + *(.gcc_except_table) + } + init BLOCK(__section_alignment__) : + { + __init_start__ = . ; + *(init) + __init_end__ = . ; + } + /* The Cygwin32 library uses a section to avoid copying certain data + on fork. This used to be named ".data". The linker used + to include this between __data_start__ and __data_end__, but that + breaks building the cygwin32 dll. Instead, we name the section + ".data_cygwin_nocopy" and explictly include it after __data_end__. */ + .data BLOCK(__section_alignment__) : + { + __data_start__ = . ; + *(.data) + *(.data2) + *(SORT(.data$*)) + __data_end__ = . ; + *(.data_cygwin_nocopy) + } + .rdata BLOCK(__section_alignment__) : + { + *(.rdata) + *(SORT(.rdata$*)) + *(.eh_frame) + } + .edata BLOCK(__section_alignment__) : + { + *(.edata) + } + /DISCARD/ : + { + *(.debug$S) + *(.debug$T) + *(.debug$F) + *(.drectve) + } + + .idata BLOCK(__section_alignment__) : + { + /* This cannot currently be handled with grouped sections. + See pe.em:sort_sections. */ + SORT(*)(.idata$2) + SORT(*)(.idata$3) + /* These zeroes mark the end of the import list. */ + LONG (0); LONG (0); LONG (0); LONG (0); LONG (0); + SORT(*)(.idata$4) + SORT(*)(.idata$5) + SORT(*)(.idata$6) + SORT(*)(.idata$7) + } + .CRT BLOCK(__section_alignment__) : + { + *(SORT(.CRT$*)) + } + .rsrc BLOCK(__section_alignment__) : + { + *(.rsrc) + *(SORT(.rsrc$*)) + } + .bss BLOCK(__section_alignment__) : + { + __bss_start__ = . ; + *(.bss) + *(COMMON) + __bss_end__ = . ; + } + .reloc BLOCK(__section_alignment__) : + { + *(.reloc) + /* These zeroes mark the end of the reloc section. */ + LONG (0); LONG (0); LONG (0); LONG (0); LONG (0); + } + .stab BLOCK(__section_alignment__) (NOLOAD) : + { + [ .stab ] + } + .stabstr BLOCK(__section_alignment__) (NOLOAD) : + { + [ .stabstr ] + } +} +

1 0

[ros-arm-bringup] 32205: We no longer generate broken kernel-mode system call stubs. We now have per-architecture definition files, since stdcall differences between the architectures cannot be fixed (tried a combination of --kill-at, which is ignored, and -add-stdcall-alias and --enable-stdcall-fixup. This is the same problem that breaks MSVC builds, according to Alex.) Fixed KeRaiseIrqlToSynchLevel. Added an arm directory in /ke where we have all the stubs for non-implemented ARM routines. We
by ros-arm-bringup＠svn.reactos.org 08 Feb '08

08 Feb '08

Author: ros-arm-bringup Date: Fri Feb 8 09:07:47 2008 New Revision: 32205 URL: http://svn.reactos.org/svn/reactos?rev=32205&view=rev Log: We no longer generate broken kernel-mode system call stubs. We now have per-architecture definition files, since stdcall differences between the architectures cannot be fixed (tried a combination of --kill-at, which is ignored, and -add-stdcall-alias and --enable-stdcall-fixup. This is the same problem that breaks MSVC builds, according to Alex.) Fixed KeRaiseIrqlToSynchLevel. Added an arm directory in /ke where we have all the stubs for non-implemented ARM routines. We can now build almost the entire kernel and link it. We now use intrinsics to export the Interlocked* APIs, for the ARM build. Recommend doing this for x86 too. Hal and bootvid build and link. Added: trunk/reactos/drivers/base/bootvid/bootvid_arm.def (with props) trunk/reactos/drivers/base/bootvid/bootvid_i386.def - copied unchanged from r32201, trunk/reactos/drivers/base/bootvid/bootvid.def trunk/reactos/hal/hal/hal_arm.def (with props) trunk/reactos/hal/hal/hal_i386.def - copied unchanged from r32201, trunk/reactos/hal/hal/hal.def trunk/reactos/ntoskrnl/include/internal/arm/asmmacro.S (with props) trunk/reactos/ntoskrnl/ke/arm/ trunk/reactos/ntoskrnl/ke/arm/stubs.c (with props) trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s (with props) trunk/reactos/ntoskrnl/ntoskrnl_arm.def (with props) trunk/reactos/ntoskrnl/ntoskrnl_arm.lnk (with props) trunk/reactos/ntoskrnl/ntoskrnl_i386.def - copied unchanged from r32201, trunk/reactos/ntoskrnl/ntoskrnl.def Removed: trunk/reactos/drivers/base/bootvid/bootvid.def trunk/reactos/hal/hal/hal.def trunk/reactos/ntoskrnl/ntoskrnl.def Modified: trunk/reactos/drivers/base/bootvid/bootvid.rbuild trunk/reactos/hal/hal/hal.rbuild trunk/reactos/hal/halx86/directory.rbuild trunk/reactos/include/reactos/armddk.h trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h trunk/reactos/ntoskrnl/ntoskrnl.rbuild trunk/reactos/tools/nci/ncitool.c [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/drivers/base/bootvid/bootvid.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… Modified: trunk/reactos/drivers/base/bootvid/bootvid.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… Added: trunk/reactos/drivers/base/bootvid/bootvid_arm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… Removed: trunk/reactos/hal/hal/hal.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.def?rev=32204&… Modified: trunk/reactos/hal/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.rbuild?rev=322… Added: trunk/reactos/hal/hal/hal_arm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal_arm.def?rev=32… Modified: trunk/reactos/hal/halx86/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/directory.rbuil… Modified: trunk/reactos/include/reactos/armddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/armddk.h?r… Added: trunk/reactos/ntoskrnl/include/internal/arm/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Added: trunk/reactos/ntoskrnl/ke/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/stubs.c?re… Added: trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/stubs_asm.… Removed: trunk/reactos/ntoskrnl/ntoskrnl.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.def?rev=… Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… Added: trunk/reactos/ntoskrnl/ntoskrnl_arm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_arm.def?… Added: trunk/reactos/ntoskrnl/ntoskrnl_arm.lnk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_arm.lnk?… Modified: trunk/reactos/tools/nci/ncitool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/ncitool.c?rev=32…

1 0

[tkreuzer] 32204: - allow translation of strings in usetup - so far most strings are still hardcoded, but the needed functionality is in place
by tkreuzer＠svn.reactos.org 08 Feb '08

08 Feb '08

Author: tkreuzer Date: Fri Feb 8 07:14:09 2008 New Revision: 32204 URL: http://svn.reactos.org/svn/reactos?rev=32204&view=rev Log: - allow translation of strings in usetup - so far most strings are still hardcoded, but the needed functionality is in place Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/mui.c trunk/reactos/base/setup/usetup/mui.h Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Fri Feb 8 07:14:09 2008 @@ -1370,11 +1370,11 @@ if (PartitionList->CurrentPartition == NULL || PartitionList->CurrentPartition->Unpartitioned == TRUE) { - CONSOLE_SetStatusText (" ENTER = Install C = Create Partition F3 = Quit"); + CONSOLE_SetStatusText (MUIGetString(STRING_INSTALLCREATEPARTITION)); } else { - CONSOLE_SetStatusText (" ENTER = Install D = Delete Partition F3 = Quit"); + CONSOLE_SetStatusText (MUIGetString(STRING_INSTALLDELETEPARTITION)); } CONSOLE_ConInKey(Ir); @@ -1495,7 +1495,7 @@ /* Print message */ coPos.X = Left + 2; coPos.Y = Top + 2; - strcpy (Buffer, "Size of new partition:"); + strcpy (Buffer, MUIGetString(STRING_PARTITIONSIZE)); iLeft = coPos.X + strlen (Buffer) + 1; iTop = coPos.Y; @@ -1604,9 +1604,9 @@ DiskEntry = PartitionList->CurrentDisk; PartEntry = PartitionList->CurrentPartition; - CONSOLE_SetStatusText (" Please wait..."); - - CONSOLE_SetTextXY (6, 8, "You have chosen to create a new partition on"); + CONSOLE_SetStatusText (MUIGetString(STRING_PLEASEWAIT)); + + CONSOLE_SetTextXY (6, 8, MUIGetString(STRING_CHOOSENEWPARTITION)); #if 0 if (DiskEntry->DiskSize >= 0x280000000ULL) /* 10 GB */ @@ -1656,7 +1656,7 @@ PartitionList->CurrentPartition->UnpartitionedLength / (1024*1024)); #endif - CONSOLE_SetStatusText (" ENTER = Create Partition ESC = Cancel F3 = Quit"); + CONSOLE_SetStatusText (MUIGetString(STRING_CREATEPARTITION)); PartEntry = PartitionList->CurrentPartition; while (TRUE) @@ -2785,7 +2785,7 @@ { MUIDisplayError(ERROR_TXTSETUP_SECTION, Ir, POPUP_WAIT_ENTER); } - + return FALSE; } @@ -2979,7 +2979,7 @@ case SPFILENOTIFY_STARTCOPY: /* Display copy message */ - CONSOLE_SetStatusText(" \xB3 Copying file: %S", (PWSTR)Param1); + CONSOLE_SetStatusText(MUIGetString(STRING_COPYING), (PWSTR)Param1); SetupUpdateMemoryInfo(CopyContext, FALSE); break; @@ -3015,7 +3015,7 @@ 10, 24, TRUE, - "Setup is copying files..."); + MUIGetString(STRING_SETUPCOPYINGFILES)); /* Create the paged pool progress bar */ CopyContext.MemoryBars[0] = CreateProgressBar(13, @@ -3025,7 +3025,7 @@ 10, 44, FALSE, - "Paged Memory"); + MUIGetString(STRING_PAGEDMEM)); /* Create the non paged pool progress bar */ CopyContext.MemoryBars[1] = CreateProgressBar(28, @@ -3035,7 +3035,7 @@ 24, 44, FALSE, - "Nonpaged Memory"); + MUIGetString(STRING_NONPAGEDMEM)); /* Create the global memory progress bar */ CopyContext.MemoryBars[2] = CreateProgressBar(43, @@ -3045,7 +3045,7 @@ 40, 44, FALSE, - "Free Memory"); + MUIGetString(STRING_FREEMEM)); /* Do the file copying */ SetupCommitFileQueueW(NULL, Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h Fri Feb 8 07:14:09 2008 @@ -1574,4 +1574,31 @@ } }; +MUI_STRING deDEStrings[] = +{ + {STRING_INSTALLCREATEPARTITION, + " ENTER = Installieren C = Partition erstellen F3 = Beenden"}, + {STRING_INSTALLDELETEPARTITION, + " ENTER = Installieren D = Partition löschen F3 = Beenden"}, + {STRING_PARTITIONSIZE, + "Größe der neuen Partition:"}, + {STRING_PLEASEWAIT, + " Bitte warten..."}, + {STRING_CHOOSENEWPARTITION, + "Sie haben beschlossen eine neue Partition zu erstellen auf"}, + {STRING_CREATEPARTITION, + " ENTER = Partition erstelln ESC = Abbruch F3 = Beenden"}, + {STRING_COPYING, + " \xB3 Kopiere Datei: %S"}, + {STRING_SETUPCOPYINGFILES, + "Setup kopiert Dateien..."}, + {STRING_PAGEDMEM, + "Paged Memory"}, + {STRING_NONPAGEDMEM, + "Nonpaged Memory"}, + {STRING_FREEMEM, + "Free Memory"}, + {0, 0} +}; + #endif Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h Fri Feb 8 07:14:09 2008 @@ -1568,4 +1568,31 @@ } }; +MUI_STRING enUSStrings[] = +{ + {STRING_INSTALLCREATEPARTITION, + " ENTER = Install C = Create Partition F3 = Quit"}, + {STRING_INSTALLDELETEPARTITION, + " ENTER = Install D = Delete Partition F3 = Quit"}, + {STRING_PARTITIONSIZE, + "Size of new partition:"}, + {STRING_PLEASEWAIT, + " Please wait..."}, + {STRING_CHOOSENEWPARTITION, + "You have chosen to create a new partition on"}, + {STRING_CREATEPARTITION, + " ENTER = Create Partition ESC = Cancel F3 = Quit"}, + {STRING_COPYING, + " \xB3 Copying file: %S"}, + {STRING_SETUPCOPYINGFILES, + "Setup is copying files..."}, + {STRING_PAGEDMEM, + "Paged Memory"}, + {STRING_NONPAGEDMEM, + "Nonpaged Memory"}, + {STRING_FREEMEM, + "Free Memory"}, + {0, 0} +}; + #endif Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c (original) +++ trunk/reactos/base/setup/usetup/mui.c Fri Feb 8 07:14:09 2008 @@ -21,7 +21,7 @@ * PROJECT: ReactOS text-mode setup * FILE: subsys/system/usetup/mui.c * PURPOSE: Text-mode setup - * PROGRAMMER: + * PROGRAMMER: */ #include "usetup.h" @@ -48,32 +48,32 @@ static const MUI_LANGUAGE LanguageList[] = { /* Lang ID, DefKbdLayout,ANSI CP, OEM CP, MAC CP, Language Name, page strgs,error strings */ - {L"00000409", L"00000409", L"1252", L"437", L"10000", L"English", enUSPages, enUSErrorEntries }, - {L"00000402", L"00000402", L"1251", L"866", L"10007", L"Bulgarian", bgBGPages, bgBGErrorEntries }, - {L"00000403", L"00000403", L"1252", L"850", L"10000", L"Catalan", enUSPages, enUSErrorEntries }, - {L"00000804", L"00000804", L"936", L"936", L"10008", L"Chinese (PRC)", enUSPages, enUSErrorEntries }, - {L"00000406", L"00000406", L"1252", L"850", L"10000", L"Danish", enUSPages, enUSErrorEntries }, - {L"00000413", L"00000813", L"1252", L"850", L"10000", L"Dutch", enUSPages, enUSErrorEntries }, - {L"0000040B", L"0000040B", L"1252", L"850", L"10000", L"Finnish", enUSPages, enUSErrorEntries }, - {L"0000040C", L"0000040C", L"1252", L"850", L"10000", L"French", frFRPages, frFRErrorEntries }, - {L"00000407", L"00000407", L"1252", L"850", L"10000", L"German", deDEPages, deDEErrorEntries }, - {L"00000408", L"00000408", L"1253", L"737", L"10006", L"Greek", elGRPages, elGRErrorEntries }, - {L"0000040D", L"0000040D", L"1255", L"862", L"10005", L"Hebrew", enUSPages, enUSErrorEntries }, - {L"0000040E", L"0000040E", L"1250", L"852", L"10029", L"Hungarian", enUSPages, enUSErrorEntries }, - {L"00000410", L"00000410", L"1252", L"850", L"10000", L"Italian", itITPages, itITErrorEntries }, - {L"00000411", L"00000411", L"932", L"932", L"10001", L"Japanese", enUSPages, enUSErrorEntries }, - {L"00000412", L"00000412", L"949", L"949", L"10003", L"Korean", enUSPages, enUSErrorEntries }, - {L"00000427", L"00000427", L"1257", L"775", L"10029", L"Lithuanian", ltLTPages, ltLTErrorEntries }, - {L"00000414", L"00000414", L"1252", L"850", L"10000", L"Norwegian", enUSPages, enUSErrorEntries }, - {L"00000419", L"00000419", L"1251", L"866", L"10007", L"Russian", ruRUPages, ruRUErrorEntries }, - {L"0000041B", L"0000041B", L"1250", L"852", L"10029", L"Slovak", skSKPages, skSKErrorEntries }, - {L"0000040A", L"0000040A", L"1252", L"850", L"10000", L"Spanish", esESPages, esESErrorEntries }, - {L"00000415", L"00000415", L"1250", L"852", L"10029", L"Polish", plPLPages, plPLErrorEntries }, - {L"00000816", L"00000816", L"1252", L"850", L"10000", L"Portuguese", enUSPages, enUSErrorEntries }, - {L"0000041D", L"0000041D", L"1252", L"850", L"10000", L"Swedish", svSEPages, svSEErrorEntries }, - {L"0000041E", L"0000041E", L"874", L"874", L"10021", L"Thai", enUSPages, enUSErrorEntries }, - {L"0000041F", L"0000041F", L"1254", L"857", L"10081", L"Turkish", enUSPages, enUSErrorEntries }, - {L"00000422", L"00000422", L"1251", L"866", L"10017", L"Ukrainian", ukUAPages, ukUAErrorEntries }, + {L"00000409", L"00000409", L"1252", L"437", L"10000", L"English", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000402", L"00000402", L"1251", L"866", L"10007", L"Bulgarian", bgBGPages, bgBGErrorEntries, enUSStrings }, + {L"00000403", L"00000403", L"1252", L"850", L"10000", L"Catalan", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000804", L"00000804", L"936", L"936", L"10008", L"Chinese (PRC)", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000406", L"00000406", L"1252", L"850", L"10000", L"Danish", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000413", L"00000813", L"1252", L"850", L"10000", L"Dutch", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000040B", L"0000040B", L"1252", L"850", L"10000", L"Finnish", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000040C", L"0000040C", L"1252", L"850", L"10000", L"French", frFRPages, frFRErrorEntries, enUSStrings }, + {L"00000407", L"00000407", L"1252", L"850", L"10000", L"German", deDEPages, deDEErrorEntries, deDEStrings }, + {L"00000408", L"00000408", L"1253", L"737", L"10006", L"Greek", elGRPages, elGRErrorEntries, enUSStrings }, + {L"0000040D", L"0000040D", L"1255", L"862", L"10005", L"Hebrew", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000040E", L"0000040E", L"1250", L"852", L"10029", L"Hungarian", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000410", L"00000410", L"1252", L"850", L"10000", L"Italian", itITPages, itITErrorEntries, enUSStrings }, + {L"00000411", L"00000411", L"932", L"932", L"10001", L"Japanese", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000412", L"00000412", L"949", L"949", L"10003", L"Korean", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000427", L"00000427", L"1257", L"775", L"10029", L"Lithuanian", ltLTPages, ltLTErrorEntries, enUSStrings }, + {L"00000414", L"00000414", L"1252", L"850", L"10000", L"Norwegian", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000419", L"00000419", L"1251", L"866", L"10007", L"Russian", ruRUPages, ruRUErrorEntries, enUSStrings }, + {L"0000041B", L"0000041B", L"1250", L"852", L"10029", L"Slovak", skSKPages, skSKErrorEntries, enUSStrings }, + {L"0000040A", L"0000040A", L"1252", L"850", L"10000", L"Spanish", esESPages, esESErrorEntries, enUSStrings }, + {L"00000415", L"00000415", L"1250", L"852", L"10029", L"Polish", plPLPages, plPLErrorEntries, enUSStrings }, + {L"00000816", L"00000816", L"1252", L"850", L"10000", L"Portuguese", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000041D", L"0000041D", L"1252", L"850", L"10000", L"Swedish", svSEPages, svSEErrorEntries, enUSStrings }, + {L"0000041E", L"0000041E", L"874", L"874", L"10021", L"Thai", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000041F", L"0000041F", L"1254", L"857", L"10081", L"Turkish", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000422", L"00000422", L"1251", L"866", L"10017", L"Ukrainian", ukUAPages, ukUAErrorEntries, enUSStrings }, {NULL, NULL, NULL, NULL, NULL} }; @@ -131,6 +131,28 @@ { /* Get all available error messages for this language */ return LanguageList[lngIndex].MuiErrors; + } + + lngIndex++; + } + while (LanguageList[lngIndex].MuiPages != NULL); + + return NULL; +} + +static +const MUI_STRING * +FindMUIStringEntries(VOID) +{ + ULONG lngIndex = 0; + + do + { + /* First we search the language list till we find current selected language messages */ + if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) + { + /* Get all available strings for this language */ + return LanguageList[lngIndex].MuiStrings; } lngIndex++; @@ -234,6 +256,32 @@ WaitEvent); } +LPSTR +MUIGetString(ULONG Number) +{ + ULONG i; + const MUI_STRING * entry; + + entry = FindMUIStringEntries(); + if (entry) + { + for (i = 0; entry[i].Number != 0; i++) + { + if (entry[i].Number == Number) + { + return entry[i].String; + } + } + } + + PopupError("Error: Failed to find translated string", + NULL, + NULL, + POPUP_WAIT_NONE); + + return "<nostring>"; +} + static BOOLEAN AddCodepageToRegistry(IN LPCWSTR ACPage, IN LPCWSTR OEMCPage, IN LPCWSTR MACCPage) { Modified: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.h (original) +++ trunk/reactos/base/setup/usetup/mui.h Fri Feb 8 07:14:09 2008 @@ -23,6 +23,12 @@ typedef struct { + LONG Number; + LPSTR String; +} MUI_STRING; + +typedef struct +{ PWCHAR LanguageID; PWCHAR LanguageKeyboardLayoutID; PWCHAR ACPage; @@ -31,6 +37,7 @@ PWCHAR LanguageDescriptor; const MUI_PAGE * MuiPages; const MUI_ERROR * MuiErrors; + const MUI_STRING * MuiStrings; }MUI_LANGUAGE; @@ -59,4 +66,20 @@ VOID SetConsoleCodePage(VOID); +LPSTR +MUIGetString(ULONG Number); + +#define STRING_INSTALLCREATEPARTITION 1 +#define STRING_INSTALLDELETEPARTITION 2 +#define STRING_CREATEPARTITION 3 +#define STRING_PARTITIONSIZE 4 +#define STRING_PLEASEWAIT 5 +#define STRING_CHOOSENEWPARTITION 6 +#define STRING_COPYING 7 +#define STRING_SETUPCOPYINGFILES 8 +#define STRING_PAGEDMEM 9 +#define STRING_NONPAGEDMEM 10 +#define STRING_FREEMEM 11 + + #endif

1 0

[tkreuzer] 32203: patch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com): remove obsolete syscalls NtUserGetDesktopWindow and NtUserGetParent
by tkreuzer＠svn.reactos.org 08 Feb '08

08 Feb '08

Author: tkreuzer Date: Fri Feb 8 04:45:54 2008 New Revision: 32203 URL: http://svn.reactos.org/svn/reactos?rev=32203&view=rev Log: patch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com): remove obsolete syscalls NtUserGetDesktopWindow and NtUserGetParent Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Fri Feb 8 04:45:54 2008 @@ -475,9 +475,6 @@ BOOL NTAPI NtUserGetClientOrigin(HWND hWnd, LPPOINT Point); - -HWND NTAPI -NtUserGetDesktopWindow(); NTSTATUS NTAPI @@ -2545,9 +2542,6 @@ NtUserGetQueueStatus(BOOL ClearChanges); HWND NTAPI -NtUserGetParent(HWND hWnd); - -HWND NTAPI NtUserGetWindow(HWND hWnd, UINT Relationship); HWND NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c Fri Feb 8 04:45:54 2008 @@ -2963,26 +2963,6 @@ /* - * @implemented - */ -HWND STDCALL -NtUserGetDesktopWindow() -{ - DECLARE_RETURN(HWND); - - DPRINT("Enter NtUserGetDesktopWindow\n"); - UserEnterShared(); - - RETURN( IntGetDesktopWindow()); - -CLEANUP: - DPRINT("Leave NtUserGetDesktopWindow, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} - - -/* * @unimplemented */ DWORD STDCALL @@ -3049,52 +3029,6 @@ UserLeave(); END_CLEANUP; } - - -/* - * NtUserGetParent - * - * The NtUserGetParent function retrieves a handle to the specified window's - * parent or owner. - * - * Remarks - * Note that, despite its name, this function can return an owner window - * instead of a parent window. - * - * Status - * @implemented - */ - -HWND STDCALL -NtUserGetParent(HWND hWnd) -{ - PWINDOW_OBJECT Wnd, WndParent; - HWND hWndParent = NULL; - DECLARE_RETURN(HWND); - - DPRINT("Enter NtUserGetParent\n"); - UserEnterExclusive(); - - if (!(Wnd = UserGetWindowObject(hWnd))) - { - RETURN( NULL); - } - - WndParent = IntGetParent(Wnd); - if (WndParent) - { - hWndParent = WndParent->hSelf; - } - - RETURN( hWndParent); - -CLEANUP: - DPRINT("Leave NtUserGetParent, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} - - HWND FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Fri Feb 8 04:45:54 2008 @@ -680,8 +680,10 @@ NtGdiSetWindowExtEx 4 NtGdiSetWindowOrgEx 4 NtGdiStretchDIBits 13 +NtUserAcquireOrReleaseInputOwnership 1 NtUserBuildMenuItemList 4 NtUserCreateCursorIconHandle 2 +NtUserDereferenceWndProcHandle 2 NtUserEnumClipboardFormats 1 NtUserGetActiveWindow 0 NtUserGetCapture 0 @@ -689,16 +691,22 @@ NtUserGetClientOrigin 2 NtUserGetClientRect 2 NtUserGetMenuDefaultItem 3 +NtUserGetLastActivePopup 1 NtUserGetLastInputInfo 1 NtUserGetMinMaxInfo 3 NtUserGetMonitorInfo 2 NtUserGetProp 2 +NtUserGetQueueStatus 1 NtUserGetScrollInfo 3 +NtUserGetShellWindow 0 NtUserGetSystemMetrics 1 +NtUserGetWindow 2 NtUserGetWindowLong 3 NtUserGetWindowRect 2 +NtUserGetWindowThreadProcessId 2 NtUserInsertMenuItem 4 NtUserKillSystemTimer 2 +NtUserManualGuiCheck 1 NtUserMenuInfo 3 NtUserMenuItemInfo 5 NtUserMonitorFromPoint 3 @@ -711,21 +719,9 @@ NtUserSendMessageTimeout 8 NtUserSendNotifyMessage 4 NtUserSetScrollBarInfo 3 -NtUserGetDesktopWindow 0 NtGdiAddFontResource 2 NtGdiCreateDIBitmap 6 NtGdiGetAspectRatioFilterEx 2 NtGdiGetFontFamilyInfo 4 NtGdiOffsetViewportOrgEx 4 NtGdiOffsetWindowOrgEx 4 -# -# ReactOS only system calls -NtUserAcquireOrReleaseInputOwnership 1 -NtUserGetWindowThreadProcessId 2 -NtUserGetQueueStatus 1 -NtUserGetParent 1 -NtUserGetWindow 2 -NtUserGetLastActivePopup 1 -NtUserGetShellWindow 0 -NtUserDereferenceWndProcHandle 2 -NtUserManualGuiCheck 1

1 0

[tkreuzer] 32202: fix a typo
by tkreuzer＠svn.reactos.org 08 Feb '08

08 Feb '08

Author: tkreuzer Date: Fri Feb 8 03:18:45 2008 New Revision: 32202 URL: http://svn.reactos.org/svn/reactos?rev=32202&view=rev Log: fix a typo Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.def Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dbghelp.def (original) +++ trunk/reactos/dll/win32/dbghelp/dbghelp.def Fri Feb 8 03:18:45 2008 @@ -1,4 +1,4 @@ -; $Id: w32kdll.def 27344 2007-08-01 14:12:10Z tkreuzer $ +; $Id: dbghelp.def 27344 2007-08-01 14:12:10Z tkreuzer $ ; ; ReactOS Operating System ;

1 0

[dreimer] 32201: Bug 3033: patch for packmgr (kario@szm.sk) Bug 3039: Ukrainian translation update (temarez@yandex.ru) Bug 3041: Bulgarian translation of ReactOS. (sstpr@narod.ru)
by dreimer＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: dreimer Date: Fri Feb 8 00:23:46 2008 New Revision: 32201 URL: http://svn.reactos.org/svn/reactos?rev=32201&view=rev Log: Bug 3033: patch for packmgr (kario(a)szm.sk) Bug 3039: Ukrainian translation update (temarez(a)yandex.ru) Bug 3041: Bulgarian translation of ReactOS. (sstpr(a)narod.ru) Added: trunk/reactos/base/applications/cmdutils/xcopy/Bg.rc (with props) trunk/reactos/base/applications/msconfig/lang/sk-SK.rc (with props) trunk/reactos/dll/cpl/access/lang/bg-BG.rc (with props) trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc (with props) trunk/reactos/dll/cpl/main/lang/sk-SK.rc (with props) trunk/reactos/dll/cpl/telephon/lang/sk-SK.rc (with props) trunk/reactos/dll/win32/netid/lang/bg-BG.rc (with props) trunk/reactos/dll/win32/rasapi32/lang/bg-BG.rc (with props) trunk/reactos/dll/win32/serialui/lang/bg-BG.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc trunk/reactos/base/applications/control/lang/bg-BG.rc trunk/reactos/base/applications/msconfig/rsrc.rc trunk/reactos/base/applications/notepad/lang/bg-BG.rc trunk/reactos/base/applications/winhelp/lang/bg-BG.rc trunk/reactos/base/setup/reactos/lang/sk-SK.rc trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/system/format/lang/bg-BG.rc trunk/reactos/dll/cpl/access/rsrc.rc trunk/reactos/dll/cpl/desk/lang/sk-SK.rc trunk/reactos/dll/cpl/hdwwiz/rsrc.rc trunk/reactos/dll/cpl/main/rsrc.rc trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc trunk/reactos/dll/cpl/telephon/rsrc.rc trunk/reactos/dll/win32/netid/rsrc.rc trunk/reactos/dll/win32/rasapi32/rsrc.rc trunk/reactos/dll/win32/serialui/serialui.rc trunk/reactos/dll/win32/shdocvw/Bg.rc trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/base/applications/cmdutils/xcopy/Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/control/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… Added: trunk/reactos/base/applications/msconfig/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/notepad/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/winhelp/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Modified: trunk/reactos/base/setup/reactos/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/sk… Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-… Modified: trunk/reactos/base/system/format/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/bg… Added: trunk/reactos/dll/cpl/access/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/bg-BG.… Modified: trunk/reactos/dll/cpl/access/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/rsrc.rc?rev… Modified: trunk/reactos/dll/cpl/desk/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sk-SK.rc… Added: trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.… Modified: trunk/reactos/dll/cpl/hdwwiz/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/rsrc.rc?rev… Added: trunk/reactos/dll/cpl/main/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/sk-SK.rc… Modified: trunk/reactos/dll/cpl/main/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/rsrc.rc?rev=3… Modified: trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/uk-UA.r… Added: trunk/reactos/dll/cpl/telephon/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/sk-S… Modified: trunk/reactos/dll/cpl/telephon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/rsrc.rc?r… Added: trunk/reactos/dll/win32/netid/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/bg-BG… Modified: trunk/reactos/dll/win32/netid/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/rsrc.rc?re… Added: trunk/reactos/dll/win32/rasapi32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasapi32/lang/bg… Modified: trunk/reactos/dll/win32/rasapi32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasapi32/rsrc.rc… Added: trunk/reactos/dll/win32/serialui/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/lang/bg… Modified: trunk/reactos/dll/win32/serialui/serialui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/serialu… Modified: trunk/reactos/dll/win32/shdocvw/Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Bg.rc?re… Modified: trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/bg…

1 0

[dreimer] 32200: Bug 3033: patch for packmgr (kario@szm.sk) Bug 3039: Ukrainian translation update (temarez@yandex.ru) Bug 3041: Bulgarian translation of ReactOS. (sstpr@narod.ru)
by dreimer＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: dreimer Date: Fri Feb 8 00:22:04 2008 New Revision: 32200 URL: http://svn.reactos.org/svn/reactos?rev=32200&view=rev Log: Bug 3033: patch for packmgr (kario(a)szm.sk) Bug 3039: Ukrainian translation update (temarez(a)yandex.ru) Bug 3041: Bulgarian translation of ReactOS. (sstpr(a)narod.ru) Added: trunk/rosapps/imagesoft/lang/sk-SK.rc (with props) trunk/rosapps/packmgr/gui/lang/sk-SK.rc (with props) Modified: trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc trunk/rosapps/imagesoft/rsrc.rc trunk/rosapps/packmgr/gui/packmgr.rc Modified: trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc Fri Feb 8 00:22:04 2008 @@ -15,7 +15,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_MAIN, IDC_STATIC, 10, 10, 20, 20 - LTEXT "ReactOS VGA Font Editor", IDC_STATIC, 37, 10, 93, 10 + LTEXT "Ðåäàêòîð VGA-øðèôò³â ReactOS", IDC_STATIC, 37, 10, 93, 10 LTEXT "Copyright 2008 Colin Finck", IDC_STATIC, 37, 20, 93, 10 DEFPUSHBUTTON "OK", IDCANCEL, 40, 44, 55, 15 END @@ -65,8 +65,8 @@ STRINGTABLE BEGIN - IDS_OPENFILTER, "Âñ³ ï³äòðèìóâàí³ ôîðìàòè (*.bin,*.psf)|*.bin;*.psf|Ôàéëè äâ³éêîâèõ øðèôò³â (*.bin)|*.bin|Åêðàíí³ Øðèôòè ÏÊ Âåðñ³¿ 1 (*.psf)|*.psf|" - IDS_SAVEFILTER, "Ôàéëè äâ³éêîâèõ øðèôò³â (*.bin)|*.bin|" + IDS_OPENFILTER, "Âñ³ ï³äòðèìóâàí³ ôîðìàòè (*.bin,*.psf)|*.bin;*.psf|Äâ³éêîâ³ ôàéëè øðèôò³â (*.bin)|*.bin|Åêðàíí³ øðèôòè ÏÊ âåðñ³¿ 1 (*.psf)|*.psf|" + IDS_SAVEFILTER, "Äâ³éêîâ³ ôàéëè øðèôò³â (*.bin)|*.bin|" IDS_OPENERROR, "Ïîìèëêà ïðè â³äêðèòò³ ôàéëó! (Íîìåð ïîìèëêè %1!u!)" IDS_READERROR, "Ïîìèëêà ïðè ÷èòàíí³ ôàéëó! (Íîìåð ïîìèëêè %1!u!)" IDS_WRITEERROR, "Ïîìèëêà ïðè çàïèñó ôàéëó! (Íîìåð ïîìèëêè %1!u!)" @@ -74,7 +74,7 @@ IDS_UNSUPPORTEDPSF, "Íåï³äòðèìóâàíèé ôîðìàò PSF øðèôòà! Ðåäàêòîð ï³äòðèìóº ò³ëüêè øðèôòè 8x8 áåç ñïåö³àëüíèõ ðåæèì³â." IDS_DOCNAME, "Øðèôò %1!u!" IDS_SAVEPROMPT, "Ôàéë ""%1"" áóâ çì³íåíèé, àëå íå çáåðåæåíèé.\n\nÇáåðåãòè éîãî?" - IDS_APPTITLE, "ReactOS VGA Font Editor" + IDS_APPTITLE, "Ðåäàêòîð VGA-øðèôò³â ReactOS" IDS_CLOSEEDIT, "Please close all open Edit windows first!" IDS_TOOLTIP_NEW, "Ñòâîðèòè" Added: trunk/rosapps/imagesoft/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/imagesoft/lang/sk-SK.rc?re… ============================================================================== --- trunk/rosapps/imagesoft/lang/sk-SK.rc (added) +++ trunk/rosapps/imagesoft/lang/sk-SK.rc Fri Feb 8 00:22:04 2008 @@ -1,0 +1,240 @@ +/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR: 02-02-2008 + * ______________________________________________ + * NOTE: this file is not fully translated + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "ImageSoft" + IDS_VERSION "v0.1" +END + +IDR_MAINMENU MENU +BEGIN + POPUP "&Súbor" + BEGIN + MENUITEM "&Nový...", ID_NEW + MENUITEM "&Otvori...", ID_OPEN + MENUITEM SEPARATOR + MENUITEM "&Zatvori\tCtrl+F4", ID_CLOSE, GRAYED + MENUITEM "Zatvori &vetky", ID_CLOSEALL,GRAYED + MENUITEM SEPARATOR + MENUITEM "&Uloi", ID_SAVE, GRAYED + MENUITEM "Uloi &ako...", ID_SAVEAS, GRAYED + MENUITEM SEPARATOR + MENUITEM "Náh¾a&d pred tlaèou", ID_PRINTPRE,GRAYED + MENUITEM "&Tlaèi...", ID_PRINT, GRAYED + MENUITEM SEPARATOR + MENUITEM "V&lastnosti...", ID_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Skonèi\tAlt+F4", ID_EXIT + END + POPUP "&Úpravy" + BEGIN + MENUITEM "&Spä", ID_UNDO, GRAYED + MENUITEM "&Znova", ID_REDO, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Vystrihnú", ID_CUT, GRAYED + MENUITEM "&Kopírova", ID_COPY, GRAYED + MENUITEM "&Paste", ID_PASTE, GRAYED + MENUITEM "Paste as new &image", ID_PASTENEWIMAGE, GRAYED + MENUITEM SEPARATOR + MENUITEM "Vy&bra vetko", ID_SELALL, GRAYED + END + POPUP "&Zobrazi" + BEGIN + MENUITEM "&Nástroje", ID_TOOLS + MENUITEM "&Farby", ID_COLOR + MENUITEM "&História", ID_HISTORY + MENUITEM "Stavový &riadok", ID_STATUSBAR + END + POPUP "&Adjust" + BEGIN + MENUITEM "Jas...", ID_BRIGHTNESS + MENUITEM "Kontrast...", ID_CONTRAST + MENUITEM "Odtieò/Nasýtenie...", -1, GRAYED + POPUP "Color" + BEGIN + MENUITEM "Èierna a biela" ID_BLACKANDWHITE + MENUITEM "Invertova farby" ID_INVERTCOLORS + END + MENUITEM SEPARATOR + MENUITEM "Rozmaza", ID_BLUR + MENUITEM "Zaostri", ID_SHARPEN + MENUITEM "Vyhladi hrany", -1, GRAYED + MENUITEM "Prida tieò", -1, GRAYED + MENUITEM SEPARATOR + MENUITEM "Image Size...", -1, GRAYED + MENUITEM "Preklopi", -1, GRAYED + MENUITEM "Zrkadli", -1, GRAYED + MENUITEM "Otoèi", -1, GRAYED + + END + POPUP "&Farby" + BEGIN + MENUITEM "&Upravi farby...", ID_EDITCOLOURS + END + POPUP "&Okná" + BEGIN + MENUITEM "&Cascade", ID_WINDOW_CASCADE + MENUITEM "Tile &Horizontally", ID_WINDOW_TILE_HORZ + MENUITEM "Tile &Vertically", ID_WINDOW_TILE_VERT + MENUITEM "&Arrange Icons", ID_WINDOW_ARRANGE + MENUITEM SEPARATOR + MENUITEM "Nex&t\tCtrl+F6", ID_WINDOW_NEXT + END + POPUP "&Pomocník" + BEGIN + MENUITEM "È&o je...", ID_ABOUT + END +END + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + + MENUITEM SEPARATOR + + END +END + + +IDD_BRIGHTNESS DIALOGEX 6, 5, 193, 120 +CAPTION "Jas" +FONT 8,"MS Shell Dlg", 0, 0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "", IDC_PICPREVIEW, 0, 1, 132, 96, SS_OWNERDRAW | SS_SUNKEN + LTEXT "Color form:", IDC_STATIC, 135, 5, 36, 9 + GROUPBOX "", IDC_BRI_GROUP, 138 ,30, 50, 48 + CONTROL "Plné (RGB)", IDC_BRI_FULL, "Button", BS_AUTORADIOBUTTON, 138, 18, 46, 9 + CONTROL "Èervená", IDC_BRI_RED, "Button", BS_AUTORADIOBUTTON, 142, 38, 42, 9 + CONTROL "Zelená", IDC_BRI_GREEN, "Button", BS_AUTORADIOBUTTON, 142, 51, 42, 9 + CONTROL "Modrá", IDC_BRI_BLUE, "Button", BS_AUTORADIOBUTTON, 142, 64, 42, 9 + EDITTEXT IDC_BRI_EDIT, 98, 103, 28, 13 + CONTROL "", IDC_BRI_TRACKBAR, "msctls_trackbar32", TBS_BOTH | TBS_NOTICKS | WS_TABSTOP, 2, 105, 90, 11 + PUSHBUTTON "OK", IDOK, 142, 88, 48, 13 + PUSHBUTTON "Zrui", IDCANCEL, 142, 105, 48, 13 +END + +IDD_ABOUTBOX DIALOGEX 22,16,210,182 +CAPTION "Èo je ImageSoft" +FONT 8,"MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +//EXSTYLE WS_EX_LAYERED +BEGIN + LTEXT "ImageSoft v0.1\nCopyright (C) 2006\nThomas Weidenmueller (w3seek(a)reactos.org)\nGed Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 150, 36 + PUSHBUTTON "Zavrie", IDOK, 75, 162, 44, 15 + ICON IDI_IMAGESOFTICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + + +IDD_IMAGE_PROP DIALOGEX 6, 5, 156, 163 +CAPTION "Vlastnosti obrázka" +FONT 8,"MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "Názov:", IDC_STATIC, 12, 5, 38, 9 + EDITTEXT IDC_IMAGE_NAME_EDIT, 58, 3, 94, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Canvas properties", IDC_STATIC, 4, 22, 148, 98 + LTEXT "Typ obrázka:", IDC_STATIC, 12, 36, 42, 9 + CONTROL "", IDC_IMAGETYPE, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 35, 88, 54 + LTEXT "írka:", IDC_STATIC, 12, 51, 42, 9 + EDITTEXT IDC_WIDTH_EDIT, 58, 49, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER + LTEXT "", IDC_WIDTH_STAT, 94, 51, 40, 9 + LTEXT "Výka:", IDC_STATIC, 12, 68, 42, 9 + EDITTEXT IDC_HEIGHT_EDIT, 58, 66, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER + LTEXT "", IDC_HEIGHT_STAT, 94, 68, 40, 9 + LTEXT "Rozlíenie:", IDC_STATIC, 12, 84, 42, 9 + EDITTEXT IDC_RES_EDIT, 58, 83, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER + LTEXT "", IDC_RES_STAT, 94, 84, 40, 9 + LTEXT "Unit:", IDC_STATIC, 12, 99, 42, 9 + CONTROL "", IDC_UNIT, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 99, 54, 50 + LTEXT "Ve¾kos obrázka:", IDC_STATIC, 12, 125, 42, 9 + LTEXT "", IDC_IMAGE_SIZE, 58, 125, 54, 9 + PUSHBUTTON "OK", IDOK, 50, 144, 48, 13 + PUSHBUTTON "Zrui", IDCANCEL, 102, 144, 48, 13 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." + IDS_READY " Hotovo." + IDS_TOOLBAR_STANDARD "Standard" + IDS_TOOLBAR_TEST "Test" + IDS_IMAGE_NAME "Obrázok %1!u!" + IDS_FLT_TOOLS "Nástroje" + IDS_FLT_COLORS "Farby" + IDS_FLT_HISTORY "História" +END + +/* imageprop.c */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMAGE_MONOCHROME "Èierno-bielo (1 bit)" + IDS_IMAGE_GREYSCALE "Odtiene edej (8 bitov)" + IDS_IMAGE_PALETTE "Paleta alebo 256 farieb (8 bitov)" + IDS_IMAGE_TRUECOLOR "Pravé farby (24 bitov)" + + IDS_UNIT_PIXELS "Pixels" + IDS_UNIT_CM "Cm" + IDS_UNIT_INCHES "Inches" + IDS_UNIT_DOTSCM "Dots / Cm" + IDS_UNIT_DPI "DPI" + IDS_UNIT_KB "%d KB" + IDS_UNIT_MB "%d MB" +END + +/* Tooltips */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_NEW "Nový" + IDS_TOOLTIP_OPEN "Otvori" + IDS_TOOLTIP_SAVE "Uloi" + IDS_TOOLTIP_PRINTPRE "Náh¾ad pred tlaèou" + IDS_TOOLTIP_PRINT "Tlaèi" + IDS_TOOLTIP_CUT "Vystrihnú" + IDS_TOOLTIP_COPY "Kopírova" + IDS_TOOLTIP_PASTE "Vloi" + IDS_TOOLTIP_UNDO "Spä" + IDS_TOOLTIP_REDO "Znova" +END + + +/* Hints */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HINT_BLANK " " + IDS_HINT_NEW " Creates a new document." + IDS_HINT_OPEN " Opens an existing document." + IDS_HINT_CLOSE " Closes this window." + IDS_HINT_CLOSEALL " Closes all windows." + IDS_HINT_SAVE " Saves the active document." + IDS_HINT_SAVEAS " Saves the active document with a new name." + IDS_HINT_PRINTPRE " Previews the printed document." + IDS_HINT_PRINT " Prints the active document." + IDS_HINT_PROP " Shows the properties of the active image." + IDS_HINT_EXIT " Exits this application." + + IDS_HINT_TOOLS " Shows or hides the tools floating window." + IDS_HINT_COLORS " Shows or hides the colors floating window." + IDS_HINT_HISTORY " Shows or hides the history floating window." + IDS_HINT_STATUS " Shows or hides the status bar." + + IDS_HINT_CASCADE " Arrange windows so they overlap." + IDS_HINT_TILE_HORZ " Arrange windows as non-overlapping tiles." + IDS_HINT_TILE_VERT " Arrange windows as non-overlapping tiles." + IDS_HINT_ARRANGE " Arrange icons at the bottom of the window." + IDS_HINT_NEXT " Activates the next window." + + IDS_HINT_SYS_RESTORE " Restores this window to normal size." + IDS_HINT_SYS_MOVE " Moves this window." + IDS_HINT_SYS_SIZE " Resizes this window." + IDS_HINT_SYS_MINIMIZE " Collapses this window to an icon." + IDS_HINT_SYS_MAXIMIZE " Expands this window to fill this screen." +END Propchange: trunk/rosapps/imagesoft/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/imagesoft/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/imagesoft/rsrc.rc?rev=3220… ============================================================================== --- trunk/rosapps/imagesoft/rsrc.rc (original) +++ trunk/rosapps/imagesoft/rsrc.rc Fri Feb 8 00:22:04 2008 @@ -15,5 +15,6 @@ #include "lang/nb-NO.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" #include "lang/th-TH.rc" #include "lang/uk-UA.rc" Added: trunk/rosapps/packmgr/gui/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/gui/lang/sk-SK.rc?… ============================================================================== --- trunk/rosapps/packmgr/gui/lang/sk-SK.rc (added) +++ trunk/rosapps/packmgr/gui/lang/sk-SK.rc Fri Feb 8 00:22:04 2008 @@ -1,0 +1,44 @@ +/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR: 03-02-2008 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +/* Dialogs */ +IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 180, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Monosti" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Zatial nie sú iadne monosti.", 0, 50, 95, 80, 8 +END + +IDD_DOIT DIALOGEX DISCARDABLE 0, 0, 180, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Vykonávam operácie" +FONT 8, "MS Shell Dlg" +BEGIN + + CTEXT "{Status}", IDC_TSTATUS, 0, 10, 180, 8 + + CONTROL "", IDC_STATUS1, "msctls_progress32", PBS_SMOOTH, 20, 25, 140, 15 + + CONTROL "", IDC_STATUS2, "msctls_progress32", PBS_SMOOTH, 20, 45, 140, 15 + + PUSHBUTTON "Zrui", IDC_CANCEL, 65, 70, 50, 14, WS_DISABLED +END + +IDR_POPUP MENU DISCARDABLE +BEGIN + POPUP "PopUp", MENUBARBREAK + BEGIN + MENUITEM "iadna akcia", 1, GRAYED + MENUITEM "Intalova (odporúèané)", 2, GRAYED + MENUITEM "Intalova zo zdrojových kódov", 3, GRAYED + MENUITEM "Aktualizova", 4, GRAYED + MENUITEM "Odintalova", 5, GRAYED + MENUITEM SEPARATOR + MENUITEM "Monosti", 8 + MENUITEM SEPARATOR + MENUITEM "Spravi", 6 + END Propchange: trunk/rosapps/packmgr/gui/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/packmgr/gui/packmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/gui/packmgr.rc?rev… ============================================================================== --- trunk/rosapps/packmgr/gui/packmgr.rc (original) +++ trunk/rosapps/packmgr/gui/packmgr.rc Fri Feb 8 00:22:04 2008 @@ -20,6 +20,7 @@ #include "lang/fr-FR.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" #include "lang/uk-UA.rc" /* EOF */

1 0

[cfinck] 32199: Yet another attempt to fix build
by cfinck＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: cfinck Date: Thu Feb 7 23:58:58 2008 New Revision: 32199 URL: http://svn.reactos.org/svn/reactos?rev=32199&view=rev Log: Yet another attempt to fix build Modified: trunk/reactos/include/ndk/i386/ketypes.h Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/ketypes.h (original) +++ trunk/reactos/include/ndk/i386/ketypes.h Thu Feb 7 23:58:58 2008 @@ -29,7 +29,7 @@ #define K0IPCR ((ULONG_PTR)(KIP0PCRADDRESS)) #define PCR ((volatile KPCR * const)K0IPCR) #if defined(CONFIG_SMP) || defined(NT_BUILD) -#undef KeGetPcr() +#undef KeGetPcr #define KeGetPcr() ((volatile KPCR * const)__readfsdword(0x1C)) #endif

1 0

[cfinck] 32198: Revert the winddk.h changes of r32197 to make the hal compilable again without any warnings. Someone (preferably ros-arm-bringup ; -), please fix this correctly. The warning is caused, because after the change in r32197, KeRaiseIrqlToSynchLevel is defined as NTKERNELAPI for all architectures. NTKERNELAPI itself is defined to DECLSPEC_IMPORT if the header is not included from ntoskrnl. This is why hal outputs a warning for its KeRaiseIrqlToSynchLevel implementation. As warnings ar
by cfinck＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: cfinck Date: Thu Feb 7 23:49:58 2008 New Revision: 32198 URL: http://svn.reactos.org/svn/reactos?rev=32198&view=rev Log: Revert the winddk.h changes of r32197 to make the hal compilable again without any warnings. Someone (preferably ros-arm-bringup ;-), please fix this correctly. The warning is caused, because after the change in r32197, KeRaiseIrqlToSynchLevel is defined as NTKERNELAPI for all architectures. NTKERNELAPI itself is defined to DECLSPEC_IMPORT if the header is not included from ntoskrnl. This is why hal outputs a warning for its KeRaiseIrqlToSynchLevel implementation. As warnings are treated as errors for hal, the build fails. Modified: trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Thu Feb 7 23:49:58 2008 @@ -9495,6 +9495,12 @@ KeRaiseIrqlToDpcLevel( VOID); +NTHALAPI +KIRQL +DDKAPI +KeRaiseIrqlToSynchLevel( + VOID); + #define KeLowerIrql(a) KfLowerIrql(a) #define KeRaiseIrql(a,b) *(b) = KfRaiseIrql(a) @@ -9581,15 +9587,14 @@ KeRaiseIrqlToDpcLevel( VOID); -#endif - NTKERNELAPI KIRQL DDKAPI KeRaiseIrqlToSynchLevel( VOID); - +#endif + /** Memory manager routines **/ NTKERNELAPI

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs