Ros-diffs March 2008

ros-diffs@reactos.org

22 participants
269 discussions

[fireball] 32708: - MAINTENANCE: Fix inconsistent new lines.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Mar 17 06:02:00 2008 New Revision: 32708 URL: http://svn.reactos.org/svn/reactos?rev=3D32708&view=3Drev Log: - MAINTENANCE: Fix inconsistent new lines. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h (contents, props chan= ged) Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32= k/ntgdihdl.h?rev=3D32708&r1=3D32707&r2=3D32708&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Mon Mar 17 06:02:00 2008 @@ -1,207 +1,207 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Win32 Graphical Subsystem (WIN32K) - * FILE: include/win32k/ntgdihal.h - * PURPOSE: Win32 Shared GDI Handle/Object Types - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) - */ - -/* INCLUDES **************************************************************= ****/ - -#ifndef _NTGDIHDL_ -#define _NTGDIHDL_ - -#include <winddi.h> - -/* DEFINES ***************************************************************= ****/ - -/* Base address where the handle table is mapped to */ -#define GDI_HANDLE_TABLE_BASE_ADDRESS (0x400000) - -/* GDI handle table can hold 0x10000 handles */ -#define GDI_HANDLE_COUNT 0x10000 -#define GDI_GLOBAL_PROCESS (0x0) -#define GDI_CFONT_MAX 16 - -/* Handle Masks and shifts */ -#define GDI_HANDLE_INDEX_MASK (GDI_HANDLE_COUNT - 1) -#define GDI_HANDLE_TYPE_MASK 0x007f0000 -#define GDI_HANDLE_BASETYPE_MASK 0x001f0000 -#define GDI_HANDLE_STOCK_MASK 0x00800000 -#define GDI_HANDLE_REUSE_MASK 0xff000000 -#define GDI_HANDLE_UPPER_MASK (GDI_HANDLE_TYPE_MASK|GDI_HANDLE_STOCK_MASK|= GDI_HANDLE_REUSE_MASK) -#define GDI_HANDLE_REUSECNT_SHIFT 24 -#define GDI_HANDLE_BASETYPE_SHIFT 16 - -#define GDI_ENTRY_STOCK_MASK 0x00000080 -#define GDI_ENTRY_REUSE_MASK 0x0000ff00 -#define GDI_ENTRY_REUSE_INC 0x00000100 -#define GDI_ENTRY_BASETYPE_MASK 0x001f0000 -#define GDI_ENTRY_FLAGS_MASK 0xff000000 -#define GDI_ENTRY_REUSECNT_SHIFT 8 -#define GDI_ENTRY_UPPER_SHIFT 16 - -/*! \defgroup GDI object types - * - * GDI object types - * - */ -/*@{*/ -#define GDI_OBJECT_TYPE_DC 0x00010000 -#define GDI_OBJECT_TYPE_DIRECTDRAW 0x00020000 /* Should be moved away f= rom gdi objects */ -#define GDI_OBJECT_TYPE_DD_SURFACE 0x00030000 /* Should be moved away f= rom gdi objects */ -#define GDI_OBJECT_TYPE_REGION 0x00040000 -#define GDI_OBJECT_TYPE_BITMAP 0x00050000 -#define GDI_OBJECT_TYPE_CLIOBJ 0x00060000 -#define GDI_OBJECT_TYPE_PATH 0x00070000 -#define GDI_OBJECT_TYPE_PALETTE 0x00080000 -#define GDI_OBJECT_TYPE_COLORSPACE 0x00090000 -#define GDI_OBJECT_TYPE_FONT 0x000a0000 - -#define GDI_OBJECT_TYPE_BRUSH 0x00100000 -#define GDI_OBJECT_TYPE_DD_VIDEOPORT 0x00120000 /* Should be moved away f= rom gdi objects */ -#define GDI_OBJECT_TYPE_DD_MOTIONCOMP 0x00140000 /* Should be moved away f= rom gdi objects */ -#define GDI_OBJECT_TYPE_ENUMFONT 0x00160000 - -/* Following object types are derived types from the above base types - use 0x001f0000 as mask to get the base type */ -#define GDI_OBJECT_TYPE_EMF 0x00210000 -#define GDI_OBJECT_TYPE_METAFILE 0x00260000 -#define GDI_OBJECT_TYPE_ENHMETAFILE 0x00460000 -#define GDI_OBJECT_TYPE_PEN 0x00300000 -#define GDI_OBJECT_TYPE_EXTPEN 0x00500000 -#define GDI_OBJECT_TYPE_METADC 0x00660000 -/*#define GDI_OBJECT_TYPE_DD_PALETTE 0x00630000 unused at the moment, o= ther value required */ -/*#define GDI_OBJECT_TYPE_DD_CLIPPER 0x00640000 unused at the moment, o= ther value required */ - -/* Following object types made up for ROS */ -#define GDI_OBJECT_TYPE_DONTCARE 0x007f0000 -/** Not really an object type. Forces GDI_FreeObj to be silent. */ -#define GDI_OBJECT_TYPE_SILENT 0x80000000 -/*@}*/ - -/* Handle macros */ -#define GDI_HANDLE_CREATE(i, t) \ - ((HANDLE)(((i) & GDI_HANDLE_INDEX_MASK) | ((t) & GDI_HANDLE_TYPE_MASK)= )) - -#define GDI_HANDLE_GET_INDEX(h) \ - (((ULONG_PTR)(h)) & GDI_HANDLE_INDEX_MASK) - -#define GDI_HANDLE_GET_TYPE(h) \ - (((ULONG_PTR)(h)) & GDI_HANDLE_TYPE_MASK) - -#define GDI_HANDLE_IS_TYPE(h, t) \ - ((t) =3D=3D (((ULONG_PTR)(h)) & GDI_HANDLE_TYPE_MASK)) - -#define GDI_HANDLE_IS_STOCKOBJ(h) \ - (0 !=3D (((ULONG_PTR)(h)) & GDI_HANDLE_STOCK_MASK)) - -#define GDI_HANDLE_SET_STOCKOBJ(h) \ - ((h) =3D (HANDLE)(((ULONG_PTR)(h)) | GDI_HANDLE_STOCK_MASK)) - -#define GDI_HANDLE_GET_UPPER(h) \ - (((ULONG_PTR)(h)) & GDI_HANDLE_UPPER_MASK) - -#define GDI_HANDLE_GET_REUSECNT(h) \ - (((ULONG_PTR)(h)) >> GDI_HANDLE_REUSECNT_SHIFT) - -#define GDI_ENTRY_GET_REUSECNT(e) \ - ((((ULONG_PTR)(e)) & GDI_ENTRY_REUSE_MASK) >> GDI_ENTRY_REUSECNT_SHIFT) - -#define GDI_OBJECT_GET_TYPE_INDEX(t) \ - ((t & GDI_HANDLE_BASETYPE_MASK) >> GDI_HANDLE_BASETYPE_SHIFT) - -/* DC OBJ Types */ -#define DC_TYPE_DIRECT 0 // normal device context -#define DC_TYPE_MEMORY 1 // memory device context -#define DC_TYPE_INFO 2 // information context - -/* DC OBJ Flags */ -#define DC_FLAG_DISPLAY 0x0001 -#define DC_FLAG_DIRECT 0x0002 -#define DC_FLAG_CANCELLED 0x0004 -#define DC_FLAG_PERMANENT 0x0008 -#define DC_FLAG_DIRTY_RAO 0x0010 -#define DC_FLAG_ACCUM_WMGR 0x0020 -#define DC_FLAG_ACCUM_APP 0x0040 -#define DC_FLAG_RESET 0x0080 -#define DC_FLAG_SYNCHRONIZEACCESS 0x0100 -#define DC_FLAG_EPSPRINTINGESCAPE 0x0200 -#define DC_FLAG_TEMPINFODC 0x0400 -#define DC_FLAG_FULLSCREEN 0x0800 -#define DC_FLAG_IN_CLONEPDEV 0x1000 -#define DC_FLAG_REDIRECTION 0x2000 -#define DC_FLAG_SHAREACCESS 0x4000 - -/* DC_ATTR Dirty Flags */ -#define DIRTY_FILL 0x00000001 -#define DIRTY_LINE 0x00000002 -#define DIRTY_TEXT 0x00000004 -#define DIRTY_BACKGROUND 0x00000008 -#define DIRTY_CHARSET 0x00000010 -#define SLOW_WIDTHS 0x00000020 -#define DC_CACHED_TM_VALID 0x00000040 -#define DISPLAY_DC 0x00000080 -#define DIRTY_PTLCURRENT 0x00000100 -#define DIRTY_PTFXCURRENT 0x00000200 -#define DIRTY_STYLESTATE 0x00000400 -#define DC_PLAYMETAFILE 0x00000800 -#define DC_BRUSH_DIRTY 0x00001000 -#define DC_PEN_DIRTY 0x00002000 -#define DC_DIBSECTION 0x00004000 -#define DC_LAST_CLIPRGN_VALID 0x00008000 -#define DC_PRIMARY_DISPLAY 0x00010000 -#define DC_MODE_DIRTY 0x00200000 -#define DC_FONTTEXT_DIRTY 0x00400000 - -/* DC_ATTR LCD Flags */ -#define LDC_LDC 0x00000001 // (init) local DC other than a norma= l DC -#define LDC_EMFLDC 0x00000002 // Enhance Meta File local DC -#define LDC_INIT_DOCUMENT 0x00000040 -#define LDC_INIT_PAGE 0x00000080 -#define LDC_KILL_DOCUMENT 0x00010000 - -/* DC_ATTR Xform Flags */ -#define METAFILE_TO_WORLD_IDENTITY 0x00000001 -#define WORLD_TO_PAGE_IDENTITY 0x00000002 -#define DEVICE_TO_PAGE_INVALID 0x00000008 -#define DEVICE_TO_WORLD_INVALID 0x00000010 -#define WORLD_TRANSFORM_SET 0x00000020 -#define POSITIVE_Y_IS_UP 0x00000040 -#define INVALIDATE_ATTRIBUTES 0x00000080 -#define PTOD_EFM11_NEGATIVE 0x00000100 -#define PTOD_EFM22_NEGATIVE 0x00000200 -#define ISO_OR_ANISO_MAP_MODE 0x00000400 -#define PAGE_TO_DEVICE_IDENTITY 0x00000800 -#define PAGE_TO_DEVICE_SCALE_IDENTITY 0x00001000 -#define PAGE_XLATE_CHANGED 0x00002000 -#define PAGE_EXTENTS_CHANGED 0x00004000 -#define WORLD_XFORM_CHANGED 0x00008000 - -/* RGN_ATTR Flags */ -#define DIRTY_RGNATTR 0x00000020 - - -/* TYPES *****************************************************************= ****/ - -typedef struct _GDI_TABLE_ENTRY -{ - PVOID KernelData; /* Points to the kernel mode structure */ - SHORT ProcessId; /* process id that created the object, 0 for stock o= bjects */ - SHORT nCount; /* usage count of object handles */ - union{ // temp union structure. - LONG Type; /* the first 16 bit is the object type including the= stock obj flag, the last 16 bits is just the object type */ - struct{ - SHORT FullUnique; - CHAR ObjectType; - CHAR Flags; - };}; - PVOID UserData; /* Points to the user mode structure, usually NULL t= hough */ -} GDI_TABLE_ENTRY, *PGDI_TABLE_ENTRY; - -// -// User space only structure! -// +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Win32 Graphical Subsystem (WIN32K) + * FILE: include/win32k/ntgdihal.h + * PURPOSE: Win32 Shared GDI Handle/Object Types + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES **************************************************************= ****/ + +#ifndef _NTGDIHDL_ +#define _NTGDIHDL_ + +#include <winddi.h> + +/* DEFINES ***************************************************************= ****/ + +/* Base address where the handle table is mapped to */ +#define GDI_HANDLE_TABLE_BASE_ADDRESS (0x400000) + +/* GDI handle table can hold 0x10000 handles */ +#define GDI_HANDLE_COUNT 0x10000 +#define GDI_GLOBAL_PROCESS (0x0) +#define GDI_CFONT_MAX 16 + +/* Handle Masks and shifts */ +#define GDI_HANDLE_INDEX_MASK (GDI_HANDLE_COUNT - 1) +#define GDI_HANDLE_TYPE_MASK 0x007f0000 +#define GDI_HANDLE_BASETYPE_MASK 0x001f0000 +#define GDI_HANDLE_STOCK_MASK 0x00800000 +#define GDI_HANDLE_REUSE_MASK 0xff000000 +#define GDI_HANDLE_UPPER_MASK (GDI_HANDLE_TYPE_MASK|GDI_HANDLE_STOCK_MASK|= GDI_HANDLE_REUSE_MASK) +#define GDI_HANDLE_REUSECNT_SHIFT 24 +#define GDI_HANDLE_BASETYPE_SHIFT 16 + +#define GDI_ENTRY_STOCK_MASK 0x00000080 +#define GDI_ENTRY_REUSE_MASK 0x0000ff00 +#define GDI_ENTRY_REUSE_INC 0x00000100 +#define GDI_ENTRY_BASETYPE_MASK 0x001f0000 +#define GDI_ENTRY_FLAGS_MASK 0xff000000 +#define GDI_ENTRY_REUSECNT_SHIFT 8 +#define GDI_ENTRY_UPPER_SHIFT 16 + +/*! \defgroup GDI object types + * + * GDI object types + * + */ +/*@{*/ +#define GDI_OBJECT_TYPE_DC 0x00010000 +#define GDI_OBJECT_TYPE_DIRECTDRAW 0x00020000 /* Should be moved away f= rom gdi objects */ +#define GDI_OBJECT_TYPE_DD_SURFACE 0x00030000 /* Should be moved away f= rom gdi objects */ +#define GDI_OBJECT_TYPE_REGION 0x00040000 +#define GDI_OBJECT_TYPE_BITMAP 0x00050000 +#define GDI_OBJECT_TYPE_CLIOBJ 0x00060000 +#define GDI_OBJECT_TYPE_PATH 0x00070000 +#define GDI_OBJECT_TYPE_PALETTE 0x00080000 +#define GDI_OBJECT_TYPE_COLORSPACE 0x00090000 +#define GDI_OBJECT_TYPE_FONT 0x000a0000 + +#define GDI_OBJECT_TYPE_BRUSH 0x00100000 +#define GDI_OBJECT_TYPE_DD_VIDEOPORT 0x00120000 /* Should be moved away f= rom gdi objects */ +#define GDI_OBJECT_TYPE_DD_MOTIONCOMP 0x00140000 /* Should be moved away f= rom gdi objects */ +#define GDI_OBJECT_TYPE_ENUMFONT 0x00160000 + +/* Following object types are derived types from the above base types + use 0x001f0000 as mask to get the base type */ +#define GDI_OBJECT_TYPE_EMF 0x00210000 +#define GDI_OBJECT_TYPE_METAFILE 0x00260000 +#define GDI_OBJECT_TYPE_ENHMETAFILE 0x00460000 +#define GDI_OBJECT_TYPE_PEN 0x00300000 +#define GDI_OBJECT_TYPE_EXTPEN 0x00500000 +#define GDI_OBJECT_TYPE_METADC 0x00660000 +/*#define GDI_OBJECT_TYPE_DD_PALETTE 0x00630000 unused at the moment, o= ther value required */ +/*#define GDI_OBJECT_TYPE_DD_CLIPPER 0x00640000 unused at the moment, o= ther value required */ + +/* Following object types made up for ROS */ +#define GDI_OBJECT_TYPE_DONTCARE 0x007f0000 +/** Not really an object type. Forces GDI_FreeObj to be silent. */ +#define GDI_OBJECT_TYPE_SILENT 0x80000000 +/*@}*/ + +/* Handle macros */ +#define GDI_HANDLE_CREATE(i, t) \ + ((HANDLE)(((i) & GDI_HANDLE_INDEX_MASK) | ((t) & GDI_HANDLE_TYPE_MASK)= )) + +#define GDI_HANDLE_GET_INDEX(h) \ + (((ULONG_PTR)(h)) & GDI_HANDLE_INDEX_MASK) + +#define GDI_HANDLE_GET_TYPE(h) \ + (((ULONG_PTR)(h)) & GDI_HANDLE_TYPE_MASK) + +#define GDI_HANDLE_IS_TYPE(h, t) \ + ((t) =3D=3D (((ULONG_PTR)(h)) & GDI_HANDLE_TYPE_MASK)) + +#define GDI_HANDLE_IS_STOCKOBJ(h) \ + (0 !=3D (((ULONG_PTR)(h)) & GDI_HANDLE_STOCK_MASK)) + +#define GDI_HANDLE_SET_STOCKOBJ(h) \ + ((h) =3D (HANDLE)(((ULONG_PTR)(h)) | GDI_HANDLE_STOCK_MASK)) + +#define GDI_HANDLE_GET_UPPER(h) \ + (((ULONG_PTR)(h)) & GDI_HANDLE_UPPER_MASK) + +#define GDI_HANDLE_GET_REUSECNT(h) \ + (((ULONG_PTR)(h)) >> GDI_HANDLE_REUSECNT_SHIFT) + +#define GDI_ENTRY_GET_REUSECNT(e) \ + ((((ULONG_PTR)(e)) & GDI_ENTRY_REUSE_MASK) >> GDI_ENTRY_REUSECNT_SHIFT) + +#define GDI_OBJECT_GET_TYPE_INDEX(t) \ + ((t & GDI_HANDLE_BASETYPE_MASK) >> GDI_HANDLE_BASETYPE_SHIFT) + +/* DC OBJ Types */ +#define DC_TYPE_DIRECT 0 // normal device context +#define DC_TYPE_MEMORY 1 // memory device context +#define DC_TYPE_INFO 2 // information context + +/* DC OBJ Flags */ +#define DC_FLAG_DISPLAY 0x0001 +#define DC_FLAG_DIRECT 0x0002 +#define DC_FLAG_CANCELLED 0x0004 +#define DC_FLAG_PERMANENT 0x0008 +#define DC_FLAG_DIRTY_RAO 0x0010 +#define DC_FLAG_ACCUM_WMGR 0x0020 +#define DC_FLAG_ACCUM_APP 0x0040 +#define DC_FLAG_RESET 0x0080 +#define DC_FLAG_SYNCHRONIZEACCESS 0x0100 +#define DC_FLAG_EPSPRINTINGESCAPE 0x0200 +#define DC_FLAG_TEMPINFODC 0x0400 +#define DC_FLAG_FULLSCREEN 0x0800 +#define DC_FLAG_IN_CLONEPDEV 0x1000 +#define DC_FLAG_REDIRECTION 0x2000 +#define DC_FLAG_SHAREACCESS 0x4000 + +/* DC_ATTR Dirty Flags */ +#define DIRTY_FILL 0x00000001 +#define DIRTY_LINE 0x00000002 +#define DIRTY_TEXT 0x00000004 +#define DIRTY_BACKGROUND 0x00000008 +#define DIRTY_CHARSET 0x00000010 +#define SLOW_WIDTHS 0x00000020 +#define DC_CACHED_TM_VALID 0x00000040 +#define DISPLAY_DC 0x00000080 +#define DIRTY_PTLCURRENT 0x00000100 +#define DIRTY_PTFXCURRENT 0x00000200 +#define DIRTY_STYLESTATE 0x00000400 +#define DC_PLAYMETAFILE 0x00000800 +#define DC_BRUSH_DIRTY 0x00001000 +#define DC_PEN_DIRTY 0x00002000 +#define DC_DIBSECTION 0x00004000 +#define DC_LAST_CLIPRGN_VALID 0x00008000 +#define DC_PRIMARY_DISPLAY 0x00010000 +#define DC_MODE_DIRTY 0x00200000 +#define DC_FONTTEXT_DIRTY 0x00400000 + +/* DC_ATTR LCD Flags */ +#define LDC_LDC 0x00000001 // (init) local DC other than a norma= l DC +#define LDC_EMFLDC 0x00000002 // Enhance Meta File local DC +#define LDC_INIT_DOCUMENT 0x00000040 +#define LDC_INIT_PAGE 0x00000080 +#define LDC_KILL_DOCUMENT 0x00010000 + +/* DC_ATTR Xform Flags */ +#define METAFILE_TO_WORLD_IDENTITY 0x00000001 +#define WORLD_TO_PAGE_IDENTITY 0x00000002 +#define DEVICE_TO_PAGE_INVALID 0x00000008 +#define DEVICE_TO_WORLD_INVALID 0x00000010 +#define WORLD_TRANSFORM_SET 0x00000020 +#define POSITIVE_Y_IS_UP 0x00000040 +#define INVALIDATE_ATTRIBUTES 0x00000080 +#define PTOD_EFM11_NEGATIVE 0x00000100 +#define PTOD_EFM22_NEGATIVE 0x00000200 +#define ISO_OR_ANISO_MAP_MODE 0x00000400 +#define PAGE_TO_DEVICE_IDENTITY 0x00000800 +#define PAGE_TO_DEVICE_SCALE_IDENTITY 0x00001000 +#define PAGE_XLATE_CHANGED 0x00002000 +#define PAGE_EXTENTS_CHANGED 0x00004000 +#define WORLD_XFORM_CHANGED 0x00008000 + +/* RGN_ATTR Flags */ +#define DIRTY_RGNATTR 0x00000020 + + +/* TYPES *****************************************************************= ****/ + +typedef struct _GDI_TABLE_ENTRY +{ + PVOID KernelData; /* Points to the kernel mode structure */ + SHORT ProcessId; /* process id that created the object, 0 for stock o= bjects */ + SHORT nCount; /* usage count of object handles */ + union{ // temp union structure. + LONG Type; /* the first 16 bit is the object type including the= stock obj flag, the last 16 bits is just the object type */ + struct{ + SHORT FullUnique; + CHAR ObjectType; + CHAR Flags; + };}; + PVOID UserData; /* Points to the user mode structure, usually NULL t= hough */ +} GDI_TABLE_ENTRY, *PGDI_TABLE_ENTRY; + +// +// User space only structure! +// typedef struct __GDI_SHARED_HANDLE_TABLE // Must match win32k/include/gdio= bj.h { GDI_TABLE_ENTRY Entries[GDI_HANDLE_COUNT]; // Handle table. @@ -211,147 +211,147 @@ CFONT cfPublic[GDI_CFONT_MAX]; // Public Fonts. DWORD dwCsbSupported1; // OEM code-page bitfield. } GDI_SHARED_HANDLE_TABLE, *PGDI_SHARED_HANDLE_TABLE; - -typedef struct _RGN_ATTR -{ - ULONG AttrFlags; - ULONG Flags; // Clipping region's complexity. NULL, SIMPLE & COMPL= EXREGION - RECTL Rect; -} RGN_ATTR,*PRGN_ATTR; - -// Local DC structure (_DC_ATTR) PVOID pvLDC; -typedef struct _LDC -{ - HDC hDC; - ULONG Flags; - INT iType; - PVOID pvEmfDC; /* Pointer to ENHMETAFILE structure */ - ABORTPROC pAbortProc; /* AbortProc for Printing */ - HANDLE hPrinter; /* Local or Remote Printer driver */ - INT iInitPage; /* Start/Stop */ - INT iInitDocument; -} LDC, *PLDC; - -typedef struct _DC_ATTR -{ - PVOID pvLDC; - ULONG ulDirty_; - HANDLE hbrush; - HANDLE hpen; - COLORREF crBackgroundClr; - ULONG ulBackgroundClr; - COLORREF crForegroundClr; - ULONG ulForegroundClr; - COLORREF crBrushClr; - ULONG ulBrushClr; - COLORREF crPenClr; - ULONG ulPenClr; - DWORD iCS_CP; - INT iGraphicsMode; - BYTE jROP2; - BYTE jBkMode; - BYTE jFillMode; - BYTE jStretchBltMode; - POINTL ptlCurrent; - POINTL ptfxCurrent; - LONG lBkMode; - LONG lFillMode; - LONG lStretchBltMode; - FLONG flFontMapper; - LONG lIcmMode; - HANDLE hcmXform; - HCOLORSPACE hColorSpace; - FLONG flIcmFlags; - INT IcmBrushColor; - INT IcmPenColor; - PVOID pvLIcm; - FLONG flTextAlign; - LONG lTextAlign; - LONG lTextExtra; - LONG lRelAbs; - LONG lBreakExtra; - LONG cBreak; - HANDLE hlfntNew; - MATRIX_S mxWorldToDevice; - MATRIX_S mxDevicetoWorld; - MATRIX_S mxWorldToPage; - EFLOAT_S efM11PtoD; - EFLOAT_S efM22PtoD; - EFLOAT_S efDxPtoD; - EFLOAT_S efDyPtoD; - INT iMapMode; - DWORD dwLayout; - LONG lWindowOrgx; - POINTL ptlWindowOrg; - SIZEL szlWindowExt; - POINTL ptlViewportOrg; - SIZEL szlViewportExt; - FLONG flXform; - SIZEL szlVirtualDevicePixel; - SIZEL szlVirtualDeviceMm; - SIZEL szlVirtualDeviceSize; - POINTL ptlBrushOrigin; - RGN_ATTR VisRectRegion; -} DC_ATTR, *PDC_ATTR; - -typedef struct _BRUSH_ATTR -{ - LOGBRUSH logbrush; - DWORD dwUnused[3]; -} BRUSH_ATTR, *PBRUSH_ATTR; - -typedef struct _FONT_ATTR -{ - DWORD dwUnknown; - void *pCharWidthData; -} FONT_ATTR, *PFONT_ATTR; - -typedef enum tagGdiPathState -{ - PATH_Null, - PATH_Open, - PATH_Closed -} GdiPathState; - -typedef struct tagGdiPath -{ - GdiPathState state; - POINT *pPoints; - BYTE *pFlags; - int numEntriesUsed, numEntriesAllocated; - BOOL newStroke; -} GdiPath; - -typedef struct _WIN_DC_INFO -{ - int flags; - - HRGN hClipRgn; /* Clip region (may be 0) */ - HRGN hrgnMeta; /* Meta region (may be 0) */ - HRGN hMetaClipRgn; /* Intersection of meta and clip regions (may be = 0) */ - HRGN hVisRgn; /* Should me to DC. Visible region (must never be= 0) */ - - HRGN hGCClipRgn; /* GC clip region (ClipRgn AND VisRgn) */ - HBITMAP hBitmap; - HBITMAP hFirstBitmap; /* Bitmap selected at creation of the DC */ - -/* #if 0 */ - HPALETTE hPalette; - - GdiPath path; -/* #endif */ - - RECT totalExtent; - BYTE bitsPerPixel; - - INT DCOrgX; /* DC origin */ - INT DCOrgY; - INT ArcDirection; - - XFORM xformWorld2Wnd; /* World-to-window transformation */ - XFORM xformWorld2Vport; /* World-to-viewport transformation */ - XFORM xformVport2World; /* Inverse of the above transformation */ - BOOL vport2WorldValid; /* Is xformVport2World valid? */ -} WIN_DC_INFO; - -#endif + +typedef struct _RGN_ATTR +{ + ULONG AttrFlags; + ULONG Flags; // Clipping region's complexity. NULL, SIMPLE & COMPL= EXREGION + RECTL Rect; +} RGN_ATTR,*PRGN_ATTR; + +// Local DC structure (_DC_ATTR) PVOID pvLDC; +typedef struct _LDC +{ + HDC hDC; + ULONG Flags; + INT iType; + PVOID pvEmfDC; /* Pointer to ENHMETAFILE structure */ + ABORTPROC pAbortProc; /* AbortProc for Printing */ + HANDLE hPrinter; /* Local or Remote Printer driver */ + INT iInitPage; /* Start/Stop */ + INT iInitDocument; +} LDC, *PLDC; + +typedef struct _DC_ATTR +{ + PVOID pvLDC; + ULONG ulDirty_; + HANDLE hbrush; + HANDLE hpen; + COLORREF crBackgroundClr; + ULONG ulBackgroundClr; + COLORREF crForegroundClr; + ULONG ulForegroundClr; + COLORREF crBrushClr; + ULONG ulBrushClr; + COLORREF crPenClr; + ULONG ulPenClr; + DWORD iCS_CP; + INT iGraphicsMode; + BYTE jROP2; + BYTE jBkMode; + BYTE jFillMode; + BYTE jStretchBltMode; + POINTL ptlCurrent; + POINTL ptfxCurrent; + LONG lBkMode; + LONG lFillMode; + LONG lStretchBltMode; + FLONG flFontMapper; + LONG lIcmMode; + HANDLE hcmXform; + HCOLORSPACE hColorSpace; + FLONG flIcmFlags; + INT IcmBrushColor; + INT IcmPenColor; + PVOID pvLIcm; + FLONG flTextAlign; + LONG lTextAlign; + LONG lTextExtra; + LONG lRelAbs; + LONG lBreakExtra; + LONG cBreak; + HANDLE hlfntNew; + MATRIX_S mxWorldToDevice; + MATRIX_S mxDevicetoWorld; + MATRIX_S mxWorldToPage; + EFLOAT_S efM11PtoD; + EFLOAT_S efM22PtoD; + EFLOAT_S efDxPtoD; + EFLOAT_S efDyPtoD; + INT iMapMode; + DWORD dwLayout; + LONG lWindowOrgx; + POINTL ptlWindowOrg; + SIZEL szlWindowExt; + POINTL ptlViewportOrg; + SIZEL szlViewportExt; + FLONG flXform; + SIZEL szlVirtualDevicePixel; + SIZEL szlVirtualDeviceMm; + SIZEL szlVirtualDeviceSize; + POINTL ptlBrushOrigin; + RGN_ATTR VisRectRegion; +} DC_ATTR, *PDC_ATTR; + +typedef struct _BRUSH_ATTR +{ + LOGBRUSH logbrush; + DWORD dwUnused[3]; +} BRUSH_ATTR, *PBRUSH_ATTR; + +typedef struct _FONT_ATTR +{ + DWORD dwUnknown; + void *pCharWidthData; +} FONT_ATTR, *PFONT_ATTR; + +typedef enum tagGdiPathState +{ + PATH_Null, + PATH_Open, + PATH_Closed +} GdiPathState; + +typedef struct tagGdiPath +{ + GdiPathState state; + POINT *pPoints; + BYTE *pFlags; + int numEntriesUsed, numEntriesAllocated; + BOOL newStroke; +} GdiPath; + +typedef struct _WIN_DC_INFO +{ + int flags; + + HRGN hClipRgn; /* Clip region (may be 0) */ + HRGN hrgnMeta; /* Meta region (may be 0) */ + HRGN hMetaClipRgn; /* Intersection of meta and clip regions (may be = 0) */ + HRGN hVisRgn; /* Should me to DC. Visible region (must never be= 0) */ + + HRGN hGCClipRgn; /* GC clip region (ClipRgn AND VisRgn) */ + HBITMAP hBitmap; + HBITMAP hFirstBitmap; /* Bitmap selected at creation of the DC */ + +/* #if 0 */ + HPALETTE hPalette; + + GdiPath path; +/* #endif */ + + RECT totalExtent; + BYTE bitsPerPixel; + + INT DCOrgX; /* DC origin */ + INT DCOrgY; + INT ArcDirection; + + XFORM xformWorld2Wnd; /* World-to-window transformation */ + XFORM xformWorld2Vport; /* World-to-viewport transformation */ + XFORM xformVport2World; /* Inverse of the above transformation */ + BOOL vport2WorldValid; /* Is xformVport2World valid? */ +} WIN_DC_INFO; + +#endif Propchange: trunk/reactos/include/reactos/win32k/ntgdihdl.h ---------------------------------------------------------------------------= --- svn:eol-style =3D native

16 years, 7 months

[fireball] 32707: - MAINTENANCE: Fix inconsistent new lines.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Mar 17 05:59:18 2008 New Revision: 32707 URL: http://svn.reactos.org/svn/reactos?rev=3D32707&view=3Drev Log: - MAINTENANCE: Fix inconsistent new lines. Modified: trunk/reactos/dll/win32/gdi32/objects/palette.c (contents, props chan= ged) Modified: trunk/reactos/dll/win32/gdi32/objects/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objec= ts/palette.c?rev=3D32707&r1=3D32706&r2=3D32707&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/gdi32/objects/palette.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/palette.c Mon Mar 17 05:59:18 2008 @@ -1,94 +1,94 @@ -#include "precomp.h" - -#define NDEBUG -#include <debug.h> - -BOOL -WINAPI -AnimatePalette(HPALETTE hpal, - UINT iStartIndex, - UINT cEntries, - const PALETTEENTRY *ppe) -{ - return NtGdiDoPalette(hpal, iStartIndex, cEntries, (PALETTEENTRY*)ppe,= GdiPalAnimate, TRUE); -} - -HPALETTE -WINAPI -CreatePalette(CONST LOGPALETTE * plpal) -{ - return NtGdiCreatePaletteInternal((LPLOGPALETTE)plpal, plpal->palNumEn= tries); -} - -/* - * @implemented - */ -UINT -WINAPI -GetPaletteEntries(HPALETTE hpal, - UINT iStartIndex, - UINT cEntries, - LPPALETTEENTRY ppe) -{ - return NtGdiDoPalette(hpal, iStartIndex, cEntries, ppe, GdiPalGetEntri= es, FALSE); -} - -UINT -WINAPI -SetPaletteEntries(HPALETTE hpal, - UINT iStartIndex, - UINT cEntries, - const PALETTEENTRY *ppe) -{ - return NtGdiDoPalette(hpal, iStartIndex, cEntries, (PALETTEENTRY*)ppe,= GdiPalSetEntries, TRUE); -} - -UINT -WINAPI -GetSystemPaletteEntries(HDC hDC, - UINT iStartIndex, - UINT cEntries, - LPPALETTEENTRY ppe) -{ - return NtGdiDoPalette(hDC, iStartIndex, cEntries, ppe, GdiPalGetSystem= Entries, FALSE); -} - -UINT -WINAPI -GetDIBColorTable(HDC hDC, - UINT iStartIndex, - UINT cEntries, - RGBQUAD *pColors) -{ - return NtGdiDoPalette(hDC, iStartIndex, cEntries, pColors, GdiPalGetCo= lorTable, FALSE); -} - -/* - * @implemented - */ -UINT -WINAPI -RealizePalette(HDC hDC) /* [in] Handle of device context */ -{ -#if 0 -// Handle something other than a normal dc object. - if (GDI_HANDLE_GET_TYPE(hDC) !=3D GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) =3D=3D GDI_OBJECT_TYPE_METADC) - return MFDRV_(hDC); - else - { - HPALETTE Pal =3D GetDCObject(hDC, GDI_OBJECT_TYPE_PALETTE); - PLDC pLDC =3D GdiGetLDC((HDC) Pal); - if ( !pLDC ) return FALSE; - if (pLDC->iType =3D=3D LDC_EMFLDC) return EMFDRV_(Pal); - return FALSE; - } - } -#endif - return UserRealizePalette(hDC); -} - +#include "precomp.h" + +#define NDEBUG +#include <debug.h> + +BOOL +WINAPI +AnimatePalette(HPALETTE hpal, + UINT iStartIndex, + UINT cEntries, + const PALETTEENTRY *ppe) +{ + return NtGdiDoPalette(hpal, iStartIndex, cEntries, (PALETTEENTRY*)ppe,= GdiPalAnimate, TRUE); +} + +HPALETTE +WINAPI +CreatePalette(CONST LOGPALETTE * plpal) +{ + return NtGdiCreatePaletteInternal((LPLOGPALETTE)plpal, plpal->palNumEn= tries); +} + +/* + * @implemented + */ +UINT +WINAPI +GetPaletteEntries(HPALETTE hpal, + UINT iStartIndex, + UINT cEntries, + LPPALETTEENTRY ppe) +{ + return NtGdiDoPalette(hpal, iStartIndex, cEntries, ppe, GdiPalGetEntri= es, FALSE); +} + +UINT +WINAPI +SetPaletteEntries(HPALETTE hpal, + UINT iStartIndex, + UINT cEntries, + const PALETTEENTRY *ppe) +{ + return NtGdiDoPalette(hpal, iStartIndex, cEntries, (PALETTEENTRY*)ppe,= GdiPalSetEntries, TRUE); +} + +UINT +WINAPI +GetSystemPaletteEntries(HDC hDC, + UINT iStartIndex, + UINT cEntries, + LPPALETTEENTRY ppe) +{ + return NtGdiDoPalette(hDC, iStartIndex, cEntries, ppe, GdiPalGetSystem= Entries, FALSE); +} + +UINT +WINAPI +GetDIBColorTable(HDC hDC, + UINT iStartIndex, + UINT cEntries, + RGBQUAD *pColors) +{ + return NtGdiDoPalette(hDC, iStartIndex, cEntries, pColors, GdiPalGetCo= lorTable, FALSE); +} + +/* + * @implemented + */ +UINT +WINAPI +RealizePalette(HDC hDC) /* [in] Handle of device context */ +{ +#if 0 +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hDC) !=3D GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) =3D=3D GDI_OBJECT_TYPE_METADC) + return MFDRV_(hDC); + else + { + HPALETTE Pal =3D GetDCObject(hDC, GDI_OBJECT_TYPE_PALETTE); + PLDC pLDC =3D GdiGetLDC((HDC) Pal); + if ( !pLDC ) return FALSE; + if (pLDC->iType =3D=3D LDC_EMFLDC) return EMFDRV_(Pal); + return FALSE; + } + } +#endif + return UserRealizePalette(hDC); +} + /* * @implemented */ @@ -99,29 +99,29 @@ UINT nEntries ) { - return NtGdiResizePalette(hPalette, nEntries); + return NtGdiResizePalette(hPalette, nEntries); } = -/* - * @implemented - */ -UINT -WINAPI -SetDIBColorTable(HDC hDC, - UINT iStartIndex, - UINT cEntries, - const RGBQUAD *pColors) -{ - UINT retValue=3D0; - - if (cEntries) - { - retValue =3D NtGdiDoPalette(hDC, iStartIndex, cEntries, (RGBQUAD*)= pColors, GdiPalSetColorTable, TRUE); - } - - return retValue; -} - +/* + * @implemented + */ +UINT +WINAPI +SetDIBColorTable(HDC hDC, + UINT iStartIndex, + UINT cEntries, + const RGBQUAD *pColors) +{ + UINT retValue=3D0; + + if (cEntries) + { + retValue =3D NtGdiDoPalette(hDC, iStartIndex, cEntries, (RGBQUAD*)= pColors, GdiPalSetColorTable, TRUE); + } + + return retValue; +} + /* * @implemented */ @@ -134,5 +134,5 @@ ((PW32CLIENTINFO)NtCurrentTeb()->Win32ClientInfo)->cSpins =3D 0; return NtGdiUpdateColors(hdc); } - -/* EOF */ + +/* EOF */ Propchange: trunk/reactos/dll/win32/gdi32/objects/palette.c ---------------------------------------------------------------------------= --- svn:eol-style =3D native

16 years, 7 months

[hpoussin] 32706: Don't fail if CCB_SYSTEM_FLAG can't be set

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Mar 17 05:30:58 2008 New Revision: 32706 URL: http://svn.reactos.org/svn/reactos?rev=3D32706&view=3Drev Log: Don't fail if CCB_SYSTEM_FLAG can't be set Modified: trunk/reactos/drivers/input/i8042prt/pnp.c Modified: trunk/reactos/drivers/input/i8042prt/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042pr= t/pnp.c?rev=3D32706&r1=3D32705&r2=3D32706&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/input/i8042prt/pnp.c (original) +++ trunk/reactos/drivers/input/i8042prt/pnp.c Mon Mar 17 05:30:58 2008 @@ -156,9 +156,13 @@ WARN_(I8042PRT, "Warning: can't write SET_LEDS (0x%08lx)\n", Status); } = - /* Turn on translation and SF (Some machines don't reboot if SF is not se= t) */ - if (!i8042ChangeMode(DeviceExtension, 0, CCB_TRANSLATE | CCB_SYSTEM_FLAG)) + /* Turn on translation */ + if (!i8042ChangeMode(DeviceExtension, 0, CCB_TRANSLATE)) return FALSE; + + /* Turn on SF (Some machines don't reboot if SF is not set) ; + * we assume that if call fails, machine doesn't need it. */ + i8042ChangeMode(DeviceExtension, 0, CCB_SYSTEM_FLAG); = return TRUE; }

16 years, 7 months

[hpoussin] 32705: Remove some more circular dependencies. May fix bug 3131

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Mar 17 05:29:43 2008 New Revision: 32705 URL: http://svn.reactos.org/svn/reactos?rev=3D32705&view=3Drev Log: Remove some more circular dependencies. May fix bug 3131 Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/= mingw/modulehandler.cpp?rev=3D32705&r1=3D32704&r2=3D32705&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Mon Mar 17 0= 5:29:43 2008 @@ -1253,21 +1253,25 @@ Rule arHostRule2 ( "\t$(ECHO_AR)\n" "\t${host_ar} -rc $@ $($(module_name)_OBJS)\n", NULL ); -Rule gasRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t)_$(module_name).o: $(source) ${$(module_name)_precondition}$(dependencies= ) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" +Rule gasRule ( "$(source): ${$(module_name)_precondition}\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(sour= ce_dir)\n" "\t$(ECHO_GAS)\n" "\t${gcc} -x assembler-with-cpp -c $< -o $@ -D__ASM__ $($(m= odule_name)_CFLAGS)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t)_$(module_name).o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule bootRule ( "$(module_output): $(source) ${$(module_name)_precondition= }$(dependencies) | $(OUTPUT)$(SEP)$(source_dir)\n" +Rule bootRule ( "$(source): ${$(module_name)_precondition}\n" + "$(module_output): $(source)$(dependencies) | $(OUTPUT)$(S= EP)$(source_dir)\n" "\t$(ECHO_NASM)\n" "\t$(Q)${nasm} -f win32 $< -o $@ $($(module_name)_NASMFLAG= S)\n", "$(OUTPUT)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule nasmRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noe= xt)_$(module_name).o: $(source) ${$(module_name)_precondition}$(dependencie= s) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" +Rule nasmRule ( "$(source): ${$(module_name)_precondition}\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noe= xt)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(sou= rce_dir)\n" "\t$(ECHO_NASM)\n" "\t$(Q)${nasm} -f win32 $< -o $@ $($(module_name)_NASMFLAG= S)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noe= xt)_$(module_name).o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule windresRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_= noext)_$(module_name).coff: $(source) ${$(module_name)_precondition}$(depen= dencies) $(WRC_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir) $(TEMPORARY)\n" +Rule windresRule ( "$(source): ${$(module_name)_precondition}\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_= noext)_$(module_name).coff: $(source)$(dependencies) $(WRC_TARGET) | $(INTE= RMEDIATE)$(SEP)$(source_dir) $(TEMPORARY)\n" "\t$(ECHO_WRC)\n" "\t${gcc} -xc -E -DRC_INVOKED ${$(module_name)_RCFLAGS}= $(source) > $(TEMPORARY)$(SEP)$(module_name).$(source_name_noext).rci.tmp\= n" "\t$(Q)$(WRC_TARGET) ${$(module_name)_RCFLAGS} $(TEMPOR= ARY)$(SEP)$(module_name).$(source_name_noext).rci.tmp $(TEMPORARY)$(SEP)$(m= odule_name).$(source_name_noext).res.tmp\n" @@ -1280,7 +1284,7 @@ "\t$(ECHO_WMC)\n" "\t$(Q)$(WMC_TARGET) -i -H $(INTERMEDIATE)$(SEP)include$(SE= P)reactos$(SEP)$(source_name_noext).h -o $(INTERMEDIATE)$(SEP)$(source_dir)= $(SEP)$(source_name_noext).rc $(source)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t).rc", "$(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext= ).h", NULL ); -Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext).spec.def: $(source) $(dependencies) $(WINEBUILD_TARGET) | $(INTERM= EDIATE)$(SEP)$(source_dir)\n" +Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERME= DIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WINEBLD)\n" "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(IN= TERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E= $(source_path)$(SEP)$(source_name_noext).spec\n" "$(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_na= me_noext).stubs.c: $(source_path)$(SEP)$(source_name_noext).spec $(WINEBUIL= D_TARGET)\n" @@ -1293,12 +1297,14 @@ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext).stubs.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext).stubs.o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule widlHeaderRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext).h: $(source) ${$(module_name)_precondition}$(dependencies) $(WIDL= _TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" +Rule widlHeaderRule ( "$(source): ${$(module_name)_precondition}\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext).h: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP= )$(source_dir)\n" "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h= -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).h $(source= )\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext).h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule widlServerRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_s.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_= s.h: $(source) ${$(module_name)_precondition}$(dependencies) $(WIDL_TARGET)= | $(INTERMEDIATE)$(SEP)$(source_dir)\n" +Rule widlServerRule ( "$(source): ${$(module_name)_precondition}\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_s.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_= s.h: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(sourc= e_dir)\n" "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h= -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h -s -S = $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.c $(source)\= n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_s.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)= _s.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h$(depe= ndencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" @@ -1308,7 +1314,8 @@ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_s.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_s.o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule widlClientRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_c.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_= c.h: $(source) ${$(module_name)_precondition}$(dependencies) $(WIDL_TARGET)= | $(INTERMEDIATE)$(SEP)$(source_dir)\n" +Rule widlClientRule ( "$(source): ${$(module_name)_precondition}\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_c.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_= c.h: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(sourc= e_dir)\n" "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h= -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h -c -C = $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c $(source)\= n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_c.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)= _c.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h$(depe= ndencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" @@ -1318,7 +1325,8 @@ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_c.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_c.o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule widlProxyRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext)_p.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p= .h: $(source) ${$(module_name)_precondition}$(dependencies) $(WIDL_TARGET) = | $(INTERMEDIATE)$(SEP)$(source_dir)\n" +Rule widlProxyRule ( "$(source): ${$(module_name)_precondition}\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext)_p.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p= .h: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source= _dir)\n" "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h = -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h -p -P $= (INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c $(source)\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext)_p.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_= p.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h$(depen= dencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" @@ -1328,7 +1336,8 @@ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext)_p.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext)_p.o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule widlTlbRule ( "$(OUTPUT)$(SEP)$(source_dir)$(SEP)$(module_name).tlb: = $(source) ${$(module_name)_precondition}$(dependencies) $(WIDL_TARGET) | $(= INTERMEDIATE)$(SEP)$(source_dir)\n" +Rule widlTlbRule ( "$(source): ${$(module_name)_precondition}\n" + "$(OUTPUT)$(SEP)$(source_dir)$(SEP)$(module_name).tlb: = $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir= )\n" "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -t -T= $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).tlb $(source)= \n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); @@ -1864,10 +1873,10 @@ delete definitionFilename; } = - if(module.type =3D=3D HostStaticLibrary) - arHostRule2.Execute ( fMakefile, backend, module, archiveFilename,= clean_files ); - else - arRule2.Execute ( fMakefile, backend, module, archiveFilename, cle= an_files ); + if(module.type =3D=3D HostStaticLibrary) + arHostRule2.Execute ( fMakefile, backend, module, archiveFilename, clean= _files ); + else + arRule2.Execute ( fMakefile, backend, module, archiveFilename, clean_fil= es ); = GenerateCleanObjectsAsYouGoCode (); = @@ -2286,9 +2295,8 @@ if ( module.host =3D=3D HostTrue ) return; = - dependencies.push_back ( "$(INIT)" ); if ( module.name !=3D "psdk" ) - dependencies.push_back ( "$(PSDK_TARGET) $(psdk_HEADERS)" ); + dependencies.push_back ( "$(INIT) $(PSDK_TARGET) $(psdk_HEADERS)" ); = /* Check if any dependent library relies on the generated headers */ for ( size_t i =3D 0; i < module.project.modules.size (); i++ )

16 years, 7 months

[cfinck] 32704: Change getbuilds, so that it works with the new server address and directory structure at the ISO Server

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun Mar 16 16:28:23 2008 New Revision: 32704 URL: http://svn.reactos.org/svn/reactos?rev=3D32704&view=3Drev Log: Change getbuilds, so that it works with the new server address and director= y structure at the ISO Server Modified: trunk/web/reactos.org/htdocs/getbuilds/ajax-getfiles-provider.php trunk/web/reactos.org/htdocs/getbuilds/config.inc.php trunk/web/reactos.org/htdocs/getbuilds/getbuilds.js.php Modified: trunk/web/reactos.org/htdocs/getbuilds/ajax-getfiles-provider.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbui= lds/ajax-getfiles-provider.php?rev=3D32704&r1=3D32703&r2=3D32704&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/web/reactos.org/htdocs/getbuilds/ajax-getfiles-provider.php (orig= inal) +++ trunk/web/reactos.org/htdocs/getbuilds/ajax-getfiles-provider.php Sun M= ar 16 16:28:23 2008 @@ -4,14 +4,14 @@ LICENSE: GPL v2 or any later version FILE: web/reactos.org/htdocs/getbuilds/ajax-getfiles-provider.php PURPOSE: Easily download prebuilt ReactOS Revisions - COPYRIGHT: Copyright 2007 Colin Finck <mail(a)colinfinck.de> + COPYRIGHT: Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> */ = // This "ajax-getfiles.php" script has to be uploaded to the server, whic= h contains the ISO files. // Therefore it has an own configuration and doesn't use "config.inc.php". = // Configuration - $ISO_DIR =3D "../iso"; + $ROOT_DIR =3D "../"; $MAX_FILES_PER_PAGE =3D 100; // The same value has to be set in "config= .inc.php" $REV_RANGE_LIMIT =3D 3000; = @@ -63,7 +63,9 @@ die("<error><message>Wrong input for parameter 'get'!</message></error>= "); } = + $directories =3D array("bootcd", "livecd"); $file_patterns =3D array(); + = if( $_GET["bootcd-dbg"] =3D=3D 1 ) $file_patterns[] =3D "#bootcd-[0-9]+-dbg#"; if( $_GET["livecd-dbg"] =3D=3D 1 ) @@ -78,15 +80,19 @@ $firstrev =3D 0; $lastrev =3D 0; $morefiles =3D 0; - $dir =3D opendir( $ISO_DIR ) or die("<error><message>opendir failed!</mes= sage></error>"); - + = + foreach($directories as $d) + { + $dir =3D opendir( $ROOT_DIR . $d ) or die("<error><message>opendir faile= d!</message></error>"); + = + while( $fname =3D readdir($dir) ) + if( preg_match( "#-([0-9]+)-#", $fname, $matches ) ) + $fnames[ $matches[1] ][] =3D $fname; + = + closedir($dir); + } + = echo "<fileinformation>"; - = - while( $fname =3D readdir($dir) ) - if( preg_match( "#-([0-9]+)-#", $fname, $matches ) ) - $fnames[ $matches[1] ][] =3D $fname; - = - closedir($dir); = for( $i =3D $_GET["startrev"]; $i <=3D $_GET["endrev"]; $i++ ) { @@ -104,10 +110,12 @@ // This is a file we are looking for if( $get_filelist ) { + $dir =3D substr($fname, 0, 6); + = echo "<file>"; printf("<name>%s</name>", $fname ); - printf("<size>%s</size>", fsize_str( filesize( "$ISO_DIR/$fname" ) = ) ); - printf("<date>%s</date>", date( "Y-m-d H:i", filemtime( "$ISO_DIR/$= fname" ) ) ); + printf("<size>%s</size>", fsize_str( filesize( "$ROOT_DIR/$dir/$fna= me" ) ) ); + printf("<date>%s</date>", date( "Y-m-d H:i", filemtime( "$ROOT_DIR/= $dir/$fname" ) ) ); echo "</file>"; } = Modified: trunk/web/reactos.org/htdocs/getbuilds/config.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbui= lds/config.inc.php?rev=3D32704&r1=3D32703&r2=3D32704&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/web/reactos.org/htdocs/getbuilds/config.inc.php (original) +++ trunk/web/reactos.org/htdocs/getbuilds/config.inc.php Sun Mar 16 16:28:= 23 2008 @@ -8,7 +8,7 @@ */ = // Configuration - $AJAX_GETFILES_PROVIDER_URL =3D "http://svn.reactos.org/scripts/ajax-getf= iles-provider.php"; + $AJAX_GETFILES_PROVIDER_URL =3D "http://iso.reactos.org/scripts/ajax-getf= iles-provider.php"; $ISO_DOWNLOAD_URL =3D "http://iso.reactos.org/"; $MAX_FILES_PER_PAGE =3D 100; // The same value has to be set in "ajax-g= etfiles-provider.php" $SVN_ACTIVITY_URL =3D "http://svn.reactos.org/svnact/svn_activity.xml"; Modified: trunk/web/reactos.org/htdocs/getbuilds/getbuilds.js.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbui= lds/getbuilds.js.php?rev=3D32704&r1=3D32703&r2=3D32704&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/web/reactos.org/htdocs/getbuilds/getbuilds.js.php (original) +++ trunk/web/reactos.org/htdocs/getbuilds/getbuilds.js.php Sun Mar 16 16:2= 8:23 2008 @@ -176,7 +176,7 @@ var fname =3D files[i].getElementsByTagName("name")[0].firstChild.data; var fsize =3D files[i].getElementsByTagName("size")[0].firstChild.data; var fdate =3D files[i].getElementsByTagName("date")[0].firstChild.data; - var flink =3D '<a href=3D"<?php echo $ISO_DOWNLOAD_URL; ?>' + fname + = '">'; + var flink =3D '<a href=3D"<?php echo $ISO_DOWNLOAD_URL; ?>' + fname.su= bstr(0, 6) + "/" + fname + '">'; oddeven =3D !oddeven; = html +=3D '<tr class=3D"' + (oddeven ? "odd" : "even") + '" onmouseove= r=3D"tr_mouseover(this);" onmouseout=3D"tr_mouseout(this);">';

16 years, 7 months

[janderwald] 32703: - fix compilation with msvc

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Mar 16 14:19:26 2008 New Revision: 32703 URL: http://svn.reactos.org/svn/reactos?rev=3D32703&view=3Drev Log: - fix compilation with msvc Modified: trunk/reactos/dll/cpl/intl/advanced.c Modified: trunk/reactos/dll/cpl/intl/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/advanced= .c?rev=3D32703&r1=3D32702&r2=3D32703&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/cpl/intl/advanced.c (original) +++ trunk/reactos/dll/cpl/intl/advanced.c Sun Mar 16 14:19:26 2008 @@ -28,6 +28,8 @@ INFCONTEXT infCont; LPCPAGE lpCPage; HANDLE hCPage; + CPINFOEX cpInfEx; + TCHAR Section[MAX_PATH]; = Count =3D (UINT) SetupGetLineCount(hIntlInf, _T("CodePages")); if (Count <=3D 0) return FALSE; @@ -45,7 +47,6 @@ lpCPage->Status =3D 0; (lpCPage->Name)[0] =3D 0; = - CPINFOEX cpInfEx; if (GetCPInfoEx(uiCPage, 0, &cpInfEx)) { _tcscpy(lpCPage->Name, cpInfEx.CodePageName); @@ -57,7 +58,6 @@ continue; } = - TCHAR Section[MAX_PATH]; _stprintf(Section, _T("%s%d"), _T("CODEPAGE_REMOVE_"), uiCPage= ); if ((uiCPage =3D=3D GetACP()) || (uiCPage =3D=3D GetOEMCP()) |= | = (!SetupFindFirstLine(hIntlInf, Section, _T("AddReg"), &inf= Cont))) @@ -101,6 +101,9 @@ LPCPAGE lpCPage; INT ItemIndex; HWND hList; + LV_COLUMN column; + LV_ITEM item; + RECT ListRect; = hList =3D GetDlgItem(hwndDlg, IDC_CONV_TABLES); = @@ -120,10 +123,6 @@ SetupCloseInfFile(hIntlInf); = if (!EnumSystemCodePages(InstalledCPProc, CP_INSTALLED)) return; - - LV_COLUMN column; - LV_ITEM item; - RECT ListRect; = ZeroMemory(&column, sizeof(LV_COLUMN)); column.mask =3D LVCF_FMT|LVCF_TEXT|LVCF_WIDTH;

16 years, 7 months

[janderwald] 32702: - make desk strict ANSI-C compilable - do not disable color changer when a background image is selected

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Mar 16 13:29:28 2008 New Revision: 32702 URL: http://svn.reactos.org/svn/reactos?rev=3D32702&view=3Drev Log: - make desk strict ANSI-C compilable - do not disable color changer when a background image is selected Modified: trunk/reactos/dll/cpl/desk/background.c trunk/reactos/dll/cpl/desk/general.c Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/backgrou= nd.c?rev=3D32702&r1=3D32701&r2=3D32702&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/cpl/desk/background.c (original) +++ trunk/reactos/dll/cpl/desk/background.c Sun Mar 16 13:29:28 2008 @@ -481,8 +481,6 @@ InvalidateRect(GetDlgItem(hwndDlg, IDC_BACKGROUND_PREVIEW), NULL, TRUE); = - EnableWindow(GetDlgItem(hwndDlg, IDC_COLOR_BUTTON), - (backgroundItem->bWallpaper =3D=3D FALSE ? TRUE : FALSE)); EnableWindow(GetDlgItem(hwndDlg, IDC_PLACEMENT_COMBO), backgroundItem->bWallpaper); = Modified: trunk/reactos/dll/cpl/desk/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/general.= c?rev=3D32702&r1=3D32701&r2=3D32702&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/cpl/desk/general.c (original) +++ trunk/reactos/dll/cpl/desk/general.c Sun Mar 16 13:29:28 2008 @@ -15,6 +15,7 @@ HWND hFontSize; INFCONTEXT Context; int i, ci =3D 0; + DWORD dwSize, dwValue, dwType; = hFontSize =3D GetDlgItem(hWnd, IDC_FONTSIZE_COMBO); = @@ -39,7 +40,8 @@ if (i !=3D CB_ERR) SendMessage(hFontSize, CB_SETITEMDATA, (WPARAM)i, = (LPARAM)ci); = - DWORD dwSize =3D MAX_PATH, dwValue, dwType =3D REG_DWO= RD; + dwSize =3D MAX_PATH; + dwType =3D REG_DWORD; = if (RegQueryValueEx(hKey, _T("LogPixels"), NULL, &dwType, (LPBYTE)&dwValue, &dwSize= ) =3D=3D ERROR_SUCCESS)

16 years, 7 months

[janderwald] 32701: - the color of the background for the desktop window should match COLOR_DESKTOP

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Mar 16 13:19:36 2008 New Revision: 32701 URL: http://svn.reactos.org/svn/reactos?rev=3D32701&view=3Drev Log: - the color of the background for the desktop window should match COLOR_DES= KTOP Modified: trunk/reactos/dll/win32/shell32/shlview.c Modified: trunk/reactos/dll/win32/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shl= view.c?rev=3D32701&r1=3D32700&r2=3D32701&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/shlview.c (original) +++ trunk/reactos/dll/win32/shell32/shlview.c Sun Mar 16 13:19:36 2008 @@ -1924,7 +1924,7 @@ wc.hInstance =3D shell32_hInstance; wc.hIcon =3D 0; wc.hCursor =3D LoadCursorW(0, (LPWSTR)IDC_ARROW); - wc.hbrBackground =3D (HBRUSH) (COLOR_WINDOW + 1); + wc.hbrBackground =3D (HBRUSH) (COLOR_BACKGROUND+1); wc.lpszMenuName =3D NULL; wc.lpszClassName =3D SV_CLASS_NAME; =

16 years, 7 months

[cfinck] 32700: Winebuild files don't need to depend on $(module_precondition) Fixes some more circular dependencies

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun Mar 16 12:10:46 2008 New Revision: 32700 URL: http://svn.reactos.org/svn/reactos?rev=3D32700&view=3Drev Log: Winebuild files don't need to depend on $(module_precondition) Fixes some more circular dependencies Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/= mingw/modulehandler.cpp?rev=3D32700&r1=3D32699&r2=3D32700&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Sun Mar 16 1= 2:10:46 2008 @@ -1280,7 +1280,7 @@ "\t$(ECHO_WMC)\n" "\t$(Q)$(WMC_TARGET) -i -H $(INTERMEDIATE)$(SEP)include$(SE= P)reactos$(SEP)$(source_name_noext).h -o $(INTERMEDIATE)$(SEP)$(source_dir)= $(SEP)$(source_name_noext).rc $(source)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t).rc", "$(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext= ).h", NULL ); -Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext).spec.def: $(source) ${$(module_name)_precondition}$(dependencies) = $(WINEBUILD_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" +Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext).spec.def: $(source) $(dependencies) $(WINEBUILD_TARGET) | $(INTERM= EDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WINEBLD)\n" "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(IN= TERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E= $(source_path)$(SEP)$(source_name_noext).spec\n" "$(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_na= me_noext).stubs.c: $(source_path)$(SEP)$(source_name_noext).spec $(WINEBUIL= D_TARGET)\n"

16 years, 7 months

[janderwald] 32699: - initialize bitbucket properties dialog - fix resources - partly implement THRASH_CanTrashFile

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Mar 16 09:55:04 2008 New Revision: 32699 URL: http://svn.reactos.org/svn/reactos?rev=3D32699&view=3Drev Log: - initialize bitbucket properties dialog - fix resources - partly implement THRASH_CanTrashFile Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/eo-EO.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KO.rc trunk/reactos/dll/win32/shell32/lang/nb-NO.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/wa-WA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/recyclebin.c trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/bg-BG.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc Sun Mar 16 09:55:04 2008 @@ -333,7 +333,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "=C3=90=C3=A0=C3=A7=C3=AC=C3=A5=C3=B0 =C3=A4=C3=AE (=C3=8C=C3=81):"= , -1, 20, 105, 70, 10 RADIOBUTTON "=C3=94=C3=A0=C3=A9=C3=AB=C3=AE=C3=A2=C3=A5=C3=B2=C3=A5 =C3= =B1=C3=A5 =C3=A8=C3=A7=C3=B2=C3=B0=C3=A8=C3=A2=C3=A0=C3=B2 =C3=A2=C3=A5=C3= =A4=C3=AD=C3=A0=C3=A3=C3=A0, =C3=A1=C3=A5=C3=A7 =C3=A4=C3=A0 =C3=B1=C3=A5 = =C3=AC=C3=A5=C3=B1=C3=B2=C3=BF=C3=B2 =C3=A2 =C3=AA=C3=AE=C3=B8=C3=B7=C3=A5= =C3=B2=C3=AE.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&=C3=8F=C3=A8=C3=B2=C3=A0=C3=AD=C3=A5 =C3=AF=C3=B0=C3=A5=C3= =A4=C3=A8 =C3=A8=C3=A7=C3=B2=C3=B0=C3=A8=C3=A2=C3=A0=C3=AD=C3=A5", 14004, 2= 0, 155, 140, 10, WS_TABSTOP + AUTOCHECKBOX "&=C3=8F=C3=A8=C3=B2=C3=A0=C3=AD=C3=A5 =C3=AF=C3=B0=C3=A5=C3= =A4=C3=A8 =C3=A8=C3=A7=C3=B2=C3=B0=C3=A8=C3=A2=C3=A0=C3=AD=C3=A5", 14004, 2= 0, 155, 140, 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -647,6 +647,8 @@ FCIDM_SHVIEW_NEWFOLDER "=C3=8D=C3=AE=C3=A2=C3=A0 &=C3=AF=C3=A0=C3=AF= =C3=AA=C3=A0" FCIDM_SHVIEW_NEWLINK "=C3=8D=C3=AE=C3=A2=C3=A0 &=C3=A2=C3=B0=C3=BA= =C3=A7=C3=AA=C3=A0" IDS_FOLDER_OPTIONS "=C3=8D=C3=A0=C3=B1=C3=B2=C3=B0=C3=AE=C3=A9= =C3=AA=C3=A8 =C3=AD=C3=A0 =C3=AF=C3=A0=C3=AF=C3=AA=C3=A8=C3=B2=C3=A5" -END - - + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" +END + + Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/ca-ES.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc Sun Mar 16 09:55:04 2008 @@ -333,7 +333,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -643,4 +643,7 @@ FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/cs-CZ.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc Sun Mar 16 09:55:04 2008 @@ -334,7 +334,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -644,4 +644,7 @@ FCIDM_SHVIEW_NEWFOLDER "Nov=C3=A1 &slo=C2=9Eka" FCIDM_SHVIEW_NEWLINK "Nov=C3=BD &z=C3=A1stupce" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/da-DK.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc Sun Mar 16 09:55:04 2008 @@ -333,7 +333,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -643,4 +643,7 @@ FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/de-DE.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc Sun Mar 16 09:55:04 2008 @@ -335,7 +335,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximale Gr=C3=B6=C3=9Fe (MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Dateien nicht in den Papie&rkorb verschieben, sondern sofort= l=C3=B6schen", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "Best=C3=A4tigungs&dialog nach erfolgreichem L=C3=B6schvorgan= g anzeigen", 14004, 20, 155, 215, 10, WS_TABSTOP + AUTOCHECKBOX "Best=C3=A4tigungs&dialog nach erfolgreichem L=C3=B6schvorga= ng anzeigen", 14004, 20, 155, 215, 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -643,4 +643,7 @@ FCIDM_SHVIEW_NEWFOLDER "Neues Ver&zeichnis" FCIDM_SHVIEW_NEWLINK "Neuer Ver&weis" IDS_FOLDER_OPTIONS "Ordneroptionen" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/el-GR.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc Sun Mar 16 09:55:04 2008 @@ -333,7 +333,7 @@ EDITTEXT 14002, 110, 90, 50, 10, WS_TABSTOP | ES_NUMBER LTEXT "=C3=8C=C3=9D=C3=A3=C3=A9=C3=B3=C3=B4=C3=AF =C3=AC=C3=9D=C3=A3=C3= =A5=C3=A8=C3=AF=C3=B2 (MB):", -1, 20, 100, 100, 10 RADIOBUTTON "=C3=8D=C3=A1 =C3=AC=C3=A7=C3=AD =C3=AC=C3=A5=C3=B4=C3=A1=C3= =AA=C3=A9=C3=AD=C3=AF=C3=BD=C3=AD=C3=B4=C3=A1=C3=A9 =C3=B4=C3=A1 =C3=A1=C3= =B1=C3=B7=C3=A5=C3=9F=C3=A1 =C3=B3=C3=B4=C3=AF=C3=AD =C3=AA=C3=9C=C3=A4=C3= =AF =C3=A1=C3=AD=C3=A1=C3=AA=C3=B5=C3=AA=C3=AB=C3=B9=C3=B3=C3=A7=C3=B2. =C3= =8D=C3=A1 =C3=AA=C3=A1=C3=B4=C3=A1=C3=B1=C3=A3=C3=AF=C3=BD=C3=AD=C3=B4=C3= =A1=C3=A9 =C3=B4=C3=A1 =C3=A1=C3=B1=C3=B7=C3=A5=C3=9F=C3=A1 =C3=AC=C3=BC=C3= =AB=C3=A9=C3=B2 =C3=A4=C3=A9=C3=A1=C3=A3=C3=B1=C3=9C=C3=B6=C3=AF=C3=AD=C3= =B4=C3=A1=C3=A9.", 14003, 20, 115, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&=C3=85=C3=AC=C3=B6=C3=9C=C3=AD=C3=A9=C3=B3=C3=A7 =C3=B0=C3= =A1=C3=B1=C3=A1=C3=A8=C3=BD=C3=B1=C3=AF=C3=B5 =C3=A3=C3=A9=C3=A1 =C3=A5=C3= =B0=C3=A9=C3=A2=C3=A5=C3=A2=C3=A1=C3=9F=C3=B9=C3=B3=C3=A7 =C3=A4=C3=A9=C3= =A1=C3=A3=C3=B1=C3=A1=C3=B6=C3=BE=C3=AD", 14004, 20, 155, 155, 10, WS_TABST= OP + AUTOCHECKBOX "&=C3=85=C3=AC=C3=B6=C3=9C=C3=AD=C3=A9=C3=B3=C3=A7 =C3=B0=C3= =A1=C3=B1=C3=A1=C3=A8=C3=BD=C3=B1=C3=AF=C3=B5 =C3=A3=C3=A9=C3=A1 =C3=A5=C3= =B0=C3=A9=C3=A2=C3=A5=C3=A2=C3=A1=C3=9F=C3=B9=C3=B3=C3=A7 =C3=A4=C3=A9=C3= =A1=C3=A3=C3=B1=C3=A1=C3=B6=C3=BE=C3=AD", 14004, 20, 155, 155, 10, WS_TABST= OP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -643,4 +643,7 @@ FCIDM_SHVIEW_NEWFOLDER "=C3=8D=C3=9D=C3=AF=C3=B2 &=C3=96=C3=9C=C3=AA= =C3=A5=C3=AB=C3=AF=C3=B2" FCIDM_SHVIEW_NEWLINK "=C3=8D=C3=9D=C3=A1 &=C3=93=C3=B5=C3=AD=C3=B4= =C3=BC=C3=AC=C3=A5=C3=B5=C3=B3=C3=A7" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/en-GB.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc Sun Mar 16 09:55:04 2008 @@ -333,7 +333,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -643,4 +643,7 @@ FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/en-US.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc Sun Mar 16 09:55:04 2008 @@ -333,7 +333,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -643,4 +643,7 @@ FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/eo-EO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/eo-EO.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/eo-EO.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/eo-EO.rc Sun Mar 16 09:55:04 2008 @@ -333,7 +333,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -643,4 +643,7 @@ FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/es-ES.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc Sun Mar 16 09:55:04 2008 @@ -335,7 +335,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "&Tama=C3=B1o m=C3=A1ximo(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "&No mover archivos a la Papelera de reciclaje. Quitar los ar= chivos inmediatamente al eliminarlos.", 14003, 20, 117, 170, 20, BS_MULTILI= NE | WS_TABSTOP - RADIOBUTTON "&Mostrar cuadro de di=C3=A1logo para confirmar eliminaci=C3= =B3n", 14004, 20, 155, 140, 10, WS_TABSTOP + AUTOCHECKBOX "&Mostrar cuadro de di=C3=A1logo para confirmar eliminaci=C3= =B3n", 14004, 20, 155, 140, 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -645,4 +645,7 @@ FCIDM_SHVIEW_NEWFOLDER "Nueva &carpeta" FCIDM_SHVIEW_NEWLINK "Nuevo &acceso directo" IDS_FOLDER_OPTIONS "Opciones de carpetas" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/fi-FI.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc Sun Mar 16 09:55:04 2008 @@ -333,7 +333,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -643,4 +643,7 @@ FCIDM_SHVIEW_NEWFOLDER "Uusi &Kansio" FCIDM_SHVIEW_NEWLINK "Uusi &Linkki" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/fr-FR.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc Sun Mar 16 09:55:04 2008 @@ -337,7 +337,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "T&aille maximale (MO) :", -1, 20, 105, 70, 10 RADIOBUTTON "Ne pas d=C3=A9placer les fichie&rs vers la Corbeille. Efface= r les fichiers imm=C3=A9diatement lors de la suppression.", 14003, 20, 117,= 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "Afficher une fen=C3=AAtre de confirmation d'effacement", 140= 04, 20, 155, 140, 10, WS_TABSTOP + AUTOCHECKBOX "Afficher une fen=C3=AAtre de confirmation d'effacement", 14= 004, 20, 155, 140, 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -647,4 +647,7 @@ FCIDM_SHVIEW_NEWFOLDER "Nouveau d&ossier" FCIDM_SHVIEW_NEWLINK "Nouveau &lien" IDS_FOLDER_OPTIONS "Options du dossier" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/hu-HU.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc Sun Mar 16 09:55:04 2008 @@ -336,7 +336,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -646,4 +646,7 @@ FCIDM_SHVIEW_NEWFOLDER "&Mappa" FCIDM_SHVIEW_NEWLINK "&Parancsikon" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/it-IT.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc Sun Mar 16 09:55:04 2008 @@ -334,7 +334,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "Dimensione &massima(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "&Non spostare i file nel cestino. I file verranno rimossi im= mediatamente.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Visualizzare un messaggio di richiesta di conferma della ca= ncellazione", 14004, 20, 155, 140, 10, WS_TABSTOP + AUTOCHECKBOX "&Visualizzare un messaggio di richiesta di conferma della c= ancellazione", 14004, 20, 155, 140, 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -644,4 +644,7 @@ FCIDM_SHVIEW_NEWFOLDER "Nuova &Cartella" FCIDM_SHVIEW_NEWLINK "Nuovo &Collegamento" IDS_FOLDER_OPTIONS "Opzioni della cartella" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/ja-JP.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc Sun Mar 16 09:55:04 2008 @@ -333,7 +333,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -643,4 +643,7 @@ FCIDM_SHVIEW_NEWFOLDER "=C2=83t=C2=83H=C2=83=C2=8B=C2=83_(&F)" FCIDM_SHVIEW_NEWLINK "=C2=83V=C2=83=C2=87=C2=81[=C2=83g=C2=83J=C2=83= b=C2=83g(&L)" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/ko-KO.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/ko-KO.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KO.rc Sun Mar 16 09:55:04 2008 @@ -333,7 +333,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -643,4 +643,7 @@ FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/nb-NO.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/nb-NO.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/nb-NO.rc Sun Mar 16 09:55:04 2008 @@ -333,7 +333,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -643,4 +643,7 @@ FCIDM_SHVIEW_NEWFOLDER "Ny &mappe" FCIDM_SHVIEW_NEWLINK "Ny &snarvei" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/nl-NL.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc Sun Mar 16 09:55:04 2008 @@ -333,7 +333,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -643,4 +643,7 @@ FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/pl-PL.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc Sun Mar 16 09:55:04 2008 @@ -339,7 +339,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "&Maksymalny rozmiar(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Nie przeno=C2=9C plik=C3=B3w do &Kosza, tylko od razu usuwaj= .", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Wy=C2=9Cwietl dialog z potwierdzeniem usuwania", 14004, 20,= 155, 140, 10, WS_TABSTOP + AUTOCHECKBOX "&Wy=C2=9Cwietl dialog z potwierdzeniem usuwania", 14004, 20= , 155, 140, 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -649,4 +649,7 @@ FCIDM_SHVIEW_NEWFOLDER "&Folder" FCIDM_SHVIEW_NEWLINK "&Skr=C3=B3t" IDS_FOLDER_OPTIONS "Opcje Katalog=C3=B3w" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/pt-BR.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc Sun Mar 16 09:55:04 2008 @@ -335,7 +335,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -645,4 +645,7 @@ FCIDM_SHVIEW_NEWFOLDER "&Pasta" FCIDM_SHVIEW_NEWLINK "&Atalho" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/pt-PT.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc Sun Mar 16 09:55:04 2008 @@ -335,7 +335,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -645,4 +645,7 @@ FCIDM_SHVIEW_NEWFOLDER "&Pasta" FCIDM_SHVIEW_NEWLINK "&Atalho" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/ru-RU.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc Sun Mar 16 09:55:04 2008 @@ -333,7 +333,7 @@ EDITTEXT 14002, 100, 78, 65, 14, WS_TABSTOP | ES_NUMBER LTEXT "&=C3=8C=C3=A0=C3=AA=C3=B1=C3=A8=C3=AC=C3=A0=C3=AB=C3=BC=C3=AD=C3= =BB=C3=A9 =C3=B0=C3=A0=C3=A7=C3=AC=C3=A5=C3=B0(=C3=8C=C3=A1):", -1, 17, 95,= 102, 10 RADIOBUTTON "&=C3=93=C3=AD=C3=A8=C3=B7=C3=B2=C3=AE=C3=A6=C3=A0=C3=B2=C3= =BC =C3=B4=C3=A0=C3=A9=C3=AB=C3=BB =C3=B1=C3=B0=C3=A0=C3=A7=C3=B3 =C3=AF=C3= =AE=C3=B1=C3=AB=C3=A5 =C3=B3=C3=A4=C3=A0=C3=AB=C3=A5=C3=AD=C3=A8=C3=BF, =C3= =AD=C3=A5 =C3=AF=C3=AE=C3=AC=C3=A5=C3=B9=C3=A0=C3=BF =C3=A8=C3=B5 =C3=A2 = =C3=AA=C3=AE=C3=B0=C3=A7=C3=A8=C3=AD=C3=B3.", 14003, 17, 108, 206, 20, BS_M= ULTILINE | WS_TABSTOP - RADIOBUTTON "&=C3=87=C3=A0=C3=AF=C3=B0=C3=A0=C3=B8=C3=A8=C3=A2=C3=A0=C3= =B2=C3=BC =C3=AF=C3=AE=C3=A4=C3=B2=C3=A2=C3=A5=C3=B0=C3=A6=C3=A4=C3=A5=C3= =AD=C3=A8=C3=A5 =C3=AD=C3=A0 =C3=B3=C3=A4=C3=A0=C3=AB=C3=A5=C3=AD=C3=A8=C3= =A5", 14004, 20, 145, 176, 10, WS_TABSTOP + AUTOCHECKBOX "&=C3=87=C3=A0=C3=AF=C3=B0=C3=A0=C3=B8=C3=A8=C3=A2=C3=A0=C3= =B2=C3=BC =C3=AF=C3=AE=C3=A4=C3=B2=C3=A2=C3=A5=C3=B0=C3=A6=C3=A4=C3=A5=C3= =AD=C3=A8=C3=A5 =C3=AD=C3=A0 =C3=B3=C3=A4=C3=A0=C3=AB=C3=A5=C3=AD=C3=A8=C3= =A5", 14004, 20, 145, 176, 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -641,4 +641,7 @@ FCIDM_SHVIEW_NEWFOLDER "&=C3=8F=C3=A0=C3=AF=C3=AA=C3=A0" FCIDM_SHVIEW_NEWLINK "&=C3=9F=C3=B0=C3=AB=C3=BB=C3=AA" IDS_FOLDER_OPTIONS "=C3=91=C3=A2=C3=AE=C3=A9=C3=B1=C3=B2=C3=A2= =C3=A0 =C3=AF=C3=A0=C3=AF=C3=AA=C3=A8" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/sk-SK.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc Sun Mar 16 09:55:04 2008 @@ -339,7 +339,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "&Maxim=C3=A1lna ve=C2=BEkos=C2=9D (MB):", -1, 20, 105, 70, 10 RADIOBUTTON "S=C3=BAbory nepremiest=C3=B2ova=C2=9D do &ko=C2=9Aa. Zmazan= =C3=A9 s=C3=BAbory hne=C3=AF odstr=C3=A1ni=C2=9D.", 14003, 20, 117, 170, 20= , BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "Zobrazova=C2=9D &dial=C3=B3gov=C3=A9 okno potvrdenia odstr= =C3=A1nenia", 14004, 20, 155, 140, 10, WS_TABSTOP + AUTOCHECKBOX "Zobrazova=C2=9D &dial=C3=B3gov=C3=A9 okno potvrdenia odstr= =C3=A1nenia", 14004, 20, 155, 140, 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -649,4 +649,7 @@ FCIDM_SHVIEW_NEWFOLDER "&Prie=C3=A8inok" FCIDM_SHVIEW_NEWLINK "&Odkaz" IDS_FOLDER_OPTIONS "Mo=C2=9Enosti prie=C3=A8inka" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/sl-SI.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc Sun Mar 16 09:55:04 2008 @@ -333,7 +333,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -643,4 +643,7 @@ FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/sv-SE.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc Sun Mar 16 09:55:04 2008 @@ -333,7 +333,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -643,4 +643,7 @@ FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/tr-TR.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc Sun Mar 16 09:55:04 2008 @@ -333,7 +333,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -643,4 +643,7 @@ FCIDM_SHVIEW_NEWFOLDER "Yeni &Dizin" FCIDM_SHVIEW_NEWLINK "Yeni &K=C3=BDsayol" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/uk-UA.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc Sun Mar 16 09:55:04 2008 @@ -334,7 +334,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "&=C3=83=C3=B0=C3=A0=C3=AD=C3=A8=C3=B7=C3=AD=C3=A8=C3=A9 =C3=AE=C3= =A1'=C2=BA=C3=AC =C3=AA=C3=AE=C3=B8=C3=A8=C3=AA=C3=A0 (=C3=8C=C3=A1):", -1,= 20, 105, 70, 10 RADIOBUTTON "=C3=8D=C3=A5 =C3=AF=C3=A5=C3=B0=C3=A5=C3=AC=C2=B3=C3=B9&=C3= =B3=C3=A2=C3=A0=C3=B2=C3=A8 =C3=B4=C3=A0=C3=A9=C3=AB=C3=A8 =C3=A4=C3=AE =C3= =AA=C3=AE=C3=B8=C3=A8=C3=AA=C3=A0, =C3=A0 =C3=A2=C3=A8=C3=A4=C3=A0=C3=AB=C3= =BF=C3=B2=C3=A8 =C2=BF=C3=B5 =C3=AE=C3=B1=C3=B2=C3=A0=C3=B2=C3=AE=C3=B7=C3= =AD=C3=AE =C3=A2=C2=B3=C3=A4=C3=B0=C3=A0=C3=A7=C3=B3", 14003, 20, 117, 170,= 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "=C3=8F=C3=AE=C3=AA=C3=A0&=C3=A7=C3=B3=C3=A2=C3=A0=C3=B2=C3= =A8 =C3=A4=C2=B3=C3=A0=C3=AB=C3=AE=C3=A3 =C3=AF=C2=B3=C3=A4=C3=B2=C3=A2=C3= =A5=C3=B0=C3=A4=C3=A6=C3=A5=C3=AD=C3=AD=C3=BF =C3=A2=C3=A8=C3=A4=C3=A0=C3= =AB=C3=A5=C3=AD=C3=AD=C3=BF", 14004, 20, 155, 140, 10, WS_TABSTOP + AUTOCHECKBOX "=C3=8F=C3=AE=C3=AA=C3=A0&=C3=A7=C3=B3=C3=A2=C3=A0=C3=B2=C3= =A8 =C3=A4=C2=B3=C3=A0=C3=AB=C3=AE=C3=A3 =C3=AF=C2=B3=C3=A4=C3=B2=C3=A2=C3= =A5=C3=B0=C3=A4=C3=A6=C3=A5=C3=AD=C3=AD=C3=BF =C3=A2=C3=A8=C3=A4=C3=A0=C3= =AB=C3=A5=C3=AD=C3=AD=C3=BF", 14004, 20, 155, 140, 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -644,4 +644,7 @@ FCIDM_SHVIEW_NEWFOLDER "&=C3=8F=C3=A0=C3=AF=C3=AA=C3=B3" FCIDM_SHVIEW_NEWLINK "&=C3=9F=C3=B0=C3=AB=C3=A8=C3=AA" IDS_FOLDER_OPTIONS "=C3=82=C3=AB=C3=A0=C3=B1=C3=B2=C3=A8=C3=A2= =C3=AE=C3=B1=C3=B2=C2=B3 =C3=AF=C3=A0=C3=AF=C3=AA=C3=A8" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/wa-WA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/wa-WA.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/wa-WA.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/wa-WA.rc Sun Mar 16 09:55:04 2008 @@ -333,7 +333,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -643,4 +643,7 @@ FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" IDS_FOLDER_OPTIONS "Folder Options" -END + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + +END Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/zh-CN.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc Sun Mar 16 09:55:04 2008 @@ -334,7 +334,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -644,6 +644,9 @@ FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" IDS_FOLDER_OPTIONS "Folder Options" + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + END = #pragma code_page(default) Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/zh-TW.rc?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc Sun Mar 16 09:55:04 2008 @@ -334,7 +334,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediat= ely when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 1= 0, WS_TABSTOP + AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, = 10, WS_TABSTOP END = OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -644,6 +644,9 @@ FCIDM_SHVIEW_NEWFOLDER "New &Folder" FCIDM_SHVIEW_NEWLINK "New &Link" IDS_FOLDER_OPTIONS "Folder Options" + IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" + IDS_RECYCLEBIN_DISKSPACE "Space Available" + END = #pragma code_page(default) Modified: trunk/reactos/dll/win32/shell32/recyclebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/rec= yclebin.c?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/recyclebin.c (original) +++ trunk/reactos/dll/win32/shell32/recyclebin.c Sun Mar 16 09:55:04 2008 @@ -793,30 +793,71 @@ RecycleBin_IContextMenu_GetCommandString }; = -INT_PTR -CALLBACK -RecycleBinGeneralDlg( - HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam -) -{ - - - return FALSE; -} +void toggleNukeOnDeleteOption(HWND hwndDlg, BOOL bEnable) +{ + if (bEnable) + { + SendDlgItemMessage(hwndDlg, 14001, BM_SETCHECK, BST_UNCHECKED, 0); + EnableWindow(GetDlgItem(hwndDlg, 14002), FALSE); + SendDlgItemMessage(hwndDlg, 14003, BM_SETCHECK, BST_CHECKED, 0); + } + else + { + SendDlgItemMessage(hwndDlg, 14001, BM_SETCHECK, BST_CHECKED, 0); + EnableWindow(GetDlgItem(hwndDlg, 14002), TRUE); + SendDlgItemMessage(hwndDlg, 14003, BM_SETCHECK, BST_UNCHECKED, 0); + } +} + = void -InitializeBitBucketDlg(HWND hwndDlg) +InitializeBitBucketDlg(HWND hwndDlg, WCHAR DefaultDrive) { WCHAR CurDrive =3D L'A'; WCHAR szDrive[] =3D L"A:\\"; DWORD dwDrives; - WCHAR szName[MAX_PATH+1]; + WCHAR szName[30]; + WCHAR szVolume[100]; DWORD MaxComponent, Flags; + LVCOLUMNW lc; + HWND hDlgCtrl; + LVITEMW li; + INT itemCount; + ULARGE_INTEGER TotalNumberOfFreeBytes, TotalNumberOfBytes, FreeBytesAva= ilable; + RECT rect; + int columnSize; + int defIndex =3D 0; + DWORD dwNukeOnDelete, dwSize; + + hDlgCtrl =3D GetDlgItem(hwndDlg, 14000); + + if (!LoadStringW(shell32_hInstance, IDS_RECYCLEBIN_LOCATION, szVolume, = sizeof(szVolume) / sizeof(WCHAR))) + szVolume[0] =3D 0; + + GetClientRect(hDlgCtrl, &rect); + + memset(&lc, 0, sizeof(LV_COLUMN) ); + lc.mask =3D LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM | LVCF_FMT; + + columnSize =3D 140; //FIXME + lc.iSubItem =3D 0; + lc.fmt =3D LVCFMT_FIXED_WIDTH; + lc.cx =3D columnSize; + lc.cchTextMax =3D lstrlenW(szVolume); + lc.pszText =3D szVolume; + (void)ListView_InsertColumnW(hDlgCtrl, 0, &lc); + + if (!LoadStringW(shell32_hInstance, IDS_RECYCLEBIN_DISKSPACE, szVolume,= sizeof(szVolume) / sizeof(WCHAR))) + szVolume[0] =3D 0; + + lc.iSubItem =3D 1; + lc.cx =3D rect.right - rect.left - columnSize; + lc.cchTextMax =3D lstrlenW(szVolume); + lc.pszText =3D szVolume; + (void)ListView_InsertColumnW(hDlgCtrl, 1, &lc); = dwDrives =3D GetLogicalDrives(); + itemCount =3D 0; do { if ((dwDrives & 0x1)) @@ -824,10 +865,37 @@ UINT Type =3D GetDriveTypeW(szDrive); if (Type =3D=3D DRIVE_FIXED) //FIXME { - if (!GetVolumeInformationW(szDrive, szName, MAX_PATH+1, NULL, = &MaxComponent, &Flags, NULL, 0)) + if (!GetVolumeInformationW(szDrive, szName, sizeof(szName) / s= izeof(WCHAR), NULL, &MaxComponent, &Flags, NULL, 0)) { - wcscpy(szName, szDrive); + szName[0] =3D 0; } + sprintfW(szVolume, L"%s (%c)", szName, szDrive[0]); + memset(&li, 0x0, sizeof(LVITEMW)); + li.mask =3D LVIF_TEXT | LVIF_PARAM; + li.iSubItem =3D 0; + li.pszText =3D szVolume; + li.iItem =3D itemCount; + li.lParam =3D CurDrive; + (void)ListView_InsertItemW(hDlgCtrl, &li); + if (GetDiskFreeSpaceExW(szDrive, &FreeBytesAvailable , &TotalN= umberOfBytes, &TotalNumberOfFreeBytes)) + { + if (StrFormatByteSizeW(TotalNumberOfFreeBytes.QuadPart, sz= Volume, sizeof(szVolume) / sizeof(WCHAR))) + { + memset(&li, 0x0, sizeof(LVITEMW)); + li.mask =3D LVIF_TEXT; + li.iSubItem =3D 1; + li.pszText =3D szVolume; + li.iItem =3D itemCount; + (void)ListView_SetItemW(hDlgCtrl, &li); + } + } + + if (CurDrive =3D=3D DefaultDrive) + { + defIndex =3D itemCount; + } + + itemCount++; } } CurDrive++; @@ -835,10 +903,26 @@ dwDrives =3D (dwDrives >> 1); }while(dwDrives); = - -} - - + li.mask =3D LVIF_STATE; + li.state =3D LVIS_FOCUSED; + li.iItem =3D defIndex; + (void)ListView_SetItemW(hDlgCtrl, &li); + + wcscpy(szVolume, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explor= er\\Bitbucket\\c"); + szVolume[62] =3D DefaultDrive; + + dwSize =3D sizeof(dwNukeOnDelete); + if (RegGetValueW(HKEY_LOCAL_MACHINE, szVolume, L"NukeOnDelete", RRF_RT_= REG_DWORD, NULL, &dwNukeOnDelete, &dwSize) =3D=3D ERROR_SUCCESS) + { + toggleNukeOnDeleteOption(hwndDlg, dwNukeOnDelete); + } + else + { + /* default to NukeOnDelete = + */ + toggleNukeOnDeleteOption(hwndDlg, TRUE); + } +} = INT_PTR CALLBACK @@ -849,8 +933,29 @@ LPARAM lParam ) { - - + switch(uMsg) + { + case WM_INITDIALOG: + InitializeBitBucketDlg(hwndDlg, (WCHAR)lParam); + return TRUE; + + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case 14001: + toggleNukeOnDeleteOption(hwndDlg, FALSE); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + case 14003: + toggleNukeOnDeleteOption(hwndDlg, TRUE); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + case 14004: + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + } + break; + } return FALSE; } = @@ -868,7 +973,7 @@ psh.hwndParent =3D NULL; psh.u3.phpage =3D hpsp; = - hprop =3D SH_CreatePropertySheetPage("BITBUCKET_PROPERTIES_DLG", BitBuc= ketDlg, (LPARAM)0, NULL); + hprop =3D SH_CreatePropertySheetPage("BITBUCKET_PROPERTIES_DLG", BitBuc= ketDlg, (LPARAM)sDrive, NULL); if (!hprop) { ERR("Failed to create property sheet"); @@ -888,7 +993,57 @@ BOOL TRASH_CanTrashFile(LPCWSTR wszPath) { - FIXME("(%s)\n", debugstr_w(wszPath)); + LONG res; + HKEY hKey; + DWORD RegSerial, dwNukeOnDelete, dwType; + LONG dwLength; + + + static WCHAR szKey[] =3D L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion= \\Explorer\\Bitbucket\\c"; + if (wszPath[1] !=3D L':') + { + /* path is UNC */ + return FALSE; + } + + szKey[62] =3D wszPath[0]; + res =3D RegOpenKeyExW(HKEY_LOCAL_MACHINE, szKey, 0, KEY_QUERY_VALUE, &h= Key); + if (res !=3D ERROR_SUCCESS) + { + FIXME("Failed to open registry path"); + return FALSE; + } + dwLength =3D sizeof(RegSerial); + res =3D RegQueryValueExW(hKey, L"VolumeSerialNumber", NULL, &dwType, (L= PBYTE)&RegSerial, &dwLength); + if (res =3D=3D ERROR_SUCCESS) + { + DWORD FileSystemFlags, MaxComponentLength, VolSerialNumber; + = + GetVolumeInformationW(wszPath, NULL, 0, &VolSerialNumber, &MaxCompo= nentLength, &FileSystemFlags, NULL, 0); + if (VolSerialNumber !=3D RegSerial) + { + /* FIXME + * the current volume was mounted on a different path + */ + FIXME("mismatched serial volume number"); + RegCloseKey(hKey); + return FALSE; + } + } + = + dwLength =3D sizeof(dwNukeOnDelete); + res =3D RegQueryValueExW(hKey, L"NukeOnDelete", NULL, &dwType, (LPBYTE)= &dwNukeOnDelete, &dwLength); + if (res =3D=3D ERROR_SUCCESS && dwNukeOnDelete =3D=3D 0x0) + { + RegCloseKey(hKey); + return FALSE; + } + + /* FIXME + * check if trash is already full = + */ + + RegCloseKey(hKey); return TRUE; } = Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shr= esdef.h?rev=3D32699&r1=3D32698&r2=3D32699&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/shell32/shresdef.h (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h Sun Mar 16 09:55:04 2008 @@ -113,6 +113,8 @@ #define IDS_FOLDER_OPTIONS 150 #define IDS_COLUMN_EXTENSION 151 #define IDS_NO_EXTENSION 152 +#define IDS_RECYCLEBIN_LOCATION 153 +#define IDS_RECYCLEBIN_DISKSPACE 154 = /* Note: this string is referenced from the registry */ #define IDS_RECYCLEBIN_FOLDER_NAME 8964

16 years, 7 months

← Newer
1
...
8
9
10
11
12
13
14
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2008