Ros-diffs August 2007

ros-diffs@reactos.org

21 participants
666 discussions

[fireball] 28257: - Fix DBG=KDBG=0 build

by fireball＠svn.reactos.org

Author: fireball Date: Thu Aug 9 11:50:31 2007 New Revision: 28257 URL: http://svn.reactos.org/svn/reactos?rev=28257&view=rev Log: - Fix DBG=KDBG=0 build Added: trunk/reactos/ntoskrnl/kd/wrappers/kdbg.c (with props) Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Added: trunk/reactos/ntoskrnl/kd/wrappers/kdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/wrappers/kdbg.… ============================================================================== --- trunk/reactos/ntoskrnl/kd/wrappers/kdbg.c (added) +++ trunk/reactos/ntoskrnl/kd/wrappers/kdbg.c Thu Aug 9 11:50:31 2007 @@ -1,0 +1,30 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/kd/wrappers/bochs.c + * PURPOSE: KDBG Wrapper for Kd + * + * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) + */ + +#include <ntoskrnl.h> +#define NDEBUG +#include <internal/debug.h> + +VOID NTAPI +KdbInitialize(PKD_DISPATCH_TABLE DispatchTable, ULONG BootPhase); + +/* FUNCTIONS *****************************************************************/ + +VOID +NTAPI +KdpKdbgInit(PKD_DISPATCH_TABLE DispatchTable, + ULONG BootPhase) +{ +#ifdef KDBG + /* Forward the call */ + KdbInitialize(DispatchTable, BootPhase); +#else + /* When KDBG is disabled, it is not used/initialized at all */ +#endif +} Propchange: trunk/reactos/ntoskrnl/kd/wrappers/kdbg.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_symbols.… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c Thu Aug 9 11:50:31 2007 @@ -671,21 +671,22 @@ } VOID -STDCALL +NTAPI KdbDebugPrint(PCH Message, ULONG Length) { + /* Nothing here */ } /*! \brief Initializes the KDB symbols implementation. * - * \param NtoskrnlModuleObject LDR_DATA_TABLE_ENTRY of ntoskrnl.exe - * \param LdrHalModuleObject LDR_DATA_TABLE_ENTRY of hal.sys + * \param DispatchTable Pointer to the KD dispatch table + * \param BootPhase Phase of initialization */ VOID -STDCALL -KdpKdbgInit(PKD_DISPATCH_TABLE DispatchTable, - ULONG BootPhase) +NTAPI +KdbInitialize(PKD_DISPATCH_TABLE DispatchTable, + ULONG BootPhase) { PCHAR p1, p2; int Found; Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Thu Aug 9 11:50:31 2007 @@ -255,6 +255,7 @@ <directory name="wrappers"> <file>bochs.c</file> <file>gdbstub.c</file> + <file>kdbg.c</file> </directory> <file>kdinit.c</file> <file>kdio.c</file>

17 years, 4 months

[fireball] 28256: - Set correct hive version in the hive structure

by fireball＠svn.reactos.org

Author: fireball Date: Thu Aug 9 11:39:47 2007 New Revision: 28256 URL: http://svn.reactos.org/svn/reactos?rev=28256&view=rev Log: - Set correct hive version in the hive structure Modified: trunk/reactos/lib/cmlib/hiveinit.c Modified: trunk/reactos/lib/cmlib/hiveinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hiveinit.c?rev=2… ============================================================================== --- trunk/reactos/lib/cmlib/hiveinit.c (original) +++ trunk/reactos/lib/cmlib/hiveinit.c Thu Aug 9 11:39:47 2007 @@ -459,6 +459,7 @@ Hive->FileFlush = FileFlush; Hive->StorageTypeCount = 2; Hive->Cluster = 1; + Hive->Version = HV_MINOR_VER; switch (Operation) {

17 years, 4 months

[jimtabor] 28255: - Removed NtGdiSetAbortProc and NtGdiEscape from w32ksvc.db, leaving NtGdiEscape in print.c and updated ntgdibad.h.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Aug 9 11:21:12 2007 New Revision: 28255 URL: http://svn.reactos.org/svn/reactos?rev=28255&view=rev Log: - Removed NtGdiSetAbortProc and NtGdiEscape from w32ksvc.db, leaving NtGdiEscape in print.c and updated ntgdibad.h. Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/objects/print.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Thu Aug 9 11:21:12 2007 @@ -77,7 +77,9 @@ STDCALL Escape(HDC hdc, INT escape, INT in_count, LPCSTR in_data, LPVOID out_data) { - return NtGdiEscape(hdc,escape,in_count,in_data,out_data); + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /* Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Thu Aug 9 11:21:12 2007 @@ -229,15 +229,6 @@ LPWSTR lpstrBuffer, UINT cch ); -/* Should be done in user-mode. */ -INT -STDCALL -NtGdiEscape(HDC hDC, - INT Escape, - INT InSize, - LPCSTR InData, - LPVOID OutData); - /* Use NtGdiExtTextOutW with 0, 0 at the end. */ BOOL STDCALL @@ -660,12 +651,6 @@ HPALETTE hpal, BOOL ForceBackground ); - -/* Should be done in user-mode. */ -INT -STDCALL -NtGdiSetAbortProc(HDC hDC, - ABORTPROC AbortProc); /* Use NtGdiSetBitmapDimension. */ BOOL Modified: trunk/reactos/subsystems/win32/win32k/objects/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/print.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/print.c Thu Aug 9 11:21:12 2007 @@ -290,15 +290,6 @@ } INT -STDCALL -NtGdiSetAbortProc(HDC hDC, - ABORTPROC AbortProc) -{ - UNIMPLEMENTED; - return 0; -} - -INT APIENTRY NtGdiStartDoc( IN HDC hdc, 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 Thu Aug 9 11:21:12 2007 @@ -694,7 +694,6 @@ #ReactOS specify syscall NtGdiSelectObject 2 NtGdiSelectPalette 3 -NtGdiSetAbortProc 2 NtGdiSetBitmapDimensionEx 4 NtGdiSetBkColor 2 NtGdiSetBkMode 2 @@ -777,7 +776,6 @@ NtGdiEnumEnhMetaFile 5 NtGdiEnumFonts 4 NtGdiEnumICMProfiles 3 -NtGdiEscape 5 NtGdiExtTextOut 8 NtGdiGdiComment 3 NtGdiGetAspectRatioFilterEx 2

17 years, 4 months

[fireball] 28254: - Fix definition of _DESCRIPTOR/KDESCRIPTOR - Fix all code/data structures of GDT/IDT to match new definition - Kernel is now MSVC/WDK compilable (but not linkable yet) - Remove two previous fixes for bootvid/kdcom MSVC/WDK compiling

by fireball＠svn.reactos.org

Author: fireball Date: Thu Aug 9 11:12:59 2007 New Revision: 28254 URL: http://svn.reactos.org/svn/reactos?rev=28254&view=rev Log: - Fix definition of _DESCRIPTOR/KDESCRIPTOR - Fix all code/data structures of GDT/IDT to match new definition - Kernel is now MSVC/WDK compilable (but not linkable yet) - Remove two previous fixes for bootvid/kdcom MSVC/WDK compiling Modified: trunk/reactos/drivers/base/bootvid/precomp.h trunk/reactos/drivers/base/kdcom/kdbg.c trunk/reactos/include/ndk/i386/ketypes.h trunk/reactos/ntoskrnl/ke/freeldr.c trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/drivers/base/bootvid/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/preco… ============================================================================== --- trunk/reactos/drivers/base/bootvid/precomp.h (original) +++ trunk/reactos/drivers/base/bootvid/precomp.h Thu Aug 9 11:12:59 2007 @@ -1,7 +1,3 @@ -#ifdef _MSC_VER -void _enable(void); -void _disable(void); -#endif #include "ntddk.h" #include "arc/arc.h" #include "halfuncs.h" 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 Thu Aug 9 11:12:59 2007 @@ -11,11 +11,6 @@ */ /* INCLUDES *****************************************************************/ - -#ifdef _MSC_VER -void _enable(void); -void _disable(void); -#endif #define NOEXTAPI #include <ntddk.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 Aug 9 11:12:59 2007 @@ -261,14 +261,12 @@ USHORT ExtendedOffset; } KIDTENTRY, *PKIDTENTRY; -#include <pshpack2.h> typedef struct _DESCRIPTOR { + USHORT Pad; USHORT Limit; ULONG Base; - USHORT Padding; } KDESCRIPTOR, *PKDESCRIPTOR; -#include <poppack.h> #ifndef NTOS_MODE_USER // Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c Thu Aug 9 11:12:59 2007 @@ -356,8 +356,8 @@ PKGDTENTRY TssEntry; /* Load the GDT and IDT */ - Ke386SetGlobalDescriptorTable(KiGdtDescriptor); - Ke386SetInterruptDescriptorTable(KiIdtDescriptor); + Ke386SetGlobalDescriptorTable(*(PKDESCRIPTOR)&KiGdtDescriptor.Limit); + Ke386SetInterruptDescriptorTable(*(PKDESCRIPTOR)&KiIdtDescriptor.Limit); /* Initialize the boot TSS */ Tss = &KiBootTss; Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c Thu Aug 9 11:12:59 2007 @@ -47,7 +47,7 @@ }; /* GDT Descriptor */ -KDESCRIPTOR KiGdtDescriptor = {sizeof(KiBootGdt), (ULONG)KiBootGdt}; +KDESCRIPTOR KiGdtDescriptor = {0, sizeof(KiBootGdt), (ULONG)KiBootGdt}; /* CPU Features and Flags */ ULONG KeI386CpuType; @@ -705,8 +705,8 @@ // // Restore GDT, IDT, LDT and TSS // - Ke386SetGlobalDescriptorTable(ProcessorState->SpecialRegisters.Gdtr.Base); - Ke386SetInterruptDescriptorTable(ProcessorState->SpecialRegisters.Idtr.Base); + Ke386SetGlobalDescriptorTable(*(PKDESCRIPTOR)&ProcessorState->SpecialRegisters.Gdtr.Limit); + Ke386SetInterruptDescriptorTable(*(PKDESCRIPTOR)&ProcessorState->SpecialRegisters.Idtr.Limit); Ke386SetTr(ProcessorState->SpecialRegisters.Tr); Ke386SetLocalDescriptorTable(ProcessorState->SpecialRegisters.Ldtr); } @@ -732,8 +732,8 @@ Ke386SetDr7(0); /* Save GDT, IDT, LDT and TSS */ - Ke386GetGlobalDescriptorTable(ProcessorState->SpecialRegisters.Gdtr.Base); - Ke386GetInterruptDescriptorTable(ProcessorState->SpecialRegisters.Idtr.Base); + Ke386GetGlobalDescriptorTable(*(PKDESCRIPTOR)&ProcessorState->SpecialRegisters.Gdtr.Limit); + Ke386GetInterruptDescriptorTable(*(PKDESCRIPTOR)&ProcessorState->SpecialRegisters.Idtr.Limit); Ke386GetTr(ProcessorState->SpecialRegisters.Tr); Ke386GetLocalDescriptorTable(ProcessorState->SpecialRegisters.Ldtr); } @@ -832,14 +832,14 @@ _disable(); /* Get the current IDT and copy it */ - Ke386GetInterruptDescriptorTable(IdtDescriptor); + Ke386GetInterruptDescriptorTable(*(PKDESCRIPTOR)&IdtDescriptor.Limit); RtlCopyMemory(NewIdt2, (PVOID)IdtDescriptor.Base, IdtDescriptor.Limit + 1); IdtDescriptor.Base = (ULONG)NewIdt2; /* Set the new IDT */ - Ke386SetInterruptDescriptorTable(IdtDescriptor); + Ke386SetInterruptDescriptorTable(*(PKDESCRIPTOR)&IdtDescriptor.Limit); ((PKIPCR)KeGetPcr())->IDT = NewIdt2; /* Restore interrupts */ Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c Thu Aug 9 11:12:59 2007 @@ -619,8 +619,8 @@ USHORT Tr = 0, Fs; /* Get GDT and IDT descriptors */ - Ke386GetGlobalDescriptorTable(GdtDescriptor); - Ke386GetInterruptDescriptorTable(IdtDescriptor); + Ke386GetGlobalDescriptorTable(*(PKDESCRIPTOR)&GdtDescriptor.Limit); + Ke386GetInterruptDescriptorTable(*(PKDESCRIPTOR)&IdtDescriptor.Limit); /* Save IDT and GDT */ *Gdt = (PKGDTENTRY)GdtDescriptor.Base; Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s Thu Aug 9 11:12:59 2007 @@ -80,6 +80,7 @@ .globl _KiIdtDescriptor _KiIdtDescriptor: + .short 0 .short 0x800 .long _KiIdt

17 years, 4 months

[jimtabor] 28253: - Fixed NtGdiAlphaBlend prototype. - Changed name for NtGdiSetIcmMode, updated ntgdibad.h. - Fix size issue in w32ksvc.db.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Aug 9 10:48:07 2007 New Revision: 28253 URL: http://svn.reactos.org/svn/reactos?rev=28253&view=rev Log: - Fixed NtGdiAlphaBlend prototype. - Changed name for NtGdiSetIcmMode, updated ntgdibad.h. - Fix size issue in w32ksvc.db. Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/misc.c trunk/reactos/include/psdk/ntgdi.h trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/icm.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Thu Aug 9 10:48:07 2007 @@ -248,7 +248,7 @@ GdiAddFontResourceW@12 GdiAddGlsBounds@8 GdiAddGlsRecord@16 -GdiAlphaBlend@44=NtGdiAlphaBlend@44 +GdiAlphaBlend@44 GdiArtificialDecrementDriver@8 GdiCleanCacheDC@4 GdiComment@12 Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/misc.… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/misc.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/misc.c Thu Aug 9 10:48:07 2007 @@ -32,6 +32,41 @@ HANDLE CurrentProcessId = NULL; DWORD GDI_BatchLimit = 1; + +BOOL +STDCALL +GdiAlphaBlend( + HDC hDCDst, + int DstX, + int DstY, + int DstCx, + int DstCy, + HDC hDCSrc, + int SrcX, + int SrcY, + int SrcCx, + int SrcCy, + BLENDFUNCTION BlendFunction + ) +{ + if ( hDCSrc == NULL ) return FALSE; + + if (GDI_HANDLE_GET_TYPE(hDCSrc) == GDI_OBJECT_TYPE_METADC) return FALSE; + + return NtGdiAlphaBlend( + hDCDst, + DstX, + DstY, + DstCx, + DstCy, + hDCSrc, + SrcX, + SrcY, + SrcCx, + SrcCy, + BlendFunction, + 0 ); +} /* * @implemented Modified: trunk/reactos/include/psdk/ntgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntgdi.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/ntgdi.h (original) +++ trunk/reactos/include/psdk/ntgdi.h Thu Aug 9 10:48:07 2007 @@ -1097,7 +1097,8 @@ IN LONG SrcY, IN LONG SrcCx, IN LONG SrcCy, - IN BLENDFUNCTION BlendFunction + IN BLENDFUNCTION BlendFunction, + IN HANDLE hcmXform ); W32KAPI Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Thu Aug 9 10:48:07 2007 @@ -748,12 +748,6 @@ int Mode ); -/* Use NtGdiSetIcmMode. */ -INT -STDCALL -NtGdiSetICMMode(HDC hDC, - INT EnableICM); - /* Should be done in user-mode. */ BOOL STDCALL Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Thu Aug 9 10:48:07 2007 @@ -1592,7 +1592,7 @@ BlendFunc.AlphaFormat = AC_SRC_ALPHA; NtGdiAlphaBlend(hDc, xLeft, yTop, cxWidth, cyHeight, - hdcOff, 0, 0, cxWidth, cyHeight, BlendFunc); + hdcOff, 0, 0, cxWidth, cyHeight, BlendFunc, 0); } else { Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Thu Aug 9 10:48:07 2007 @@ -1394,7 +1394,8 @@ LONG YOriginSrc, LONG WidthSrc, LONG HeightSrc, - BLENDFUNCTION BlendFunc) + BLENDFUNCTION BlendFunc, + HANDLE hcmXform) { PDC DCDest = NULL; PDC DCSrc = NULL; Modified: trunk/reactos/subsystems/win32/win32k/objects/icm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/icm.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/icm.c Thu Aug 9 10:48:07 2007 @@ -123,8 +123,9 @@ INT STDCALL -NtGdiSetICMMode(HDC hDC, - INT EnableICM) +NtGdiSetIcmMode(HDC hDC, + ULONG nCommand, + ULONG EnableICM) // ulMode { /* FIXME: this should be coded someday */ if (EnableICM == ICM_OFF) 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 Thu Aug 9 10:48:07 2007 @@ -13,7 +13,7 @@ # NtGdiAddFontMemResourceEx 5 # NtGdiRemoveMergeFont 2 # NtGdiAddRemoteMMInstanceToDC 3 -# NtGdiAlphaBlend 12 Wrong number of param ? +NtGdiAlphaBlend 12 NtGdiAngleArc 6 # NtGdiAnyLinkedFonts 0 # NtGdiFontIsLinked 1 @@ -280,7 +280,7 @@ # NtGdiSetDIBitsToDeviceInternal 16 # NtGdiSetFontEnumeration 1 # NtGdiSetFontXform 3 -# NtGdiSetIcmMode 3 Wrong number of param ? +NtGdiSetIcmMode 3 # NtGdiSetLinkedUFIs 3 # NtGdiSetMagicColors 3 NtGdiSetMetaRgn 1 @@ -676,7 +676,6 @@ # # # Wrong number of param ? -NtGdiSetICMMode 2 NtUserCreateWindowEx 14 NtUserCreateWindowStation 6 NtUserEnumDisplayMonitors 5 @@ -691,7 +690,6 @@ NtUserSetWinEventHook 8 NtUserUnregisterClass 2 NtUserValidateHandleSecure 1 -NtGdiAlphaBlend 11 # #ReactOS specify syscall NtGdiSelectObject 2

17 years, 4 months

[greatlrd] 28252: gdi32 implement EngBitBlt win32k implement NtGdiEngBitBlt

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu Aug 9 03:53:58 2007 New Revision: 28252 URL: http://svn.reactos.org/svn/reactos?rev=28252&view=rev Log: gdi32 implement EngBitBlt win32k implement NtGdiEngBitBlt Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/subsystems/win32/win32k/eng/bitblt.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Thu Aug 9 03:53:58 2007 @@ -164,7 +164,7 @@ EngAcquireSemaphore@4 EngAlphaBlend@28=NtGdiEngAlphaBlend@28; EngAssociateSurface@12 -EngBitBlt@44 +EngBitBlt@44=NtGdiEngBitBlt@44; EngCheckAbort@4 EngComputeGlyphSet@12 EngCopyBits@24 Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Thu Aug 9 03:53:58 2007 @@ -2548,26 +2548,7 @@ return 0; } -/* - * @unimplemented - */ -BOOL STDCALL -EngBitBlt(SURFOBJ *Dest, - SURFOBJ *Source, - SURFOBJ *Mask, - CLIPOBJ *ClipRegion, - XLATEOBJ *ColorTranslation, - RECTL *DestRect, - POINTL *SourcePoint, - POINTL *MaskRect, - BRUSHOBJ *Brush, - POINTL *BrushOrigin, - ROP4 rop4) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} + /* * @unimplemented Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt.c Thu Aug 9 03:53:58 2007 @@ -247,6 +247,50 @@ } INT __cdecl abs(INT nm); + + +BOOL STDCALL +NtGdiEngBitBlt( + IN SURFOBJ *psoTrg, + IN SURFOBJ *psoSrc, + IN SURFOBJ *psoMask, + IN CLIPOBJ *pco, + IN XLATEOBJ *pxlo, + IN RECTL *prclTrg, + IN POINTL *pptlSrc, + IN POINTL *pptlMask, + IN BRUSHOBJ *pbo, + IN POINTL *pptlBrush, + IN ROP4 rop4 ) +{ + RECTL rclTrg; + POINTL ptlSrc; + POINTL ptlMask; + POINTL ptlBrush; + + _SEH_TRY + { + ProbeForRead(prclTrg, sizeof(RECTL), 1); + RtlCopyMemory(&rclTrg,prclTrg, sizeof(POINTL)); + + ProbeForRead(pptlSrc, sizeof(RECTL), 1); + RtlCopyMemory(&ptlSrc, pptlSrc, sizeof(POINTL)); + + ProbeForRead(pptlMask, sizeof(RECTL), 1); + RtlCopyMemory(&ptlMask, pptlMask, sizeof(POINTL)); + + ProbeForRead(pptlBrush, sizeof(RECTL), 1); + RtlCopyMemory(&ptlBrush, pptlBrush, sizeof(POINTL)); + + } + _SEH_HANDLE + { + _SEH_YIELD(return FALSE); + } + _SEH_END; + + return EngBitBlt(psoTrg, psoSrc, psoMask, pco, pxlo, &rclTrg, &ptlSrc, &ptlMask, pbo, &ptlBrush, rop4); +} /* * @implemented 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 Thu Aug 9 03:53:58 2007 @@ -617,7 +617,7 @@ # NtGdiEngEraseSurface 3 # NtGdiEngUnlockSurface 1 # NtGdiEngLockSurface 1 -# NtGdiEngBitBlt 11 +NtGdiEngBitBlt 11 # NtGdiEngStretchBlt 11 # NtGdiEngPlgBlt 11 # NtGdiEngMarkBandingSurface 1

17 years, 4 months

[greatlrd] 28251: Implement NtGdiEngAlphaBlend Implement EngAlphaBlend

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu Aug 9 03:03:46 2007 New Revision: 28251 URL: http://svn.reactos.org/svn/reactos?rev=28251&view=rev Log: Implement NtGdiEngAlphaBlend Implement EngAlphaBlend Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/subsystems/win32/win32k/eng/bitblt.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Thu Aug 9 03:03:46 2007 @@ -162,7 +162,7 @@ EndPage@4 EndPath@4 EngAcquireSemaphore@4 -EngAlphaBlend@28 +EngAlphaBlend@28=NtGdiEngAlphaBlend@28; EngAssociateSurface@12 EngBitBlt@44 EngCheckAbort@4 Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Thu Aug 9 03:03:46 2007 @@ -2534,16 +2534,6 @@ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); } -/* - * @unimplemented - */ -BOOL STDCALL -EngAlphaBlend(SURFOBJ *psoDest,SURFOBJ *psoSrc,CLIPOBJ *pco,XLATEOBJ *pxlo,RECTL *prclDest,RECTL *prclSrc,BLENDOBJ *pBlendObj) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} /* * @unimplemented Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt.c Thu Aug 9 03:03:46 2007 @@ -890,6 +890,37 @@ BITMAPOBJ_UnlockBitmapBits(DestObj); return ret; +} + + +BOOL +STDCALL +NtGdiEngAlphaBlend(IN SURFOBJ *Dest, + IN SURFOBJ *Source, + IN CLIPOBJ *ClipRegion, + IN XLATEOBJ *ColorTranslation, + IN PRECTL upDestRect, + IN PRECTL upSourceRect, + IN BLENDOBJ *BlendObj) +{ + RECTL DestRect; + RECTL SourceRect; + + _SEH_TRY + { + ProbeForRead(upDestRect, sizeof(RECTL), 1); + RtlCopyMemory(&DestRect,upDestRect, sizeof(RECTL)); + ProbeForRead(upSourceRect, sizeof(RECTL), 1); + RtlCopyMemory(&Source, upSourceRect, sizeof(RECTL)); + + } + _SEH_HANDLE + { + _SEH_YIELD(return FALSE); + } + _SEH_END; + + return EngAlphaBlend(Dest, Source, ClipRegion, ColorTranslation, &DestRect, &SourceRect, BlendObj); } BOOL 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 Thu Aug 9 03:03:46 2007 @@ -626,7 +626,7 @@ # NtGdiEngStrokeAndFillPath 10 # NtGdiEngPaint 5 # NtGdiEngLineTo 9 -# NtGdiEngAlphaBlend 7 +NtGdiEngAlphaBlend 7 # NtGdiEngGradientFill 10 # NtGdiEngTransparentBlt 8 # NtGdiEngTextOut 10

17 years, 4 months

[dreimer] 28250: Add Cardsbav.dll to Build of RosApps

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Aug 9 02:05:04 2007 New Revision: 28250 URL: http://svn.reactos.org/svn/reactos?rev=28250&view=rev Log: Add Cardsbav.dll to Build of RosApps Modified: trunk/rosapps/directory.rbuild Modified: trunk/rosapps/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/directory.rbuild?rev=28250… ============================================================================== --- trunk/rosapps/directory.rbuild (original) +++ trunk/rosapps/directory.rbuild Thu Aug 9 02:05:04 2007 @@ -3,6 +3,10 @@ <xi:include href="avtest/avtest.rbuild" /> </directory> --> +<directory name="cardsbav"> + <xi:include href="cardsbav/cardsbav.rbuild" /> +</directory> + <directory name="cmdutils"> <xi:include href="cmdutils/cmdutils.rbuild" /> </directory>

17 years, 4 months

[cfinck] 28249: Slovak translations for Explorer, Taskmgr and Winhelp by Mario Kacmar (kario AT szm DOT sk) See issue #2543, 2551, 2552 for more details.

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Aug 8 23:23:53 2007 New Revision: 28249 URL: http://svn.reactos.org/svn/reactos?rev=28249&view=rev Log: Slovak translations for Explorer, Taskmgr and Winhelp by Mario Kacmar (kario AT szm DOT sk) See issue #2543,2551,2552 for more details. Added: trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc trunk/reactos/base/shell/explorer/explorer-sk.rc Modified: trunk/reactos/base/applications/taskmgr/rsrc.rc trunk/reactos/base/applications/winhelp/lang/sk-SK.rc trunk/reactos/base/shell/explorer/explorer_intres.rc Added: trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc (added) +++ trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc Wed Aug 8 23:23:53 2007 @@ -1,0 +1,683 @@ +///////////////////////////////////////////////////////////////////////////// +// Slovak resource files by Kario (kario(a)szm.sk) (08-08-2007) + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT +#pragma code_page(1250) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDR_TASKMANAGER MENU DISCARDABLE +BEGIN + POPUP "&Súbor" + BEGIN + MENUITEM "&Nová úloha (Spusti...)", ID_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "U&konèi Správcu úloh", ID_FILE_EXIT + END + POPUP "&Monosti" + BEGIN + MENUITEM "&Vdy navrchu", ID_OPTIONS_ALWAYSONTOP + , CHECKED + MENUITEM "&Minimalizova pri pouití", ID_OPTIONS_MINIMIZEONUSE + , CHECKED + MENUITEM "&Skrý pri minimalizovaní", ID_OPTIONS_HIDEWHENMINIMIZED + , CHECKED + MENUITEM "&Zobrazi 16-bitové úlohy", ID_OPTIONS_SHOW16BITTASKS + , CHECKED + END + POPUP "&Zobrazi" + BEGIN + MENUITEM "&Obnovi", ID_VIEW_REFRESH + POPUP "&Rýchlos aktualizácie" + BEGIN + MENUITEM "&Vysoká", ID_VIEW_UPDATESPEED_HIGH + MENUITEM "No&rmálna", ID_VIEW_UPDATESPEED_NORMAL + , CHECKED + MENUITEM "&Nízka", ID_VIEW_UPDATESPEED_LOW + MENUITEM "&Pozastavené", ID_VIEW_UPDATESPEED_PAUSED + + END + MENUITEM SEPARATOR + MENUITEM "&Ve¾ké ikony", ID_VIEW_LARGE + MENUITEM "&Malé ikony", ID_VIEW_SMALL + MENUITEM "&Podrobnosti", ID_VIEW_DETAILS, CHECKED + MENUITEM "&Vybra såpce...", ID_VIEW_SELECTCOLUMNS + POPUP "&História procesora" + BEGIN + MENUITEM "&Jeden graf pre vetky procesory", ID_VIEW_CPUHISTORY_ONEGRAPHALL + + MENUITEM "Jeden graf pre &kadý procesor", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU + , CHECKED + END + MENUITEM "&Zobrazi èasy jadra", ID_VIEW_SHOWKERNELTIMES + END + POPUP "&Okna" + BEGIN + MENUITEM "&Pod seba", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "&Ved¾a seba", ID_WINDOWS_TILEVERTICALLY + MENUITEM "&Minimalizova", ID_WINDOWS_MINIMIZE + MENUITEM "Ma&ximalizova", ID_WINDOWS_MAXIMIZE + MENUITEM "&Kaskáda", ID_WINDOWS_CASCADE + MENUITEM "Presunú dopred&u", ID_WINDOWS_BRINGTOFRONT + END + POPUP "&Pomocník" + BEGIN + MENUITEM "Témy &Pomocníka pre Správcu úloh", ID_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "È&o je &Správca úloh", ID_HELP_ABOUT + END +END + +IDR_WINDOWSMENU MENU DISCARDABLE +BEGIN + MENUITEM "&Pod seba", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "&Ved¾a seba", ID_WINDOWS_TILEVERTICALLY + MENUITEM "&Minimalizova", ID_WINDOWS_MINIMIZE + MENUITEM "Ma&ximalizova", ID_WINDOWS_MAXIMIZE + MENUITEM "&Kaskáda", ID_WINDOWS_CASCADE + MENUITEM "Presunú d&opredu", ID_WINDOWS_BRINGTOFRONT +END + +IDR_APPLICATION_PAGE_CONTEXT1 MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "&Nová úloha (Spusti...)", ID_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "&Ve¾ké ikony", ID_VIEW_LARGE + MENUITEM "&Malé ikony", ID_VIEW_SMALL + MENUITEM "&Podrobnosti", ID_VIEW_DETAILS, CHECKED + END +END + +IDR_APPLICATION_PAGE_CONTEXT2 MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "P&repnú", ID_APPLICATION_PAGE_SWITCHTO + MENUITEM "Presunú d&opredu", ID_WINDOWS_BRINGTOFRONT + MENUITEM SEPARATOR + MENUITEM "&Pod seba", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "&Ved¾a seba", ID_WINDOWS_TILEVERTICALLY + MENUITEM "&Minimalizova", ID_WINDOWS_MINIMIZE + MENUITEM "Ma&ximalizova", ID_WINDOWS_MAXIMIZE + MENUITEM "&Kaskáda", ID_WINDOWS_CASCADE + MENUITEM SEPARATOR + MENUITEM "Ukonèi úlo&hu", ID_APPLICATION_PAGE_ENDTASK + MENUITEM "Pr&ejs na proces", ID_APPLICATION_PAGE_GOTOPROCESS + END +END + +IDR_TRAY_POPUP MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "&Obnovi", ID_RESTORE + MENUITEM "&Zavrie", ID_FILE_EXIT + MENUITEM SEPARATOR + MENUITEM "&Vdy navrchu", ID_OPTIONS_ALWAYSONTOP + END +END + +IDR_PROCESS_PAGE_CONTEXT MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "&Ukonèi proces", ID_PROCESS_PAGE_ENDPROCESS + MENUITEM "Ukonèi stro&m procesu", ID_PROCESS_PAGE_ENDPROCESSTREE + + MENUITEM "&Ladi", ID_PROCESS_PAGE_DEBUG + MENUITEM SEPARATOR + POPUP "&Nastavi prioritu" + BEGIN + MENUITEM "&V reálnom èase", ID_PROCESS_PAGE_SETPRIORITY_REALTIME + + MENUITEM "Vy&soká", ID_PROCESS_PAGE_SETPRIORITY_HIGH + + MENUITEM "Vyia &ako normálna", ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL + + MENUITEM "&Normálna", ID_PROCESS_PAGE_SETPRIORITY_NORMAL + + MENUITEM "Niia ako nor&málna", ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL + + MENUITEM "Níz&ka", ID_PROCESS_PAGE_SETPRIORITY_LOW + + END + MENUITEM "Nastavi &afinitu...", ID_PROCESS_PAGE_SETAFFINITY + MENUITEM "Upravi &kanály ladenia...", ID_PROCESS_PAGE_DEBUGCHANNELS + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Èo je Správca úloh systému ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Správca úloh v1.0\nCopyright (C) 1999 - 2001\nBrian Palmer (brianp(a)reactos.org)", + IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, + 122,26 + DEFPUSHBUTTON "OK",IDOK,183,189,44,14,WS_GROUP + ICON IDI_TASKMANAGER,IDC_STATIC,19,30,20,20 + EDITTEXT IDC_LICENSE_EDIT,53,63,174,107,ES_MULTILINE | + ES_READONLY | WS_VSCROLL +END + +IDD_TASKMGR_DIALOG DIALOG DISCARDABLE 0, 0, 264, 246 +STYLE DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | + WS_THICKFRAME +CAPTION "Správca úloh systému ReactOS" +MENU IDR_TASKMANAGER +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,3,3,257,228 +END + +IDD_APPLICATION_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | + LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 + PUSHBUTTON "&Nová úloha...",IDC_NEWTASK,187,189,53,14 + PUSHBUTTON "&Prepnú",IDC_SWITCHTO,131,189,53,14,WS_DISABLED + PUSHBUTTON "Ukonèi úlo&hu",IDC_ENDTASK,75,189,53,14,WS_DISABLED +END + +IDD_PROCESS_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | + WS_BORDER | WS_TABSTOP,7,7,233,177 + PUSHBUTTON "&Ukonèi proces",IDC_ENDPROCESS,171,189,69,14 + CONTROL "&Zobrazi procesy vetkých pouívate¾ov",IDC_SHOWALLPROCESSES, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 +END + +//IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 +IDD_PERFORMANCE_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Procesor",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT + GROUPBOX "Stránkovanie",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT + GROUPBOX "Súèty",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "Vyuitie pamäte (kB)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "Fyzická pamä (kB)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "Pamä jadra (kB)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT + LTEXT "Popisovaèe",IDS_TOTALS_HANDLE_COUNT,12,131,27,8 + LTEXT "Vlákna",IDS_TOTALS_THREAD_COUNT,12,140,27,8 + LTEXT "Procesy",IDS_TOTALS_PROCESS_COUNT,12,149,34,8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT,65,131,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_TOTALS_THREAD_COUNT,65,140,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + LTEXT "Celkovo",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 + LTEXT "Limit",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8 + LTEXT "Maximum",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_COMMIT_CHARGE_LIMIT,65,184,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_COMMIT_CHARGE_PEAK,65,193,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + LTEXT "Celkovo",IDS_PHYSICAL_MEMORY_TOTAL,137,131,27,8 + LTEXT "K dispozícii",IDS_PHYSICAL_MEMORY_AVAILABLE,137,140,30,8 + LTEXT "Vyrovnávacia pamä systému",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,137,149,46,8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL,185,131,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE,185,140,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE,185,149,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + LTEXT "Celkovo",IDS_KERNEL_MEMORY_TOTAL,137,174,27,8 + LTEXT "Stránkovaná",IDS_KERNEL_MEMORY_PAGED,137,184,21,8 + LTEXT "Nestránkovaná",IDS_KERNEL_MEMORY_NONPAGED,137,193,34,8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL,185,174,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_KERNEL_MEMORY_PAGED,185,184,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED,185,193,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + GROUPBOX "História vyuitia procesora",IDC_CPU_USAGE_HISTORY_FRAME,74,5,168,54,0,WS_EX_TRANSPARENT + GROUPBOX "História vyuitia stránkovacieho súboru",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT + PUSHBUTTON "Zobrazenie vyuitia procesora",IDC_CPU_USAGE_GRAPH,12,17,47,37,0, + WS_EX_CLIENTEDGE + PUSHBUTTON "Zobrazenie vyuitia pamäte",IDC_MEM_USAGE_GRAPH,12,75,47,37,0, + WS_EX_CLIENTEDGE + PUSHBUTTON "História vyuitia procesora",IDC_CPU_USAGE_HISTORY_GRAPH,81,17, + 153,37,0,WS_EX_CLIENTEDGE + PUSHBUTTON "História vyuitia pamäte",IDC_MEM_USAGE_HISTORY_GRAPH,81,75, + 153,37,0,WS_EX_CLIENTEDGE +END + +IDD_DEBUG_CHANNELS_DIALOG DIALOG DISCARDABLE 0, 0, 247, 210 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Kanály ladenia" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | + LVS_SORTASCENDING,7,7,233,177 + PUSHBUTTON "Zavrie",IDOK,171,189,69,14 +END + +IDD_AFFINITY_DIALOG DIALOG DISCARDABLE 0, 0, 231, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Afinita procesorov" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,120,133,50,14 + PUSHBUTTON "Zrui",IDCANCEL,174,133,50,14 + LTEXT "Nastavenie afinity procesorov riadi výber procesorov, na ktorých sa bude môc proces spusti.", + IDC_STATIC,5,5,220,16 + CONTROL "Procesor è. 0",IDC_CPU0,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, + 11,28,37,10 + CONTROL "Procesor è. 1",IDC_CPU1,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,41,37,10 + CONTROL "Procesor è. 2",IDC_CPU2,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,54,37,10 + CONTROL "Procesor è. 3",IDC_CPU3,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,67,37,10 + CONTROL "Procesor è. 4",IDC_CPU4,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,80,37,10 + CONTROL "Procesor è. 5",IDC_CPU5,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,93,37,10 + CONTROL "Procesor è. 6",IDC_CPU6,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,106,37,10 + CONTROL "Procesor è. 7",IDC_CPU7,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,119,37,10 + CONTROL "Procesor è. 8",IDC_CPU8,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,61,28,37,10 + CONTROL "Procesor è. 9",IDC_CPU9,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,61,41,37,10 + CONTROL "Procesor è. 10",IDC_CPU10,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,54,41,10 + CONTROL "Procesor è. 11",IDC_CPU11,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,67,41,10 + CONTROL "Procesor è. 12",IDC_CPU12,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,80,41,10 + CONTROL "Procesor è. 13",IDC_CPU13,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,93,41,10 + CONTROL "Procesor è. 14",IDC_CPU14,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,106,41,10 + CONTROL "Procesor è. 15",IDC_CPU15,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,119,41,10 + CONTROL "Procesor è. 16",IDC_CPU16,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,28,41,10 + CONTROL "Procesor è. 17",IDC_CPU17,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,41,41,10 + CONTROL "Procesor è. 18",IDC_CPU18,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,54,41,10 + CONTROL "Procesor è. 19",IDC_CPU19,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,67,41,10 + CONTROL "Procesor è. 20",IDC_CPU20,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,80,41,10 + CONTROL "Procesor è. 21",IDC_CPU21,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,93,41,10 + CONTROL "Procesor è. 22",IDC_CPU22,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,106,41,10 + CONTROL "Procesor è. 23",IDC_CPU23,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,119,41,10 + CONTROL "Procesor è. 24",IDC_CPU24,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,28,41,10 + CONTROL "Procesor è. 25",IDC_CPU25,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,41,41,10 + CONTROL "Procesor è. 26",IDC_CPU26,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,54,41,10 + CONTROL "Procesor è. 27",IDC_CPU27,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,67,41,10 + CONTROL "Procesor è. 28",IDC_CPU28,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,80,41,10 + CONTROL "Procesor è. 29",IDC_CPU29,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,93,41,10 + CONTROL "Procesor è. 30",IDC_CPU30,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,106,41,10 + CONTROL "Procesor è. 31",IDC_CPU31,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,119,41,10 +END + +IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 0, 0, 195, 199 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Výber ståpcov" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,84,178,50,14 + PUSHBUTTON "Zrui",IDCANCEL,138,178,50,14 + LTEXT "Vyberte ståpce, ktoré sa majú zobrazi na karte procesov v Správcovi úloh.", + IDC_STATIC,7,7,181,17 + CONTROL "&Názov obrazu",IDC_IMAGENAME,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,7,28,56,10 + CONTROL "I&dentifikátor procesu (PID)",IDC_PID,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,39,88,10 + CONTROL "Vy&uitie procesora",IDC_CPUUSAGE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,50,53,10 + CONTROL "Èa&s procesora",IDC_CPUTIME,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,61,48,10 + CONTROL "&Vyuitie pamäte",IDC_MEMORYUSAGE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,72,63,10 + CONTROL "&Rozdiel vyuitia pamäte",IDC_MEMORYUSAGEDELTA,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,83,82,10 + CONTROL "M&aximálne vyuitie pamäte",IDC_PEAKMEMORYUSAGE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,94,82,10 + CONTROL "C&hyby stránkovania pamäte",IDC_PAGEFAULTS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,105,53,10 + CONTROL "O&bjekty USER",IDC_USEROBJECTS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,116,62,10 + CONTROL "Vstup a výstup - èítanie",IDC_IOREADS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,127,49,10 + CONTROL "Vstup a výstup - preèítané bajty",IDC_IOREADBYTES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,138,65,10 + CONTROL "&Identifikácia relácie",IDC_SESSIONID,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,149,50,10 + CONTROL "&Meno pouívate¾a",IDC_USERNAME,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,160,51,10 + CONTROL "Rozdiel &chýb stránkovania pamäte",IDC_PAGEFAULTSDELTA,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,28,72,10 + CONTROL "V&e¾kos virtuálnej pamäte",IDC_VIRTUALMEMORYSIZE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,39,77,10 + CONTROL "Stránkovaný &fond",IDC_PAGEDPOOL,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,50,53,10 + CONTROL "Nes&tránkovaný fond",IDC_NONPAGEDPOOL,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,61,67,10 + CONTROL "&Základná priorita",IDC_BASEPRIORITY,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,72,55,10 + CONTROL "P&oèet popisovaèov",IDC_HANDLECOUNT,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,83,59,10 + CONTROL "&Poèet vlákien",IDC_THREADCOUNT,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,94,59,10 + CONTROL "Objekty &GDI",IDC_GDIOBJECTS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,105,55,10 + CONTROL "Vstup a výstup - zápis",IDC_IOWRITES,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,116,49,10 + CONTROL "Vstup a výstup - zapísané bajty",IDC_IOWRITEBYTES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,127,65,10 + CONTROL "Vstup a výstup - iné",IDC_IOOTHER,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,138,46,10 + CONTROL "Vstup a výstup - iné bajty",IDC_IOOTHERBYTES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,149,65,10 +END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""resource.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_ABOUTBOX, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 252 + TOPMARGIN, 7 + BOTTOMMARGIN, 203 + END + + IDD_TASKMGR_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 3 + RIGHTMARGIN, 260 + TOPMARGIN, 3 + BOTTOMMARGIN, 231 + END + + IDD_APPLICATION_PAGE, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 240 + TOPMARGIN, 7 + BOTTOMMARGIN, 203 + END + + IDD_PROCESS_PAGE, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 240 + TOPMARGIN, 7 + BOTTOMMARGIN, 203 + END + + IDD_PERFORMANCE_PAGE, DIALOG + BEGIN + LEFTMARGIN, 5 + RIGHTMARGIN, 242 + VERTGUIDE, 12 + VERTGUIDE, 65 + VERTGUIDE, 110 + TOPMARGIN, 5 + BOTTOMMARGIN, 205 + END + + IDD_AFFINITY_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 224 + VERTGUIDE, 11 + VERTGUIDE, 61 + VERTGUIDE, 116 + VERTGUIDE, 175 + TOPMARGIN, 7 + BOTTOMMARGIN, 147 + HORZGUIDE, 28 + HORZGUIDE, 38 + HORZGUIDE, 51 + HORZGUIDE, 64 + HORZGUIDE, 77 + HORZGUIDE, 90 + HORZGUIDE, 103 + HORZGUIDE, 116 + HORZGUIDE, 129 + END + + IDD_COLUMNS_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 188 + VERTGUIDE, 107 + TOPMARGIN, 7 + BOTTOMMARGIN, 192 + HORZGUIDE, 28 + END +END +#endif // APSTUDIO_INVOKED + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "Správca úloh" + IDC_TASKMGR "Správca úloh" + IDS_IDLE_PROCESS "Procesy systémovej neèinnosti" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_FILE_NEW "Spustí nový program." + ID_OPTIONS_ALWAYSONTOP "Ak Správca úloh nie je minimalizovaný, zostáva v popredí vetkých ostatných úloh." + ID_OPTIONS_MINIMIZEONUSE + "Správce úloh se zminimalizuje po pøepnutí na jinou úlohu" + ID_OPTIONS_HIDEWHENMINIMIZED "Skryje Správcu úloh pri minimalizovaní." + ID_VIEW_REFRESH "Správca úloh sa aktualizuje ihneï bez oh¾adu na nastavenie rýchlosti aktualizácie." + ID_VIEW_LARGE "Zobrazí úlohy ve¾kými ikonami." + ID_VIEW_SMALL "Zobrazí úlohy malými ikonami." + ID_VIEW_DETAILS "Zobrazí informácie o kadej úlohe." + ID_VIEW_UPDATESPEED_HIGH "Aktualizuje obrazovku dvakrát za sekundu." + ID_VIEW_UPDATESPEED_NORMAL "Aktualizuje obrazovku kadé dve sekundy." + ID_VIEW_UPDATESPEED_LOW "Aktualizuje obrazovku kadé tyri sekundy." +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_VIEW_UPDATESPEED_PAUSED "Obrazovka sa automaticky neaktualizuje." + ID_WINDOWS_TILEHORIZONTALLY + "Usporiada okná na pracovnej ploche pod seba." + ID_WINDOWS_TILEVERTICALLY "Usporiada okná na pracovnej ploche ved¾a seba." + ID_WINDOWS_MINIMIZE "Minimalizuje okná." + ID_WINDOWS_MAXIMIZE "Maximalizuje okná." + ID_WINDOWS_CASCADE "Vybraté okná usporiada na obrazovke do diagonálnej kaskády." + ID_WINDOWS_BRINGTOFRONT "Prenesie okno do popredia bez aktivácie." + ID_HELP_TOPICS "Zobrazí témy Pomocníka pre program Správca úloh." + ID_HELP_ABOUT "Zobrazí informácie o programe, jeho verziu a autorské práva." + ID_FILE_EXIT "Ukonèí program Správca úloh." + ID_OPTIONS_SHOW16BITTASKS + "Zobrazí 16-bitové úlohy pod procesom ntvdm.exe." + ID_VIEW_SELECTCOLUMNS "Vyberte ståpce, ktoré sa majú zobrazi na karte procesov v Správcovi úloh." + ID_VIEW_SHOWKERNELTIMES "Zobrazí èas jádra na grafoch výkonu." + ID_VIEW_CPUHISTORY_ONEGRAPHALL + "Graf histórie zobrazuje celkové vyuitie procesora." + ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "Kadý procesor má vlastný graf histórie." + ID_APPLICATION_PAGE_SWITCHTO + "Prenesie úlohu do popredia a aktivuje jej okno." +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_ENDTASK "Pokúsi sa ukonèi vybrané úlohy." + ID_GOTOPROCESS "Prepne na proces vybranej úlohy." + ID_RESTORE "Obnoví Správcu úloh zo skrytého stavu." + ID_PROCESS_PAGE_ENDPROCESS "Odstráni proces zo systému." + ID_PROCESS_PAGE_ENDPROCESSTREE + "Odstráni proces a jeho potomkov zo systému." + ID_PROCESS_PAGE_DEBUG "Pripojí k procesu ladiaci nástroj." + ID_PROCESS_PAGE_SETAFFINITY + "Urèuje procesor, na ktorom sa proces môe spusti." + ID_PROCESS_PAGE_SETPRIORITY_REALTIME + "Zaradí proces do triedy priorít REÁLNY ÈAS." + ID_PROCESS_PAGE_SETPRIORITY_HIGH "Zaradí proces do triedy priorít ZVÝENÁ." + ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL + "Zaradí proces do triedy priorít VYSOKÁ." + ID_PROCESS_PAGE_SETPRIORITY_NORMAL + "Zaradí proces do triedy priorít NORMÁLNA." + ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL + "Zaradí proces do triedy priorít ZNÍENÁ." + ID_PROCESS_PAGE_SETPRIORITY_LOW "Zaradí proces do triedy priorít NÍZKA." + IDS_LICENSE "Tento program je vo¾ný softvér; môete ho íri a/alebo modifikova pod¾a podmienok GNU Menej veobecnej verejnej licencie (GNU Lesser General Public License) ako boli zverejnené nadáciou Free Software Foundation; buï verzie 2.1 tejto licencie, alebo (pod¾a váho uváenia) niektorej neskorej verzie.\r\n\r\nTento program je distribuovaný v nádeji, e bude uitoèný, avak BEZ AKEJKO¼VEK ZÁRUKY; rovnako bez záruky PREDAJNOSTI alebo VHODNOSTI PRE URÈITÝ ÚÈEL. Pre viac detajlov si pozrite GNU Veobecnú verejnú licenciu (GNU General Public License).\r\n\r\nKópiu Veobecnej verejnej licencie GNU ste mali dosta spolu s týmto programom; ak nie, napíte si o òu na Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TAB_APPS "Aplikácie" + IDS_TAB_PROCESSES "Procesy" + IDS_TAB_PERFORMANCE "Výkon" + IDS_TAB_TASK "Úloha" + IDS_TAB_STATUS "Stav" + IDS_TAB_IMAGENAME "Názov obrazu" + IDS_TAB_PID "PID" + IDS_TAB_USERNAME "Meno pouívate¾a" + IDS_TAB_SESSIONID "Identifikácia relácie" + IDS_TAB_CPU "Procesor" + IDS_TAB_CPUTIME "Èas procesora" + IDS_TAB_MEMUSAGE "Pouívanie pamäte" + IDS_TAB_PEAKMEMUSAGE "Vyuitie maximálnej ve¾kosti pamäte" + IDS_TAB_MEMDELTA "Rozdiel vyuitia pamäte" + IDS_TAB_PAGEFAULT "Chyby stránkovania pamäte" + IDS_TAB_PFDELTA "Rozdiel chýb stránkovania pamäte" + IDS_TAB_VMSIZE "Ve¾kos virtuálnej pamäte" + IDS_TAB_PAGEDPOOL "Stránkovaný fond" + IDS_TAB_NPPOOL "Nestránkovaný fond" + IDS_TAB_BASEPRI "Základná priorita" + IDS_TAB_HANDLES "Popisovaèe" + IDS_TAB_THREADS "Vlákna" + IDS_TAB_USERPBJECTS "Objekty USER" + IDS_TAB_GDIOBJECTS "Objekty GDI" + IDS_TAB_IOREADS "Vstup a výstup - èítanie" + IDS_TAB_IOWRITES "Vstup a výstup - zápis" + IDS_TAB_IOOTHER "Vstup a výstup - iné" + IDS_TAB_IOREADBYTES "Vstup a výstup - preèítané bajty" + IDS_TAB_IOWRITESBYTES "Vstup a výstup - zapísané bajty" + IDS_TAB_IOOTHERBYTES "Vstup a výstup - iné bajty" + IDS_MENU_SELECTCOLUMNS "&Vybra ståpce..." + IDS_MENU_16BITTASK "&Zobrazit 16-bitové úlohy" + IDS_MENU_WINDOWS "&Okna" + IDS_MENU_LARGEICONS "&Velké ikony" + IDS_MENU_SMALLICONS "&Malé ikony" + IDS_MENU_DETAILS "&Podrobnosti" + IDS_MENU_ONEGRAPHALLCPUS "&Jeden graf pre vetky procesory" + IDS_MENU_ONEGRAPHPERCPU "Jeden graf pre &kadý procesor" + IDS_MENU_CPUHISTORY "&História procesora" + IDS_MENU_SHOWKERNELTIMES "&Zobrazi èasy jadra" + IDS_CREATENEWTASK "Vytvori novú úlohu" + IDS_CREATENEWTASK_DESC "Zadajte názov programu, prieèinka, dokumentu alebo internetového zdroja a systém ReactOS ho otvorí." + IDS_MSG_ACCESSPROCESSAFF "Není moné zpøístupnit afinitu procesu" + IDS_MSG_PROCESSONEPRO "Proces musí ma afinitu aspoò k jednému procesoru." + IDS_MSG_INVALIDOPTION "Neplatná monos" + IDS_MSG_UNABLEDEBUGPROCESS "Ladiaci nástroj sa nepodarilo pripoji." + IDS_MSG_WARNINGDEBUG "UPOZORNENIE: Proces ladenia môe zapríèini stratu údajov.\nNaozaj chcete pripoji ladiaci nástroj?" + IDS_MSG_TASKMGRWARNING "Upozornenie Správcu úloh" + IDS_MSG_WARNINGTERMINATING "UPOZORNENIE: Ukonèenie procesu môe ma neiadúce\ndôsledky vrátane nestability systému.\nStav alebo údaje o procese sa nebudú da\npred ukonèením uloi.\nNaozaj chcete proces ukonèi?" + IDS_MSG_UNABLETERMINATEPRO "Proces sa nedá ukonèi." + IDS_MSG_UNABLECHANGEPRIORITY "Priorita sa nedá zmeni." + IDS_MSG_WARNINGCHANGEPRIORITY "UPOZORNENIE: Zmena triedy priority procesu môe ma\nneiadúce dôsledky vrátane nestability systému.\nNaozaj chcete zmeni triedu priority procesu?" + IDS_MSG_TRAYICONCPUUSAGE "Vyuitie procesora: %d%%" + IDS_STATUS_MEMUSAGE "Vyuitá pamä: %dK / %dK" + IDS_STATUS_CPUUSAGE "Vyuitie procesora: %3d%%" + IDS_STATUS_PROCESSES "Procesy: %d" + IDS_Not_Responding "Neodpovedá" + IDS_Running "Spustené" +END + +#endif // Slovak resource file +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED Modified: trunk/reactos/base/applications/taskmgr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/rsrc.rc (original) +++ trunk/reactos/base/applications/taskmgr/rsrc.rc Wed Aug 8 23:23:53 2007 @@ -18,5 +18,6 @@ #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" #include "lang/sv-SE.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/base/applications/winhelp/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/winhelp/lang/sk-SK.rc Wed Aug 8 23:23:53 2007 @@ -1,3 +1,10 @@ +/* +* FILE: base/applications/winhelp/lang/sk-SK.rc +* PURPOSE: Slovak Language File for winhelp +* TRANSLATOR: Kario (kario(a)szm.sk) +* DATE OF TR: 04-08-2007 +*/ + /* * Help Viewer * @@ -37,13 +44,13 @@ POPUP "&Záloka" { MENUITEM "&Definova...", MNID_BKMK_DEFINE } - POPUP "&Pomoc" { - MENUITEM "Pomoc &na pomoci", MNID_HELP_HELPON + POPUP "&Pomocík" { + MENUITEM "&Ako poui Pomocníka", MNID_HELP_HELPON MENUITEM "Vdy na &vrchu", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "&Info...", MNID_HELP_ABOUT #ifdef WINELIB - MENUITEM "O& WINE", MNID_HELP_WINE + MENUITEM "È&o je ReactOS", MNID_HELP_WINE #endif } } @@ -51,18 +58,18 @@ /* Strings */ STRINGTABLE DISCARDABLE { -STID_WINE_HELP, "WINE Pomoc" +STID_WINE_HELP, "Pomocník ReactOSu" STID_WHERROR, "CHYBA" -STID_WARNING, "VAROVANIE" +STID_WARNING, "UPOZORNENIE" STID_INFO, "Informácie" STID_NOT_IMPLEMENTED, "Neimplementované" -STID_HLPFILE_ERROR_s, "Chyba poèas èítania súboru `%s'" +STID_HLPFILE_ERROR_s, "Pri pokuse otvori súbor pomocníka '%s' sa vyskytla chyba." STID_CONTENTS, "&Obsah" STID_SEARCH, "&H¾ada" STID_BACK, "&Spä" STID_HISTORY, "&História" -STID_TOPICS, "&Topics" +STID_TOPICS, "&Témy" STID_ALL_FILES, "Vetky súbory (*.*)" STID_HELP_FILES_HLP, "Súbory pomoci (*.hlp)" -STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" +STID_FILE_NOT_FOUND_s "Súbor '%s' nebol nájdený. Chcete sa pokúsi nájs tento súbor sami?" } Added: trunk/reactos/base/shell/explorer/explorer-sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-sk.rc (added) +++ trunk/reactos/base/shell/explorer/explorer-sk.rc Wed Aug 8 23:23:53 2007 @@ -1,0 +1,409 @@ +/* +* FILE: base/shell/explorer/explorer-sk.rc +* PURPOSE: Slovak Language File for winhelp +* TRANSLATOR: Kario (kario(a)szm.sk) +* DATE OF TR: 08-08-2007 +* _______________________________________________ +* NOTE: this file need to be fixed +*/ + + +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include <windows.h> + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// Slovak resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SKY) +#ifdef _WIN32 +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT +#pragma code_page(1250) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDM_MDIFRAME MENU DISCARDABLE +BEGIN + POPUP "&Súbor" + BEGIN + MENUITEM "&Spusti...", ID_EXECUTE + MENUITEM SEPARATOR + MENUITEM "&Ukonèi", ID_FILE_EXIT + END + POPUP "&Zobrazenie" + BEGIN + MENUITEM "&Panel nástrojov", ID_VIEW_TOOL_BAR + MENUITEM "&Extra panel", ID_VIEW_EXTRA_BAR + MENUITEM "&Lita diskov", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&Boèný panel", ID_VIEW_SIDE_BAR + MENUITEM "&Stavový riadok", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Obnovi\tF5", ID_REFRESH + MENUITEM "&Celá obrazovka\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "SDI", ID_VIEW_SDI + END + POPUP "&Okno" + BEGIN + MENUITEM "&Nové okno", ID_WINDOW_NEW + MENUITEM "&Kaskáda\tShift+F5", ID_WINDOW_CASCADE + MENUITEM "&Pod seba", ID_WINDOW_TILE_HORZ + MENUITEM "&Ved¾a seba\tShift+F4", ID_WINDOW_TILE_VERT + MENUITEM "Usporiada &automaticky", ID_WINDOW_AUTOSORT + MENUITEM "Usporiada &symboly", ID_WINDOW_ARRANGE + END + POPUP "&Nástroje" + BEGIN + MENUITEM "&Monosti", ID_TOOLS_OPTIONS + END + POPUP "&Pomocník" + BEGIN + MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ + MENUITEM "&Èo je Explorer...", ID_ABOUT_EXPLORER + MENUITEM "È&o je operaèný systém...", ID_ABOUT_WINDOWS + END +END + +IDM_DESKTOPBAR MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Nastavenia...", ID_DESKTOPBAR_SETTINGS + MENUITEM "&Správca úloh...", ID_TASKMGR + MENUITEM SEPARATOR + MENUITEM "È&o je Explorer...", ID_ABOUT_EXPLORER + END +END + +IDM_VOLUME MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Otvori ovládanie hlasitosti", ID_TRAY_VOLUME + MENUITEM "Upravi vlastnosti zvuku", ID_VOLUME_PROPERTIES + END +END + +IDM_NOTIFYAREA MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Zobrazi skryté ikony", ID_SHOW_HIDDEN_ICONS + MENUITEM "Zo&brazi ikonu skrývania", ID_SHOW_ICON_BUTTON + MENUITEM "&Prispôsobi oznamovanie...", ID_CONFIG_NOTIFYAREA + MENUITEM "Upr&avi dátum a èas", ID_CONFIG_TIME + MENUITEM SEPARATOR + MENUITEM "È&o je Explorer...", ID_ABOUT_EXPLORER + END +END + +IDM_SDIFRAME MENU DISCARDABLE +BEGIN + POPUP "&Súbor" + BEGIN + MENUITEM "&Spusti...", ID_EXECUTE + MENUITEM SEPARATOR + MENUITEM "&Ukonèi", ID_FILE_EXIT + END + POPUP "&Zobrazenie" + BEGIN + MENUITEM "&Panel nástrojov", ID_VIEW_TOOL_BAR + MENUITEM "&Boèný panel", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "&Stavový riadok", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Obnovi\tF5", ID_REFRESH + MENUITEM "&Celá obrazovka\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "&MDI", ID_VIEW_MDI + END + POPUP "&Nástroje" + BEGIN + MENUITEM "&Monosti", ID_TOOLS_OPTIONS + END + POPUP "&Pomocník" + BEGIN + MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ + MENUITEM "&Èo je Explorer...", ID_ABOUT_EXPLORER + MENUITEM "È&o je operaèný systém...", ID_ABOUT_WINDOWS + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_EXECUTE DIALOG DISCARDABLE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Spusti" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,150,10 + CONTROL "&Príkaz:",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, + 18,60,10 + EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL + CONTROL "Ako &symbol",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3, + 45,71,12 + DEFPUSHBUTTON "&OK",1,158,6,47,14 + PUSHBUTTON "&Zrui",2,158,23,47,14 + PUSHBUTTON "&Pomocník",254,158,43,47,14 +END + +IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "H¾ada program v ponuke tart" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "&Filter:",IDC_STATIC,7,9,18,8 + EDITTEXT IDC_FILTER,34,7,100,14,ES_AUTOHSCROLL + CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | + LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | + WS_TABSTOP,7,25,186,33 + PUSHBUTTON "&Check Entries",IDC_CHECK_ENTRIES,143,7,50,14 +END + +IDD_DESKBAR_DESKTOP DIALOG DISCARDABLE 0, 0, 212, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Vlastnosti plochy" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Vyberte si prosím, vami uprednostòovaný spôsob zarovnania ikón:", + IDC_STATIC,7,7,166,8 + CONTROL "z¾ava zhora dole",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,25,46,44 + CONTROL "z¾ava zhora vpravo",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,25,46,44 + CONTROL "zprava zhora v¾avo",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,25,46,44 + CONTROL "zprava zhora dole",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,159,25,46,44 + CONTROL "z¾ava zdola hore",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,73,46,44 + CONTROL "z¾ava zdola vpravo",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,73,46,44 + CONTROL "zprava zdola v¾avo",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,73,46,44 + CONTROL "zprava zdola hore",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,159,73,46,44 + CONTROL "po okrajoch dole",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,121,46,44 + CONTROL "po okrajoch H/V",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,121,46,44 + CONTROL "dookola",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,121,46,44 + CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | + WS_TABSTOP,159,121,46,44 + CONTROL "Zobrazi èíslo &verzie",ID_DESKTOP_VERSION,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 +END + +IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Vlastnosti panela úloh" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "Zobrazi &hodiny",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,152,52,10 + CONTROL "&Skry neaktívne ikony", + ID_HIDE_INACTIVE_ICONS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,174,111,10 + PUSHBUTTON "&Prispôsobi...",ID_CONFIG_NOTIFYAREA,153,173,50,14 +END + +IDD_DESKBAR_STARTMENU DIALOG DISCARDABLE 0, 0, 210, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Vlastnosti ponuky tart" +FONT 8, "MS Sans Serif" +BEGIN +END + +IDD_NOTIFYAREA DIALOGEX 0, 0, 208, 174 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "Prispôsobenie oznamovacích ikón" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | + TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31 + LTEXT "&Text popisu:",IDC_LABEL1,7,44,40,8 + EDITTEXT IDC_NOTIFY_TOOLTIP,58,42,143,14,ES_AUTOHSCROLL + LTEXT "&Názov okna:",IDC_LABEL2,7,63,44,8 + EDITTEXT IDC_NOTIFY_TITLE,58,60,143,14,ES_AUTOHSCROLL + LTEXT "&Cesta:",IDC_LABEL3,7,81,43,8 + EDITTEXT IDC_NOTIFY_MODULE,58,78,143,14,ES_AUTOHSCROLL + GROUPBOX "&Zobrazenie",IDC_LABEL4,7,96,157,28 + CONTROL "z&obrazi",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | + WS_TABSTOP,15,108,33,10 + CONTROL "&skry",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON,66, + 108,29,10 + CONTROL "skry a&utomaticky",IDC_NOTIFY_AUTOHIDE,"Button", + BS_AUTORADIOBUTTON,112,108,43,10 + ICON "",IDC_PICTURE,173,101,21,20 + LTEXT "&Posledná zmena:",IDC_LABEL6,7,132,43,8 + EDITTEXT IDC_LAST_CHANGE,59,129,105,14,ES_AUTOHSCROLL | + ES_READONLY + CONTROL "zo&brazi skryté",ID_SHOW_HIDDEN_ICONS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,154,56,10 + DEFPUSHBUTTON "&OK",IDOK,91,153,50,14,WS_GROUP + PUSHBUTTON "&Zrui",IDCANCEL,151,153,50,14 +END + +IDD_MDI_SDI DIALOGEX 0, 0, 194, 157 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_APPWINDOW +CAPTION "Vybra spôsob zobrazovania okien" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "Vyberte si prosím, vami uprednostòované pouívate¾ské rozhranie:", + IDC_STATIC,7,7,160,8 + CONTROL "&MDI (Mnoho dokumentové rozhranie)",IDC_MDI,"Button", + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,124,10 + CONTROL "&SDI (Jedno dokumentové rozhranie)",IDC_SDI,"Button", + BS_AUTORADIOBUTTON,7,62,118,10 + CONTROL 170,IDC_STATIC,"Static",SS_BITMAP,145,23,15,13 + CONTROL 171,IDC_STATIC,"Static",SS_BITMAP,145,57,15,13 + CONTROL "Otvára prieèinky v samostatných &oknách", + IDC_SEPARATE_SUBFOLDERS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,90,135,10 + LTEXT "Toto nastavenie sa v budúcnosti pouije ako predvolené pre vetké okná Priezkumníka.", + IDC_STATIC,7,111,174,22 + DEFPUSHBUTTON "&OK",IDOK,29,136,50,14,WS_GROUP + PUSHBUTTON "&Zrui",IDCANCEL,106,136,50,14 +END + +IDD_ABOUT_EXPLORER DIALOG DISCARDABLE 0, 0, 199, 106 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Èo je ReactOS Explorer" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "ReactOS Explorer",IDC_ROS_EXPLORER,91,13,104,11 + LTEXT "V 0.9",IDC_VERSION_TXT,91,27,104,8 + LTEXT "(c) 2003-2005 Martin Fuchs",IDC_STATIC,91,42,104,8 + LTEXT "",IDC_WIN_VERSION,91,58,98,22 + LTEXT "http://www.sky.franken.de/explorer/",IDC_WWW,17,84,129, + 8 + CONTROL "&OK",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP, + 154,90,38,12 +END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE MOVEABLE PURE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE MOVEABLE PURE +BEGIN + "#include <windows.h>\r\n" + "\0" +END + +3 TEXTINCLUDE MOVEABLE PURE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TITLE "ReactOS Explorer" + IDS_START "tart" + IDS_LOGOFF "Odhlási..." + IDS_SHUTDOWN "Vypnú..." + IDS_LAUNCH "Spusti..." + IDS_START_HELP "Pomocník" + IDS_SEARCH_FILES "H¾ada..." + IDS_DOCUMENTS "Moje dokumenty" + IDS_FAVORITES "Ob¾úbené poloky" + IDS_PROGRAMS "Programy" + IDS_SETTINGS "Nastavenia" + IDS_EXPLORE "Preskúma" + IDS_EMPTY "(Prázdne)" + IDS_RECENT "Nedávne dokumenty" + IDS_ADMIN "Administration" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STARTMENU "Ponuka tart" + IDS_MINIMIZE_ALL "minimalizova vetké okná" + IDS_DESKTOP_NUM "Pracovná plocha %d" + IDS_VOLUME "Hlasitos" + IDS_ITEMS_CUR "súèasné poloky" + IDS_ITEMS_CONFIGURED "konfigurácia" + IDS_ITEMS_VISIBLE "vidite¾né" + IDS_ITEMS_HIDDEN "skryté" + IDS_NOTIFY_SHOW "zobrazi" + IDS_NOTIFY_HIDE "skry" + IDS_NOTIFY_AUTOHIDE "skry automaticky" + IDS_SHOW_HIDDEN_ICONS "Zobrazi skryté ikony" + IDS_HIDE_ICONS "Skry ikony" + IDS_TERMINATE "Ukonèi ReactOS Explorer" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NETWORK "Sie" + IDS_CONNECTIONS "Sieové pripojenia" + IDS_DRIVES "Disky" + IDS_SEARCH_COMPUTER "H¾ada poèítaè..." + IDS_SETTINGS_MENU "Nastavenie" + IDS_CONTROL_PANEL "Ovládací panel" + IDS_PRINTERS "Tlaèiarne" + IDS_BROWSE "Prechádza súbory" + IDS_SEARCH_PRG "H¾ada program..." + IDS_ALL_USERS "All Users\\" + IDS_SEARCH "H¾ada" + IDS_ABOUT_EXPLORER "È&o je Explorer..." + IDS_LAUNCH_MANY_PROGRAMS + "Vybrali ste viac programov.\nPrajete si spusti ich vetky?" + IDS_DESKTOPBAR_SETTINGS "Nastavenia plochy" + IDS_DESKTOP "Pracovná plocha" + IDS_TASKBAR "Panel úloh" +END + +#endif // Slovak resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer_intres.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer_intres.rc (original) +++ trunk/reactos/base/shell/explorer/explorer_intres.rc Wed Aug 8 23:23:53 2007 @@ -124,6 +124,7 @@ "#include ""explorer-pt.rc""\r\n" "#include ""explorer-ro.rc""\r\n" "#include ""explorer-ru.rc""\r\n" + "#include ""explorer-sk.rc""\r\n" "#include ""explorer-sv.rc""\r\n" "#include ""explorer-uk.rc""\r\n" "\r\n" @@ -229,6 +230,7 @@ #include "explorer-pt.rc" #include "explorer-ro.rc" #include "explorer-ru.rc" +#include "explorer-sk.rc" #include "explorer-sv.rc" #include "explorer-uk.rc"

17 years, 4 months

[jimtabor] 28248: - Removed NtGdiGet/SetArcDirection and NtGdiGetSetTextCharExtra, update ntgdibad.h. - Updated NtGdiGet/AndSet/DCDword. - Changes to other files to reflect the updates and removals.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Aug 8 22:58:06 2007 New Revision: 28248 URL: http://svn.reactos.org/svn/reactos?rev=28248&view=rev Log: - Removed NtGdiGet/SetArcDirection and NtGdiGetSetTextCharExtra, update ntgdibad.h. - Updated NtGdiGet/AndSet/DCDword. - Changes to other files to reflect the updates and removals. Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/dc.c trunk/reactos/dll/win32/gdi32/objects/text.c trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/line.c trunk/reactos/subsystems/win32/win32k/objects/path.c trunk/reactos/subsystems/win32/win32k/objects/text.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Wed Aug 8 22:58:06 2007 @@ -334,7 +334,7 @@ GdiSwapBuffers@4 GdiTransparentBlt@44=NtGdiTransparentBlt@44 GdiValidateHandle@4 -GetArcDirection@4=NtGdiGetArcDirection@4 +GetArcDirection@4 GetAspectRatioFilterEx@8 GetBitmapAttributes@4 GetBitmapBits@12=NtGdiGetBitmapBits@12 @@ -529,7 +529,7 @@ SelectObject@8=NtGdiSelectObject@8 SelectPalette@12=NtGdiSelectPalette@12 SetAbortProc@8 -SetArcDirection@8=NtGdiSetArcDirection@8 +SetArcDirection@8 SetBitmapAttributes@8 SetBitmapBits@12=NtGdiSetBitmapBits@12 SetBitmapDimensionEx@16=NtGdiSetBitmapDimensionEx@16 Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Wed Aug 8 22:58:06 2007 @@ -176,19 +176,6 @@ /* * @unimplemented */ -int -STDCALL -GetTextCharacterExtra( - HDC hDc - ) -{ - return NtGdiGetSetTextCharExtra( hDc, 0, FALSE); -} - - -/* - * @unimplemented - */ DWORD STDCALL GetFontLanguageInfo( @@ -310,20 +297,6 @@ UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; -} - - -/* - * @unimplemented - */ -int -STDCALL -SetTextCharacterExtra( - HDC hDC, - int CharExtra - ) -{ - return NtGdiGetSetTextCharExtra( hDC, CharExtra, TRUE); } @@ -1267,22 +1240,6 @@ STDCALL SetFontEnumeration( DWORD a0 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/* - * @unimplemented - */ -DWORD -STDCALL -SetRelAbs( - DWORD a0, - DWORD a1 ) { UNIMPLEMENTED; Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c Wed Aug 8 22:58:06 2007 @@ -290,6 +290,22 @@ } +INT +STDCALL +GetArcDirection( HDC hdc ) +{ + return GetDCDWord( hdc, GdiGetArcDirection, 0); +} + + +INT +STDCALL +SetArcDirection( HDC hdc, INT nDirection ) +{ + return GetAndSetDCDWord( hdc, GdiGetSetArcDirection, nDirection, 0, 0, 0 ); +} + + /* * @implemented */ @@ -301,6 +317,20 @@ ) { return GetDCDWord( hdc, GdiGetRelAbs, 0); +} + + +/* + * @implemented + */ +DWORD +STDCALL +SetRelAbs( + HDC hdc, + INT Mode + ) +{ + return GetAndSetDCDWord( hdc, GdiGetSetRelAbs, Mode, 0, 0, 0 ); } Modified: trunk/reactos/dll/win32/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/te… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/text.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/text.c Wed Aug 8 22:58:06 2007 @@ -44,6 +44,26 @@ int cbString) { return NtGdiExtTextOut(hdc, nXStart, nYStart, 0, NULL, lpString, cbString, NULL); +} + + +/* + * @unimplemented + */ +int +STDCALL +GetTextCharacterExtra( + HDC hDc + ) +{ +#if 0 + PDC_ATTR Dc_Attr; + + if (!GdiGetHandleUserData((HGDIOBJ) hDc, (PVOID) &Dc_Attr)) return 0; + return Dc_Attr->lTextExtra; +#endif + // Do it this way for now. + return GetDCDWord( hDc, GdiGetTextCharExtra, 0); } @@ -393,3 +413,47 @@ return TRUE; } + + +/* + * @unimplemented + */ +int +STDCALL +SetTextCharacterExtra( + HDC hDC, + int CharExtra + ) +{ + INT cExtra = 0x80000000; +// PDC_ATTR Dc_Attr; + + if (CharExtra == cExtra) + { + SetLastError(ERROR_INVALID_PARAMETER); + return cExtra; + } +#if 0 + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + { + return 0; //call MFDRV META_SETTEXTCHAREXTRA + } + if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr)) return cExtra; + + if (NtCurrentTeb()->GdiTebBatch.HDC == hDC) + { + if (Dc_Attr->ulDirty_ & DC_FONTTEXT_DIRTY) + { + NtGdiFlush(); // Sync up Dc_Attr from Kernel space. + Dc_Attr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); + } + } + cExtra = Dc_Attr->lTextExtra; + Dc_Attr->lTextExtra = CharExtra; + return cExrta; +#endif +// Do this for now. + return GetAndSetDCDWord( hDC, GdiGetSetTextCharExtra, CharExtra, 0, 0, 0 ); +} + + Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Wed Aug 8 22:58:06 2007 @@ -259,11 +259,6 @@ CONST LPBYTE Data ); -/* Use NtGdiGetDCDword with GdiGetArcDirection. */ -INT -STDCALL -NtGdiGetArcDirection ( HDC hDC ); - /* Should be done in user-mode. */ BOOL STDCALL @@ -464,11 +459,6 @@ /* Should be done in user-mode using shared GDI Objects. */ INT STDCALL NtGdiGetROP2(HDC hDC); - -/* Should be done in user-mode using shared GDI Objects. */ -INT -STDCALL -NtGdiGetSetTextCharExtra( HDC hDC, INT CharExtra, BOOL Set); /* Should be done in user-mode using shared GDI Objects. */ INT STDCALL NtGdiGetStretchBltMode(HDC hDC); @@ -676,12 +666,6 @@ STDCALL NtGdiSetAbortProc(HDC hDC, ABORTPROC AbortProc); - -/* Use NtGdiGetAndSetDCDword with GdiGetSetArcDirection. */ -int -STDCALL -NtGdiSetArcDirection(HDC hDC, - int ArcDirection); /* Use NtGdiSetBitmapDimension. */ BOOL Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Wed Aug 8 22:58:06 2007 @@ -2161,20 +2161,31 @@ SafeResult = dc->Dc_Attr.lRelAbs; break; case GdiGetBreakExtra: + SafeResult = dc->Dc_Attr.lBreakExtra; break; case GdiGerCharBreak: + SafeResult = dc->Dc_Attr.cBreak; break; case GdiGetArcDirection: + SafeResult = dc->w.ArcDirection; break; case GdiGetEMFRestorDc: break; case GdiGetFontLanguageInfo: break; case GdiGetIsMemDc: + { + if (dc->w.flags & DC_MEMORY) + SafeResult = DC_TYPE_MEMORY; // = dc->DC_Type; + else + SafeResult = DC_TYPE_DIRECT; + } break; case GdiGetMapMode: + SafeResult = dc->Dc_Attr.iMapMode; break; case GdiGetTextCharExtra: + SafeResult = dc->Dc_Attr.lTextExtra; break; default: SetLastWin32Error(ERROR_INVALID_PARAMETER); @@ -2241,18 +2252,34 @@ case GdtGetSetCopyCount: break; case GdiGetSetTextAlign: + SafeResult = dc->Dc_Attr.lTextAlign; + dc->Dc_Attr.lTextAlign = dwIn; + dc->Dc_Attr.flTextAlign = dwIn; break; case GdiGetSetRelAbs: + SafeResult = dc->Dc_Attr.lRelAbs; + dc->Dc_Attr.lRelAbs = dwIn; break; case GdiGetSetTextCharExtra: + SafeResult = dc->Dc_Attr.lTextExtra; + dc->Dc_Attr.lTextExtra = dwIn; break; case GdiGetSetSelectFont: break; case GdiGetSetMapperFlagsInternal: break; case GdiGetSetMapMode: + SafeResult = dc->Dc_Attr.iMapMode; + dc->Dc_Attr.iMapMode = dwIn; break; case GdiGetSetArcDirection: + if (dwIn != AD_COUNTERCLOCKWISE && dwIn != AD_CLOCKWISE) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + Ret = FALSE; + } + SafeResult = dc->w.ArcDirection; + dc->w.ArcDirection = dwIn; break; default: SetLastWin32Error(ERROR_INVALID_PARAMETER); @@ -2290,7 +2317,6 @@ DC_SET_MODE( NtGdiSetBkMode, Dc_Attr.jBkMode, TRANSPARENT, OPAQUE ) DC_SET_MODE( NtGdiSetPolyFillMode, Dc_Attr.jFillMode, ALTERNATE, WINDING ) -// DC_SET_MODE( NtGdiSetRelAbs, Dc_Attr.lRelAbs, ABSOLUTE, RELATIVE ) DC_SET_MODE( NtGdiSetROP2, Dc_Attr.jROP2, R2_BLACK, R2_WHITE ) DC_SET_MODE( NtGdiSetStretchBltMode, Dc_Attr.jStretchBltMode, BLACKONWHITE, HALFTONE ) Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/line.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/line.c Wed Aug 8 22:58:06 2007 @@ -278,12 +278,6 @@ return ret; } -INT FASTCALL -IntGdiGetArcDirection(DC *dc) -{ - return dc->w.ArcDirection; -} - BOOL FASTCALL IntGdiPolyPolyline(DC *dc, @@ -327,25 +321,6 @@ return FALSE; } -INT -STDCALL -NtGdiGetArcDirection(HDC hDC) -{ - PDC dc = DC_LockDc (hDC); - int ret = 0; // default to failure - - if ( dc ) - { - ret = IntGdiGetArcDirection ( dc ); - DC_UnlockDc(dc); - } - else - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - } - - return ret; -} BOOL STDCALL @@ -956,24 +931,4 @@ return Ret; } -int -STDCALL -NtGdiSetArcDirection(HDC hDC, - int ArcDirection) -{ - PDC dc; - INT nOldDirection = 0; // default to FAILURE - - dc = DC_LockDc (hDC); - if ( !dc ) return 0; - - if ( ArcDirection == AD_COUNTERCLOCKWISE || ArcDirection == AD_CLOCKWISE ) - { - nOldDirection = dc->w.ArcDirection; - dc->w.ArcDirection = ArcDirection; - } - - DC_UnlockDc( dc ); - return nOldDirection; -} /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c Wed Aug 8 22:58:06 2007 @@ -39,9 +39,6 @@ VOID FASTCALL PATH_ScaleNormalizedPoint (FLOAT_POINT corners[], double x, double y, POINT *pPoint); BOOL FASTCALL PATH_StrokePath(DC *dc, GdiPath *pPath); BOOL PATH_CheckCorners(DC *dc, POINT corners[], INT x1, INT y1, INT x2, INT y2); - -INT FASTCALL -IntGdiGetArcDirection(DC *dc); VOID FASTCALL IntGetCurrentPositionEx(PDC dc, LPPOINT pt); @@ -750,7 +747,7 @@ ASSERT ( dc ); - clockwise = ( IntGdiGetArcDirection(dc) == AD_CLOCKWISE ); + clockwise = ( dc->w.ArcDirection == AD_CLOCKWISE ); /* Check that path is open */ if ( dc->w.path.state != PATH_Open ) Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Wed Aug 8 22:58:06 2007 @@ -4180,28 +4180,6 @@ } -/* Remove this HAX! after the below function is done in GDI32.DLL! */ -INT -STDCALL -NtGdiGetSetTextCharExtra( HDC hDC, INT CharExtra, BOOL Set) -{ - /* Ulta-Ugly Hax! */ - INT Ret = 0x80000000; - - PDC dc = DC_LockDc ( hDC ); - if (!dc) - { - DPRINT("TextCharacterExtra %d", CharExtra); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return Ret; - } - DPRINT("TextCharacterExtra %d", CharExtra); - Ret = dc->Dc_Attr.lTextExtra; - if( Set ) dc->Dc_Attr.lTextExtra = CharExtra; - DC_UnlockDc(dc); - return (Ret); -} - static BOOL FASTCALL IntGetFullFileName( POBJECT_NAME_INFORMATION NameInfo, 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 Wed Aug 8 22:58:06 2007 @@ -697,7 +697,6 @@ NtGdiSelectObject 2 NtGdiSelectPalette 3 NtGdiSetAbortProc 2 -NtGdiSetArcDirection 2 NtGdiSetBitmapDimensionEx 4 NtGdiSetBkColor 2 NtGdiSetBkMode 2 @@ -783,7 +782,6 @@ NtGdiEscape 5 NtGdiExtTextOut 8 NtGdiGdiComment 3 -NtGdiGetArcDirection 1 NtGdiGetAspectRatioFilterEx 2 NtGdiGetBitmapDimensionEx 2 NtGdiGetBkColor 1 @@ -816,7 +814,6 @@ NtGdiGetPixelFormat 1 NtGdiGetPolyFillMode 1 NtGdiGetROP2 1 -NtGdiGetSetTextCharExtra 3 NtGdiGetStretchBltMode 1 NtGdiGetSystemPaletteEntries 4 NtGdiGetTextAlign 1

17 years, 4 months

← Newer
1
...
45
46
47
48
49
50
51
...
67
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 August 2007