Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 33301: - Fix two typos in the buffer size calculation code, spotted by Stefan Ginsberg.
by fireball＠svn.reactos.org 05 May '08

05 May '08

Author: fireball Date: Mon May 5 13:23:55 2008 New Revision: 33301 URL: http://svn.reactos.org/svn/reactos?rev=33301&view=rev Log: - Fix two typos in the buffer size calculation code, spotted by Stefan Ginsberg. Modified: trunk/reactos/ntoskrnl/mm/virtual.c Modified: trunk/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] Mon May 5 13:23:55 2008 @@ -78,28 +78,28 @@ _SEH_DECLARE_LOCALS(MiGetExceptionInfo); NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - + /* Calculate the maximum amount of data to move */ TotalSize = MI_MAPPED_COPY_PAGES - 2; - if (TotalSize <= (MI_MAPPED_COPY_PAGES - 2)) TotalSize = BufferSize; + if (BufferSize <= (MI_MAPPED_COPY_PAGES - 2)) TotalSize = BufferSize; CurrentSize = BufferSize; RemainingSize = TotalSize; - + /* Loop as long as there is still data */ while (RemainingSize > 0) { /* Check if this transfer will finish everything off */ if (RemainingSize < CurrentSize) CurrentSize = RemainingSize; - + /* Attach to the source address space */ KeStackAttachProcess(&SourceProcess->Pcb, &ApcState); - + /* Reset state for this pass */ MdlAddress = NULL; PagesLocked = FALSE; FailedInMoving = FALSE; ASSERT(FailedInProbe == FALSE); - + /* Protect user-mode copy */ _SEH_TRY { @@ -108,19 +108,19 @@ { /* Catch a failure here */ FailedInProbe = TRUE; - + /* Do the probe */ ProbeForRead(SourceAddress, BufferSize, sizeof(CHAR)); - + /* Passed */ FailedInProbe = FALSE; } - + /* Initialize and probe and lock the MDL */ MmInitializeMdl (Mdl, CurrentAddress, CurrentSize); MmProbeAndLockPages (Mdl, PreviousMode, IoReadAccess); PagesLocked = TRUE; - + /* Now map the pages */ MdlAddress = MmMapLockedPagesSpecifyCache(Mdl, KernelMode, @@ -134,24 +134,24 @@ FailedInMapping = TRUE; ExRaiseStatus(STATUS_INSUFFICIENT_RESOURCES); } - + /* Now let go of the source and grab to the target process */ KeUnstackDetachProcess(&ApcState); KeStackAttachProcess(&TargetProcess->Pcb, &ApcState); - + /* Check if this is our first time through */ if ((CurrentAddress == SourceAddress) && (PreviousMode != KernelMode)) { /* Catch a failure here */ FailedInProbe = TRUE; - + /* Do the probe */ ProbeForWrite(TargetAddress, BufferSize, sizeof(CHAR)); - + /* Passed */ FailedInProbe = FALSE; } - + /* Now do the actual move */ FailedInMoving = TRUE; RtlCopyMemory(CurrentTargetAddress, MdlAddress, CurrentSize); @@ -160,13 +160,13 @@ { /* Detach from whoever we may be attached to */ KeUnstackDetachProcess(&ApcState); - + /* Check if we had mapped the pages */ if (MdlAddress) MmUnmapLockedPages(MdlAddress, Mdl); - + /* Check if we had locked the pages */ if (PagesLocked) MmUnlockPages(Mdl); - + /* Check if we failed during the probe or mapping */ if ((FailedInProbe) || (FailedInMapping)) { @@ -174,7 +174,7 @@ Status = _SEH_GetExceptionCode(); _SEH_YIELD(); } - + /* Otherwise, we failed probably during the move */ *ReturnSize = BufferSize - RemainingSize; if (FailedInMoving) @@ -186,28 +186,28 @@ *ReturnSize = _SEH_VAR(BadAddress) - (ULONG_PTR)SourceAddress; } } - + /* Return partial copy */ Status = STATUS_PARTIAL_COPY; } _SEH_END; - + /* Check for SEH status */ if (Status != STATUS_SUCCESS) return Status; - + /* Detach from target */ KeUnstackDetachProcess(&ApcState); - + /* Unmap and unlock */ MmUnmapLockedPages(MdlAddress, Mdl); MmUnlockPages(Mdl); - + /* Update location and size */ RemainingSize -= CurrentSize; CurrentAddress = (PVOID)((ULONG_PTR)CurrentAddress + CurrentSize); CurrentTargetAddress = (PVOID)((ULONG_PTR)CurrentTargetAddress + CurrentSize); } - + /* All bytes read */ *ReturnSize = BufferSize; return STATUS_SUCCESS; @@ -232,13 +232,13 @@ _SEH_DECLARE_LOCALS(MiGetExceptionInfo); NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); - + /* Calculate the maximum amount of data to move */ TotalSize = MI_MAX_TRANSFER_SIZE; - if (TotalSize <= MI_MAX_TRANSFER_SIZE) TotalSize = BufferSize; + if (BufferSize <= MI_MAX_TRANSFER_SIZE) TotalSize = BufferSize; CurrentSize = BufferSize; RemainingSize = TotalSize; - + /* Check if we can use the stack */ if (BufferSize <= MI_POOL_COPY_BYTES) { @@ -252,20 +252,20 @@ if (!PoolAddress) ASSERT(FALSE); HavePoolAddress = TRUE; } - + /* Loop as long as there is still data */ while (RemainingSize > 0) { /* Check if this transfer will finish everything off */ if (RemainingSize < CurrentSize) CurrentSize = RemainingSize; - + /* Attach to the source address space */ KeStackAttachProcess(&SourceProcess->Pcb, &ApcState); - + /* Reset state for this pass */ FailedInMoving = FALSE; ASSERT(FailedInProbe == FALSE); - + /* Protect user-mode copy */ _SEH_TRY { @@ -274,34 +274,34 @@ { /* Catch a failure here */ FailedInProbe = TRUE; - + /* Do the probe */ ProbeForRead(SourceAddress, BufferSize, sizeof(CHAR)); - + /* Passed */ FailedInProbe = FALSE; } - + /* Do the copy */ RtlCopyMemory(PoolAddress, CurrentAddress, CurrentSize); - + /* Now let go of the source and grab to the target process */ KeUnstackDetachProcess(&ApcState); KeStackAttachProcess(&TargetProcess->Pcb, &ApcState); - + /* Check if this is our first time through */ if ((CurrentAddress == SourceAddress) && (PreviousMode != KernelMode)) { /* Catch a failure here */ FailedInProbe = TRUE; - + /* Do the probe */ ProbeForWrite(TargetAddress, BufferSize, sizeof(CHAR)); - + /* Passed */ FailedInProbe = FALSE; } - + /* Now do the actual move */ FailedInMoving = TRUE; RtlCopyMemory(CurrentTargetAddress, PoolAddress, CurrentSize); @@ -310,10 +310,10 @@ { /* Detach from whoever we may be attached to */ KeUnstackDetachProcess(&ApcState); - + /* Check if we had allocated pool */ if (HavePoolAddress) ExFreePool(PoolAddress); - + /* Check if we failed during the probe */ if (FailedInProbe) { @@ -321,7 +321,7 @@ Status = _SEH_GetExceptionCode(); _SEH_YIELD(); } - + /* Otherwise, we failed probably during the move */ *ReturnSize = BufferSize - RemainingSize; if (FailedInMoving) @@ -333,27 +333,27 @@ *ReturnSize = _SEH_VAR(BadAddress) - (ULONG_PTR)SourceAddress; } } - + /* Return partial copy */ Status = STATUS_PARTIAL_COPY; } _SEH_END; - + /* Check for SEH status */ if (Status != STATUS_SUCCESS) return Status; - + /* Detach from target */ KeUnstackDetachProcess(&ApcState); - + /* Update location and size */ RemainingSize -= CurrentSize; CurrentAddress = (PVOID)((ULONG_PTR)CurrentAddress + CurrentSize); CurrentTargetAddress = (PVOID)((ULONG_PTR)CurrentTargetAddress + CurrentSize); } - + /* Check if we had allocated pool */ if (HavePoolAddress) ExFreePool(PoolAddress); - + /* All bytes read */ *ReturnSize = BufferSize; return STATUS_SUCCESS;

1 0

[jimtabor] 33300: Implement XxxRedrawDesktop for Dx, needs testing.
by jimtabor＠svn.reactos.org 05 May '08

05 May '08

Author: jimtabor Date: Mon May 5 12:45:20 2008 New Revision: 33300 URL: http://svn.reactos.org/svn/reactos?rev=33300&view=rev Log: Implement XxxRedrawDesktop for Dx, needs testing. Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] Mon May 5 12:45:20 2008 @@ -117,6 +117,8 @@ BOOL FASTCALL IntDesktopUpdatePerUserSettings(BOOL bEnable); +VOID APIENTRY UserRedrawDesktop(VOID); + BOOL IntRegisterShellHookWindow(HWND hWnd); BOOL IntDeRegisterShellHookWindow(HWND hWnd); Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] Mon May 5 12:45:20 2008 @@ -627,10 +627,11 @@ APIENTRY DxEngRedrawDesktop() { - /* FIXME add redraw code */ - UNIMPLEMENTED; + UserRedrawDesktop(); return TRUE; } + + ULONG gulVisRgnUniqueness; // Increase count everytime client region is updated. /************************************************************************/ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Mon May 5 12:45:20 2008 @@ -625,6 +625,25 @@ } /* PUBLIC FUNCTIONS ***********************************************************/ + +VOID APIENTRY +UserRedrawDesktop() +{ + PWINDOW_OBJECT Window = NULL; + + UserEnterExclusive(); + + Window = UserGetDesktopWindow(); + + IntInvalidateWindows( Window, + Window->UpdateRegion, + RDW_FRAME | + RDW_ERASE | + RDW_INVALIDATE | + RDW_ALLCHILDREN); + UserLeave(); +} + NTSTATUS FASTCALL co_IntShowDesktop(PDESKTOP_OBJECT Desktop, ULONG Width, ULONG Height)

1 0

[gbrunmar] 33299: Implemented IDirect3DDevice9::GetAvailableTextureMem()
by gbrunmar＠svn.reactos.org 05 May '08

05 May '08

Author: gbrunmar Date: Mon May 5 11:49:13 2008 New Revision: 33299 URL: http://svn.reactos.org/svn/reactos?rev=33299&view=rev Log: Implemented IDirect3DDevice9::GetAvailableTextureMem() Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c trunk/reactos/dll/directx/d3d9/d3d9_private.h Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_devi… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] Mon May 5 11:49:13 2008 @@ -70,11 +70,43 @@ return D3D_OK; } +/*++ +* @name IDirect3DDevice9::GetAvailableTextureMem +* @implemented +* +* The function IDirect3DDevice9Impl_GetAvailableTextureMem returns a pointer to the IDirect3D9 object +* that created this device. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3DDevice9 object returned from IDirect3D9::CreateDevice() +* +* @return UINT +* The method returns an estimated the currently available texture memory in bytes rounded +* to the nearest MB. Applications should NOT use this as an exact number. +* +*/ static UINT WINAPI IDirect3DDevice9Impl_GetAvailableTextureMem(LPDIRECT3DDEVICE9 iface) { - UNIMPLEMENTED - - return D3D_OK; + UINT AvailableTextureMemory = 0; + DD_GETAVAILDRIVERMEMORYDATA ddGetAvailDriverMemoryData; + + LPDIRECT3DDEVICE9_INT This = impl_from_IDirect3DDevice9(iface); + LOCK_D3DDEVICE9(); + + memset(&ddGetAvailDriverMemoryData, 0, sizeof(ddGetAvailDriverMemoryData)); + ddGetAvailDriverMemoryData.lpDD = (PDD_DIRECTDRAW_GLOBAL)&This->DeviceData[0].pUnknown6BC->hDD; + + if (DDHAL_DRIVER_HANDLED == (*This->DeviceData[0].D3D9Callbacks.DdGetAvailDriverMemory)(&ddGetAvailDriverMemoryData)) + { + if (DD_OK == ddGetAvailDriverMemoryData.ddRVal) + { + /* Round it up to the nearest MB */ + AvailableTextureMemory = (ddGetAvailDriverMemoryData.dwFree + 0x80000) & 0xFFF00000; + } + } + + UNLOCK_D3DDEVICE9(); + return AvailableTextureMemory; } static HRESULT WINAPI IDirect3DDevice9Impl_EvictManagedResources(LPDIRECT3DDEVICE9 iface) Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_priv… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h [iso-8859-1] Mon May 5 11:49:13 2008 @@ -10,6 +10,7 @@ #include <windows.h> #include <ddraw.h> +#include <ddrawint.h> #define D3D9_INT_MAX_NUM_ADAPTERS 12 @@ -107,7 +108,7 @@ /* 0x0044 */ DWORD DdFlip; /* 0x0048 */ DWORD DdGetBltStatus; /* 0x004c */ DWORD DdGetFlipStatus; -/* 0x0050 */ DWORD DdGetAvailDriverMemory; +/* 0x0050 */ PDD_GETAVAILDRIVERMEMORY DdGetAvailDriverMemory; /* 0x0054 */ DWORD unknown0115; /* 0x0058 */ DWORD DdSetMode; /* 0x005c */ DWORD DdSetExclusiveMode;

1 0

[gbrunmar] 33298: * Implemented IDirect3DDevice9::GetDirect3D() and GetDeviceCaps() * Added a DevCaps filter when retrieving D3DCAPS9 from device caps
by gbrunmar＠svn.reactos.org 05 May '08

05 May '08

Author: gbrunmar Date: Mon May 5 10:58:23 2008 New Revision: 33298 URL: http://svn.reactos.org/svn/reactos?rev=33298&view=rev Log: * Implemented IDirect3DDevice9::GetDirect3D() and GetDeviceCaps() * Added a DevCaps filter when retrieving D3DCAPS9 from device caps Modified: trunk/reactos/dll/directx/d3d9/adapter.c trunk/reactos/dll/directx/d3d9/d3d9_device.c Modified: trunk/reactos/dll/directx/d3d9/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/adapter.c… ============================================================================== --- trunk/reactos/dll/directx/d3d9/adapter.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/adapter.c [iso-8859-1] Mon May 5 10:58:23 2008 @@ -20,6 +20,13 @@ #define D3D9_PRE_XP_CAPS2 (D3DCAPS2_CANAUTOGENMIPMAP | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_RESERVED | D3DCAPS2_FULLSCREENGAMMA) #define D3D9_XP_OR_LATER_CAPS2 (D3D9_PRE_XP_CAPS2 | D3DCAPS2_CANMANAGERESOURCE) #define D3D9_CAPS3 (D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD | D3DCAPS3_LINEAR_TO_SRGB_PRESENTATION | D3DCAPS3_COPY_TO_VIDMEM | D3DCAPS3_COPY_TO_SYSTEMMEM) +#define D3D9_DEVCAPS (D3DDEVCAPS_EXECUTESYSTEMMEMORY | D3DDEVCAPS_EXECUTEVIDEOMEMORY | D3DDEVCAPS_TLVERTEXSYSTEMMEMORY \ + | D3DDEVCAPS_TLVERTEXVIDEOMEMORY | D3DDEVCAPS_TEXTURESYSTEMMEMORY | D3DDEVCAPS_TEXTUREVIDEOMEMORY \ + | D3DDEVCAPS_DRAWPRIMTLVERTEX | D3DDEVCAPS_CANRENDERAFTERFLIP | D3DDEVCAPS_TEXTURENONLOCALVIDMEM \ + | D3DDEVCAPS_DRAWPRIMITIVES2 | D3DDEVCAPS_SEPARATETEXTUREMEMORIES | D3DDEVCAPS_DRAWPRIMITIVES2EX \ + | D3DDEVCAPS_HWTRANSFORMANDLIGHT | D3DDEVCAPS_CANBLTSYSTONONLOCAL | D3DDEVCAPS_HWRASTERIZATION \ + | D3DDEVCAPS_PUREDEVICE | D3DDEVCAPS_QUINTICRTPATCHES | D3DDEVCAPS_RTPATCHES | D3DDEVCAPS_RTPATCHHANDLEZERO \ + | D3DDEVCAPS_NPATCHES) #define D3DCAPS2_PRESENT_INTERVAL_SEVERAL 0x00200000 #define D3DCAPS2_PRESENT_INTERVAL_IMMEDIATE 0x00400000 @@ -211,6 +218,7 @@ pDstCaps->Caps2 = pSrcCaps->Caps2 & D3D9_PRE_XP_CAPS2; pDstCaps->Caps3 = pSrcCaps->Caps3 & D3D9_CAPS3; + pDstCaps->DevCaps = pSrcCaps->DevCaps & D3D9_DEVCAPS; pDstCaps->PresentationIntervals = D3DPRESENT_INTERVAL_ONE; if (pSrcCaps->Caps2 & D3DCAPS2_PRESENT_INTERVAL_SEVERAL) Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_devi… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] Mon May 5 10:58:23 2008 @@ -7,6 +7,7 @@ */ #include "d3d9_device.h" #include "d3d9_helpers.h" +#include "adapter.h" #include "debug.h" #define LOCK_D3DDEVICE9() if (This->bLockDevice) EnterCriticalSection(&This->CriticalSection); @@ -83,17 +84,78 @@ return D3D_OK; } +/*++ +* @name IDirect3DDevice9::GetDirect3D +* @implemented +* +* The function IDirect3DDevice9Impl_GetDirect3D returns a pointer to the IDirect3D9 object +* that created this device. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3DDevice9 object returned from IDirect3D9::CreateDevice() +* +* @param IDirect3D9** ppD3D9 +* Pointer to a IDirect3D9* to receive the IDirect3D9 object pointer. +* +* @return HRESULT +* If the method successfully fills the ppD3D9 structure, the return value is D3D_OK. +* If ppD3D9 is a bad pointer, the return value will be D3DERR_INVALIDCALL. +* +*/ static HRESULT WINAPI IDirect3DDevice9Impl_GetDirect3D(LPDIRECT3DDEVICE9 iface, IDirect3D9** ppD3D9) { - UNIMPLEMENTED - - return D3D_OK; -} - + IDirect3D9* pDirect3D9; + LPDIRECT3DDEVICE9_INT This = impl_from_IDirect3DDevice9(iface); + LOCK_D3DDEVICE9(); + + if (IsBadWritePtr(ppD3D9, sizeof(IDirect3D9*))) + { + DPRINT1("Invalid ppD3D9 parameter specified"); + UNLOCK_D3DDEVICE9(); + return D3DERR_INVALIDCALL; + } + + pDirect3D9 = (IDirect3D9*)&This->pDirect3D9->lpVtbl; + IDirect3D9_AddRef(pDirect3D9); + *ppD3D9 = pDirect3D9; + + UNLOCK_D3DDEVICE9(); + return D3D_OK; +} + +/*++ +* @name IDirect3DDevice9::GetDeviceCaps +* @implemented +* +* The function IDirect3DDevice9Impl_GetDeviceCaps fills the pCaps argument with the +* capabilities of the device. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3D9 object returned from Direct3DCreate9() +* +* @param D3DCAPS9* pCaps +* Pointer to a D3DCAPS9 structure to be filled with the device's capabilities. +* +* @return HRESULT +* If the method successfully fills the pCaps structure, the return value is D3D_OK. +* If pCaps is a bad pointer the return value will be D3DERR_INVALIDCALL. +* +*/ static HRESULT WINAPI IDirect3DDevice9Impl_GetDeviceCaps(LPDIRECT3DDEVICE9 iface, D3DCAPS9* pCaps) { - UNIMPLEMENTED - + LPDIRECT3DDEVICE9_INT This = impl_from_IDirect3DDevice9(iface); + LOCK_D3DDEVICE9(); + + if (IsBadWritePtr(pCaps, sizeof(D3DCAPS9))) + { + DPRINT1("Invalid pCaps parameter specified"); + UNLOCK_D3DDEVICE9(); + return D3DERR_INVALIDCALL; + } + + GetAdapterCaps(&This->pDirect3D9->DisplayAdapters[0], This->DeviceData[0].DeviceType, pCaps); + + UNLOCK_D3DDEVICE9(); return D3D_OK; }

1 0

[hpoussin] 33297: Remove some warnings
by hpoussin＠svn.reactos.org 05 May '08

05 May '08

Author: hpoussin Date: Mon May 5 09:50:43 2008 New Revision: 33297 URL: http://svn.reactos.org/svn/reactos?rev=33297&view=rev Log: Remove some warnings Modified: trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h trunk/reactos/drivers/filesystems/ext2/src/cleanup.c trunk/reactos/drivers/filesystems/ext2/src/close.c trunk/reactos/drivers/filesystems/ext2/src/create.c trunk/reactos/drivers/filesystems/ext2/src/devcntrl.c trunk/reactos/drivers/filesystems/ext2/src/dircntrl.c trunk/reactos/drivers/filesystems/ext2/src/ext2init.c trunk/reactos/drivers/filesystems/ext2/src/fastio.c trunk/reactos/drivers/filesystems/ext2/src/fileinfo.c trunk/reactos/drivers/filesystems/ext2/src/flush.c trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c trunk/reactos/drivers/filesystems/ext2/src/io.c trunk/reactos/drivers/filesystems/ext2/src/metadata.c trunk/reactos/drivers/filesystems/ext2/src/misc.c trunk/reactos/drivers/filesystems/ext2/src/read.c trunk/reactos/drivers/filesystems/ext2/src/shutdown.c trunk/reactos/drivers/filesystems/ext2/src/volinfo.c trunk/reactos/drivers/filesystems/ext2/src/write.c Modified: trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h [iso-8859-1] Mon May 5 09:50:43 2008 @@ -130,8 +130,9 @@ } #ifdef EXT2_POOL_WITH_TAG + #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define Ext2AllocatePool(PoolType,NumberOfBytes) \ - ExAllocatePoolWithTag( PoolType, NumberOfBytes, '2txE' ) + ExAllocatePoolWithTag( PoolType, NumberOfBytes, TAG ( 'E','x','t','2' ) ) #else #define Ext2AllocatePool(PoolType,NumberOfBytes) \ ExAllocatePool( PoolType, NumberOfBytes ) Modified: trunk/reactos/drivers/filesystems/ext2/src/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/cleanup.c [iso-8859-1] Mon May 5 09:50:43 2008 @@ -113,12 +113,10 @@ PtrExt2VCB PtrVCB = NULL; PtrExt2NTRequiredFCB PtrReqdFCB = NULL; PERESOURCE PtrResourceAcquired = NULL; - IO_STATUS_BLOCK LocalIoStatus; BOOLEAN CompleteIrp = TRUE; BOOLEAN PostRequest = FALSE; BOOLEAN AcquiredVCB = FALSE; - BOOLEAN CanWait = FALSE; BOOLEAN BlockForResource; int i = 1; Modified: trunk/reactos/drivers/filesystems/ext2/src/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/close.c [iso-8859-1] Mon May 5 09:50:43 2008 @@ -115,12 +115,10 @@ PtrExt2VCB PtrVCB = NULL; PtrExt2NTRequiredFCB PtrReqdFCB = NULL; PERESOURCE PtrResourceAcquired = NULL; - IO_STATUS_BLOCK LocalIoStatus; BOOLEAN CompleteIrp = TRUE; BOOLEAN PostRequest = FALSE; BOOLEAN AcquiredVCB = FALSE; - BOOLEAN CanWait = FALSE; BOOLEAN BlockForResource; int i = 1; Modified: trunk/reactos/drivers/filesystems/ext2/src/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/create.c [iso-8859-1] Mon May 5 09:50:43 2008 @@ -180,8 +180,6 @@ UNICODE_STRING AbsolutePathName; UNICODE_STRING RenameLinkTargetFileName; - LARGE_INTEGER FileAllocationSize, FileEndOfFile; - ASSERT(PtrIrpContext); ASSERT(PtrIrp); @@ -472,12 +470,10 @@ UNICODE_STRING RemainingName; UNICODE_STRING CurrentName; UNICODE_STRING NextRemainingName; - PEXT2_INODE PtrNextInode = NULL; ULONG CurrInodeNo = 0; PtrExt2FCB PtrCurrFCB = NULL; PtrExt2FCB PtrNextFCB = NULL; PFILE_OBJECT PtrCurrFileObject = NULL; - UINT NameBufferIndex; ULONG Type = 0; LARGE_INTEGER ZeroSize; BOOLEAN Found = FALSE; @@ -527,7 +523,6 @@ if( OpenTargetDirectory ) { - int i; // // This is for a rename/move operation... // @@ -580,10 +575,10 @@ // Quit searching... // - if( ( NextRemainingName.Length == 0 ) && + if( ( NextRemainingName.Length == 0 ) && ( ( RequestedDisposition == FILE_CREATE ) || ( RequestedDisposition == FILE_OPEN_IF) || - ( RequestedDisposition == FILE_OVERWRITE_IF) ) + ( RequestedDisposition == FILE_OVERWRITE_IF) ) ) { // @@ -618,7 +613,6 @@ } else if( NextRemainingName.Length == 0 && OpenTargetDirectory ) { - int i; // // This is for a rename/move operation... // Just the last component was not found... @@ -1163,7 +1157,6 @@ { PtrExt2FCB PtrFCB = NULL; - ULONG InodeNo = 0; PLIST_ENTRY PtrEntry; if( IsListEmpty( &(PtrVCB->FCBListHead) ) ) @@ -1222,7 +1215,6 @@ ULONG *Type ) { - PtrExt2FCB PtrNewFCB = NULL; PFILE_OBJECT PtrFileObject = NULL; ULONG InodeNo = 0; @@ -1637,7 +1629,6 @@ { EXT2_INODE Inode; PtrExt2VCB PtrVCB = PtrFCB->PtrVCB; - ULONG i; Ext2InitializeFCBInodeInfo( PtrFCB ); Modified: trunk/reactos/drivers/filesystems/ext2/src/devcntrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/devcntrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/devcntrl.c [iso-8859-1] Mon May 5 09:50:43 2008 @@ -125,7 +125,6 @@ PtrExt2CCB PtrCCB = NULL; PtrExt2VCB PtrVCB = NULL; ULONG IoControlCode = 0; - void *BufferPointer = NULL; try { @@ -165,9 +164,6 @@ IoSetCompletionRoutine(PtrIrp, Ext2DevIoctlCompletion, NULL, TRUE, TRUE, TRUE); // Send the request. RC = IoCallDriver(PtrVCB->TargetDeviceObject, PtrIrp); - - try_exit: NOTHING; - } finally { Modified: trunk/reactos/drivers/filesystems/ext2/src/dircntrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/dircntrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/dircntrl.c [iso-8859-1] Mon May 5 09:50:43 2008 @@ -109,7 +109,6 @@ PFILE_OBJECT PtrFileObject = NULL; PtrExt2FCB PtrFCB = NULL; PtrExt2CCB PtrCCB = NULL; - PtrExt2VCB PtrVCB = NULL; // First, get a pointer to the current I/O stack location PtrIoStackLocation = IoGetCurrentIrpStackLocation(PtrIrp); @@ -189,7 +188,6 @@ PtrExt2CCB PtrCCB) { NTSTATUS RC = STATUS_SUCCESS; - BOOLEAN CompleteRequest = TRUE; BOOLEAN PostRequest = FALSE; PtrExt2NTRequiredFCB PtrReqdFCB = NULL; BOOLEAN CanWait = FALSE; @@ -212,9 +210,7 @@ BOOLEAN SearchWithWildCards = FALSE; PFILE_BOTH_DIR_INFORMATION BothDirInformation = NULL; - PFILE_FULL_DIR_INFORMATION FullDirInformation = NULL; PFILE_DIRECTORY_INFORMATION DirectoryInformation = NULL; - PFILE_NAMES_INFORMATION NamesInformation = NULL; PEXT2_DIR_ENTRY PtrDirEntry = NULL; @@ -233,7 +229,7 @@ PBCB PtrBCB = NULL; BYTE * PtrPinnedBlockBuffer = NULL; - unsigned int i,j; + unsigned int j; DebugTrace(DEBUG_TRACE_MISC, " === Querying Directory %S", PtrFCB->FCBName->ObjectName.Buffer ); Modified: trunk/reactos/drivers/filesystems/ext2/src/ext2init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/ext2init.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/ext2init.c [iso-8859-1] Mon May 5 09:50:43 2008 @@ -49,7 +49,6 @@ { NTSTATUS RC = STATUS_SUCCESS; UNICODE_STRING DriverDeviceName; - BOOLEAN RegisteredShutdown = FALSE; #if 0 Ext2BreakPoint(); @@ -128,7 +127,7 @@ // create a device object representing the driver itself // so that requests can be targeted to the driver ... // e.g. for a disk-based FSD, "mount" requests will be sent to - // this device object by the I/O Manager.\ + // this device object by the I/O Manager. // For a redirector/server, you may have applications // send "special" IOCTL's using this device object ... RtlInitUnicodeString(&DriverDeviceName, EXT2_FS_NAME); @@ -136,10 +135,10 @@ DriverObject, // our driver object 0, // don't need an extension for this object &DriverDeviceName,// name - can be used to "open" the driver - // see the book for alternate choices + // see the book for alternate choices FILE_DEVICE_DISK_FILE_SYSTEM, 0, // no special characteristics - // do not want this as an exclusive device, though you might + // do not want this as an exclusive device, though you might FALSE, &(Ext2GlobalData.Ext2DeviceObject)))) { Modified: trunk/reactos/drivers/filesystems/ext2/src/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/fastio.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/fastio.c [iso-8859-1] Mon May 5 09:50:43 2008 @@ -191,9 +191,6 @@ Ext2LogEvent(EXT2_ERROR_INTERNAL_ERROR, RC); } - - try_exit: NOTHING; - } finally { } @@ -257,9 +254,6 @@ Ext2LogEvent(EXT2_ERROR_INTERNAL_ERROR, RC); } - - try_exit: NOTHING; - } finally { @@ -321,9 +315,6 @@ RC = Ext2ExceptionHandler(PtrIrpContext, NULL); Ext2LogEvent(EXT2_ERROR_INTERNAL_ERROR, RC); } - - try_exit: NOTHING; - } finally { @@ -384,9 +375,6 @@ RC = Ext2ExceptionHandler(PtrIrpContext, NULL); Ext2LogEvent(EXT2_ERROR_INTERNAL_ERROR, RC); } - - try_exit: NOTHING; - } finally { @@ -452,9 +440,6 @@ RC = Ext2ExceptionHandler(PtrIrpContext, NULL); Ext2LogEvent(EXT2_ERROR_INTERNAL_ERROR, RC); } - - try_exit: NOTHING; - } finally { @@ -519,9 +504,6 @@ RC = Ext2ExceptionHandler(PtrIrpContext, NULL); Ext2LogEvent(EXT2_ERROR_INTERNAL_ERROR, RC); } - - try_exit: NOTHING; - } finally { @@ -582,9 +564,6 @@ RC = Ext2ExceptionHandler(PtrIrpContext, NULL); Ext2LogEvent(EXT2_ERROR_INTERNAL_ERROR, RC); } - - try_exit: NOTHING; - } finally { @@ -646,9 +625,6 @@ RC = Ext2ExceptionHandler(PtrIrpContext, NULL); Ext2LogEvent(EXT2_ERROR_INTERNAL_ERROR, RC); } - - try_exit: NOTHING; - } finally { @@ -931,8 +907,6 @@ IN PVOID Context) { - BOOLEAN ReturnedStatus = TRUE; - PtrExt2VCB PtrVCB = NULL; PtrExt2FCB PtrFCB = NULL; PtrExt2CCB PtrCCB = NULL; @@ -1105,7 +1079,6 @@ void NTAPI Ext2RelReadAhead( IN PVOID Context) { - BOOLEAN ReturnedStatus = TRUE; PtrExt2FCB PtrFCB = NULL; PtrExt2CCB PtrCCB = NULL; PtrExt2NTRequiredFCB PtrReqdFCB = NULL; @@ -1211,9 +1184,6 @@ RC = Ext2ExceptionHandler(PtrIrpContext, NULL); Ext2LogEvent(EXT2_ERROR_INTERNAL_ERROR, RC); } - - try_exit: NOTHING; - } finally { @@ -1278,9 +1248,6 @@ RC = Ext2ExceptionHandler(PtrIrpContext, NULL); Ext2LogEvent(EXT2_ERROR_INTERNAL_ERROR, RC); } - - try_exit: NOTHING; - } finally { @@ -1345,9 +1312,6 @@ Ext2LogEvent(EXT2_ERROR_INTERNAL_ERROR, RC); } - - try_exit: NOTHING; - } finally { @@ -1411,9 +1375,6 @@ Ext2LogEvent(EXT2_ERROR_INTERNAL_ERROR, RC); } - - try_exit: NOTHING; - } finally { @@ -1476,9 +1437,6 @@ RC = Ext2ExceptionHandler(PtrIrpContext, NULL); Ext2LogEvent(EXT2_ERROR_INTERNAL_ERROR, RC); } - - try_exit: NOTHING; - } finally { @@ -1556,9 +1514,6 @@ RC = Ext2ExceptionHandler(PtrIrpContext, NULL); Ext2LogEvent(EXT2_ERROR_INTERNAL_ERROR, RC); } - - try_exit: NOTHING; - } finally { @@ -1621,9 +1576,6 @@ RC = Ext2ExceptionHandler(PtrIrpContext, NULL); Ext2LogEvent(EXT2_ERROR_INTERNAL_ERROR, RC); } - - try_exit: NOTHING; - } finally { @@ -1681,9 +1633,6 @@ RC = Ext2ExceptionHandler(PtrIrpContext, NULL); Ext2LogEvent(EXT2_ERROR_INTERNAL_ERROR, RC); } - - try_exit: NOTHING; - } finally { @@ -1740,9 +1689,6 @@ RC = Ext2ExceptionHandler(PtrIrpContext, NULL); Ext2LogEvent(EXT2_ERROR_INTERNAL_ERROR, RC); } - - try_exit: NOTHING; - } finally { Modified: trunk/reactos/drivers/filesystems/ext2/src/fileinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/fileinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/fileinfo.c [iso-8859-1] Mon May 5 09:50:43 2008 @@ -115,7 +115,6 @@ BOOLEAN MainResourceAcquired = FALSE; BOOLEAN VCBResourceAcquired = FALSE; BOOLEAN PagingIoResourceAcquired = FALSE; - IO_STATUS_BLOCK LocalIoStatus; void *PtrSystemBuffer = NULL; long BufferLength = 0; FILE_INFORMATION_CLASS FunctionalityRequested; @@ -894,8 +893,6 @@ { Ext2ClearFlag(PtrFileObject->Flags, FO_TEMPORARY_FILE); } - - try_exit: NOTHING; } finally { Modified: trunk/reactos/drivers/filesystems/ext2/src/flush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/flush.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/flush.c [iso-8859-1] Mon May 5 09:50:43 2008 @@ -282,8 +282,6 @@ PtrExt2VCB PtrVCB) { BOOLEAN AcquiredVCB = FALSE; - PtrExt2FCB PtrFCB = NULL; - PLIST_ENTRY PtrNextFCB = NULL; try { ExAcquireResourceExclusiveLite(&(PtrVCB->VCBResource), TRUE); @@ -335,8 +333,6 @@ PIRP PtrIrp, PVOID Context) { - NTSTATUS RC = STATUS_SUCCESS; - if (PtrIrp->PendingReturned) { IoMarkIrpPending(PtrIrp); } Modified: trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c [iso-8859-1] Mon May 5 09:50:43 2008 @@ -895,8 +895,6 @@ DebugTrace(DEBUG_TRACE_FSCTRL, "Unknown FSCTRL !!!", 0); } - - try_exit: NOTHING; } finally { Modified: trunk/reactos/drivers/filesystems/ext2/src/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/io.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/io.c [iso-8859-1] Mon May 5 09:50:43 2008 @@ -242,15 +242,7 @@ PEXT2_IO_CONTEXT PtrIoContext = NULL; PKEVENT PtrSyncEvent = NULL; - PVOID PtrReadBuffer = NULL; - ULONG ReadBufferLength = 0; - - ULONG LogicalBlockNo = 0; - ULONG LogicalBlockSize = 0; - ULONG PhysicalBlockSize = 0; - - uint32 NumberBytesRead = 0; - int i; + PIO_STACK_LOCATION PtrIrpNextSp = NULL; try Modified: trunk/reactos/drivers/filesystems/ext2/src/metadata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/metadata.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/metadata.c [iso-8859-1] Mon May 5 09:50:43 2008 @@ -472,8 +472,6 @@ } } - - try_exit: NOTHING; } finally { @@ -713,8 +711,6 @@ // The Read Buffer Pointer BYTE * PtrPinnedBuffer = NULL; - - PEXT2_INODE PtrTempInode; // Buffer Control Block PBCB PtrBCB = NULL; @@ -841,7 +837,6 @@ PtrExt2VCB PtrVCB; LARGE_INTEGER VolumeByteOffset; unsigned long LogicalBlockSize = 0; - unsigned long NumberOfBytesToRead = 0; BOOLEAN RC = FALSE; USHORT HeaderLength = sizeof( EXT2_DIR_ENTRY ); @@ -1071,7 +1066,6 @@ PBCB PtrDataBlockBCB = NULL; BYTE * PtrDataBlock = NULL; PFILE_OBJECT PtrFileObject = NULL; - PEXT2_DIR_ENTRY PtrTempDirEntry; LONGLONG ByteOffset = 0; PtrExt2VCB PtrVCB; LARGE_INTEGER VolumeByteOffset; @@ -2598,9 +2592,6 @@ BYTE * PtrPinnedBlockBuffer = NULL; PEXT2_DIR_ENTRY PtrDirEntry = NULL; BOOLEAN Found = FALSE; - int i; - - StartBufferOffset.QuadPart = 0; Modified: trunk/reactos/drivers/filesystems/ext2/src/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/misc.c [iso-8859-1] Mon May 5 09:50:43 2008 @@ -205,9 +205,6 @@ DebugTrace( DEBUG_TRACE_FREE, "Freeing = %lX [misc]", Ext2GlobalData.IrpContextZone); ExFreePool(Ext2GlobalData.IrpContextZone); - - try_exit: NOTHING; - } finally { @@ -429,7 +426,7 @@ { PtrExt2ObjectName PtrObjectName = NULL; BOOLEAN AllocatedFromZone = TRUE; - KIRQL CurrentIrql; + //KIRQL CurrentIrql; /* // first, try to allocate out of the zone KeAcquireSpinLock(&(Ext2GlobalData.ZoneAllocationSpinLock), &CurrentIrql); @@ -491,7 +488,9 @@ void NTAPI Ext2ReleaseObjectName( PtrExt2ObjectName PtrObjectName) { +#ifdef USE_ZONES KIRQL CurrentIrql; +#endif ASSERT(PtrObjectName); PtrObjectName->NodeIdentifier.NodeType = EXT2_NODE_TYPE_FREED; @@ -540,7 +539,9 @@ { PtrExt2CCB PtrCCB = NULL; BOOLEAN AllocatedFromZone = TRUE; - KIRQL CurrentIrql; +#ifdef USE_ZONES + KIRQL CurrentIrql; +#endif #ifdef USE_ZONES @@ -608,7 +609,9 @@ void NTAPI Ext2ReleaseCCB( PtrExt2CCB PtrCCB) { +#ifdef USE_ZONES KIRQL CurrentIrql; +#endif ASSERT( PtrCCB ); if(PtrCCB->NodeIdentifier.NodeType != EXT2_NODE_TYPE_CCB) @@ -665,7 +668,9 @@ { PtrExt2FCB PtrFCB = NULL; BOOLEAN AllocatedFromZone = TRUE; +#ifdef USE_ZONES KIRQL CurrentIrql; +#endif // first, try to allocate out of the zone #ifdef USE_ZONES @@ -862,7 +867,7 @@ void NTAPI Ext2ReleaseFCB( PtrExt2FCB PtrFCB) { - KIRQL CurrentIrql; + //KIRQL CurrentIrql; AssertFCB( PtrFCB ); @@ -1025,7 +1030,7 @@ { PtrExt2IrpContext PtrIrpContext = NULL; BOOLEAN AllocatedFromZone = TRUE; - KIRQL CurrentIrql; + //KIRQL CurrentIrql; PIO_STACK_LOCATION PtrIoStackLocation = NULL; /* @@ -1611,8 +1616,6 @@ OUT PtrExt2CCB *PPtrCCB, OUT PtrExt2VCB *PPtrVCB ) { - int Offset; - (*PPtrCCB) = (PtrExt2CCB)(PtrFileObject->FsContext2); if( *PPtrCCB ) { Modified: trunk/reactos/drivers/filesystems/ext2/src/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/read.c [iso-8859-1] Mon May 5 09:50:43 2008 @@ -117,10 +117,8 @@ PtrExt2VCB PtrVCB = NULL; PtrExt2NTRequiredFCB PtrReqdFCB = NULL; PERESOURCE PtrResourceAcquired = NULL; - IO_STATUS_BLOCK LocalIoStatus; PVOID PtrSystemBuffer = NULL; PVOID PtrPinnedReadBuffer = NULL; - uint32 KeyValue = 0; BOOLEAN CompleteIrp = TRUE; BOOLEAN PostRequest = FALSE; @@ -129,13 +127,7 @@ BOOLEAN PagingIo = FALSE; BOOLEAN NonBufferedIo = FALSE; BOOLEAN SynchronousIo = FALSE; - BOOLEAN MdlLocked = FALSE; BOOLEAN ReadTruncated = FALSE; - - LARGE_INTEGER StartPhysicalBlock; - ULONG NoOfBlocks = 0; - - PIO_STACK_LOCATION PtrIrpNextSp = NULL; // Used to cache the Single Indirect blocks pointed to by // the Double Indirect block @@ -162,7 +154,7 @@ PBCB PtrPinnedDIndirectBCB = NULL; PBCB PtrPinnedTIndirectBCB = NULL; - int i, Index; + int Index; try { Modified: trunk/reactos/drivers/filesystems/ext2/src/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/shutdown.c [iso-8859-1] Mon May 5 09:50:43 2008 @@ -108,7 +108,6 @@ { NTSTATUS RC = STATUS_SUCCESS; PIO_STACK_LOCATION PtrIoStackLocation = NULL; - IO_STATUS_BLOCK LocalIoStatus; try { @@ -197,8 +196,6 @@ } *///////////////////////////////////////////// - try_exit: NOTHING; - } finally { Modified: trunk/reactos/drivers/filesystems/ext2/src/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/volinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/volinfo.c [iso-8859-1] Mon May 5 09:50:43 2008 @@ -174,7 +174,6 @@ Status = STATUS_BUFFER_OVERFLOW; DebugTrace(DEBUG_TRACE_MISC, " === Buffer insufficient", 0); } - try_exit: NOTHING; } finally { Modified: trunk/reactos/drivers/filesystems/ext2/src/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/write.c [iso-8859-1] Mon May 5 09:50:43 2008 @@ -113,9 +113,7 @@ PtrExt2VCB PtrVCB = NULL; PtrExt2NTRequiredFCB PtrReqdFCB = NULL; PERESOURCE PtrResourceAcquired = NULL; - IO_STATUS_BLOCK LocalIoStatus; void *PtrSystemBuffer = NULL; - uint32 KeyValue = 0; BOOLEAN CompleteIrp = TRUE; BOOLEAN PostRequest = FALSE;

1 0

[hpoussin] 33296: Fix assert
by hpoussin＠svn.reactos.org 05 May '08

05 May '08

Author: hpoussin Date: Mon May 5 09:50:01 2008 New Revision: 33296 URL: http://svn.reactos.org/svn/reactos?rev=33296&view=rev Log: Fix assert 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 [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Mon May 5 09:50:01 2008 @@ -8685,8 +8685,8 @@ _InvokeOnCancel) \ { \ PIO_STACK_LOCATION _IrpSp; \ - ASSERT(_InvokeOnSuccess || _InvokeOnError || _InvokeOnCancel ? \ - _CompletionRoutine != NULL : TRUE); \ + ASSERT((_InvokeOnSuccess) || (_InvokeOnError) || (_InvokeOnCancel) ? \ + (_CompletionRoutine) != NULL : TRUE); \ _IrpSp = IoGetNextIrpStackLocation(_Irp); \ _IrpSp->CompletionRoutine = (PIO_COMPLETION_ROUTINE)(_CompletionRoutine); \ _IrpSp->Context = (_Context); \

1 0

[tkreuzer] 33295: add tests for GetCurrentObject
by tkreuzer＠svn.reactos.org 05 May '08

05 May '08

Author: tkreuzer Date: Mon May 5 08:33:42 2008 New Revision: 33295 URL: http://svn.reactos.org/svn/reactos?rev=33295&view=rev Log: add tests for GetCurrentObject Added: trunk/rostests/apitests/gdi32api/tests/GetCurrentObject.c (with props) Modified: trunk/rostests/apitests/gdi32api/testlist.c Modified: trunk/rostests/apitests/gdi32api/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/testlis… ============================================================================== --- trunk/rostests/apitests/gdi32api/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32api/testlist.c [iso-8859-1] Mon May 5 08:33:42 2008 @@ -12,6 +12,7 @@ #include "tests/CreateRectRgn.c" #include "tests/ExtCreatePen.c" #include "tests/GetClipRgn.c" +#include "tests/GetCurrentObject.c" #include "tests/GetObject.c" #include "tests/GetStockObject.c" #include "tests/GetDIBits.c" @@ -31,6 +32,7 @@ { L"CreateRectRgn", Test_CreateRectRgn }, { L"ExtCreatePen", Test_ExtCreatePen }, { L"GetClipRgn", Test_GetClipRgn }, + { L"GetCurrentObject", Test_GetCurrentObject }, { L"GetObject", Test_GetObject }, { L"GetStockObject", Test_GetStockObject }, { L"GetDIBits", Test_GetDIBits }, Added: trunk/rostests/apitests/gdi32api/tests/GetCurrentObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GetCurrentObject.c (added) +++ trunk/rostests/apitests/gdi32api/tests/GetCurrentObject.c [iso-8859-1] Mon May 5 08:33:42 2008 @@ -1,0 +1,139 @@ + +INT +Test_GetCurrentObject(PTESTINFO pti) +{ + HWND hWnd; + HDC hDC; + + /* Create a window */ + hWnd = CreateWindowW(L"BUTTON", L"TestWindow", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, + NULL, NULL, g_hInstance, 0); + /* Get the DC */ + hDC = GetDC(hWnd); + + /* Test NULL DC */ + SetLastError(ERROR_SUCCESS); + TEST(GetCurrentObject(NULL, 0) == 0); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + SetLastError(ERROR_SUCCESS); + TEST(GetCurrentObject(NULL, OBJ_BITMAP) == 0); + TEST(GetCurrentObject(NULL, OBJ_BRUSH) == 0); + TEST(GetCurrentObject(NULL, OBJ_COLORSPACE) == 0); + TEST(GetCurrentObject(NULL, OBJ_FONT) == 0); + TEST(GetCurrentObject(NULL, OBJ_PAL) == 0); + TEST(GetCurrentObject(NULL, OBJ_PEN) == 0); + TEST(GetLastError() == ERROR_SUCCESS); + + /* Test invalid DC handle */ + SetLastError(ERROR_SUCCESS); + TEST(GetCurrentObject((HDC)-123, 0) == 0); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + SetLastError(ERROR_SUCCESS); + TEST(GetCurrentObject((HDC)-123, OBJ_BITMAP) == 0); + TEST(GetLastError() == ERROR_SUCCESS); + + /* Test invalid types */ + SetLastError(ERROR_SUCCESS); + TEST(GetCurrentObject(hDC, 0) == 0); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + SetLastError(ERROR_SUCCESS); + TEST(GetCurrentObject(hDC, 3) == 0); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + SetLastError(ERROR_SUCCESS); + TEST(GetCurrentObject(hDC, 4) == 0); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + SetLastError(ERROR_SUCCESS); + TEST(GetCurrentObject(hDC, 8) == 0); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + SetLastError(ERROR_SUCCESS); + TEST(GetCurrentObject(hDC, 9) == 0); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + SetLastError(ERROR_SUCCESS); + TEST(GetCurrentObject(hDC, 10) == 0); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + SetLastError(ERROR_SUCCESS); + TEST(GetCurrentObject(hDC, 12) == 0); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + SetLastError(ERROR_SUCCESS); + TEST(GetCurrentObject(hDC, 13) == 0); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + /* Default bitmap */ + SetLastError(ERROR_SUCCESS); + HBITMAP hBmp; + hBmp = GetCurrentObject(hDC, OBJ_BITMAP); + TEST(GDI_HANDLE_GET_TYPE(hBmp) == GDI_OBJECT_TYPE_BITMAP); + TEST(GetLastError() == ERROR_SUCCESS); + + /* Other bitmap */ + SetLastError(ERROR_SUCCESS); + SelectObject(hDC, GetStockObject(21)); + TEST(hBmp == GetCurrentObject(hDC, OBJ_BITMAP)); + TEST(GDI_HANDLE_GET_TYPE(hBmp) == GDI_OBJECT_TYPE_BITMAP); + TEST(GetLastError() == ERROR_SUCCESS); + + /* Default brush */ + SetLastError(ERROR_SUCCESS); + TEST(GetCurrentObject(hDC, OBJ_BRUSH) == GetStockObject(WHITE_BRUSH)); + TEST(GetLastError() == ERROR_SUCCESS); + + /* Other brush */ + SetLastError(ERROR_SUCCESS); + SelectObject(hDC, GetStockObject(BLACK_BRUSH)); + TEST(GetCurrentObject(hDC, OBJ_BRUSH) == GetStockObject(BLACK_BRUSH)); + TEST(GetLastError() == ERROR_SUCCESS); + + /* Default colorspace */ + SetLastError(ERROR_SUCCESS); + TEST(GetCurrentObject(hDC, OBJ_COLORSPACE) == GetStockObject(20)); + TEST(GetLastError() == ERROR_SUCCESS); + + /* Default font */ + SetLastError(ERROR_SUCCESS); + TEST(GetCurrentObject(hDC, OBJ_FONT) == GetStockObject(SYSTEM_FONT)); + TEST(GetLastError() == ERROR_SUCCESS); + + /* Other font */ + SetLastError(ERROR_SUCCESS); + SelectObject(hDC, GetStockObject(DEFAULT_GUI_FONT)); + TEST(GetCurrentObject(hDC, OBJ_FONT) == GetStockObject(DEFAULT_GUI_FONT)); + TEST(GetLastError() == ERROR_SUCCESS); + + /* Default palette */ + SetLastError(ERROR_SUCCESS); + TEST(GetCurrentObject(hDC, OBJ_PAL) == GetStockObject(DEFAULT_PALETTE)); + TEST(GetLastError() == ERROR_SUCCESS); + + /* Default pen */ + SetLastError(ERROR_SUCCESS); + TEST(GetCurrentObject(hDC, OBJ_PEN) == GetStockObject(BLACK_PEN)); + TEST(GetLastError() == ERROR_SUCCESS); + + /* Other pen */ + SetLastError(ERROR_SUCCESS); + SelectObject(hDC, GetStockObject(WHITE_PEN)); + TEST(GetCurrentObject(hDC, OBJ_PEN) == GetStockObject(WHITE_PEN)); + TEST(GetLastError() == ERROR_SUCCESS); + + /* DC pen */ + SetLastError(ERROR_SUCCESS); + SelectObject(hDC, GetStockObject(DC_PEN)); + TEST(GetCurrentObject(hDC, OBJ_PEN) == GetStockObject(DC_PEN)); + TEST(GetLastError() == ERROR_SUCCESS); + + ReleaseDC(hWnd, hDC); + DestroyWindow(hWnd); + + return APISTATUS_NORMAL; +} + Propchange: trunk/rostests/apitests/gdi32api/tests/GetCurrentObject.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dreimer] 33294: ... And the last things I forgot.... Note to myself: ONLY accept .diff and .patch files and NOTHING ELSE.
by dreimer＠svn.reactos.org 05 May '08

05 May '08

Author: dreimer Date: Mon May 5 08:27:26 2008 New Revision: 33294 URL: http://svn.reactos.org/svn/reactos?rev=33294&view=rev Log: ... And the last things I forgot.... Note to myself: ONLY accept .diff and .patch files and NOTHING ELSE. Modified: trunk/reactos/dll/cpl/access/lang/it-IT.rc trunk/reactos/dll/cpl/desk/lang/it-IT.rc trunk/reactos/dll/cpl/main/lang/it-IT.rc trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc trunk/reactos/dll/win32/netid/lang/it-IT.rc Modified: trunk/reactos/dll/cpl/access/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/it-IT.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/lang/it-IT.rc [iso-8859-1] Mon May 5 08:27:26 2008 @@ -16,12 +16,12 @@ AUTOCHECKBOX "Usa &Filtro",IDC_FILTER_BOX,PROPSHEETPADDING(2),LABELLINE(13)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "I&mpostazioni",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(13)+2,PROPSHEETPADDING(15),14 - GROUPBOX "Bistabili",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + GROUPBOX "Segnali acustici",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Se vuoi un segnale acustico quando viene premuto Blocco Maiuscole, Num o Scr.",-1,PROPSHEETPADDING(2),LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - AUTOCHECKBOX "Use &Bistabili",IDC_TOGGLE_BOX,PROPSHEETPADDING(2),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + AUTOCHECKBOX "Usa segnali acustici",IDC_TOGGLE_BOX,PROPSHEETPADDING(2),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "Im&postazioni",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 - AUTOCHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 + AUTOCHECKBOX "Mostra guida suppelentare per la tastiera nei programmi",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 END @@ -30,10 +30,10 @@ CAPTION "Suoni" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Visuale",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10)+PROPSHEETPADDING(1) + GROUPBOX "Segnali visivi",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10)+PROPSHEETPADDING(1) LTEXT "Usa questa opzione se vuoi una segnalazione visiva in corrispondenza delle segnalazioni acustiche.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) - AUTOCHECKBOX "Use &Visuale",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15),14 - LTEXT "User the following warning:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + AUTOCHECKBOX "Usa segnali &visivi",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + LTEXT "Scegliere il tipo di segnale visivo:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP GROUPBOX "Titoli",-1,PROPSHEETPADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 @@ -73,18 +73,18 @@ BEGIN GROUPBOX "Mouse sui tasti",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Usa questa opzione se vuoi usare il tastierino numerico al posto del mouse.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) - AUTOCHECKBOX "Use &Mouse sui tasti",IDC_MOUSE_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + AUTOCHECKBOX "Usa controllo &Mouse sui tasti",IDC_MOUSE_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "&Impostazioni",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 END IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" +CAPTION "Generale" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Reset Automatico",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - AUTOCHECKBOX "&Disattiva le funzioni di accessibilità se fermo per:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + AUTOCHECKBOX "&Disattiva le funzioni di accessibilità se non usate per:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(10), LABELLINE(5), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP Modified: trunk/reactos/dll/cpl/desk/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/it-IT.rc [iso-8859-1] Mon May 5 08:27:26 2008 @@ -9,13 +9,13 @@ 70, 10, 105, 70, WS_EX_STATICEDGE CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | - WS_BORDER | WS_TABSTOP, 8, 114, 174, 78 + WS_BORDER | WS_TABSTOP, 8, 122, 174, 78 LTEXT "Selezionare un immagine da usare come sfondo per il tuo desktop:", - IDC_STATIC, 8, 103, 180, 9 - PUSHBUTTON "&Esplora...", IDC_BROWSE_BUTTON, 188, 114, 50, 15 - PUSHBUTTON "&Colore...", IDC_COLOR_BUTTON, 188, 177, 50, 15 - LTEXT "Posizione:", IDC_STATIC, 188, 138, 36, 9 - COMBOBOX IDC_PLACEMENT_COMBO, 188, 149, 50, 54, + IDC_STATIC, 8, 103, 174, 17 + PUSHBUTTON "&Esplora...", IDC_BROWSE_BUTTON, 188, 122, 50, 15 + PUSHBUTTON "&Colore...", IDC_COLOR_BUTTON, 188, 185, 50, 15 + LTEXT "Posizione:", IDC_STATIC, 188, 146, 36, 9 + COMBOBOX IDC_PLACEMENT_COMBO, 188, 157, 50, 54, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END @@ -30,18 +30,18 @@ COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Impostazioni",IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP PUSHBUTTON "&Anteprima",IDC_SCREENS_TESTSC, 175, 103, 50, 13 - LTEXT "&Attesa",IDC_WAITTEXT, 14, 125, 16, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY, 34, 123, 32, 13, ES_RIGHT | WS_GROUP + LTEXT "&Attesa",IDC_WAITTEXT, 14, 125, 24, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY, 42, 123, 32, 13, ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | - WS_BORDER | WS_GROUP, 54, 123, 12, 13 - LTEXT "minuti", IDC_MINTEXT, 70, 125, 26, 9 + WS_BORDER | WS_GROUP, 62, 123, 12, 13 + LTEXT "minuti", IDC_MINTEXT, 77, 125, 26, 9 CONTROL "Chiedere la &password al ripristino.",IDC_SCREENS_USEPASSCHK,"button", - BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 104, 19 + BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 120, 19 GROUPBOX "&Funzioni di risparmio energetico del monitor", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 LTEXT "Per regolare le impostazioni premere Alimentazione.", IDC_STATIC, 14, 166, 146 ,20 - PUSHBUTTON "Alim&entazione...", IDC_SCREENS_POWER_BUTTON, 176, 171, 50, 13 + PUSHBUTTON "Alim&entazione...", IDC_SCREENS_POWER_BUTTON, 162, 170, 64, 15 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -99,21 +99,21 @@ CAPTION "Impostazioni" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Trascinare le icone dei monitor in modo corrispondente alla disposizione fisica dei vostri monitor.",-1,3,3,240,10 - CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE - LTEXT "&Schermo:",1820,3,100,30,8 - LTEXT "<none>",IDC_SETTINGS_DEVICE,9,109,224,8 - GROUPBOX "&Risoluzione dello schermo",1818,3,120,115,43 + LTEXT "Trascinare le icone dei monitor in modo corrispondente alla disposizione fisica dei vostri monitor.",-1,3,3,240,18 + CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,24,240,82,WS_EX_CLIENTEDGE + LTEXT "&Schermo:",1820,3,108,30,8 + LTEXT "<none>",IDC_SETTINGS_DEVICE,9,117,224,8 + GROUPBOX "&Risoluzione dello schermo",1818,3,128,115,43 CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", - TBS_AUTOTICKS | WS_TABSTOP, 30, 130, 58, 17 - LTEXT "Min",1815,9,130,15,8,NOT WS_GROUP - LTEXT "Max",1816,93,130,21,8,NOT WS_GROUP - LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER - GROUPBOX "&Colori",1817,125,120,115,43 - COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + TBS_AUTOTICKS | WS_TABSTOP, 30, 138, 58, 17 + LTEXT "Min",1815,9,138,15,8,NOT WS_GROUP + LTEXT "Max",1816,93,138,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,158,100,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "&Colori",1817,125,128,115,43 + COMBOBOX IDC_SETTINGS_BPP,131,138,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9 - PUSHBUTTON "A&vanzate...",IDC_SETTINGS_ADVANCED,170,165,70,14 + CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,156,103,9 + PUSHBUTTON "A&vanzate...",IDC_SETTINGS_ADVANCED,170,174,70,14 END IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 @@ -127,7 +127,7 @@ LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 GROUPBOX "Compatibilità", -1, 7, 67, 237, 97 LTEXT "Alcuni programmi funzionano in modo irregolare se non riavviate il computer dopo una modifica delle impostazioni dei colori.\r\n\nDopo la modifica delle impostazioni dei colori:", -1, 12, 78, 228, 34 - AUTORADIOBUTTON "&Riavviare il computer prima di applicare le nuove impostazioni dei colori.", IDC_RESTART_RB, 14, 116, 224, 10 + AUTORADIOBUTTON "&Riavviare il computer prima di applicare le nuove impostazioni.", IDC_RESTART_RB, 14, 116, 224, 10 AUTORADIOBUTTON "Applicare le nuove impostazioni dei colori senza riavviare.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 AUTORADIOBUTTON "Chiedere prima di applicare le nuove impostazioni dei colori.", IDC_ASKME_RB, 14, 146, 224, 10 END Modified: trunk/reactos/dll/cpl/main/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/lang/it-IT.rc [iso-8859-1] Mon May 5 08:27:26 2008 @@ -16,13 +16,13 @@ ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15 LTEXT "&Frequenza ripetizione", -1, 40, 60, 150, 10 LTEXT "Lenta", -1, 40, 75, 20, 10 - LTEXT "Veloce", -1, 200, 75, 20, 10 + LTEXT "Veloce", -1, 200, 75, 32, 10 CONTROL "",IDC_SLIDER_REPEAT_RATE, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 75, 130, 17 - LTEXT "Clicca qui e tieni premuto un tasto per provare la frequenza di ripetizione:", -1, 15, 105, 200, 20 + LTEXT "Clicca qui e tieni premuto un tasto per provare la frequenza di ripetizione:", -1, 15, 99, 200, 20 EDITTEXT IDC_EDIT_REPEAT_RATE, 15, 115, 200, 15, WS_CHILD | WS_VISIBLE | WS_GROUP GROUPBOX "Frequenza di lampeggio del Cursore:", -1, 5, 145, 230, 50 LTEXT "", IDC_TEXT_CURSOR_BLINK, 20, 165, 1, 8 - LTEXT "Nessuna", -1, 40, 165, 30, 10 + LTEXT "Nessuna", -1, 30, 165, 30, 10 LTEXT "Veloce", -1, 200, 165, 30, 10 CONTROL "",IDC_SLIDER_CURSOR_BLINK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 165, 130, 17 END @@ -57,16 +57,16 @@ CHECKBOX "&Scambia il bottone secondario e primario", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE LTEXT "Assegna al tasto destro del mouse le funzioni principali come ad esempio la selezione e il trascinamento", -1, 10, 30, 150, 30 - GROUPBOX "Velocità del doppio clic", -1, 5, 75, 230, 70 - LTEXT "Fai doppio clic sulla cartella per verificare le impostazioni. Se la cartella non si apre o chiude, prova a usare una velocità minore.", -1, 10, 85, 150, 30 - LTEXT "Velocità: Lenta", -1, 10, 120, 90, 8 - LTEXT "Veloce", -1, 140, 120, 30, 8 - CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 - CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE + GROUPBOX "Velocità del doppio clic", -1, 5, 76, 230, 70 + LTEXT "Fai doppio clic sulla cartella per verificare le impostazioni. Se la cartella non si apre o chiude, prova a usare una velocità minore.", -1, 10, 86, 150, 30 + LTEXT "Velocità: Lenta", -1, 10, 121, 92, 8 + LTEXT "Veloce", -1, 140, 121, 30, 8 + CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 62, 121, 70, 17 + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 86, 65, 57, WS_EX_STATICEDGE GROUPBOX "Blocca clic", -1, 5, 150, 230, 70 CHECKBOX "&Abilita Blocca Clic", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 - PUSHBUTTON "&Impostazioni...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 10 - LTEXT "Permette di selezionare e trascinare senza tenere premuto il tasto del mouse. Per attivare premere brevemente il tasto del mouse. Per disattivare, cliccare di nuovo", -1, 10, 180, 190, 30 + PUSHBUTTON "&Impostazioni...", IDC_BUTTON_CLICK_LOCK, 164, 160, 66, 14 + LTEXT "Permette di selezionare e trascinare senza tenere premuto il tasto del mouse. Per attivare premere brevemente il tasto del mouse. Per disattivare, cliccare di nuovo.", -1, 10, 180, 190, 30 END IDD_PAGE_POINTER DIALOGEX 0, 0, 246, 228 @@ -75,15 +75,15 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Schema", -1, 5, 5, 170, 45 - COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Salva come...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 + COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 155, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Salva come...", IDC_BUTTON_SAVEAS_SCHEME, 66, 30, 54, 15 PUSHBUTTON "&Cancella", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE - LTEXT "&Personalizza", -1, 5, 60, 40, 10 + LTEXT "&Personalizza", -1, 5, 60, 48, 10 LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY - CHECKBOX "&Abilita l'ombra del puntatore", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 - PUSHBUTTON "Usa predefinito", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 - PUSHBUTTON "&Esplora", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 + CHECKBOX "&Abilita l'ombra del puntatore", IDC_CHECK_DROP_SHADOW, 5, 200, 108, 10 + PUSHBUTTON "Usa predefinito", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 199, 60, 15 + PUSHBUTTON "&Esplora", IDC_BUTTON_BROWSE_CURSOR, 185, 199, 50, 15 END IDD_CURSOR_SCHEME_SAVEAS DIALOGEX 0, 0, 200, 75 @@ -103,28 +103,28 @@ CAPTION "Opzioni del puntatore" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Motion", -1, 5, 5, 230, 60 - LTEXT "Scegli una velocità per il puntatore:", -1, 60, 15, 110, 10 + GROUPBOX "Moto", -1, 5, 5, 230, 60 + LTEXT "Scegli una velocità per il puntatore:", -1, 60, 15, 130, 10 LTEXT "Lento", -1, 60, 30, 20, 10 CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 - LTEXT "Veloce", -1, 170, 30, 20, 10 + LTEXT "Veloce", -1, 170, 30, 28, 10 ICON IDI_MOUSE_SPEED, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 - CHECKBOX "&Aumenta la precisione del puntatore", IDC_CHECK_POINTER_PRECISION, 60, 50, 100, 10 - GROUPBOX "Salta a", -1, 5, 65, 230, 40 + CHECKBOX "&Aumenta la precisione del puntatore", IDC_CHECK_POINTER_PRECISION, 60, 50, 130, 10 + GROUPBOX "Salta a", -1, 5, 67, 230, 40 CHECKBOX "Muove automaticamente il puntatore al bottone preselezionato nelle finestre di dialogo", - IDC_CHECK_SNAP_TO, 60, 75, 170, 20, BS_MULTILINE | BS_TOP - ICON IDI_MOUSE_BUTTON, IDC_ICON_SNAP_TO, 15, 75, 15, 15 - GROUPBOX "Visibilità", -1, 5, 105, 230, 95 - CHECKBOX "&Visualizza la traccia del puntatore", IDC_CHECK_POINTER_TRAIL, 60, 115, 80, 10 - LTEXT "Corta", IDC_TEXT_TRAIL_SHORT, 60, 130, 30, 10 - LTEXT "Lunga", IDC_TEXT_TRAIL_LONG, 160, 130, 30, 10 - ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 - CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 - CHECKBOX "&Nascondi il puntatore mentre si scrive", IDC_CHECK_HIDE_POINTER, 60, 150, 90, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 + IDC_CHECK_SNAP_TO, 60, 77, 170, 20, BS_MULTILINE | BS_TOP + ICON IDI_MOUSE_BUTTON, IDC_ICON_SNAP_TO, 15, 77, 15, 15 + GROUPBOX "Visibilità", -1, 5, 109, 230, 95 + CHECKBOX "&Visualizza la traccia del puntatore", IDC_CHECK_POINTER_TRAIL, 60, 119, 130, 10 + LTEXT "Corta", IDC_TEXT_TRAIL_SHORT, 60, 135, 30, 10 + LTEXT "Lunga", IDC_TEXT_TRAIL_LONG, 160, 135, 30, 10 + ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 15, 119, 15, 15 + CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 74, 17 + CHECKBOX "&Nascondi il puntatore mentre si scrive", IDC_CHECK_HIDE_POINTER, 60, 154, 140, 10 + ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 15, 149, 15, 15 CHECKBOX "&Mostra la posizione del puntatore quando si preme il tasto CTRL", - IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP - ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 + IDC_CHECK_SHOW_POINTER, 60, 179, 170, 20, BS_MULTILINE | BS_TOP + ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 15, 174, 15, 15 END IDD_PAGE_WHEEL DIALOGEX 0, 0, 246, 228 Modified: trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc [iso-8859-1] Mon May 5 08:27:26 2008 @@ -27,7 +27,7 @@ CAPTION "Suoni" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Uno schema dei suoni è un insieme di suoni legati agli eventi in Reactos e nei programmi. Potete selezionare uno schema esistente o salvarne uno che avete modificato.",-1,8,7,230,40 + LTEXT "Uno schema dei suoni è un insieme di suoni legati agli eventi in ReactOS e nei programmi. Potete selezionare uno schema esistente o salvarne uno che avete modificato.",-1,8,7,230,40 LTEXT "S&chema dei suoni:",-1,8,42,150,17 COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Salva come...", IDC_SAVEAS_BTN, 134,70,50,15 Modified: trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] Mon May 5 08:27:26 2008 @@ -2,7 +2,7 @@ IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" +CAPTION "Generale" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 Modified: trunk/reactos/dll/win32/netid/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/it-IT… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/it-IT.rc [iso-8859-1] Mon May 5 08:27:26 2008 @@ -7,10 +7,10 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON - LTEXT "ReactOS usea le informazioni seguenti per identificare questo computer nella rete.", IDC_STATIC, 40, 5, 204, 20 - LTEXT "Descrizione del Computer :", IDC_STATIC, 6, 40, 70, 9 + LTEXT "ReactOS usa le informazioni seguenti per identificare questo computer nella rete.", IDC_STATIC, 40, 5, 204, 20 + LTEXT "Descrizione del computer:", IDC_STATIC, 6, 37, 78, 16 EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Nome esteso del computer:", IDC_STATIC, 6, 68, 64, 9 + LTEXT "Nome esteso del computer:", IDC_STATIC, 6, 67, 78, 16 LTEXT "(Predefinito)", IDC_COMPUTERNAME, 98, 68, 144, 11 LTEXT "Gruppo di lavoro:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 LTEXT "(vuoto)", IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 9

1 0

[dreimer] 33293: Forgot to save a local fix before commit...
by dreimer＠svn.reactos.org 05 May '08

05 May '08

Author: dreimer Date: Mon May 5 08:22:09 2008 New Revision: 33293 URL: http://svn.reactos.org/svn/reactos?rev=33293&view=rev Log: Forgot to save a local fix before commit... Modified: trunk/reactos/base/applications/kbswitch/lang/sk-SK.rc Modified: trunk/reactos/base/applications/kbswitch/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/lang/sk-SK.rc [iso-8859-1] Mon May 5 08:22:09 2008 @@ -8,7 +8,7 @@ BEGIN POPUP "popup" BEGIN - MENUITEM "&Nastavenia...", ID_PROFERENCES + MENUITEM "&Nastavenia...", ID_PREFERENCES MENUITEM SEPARATOR MENUITEM "&Zavrie", ID_EXIT END

1 0

[dreimer] 33291: Sync WineFile to Code frozen Wine. Bug 3215: some updates and slovak translations by Mario Kacmar (kario@szm.sk)
by dreimer＠svn.reactos.org 05 May '08

05 May '08

Author: dreimer Date: Mon May 5 08:05:42 2008 New Revision: 33291 URL: http://svn.reactos.org/svn/reactos?rev=33291&view=rev Log: Sync WineFile to Code frozen Wine. Bug 3215: some updates and slovak translations by Mario Kacmar (kario(a)szm.sk) Added: trunk/rosapps/magnify/lang/sk-SK.rc (with props) Modified: trunk/rosapps/magnify/rsrc.rc trunk/rosapps/packmgr/lib/lang/cs-CZ.rc trunk/rosapps/winefile/Makefile.in trunk/rosapps/winefile/lang/fr-FR.rc trunk/rosapps/winefile/lang/ko-KO.rc trunk/rosapps/winefile/lang/pl-PL.rc trunk/rosapps/winefile/lang/sl-SI.rc trunk/rosapps/winefile/winefile.c Added: trunk/rosapps/magnify/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/sk-SK.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/sk-SK.rc (added) +++ trunk/rosapps/magnify/lang/sk-SK.rc [iso-8859-1] Mon May 5 08:05:42 2008 @@ -1,0 +1,64 @@ +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +IDC_MAGNIFIER MENU +BEGIN + POPUP "&Súbor" + BEGIN + MENUITEM "S&konèi", IDM_EXIT + MENUITEM "&Monosti", IDM_OPTIONS + MENUITEM SEPARATOR + MENUITEM "È&o je ...", IDM_ABOUT + END +END + +IDC_MAGNIFIER ACCELERATORS +BEGIN + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +END + +IDD_ABOUTBOX DIALOGEX 22, 17, 220, 75 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_CAPTION | WS_SYSMENU +CAPTION "Èo je Lupa" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_ICON,IDC_MYICON,14,9,20,20 + LTEXT "Lupa (Magnifier) verzia 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX + LTEXT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)",IDC_STATIC,48,24,125,22 + PUSHBUTTON "OK",IDOK,162,48,50,14 +END + +IDD_DIALOGOPTIONS DIALOGEX 0, 0, 153, 182 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Nastavenia Lupy" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "Koniec",IDOK,96,161,50,14 + PUSHBUTTON "Pomocník",IDOK,38,161,50,14 + LTEXT "Úroveò zväèenia:",IDC_STATIC,6,8,68,8 + COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Tracking",IDC_STATIC,7,25,139,59 + GROUPBOX "Presentation",IDC_STATIC,7,87,139,57 + CONTROL "Follow mouse cursor",IDC_FOLLOWMOUSECHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,42,114,10 + CONTROL "Follow keyboard focus",IDC_FOLLOWKEYBOARDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,54,114,10 + CONTROL "Follow text editing",IDC_FOLLOWTEXTEDITINGCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,66,114,10 + CONTROL "Invertova farby",IDC_INVERTCOLORSCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,102,114,10 + CONTROL "Zaèa minimalizovane",IDC_STARTMINIMIZEDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,114,114,10 + CONTROL "Zobrazi Lupu",IDC_SHOWMAGNIFIERCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,126,114,10 +END + +IDD_WARNINGDIALOG DIALOGEX 0, 0, 250, 97 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION +CAPTION "Lupa systému ReactOS" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK",IDOK,193,76,50,14 + ICON IDI_ICON,IDC_STATIC,7,17,20,20 + LTEXT "Magnifier is intended to provide a minimum level of functionality for users with slight visual impairments. Most users with visual impairments will need a magnification utility with higher funcionality for daily use.",IDC_STATIC,36,7,207,33 + CONTROL "Do not show this message again",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10 +END + +STRINGTABLE +BEGIN + IDS_APP_TITLE "Lupa" +END Propchange: trunk/rosapps/magnify/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/magnify/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/rsrc.rc?rev=33291&… ============================================================================== --- trunk/rosapps/magnify/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/magnify/rsrc.rc [iso-8859-1] Mon May 5 08:05:42 2008 @@ -8,4 +8,5 @@ #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" Modified: trunk/rosapps/packmgr/lib/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/lib/lang/cs-CZ.rc?… ============================================================================== --- trunk/rosapps/packmgr/lib/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/rosapps/packmgr/lib/lang/cs-CZ.rc [iso-8859-1] Mon May 5 08:05:42 2008 @@ -11,7 +11,7 @@ ERR_DOWNL "Vyadovaný soubor nemohl být staen!\nProsím podívejte se do logu pro detaily." ERR_FILE "Nastala chyba bìhem vykonávání skriptu.\nSoubor nelze otevøít." - ERR_SYNATX "Nastala chyba bìhem vykonávání skriptu.\nChybná synatxe." + ERR_SYNATX "Nastala chyba bìhem vykonávání skriptu.\nChybná syntaxe." ERR_CALL "Nastala chyba bìhem vykonávání skriptu.\nNelze najít funkci." ERR_PARAMETER "Nastala chyba bìhem vykonávání skriptu.\nNesprávný parametr(y)." Modified: trunk/rosapps/winefile/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/Makefile.in?rev=3… ============================================================================== --- trunk/rosapps/winefile/Makefile.in [iso-8859-1] (original) +++ trunk/rosapps/winefile/Makefile.in [iso-8859-1] Mon May 5 08:05:42 2008 @@ -5,8 +5,7 @@ VPATH = @srcdir@ MODULE = winefile.exe APPMODE = -mwindows -IMPORTS = shell32 comdlg32 comctl32 ole32 mpr version user32 gdi32 advapi32 kernel32 -EXTRALIBS = -luuid +IMPORTS = uuid shell32 comdlg32 comctl32 ole32 mpr version user32 gdi32 advapi32 kernel32 C_SRCS = \ splitpath.c \ Modified: trunk/rosapps/winefile/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/fr-FR.rc?rev… ============================================================================== --- trunk/rosapps/winefile/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/rosapps/winefile/lang/fr-FR.rc [iso-8859-1] Mon May 5 08:05:42 2008 @@ -6,7 +6,7 @@ * Copyright 2002 Steven Edwards * Copyright 2002 Alexandre Julliard * Copyright 2003 Sylvain Petreolle - * Copyright 2005-2006 Jonathan Ernst + * Copyright 2005-2008 Jonathan Ernst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -33,8 +33,8 @@ MENUITEM "&Ouvrir\tEntrée", ID_ACTIVATE MENUITEM "&Déplacer...\tF7", ID_FILE_MOVE MENUITEM "&Copier...\tF8", ID_FILE_COPY - MENUITEM "P&resse-Papiers...\tF9", 118 - MENUITEM "&Effacer\tDel", ID_FILE_DELETE + MENUITEM "P&resse-papiers...\tF9", 118 + MENUITEM "&Effacer\tSuppr", ID_FILE_DELETE MENUITEM "Re&nommer...", 109 MENUITEM "&Propriétés...\tAlt+Entree", ID_EDIT_PROPERTIES MENUITEM SEPARATOR @@ -62,7 +62,7 @@ MENUITEM SEPARATOR MENUITEM "&Formater Disque...", ID_FORMAT_DISK #ifdef _WIN95 - MENUITEM "Créer un disque *système...", -1 /*TODO*/ + MENUITEM "Créer un disque &système...", -1 /*TODO*/ #endif MENUITEM SEPARATOR MENUITEM "Connecter un lecteur &réseau",ID_CONNECT_NETWORK_DRIVE @@ -167,7 +167,7 @@ FONT 8, "MS Shell Dlg" { CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Dossier :", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + CONTROL "&Chemin :", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 PUSHBUTTON "Annuler", 2, 158, 23, 47, 14 @@ -179,7 +179,7 @@ CAPTION "Par type de fichier" FONT 8, "MS Sans Serif" BEGIN - LTEXT "&Name:",-1,7,8,22,10 + LTEXT "&Nom :",-1,7,8,22,10 EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL GROUPBOX "Type de fichier",-1,7,23,87,56 CONTROL "&Répertoires",IDC_VIEW_TYPE_DIRECTORIES,"Button", @@ -211,7 +211,7 @@ EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP LTEXT "Version :",-1,7,40,59,9 EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "Cop&yright:",-1,7,51,59,9 + LTEXT "Cop&yright :",-1,7,51,59,9 EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP LTEXT "Taille :",-1,7,62,59,9 EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP Modified: trunk/rosapps/winefile/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/ko-KO.rc?rev… ============================================================================== --- trunk/rosapps/winefile/lang/ko-KO.rc [iso-8859-1] (original) +++ trunk/rosapps/winefile/lang/ko-KO.rc [iso-8859-1] Mon May 5 08:05:42 2008 @@ -176,7 +176,7 @@ IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "ÆÄÀÏ Å¸ÀÔÀ¸·Î" -FONT 8, "MS Shell Dlg" +FONT 8, "MS Sans Serif" BEGIN LTEXT "ÀÌ¸§(&N):",-1,7,8,22,10 EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL @@ -190,7 +190,7 @@ CONTROL "´Ù¸¥ ÆÄÀÏ(&O)",IDC_VIEW_TYPE_OTHERS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 CONTROL "¼û±è/½Ã½ºÅÛ ÆÄÀÏ º¸¿©ÁÖ±â(&S)",IDC_VIEW_TYPE_HIDDEN, - "¹öÆ°",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 DEFPUSHBUTTON "È®ÀÎ",IDOK,104,7,50,14 PUSHBUTTON "Ãë¼Ò",IDCANCEL,104,24,50,14 END @@ -198,11 +198,12 @@ IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "%s ¼Ó¼º" -FONT 8, "MS Shell Dlg" +FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "È®ÀÎ",IDOK,191,7,50,14 PUSHBUTTON "Ãë¼Ò",IDCANCEL,191,29,50,14 LTEXT "ÆÄÀÏ ÀÌ¸§(&F):",-1,7,7,59,9 + EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP LTEXT "¿ÏÀüÇÑ °æ·Î(&P):",-1,7,18,59,9 EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP @@ -241,7 +242,7 @@ IDS_DESKTOP "µ¥½ºÅ©Å¾" IDS_SHELL "¼¿" IDS_TITLEFMT "%s - %s" - IDS_NO_IMPL "¹Ì±¸Çö" + IDS_NO_IMPL "¾ÆÁ÷ ±¸Çö¾ÈµÊ" IDS_WINE_FILE "Wine ÆÄÀÏ" } Modified: trunk/rosapps/winefile/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/pl-PL.rc?rev… ============================================================================== --- trunk/rosapps/winefile/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/rosapps/winefile/lang/pl-PL.rc [iso-8859-1] Mon May 5 08:05:42 2008 @@ -133,7 +133,7 @@ MENUITEM "Rozmieæ automatycznie", ID_WINDOW_AUTOSORT #endif MENUITEM "Rozmieæ &symbole", ID_WINDOW_ARRANGE - MENUITEM "&Odwierz\tF5", ID_REFRESH + MENUITEM "&Odwie¿\tF5", ID_REFRESH } POPUP "&?" { @@ -201,7 +201,7 @@ FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "OK",IDOK,191,7,50,14 - PUSHBUTTON "Anulujl",IDCANCEL,191,29,50,14 + PUSHBUTTON "Anuluj",IDCANCEL,191,29,50,14 LTEXT "&Nazwa pliku:",-1,7,7,59,9 EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP LTEXT "&Pe³na cie¿ka:",-1,7,18,59,9 Modified: trunk/rosapps/winefile/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/sl-SI.rc?rev… ============================================================================== --- trunk/rosapps/winefile/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/rosapps/winefile/lang/sl-SI.rc [iso-8859-1] Mon May 5 08:05:42 2008 @@ -2,7 +2,7 @@ * WineFile * Slovenian Language Support * - * Copyright 2003 Rok Mandeljc <rok.mandeljc(a)gimb.org> + * Copyright 2003, 2008 Rok Mandeljc * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,140 +19,244 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma code_page(65001) + LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT /* Menu */ IDM_WINEFILE MENU FIXED IMPURE { - POPUP "&File" { - MENUITEM "&Open\tEnter", ID_ACTIVATE - MENUITEM "&Move...\tF7", ID_FILE_MOVE - MENUITEM "&Copy...\tF8", ID_FILE_COPY - MENUITEM "&In Clipboard...\tF9", 118 - MENUITEM "&Delete\tDel", ID_FILE_DELETE - MENUITEM "Re&name...", 109 - MENUITEM "Propert&ies...\tAlt+Enter", ID_EDIT_PROPERTIES - MENUITEM SEPARATOR - MENUITEM "C&ompress...", 119 - MENUITEM "Dec&ompress...", 120 - MENUITEM SEPARATOR - MENUITEM "&Run...", ID_EXECUTE - MENUITEM "&Print...", 102 - MENUITEM "Associate...", 103 - MENUITEM SEPARATOR - MENUITEM "Cr&eate Directory...", 111 - MENUITEM "Searc&h...", 104 - MENUITEM "&Select Files...", 116 + POPUP "&Datoteka" { + MENUITEM "&Odpri\tEnter", ID_ACTIVATE + MENUITEM "&Premakni ...\tF7", ID_FILE_MOVE + MENUITEM "&Kopiraj ...\tF8", ID_FILE_COPY + MENUITEM "&Na odloÅ¾iÅ¡Äe ...\tF9", 118 + MENUITEM "&IzbriÅ¡i\tDel", ID_FILE_DELETE + MENUITEM "P&reimenuj ...", 109 + MENUITEM "&Lastnosti ...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "&Stisni ...", 119 + MENUITEM "Ra&zÅ¡iri ...", 120 + MENUITEM SEPARATOR + MENUITEM "ZaÅ¾&eni ...", ID_EXECUTE + MENUITEM "&Tiskaj ...", 102 + MENUITEM "PoveÅ¾i s programom ...", 103 + MENUITEM SEPARATOR + MENUITEM "Ustvari &mapo...", 111 + MENUITEM "&IÅ¡Äi ...", 104 + MENUITEM "Iz&beri datoteke ...", 116 MENUITEM SEPARATOR #ifndef _NO_EXTENSIONS - MENUITEM "E&xit\tAlt+X", ID_FILE_EXIT + MENUITEM "Iz&hod\tAlt+X", ID_FILE_EXIT #else - MENUITEM "E&xit", ID_FILE_EXIT -#endif - } - - POPUP "&Disk" { - MENUITEM "&Copy Disk...", 201 - MENUITEM "&Label Disk...", 202 - MENUITEM SEPARATOR - MENUITEM "&Format Disk...", ID_FORMAT_DISK + MENUITEM "Iz&hod", ID_FILE_EXIT +#endif + } + + POPUP "Po&goni" { + MENUITEM "&Kopiraj disk ...", 201 + MENUITEM "&OznaÄi disk ...", 202 + MENUITEM SEPARATOR + MENUITEM "&Formatiraj disk ...", ID_FORMAT_DISK #ifdef _WIN95 - MENUITEM "&Make System Disk...", -1 /*TODO*/ -#endif - MENUITEM SEPARATOR - MENUITEM "Connect &Network Drive", ID_CONNECT_NETWORK_DRIVE - MENUITEM "&Disconnect Network Drive", ID_DISCONNECT_NETWORK_DRIVE - MENUITEM SEPARATOR - MENUITEM "Share as...", 254 - MENUITEM "&Remove Share...", 255 - MENUITEM SEPARATOR - MENUITEM "&Select Drive...", 251 - } - - POPUP "&Directories" { - MENUITEM "&Next Level\t+", 301 - MENUITEM "Expand &Tree\t*", 302 - MENUITEM "Expand &all\tStrg+*", 303 - MENUITEM "Collapse &Tree\t-", 304 - MENUITEM SEPARATOR - MENUITEM "&Mark Childs", 505 - } - - POPUP "&View" { - MENUITEM "T&ree and Directory", 413 - MENUITEM "Tr&ee Only", 411 - MENUITEM "Directory &Only", 412 - MENUITEM SEPARATOR - MENUITEM "Sp&lit", ID_VIEW_SPLIT - MENUITEM SEPARATOR - MENUITEM "&Name", ID_VIEW_NAME - MENUITEM "&All File Details", ID_VIEW_ALL_ATTRIBUTES, CHECKED - MENUITEM "&Partial Details...", ID_VIEW_SELECTED_ATTRIBUTES - MENUITEM SEPARATOR - MENUITEM "&Sort by Name", ID_VIEW_SORT_NAME - MENUITEM "Sort &by Type", ID_VIEW_SORT_TYPE - MENUITEM "Sort by Si&ze", ID_VIEW_SORT_SIZE - MENUITEM "Sort by &Date", ID_VIEW_SORT_DATE - MENUITEM SEPARATOR - MENUITEM "Filter by &...", ID_VIEW_FILTER - } - - POPUP "&Options" { - MENUITEM "&Confirmation...", 501 - MENUITEM "&Font...", ID_SELECT_FONT - MENUITEM "Customize Tool&bar...", 512 - MENUITEM SEPARATOR - MENUITEM "&Toolbar", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "&Drivebar", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "&Status Bar", ID_VIEW_STATUSBAR, CHECKED + MENUITEM "Ustvari &sistemsko disketo ...", -1 /*TODO*/ +#endif + MENUITEM SEPARATOR + MENUITEM "PoveÅ¾i se z o&mreÅ¾nim pogonom", ID_CONNECT_NETWORK_DRIVE + MENUITEM "O&dklopi omreÅ¾ni pogon", ID_DISCONNECT_NETWORK_DRIVE + MENUITEM SEPARATOR + MENUITEM "V skupno rabo kot ...", 254 + MENUITEM "Odst&rani iz skupne rabe ...", 255 + MENUITEM SEPARATOR + MENUITEM "Iz&beri pogon ...", 251 + } + + POPUP "&Mape" { + MENUITEM "&Naslednji nivo\t+", 301 + MENUITEM "RazÅ¡iri &drevo\t*", 302 + MENUITEM "RazÅ¡iri &vse\tStrg+*", 303 + MENUITEM "SkrÄi d&revo\t-", 304 + MENUITEM SEPARATOR + MENUITEM "&OznaÄi vsebino", 505 + } + + POPUP "Pog&led" { + MENUITEM "&Drevo in mape", 413 + MENUITEM "Samo d&revo", 411 + MENUITEM "Samo &mape", 412 + MENUITEM SEPARATOR + MENUITEM "&LoÄeno", ID_VIEW_SPLIT + MENUITEM SEPARATOR + MENUITEM "&Ime", ID_VIEW_NAME + MENUITEM "Vse &podrobnosti datoteke", ID_VIEW_ALL_ATTRIBUTES, CHECKED + MENUITEM "&Delne podrobnosti ...", ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "Razvrsti po &imenu", ID_VIEW_SORT_NAME + MENUITEM "Razvrsti po &vrsti", ID_VIEW_SORT_TYPE + MENUITEM "Razvrsti po ve&likosti", ID_VIEW_SORT_SIZE + MENUITEM "Razvrsti po datu&mu", ID_VIEW_SORT_DATE + MENUITEM SEPARATOR + MENUITEM "Filter &...", ID_VIEW_FILTER + } + + POPUP "M&oÅ¾nosti" { + MENUITEM "Potr&ditev ...", 501 + MENUITEM "&Pisava ...", ID_SELECT_FONT + MENUITEM "Uredi &orodno vrstico ...", 512 + MENUITEM SEPARATOR + MENUITEM "&Orodna vrstica", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "Vrstica po&gonov", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&Statusna vrstica", ID_VIEW_STATUSBAR, CHECKED #ifndef _NO_EXTENSIONS - MENUITEM "F&ull Screen\tCtrl+Shift+S", ID_VIEW_FULLSCREEN -#endif - MENUITEM SEPARATOR - MENUITEM "&Minize on run", 504 - MENUITEM "&Save settings on exit", 511 - } - - - POPUP "&Security" { - MENUITEM "&Access...", 605 - MENUITEM "&Logging...", 606 - MENUITEM "&Owner...", 607 - } - - POPUP "&Window" { - MENUITEM "New &Window", ID_WINDOW_NEW - MENUITEM "Cascading\tCtrl+F5", ID_WINDOW_CASCADE - MENUITEM "Tile &Horizontally", ID_WINDOW_TILE_HORZ - MENUITEM "Tile &Vertically\tCtrl+F4", ID_WINDOW_TILE_VERT + MENUITEM "&Cel zaslon\tCtrl+Shift+S", ID_VIEW_FULLSCREEN +#endif + MENUITEM SEPARATOR + MENUITEM "Poman&jÅ¡aj ob zagonu", 504 + MENUITEM "S&hrani nastavitve ob izhodu", ID_VIEW_SAVESETTINGS + } + + + POPUP "&Varnost" { + MENUITEM "&Dostop ...", 605 + MENUITEM "&BeleÅ¾enje ...", 606 + MENUITEM "&Lastnik ...", 607 + } + + POPUP "O&kno" { + MENUITEM "Novo &okno", ID_WINDOW_NEW + MENUITEM "V kaskado\tCtrl+F5", ID_WINDOW_CASCADE + MENUITEM "&Horizontalna razporeditev", ID_WINDOW_TILE_HORZ + MENUITEM "&Vertikalna razporeditev\tCtrl+F4", ID_WINDOW_TILE_VERT #ifndef _NO_EXTENSIONS - MENUITEM "Arrange Automatically", ID_WINDOW_AUTOSORT -#endif - MENUITEM "Arrange &Symbols", ID_WINDOW_ARRANGE - MENUITEM "&Refresh\tF5", ID_REFRESH - } - - POPUP "&?" { - MENUITEM "&Help Topics\tF1", ID_HELP - MENUITEM "Help &Search...\tF1", ID_HELP - MENUITEM "&Using Help\tF1", ID_HELP_USING - MENUITEM SEPARATOR - MENUITEM "&Info about Winefile...", ID_ABOUT + MENUITEM "Samodejna razporeditev", ID_WINDOW_AUTOSORT +#endif + MENUITEM "Razporedi &simbole", ID_WINDOW_ARRANGE + MENUITEM "O&sveÅ¾i\tF5", ID_REFRESH + } + + POPUP "&PomoÄ" { + MENUITEM "&Teme pomoÄi\tF1", ID_HELP + MENUITEM "&Iskanje po pomoÄi ...\tF1", ID_HELP + MENUITEM "&Uporaba pomoÄi\tF1", ID_HELP_USING + MENUITEM SEPARATOR + MENUITEM "&O Winefile ...", ID_ABOUT } } IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Execute" +CAPTION "Zagon" FONT 8, "MS Shell Dlg" { CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Command:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + CONTROL "&Ukaz:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "As &Symbol", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 - DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "Cancel", 2, 158, 23, 47, 14 - PUSHBUTTON "&Help", 254, 158, 43, 47, 14 -} + CONTROL "Kot &simbol", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 + DEFPUSHBUTTON "V redu", 1, 158, 6, 47, 14 + PUSHBUTTON "PrekliÄi", 2, 158, 23, 47, 14 + PUSHBUTTON "&PomoÄ", 254, 158, 43, 47, 14 +} + +IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Izbira ciljne poti" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&Pot:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "V redu", 1, 158, 6, 47, 14 + PUSHBUTTON "PrekliÄi", 2, 158, 23, 47, 14 + PUSHBUTTON "&Brskaj", 254, 158, 43, 47, 14 +} + +IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Glede na vrsto datoteke" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "&Ime:",-1,7,8,22,10 + EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL + GROUPBOX "Vrsta datoteke",-1,7,23,87,56 + CONTROL "&Mape",IDC_VIEW_TYPE_DIRECTORIES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 + CONTROL "&Programi",IDC_VIEW_TYPE_PROGRAMS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 + CONTROL "&Dokumenti",IDC_VIEW_TYPE_DOCUMENTS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 + CONTROL "&Ostalo",IDC_VIEW_TYPE_OTHERS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 + CONTROL "PokaÅ¾i skrite/&sistemske datoteke",IDC_VIEW_TYPE_HIDDEN, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 + DEFPUSHBUTTON "V redu",IDOK,104,7,50,14 + PUSHBUTTON "PrekliÄi",IDCANCEL,104,24,50,14 +END + +IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Lastnosti %s" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "V redu",IDOK,191,7,50,14 + PUSHBUTTON "PrekliÄi",IDCANCEL,191,29,50,14 + LTEXT "&Ime datoteke:",-1,7,7,59,9 + EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Polna &pot:",-1,7,18,59,9 + EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Nazadnje spremenjeno:",-1,7,29,59,9 + EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "RazliÄica:",-1,7,40,59,9 + EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "&Avtorske pravice:",-1,7,51,59,9 + EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Velikost:",-1,7,62,59,9 + EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + GROUPBOX "Attributi",-1,7,79,158,46 + CONTROL "Samo za &branje",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 + CONTROL "S&krito",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 + CONTROL "&Arhiv",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 + CONTROL "&Sistemsko",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 + CONTROL "S&tisnjeno",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 + GROUPBOX "Informacije o &razliÄici",-1,7,129,234,79 + LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL +END + + +STRINGTABLE +{ + IDS_FONT_SEL_DLG_NAME "Uveljavljam nastavitve pisave" + IDS_FONT_SEL_ERROR "Napaka pri izbiranju nove pisave." +} + +STRINGTABLE +{ + IDS_WINEFILE "Winefile" + IDS_ERROR "Napaka" + IDS_ROOT_FS "root fs" + IDS_UNIXFS "unixfs" + IDS_DESKTOP "Namizje" + IDS_SHELL "Shell" + IDS_TITLEFMT "%s - %s" + IDS_NO_IMPL "Ni (Å¡e) na voljo" + IDS_WINE_FILE "Wine File" +} + +STRINGTABLE +{ + IDS_COL_NAME "Ime" + IDS_COL_SIZE "Velikost" + IDS_COL_CDATE "CDate" + IDS_COL_ADATE "ADate" + IDS_COL_MDATE "MDate" + IDS_COL_IDX "Indeks/Inoda" + IDS_COL_LINKS "Povezave" + IDS_COL_ATTR "Attributi" + IDS_COL_SEC "Varnost" + + IDS_FREE_SPACE_FMT "Prosto: %s od %s" +} + +#pragma code_page(default) Modified: trunk/rosapps/winefile/winefile.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/winefile.c?rev=33… ============================================================================== --- trunk/rosapps/winefile/winefile.c [iso-8859-1] (original) +++ trunk/rosapps/winefile/winefile.c [iso-8859-1] Mon May 5 08:05:42 2008 @@ -2406,7 +2406,7 @@ if (DialogBoxParam(Globals.hInstance, MAKEINTRESOURCE(IDD_EXECUTE), hwnd, ExecuteDialogDlgProc, (LPARAM)&dlg) == IDOK) { HINSTANCE hinst = ShellExecute(hwnd, NULL/*operation*/, dlg.cmd/*file*/, NULL/*parameters*/, NULL/*dir*/, dlg.cmdshow); - if ((int)hinst <= 32) + if (PtrToUlong(hinst) <= 32) display_error(hwnd, GetLastError()); } break;} @@ -2598,13 +2598,13 @@ #ifndef _NO_EXTENSIONS -static HWND create_header(HWND parent, Pane* pane, int id) +static HWND create_header(HWND parent, Pane* pane, UINT id) { HD_ITEM hdi; int idx; HWND hwnd = CreateWindow(WC_HEADER, 0, WS_CHILD|WS_VISIBLE|HDS_HORZ|HDS_FULLDRAG/*TODO: |HDS_BUTTONS + sort orders*/, - 0, 0, 0, 0, parent, (HMENU)id, Globals.hInstance, 0); + 0, 0, 0, 0, parent, (HMENU)ULongToHandle(id), Globals.hInstance, 0); if (!hwnd) return 0; @@ -2952,7 +2952,7 @@ static WNDPROC g_orgTreeWndProc; -static void create_tree_window(HWND parent, Pane* pane, int id, int id_header, LPCTSTR pattern, int filter_flags) +static void create_tree_window(HWND parent, Pane* pane, UINT id, UINT id_header, LPCTSTR pattern, int filter_flags) { static const TCHAR sListBox[] = {'L','i','s','t','B','o','x','\0'}; @@ -2960,8 +2960,8 @@ Entry* entry = pane->root; pane->hwnd = CreateWindow(sListBox, sEmpty, WS_CHILD|WS_VISIBLE|WS_HSCROLL|WS_VSCROLL| - LBS_DISABLENOSCROLL|LBS_NOINTEGRALHEIGHT|LBS_OWNERDRAWFIXED|LBS_NOTIFY, - 0, 0, 0, 0, parent, (HMENU)id, Globals.hInstance, 0); + LBS_DISABLENOSCROLL|LBS_NOINTEGRALHEIGHT|LBS_OWNERDRAWFIXED|LBS_NOTIFY, + 0, 0, 0, 0, parent, (HMENU)ULongToHandle(id), Globals.hInstance, 0); SetWindowLongPtr(pane->hwnd, GWLP_USERDATA, (LPARAM)pane); g_orgTreeWndProc = (WNDPROC) SetWindowLongPtr(pane->hwnd, GWLP_WNDPROC, (LPARAM)TreeWndProc); @@ -3936,7 +3936,7 @@ { HINSTANCE hinst = ShellExecute(hwnd, NULL/*operation*/, cmd, NULL/*parameters*/, NULL/*dir*/, nCmdShow); - if ((int)hinst <= 32) { + if (PtrToUlong(hinst) <= 32) { display_error(hwnd, GetLastError()); return FALSE; } @@ -4780,7 +4780,7 @@ /* create main window */ - Globals.hMainWnd = CreateWindowEx(0, (LPCTSTR)(int)Globals.hframeClass, RS(b1,IDS_WINE_FILE), WS_OVERLAPPEDWINDOW, + Globals.hMainWnd = CreateWindowEx(0, MAKEINTRESOURCE(Globals.hframeClass), RS(b1,IDS_WINE_FILE), WS_OVERLAPPEDWINDOW, opts.start_x, opts.start_y, opts.width, opts.height, hwndParent, Globals.hMenuFrame, Globals.hInstance, 0/*lpParam*/);

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